From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Nitzan Carmi <nitzanc@mellanox.com>,
Jianchao Wang <jianchao.w.wang@oracle.com>,
Keith Busch <keith.busch@intel.com>
Subject: Re: linux-next: manual merge of the rcu tree with Linus' tree
Date: Tue, 15 May 2018 10:44:16 -0700 [thread overview]
Message-ID: <20180515174416.GJ26088@linux.vnet.ibm.com> (raw)
In-Reply-To: <20180514134636.61831bcc@canb.auug.org.au>
On Mon, May 14, 2018 at 01:46:36PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the rcu tree got a conflict in:
>
> drivers/nvme/host/core.c
>
> between commit:
>
> 12d9f07022dc ("nvme: fix use-after-free in nvme_free_ns_head")
>
> from Linus' tree and commit:
>
> d9cf21bae6cf ("nvme: Avoid flush dependency in delete controller flow")
>
> from the rcu 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.
Thank you, Stephen!!!
Thanx, Paul
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/nvme/host/core.c
> index 99b857e5a7a9,c3cea8a29843..000000000000
> --- a/drivers/nvme/host/core.c
> +++ b/drivers/nvme/host/core.c
> @@@ -351,8 -349,7 +351,8 @@@ static void nvme_free_ns_head(struct kr
> nvme_mpath_remove_disk(head);
> ida_simple_remove(&head->subsys->ns_ida, head->instance);
> list_del_init(&head->entry);
> - cleanup_srcu_struct(&head->srcu);
> + cleanup_srcu_struct_quiesced(&head->srcu);
> + nvme_put_subsystem(head->subsys);
> kfree(head);
> }
>
next prev parent reply other threads:[~2018-05-15 17:42 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-14 3:46 linux-next: manual merge of the rcu tree with Linus' tree Stephen Rothwell
2018-05-15 17:44 ` Paul E. McKenney [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-10-17 22:41 Stephen Rothwell
2022-10-18 18:38 ` Paul E. McKenney
2022-07-08 4:12 Stephen Rothwell
2022-07-08 15:23 ` Paul E. McKenney
2018-06-12 0:46 Stephen Rothwell
2018-06-12 1:01 ` Paul E. McKenney
2018-06-18 3:48 ` Stephen Rothwell
2018-06-18 3:49 ` Stephen Rothwell
2018-06-18 14:48 ` Paul E. McKenney
2017-09-26 3:00 Stephen Rothwell
2017-09-26 3:26 ` Paul E. McKenney
2017-09-26 3:42 ` Stephen Rothwell
2017-03-08 0:46 Stephen Rothwell
2017-03-08 0:56 ` Stephen Rothwell
2016-03-30 0:32 Stephen Rothwell
2016-03-30 10:30 ` Paul E. McKenney
2016-03-30 0:23 Stephen Rothwell
2012-11-29 3:06 Stephen Rothwell
2012-11-29 22:12 ` Paul E. McKenney
2012-08-06 2:31 Stephen Rothwell
2011-09-27 6:04 Stephen Rothwell
2011-09-27 12:20 ` Frederic Weisbecker
2011-09-27 5:14 Stephen Rothwell
2011-09-27 13:14 ` Borislav Petkov
2010-10-06 2:38 Stephen Rothwell
2010-10-06 4:17 ` Paul E. McKenney
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=20180515174416.GJ26088@linux.vnet.ibm.com \
--to=paulmck@linux.vnet.ibm.com \
--cc=jianchao.w.wang@oracle.com \
--cc=keith.busch@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nitzanc@mellanox.com \
--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).