From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christoph Hellwig <hch@lst.de>
Cc: Ralf Baechle <ralf@linux-mips.org>,
James Hogan <james.hogan@imgtec.com>,
Masahiro Yamada <yamada.masahiro@socionext.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>
Subject: Re: linux-next: manual merge of the mips tree with the kbuild tree
Date: Fri, 3 Aug 2018 16:42:52 +1000 [thread overview]
Message-ID: <20180803164252.5f519701@canb.auug.org.au> (raw)
In-Reply-To: <20180803064128.GA1715@lst.de>
[-- 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 --]
next prev parent reply other threads:[~2018-08-03 6:42 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 [this message]
2018-08-03 7:12 ` Christoph Hellwig
2018-08-03 7:51 ` Stephen Rothwell
2018-08-14 23:31 ` Stephen Rothwell
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=20180803164252.5f519701@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).