From: Mark Brown <broonie@kernel•org>
To: Wei Liu <wei.liu@kernel•org>
Cc: Helge Deller <deller@gmx•de>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Mukesh Rathor <mrathor@linux•microsoft.com>,
Prasanna Kumar T S M <ptsm@linux•microsoft.com>
Subject: linux-next: manual merge of the hyperv tree with the fbdev tree
Date: Thu, 2 Oct 2025 17:14:39 +0100 [thread overview]
Message-ID: <aN6k79cY8mKSrKQq@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1264 bytes --]
Hi all,
Today's linux-next merge of the hyperv tree got a conflict in:
drivers/video/fbdev/Kconfig
between commit:
9e84636785c5e ("fbdev: hyperv_fb: Deprecate this in favor of Hyper-V DRM driver")
from the fbdev tree and commit:
94b04355e6397 ("Drivers: hv: Add CONFIG_HYPERV_VMBUS option")
from the hyperv tree.
I fixed it up (see below) 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.
diff --cc drivers/video/fbdev/Kconfig
index a7500251f41ac,72c63eaeb983a..0000000000000
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@@ -1771,8 -1773,8 +1771,8 @@@ config FB_BROADSHEE
a bridge adapter.
config FB_HYPERV
- tristate "Microsoft Hyper-V Synthetic Video support"
+ tristate "Microsoft Hyper-V Synthetic Video support (DEPRECATED)"
- depends on FB && HYPERV
+ depends on FB && HYPERV_VMBUS
select DMA_CMA if HAVE_DMA_CONTIGUOUS && CMA
select FB_IOMEM_HELPERS_DEFERRED
help
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-10-02 16:14 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-02 16:14 Mark Brown [this message]
2025-10-02 19:41 ` linux-next: manual merge of the hyperv tree with the fbdev tree Helge Deller
2025-10-02 20:05 ` Wei Liu
2025-10-02 20:09 ` Helge Deller
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=aN6k79cY8mKSrKQq@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=deller@gmx$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mrathor@linux$(echo .)microsoft.com \
--cc=ptsm@linux$(echo .)microsoft.com \
--cc=wei.liu@kernel$(echo .)org \
/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