Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
fs/f2fs/data.c
between commit:
8e5b935bf1ce ("f2fs: maintain extent cache in separated file")
from the f2fs tree and commit:
4246a0b63bd8 ("block: add a bi_error field to struct bio")
from the block tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc fs/f2fs/data.c
index 111f180fd1d2,8f0baa7ffb50..000000000000
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@@ -27,7 -26,10 +27,7 @@@
#include "trace.h"
#include <trace/events/f2fs.h>
- static void f2fs_read_end_io(struct bio *bio, int err)
-static struct kmem_cache *extent_tree_slab;
-static struct kmem_cache *extent_node_slab;
-
+ static void f2fs_read_end_io(struct bio *bio)
{
struct bio_vec *bvec;
int i;
--
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
