Re: linux-next: manual merge of the usb tree with the block tree

[Jens Axboe]

On Mon, Mar 01 2010, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/storage/scsiglue.c between commit
> 086fa5ff0854c676ec333760f4c0154b3b242616 ("block: Rename
> blk_queue_max_sectors to blk_queue_max_hw_sectors") from the block tree
> and commit 628726dbb5ebbec77336019ac4e1f60cf3ba08c1 ("usb-storage: use
> max_hw_sectors instead of max_sectors") from the usb tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Thanks Stephen, looks good.

-- 
Jens Axboe

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/