Skip to content

Commit 993a47b

Browse files
gregkhgregkh
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 <[email protected]>
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

Diff for: ‎.mailmap

+8-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ Antonio Quartulli <[email protected]> <[email protected]>
8888
Antonio Quartulli <[email protected]> <[email protected]>
8989
Antonio Quartulli <[email protected]> <[email protected]>
9090
Antonio Quartulli <[email protected]> <[email protected]>
91-
Antonio Quartulli <[email protected]> <[email protected]>
9291
Antonio Quartulli <[email protected]> <[email protected]>
9392
Anup Patel <[email protected]> <[email protected]>
9493
Archit Taneja <[email protected]>
@@ -226,6 +225,7 @@ Fangrui Song <[email protected]> <[email protected]>
226225
Felipe W Damasio <[email protected]>
227226
Felix Kuhling <[email protected]>
228227
Felix Moeller <[email protected]>
228+
Feng Tang <[email protected]> <[email protected]>
229229
Fenglin Wu <[email protected]> <[email protected]>
230230
Filipe Lautert <[email protected]>
231231
Finn Thain <[email protected]> <[email protected]>
@@ -317,6 +317,8 @@ Jayachandran C <[email protected]> <[email protected]>
317317
Jean Tourrilhes <[email protected]>
318318
Jeevan Shriram <[email protected]> <[email protected]>
319319
Jeff Garzik <[email protected]>
320+
Jeff Johnson <[email protected]> <[email protected]>
321+
Jeff Johnson <[email protected]> <[email protected]>
320322
Jeff Layton <[email protected]> <[email protected]>
321323
Jeff Layton <[email protected]> <[email protected]>
322324
Jeff Layton <[email protected]> <[email protected]>
@@ -519,6 +521,7 @@ Nadav Amit <[email protected]> <[email protected]>
519521
Nadia Yvette Chambers <[email protected]> William Lee Irwin III <[email protected]>
520522
Naoya Horiguchi <[email protected]> <[email protected]>
521523
Naoya Horiguchi <[email protected]> <[email protected]>
524+
Natalie Vock <[email protected]> <[email protected]>
522525
Nathan Chancellor <[email protected]> <[email protected]>
523526
Naveen N Rao <[email protected]> <[email protected]>
524527
Naveen N Rao <[email protected]> <[email protected]>
@@ -531,6 +534,7 @@ Nicholas Piggin <[email protected]> <[email protected]>
531534
Nicholas Piggin <[email protected]> <[email protected]>
532535
Nicholas Piggin <[email protected]> <[email protected]>
533536
Nicholas Piggin <[email protected]> <[email protected]>
537+
Nick Desaulniers <[email protected]> <[email protected]>
534538
Nicolas Ferre <[email protected]> <[email protected]>
535539
Nicolas Pitre <[email protected]> <[email protected]>
536540
Nicolas Pitre <[email protected]> <[email protected]>
@@ -609,6 +613,8 @@ Richard Leitner <[email protected]> <[email protected]>
609613
Richard Leitner <[email protected]> <[email protected]>
610614
Robert Foss <[email protected]> <[email protected]>
611615
Rocky Liao <[email protected]> <[email protected]>
616+
Rodrigo Siqueira <[email protected]> <[email protected]>
617+
Rodrigo Siqueira <[email protected]> <[email protected]>
612618
Roman Gushchin <[email protected]> <[email protected]>
613619
Roman Gushchin <[email protected]> <[email protected]>
614620
Roman Gushchin <[email protected]> <[email protected]>
@@ -685,6 +691,7 @@ Subbaraman Narayanamurthy <[email protected]> <[email protected]>
685691
Subhash Jadavani <[email protected]>
686692
Sudarshan Rajagopalan <[email protected]> <[email protected]>
687693
Sudeep Holla <[email protected]> Sudeep KarkadaNagesha <[email protected]>
694+
Sumit Garg <[email protected]> <[email protected]>
688695
Sumit Semwal <[email protected]>
689696
Surabhi Vishnoi <[email protected]> <[email protected]>
690697
Sven Eckelmann <[email protected]> <[email protected]>

Diff for: ‎Documentation/admin-guide/README.rst

+1-1
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

Diff for: ‎Documentation/admin-guide/sysctl/kernel.rst

+11
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

Diff for: ‎Documentation/arch/powerpc/cxl.rst

+2-1
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

Diff for: ‎Documentation/arch/x86/sva.rst

+2-2
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.

Diff for: ‎Documentation/devicetree/bindings/arm/rockchip/pmu.yaml

+7-1
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
- |

Diff for: ‎Documentation/devicetree/bindings/iio/adc/adi,ad7606.yaml

+1
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

Diff for: ‎Documentation/devicetree/bindings/mtd/cdns,hp-nfc.yaml

+7-1
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 {

Diff for: ‎Documentation/filesystems/idmappings.rst

+2-2
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

Diff for: ‎Documentation/networking/strparser.rst

+8-1
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);

Diff for: ‎Documentation/process/embargoed-hardware-issues.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ an involved disclosed party. The current ambassadors list:
308308

309309
Google Kees Cook <[email protected]>
310310

311-
LLVM Nick Desaulniers <ndesaulniers@google.com>
311+
LLVM Nick Desaulniers <nick.desaulniers+lkml@gmail.com>
312312
============= ========================================================
313313

314314
If you want your organization to be added to the ambassadors list, please

Diff for: ‎Documentation/scheduler/sched-rt-group.rst

+3
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,9 @@ The system wide settings are configured under the /proc virtual file system:
102102
* sched_rt_period_us takes values from 1 to INT_MAX.
103103
* sched_rt_runtime_us takes values from -1 to sched_rt_period_us.
104104
* A run time of -1 specifies runtime == period, ie. no limit.
105+
* sched_rt_runtime_us/sched_rt_period_us > 0.05 inorder to preserve
106+
bandwidth for fair dl_server. For accurate value check average of
107+
runtime/period in /sys/kernel/debug/sched/fair_server/cpuX/
105108

106109

107110
2.2 Default behaviour

Diff for: ‎Documentation/translations/sp_SP/process/embargoed-hardware-issues.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ revelada involucrada. La lista de embajadores actuales:
287287

288288
Google Kees Cook <[email protected]>
289289

290-
LLVM Nick Desaulniers <ndesaulniers@google.com>
290+
LLVM Nick Desaulniers <nick.desaulniers+lkml@gmail.com>
291291
============= ========================================================
292292

293293
Si quiere que su organización se añada a la lista de embajadores, por

Diff for: ‎Documentation/userspace-api/landlock.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Landlock: unprivileged access control
88
=====================================
99

1010
:Author: Mickaël Salaün
11-
:Date: October 2024
11+
:Date: January 2025
1212

1313
The goal of Landlock is to enable restriction of ambient rights (e.g. global
1414
filesystem or network access) for a set of processes. Because Landlock
@@ -329,11 +329,11 @@ non-sandboxed process, we can specify this restriction with
329329
A sandboxed process can connect to a non-sandboxed process when its domain is
330330
not scoped. If a process's domain is scoped, it can only connect to sockets
331331
created by processes in the same scope.
332-
Moreover, If a process is scoped to send signal to a non-scoped process, it can
332+
Moreover, if a process is scoped to send signal to a non-scoped process, it can
333333
only send signals to processes in the same scope.
334334

335335
A connected datagram socket behaves like a stream socket when its domain is
336-
scoped, meaning if the domain is scoped after the socket is connected , it can
336+
scoped, meaning if the domain is scoped after the socket is connected, it can
337337
still :manpage:`send(2)` data just like a stream socket. However, in the same
338338
scenario, a non-connected datagram socket cannot send data (with
339339
:manpage:`sendto(2)`) outside its scope.

0 commit comments

Comments
 (0)