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

!12281 [openEuler-24.03-LTS][linux-6.6.y sync] Backport 6.6.48-6.6.49 LTS Patches 

Merge Pull Request from: @wenzhiwei11 
 
git log --oneline v6.6.48..v6.6.49 | wc -l
93
83+9+1
Merged commits(9)

 btrfs: fix a use-after-free when hitting errors inside btrfs_submit_chunk() 
 smb/client: avoid dereferencing rdata=NULL in smb2_new_read_req()
 tracing: Have format file honor EVENT_FILE_FL_FREED
 ovl: pass string to ovl_parse_layer()
 ovl: fix wrong lowerdir number check for parameter Opt_lowerdir
 selinux,smack: don't bypass permissions check in inode_setsecctx hook
 ethtool: check device is present when getting link settings
 usb: dwc3: st: fix probed platform device ref count on probe error path
 scsi: aacraid: Fix double-free on probe failure

Conflicts commit(1)

 Revert "change alloc_pages name in dma_map_ops to avoid name conflicts" 
 
Link:https://gitee.com/openeuler/kernel/pulls/12281

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 7cefb1cd e3e192e8

arch/arm/boot/dts/nxp/imx/imx6dl-yapp43-common.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -274,24 +274,24 @@ 


		led@0 {

			chan-name = "R";

			led-cur = /bits/ 8 <0x20>;

			max-cur = /bits/ 8 <0x60>;

			led-cur = /bits/ 8 <0x6e>;

			max-cur = /bits/ 8 <0xc8>;

			reg = <0>;

			color = <LED_COLOR_ID_RED>;

		};



		led@1 {

			chan-name = "G";

			led-cur = /bits/ 8 <0x20>;

			max-cur = /bits/ 8 <0x60>;

			led-cur = /bits/ 8 <0xbe>;

			max-cur = /bits/ 8 <0xc8>;

			reg = <1>;

			color = <LED_COLOR_ID_GREEN>;

		};



		led@2 {

			chan-name = "B";

			led-cur = /bits/ 8 <0x20>;

			max-cur = /bits/ 8 <0x60>;

			led-cur = /bits/ 8 <0xbe>;

			max-cur = /bits/ 8 <0xc8>;

			reg = <2>;

			color = <LED_COLOR_ID_BLUE>;

		};

arch/arm/boot/dts/ti/omap/omap3-n900.dts

+1 −1
Original line number Diff line number Diff line
@@ -781,7 +781,7 @@ 


		mount-matrix =	 "-1",  "0",  "0",

				  "0",  "1",  "0",

				  "0",  "0",  "1";

				  "0",  "0",  "-1";

	};



	cam1: camera@3e {

arch/arm64/boot/dts/freescale/imx8mp-beacon-kit.dts

+5 −7
Original line number Diff line number Diff line
@@ -163,13 +163,12 @@ 


		simple-audio-card,cpu {

			sound-dai = <&sai3>;

			frame-master;

			bitclock-master;

		};



		simple-audio-card,codec {

			sound-dai = <&wm8962>;

			clocks = <&clk IMX8MP_CLK_IPP_DO_CLKO1>;

			frame-master;

			bitclock-master;

		};

	};

};
@@ -381,10 +380,9 @@ 
&sai3 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_sai3>;

	assigned-clocks = <&clk IMX8MP_CLK_SAI3>,

			  <&clk IMX8MP_AUDIO_PLL2> ;

	assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL2_OUT>;

	assigned-clock-rates = <12288000>, <361267200>;

	assigned-clocks = <&clk IMX8MP_CLK_SAI3>;

	assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL1_OUT>;

	assigned-clock-rates = <12288000>;

	fsl,sai-mclk-direction-output;

	status = "okay";

};

arch/arm64/boot/dts/freescale/imx93-tqma9352-mba93xxla.dts

+1 −1
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ 
	pinctrl-0 = <&pinctrl_usdhc2_hs>, <&pinctrl_usdhc2_gpio>;

	pinctrl-1 = <&pinctrl_usdhc2_uhs>, <&pinctrl_usdhc2_gpio>;

	pinctrl-2 = <&pinctrl_usdhc2_uhs>, <&pinctrl_usdhc2_gpio>;

	cd-gpios = <&gpio3 00 GPIO_ACTIVE_LOW>;

	cd-gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;

	vmmc-supply = <&reg_usdhc2_vmmc>;

	bus-width = <4>;

	no-sdio;

arch/arm64/boot/dts/freescale/imx93-tqma9352.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
		linux,cma {

			compatible = "shared-dma-pool";

			reusable;

			alloc-ranges = <0 0x60000000 0 0x40000000>;

			alloc-ranges = <0 0x80000000 0 0x40000000>;

			size = <0 0x10000000>;

			linux,cma-default;

		};