linux-next: manual merge of the akpm tree with the block tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in fs/bio.c
between commit 3a366e614d08 ("block: add missing block_bio_complete()
tracepoint") from the block tree and commit "block, aio: batch completion
for bios/kiocbs" from the akpm tree.

I am not sure how to fix this up, so I just dropped the block tree
additions of "trace_block_bio_complete(bio, error);" to this file.

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

pgp5ddvbbUQUb.pgp
Description: PGP signature