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

!780 Backport 5.10.152 LTS 

Merge Pull Request from: @sanglipeng 
 
Backport 5.10.152 LTS patches from upstream.

Conflicts:

Already merged(6):
392536023da1 block: wbt: Remove unnecessary invoking of wbt_update_limits in wbt_init
910ba49b3345 blk-wbt: call rq_qos_add() after wb_normal is initialized 
51b96ecaedc0 arm64: errata: Remove AES hwcap for COMPAT tasks  
7aa3d623c11b net: sched: fix race condition in qdisc_graft()  
f687e2111b6f fcntl: fix potential deadlocks for &fown_struct.lock 
  (merged mainline commit f671a691 fcntl: fix potential deadlocks for &fown_struct.lock)
31b1570677e8 blk-wbt: fix that 'rwb->wc' is always set to 1 in wbt_init() 

Context conflict(3):
dea47fefa6aa perf pmu: Validate raw event with sysfs exported format bits
b1efc196446a fcntl: make F_GETOWN(EX) return 0 on dead owner task

Rejected(1):
a6e770733dc4 arm64: topology: move store_cpu_topology() to shared code

Total patches: 72 - 6 -1 = 65 
 
Link:https://gitee.com/openeuler/kernel/pulls/780

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 81da3d0b 3c424294

Makefile

+3 −1
Original line number Diff line number Diff line
@@ -848,7 +848,9 @@ else 
DEBUG_CFLAGS	+= -g

endif



ifneq ($(LLVM_IAS),1)

ifeq ($(LLVM_IAS),1)

KBUILD_AFLAGS	+= -g

else

KBUILD_AFLAGS	+= -Wa,-gdwarf-2

endif

arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,10 @@ 
	label = "proximity-wifi-lte";

};



&mpss_mem {

	reg = <0x0 0x86000000 0x0 0x8c00000>;

};



&remoteproc_mpss {

	firmware-name = "qcom/sc7180-trogdor/modem/mba.mbn",

			"qcom/sc7180-trogdor/modem/qdsp6sw.mbn";

arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi

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



		mpss_mem: memory@86000000 {

			reg = <0x0 0x86000000 0x0 0x8c00000>;

			reg = <0x0 0x86000000 0x0 0x2000000>;

			no-map;

		};

arch/arm64/kvm/vgic/vgic-its.c

+4 −1
Original line number Diff line number Diff line
@@ -2172,7 +2172,7 @@ static int scan_its_table(struct vgic_its *its, gpa_t base, int size, u32 esz, 


	memset(entry, 0, esz);



	while (len > 0) {

	while (true) {

		int next_offset;

		size_t byte_offset;
@@ -2185,6 +2185,9 @@ static int scan_its_table(struct vgic_its *its, gpa_t base, int size, u32 esz, 
			return next_offset;



		byte_offset = next_offset * esz;

		if (byte_offset >= len)

			break;



		id += next_offset;

		gpa += byte_offset;

		len -= byte_offset;

arch/riscv/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ config RISCV 
	select CLINT_TIMER if !MMU

	select COMMON_CLK

	select EDAC_SUPPORT

	select GENERIC_ARCH_TOPOLOGY if SMP

	select GENERIC_ARCH_TOPOLOGY

	select GENERIC_ATOMIC64 if !64BIT

	select GENERIC_CLOCKEVENTS

	select GENERIC_EARLY_IOREMAP