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

!15686 [openEuler-24.03-LTS][linux-6.6.y sync] Backport 6.6.76-6.6.78 LTS Patches 

Merge Pull Request from: @koishimind 
 
git log --oneline v6.6.76..v6.6.78 | wc -l
277=253+8+12+4
253+8+12+4+8

check-kabi(8):
drm/connector: add mutex to protect ELD from concurrent access
drm/vc4: hdmi: use eld_mutex to protect access to connector->eld
drm/sti: hdmi: use eld_mutex to protect access to connector->eld
drm/radeon: use eld_mutex to protect access to connector->eld
drm/exynos: hdmi: use eld_mutex to protect access to connector->eld
drm/amd/display: use eld_mutex to protect access to connector->eld
drm/bridge: ite-it66121: use eld_mutex to protect access to connector->eld
drm/bridge: anx7625: use eld_mutex to protect access to connector->eld

merged(12):
wifi: brcmfmac: Check the return value of of_property_read_string_index()
nvme: handle connectivity loss in nvme_set_queue_count
binfmt_flat: Fix integer overflow bug on 32 bit systems
clk: qcom: dispcc-sm6350: Add missing parent_map for a clock
blk-cgroup: Fix class @block_class's subsystem refcount leakage
usbnet: ipheth: fix possible overflow in DPE length check
mm: kmemleak: fix upper boundary check for physical address objects
ata: libata-sff: Ensure that we cannot write outside the allocated buffer
ocfs2: handle a symlink read error correctly
nilfs2: fix possible int overflows in nilfs_fiemap()
tracing/osnoise: Fix resetting of tracepoints
ptp: Ensure info->enable callback is always set

conflicts(4):
exec: fix up /proc/pid/comm in the execveat(AT_EMPTY_PATH) case
cachefiles: Fix NULL pointer dereference in object->file
mptcp: pm: only set fullmesh for subflow endp
selftests: mptcp: join: fix AF_INET6 variable

check-depends(8):
rtla/timerlat_top: Set OSNOISE_WORKLOAD for kernel threads
rtla/timerlat_hist: Set OSNOISE_WORKLOAD for kernel threads
Revert "rtla/timerlat_hist: Set OSNOISE_WORKLOAD for kernel threads"
Revert "rtla/timerlat_top: Set OSNOISE_WORKLOAD for kernel threads"
Revert "KVM: PPC: e500: Mark "struct page" dirty in kvmppc_e500_shadow_map()"
Revert "KVM: PPC: e500: Mark "struct page" pfn accessed before dropping mmu_lock"
Revert "KVM: PPC: e500: Use __kvm_faultin_pfn() to handle page faults"
Revert "KVM: e500: always restore irqs"
ALSA: hda/realtek: Fix built-in mic assignment on ASUS VivoBook X515UA
ALSA: hda/realtek: Fix wrong mic setup for ASUS VivoBook 15
ALSA: hda/realtek: Add quirks for ASUS ROG 2023 models
ALSA: hda/realtek: Fix microphone regression on ASUS N705UD
Revert "of: reserved-memory: Fix using wrong number of cells to get property 'alignment'"
char: misc: deallocate static minor in error path
 
 
Link:https://gitee.com/openeuler/kernel/pulls/15686

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents b85054be 3c01d922

arch/arm/boot/dts/ti/omap/dra7-l4.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
	ranges = <0x00000000 0x4a000000 0x100000>,	/* segment 0 */

		 <0x00100000 0x4a100000 0x100000>,	/* segment 1 */

		 <0x00200000 0x4a200000 0x100000>;	/* segment 2 */

	dma-ranges;



	segment@0 {					/* 0x4a000000 */

		compatible = "simple-pm-bus";
@@ -557,6 +558,7 @@ 
			 <0x0007e000 0x0017e000 0x001000>,	/* ap 124 */

			 <0x00059000 0x00159000 0x001000>,	/* ap 125 */

			 <0x0005a000 0x0015a000 0x001000>;	/* ap 126 */

		dma-ranges;



		target-module@2000 {			/* 0x4a102000, ap 27 3c.0 */

			compatible = "ti,sysc";

arch/arm/boot/dts/ti/omap/omap3-gta04.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -446,6 +446,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <

			&hsusb2_2_pins

			&mcspi3hog_pins

	>;



	hsusb2_2_pins: hsusb2-2-pins {
@@ -459,6 +460,15 @@ 
		>;

	};



	mcspi3hog_pins: mcspi3hog-pins {

		pinctrl-single,pins = <

			OMAP3630_CORE2_IOPAD(0x25dc, PIN_OUTPUT_PULLDOWN | MUX_MODE4)	/* etk_d0 */

			OMAP3630_CORE2_IOPAD(0x25de, PIN_OUTPUT_PULLDOWN | MUX_MODE4)	/* etk_d1 */

			OMAP3630_CORE2_IOPAD(0x25e0, PIN_OUTPUT_PULLDOWN | MUX_MODE4)	/* etk_d2 */

			OMAP3630_CORE2_IOPAD(0x25e2, PIN_OUTPUT_PULLDOWN | MUX_MODE4)	/* etk_d3 */

		>;

	};



	spi_gpio_pins: spi-gpio-pinmux-pins {

		pinctrl-single,pins = <

			OMAP3630_CORE2_IOPAD(0x25d8, PIN_OUTPUT | MUX_MODE4) /* clk */

arch/arm64/boot/dts/nvidia/tegra234.dtsi

+4 −2
Original line number Diff line number Diff line
@@ -1709,7 +1709,7 @@ 
			compatible = "nvidia,tegra234-sce-fabric";

			reg = <0x0 0xb600000 0x0 0x40000>;

			interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;

			status = "okay";

			status = "disabled";

		};



		rce-fabric@be00000 {
@@ -1889,7 +1889,7 @@ 
		};



		dce-fabric@de00000 {

			compatible = "nvidia,tegra234-sce-fabric";

			compatible = "nvidia,tegra234-dce-fabric";

			reg = <0x0 0xde00000 0x0 0x40000>;

			interrupts = <GIC_SPI 381 IRQ_TYPE_LEVEL_HIGH>;

			status = "okay";
@@ -1912,6 +1912,8 @@ 
			#redistributor-regions = <1>;

			#interrupt-cells = <3>;

			interrupt-controller;



			#address-cells = <0>;

		};



		smmu_iso: iommu@10000000 {

arch/arm64/boot/dts/qcom/sm6115.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -1667,7 +1667,7 @@ 


		remoteproc_mpss: remoteproc@6080000 {

			compatible = "qcom,sm6115-mpss-pas";

			reg = <0x0 0x06080000 0x0 0x100>;

			reg = <0x0 0x06080000 0x0 0x10000>;



			interrupts-extended = <&intc GIC_SPI 307 IRQ_TYPE_EDGE_RISING>,

					      <&modem_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
@@ -2310,9 +2310,9 @@ 
			};

		};



		remoteproc_adsp: remoteproc@ab00000 {

		remoteproc_adsp: remoteproc@a400000 {

			compatible = "qcom,sm6115-adsp-pas";

			reg = <0x0 0x0ab00000 0x0 0x100>;

			reg = <0x0 0x0a400000 0x0 0x4040>;



			interrupts-extended = <&intc GIC_SPI 282 IRQ_TYPE_EDGE_RISING>,

					      <&adsp_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
@@ -2384,7 +2384,7 @@ 


		remoteproc_cdsp: remoteproc@b300000 {

			compatible = "qcom,sm6115-cdsp-pas";

			reg = <0x0 0x0b300000 0x0 0x100000>;

			reg = <0x0 0x0b300000 0x0 0x4040>;



			interrupts-extended = <&intc GIC_SPI 265 IRQ_TYPE_EDGE_RISING>,

					      <&cdsp_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,

arch/arm64/boot/dts/qcom/sm6350.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -935,7 +935,7 @@ 
				power-domains = <&rpmhpd SM6350_CX>;

				operating-points-v2 = <&qup_opp_table>;

				interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>,

						<&aggre1_noc MASTER_QUP_0 0 &clk_virt SLAVE_EBI_CH0 0>;

						<&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_QUP_0 0>;

				interconnect-names = "qup-core", "qup-config";

				status = "disabled";

			};
@@ -1259,7 +1259,7 @@ 


		adsp: remoteproc@3000000 {

			compatible = "qcom,sm6350-adsp-pas";

			reg = <0 0x03000000 0 0x100>;

			reg = <0x0 0x03000000 0x0 0x10000>;



			interrupts-extended = <&pdc 6 IRQ_TYPE_LEVEL_HIGH>,

					      <&smp2p_adsp_in 0 IRQ_TYPE_EDGE_RISING>,
@@ -1480,7 +1480,7 @@ 


		mpss: remoteproc@4080000 {

			compatible = "qcom,sm6350-mpss-pas";

			reg = <0x0 0x04080000 0x0 0x4040>;

			reg = <0x0 0x04080000 0x0 0x10000>;



			interrupts-extended = <&intc GIC_SPI 136 IRQ_TYPE_EDGE_RISING>,

					      <&modem_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,