Re: linux-next: manual merge of the mips tree with the kbuild tree
Hi all,
On Fri, 3 Aug 2018 09:21:00 +1000 Stephen Rothwell
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
pgpqXJmpIKkCd.pgp
Description: OpenPGP digital signature
Re: linux-next: manual merge of the mips tree with the kbuild tree
Hi all,
On Fri, 3 Aug 2018 09:21:00 +1000 Stephen Rothwell
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
pgpqXJmpIKkCd.pgp
Description: OpenPGP digital signature
Re: linux-next: manual merge of the mips tree with the kbuild tree
Hi Christoph, On Fri, 3 Aug 2018 09:12:26 +0200 Christoph Hellwig wrote: > > On Fri, Aug 03, 2018 at 04:42:52PM +1000, Stephen Rothwell wrote: > > > > On Fri, 3 Aug 2018 08:41:28 +0200 Christoph Hellwig wrote: > > > > > > On Fri, Aug 03, 2018 at 09:21:00AM +1000, Stephen Rothwell wrote: > > > > I fixed it up (see below) > > > > > > I can't find any fixup below.. > > > > Sorry about that - see below. > > Thanks. So just another trivial removals near additions case. Yes, the notifications are mostly to make sure I haven't done something stupid and (for more complex cases) to make sure people make Linus aware when sending pull requests. -- Cheers, Stephen Rothwell pgp3RTLNE10D3.pgp Description: OpenPGP digital signature
Re: linux-next: manual merge of the mips tree with the kbuild tree
Hi Christoph, On Fri, 3 Aug 2018 09:12:26 +0200 Christoph Hellwig wrote: > > On Fri, Aug 03, 2018 at 04:42:52PM +1000, Stephen Rothwell wrote: > > > > On Fri, 3 Aug 2018 08:41:28 +0200 Christoph Hellwig wrote: > > > > > > On Fri, Aug 03, 2018 at 09:21:00AM +1000, Stephen Rothwell wrote: > > > > I fixed it up (see below) > > > > > > I can't find any fixup below.. > > > > Sorry about that - see below. > > Thanks. So just another trivial removals near additions case. Yes, the notifications are mostly to make sure I haven't done something stupid and (for more complex cases) to make sure people make Linus aware when sending pull requests. -- Cheers, Stephen Rothwell pgp3RTLNE10D3.pgp Description: OpenPGP digital signature
Re: linux-next: manual merge of the mips tree with the kbuild tree
On Fri, Aug 03, 2018 at 04:42:52PM +1000, Stephen Rothwell wrote: > Hi Christoph, > > On Fri, 3 Aug 2018 08:41:28 +0200 Christoph Hellwig wrote: > > > > On Fri, Aug 03, 2018 at 09:21:00AM +1000, Stephen Rothwell wrote: > > > I fixed it up (see below) > > > > I can't find any fixup below.. > > Sorry about that - see below. Thanks. So just another trivial removals near additions case.
Re: linux-next: manual merge of the mips tree with the kbuild tree
On Fri, Aug 03, 2018 at 04:42:52PM +1000, Stephen Rothwell wrote: > Hi Christoph, > > On Fri, 3 Aug 2018 08:41:28 +0200 Christoph Hellwig wrote: > > > > On Fri, Aug 03, 2018 at 09:21:00AM +1000, Stephen Rothwell wrote: > > > I fixed it up (see below) > > > > I can't find any fixup below.. > > Sorry about that - see below. Thanks. So just another trivial removals near additions case.
Re: linux-next: manual merge of the mips tree with the kbuild tree
Hi Christoph, On Fri, 3 Aug 2018 08:41:28 +0200 Christoph Hellwig wrote: > > On Fri, Aug 03, 2018 at 09:21:00AM +1000, Stephen Rothwell wrote: > > I fixed it up (see below) > > I can't find any fixup below.. Sorry about that - see below. -- Cheers, Stephen Rothwell 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 pgpnH8NIN1nto.pgp Description: OpenPGP digital signature
Re: linux-next: manual merge of the mips tree with the kbuild tree
Hi Christoph, On Fri, 3 Aug 2018 08:41:28 +0200 Christoph Hellwig wrote: > > On Fri, Aug 03, 2018 at 09:21:00AM +1000, Stephen Rothwell wrote: > > I fixed it up (see below) > > I can't find any fixup below.. Sorry about that - see below. -- Cheers, Stephen Rothwell 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 pgpnH8NIN1nto.pgp Description: OpenPGP digital signature
Re: linux-next: manual merge of the mips tree with the kbuild tree
On Fri, Aug 03, 2018 at 09:21:00AM +1000, Stephen Rothwell wrote: > I fixed it up (see below) I can't find any fixup below..
Re: linux-next: manual merge of the mips tree with the kbuild tree
On Fri, Aug 03, 2018 at 09:21:00AM +1000, Stephen Rothwell wrote: > I fixed it up (see below) I can't find any fixup below..
