Messages in this thread | | | Date | Thu, 10 Sep 2009 09:24:07 +0200 | From | Jens Axboe <> | Subject | Re: linux-next: manual merge of the block tree with the tree |
| |
On Thu, Sep 10 2009, Stephen Rothwell wrote: > Hi Jens, > > Today's linux-next merge of the block tree got a conflict in > drivers/block/aoe/aoeblk.c between commit > 7135a71b19be1faf48b7148d77844d03bc0717d6 ("aoe: allocate unused > request_queue for sysfs") from Linus' tree and commit > 5063fe01e7dc205ebca89877f8eb01d6a5b0ebd6 ("writeback: add name to > backing_dev_info") from the block tree. > > I fixed it up (see below) and can carry the fix for a while.
Thanks, I'll update my for-2.6.32 branch today and let that propagate into for-next to resolve this.
-- Jens Axboe
| |