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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20230209131258.1d7a28fb@canb.auug.org.au>
Date:   Thu, 9 Feb 2023 13:12:58 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>,
        Jonathan Corbet <corbet@....net>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        "Mike Rapoport (IBM)" <rppt@...nel.org>,
        SeongJae Park <sj@...nel.org>
Subject: linux-next: manual merge of the mm-stable tree with the jc_docs
 tree

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
  =============
  

Content of type "application/pgp-signature" skipped