* linux-next: manual merge of the dma-mapping tree with the kbuild tree
@ 2018-08-02 22:08 Stephen Rothwell
2018-08-14 23:27 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2018-08-02 22:08 UTC (permalink / raw)
To: Christoph Hellwig, Masahiro Yamada
Cc: Linux-Next Mailing List, Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 1168 bytes --]
Hi all,
Today's linux-next merge of the dma-mapping tree got a conflict in:
arch/nios2/Kconfig
between commit:
17c46a6aff5c ("kconfig: remove duplicate SWAP symbol defintions")
from the kbuild tree and commit:
25622e045a6a ("nios2: use generic dma_noncoherent_ops")
from the dma-mapping 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/nios2/Kconfig
index cbe1844b0657,92035042cf62..000000000000
--- a/arch/nios2/Kconfig
+++ b/arch/nios2/Kconfig
@@@ -1,7 -1,9 +1,10 @@@
# SPDX-License-Identifier: GPL-2.0
config NIOS2
def_bool y
+ select ARCH_NO_SWAP
+ select ARCH_HAS_SYNC_DMA_FOR_CPU
+ select ARCH_HAS_SYNC_DMA_FOR_DEVICE
+ select DMA_NONCOHERENT_OPS
select TIMER_OF
select GENERIC_ATOMIC64
select GENERIC_CLOCKEVENTS
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the dma-mapping tree with the kbuild tree
2018-08-02 22:08 linux-next: manual merge of the dma-mapping tree with the kbuild tree Stephen Rothwell
@ 2018-08-14 23:27 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2018-08-14 23:27 UTC (permalink / raw)
To: Masahiro Yamada
Cc: Christoph Hellwig, Linux-Next Mailing List, Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 1434 bytes --]
Hi all,
On Fri, 3 Aug 2018 08:08:56 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the dma-mapping tree got a conflict in:
>
> arch/nios2/Kconfig
>
> between commit:
>
> 17c46a6aff5c ("kconfig: remove duplicate SWAP symbol defintions")
>
> from the kbuild tree and commit:
>
> 25622e045a6a ("nios2: use generic dma_noncoherent_ops")
>
> from the dma-mapping 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/nios2/Kconfig
> index cbe1844b0657,92035042cf62..000000000000
> --- a/arch/nios2/Kconfig
> +++ b/arch/nios2/Kconfig
> @@@ -1,7 -1,9 +1,10 @@@
> # SPDX-License-Identifier: GPL-2.0
> config NIOS2
> def_bool y
> + select ARCH_NO_SWAP
> + select ARCH_HAS_SYNC_DMA_FOR_CPU
> + select ARCH_HAS_SYNC_DMA_FOR_DEVICE
> + select DMA_NONCOHERENT_OPS
> select TIMER_OF
> select GENERIC_ATOMIC64
> select GENERIC_CLOCKEVENTS
This is now a conflict between Linus' tree and the kbuild tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the dma-mapping tree with the kbuild tree
@ 2018-12-13 21:04 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2018-12-13 21:04 UTC (permalink / raw)
To: Christoph Hellwig, Masahiro Yamada
Cc: Linux Next Mailing List, Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 1558 bytes --]
Hi all,
Today's linux-next merge of the dma-mapping tree got a conflict in:
arch/alpha/Kconfig
between commit:
6630a8e50105 ("eisa: consolidate EISA Kconfig entry in drivers/eisa")
from the kbuild tree and commit:
3731c3d4774e ("dma-mapping: always build the direct mapping code")
from the dma-mapping 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/alpha/Kconfig
index 5e7a44e6110f,5da6ff54b3e7..000000000000
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@@ -5,10 -5,8 +5,11 @@@ config ALPH
select ARCH_MIGHT_HAVE_PC_PARPORT
select ARCH_MIGHT_HAVE_PC_SERIO
select ARCH_NO_PREEMPT
+ select ARCH_NO_SG_CHAIN
select ARCH_USE_CMPXCHG_LOCKREF
+ select FORCE_PCI if !ALPHA_JENSEN
+ select PCI_DOMAINS if PCI
+ select PCI_SYSCALL if PCI
select HAVE_AOUT
select HAVE_IDE
select HAVE_OPROFILE
@@@ -208,8 -203,6 +209,7 @@@ config ALPHA_EIGE
config ALPHA_JENSEN
bool "Jensen"
depends on BROKEN
- select DMA_DIRECT_OPS
+ select HAVE_EISA
help
DEC PC 150 AXP (aka Jensen): This is a very old Digital system - one
of the first-generation Alpha systems. A number of these systems
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-12-13 21:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-02 22:08 linux-next: manual merge of the dma-mapping tree with the kbuild tree Stephen Rothwell
2018-08-14 23:27 ` Stephen Rothwell
2018-12-13 21:04 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).