Skip to content

Commit 60720db

Browse files
committed
Merge tag 'v5.10.76' into 5.10-main
This is the 5.10.76 stable release # gpg verification failed.
2 parents cae9918 + 378e85d commit 60720db

117 files changed

Lines changed: 989 additions & 478 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.

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 = 75
4+
SUBLEVEL = 76
55
EXTRAVERSION =
66
NAME = Dare mighty things
77

arch/arm/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ config ARM
8787
select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL
8888
select HAVE_FUNCTION_GRAPH_TRACER if !THUMB2_KERNEL && !CC_IS_CLANG
8989
select HAVE_FUNCTION_TRACER if !XIP_KERNEL
90+
select HAVE_FUTEX_CMPXCHG if FUTEX
9091
select HAVE_GCC_PLUGINS
9192
select HAVE_HW_BREAKPOINT if PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7)
9293
select HAVE_IDE if PCI || ISA || PCMCIA

arch/arm/boot/dts/at91-sama5d27_som1_ek.dts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
isc: isc@f0008000 {
7272
pinctrl-names = "default";
7373
pinctrl-0 = <&pinctrl_isc_base &pinctrl_isc_data_8bit &pinctrl_isc_data_9_10 &pinctrl_isc_data_11_12>;
74-
status = "okay";
7574
};
7675

7776
qspi1: spi@f0024000 {

arch/arm/boot/dts/spear3xx.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
};
4848

4949
gmac: eth@e0800000 {
50-
compatible = "st,spear600-gmac";
50+
compatible = "snps,dwmac-3.40a";
5151
reg = <0xe0800000 0x8000>;
5252
interrupts = <23 22>;
5353
interrupt-names = "macirq", "eth_wake_irq";

arch/arm/boot/dts/vexpress-v2m.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*/
2020

2121
/ {
22-
bus@4000000 {
22+
bus@40000000 {
2323
motherboard {
2424
model = "V2M-P1";
2525
arm,hbi = <0x190>;

arch/arm/boot/dts/vexpress-v2p-ca9.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@
295295
};
296296
};
297297

298-
smb: bus@4000000 {
298+
smb: bus@40000000 {
299299
compatible = "simple-bus";
300300

301301
#address-cells = <2>;

arch/nios2/include/asm/irqflags.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
static inline unsigned long arch_local_save_flags(void)
1111
{
12-
return RDCTL(CTL_STATUS);
12+
return RDCTL(CTL_FSTATUS);
1313
}
1414

1515
/*
@@ -18,7 +18,7 @@ static inline unsigned long arch_local_save_flags(void)
1818
*/
1919
static inline void arch_local_irq_restore(unsigned long flags)
2020
{
21-
WRCTL(CTL_STATUS, flags);
21+
WRCTL(CTL_FSTATUS, flags);
2222
}
2323

2424
static inline void arch_local_irq_disable(void)

arch/nios2/include/asm/registers.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#endif
1212

1313
/* control register numbers */
14-
#define CTL_STATUS 0
14+
#define CTL_FSTATUS 0
1515
#define CTL_ESTATUS 1
1616
#define CTL_BSTATUS 2
1717
#define CTL_IENABLE 3

0 commit comments

Comments
 (0)