Drop arm-config-mutli-v7-reenable-fb-dependency.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.10/arm-config-mutli-v7-reenable-fb-dependency.patch b/queue-5.10/arm-config-mutli-v7-reenable-fb-dependency.patch
deleted file mode 100644 (file)
index 19c81d2..0000000
--- a/queue-5.10/arm-config-mutli-v7-reenable-fb-dependency.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From eeae00b11f89acbcf7e0adda66e5571a4b154adc Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 15 Jun 2021 10:44:34 +0930
-Subject: ARM: config: mutli v7: Reenable FB dependency
-
-From: Joel Stanley <joel@jms.id.au>
-
-[ Upstream commit 8c1768967e2733d55abf449d8abd6f1915ba3539 ]
-
-DRM_FBDEV_EMULATION previously selected FB and was default y as long as DRM
-was enabled. In commit f611b1e7624c ("drm: Avoid circular dependencies for
-CONFIG_FB") the select was replaced with a depends on FB, disabling the
-drivers that depended on it.
-
-Renable FB so we get back FB_EFI, FB_WM8505, FB_SH_MOBILE_LCDC, FB_SIMPLE and
-VIDEO_VIVID.
-
-It must be set to y and not a module as the test driver VIDEO_VIVID
-requires it to be built in.
-
-Link: https://lore.kernel.org/r/CAK8P3a18EdBKQdGDOZc9cPKsf=hY8==v2cO0DBE_tyd82Uq-Ng@mail.gmail.com
-Signed-off-by: Joel Stanley <joel@jms.id.au>
-Reviewed-by: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/configs/multi_v7_defconfig | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
-index a611b0c1e540..b1073fb3a132 100644
---- a/arch/arm/configs/multi_v7_defconfig
-+++ b/arch/arm/configs/multi_v7_defconfig
-@@ -701,6 +701,7 @@ CONFIG_DRM_PL111=m
- CONFIG_DRM_LIMA=m
- CONFIG_DRM_PANFROST=m
- CONFIG_DRM_ASPEED_GFX=m
-+CONFIG_FB=y
- CONFIG_FB_EFI=y
- CONFIG_FB_WM8505=y
- CONFIG_FB_SH_MOBILE_LCDC=y
--- 
-2.33.0
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 9bcb71ab65e8d8dbe190c14a3f76b20df5216457..e311b74b2d30b0f63f8a2712be63625680ccc493 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -2,7 +2,6 @@ parisc-math-emu-fix-fall-through-warnings.patch
 xhci-add-quirk-for-host-controllers-that-don-t-update-endpoint-dcs.patch
 io_uring-fix-splice_fd_in-checks-backport-typo.patch
 arm-dts-vexpress-v2p-ca9-fix-the-smb-unit-address.patch
-arm-config-mutli-v7-reenable-fb-dependency.patch
 arm-dts-at91-sama5d2_som1_ek-disable-isc-node-by-def.patch
 block-decode-queue_flag_hctx_active-in-debugfs-outpu.patch
 xen-x86-prevent-pvh-type-from-getting-clobbered.patch

diff --git a/queue-5.14/arm-config-mutli-v7-reenable-fb-dependency.patch b/queue-5.14/arm-config-mutli-v7-reenable-fb-dependency.patch
deleted file mode 100644 (file)
index 2574335..0000000
--- a/queue-5.14/arm-config-mutli-v7-reenable-fb-dependency.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 32dabe1794f5767b624925abcf461bac3f856e33 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 15 Jun 2021 10:44:34 +0930
-Subject: ARM: config: mutli v7: Reenable FB dependency
-
-From: Joel Stanley <joel@jms.id.au>
-
-[ Upstream commit 8c1768967e2733d55abf449d8abd6f1915ba3539 ]
-
-DRM_FBDEV_EMULATION previously selected FB and was default y as long as DRM
-was enabled. In commit f611b1e7624c ("drm: Avoid circular dependencies for
-CONFIG_FB") the select was replaced with a depends on FB, disabling the
-drivers that depended on it.
-
-Renable FB so we get back FB_EFI, FB_WM8505, FB_SH_MOBILE_LCDC, FB_SIMPLE and
-VIDEO_VIVID.
-
-It must be set to y and not a module as the test driver VIDEO_VIVID
-requires it to be built in.
-
-Link: https://lore.kernel.org/r/CAK8P3a18EdBKQdGDOZc9cPKsf=hY8==v2cO0DBE_tyd82Uq-Ng@mail.gmail.com
-Signed-off-by: Joel Stanley <joel@jms.id.au>
-Reviewed-by: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/configs/multi_v7_defconfig | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
-index bd5775184c03..707fb2c2fdda 100644
---- a/arch/arm/configs/multi_v7_defconfig
-+++ b/arch/arm/configs/multi_v7_defconfig
-@@ -721,6 +721,7 @@ CONFIG_DRM_PL111=m
- CONFIG_DRM_LIMA=m
- CONFIG_DRM_PANFROST=m
- CONFIG_DRM_ASPEED_GFX=m
-+CONFIG_FB=y
- CONFIG_FB_EFI=y
- CONFIG_FB_WM8505=y
- CONFIG_FB_SH_MOBILE_LCDC=y
--- 
-2.33.0
-

diff --git a/queue-5.14/series b/queue-5.14/series
index 2fb2c076a8edfa22c6ee35568206352ff13fcb47..9875e5a32496030db8690c7bb2aec2d9583eee27 100644 (file)
--- a/queue-5.14/series
+++ b/queue-5.14/series
@@ -2,7 +2,6 @@ block-mq-deadline-move-dd_queued-to-fix-defined-but-not-used-warning.patch
 parisc-math-emu-fix-fall-through-warnings.patch
 sh-pgtable-3level-fix-cast-to-pointer-from-integer-of-different-size.patch
 arm-dts-vexpress-v2p-ca9-fix-the-smb-unit-address.patch
-arm-config-mutli-v7-reenable-fb-dependency.patch
 arm-dts-at91-sama5d2_som1_ek-disable-isc-node-by-def.patch
 block-decode-queue_flag_hctx_active-in-debugfs-outpu.patch
 xen-x86-prevent-pvh-type-from-getting-clobbered.patch

diff --git a/queue-5.4/arm-config-mutli-v7-reenable-fb-dependency.patch b/queue-5.4/arm-config-mutli-v7-reenable-fb-dependency.patch
deleted file mode 100644 (file)
index 5926195..0000000
--- a/queue-5.4/arm-config-mutli-v7-reenable-fb-dependency.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 18a10dca9f75336e6285015aea55a4a55220df52 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 15 Jun 2021 10:44:34 +0930
-Subject: ARM: config: mutli v7: Reenable FB dependency
-
-From: Joel Stanley <joel@jms.id.au>
-
-[ Upstream commit 8c1768967e2733d55abf449d8abd6f1915ba3539 ]
-
-DRM_FBDEV_EMULATION previously selected FB and was default y as long as DRM
-was enabled. In commit f611b1e7624c ("drm: Avoid circular dependencies for
-CONFIG_FB") the select was replaced with a depends on FB, disabling the
-drivers that depended on it.
-
-Renable FB so we get back FB_EFI, FB_WM8505, FB_SH_MOBILE_LCDC, FB_SIMPLE and
-VIDEO_VIVID.
-
-It must be set to y and not a module as the test driver VIDEO_VIVID
-requires it to be built in.
-
-Link: https://lore.kernel.org/r/CAK8P3a18EdBKQdGDOZc9cPKsf=hY8==v2cO0DBE_tyd82Uq-Ng@mail.gmail.com
-Signed-off-by: Joel Stanley <joel@jms.id.au>
-Reviewed-by: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/configs/multi_v7_defconfig | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
-index e4c8def9a0a5..32dfc736a4b1 100644
---- a/arch/arm/configs/multi_v7_defconfig
-+++ b/arch/arm/configs/multi_v7_defconfig
-@@ -677,6 +677,7 @@ CONFIG_DRM_PL111=m
- CONFIG_DRM_LIMA=m
- CONFIG_DRM_PANFROST=m
- CONFIG_DRM_ASPEED_GFX=m
-+CONFIG_FB=y
- CONFIG_FB_EFI=y
- CONFIG_FB_WM8505=y
- CONFIG_FB_SH_MOBILE_LCDC=y
--- 
-2.33.0
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 823b1407dbbd7e65954ff87099cf744d1a12212b..b58f5ded91190993a4a97c7a69ff10c78403b89e 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -1,7 +1,6 @@
 parisc-math-emu-fix-fall-through-warnings.patch
 net-switchdev-do-not-propagate-bridge-updates-across-bridges.patch
 tee-optee-fix-missing-devices-unregister-during-optee_remove.patch
-arm-config-mutli-v7-reenable-fb-dependency.patch
 arm-dts-at91-sama5d2_som1_ek-disable-isc-node-by-def.patch
 xtensa-xtfpga-use-config_use_of-instead-of-config_of.patch
 xtensa-xtfpga-try-software-restart-before-simulating.patch