linux-kernel - linux-next: manual merge of the net-next tree with the hyperv-fixes tree

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: <20250711130752.23023d98@canb.auug.org.au>
Date: Fri, 11 Jul 2025 13:07:52 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: David Miller <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>,
 Paolo Abeni <pabeni@...hat.com>, Networking <netdev@...r.kernel.org>, Wei
 Liu <wei.liu@...nel.org>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, Naman Jain
 <namjain@...ux.microsoft.com>, Shradha Gupta
 <shradhagupta@...ux.microsoft.com>
Subject: linux-next: manual merge of the net-next tree with the hyperv-fixes
 tree

Hi all,

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

  drivers/net/ethernet/microsoft/mana/gdma_main.c

between commit:

  9669ddda18fb ("net: mana: Fix warnings for missing export.h header inclusion")

from the hyperv-fixes tree and commit:

  755391121038 ("net: mana: Allocate MSI-X vectors dynamically")

from the net-next 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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/net/ethernet/microsoft/mana/gdma_main.c
index 58f8ee710912,d6c0699bc8cf..000000000000
--- a/drivers/net/ethernet/microsoft/mana/gdma_main.c
+++ b/drivers/net/ethernet/microsoft/mana/gdma_main.c
@@@ -6,9 -6,11 +6,12 @@@
  #include <linux/pci.h>
  #include <linux/utsname.h>
  #include <linux/version.h>
 +#include <linux/export.h>
+ #include <linux/msi.h>
+ #include <linux/irqdomain.h>
  
  #include <net/mana/mana.h>
+ #include <net/mana/hw_channel.h>
  
  struct dentry *mana_debugfs_root;
  

Content of type "application/pgp-signature" skipped