Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

Browse source

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  block: fix missing bio back/front segment size setting in blk_recount_segments()
  loop: don't increment p->offset with (size_t) -EINVAL
  cciss: remove 30 second initial timeout on controller reset
  Fix kernel NULL pointer dereference in xen-blkfront

...

This commit is contained in:

Linus Torvalds 2009-03-08 10:08:57 -07:00

parent d3dea1e2d5 59247eaea5

commit 81d1ab82c0

4 changed files with 15 additions and 23 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

25

block/blk-merge.c

View file

8

drivers/block/cciss.c

View file

3

drivers/block/loop.c

View file

2

drivers/block/xen-blkfront.c

View file