Unverified Commit d69967a0 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13244 [openEuler-24.03-LTS][linux-6.6.y sync] Backport 6.6.59-6.6.60 LTS Patches 

Merge Pull Request from: @wenzhiwei11 
 
git log --oneline v6.6.59..v6.6.60 | wc -l
150
137+7+6

Merged（7）:
smb: client: fix parsing of device numbers
rcu-tasks: Pull sampling of ->percpu_dequeue_lim out of loop
rcu-tasks: Add data to eliminate RCU-tasks/do_exit() deadlocks
rcu-tasks: Initialize data to eliminate RCU-tasks/do_exit() deadlocks
rcu-tasks: Fix access non-existent percpu rtpcp variable in rcu_tasks_need_gpcb()
io_uring: always lock __io_cqring_overflow_flush
drm/amd/display: Add null checks for 'stream' and 'plane' before dereferencing

Conflicts（6）:
firmware: arm_sdei: Fix the input parameter of cpuhp_remove_state()
xhci: Fix Link TRB DMA in command ring stopped completion event
cgroup/bpf: use a dedicated workqueue for cgroup bpf destruction
sched/numa: Fix the potential null pointer dereference in task_numa_work()
mm: huge_memory: add vma_thp_disabled() and thp_disabled_by_hw()
mm: don't install PMD mappings when THPs are disabled by the hw/process/vma

 
 
Link:https://gitee.com/openeuler/kernel/pulls/13244

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents c7c957f7 ba70e75e

arch/arm64/boot/dts/freescale/imx8ulp.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ 
			};



			flexspi2: spi@29810000 {

				compatible = "nxp,imx8mm-fspi";

				compatible = "nxp,imx8ulp-fspi";

				reg = <0x29810000 0x10000>, <0x60000000 0x10000000>;

				reg-names = "fspi_base", "fspi_mmap";

				#address-cells = <1>;

arch/riscv/kernel/acpi.c

+2 −2
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ void __init __iomem *__acpi_map_table(unsigned long phys, unsigned long size) 
	if (!size)

		return NULL;



	return early_ioremap(phys, size);

	return early_memremap(phys, size);

}



void __init __acpi_unmap_table(void __iomem *map, unsigned long size)
@@ -212,7 +212,7 @@ void __init __acpi_unmap_table(void __iomem *map, unsigned long size) 
	if (!map || !size)

		return;



	early_iounmap(map, size);

	early_memunmap(map, size);

}



void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size)

arch/riscv/kernel/asm-offsets.c

+0 −2
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ 
 * Copyright (C) 2017 SiFive

 */



#define GENERATING_ASM_OFFSETS



#include <linux/kbuild.h>

#include <linux/mm.h>

#include <linux/sched.h>

arch/riscv/kernel/cpu-hotplug.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ void arch_cpuhp_cleanup_dead_cpu(unsigned int cpu) 
	if (cpu_ops[cpu]->cpu_is_stopped)

		ret = cpu_ops[cpu]->cpu_is_stopped(cpu);

	if (ret)

		pr_warn("CPU%d may not have stopped: %d\n", cpu, ret);

		pr_warn("CPU%u may not have stopped: %d\n", cpu, ret);

}



/*

arch/riscv/kernel/efi-header.S

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ extra_header_fields: 
	.long	efi_header_end - _start			// SizeOfHeaders

	.long	0					// CheckSum

	.short	IMAGE_SUBSYSTEM_EFI_APPLICATION		// Subsystem

	.short	0					// DllCharacteristics

	.short	IMAGE_DLL_CHARACTERISTICS_NX_COMPAT	// DllCharacteristics

	.quad	0					// SizeOfStackReserve

	.quad	0					// SizeOfStackCommit

	.quad	0					// SizeOfHeapReserve