linux-next: manual merge of the mips tree with the kbuild tree

linux-next: manual merge of the mips tree with the kbuild tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1592 bytes --]

Hi all,

Today's linux-next merge of the mips tree got a conflict in:

  arch/mips/Kconfig

between commit:

  eb01d42a7778 ("PCI: consolidate PCI config entry in drivers/pci")

from the kbuild tree and commit:

  47bf2b031754 ("mips: sort list of configs for Malta")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/mips/Kconfig
index f4df8007fddb,e49b5a0c8585..000000000000
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -495,22 -498,23 +499,23 @@@ config MIPS_MALT
  	select BOOT_RAW
  	select BUILTIN_DTB
  	select CEVT_R4K
- 	select CSRC_R4K
  	select CLKSRC_MIPS_GIC
  	select COMMON_CLK
+ 	select CSRC_R4K
  	select DMA_MAYBE_COHERENT
  	select GENERIC_ISA_DMA
- 	select HAVE_PCSPKR_PLATFORM
- 	select IRQ_MIPS_CPU
- 	select MIPS_GIC
 +	select HAVE_PCI
+ 	select HAVE_PCSPKR_PLATFORM
 -	select HW_HAS_PCI
  	select I8253
  	select I8259
+ 	select IRQ_MIPS_CPU
+ 	select LIBFDT
  	select MIPS_BONITO64
  	select MIPS_CPU_SCACHE
+ 	select MIPS_GIC
  	select MIPS_L1_CACHE_SHIFT_6
- 	select PCI_GT64XXX_PCI0
  	select MIPS_MSC
+ 	select PCI_GT64XXX_PCI0
  	select SMP_UP if SMP
  	select SWAP_IO_SPACE
  	select SYS_HAS_CPU_MIPS32_R1

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the mips tree with the kbuild tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1292 bytes --]

Hi all,

Today's linux-next merge of the mips tree got a conflict in:

  arch/mips/Kconfig

between commit:

  2ff2b7ec65dc ("kbuild: add CONFIG_ASM_MODVERSIONS")

from the kbuild tree and commit:

  45e03e62724f ("MIPS: Decouple CPU_SUPPORTS_HUGEPAGES from 64BIT")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/mips/Kconfig
index 3db919b5c93a,31c7044e34e6..000000000000
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -43,8 -44,7 +44,8 @@@ config MIP
  	select HAVE_ARCH_MMAP_RND_COMPAT_BITS if MMU && COMPAT
  	select HAVE_ARCH_SECCOMP_FILTER
  	select HAVE_ARCH_TRACEHOOK
- 	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES && 64BIT
+ 	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES
 +	select HAVE_ASM_MODVERSIONS
  	select HAVE_EBPF_JIT if (!CPU_MICROMIPS)
  	select HAVE_CONTEXT_TRACKING
  	select HAVE_COPY_THREAD_TLS

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the mips tree with the kbuild tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 752 bytes --]

Hi all,

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.



-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the mips tree with the kbuild tree

[Christoph Hellwig]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 774 bytes --]

Hi Christoph,

On Fri, 3 Aug 2018 08:41:28 +0200 Christoph Hellwig <hch@lst.de> 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the mips tree with the kbuild tree

[Christoph Hellwig]

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 <hch@lst.de> 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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 741 bytes --]

Hi Christoph,

On Fri, 3 Aug 2018 09:12:26 +0200 Christoph Hellwig <hch@lst.de> 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 <hch@lst.de> 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the mips tree with the kbuild tree

[Stephen Rothwell]

[-- 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 --]