From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Christoph Hellwig <hch@lst•de>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Alexandre Ghiti <alex@ghiti•fr>
Subject: linux-next: manual merge of the akpm-current tree with the dma-mapping tree
Date: Wed, 21 Aug 2019 17:28:03 +1000 [thread overview]
Message-ID: <20190821172803.4dabc39a@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1265 bytes --]
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arm/Kconfig
between commit:
936376f88ff1 ("arm: select the dma-noncoherent symbols for all swiotlb builds")
from the dma-mapping tree and commit:
83286f0dcb91 ("arm: use generic mmap top-down layout and brk randomization")
from the akpm-current tree.
I fixed it up (see below) 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
diff --cc arch/arm/Kconfig
index dcf46f0e45c2,81b08b027e4e..000000000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -7,9 -7,6 +7,8 @@@ config AR
select ARCH_HAS_BINFMT_FLAT
select ARCH_HAS_DEBUG_VIRTUAL if MMU
select ARCH_HAS_DEVMEM_IS_ALLOWED
+ select ARCH_HAS_DMA_COHERENT_TO_PFN if SWIOTLB
+ select ARCH_HAS_DMA_MMAP_PGPROT if SWIOTLB
- select ARCH_HAS_ELF_RANDOMIZE
select ARCH_HAS_FORTIFY_SOURCE
select ARCH_HAS_KEEPINITRD
select ARCH_HAS_KCOV
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-08-21 7:28 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-21 7:28 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-09-16 4:11 linux-next: manual merge of the akpm-current tree with the dma-mapping tree Stephen Rothwell
2020-09-16 4:22 ` Song Bao Hua (Barry Song)
2020-09-16 4:35 ` Christoph Hellwig
2019-09-16 2:46 Mark Brown
2019-06-17 8:14 Stephen Rothwell
2019-06-17 8:15 ` Christoph Hellwig
2019-06-03 5:01 Stephen Rothwell
2018-09-10 4:06 Stephen Rothwell
2018-05-10 6:39 Stephen Rothwell
2014-10-28 4:24 Stephen Rothwell
2014-10-28 6:29 ` Andrew Morton
2014-10-28 6:54 ` Marek Szyprowski
2014-10-28 20:26 ` Andrew Morton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190821172803.4dabc39a@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=alex@ghiti$(echo .)fr \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox