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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1313 bytes --]

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;
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]