[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20130415152105.c658ed6f5ce2140b1034beca@canb.auug.org.au>
Date: Mon, 15 Apr 2013 15:21:05 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Dan Magenheimer <dan.magenheimer@...cle.com>,
Wanpeng Li <liwanp@...ux.vnet.ibm.com>,
Greg KH <greg@...ah.com>
Subject: linux-next: manual merge of the akpm tree with the staging tree
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
drivers/staging/zcache/ramster/ramster.c between commit df735543008f
("staging: ramster: Move debugfs code out of ramster.c file") from the
staging tree and commit "staging: zcache: enable ramster to be
built/loaded as a module" from the akpm tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc drivers/staging/zcache/ramster/ramster.c
index 8781627,3ead248..0000000
--- a/drivers/staging/zcache/ramster/ramster.c
+++ b/drivers/staging/zcache/ramster/ramster.c
diff --git a/drivers/staging/zcache/ramster/debug.c b/drivers/staging/zcache/ramster/debug.c
index bf34133..327e4f0 100644
--- a/drivers/staging/zcache/ramster/debug.c
+++ b/drivers/staging/zcache/ramster/debug.c
@@ -43,7 +43,7 @@ static struct debug_entry {
};
#undef ATTR
-int __init ramster_debugfs_init(void)
+int ramster_debugfs_init(void)
{
int i;
struct dentry *root = debugfs_create_dir("ramster", NULL);
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists