lkml.org 
[lkml]   [2011]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subject[GIT PULL] block bits for 3.1-rc
Hi Linus,

This is a lot larger than it usually would be at this time. The
reason is mostly the expedited merge window overlapping with
my vacation. That said, the traffic in this branch in the last
few weeks has only been fixes and it's continually been in linux-next
and run on my various machines. So I'm quite confident that it's sound.

So what's in here:

- A few fixes for some cdrom corner cases.
- Flush fixing for stacked devices
- Revert of the CFQ meta data special treatment patch, it's been shown
to regress a kernel build workload by about 10%. More investigation
is needed, for 3.1 lets just back it out.
- bsg helper library, moving the FC class code into the block layer
for proper sharing with eg iscsi/SAS.
- Nicer loop multi device handling code, and loop deadlock fix.
- Two fixups for xen-blkfront, one for xen-blkback.
- Fixups for rq_affinity changes that went into 3.1-rc1.
- Fixup for CFQ
- Support for properly tracing FLUSH and FUA commands with blktrace.

Diffstat looks large because of the bsg-lib addition, apart from that
it's mostly smallish stuff.

Please pull.


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

Andrew Morton (1):
drivers/cdrom/cdrom.c: relax check on dvd manufacturer value

Axel Lin (1):
block: swim3: fix unterminated of_device_id table

H Hartley Sweeten (1):
drivers/block/drbd/drbd_nl.c: use bitmap_parse instead of __bitmap_parse

Herbert Poetzl (1):
block/genhd.c: remove useless cast in diskstats_show()

Jeff Moyer (2):
allow blk_flush_policy to return REQ_FSEQ_DATA independent of *FLUSH
block: fix flush machinery for stacking drivers with differring flush flags

Jens Axboe (3):
bsg-lib: add module.h include
Merge branch 'stable/for-jens' of git://git.kernel.org/.../konrad/xen into for-linus
Revert "cfq: Remove special treatment for metadata rqs."

Kay Sievers (4):
loop: replace linked list of allocated devices with an idr index
loop: add management interface for on-demand device allocation
loop: add BLK_DEV_LOOP_MIN_COUNT=%i to allow distros 0 pre-allocated loop devices
loop: fix deadlock when sysfs and LOOP_CLR_FD race against each other

Konrad Rzeszutek Wilk (1):
xen/blkback: Make description more obvious.

Matthew Wilcox (1):
Move some REQ flags to the common bio/request area

Mike Christie (1):
block: add bsg helper library

Namhyung Kim (1):
blktrace: add FLUSH/FUA support

Shaohua Li (2):
blk-throttle: correctly determine sync bio
block: improve rq_affinity placement

Stefan Bader (2):
xen-blkfront: Drop name and minor adjustments for emulated scsi devices
xen-blkfront: Fix one off warning about name clash

Tao Ma (1):
block: Make rq_affinity = 1 work as expected

Vivek Goyal (2):
cfq-iosched: Reduce linked group count upon group destruction
cfq-iosched: Add documentation about idling

Documentation/block/cfq-iosched.txt | 71 +++++++++
Documentation/kernel-parameters.txt | 9 +-
block/Kconfig | 10 ++
block/Makefile | 1 +
block/blk-core.c | 8 +-
block/blk-flush.c | 25 +++-
block/blk-softirq.c | 8 +
block/blk-throttle.c | 4 +-
block/blk.h | 2 +
block/bsg-lib.c | 298 +++++++++++++++++++++++++++++++++++
block/cfq-iosched.c | 21 +++
block/genhd.c | 8 +-
drivers/block/Kconfig | 17 ++-
drivers/block/drbd/drbd_nl.c | 4 +-
drivers/block/loop.c | 297 ++++++++++++++++++++++++-----------
drivers/block/swim3.c | 1 +
drivers/block/xen-blkfront.c | 6 +-
drivers/cdrom/cdrom.c | 8 +-
include/linux/blk_types.h | 7 +-
include/linux/blkdev.h | 5 +
include/linux/blktrace_api.h | 5 +-
include/linux/bsg-lib.h | 73 +++++++++
include/linux/loop.h | 5 +-
include/linux/miscdevice.h | 1 +
include/trace/events/block.h | 20 ++-
kernel/trace/blktrace.c | 21 ++-
26 files changed, 800 insertions(+), 135 deletions(-)
create mode 100644 block/bsg-lib.c
create mode 100644 include/linux/bsg-lib.h
--
Jens Axboe



\
 
 \ /
  Last update: 2011-08-19 15:19    [from the cache]
©2003-2011 Jasper Spaans