From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Leon Romanovsky <leon@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>,
Maor Gottlieb <maorg@mellanox.com>
Subject: linux-next: manual merge of the mlx5-next tree with the rdma tree
Date: Thu, 14 May 2020 12:59:20 +1000 [thread overview]
Message-ID: <20200514125920.2c9a6509@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 767 bytes --]
Hi all,
Today's linux-next merge of the mlx5-next tree got a conflict in:
drivers/infiniband/hw/mlx5/main.c
between commit:
2be08c308f10 ("RDMA/mlx5: Delete create QP flags obfuscation")
from the rdma tree and commit:
14c129e30152 ("{IB/net}/mlx5: Simplify don't trap code")
from the mlx5-next tree.
I fixed it up (the latter change included the former) 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:[~2020-05-14 2:59 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-14 2:59 Stephen Rothwell [this message]
2020-05-14 5:54 ` linux-next: manual merge of the mlx5-next tree with the rdma tree Leon Romanovsky
-- strict thread matches above, loose matches on Subject: below --
2019-07-04 2:47 Stephen Rothwell
2019-07-04 6:27 ` Leon Romanovsky
2019-07-08 3:28 ` Stephen Rothwell
2019-07-08 16:09 ` Jason Gunthorpe
2019-04-30 3:58 Stephen Rothwell
2019-05-06 4:01 ` Stephen Rothwell
2019-05-06 4:13 ` Leon Romanovsky
2019-05-09 1:07 ` Stephen Rothwell
2018-12-05 1:07 Stephen Rothwell
2018-12-05 1:33 ` Doug Ledford
2018-12-05 2:10 ` Stephen Rothwell
2018-12-05 6:30 ` Leon Romanovsky
2018-11-21 0:04 Stephen Rothwell
2018-11-21 7:16 ` 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=20200514125920.2c9a6509@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dledford@redhat.com \
--cc=jgg@mellanox.com \
--cc=leon@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=maorg@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;
as well as URLs for NNTP newsgroup(s).