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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Fri, 3 Aug 2018 16:42:52 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Christoph Hellwig <hch@....de>
Cc:     Ralf Baechle <ralf@...ux-mips.org>,
        James Hogan <james.hogan@...tec.com>,
        Masahiro Yamada <yamada.masahiro@...ionext.com>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Paul Burton <paul.burton@...s.com>
Subject: 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 <hch@....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

Content of type "application/pgp-signature" skipped