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

!2938 Backport 5.10.183 - 5.10.184 LTS patches from upstream 

Merge Pull Request from: @sanglipeng 
 
https://gitee.com/openeuler/kernel/issues/I8IRR2


Conflicts:

Already merged(8):
7c5c67aa29444: net/sched: flower: fix possible OOB write in fl_set_geneve_opt()
01c3d30649759: nbd: Fix debugfs_create_dir error checking
eb37fef417a24: media: ttusb-dec: fix memory leak in ttusb_dec_exit_dvb()
ae7e941f4dc35: net: sched: fix NULL pointer dereference in mq_attach
d03d31d3a2060: gfs2: Don't deref jdesc in evict
2ea7d26ed851d: media: dvb-core: Fix use-after-free due on race condition at dvb_net
ca2d171fd1f3e: media: dvb-core: Fix kernel WARNING for blocking operation in wait_event*()
76169f7490899: media: dvb-core: Fix use-after-free due to race condition at dvb_ca_en50221

Rejected(4):
0dcf021af4cb3: ALSA: hda: Glenfly: add HD Audio PCI IDs and HDMI Codec Vendor IDs.
a2cd7599b558d: scsi: dpt_i2o: Remove broken pass-through ioctl (I2OUSERCMD)
d21a20f4421db: scsi: dpt_i2o: Do not process completions with invalid addresses
0e98a97f772f2: xfs: verify buffer contents when we skip log replay

Kabi broken(2):
cccc6209708f5: tcp: deny tcp_disconnect() when threads are waiting
9fcc3c3d26a04: neighbour: fix unaligned access to pneigh_entry

Config broken(2):
842156dc0aad5: ARM: defconfig: drop CONFIG_DRM_RCAR_LVDS
6d6612f7f9768: drm/rcar: stop using 'imply' for dependencies

Total patches: 188 - 8 - 4 - 2 - 2 = 172 
 
Link:https://gitee.com/openeuler/kernel/pulls/2938

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents c0386911 dfb55421

Documentation/devicetree/bindings/sound/tas2562.yaml

+4 −2
Original line number Diff line number Diff line
@@ -50,7 +50,9 @@ properties: 
    description: TDM TX current sense time slot.



  '#sound-dai-cells':

    const: 1

    # The codec has a single DAI, the #sound-dai-cells=<1>; case is left in for backward

    # compatibility but is deprecated.

    enum: [0, 1]



required:

  - compatible
@@ -67,7 +69,7 @@ examples: 
     codec: codec@4c {

       compatible = "ti,tas2562";

       reg = <0x4c>;

       #sound-dai-cells = <1>;

       #sound-dai-cells = <0>;

       interrupt-parent = <&gpio1>;

       interrupts = <14>;

       shutdown-gpios = <&gpio1 15 0>;

Documentation/devicetree/bindings/sound/tas2764.yaml

+4 −2
Original line number Diff line number Diff line
@@ -46,7 +46,9 @@ properties: 
    description: TDM TX voltage sense time slot.



  '#sound-dai-cells':

    const: 1

    # The codec has a single DAI, the #sound-dai-cells=<1>; case is left in for backward

    # compatibility but is deprecated.

    enum: [0, 1]



required:

  - compatible
@@ -63,7 +65,7 @@ examples: 
     codec: codec@38 {

       compatible = "ti,tas2764";

       reg = <0x38>;

       #sound-dai-cells = <1>;

       #sound-dai-cells = <0>;

       interrupt-parent = <&gpio1>;

       interrupts = <14>;

       reset-gpios = <&gpio1 15 0>;

Documentation/devicetree/bindings/sound/tas2770.yaml

+4 −2
Original line number Diff line number Diff line
@@ -52,7 +52,9 @@ properties: 
      - 1 # Falling edge



  '#sound-dai-cells':

    const: 1

    # The codec has a single DAI, the #sound-dai-cells=<1>; case is left in for backward

    # compatibility but is deprecated.

    enum: [0, 1]



required:

  - compatible
@@ -69,7 +71,7 @@ examples: 
     codec: codec@41 {

       compatible = "ti,tas2770";

       reg = <0x41>;

       #sound-dai-cells = <1>;

       #sound-dai-cells = <0>;

       interrupt-parent = <&gpio1>;

       interrupts = <14>;

       reset-gpio = <&gpio1 15 0>;

Makefile

+4 −0
Original line number Diff line number Diff line
@@ -815,6 +815,10 @@ endif 
KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)



KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable)



# These result in bogus false positives

KBUILD_CFLAGS += $(call cc-disable-warning, dangling-pointer)



ifdef CONFIG_FRAME_POINTER

KBUILD_CFLAGS	+= -fno-omit-frame-pointer -fno-optimize-sibling-calls

else

arch/arm/boot/dts/stm32f7-pinctrl.dtsi

+82 −0
Original line number Diff line number Diff line
@@ -284,6 +284,88 @@ 
					slew-rate = <2>;

				};

			};



			can1_pins_a: can1-0 {

				pins1 {

					pinmux = <STM32_PINMUX('A', 12, AF9)>; /* CAN1_TX */

				};

				pins2 {

					pinmux = <STM32_PINMUX('A', 11, AF9)>; /* CAN1_RX */

					bias-pull-up;

				};

			};



			can1_pins_b: can1-1 {

				pins1 {

					pinmux = <STM32_PINMUX('B', 9, AF9)>; /* CAN1_TX */

				};

				pins2 {

					pinmux = <STM32_PINMUX('B', 8, AF9)>; /* CAN1_RX */

					bias-pull-up;

				};

			};



			can1_pins_c: can1-2 {

				pins1 {

					pinmux = <STM32_PINMUX('D', 1, AF9)>; /* CAN1_TX */

				};

				pins2 {

					pinmux = <STM32_PINMUX('D', 0, AF9)>; /* CAN1_RX */

					bias-pull-up;



				};

			};



			can1_pins_d: can1-3 {

				pins1 {

					pinmux = <STM32_PINMUX('H', 13, AF9)>; /* CAN1_TX */

				};

				pins2 {

					pinmux = <STM32_PINMUX('H', 14, AF9)>; /* CAN1_RX */

					bias-pull-up;



				};

			};



			can2_pins_a: can2-0 {

				pins1 {

					pinmux = <STM32_PINMUX('B', 6, AF9)>; /* CAN2_TX */

				};

				pins2 {

					pinmux = <STM32_PINMUX('B', 5, AF9)>; /* CAN2_RX */

					bias-pull-up;

				};

			};



			can2_pins_b: can2-1 {

				pins1 {

					pinmux = <STM32_PINMUX('B', 13, AF9)>; /* CAN2_TX */

				};

				pins2 {

					pinmux = <STM32_PINMUX('B', 12, AF9)>; /* CAN2_RX */

					bias-pull-up;

				};

			};



			can3_pins_a: can3-0 {

				pins1 {

					pinmux = <STM32_PINMUX('A', 15, AF11)>; /* CAN3_TX */

				};

				pins2 {

					pinmux = <STM32_PINMUX('A', 8, AF11)>; /* CAN3_RX */

					bias-pull-up;

				};

			};



			can3_pins_b: can3-1 {

				pins1 {

					pinmux = <STM32_PINMUX('B', 4, AF11)>;  /* CAN3_TX */

				};

				pins2 {

					pinmux = <STM32_PINMUX('B', 3, AF11)>; /* CAN3_RX */

					bias-pull-up;

				};

			};

		};

	};

};