Merge drm/drm-next into drm-misc-next (a1eccc57) · Commits · EulixOS / Software / Kernel

.clang-format

+1 −1

Original line number	Diff line number	Diff line
		@@ -190,6 +190,7 @@ ForEachMacros:
		- 'for_each_active_dev_scope'
		- 'for_each_active_drhd_unit'
		- 'for_each_active_iommu'
		- 'for_each_active_route'
		- 'for_each_aggr_pgid'
		- 'for_each_available_child_of_node'
		- 'for_each_bench'
		@@ -225,7 +226,6 @@ ForEachMacros:
		- 'for_each_console_srcu'
		- 'for_each_cpu'
		- 'for_each_cpu_and'
		- 'for_each_cpu_not'
		- 'for_each_cpu_wrap'
		- 'for_each_dapm_widgets'
		- 'for_each_dedup_cand'

.gitattributes

+4 −4

Original line number	Diff line number	Diff line
		*.c diff=cpp
		*.h diff=cpp
		*.dtsi diff=dts
		# SPDX-License-Identifier: GPL-2.0-only
		*.[ch] diff=cpp
		*.dts diff=dts
		*.dts[io] diff=dts

.gitignore

+3 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@
		# subdirectories here. Add them in the ".gitignore" file
		# in that subdirectory instead.
		#
		# NOTE! Please use 'git ls-files -i --exclude-standard'
		# NOTE! Please use 'git ls-files -i -c --exclude-per-directory=.gitignore'
		# command after changing this file, to see if there are
		# any tracked files which get ignored after the change.
		#
		@@ -16,6 +16,7 @@
		*.bin
		*.bz2
		.c.[012].*
		*.cover
		*.dt.yaml
		*.dtb
		*.dtbo
		@@ -33,6 +34,7 @@
		*.lz4
		*.lzma
		*.lzo
		*.mbx
		*.mod
		*.mod.c
		*.o

.mailmap

+7 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,8 @@ Aleksey Gorelov <aleksey_gorelov@phoenix.com>
		Alexander Lobakin <alobakin@pm.me> <alobakin@dlink.ru>
		Alexander Lobakin <alobakin@pm.me> <alobakin@marvell.com>
		Alexander Lobakin <alobakin@pm.me> <bloodyreaper@yandex.ru>
		Alexander Mikhalitsyn <alexander@mihalicyn.com> <alexander.mikhalitsyn@virtuozzo.com>
		Alexander Mikhalitsyn <alexander@mihalicyn.com> <aleksandr.mikhalitsyn@canonical.com>
		Alexandre Belloni <alexandre.belloni@bootlin.com> <alexandre.belloni@free-electrons.com>
		Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
		Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
		@@ -119,6 +121,7 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>
		Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>
		Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>
		<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>
		Dikshita Agarwal <dikshita@qti.qualcomm.com> <dikshita@codeaurora.org>
		Dmitry Baryshkov <dbaryshkov@gmail.com>
		Dmitry Baryshkov <dbaryshkov@gmail.com> <[dbaryshkov@gmail.com]>
		Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_baryshkov@mentor.com>
		@@ -130,6 +133,7 @@ Domen Puncer <domen@coderock.org>
		Douglas Gilbert <dougg@torque.net>
		Ed L. Cashin <ecashin@coraid.com>
		Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>
		Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com>
		Evgeniy Polyakov <johnpol@2ka.mipt.ru>
		Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> <ezequiel@collabora.com>
		Felipe W Damasio <felipewd@terra.com.br>
		@@ -147,6 +151,7 @@ Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com>
		Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>
		Gao Xiang <xiang@kernel.org> <hsiangkao@linux.alibaba.com>
		Gao Xiang <xiang@kernel.org> <hsiangkao@redhat.com>
		Georgi Djakov <djakov@kernel.org> <georgi.djakov@linaro.org>
		Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>
		Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>
		Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@linux.vnet.ibm.com>
		@@ -214,6 +219,7 @@ Jisheng Zhang <jszhang@kernel.org> <jszhang@marvell.com>
		Jisheng Zhang <jszhang@kernel.org> <Jisheng.Zhang@synaptics.com>
		Johan Hovold <johan@kernel.org> <jhovold@gmail.com>
		Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>
		John Crispin <john@phrozen.org> <blogic@openwrt.org>
		John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
		John Stultz <johnstul@us.ibm.com>
		Jordan Crouse <jordan@cosmicpenguin.net> <jcrouse@codeaurora.org>
		@@ -437,6 +443,7 @@ Vasily Averin <vasily.averin@linux.dev> <vvs@openvz.org>
		Vasily Averin <vasily.averin@linux.dev> <vvs@parallels.com>
		Vasily Averin <vasily.averin@linux.dev> <vvs@sw.ru>
		Valentin Schneider <vschneid@redhat.com> <valentin.schneider@arm.com>
		Vikash Garodia <quic_vgarodia@quicinc.com> <vgarodia@codeaurora.org>
		Vinod Koul <vkoul@kernel.org> <vinod.koul@intel.com>
		Vinod Koul <vkoul@kernel.org> <vinod.koul@linux.intel.com>
		Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>

CREDITS

+11 −3

Original line number	Diff line number	Diff line
		@@ -1173,6 +1173,10 @@ D: Future Domain TMC-16x0 SCSI driver (author)
		D: APM driver (early port)
		D: DRM drivers (author of several)

		N: Veaceslav Falico
		E: vfalico@gmail.com
		D: Co-maintainer and co-author of the network bonding driver.

		N: János Farkas
		E: chexum@shadow.banki.hu
		D: romfs, various (mostly networking) fixes
		@@ -1848,11 +1852,11 @@ E: ajoshi@shell.unixbox.com
		D: fbdev hacking

		N: Jesper Juhl
		E: jj@chaosbits.net
		E: jesperjuhl76@gmail.com
		D: Various fixes, cleanups and minor features all over the tree.
		D: Wrote initial version of the hdaps driver (since passed on to others).
		S: Lemnosvej 1, 3.tv
		S: 2300 Copenhagen S.
		S: Titangade 5G, 2.tv
		S: 2200 Copenhagen N.
		S: Denmark

		N: Jozsef Kadlecsik
		@@ -4179,6 +4183,10 @@ S: B-1206 Jingmao Guojigongyu
		S: 16 Baliqiao Nanjie, Beijing 101100
		S: People's Repulic of China

		N: Vlad Yasevich
		E: vyasevich@gmail.com
		D: SCTP protocol maintainer.

		N: Aviad Yehezkel
		E: aviadye@nvidia.com
		D: Kernel TLS implementation and offload support.