2013-04-15 05:21:17

by Stephen Rothwell

[permalink] [raw]
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).

Stephen Rothwell [email protected]

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);

(No filename) (1.05 kB)
(No filename) (836.00 B)
Download all attachments