From: Linus Torvalds Date: Thu, 4 Dec 2008 00:45:56 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block X-Git-Tag: v2.6.28-rc8~65 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=feaf3848a813a106f163013af6fcf6c4bfec92d9;p=linux-2.6-block.git Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: block: fix setting of max_segment_size and seg_boundary mask block: internal dequeue shouldn't start timer block: set disk->node_id before it's being used When block layer fails to map iov, it calls bio_unmap_user to undo --- feaf3848a813a106f163013af6fcf6c4bfec92d9