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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <20220628165419.0bbe7b0f@canb.auug.org.au>
Date:   Tue, 28 Jun 2022 16:54:19 +1000
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 <rppt@...nel.org>,
        Mike Rapoport <rppt@...ux.ibm.com>,
        Yanteng Si <siyanteng@...ngson.cn>
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/translations/zh_CN/vm/page_migration.rst
  Documentation/translations/zh_CN/vm/vmalloced-kernel-stacks.rst

between commits:

  3f39b3d70fcd ("docs/zh_CN: add vm page_migration translation")
  17c260504f6f ("docs/zh_CN: add vm vmalloced-kernel-stacks translation")

from the jc_docs tree and commit:

  ee65728e103b ("docs: rename Documentation/vm to Documentation/mm")

from the mm-stable tree.

I fixed it up (I moved the files into the "mm" directory) 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

Content of type "application/pgp-signature" skipped