From /pub/scm/linux/kernel/git/jejb/../torvalds/linux-2.6 0ce790e..6aba74f master -> origin/master From /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 3703b2c..0ce790e master -> scsi-misc Checking out files: 35% (237/672) Checking out files: 36% (242/672) Checking out files: 37% (249/672) ## # 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-core.c | 2 +- block/blk-flush.c | 6 +++--- block/blk-throttle.c | 4 ++-- block/elevator.c | 35 +++++++++++++++-------------------- drivers/ide/ide-io.c | 3 +-- fs/inode.c | 8 +++++++- fs/nilfs2/page.c | 2 +- fs/ubifs/xattr.c | 3 +-- fs/ufs/truncate.c | 1 - include/linux/elevator.h | 1 - include/linux/fs.h | 2 ++ 11 files changed, 33 insertions(+), 34 deletions(-) ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-next block-for-next ## Already up-to-date! Merge made by recursive. ## # 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 mm next series series.html uml-fixes.patch v6-1-4-dm-replicator-documentation-and-module-registry.patch v6-2-4-dm-rChecking out files: 17% (1656/9300) Checking out files: 18% (1674/9300) Checking out files: 19% (1767/9300) Checking out files: 20% (1860/9300) Checking out files: 21% (1953/9300) Checking out files: 21% (1995/9300) Checking out files: 22% (2046/9300) Checking out files: 23% (2139/9300) Checking out files: 24% (223## # 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-rc1-stor1. Already up-to-date. ## # check ## No prior to diff against ## # label ## [2.6.39-rc1-stor1 395dc21] 2.6.39-rc1-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- ## 3939/9300) Checking out files: 43% (3999/9300) Checking out files: 44% (4092/9300) Checking out files: 45% (4185/9300) Checking out files: 45% (4217/9300) Checking out files: 46% (4278/9300) Checking out files: 47% (4371/9300) Checking out files: 48% (4464/9300) Checking out files: 48% (4534/9300) Checking out files: 49% (4557/9300) Checking out files: 50% (4650/9300) Checking out files: 51% (4743/9300) Checking out files: 51% (4772/9300) Checking out files: 51% (4809/9300) Checking out files: 52% (4836/9300) Checking out files: 53% (4929/9300) Checking out files: 53% (4960/9300) Checking out files: 54% (5022/9300) Checking out files: 55% (5115/9300) Checking out files: 56% (5208/9300) Checking out files: 56% (5215/9300) Checking out files: 57% (5301/9300) Checking out files: 58% (5394/9300) Checking out files: 58% (5437/9300) Checking out files: 59% (5487/9300) Checking out files: 60% (5580/9300) Checking out files: 60% (5606/9300) Checking out files: 61% (5673/9300) Checking out files: 62% (5766/9300) Checking out files: 62% (5771/9300) Checking out files: 63% (5859/9300) Checking out files: 64% (5952/9300) Checking out files: 64% (6038/9300) Checking out files: 65% (6045/9300) Checking out files: 66% (6138/9300) Checking out files: 67% (6231/9300) Checking out files: 68% (6324/9300) Checking out files: 69% (6417/9300) Checking out files: 69% (6443/9300) Checking out files: 70% (6510/9300) Checking out files: 71% (6603/9300) Checking out files: 72% (6696/9300) Checking out files: 72% (6737/9300) Checking out files: 73% (6789/9300) Checking out files: 74% (6882/9300) Checking out files: 75% (6975/9300) Checking out files: 75% (7049/9300) Checking out files: 76% (7068/9300) Checking out files: 77% (7161/9300) Checking out files: 78% (7254/9300) Checking out files: 78% (7290/9300) Checking out files: 79% (7347/9300) Checking out files: 80% (7440/9300) Checking out files: 80% (7509/9300) Checking out files: 81% (7533/9300) Checking out files: 82% (7626/9300) Checking out files: 83% (7719/9300) Checking out files: 83% (7763/9300) Checking out files: 84% (7812/9300) Checking out files: 85% (7905/9300) Checking out files: 85% (7993/9300) Checking out files: 86% (7998/9300) Checking out files: 87% (8091/9300) Checking out files: 88% (8184/9300) Checking out files: 88% (8257/9300) Checking out files: 89% (8277/9300) Checking out files: 90% (8370/9300) Checking out files: 91% (8463/9300) Checking out files: 91% (8488/9300) Checking out files: 92% (8556/9300) Checking out files: 93% (8649/9300) Checking out files: 93% (8690/9300) Checking out files: 94% (8742/9300) Checking out files: 95% (8835/9300) Checking out files: 95% (8887/9300) Checking out files: 96% (8928/9300) Checking out files: 97% (9021/9300) Checking out files: 97% (9105/9300) Checking out files: 98% (9114/9300) Checking out files: 99% (9207/9300) Checking out files: 100% (9300/9300) Checking out files: 100% (9300/9300), done. Switched to branch 'device-mapper' Checking out files: 12% (1168/9300) Checking out files: 13% (1209/9300) Checking out files: 14% (1302/9300) Checking out files: 15% (1395/9300) Checking out files: 16% (1488/9300) Checking out files: 16% (1540/9300) Checking out files: 17% (1581/9300) Checking out files: 18% (1674/9300) Checking out files: 19% (1767/9300) Checking out files: 20% (1860/9300) Checking out files: 20% (1928/9300) Checking out files: 21% (1953/9300) Checking out files: 22% (2046/9300) Checking out files: 23% (2139/9300) Checking out files: 24% (2232/9300) Checking out files: 24% (2290/9300) Checking out files: 25% (2325/9300) Checking out files: 26% (2418/9300) Checking out files: 27% (2511/9300) Checking out files: 27% (2594/9300) Checking out files: 28% (2604/9300) Checking out files: 29% (2697/9300) Checking out files: 30% (2790/9300) Checking out files: 31% (2883/9300) Checking out files: 31% (2936/9300) Checking out files: 32% (2976/9300) Checking out files: 33% (3069/9300) Checking out files: 34% (3162/9300) Checking out files: 34% (3208/9300) Checking out files: 35% (3255/9300) Checking out files: 36% (3348/9300) Checking out files: 36% (3360/9300) Checking out files: 37% (3441/9300) Checking out files: 38% (3534/9300) Checking out files: 38% (3535/9300) Checking out files: 39% (3627/9300) Checking out files: 39% (3716/9300) Checking out files: 40% (3720/9300) Checking out files: 41% (3813/9300) Checking out files: 41% (3892/9300) Checking out files: 42% (3906/9300) Checking out files: 43% (3999/9300) Checking out files: 43% (4071/9300) Checking out files: 44% (4092/9300) Checking out files: 45% (4185/9300) Checking out files: 45% (4261/9300) Checking out files: 46% (4278/9300) Checking out files: 47% (4371/9300) Checking out files: 48% (4464/9300) Checking out files: 48% (4527/9300) Checking out files: 49% (4557/9300) Checking out files: 50% (4650/9300) Checking out files: 51% (4743/9300) Checking out files: 51% (4762/9300) Checking out files: 52% (4836/9300) Checking out files: 53% (4929/9300) Checking out files: 54% (5022/9300) Checking out files: 54% (5026/9300) Checking out files: 55% (5115/9300) Checking out files: 56% (5208/9300) Checking out files: 56% (5239/9300) Checking out files: 57% (5301/9300) Checking out files: 58% (5394/9300) Checking out files: 59% (5487/9300) Checking out files: 59% (5548/9300) Checking out files: 60% (5580/9300) Checking out files: 61% (5673/9300) Checking out files: 61% (5757/9300) Checking out files: 62% (5766/9300) Checking out files: 63% (5859/9300) Checking out files: 64% (5952/9300) Checking out files: 64% (6023/9300) Checking out files: 65% (6045/9300) Checking out files: 66% (6138/9300) Checking out files: 66% (6200/9300) Checking out files: 67% (6231/9300) Checking out files: 68% (6324/9300) Checking out files: 69% (6417/9300) Checking out files: 69% (6419/9300) Checking out files: 70% (6510/9300) Checking out files: 71% (6603/9300) Checking out files: 71% (6659/9300) Checking out files: 72% (6696/9300) Checking out files: 73% (6789/9300) Checking out files: 74% (6882/9300) Checking out files: 74% (6907/9300) Checking out files: 75% (6975/9300) Checking out files: 76% (7068/9300) Checking out files: 76% (7139/9300) Checking out files: 77% (7161/9300) Checking out files: 78% (7254/9300) Checking out files: 79% (7347/9300) Checking out files: 79% (7380/9300) Checking out files: 80% (7440/9300) Checking out files: 81% (7533/9300) Checking out files: 82% (7626/9300) Checking out files: 82% (7635/9300) Checking out files: 83% (7719/9300) Checking out files: 84% (7812/9300) Checking out files: 84% (7846/9300) Checking out files: 85% (7905/9300) Checking out files: 86% (7998/9300) Checking out files: 86% (8058/9300) Checking out files: 87% (8091/9300) Checking out files: 88% (8184/9300) Checking out files: 89% (8277/9300) Checking out files: 90% (8370/9300) Checking out files: 91% (8463/9300) Checking out files: 91% (8532/9300) Checking out files: 92% (8556/9300) Checking out files: 93% (8649/9300) Checking out files: 94% (8742/9300) Checking out files: 94% (8754/9300) Checking out files: 95% (8835/9300) Checking out files: 96% (8928/9300) Checking out files: 96% (8981/9300) Checking out files: 97% (9021/9300) Checking out files: 98% (9114/9300) Checking out files: 99% (9207/9300) Checking out files: 99% (9292/9300) Checking out files: 100% (9300/9300) Checking out files: 100% (9300/9300), done. Switched to branch '2.6.39-rc1-stor1' From /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 + 926a939...c66ac9d master -> scsi-post-merge (forced update) Checking out files: 21% (2290/10849) Checking out files: 22% (2387/10849) Checking out files: 23% (2496/10849) Checking out files: 24% (2604/10849) Checking out files: 24% (2712/10849) Checking out files: 25% (2713/10849) Checking out files: 26% (2821/10849) Checking out files: 27% (2930/10849) Checking out files: 28% (3038/10849) Checking out files: 29% (3147/10849) Checking out files: 29% (3177/10849) Checking out files: 30% (3255/10849) Checking out files: 31% (3364/10849) Checking out files: 32% (3472/10849) Checking out files: 33% (3581/10849) Checking out files: 33% (3684/10849) Checking out files: 34% (3689/10849) Checking out files: 35% (3798/10849) Checking out files: 36% (3906/10849) Checking out files: 36% (3979/10849) Checking out files: 37% (4015/10849) Checking out files: 38% (4123/10849) Checking out files: 39% (4232/10849) Checking out files: 39% (4249/10849) Checking out files: 40% (4340/10849) Checking out files: 41% (4449/10849) Checking out files: 41% (4520/10849) Checking out files: 42% (4557/10849) Checking out files: 43% (4666/10849) Checking out files: 44% (4774/10849) Checking out files: 44% (4829/10849) Checking out files: 45% (4883/10849) Checking out files: 46% (4991/10849) Checking out files: 47% (5100/10849) Checking out files: 48% (5208/10849) Checking out files: 48% (5220/10849) Checking out files: 49% (5317/10849) Checking out files: 50% (5425/10849) Checking out files: 51% (5533/10849) Checking out files: 51% (5564/10849) Checking out files: 52% (5642/10849) Checking out files: 53% (5750/10849) Checking out files: 53% (5841/10849) Checking out files: 54% (5859/10849) Checking out files: 55% (5967/10849) Checking out files: 56% (6076/10849) Checking out files: 56% (6139/10849) Checking out files: 57% (6184/10849) Checking out files: 58% (6293/10849) Checking out files: 58% (6397/10849) Checking out files: 59% (6401/10849) Checking out files: 60% (6510/10849) Checking out files: 61% (6618/10849) Checking out files: 61% (6683/10849) Checking out files: 62% (6727/10849) Checking out files: 63% (6835/10849) Checking out files: 64% (6944/10849) Checking out files: 64% (6974/10849) Checking out files: 65% (7052/10849) Checking out files: 66% (7161/10849) Checking out files: 66% (7234/10849) Checking out files: 67% (7269/10849) Checking out files: 68% (7378/10849) Checking out files: 69% (7486/10849) Checking out files: 70% (7595/10849) Checking out files: 70% (7657/10849) Checking out files: 71% (7703/10849) Checking out files: 72% (7812/10849) Checking out files: 73% (7920/10849) Checking out files: 73% (7938/10849) Checking out files: 74% (8029/10849) Checking out files: 75% (8137/10849) Checking out files: 75% (8212/10849) Checking out files: 76% (8246/10849) Checking out files: 77% (8354/10849) Checking out files: 78% (8463/10849) Checking out files: 78% (8465/10849) Checking out files: 79% (8571/10849) Checking out files: 80% (8680/10849) Checking out files: 80% (8732/10849) Checking out files: 81% (8788/10849) Checking out files: 82% (8897/10849) Checking out files: 82% (8988/10849) Checking out files: 83% (9005/10849) Checking out files: 84% (9114/10849) Checking out files: 84% (9213/10849) Checking out files: 85% (9222/10849) Checking out files: 86% (9331/10849) Checking out files: 87% (9439/10849) Checking out files: 87% (9442/10849) Checking out files: 88% (9548/10849) Checking out files: 89% (9656/10849) Checking out files: 89% (9703/10849) Checking out files: 90% (9765/10849) Checking out files: 91% (9873/10849) Checking out files: 91% (9953/10849) Checking out files: 92% (9982/10849) Checking out files: 93% (10090/10849) Checking out files: 94% (10199/10849) Checking out files: 94% (10230/10849) Checking out files: 95% (10307/10849) Checking out files: 96% (10416/10849) Checking out files: 96% (10503/10849) Checking out files: 97% (10524/10849) Checking out files: 98% (10633/10849) Checking out files: 98% (10720/10849) Checking out files: 99% (10741/10849) Checking out files: 100% (10849/10849) Checking out files: 100% (10849/10849), done. Switched to branch 'scsi-post-merge' Switched to branch '2.6.39-rc1-stor1' From . * branch scsi-post-merge -> FETCH_HEAD