[lkml]   [2011]   [Sep]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the moduleh tree with the powerpc tree
Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
arch/powerpc/mm/tlb_nohash.c between commit 41151e77a4d9 ("powerpc:
Hugetlb for BookE") from the powerpc tree and commit 09773e3bc0e4
("powerpc: include export.h for files using EXPORT_SYMBOL/THIS_MODULE")
from the moduleh tree.

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

diff --cc arch/powerpc/mm/tlb_nohash.c
index afc95c7,ab06aea..0000000
--- a/arch/powerpc/mm/tlb_nohash.c
+++ b/arch/powerpc/mm/tlb_nohash.c
@@@ -36,7 -36,7 +36,8 @@@
#include <linux/spinlock.h>
#include <linux/memblock.h>
#include <linux/of_fdt.h>
+#include <linux/hugetlb.h>
+ #include <linux/export.h>

#include <asm/tlbflush.h>
#include <asm/tlb.h>

 \ /
  Last update: 2011-09-21 07:07    [W:0.022 / U:4.116 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site