linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Paul E. McKenney" <paulmck@linux.ibm.com>
To: "Joel Fernandes (Google)" <joel@joelfernandes.org>
Cc: linux-kernel@vger.kernel.org, rcu@vger.kernel.org
Subject: Re: [PATCH 0/9] Apply new rest conversion patches to /dev branch
Date: Thu, 1 Aug 2019 12:58:32 -0700	[thread overview]
Message-ID: <20190801195832.GP5913@linux.ibm.com> (raw)
In-Reply-To: <20190801181411.96429-1-joel@joelfernandes.org>

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.

							Thanx, Paul

> thanks,
> 
>  - Joel
> 
> And in the process I learnt about get_user() and compiler barriers ;-)
> 
> Joel Fernandes (Google) (8):
> Revert "rcu: Restore barrier() to rcu_read_lock() and
> rcu_read_unlock()"
> Revert "rcu: Add support for consolidated-RCU reader checking"
> Revert "treewide: Rename rcu_dereference_raw_notrace() to _check()"
> docs: rcu: Correct links referring to titles
> docs: rcu: Increase toctree to 3
> Revert "Revert "treewide: Rename rcu_dereference_raw_notrace() to
> _check()""
> Revert "Revert "rcu: Add support for consolidated-RCU reader
> checking""
> Revert "Revert "rcu: Restore barrier() to rcu_read_lock() and
> rcu_read_unlock()""
> 
> Mauro Carvalho Chehab (1):
> docs: rcu: convert some articles from html to ReST
> 
> .../Data-Structures/Data-Structures.html      | 1391 -------
> .../Data-Structures/Data-Structures.rst       | 1163 ++++++
> .../Expedited-Grace-Periods.html              |  668 ----
> .../Expedited-Grace-Periods.rst               |  521 +++
> .../Memory-Ordering/Tree-RCU-Diagram.html     |    9 -
> .../Tree-RCU-Memory-Ordering.html             |  704 ----
> .../Tree-RCU-Memory-Ordering.rst              |  624 +++
> .../RCU/Design/Requirements/Requirements.html | 3401 -----------------
> .../RCU/Design/Requirements/Requirements.rst  | 2704 +++++++++++++
> Documentation/RCU/index.rst                   |    7 +-
> Documentation/RCU/whatisRCU.txt               |    4 +-
> 11 files changed, 5020 insertions(+), 6176 deletions(-)
> delete mode 100644 Documentation/RCU/Design/Data-Structures/Data-Structures.html
> create mode 100644 Documentation/RCU/Design/Data-Structures/Data-Structures.rst
> delete mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html
> create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.rst
> delete mode 100644 Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Diagram.html
> delete mode 100644 Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Memory-Ordering.html
> create mode 100644 Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Memory-Ordering.rst
> delete mode 100644 Documentation/RCU/Design/Requirements/Requirements.html
> create mode 100644 Documentation/RCU/Design/Requirements/Requirements.rst
> 
> --
> 2.22.0.770.g0f2c4a37fd-goog
> 

  parent reply	other threads:[~2019-08-01 19:58 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 [this message]
2019-08-01 20:04   ` Joel Fernandes
2019-08-01 20:14     ` 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=20190801195832.GP5913@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).