From: Saeed Mahameed <saeedm@nvidia.com>
To: "sfr@canb.auug.org.au" <sfr@canb.auug.org.au>,
Jason Gunthorpe <jgg@nvidia.com>,
"davem@davemloft.net" <davem@davemloft.net>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"dledford@redhat.com" <dledford@redhat.com>
Cc: Ben Ben Ishay <benishay@nvidia.com>,
Leon Romanovsky <leonro@nvidia.com>,
Aharon Landau <aharonl@nvidia.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"leon@kernel.org" <leon@kernel.org>
Subject: Re: linux-next: manual merge of the net-next tree with the rdma tree
Date: Thu, 28 Oct 2021 07:48:16 +0000 [thread overview]
Message-ID: <bc7ba7b44e704b6316085949693e250ef0866a65.camel@nvidia.com> (raw)
In-Reply-To: <20211028115637.1ed0ba86@canb.auug.org.au>
On Thu, 2021-10-28 at 11:56 +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> drivers/net/ethernet/mellanox/mlx5/core/en_main.c
>
> between commit:
>
> 83fec3f12a59 ("RDMA/mlx5: Replace struct mlx5_core_mkey by u32 key")
>
> from the rdma tree and commit:
>
> e5ca8fb08ab2 ("net/mlx5e: Add control path for SHAMPO feature")
>
> 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.
>
A merge conflict resolution pr was already sent to net-next,
https://lore.kernel.org/netdev/20211028052104.1071670-1-saeed@kernel.org/T/#u
next prev parent reply other threads:[~2021-10-28 7:48 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-28 0:56 linux-next: manual merge of the net-next tree with the rdma tree Stephen Rothwell
2021-10-28 7:48 ` Saeed Mahameed [this message]
-- strict thread matches above, loose matches on Subject: below --
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-27 0:25 Stephen Rothwell
2019-02-27 16:24 ` Doug Ledford
2019-02-28 9:05 ` Leon Romanovsky
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=bc7ba7b44e704b6316085949693e250ef0866a65.camel@nvidia.com \
--to=saeedm@nvidia.com \
--cc=aharonl@nvidia.com \
--cc=benishay@nvidia.com \
--cc=davem@davemloft.net \
--cc=dledford@redhat.com \
--cc=jgg@nvidia.com \
--cc=leon@kernel.org \
--cc=leonro@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).