Skip to content

Commit 48a7107

Browse files
committed
Merge drm/drm-fixes into drm-misc-fixes
Updating drm-misc-fixes to the state of v6.18-rc1. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
2 parents 7f38a14 + 3a86608 commit 48a7107

File tree

13,011 files changed

+588671
-340518
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

13,011 files changed

+588671
-340518
lines changed

.clang-format

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,6 @@ ForEachMacros:
294294
- 'for_each_fib6_node_rt_rcu'
295295
- 'for_each_fib6_walker_rt'
296296
- 'for_each_file_lock'
297-
- 'for_each_free_mem_pfn_range_in_zone_from'
298297
- 'for_each_free_mem_range'
299298
- 'for_each_free_mem_range_reverse'
300299
- 'for_each_func_rsrc'

.get_maintainer.ignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
Alan Cox <alan@lxorguk.ukuu.org.uk>
22
Alan Cox <root@hraefn.swansea.linux.org.uk>
3+
Alyssa Rosenzweig <alyssa@rosenzweig.io>
34
Christoph Hellwig <hch@lst.de>
45
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
56
Marc Gonzalez <marc.w.gonzalez@free.fr>

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ x509.genkey
176176
*.kdev4
177177

178178
# Clang's compilation database file
179-
/compile_commands.json
179+
compile_commands.json
180180

181181
# Documentation toolchain
182182
sphinx_*/

.mailmap

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ Ben M Cahill <ben.m.cahill@intel.com>
134134
Ben Widawsky <bwidawsk@kernel.org> <ben@bwidawsk.net>
135135
Ben Widawsky <bwidawsk@kernel.org> <ben.widawsky@intel.com>
136136
Ben Widawsky <bwidawsk@kernel.org> <benjamin.widawsky@intel.com>
137+
Bence Csókás <bence98@sch.bme.hu> <csokas.bence@prolan.hu>
137138
Benjamin Poirier <benjamin.poirier@gmail.com> <bpoirier@suse.de>
138139
Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@gmail.com>
139140
Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@redhat.com>
@@ -164,6 +165,8 @@ Casey Connolly <casey.connolly@linaro.org> <caleb@connolly.tech>
164165
Casey Connolly <casey.connolly@linaro.org> <caleb@postmarketos.org>
165166
Can Guo <quic_cang@quicinc.com> <cang@codeaurora.org>
166167
Carl Huang <quic_cjhuang@quicinc.com> <cjhuang@codeaurora.org>
168+
Carl Vanderlip <carl.vanderlip@oss.qualcomm.com> <carlv@codeaurora.org>
169+
Carl Vanderlip <carl.vanderlip@oss.qualcomm.com> <quic_carlv@quicinc.com>
167170
Carlos Bilbao <carlos.bilbao@kernel.org> <carlos.bilbao@amd.com>
168171
Carlos Bilbao <carlos.bilbao@kernel.org> <carlos.bilbao.osdev@gmail.com>
169172
Carlos Bilbao <carlos.bilbao@kernel.org> <bilbao@vt.edu>
@@ -213,7 +216,8 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>
213216
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>
214217
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>
215218
<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>
216-
Dikshita Agarwal <quic_dikshita@quicinc.com> <dikshita@codeaurora.org>
219+
Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com> <dikshita@codeaurora.org>
220+
Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com> <quic_dikshita@quicinc.com>
217221
Dmitry Baryshkov <lumag@kernel.org> <dbaryshkov@gmail.com>
218222
Dmitry Baryshkov <lumag@kernel.org> <[dbaryshkov@gmail.com]>
219223
Dmitry Baryshkov <lumag@kernel.org> <dmitry_baryshkov@mentor.com>
@@ -226,6 +230,8 @@ Domen Puncer <domen@coderock.org>
226230
Douglas Gilbert <dougg@torque.net>
227231
Drew Fustini <fustini@kernel.org> <drew@pdp7.com>
228232
<duje@dujemihanovic.xyz> <duje.mihanovic@skole.hr>
233+
Easwar Hariharan <easwar.hariharan@linux.microsoft.com> <easwar.hariharan@intel.com>
234+
Easwar Hariharan <easwar.hariharan@linux.microsoft.com> <eahariha@linux.microsoft.com>
229235
Ed L. Cashin <ecashin@coraid.com>
230236
Elliot Berman <quic_eberman@quicinc.com> <eberman@codeaurora.org>
231237
Enric Balletbo i Serra <eballetbo@kernel.org> <enric.balletbo@collabora.com>
@@ -587,6 +593,7 @@ Nikolay Aleksandrov <razor@blackwall.org> <nikolay@redhat.com>
587593
Nikolay Aleksandrov <razor@blackwall.org> <nikolay@cumulusnetworks.com>
588594
Nikolay Aleksandrov <razor@blackwall.org> <nikolay@nvidia.com>
589595
Nikolay Aleksandrov <razor@blackwall.org> <nikolay@isovalent.com>
596+
Nobuhiro Iwamatsu <nobuhiro.iwamatsu.x90@mail.toshiba> <nobuhiro1.iwamatsu@toshiba.co.jp>
590597
Odelu Kukatla <quic_okukatla@quicinc.com> <okukatla@codeaurora.org>
591598
Oleksandr Natalenko <oleksandr@natalenko.name> <oleksandr@redhat.com>
592599
Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>
@@ -620,6 +627,7 @@ Paulo Alcantara <pc@manguebit.org> <palcantara@suse.com>
620627
Paulo Alcantara <pc@manguebit.org> <pc@manguebit.com>
621628
Pavankumar Kondeti <quic_pkondeti@quicinc.com> <pkondeti@codeaurora.org>
622629
Peter A Jonsson <pj@ludd.ltu.se>
630+
Peter Hilber <peter.hilber@oss.qualcomm.com> <quic_philber@quicinc.com>
623631
Peter Oruba <peter.oruba@amd.com>
624632
Peter Oruba <peter@oruba.de>
625633
Pierre-Louis Bossart <pierre-louis.bossart@linux.dev> <pierre-louis.bossart@linux.intel.com>
@@ -703,6 +711,7 @@ Sergey Senozhatsky <senozhatsky@chromium.org> <sergey.senozhatsky@mail.by>
703711
Sergey Senozhatsky <senozhatsky@chromium.org> <senozhatsky@google.com>
704712
Seth Forshee <sforshee@kernel.org> <seth.forshee@canonical.com>
705713
Shakeel Butt <shakeel.butt@linux.dev> <shakeelb@google.com>
714+
Shameer Kolothum <skolothumtho@nvidia.com> <shameerali.kolothum.thodi@huawei.com>
706715
Shannon Nelson <sln@onemain.com> <shannon.nelson@amd.com>
707716
Shannon Nelson <sln@onemain.com> <snelson@pensando.io>
708717
Shannon Nelson <sln@onemain.com> <shannon.nelson@intel.com>
@@ -713,7 +722,8 @@ Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
713722
Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>
714723
Shuah Khan <shuah@kernel.org> <shuahkh@osg.samsung.com>
715724
Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>
716-
Sibi Sankar <quic_sibis@quicinc.com> <sibis@codeaurora.org>
725+
Sibi Sankar <sibi.sankar@oss.qualcomm.com> <sibis@codeaurora.org>
726+
Sibi Sankar <sibi.sankar@oss.qualcomm.com> <quic_sibis@quicinc.com>
717727
Sid Manning <quic_sidneym@quicinc.com> <sidneym@codeaurora.org>
718728
Simon Arlott <simon@octiron.net> <simon@fire.lp0.eu>
719729
Simona Vetter <simona.vetter@ffwll.ch> <daniel.vetter@ffwll.ch>
@@ -737,6 +747,8 @@ Sriram Yagnaraman <sriram.yagnaraman@ericsson.com> <sriram.yagnaraman@est.tech>
737747
Stanislav Fomichev <sdf@fomichev.me> <sdf@google.com>
738748
Stanislav Fomichev <sdf@fomichev.me> <stfomichev@gmail.com>
739749
Stefan Wahren <wahrenst@gmx.net> <stefan.wahren@i2se.com>
750+
Stéphane Grosjean <stephane.grosjean@hms-networks.com> <s.grosjean@peak-system.com>
751+
Stéphane Grosjean <stephane.grosjean@hms-networks.com> <stephane.grosjean@free.fr>
740752
Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
741753
Stephen Hemminger <stephen@networkplumber.org> <shemminger@linux-foundation.org>
742754
Stephen Hemminger <stephen@networkplumber.org> <shemminger@osdl.org>
@@ -791,6 +803,7 @@ Tvrtko Ursulin <tursulin@ursulin.net> <tvrtko.ursulin@onelan.co.uk>
791803
Tvrtko Ursulin <tursulin@ursulin.net> <tvrtko@ursulin.net>
792804
Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>
793805
Tzung-Bi Shih <tzungbi@kernel.org> <tzungbi@google.com>
806+
Umang Jain <uajain@igalia.com> <umang.jain@ideasonboard.com>
794807
Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
795808
Uwe Kleine-König <u.kleine-koenig@baylibre.com> <ukleinek@baylibre.com>
796809
Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
@@ -812,7 +825,9 @@ Valentin Schneider <vschneid@redhat.com> <valentin.schneider@arm.com>
812825
Veera Sundaram Sankaran <quic_veeras@quicinc.com> <veeras@codeaurora.org>
813826
Veerabhadrarao Badiganti <quic_vbadigan@quicinc.com> <vbadigan@codeaurora.org>
814827
Venkateswara Naralasetty <quic_vnaralas@quicinc.com> <vnaralas@codeaurora.org>
815-
Vikash Garodia <quic_vgarodia@quicinc.com> <vgarodia@codeaurora.org>
828+
Vikash Garodia <vikash.garodia@oss.qualcomm.com> <vgarodia@codeaurora.org>
829+
Vikash Garodia <vikash.garodia@oss.qualcomm.com> <quic_vgarodia@quicinc.com>
830+
Vincent Mailhol <mailhol@kernel.org> <mailhol.vincent@wanadoo.fr>
816831
Vinod Koul <vkoul@kernel.org> <vinod.koul@intel.com>
817832
Vinod Koul <vkoul@kernel.org> <vinod.koul@linux.intel.com>
818833
Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>

.pylintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[MASTER]
2-
init-hook='import sys; sys.path += ["scripts/lib/kdoc", "scripts/lib/abi"]'
2+
init-hook='import sys; sys.path += ["scripts/lib/kdoc", "scripts/lib/abi", "tools/docs/lib"]'

CREDITS

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1890,6 +1890,11 @@ S: Reading
18901890
S: RG6 2NU
18911891
S: United Kingdom
18921892

1893+
N: Michael Jamet
1894+
E: michael.jamet@intel.com
1895+
D: Thunderbolt/USB4 driver maintainer
1896+
D: Thunderbolt/USB4 networking driver maintainer
1897+
18931898
N: Dave Jeffery
18941899
E: dhjeffery@gmail.com
18951900
D: SCSI hacks and IBM ServeRAID RAID driver maintenance
@@ -3222,6 +3227,10 @@ D: AIC5800 IEEE 1394, RAW I/O on 1394
32223227
D: Starter of Linux1394 effort
32233228
S: ask per mail for current address
32243229

3230+
N: Boris Pismenny
3231+
E: borisp@mellanox.com
3232+
D: Kernel TLS implementation and offload support.
3233+
32253234
N: Nicolas Pitre
32263235
E: nico@fluxnic.net
32273236
D: StrongARM SA1100 support integrator & hacker
@@ -3908,6 +3917,12 @@ S: C/ Federico Garcia Lorca 1 10-A
39083917
S: Sevilla 41005
39093918
S: Spain
39103919

3920+
N: Björn Töpel
3921+
E: bjorn@kernel.org
3922+
D: AF_XDP
3923+
S: Gothenburg
3924+
S: Sweden
3925+
39113926
N: Linus Torvalds
39123927
E: torvalds@linux-foundation.org
39133928
D: Original kernel hacker
@@ -4168,6 +4183,9 @@ S: 1513 Brewster Dr.
41684183
S: Carrollton, TX 75010
41694184
S: USA
41704185

4186+
N: Dave Watson
4187+
D: Kernel TLS implementation.
4188+
41714189
N: Tim Waugh
41724190
E: tim@cyberelk.net
41734191
D: Co-architect of the parallel-port sharing system

0 commit comments

Comments
 (0)