From: Greg Kroah-Hartman Date: Tue, 18 Oct 2022 16:53:52 +0000 (+0200) Subject: drop 2 more 6.0 patches X-Git-Tag: v6.0.3~57 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ce5553a2cd7c484cca3129482414d0db6786b00;p=thirdparty%2Fkernel%2Fstable-queue.git drop 2 more 6.0 patches --- diff --git a/queue-6.0/arm-dts-imx6dl-yapp4-bind-the-backlight-controller-t.patch b/queue-6.0/arm-dts-imx6dl-yapp4-bind-the-backlight-controller-t.patch deleted file mode 100644 index f28a43e8c83..00000000000 --- a/queue-6.0/arm-dts-imx6dl-yapp4-bind-the-backlight-controller-t.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 12e62bf9291b4e7216019a542a32526fb6e882ba Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 14 Jul 2022 18:25:15 +0200 -Subject: ARM: dts: imx6dl-yapp4: Bind the backlight controller to the LCD - panel -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Michal Vokáč - -[ Upstream commit 8b212526a957e012e88d68d7f33bb11b312c2ea6 ] - -Add connection between the backlight controller and LCD panel. -With that the backlight is automatically switched on when the panel -is on or switched off when the panel is blanked. - -Signed-off-by: Michal Vokáč -Reviewed-by: Fabio Estevam -Signed-off-by: Shawn Guo -Stable-dep-of: afd8f77957e3 ("ARM: dts: imx6qdl-kontron-samx6i: hook up DDC i2c bus") -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/arm/boot/dts/imx6dl-yapp4-common.dtsi b/arch/arm/boot/dts/imx6dl-yapp4-common.dtsi -index 674af39c884a..52162e8c7274 100644 ---- a/arch/arm/boot/dts/imx6dl-yapp4-common.dtsi -+++ b/arch/arm/boot/dts/imx6dl-yapp4-common.dtsi -@@ -55,6 +55,7 @@ - panel: panel { - compatible = "dataimage,scf0700c48ggu18"; - power-supply = <&sw2_reg>; -+ backlight = <&backlight>; - status = "disabled"; - - port { --- -2.35.1 - diff --git a/queue-6.0/series b/queue-6.0/series index 25a32d8647d..61d270d7e6a 100644 --- a/queue-6.0/series +++ b/queue-6.0/series @@ -312,7 +312,6 @@ mips-dts-ralink-mt7621-fix-external-phy-on-gb-pc2.patch x86-microcode-amd-track-patch-allocation-size-explic.patch libbpf-restore-memory-layout-of-bpf_object_open_opts.patch wifi-ath11k-fix-peer-addition-deletion-error-on-sta-.patch -x86-boot-remove-superfluous-type-casting-from-arch-x.patch x86-cpu-include-the-header-of-init_ia32_feat_ctl-s-p.patch spi-cadence-quadspi-fix-pm-disable-depth-imbalance-i.patch spi-dw-fix-pm-disable-depth-imbalance-in-dw_spi_bt1_.patch @@ -421,7 +420,6 @@ memory-of-fix-refcount-leak-bug-in-of_lpddr3_get_ddr.patch locks-fix-toctou-race-when-granting-write-lease.patch soc-qcom-smsm-fix-refcount-leak-bugs-in-qcom_smsm_pr.patch soc-qcom-smem_state-add-refcounting-for-the-state-of.patch -arm-dts-imx6dl-yapp4-bind-the-backlight-controller-t.patch arm-dts-imx6qdl-kontron-samx6i-hook-up-ddc-i2c-bus.patch arm64-dts-renesas-r9a07g044-fix-sci-rx-tx-interrupt-.patch arm64-dts-renesas-r9a07g054-fix-sci-rx-tx-interrupt-.patch diff --git a/queue-6.0/x86-boot-remove-superfluous-type-casting-from-arch-x.patch b/queue-6.0/x86-boot-remove-superfluous-type-casting-from-arch-x.patch deleted file mode 100644 index 3a3cd514d82..00000000000 --- a/queue-6.0/x86-boot-remove-superfluous-type-casting-from-arch-x.patch +++ /dev/null @@ -1,47 +0,0 @@ -From a40bc07edf5c31315fcce431a19217799f69ec28 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 25 Jul 2022 12:23:58 +0800 -Subject: x86/boot: Remove superfluous type casting from arch/x86/boot/bitops.h - -From: Li kunyu - -[ Upstream commit 039f0e054a29d06970892240d70143150d2aaec2 ] - -'const void *' will auto-type-convert to just about any other const -pointer type, no need to force it. - - [ mingo: Rewrote the changelog. ] - -Signed-off-by: Li kunyu -Signed-off-by: Ingo Molnar -Signed-off-by: Borislav Petkov -Link: https://lore.kernel.org/r/20220725042358.3377-1-kunyu@nfschina.com -Stable-dep-of: 30ea703a38ef ("x86/cpu: Include the header of init_ia32_feat_ctl()'s prototype") -Signed-off-by: Sasha Levin ---- - arch/x86/boot/bitops.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h -index 02e1dea11d94..8518ae214c9b 100644 ---- a/arch/x86/boot/bitops.h -+++ b/arch/x86/boot/bitops.h -@@ -19,13 +19,13 @@ - - static inline bool constant_test_bit(int nr, const void *addr) - { -- const u32 *p = (const u32 *)addr; -+ const u32 *p = addr; - return ((1UL << (nr & 31)) & (p[nr >> 5])) != 0; - } - static inline bool variable_test_bit(int nr, const void *addr) - { - bool v; -- const u32 *p = (const u32 *)addr; -+ const u32 *p = addr; - - asm("btl %2,%1" CC_SET(c) : CC_OUT(c) (v) : "m" (*p), "Ir" (nr)); - return v; --- -2.35.1 -