linux-kernel - linux-next: manual merge of the mips tree with Linus' 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>] [day] [month] [year] [list]

Date:	Sun, 22 Feb 2015 11:15:28 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Ralf Baechle <ralf@...ux-mips.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Steven J. Hill" <Steven.Hill@...tec.com>,
	"Kirill A. Shutemov" <kirill@...temov.name>
Subject: linux-next: manual merge of the mips tree with Linus' tree

Hi Ralf,

Today's linux-next merge of the mips tree got a conflict in
arch/mips/include/asm/pgtable-bits.h between commit b32da82e28ce
("mips: drop _PAGE_FILE and pte_file()-related helpers") from Linus'
tree and commit 05f9883a2899 ("MIPS: Usage and cosmetic cleanups of
page table bits.") from the mips tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/mips/include/asm/pgtable-bits.h
index fc807aa5ec8d,156fd6eb1e03..000000000000
--- a/arch/mips/include/asm/pgtable-bits.h
+++ b/arch/mips/include/asm/pgtable-bits.h
@@@ -167,9 -150,13 +150,9 @@@
  
  #endif /* defined(CONFIG_PHYS_ADDR_T_64BIT && defined(CONFIG_CPU_MIPS32) */
  
- #ifndef _PFN_SHIFT
- #define _PFN_SHIFT		    PAGE_SHIFT
- #endif
 -/*
 - * _PAGE_FILE semantics: set:pagecache unset:swap
 - */
 -#define _PAGE_FILE		_PAGE_MODIFIED
+ #define _PAGE_SILENT_READ	_PAGE_VALID
+ #define _PAGE_SILENT_WRITE	_PAGE_DIRTY
+ 
  #define _PFN_MASK		(~((1 << (_PFN_SHIFT)) - 1))
  
  #ifndef _PAGE_NO_READ

Content of type "application/pgp-signature" skipped