LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [GIT PULL] Some more documentation work for 5.2
@ 2019-05-10 15:28 Jonathan Corbet
  2019-05-10 17:35 ` pr-tracker-bot
  0 siblings, 1 reply; 2+ messages in thread
From: Jonathan Corbet @ 2019-05-10 15:28 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: LKML, linux-doc

The following changes since commit
d9defe448f4c7b88ca2ae636a321ef8970fa718d:

  docs/livepatch: Unify style of livepatch documentation in the ReST format (2019-05-07 16:06:28 -0600)

are available in the Git repository at:

  git://git.lwn.net/linux.git tags/docs-5.2a

for you to fetch changes up to afbd4d42470e91470bc59040094b89cd717530bd:

  Merge branch 'x86' into docs-next (2019-05-08 14:38:11 -0600)

----------------------------------------------------------------
Some late arriving documentation changes.  In particular, this contains the
conversion of the x86 docs to RST (acked by Ingo), which has been in the
works for some time but needed a couple of final tweaks.

There is a moderately annoying conflict with
Documentation/x86/x86_64/mm.txt, which has a parallel change that went in
via the x86 tree.  The resolution is to delete that file but to propagate
the change; I've put a proposed merge (which is really just what Stephen
did in docs-next) at the tag docs-5.2a-merge should that be helpful.
----------------------------------------------------------------

Changbin Du (27): Documentation: add Linux x86 docs to Sphinx TOC tree
      Documentation: x86: convert boot.txt to reST
      Documentation: x86: convert topology.txt to reST
      Documentation: x86: convert exception-tables.txt to reST
      Documentation: x86: convert kernel-stacks to reST
      Documentation: x86: convert entry_64.txt to reST
      Documentation: x86: convert earlyprintk.txt to reST
      Documentation: x86: convert zero-page.txt to reST
      Documentation: x86: convert tlb.txt to reST
      Documentation: x86: convert mtrr.txt to reST
      Documentation: x86: convert pat.txt to reST
      Documentation: x86: convert protection-keys.txt to reST
      Documentation: x86: convert intel_mpx.txt to reST
      Documentation: x86: convert amd-memory-encryption.txt to reST
      Documentation: x86: convert pti.txt to reST
      Documentation: x86: convert microcode.txt to reST
      Documentation: x86: convert resctrl_ui.txt to reST
      Documentation: x86: convert orc-unwinder.txt to reST
      Documentation: x86: convert usb-legacy-support.txt to reST
      Documentation: x86: convert i386/IO-APIC.txt to reST
      Documentation: x86: convert x86_64/boot-options.txt to reST
      Documentation: x86: convert x86_64/uefi.txt to reST
      Documentation: x86: convert x86_64/mm.txt to reST
      Documentation: x86: convert x86_64/5level-paging.txt to reST
      Documentation: x86: convert x86_64/fake-numa-for-cpusets to reST
      Documentation: x86: convert x86_64/cpu-hotplug-spec to reST
      Documentation: x86: convert x86_64/machinecheck to reST

Federico Vaga (1):
      doc:it_IT: align documentation after licenses patches

Jonathan Corbet (1):
      Merge branch 'x86' into docs-next

Tzvetomir Stoyanov (1):
      Documentation/trace: Add clarification how histogram onmatch works

 Documentation/index.rst                            |   1 +
 Documentation/trace/histogram.rst                  |  11 +-
 .../translations/it_IT/process/license-rules.rst   |  60 +-
 ...ry-encryption.txt => amd-memory-encryption.rst} |  13 +-
 Documentation/x86/{boot.txt => boot.rst}           | 528 +++++++-----
 .../x86/{earlyprintk.txt => earlyprintk.rst}       | 122 +--
 Documentation/x86/{entry_64.txt => entry_64.rst}   |  12 +-
 .../{exception-tables.txt => exception-tables.rst} | 247 +++---
 .../x86/i386/{IO-APIC.txt => IO-APIC.rst}          |  28 +-
 Documentation/x86/i386/index.rst                   |  10 +
 Documentation/x86/index.rst                        |  30 +
 Documentation/x86/{intel_mpx.txt => intel_mpx.rst} | 120 +--
 .../x86/{kernel-stacks => kernel-stacks.rst}       |  20 +-
 Documentation/x86/{microcode.txt => microcode.rst} |  62 +-
 Documentation/x86/mtrr.rst                         | 354 ++++++++
 Documentation/x86/mtrr.txt                         | 329 --------
 .../x86/{orc-unwinder.txt => orc-unwinder.rst}     |  27 +-
 Documentation/x86/pat.rst                          | 242 ++++++
 Documentation/x86/pat.txt                          | 230 ------
 .../{protection-keys.txt => protection-keys.rst}   |  33 +-
 Documentation/x86/{pti.txt => pti.rst}             |  17 +-
 .../x86/{resctrl_ui.txt => resctrl_ui.rst}         | 916 +++++++++++----------
 Documentation/x86/{tlb.txt => tlb.rst}             |  30 +-
 Documentation/x86/{topology.txt => topology.rst}   |  92 ++-
 ...b-legacy-support.txt => usb-legacy-support.rst} |  40 +-
 .../{5level-paging.txt => 5level-paging.rst}       |  16 +-
 Documentation/x86/x86_64/boot-options.rst          | 335 ++++++++
 Documentation/x86/x86_64/boot-options.txt          | 278 -------
 .../{cpu-hotplug-spec => cpu-hotplug-spec.rst}     |   5 +-
 ...-numa-for-cpusets => fake-numa-for-cpusets.rst} |  25 +-
 Documentation/x86/x86_64/index.rst                 |  16 +
 .../x86/x86_64/{machinecheck => machinecheck.rst}  |  12 +-
 Documentation/x86/x86_64/mm.rst                    | 161 ++++
 Documentation/x86/x86_64/mm.txt                    | 153 ----
 Documentation/x86/x86_64/{uefi.txt => uefi.rst}    |  30 +-
 Documentation/x86/zero-page.rst                    |  45 +
 Documentation/x86/zero-page.txt                    |  40 -
 37 files changed, 2620 insertions(+), 2070 deletions(-)
 rename Documentation/x86/{amd-memory-encryption.txt => amd-memory-encryption.rst} (94%)
 rename Documentation/x86/{boot.txt => boot.rst} (73%)
 rename Documentation/x86/{earlyprintk.txt => earlyprintk.rst} (51%)
 rename Documentation/x86/{entry_64.txt => entry_64.rst} (95%)
 rename Documentation/x86/{exception-tables.txt => exception-tables.rst} (64%)
 rename Documentation/x86/i386/{IO-APIC.txt => IO-APIC.rst} (93%)
 create mode 100644 Documentation/x86/i386/index.rst
 create mode 100644 Documentation/x86/index.rst
 rename Documentation/x86/{intel_mpx.txt => intel_mpx.rst} (75%)
 rename Documentation/x86/{kernel-stacks => kernel-stacks.rst} (92%)
 rename Documentation/x86/{microcode.txt => microcode.rst} (81%)
 create mode 100644 Documentation/x86/mtrr.rst
 delete mode 100644 Documentation/x86/mtrr.txt
 rename Documentation/x86/{orc-unwinder.txt => orc-unwinder.rst} (93%)
 create mode 100644 Documentation/x86/pat.rst
 delete mode 100644 Documentation/x86/pat.txt
 rename Documentation/x86/{protection-keys.txt => protection-keys.rst} (83%)
 rename Documentation/x86/{pti.txt => pti.rst} (96%)
 rename Documentation/x86/{resctrl_ui.txt => resctrl_ui.rst} (68%)
 rename Documentation/x86/{tlb.txt => tlb.rst} (81%)
 rename Documentation/x86/{topology.txt => topology.rst} (74%)
 rename Documentation/x86/{usb-legacy-support.txt => usb-legacy-support.rst} (53%)
 rename Documentation/x86/x86_64/{5level-paging.txt => 5level-paging.rst} (91%)
 create mode 100644 Documentation/x86/x86_64/boot-options.rst
 delete mode 100644 Documentation/x86/x86_64/boot-options.txt
 rename Documentation/x86/x86_64/{cpu-hotplug-spec => cpu-hotplug-spec.rst} (88%)
 rename Documentation/x86/x86_64/{fake-numa-for-cpusets => fake-numa-for-cpusets.rst} (85%)
 create mode 100644 Documentation/x86/x86_64/index.rst
 rename Documentation/x86/x86_64/{machinecheck => machinecheck.rst} (92%)
 create mode 100644 Documentation/x86/x86_64/mm.rst
 delete mode 100644 Documentation/x86/x86_64/mm.txt
 rename Documentation/x86/x86_64/{uefi.txt => uefi.rst} (79%)
 create mode 100644 Documentation/x86/zero-page.rst
 delete mode 100644 Documentation/x86/zero-page.txt

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [GIT PULL] Some more documentation work for 5.2
  2019-05-10 15:28 [GIT PULL] Some more documentation work for 5.2 Jonathan Corbet
@ 2019-05-10 17:35 ` pr-tracker-bot
  0 siblings, 0 replies; 2+ messages in thread
From: pr-tracker-bot @ 2019-05-10 17:35 UTC (permalink / raw)
  To: Jonathan Corbet; +Cc: Linus Torvalds, LKML, linux-doc

The pull request you sent on Fri, 10 May 2019 09:28:37 -0600:

> git://git.lwn.net/linux.git tags/docs-5.2a

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/1fb3b526df3bd7647e7854915ae6b22299408baf

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-05-10 17:35 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-10 15:28 [GIT PULL] Some more documentation work for 5.2 Jonathan Corbet
2019-05-10 17:35 ` pr-tracker-bot

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).