linux-kernel - linux-next: manual merge of 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: <20230622110725.4a1e791d@canb.auug.org.au>
Date:   Thu, 22 Jun 2023 11:07:25 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Jonathan Corbet <corbet@....net>,
        Catalin Marinas <catalin.marinas@....com>,
        Will Deacon <will@...nel.org>
Cc:     Baoquan He <bhe@...hat.com>,
        Chaitanya S Prakash <chaitanyas.prakash@....com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the jc_docs tree with the arm64 tree

Hi all,

Today's linux-next merge of the jc_docs tree got conflicts in:

  Documentation/arm64/kdump.rst
  Documentation/arm64/ptdump.rst

between commits:

  03dc0e05407f ("Documentation: add kdump.rst to present crashkernel reservation on arm64")
  a0238ada560f ("Documentation/arm64: Add ptdump documentation")

from the arm64 tree and commit:

  e4624435f38b ("docs: arm64: Move arm64 documentation under Documentation/arch/")

from the jc_docs tree.

I fixed it up (I added the files in the new 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