Subject: linux-next: manual merge of the akpm-current tree with the pci tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 10 Jul 2018 16:57:11 +1000

Hi all,

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

  drivers/ntb/hw/mscc/ntb_hw_switchtec.c

between commit:

  cfdfc14e7fb8 ("switchtec: Use generic PCI Vendor ID and Class Code")

from the pci tree and commit:

  a2a35435484e ("ntb: ntb_hw_switchtec: cleanup 64bit IO defines to use the common header")

from the akpm-current 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/ntb/hw/mscc/ntb_hw_switchtec.c
index 5ee5f40b4dfc,f403da24b833..000000000000
--- a/drivers/ntb/hw/mscc/ntb_hw_switchtec.c
+++ b/drivers/ntb/hw/mscc/ntb_hw_switchtec.c
@@@ -13,13 -13,13 +13,14 @@@
   *
   */
  
- #include <linux/switchtec.h>
- #include <linux/module.h>
+ #include <linux/interrupt.h>
+ #include <linux/io-64-nonatomic-lo-hi.h>
  #include <linux/delay.h>
  #include <linux/kthread.h>
- #include <linux/interrupt.h>
+ #include <linux/module.h>
  #include <linux/ntb.h>
 +#include <linux/pci.h>
+ #include <linux/switchtec.h>
  
  MODULE_DESCRIPTION("Microsemi Switchtec(tm) NTB Driver");
  MODULE_VERSION("0.1");