Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 355a47ae authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

Merge remote-tracking branch 'drm/drm-next' into drm-misc-next-fixes 



Some fixes have been accidentally pushed to this, so I cannot fost-forward.
Required to pull in the remove-fbcon-notifiers fixes.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
parents b1622cb3 80d42db0

.clang-format

+4 −4
Original line number Diff line number Diff line
@@ -387,14 +387,14 @@ ForEachMacros: 
  - 'rhl_for_each_entry_rcu'

  - 'rhl_for_each_rcu'

  - 'rht_for_each'

  - 'rht_for_each_continue'

  - 'rht_for_each_from'

  - 'rht_for_each_entry'

  - 'rht_for_each_entry_continue'

  - 'rht_for_each_entry_from'

  - 'rht_for_each_entry_rcu'

  - 'rht_for_each_entry_rcu_continue'

  - 'rht_for_each_entry_rcu_from'

  - 'rht_for_each_entry_safe'

  - 'rht_for_each_rcu'

  - 'rht_for_each_rcu_continue'

  - 'rht_for_each_rcu_from'

  - '__rq_for_each_bio'

  - 'rq_for_each_bvec'

  - 'rq_for_each_segment'

.get_maintainer.ignore

+1 −0
Original line number Diff line number Diff line 
Christoph Hellwig <hch@lst.de>

Marc Gonzalez <marc.w.gonzalez@free.fr>

.gitignore

+16 −8
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ modules.builtin 
/vmlinuz

/System.map

/Module.markers

/modules.builtin.modinfo



#

# RPM spec file (make rpm-pkg)
@@ -80,20 +81,22 @@ modules.builtin 
/tar-install/



#

# git files that we don't want to ignore even if they are dot-files

# We don't want to ignore the following even if they are dot-files

#

!.clang-format

!.cocciconfig

!.get_maintainer.ignore

!.gitattributes

!.gitignore

!.mailmap

!.cocciconfig

!.clang-format



#

# Generated include files

#

include/config

include/generated

include/ksym

arch/*/include/generated

/include/config/

/include/generated/

/include/ksym/

/arch/*/include/generated/



# stgit generated dirs

patches-*
@@ -129,7 +132,12 @@ signing_key.x509 
x509.genkey



# Kconfig presets

all.config

/all.config

/alldef.config

/allmod.config

/allno.config

/allrandom.config

/allyes.config



# Kdevelop4

*.kdev4

.mailmap

+16 −0
Original line number Diff line number Diff line
@@ -16,6 +16,11 @@ Alan Cox <alan@lxorguk.ukuu.org.uk> 
Alan Cox <root@hraefn.swansea.linux.org.uk>

Aleksey Gorelov <aleksey_gorelov@phoenix.com>

Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>

Alex Shi <alex.shi@linux.alibaba.com> <alex.shi@intel.com>

Alex Shi <alex.shi@linux.alibaba.com> <alex.shi@linaro.org>

Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>

Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>

Alexei Starovoitov <ast@kernel.org> <ast@fb.com>

Al Viro <viro@ftp.linux.org.uk>

Al Viro <viro@zenIV.linux.org.uk>

Andi Shyti <andi@etezian.org> <andi.shyti@samsung.com>
@@ -46,6 +51,12 @@ Christoph Hellwig <hch@lst.de> 
Christophe Ricard <christophe.ricard@gmail.com>

Corey Minyard <minyard@acm.org>

Damian Hobson-Garcia <dhobsong@igel.co.jp>

Daniel Borkmann <daniel@iogearbox.net> <dborkman@redhat.com>

Daniel Borkmann <daniel@iogearbox.net> <dborkmann@redhat.com>

Daniel Borkmann <daniel@iogearbox.net> <danborkmann@iogearbox.net>

Daniel Borkmann <daniel@iogearbox.net> <daniel.borkmann@tik.ee.ethz.ch>

Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>

Daniel Borkmann <daniel@iogearbox.net> <dxchgb@gmail.com>

David Brownell <david-b@pacbell.net>

David Woodhouse <dwmw2@shinybook.infradead.org>

Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>
@@ -117,6 +128,8 @@ Leonid I Ananiev <leonid.i.ananiev@intel.com> 
Linas Vepstas <linas@austin.ibm.com>

Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>

Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>

Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>

Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>

Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>

Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>

Mark Brown <broonie@sirena.org.uk>
@@ -189,6 +202,7 @@ Santosh Shilimkar <ssantosh@kernel.org> 
Santosh Shilimkar <santosh.shilimkar@oracle.org>

Sascha Hauer <s.hauer@pengutronix.de>

S.Çağlar Onur <caglar@pardus.org.tr>

Sean Nyekjaer <sean@geanix.com> <sean.nyekjaer@prevas.dk>

Sebastian Reichel <sre@kernel.org> <sre@debian.org>

Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>

Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
@@ -207,6 +221,8 @@ Tejun Heo <htejun@gmail.com> 
Thomas Graf <tgraf@suug.ch>

Thomas Pedersen <twp@codeaurora.org>

Tony Luck <tony.luck@intel.com>

TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>

TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>

Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>

Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>

Uwe Kleine-König <ukl@pengutronix.de>

CREDITS

+8 −0
Original line number Diff line number Diff line
@@ -3364,6 +3364,14 @@ S: Braunschweiger Strasse 79 
S: 31134 Hildesheim

S: Germany



N: Martin Schwidefsky

D: Martin was the most significant contributor to the initial s390

D: port of the Linux Kernel and later the maintainer of the s390

D: architecture backend for almost two decades.

D: He passed away in 2019, and will be greatly missed.

S: Germany

W: https://lwn.net/Articles/789028/



N: Marcel Selhorst

E: tpmdd@selhorst.net

D: TPM driver