]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 13 Mar 2016 04:18:54 +0000 (20:18 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 13 Mar 2016 04:18:54 +0000 (20:18 -0800)
Pull block merge fix from Jens Axboe.

This fixes the block segment counting bug and resulting sg overrun
reported by Kent Overstreet, introduced with the last block pull.

* 'for-linus' of git://git.kernel.dk/linux-block:
  block: don't optimize for non-cloned bio in bio_get_last_bvec()


Trivial merge