Merge drm/drm-fixes into drm-misc-fixes (2c55d703) · Commits · EulixOS / Software / Kernel

.clang-format

+5 −0

Original line number	Diff line number	Diff line
		@@ -222,6 +222,7 @@ ForEachMacros:
		- 'for_each_component_dais'
		- 'for_each_component_dais_safe'
		- 'for_each_console'
		- 'for_each_console_srcu'
		- 'for_each_cpu'
		- 'for_each_cpu_and'
		- 'for_each_cpu_not'
		@@ -440,8 +441,11 @@ ForEachMacros:
		- 'inet_lhash2_for_each_icsk'
		- 'inet_lhash2_for_each_icsk_continue'
		- 'inet_lhash2_for_each_icsk_rcu'
		- 'interval_tree_for_each_double_span'
		- 'interval_tree_for_each_span'
		- 'intlist__for_each_entry'
		- 'intlist__for_each_entry_safe'
		- 'iopt_for_each_contig_area'
		- 'kcore_copy__for_each_phdr'
		- 'key_for_each'
		- 'key_for_each_safe'
		@@ -535,6 +539,7 @@ ForEachMacros:
		- 'perf_hpp_list__for_each_sort_list_safe'
		- 'perf_pmu__for_each_hybrid_pmu'
		- 'ping_portaddr_for_each_entry'
		- 'ping_portaddr_for_each_entry_rcu'
		- 'plist_for_each'
		- 'plist_for_each_continue'
		- 'plist_for_each_entry'

.gitignore

+2 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		*.dtb
		*.dtbo
		*.dtb.S
		*.dtbo.S
		*.dwo
		*.elf
		*.gcno
		@@ -38,6 +39,7 @@
		.o.
		*.patch
		*.rmeta
		*.rpm
		*.rsi
		*.s
		*.so

.mailmap

+4 −0

Original line number	Diff line number	Diff line
		@@ -228,6 +228,7 @@ Juha Yrjola <at solidboot.com>
		Juha Yrjola <juha.yrjola@nokia.com>
		Juha Yrjola <juha.yrjola@solidboot.com>
		Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>
		Iskren Chernev <me@iskren.info> <iskren.chernev@gmail.com>
		Kalle Valo <kvalo@kernel.org> <kvalo@codeaurora.org>
		Kalyan Thota <quic_kalyant@quicinc.com> <kalyan_t@codeaurora.org>
		Kay Sievers <kay.sievers@vrfy.org>
		@@ -287,6 +288,7 @@ Matthew Wilcox <willy@infradead.org> <willy@linux.intel.com>
		Matthew Wilcox <willy@infradead.org> <willy@parisc-linux.org>
		Matthias Fuchs <socketcan@esd.eu> <matthias.fuchs@esd.eu>
		Matthieu CASTET <castet.matthieu@free.fr>
		Matti Vaittinen <mazziesaccount@gmail.com> <matti.vaittinen@fi.rohmeurope.com>
		Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>
		Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com>
		Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>
		@@ -372,6 +374,8 @@ Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>
		Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>
		Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>
		Roman Gushchin <roman.gushchin@linux.dev> <klamm@yandex-team.ru>
		Muchun Song <muchun.song@linux.dev> <songmuchun@bytedance.com>
		Muchun Song <muchun.song@linux.dev> <smuchun@gmail.com>
		Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com>
		Rudolf Marek <R.Marek@sh.cvut.cz>
		Rui Saraiva <rmps@joel.ist.utl.pt>

CREDITS

+4 −0

Original line number	Diff line number	Diff line
		@@ -1439,6 +1439,10 @@ N: Justin Guyett
		E: jguyett@andrew.cmu.edu
		D: via-rhine net driver hacking

		N: Nitin Gupta
		E: ngupta@vflare.org
		D: zsmalloc memory allocator and zram block device driver

		N: Danny ter Haar
		E: dth@cistron.nl
		D: /proc/cpuinfo, reboot on panic , kernel pre-patch tester ;)

Documentation/ABI/stable/sysfs-driver-dma-idxd

+12 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ Date: Oct 25, 2019
		KernelVersion: 5.6.0
		Contact: dmaengine@vger.kernel.org
		Description: The largest number of work descriptors in a batch.
		It's not visible when the device does not support batch.

		What: /sys/bus/dsa/devices/dsa<m>/max_work_queues_size
		Date: Oct 25, 2019
		@@ -49,6 +50,8 @@ Description: The total number of read buffers supported by this device.
		The read buffers represent resources within the DSA
		implementation, and these resources are allocated by engines to
		support operations. See DSA spec v1.2 9.2.4 Total Read Buffers.
		It's not visible when the device does not support Read Buffer
		allocation control.

		What: /sys/bus/dsa/devices/dsa<m>/max_transfer_size
		Date: Oct 25, 2019
		@@ -122,6 +125,8 @@ Contact: dmaengine@vger.kernel.org
		Description: The maximum number of read buffers that may be in use at
		one time by operations that access low bandwidth memory in the
		device. See DSA spec v1.2 9.2.8 GENCFG on Global Read Buffer Limit.
		It's not visible when the device does not support Read Buffer
		allocation control.

		What: /sys/bus/dsa/devices/dsa<m>/cmd_status
		Date: Aug 28, 2020
		@@ -205,6 +210,7 @@ KernelVersion: 5.10.0
		Contact: dmaengine@vger.kernel.org
		Description: The max batch size for this workqueue. Cannot exceed device
		max batch size. Configurable parameter.
		It's not visible when the device does not support batch.

		What: /sys/bus/dsa/devices/wq<m>.<n>/ats_disable
		Date: Nov 13, 2020
		@@ -250,6 +256,8 @@ KernelVersion: 5.17.0
		Contact: dmaengine@vger.kernel.org
		Description: Enable the use of global read buffer limit for the group. See DSA
		spec v1.2 9.2.18 GRPCFG Use Global Read Buffer Limit.
		It's not visible when the device does not support Read Buffer
		allocation control.

		What: /sys/bus/dsa/devices/group<m>.<n>/read_buffers_allowed
		Date: Dec 10, 2021
		@@ -258,6 +266,8 @@ Contact: dmaengine@vger.kernel.org
		Description: Indicates max number of read buffers that may be in use at one time
		by all engines in the group. See DSA spec v1.2 9.2.18 GRPCFG Read
		Buffers Allowed.
		It's not visible when the device does not support Read Buffer
		allocation control.

		What: /sys/bus/dsa/devices/group<m>.<n>/read_buffers_reserved
		Date: Dec 10, 2021
		@@ -266,6 +276,8 @@ Contact: dmaengine@vger.kernel.org
		Description: Indicates the number of Read Buffers reserved for the use of
		engines in the group. See DSA spec v1.2 9.2.18 GRPCFG Read Buffers
		Reserved.
		It's not visible when the device does not support Read Buffer
		allocation control.

		What: /sys/bus/dsa/devices/group<m>.<n>/desc_progress_limit
		Date: Sept 14, 2022