Hi Ted,

Today's linux-next merge of the ext4 tree got a conflict in
fs/ext4/super.c between commit fd89d5f2030a ("ext4: convert to
alloc_workqueue()") from Linus' tree and commit 198868f35de9 ("ext4: Use
single thread to perform DIO unwritten convertion") from the ext4 tree.

I just used the ext4 tree version.

P.S. Ted, that ext4 tree commit has no SOB from you even though you are
the committer ...
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/