Commit 9ff17e6b authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

Merge drm/drm-next into drm-intel-gt-next 



For conflict avoidance we need the following commit:

  c9a9f18d drm/i915/huc: use const struct bus_type pointers

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
parents d922b80b 2e149283

.clang-format

+1 −1
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ ForEachMacros: 
  - 'of_property_for_each_string'

  - 'of_property_for_each_u32'

  - 'pci_bus_for_each_resource'

  - 'pci_doe_for_each_off'

  - 'pci_dev_for_each_resource'

  - 'pcl_for_each_chunk'

  - 'pcl_for_each_segment'

  - 'pcm_for_each_format'

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ modules.order 
!.get_maintainer.ignore

!.gitattributes

!.gitignore

!.kunitconfig

!.mailmap

!.rustfmt.toml

.mailmap

+14 −1
Original line number Diff line number Diff line
@@ -213,7 +213,10 @@ Jeff Garzik <jgarzik@pretzel.yyz.us> 
Jeff Layton <jlayton@kernel.org> <jlayton@poochiereds.net>

Jeff Layton <jlayton@kernel.org> <jlayton@primarydata.com>

Jeff Layton <jlayton@kernel.org> <jlayton@redhat.com>

Jens Axboe <axboe@suse.de>

Jens Axboe <axboe@kernel.dk> <axboe@suse.de>

Jens Axboe <axboe@kernel.dk> <jens.axboe@oracle.com>

Jens Axboe <axboe@kernel.dk> <axboe@fb.com>

Jens Axboe <axboe@kernel.dk> <axboe@meta.com>

Jens Osterkamp <Jens.Osterkamp@de.ibm.com>

Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>

Jessica Zhang <quic_jesszhan@quicinc.com> <jesszhan@codeaurora.org>
@@ -232,6 +235,8 @@ 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>

<jon.toppins+linux@gmail.com> <jtoppins@cumulusnetworks.com>

<jon.toppins+linux@gmail.com> <jtoppins@redhat.com>

Jordan Crouse <jordan@cosmicpenguin.net> <jcrouse@codeaurora.org>

<josh@joshtriplett.org> <josh@freedesktop.org>

<josh@joshtriplett.org> <josh@kernel.org>
@@ -265,7 +270,9 @@ Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com> 
Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@canonical.com>

Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Kuogee Hsieh <quic_khsieh@quicinc.com> <khsieh@codeaurora.org>

Leonard Crestez <leonard.crestez@nxp.com> Leonard Crestez <cdleonard@gmail.com>

Leonardo Bras <leobras.c@gmail.com> <leonardo@linux.ibm.com>

Leonard Göhrs <l.goehrs@pengutronix.de>

Leonid I Ananiev <leonid.i.ananiev@intel.com>

Leon Romanovsky <leon@kernel.org> <leon@leon.nu>

Leon Romanovsky <leon@kernel.org> <leonro@mellanox.com>
@@ -295,6 +302,8 @@ Martin Kepplinger <martink@posteo.de> <martin.kepplinger@puri.sm> 
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>

Martyna Szapar-Mudlaw <martyna.szapar-mudlaw@linux.intel.com> <martyna.szapar-mudlaw@intel.com>

Mathieu Othacehe <m.othacehe@gmail.com>

Mat Martineau <martineau@kernel.org> <mathew.j.martineau@linux.intel.com>

Mat Martineau <martineau@kernel.org> <mathewm@codeaurora.org>

Matthew Wilcox <willy@infradead.org> <matthew.r.wilcox@intel.com>

Matthew Wilcox <willy@infradead.org> <matthew@wil.cx>

Matthew Wilcox <willy@infradead.org> <mawilcox@linuxonhyperv.com>
@@ -322,6 +331,7 @@ Maxime Ripard <mripard@kernel.org> <maxime.ripard@bootlin.com> 
Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com>

Mayuresh Janorkar <mayur@ti.com>

Michael Buesch <m@bues.ch>

Michal Simek <michal.simek@amd.com> <michal.simek@xilinx.com>

Michel Dänzer <michel@tungstengraphics.com>

Michel Lespinasse <michel@lespinasse.org>

Michel Lespinasse <michel@lespinasse.org> <walken@google.com>
@@ -354,6 +364,7 @@ Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org> 
Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>

Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.com>

Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>

Oleksandr Natalenko <oleksandr@natalenko.name> <oleksandr@redhat.com>

Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>

Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>

Oleksij Rempel <linux@rempel-privat.de> <fixed-term.Oleksij.Rempel@de.bosch.com>
@@ -369,6 +380,8 @@ Paul E. McKenney <paulmck@kernel.org> <paul.mckenney@linaro.org> 
Paul E. McKenney <paulmck@kernel.org> <paulmck@linux.ibm.com>

Paul E. McKenney <paulmck@kernel.org> <paulmck@linux.vnet.ibm.com>

Paul E. McKenney <paulmck@kernel.org> <paulmck@us.ibm.com>

Paul Mackerras <paulus@ozlabs.org> <paulus@samba.org>

Paul Mackerras <paulus@ozlabs.org> <paulus@au1.ibm.com>

Peter A Jonsson <pj@ludd.ltu.se>

Peter Oruba <peter.oruba@amd.com>

Peter Oruba <peter@oruba.de>

CREDITS

+23 −2
Original line number Diff line number Diff line
@@ -229,6 +229,10 @@ S: University of Notre Dame 
S: Notre Dame, Indiana

S: USA



N: Kai Bankett

E: chaosman@ontika.net

D: QNX6 filesystem



N: Greg Banks

E: gnb@alphalink.com.au

D: IDT77105 ATM network driver
@@ -886,6 +890,10 @@ W: http://jdelvare.nerim.net/ 
D: Several hardware monitoring drivers

S: France



N: Frank "Jedi/Sector One" Denis

E: j@pureftpd.org

D: QNX4 filesystem



N: Peter Denison

E: peterd@pnd-pc.demon.co.uk

W: http://www.pnd-pc.demon.co.uk/promise/
@@ -1259,6 +1267,10 @@ S: USA 
N: Adam Fritzler

E: mid@zigamorph.net



N: Richard "Scuba" A. Frowijn

E: scuba@wxs.nl

D: QNX4 filesystem



N: Fernando Fuganti

E: fuganti@conectiva.com.br

E: fuganti@netbank.com.br
@@ -2218,6 +2230,10 @@ D: Digiboard PC/Xe and PC/Xi, Digiboard EPCA 
D: NUMA support, Slab allocators, Page migration

D: Scalability, Time subsystem



N: Anders Larsen

E: al@alarsen.net

D: QNX4 filesystem



N: Paul Laufer

E: paul@laufernet.com

D: Soundblaster driver fixes, ISAPnP quirk
@@ -2494,8 +2510,8 @@ D: XF86_8514 
D: cfdisk (curses based disk partitioning program)



N: Mat Martineau

E: mat@martineau.name

D: MPTCP subsystem co-maintainer 2020-2023

E: martineau@kernel.org

D: MPTCP subsystem co-maintainer

D: Keyctl restricted keyring and Diffie-Hellman UAPI

D: Bluetooth L2CAP ERTM mode and AMP

S: USA
@@ -3459,6 +3475,11 @@ D: several improvements to system programs 
S: Oldenburg

S: Germany



N: Mathieu Poirier

E: mathieu.poirier@linaro.org

D: CoreSight kernel subsystem, Maintainer 2014-2022

D: Perf tool support for CoreSight



N: Robert Schwebel

E: robert@schwebel.de

W: https://www.schwebel.de

Documentation/ABI/obsolete/sysfs-selinux-checkreqprot→Documentation/ABI/removed/sysfs-selinux-checkreqprot

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ KernelVersion: 2.6.12-rc2 (predates git) 
Contact:	selinux@vger.kernel.org

Description:



	REMOVAL UPDATE: The SELinux checkreqprot functionality was removed in

	March 2023, the original deprecation notice is shown below.



	The selinuxfs "checkreqprot" node allows SELinux to be configured

	to check the protection requested by userspace for mmap/mprotect

	calls instead of the actual protection applied by the kernel.