From /pub/scm/linux/kernel/git/jejb/../torvalds/linux-2.6 0524975..dcb4a1f master -> origin/mast## From /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 6ad11ea..c21fd1a master -> scsi-misc Checking out files: 5% (119/2378) Checking out files: 6% (143/2378) Removing patches/ ## # git /pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git master scsi-rc-fixes ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-linus block-for-linus ## Merge made by recursive. block/blk.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-next block-for-next ## Auto-merging drivers/ata/libata-scsi.c Merge made by recursive. Documentation/ABI/testing/sysfs-block | 64 +++ Documentation/blockdev/cciss.txt | 15 + block/blk-cgroup.c | 180 ++++++-- block/blk-cgroup.h | 36 ++- block/blk-core.c | 30 +-- block/blk-exec.c | 2 +- block/blk-flush.c | 16 +- block/blk-lib.c | 82 +--- block/blk-settings.c | 9 +- block/blk-sysfs.c | 3 +- block/blk-throttle.c | 313 ++++++++++--- block/blk.h | 20 + block/cfq-iosched.c | 202 ++++++-- block/elevator.c | 11 +- drivers/ata/libata-scsi.c | 13 +- drivers/block/Kconfig | 21 + drivers/block/Makefile | 1 + drivers/block/cciss.c | 571 ++++++++++++++++++----- drivers/block/cciss.h | 11 +- drivers/block/cciss_cmd.h | 11 + drivers/block/cciss_scsi.c | 41 +- drivers/block/cciss_scsi.h | 4 - drivers/block/paride/pcd.c | 2 + drivers/block/xen-blkback/Makefile | 3 + drivers/block/xen-blkback/blkback.c | 824 +++++++++++++++++++++++++++++++++ drivers/block/xen-blkback/common.h | 233 ++++++++++ drivers/block/xen-blkback/xenbus.c | 768 ++++++++++++++++++++++++++++++ drivers/block/xen-blkfront.c | 51 ++- drivers/cdrom/viocd.c | 4 +- drivers/ide/ide-cd.c | 3 +- drivers/scsi/sr.c | 2 +- fs/block_dev.c | 17 +- fs/partitions/check.c | 8 +- include/linux/blk_types.h | 2 - include/linux/blkdev.h | 15 +- include/linux/genhd.h | 2 +- include/xen/interface/io/blkif.h | 13 + mm/backing-dev.c | 4 +- 38 files changed, 3158 insertions(+), 449 deletions(-) create mode 100644 drivers/block/xen-blkback/Makefile create mode 100644 drivers/block/xen-blkback/blkback.c create mode 100644 drivers/block/xen-blkback/common.h create mode 100644 drivers/block/xen-blkback/xenbus.c ## # git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-fixes libata-fixes ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream libata-upstream ## Already up-to-date. ## # quilt /pub/linux/kernel/people/agk/patches/2.6/editing/ device-mapper section NEXT_PATCHES ## sending incremental file list ./ base dm-add-flakey-target.patch dm-add-ioband.patch dm-bufio.patch dm-crypt-wipe-keys-string-immediately-after-key-is-set.patch dm-delay-unplug-queue.patch dm-emulate-BLKRRPART-ioctl.patch dm-export-dm_disk.patch dm-fix-opening-log-and-cow-devices-for-read-only-tables.patch dm-ioctl-add-flag-to-wipe-buffers-for-secure-data.patch dm-ioctl-prepare-for-crypt-key-wiping.patch dm-iostats.patch dm-kcopyd-add-async-destruction-option.patch dm-loop.patch dm-memcache.patch dm-mpath-add-alua.patch dm-mpath-allow-table-load-with-no-priority-groups.patch dm-mpath-fail-message-ioctl-if-specified-path-is-not-valid.patch dm-mpath-improve-err-mesgs.patch dm-mpath-pg_timeout.patch dm-mpath-refactor-pg_init-trigger.patch dm-multisnap-common.patch dm-multisnap-daniel.patch dm-multisnap-mikulas-alloc.patch dm-multisnap-mikulas-blocks.patch dm-multisnap-mikulas-btree.patch dm-multisnap-mikulas-commit.patch dm-multisnap-mikulas-common.patch dm-multisnap-mikulas-config.patch dm-multisnap-mikulas-delete.patch dm-multisnap-mikulas-freelist.patch dm-multisnap-mikulas-headers.patch dm-multisnap-mikulas-io.patch dm-multisnap-mikulas-snaps.patch dm-raid1-clear-region_hash-on-suspend.patch dm-raid1-increase-dm-io-pages.patch dm-raid1-mempool-bug-workaround-reversion.patch dm-raid1-read-balancing.patch dm-raid1-separate-region_hash-interface-part2-to-be-split-and-fixed.patch dm-raid45-to-be-split.patch dm-region_hash-change-primes.patch dm-snapshot-cleanup-style.patch dm-snapshot-invalidate-from-workqueue.patch dm-snapshot-release-memory-if-invalid.patch dm-stripe-implement-merge-method.patch dm-table-extend-device-name-lookups.patch dm-table-limit-max_segments-when-no-merge_bvec-fn.patch dm-throttle.patch dm-tidy-io-initialisation-functions.patch dm-userspace.patch end git-update1.patch git-update2.patch git-update3.patch git-update4.patch git-update5.patch git-update6.patch mm next series series.html uml-fixes.patch v6-1-4-dm-replicator-documentation-and-module-registry.patch v6-2-4-dm-replicator-replication-log-and-site-link-handler-interfaces-and-main-replicator-module.patch v6-3-4Checking out files: 15% (379/2506) Checking out files: 16% (401/2506) Checking out files: 17% (427/2506) Checking out files: 18% (452/2506) Checking out files: 18% (461/2506) Checking out files: 19% (477/2506) ## # gitrebase /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git master scsi-post-merge merge-base ## First, rewinding head to replay your work on top of it... Fast-forwarded scsi-post-merge to 2.6.39-stor1. Already up-to-date. ## # check ## No prior to diff against ## # label ## [2.6.39-stor1 b09a7f4] 2.6.39-stor1 Committer: James Bottomley Your name and email address were configured automatically based on your username and hostname. Please check that they are accurate. You can suppress this message by setting them explicitly: git config --global user.name "Your Name" git config --global user.email you@example.com After doing this, you may fix the identity used for this commit with: git commit --amend --reset-author 1 files changed, 1 insertions(+), 1 deletions(-) ## # diff /pub/linux/kernel/people/jejb/storage-tree/patch- ## ## # log /pub/linux/kernel/people/jejb/storage-tree/log- ## out files: 38% (953/2506) Checking out files: 39% (978/2506) Checking out files: 40% (1003/2506) Checking out files: 41% (1028/2506) Checking out files: 42% (1053/2506) Checking out files: 43% (1078/2506) Checking out files: 43% (1083/2506) Checking out files: 44% (1103/2506) Checking out files: 45% (1128/2506) Checking out files: 46% (1153/2506) Checking out files: 47% (1178/2506) Checking out files: 48% (1203/2506) Checking out files: 48% (1227/2506) Checking out files: 49% (1228/2506) Checking out files: 50% (1253/2506) Checking out files: 51% (1279/2506) Checking out files: 52% (1304/2506) Checking out files: 53% (1329/2506) Checking out files: 53% (1338/2506) Checking out files: 54% (1354/2506) Checking out files: 55% (1379/2506) Checking out files: 56% (1404/2506) Checking out files: 56% (1415/2506) Checking out files: 57% (1429/2506) Checking out files: 58% (1454/2506) Checking out files: 59% (1479/2506) Checking out files: 59% (1503/2506) Checking out files: 60% (1504/2506) Checking out files: 61% (1529/2506) Checking out files: 62% (1554/2506) Checking out files: 63% (1579/2506) Checking out files: 63% (1583/2506) Checking out files: 64% (1604/2506) Checking out files: 65% (1629/2506) Checking out files: 65% (1645/2506) Checking out files: 66% (1654/2506) Checking out files: 67% (1680/2506) Checking out files: 68% (1705/2506) Checking out files: 69% (1730/2506) Checking out files: 70% (1755/2506) Checking out files: 70% (1758/2506) Checking out files: 71% (1780/2506) Checking out files: 72% (1805/2506) Checking out files: 73% (1830/2506) Checking out files: 73% (1844/2506) Checking out files: 74% (1855/2506) Checking out files: 75% (1880/2506) Checking out files: 76% (1905/2506) Checking out files: 76% (1909/2506) Checking out files: 77% (1930/2506) Checking out files: 77% (1949/2506) Checking out files: 78% (1955/2506) Checking out files: 79% (1980/2506) Checking out files: 79% (1983/2506) Checking out files: 80% (2005/2506) Checking out files: 81% (2030/2506) Checking out files: 81% (2051/2506) Checking out files: 82% (2055/2506) Checking out files: 83% (2080/2506) Checking out files: 84% (2106/2506) Checking out files: 85% (2131/2506) Checking out files: 86% (2156/2506) Checking out files: 87% (2181/2506) Checking out files: 87% (2199/2506) Checking out files: 88% (2206/2506) Checking out files: 89% (2231/2506) Checking out files: 90% (2256/2506) Checking out files: 91% (2281/2506) Checking out files: 92% (2306/2506) Checking out files: 93% (2331/2506) Checking out files: 93% (2332/2506) Checking out files: 94% (2356/2506) Checking out files: 95% (2381/2506) Checking out files: 96% (2406/2506) Checking out files: 97% (2431/2506) Checking out files: 98% (2456/2506) Checking out files: 99% (2481/2506) Checking out files: 100% (2506/2506) Checking out files: 100% (2506/2506), done. Switched to branch 'device-mapper' Checking out files: 16% (401/2506) Checking out files: 17% (427/2506) Checking out files: 18% (452/2506) Checking out files: 19% (477/2506) Checking out files: 20% (502/2506) Checking out files: 21% (527/2506) Checking out files: 22% (552/2506) Checking out files: 23% (577/2506) Checking out files: 24% (602/2506) Checking out files: 24% (605/2506) Checking out files: 25% (627/2506) Checking out files: 26% (652/2506) Checking out files: 27% (677/2506) Checking out files: 28% (702/2506) Checking out files: 29% (727/2506) Checking out files: 30% (752/2506) Checking out files: 31% (777/2506) Checking out files: 32% (802/2506) Checking out files: 32% (805/2506) Checking out files: 33% (827/2506) Checking out files: 34% (853/2506) Checking out files: 35% (878/2506) Checking out files: 36% (903/2506) Checking out files: 37% (928/2506) Checking out files: 38% (953/2506) Checking out files: 38% (956/2506) Checking out files: 39% (978/2506) Checking out files: 40% (1003/2506) Checking out files: 41% (1028/2506) Checking out files: 41% (1037/2506) Checking out files: 42% (1053/2506) Checking out files: 43% (1078/2506) Checking out files: 44% (1103/2506) Checking out files: 45% (1128/2506) Checking out files: 46% (1153/2506) Checking out files: 47% (1178/2506) Checking out files: 48% (1203/2506) Checking out files: 49% (1228/2506) Checking out files: 50% (1253/2506) Checking out files: 51% (1279/2506) Checking out files: 52% (1304/2506) Checking out files: 53% (1329/2506) Checking out files: 54% (1354/2506) Checking out files: 55% (1379/2506) Checking out files: 56% (1404/2506) Checking out files: 57% (1429/2506) Checking out files: 57% (1448/2506) Checking out files: 58% (1454/2506) Checking out files: 59% (1479/2506) Checking out files: 60% (1504/2506) Checking out files: 61% (1529/2506) Checking out files: 62% (1554/2506) Checking out files: 63% (1579/2506) Checking out files: 64% (1604/2506) Checking out files: 65% (1629/2506) Checking out files: 66% (1654/2506) Checking out files: 67% (1680/2506) Checking out files: 68% (1705/2506) Checking out files: 68% (1708/2506) Checking out files: 69% (1730/2506) Checking out files: 70% (1755/2506) Checking out files: 71% (1780/2506) Checking out files: 72% (1805/2506) Checking out files: 72% (1829/2506) Checking out files: 73% (1830/2506) Checking out files: 74% (1855/2506) Checking out files: 75% (1880/2506) Checking out files: 76% (1905/2506) Checking out files: 76% (1926/2506) Checking out files: 77% (1930/2506) Checking out files: 78% (1955/2506) Checking out files: 79% (1980/2506) Checking out files: 80% (2005/2506) Checking out files: 81% (2030/2506) Checking out files: 82% (2055/2506) Checking out files: 83% (2080/2506) Checking out files: 83% (2081/2506) Checking out files: 84% (2106/2506) Checking out files: 85% (2131/2506) Checking out files: 86% (2156/2506) Checking out files: 87% (2181/2506) Checking out files: 88% (2206/2506) Checking out files: 89% (2231/2506) Checking out files: 90% (2256/2506) Checking out files: 91% (2281/2506) Checking out files: 91% (2305/2506) Checking out files: 92% (2306/2506) Checking out files: 93% (2331/2506) Checking out files: 94% (2356/2506) Checking out files: 95% (2381/2506) Checking out files: 96% (2406/2506) Checking out files: 97% (2431/2506) Checking out files: 98% (2456/2506) Checking out files: 99% (2481/2506) Checking out files: 100% (2506/2506) Checking out files: 100% (2506/2506), done. Switched to branch '2.6.39-stor1' From /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 + f432d0d...c66ac9d master -> scsi-post-merge (forced update) Checking out files: 17% (2365/13678) Checking out files: 18% (2463/13678) Checking out files: 19% (2599/13678) Checking out files: 19% (2659/13678) Checking out files: 20% (2736/13678) Checking out files: 21% (2873/13678) Checking out files: 22% (3010/13678) Checking out files: 22% (3021/13678) Checking out files: 23% (3146/13678) Checking out files: 24% (3283/13678) Checking out files: 24% (3319/13678) Checking out files: 25% (3420/13678) Checking out files: 26% (3557/13678) Checking out files: 26% (3585/13678) Checking out files: 27% (3694/13678) Checking out files: 28% (3830/13678) Checking out files: 28% (3879/13678) Checking out files: 29% (3967/13678) Checking out files: 29% (4035/13678) Checking out files: 30% (4104/13678) Checking out files: 30% (4201/13678) Checking out files: 31% (4241/13678) Checking out files: 32% (4377/13678) Checking out files: 32% (4461/13678) Checking out files: 33% (4514/13678) Checking out files: 33% (4611/13678) Checking out files: 34% (4651/13678) Checking out files: 35% (4788/13678) Checking out files: 35% (4806/13678) Checking out files: 36% (4925/13678) Checking out files: 36% (4959/13678) Checking out files: 37% (5061/13678) Checking out files: 37% (5172/13678) Checking out files: 38% (5198/13678) Checking out files: 39% (5335/13678) Checking out files: 39% (5366/13678) Checking out files: 40% (5472/13678) Checking out files: 41% (5608/13678) Checking out files: 41% (5620/13678) Checking out files: 42% (5745/13678) Checking out files: 42% (5824/13678) Checking out files: 43% (5882/13678) Checking out files: 44% (6019/13678) Checking out files: 44% (6127/13678) Checking out files: 45% (6156/13678) Checking out files: 46% (6292/13678) Checking out files: 46% (6311/13678) Checking out files: 46% (6391/13678) Checking out files: 46% (6427/13678) Checking out files: 47% (6429/13678) Checking out files: 47% (6508/13678) Checking out files: 48% (6566/13678) Checking out files: 48% (6607/13678) Checking out files: 49% (6703/13678) Checking out files: 49% (6712/13678) Checking out files: 49% (6828/13678) Checking out files: 50% (6839/13678) Checking out files: 50% (6865/13678) Checking out files: 50% (6908/13678) Checking out files: 51% (6976/13678) Checking out files: 51% (7062/13678) Checking out files: 52% (7113/13678) Checking out files: 52% (7192/13678) Checking out files: 53% (7250/13678) Checking out files: 53% (7321/13678) Checking out files: 54% (7387/13678) Checking out files: 54% (7436/13678) Checking out files: 54% (7489/13678) Checking out files: 55% (7523/13678) Checking out files: 55% (7635/13678) Checking out files: 56% (7660/13678) Checking out files: 56% (7738/13678) Checking out files: 57% (7797/13678) Checking out files: 57% (7810/13678) Checking out files: 57% (7887/13678) Checking out files: 57% (7925/13678) Checking out files: 58% (7934/13678) Checking out files: 58% (7964/13678) Checking out files: 58% (8021/13678) Checking out files: 58% (8056/13678) Checking out files: 59% (8071/13678) Checking out files: 59% (8147/13678) Checking out files: 60% (8207/13678) Checking out files: 60% (8227/13678) Checking out files: 60% (8326/13678) Checking out files: 61% (8344/13678) Checking out files: 61% (8348/13678) Checking out files: 61% (8418/13678) Checking out files: 62% (8481/13678) Checking out files: 62% (8531/13678) Checking out files: 62% (8604/13678) Checking out files: 63% (8618/13678) Checking out files: 63% (8727/13678) Checking out files: 64% (8754/13678) Checking out files: 64% (8853/13678) Checking out files: 65% (8891/13678) Checking out files: 65% (8946/13678) Checking out files: 65% (9009/13678) Checking out files: 66% (9028/13678) Checking out files: 66% (9080/13678) Checking out files: 67% (9165/13678) Checking out files: 67% (9184/13678) Checking out files: 67% (9268/13678) Checking out files: 68% (9302/13678) Checking out files: 68% (9388/13678) Checking out files: 69% (9438/13678) Checking out files: 69% (9505/13678) Checking out files: 70% (9575/13678) Checking out files: 70% (9580/13678) Checking out files: 71% (9712/13678) Checking out files: 71% (9776/13678) Checking out files: 72% (9849/13678) Checking out files: 72% (9940/13678) Checking out files: 73% (9985/13678) Checking out files: 73% (10089/13678) Checking out files: 74% (10122/13678) Checking out files: 74% (10202/13678) Checking out files: 75% (10259/13678) Checking out files: 75% (10309/13678) Checking out files: 75% (10386/13678) Checking out files: 76% (10396/13678) Checking out files: 76% (10423/13678) Checking out files: 77% (10533/13678) Checking out files: 77% (10553/13678) Checking out files: 77% (10639/13678) Checking out files: 78% (10669/13678) Checking out files: 78% (10741/13678) Checking out files: 79% (10806/13678) Checking out files: 79% (10824/13678) Checking out files: 79% (10851/13678) Checking out files: 80% (10943/13678) Checking out files: 80% (10957/13678) Checking out files: 81% (11080/13678) Checking out files: 81% (11087/13678) Checking out files: 82% (11216/13678) Checking out files: 82% (11217/13678) Checking out files: 83% (11353/13678) Checking out files: 83% (11380/13678) Checking out files: 84% (11490/13678) Checking out files: 84% (11522/13678) Checking out files: 84% (11607/13678) Checking out files: 85% (11627/13678) Checking out files: 85% (11737/13678) Checking out files: 86% (11764/13678) Checking out files: 86% (11875/13678) Checking out files: 87% (11900/13678) Checking out files: 88% (12037/13678) Checking out files: 88% (12038/13678) Checking out files: 88% (12165/13678) Checking out files: 89% (12174/13678) Checking out files: 89% (12300/13678) Checking out files: 90% (12311/13678) Checking out files: 90% (12427/13678) Checking out files: 91% (12447/13678) Checking out files: 91% (12530/13678) Checking out files: 92% (12584/13678) Checking out files: 92% (12625/13678) Checking out files: 93% (12721/13678) Checking out files: 93% (12731/13678) Checking out files: 93% (12783/13678) Checking out files: 93% (12828/13678) Checking out files: 94% (12858/13678) Checking out files: 94% (12922/13678) Checking out files: 94% (12992/13678) Checking out files: 95% (12995/13678) Checking out files: 95% (13059/13678) Checking out files: 96% (13131/13678) Checking out files: 96% (13186/13678) Checking out files: 96% (13261/13678) Checking out files: 97% (13268/13678) Checking out files: 97% (13314/13678) Checking out files: 97% (13375/13678) Checking out files: 98% (13405/13678) Checking out files: 98% (13451/13678) Checking out files: 99% (13542/13678) Checking out files: 99% (13575/13678) Checking out files: 100% (13678/13678) Checking out files: 100% (13678/13678), done. Switched to branch 'scsi-post-merge' Switched to branch '2.6.39-stor1' From . * branch scsi-post-merge -> FETCH_HEAD