* linux-next: manual merge of the hyperv tree with the fbdev tree
@ 2025-10-02 16:14 Mark Brown
2025-10-02 19:41 ` Helge Deller
0 siblings, 1 reply; 4+ messages in thread
From: Mark Brown @ 2025-10-02 16:14 UTC (permalink / raw)
To: Wei Liu
Cc: Helge Deller, Linux Kernel Mailing List, Linux Next Mailing List,
Mukesh Rathor, Prasanna Kumar T S M
[-- 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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the hyperv tree with the fbdev tree
2025-10-02 16:14 linux-next: manual merge of the hyperv tree with the fbdev tree Mark Brown
@ 2025-10-02 19:41 ` Helge Deller
2025-10-02 20:05 ` Wei Liu
0 siblings, 1 reply; 4+ messages in thread
From: Helge Deller @ 2025-10-02 19:41 UTC (permalink / raw)
To: Mark Brown, Wei Liu
Cc: Linux Next Mailing List, Mukesh Rathor, Prasanna Kumar T S M
On 10/2/25 18:14, Mark Brown wrote:
> 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.
Wei, I have those two patches in my tree:
MAINTAINERS: Mark hyperv_fb driver obsolete
fbdev: hyperv_fb: Deprecate this in favor of Hyper-V DRM driver
Please let me know if I should drop those.
I'm fine if you carry both (or any) in your tree.
Helge
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the hyperv tree with the fbdev tree
2025-10-02 19:41 ` Helge Deller
@ 2025-10-02 20:05 ` Wei Liu
2025-10-02 20:09 ` Helge Deller
0 siblings, 1 reply; 4+ messages in thread
From: Wei Liu @ 2025-10-02 20:05 UTC (permalink / raw)
To: Helge Deller
Cc: Mark Brown, Wei Liu, Linux Next Mailing List, Mukesh Rathor,
Prasanna Kumar T S M
On Thu, Oct 02, 2025 at 09:41:58PM +0200, Helge Deller wrote:
> On 10/2/25 18:14, Mark Brown wrote:
> > 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.
>
>
> Wei, I have those two patches in my tree:
> MAINTAINERS: Mark hyperv_fb driver obsolete
> fbdev: hyperv_fb: Deprecate this in favor of Hyper-V DRM driver
>
> Please let me know if I should drop those.
> I'm fine if you carry both (or any) in your tree.
I can carry both. That simplifies things.
Thanks,
Wei
>
> Helge
>
>
>
> > 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
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the hyperv tree with the fbdev tree
2025-10-02 20:05 ` Wei Liu
@ 2025-10-02 20:09 ` Helge Deller
0 siblings, 0 replies; 4+ messages in thread
From: Helge Deller @ 2025-10-02 20:09 UTC (permalink / raw)
To: Wei Liu
Cc: Mark Brown, Linux Next Mailing List, Mukesh Rathor,
Prasanna Kumar T S M
On 10/2/25 22:05, Wei Liu wrote:
> On Thu, Oct 02, 2025 at 09:41:58PM +0200, Helge Deller wrote:
>> On 10/2/25 18:14, Mark Brown wrote:
>>> 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.
>>
>>
>> Wei, I have those two patches in my tree:
>> MAINTAINERS: Mark hyperv_fb driver obsolete
>> fbdev: hyperv_fb: Deprecate this in favor of Hyper-V DRM driver
>>
>> Please let me know if I should drop those.
>> I'm fine if you carry both (or any) in your tree.
>
> I can carry both. That simplifies things.
Ok. I drop both.
Thanks!
Helge
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-10-02 20:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-10-02 16:14 linux-next: manual merge of the hyperv tree with the fbdev tree Mark Brown
2025-10-02 19:41 ` Helge Deller
2025-10-02 20:05 ` Wei Liu
2025-10-02 20:09 ` Helge Deller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox