lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [day] [month] [year] [list]
Message-ID: <aN6k79cY8mKSrKQq@sirena.org.uk>
Date: Thu, 2 Oct 2025 17:14:39 +0100
From: Mark Brown <broonie@...nel.org>
To: Wei Liu <wei.liu@...nel.org>
Cc: Helge Deller <deller@....de>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Mukesh Rathor <mrathor@...ux.microsoft.com>,
	Prasanna Kumar T S M <ptsm@...ux.microsoft.com>
Subject: linux-next: manual merge of the hyperv tree with the fbdev tree

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

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ