Skip to content

Commit de92e4b

Browse files
popcornmixpopcornmix
committed
Merge remote-tracking branch 'stable/linux-6.6.y' into rpi-6.6.y
2 parents 5fa4b1f + a30cd70 commit de92e4b

File tree

209 files changed

+2207
-867
lines changed

Some content is hidden

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

209 files changed

+2207
-867
lines changed

‎Documentation/ABI/testing/sysfs-fs-xfs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
What: /sys/fs/xfs/<disk>/log/log_head_lsn
22
Date: July 2014
33
KernelVersion: 3.17
4-
Contact: xfs@oss.sgi.com
4+
Contact: linux-xfs@vger.kernel.org
55
Description:
66
The log sequence number (LSN) of the current head of the
77
log. The LSN is exported in "cycle:basic block" format.
@@ -10,15 +10,15 @@ Users: xfstests
1010
What: /sys/fs/xfs/<disk>/log/log_tail_lsn
1111
Date: July 2014
1212
KernelVersion: 3.17
13-
Contact: xfs@oss.sgi.com
13+
Contact: linux-xfs@vger.kernel.org
1414
Description:
1515
The log sequence number (LSN) of the current tail of the
1616
log. The LSN is exported in "cycle:basic block" format.
1717

1818
What: /sys/fs/xfs/<disk>/log/reserve_grant_head
1919
Date: July 2014
2020
KernelVersion: 3.17
21-
Contact: xfs@oss.sgi.com
21+
Contact: linux-xfs@vger.kernel.org
2222
Description:
2323
The current state of the log reserve grant head. It
2424
represents the total log reservation of all currently
@@ -29,7 +29,7 @@ Users: xfstests
2929
What: /sys/fs/xfs/<disk>/log/write_grant_head
3030
Date: July 2014
3131
KernelVersion: 3.17
32-
Contact: xfs@oss.sgi.com
32+
Contact: linux-xfs@vger.kernel.org
3333
Description:
3434
The current state of the log write grant head. It
3535
represents the total log reservation of all currently

‎Documentation/devicetree/bindings/net/fsl,fec.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,13 @@ properties:
182182
description:
183183
Register bits of stop mode control, the format is <&gpr req_gpr req_bit>.
184184

185+
fsl,pps-channel:
186+
$ref: /schemas/types.yaml#/definitions/uint32
187+
default: 0
188+
description:
189+
Specifies to which timer instance the PPS signal is routed.
190+
enum: [0, 1, 2, 3]
191+
185192
mdio:
186193
$ref: mdio.yaml#
187194
unevaluatedProperties: false

‎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 = 6
4-
SUBLEVEL = 67
4+
SUBLEVEL = 69
55
EXTRAVERSION =
66
NAME = Pinguïn Aangedreven
77

‎arch/hexagon/Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,9 @@ KBUILD_LDFLAGS += $(ldflags-y)
3232
TIR_NAME := r19
3333
KBUILD_CFLAGS += -ffixed-$(TIR_NAME) -DTHREADINFO_REG=$(TIR_NAME) -D__linux__
3434
KBUILD_AFLAGS += -DTHREADINFO_REG=$(TIR_NAME)
35+
36+
# Disable HexagonConstExtenders pass for LLVM versions prior to 19.1.0
37+
# https://github.com/llvm/llvm-project/issues/99714
38+
ifneq ($(call clang-min-version, 190100),y)
39+
KBUILD_CFLAGS += -mllvm -hexagon-cext=false
40+
endif

‎arch/loongarch/include/asm/inst.h

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,17 @@ DEF_EMIT_REG2I16_FORMAT(blt, blt_op)
655655
DEF_EMIT_REG2I16_FORMAT(bge, bge_op)
656656
DEF_EMIT_REG2I16_FORMAT(bltu, bltu_op)
657657
DEF_EMIT_REG2I16_FORMAT(bgeu, bgeu_op)
658-
DEF_EMIT_REG2I16_FORMAT(jirl, jirl_op)
658+
659+
static inline void emit_jirl(union loongarch_instruction *insn,
660+
enum loongarch_gpr rd,
661+
enum loongarch_gpr rj,
662+
int offset)
663+
{
664+
insn->reg2i16_format.opcode = jirl_op;
665+
insn->reg2i16_format.immediate = offset;
666+
insn->reg2i16_format.rd = rd;
667+
insn->reg2i16_format.rj = rj;
668+
}
659669

660670
#define DEF_EMIT_REG2BSTRD_FORMAT(NAME, OP) \
661671
static inline void emit_##NAME(union loongarch_instruction *insn, \

‎arch/loongarch/kernel/efi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ static void __init init_screen_info(void)
9090
memset(si, 0, sizeof(*si));
9191
early_memunmap(si, sizeof(*si));
9292

93-
memblock_reserve(screen_info.lfb_base, screen_info.lfb_size);
93+
memblock_reserve(__screen_info_lfb_base(&screen_info), screen_info.lfb_size);
9494
}
9595

9696
void __init efi_init(void)

‎arch/loongarch/kernel/inst.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ u32 larch_insn_gen_jirl(enum loongarch_gpr rd, enum loongarch_gpr rj, int imm)
332332
return INSN_BREAK;
333333
}
334334

335-
emit_jirl(&insn, rj, rd, imm >> 2);
335+
emit_jirl(&insn, rd, rj, imm >> 2);
336336

337337
return insn.word;
338338
}

‎arch/loongarch/net/bpf_jit.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,13 +181,13 @@ static void __build_epilogue(struct jit_ctx *ctx, bool is_tail_call)
181181
/* Set return value */
182182
emit_insn(ctx, addiw, LOONGARCH_GPR_A0, regmap[BPF_REG_0], 0);
183183
/* Return to the caller */
184-
emit_insn(ctx, jirl, LOONGARCH_GPR_RA, LOONGARCH_GPR_ZERO, 0);
184+
emit_insn(ctx, jirl, LOONGARCH_GPR_ZERO, LOONGARCH_GPR_RA, 0);
185185
} else {
186186
/*
187187
* Call the next bpf prog and skip the first instruction
188188
* of TCC initialization.
189189
*/
190-
emit_insn(ctx, jirl, LOONGARCH_GPR_T3, LOONGARCH_GPR_ZERO, 1);
190+
emit_insn(ctx, jirl, LOONGARCH_GPR_ZERO, LOONGARCH_GPR_T3, 1);
191191
}
192192
}
193193

@@ -841,7 +841,7 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx, bool ext
841841
return ret;
842842

843843
move_addr(ctx, t1, func_addr);
844-
emit_insn(ctx, jirl, t1, LOONGARCH_GPR_RA, 0);
844+
emit_insn(ctx, jirl, LOONGARCH_GPR_RA, t1, 0);
845845
move_reg(ctx, regmap[BPF_REG_0], LOONGARCH_GPR_A0);
846846
break;
847847

‎arch/mips/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ drivers-$(CONFIG_PCI) += arch/mips/pci/
299299
ifdef CONFIG_64BIT
300300
ifndef KBUILD_SYM32
301301
ifeq ($(shell expr $(load-y) \< 0xffffffff80000000), 0)
302-
KBUILD_SYM32 = y
302+
KBUILD_SYM32 = $(call cc-option-yn, -msym32)
303303
endif
304304
endif
305305

‎arch/mips/boot/dts/loongson/loongson64g_4core_ls7a.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
compatible = "loongson,pch-msi-1.0";
3434
reg = <0 0x2ff00000 0 0x8>;
3535
interrupt-controller;
36+
#interrupt-cells = <1>;
3637
msi-controller;
3738
loongson,msi-base-vec = <64>;
3839
loongson,msi-num-vecs = <192>;

0 commit comments

Comments
 (0)