Skip to content

Commit 6a7638e

Browse files
xdevs23xdevs23
committed
Merge remote-tracking branch 'stable/linux-6.12.y' into v6.12+
2 parents ea9e780 + 5996393 commit 6a7638e

177 files changed

Lines changed: 1687 additions & 753 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/laptops/thinkpad-acpi.rst‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -445,8 +445,10 @@ event code Key Notes
445445
0x1008 0x07 FN+F8 IBM: toggle screen expand
446446
Lenovo: configure UltraNav,
447447
or toggle screen expand.
448-
On newer platforms (2024+)
449-
replaced by 0x131f (see below)
448+
On 2024 platforms replaced by
449+
0x131f (see below) and on newer
450+
platforms (2025 +) keycode is
451+
replaced by 0x1401 (see below).
450452

451453
0x1009 0x08 FN+F9 -
452454

@@ -506,9 +508,11 @@ event code Key Notes
506508

507509
0x1019 0x18 unknown
508510

509-
0x131f ... FN+F8 Platform Mode change.
511+
0x131f ... FN+F8 Platform Mode change (2024 systems).
510512
Implemented in driver.
511513

514+
0x1401 ... FN+F8 Platform Mode change (2025 + systems).
515+
Implemented in driver.
512516
... ... ...
513517

514518
0x1020 0x1F unknown

‎Documentation/devicetree/bindings/display/bridge/adi,adv7533.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ properties:
9090
adi,dsi-lanes:
9191
description: Number of DSI data lanes connected to the DSI host.
9292
$ref: /schemas/types.yaml#/definitions/uint32
93-
enum: [ 1, 2, 3, 4 ]
93+
enum: [ 2, 3, 4 ]
9494

9595
"#sound-dai-cells":
9696
const: 0

‎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 = 12
4-
SUBLEVEL = 8
4+
SUBLEVEL = 9
55
EXTRAVERSION =
66
NAME = Baby Opossum Posse
77

‎arch/arc/Kconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,6 @@ config ARC_PAGE_SIZE_16K
297297
config ARC_PAGE_SIZE_4K
298298
bool "4KB"
299299
select HAVE_PAGE_SIZE_4KB
300-
depends on ARC_MMU_V3 || ARC_MMU_V4
301300

302301
endchoice
303302

@@ -474,7 +473,8 @@ config HIGHMEM
474473

475474
config ARC_HAS_PAE40
476475
bool "Support for the 40-bit Physical Address Extension"
477-
depends on ISA_ARCV2
476+
depends on MMU_V4
477+
depends on !ARC_PAGE_SIZE_4K
478478
select HIGHMEM
479479
select PHYS_ADDR_T_64BIT
480480
help

‎arch/arc/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
KBUILD_DEFCONFIG := haps_hs_smp_defconfig
77

88
ifeq ($(CROSS_COMPILE),)
9-
CROSS_COMPILE := $(call cc-cross-prefix, arc-linux- arceb-linux-)
9+
CROSS_COMPILE := $(call cc-cross-prefix, arc-linux- arceb-linux- arc-linux-gnu-)
1010
endif
1111

1212
cflags-y += -fno-common -pipe -fno-builtin -mmedium-calls -D__linux__

‎arch/arc/include/asm/cmpxchg.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
\
4949
switch(sizeof((_p_))) { \
5050
case 1: \
51-
_prev_ = (__typeof__(*(ptr)))cmpxchg_emu_u8((volatile u8 *)_p_, (uintptr_t)_o_, (uintptr_t)_n_); \
51+
_prev_ = (__typeof__(*(ptr)))cmpxchg_emu_u8((volatile u8 *__force)_p_, (uintptr_t)_o_, (uintptr_t)_n_); \
5252
break; \
5353
case 4: \
5454
_prev_ = __cmpxchg(_p_, _o_, _n_); \

‎arch/arc/net/bpf_jit_arcv2.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2916,7 +2916,7 @@ bool check_jmp_32(u32 curr_off, u32 targ_off, u8 cond)
29162916
addendum = (cond == ARC_CC_AL) ? 0 : INSN_len_normal;
29172917
disp = get_displacement(curr_off + addendum, targ_off);
29182918

2919-
if (ARC_CC_AL)
2919+
if (cond == ARC_CC_AL)
29202920
return is_valid_far_disp(disp);
29212921
else
29222922
return is_valid_near_disp(disp);

‎arch/x86/events/intel/core.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7067,6 +7067,7 @@ __init int intel_pmu_init(void)
70677067

70687068
case INTEL_METEORLAKE:
70697069
case INTEL_METEORLAKE_L:
7070+
case INTEL_ARROWLAKE_U:
70707071
intel_pmu_init_hybrid(hybrid_big_small);
70717072

70727073
x86_pmu.pebs_latency_data = cmt_latency_data;

‎block/blk.h‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -469,11 +469,6 @@ static inline bool bio_zone_write_plugging(struct bio *bio)
469469
{
470470
return bio_flagged(bio, BIO_ZONE_WRITE_PLUGGING);
471471
}
472-
static inline bool bio_is_zone_append(struct bio *bio)
473-
{
474-
return bio_op(bio) == REQ_OP_ZONE_APPEND ||
475-
bio_flagged(bio, BIO_EMULATES_ZONE_APPEND);
476-
}
477472
void blk_zone_write_plug_bio_merged(struct bio *bio);
478473
void blk_zone_write_plug_init_request(struct request *rq);
479474
static inline void blk_zone_update_request_bio(struct request *rq,
@@ -522,10 +517,6 @@ static inline bool bio_zone_write_plugging(struct bio *bio)
522517
{
523518
return false;
524519
}
525-
static inline bool bio_is_zone_append(struct bio *bio)
526-
{
527-
return false;
528-
}
529520
static inline void blk_zone_write_plug_bio_merged(struct bio *bio)
530521
{
531522
}

‎drivers/clk/imx/clk-imx8mp-audiomix.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,8 @@ static int clk_imx8mp_audiomix_reset_controller_register(struct device *dev,
278278

279279
#else /* !CONFIG_RESET_CONTROLLER */
280280

281-
static int clk_imx8mp_audiomix_reset_controller_register(struct clk_imx8mp_audiomix_priv *priv)
281+
static int clk_imx8mp_audiomix_reset_controller_register(struct device *dev,
282+
struct clk_imx8mp_audiomix_priv *priv)
282283
{
283284
return 0;
284285
}

0 commit comments

Comments
 (0)