linux-kernel - linux-next: manual merge of the jc_docs tree with the dma-mapping tree

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:   Thu, 10 May 2018 11:38:29 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Jonathan Corbet <corbet@....net>, Christoph Hellwig <hch@....de>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Andrea Parri <andrea.parri@...rulasolutions.com>
Subject: linux-next: manual merge of the jc_docs tree with the dma-mapping
 tree

Hi Jonathan,

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

  Documentation/features/io/dma-api-debug/arch-support.txt

between commit:

  6e88628d03dd ("dma-debug: remove CONFIG_HAVE_DMA_API_DEBUG")

from the dma-mapping tree and commit:

  7156fc292850 ("Documentation/features: Refresh the arch support status files in place")

from the jc_docs tree.

I fixed it up (I just remobved the file like the former commit did) 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