Hi Ted,

Today's linux-next merge of the ext4 tree got a conflict in
fs/ext4/mballoc.c between commit 2892c15ddda6a76dc10b7499e56c0f3b892e5a69
("ext4: make grpinfo slab cache names static") from Linus' tree and
commit 63a1555068c51e47fcdd3c097e9891ac88e86184 ("ext4: make grpinfo slab
cache names static") from the ext4 tree.

I used the version from Linus' tree (since that one was updated).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/