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

Stephen Rothwell
2018-08-03T06:42:52Z

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