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

!838 Backport 5.10.154 LTS 

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

Conflicts:

Already merged(11):
3583826b443a  net: tun: fix bugs for oversize packet when napi frags enabled
cb1c012099ef  Bluetooth: L2CAP: Fix use-after-free caused by l2cap_reassemble_sdu
d9ec6e2fbd4a  Bluetooth: L2CAP: fix use-after-free in l2cap_conn_del()
6b6f94fb9a74  Bluetooth: L2CAP: Fix accepting connection request for invalid SPSM
26ca2ac091b4  Bluetooth: L2CAP: Fix attempting to access uninitialized memory
818c36b988b8  tcp/udp: Fix memory leak in ipv6_renew_options().
836686e1a01d  memcg: enable accounting of ipc resources
015ac18be7de  binder: fix UAF of alloc->vma in race with munmap()
ea5f2fd4640e  ftrace: Fix use-after-free for dynamic ftrace_ops
2bf33b5ea46d  tcp/udp: Make early_demux back namespacified.
c6678c8f4f3f  wifi: brcmfmac: Fix potential buffer overflow in brcmf_fweh_event_worker()


context confilict(4):  
523e1dd9f8d4  KVM: nVMX: Pull KVM L0's desired controls directly from vmcs01
391cceee6d43  fscrypt: stop using keyrings subsystem for fscrypt_master_key
29997a6fa60d  fscrypt: fix keyring memory leak on mount failure
e33ce54cef5d  coresight: cti: Fix hang in cti_disable_hw()


Total patches: 117 - 11 = 106 
 
Link:https://gitee.com/openeuler/kernel/pulls/838

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 28186029 1f3f08b9

Documentation/trace/histogram.rst

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ Documentation written by Tom Zanussi 
  will use the event's kernel stacktrace as the key.  The keywords

  'keys' or 'key' can be used to specify keys, and the keywords

  'values', 'vals', or 'val' can be used to specify values.  Compound

  keys consisting of up to two fields can be specified by the 'keys'

  keys consisting of up to three fields can be specified by the 'keys'

  keyword.  Hashing a compound key produces a unique entry in the

  table for each unique combination of component keys, and can be

  useful for providing more fine-grained summaries of event data.

arch/arm/boot/dts/imx6qdl-gw5910.dtsi

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


		user-pb {

			label = "user_pb";

			gpios = <&gsc_gpio 0 GPIO_ACTIVE_LOW>;

			gpios = <&gsc_gpio 2 GPIO_ACTIVE_LOW>;

			linux,code = <BTN_0>;

		};

arch/arm/boot/dts/imx6qdl-gw5913.dtsi

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


		user-pb {

			label = "user_pb";

			gpios = <&gsc_gpio 0 GPIO_ACTIVE_LOW>;

			gpios = <&gsc_gpio 2 GPIO_ACTIVE_LOW>;

			linux,code = <BTN_0>;

		};

arch/arm64/boot/dts/arm/juno-base.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -595,12 +595,26 @@ 
			polling-delay = <1000>;

			polling-delay-passive = <100>;

			thermal-sensors = <&scpi_sensors0 0>;

			trips {

				pmic_crit0: trip0 {

					temperature = <90000>;

					hysteresis = <2000>;

					type = "critical";

				};

			};

		};



		soc {

			polling-delay = <1000>;

			polling-delay-passive = <100>;

			thermal-sensors = <&scpi_sensors0 3>;

			trips {

				soc_crit0: trip0 {

					temperature = <80000>;

					hysteresis = <2000>;

					type = "critical";

				};

			};

		};



		big_cluster_thermal_zone: big-cluster {

arch/parisc/include/asm/hardware.h

+6 −6
Original line number Diff line number Diff line
@@ -10,12 +10,12 @@ 
#define SVERSION_ANY_ID		PA_SVERSION_ANY_ID



struct hp_hardware {

	unsigned short	hw_type:5;	/* HPHW_xxx */

	unsigned short	hversion;

	unsigned long	sversion:28;

	unsigned short	opt;

	const char	name[80];	/* The hardware description */

};

	unsigned int	hw_type:8;	/* HPHW_xxx */

	unsigned int	hversion:12;

	unsigned int	sversion:12;

	unsigned char	opt;

	unsigned char	name[59];	/* The hardware description */

} __packed;



struct parisc_device;