Skip to content

Commit 651b77b

Browse files
frank-wfrank-w
committed
Merge tag 'v6.18.22' into 6.18-main
This is the 6.18.22 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmnaPkEACgkQONu9yGCS # aT4BrA//YZMMVfuDRaDQHKsRODCkf9mcCJKpVbRnZnz0vtt4G5IVFcM0zagNi7dq # kNhBHVitK1ueQRtfAwuGFpHcWmyeZViDmPupYr3fp/xlT7tbxmAMl6yYBM1XsTOi # JupER+l4/QStEa6SyjJCsNTrZGPY2ajQIkI5WRXLxiCfVejxWA9fnZT83RSp1/Ht # xvZqk9JPnFZHgDlUaD/uogZva4t3qlnO/ste90j7QPVYYWv/J8IwtSxfaycU8D9W # G6N6WerEXhFH5RkAF2eEcmXLyH60UYS3oXJfTFn5kIZhAYYch2g8gRBBhq1L6ImR # tvz1HzX3U76gYeNATM2DgH9Qx2ptXRdLDNdYPglddjagV+Vg+iiMI2RYVScD2kV+ # 0rHV4hELvRaPtjwqYBT3jBayqu1fpvJ+iSY2vfTrjJKVYNBBjw6aSYd0w0lpQR9c # zehr71tTno7aYIVkfS7jncUXggD+Xxnqwa/k5Xqv2cDyQSGBpmP0sDSrhrmOhsBc # fbBhCxaWD5jJ+oBlkOFpjQp0CoXT2IzBXoBDZqdtjnXGvsDV3NbRzogvwpw/ICga # +6xnKv15+ywW2MPh2aItR//FzVnIf0wMtgEvNQwyLac1aQDMUAeE5UJHzDDZj7ZV # 0UZYm6EHmH+/Z1t7MdYZBN/42Bjs9A9HQofxzhqbmFEUMEz+MlE= # =1q8/ # -----END PGP SIGNATURE----- # gpg: Signature made Sat Apr 11 14:27:45 2026 CEST # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents 373edc0 + f2b09e8 commit 651b77b

308 files changed

Lines changed: 3149 additions & 1618 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/devicetree/bindings/auxdisplay/holtek,ht16k33.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ then:
6666
required:
6767
- refresh-rate-hz
6868

69-
additionalProperties: false
69+
unevaluatedProperties: false
7070

7171
examples:
7272
- |

‎Documentation/devicetree/bindings/connector/usb-connector.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,7 @@ properties:
301301
maxItems: 4
302302

303303
dependencies:
304+
pd-disable: [typec-power-opmode]
304305
sink-vdos-v1: [ sink-vdos ]
305306
sink-vdos: [ sink-vdos-v1 ]
306307

‎Documentation/devicetree/bindings/gpio/microchip,mpfs-gpio.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ properties:
3434
const: 2
3535

3636
"#interrupt-cells":
37-
const: 1
37+
const: 2
3838

3939
ngpios:
4040
description:
@@ -83,7 +83,7 @@ examples:
8383
gpio-controller;
8484
#gpio-cells = <2>;
8585
interrupt-controller;
86-
#interrupt-cells = <1>;
86+
#interrupt-cells = <2>;
8787
interrupts = <53>, <53>, <53>, <53>,
8888
<53>, <53>, <53>, <53>,
8989
<53>, <53>, <53>, <53>,

‎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 = 6
33
PATCHLEVEL = 18
4-
SUBLEVEL = 21
4+
SUBLEVEL = 22
55
EXTRAVERSION =
66
NAME = Baby Opossum Posse
77

‎arch/arm64/kernel/pi/patch-scs.c‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,14 @@ static int scs_handle_fde_frame(const struct eh_frame *frame,
192192
size -= 2;
193193
break;
194194

195+
case DW_CFA_advance_loc4:
196+
loc += *opcode++ * code_alignment_factor;
197+
loc += (*opcode++ << 8) * code_alignment_factor;
198+
loc += (*opcode++ << 16) * code_alignment_factor;
199+
loc += (*opcode++ << 24) * code_alignment_factor;
200+
size -= 4;
201+
break;
202+
195203
case DW_CFA_def_cfa:
196204
case DW_CFA_offset_extended:
197205
size = skip_xleb128(&opcode, size);

‎arch/mips/lib/multi3.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
#include "libgcc.h"
55

66
/*
7-
* GCC 7 & older can suboptimally generate __multi3 calls for mips64r6, so for
7+
* GCC 9 & older can suboptimally generate __multi3 calls for mips64r6, so for
88
* that specific case only we implement that intrinsic here.
99
*
1010
* See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82981
1111
*/
12-
#if defined(CONFIG_64BIT) && defined(CONFIG_CPU_MIPSR6) && (__GNUC__ < 8)
12+
#if defined(CONFIG_64BIT) && defined(CONFIG_CPU_MIPSR6) && (__GNUC__ < 10)
1313

1414
/* multiply 64-bit values, low 64-bits returned */
1515
static inline long long notrace dmulu(long long a, long long b)
@@ -51,4 +51,4 @@ ti_type notrace __multi3(ti_type a, ti_type b)
5151
}
5252
EXPORT_SYMBOL(__multi3);
5353

54-
#endif /* 64BIT && CPU_MIPSR6 && GCC7 */
54+
#endif /* 64BIT && CPU_MIPSR6 && GCC9 */

‎arch/mips/mm/cache.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,8 @@ void cpu_cache_init(void)
207207
{
208208
if (IS_ENABLED(CONFIG_CPU_R3000) && cpu_has_3k_cache)
209209
r3k_cache_init();
210-
if (IS_ENABLED(CONFIG_CPU_R4K_CACHE_TLB) && cpu_has_4k_cache)
210+
if ((IS_ENABLED(CONFIG_CPU_R4K_CACHE_TLB) ||
211+
IS_ENABLED(CONFIG_CPU_SB1)) && cpu_has_4k_cache)
211212
r4k_cache_init();
212213

213214
if (IS_ENABLED(CONFIG_CPU_CAVIUM_OCTEON) && cpu_has_octeon_cache)

‎arch/mips/mm/tlb-r4k.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ static void __ref r4k_tlb_uniquify(void)
538538

539539
tlb_vpn_size = tlbsize * sizeof(*tlb_vpns);
540540
tlb_vpns = (use_slab ?
541-
kmalloc(tlb_vpn_size, GFP_KERNEL) :
541+
kmalloc(tlb_vpn_size, GFP_ATOMIC) :
542542
memblock_alloc_raw(tlb_vpn_size, sizeof(*tlb_vpns)));
543543
if (WARN_ON(!tlb_vpns))
544544
return; /* Pray local_flush_tlb_all() is good enough. */

‎arch/mips/ralink/clk.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ static const char *clk_cpu(int *idx)
2121
{
2222
switch (ralink_soc) {
2323
case RT2880_SOC:
24-
*idx = 0;
24+
*idx = 1;
2525
return "ralink,rt2880-sysc";
2626
case RT3883_SOC:
27-
*idx = 0;
27+
*idx = 1;
2828
return "ralink,rt3883-sysc";
2929
case RT305X_SOC_RT3050:
30-
*idx = 0;
30+
*idx = 1;
3131
return "ralink,rt3050-sysc";
3232
case RT305X_SOC_RT3052:
33-
*idx = 0;
33+
*idx = 1;
3434
return "ralink,rt3052-sysc";
3535
case RT305X_SOC_RT3350:
3636
*idx = 1;

‎arch/riscv/kernel/kgdb.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ struct dbg_reg_def_t dbg_reg_def[DBG_MAX_REG_NUM] = {
175175
{DBG_REG_T1, GDB_SIZEOF_REG, offsetof(struct pt_regs, t1)},
176176
{DBG_REG_T2, GDB_SIZEOF_REG, offsetof(struct pt_regs, t2)},
177177
{DBG_REG_FP, GDB_SIZEOF_REG, offsetof(struct pt_regs, s0)},
178-
{DBG_REG_S1, GDB_SIZEOF_REG, offsetof(struct pt_regs, a1)},
178+
{DBG_REG_S1, GDB_SIZEOF_REG, offsetof(struct pt_regs, s1)},
179179
{DBG_REG_A0, GDB_SIZEOF_REG, offsetof(struct pt_regs, a0)},
180180
{DBG_REG_A1, GDB_SIZEOF_REG, offsetof(struct pt_regs, a1)},
181181
{DBG_REG_A2, GDB_SIZEOF_REG, offsetof(struct pt_regs, a2)},
@@ -244,8 +244,9 @@ sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *task)
244244
gdb_regs[DBG_REG_S6_OFF] = task->thread.s[6];
245245
gdb_regs[DBG_REG_S7_OFF] = task->thread.s[7];
246246
gdb_regs[DBG_REG_S8_OFF] = task->thread.s[8];
247-
gdb_regs[DBG_REG_S9_OFF] = task->thread.s[10];
248-
gdb_regs[DBG_REG_S10_OFF] = task->thread.s[11];
247+
gdb_regs[DBG_REG_S9_OFF] = task->thread.s[9];
248+
gdb_regs[DBG_REG_S10_OFF] = task->thread.s[10];
249+
gdb_regs[DBG_REG_S11_OFF] = task->thread.s[11];
249250
gdb_regs[DBG_REG_EPC_OFF] = task->thread.ra;
250251
}
251252

0 commit comments

Comments
 (0)