[lkml]   [2012]   [Apr]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the tile tree with Linus' tree
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

Stephen Rothwell

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;
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2012-04-02 02:41    [W:0.029 / U:0.432 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site