Skip to contentSkip to conversation

block bits for 2.6.34-rc4

GIT PULL Jens Axboe 1 participant 1 message Jan 20, 2010

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

Hi Linus,

Nothing major in here. A CFQ bug fix, two rounds of drbd fixups, some fixes to the IO stacking calculations, and a few other bug fixes. Please pull!

git://git.kernel.dk/linux-2.6-block.git for-linus

Divyesh Shah (1):
cfq-iosched: Respect ioprio_class when preempting

Jens Axboe (2):
Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-linus Merge branch 'for-jens' of http://git.drbd.org/linux-2.6-drbd into for-linus

Johannes Thoma (2):
drbd: Kconfig fix
drbd: Don't go into StandAlone mode when authentification failes because of network error

Julia Lawall (2):
drivers/block/drbd: Correct NULL test drivers/block/drbd/drbd_receiver.c: correct NULL test

Kirill Afonshin (1):
block: removed unused as_io_context

Lars Ellenberg (1):
drbd: check on CONFIG_LBDAF, not LBD

Martin K. Petersen (4):
block: Correct handling of bottom device misaligment
block: Fix discard alignment calculation and printing
block: bdev_stack_limits wrapper
DM: Fix device mapper topology stacking

Philipp Reisner (5):
drbd: Use drbd_crypto_is_hash() instead of an open coded check
drbd: Fix for a race between IO and a detach operation [Bugz 262]
drbd: Silenced an assert that could triggered after changing write ordering method
drbd: Allow online resizing of DRBD devices while peer not reachable (needs to be explicitly forced)
drbd: The kernel code is now equivalent to out of tree release 8.3.7

Stephen Hemminger (1):
genhd: overlapping variable definition

Thiago Farina (1):
fs/bio.c: fix shadows sparse warning

 block/blk-ioc.c                    |    5 ----
 block/blk-settings.c               |   39 +++++++++++++++++++++++++++---
 block/cfq-iosched.c                |    6 ++++
 block/genhd.c                      |    2 +-
 drivers/block/drbd/Kconfig         |    2 +-
 drivers/block/drbd/drbd_int.h      |    7 ++---
 drivers/block/drbd/drbd_main.c     |    1 +
 drivers/block/drbd/drbd_nl.c       |   19 +++++++++-----
 drivers/block/drbd/drbd_receiver.c |   46 +++++++++++++++++++++++------------
 drivers/md/dm-table.c              |   20 ++++-----------
 fs/bio.c                           |    2 +-
 include/linux/blkdev.h             |    9 +++++-
 include/linux/drbd.h               |    2 +-
 include/linux/drbd_nl.h            |    1 +
 include/linux/genhd.h              |    6 ++--
 include/linux/iocontext.h          |   27 ---------------------
 16 files changed, 107 insertions(+), 87 deletions(-)
Signature · 1 line
Jens Axboe