Skip to content

Commit 993a47b

Browse files
committed
Merge 6.14-rc6 into driver-core-next
We need the driver core fix in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2 parents 21b0dc5 + 80e54e8 commit 993a47b

File tree

804 files changed

+9098
-4349
lines changed

Some content is hidden

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

804 files changed

+9098
-4349
lines changed

.mailmap

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ Antonio Quartulli <antonio@mandelbit.com> <antonio@open-mesh.com>
8888
Antonio Quartulli <antonio@mandelbit.com> <antonio.quartulli@open-mesh.com>
8989
Antonio Quartulli <antonio@mandelbit.com> <ordex@autistici.org>
9090
Antonio Quartulli <antonio@mandelbit.com> <ordex@ritirata.org>
91-
Antonio Quartulli <antonio@mandelbit.com> <antonio@openvpn.net>
9291
Antonio Quartulli <antonio@mandelbit.com> <a@unstable.cc>
9392
Anup Patel <anup@brainfault.org> <anup.patel@wdc.com>
9493
Archit Taneja <archit@ti.com>
@@ -226,6 +225,7 @@ Fangrui Song <i@maskray.me> <maskray@google.com>
226225
Felipe W Damasio <felipewd@terra.com.br>
227226
Felix Kuhling <fxkuehl@gmx.de>
228227
Felix Moeller <felix@derklecks.de>
228+
Feng Tang <feng.79.tang@gmail.com> <feng.tang@intel.com>
229229
Fenglin Wu <quic_fenglinw@quicinc.com> <fenglinw@codeaurora.org>
230230
Filipe Lautert <filipe@icewall.org>
231231
Finn Thain <fthain@linux-m68k.org> <fthain@telegraphics.com.au>
@@ -317,6 +317,8 @@ Jayachandran C <c.jayachandran@gmail.com> <jnair@caviumnetworks.com>
317317
Jean Tourrilhes <jt@hpl.hp.com>
318318
Jeevan Shriram <quic_jshriram@quicinc.com> <jshriram@codeaurora.org>
319319
Jeff Garzik <jgarzik@pretzel.yyz.us>
320+
Jeff Johnson <jeff.johnson@oss.qualcomm.com> <jjohnson@codeaurora.org>
321+
Jeff Johnson <jeff.johnson@oss.qualcomm.com> <quic_jjohnson@quicinc.com>
320322
Jeff Layton <jlayton@kernel.org> <jlayton@poochiereds.net>
321323
Jeff Layton <jlayton@kernel.org> <jlayton@primarydata.com>
322324
Jeff Layton <jlayton@kernel.org> <jlayton@redhat.com>
@@ -519,6 +521,7 @@ Nadav Amit <nadav.amit@gmail.com> <namit@cs.technion.ac.il>
519521
Nadia Yvette Chambers <nyc@holomorphy.com> William Lee Irwin III <wli@holomorphy.com>
520522
Naoya Horiguchi <nao.horiguchi@gmail.com> <n-horiguchi@ah.jp.nec.com>
521523
Naoya Horiguchi <nao.horiguchi@gmail.com> <naoya.horiguchi@nec.com>
524+
Natalie Vock <natalie.vock@gmx.de> <friedrich.vock@gmx.de>
522525
Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.com>
523526
Naveen N Rao <naveen@kernel.org> <naveen.n.rao@linux.ibm.com>
524527
Naveen N Rao <naveen@kernel.org> <naveen.n.rao@linux.vnet.ibm.com>
@@ -531,6 +534,7 @@ Nicholas Piggin <npiggin@gmail.com> <npiggin@kernel.dk>
531534
Nicholas Piggin <npiggin@gmail.com> <npiggin@suse.de>
532535
Nicholas Piggin <npiggin@gmail.com> <nickpiggin@yahoo.com.au>
533536
Nicholas Piggin <npiggin@gmail.com> <piggin@cyberone.com.au>
537+
Nick Desaulniers <nick.desaulniers+lkml@gmail.com> <ndesaulniers@google.com>
534538
Nicolas Ferre <nicolas.ferre@microchip.com> <nicolas.ferre@atmel.com>
535539
Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org>
536540
Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>
@@ -609,6 +613,8 @@ Richard Leitner <richard.leitner@linux.dev> <me@g0hl1n.net>
609613
Richard Leitner <richard.leitner@linux.dev> <richard.leitner@skidata.com>
610614
Robert Foss <rfoss@kernel.org> <robert.foss@linaro.org>
611615
Rocky Liao <quic_rjliao@quicinc.com> <rjliao@codeaurora.org>
616+
Rodrigo Siqueira <siqueira@igalia.com> <rodrigosiqueiramelo@gmail.com>
617+
Rodrigo Siqueira <siqueira@igalia.com> <Rodrigo.Siqueira@amd.com>
612618
Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>
613619
Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>
614620
Roman Gushchin <roman.gushchin@linux.dev> <klamm@yandex-team.ru>
@@ -685,6 +691,7 @@ Subbaraman Narayanamurthy <quic_subbaram@quicinc.com> <subbaram@codeaurora.org>
685691
Subhash Jadavani <subhashj@codeaurora.org>
686692
Sudarshan Rajagopalan <quic_sudaraja@quicinc.com> <sudaraja@codeaurora.org>
687693
Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
694+
Sumit Garg <sumit.garg@kernel.org> <sumit.garg@linaro.org>
688695
Sumit Semwal <sumit.semwal@ti.com>
689696
Surabhi Vishnoi <quic_svishnoi@quicinc.com> <svishnoi@codeaurora.org>
690697
Sven Eckelmann <sven@narfation.org> <seckelmann@datto.com>

Documentation/admin-guide/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ Configuring the kernel
176176
values without prompting.
177177

178178
"make defconfig" Create a ./.config file by using the default
179-
symbol values from either arch/$ARCH/defconfig
179+
symbol values from either arch/$ARCH/configs/defconfig
180180
or arch/$ARCH/configs/${PLATFORM}_defconfig,
181181
depending on the architecture.
182182

Documentation/admin-guide/sysctl/kernel.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,17 @@ pid>/``).
212212
This value defaults to 0.
213213
214214

215+
core_sort_vma
216+
=============
217+
218+
The default coredump writes VMAs in address order. By setting
219+
``core_sort_vma`` to 1, VMAs will be written from smallest size
220+
to largest size. This is known to break at least elfutils, but
221+
can be handy when dealing with very large (and truncated)
222+
coredumps where the more useful debugging details are included
223+
in the smaller VMAs.
224+
225+
215226
core_uses_pid
216227
=============
217228

Documentation/arch/powerpc/cxl.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Introduction
1818
both access system memory directly and with the same effective
1919
addresses.
2020

21+
**This driver is deprecated and will be removed in a future release.**
2122

2223
Hardware overview
2324
=================
@@ -453,7 +454,7 @@ Sysfs Class
453454

454455
A cxl sysfs class is added under /sys/class/cxl to facilitate
455456
enumeration and tuning of the accelerators. Its layout is
456-
described in Documentation/ABI/testing/sysfs-class-cxl
457+
described in Documentation/ABI/obsolete/sysfs-class-cxl
457458

458459

459460
Udev rules

Documentation/arch/x86/sva.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ to cache translations for virtual addresses. The IOMMU driver uses the
2525
mmu_notifier() support to keep the device TLB cache and the CPU cache in
2626
sync. When an ATS lookup fails for a virtual address, the device should
2727
use the PRI in order to request the virtual address to be paged into the
28-
CPU page tables. The device must use ATS again in order the fetch the
28+
CPU page tables. The device must use ATS again in order to fetch the
2929
translation before use.
3030

3131
Shared Hardware Workqueues
@@ -216,7 +216,7 @@ submitting work and processing completions.
216216

217217
Single Root I/O Virtualization (SR-IOV) focuses on providing independent
218218
hardware interfaces for virtualizing hardware. Hence, it's required to be
219-
almost fully functional interface to software supporting the traditional
219+
an almost fully functional interface to software supporting the traditional
220220
BARs, space for interrupts via MSI-X, its own register layout.
221221
Virtual Functions (VFs) are assisted by the Physical Function (PF)
222222
driver.

Documentation/devicetree/bindings/arm/rockchip/pmu.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,17 @@ properties:
5353
reg:
5454
maxItems: 1
5555

56+
power-controller:
57+
type: object
58+
59+
reboot-mode:
60+
type: object
61+
5662
required:
5763
- compatible
5864
- reg
5965

60-
additionalProperties: true
66+
additionalProperties: false
6167

6268
examples:
6369
- |

Documentation/devicetree/bindings/iio/adc/adi,ad7606.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ properties:
146146
maxItems: 2
147147

148148
pwm-names:
149+
minItems: 1
149150
items:
150151
- const: convst1
151152
- const: convst2

Documentation/devicetree/bindings/mtd/cdns,hp-nfc.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ properties:
3333
clocks:
3434
maxItems: 1
3535

36+
clock-names:
37+
items:
38+
- const: nf_clk
39+
3640
dmas:
3741
maxItems: 1
3842

@@ -51,6 +55,7 @@ required:
5155
- reg-names
5256
- interrupts
5357
- clocks
58+
- clock-names
5459

5560
unevaluatedProperties: false
5661

@@ -66,7 +71,8 @@ examples:
6671
#address-cells = <1>;
6772
#size-cells = <0>;
6873
interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
69-
clocks = <&nf_clk>;
74+
clocks = <&clk>;
75+
clock-names = "nf_clk";
7076
cdns,board-delay-ps = <4830>;
7177
7278
nand@0 {

Documentation/filesystems/idmappings.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ what id ``k11000`` corresponds to in the second or third idmapping. The
6363
straightforward algorithm to use is to apply the inverse of the first idmapping,
6464
mapping ``k11000`` up to ``u1000``. Afterwards, we can map ``u1000`` down using
6565
either the second idmapping mapping or third idmapping mapping. The second
66-
idmapping would map ``u1000`` down to ``21000``. The third idmapping would map
67-
``u1000`` down to ``u31000``.
66+
idmapping would map ``u1000`` down to ``k21000``. The third idmapping would map
67+
``u1000`` down to ``k31000``.
6868

6969
If we were given the same task for the following three idmappings::
7070

Documentation/networking/strparser.rst

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Functions
112112
Callbacks
113113
=========
114114

115-
There are six callbacks:
115+
There are seven callbacks:
116116

117117
::
118118

@@ -182,6 +182,13 @@ There are six callbacks:
182182
the length of the message. skb->len - offset may be greater
183183
then full_len since strparser does not trim the skb.
184184

185+
::
186+
187+
int (*read_sock)(struct strparser *strp, read_descriptor_t *desc,
188+
sk_read_actor_t recv_actor);
189+
190+
The read_sock callback is used by strparser instead of
191+
sock->ops->read_sock, if provided.
185192
::
186193

187194
int (*read_sock_done)(struct strparser *strp, int err);

0 commit comments

Comments
 (0)