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 >