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

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

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

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 i

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 c

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: > >

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.. > >

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 fdd83c534b114febc41ec115

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..

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

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"