linux-next: manual merge of the mips tree with Linus' tree

From: Stephen Rothwell
Date: Sat Feb 21 2015 - 19:16:35 EST

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

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

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
- #endif
- * _PAGE_FILE semantics: set:pagecache unset:swap
- */
#define _PFN_MASK (~((1 << (_PFN_SHIFT)) - 1))

#ifndef _PAGE_NO_READ

Attachment: pgp8RX0SIOtkJ.pgp
Description: OpenPGP digital signature