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 for Android: free password hash cracker in your pocket

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

Date:   Wed, 2 Sep 2020 14:31:01 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     "Paul E. McKenney" <paulmck@...nel.org>,
        Jonathan Corbet <corbet@....net>
Cc:     SeongJae Park <sjpark@...zon.de>,
        Mauro Carvalho Chehab <mchehab+huawei@...nel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...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/memory-barriers.txt

between commit:

  537f3a7cf48e ("docs/memory-barriers.txt: Fix references for DMA*.txt files")

from the jc_docs tree and commit:

  6f6705147bab ("docs: fix references for DMA*.txt files")

from the rcu tree.

I fixed it up (they are preety much the same - I used 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