From: "Paul E. McKenney" <paulmck@linux.ibm.com>
To: Joel Fernandes <joel@joelfernandes.org>
Cc: LKML <linux-kernel@vger.kernel.org>, rcu <rcu@vger.kernel.org>
Subject: Re: [PATCH 0/9] Apply new rest conversion patches to /dev branch
Date: Thu, 1 Aug 2019 13:14:35 -0700 [thread overview]
Message-ID: <20190801201435.GQ5913@linux.ibm.com> (raw)
In-Reply-To: <CAEXW_YQ-JnuZGj7zUtmvY0Cn4swoHXoR6UD=iPKw56N55CL3-Q@mail.gmail.com>
On Thu, Aug 01, 2019 at 04:04:15PM -0400, Joel Fernandes wrote:
> On Thu, Aug 1, 2019 at 3:58 PM Paul E. McKenney <paulmck@linux.ibm.com> wrote:
> >
> > On Thu, Aug 01, 2019 at 02:14:02PM -0400, Joel Fernandes (Google) wrote:
> > > This series fixes the rcu/dev branch so it can apply the new ReST conversion patches.
> > >
> > > Patches based on "00ec8f46465e rcu/nohz: Make multi_cpu_stop() enable tick on
> > > all online CPUs"
> > >
> > > The easiest was to do this is to revert the patches that conflict and then
> > > applying the doc patches, and then applying them again. But in the
> > > re-application, we convert the documentation
> > >
> > > No manual fix ups were done in this process, other than to documentation.
> >
> > Ah, I was expecting that you would forward-port the conversion, but
> > yes, that could be painful and error prone.
> >
> > But given that there are some dependencies on these patches, could you
> > please use the following alternative procedure for the patches that
> > touch both code and documentation?
> >
> > o Revert only the documentation portion of each commit. I will
> > then merge the partial reverts with the original commits.
> >
> > o Apply the documentation conversion.
> >
> > o Reapply the documentation portions on top of the conversion.
>
> Sure, this would be better. I will do this in the evening and send it
> to you. Thanks,
Very good, looking forward to seeing it!
The smoke tests of the rebase onto v5.3-rc2 passed, so on to create
the usual branches. Yes, this will complicate merging of the partial
reverts, but there will be the need to apply review comments and the
like anyway, so not really a net increase in complexity. ;-)
Thanx, Paul
prev parent reply other threads:[~2019-08-01 20:14 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-01 18:14 [PATCH 0/9] Apply new rest conversion patches to /dev branch Joel Fernandes (Google)
2019-08-01 18:14 ` [PATCH 1/9] Revert "rcu: Restore barrier() to rcu_read_lock() and rcu_read_unlock()" Joel Fernandes (Google)
2019-08-01 18:14 ` [PATCH 2/9] Revert "rcu: Add support for consolidated-RCU reader checking" Joel Fernandes (Google)
2019-08-01 18:14 ` [PATCH 3/9] Revert "treewide: Rename rcu_dereference_raw_notrace() to _check()" Joel Fernandes (Google)
2019-08-01 18:14 ` [PATCH 5/9] docs: rcu: Correct links referring to titles Joel Fernandes (Google)
2019-08-01 18:14 ` [PATCH 6/9] docs: rcu: Increase toctree to 3 Joel Fernandes (Google)
2019-08-01 18:14 ` [PATCH 7/9] Revert "Revert "treewide: Rename rcu_dereference_raw_notrace() to _check()"" Joel Fernandes (Google)
2019-08-01 18:14 ` [PATCH 8/9] Revert "Revert "rcu: Add support for consolidated-RCU reader checking"" Joel Fernandes (Google)
2019-08-01 18:14 ` [PATCH 9/9] Revert "Revert "rcu: Restore barrier() to rcu_read_lock() and rcu_read_unlock()"" Joel Fernandes (Google)
2019-08-01 18:38 ` [PATCH 0/9] Apply new rest conversion patches to /dev branch Joel Fernandes
2019-08-01 19:58 ` Paul E. McKenney
2019-08-01 20:04 ` Joel Fernandes
2019-08-01 20:14 ` Paul E. McKenney [this message]
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=20190801201435.GQ5913@linux.ibm.com \
--to=paulmck@linux.ibm.com \
--cc=joel@joelfernandes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rcu@vger.kernel.org \
/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).