lkml.org 
[lkml]   [2010]   [Nov]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the cleancache tree with the bkl-config tree
Hi Dan,

Today's linux-next merge of the cleancache tree got a conflict in
fs/ocfs2/super.c between commit cdbe83a95ae7c7a8762c10567a2c5d08cfc1cc4d
("BKL: remove extraneous #include <smp_lock.h>") from the bkl-config tree
and commit 91bf812da0c4f2efd0883fe02dc057853de731b1 ("ocfs2: add
cleancache support") from the cleancache tree.

Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc fs/ocfs2/super.c
index cfeab7c,e3f0a4e..0000000
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@@ -41,6 -41,8 +41,7 @@@
#include <linux/mount.h>
#include <linux/seq_file.h>
#include <linux/quotaops.h>
-#include <linux/smp_lock.h>
+ #include <linux/cleancache.h>

#define MLOG_MASK_PREFIX ML_SUPER
#include <cluster/masklog.h>


\
 
 \ /
  Last update: 2010-11-17 03:37    [W:0.693 / U:0.800 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site