Skip to content

Commit 8909175

Browse files
popcornmixpopcornmix
committed
Merge remote-tracking branch 'stable/linux-6.6.y' into rpi-6.6.y
2 parents dafde0a + 1acb101 commit 8909175

File tree

257 files changed

+3085
-1788
lines changed

Some content is hidden

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

257 files changed

+3085
-1788
lines changed

‎Documentation/admin-guide/media/building.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Please notice, however, that, if:
1515

1616
you should use the main media development tree ``master`` branch:
1717

18-
https://git.linuxtv.org/media_tree.git/
18+
https://git.linuxtv.org/media.git/
1919

2020
In this case, you may find some useful information at the
2121
`LinuxTv wiki pages <https://linuxtv.org/wiki>`_:

‎Documentation/admin-guide/media/saa7134.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Changes / Fixes
6767
Please mail to linux-media AT vger.kernel.org unified diffs against
6868
the linux media git tree:
6969

70-
https://git.linuxtv.org/media_tree.git/
70+
https://git.linuxtv.org/media.git/
7171

7272
This is done by committing a patch at a clone of the git tree and
7373
submitting the patch using ``git send-email``. Don't forget to

‎Documentation/arch/arm64/silicon-errata.rst‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,9 @@ stable kernels.
244244
+----------------+-----------------+-----------------+-----------------------------+
245245
| Hisilicon | Hip08 SMMU PMCG | #162001800 | N/A |
246246
+----------------+-----------------+-----------------+-----------------------------+
247-
| Hisilicon | Hip08 SMMU PMCG | #162001900 | N/A |
248-
| | Hip09 SMMU PMCG | | |
247+
| Hisilicon | Hip{08,09,09A,10| #162001900 | N/A |
248+
| | ,10C,11} | | |
249+
| | SMMU PMCG | | |
249250
+----------------+-----------------+-----------------+-----------------------------+
250251
+----------------+-----------------+-----------------+-----------------------------+
251252
| Qualcomm Tech. | Kryo/Falkor v1 | E1003 | QCOM_FALKOR_ERRATUM_1003 |

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

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

9292
ports:
9393
description:

‎Documentation/i2c/busses/i2c-i801.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ Supported adapters:
4848
* Intel Raptor Lake (PCH)
4949
* Intel Meteor Lake (SOC and PCH)
5050
* Intel Birch Stream (SOC)
51+
* Intel Arrow Lake (SOC)
52+
* Intel Panther Lake (SOC)
5153

5254
Datasheets: Publicly available at the Intel website
5355

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

‎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/loongarch/kernel/numa.c‎

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -226,32 +226,6 @@ static void __init node_mem_init(unsigned int node)
226226

227227
#ifdef CONFIG_ACPI_NUMA
228228

229-
/*
230-
* Sanity check to catch more bad NUMA configurations (they are amazingly
231-
* common). Make sure the nodes cover all memory.
232-
*/
233-
static bool __init numa_meminfo_cover_memory(const struct numa_meminfo *mi)
234-
{
235-
int i;
236-
u64 numaram, biosram;
237-
238-
numaram = 0;
239-
for (i = 0; i < mi->nr_blks; i++) {
240-
u64 s = mi->blk[i].start >> PAGE_SHIFT;
241-
u64 e = mi->blk[i].end >> PAGE_SHIFT;
242-
243-
numaram += e - s;
244-
numaram -= __absent_pages_in_range(mi->blk[i].nid, s, e);
245-
if ((s64)numaram < 0)
246-
numaram = 0;
247-
}
248-
max_pfn = max_low_pfn;
249-
biosram = max_pfn - absent_pages_in_range(0, max_pfn);
250-
251-
BUG_ON((s64)(biosram - numaram) >= (1 << (20 - PAGE_SHIFT)));
252-
return true;
253-
}
254-
255229
static void __init add_node_intersection(u32 node, u64 start, u64 size, u32 type)
256230
{
257231
static unsigned long num_physpages;
@@ -396,7 +370,7 @@ int __init init_numa_memory(void)
396370
return -EINVAL;
397371

398372
init_node_memblock();
399-
if (numa_meminfo_cover_memory(&numa_meminfo) == false)
373+
if (!memblock_validate_numa_coverage(SZ_1M))
400374
return -EINVAL;
401375

402376
for_each_node_mask(node, node_possible_map) {

‎arch/powerpc/kernel/setup-common.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,6 @@ struct seq_buf ppc_hw_desc __initdata = {
601601
.buffer = ppc_hw_desc_buf,
602602
.size = sizeof(ppc_hw_desc_buf),
603603
.len = 0,
604-
.readpos = 0,
605604
};
606605

607606
static __init void probe_machine(void)

‎arch/x86/entry/vsyscall/vsyscall_64.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ static void warn_bad_vsyscall(const char *level, struct pt_regs *regs,
7676
if (!show_unhandled_signals)
7777
return;
7878

79-
printk_ratelimited("%s%s[%d] %s ip:%lx cs:%lx sp:%lx ax:%lx si:%lx di:%lx\n",
79+
printk_ratelimited("%s%s[%d] %s ip:%lx cs:%x sp:%lx ax:%lx si:%lx di:%lx\n",
8080
level, current->comm, task_pid_nr(current),
8181
message, regs->ip, regs->cs,
8282
regs->sp, regs->ax, regs->si, regs->di);

0 commit comments

Comments
 (0)