Skip to content

Commit f39b6c4

Browse files
committed
Merge tag 'v6.18-rc6' into for-linus
Sync up with the mainline to bring in definition of INPUT_PROP_HAPTIC_TOUCHPAD.
2 parents e08969c + 6a23ae0 commit f39b6c4

File tree

13,508 files changed

+598649
-346113
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,508 files changed

+598649
-346113
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: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Alan Cox <alan@lxorguk.ukuu.org.uk>
2727
Alan Cox <root@hraefn.swansea.linux.org.uk>
2828
Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
2929
Aleksey Gorelov <aleksey_gorelov@phoenix.com>
30+
Alex Williamson <alex@shazbot.org> <alex.williamson@redhat.com>
3031
Alexander Lobakin <alobakin@pm.me> <alobakin@dlink.ru>
3132
Alexander Lobakin <alobakin@pm.me> <alobakin@marvell.com>
3233
Alexander Lobakin <alobakin@pm.me> <bloodyreaper@yandex.ru>
@@ -134,6 +135,7 @@ Ben M Cahill <ben.m.cahill@intel.com>
134135
Ben Widawsky <bwidawsk@kernel.org> <ben@bwidawsk.net>
135136
Ben Widawsky <bwidawsk@kernel.org> <ben.widawsky@intel.com>
136137
Ben Widawsky <bwidawsk@kernel.org> <benjamin.widawsky@intel.com>
138+
Bence Csókás <bence98@sch.bme.hu> <csokas.bence@prolan.hu>
137139
Benjamin Poirier <benjamin.poirier@gmail.com> <bpoirier@suse.de>
138140
Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@gmail.com>
139141
Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@redhat.com>
@@ -164,6 +166,8 @@ Casey Connolly <casey.connolly@linaro.org> <caleb@connolly.tech>
164166
Casey Connolly <casey.connolly@linaro.org> <caleb@postmarketos.org>
165167
Can Guo <quic_cang@quicinc.com> <cang@codeaurora.org>
166168
Carl Huang <quic_cjhuang@quicinc.com> <cjhuang@codeaurora.org>
169+
Carl Vanderlip <carl.vanderlip@oss.qualcomm.com> <carlv@codeaurora.org>
170+
Carl Vanderlip <carl.vanderlip@oss.qualcomm.com> <quic_carlv@quicinc.com>
167171
Carlos Bilbao <carlos.bilbao@kernel.org> <carlos.bilbao@amd.com>
168172
Carlos Bilbao <carlos.bilbao@kernel.org> <carlos.bilbao.osdev@gmail.com>
169173
Carlos Bilbao <carlos.bilbao@kernel.org> <bilbao@vt.edu>
@@ -202,6 +206,7 @@ Danilo Krummrich <dakr@kernel.org> <dakr@redhat.com>
202206
David Brownell <david-b@pacbell.net>
203207
David Collins <quic_collinsd@quicinc.com> <collinsd@codeaurora.org>
204208
David Heidelberg <david@ixit.cz> <d.okias@gmail.com>
209+
David Hildenbrand <david@kernel.org> <david@redhat.com>
205210
David Rheinsberg <david@readahead.eu> <dh.herrmann@gmail.com>
206211
David Rheinsberg <david@readahead.eu> <dh.herrmann@googlemail.com>
207212
David Rheinsberg <david@readahead.eu> <david.rheinsberg@gmail.com>
@@ -213,7 +218,8 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>
213218
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>
214219
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>
215220
<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>
216-
Dikshita Agarwal <quic_dikshita@quicinc.com> <dikshita@codeaurora.org>
221+
Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com> <dikshita@codeaurora.org>
222+
Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com> <quic_dikshita@quicinc.com>
217223
Dmitry Baryshkov <lumag@kernel.org> <dbaryshkov@gmail.com>
218224
Dmitry Baryshkov <lumag@kernel.org> <[dbaryshkov@gmail.com]>
219225
Dmitry Baryshkov <lumag@kernel.org> <dmitry_baryshkov@mentor.com>
@@ -223,9 +229,12 @@ Dmitry Safonov <0x7f454c46@gmail.com> <dima@arista.com>
223229
Dmitry Safonov <0x7f454c46@gmail.com> <d.safonov@partner.samsung.com>
224230
Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>
225231
Domen Puncer <domen@coderock.org>
232+
Dong Aisheng <aisheng.dong@nxp.com> <b29396@freescale.com>
226233
Douglas Gilbert <dougg@torque.net>
227234
Drew Fustini <fustini@kernel.org> <drew@pdp7.com>
228235
<duje@dujemihanovic.xyz> <duje.mihanovic@skole.hr>
236+
Easwar Hariharan <easwar.hariharan@linux.microsoft.com> <easwar.hariharan@intel.com>
237+
Easwar Hariharan <easwar.hariharan@linux.microsoft.com> <eahariha@linux.microsoft.com>
229238
Ed L. Cashin <ecashin@coraid.com>
230239
Elliot Berman <quic_eberman@quicinc.com> <eberman@codeaurora.org>
231240
Enric Balletbo i Serra <eballetbo@kernel.org> <enric.balletbo@collabora.com>
@@ -418,7 +427,7 @@ Kenneth W Chen <kenneth.w.chen@intel.com>
418427
Kenneth Westfield <quic_kwestfie@quicinc.com> <kwestfie@codeaurora.org>
419428
Kiran Gunda <quic_kgunda@quicinc.com> <kgunda@codeaurora.org>
420429
Kirill Tkhai <tkhai@ya.ru> <ktkhai@virtuozzo.com>
421-
Kirill A. Shutemov <kas@kernel.org> <kirill.shutemov@linux.intel.com>
430+
Kiryl Shutsemau <kas@kernel.org> <kirill.shutemov@linux.intel.com>
422431
Kishon Vijay Abraham I <kishon@kernel.org> <kishon@ti.com>
423432
Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@linaro.org>
424433
Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@somainline.org>
@@ -587,6 +596,7 @@ Nikolay Aleksandrov <razor@blackwall.org> <nikolay@redhat.com>
587596
Nikolay Aleksandrov <razor@blackwall.org> <nikolay@cumulusnetworks.com>
588597
Nikolay Aleksandrov <razor@blackwall.org> <nikolay@nvidia.com>
589598
Nikolay Aleksandrov <razor@blackwall.org> <nikolay@isovalent.com>
599+
Nobuhiro Iwamatsu <nobuhiro.iwamatsu.x90@mail.toshiba> <nobuhiro1.iwamatsu@toshiba.co.jp>
590600
Odelu Kukatla <quic_okukatla@quicinc.com> <okukatla@codeaurora.org>
591601
Oleksandr Natalenko <oleksandr@natalenko.name> <oleksandr@redhat.com>
592602
Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>
@@ -596,7 +606,8 @@ Oleksij Rempel <o.rempel@pengutronix.de>
596606
Oleksij Rempel <o.rempel@pengutronix.de> <ore@pengutronix.de>
597607
Oliver Hartkopp <socketcan@hartkopp.net> <oliver.hartkopp@volkswagen.de>
598608
Oliver Hartkopp <socketcan@hartkopp.net> <oliver@hartkopp.net>
599-
Oliver Upton <oliver.upton@linux.dev> <oupton@google.com>
609+
Oliver Upton <oupton@kernel.org> <oupton@google.com>
610+
Oliver Upton <oupton@kernel.org> <oliver.upton@linux.dev>
600611
Ondřej Jirman <megi@xff.cz> <megous@megous.com>
601612
Oza Pawandeep <quic_poza@quicinc.com> <poza@codeaurora.org>
602613
Pali Rohár <pali@kernel.org> <pali.rohar@gmail.com>
@@ -620,6 +631,7 @@ Paulo Alcantara <pc@manguebit.org> <palcantara@suse.com>
620631
Paulo Alcantara <pc@manguebit.org> <pc@manguebit.com>
621632
Pavankumar Kondeti <quic_pkondeti@quicinc.com> <pkondeti@codeaurora.org>
622633
Peter A Jonsson <pj@ludd.ltu.se>
634+
Peter Hilber <peter.hilber@oss.qualcomm.com> <quic_philber@quicinc.com>
623635
Peter Oruba <peter.oruba@amd.com>
624636
Peter Oruba <peter@oruba.de>
625637
Pierre-Louis Bossart <pierre-louis.bossart@linux.dev> <pierre-louis.bossart@linux.intel.com>
@@ -634,6 +646,7 @@ Qais Yousef <qyousef@layalina.io> <qais.yousef@arm.com>
634646
Quentin Monnet <qmo@kernel.org> <quentin.monnet@netronome.com>
635647
Quentin Monnet <qmo@kernel.org> <quentin@isovalent.com>
636648
Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>
649+
Rae Moar <raemoar63@gmail.com> <rmoar@google.com>
637650
Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>
638651
Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>
639652
Rajendra Nayak <quic_rjendra@quicinc.com> <rnayak@codeaurora.org>
@@ -703,6 +716,7 @@ Sergey Senozhatsky <senozhatsky@chromium.org> <sergey.senozhatsky@mail.by>
703716
Sergey Senozhatsky <senozhatsky@chromium.org> <senozhatsky@google.com>
704717
Seth Forshee <sforshee@kernel.org> <seth.forshee@canonical.com>
705718
Shakeel Butt <shakeel.butt@linux.dev> <shakeelb@google.com>
719+
Shameer Kolothum <skolothumtho@nvidia.com> <shameerali.kolothum.thodi@huawei.com>
706720
Shannon Nelson <sln@onemain.com> <shannon.nelson@amd.com>
707721
Shannon Nelson <sln@onemain.com> <snelson@pensando.io>
708722
Shannon Nelson <sln@onemain.com> <shannon.nelson@intel.com>
@@ -713,7 +727,8 @@ Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
713727
Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>
714728
Shuah Khan <shuah@kernel.org> <shuahkh@osg.samsung.com>
715729
Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>
716-
Sibi Sankar <quic_sibis@quicinc.com> <sibis@codeaurora.org>
730+
Sibi Sankar <sibi.sankar@oss.qualcomm.com> <sibis@codeaurora.org>
731+
Sibi Sankar <sibi.sankar@oss.qualcomm.com> <quic_sibis@quicinc.com>
717732
Sid Manning <quic_sidneym@quicinc.com> <sidneym@codeaurora.org>
718733
Simon Arlott <simon@octiron.net> <simon@fire.lp0.eu>
719734
Simona Vetter <simona.vetter@ffwll.ch> <daniel.vetter@ffwll.ch>
@@ -737,6 +752,8 @@ Sriram Yagnaraman <sriram.yagnaraman@ericsson.com> <sriram.yagnaraman@est.tech>
737752
Stanislav Fomichev <sdf@fomichev.me> <sdf@google.com>
738753
Stanislav Fomichev <sdf@fomichev.me> <stfomichev@gmail.com>
739754
Stefan Wahren <wahrenst@gmx.net> <stefan.wahren@i2se.com>
755+
Stéphane Grosjean <stephane.grosjean@hms-networks.com> <s.grosjean@peak-system.com>
756+
Stéphane Grosjean <stephane.grosjean@hms-networks.com> <stephane.grosjean@free.fr>
740757
Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
741758
Stephen Hemminger <stephen@networkplumber.org> <shemminger@linux-foundation.org>
742759
Stephen Hemminger <stephen@networkplumber.org> <shemminger@osdl.org>
@@ -791,6 +808,7 @@ Tvrtko Ursulin <tursulin@ursulin.net> <tvrtko.ursulin@onelan.co.uk>
791808
Tvrtko Ursulin <tursulin@ursulin.net> <tvrtko@ursulin.net>
792809
Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>
793810
Tzung-Bi Shih <tzungbi@kernel.org> <tzungbi@google.com>
811+
Umang Jain <uajain@igalia.com> <umang.jain@ideasonboard.com>
794812
Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
795813
Uwe Kleine-König <u.kleine-koenig@baylibre.com> <ukleinek@baylibre.com>
796814
Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
@@ -812,7 +830,9 @@ Valentin Schneider <vschneid@redhat.com> <valentin.schneider@arm.com>
812830
Veera Sundaram Sankaran <quic_veeras@quicinc.com> <veeras@codeaurora.org>
813831
Veerabhadrarao Badiganti <quic_vbadigan@quicinc.com> <vbadigan@codeaurora.org>
814832
Venkateswara Naralasetty <quic_vnaralas@quicinc.com> <vnaralas@codeaurora.org>
815-
Vikash Garodia <quic_vgarodia@quicinc.com> <vgarodia@codeaurora.org>
833+
Vikash Garodia <vikash.garodia@oss.qualcomm.com> <vgarodia@codeaurora.org>
834+
Vikash Garodia <vikash.garodia@oss.qualcomm.com> <quic_vgarodia@quicinc.com>
835+
Vincent Mailhol <mailhol@kernel.org> <mailhol.vincent@wanadoo.fr>
816836
Vinod Koul <vkoul@kernel.org> <vinod.koul@intel.com>
817837
Vinod Koul <vkoul@kernel.org> <vinod.koul@linux.intel.com>
818838
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: 22 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
@@ -2031,6 +2036,10 @@ S: Botanicka' 68a
20312036
S: 602 00 Brno
20322037
S: Czech Republic
20332038

2039+
N: Karsten Keil
2040+
E: isdn@linux-pingi.de
2041+
D: ISDN subsystem maintainer
2042+
20342043
N: Jakob Kemi
20352044
E: jakob.kemi@telia.com
20362045
D: V4L W9966 Webcam driver
@@ -3222,6 +3231,10 @@ D: AIC5800 IEEE 1394, RAW I/O on 1394
32223231
D: Starter of Linux1394 effort
32233232
S: ask per mail for current address
32243233

3234+
N: Boris Pismenny
3235+
E: borisp@mellanox.com
3236+
D: Kernel TLS implementation and offload support.
3237+
32253238
N: Nicolas Pitre
32263239
E: nico@fluxnic.net
32273240
D: StrongARM SA1100 support integrator & hacker
@@ -3908,6 +3921,12 @@ S: C/ Federico Garcia Lorca 1 10-A
39083921
S: Sevilla 41005
39093922
S: Spain
39103923

3924+
N: Björn Töpel
3925+
E: bjorn@kernel.org
3926+
D: AF_XDP
3927+
S: Gothenburg
3928+
S: Sweden
3929+
39113930
N: Linus Torvalds
39123931
E: torvalds@linux-foundation.org
39133932
D: Original kernel hacker
@@ -4168,6 +4187,9 @@ S: 1513 Brewster Dr.
41684187
S: Carrollton, TX 75010
41694188
S: USA
41704189

4190+
N: Dave Watson
4191+
D: Kernel TLS implementation.
4192+
41714193
N: Tim Waugh
41724194
E: tim@cyberelk.net
41734195
D: Co-architect of the parallel-port sharing system

0 commit comments

Comments
 (0)