From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg Ungerer <gerg@snapgear.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the m68knommu tree with the m68k tree
Date: Tue, 13 Oct 2020 18:24:16 +1100 [thread overview]
Message-ID: <20201013182416.2cb8ecaf@canb.auug.org.au> (raw)
In-Reply-To: <20200910093437.4098988b@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2733 bytes --]
Hi all,
On Thu, 10 Sep 2020 09:34:37 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the m68knommu tree got a conflict in:
>
> arch/m68k/Kconfig
>
> between commit:
>
> dc072012bc94 ("m68k: Sort selects in main Kconfig")
>
> from the m68k tree and commit:
>
> ef03e4545eac ("m68knommu: switch to using asm-generic/uaccess.h")
>
> from the m68knommu 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.
>
> diff --cc arch/m68k/Kconfig
> index 93bbb74ea876,aefffebc0afa..000000000000
> --- a/arch/m68k/Kconfig
> +++ b/arch/m68k/Kconfig
> @@@ -6,32 -6,33 +6,33 @@@ config M68
> select ARCH_HAS_BINFMT_FLAT
> select ARCH_HAS_DMA_PREP_COHERENT if HAS_DMA && MMU && !COLDFIRE
> select ARCH_HAS_SYNC_DMA_FOR_DEVICE if HAS_DMA
> + select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS
> select ARCH_MIGHT_HAVE_PC_PARPORT if ISA
> select ARCH_NO_PREEMPT if !COLDFIRE
> + select ARCH_WANT_IPC_PARSE_VERSION
> select BINFMT_FLAT_ARGVP_ENVP_ON_STACK
> select DMA_DIRECT_REMAP if HAS_DMA && MMU && !COLDFIRE
> - select HAVE_IDE
> - select HAVE_AOUT if MMU
> - select HAVE_ASM_MODVERSIONS
> - select HAVE_DEBUG_BUGVERBOSE
> - select GENERIC_IRQ_SHOW
> select GENERIC_ATOMIC64
> - select NO_DMA if !MMU && !COLDFIRE
> - select HAVE_UID16
> - select VIRT_TO_BUS
> - select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS
> select GENERIC_CPU_DEVICES
> select GENERIC_IOMAP
> + select GENERIC_IRQ_SHOW
> select GENERIC_STRNCPY_FROM_USER if MMU
> select GENERIC_STRNLEN_USER if MMU
> - select UACCESS_MEMCPY if !MMU
> - select ARCH_WANT_IPC_PARSE_VERSION
> + select HAVE_AOUT if MMU
> + select HAVE_ASM_MODVERSIONS
> + select HAVE_DEBUG_BUGVERBOSE
> select HAVE_FUTEX_CMPXCHG if MMU && FUTEX
> + select HAVE_IDE
> select HAVE_MOD_ARCH_SPECIFIC
> + select HAVE_UID16
> + select MMU_GATHER_NO_RANGE if MMU
> select MODULES_USE_ELF_REL
> select MODULES_USE_ELF_RELA
> - select OLD_SIGSUSPEND3
> + select NO_DMA if !MMU && !COLDFIRE
> select OLD_SIGACTION
> - select MMU_GATHER_NO_RANGE if MMU
> + select OLD_SIGSUSPEND3
> ++ select UACCESS_MEMCPY if !MMU
> + select VIRT_TO_BUS
>
> config CPU_BIG_ENDIAN
> def_bool y
This is now a conflict between the m68knommu tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-10-13 7:24 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-09 23:34 linux-next: manual merge of the m68knommu tree with the m68k tree Stephen Rothwell
2020-10-13 7:24 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-05-09 23:44 Stephen Rothwell
2022-05-10 3:37 ` Michael Schmitz
2022-05-10 4:15 ` Greg Ungerer
2019-07-01 23:09 Stephen Rothwell
2019-07-09 0:25 ` Stephen Rothwell
2011-11-14 0:03 Stephen Rothwell
2011-11-14 0:29 ` Greg Ungerer
2011-11-09 0:15 Stephen Rothwell
2011-11-09 7:08 ` Greg Ungerer
2011-11-09 7:13 ` Geert Uytterhoeven
2011-11-09 7:37 ` Greg Ungerer
2011-11-09 8:19 ` Geert Uytterhoeven
2011-11-09 0:15 Stephen Rothwell
2011-06-22 1:12 Stephen Rothwell
2011-06-22 6:34 ` Greg Ungerer
2011-06-22 8:29 ` Geert Uytterhoeven
2011-06-23 6:12 ` Greg Ungerer
2010-09-14 0:51 Stephen Rothwell
2010-09-14 1:21 ` Greg Ungerer
2010-09-14 8:47 ` Geert Uytterhoeven
2009-11-26 0:58 Stephen Rothwell
2009-11-26 21:29 ` Geert Uytterhoeven
2009-11-27 4:43 ` Greg Ungerer
2009-11-27 8:43 ` Geert Uytterhoeven
2009-11-27 11:23 ` Greg Ungerer
2009-11-27 21:21 ` Geert Uytterhoeven
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=20201013182416.2cb8ecaf@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=geert@linux-m68k.org \
--cc=gerg@snapgear.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).