Subject: linux-next: manual merge of the fbdev tree with the drm tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 5 Jan 2026 13:38:10 +1100

Hi all,

Today's linux-next merge of the fbdev tree got a conflict in:

  drivers/gpu/drm/Kconfig

between commit:

  6d2b55f7d701 ("drm/hyperv: move Kconfig under driver directory")

from the drm tree and commit:

  18e7e9aa3237 ("drm/hyperv: Remove reference to hyperv_fb driver")

from the fbdev tree.

I fixed it up (I used the former version of this files and applied the
following merge resolution patch) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

From: Stephen Rothwell <[email-masked]>
Date: Mon, 5 Jan 2026 13:29:10 +1100
Subject: [PATCH] fix up for "drm/hyperv: Remove reference to hyperv_fb driver"

interacting with commit

  6d2b55f7d701 ("drm/hyperv: move Kconfig under driver directory")

from the drm tree.

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 drivers/gpu/drm/hyperv/Kconfig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/hyperv/Kconfig b/drivers/gpu/drm/hyperv/Kconfig
index 86234f6a73f2..e48e35fb7f8b 100644
--- a/drivers/gpu/drm/hyperv/Kconfig
+++ b/drivers/gpu/drm/hyperv/Kconfig
@@ -8,7 +8,6 @@ config DRM_HYPERV
 	help
 	 This is a KMS driver for Hyper-V synthetic video device. Choose this
 	 option if you would like to enable drm driver for Hyper-V virtual
-	 machine. Unselect Hyper-V framebuffer driver (CONFIG_FB_HYPERV) so
-	 that DRM driver is used by default.
+	 machine.
 
 	 If M is selected the module will be called hyperv_drm.
-- 
2.52.0

-- 
Cheers,
Stephen Rothwell