Merge ASB #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

Rasenkai wants to merge 185 commits into vicharak-in:master from Rasenkai:master

Makefile

-Original file line number
+Diff line change
@@ -1,7 +1,7 @@
     # SPDX-License-Identifier: GPL-2.0
     VERSION = 5
     PATCHLEVEL = 10
-    SUBLEVEL = 228
+    SUBLEVEL = 230
     EXTRAVERSION =
     NAME = Dare mighty things
@@ Expand Down @@

android/abi_gki_aarch64.xml

Large diffs are not rendered by default.

android/abi_gki_aarch64_arg

-Original file line number
+Diff line change
@@ Expand Up / @@ -62,6 +62,7 @@ @@
       bitmap_release_region
       __bitmap_replace
       __bitmap_set
+      __bitmap_weight
       blk_alloc_queue
       blk_cleanup_queue
       blk_queue_flag_clear
@@ Expand Down Expand Up / @@ -362,6 +363,7 @@ @@
       _dev_info
       __dev_kfree_skb_any
       devm_add_action
+      devm_backlight_device_register
       devm_blk_ksm_init
       devm_clk_bulk_get
       devm_clk_bulk_get_all
@@ Expand Down Expand Up / @@ -414,6 +416,7 @@ @@
       devm_platform_get_and_ioremap_resource
       devm_platform_ioremap_resource
       devm_platform_ioremap_resource_byname
+      devm_power_supply_get_by_phandle
       devm_power_supply_register
       devm_pwm_put
       devm_regmap_add_irq_chip
@@ Expand All / @@ -424,7 +427,6 @@ @@
       __devm_regmap_init_mmio_clk
       devm_regulator_bulk_get
       devm_regulator_get
-      devm_regulator_get_exclusive
       devm_regulator_get_optional
       devm_regulator_put
       devm_regulator_register
@@ Expand Down Expand Up / @@ -1005,7 +1007,11 @@ @@
       __iio_device_register
       iio_device_release_direct_mode
       iio_device_unregister
+      iio_enum_available_read
+      iio_enum_read
+      iio_enum_write
       iio_get_time_ns
+      iio_pollfunc_store_time
       iio_push_event
       iio_push_to_buffers
       iio_read_channel_processed
@@ Expand Down Expand Up / @@ -1662,9 +1668,11 @@ @@
       __pm_runtime_use_autosuspend
       __pm_stay_awake
       pm_stay_awake
+      pm_suspend_global_flags
       pm_system_wakeup
       pm_wakeup_dev_event
       pm_wakeup_ws_event
+      power_supply_am_i_supplied
       power_supply_changed
       power_supply_get_battery_info
       power_supply_get_by_name
@@ Expand All / @@ -1674,8 +1682,10 @@ @@
       power_supply_put_battery_info
       power_supply_register
       power_supply_register_no_ws
+      power_supply_reg_notifier
       power_supply_set_property
       power_supply_unregister
+      power_supply_unreg_notifier
       prandom_bytes
       prandom_u32
       preempt_schedule
@@ Expand Down Expand Up / @@ -1814,6 +1824,7 @@ @@
       regulator_is_supported_voltage
       regulator_list_voltage_linear
       regulator_list_voltage_linear_range
+      regulator_map_voltage_linear
       regulator_map_voltage_linear_range
       regulator_notifier_call_chain
       regulator_put
@@ Expand All / @@ -1824,6 +1835,7 @@ @@
       regulator_set_mode
       regulator_set_voltage
       regulator_set_voltage_sel_regmap
+      regulator_sync_voltage
       regulator_unregister_notifier
       release_firmware
       __release_region
@@ Expand Down Expand Up / @@ -2577,3 +2589,4 @@ @@
     # preserved by --additions-only
       debugfs_file_get
       debugfs_file_put
+      devm_regulator_get_exclusive

android/abi_gki_aarch64_galaxy

-Original file line number
+Diff line change
@@ Expand Up / @@ -3132,6 +3132,7 @@ @@
       scsi_device_get
       scsi_device_put
       scsi_device_quiesce
+      scsi_device_resume
       scsi_dma_unmap
       scsi_eh_ready_devs
       __scsi_execute
@@ Expand Down @@

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

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -363,8 +363,8 @@
  
    &i2c2 {

    	status = "okay";

    	rt5616: rt5616@1b {

    		compatible = "rt5616";

    	rt5616: audio-codec@1b {

    		compatible = "realtek,rt5616";

    		reg = <0x1b>;

    		clocks = <&cru SCLK_I2S_OUT>;

    		clock-names = "mclk";

arch/arm/boot/dts/rk3036.dtsi

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -585,12 +585,13 @@
  
    		};

    	};

    	acodec: acodec-ana@20030000 {

    	acodec: audio-codec@20030000 {

    		compatible = "rockchip,rk3036-codec";

    		reg = <0x20030000 0x4000>;

    		rockchip,grf = <&grf>;

    		clock-names = "acodec_pclk";

    		clocks = <&cru PCLK_ACODEC>;

    		rockchip,grf = <&grf>;

    		#sound-dai-cells = <0>;

    		status = "disabled";

    	};

    @@ -768,11 +769,11 @@
  
    	};

    	spi: spi@20074000 {

    		compatible = "rockchip,rockchip-spi";

    		compatible = "rockchip,rk3036-spi";

    		reg = <0x20074000 0x1000>;

    		interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;

    		clocks = <&cru PCLK_SPI>, <&cru SCLK_SPI>;

    		clock-names = "apb-pclk","spi_pclk";

    		clocks = <&cru SCLK_SPI>, <&cru PCLK_SPI>;

    		clock-names = "spiclk", "apb_pclk";

    		dmas = <&pdma 8>, <&pdma 9>;

    		dma-names = "tx", "rx";

    		pinctrl-names = "default";

arch/arm64/boot/dts/freescale/imx8mp.dtsi

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -659,7 +659,7 @@
  
    				compatible = "fsl,imx8mp-usdhc", "fsl,imx7d-usdhc";

    				reg = <0x30b40000 0x10000>;

    				interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;

    				clocks = <&clk IMX8MP_CLK_DUMMY>,

    				clocks = <&clk IMX8MP_CLK_IPG_ROOT>,

    					 <&clk IMX8MP_CLK_NAND_USDHC_BUS>,

    					 <&clk IMX8MP_CLK_USDHC1_ROOT>;

    				clock-names = "ipg", "ahb", "per";

    @@ -673,7 +673,7 @@
  
    				compatible = "fsl,imx8mp-usdhc", "fsl,imx7d-usdhc";

    				reg = <0x30b50000 0x10000>;

    				interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;

    				clocks = <&clk IMX8MP_CLK_DUMMY>,

    				clocks = <&clk IMX8MP_CLK_IPG_ROOT>,

    					 <&clk IMX8MP_CLK_NAND_USDHC_BUS>,

    					 <&clk IMX8MP_CLK_USDHC2_ROOT>;

    				clock-names = "ipg", "ahb", "per";

    @@ -687,7 +687,7 @@
  
    				compatible = "fsl,imx8mp-usdhc", "fsl,imx7d-usdhc";

    				reg = <0x30b60000 0x10000>;

    				interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;

    				clocks = <&clk IMX8MP_CLK_DUMMY>,

    				clocks = <&clk IMX8MP_CLK_IPG_ROOT>,

    					 <&clk IMX8MP_CLK_NAND_USDHC_BUS>,

    					 <&clk IMX8MP_CLK_USDHC3_ROOT>;

    				clock-names = "ipg", "ahb", "per";

arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -30,14 +30,14 @@
  
    		power_led: led-0 {

    			label = "firefly:red:power";

    			linux,default-trigger = "ir-power-click";

    			linux,default-trigger = "default-on";

    			default-state = "on";

    			gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;

    		};

    		user_led: led-1 {

    			label = "firefly:blue:user";

    			linux,default-trigger = "ir-user-click";

    			linux,default-trigger = "rc-feedback";

    			default-state = "off";

    			gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>;

    		};

arch/arm64/boot/dts/rockchip/rk3328.dtsi

-Original file line number
+Diff line change
@@ Expand Up / @@ -1195,8 +1195,7 @@ @@
     		compatible = "rockchip,rk3328-dw-hdmi";
     		reg = <0x0 0xff3c0000 0x0 0x20000>;
     		reg-io-width = <4>;
-    		interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>,
-    			     <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
+    		interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
     		clocks = <&cru PCLK_HDMI>,
     			 <&cru SCLK_HDMI_SFC>,
     			 <&cru SCLK_RTC32K>;
@@ Expand Down @@

arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi

-Original file line number
+Diff line change
@@ Expand Up / @@ -56,7 +56,6 @@ @@
     			fan: fan@18 {
     				compatible = "ti,amc6821";
     				reg = <0x18>;
-    				#cooling-cells = <2>;
     			};
     			rtc_twi: rtc@6f {
@@ Expand Down @@

arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi

-Original file line number
+Diff line change
@@ Expand Up / @@ -568,7 +568,7 @@ @@
     	bluetooth {
     		compatible = "brcm,bcm43438-bt";
     		clocks = <&rk808 1>;
-    		clock-names = "ext_clock";
+    		clock-names = "txco";
     		device-wakeup-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>;
     		host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>;
     		shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>;
@@ Expand Down @@

arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts

-Original file line number
+Diff line change
@@ Expand Up / @@ -159,7 +159,7 @@ @@
     	status = "okay";
     	rt5651: rt5651@1a {
-    		compatible = "rockchip,rt5651";
+    		compatible = "realtek,rt5651";
     		reg = <0x1a>;
     		clocks = <&cru SCLK_I2S_8CH_OUT>;
     		clock-names = "mclk";
@@ Expand Down @@

arch/arm64/include/asm/uprobes.h

-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,7 @@ @@
     #define UPROBE_SWBP_INSN_SIZE	AARCH64_INSN_SIZE
     #define UPROBE_XOL_SLOT_BYTES	AARCH64_INSN_SIZE
-    typedef u32 uprobe_opcode_t;
+    typedef __le32 uprobe_opcode_t;
     struct arch_uprobe_task {
     };
@@ Expand Down @@

arch/powerpc/platforms/powernv/opal-irqchip.c

-Original file line number
+Diff line change
@@ Expand Up / @@ -285,6 +285,7 @@ int __init opal_event_init(void) @@
     				 name, NULL);
     		if (rc) {
     			pr_warn("Error %d requesting OPAL irq %d\n", rc, (int)r->start);
+    			kfree(name);
     			continue;
     		}
     	}
@@ Expand Down @@

arch/riscv/kernel/asm-offsets.c

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,8 +4,6 @@ @@
      * Copyright (C) 2017 SiFive
      */
-    #define GENERATING_ASM_OFFSETS
     #include <linux/kbuild.h>
     #include <linux/sched.h>
     #include <asm/thread_info.h>
@@ Expand Down @@

arch/riscv/kernel/cpu-hotplug.c

-Original file line number
+Diff line change
@@ Expand Up / @@ -69,7 +69,7 @@ void __cpu_die(unsigned int cpu) @@
     	if (cpu_ops[cpu]->cpu_is_stopped)
     		ret = cpu_ops[cpu]->cpu_is_stopped(cpu);
     	if (ret)
-    		pr_warn("CPU%d may not have stopped: %d\n", cpu, ret);
+    		pr_warn("CPU%u may not have stopped: %d\n", cpu, ret);
     }
     /*
@@ Expand Down @@

arch/riscv/kernel/efi-header.S

-Original file line number
+Diff line change
@@ Expand Up / @@ -59,7 +59,7 @@ extra_header_fields: @@
     	.long	efi_header_end - _start			// SizeOfHeaders
     	.long	0					// CheckSum
     	.short	IMAGE_SUBSYSTEM_EFI_APPLICATION		// Subsystem
-    	.short	0					// DllCharacteristics
+    	.short	IMAGE_DLL_CHARACTERISTICS_NX_COMPAT	// DllCharacteristics
     	.quad	0					// SizeOfStackReserve
     	.quad	0					// SizeOfStackCommit
     	.quad	0					// SizeOfHeapReserve
@@ Expand Down @@

arch/riscv/kernel/traps_misaligned.c

-Original file line number
+Diff line change
@@ Expand Up / @@ -131,8 +131,6 @@ @@
     #define REG_PTR(insn, pos, regs)	\
     	(ulong *)((ulong)(regs) + REG_OFFSET(insn, pos))
-    #define GET_RM(insn)			(((insn) >> 12) & 7)
     #define GET_RS1(insn, regs)		(*REG_PTR(insn, SH_RS1, regs))
     #define GET_RS2(insn, regs)		(*REG_PTR(insn, SH_RS2, regs))
     #define GET_RS1S(insn, regs)		(*REG_PTR(RVC_RS1S(insn), 0, regs))
@@ Expand Down @@

arch/riscv/kernel/vdso/Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,7 @@ obj-vdso = $(patsubst %, %.o, $(vdso-syms)) note.o @@
     ccflags-y := -fno-stack-protector
     ccflags-y += -DDISABLE_BRANCH_PROFILING
+    ccflags-y += -fno-builtin
     ifneq ($(c-gettimeofday-y),)
       CFLAGS_vgettimeofday.o += -fPIC -include $(c-gettimeofday-y)
@@ Expand Down @@

arch/x86/include/asm/nospec-branch.h

-Original file line number
+Diff line change
@@ Expand Up / @@ -199,7 +199,16 @@ @@
      */
     .macro CLEAR_CPU_BUFFERS
     	ALTERNATIVE "jmp .Lskip_verw_\@", "", X86_FEATURE_CLEAR_CPU_BUF
-    	verw _ASM_RIP(mds_verw_sel)
+    #ifdef CONFIG_X86_64
+    	verw mds_verw_sel(%rip)
+    #else
+    	/*
+    	 * In 32bit mode, the memory operand must be a %cs reference. The data
+    	 * segments may not be usable (vm86 mode), and the stack segment may not
+    	 * be flat (ESPFIX32).
+    	 */
+    	verw %cs:mds_verw_sel
+    #endif
     .Lskip_verw_\@:
     .endm
@@ Expand Down @@

arch/x86/kvm/svm/nested.c

-Original file line number
+Diff line change
@@ Expand Up @@
     	u64 pdpte;
     	int ret;
+    	/*
+    	 * Note, nCR3 is "assumed" to be 32-byte aligned, i.e. the CPU ignores
+    	 * nCR3[4:0] when loading PDPTEs from memory.
+    	 */
     	ret = kvm_vcpu_read_guest_page(vcpu, gpa_to_gfn(cr3), &pdpte,
-    				       offset_in_page(cr3) + index * 8, 8);
+    				       (cr3 & GENMASK(11, 5)) + index * 8, 8);
     	if (ret)
     		return 0;
     	return pdpte;
@@ Expand Down @@

block/bfq-cgroup.c

-Original file line number
+Diff line change
@@ Expand Up @@
     {
     	if (blkg_rwstat_init(&stats->bytes, gfp) ||
     	    blkg_rwstat_init(&stats->ios, gfp))
-    		return -ENOMEM;
+    		goto error;
     #ifdef CONFIG_BFQ_CGROUP_DEBUG
     	if (blkg_rwstat_init(&stats->merged, gfp) ||
@@ Expand All @@
     	    bfq_stat_init(&stats->dequeue, gfp) ||
     	    bfq_stat_init(&stats->group_wait_time, gfp) ||
     	    bfq_stat_init(&stats->idle_time, gfp) ||
-    	    bfq_stat_init(&stats->empty_time, gfp)) {
-    		bfqg_stats_exit(stats);
-    		return -ENOMEM;
-    	}
+    	    bfq_stat_init(&stats->empty_time, gfp))
+    		goto error;
     #endif
     	return 0;
+    error:
+    	bfqg_stats_exit(stats);
+    	return -ENOMEM;
     }
     static struct bfq_group_data *cpd_to_bfqgd(struct blkcg_policy_data *cpd)
@@ Expand Down @@

drivers/acpi/button.c

-Original file line number
+Diff line change
@@ Expand Up / @@ -124,6 +124,17 @@ static const struct dmi_system_id dmi_lid_quirks[] = { @@
     		},
     		.driver_data = (void *)(long)ACPI_BUTTON_LID_INIT_OPEN,
     	},
+    	{
+    		/*
+    		 * Samsung galaxybook2 ,initial _LID device notification returns
+    		 * lid closed.
+    		 */
+    		.matches = {
+    			DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
+    			DMI_MATCH(DMI_PRODUCT_NAME, "750XED"),
+    		},
+    		.driver_data = (void *)(long)ACPI_BUTTON_LID_INIT_OPEN,
+    	},
     	{}
     };
@@ Expand Down @@

drivers/acpi/resource.c

-Original file line number
+Diff line change
@@ Expand Up / @@ -507,6 +507,13 @@ static const struct dmi_system_id asus_laptop[] = { @@
     			DMI_MATCH(DMI_BOARD_NAME, "GMxHGxx"),
     		},
     	},
+    	{
+    		/* LG Electronics 16T90SP */
+    		.matches = {
+    			DMI_MATCH(DMI_SYS_VENDOR, "LG Electronics"),
+    			DMI_MATCH(DMI_BOARD_NAME, "16T90SP"),
+    		},
+    	},
     	{ }
     };
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge ASB #3

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Merge ASB #3

Are you sure you want to change the base?

Uh oh!

Merge ASB #3

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!