linux-kernel - linux-next: manual merge of the trivial 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]

Date:   Tue, 11 Jan 2022 15:08:46 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Jiri Kosina <jikos@...nel.org>, Jonathan Corbet <corbet@....net>
Cc:     Jiri Kosina <jkosina@...e.cz>, Joe Perches <joe@...ches.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Miguel Ojeda <ojeda@...nel.org>
Subject: linux-next: manual merge of the trivial tree with the jc_docs tree

Hi all,

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

  Documentation/process/submitting-patches.rst

between commit:

  6c5ccd24ff17 ("Remove mentions of the Trivial Patch Monkey")

from the jc_docs tree and commit:

  081c8919b02b ("Documentation: remove trivial tree")

from the trivial tree.

I fixed it up (it was just an empty line difference, I 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.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped