Skip to content

Commit aa829c3

Browse files
author
bpf-ci[bot]
committed
Merge remote-tracking branch 'refs/remotes/linux-next-upstream/master' into linux-next
2 parents ee9631b + 4cd074a commit aa829c3

5,854 files changed

Lines changed: 258184 additions & 225244 deletions

File tree

Some content is hidden

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

.clang-format

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,7 @@ ForEachMacros:
481481
- 'genradix_for_each'
482482
- 'genradix_for_each_from'
483483
- 'genradix_for_each_reverse'
484+
- 'guard'
484485
- 'hash_for_each'
485486
- 'hash_for_each_possible'
486487
- 'hash_for_each_possible_rcu'
@@ -674,6 +675,7 @@ ForEachMacros:
674675
- 'rq_list_for_each'
675676
- 'rq_list_for_each_safe'
676677
- 'sample_read_group__for_each'
678+
- 'scoped_guard'
677679
- 'scsi_for_each_prot_sg'
678680
- 'scsi_for_each_sg'
679681
- 'sctp_for_each_hentry'

.mailmap

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Abhinav Kumar <quic_abhinavk@quicinc.com> <abhinavk@codeaurora.org>
1919
Ahmad Masri <quic_amasri@quicinc.com> <amasri@codeaurora.org>
2020
Adam Oldham <oldhamca@gmail.com>
2121
Adam Radford <aradford@gmail.com>
22+
Aditya Garg <gargaditya08@proton.me> <gargaditya08@live.com>
2223
Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>
2324
Adrian Bunk <bunk@stusta.de>
2425
Ajay Kaher <ajay.kaher@broadcom.com> <akaher@vmware.com>
@@ -207,6 +208,7 @@ Claudiu Beznea <claudiu.beznea@tuxon.dev> <claudiu.beznea@microchip.com>
207208
Colin Ian King <colin.i.king@gmail.com> <colin.king@canonical.com>
208209
Corey Minyard <minyard@acm.org>
209210
Damian Hobson-Garcia <dhobsong@igel.co.jp>
211+
Dan Carpenter <error27@gmail.com> <dan.carpenter@linaro.org>
210212
Dan Carpenter <error27@gmail.com> <dan.carpenter@oracle.com>
211213
Dan Williams <djbw@kernel.org> <dan.j.williams@intel.com>
212214
Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>
@@ -338,6 +340,7 @@ Herbert Xu <herbert@gondor.apana.org.au>
338340
Huacai Chen <chenhuacai@kernel.org> <chenhc@lemote.com>
339341
Huacai Chen <chenhuacai@kernel.org> <chenhuacai@loongson.cn>
340342
Ignat Korchagin <ignat@linux.win> <ignat@cloudflare.com>
343+
Igor Korotin <igor.korotin@linux.dev> <igor.korotin.linux@gmail.com>
341344
Ike Panhc <ikepanhc@gmail.com> <ike.pan@canonical.com>
342345
J. Bruce Fields <bfields@fieldses.org> <bfields@redhat.com>
343346
J. Bruce Fields <bfields@fieldses.org> <bfields@citi.umich.edu>
@@ -494,6 +497,7 @@ Leon Romanovsky <leon@kernel.org> <leon@leon.nu>
494497
Leon Romanovsky <leon@kernel.org> <leonro@mellanox.com>
495498
Leon Romanovsky <leon@kernel.org> <leonro@nvidia.com>
496499
Leo Yan <leo.yan@linux.dev> <leo.yan@linaro.org>
500+
Liam R. Howlett <liam@infradead.org> <Liam.Howlett@oracle.com>
497501
Liam Mark <quic_lmark@quicinc.com> <lmark@codeaurora.org>
498502
Linas Vepstas <linas@austin.ibm.com>
499503
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
@@ -504,6 +508,8 @@ Linus Walleij <linusw@kernel.org> <linus.walleij@stericsson.com>
504508
Linus Walleij <linusw@kernel.org> <linus.walleij@linaro.org>
505509
Linus Walleij <linusw@kernel.org> <triad@df.lth.se>
506510
<linux-hardening@vger.kernel.org> <kernel-hardening@lists.openwall.com>
511+
Li Wang <li.wang@linux.dev> <liwang@redhat.com>
512+
Li Wang <li.wang@linux.dev> <wangli.ahau@gmail.com>
507513
Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>
508514
Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
509515
Lior David <quic_liord@quicinc.com> <liord@codeaurora.org>
@@ -586,6 +592,7 @@ Michel Lespinasse <michel@lespinasse.org> <walken@google.com>
586592
Michel Lespinasse <michel@lespinasse.org> <walken@zoy.org>
587593
Mickaël Salaün <mic@digikod.net> <mic@linux.microsoft.com>
588594
Miguel Ojeda <ojeda@kernel.org> <miguel.ojeda.sandonis@gmail.com>
595+
Mike Leach <mike.leach@arm.com> <mike.leach@linaro.org>
589596
Mike Rapoport <rppt@kernel.org> <mike@compulab.co.il>
590597
Mike Rapoport <rppt@kernel.org> <mike.rapoport@gmail.com>
591598
Mike Rapoport <rppt@kernel.org> <rppt@linux.ibm.com>
@@ -675,6 +682,7 @@ Peter A Jonsson <pj@ludd.ltu.se>
675682
Peter Hilber <peter.hilber@oss.qualcomm.com> <quic_philber@quicinc.com>
676683
Peter Oruba <peter.oruba@amd.com>
677684
Peter Oruba <peter@oruba.de>
685+
Peter Rosin <peda@lysator.liu.se> <peda@axentia.se>
678686
Pierre-Louis Bossart <pierre-louis.bossart@linux.dev> <pierre-louis.bossart@linux.intel.com>
679687
Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>
680688
Pratyush Yadav <pratyush@kernel.org> <ptyadav@amazon.de>
@@ -685,6 +693,7 @@ Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>
685693
Puranjay Mohan <puranjay@kernel.org> <puranjay12@gmail.com>
686694
Qais Yousef <qyousef@layalina.io> <qais.yousef@imgtec.com>
687695
Qais Yousef <qyousef@layalina.io> <qais.yousef@arm.com>
696+
Qi Zheng <qi.zheng@linux.dev> <zhengqi.arch@bytedance.com>
688697
Quentin Monnet <qmo@kernel.org> <quentin.monnet@netronome.com>
689698
Quentin Monnet <qmo@kernel.org> <quentin@isovalent.com>
690699
Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>
@@ -743,6 +752,7 @@ Sarangdhar Joshi <spjoshi@codeaurora.org>
743752
Saravana Kannan <saravanak@kernel.org> <skannan@codeaurora.org>
744753
Saravana Kannan <saravanak@kernel.org> <saravanak@google.com>
745754
Sascha Hauer <s.hauer@pengutronix.de>
755+
Sasha Finkelstein <k@chaosmail.tech> <fnkl.kernel@gmail.com>
746756
Sahitya Tummala <quic_stummala@quicinc.com> <stummala@codeaurora.org>
747757
Sathishkumar Muruganandam <quic_murugana@quicinc.com> <murugana@codeaurora.org>
748758
Satya Priya <quic_skakitap@quicinc.com> <quic_c_skakit@quicinc.com> <skakit@codeaurora.org>

CREDITS

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1451,6 +1451,14 @@ N: Andy Gospodarek
14511451
E: andy@greyhouse.net
14521452
D: Maintenance and contributions to the network interface bonding driver.
14531453

1454+
N: Vivek Goyal
1455+
E: vgoyal@redhat.com
1456+
D: KDUMP, KEXEC, and VIRTIO FILE SYSTEM
1457+
1458+
N: Alexander Graf
1459+
E: graf@amazon.com
1460+
D: Kexec Handover (KHO)
1461+
14541462
N: Wolfgang Grandegger
14551463
E: wg@grandegger.com
14561464
D: Controller Area Network (device drivers)
@@ -3644,6 +3652,11 @@ S: Dag Hammerskjolds v. 3E
36443652
S: S-226 64 LUND
36453653
S: Sweden
36463654

3655+
N: Tilman Schmidt
3656+
E: tilman@imap.cc
3657+
D: Siemens Gigaset ISDN driver author and maintainer
3658+
D: ISDN CAPI subsystem contributions
3659+
36473660
N: Henning P. Schmiedehausen
36483661
E: hps@tanstaafl.de
36493662
D: added PCI support to the serial driver

Documentation/.renames.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -783,11 +783,9 @@ namespaces/compatibility-list admin-guide/namespaces/compatibility-list
783783
namespaces/index admin-guide/namespaces/index
784784
namespaces/resource-control admin-guide/namespaces/resource-control
785785
networking/altera_tse networking/device_drivers/ethernet/altera/altera_tse
786-
networking/baycom networking/device_drivers/hamradio/baycom
787786
networking/bpf_flow_dissector bpf/prog_flow_dissector
788787
networking/cxacru networking/device_drivers/atm/cxacru
789788
networking/defza networking/device_drivers/fddi/defza
790-
networking/device_drivers/3com/3c509 networking/device_drivers/ethernet/3com/3c509
791789
networking/device_drivers/3com/vortex networking/device_drivers/ethernet/3com/vortex
792790
networking/device_drivers/amazon/ena networking/device_drivers/ethernet/amazon/ena
793791
networking/device_drivers/aquantia/atlantic networking/device_drivers/ethernet/aquantia/atlantic
@@ -822,7 +820,6 @@ networking/device_drivers/microsoft/netvsc networking/device_drivers/ethernet/mi
822820
networking/device_drivers/netronome/nfp networking/device_drivers/ethernet/netronome/nfp
823821
networking/device_drivers/pensando/ionic networking/device_drivers/ethernet/pensando/ionic
824822
networking/device_drivers/qualcomm/rmnet networking/device_drivers/cellular/qualcomm/rmnet
825-
networking/device_drivers/smsc/smc9 networking/device_drivers/ethernet/smsc/smc9
826823
networking/device_drivers/stmicro/stmmac networking/device_drivers/ethernet/stmicro/stmmac
827824
networking/device_drivers/ti/cpsw networking/device_drivers/ethernet/ti/cpsw
828825
networking/device_drivers/ti/cpsw_switchdev networking/device_drivers/ethernet/ti/cpsw_switchdev
@@ -836,19 +833,16 @@ networking/e100 networking/device_drivers/ethernet/intel/e100
836833
networking/e1000 networking/device_drivers/ethernet/intel/e1000
837834
networking/e1000e networking/device_drivers/ethernet/intel/e1000e
838835
networking/fm10k networking/device_drivers/ethernet/intel/fm10k
839-
networking/fore200e networking/device_drivers/atm/fore200e
840836
networking/hinic networking/device_drivers/ethernet/huawei/hinic
841837
networking/i40e networking/device_drivers/ethernet/intel/i40e
842838
networking/iavf networking/device_drivers/ethernet/intel/iavf
843839
networking/ice networking/device_drivers/ethernet/intel/ice
844840
networking/igb networking/device_drivers/ethernet/intel/igb
845841
networking/igbvf networking/device_drivers/ethernet/intel/igbvf
846-
networking/iphase networking/device_drivers/atm/iphase
847842
networking/ixgbe networking/device_drivers/ethernet/intel/ixgbe
848843
networking/ixgbevf networking/device_drivers/ethernet/intel/ixgbevf
849844
networking/netdev-FAQ process/maintainer-netdev
850845
networking/skfp networking/device_drivers/fddi/skfp
851-
networking/z8530drv networking/device_drivers/hamradio/z8530drv
852846
nfc/index driver-api/nfc/index
853847
nfc/nfc-hci driver-api/nfc/nfc-hci
854848
nfc/nfc-pn544 driver-api/nfc/nfc-pn544
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
What: /sys/bus/pci/drivers/intel_vpu/.../sched_mode
2+
Date: October 2024
3+
KernelVersion: 6.12
4+
Contact: dri-devel@lists.freedesktop.org
5+
Description: Current NPU scheduling mode. Returns one of the following strings:
6+
- "HW" - Hardware Scheduler mode
7+
- "OS" - Operating System Scheduler mode
8+
Read-only.
9+
Deprecated since the "OS" scheduling mode is not usable
10+
and will be removed from future versions of the driver.
11+
Will be removed in 2027
12+
13+
What: /sys/bus/pci/drivers/intel_vpu/.../npu_max_frequency_mhz
14+
Date: April 2025
15+
KernelVersion: 6.15
16+
Contact: dri-devel@lists.freedesktop.org
17+
Description: Legacy alias for /sys/bus/pci/drivers/intel_vpu/.../freq/hw_max_freq.
18+
Shows maximum frequency in MHz of the NPU's data processing unit.
19+
Read-only.
20+
Will be removed in 2027
21+
22+
What: /sys/bus/pci/drivers/intel_vpu/.../npu_current_frequency_mhz
23+
Date: April 2025
24+
KernelVersion: 6.15
25+
Contact: dri-devel@lists.freedesktop.org
26+
Description: Legacy alias for /sys/bus/pci/drivers/intel_vpu/.../freq/current_freq.
27+
Shows current frequency in MHz of the NPU's data processing unit.
28+
The value is read only when the device is active; otherwise it returns 0.
29+
Read-only.
30+
Will be removed in 2027

Documentation/ABI/stable/sysfs-driver-speakup

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ What: /sys/accessibility/speakup/bleeps
1616
KernelVersion: 2.6
1717
Contact: speakup@linux-speakup.org
1818
Description: This controls whether one hears beeps through the PC speaker
19-
when using speakup's review commands.
20-
TODO: what values does it accept?
19+
when using speakup's review commands. Range: 0-3. 0 = off, 1 = beeps
20+
only, 2 = announcements only, 3 = beeps and announcements (default).
2121

2222
What: /sys/accessibility/speakup/bleep_time
2323
KernelVersion: 2.6

Documentation/ABI/testing/sysfs-bus-coresight-devices-tpdm

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,3 +278,13 @@ Date: Aug 2025
278278
KernelVersion 6.18
279279
Contact: Mao Jinlong <quic_jinlmao@quicinc.com>
280280
Description: (Read) Show hardware context information of device.
281+
282+
What: /sys/bus/coresight/devices/<tpdm-name>/traceid
283+
Date: March 2026
284+
KernelVersion: 7.1
285+
Contact: Jie Gan <jie.gan@oss.qualcomm.com>
286+
Description:
287+
(R) Show the trace ID that will appear in the trace stream
288+
coming from this TPDM. The trace ID is inherited from the
289+
connected TPDA device and is fixed for the lifetime of the
290+
device. Returns -EINVAL if the device has not been enabled yet.

Documentation/ABI/testing/sysfs-bus-i3c

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,3 +172,23 @@ Description:
172172
the automatic retries. Exist only when I3C constroller supports
173173
this retry on nack feature.
174174

175+
What: /sys/bus/i3c/devices/i3c-<bus-id>/do_daa
176+
KernelVersion: 7.0
177+
Contact: linux-i3c@vger.kernel.org
178+
Description:
179+
Write-only attribute that triggers a Dynamic Address Assignment
180+
(DAA) procedure which discovers new I3C devices on the bus.
181+
Writing a boolean true value (1, y, yes, true, on) to this
182+
attribute causes the master controller to perform DAA, which
183+
includes broadcasting an ENTDAA (Enter Dynamic Address Assignment)
184+
Common Command Code (CCC) on the bus. Writing a false value
185+
returns -EINVAL.
186+
187+
This is useful for discovering I3C devices that were not present
188+
during initial bus initialization and are unable to issue
189+
Hot-Join. Only devices without a currently assigned dynamic address
190+
will respond to the ENTDAA broadcast and be assigned addresses.
191+
192+
Note that this mechanism is distinct from Hot-Join, since this is
193+
controller-initiated discovery, while Hot-Join is device-initiated
194+
method to provoke controller discovery procedure.

Documentation/ABI/testing/sysfs-bus-iio

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1428,7 +1428,7 @@ KernelVersion: 2.6.35
14281428
Contact: linux-iio@vger.kernel.org
14291429
Description:
14301430
The name of the trigger source being used, as per string given
1431-
in /sys/class/iio/triggerY/name.
1431+
in /sys/bus/iio/devices/triggerY/name.
14321432

14331433
What: /sys/bus/iio/devices/iio:deviceX/bufferY/length
14341434
KernelVersion: 5.11

Documentation/ABI/testing/sysfs-class-power

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,8 @@ Description:
675675

676676
Valid values:
677677
"Unknown", "SDP", "DCP", "CDP", "ACA", "C", "PD",
678-
"PD_DRP", "PD_PPS", "BrickID"
678+
"PD_DRP", "PD_PPS", "BrickID", "PD_SPR_AVS",
679+
"PD_PPS_SPR_AVS"
679680

680681
**Device Specific Properties**
681682

0 commit comments

Comments
 (0)