From: Greg KH To: torvalds@osdl.org, akpm@osdl.org Cc: linux-kernel@vger.kernel.org Subject: [BK PATCH] AOE and Block fixes for 2.6.11-rc1 Hi, Here are some AOE driver fixes and a block /proc file updates for 2.6.11-rc1. All of these patches have been posted to lkml, and been in the past few -mm releases. Please pull from: bk://kernel.bkbits.net/gregkh/linux/block-2.6 Individual patches will follow, sent to the linux-kernel list. thanks, greg k-h Documentation/aoe/aoe.txt | 41 ++++++++++++++++++------------ Documentation/aoe/mkdevs.sh | 9 ++++-- Documentation/aoe/mkshelf.sh | 8 +++--- Documentation/aoe/status.sh | 21 ++++++++++++--- drivers/block/aoe/aoe.h | 8 ++++-- drivers/block/aoe/aoeblk.c | 57 +++++++++++++++++++++++++++++-------------- drivers/block/aoe/aoechr.c | 2 - drivers/block/aoe/aoedev.c | 24 +++--------------- drivers/block/aoe/aoemain.c | 47 ++++++++++++++++++++++++----------- drivers/block/aoe/aoenet.c | 21 ++++++--------- drivers/block/genhd.c | 37 +++++++++------------------ include/linux/genhd.h | 6 ++++ 12 files changed, 164 insertions(+), 117 deletions(-) ----- Ed L. Cashin: o aoe: fix __init calling __exit o aoe: don't sleep with interrupts on Greg Kroah-Hartman: o Block: move struct disk_attribute to genhd.h o Block: Remove block_subsys.rwsem usage