Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
References: <20190801181411.96429-1-joel@joelfernandes.org> <20190801195832.GP5913@linux.ibm.com>
In-Reply-To: <20190801195832.GP5913@linux.ibm.com>
From:   Joel Fernandes <joel@joelfernandes.org>
Date:   Thu, 1 Aug 2019 16:04:15 -0400
Message-ID: <CAEXW_YQ-JnuZGj7zUtmvY0Cn4swoHXoR6UD=iPKw56N55CL3-Q@mail.gmail.com>
Subject: Re: [PATCH 0/9] Apply new rest conversion patches to /dev branch
To:     "Paul E. McKenney" <paulmck@linux.ibm.com>
Cc:     LKML <linux-kernel@vger.kernel.org>, rcu <rcu@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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,

 - Joel