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

!1541 Backport 5.10.158 - 5.10.159 LTS patches from upstream. 

Merge Pull Request from: @sanglipeng 
 
Backport 5.10.158 - 5.10.159 LTS patches from upstream.

Conflicts:

context confilict(4):  
5e3d4a68e2e1: x86/tsx: Add a feature bit for TSX control MSR support
7c7075c88da4: rtc: mc146818: Prevent reading garbage
8bb5fe58305f: rtc: mc146818-lib: fix RTC presence check
3eecd2bc10e0: xen/netback: do some code cleanup

Already merged(9):
a2efc465245e: io_uring: don't hold uring_lock when calling io_run_task_work*
4aa32aaef6c1: proc: avoid integer type confusion in get_proc_long
9ba389863ac6: proc: proc_skip_spaces() shouldn't think it is working on C strings
83632fc41449: xen/netback: don't call kfree_skb() with interrupts disabled
c42221efb115: can: af_can: fix NULL pointer dereference in can_rcv_filter
575a6266f63d: af_unix: Get user_ns from in_skb in unix_diag_get_exact().
49e07c0768db: xen/netback: Ensure protocol headers don't fall in the non-linear area
fccee93eb20d: mm/hugetlb: fix races when looking up a CONT-PTE/PMD size hugetlb page
a00444e25bbc: xen/netback: fix build warning

Rejected(1):
f1f7f36cf682: memcg: fix possible use-after-free in memcg_write_event_control()

Total patches: 193 - 9 -1  = 183 
 
Link:https://gitee.com/openeuler/kernel/pulls/1541

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 598a1d66 82e4861c

arch/alpha/kernel/rtc.c

+6 −1
Original line number Diff line number Diff line
@@ -80,7 +80,12 @@ init_rtc_epoch(void) 
static int

alpha_rtc_read_time(struct device *dev, struct rtc_time *tm)

{

	mc146818_get_time(tm);

	int ret = mc146818_get_time(tm);



	if (ret < 0) {

		dev_err_ratelimited(dev, "unable to read current time\n");

		return ret;

	}



	/* Adjust for non-default epochs.  It's easier to depend on the

	   generic __get_rtc_time and adjust the epoch here than create

arch/arm/boot/dts/at91rm9200.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -660,7 +660,7 @@ 
				compatible = "atmel,at91rm9200-udc";

				reg = <0xfffb0000 0x4000>;

				interrupts = <11 IRQ_TYPE_LEVEL_HIGH 2>;

				clocks = <&pmc PMC_TYPE_PERIPHERAL 11>, <&pmc PMC_TYPE_SYSTEM 2>;

				clocks = <&pmc PMC_TYPE_PERIPHERAL 11>, <&pmc PMC_TYPE_SYSTEM 1>;

				clock-names = "pclk", "hclk";

				status = "disabled";

			};

arch/arm/boot/dts/imx7s.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -1224,7 +1224,7 @@ 
		gpmi: nand-controller@33002000{

			compatible = "fsl,imx7d-gpmi-nand";

			#address-cells = <1>;

			#size-cells = <0>;

			#size-cells = <1>;

			reg = <0x33002000 0x2000>, <0x33004000 0x4000>;

			reg-names = "gpmi-nand", "bch";

			interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/boot/dts/rk3036-evb.dts

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

	status = "okay";



	hym8563: hym8563@51 {

	hym8563: rtc@51 {

		compatible = "haoyu,hym8563";

		reg = <0x51>;

		#clock-cells = <0>;

arch/arm/boot/dts/rk3188-radxarock.dts

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
		#sound-dai-cells = <0>;

	};



	ir_recv: gpio-ir-receiver {

	ir_recv: ir-receiver {

		compatible = "gpio-ir-receiver";

		gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;

		pinctrl-names = "default";