Skip to content

Commit 92cf001

Browse files
committed
Merge tag 'v6.18-rc2' into u/nathanl/sdxi-dev
Linux 6.18-rc2
2 parents 289859e + 211ddde commit 92cf001

File tree

12,503 files changed

+575615
-336482
lines changed

Some content is hidden

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

12,503 files changed

+575615
-336482
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'

.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: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,8 @@ Casey Connolly <casey.connolly@linaro.org> <caleb@connolly.tech>
165165
Casey Connolly <casey.connolly@linaro.org> <caleb@postmarketos.org>
166166
Can Guo <quic_cang@quicinc.com> <cang@codeaurora.org>
167167
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>
168170
Carlos Bilbao <carlos.bilbao@kernel.org> <carlos.bilbao@amd.com>
169171
Carlos Bilbao <carlos.bilbao@kernel.org> <carlos.bilbao.osdev@gmail.com>
170172
Carlos Bilbao <carlos.bilbao@kernel.org> <bilbao@vt.edu>
@@ -214,7 +216,8 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>
214216
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>
215217
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>
216218
<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>
217-
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>
218221
Dmitry Baryshkov <lumag@kernel.org> <dbaryshkov@gmail.com>
219222
Dmitry Baryshkov <lumag@kernel.org> <[dbaryshkov@gmail.com]>
220223
Dmitry Baryshkov <lumag@kernel.org> <dmitry_baryshkov@mentor.com>
@@ -224,6 +227,7 @@ Dmitry Safonov <0x7f454c46@gmail.com> <dima@arista.com>
224227
Dmitry Safonov <0x7f454c46@gmail.com> <d.safonov@partner.samsung.com>
225228
Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>
226229
Domen Puncer <domen@coderock.org>
230+
Dong Aisheng <aisheng.dong@nxp.com> <b29396@freescale.com>
227231
Douglas Gilbert <dougg@torque.net>
228232
Drew Fustini <fustini@kernel.org> <drew@pdp7.com>
229233
<duje@dujemihanovic.xyz> <duje.mihanovic@skole.hr>
@@ -708,6 +712,7 @@ Sergey Senozhatsky <senozhatsky@chromium.org> <sergey.senozhatsky@mail.by>
708712
Sergey Senozhatsky <senozhatsky@chromium.org> <senozhatsky@google.com>
709713
Seth Forshee <sforshee@kernel.org> <seth.forshee@canonical.com>
710714
Shakeel Butt <shakeel.butt@linux.dev> <shakeelb@google.com>
715+
Shameer Kolothum <skolothumtho@nvidia.com> <shameerali.kolothum.thodi@huawei.com>
711716
Shannon Nelson <sln@onemain.com> <shannon.nelson@amd.com>
712717
Shannon Nelson <sln@onemain.com> <snelson@pensando.io>
713718
Shannon Nelson <sln@onemain.com> <shannon.nelson@intel.com>
@@ -718,7 +723,8 @@ Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
718723
Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>
719724
Shuah Khan <shuah@kernel.org> <shuahkh@osg.samsung.com>
720725
Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>
721-
Sibi Sankar <quic_sibis@quicinc.com> <sibis@codeaurora.org>
726+
Sibi Sankar <sibi.sankar@oss.qualcomm.com> <sibis@codeaurora.org>
727+
Sibi Sankar <sibi.sankar@oss.qualcomm.com> <quic_sibis@quicinc.com>
722728
Sid Manning <quic_sidneym@quicinc.com> <sidneym@codeaurora.org>
723729
Simon Arlott <simon@octiron.net> <simon@fire.lp0.eu>
724730
Simona Vetter <simona.vetter@ffwll.ch> <daniel.vetter@ffwll.ch>
@@ -742,6 +748,8 @@ Sriram Yagnaraman <sriram.yagnaraman@ericsson.com> <sriram.yagnaraman@est.tech>
742748
Stanislav Fomichev <sdf@fomichev.me> <sdf@google.com>
743749
Stanislav Fomichev <sdf@fomichev.me> <stfomichev@gmail.com>
744750
Stefan Wahren <wahrenst@gmx.net> <stefan.wahren@i2se.com>
751+
Stéphane Grosjean <stephane.grosjean@hms-networks.com> <s.grosjean@peak-system.com>
752+
Stéphane Grosjean <stephane.grosjean@hms-networks.com> <stephane.grosjean@free.fr>
745753
Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
746754
Stephen Hemminger <stephen@networkplumber.org> <shemminger@linux-foundation.org>
747755
Stephen Hemminger <stephen@networkplumber.org> <shemminger@osdl.org>
@@ -796,6 +804,7 @@ Tvrtko Ursulin <tursulin@ursulin.net> <tvrtko.ursulin@onelan.co.uk>
796804
Tvrtko Ursulin <tursulin@ursulin.net> <tvrtko@ursulin.net>
797805
Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>
798806
Tzung-Bi Shih <tzungbi@kernel.org> <tzungbi@google.com>
807+
Umang Jain <uajain@igalia.com> <umang.jain@ideasonboard.com>
799808
Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
800809
Uwe Kleine-König <u.kleine-koenig@baylibre.com> <ukleinek@baylibre.com>
801810
Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
@@ -817,7 +826,9 @@ Valentin Schneider <vschneid@redhat.com> <valentin.schneider@arm.com>
817826
Veera Sundaram Sankaran <quic_veeras@quicinc.com> <veeras@codeaurora.org>
818827
Veerabhadrarao Badiganti <quic_vbadigan@quicinc.com> <vbadigan@codeaurora.org>
819828
Venkateswara Naralasetty <quic_vnaralas@quicinc.com> <vnaralas@codeaurora.org>
820-
Vikash Garodia <quic_vgarodia@quicinc.com> <vgarodia@codeaurora.org>
829+
Vikash Garodia <vikash.garodia@oss.qualcomm.com> <vgarodia@codeaurora.org>
830+
Vikash Garodia <vikash.garodia@oss.qualcomm.com> <quic_vgarodia@quicinc.com>
831+
Vincent Mailhol <mailhol@kernel.org> <mailhol.vincent@wanadoo.fr>
821832
Vinod Koul <vkoul@kernel.org> <vinod.koul@intel.com>
822833
Vinod Koul <vkoul@kernel.org> <vinod.koul@linux.intel.com>
823834
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: 11 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
@@ -3912,6 +3917,12 @@ S: C/ Federico Garcia Lorca 1 10-A
39123917
S: Sevilla 41005
39133918
S: Spain
39143919

3920+
N: Björn Töpel
3921+
E: bjorn@kernel.org
3922+
D: AF_XDP
3923+
S: Gothenburg
3924+
S: Sweden
3925+
39153926
N: Linus Torvalds
39163927
E: torvalds@linux-foundation.org
39173928
D: Original kernel hacker

0 commit comments

Comments
 (0)