From: Leon Romanovsky <leon@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Doug Ledford <dledford@redhat.com>,
Jason Gunthorpe <jgg@mellanox.com>,
David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Vu Pham <vuhuong@mellanox.com>,
Saeed Mahameed <saeedm@mellanox.com>,
Mark Bloch <markb@mellanox.com>
Subject: Re: linux-next: manual merge of the mlx5-next tree with the rdma tree
Date: Mon, 6 May 2019 07:13:12 +0300 [thread overview]
Message-ID: <20190506041312.GJ6938@mtr-leonro.mtl.com> (raw)
In-Reply-To: <20190506140147.23d41ac1@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2126 bytes --]
On Mon, May 06, 2019 at 02:01:47PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> On Tue, 30 Apr 2019 13:58:46 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Hi Leon,
> >
> > Today's linux-next merge of the mlx5-next tree got a conflict in:
> >
> > drivers/infiniband/hw/mlx5/main.c
> >
> > between commit:
> >
> > 35b0aa67b298 ("RDMA/mlx5: Refactor netdev affinity code")
> >
> > from the rdma tree and commit:
> >
> > c42260f19545 ("net/mlx5: Separate and generalize dma device from pci device")
> >
> > from the mlx5-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/mlx5/main.c
> > index 6135a0b285de,fae6a6a1fbea..000000000000
> > --- a/drivers/infiniband/hw/mlx5/main.c
> > +++ b/drivers/infiniband/hw/mlx5/main.c
> > @@@ -200,12 -172,18 +200,12 @@@ static int mlx5_netdev_event(struct not
> >
> > switch (event) {
> > case NETDEV_REGISTER:
> > + /* Should already be registered during the load */
> > + if (ibdev->is_rep)
> > + break;
> > write_lock(&roce->netdev_lock);
> > - if (ndev->dev.parent == &mdev->pdev->dev)
> > - if (ibdev->rep) {
> > - struct mlx5_eswitch *esw = ibdev->mdev->priv.eswitch;
> > - struct net_device *rep_ndev;
> > -
> > - rep_ndev = mlx5_ib_get_rep_netdev(esw,
> > - ibdev->rep->vport);
> > - if (rep_ndev == ndev)
> > - roce->netdev = ndev;
> > - } else if (ndev->dev.parent == mdev->device) {
> > ++ if (ndev->dev.parent == mdev->device)
> > roce->netdev = ndev;
> > - }
> > write_unlock(&roce->netdev_lock);
> > break;
> >
>
> This is now a conflict between the net-next tree and the rdma tree.
Thanks Stephen,
Looks good.
>
> --
> Cheers,
> Stephen Rothwell
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
next prev parent reply other threads:[~2019-05-06 4:13 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-30 3:58 linux-next: manual merge of the mlx5-next tree with the rdma tree Stephen Rothwell
2019-05-06 4:01 ` Stephen Rothwell
2019-05-06 4:13 ` Leon Romanovsky [this message]
2019-05-09 1:07 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2020-05-14 2:59 Stephen Rothwell
2020-05-14 5:54 ` Leon Romanovsky
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
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=20190506041312.GJ6938@mtr-leonro.mtl.com \
--to=leon@kernel.org \
--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=markb@mellanox.com \
--cc=netdev@vger.kernel.org \
--cc=saeedm@mellanox.com \
--cc=sfr@canb.auug.org.au \
--cc=vuhuong@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).