From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Ralf Baechle <ralf@linux-mips.org>,
James Hogan <james.hogan@imgtec.com>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Paul Burton <paul.burton@mips.com>,
Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: manual merge of the mips tree with the kbuild tree
Date: Wed, 15 Aug 2018 09:31:59 +1000 [thread overview]
Message-ID: <20180815093159.55c5588f@canb.auug.org.au> (raw)
In-Reply-To: <20180803092100.7d0fda13@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1452 bytes --]
Hi all,
On Fri, 3 Aug 2018 09:21:00 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the mips tree got a conflict in:
>
> arch/mips/Kconfig
>
> between commit:
>
> 1572497cb0e6 ("kconfig: include common Kconfig files from top-level Kconfig")
>
> from the kbuild tree and commit:
>
> 6c359eb1dcdb ("MIPS: Allow auto-dection of ARCH_PFN_OFFSET & PHYS_OFFSET")
>
> from the mips 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.
> fdd83c534b114febc41ec115449cb25f421e1719
> diff --cc arch/mips/Kconfig
> index 06a633eb9777,642a56e2a1ea..2af13b162e5e
> --- a/arch/mips/Kconfig
> +++ b/arch/mips/Kconfig
> @@@ -2990,6 -2988,13 +2984,9 @@@ config PGTABLE_LEVEL
> default 3 if 64BIT && !PAGE_SIZE_64KB
> default 2
>
> + config MIPS_AUTO_PFN_OFFSET
> + bool
> +
> -source "init/Kconfig"
> -
> -source "kernel/Kconfig.freezer"
> -
> menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)"
>
> config HW_HAS_EISA
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 --]
next prev parent reply other threads:[~2018-08-14 23:32 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-02 23:21 linux-next: manual merge of the mips tree with the kbuild tree Stephen Rothwell
2018-08-03 6:41 ` Christoph Hellwig
2018-08-03 6:42 ` Stephen Rothwell
2018-08-03 7:12 ` Christoph Hellwig
2018-08-03 7:51 ` Stephen Rothwell
2018-08-14 23:31 ` Stephen Rothwell [this message]
2018-11-25 23:17 Stephen Rothwell
2019-08-25 23:17 Stephen Rothwell
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=20180815093159.55c5588f@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=hch@lst.de \
--cc=james.hogan@imgtec.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=paul.burton@mips.com \
--cc=ralf@linux-mips.org \
--cc=yamada.masahiro@socionext.com \
/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).