From /pub/scm/linux/kernel/git/jejb/../torvalds/linux-2.6 0c21e3a..5b2eef9 master -> origin/mast## Checking out files: 44% (228/516) Checking out files: 45% (233/516) Checking out files: 46% (238/516) Checking out files: 47% (243/516) Checking out files: 48% (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 ## Auto-merging drivers/scsi/scsi_lib.c Merge made by recursive. Documentation/kernel-parameters.txt | 5 - Documentation/power/runtime_pm.txt | 4 +- arch/arm/mach-at91/Makefile | 2 +- arch/arm/mach-at91/board-pcontrol-g20.c | 98 +----- arch/arm/mach-at91/board-stamp9g20.c | 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 - From /pub/scm/linux/kernel/git/axboe/linux-2.6-block 1fe6515..5fce009 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-stor21' From /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 + 5d7598d...834349b master -> scsi-post-merge (forced update) Switched to branch 'scsi-post-merge' Switched to branch '2.6.37-rc6-stor21' From . * branch scsi-post-merge -> FETCH_HEAD 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/blk-merge.c Auto-merging block/ioctl.c Auto-merging drivers/block/cciss.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 | 40 ++- block/blk-ioc.c | 5 +- block/blk-merge.c | 3 +- block/cfq-iosched.c | 112 +++-- block/genhd.c | 550 +++++++++++++++++++-- block/ioctl.c | 5 +- drivers/block/cciss.c | 23 +- drivers/block/cciss.h | 4 +- drivers/block/cciss_cmd.h | 2 +- drivers/block/drbd/drbd_int.h | 2 - drivers/block/drbd/drbd_main.c | 7 +- drivers/block/drbd/drbd_nl.c | 105 ++--- drivers/block/floppy.c | 15 +- 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 | 6 +- 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/bio-integrity.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 | 106 +---- 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 | 5 +- include/linux/cdrom.h | 6 + include/linux/fs.h | 26 +- include/linux/genhd.h | 45 ++- include/scsi/scsi.h | 1 + include/trace/events/block.h | 12 +- kernel/power/swap.c | 5 +- kernel/trace/blktrace.c | 37 +- mm/swapfile.c | 7 +- 57 files changed, 1348 insertions(+), 1106 deletions(-) ## # git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-fixes libata-fixes ## Auto-merging drivers/block/cciss.c Merge made by recursive. Documentation/accounting/getdelays.c | 1 + .../trace/postprocess/trace-vmscan-postprocess.pl | 11 +- MAINTAINERS | 4 +- Makefile | 2 +- arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 1 + arch/x86/kernel/setup.c | 17 ++- drivers/ata/Kconfig | 22 ++-- drivers/ata/Makefile | 2 +- drivers/ata/libata-core.c | 24 ++- drivers/ata/libata-eh.c | 17 ++- drivers/ata/libata-sff.c | 7 +- drivers/ata/pata_cs5536.c | 20 ++- drivers/bluetooth/hci_ldisc.c | 6 +- drivers/char/agp/intel-gtt.c | 11 +- drivers/gpio/cs5535-gpio.c | 19 ++- drivers/gpio/gpiolib.c | 3 + drivers/gpio/rdc321x-gpio.c | 2 +- drivers/gpu/drm/drm_crtc_helper.c | 7 +- drivers/gpu/drm/i915/intel_bios.c | 2 +- drivers/gpu/drm/i915/intel_dp.c | 37 ++++- drivers/gpu/drm/i915/intel_ringbuffer.c | 19 +-- drivers/gpu/drm/i915/intel_ringbuffer.h | 5 +- drivers/gpu/drm/i915/intel_sdvo.c | 9 +- drivers/gpu/drm/radeon/atombios_crtc.c | 7 +- drivers/gpu/drm/radeon/evergreen.c | 27 ++-- drivers/gpu/drm/radeon/evergreend.h | 1 + drivers/gpu/drm/radeon/r600.c | 10 +- drivers/gpu/drm/radeon/r600_cs.c | 9 +- drivers/gpu/drm/radeon/radeon_device.c | 9 +- drivers/gpu/drm/radeon/radeon_drv.c | 19 ++ drivers/gpu/drm/radeon/radeon_fb.c | 2 +- drivers/leds/led-class.c | 2 +- drivers/media/IR/keymaps/rc-rc6-mce.c | 21 ++- drivers/media/IR/lirc_dev.c | 29 ++-- drivers/media/IR/mceusb.c | 174 ++++++++++++-------- drivers/media/IR/nuvoton-cir.c | 10 +- drivers/media/IR/streamzap.c | 21 ++- drivers/media/video/mx2_camera.c | 2 - drivers/media/video/s5p-fimc/fimc-capture.c | 51 ++++++- drivers/media/video/s5p-fimc/fimc-core.c | 54 ++++--- drivers/media/video/s5p-fimc/fimc-core.h | 24 ++- drivers/media/video/s5p-fimc/regs-fimc.h | 3 + drivers/media/video/sh_mobile_ceu_camera.c | 2 +- drivers/mfd/ab8500-core.c | 2 +- drivers/mfd/wm831x-core.c | 8 +- drivers/net/atl1c/atl1c_main.c | 39 ++--- drivers/net/benet/be.h | 2 +- drivers/net/benet/be_cmds.c | 75 +++++---- drivers/net/benet/be_main.c | 2 +- drivers/net/bonding/bond_ipv6.c | 7 +- drivers/net/bonding/bond_main.c | 42 +---- drivers/net/bonding/bonding.h | 4 +- drivers/net/epic100.c | 4 +- drivers/net/hamachi.c | 4 +- drivers/net/pcmcia/axnet_cs.c | 1 + drivers/net/pcmcia/pcnet_cs.c | 1 - drivers/net/sundance.c | 4 +- drivers/net/tehuti.c | 4 +- drivers/net/typhoon.c | 1 - drivers/net/usb/asix.c | 4 + drivers/net/usb/mcs7830.c | 14 ++- drivers/net/veth.c | 4 +- drivers/net/wireless/hostap/hostap_main.c | 1 - drivers/net/wireless/iwlwifi/iwl-1000.c | 2 + drivers/net/wireless/iwlwifi/iwl-6000.c | 12 ++ drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c | 88 ++++++++++- drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 6 + drivers/net/wireless/iwlwifi/iwl-core.h | 1 + drivers/net/wireless/iwlwifi/iwl-eeprom.h | 25 +++- drivers/net/wireless/libertas/cfg.c | 2 +- drivers/net/wireless/p54/p54usb.c | 6 + drivers/net/wireless/rt2x00/rt2800pci.c | 1 + drivers/net/wireless/rt2x00/rt2x00.h | 1 + drivers/net/wireless/rt2x00/rt2x00dev.c | 9 +- drivers/net/yellowfin.c | 4 +- drivers/of/of_i2c.c | 2 +- drivers/rtc/rtc-rs5c372.c | 2 +- drivers/spi/mpc52xx_spi.c | 2 +- drivers/spi/spi.c | 3 +- drivers/spi/spi_fsl_espi.c | 35 +++- drivers/tty/n_gsm.c | 6 +- drivers/usb/core/Kconfig | 12 +- drivers/usb/gadget/composite.c | 18 +- drivers/usb/host/xhci-mem.c | 25 ++- drivers/usb/misc/uss720.c | 4 +- drivers/usb/serial/ftdi_sio.c | 1 + drivers/usb/serial/ftdi_sio_ids.h | 5 + drivers/usb/storage/unusual_devs.h | 7 + drivers/video/backlight/cr_bllcd.c | 1 + drivers/watchdog/rdc321x_wdt.c | 2 +- fs/ceph/dir.c | 3 +- fs/ceph/file.c | 39 +++-- fs/ext4/resize.c | 5 + fs/logfs/journal.c | 2 +- fs/logfs/readwrite.c | 3 + fs/ocfs2/aops.c | 7 +- fs/ocfs2/aops.h | 23 +++- fs/ocfs2/cluster/masklog.c | 3 +- fs/ocfs2/cluster/masklog.h | 15 +- fs/ocfs2/dir.c | 4 + fs/ocfs2/dlm/dlmmaster.c | 40 +++-- fs/ocfs2/file.c | 15 ++- fs/ocfs2/ocfs2_fs.h | 2 +- include/linux/ceph/libceph.h | 6 +- include/linux/kthread.h | 45 ++++- include/linux/netlink.h | 2 +- include/linux/taskstats.h | 3 +- include/linux/unaligned/packed_struct.h | 6 +- include/net/flow.h | 1 - include/net/ip6_route.h | 10 + include/net/mac80211.h | 28 +++- include/net/pkt_cls.h | 4 +- include/net/sch_generic.h | 6 +- include/net/sock.h | 3 + kernel/kthread.c | 11 ++ kernel/taskstats.c | 57 +++++-- mm/compaction.c | 1 - mm/migrate.c | 2 + mm/page-writeback.c | 2 +- mm/percpu.c | 2 +- net/bluetooth/rfcomm/core.c | 1 + net/bridge/br_multicast.c | 2 +- net/ceph/messenger.c | 8 +- net/ceph/pagevec.c | 15 +- net/core/fib_rules.c | 3 +- net/core/sock.c | 47 ++++-- net/ipv4/fib_frontend.c | 10 +- net/ipv4/route.c | 7 +- net/ipv4/tcp_ipv4.c | 4 +- net/ipv4/udp.c | 1 + net/ipv4/udplite.c | 1 + net/ipv6/addrconf.c | 4 +- net/ipv6/ip6_output.c | 12 +- net/ipv6/route.c | 7 +- net/ipv6/udp.c | 1 + net/ipv6/udplite.c | 1 + net/ipv6/xfrm6_output.c | 16 ++- net/irda/af_irda.c | 18 ++- net/mac80211/ibss.c | 4 + net/mac80211/rx.c | 5 +- net/mac80211/work.c | 5 +- net/sched/sch_sfq.c | 20 +-- net/sctp/socket.c | 2 +- security/keys/request_key.c | 1 - sound/core/pcm_lib.c | 10 +- sound/pci/hda/hda_codec.c | 57 ++++--- sound/pci/hda/patch_realtek.c | 64 +++++--- sound/pci/hda/patch_sigmatel.c | 5 +- tools/perf/builtin-buildid-list.c | 3 +- tools/perf/builtin-probe.c | 5 + tools/perf/util/header.c | 10 +- tools/perf/util/probe-event.c | 15 ++- tools/perf/util/probe-finder.c | 85 ++++++---- tools/perf/util/string.c | 2 +- tools/perf/util/symbol.c | 4 +- tools/perf/util/symbol.h | 2 + 156 files changed, 1379 insertions(+), 658 deletions(-) ## # git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream libata-upstream ## Auto-merging drivers/scsi/ipr.c Merge made by recursive. Documentation/filesystems/Locking | 212 ++++++------ Documentation/kernel-parameters.txt | 2 +- MAINTAINERS | 17 +- Makefile | 2 +- arch/arm/common/it8152.c | 1 + arch/arm/include/asm/hardware/it8152.h | 1 + arch/arm/include/asm/highmem.h | 3 - arch/arm/include/asm/sizes.h | 6 +- arch/arm/include/asm/system.h | 1 + arch/arm/kernel/entry-common.S | 6 + arch/arm/kernel/smp.c | 1 - arch/arm/mach-at91/include/mach/at91_mci.h | 2 + arch/arm/mach-ixp4xx/common-pci.c | 2 +- arch/arm/mach-pxa/Kconfig | 1 + arch/arm/mach-pxa/sleep.S | 4 +- arch/arm/mm/cache-feroceon-l2.c | 37 +- arch/arm/mm/cache-xsc3l2.c | 57 ++-- arch/arm/mm/dma-mapping.c | 7 +- arch/arm/mm/flush.c | 7 +- arch/arm/mm/highmem.c | 87 ----- arch/mn10300/kernel/irq.c | 2 +- arch/sh/boards/mach-se/7206/irq.c | 2 +- arch/sh/kernel/cpu/sh2a/clock-sh7201.c | 2 +- arch/sh/kernel/cpu/sh4/clock-sh4-202.c | 3 +- arch/x86/kernel/microcode_intel.c | 16 +- arch/x86/kvm/i8259.c | 2 + arch/x86/kvm/mmu.c | 3 +- arch/x86/oprofile/op_model_amd.c | 24 +- drivers/acpi/acpica/evgpeinit.c | 3 + drivers/acpi/battery.c | 5 - drivers/acpi/scan.c | 97 ++++-- drivers/ata/Kconfig | 28 +- 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/ata/pata_hpt366.c | 51 ++-- drivers/ata/pata_hpt37x.c | 236 ++++++++----- drivers/ata/pata_hpt3x2n.c | 150 ++++++--- drivers/atm/atmtcp.c | 5 +- drivers/char/ramoops.c | 12 +- drivers/dma/mv_xor.c | 2 +- drivers/gpu/drm/i915/dvo_ch7017.c | 2 +- drivers/gpu/drm/i915/i915_dma.c | 23 ++ drivers/gpu/drm/i915/i915_reg.h | 10 + drivers/gpu/drm/i915/intel_bios.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 21 +- drivers/gpu/drm/i915/intel_sdvo.c | 3 +- drivers/hwmon/s3c-hwmon.c | 2 - drivers/isdn/gigaset/capi.c | 1 + drivers/media/video/cx25840/cx25840-core.c | 19 +- drivers/media/video/cx88/cx88-alsa.c | 99 +----- drivers/media/video/cx88/cx88-cards.c | 7 + drivers/media/video/cx88/cx88-video.c | 27 +-- drivers/media/video/cx88/cx88.h | 6 +- drivers/media/video/em28xx/em28xx-video.c | 2 +- drivers/media/video/soc_camera.c | 4 +- drivers/media/video/wm8775.c | 104 ++---- drivers/mmc/core/core.c | 1 + drivers/mmc/host/at91_mci.c | 13 +- drivers/mmc/host/atmel-mci.c | 18 +- drivers/net/atlx/atl1.c | 10 + drivers/net/cnic.c | 10 +- drivers/net/ehea/ehea_ethtool.c | 7 + drivers/net/ppp_generic.c | 9 +- drivers/net/skfp/skfddi.c | 2 +- drivers/net/starfire.c | 2 +- drivers/net/tg3.c | 2 +- drivers/pci/hotplug/pciehp_acpi.c | 3 +- drivers/platform/x86/intel_ips.c | 36 ++- drivers/platform/x86/intel_ips.h | 21 ++ drivers/scsi/ipr.c | 2 +- drivers/scsi/libsas/sas_scsi_host.c | 3 +- drivers/sh/intc/core.c | 1 + drivers/spi/coldfire_qspi.c | 2 +- drivers/spi/omap2_mcspi.c | 39 ++ drivers/staging/zram/zram_drv.c | 6 - drivers/usb/atm/ueagle-atm.c | 22 +- drivers/video/fbmem.c | 2 +- drivers/video/imxfb.c | 9 +- drivers/video/sh_mobile_hdmi.c | 16 +- drivers/video/sh_mobile_lcdcfb.c | 30 +- include/linux/dmaengine.h | 13 +- include/linux/libata.h | 6 +- include/media/wm8775.h | 3 - init/do_mounts.c | 2 +- kernel/trace/ring_buffer.c | 9 +- kernel/user.c | 1 + kernel/watchdog.c | 3 +- mm/memcontrol.c | 19 +- mm/nommu.c | 28 ++- net/bridge/br_multicast.c | 28 +- net/bridge/br_stp_bpdu.c | 2 + net/can/bcm.c | 4 +- net/ipv4/route.c | 8 +- scripts/kconfig/menu.c | 14 + security/integrity/ima/ima_policy.c | 2 + sound/oss/soundcard.c | 4 +- sound/pci/hda/hda_intel.c | 1 + sound/soc/codecs/max98088.c | 10 +- sound/soc/codecs/wm8523.c | 9 +- sound/soc/codecs/wm8741.c | 10 +- sound/soc/codecs/wm8753.c | 226 +++++-------- sound/soc/codecs/wm8904.c | 37 +- sound/soc/codecs/wm8940.c | 1 + sound/soc/codecs/wm8955.c | 31 +- sound/soc/codecs/wm8960.c | 1 + sound/soc/codecs/wm8962.c | 45 +-- sound/soc/codecs/wm8971.c | 1 + sound/soc/codecs/wm9081.c | 1 + sound/soc/codecs/wm9090.c | 18 +- tools/perf/util/hist.c | 2 +- 113 files changed, 1758 insertions(+), 1081 deletions(-) create mode 100644 drivers/ata/acard-ahci.c create mode 100644 drivers/platform/x86/intel_ips.h ## # 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-convert-workqueues-to-alloc_ordered.patch dm-crypt-add-loop-aes-iv-generator-old.patch dm-crypt-add-loop-aes-iv-generator.patch dm-crypt-add-multi-key-capability.patch dm-crypt-add-post-iv-call-to-iv-generator.patch dm-crypt-remove-unused-compatible-table-output.patch dm-crypt-scale-to-multiple-CPUs.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-crypt-use-io-thread-for-reads-only-if-mempool-exhausted.patch dm-delay-unplug-queue.patch dm-dont-take-i_mutex-to-change-device-size.patch dm-dont-use-flush_scheduled_work.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-ioctl-suppress-needless-warning-messages.patch dm-iostats.patch dm-kcopyd-add-async-destruction-option.patch dm-kcopyd-delay-unplugging.patch dm-kcopyd-delay-unplugging.patch.old dm-log-use-PTR_ERR-value-instead-of-ENOMEM.patch dm-log-userspace-add-version-number-to-comms.patch dm-log-userspace-group-clear-and-mark-requests.patch dm-log-userspace-split-flush-queue.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-remove-superfluous-irq-disablement-in-dm_request_fn.patch dm-snapshot-avoid-storing-private-suspended-state.patch dm-snapshot-cleanup-style.patch dm-snapshot-invalidate-from-workqueue.patch dm-snapshot-persistent-make-metadata_wq-multithreaded.patch dm-snapshot-release-memory-if-invalid.patch dm-snapshot-remove-unused-dm_snapshot-queued_bios_work.patch dm-split-bios-into-only-two-pieces.patch dm-stripe-switch-from-local-workqueue-to-system_wq.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-non-reentrant-workqueues-if-equivalent.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 131269315 bytes received 2086 bytes 37506114.57 bytes/sec total size is 131242223 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 dm-kcopyd-delay-unplugging.patch dm-log-userspace-split-flush-queue.patch dm-log-userspace-group-clear-and-mark-requests.patch dm-log-userspace-add-version-number-to-comms.patch dm-crypt-scale-to-multiple-cpus.patch dm-crypt-use-io-thread-for-reads-only-if-mempool-exhausted.patch dm-crypt-simplify-compatible-table-output.patch dm-crypt-add-post-iv-call-to-iv-generator.patch dm-crypt-add-multi-key-capability.patch dm-crypt-add-loop-aes-iv-generator.patch dm-ioctl-suppress-needless-warning-messages.patch dm-snapshot-remove-unused-dm_snapshot-queued_bios_work.patch dm-dont-use-flush_scheduled_work.patch dm-stripe-switch-from-local-workqueue-to-system_wq.patch dm-convert-workqueues-to-alloc_ordered.patch dm-use-non-reentrant-workqueues-if-equivalent.patch dm-snapshot-persistent-make-metadata_wq-multithreaded.patch dm-snapshot-avoid-storing-private-suspended-state.patch dm-log-use-PTR_ERR-value-instead-of-ENOMEM.patch dm-remove-superfluous-irq-disablement-in-dm_request_fn.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... Applying: [SCSI] sd: implement sd_check_events() Applying: [SCSI] sd,sr: kill compat SDEV_MEDIA_CHANGE event Applying: [SCSI] target: Add LIO target core v4.0.0-rc6 Updating 0e3e1ce..51e1bae Fast-forward Documentation/target/tcm_mod_builder.py | 1094 +++++ Documentation/target/tcm_mod_builder.txt | 145 + drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/scsi/sd.c | 103 +- drivers/scsi/sd.h | 1 - drivers/scsi/sr.c | 4 - drivers/target/Kconfig | 32 + drivers/target/Makefile | 24 + drivers/target/target_core_alua.c | 1991 +++++++++ drivers/target/target_core_alua.h | 126 + drivers/target/target_core_cdb.c | 1131 +++++ drivers/target/target_core_configfs.c | 3225 ++++++++++++++ drivers/target/target_core_device.c | 1694 +++++++ drivers/target/target_core_fabric_configfs.c | 1001 +++++ drivers/target/target_core_fabric_lib.c | 451 ++ drivers/target/target_core_file.c | 688 +++ drivers/target/target_core_file.h | 50 + drivers/target/target_core_hba.c | 185 + drivers/target/target_core_hba.h | 7 + drivers/target/target_core_iblock.c | 808 ++++ drivers/target/target_core_iblock.h | 40 + drivers/target/target_core_mib.c | 1078 +++++ drivers/target/target_core_mib.h | 28 + drivers/target/target_core_pr.c | 4251 ++++++++++++++++++ drivers/target/target_core_pr.h | 67 + drivers/target/target_core_pscsi.c | 1470 ++++++ drivers/target/target_core_pscsi.h | 65 + drivers/target/target_core_rd.c | 1091 +++++ drivers/target/target_core_rd.h | 73 + drivers/target/target_core_scdb.c | 105 + drivers/target/target_core_scdb.h | 10 + drivers/target/target_core_tmr.c | 395 ++ drivers/target/target_core_tpg.c | 826 ++++ drivers/target/target_core_transport.c | 6133 ++++++++++++++++++++++++++ drivers/target/target_core_ua.c | 332 ++ drivers/target/target_core_ua.h | 36 + include/target/configfs_macros.h | 147 + include/target/target_core_base.h | 937 ++++ include/target/target_core_configfs.h | 52 + include/target/target_core_device.h | 61 + include/target/target_core_fabric_configfs.h | 106 + include/target/target_core_fabric_lib.h | 28 + include/target/target_core_fabric_ops.h | 100 + include/target/target_core_tmr.h | 43 + include/target/target_core_tpg.h | 35 + include/target/target_core_transport.h | 350 ++ 47 files changed, 30564 insertions(+), 58 deletions(-) create mode 100755 Documentation/target/tcm_mod_builder.py create mode 100644 Documentation/target/tcm_mod_builder.txt create mode 100644 drivers/target/Kconfig create mode 100644 drivers/target/Makefile create mode 100644 drivers/target/target_core_alua.c create mode 100644 drivers/target/target_core_alua.h create mode 100644 drivers/target/target_core_cdb.c create mode 100644 drivers/target/target_core_configfs.c create mode 100644 drivers/target/target_core_device.c create mode 100644 drivers/target/target_core_fabric_configfs.c create mode 100644 drivers/target/target_core_fabric_lib.c create mode 100644 drivers/target/target_core_file.c create mode 100644 drivers/target/target_core_file.h create mode 100644 drivers/target/target_core_hba.c create mode 100644 drivers/target/target_core_hba.h create mode 100644 drivers/target/target_core_iblock.c create mode 100644 drivers/target/target_core_iblock.h create mode 100644 drivers/target/target_core_mib.c create mode 100644 drivers/target/target_core_mib.h create mode 100644 drivers/target/target_core_pr.c create mode 100644 drivers/target/target_core_pr.h create mode 100644 drivers/target/target_core_pscsi.c create mode 100644 drivers/target/target_core_pscsi.h create mode 100644 drivers/target/target_core_rd.c create mode 100644 drivers/target/target_core_rd.h create mode 100644 drivers/target/target_core_scdb.c create mode 100644 drivers/target/target_core_scdb.h create mode 100644 drivers/target/target_core_tmr.c create mode 100644 drivers/target/target_core_tpg.c create mode 100644 drivers/target/target_core_transport.c create mode 100644 drivers/target/target_core_ua.c create mode 100644 drivers/target/target_core_ua.h create mode 100644 include/target/configfs_macros.h create mode 100644 include/target/target_core_base.h create mode 100644 include/target/target_core_configfs.h create mode 100644 include/target/target_core_device.h create mode 100644 include/target/target_core_fabric_configfs.h create mode 100644 include/target/target_core_fabric_lib.h create mode 100644 include/target/target_core_fabric_ops.h create mode 100644 include/target/target_core_tmr.h create mode 100644 include/target/target_core_tpg.h create mode 100644 include/target/target_core_transport.h ## # check ## Differences exist, continuing ## # label ## [2.6.37-rc6-stor21 3eedb15] 2.6.37-rc6-stor21 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- ##