From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>,
Doug Ledford <dledford@redhat.com>,
Jason Gunthorpe <jgg@mellanox.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Shamir Rabinovitch <shamir.rabinovitch@oracle.com>,
Jakub Kicinski <jakub.kicinski@netronome.com>
Subject: linux-next: manual merge of the net-next tree with the rdma tree
Date: Wed, 27 Feb 2019 11:25:22 +1100 [thread overview]
Message-ID: <20190227112522.2f32b5d7@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/infiniband/hw/mlx4/Kconfig
between commit:
6fa8f1afd337 ("IB/{core,uverbs}: Move ib_umem_xxx functions from ib_core to ib_uverbs")
from the rdma tree and commit:
f4b6bcc7002f ("net: devlink: turn devlink into a built-in")
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/infiniband/hw/mlx4/Kconfig
index db4aa13ebae0,4e9936731867..000000000000
--- a/drivers/infiniband/hw/mlx4/Kconfig
+++ b/drivers/infiniband/hw/mlx4/Kconfig
@@@ -1,7 -1,7 +1,6 @@@
config MLX4_INFINIBAND
tristate "Mellanox ConnectX HCA support"
depends on NETDEVICES && ETHERNET && PCI && INET
- depends on MAY_USE_DEVLINK
- depends on INFINIBAND_USER_ACCESS || !INFINIBAND_USER_ACCESS
select NET_VENDOR_MELLANOX
select MLX4_CORE
---help---
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-02-27 0:25 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-27 0:25 Stephen Rothwell [this message]
2019-02-27 16:24 ` linux-next: manual merge of the net-next tree with the rdma tree Doug Ledford
2019-02-28 9:05 ` Leon Romanovsky
-- strict thread matches above, loose matches on Subject: below --
2021-10-28 0:56 Stephen Rothwell
2021-10-28 7:48 ` Saeed Mahameed
2021-10-19 23:34 Stephen Rothwell
2020-05-08 3:18 Stephen Rothwell
2020-05-08 12:35 ` Jason Gunthorpe
2020-05-09 7:49 ` Saeed Mahameed
2020-05-09 7:40 ` Saeed Mahameed
2019-06-20 2:15 Stephen Rothwell
2019-02-18 0:05 Stephen Rothwell
2019-02-18 10:48 ` Leon Romanovsky
2018-08-02 2:05 Stephen Rothwell
2018-08-15 23:45 ` Stephen Rothwell
2018-07-27 2:33 Stephen Rothwell
2018-07-27 2:48 ` Jason Gunthorpe
2018-07-27 3:28 ` Stephen Rothwell
2018-07-27 3:45 ` Stephen Rothwell
2018-07-27 5:03 ` Parav Pandit
2018-07-27 4:57 ` Parav Pandit
2018-07-27 5:09 ` Stephen Rothwell
2018-07-31 21:12 ` Parav Pandit
2018-08-01 5:33 ` Stephen Rothwell
2018-08-01 17:13 ` Jason Gunthorpe
2018-08-01 18:30 ` Parav Pandit
2018-07-02 0:21 Stephen Rothwell
2018-08-15 23:41 ` 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=20190227112522.2f32b5d7@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=dledford@redhat.com \
--cc=jakub.kicinski@netronome.com \
--cc=jgg@mellanox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=shamir.rabinovitch@oracle.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).