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

!15440 [openEuler-24.03-LTS][linux-6.6.y sync] Backport 6.6.70-6.6.72 LTS Patches 

Merge Pull Request from: @wenzhiwei11 
 
git log --oneline v6.6.70..v6.6.72 | wc -l
132
108+3+21

conflicts(3):
memblock: use numa_valid_node() helper to check for invalid node ID
workqueue: Update lock debugging code
fs/Kconfig: make hugetlbfs a menuconfig

merged(21):
exfat: fix the infinite loop in exfat_readdir()
net_sched: cls_flow: validate TCA_FLOW_RSHIFT attribute
btrfs: avoid NULL pointer dereference if no valid extent tree
netfilter: conntrack: clamp maximum hashtable size to INT_MAX
sched: sch_cake: add bounds checks to host bulk flow fairness counts
drm/mediatek: Set private->all_drm_private[i]->drm to NULL if mtk_drm_bind returns err
ksmbd: fix a missing return value check bug
platform/x86/amd/pmc: Only disable IRQ1 wakeup where i8042 actually enabled it
drm/amd/display: Add check for granularity in dml ceil/floor helpers
riscv: Fix sleeping in invalid context in die()
f2fs: fix null-ptr-deref in f2fs_submit_page_bio()
topology: Keep the cpumask unchanged when printing cpumap
misc: microchip: pci1xxxx: Resolve kernel panic during GPIO IRQ handling
x86/fpu: Ensure shadow stack is active before "getting" registers
iio: light: vcnl4035: fix information leak in triggered buffer
iio: adc: rockchip_saradc: fix information leak in triggered buffer
iio: adc: ti-ads8688: fix information leak in triggered buffer
iio: adc: at91: call input_free_device() on allocated iio_dev
hwmon: (drivetemp) Fix driver producing garbage data when SCSI errors occur
block, bfq: fix waker_bfqq UAF after bfq_split_bfqq()
workqueue: Do not warn when cancelling WQ_MEM_RECLAIM work from !WQ_MEM_RECLAIM worker
 
 
Link:https://gitee.com/openeuler/kernel/pulls/15440

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 2f1a9354 199b17cf

arch/arm/boot/dts/nxp/imx/imxrt1050.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ 
			reg = <0x402c0000 0x4000>;

			interrupts = <110>;

			clocks = <&clks IMXRT1050_CLK_IPG_PDOF>,

				<&clks IMXRT1050_CLK_OSC>,

				<&clks IMXRT1050_CLK_AHB_PODF>,

				<&clks IMXRT1050_CLK_USDHC1>;

			clock-names = "ipg", "ahb", "per";

			bus-width = <4>;

arch/arm64/boot/dts/rockchip/rk3328.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -304,6 +304,7 @@ 


			power-domain@RK3328_PD_HEVC {

				reg = <RK3328_PD_HEVC>;

				clocks = <&cru SCLK_VENC_CORE>;

				#power-domain-cells = <0>;

			};

			power-domain@RK3328_PD_VIDEO {

arch/riscv/include/asm/cacheflush.h

+6 −0
Original line number Diff line number Diff line
@@ -13,6 +13,12 @@ static inline void local_flush_icache_all(void) 
	asm volatile ("fence.i" ::: "memory");

}



static inline void local_flush_icache_range(unsigned long start,

					    unsigned long end)

{

	local_flush_icache_all();

}



#define PG_dcache_clean PG_arch_1



static inline void flush_dcache_folio(struct folio *folio)

arch/riscv/include/asm/page.h

+1 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ struct kernel_mapping { 


extern struct kernel_mapping kernel_map;

extern phys_addr_t phys_ram_base;

extern unsigned long vmemmap_start_pfn;



#define is_kernel_mapping(x)	\

	((x) >= kernel_map.virt_addr && (x) < (kernel_map.virt_addr + kernel_map.size))

arch/riscv/include/asm/patch.h

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#ifndef _ASM_RISCV_PATCH_H

#define _ASM_RISCV_PATCH_H



int patch_insn_write(void *addr, const void *insn, size_t len);

int patch_text_nosync(void *addr, const void *insns, size_t len);

int patch_text_set_nosync(void *addr, u8 c, size_t len);

int patch_text(void *addr, u32 *insns, int ninsns);