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

[Stephen Rothwell]

Hi Chris,

Today's linux-next merge of the tile tree got a conflict in
arch/tile/include/asm/pgtable.h between commit bd119c692393
("Disintegrate asm/system.h for Tile") from Linus' tree and commit
7dc0069e58f6 ("arch/tile: Allow tilegx to build with either 16K or 64K
page size") from the tile tree.

Just context changes. I fixed it up (see below) and can carry the fix as
necessary.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/tile/include/asm/pgtable.h
index 6749091,ff01704..0000000
--- a/arch/tile/include/asm/pgtable.h
+++ b/arch/tile/include/asm/pgtable.h
@@@ -27,8 -27,11 +27,10 @@@
  #include <linux/slab.h>
  #include <linux/list.h>
  #include <linux/spinlock.h>
+ #include <linux/pfn.h>
  #include <asm/processor.h>
  #include <asm/fixmap.h>
 -#include <asm/system.h>
+ #include <asm/page.h>
  
  struct mm_struct;
  struct vm_area_struct;

Attachment: pgp00000.pgp
Description: PGP signature