Messages in this thread | | | Date | Wed, 29 Sep 2010 13:53:43 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the cleancache tree with the rcu tree |
| |
Hi Dan,
Today's linux-next merge of the cleancache tree got a conflict in include/linux/fs.h between commit 4d2deb40b20c2608486598364e63e37b09a9ac2f ("kernel: __rcu annotations") from the rcu tree and commit 661ea21b454e53a8b6fd587d2db0daa5be6d7c18 ("fs: add field to superblock to support cleancache") 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 include/linux/fs.h index fd85cd2,31eb6b8..0000000 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@@ -1386,7 -1380,12 +1386,12 @@@ struct super_block * Saved mount options for lazy filesystems using * generic_show_options() */ - char *s_options; + char __rcu *s_options; + + /* + * Saved pool identifier for cleancache (-1 means none) + */ + int cleancache_poolid; }; extern struct timespec current_fs_time(struct super_block *sb);
| |