Messages in this thread | | | Date | Fri, 01 Nov 2013 09:10:43 -0600 | From | Jens Axboe <> | Subject | Re: linux-next: manual merge of the block tree with the tree |
| |
On 10/31/2013 09:20 PM, Stephen Rothwell wrote: > Hi Jens, > > Today's linux-next merge of the block tree got a conflict in > drivers/block/loop.c between commit 2486740b52fd ("loop: use aio to > perform io on the underlying file") from the aio-direct tree and commit > ed2d2f9a8265 ("block: Abstract out bvec iterator") from the block tree. > > I fixed it up (I think - see below - I have also attached the final > resulting file) and can carry the fix as necessary (no action is > required). >
What tree is this from? It'd be a lot more convenient to fold that loop patch into my tree, especially since the block tree in linux-next failed after this merge.
-- Jens Axboe
| |