Hi Dan, Today's linux-next merge of the cleancache tree got a conflict in fs/super.c between commit fb0a35ccc864ca877ed0908abcb7e8d0a5e09858 ("fs: dcache per-bucket dcache hash locking") from the vfs-scale tree and commit 03e838947c8abe29a9d7abfaf7fd9125a46b70e9 ("mm/fs: add hooks to support cleancache") from the cleancache tree. Just trivial overlapping additions. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx diff --cc fs/super.c index 968ba01,30a54e0..0000000 --- a/fs/super.c +++ b/fs/super.c @@@ -30,7 -30,7 +30,8 @@@ #include <linux/idr.h> #include <linux/mutex.h> #include <linux/backing-dev.h> +#include <linux/rculist_bl.h> + #include <linux/cleancache.h> #include "internal.h" -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html