Switched to branch '2.6.37-rc6-stor2' From . * branch scsi-rc-fixes -> FETCH_HEAD From . * branch block-for-linus -> FETCH_HEAD From /pub/scm/linux/kernel/git/axboe/linux-2.6-block b0f259e..047b7bd for-next -> block-for-next From . * branch block-for-next -> FETCH_HEAD From . * branch libata-fixes -> FETCH_HEAD From . * branch libata-upstream -> FETCH_HEAD Switched to branch 'device-mapper' Switched to branch '2.6.37-rc6-stor2' From /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 + 2ae06e1...5fdc3f7 master -> scsi-post-merge (forced update) From /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 2bfc96a..5fdc3f7 merge-base -> scsi-post-merge-base Switched to branch 'scsi-post-merge' Switched to branch '2.6.37-rc6-stor2' From . * branch scsi-post-merge -> FETCH_HEAD | 82 +++-- arch/arm/mach-at91/clock.c | 2 +- arch/arm/mach-at91/include/mach/stamp9g20.h | 7 + arch/arm/mach-s3c2412/Kconfig | 7 + arch/arm/mach-s3c2412/Makefile | 3 +- arch/arm/mach-s3c2416/Kconfig | 1 + arch/arm/mach-s5pv210/mach-aquila.c | 6 + arch/arm/mach-s5pv210/mach-goni.c | 6 + arch/arm/mach-shmobile/include/mach/entry-macro.S | 30 ++- arch/arm/mach-shmobile/include/mach/vmalloc.h | 2 +- arch/arm/plat-s3c24xx/Kconfig | 2 +- arch/mips/Kconfig | 38 ++- arch/mips/alchemy/common/platform.c | 2 + arch/mips/alchemy/devboards/prom.c | 5 +- arch/mips/ar7/clock.c | 9 +- arch/mips/ar7/time.c | 3 + arch/mips/bcm47xx/setup.c | 153 ++++++--- arch/mips/include/asm/cpu.h | 4 +- arch/mips/include/asm/elf.h | 8 +- arch/mips/include/asm/io.h | 12 +- arch/mips/include/asm/mach-ar7/ar7.h | 3 +- arch/mips/include/asm/mach-bcm47xx/nvram.h | 7 + arch/mips/jz4740/board-qi_lb60.c | 4 +- arch/mips/jz4740/platform.c | 2 +- arch/mips/jz4740/prom.c | 2 +- arch/mips/kernel/cevt-r4k.c | 2 +- arch/mips/kernel/cpu-probe.c | 7 +- arch/mips/kernel/linux32.c | 13 +- arch/mips/kernel/process.c | 1 - arch/mips/kernel/prom.c | 2 +- arch/mips/kernel/smp-mt.c | 2 +- arch/mips/kernel/traps.c | 44 ++- arch/mips/kernel/vpe.c | 14 +- arch/mips/lib/memset.S | 4 +- arch/mips/loongson/common/env.c | 4 +- arch/mips/math-emu/cp1emu.c | 116 +++++- arch/mips/mm/dma-default.c | 4 +- arch/mips/mm/sc-mips.c | 4 + arch/mips/pmc-sierra/yosemite/py-console.c | 12 +- arch/mips/sibyte/swarm/setup.c | 8 +- arch/mn10300/kernel/time.c | 10 +- arch/tile/include/asm/signal.h | 2 +- arch/tile/kernel/compat_signal.c | 6 +- arch/tile/kernel/intvec_32.S | 24 +- arch/tile/kernel/process.c | 8 + arch/tile/kernel/signal.c | 10 +- arch/x86/boot/compressed/misc.c | 2 +- arch/x86/include/asm/e820.h | 3 + arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kernel/Makefile | 1 + arch/x86/kernel/apic/apic.c | 8 + arch/x86/kernel/apic/io_apic.c | 4 +- arch/x86/kernel/apic/probe_64.c | 7 - arch/x86/kernel/head_32.S | 16 +- arch/x86/kernel/hpet.c | 26 +- arch/x86/kernel/resource.c | 48 +++ arch/x86/kernel/setup.c | 1 - arch/x86/kernel/xsave.c | 3 +- arch/x86/kvm/svm.c | 4 + arch/x86/kvm/vmx.c | 5 - arch/x86/kvm/x86.c | 11 +- arch/x86/kvm/x86.h | 5 + arch/x86/lguest/boot.c | 16 +- arch/x86/lguest/i386_head.S | 105 ++++++ arch/x86/pci/i386.c | 18 +- arch/x86/vdso/Makefile | 4 +- block/blk-map.c | 5 +- block/blk-merge.c | 6 +- block/blk-settings.c | 51 ++-- block/blk-sysfs.c | 2 +- block/blk-throttle.c | 39 ++- drivers/block/cciss.c | 2 + drivers/block/drbd/drbd_receiver.c | 14 +- drivers/block/drbd/drbd_req.h | 3 +- drivers/block/drbd/drbd_worker.c | 10 +- drivers/clocksource/sh_cmt.c | 17 +- drivers/input/evdev.c | 113 +++--- drivers/input/tablet/wacom_wac.c | 3 + drivers/md/dm-table.c | 10 +- drivers/md/md.c | 3 - drivers/media/common/saa7146_hlp.c | 8 +- drivers/media/common/saa7146_video.c | 16 +- drivers/media/radio/radio-aimslab.c | 16 +- drivers/media/radio/radio-aztech.c | 6 +- drivers/media/radio/radio-cadet.c | 12 +- drivers/media/radio/radio-gemtek-pci.c | 6 +- drivers/media/radio/radio-gemtek.c | 14 +- drivers/media/radio/radio-maestro.c | 14 +- drivers/media/radio/radio-maxiradio.c | 2 +- drivers/media/radio/radio-miropcm20.c | 6 +- drivers/media/radio/radio-rtrack2.c | 10 +- drivers/media/radio/radio-sf16fmi.c | 7 +- drivers/media/radio/radio-sf16fmr2.c | 11 +- drivers/media/radio/radio-si4713.c | 3 +- drivers/media/radio/radio-tea5764.c | 49 +-- drivers/media/radio/radio-terratec.c | 8 +- drivers/media/radio/radio-timb.c | 5 +- drivers/media/radio/radio-trust.c | 18 +- drivers/media/radio/radio-typhoon.c | 16 +- drivers/media/radio/radio-zoltrix.c | 30 +- drivers/media/video/arv.c | 2 +- drivers/media/video/bt8xx/bttv-driver.c | 117 +------ drivers/media/video/bw-qcam.c | 2 +- drivers/media/video/c-qcam.c | 2 +- drivers/media/video/cafe_ccic.c | 2 +- drivers/media/video/cx18/cx18-alsa-pcm.c | 8 +- drivers/media/video/cx18/cx18-streams.c | 2 +- drivers/media/video/et61x251/et61x251_core.c | 2 +- drivers/media/video/gspca/sonixj.c | 416 +++++++++------------ drivers/media/video/meye.c | 14 +- drivers/media/video/pms.c | 2 +- drivers/media/video/sh_vou.c | 13 +- drivers/media/video/sn9c102/sn9c102_core.c | 2 +- drivers/media/video/uvc/uvc_ctrl.c | 48 +++- drivers/media/video/uvc/uvc_queue.c | 133 ++++++-- drivers/media/video/uvc/uvc_v4l2.c | 185 +++------- drivers/media/video/uvc/uvc_video.c | 3 - drivers/media/video/uvc/uvcvideo.h | 10 +- drivers/media/video/v4l2-dev.c | 69 +++- drivers/media/video/v4l2-device.c | 1 + drivers/media/video/w9966.c | 2 +- drivers/pci/bus.c | 81 +---- drivers/pci/dmar.c | 5 + drivers/pci/quirks.c | 26 ++ drivers/scsi/scsi_lib.c | 3 +- drivers/staging/cx25821/cx25821-video.c | 8 +- drivers/staging/cx25821/cx25821-video.h | 2 +- drivers/video/omap/Kconfig | 4 +- drivers/video/omap2/vram.c | 4 +- fs/btrfs/export.c | 2 +- fs/namei.c | 3 + fs/nilfs2/gcinode.c | 9 - fs/nilfs2/ioctl.c | 12 + fs/notify/fanotify/fanotify.c | 6 +- fs/notify/fanotify/fanotify_user.c | 81 +++-- fs/notify/inotify/inotify_user.c | 1 + include/linux/blkdev.h | 10 +- include/linux/bootmem.h | 2 + include/linux/cnt32_to_63.h | 20 +- include/linux/fanotify.h | 10 +- include/linux/fsnotify.h | 3 - include/linux/fsnotify_backend.h | 2 +- include/linux/input.h | 6 +- include/linux/ioport.h | 2 +- include/linux/perf_event.h | 1 + include/linux/pm_runtime.h | 3 +- include/linux/sched.h | 2 +- include/linux/ssb/ssb_driver_gige.h | 17 +- include/media/saa7146.h | 2 +- include/media/v4l2-device.h | 2 + kernel/fork.c | 1 + kernel/perf_event.c | 37 ++- kernel/power/swap.c | 2 +- kernel/power/user.c | 2 +- kernel/resource.c | 104 +----- kernel/sched.c | 287 ++++++++++++--- kernel/timer.c | 8 +- kernel/trace/trace.c | 10 +- scripts/recordmcount.h | 2 +- scripts/tags.sh | 4 +- sound/pci/hda/patch_realtek.c | 24 ++- sound/soc/codecs/wm8580.c | 2 +- sound/soc/codecs/wm8904.c | 3 +- sound/soc/codecs/wm8955.c | 3 +- sound/soc/codecs/wm8960.c | 3 +- sound/soc/soc-dapm.c | 3 + 170 files changed, 1983 insertions(+), 1506 deletions(-) create mode 100644 arch/arm/mach-at91/include/mach/stamp9g20.h create mode 100644 arch/x86/kernel/resource.c ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-next block-for-next ## Auto-merging block/ioctl.c Auto-merging drivers/md/dm-table.c Auto-merging drivers/md/md.c Auto-merging drivers/scsi/scsi_lib.c Auto-merging drivers/scsi/sd.c Auto-merging fs/block_dev.c Auto-merging fs/btrfs/volumes.c Auto-merging fs/btrfs/volumes.h Auto-merging fs/ext3/super.c Auto-merging fs/ext4/super.c Auto-merging fs/ocfs2/cluster/heartbeat.c Auto-merging fs/reiserfs/journal.c Auto-merging fs/splice.c Auto-merging include/linux/blkdev.h Auto-merging include/linux/fs.h Auto-merging include/scsi/scsi.h Auto-merging kernel/power/swap.c Merge made by recursive. Documentation/cgroups/blkio-controller.txt | 27 + block/blk-cgroup.c | 4 - block/blk-core.c | 10 +- block/cfq-iosched.c | 62 ++-- block/genhd.c | 548 +++++++++++++++++++-- block/ioctl.c | 5 +- drivers/block/drbd/drbd_int.h | 2 - drivers/block/drbd/drbd_main.c | 7 +- drivers/block/drbd/drbd_nl.c | 105 ++--- drivers/block/loop.c | 6 +- drivers/block/pktcdvd.c | 22 +- drivers/cdrom/cdrom.c | 56 ++- drivers/char/raw.c | 14 +- drivers/md/dm-table.c | 20 +- drivers/md/dm.c | 4 +- drivers/md/md.c | 16 +- drivers/mtd/devices/block2mtd.c | 10 +- drivers/s390/block/dasd_genhd.c | 2 +- drivers/scsi/scsi_lib.c | 13 +- drivers/scsi/sd.c | 10 +- drivers/scsi/sr.c | 174 ++++--- drivers/scsi/sr.h | 3 +- drivers/scsi/sr_ioctl.c | 2 +- drivers/usb/gadget/storage_common.c | 7 +- fs/block_dev.c | 741 ++++++++++------------------ fs/btrfs/volumes.c | 28 +- fs/btrfs/volumes.h | 2 +- fs/char_dev.c | 2 +- fs/ext3/super.c | 12 +- fs/ext4/super.c | 12 +- fs/gfs2/ops_fstype.c | 8 +- fs/jfs/jfs_logmgr.c | 17 +- fs/logfs/dev_bdev.c | 7 +- fs/nfsd/vfs.c | 5 - fs/nilfs2/super.c | 8 +- fs/ocfs2/cluster/heartbeat.c | 2 +- fs/partitions/check.c | 98 +---- fs/reiserfs/journal.c | 21 +- fs/splice.c | 43 +-- fs/super.c | 19 +- fs/xfs/linux-2.6/xfs_super.c | 5 +- include/linux/blkdev.h | 4 +- include/linux/cdrom.h | 6 + include/linux/fs.h | 26 +- include/linux/genhd.h | 20 +- include/scsi/scsi.h | 1 + include/trace/events/block.h | 6 +- kernel/power/swap.c | 5 +- kernel/trace/blktrace.c | 12 +- mm/swapfile.c | 7 +- 50 files changed, 1207 insertions(+), 1039 deletions(-) ## # 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 ## Auto-merging drivers/scsi/ipr.c Merge made by recursive. drivers/ata/Kconfig | 8 + drivers/ata/Makefile | 1 + drivers/ata/acard-ahci.c | 528 +++++++++++++++++++++++++++++++++++ drivers/ata/ahci.h | 3 + drivers/ata/libahci.c | 11 +- drivers/ata/libata-scsi.c | 60 ++--- drivers/scsi/ipr.c | 2 +- drivers/scsi/libsas/sas_scsi_host.c | 3 +- include/linux/libata.h | 6 +- 9 files changed, 574 insertions(+), 48 deletions(-) create mode 100644 drivers/ata/acard-ahci.c ## # quilt /pub/linux/kernel/people/agk/patches/2.6/editing/ device-mapper section NEXT_PATCHES ## sending incremental file list ./ 0002-dm-log-userspace-split-flush-queue.patch 0003-dm-log-userspace-group-clear-and-mark-requests.patch 0004-dm-log-userspace-add-version-number-to-communication.patch 0005-dm-stripe-switch-from-local-workqueue-to-system_wq.patch 0006-dm-snapshot-kill-unused-dm_snapshot-queued_bios_work.patch 0007-dm-convert-to-alloc-_ordered-_workqueue.patch 0008-dm-don-t-use-flush_scheduled_work.patch 0009-dm-use-non-reentrant-workqueues-if-equivalent.patch 0010-dm-snapshot-persistent-make-metadata_wq-multithreade.patch base dm-add-flakey-target.patch dm-add-ioband.patch dm-bufio.patch dm-change-clone-bi_private-pointer-during-cleanup.patch dm-crypt-remove-unused-compatible-table-output.patch dm-crypt-scale-to-multiple-CPUs.patch dm-crypt-set-key-size-early.patch dm-crypt-simplify-compatible-table-output.patch dm-crypt-use-IO-thread-for-reads-only-if-mempool-is-exhausted.patch dm-delay-unplug-queue.patch dm-dont-take-i_mutex-to-change-device-size.patch dm-emulate-BLKRRPART-ioctl.patch dm-export-dm_disk.patch dm-extract-region_hash.patch dm-flakey.patch dm-handle-clone-reprocessing.patch dm-io-delay-queue-unplug-in-kcopyd.patch dm-io-remove-BIO_RW_SYNCIO-flag-from-kcopyd.patch dm-ioctl-allow-rename-to-fill-empty-uuid.patch dm-iostats.patch dm-kcopyd-add-async-destruction-option.patch dm-kcopyd-delay-unplugging.patch dm-log-userspace-trap-all-failed-log-construction-errors.patch dm-loop.patch dm-memcache.patch dm-mpath-add-alua.patch dm-mpath-disable-blk_abort_queue.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-raid1-support-discard.patch dm-raid45-to-be-split.patch dm-region_hash-change-primes.patch dm-remove-dm_mutex-after-bkl-conversion.patch dm-remove-extra-locking-when-changing-device-size.patch dm-remove-struct-clone_info.patch dm-snapshot-cleanup-style.patch dm-snapshot-invalidate-from-workqueue.patch dm-snapshot-release-memory-if-invalid.patch dm-split-bios-into-only-two-pieces.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-use-singlethread-workqueues.patch dm-userspace.patch end git-2636rc1-2637rc4.patch git-update1.patch git-update2.patch git-update3.patch mm next next-20101013.patch 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-4-dm-replicator-ringbuffer-replication-log-handler.patch v6-4-4-dm-replicator-blockdev-site-link-handler.patch sent 131177715 bytes received 1706 bytes 87452947.33 bytes/sec total size is 131152841 speedup is 1.00 Using base v2.6.37-rc6-186-ge5fcdb7 dm-dont-take-i_mutex-to-change-device-size.patch dm-mpath-disable-blk_abort_queue.patch dm-io-remove-BIO_RW_SYNCIO-flag-from-kcopyd.patch dm-ioctl-allow-rename-to-fill-empty-uuid.patch dm-raid1-support-discard.patch dm-remove-dm_mutex-after-bkl-conversion.patch dm-crypt-set-key-size-early.patch dm-log-userspace-trap-all-failed-log-construction-errors.patch ## # 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... Nothing to do. Already up-to-date. ## # check ## Differences exist, continuing ## # label ## [2.6.37-rc6-stor2 1891c8d] 2.6.37-rc6-stor2 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 If the identity used for this commit is wrong, you can fix it with: git commit --amend --author='Your Name ' 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- ##