linux-kernel - linux-next: manual merge of the rcu 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>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20220923134834.299646cd@canb.auug.org.au>
Date:   Fri, 23 Sep 2022 13:48:34 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     "Paul E. McKenney" <paulmck@...nel.org>,
        Jonathan Corbet <corbet@....net>
Cc:     Akhil Raj <lf32.dev@...il.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 rcu tree with the jc_docs tree

Hi all,

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

  Documentation/RCU/checklist.rst

between commit:

  712e1dea2e4f ("Delete duplicate words from kernel docs")

from the jc_docs tree and commit:

  1f0e704eea04 ("doc: Update checklist.txt")

from the rcu tree.

I fixed it up (I just used the latter since it removed the words removed
by the former) 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