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: <20240819101242.5e85a0fb@canb.auug.org.au>
Date: Mon, 19 Aug 2024 10:12:42 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jonathan Corbet <corbet@....net>
Cc: Daniel Yang <danielyangkang@...il.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Mikulas Patocka <mpatocka@...hat.com>, Shibu
 Kumar <shibukumar.bit@...il.com>
Subject: linux-next: manual merge of the jc_docs tree with Linus' tree

Hi all,

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

  Documentation/admin-guide/device-mapper/dm-crypt.rst

between commit:

  86cfa9a85fb0 ("Documentation: dm-crypt.rst warning + error fix")

from Linus' tree and commit:

  e9c7acd72312 ("docs: dm-crypt: Removal of unexpected indentation error")

from the jc_docs tree.

I fixed it up (I just used the latter) 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.

BTW, the author Signed-off-by in the latter lacks angle brackets.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped