From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Doug Ledford <dledford@redhat.com>,
Jason Gunthorpe <jgg@mellanox.com>,
David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Vu Pham <vu@mellanox.com>, Gal Pressman <pressmangal@gmail.com>
Subject: linux-next: manual merge of the rdma tree with the net tree
Date: Mon, 17 Dec 2018 11:08:10 +1100 [thread overview]
Message-ID: <20181217110810.64c69fb7@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 748 bytes --]
Hi all,
Today's linux-next merge of the rdma tree got a conflict in:
include/linux/mlx5/mlx5_ifc.h
between commit:
663f146f2ecf ("net/mlx5: E-Switch, Fix fdb cap bits swap")
from the net tree and commit:
c74d90c11c05 ("net/mlx5: Fix offsets of ifc reserved fields")
from the rdma tree.
I fixed it up (I just used the net tree version) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-12-17 0:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-17 0:08 Stephen Rothwell [this message]
2018-12-17 21:24 ` linux-next: manual merge of the rdma tree with the net tree Saeed Mahameed
-- strict thread matches above, loose matches on Subject: below --
2022-05-19 1:35 Stephen Rothwell
2022-05-19 4:03 ` Saeed Mahameed
2022-05-19 17:48 ` Jakub Kicinski
2022-05-20 22:16 ` Saeed Mahameed
2018-01-15 0:53 Stephen Rothwell
2018-01-15 12:24 ` Leon Romanovsky
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=20181217110810.64c69fb7@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=dledford@redhat.com \
--cc=jgg@mellanox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pressmangal@gmail.com \
--cc=vu@mellanox.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