From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Helge Deller <deller@gmx•de>, Dave Airlie <airlied@redhat•com>
Cc: Jani Nikula <jani.nikula@intel•com>,
DRI <dri-devel@lists•freedesktop.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Prasanna Kumar T S M <ptsm@linux•microsoft.com>
Subject: linux-next: manual merge of the fbdev tree with the drm tree
Date: Mon, 5 Jan 2026 13:38:10 +1100 [thread overview]
Message-ID: <20260105133810.37a2af1d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1832 bytes --]
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 <sfr@canb•auug.org.au>
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 <sfr@canb•auug.org.au>
---
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2026-01-05 2:38 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-05 2:38 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-12-13 0:58 linux-next: manual merge of the fbdev tree with the drm tree Stephen Rothwell
2023-12-13 0:56 Stephen Rothwell
2023-08-01 0:43 Stephen Rothwell
2023-06-20 1:38 Stephen Rothwell
2022-12-13 0:16 Stephen Rothwell
2022-12-13 11:10 ` Helge Deller
2022-10-04 2:27 Stephen Rothwell
2022-10-04 7:29 ` Helge Deller
2013-06-17 4:21 Stephen Rothwell
2013-06-17 7:23 ` Tomi Valkeinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260105133810.37a2af1d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@redhat$(echo .)com \
--cc=deller@gmx$(echo .)de \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=jani.nikula@intel$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ptsm@linux$(echo .)microsoft.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox