From: Parav Pandit <parav@mellanox.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
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>
Subject: RE: linux-next: manual merge of the rdma tree with Linus' tree
Date: Sat, 29 Sep 2018 02:57:21 +0000 [thread overview]
Message-ID: <VI1PR0501MB227163173354F5F3D7BE298CD1ED0@VI1PR0501MB2271.eurprd05.prod.outlook.com> (raw)
In-Reply-To: <20180928100125.61d3e9b6@canb.auug.org.au>
Hi Stephen,
> -----Original Message-----
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Sent: Thursday, September 27, 2018 7:01 PM
> To: 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>; Parav Pandit
> <parav@mellanox.com>
> Subject: linux-next: manual merge of the rdma tree with Linus' tree
>
> Hi all,
>
> Today's linux-next merge of the rdma tree got a conflict in:
>
> drivers/infiniband/core/cache.c
>
> between commit:
>
> 5c5702e259dc ("RDMA/core: Set right entry state before releasing
> reference")
>
> from Linus' tree and commit:
>
> 43c7c851b9bc ("RDMA/core: Use dev_err/dbg/etc instead of pr_* + ibdev-
> >name")
>
> from the rdma 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.
>
Sorry for the late reply. For some reason mail ended up in spam folder which I noticed now.
I should have watched the device naming series.
My fix went to for-rc and I guess it wasn't applied to for-next which resulted into this merge conflict.
My understanding is, maintainers usually try to avoid merge conflict between for-next and for-rc branches before sending pull request from rdma tree.
I will try to be more careful in future to notify maintainer about it.
Your changes below looks good. Thanks.
Reviewed-by: Parav Pandit <parav@mellanox.com>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/infiniband/core/cache.c index
> 3208ad6ad540,ebc64418d809..000000000000
> --- a/drivers/infiniband/core/cache.c
> +++ b/drivers/infiniband/core/cache.c
> @@@ -337,39 -335,6 +335,38 @@@ static int add_roce_gid(struct ib_gid_t
> return 0;
> }
>
> +/**
> + * del_gid - Delete GID table entry
> + *
> + * @ib_dev: IB device whose GID entry to be deleted
> + * @port: Port number of the IB device
> + * @table: GID table of the IB device for a port
> + * @ix: GID entry index to delete
> + *
> + */
> +static void del_gid(struct ib_device *ib_dev, u8 port,
> + struct ib_gid_table *table, int ix)
> +{
> + struct ib_gid_table_entry *entry;
> +
> + lockdep_assert_held(&table->lock);
> +
> - pr_debug("%s device=%s port=%d index=%d gid %pI6\n", __func__,
> - ib_dev->name, port, ix,
> - table->data_vec[ix]->attr.gid.raw);
> ++ dev_dbg(&ib_dev->dev, "%s port=%d index=%d gid %pI6\n",
>__func__, port,
> ++ ix, table->data_vec[ix]->attr.gid.raw);
> +
> + write_lock_irq(&table->rwlock);
> + entry = table->data_vec[ix];
> + entry->state = GID_TABLE_ENTRY_PENDING_DEL;
> + /*
> + * For non RoCE protocol, GID entry slot is ready to use.
> + */
> + if (!rdma_protocol_roce(ib_dev, port))
> + table->data_vec[ix] = NULL;
> + write_unlock_irq(&table->rwlock);
> +
> + put_gid_entry_locked(entry);
> +}
> +
> /**
> * add_modify_gid - Add or modify GID table entry
> *
next prev parent reply other threads:[~2018-09-29 2:57 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-28 0:01 linux-next: manual merge of the rdma tree with Linus' tree Stephen Rothwell
2018-09-29 2:57 ` Parav Pandit [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-06-22 1:52 Stephen Rothwell
2021-05-21 0:34 Stephen Rothwell
2021-04-15 2:05 Stephen Rothwell
2021-02-10 2:15 Stephen Rothwell
2021-02-10 18:57 ` Pearson, Robert B
2021-02-10 20:36 ` Jason Gunthorpe
2021-02-10 22:08 ` Pearson, Robert B
2021-02-11 20:03 ` Martin Wilck
2019-11-05 1:17 Stephen Rothwell
2019-11-05 2:21 ` Jason Gunthorpe
2019-11-05 2:28 ` Stephen Rothwell
2019-10-24 0:01 Stephen Rothwell
2019-10-28 19:30 ` Jason Gunthorpe
2019-06-20 2:10 Stephen Rothwell
2019-06-20 3:25 ` Doug Ledford
2019-06-20 2:06 Stephen Rothwell
2019-06-20 3:24 ` Doug Ledford
2019-06-14 3:00 Stephen Rothwell
2019-06-14 13:11 ` Doug Ledford
2018-08-06 2:01 Stephen Rothwell
2018-08-06 19:41 ` Jason Gunthorpe
2018-08-06 21:49 ` Stephen Rothwell
2017-08-08 2:11 Stephen Rothwell
2017-07-14 1:14 Stephen Rothwell
2017-07-14 1:17 ` Doug Ledford
2017-07-14 3:34 ` Leon Romanovsky
2017-07-14 3:50 ` Stephen Rothwell
2017-07-14 4:55 ` Leon Romanovsky
2017-07-14 12:03 ` Doug Ledford
2017-07-14 13:46 ` Leon Romanovsky
2017-07-14 4:12 ` Doug Ledford
2017-07-14 4:54 ` Leon Romanovsky
2017-07-14 14:33 ` Doug Ledford
2017-07-14 15:10 ` Leon Romanovsky
2016-12-15 0:47 Stephen Rothwell
2016-10-10 0:59 Stephen Rothwell
2016-10-10 0:54 Stephen Rothwell
2016-08-05 1:05 Stephen Rothwell
2016-08-05 1:01 Stephen Rothwell
2016-08-05 0:52 Stephen Rothwell
2016-05-19 1:45 Stephen Rothwell
2016-03-22 0:33 Stephen Rothwell
2016-03-22 0:29 Stephen Rothwell
2016-03-22 0:24 Stephen Rothwell
2016-03-22 0:17 Stephen Rothwell
2015-11-01 7:48 Stephen Rothwell
2015-11-02 10:40 ` Sagi Grimberg
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=VI1PR0501MB227163173354F5F3D7BE298CD1ED0@VI1PR0501MB2271.eurprd05.prod.outlook.com \
--to=parav@mellanox.com \
--cc=dledford@redhat.com \
--cc=jgg@mellanox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@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).