| Message ID | 20210714122703.212609-1-linus.walleij@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 2096d6feec8359203de406c424242dcb977fe1d1 |
| Headers | show |
| Series | ARM: configs: Update Integrator defconfig | expand |
On Wed, Jul 14, 2021 at 02:27:03PM +0200, Linus Walleij wrote: > This updates the Integrator defconfig for the changes > in the v5.14-rc1 kernel: > > - The Framebuffer CONFIG_FB needs to be explicitly selected > or we don't get any framebuffer anymore. DRM has stopped to > select FB because of circular dependency. > - Drop the unused Matrox FB drivers that are only used with > specific PCI cards. > > Fixes: f611b1e7624c ("drm: Avoid circular dependencies for CONFIG_FB") > Cc: Kees Cook <keescook@chromium.org> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Reviewed-by: Kees Cook <keescook@chromium.org>
Hello: This patch was applied to soc/soc.git (refs/heads/arm/fixes): On Wed, 14 Jul 2021 14:27:03 +0200 you wrote: > This updates the Integrator defconfig for the changes > in the v5.14-rc1 kernel: > > - The Framebuffer CONFIG_FB needs to be explicitly selected > or we don't get any framebuffer anymore. DRM has stopped to > select FB because of circular dependency. > - Drop the unused Matrox FB drivers that are only used with > specific PCI cards. > > [...] Here is the summary with links: - ARM: configs: Update Integrator defconfig https://git.kernel.org/soc/soc/c/2096d6feec83 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
From: Arnd Bergmann <arnd@arndb.de> On Wed, 14 Jul 2021 14:27:03 +0200, Linus Walleij wrote: > This updates the Integrator defconfig for the changes > in the v5.14-rc1 kernel: > > - The Framebuffer CONFIG_FB needs to be explicitly selected > or we don't get any framebuffer anymore. DRM has stopped to > select FB because of circular dependency. > - Drop the unused Matrox FB drivers that are only used with > specific PCI cards. Applied to arm/fixes, thanks! [1/1] ARM: configs: Update Integrator defconfig commit: 2096d6feec8359203de406c424242dcb977fe1d1 Arnd
diff --git a/arch/arm/configs/integrator_defconfig b/arch/arm/configs/integrator_defconfig index b06e537d5149..4dfe321a79f6 100644 --- a/arch/arm/configs/integrator_defconfig +++ b/arch/arm/configs/integrator_defconfig @@ -57,10 +57,7 @@ CONFIG_DRM=y CONFIG_DRM_DISPLAY_CONNECTOR=y CONFIG_DRM_SIMPLE_BRIDGE=y CONFIG_DRM_PL111=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_MATROX=y -CONFIG_FB_MATROX_MILLENIUM=y -CONFIG_FB_MATROX_MYSTIQUE=y +CONFIG_FB=y CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_VGA_CONSOLE is not set CONFIG_LOGO=y
This updates the Integrator defconfig for the changes in the v5.14-rc1 kernel: - The Framebuffer CONFIG_FB needs to be explicitly selected or we don't get any framebuffer anymore. DRM has stopped to select FB because of circular dependency. - Drop the unused Matrox FB drivers that are only used with specific PCI cards. Fixes: f611b1e7624c ("drm: Avoid circular dependencies for CONFIG_FB") Cc: Kees Cook <keescook@chromium.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- SoC folks: Please apply this directly for the v5.14 rc:s. --- arch/arm/configs/integrator_defconfig | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)