Re: [PATCH 0/9] Apply new rest conversion patches to /dev branch

[Joel Fernandes]

On Thu, Aug 1, 2019 at 3:58 PM Paul E. McKenney <paulmck@xxxxxxxxxxxxx> 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,

 - Joel