Messages in this thread | | | Date | Mon, 26 Jan 2015 21:00:18 -0700 | From | Jens Axboe <> | Subject | Re: linux-next: manual merge of the block tree with the vfs tree |
| |
On 01/26/2015 08:57 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 c2ca80413553 ("loop: convert to > vfs_iter_read/write") from the vfs tree and commit b5dd2f6047ca > ("block: loop: improve performance via blk-mq") and several others from > the block tree. > > I have no idea how fixed it up so I just used the version of the file > from the block tree (its been there a while). Please have a chat and > figure out how to combine these two large changes.
Why isn't the loop patch in the block tree? That'd avoid such incidents. We could add a dependency for the required VFS patch.
-- Jens Axboe
| |