Skip to content

Commit 0c42eaa

Browse files
frank-wfrank-w
committed
Merge tag 'v6.12.56' into 6.12-main
This is the 6.12.56 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmkCEfoACgkQONu9yGCS # aT6W/hAAyeK3wePTuwgVGmiGd8f7ZLtRtNlboAr0755caKbp++OmjMgw/BjQCZ2N # 6RPXKZNoRZa5jel3+WT+aRUXqSJ6IvcYChrmNVtzurvi/D3hIiJhdHjnH3q/MvDT # qrPD/UKZemtnxUu/OCoKzo10KT+hoY1k+2Q4v6aBKaylY0pq4XOU37QzMOIwIqvf # zN13WkEhhg+EU7fBsx3nUlXPqhrdcUlIESB+MhnVjPdw4v/jCUNmaJ/eHFda4dKW # 2vH3HuFxirLkR33Pv6j68Rkuyi/3/b6PYe49tN0s2XYfJ8xAZ91pVxTEUhh3Qknn # JmMN/lEDxl6IsK3/4OuhjJWwtANHOCTzvsHibObRIMtSw4PtBwFe64UdwIIg6/hX # 8SlN6hUbvrKbkeWdWXwHlI3RPDzpLRRyou86bAWnLx0Aq3y58SWd/5pPsubUzMBY # Qw7IjNBkHe8sUHO2wfhxbNLsH0/vNX2WySEyGqvLfF9xKRodc0JegO2jToGNDtxP # 8mwiaGxkufj4Oz5oVkvOUo2a0AZyCFQVIpdr4yN7SzkR9BRj8nQ+Q39bu2uIzKHU # 4vcXt/xzHrKxd01ctQyNLA63ndLGcjIjx+xenmag/dQzEajmoyijlKGvgpiLWgIP # xhS3hwU6ItpJ4nqS4xgILvJN2CUpsJTDQyvoHV81U4k1JPEJNUk= # =1SVo # -----END PGP SIGNATURE----- # gpg: Signature made Wed Oct 29 14:09:14 2025 CET # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents cb6bcfb + 4408a3d commit 0c42eaa

File tree

114 files changed

+1176
-688
lines changed

Some content is hidden

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

114 files changed

+1176
-688
lines changed

‎Documentation/devicetree/bindings/usb/fsl,imx8mp-dwc3.yaml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,21 @@ required:
8585
- reg
8686
- "#address-cells"
8787
- "#size-cells"
88-
- dma-ranges
8988
- ranges
9089
- clocks
9190
- clock-names
9291
- interrupts
9392
- power-domains
9493

94+
allOf:
95+
- if:
96+
properties:
97+
compatible:
98+
const: fsl,imx8mp-dwc3
99+
then:
100+
required:
101+
- dma-ranges
102+
95103
additionalProperties: false
96104

97105
examples:

‎Makefile‎

Lines changed: 3 additions & 3 deletions
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 = 55
4+
SUBLEVEL = 56
55
EXTRAVERSION =
66
NAME = Baby Opossum Posse
77

@@ -1372,11 +1372,11 @@ endif
13721372

13731373
tools/: FORCE
13741374
$(Q)mkdir -p $(objtree)/tools
1375-
$(Q)$(MAKE) LDFLAGS= O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/
1375+
$(Q)$(MAKE) O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/
13761376

13771377
tools/%: FORCE
13781378
$(Q)mkdir -p $(objtree)/tools
1379-
$(Q)$(MAKE) LDFLAGS= O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/ $*
1379+
$(Q)$(MAKE) O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/ $*
13801380

13811381
# ---------------------------------------------------------------------------
13821382
# Kernel selftest

‎arch/arm64/boot/dts/broadcom/bcm2712.dtsi‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,9 @@
263263
<0x7fffc000 0x2000>,
264264
<0x7fffe000 0x2000>;
265265
interrupt-controller;
266+
#address-cells = <0>;
267+
interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) |
268+
IRQ_TYPE_LEVEL_HIGH)>;
266269
#interrupt-cells = <3>;
267270
};
268271
};

‎arch/arm64/include/asm/pgtable.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,8 @@ static inline pmd_t set_pmd_bit(pmd_t pmd, pgprot_t prot)
212212
static inline pte_t pte_mkwrite_novma(pte_t pte)
213213
{
214214
pte = set_pte_bit(pte, __pgprot(PTE_WRITE));
215-
pte = clear_pte_bit(pte, __pgprot(PTE_RDONLY));
215+
if (pte_sw_dirty(pte))
216+
pte = clear_pte_bit(pte, __pgprot(PTE_RDONLY));
216217
return pte;
217218
}
218219

‎arch/arm64/mm/copypage.c‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,13 @@ void copy_highpage(struct page *to, struct page *from)
2525
page_kasan_tag_reset(to);
2626

2727
if (system_supports_mte() && page_mte_tagged(from)) {
28-
/* It's a new page, shouldn't have been tagged yet */
29-
WARN_ON_ONCE(!try_page_mte_tagging(to));
28+
/*
29+
* Most of the time it's a new page that shouldn't have been
30+
* tagged yet. However, folio migration can end up reusing the
31+
* same page without untagging it. Ignore the warning if the
32+
* page is already tagged.
33+
*/
34+
try_page_mte_tagging(to);
3035
mte_copy_page_tags(kto, kfrom);
3136
set_page_mte_tagged(to);
3237
}

‎arch/arm64/tools/sysreg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,7 +1213,7 @@ UnsignedEnum 43:40 TraceFilt
12131213
0b0000 NI
12141214
0b0001 IMP
12151215
EndEnum
1216-
UnsignedEnum 39:36 DoubleLock
1216+
SignedEnum 39:36 DoubleLock
12171217
0b0000 IMP
12181218
0b1111 NI
12191219
EndEnum
@@ -1861,7 +1861,7 @@ UnsignedEnum 11:8 ASID2
18611861
0b0000 NI
18621862
0b0001 IMP
18631863
EndEnum
1864-
SignedEnum 7:4 EIESB
1864+
UnsignedEnum 7:4 EIESB
18651865
0b0000 NI
18661866
0b0001 ToEL3
18671867
0b0010 ToELx

‎arch/m68k/include/asm/bitops.h‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -350,12 +350,12 @@ static inline bool xor_unlock_is_negative_byte(unsigned long mask,
350350
#include <asm-generic/bitops/ffz.h>
351351
#else
352352

353-
static inline int find_first_zero_bit(const unsigned long *vaddr,
354-
unsigned size)
353+
static inline unsigned long find_first_zero_bit(const unsigned long *vaddr,
354+
unsigned long size)
355355
{
356356
const unsigned long *p = vaddr;
357-
int res = 32;
358-
unsigned int words;
357+
unsigned long res = 32;
358+
unsigned long words;
359359
unsigned long num;
360360

361361
if (!size)
@@ -376,8 +376,9 @@ static inline int find_first_zero_bit(const unsigned long *vaddr,
376376
}
377377
#define find_first_zero_bit find_first_zero_bit
378378

379-
static inline int find_next_zero_bit(const unsigned long *vaddr, int size,
380-
int offset)
379+
static inline unsigned long find_next_zero_bit(const unsigned long *vaddr,
380+
unsigned long size,
381+
unsigned long offset)
381382
{
382383
const unsigned long *p = vaddr + (offset >> 5);
383384
int bit = offset & 31UL, res;
@@ -406,11 +407,12 @@ static inline int find_next_zero_bit(const unsigned long *vaddr, int size,
406407
}
407408
#define find_next_zero_bit find_next_zero_bit
408409

409-
static inline int find_first_bit(const unsigned long *vaddr, unsigned size)
410+
static inline unsigned long find_first_bit(const unsigned long *vaddr,
411+
unsigned long size)
410412
{
411413
const unsigned long *p = vaddr;
412-
int res = 32;
413-
unsigned int words;
414+
unsigned long res = 32;
415+
unsigned long words;
414416
unsigned long num;
415417

416418
if (!size)
@@ -431,8 +433,9 @@ static inline int find_first_bit(const unsigned long *vaddr, unsigned size)
431433
}
432434
#define find_first_bit find_first_bit
433435

434-
static inline int find_next_bit(const unsigned long *vaddr, int size,
435-
int offset)
436+
static inline unsigned long find_next_bit(const unsigned long *vaddr,
437+
unsigned long size,
438+
unsigned long offset)
436439
{
437440
const unsigned long *p = vaddr + (offset >> 5);
438441
int bit = offset & 31UL, res;

‎arch/mips/mti-malta/malta-setup.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ static struct resource standard_io_resources[] = {
4747
.name = "keyboard",
4848
.start = 0x60,
4949
.end = 0x6f,
50-
.flags = IORESOURCE_IO | IORESOURCE_BUSY
50+
.flags = IORESOURCE_IO
5151
},
5252
{
5353
.name = "dma page reg",

‎arch/nios2/kernel/setup.c‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,20 @@ static void __init find_limits(unsigned long *min, unsigned long *max_low,
142142
*max_high = PFN_DOWN(memblock_end_of_DRAM());
143143
}
144144

145+
static void __init adjust_lowmem_bounds(void)
146+
{
147+
phys_addr_t block_start, block_end;
148+
u64 i;
149+
phys_addr_t memblock_limit = 0;
150+
151+
for_each_mem_range(i, &block_start, &block_end) {
152+
if (block_end > memblock_limit)
153+
memblock_limit = block_end;
154+
}
155+
156+
memblock_set_current_limit(memblock_limit);
157+
}
158+
145159
void __init setup_arch(char **cmdline_p)
146160
{
147161
console_verbose();
@@ -155,6 +169,7 @@ void __init setup_arch(char **cmdline_p)
155169
/* Keep a copy of command line */
156170
*cmdline_p = boot_command_line;
157171

172+
adjust_lowmem_bounds();
158173
find_limits(&min_low_pfn, &max_low_pfn, &max_pfn);
159174
max_mapnr = max_low_pfn;
160175

‎arch/powerpc/include/asm/pgtable.h‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,6 @@ struct mm_struct;
2020
#include <asm/nohash/pgtable.h>
2121
#endif /* !CONFIG_PPC_BOOK3S */
2222

23-
/*
24-
* Protection used for kernel text. We want the debuggers to be able to
25-
* set breakpoints anywhere, so don't write protect the kernel text
26-
* on platforms where such control is possible.
27-
*/
28-
#if defined(CONFIG_KGDB) || defined(CONFIG_XMON) || defined(CONFIG_BDI_SWITCH) || \
29-
defined(CONFIG_KPROBES) || defined(CONFIG_DYNAMIC_FTRACE)
30-
#define PAGE_KERNEL_TEXT PAGE_KERNEL_X
31-
#else
32-
#define PAGE_KERNEL_TEXT PAGE_KERNEL_ROX
33-
#endif
34-
3523
/* Make modules code happy. We don't set RO yet */
3624
#define PAGE_KERNEL_EXEC PAGE_KERNEL_X
3725

0 commit comments

Comments
 (0)