Subject: linux-next: manual merge of the akpm-current tree with the fsl tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 2 Feb 2015 19:02:09 +1100

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
arch/powerpc/include/asm/pgtable-ppc32.h between commit ce67f5d0a00c
("powerpc32: Use kmem_cache memory for PGDIR") from the fsl tree and
commit f8b48f1a9895 ("powerpc: drop _PAGE_FILE and pte_file()-related
helpers") from the akpm-current tree.

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

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc arch/powerpc/include/asm/pgtable-ppc32.h
index 26ce0ab0a9e4,cc3e621aa830..000000000000
--- a/arch/powerpc/include/asm/pgtable-ppc32.h
+++ b/arch/powerpc/include/asm/pgtable-ppc32.h
@@@ -342,14 -341,6 +342,9 @@@ static inline void __ptep_set_access_fl
  #define __pte_to_swp_entry(pte)		((swp_entry_t) { pte_val(pte) >> 3 })
  #define __swp_entry_to_pte(x)		((pte_t) { (x).val << 3 })
  
- /* Encode and decode a nonlinear file mapping entry */
- #define PTE_FILE_MAX_BITS	29
- #define pte_to_pgoff(pte)	(pte_val(pte) >> 3)
- #define pgoff_to_pte(off)	((pte_t) { ((off) << 3) | _PAGE_FILE })
- 
 +#ifndef CONFIG_PPC_4K_PAGES
 +void pgtable_cache_init(void);
 +#else
  /*
   * No page table caches to initialise
   */