From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>,
netdev@vger.kernel.org, Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Jason S. McMullan" <jason.mcmullan@netronome.com>,
Jakub Kicinski <jakub.kicinski@netronome.com>,
Rolf Neugebauer <rolf.neugebauer@netronome.com>,
Simon Horman <simon.horman@netronome.com>
Subject: linux-next: manual merge of the net-next tree with the pci tree
Date: Mon, 14 Dec 2015 11:27:21 +1100 [thread overview]
Message-ID: <20151214112721.7c60d4b0@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
include/linux/pci_ids.h
between commit:
a755e169031d ("PCI: Add Netronome vendor and device IDs")
from the pci tree and commit:
2d1e0254ef83 ("pci_ids: add Netronome Systems vendor")
from the net-next tree.
I fixed it up (the former was just a superset of the latter, so I used
that) and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
next reply other threads:[~2015-12-14 0:27 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-14 0:27 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-08-23 2:35 linux-next: manual merge of the net-next tree with the pci tree Stephen Rothwell
2018-04-03 3:14 Stephen Rothwell
2018-04-05 1:40 ` Stephen Rothwell
2017-06-21 1:54 Stephen Rothwell
2017-06-21 13:29 ` Kalle Valo
2017-06-21 13:32 ` Stephen Rothwell
2017-07-03 1:49 ` Stephen Rothwell
2017-04-12 0:25 Stephen Rothwell
2013-04-26 3:31 Stephen Rothwell
2012-12-10 1:08 Stephen Rothwell
2012-12-10 6:44 ` Grumbach, Emmanuel
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=20151214112721.7c60d4b0@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=bhelgaas@google.com \
--cc=davem@davemloft.net \
--cc=jakub.kicinski@netronome.com \
--cc=jason.mcmullan@netronome.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=rolf.neugebauer@netronome.com \
--cc=simon.horman@netronome.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).