Skip to content

Commit ed22547

Browse files
committed
Merge tag 'v5.10.115-rt67' into nilrt/master/5.10
Linux 5.10.115-rt67 [gratian: fixed minor IRQTF_* enum conflict between commit 7007edb ("irq: Add priority support to /proc/irq/../") and commit e6e61aa ("genirq: Synchronize interrupt thread startup")] Signed-off-by: Gratian Crisan <gratian.crisan@ni.com>
2 parents 51bfa7d + 257a02c commit ed22547

1,175 files changed

Lines changed: 9952 additions & 5142 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.

Documentation/admin-guide/sysctl/kernel.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -787,6 +787,7 @@ bit 1 print system memory info
787787
bit 2 print timer info
788788
bit 3 print locks info if ``CONFIG_LOCKDEP`` is on
789789
bit 4 print ftrace buffer
790+
bit 5 print all printk messages in buffer
790791
===== ============================================
791792

792793
So for example to print tasks and memory info on panic, user can::

Documentation/core-api/dma-attributes.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,3 +130,11 @@ accesses to DMA buffers in both privileged "supervisor" and unprivileged
130130
subsystem that the buffer is fully accessible at the elevated privilege
131131
level (and ideally inaccessible or at least read-only at the
132132
lesser-privileged levels).
133+
134+
DMA_ATTR_OVERWRITE
135+
------------------
136+
137+
This is a hint to the DMA-mapping subsystem that the device is expected to
138+
overwrite the entire mapped size, thus the caller does not require any of the
139+
previous buffer contents to be preserved. This allows bounce-buffering
140+
implementations to optimise DMA_FROM_DEVICE transfers.

Documentation/devicetree/bindings/mtd/nand-controller.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ patternProperties:
4444
properties:
4545
reg:
4646
description:
47-
Contains the native Ready/Busy IDs.
47+
Contains the chip-select IDs.
4848

4949
nand-ecc-mode:
5050
description:
@@ -174,6 +174,6 @@ examples:
174174
nand-ecc-mode = "soft";
175175
nand-ecc-algo = "bch";
176176
177-
/* controller specific properties */
177+
/* NAND chip specific properties */
178178
};
179179
};

Documentation/devicetree/bindings/spi/spi-mxic.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@ Required properties:
88
- reg: should contain 2 entries, one for the registers and one for the direct
99
mapping area
1010
- reg-names: should contain "regs" and "dirmap"
11-
- interrupts: interrupt line connected to the SPI controller
1211
- clock-names: should contain "ps_clk", "send_clk" and "send_dly_clk"
1312
- clocks: should contain 3 entries for the "ps_clk", "send_clk" and
1413
"send_dly_clk" clocks
1514

15+
Optional properties:
16+
- interrupts: interrupt line connected to the SPI controller
17+
1618
Example:
1719

1820
spi@43c30000 {

Documentation/filesystems/ext4/attributes.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ The beginning of an extended attribute block is in
7676
- Checksum of the extended attribute block.
7777
* - 0x14
7878
- \_\_u32
79-
- h\_reserved[2]
79+
- h\_reserved[3]
8080
- Zero.
8181

8282
The checksum is calculated against the FS UUID, the 64-bit block number

Documentation/process/stable-kernel-rules.rst

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,16 @@ Trees
168168
- The finalized and tagged releases of all stable kernels can be found
169169
in separate branches per version at:
170170

171-
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
171+
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
172+
173+
- The release candidate of all stable kernel versions can be found at:
174+
175+
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/
176+
177+
.. warning::
178+
The -stable-rc tree is a snapshot in time of the stable-queue tree and
179+
will change frequently, hence will be rebased often. It should only be
180+
used for testing purposes (e.g. to be consumed by CI systems).
172181

173182

174183
Review committee

Documentation/sound/hd-audio/models.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,10 @@ alc-sense-combo
261261
huawei-mbx-stereo
262262
Enable initialization verbs for Huawei MBX stereo speakers;
263263
might be risky, try this at your own risk
264+
alc298-samsung-headphone
265+
Samsung laptops with ALC298
266+
alc256-samsung-headphone
267+
Samsung laptops with ALC256
264268

265269
ALC66x/67x/892
266270
==============

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 5
33
PATCHLEVEL = 10
4-
SUBLEVEL = 109
4+
SUBLEVEL = 115
55
EXTRAVERSION =
66
NAME = Dare mighty things
77

arch/arc/kernel/entry.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ tracesys_exit:
199199
st r0, [sp, PT_r0] ; sys call return value in pt_regs
200200

201201
;POST Sys Call Ptrace Hook
202+
mov r0, sp ; pt_regs needed
202203
bl @syscall_trace_exit
203204
b ret_from_exception ; NOT ret_from_system_call at is saves r0 which
204205
; we'd done before calling post hook above

arch/arc/kernel/process.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ SYSCALL_DEFINE0(arc_gettls)
4343
return task_thread_info(current)->thr_ptr;
4444
}
4545

46-
SYSCALL_DEFINE3(arc_usr_cmpxchg, int *, uaddr, int, expected, int, new)
46+
SYSCALL_DEFINE3(arc_usr_cmpxchg, int __user *, uaddr, int, expected, int, new)
4747
{
4848
struct pt_regs *regs = current_pt_regs();
4949
u32 uval;

0 commit comments

Comments
 (0)