From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
Bjorn Helgaas <bhelgaas@google.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Doug Meyer <dmeyer@gigaio.com>,
Logan Gunthorpe <logang@deltatee.com>
Subject: linux-next: manual merge of the akpm-current tree with the pci tree
Date: Tue, 10 Jul 2018 16:57:11 +1000 [thread overview]
Message-ID: <20180710165711.0e618002@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1457 bytes --]
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");
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-07-10 6:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-10 6:57 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-09-25 7:47 linux-next: manual merge of the akpm-current tree with the pci tree Stephen Rothwell
2014-09-25 19:30 ` Peter Feiner
2014-09-25 19:47 ` Andrew Morton
2014-09-26 9:00 ` Liviu Dudau
2013-12-23 3:45 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180710165711.0e618002@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=bhelgaas@google.com \
--cc=dmeyer@gigaio.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=logang@deltatee.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).