Skip to content

Commit 594ce0b

Browse files
author
Russell King (Oracle)
committed
Merge topic branches 'clkdev' and 'fixes' into for-linus
2 parents 616501e + e3cf20e commit 594ce0b

19,511 files changed

Lines changed: 1172004 additions & 484191 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.

.get_maintainer.ignore

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

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
*.xz
5353
*.zst
5454
Module.symvers
55+
dtbs-list
5556
modules.order
5657

5758
#

.mailmap

Lines changed: 38 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Adam Oldham <oldhamca@gmail.com>
2020
Adam Radford <aradford@gmail.com>
2121
Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>
2222
Adrian Bunk <bunk@stusta.de>
23+
Ajay Kaher <ajay.kaher@broadcom.com> <akaher@vmware.com>
2324
Akhil P Oommen <quic_akhilpo@quicinc.com> <akhilpo@codeaurora.org>
2425
Alan Cox <alan@lxorguk.ukuu.org.uk>
2526
Alan Cox <root@hraefn.swansea.linux.org.uk>
@@ -36,6 +37,17 @@ Alexei Avshalom Lazar <quic_ailizaro@quicinc.com> <ailizaro@codeaurora.org>
3637
Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
3738
Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
3839
Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
40+
Alexey Makhalov <alexey.amakhalov@broadcom.com> <amakhalov@vmware.com>
41+
Alex Elder <elder@kernel.org>
42+
Alex Elder <elder@kernel.org> <aelder@sgi.com>
43+
Alex Elder <elder@kernel.org> <alex.elder@linaro.org>
44+
Alex Elder <elder@kernel.org> <alex.elder@linary.org>
45+
Alex Elder <elder@kernel.org> <elder@dreamhost.com>
46+
Alex Elder <elder@kernel.org> <elder@dreawmhost.com>
47+
Alex Elder <elder@kernel.org> <elder@ieee.org>
48+
Alex Elder <elder@kernel.org> <elder@inktank.com>
49+
Alex Elder <elder@kernel.org> <elder@linaro.org>
50+
Alex Elder <elder@kernel.org> <elder@newdream.net>
3951
Alex Hung <alexhung@gmail.com> <alex.hung@canonical.com>
4052
Alex Shi <alexs@kernel.org> <alex.shi@intel.com>
4153
Alex Shi <alexs@kernel.org> <alex.shi@linaro.org>
@@ -85,6 +97,11 @@ Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@linaro.org>
8597
Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@spreadtrum.com>
8698
Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@unisoc.com>
8799
Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang7@gmail.com>
100+
Barry Song <baohua@kernel.org> <21cnbao@gmail.com>
101+
Barry Song <baohua@kernel.org> <v-songbaohua@oppo.com>
102+
Barry Song <baohua@kernel.org> <song.bao.hua@hisilicon.com>
103+
Barry Song <baohua@kernel.org> <Baohua.Song@csr.com>
104+
Barry Song <baohua@kernel.org> <barry.song@analog.com>
88105
Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>
89106
Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>
90107
Bartosz Golaszewski <brgl@bgdev.pl> <bgolaszewski@baylibre.com>
@@ -96,6 +113,8 @@ Ben Widawsky <bwidawsk@kernel.org> <ben@bwidawsk.net>
96113
Ben Widawsky <bwidawsk@kernel.org> <ben.widawsky@intel.com>
97114
Ben Widawsky <bwidawsk@kernel.org> <benjamin.widawsky@intel.com>
98115
Benjamin Poirier <benjamin.poirier@gmail.com> <bpoirier@suse.de>
116+
Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@gmail.com>
117+
Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@redhat.com>
99118
Bjorn Andersson <andersson@kernel.org> <bjorn@kryo.se>
100119
Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@linaro.org>
101120
Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@sonymobile.com>
@@ -110,9 +129,11 @@ Brendan Higgins <brendan.higgins@linux.dev> <brendanhiggins@google.com>
110129
Brian Avery <b.avery@hp.com>
111130
Brian King <brking@us.ibm.com>
112131
Brian Silverman <bsilver16384@gmail.com> <brian.silverman@bluerivertech.com>
132+
Bryan Tan <bryan-bt.tan@broadcom.com> <bryantan@vmware.com>
113133
Cai Huoqing <cai.huoqing@linux.dev> <caihuoqing@baidu.com>
114134
Can Guo <quic_cang@quicinc.com> <cang@codeaurora.org>
115135
Carl Huang <quic_cjhuang@quicinc.com> <cjhuang@codeaurora.org>
136+
Carlos Bilbao <carlos.bilbao.osdev@gmail.com> <carlos.bilbao@amd.com>
116137
Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>
117138
Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>
118139
Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>
@@ -289,6 +310,7 @@ Johan Hovold <johan@kernel.org> <jhovold@gmail.com>
289310
Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>
290311
John Crispin <john@phrozen.org> <blogic@openwrt.org>
291312
John Fastabend <john.fastabend@gmail.com> <john.r.fastabend@intel.com>
313+
John Garry <john.g.garry@oracle.com> <john.garry@huawei.com>
292314
John Keeping <john@keeping.me.uk> <john@metanate.com>
293315
John Moon <john@jmoon.dev> <quic_johmoo@quicinc.com>
294316
John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
@@ -340,7 +362,8 @@ Lee Jones <lee@kernel.org> <joneslee@google.com>
340362
Lee Jones <lee@kernel.org> <lee.jones@canonical.com>
341363
Lee Jones <lee@kernel.org> <lee.jones@linaro.org>
342364
Lee Jones <lee@kernel.org> <lee@ubuntu.com>
343-
Leonard Crestez <leonard.crestez@nxp.com> Leonard Crestez <cdleonard@gmail.com>
365+
Leonard Crestez <cdleonard@gmail.com> <leonard.crestez@nxp.com>
366+
Leonard Crestez <cdleonard@gmail.com> <leonard.crestez@intel.com>
344367
Leonardo Bras <leobras.c@gmail.com> <leonardo@linux.ibm.com>
345368
Leonard Göhrs <l.goehrs@pengutronix.de>
346369
Leonid I Ananiev <leonid.i.ananiev@intel.com>
@@ -439,10 +462,14 @@ Mukesh Ojha <quic_mojha@quicinc.com> <mojha@codeaurora.org>
439462
Muna Sinada <quic_msinada@quicinc.com> <msinada@codeaurora.org>
440463
Murali Nalajala <quic_mnalajal@quicinc.com> <mnalajal@codeaurora.org>
441464
Mythri P K <mythripk@ti.com>
465+
Nadav Amit <nadav.amit@gmail.com> <namit@vmware.com>
466+
Nadav Amit <nadav.amit@gmail.com> <namit@cs.technion.ac.il>
442467
Nadia Yvette Chambers <nyc@holomorphy.com> William Lee Irwin III <wli@holomorphy.com>
443-
Naoya Horiguchi <naoya.horiguchi@nec.com> <n-horiguchi@ah.jp.nec.com>
468+
Naoya Horiguchi <nao.horiguchi@gmail.com> <n-horiguchi@ah.jp.nec.com>
469+
Naoya Horiguchi <nao.horiguchi@gmail.com> <naoya.horiguchi@nec.com>
444470
Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.com>
445-
Neeraj Upadhyay <quic_neeraju@quicinc.com> <neeraju@codeaurora.org>
471+
Neeraj Upadhyay <neeraj.upadhyay@kernel.org> <quic_neeraju@quicinc.com>
472+
Neeraj Upadhyay <neeraj.upadhyay@kernel.org> <neeraju@codeaurora.org>
446473
Neil Armstrong <neil.armstrong@linaro.org> <narmstrong@baylibre.com>
447474
Nguyen Anh Quynh <aquynh@gmail.com>
448475
Nicholas Piggin <npiggin@gmail.com> <npiggen@suse.de>
@@ -493,9 +520,11 @@ Praveen BP <praveenbp@ti.com>
493520
Pradeep Kumar Chitrapu <quic_pradeepc@quicinc.com> <pradeepc@codeaurora.org>
494521
Prasad Sodagudi <quic_psodagud@quicinc.com> <psodagud@codeaurora.org>
495522
Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>
523+
Puranjay Mohan <puranjay@kernel.org> <puranjay12@gmail.com>
496524
Qais Yousef <qyousef@layalina.io> <qais.yousef@imgtec.com>
497525
Qais Yousef <qyousef@layalina.io> <qais.yousef@arm.com>
498-
Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>
526+
Quentin Monnet <qmo@kernel.org> <quentin.monnet@netronome.com>
527+
Quentin Monnet <qmo@kernel.org> <quentin@isovalent.com>
499528
Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>
500529
Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>
501530
Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>
@@ -517,6 +546,7 @@ Rémi Denis-Courmont <rdenis@simphalempin.com>
517546
Ricardo Ribalda <ribalda@kernel.org> <ricardo@ribalda.com>
518547
Ricardo Ribalda <ribalda@kernel.org> Ricardo Ribalda Delgado <ribalda@kernel.org>
519548
Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>
549+
Richard Genoud <richard.genoud@bootlin.com> <richard.genoud@gmail.com>
520550
Richard Leitner <richard.leitner@linux.dev> <dev@g0hl1n.net>
521551
Richard Leitner <richard.leitner@linux.dev> <me@g0hl1n.net>
522552
Richard Leitner <richard.leitner@linux.dev> <richard.leitner@skidata.com>
@@ -525,6 +555,7 @@ Rocky Liao <quic_rjliao@quicinc.com> <rjliao@codeaurora.org>
525555
Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>
526556
Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>
527557
Roman Gushchin <roman.gushchin@linux.dev> <klamm@yandex-team.ru>
558+
Ronak Doshi <ronak.doshi@broadcom.com> <doshir@vmware.com>
528559
Muchun Song <muchun.song@linux.dev> <songmuchun@bytedance.com>
529560
Muchun Song <muchun.song@linux.dev> <smuchun@gmail.com>
530561
Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com>
@@ -541,7 +572,7 @@ Sarangdhar Joshi <spjoshi@codeaurora.org>
541572
Sascha Hauer <s.hauer@pengutronix.de>
542573
Sahitya Tummala <quic_stummala@quicinc.com> <stummala@codeaurora.org>
543574
Sathishkumar Muruganandam <quic_murugana@quicinc.com> <murugana@codeaurora.org>
544-
Satya Priya <quic_c_skakit@quicinc.com> <skakit@codeaurora.org>
575+
Satya Priya <quic_skakitap@quicinc.com> <quic_c_skakit@quicinc.com> <skakit@codeaurora.org>
545576
S.Çağlar Onur <caglar@pardus.org.tr>
546577
Sayali Lokhande <quic_sayalil@quicinc.com> <sayalil@codeaurora.org>
547578
Sean Christopherson <seanjc@google.com> <sean.j.christopherson@intel.com>
@@ -573,6 +604,7 @@ Simon Kelley <simon@thekelleys.org.uk>
573604
Sricharan Ramabadhran <quic_srichara@quicinc.com> <sricharan@codeaurora.org>
574605
Srinivas Ramana <quic_sramana@quicinc.com> <sramana@codeaurora.org>
575606
Sriram R <quic_srirrama@quicinc.com> <srirrama@codeaurora.org>
607+
Stefan Wahren <wahrenst@gmx.net> <stefan.wahren@i2se.com>
576608
Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
577609
Stephen Hemminger <stephen@networkplumber.org> <shemminger@linux-foundation.org>
578610
Stephen Hemminger <stephen@networkplumber.org> <shemminger@osdl.org>
@@ -646,6 +678,7 @@ Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>
646678
Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>
647679
Viresh Kumar <viresh.kumar@linaro.org> <viresh.kumar@linaro.org>
648680
Viresh Kumar <viresh.kumar@linaro.org> <viresh.kumar@linaro.com>
681+
Vishnu Dasa <vishnu.dasa@broadcom.com> <vdasa@vmware.com>
649682
Vivek Aknurwar <quic_viveka@quicinc.com> <viveka@codeaurora.org>
650683
Vivien Didelot <vivien.didelot@gmail.com> <vivien.didelot@savoirfairelinux.com>
651684
Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com>

CREDITS

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,11 @@ D: dosfs, LILO, some fd features, ATM, various other hacks here and there
6363
S: Buenos Aires
6464
S: Argentina
6565

66+
NTFS FILESYSTEM
67+
N: Anton Altaparmakov
68+
E: anton@tuxera.com
69+
D: NTFS filesystem
70+
6671
N: Tim Alpaerts
6772
E: tim_alpaerts@toyota-motor-europe.com
6873
D: 802.2 class II logical link control layer,
@@ -2955,6 +2960,11 @@ S: 2364 Old Trail Drive
29552960
S: Reston, Virginia 20191
29562961
S: USA
29572962

2963+
N: Sekhar Nori
2964+
E: nori.sekhar@gmail.com
2965+
D: Maintainer of Texas Instruments DaVinci machine support, contributor
2966+
D: to device drivers relevant to that SoC family.
2967+
29582968
N: Fredrik Noring
29592969
E: noring@nocrew.org
29602970
W: http://www.lysator.liu.se/~noring/
@@ -3136,6 +3146,10 @@ S: Triftstra=DFe 55
31363146
S: 13353 Berlin
31373147
S: Germany
31383148

3149+
N: Gustavo Pimental
3150+
E: gustavo.pimentel@synopsys.com
3151+
D: PCI driver for Synopsys DesignWare
3152+
31393153
N: Emanuel Pirker
31403154
E: epirker@edu.uni-klu.ac.at
31413155
D: AIC5800 IEEE 1394, RAW I/O on 1394

Documentation/ABI/obsolete/sysfs-gpio

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ Description:
2828
/label ... (r/o) descriptive, not necessarily unique
2929
/ngpio ... (r/o) number of GPIOs; numbered N to N + (ngpio - 1)
3030

31-
This ABI is deprecated and will be removed after 2020. It is
32-
replaced with the GPIO character device.
31+
This ABI is obsoleted by Documentation/ABI/testing/gpio-cdev and will be
32+
removed after 2020.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
What: /sys/firmware/efi/vars
2+
Date: April 2004, removed March 2023
3+
Description:
4+
This directory exposed interfaces for interacting with
5+
EFI variables. For more information on EFI variables,
6+
see 'Variable Services' in the UEFI specification
7+
(section 7.2 in specification version 2.3 Errata D).
8+
9+
The 'efivars' sysfs interface was removed in March of 2023,
10+
after being considered deprecated no later than September
11+
of 2020. Its functionality has been replaced by the
12+
'efivarfs' filesystem.

Documentation/ABI/stable/sysfs-block

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,16 @@ Description:
101101
devices that support receiving integrity metadata.
102102

103103

104+
What: /sys/block/<disk>/partscan
105+
Date: May 2024
106+
Contact: Christoph Hellwig <hch@lst.de>
107+
Description:
108+
The /sys/block/<disk>/partscan files reports if partition
109+
scanning is enabled for the disk. It returns "1" if partition
110+
scanning is enabled, or "0" if not. The value type is a 32-bit
111+
unsigned integer, but only "0" and "1" are valid values.
112+
113+
104114
What: /sys/block/<disk>/<partition>/alignment_offset
105115
Date: April 2009
106116
Contact: Martin K. Petersen <martin.petersen@oracle.com>
@@ -584,18 +594,6 @@ Description:
584594
the data. If no such restriction exists, this file will contain
585595
'0'. This file is writable for testing purposes.
586596

587-
588-
What: /sys/block/<disk>/queue/throttle_sample_time
589-
Date: March 2017
590-
Contact: linux-block@vger.kernel.org
591-
Description:
592-
[RW] This is the time window that blk-throttle samples data, in
593-
millisecond. blk-throttle makes decision based on the
594-
samplings. Lower time means cgroups have more smooth throughput,
595-
but higher CPU overhead. This exists only when
596-
CONFIG_BLK_DEV_THROTTLING_LOW is enabled.
597-
598-
599597
What: /sys/block/<disk>/queue/virt_boundary_mask
600598
Date: April 2021
601599
Contact: linux-block@vger.kernel.org

Documentation/ABI/stable/sysfs-bus-mhi

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,16 @@ Description: Initiates a SoC reset on the MHI controller. A SoC reset is
2929
This can be useful as a method of recovery if the device is
3030
non-responsive, or as a means of loading new firmware as a
3131
system administration task.
32+
33+
What: /sys/bus/mhi/devices/.../trigger_edl
34+
Date: April 2024
35+
KernelVersion: 6.10
36+
Contact: mhi@lists.linux.dev
37+
Description: Writing a non-zero value to this file will force devices to
38+
enter EDL (Emergency Download) mode. This entry only exists for
39+
devices capable of entering the EDL mode using the standard EDL
40+
triggering mechanism defined in the MHI spec v1.2. Once in EDL
41+
mode, the flash programmer image can be downloaded to the
42+
device to enter the flash programmer execution environment.
43+
This can be useful if user wants to use QDL (Qualcomm Download,
44+
which is used to download firmware over EDL) to update firmware.

Documentation/ABI/stable/sysfs-firmware-efi-vars

Lines changed: 0 additions & 79 deletions
This file was deleted.

Documentation/ABI/testing/configfs-usb-gadget-ffs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ KernelVersion: 3.13
44
Description: The purpose of this directory is to create and remove it.
55

66
A corresponding USB function instance is created/removed.
7-
There are no attributes here.
87

9-
All parameters are set through FunctionFS.
8+
All attributes are read only:
9+
10+
============= ============================================
11+
ready 1 if the function is ready to be used, E.G.
12+
if userspace has written descriptors and
13+
strings to ep0, so the gadget can be
14+
enabled - 0 otherwise.
15+
============= ============================================
16+
17+
All other parameters are set through FunctionFS.

0 commit comments

Comments
 (0)