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

Message-ID: <20181002183139.64a85845@canb.auug.org.au>
Date:   Tue, 2 Oct 2018 18:31:39 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>,
        Christoph Hellwig <hch@....de>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Mike Rapoport <rppt@...ux.vnet.ibm.com>
Subject: linux-next: manual merge of the akpm tree with the dma-mapping tree

Hi all,

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

  arch/unicore32/Kconfig

between commit:

  b733116feab5 ("unicore32: remove swiotlb support")

from the dma-mapping tree and patch:

  "mm: remove CONFIG_HAVE_MEMBLOCK"

from the akpm tree.

I fixed it up (I forgot to generate the patch, sorry) 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