linux-next: manual merge of the mm-stable tree with the jc_docs tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the mm-stable tree got a conflict in:

  Documentation/admin-guide/mm/numaperf.rst

between commit:

  00cba6b60fed ("docs/admin-guide/mm: remove useless markup")

from the jc_docs tree and commit:

  6c364edc194e ("Docs/admin-guide/mm/numaperf: increase depth of subsections")

from the mm-stable tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc Documentation/admin-guide/mm/numaperf.rst
index 24e63e740420,544a6d16c801..000000000000
--- a/Documentation/admin-guide/mm/numaperf.rst
+++ b/Documentation/admin-guide/mm/numaperf.rst
@@@ -1,4 -1,9 +1,7 @@@
- =============
 -.. _numaperf:
 -
+ =======================
+ NUMA Memory Performance
+ =======================
+ 
  NUMA Locality
  =============

Attachment: pgpJlr_E8kZmW.pgp
Description: OpenPGP digital signature