From /pub/scm/linux/kernel/git/jejb/../torvalds/linux-2.6 49553c2..bfa88ea master -> origin/mas## #Checking out files: 39% (165/421) Checking out files: 40% (169/421) Checking out files: 41% (173/421) Checking out files: 42% (177/421) Checking out files: 43%Removing patches/ ## # git /pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git master scsi-rc-fixes ## Auto-merging drivers/scsi/qla2xxx/qla_attr.c Auto-merging drivers/scsi/qla2xxx/qla_def.h Auto-merging drivers/scsi/qla2xxx/qla_init.c Auto-merging drivers/scsi/qla2xxx/qla_isr.c Auto-merging drivers/scsi/qla2xxx/qla_mbx.c Auto-merging drivers/scsi/qla2xxx/qla_nx.c Auto-merging drivers/scsi/qla2xxx/qla_os.c Auto-merging drivers/scsi/sd.c Merge made by recursive. drivers/scsi/be2iscsi/be_iscsi.c | 5 +- drivers/scsi/be2iscsi/be_mgmt.c | 2 +- drivers/scsi/constants.c | 6 +- drivers/scsi/hpsa.c | 6 ++ drivers/scsi/osd/osd_initiator.c | 2 +- drivers/scsi/qla2xxx/qla_attr.c | 23 ++++++--- drivers/scsi/qla2xxx/qla_dbg.h | 2 - drivers/scsi/qla2xxx/qla_def.h | 20 +++++++ drivers/scsi/qla2xxx/qla_init.c | 94 ++++++++++++++++++++++++++++++----- drivers/scsi/qla2xxx/qla_isr.c | 7 ++- drivers/scsi/qla2xxx/qla_mbx.c | 7 ++- drivers/scsi/qla2xxx/qla_mid.c | 68 ++++++++++++++++++++++--- drivers/scsi/qla2xxx/qla_nx.c | 36 ++++++++++--- drivers/scsi/qla2xxx/qla_os.c | 30 ++++++++++-- drivers/scsi/qla2xxx/qla_version.h | 4 +- drivers/scsi/scsi_lib.c | 2 +- drivers/scsi/sd.c | 8 ++-- drivers/scsi/sym53c8xx_2/sym_hipd.c | 10 ++-- 18 files changed, 262 insertions(+), 70 deletions(-) ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-linus block-for-linus ## Removing drivers/md/.gitignore Removing drivers/pci/pcie/pme/Makefile Removing drivers/pci/pcie/pme/pcie_pme.h Removing drivers/pci/pcie/pme/pcie_pme_acpi.c Merge made by recursive. Documentation/DocBook/device-drivers.tmpl | 1 - Documentation/DocBook/kernel-api.tmpl | 1 - Documentation/DocBook/kernel-locking.tmpl | 6 + Documentation/DocBook/tracepoint.tmpl | 5 + Documentation/block/cfq-iosched.txt | 45 +++ Documentation/cgroups/blkio-controller.txt | 28 ++ Documentation/gpio.txt | 22 +- Documentation/kernel-doc-nano-HOWTO.txt | 5 + Documentation/kernel-parameters.txt | 17 +- Documentation/mutex-design.txt | 3 +- Documentation/sound/alsa/HD-Audio-Models.txt | 1 + MAINTAINERS | 36 ++- Makefile From . * branch block-for-next -> FETCH_HEAD From . * branch libata-fixes -> FETCH_HEAD From . * branch libata-upstream -> FETCH_HEAD Checking out files: 22% (260/1140) Checking out files: 23% (263/1140) Checking out files: 24% (274/1140) Checking out files: 25% (285/1140) Checking out files: 26% (297/1140) Checking out files: 27% (308/1140) Checking out files: 28% (320/1140) Checking out files: 29% (331/1140) Checking out files: 30% (342/1140) Checking out files: 31% (354/1140) Checking out files: 32% (365/1140) Checking out files: 33% (377/1140) Checking out files: 34% (388/1140) Checking out files: 35% (399/1140) Checking out files: 36% (411/1140) Checking out files: 37% (422/1140) Checking out files: 38% (434/1140) Checking out files: 39% (445/1140) Checking out files: 40% (456/1140) Checking out files: 41% (468/1140) Checking out files: 42% (479/1140) Checking out files: 43% (491/1140) Checking out files: 44% (502/1140) Checking out files: 45% (513/1140) Checking out files: 46% (525/1140) Checking out files: 47% (536/1140) Checking out files: 48% (548/1140) Checking out files: 49% (559/1140) Checking out files: 50% (570/1140) Checking out files: 51% (582/1140) Checking out files: 52% (593/1140) Checking out files: 53% (605/1140) Checking out files: 54% (616/1140) Checking out files: 55% (627/1140) Checking out files: 56% (639/1140) Checking out files: 57% (650/1140) Checking out files: 58% (662/1140) Checking out files: 59% (673/1140) Checking out files: 60% (684/1140) Checking out files: 61% (696/1140) Checking out files: 62% (707/1140) Checking out files: 63% (719/1140) Checking out files: 64% (730/1140) Checking out files: 65% (741/1140) Checking out files: 66% (753/1140) Checking out files: 67% (764/1140) Checking out files: 68% (776/1140) Checking out files: 69% (787/1140) Checking out files: 70% (798/1140) Checking out files: 71% (810/1140) Checking out files: 72% (821/1140) Checking out files: 73% (833/1140) Checking out files: 74% (844/1140) Checking out files: 75% (855/1140) Checking out files: 76% (867/1140) Checking out files: 77% (878/1140) Checking out files: 78% (890/1140) Checking out files: 79% (901/1140) Checking out files: 80% (912/1140) Checking out files: 81% (924/1140) Checking out files: 82% (935/1140) Checking out files: 83% (947/1140) Checking out files: 84% (958/1140) Checking out files: 85% (969/1140) Checking out files: 86% (981/1140) Checking out files: 87% (992/1140) Checking out files: 88% (1004/1140) Checking out files: 89% (1015/1140) Checking out files: 89% (1024/1140) Checking out files: 90% (1026/1140) Checking out files: 91% (1038/1140) Checking out files: 92% (1049/1140) Checking out files: 93% (1061/1140) Checking out files: 94% (1072/1140) Checking out files: 95% (1083/1140) Checking out files: 96% (1095/1140) Checking out files: 97% (1106/1140) Checking out files: 98% (1118/1140) Checking out files: 99% (1129/1140) Checking out files: 100% (1140/1140) Checking out files: 100% (1140/1140), done. Switched to branch 'device-mapper' Switched to branch '2.6.36-rc3-stor5' From /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 + 3f7941e...2bfc96a master -> scsi-post-merge (forced update) Switched to branch 'scsi-post-merge' Switched to branch '2.6.36-rc3-stor5' From . * branch scsi-post-merge -> FETCH_HEAD | 2 - arch/sparc/kernel/unaligned_32.c | 3 +- arch/sparc/kernel/windows.c | 2 - arch/x86/include/asm/iomap.h | 4 +- arch/x86/include/asm/kvm_emulate.h | 7 +- arch/x86/include/asm/pci.h | 6 +- arch/x86/kernel/cpu/mcheck/mce_amd.c | 4 +- arch/x86/kernel/cpu/mcheck/therm_throt.c | 9 +- arch/x86/kernel/cpu/perf_event.c | 59 +++- arch/x86/kernel/cpu/perf_event_intel.c | 15 +- arch/x86/kernel/cpu/perf_event_p4.c | 2 +- arch/x86/kernel/trampoline.c | 3 +- arch/x86/kernel/tsc.c | 2 +- arch/x86/kvm/emulate.c | 9 +- arch/x86/kvm/i8259.c | 3 + arch/x86/kvm/irq.h | 2 +- arch/x86/mm/iomap_32.c | 6 +- arch/x86/oprofile/nmi_int.c | 22 ++- block/blk-cgroup.c | 2 +- block/blk-core.c | 6 +- block/blk-map.c | 2 +- block/blk-sysfs.c | 1 + block/blk.h | 8 +- block/cfq-iosched.c | 103 ++++++- block/elevator.c | 44 ++- crypto/Kconfig | 8 +- crypto/ahash.c | 7 +- crypto/algboss.c | 8 +- crypto/testmgr.c | 4 +- drivers/acpi/pci_root.c | 97 ++++--- drivers/ata/ahci.c | 3 + drivers/ata/ata_piix.c | 4 + drivers/ata/libahci.c | 2 +- drivers/ata/libata-core.c | 14 +- drivers/ata/libata-eh.c | 4 + drivers/ata/libata-sff.c | 41 ++- drivers/ata/pata_artop.c | 3 +- drivers/ata/pata_via.c | 2 + drivers/ata/sata_mv.c | 2 +- drivers/base/power/main.c | 1 + drivers/block/cciss.c | 13 +- drivers/block/loop.c | 2 +- drivers/block/mg_disk.c | 3 +- drivers/char/agp/intel-agp.c | 16 +- drivers/char/agp/intel-agp.h | 22 +- drivers/char/agp/intel-gtt.c | 66 +++-- drivers/char/hw_random/n2-drv.c | 2 +- drivers/char/tty_io.c | 2 +- drivers/char/vt.c | 15 +- drivers/char/vt_ioctl.c | 16 +- drivers/gpio/sx150x.c | 26 ++- drivers/gpu/drm/drm_crtc_helper.c | 24 ++- drivers/gpu/drm/i915/i915_debugfs.c | 50 ++++ drivers/gpu/drm/i915/i915_dma.c | 36 ++- drivers/gpu/drm/i915/i915_drv.c | 65 ++--- drivers/gpu/drm/i915/i915_drv.h | 27 +-- drivers/gpu/drm/i915/i915_gem.c | 11 +- drivers/gpu/drm/i915/i915_irq.c | 73 ++++- drivers/gpu/drm/i915/i915_reg.h | 9 + drivers/gpu/drm/i915/intel_display.c | 267 ++++++++---------- drivers/gpu/drm/i915/intel_dp.c | 58 ++-- drivers/gpu/drm/i915/intel_drv.h | 10 + drivers/gpu/drm/i915/intel_lvds.c | 2 - drivers/gpu/drm/i915/intel_overlay.c | 2 + drivers/gpu/drm/i915/intel_ringbuffer.c | 8 +- drivers/gpu/drm/i915/intel_sdvo.c | 69 ++++-- drivers/gpu/drm/i915/intel_tv.c | 9 +- drivers/gpu/drm/nouveau/nouveau_fence.c | 6 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 7 +- drivers/gpu/drm/nouveau/nv50_instmem.c | 2 + drivers/gpu/drm/radeon/atombios_crtc.c | 48 +++- drivers/gpu/drm/radeon/evergreen.c | 48 +++- drivers/gpu/drm/radeon/r600.c | 16 +- drivers/gpu/drm/radeon/radeon.h | 8 +- drivers/gpu/drm/radeon/radeon_asic.c | 18 -- drivers/gpu/drm/radeon/radeon_atombios.c | 27 ++ drivers/gpu/drm/radeon/radeon_clocks.c | 58 +---- drivers/gpu/drm/radeon/radeon_connectors.c | 78 +++--- drivers/gpu/drm/radeon/radeon_device.c | 28 +-- drivers/gpu/drm/radeon/radeon_i2c.c | 2 +- drivers/gpu/drm/radeon/radeon_mode.h | 1 - drivers/gpu/drm/radeon/rv770.c | 61 ++++- drivers/hwmon/hp_accel.c | 2 + drivers/infiniband/hw/cxgb3/cxio_hal.h | 2 +- drivers/infiniband/hw/nes/nes_cm.c | 18 +- drivers/infiniband/hw/nes/nes_hw.c | 14 +- drivers/infiniband/hw/nes/nes_hw.h | 1 + drivers/infiniband/hw/nes/nes_nic.c | 4 +- drivers/input/input.c | 11 +- drivers/input/mouse/bcm5974.c | 12 +- drivers/input/serio/i8042.c | 2 +- drivers/input/tablet/wacom_wac.c | 4 +- drivers/md/.gitignore | 4 - drivers/md/bitmap.c | 3 +- drivers/md/md.c | 25 +- drivers/md/md.h | 2 +- drivers/mmc/core/sdio.c | 5 +- drivers/mmc/host/at91_mci.c | 1 + drivers/mmc/host/imxmmc.c | 3 +- drivers/mmc/host/omap_hsmmc.c | 3 +- drivers/mmc/host/s3cmci.c | 2 +- drivers/mmc/host/tmio_mmc.c | 7 +- drivers/mmc/host/tmio_mmc.h | 13 +- drivers/mtd/ubi/Kconfig.debug | 2 +- drivers/mtd/ubi/cdev.c | 12 +- drivers/mtd/ubi/scan.c | 2 +- drivers/mtd/ubi/wl.c | 3 +- drivers/net/3c59x.c | 15 +- drivers/net/b44.c | 9 + drivers/net/benet/be.h | 1 + drivers/net/benet/be_cmds.c | 8 +- drivers/net/benet/be_cmds.h | 2 +- drivers/net/benet/be_ethtool.c | 1 + drivers/net/benet/be_hw.h | 7 +- drivers/net/benet/be_main.c | 47 ++-- drivers/net/bonding/bond_main.c | 56 +++-- drivers/net/ks8851.c | 39 ++-- drivers/net/niu.c | 16 +- drivers/net/pcmcia/pcnet_cs.c | 1 + drivers/net/pxa168_eth.c | 2 + drivers/net/stmmac/stmmac_main.c | 9 +- drivers/net/usb/ipheth.c | 7 +- drivers/net/via-velocity.c | 2 +- drivers/net/wireless/ath/ath5k/base.c | 4 + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 +- drivers/net/wireless/ath/ath9k/eeprom.h | 2 +- drivers/net/wireless/ath/regd.h | 1 - drivers/net/wireless/libertas/if_sdio.c | 2 +- drivers/net/wireless/p54/txrx.c | 2 +- drivers/oprofile/buffer_sync.c | 27 +- drivers/oprofile/cpu_buffer.c | 2 - drivers/pci/hotplug/acpi_pcihp.c | 6 +- drivers/pci/hotplug/pciehp.h | 16 +- drivers/pci/hotplug/pciehp_acpi.c | 4 +- drivers/pci/hotplug/pciehp_core.c | 4 +- drivers/pci/pci.h | 2 + drivers/pci/pcie/Makefile | 3 +- drivers/pci/pcie/aer/aerdrv.c | 9 +- drivers/pci/pcie/aer/aerdrv_acpi.c | 36 --- drivers/pci/pcie/aer/aerdrv_core.c | 14 +- drivers/pci/pcie/{pme/pcie_pme.c => pme.c} | 66 +---- drivers/pci/pcie/pme/Makefile | 8 - drivers/pci/pcie/pme/pcie_pme.h | 28 -- drivers/pci/pcie/pme/pcie_pme_acpi.c | 54 ---- drivers/pci/pcie/portdrv.h | 22 ++ drivers/pci/pcie/portdrv_acpi.c | 77 +++++ drivers/pci/pcie/portdrv_core.c | 53 ++++- drivers/pci/pcie/portdrv_pci.c | 38 ++- drivers/pci/slot.c | 2 +- drivers/rtc/rtc-bfin.c | 15 +- drivers/rtc/rtc-m41t80.c | 2 +- drivers/rtc/rtc-pl031.c | 2 +- drivers/s390/char/tape_block.c | 3 +- drivers/serial/bfin_sport_uart.c | 2 +- drivers/staging/comedi/drivers/das08_cs.c | 1 - drivers/staging/hv/netvsc_drv.c | 3 + drivers/staging/hv/ring_buffer.c | 3 +- drivers/staging/hv/storvsc_api.h | 4 +- drivers/staging/hv/storvsc_drv.c | 11 +- drivers/staging/octeon/Kconfig | 2 +- drivers/staging/rt2860/usb_main_dev.c | 41 +++- drivers/staging/spectra/Kconfig | 1 + drivers/staging/spectra/ffsport.c | 1 + drivers/staging/wlan-ng/cfg80211.c | 3 + drivers/staging/zram/zram_drv.c | 1 + drivers/usb/atm/cxacru.c | 24 ++- drivers/usb/class/cdc-acm.c | 23 ++- drivers/usb/core/message.c | 22 +- drivers/usb/gadget/rndis.c | 12 +- drivers/usb/gadget/rndis.h | 2 +- drivers/usb/gadget/s3c-hsotg.c | 2 - drivers/usb/host/ehci-ppc-of.c | 12 +- drivers/usb/serial/cp210x.c | 11 +- drivers/usb/serial/ftdi_sio.c | 8 + drivers/usb/serial/ftdi_sio_ids.h | 12 + drivers/usb/serial/mos7840.c | 32 ++- drivers/usb/serial/option.c | 119 +++++--- drivers/usb/serial/ssu100.c | 2 +- drivers/vhost/vhost.c | 85 ++++-- drivers/video/pxa168fb.c | 6 +- fs/9p/fid.c | 3 +- fs/binfmt_misc.c | 2 +- fs/bio-integrity.c | 4 +- fs/direct-io.c | 4 +- fs/exec.c | 14 + fs/fcntl.c | 10 +- fs/fs-writeback.c | 2 +- fs/fuse/dev.c | 42 ++- fs/fuse/file.c | 8 +- fs/minix/namei.c | 2 +- fs/namespace.c | 23 ++- fs/nfsd/nfs4state.c | 2 +- fs/nilfs2/the_nilfs.c | 1 + fs/ocfs2/alloc.c | 2 +- fs/ocfs2/blockcheck.c | 4 +- fs/ocfs2/file.c | 15 +- fs/ocfs2/inode.c | 6 +- fs/ocfs2/mmap.c | 8 +- fs/ocfs2/namei.c | 302 +++++++++++++++----- fs/ocfs2/refcounttree.c | 5 +- fs/ocfs2/suballoc.c | 219 +++++++++++++-- fs/ocfs2/suballoc.h | 21 ++ fs/proc/page.c | 2 +- fs/proc/task_mmu.c | 3 +- fs/sysfs/file.c | 2 +- fs/xfs/linux-2.6/xfs_buf.c | 11 +- fs/xfs/linux-2.6/xfs_buf.h | 1 - fs/xfs/linux-2.6/xfs_ioctl.c | 9 + fs/xfs/linux-2.6/xfs_iops.c | 2 +- fs/xfs/xfs_bmap.c | 14 +- fs/xfs/xfs_fs.h | 4 +- fs/xfs/xfs_vnodeops.c | 13 +- include/acpi/acpi_bus.h | 3 - include/asm-generic/gpio.h | 14 +- include/asm-generic/percpu.h | 15 +- include/linux/acpi.h | 4 +- include/linux/cgroup.h | 12 +- include/linux/elevator.h | 1 + include/linux/i2c/sx150x.h | 4 + include/linux/intel-gtt.h | 20 ++ include/linux/io-mapping.h | 24 +- include/linux/kfifo.h | 58 ++-- include/linux/ksm.h | 20 +- include/linux/lglock.h | 4 +- include/linux/libata.h | 4 +- include/linux/mm.h | 6 + include/linux/mmc/sdio.h | 2 + include/linux/mmzone.h | 13 + include/linux/mutex.h | 8 + include/linux/pci.h | 3 + include/linux/pci_ids.h | 2 + include/linux/percpu.h | 2 +- include/linux/semaphore.h | 3 + include/linux/serial.h | 3 +- include/linux/serial_core.h | 3 +- include/linux/swap.h | 11 +- include/linux/vmstat.h | 22 ++ include/linux/workqueue.h | 18 +- include/net/cls_cgroup.h | 10 +- include/net/ip_vs.h | 3 + include/net/sock.h | 1 + include/net/udp.h | 1 + kernel/cgroup.c | 13 +- kernel/debug/kdb/kdb_bp.c | 2 - kernel/gcov/fs.c | 244 ++++++++++++---- kernel/groups.c | 5 +- kernel/hrtimer.c | 3 +- kernel/mutex.c | 23 +- kernel/perf_event.c | 32 ++- kernel/pm_qos_params.c | 4 +- kernel/power/hibernate.c | 1 - kernel/power/snapshot.c | 86 +++++-- kernel/power/swap.c | 6 +- kernel/sched.c | 6 + kernel/sched_fair.c | 5 +- kernel/sys.c | 2 + kernel/sysctl.c | 5 +- kernel/trace/ftrace.c | 19 +- kernel/trace/ring_buffer.c | 2 - kernel/trace/trace_event_perf.c | 3 + kernel/trace/trace_kprobe.c | 43 ++-- kernel/watchdog.c | 17 +- kernel/workqueue.c | 53 +++- lib/raid6/.gitignore | 4 + lib/scatterlist.c | 14 +- mm/Kconfig | 2 +- mm/backing-dev.c | 7 +- mm/bounce.c | 2 +- mm/compaction.c | 7 +- mm/ksm.c | 3 - mm/memory.c | 39 +++- mm/memory_hotplug.c | 16 +- mm/mlock.c | 6 - mm/mmzone.c | 21 ++ mm/page_alloc.c | 33 ++- mm/percpu.c | 6 +- mm/percpu_up.c | 4 +- mm/swapfile.c | 129 +++------ mm/vmstat.c | 16 +- net/bridge/br_netfilter.c | 6 +- net/core/dev.c | 16 +- net/core/gen_estimator.c | 12 +- net/core/skbuff.c | 6 +- net/ipv4/Kconfig | 2 +- net/ipv4/datagram.c | 5 +- net/ipv4/fib_frontend.c | 15 +- net/ipv4/fib_trie.c | 8 +- net/ipv4/route.c | 7 +- net/ipv4/udp.c | 44 +++ net/ipv6/datagram.c | 7 +- net/ipv6/netfilter/nf_conntrack_reasm.c | 80 +----- net/ipv6/reassembly.c | 71 +---- net/ipv6/udp.c | 10 + net/irda/af_irda.c | 4 +- net/irda/irlan/irlan_common.c | 2 +- net/mac80211/main.c | 6 + net/netfilter/ipvs/ip_vs_core.c | 1 + net/netfilter/ipvs/ip_vs_ftp.c | 9 +- net/netfilter/ipvs/ip_vs_xmit.c | 18 +- net/netlink/af_netlink.c | 22 ++ net/sched/act_police.c | 21 +- net/sched/sch_hfsc.c | 2 +- net/sctp/sm_statefuns.c | 46 ++-- net/unix/af_unix.c | 15 +- net/wireless/core.c | 21 +- net/wireless/wext-compat.c | 3 + net/wireless/wext-core.c | 16 + net/xfrm/xfrm_user.c | 2 +- scripts/basic/docproc.c | 129 +++++++++- scripts/kernel-doc | 54 ++++- security/apparmor/include/resource.h | 4 +- security/apparmor/lib.c | 2 +- security/apparmor/lsm.c | 2 +- security/apparmor/path.c | 38 +-- security/apparmor/policy.c | 6 +- security/apparmor/resource.c | 20 +- security/integrity/ima/ima.h | 1 + security/integrity/ima/ima_iint.c | 4 +- security/integrity/ima/ima_main.c | 8 +- security/keys/keyctl.c | 6 +- sound/core/rawmidi.c | 2 + sound/core/seq/oss/seq_oss_init.c | 9 +- sound/isa/msnd/msnd_pinnacle.c | 8 +- sound/pci/hda/hda_codec.c | 2 +- sound/pci/hda/patch_cirrus.c | 50 ++++ sound/pci/hda/patch_conexant.c | 58 ++++ sound/pci/hda/patch_realtek.c | 1 + sound/pci/oxygen/oxygen.h | 1 + sound/pci/oxygen/oxygen_lib.c | 21 ++- sound/pci/oxygen/virtuoso.c | 1 + sound/pci/oxygen/xonar_wm87x6.c | 22 ++- sound/usb/card.c | 19 +- sound/usb/clock.c | 3 +- sound/usb/endpoint.c | 11 +- sound/usb/format.c | 22 +- sound/usb/mixer.c | 10 +- sound/usb/pcm.c | 3 +- tools/perf/util/callchain.h | 1 + tools/perf/util/probe-event.c | 1 + tools/perf/util/probe-finder.c | 42 ++- tools/perf/util/symbol.c | 7 + tools/perf/util/symbol.h | 3 +- virt/kvm/kvm_main.c | 5 +- 414 files changed, 4777 insertions(+), 2391 deletions(-) create mode 100644 Documentation/block/cfq-iosched.txt create mode 100644 arch/arm/mach-shmobile/pm_runtime.c delete mode 100644 drivers/md/.gitignore rename drivers/pci/pcie/{pme/pcie_pme.c => pme.c} (83%) delete mode 100644 drivers/pci/pcie/pme/Makefile delete mode 100644 drivers/pci/pcie/pme/pcie_pme.h delete mode 100644 drivers/pci/pcie/pme/pcie_pme_acpi.c create mode 100644 drivers/pci/pcie/portdrv_acpi.c create mode 100644 include/linux/intel-gtt.h create mode 100644 lib/raid6/.gitignore ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-next block-for-next ## Removing Documentation/block/barrier.txt Auto-merging Documentation/lguest/lguest.c Removing block/blk-barrier.c Auto-merging drivers/block/cciss.c Auto-merging drivers/block/xen-blkfront.c Auto-merging drivers/md/md.c Auto-merging drivers/md/md.h Auto-merging drivers/scsi/sd.c Auto-merging fs/nilfs2/the_nilfs.c Auto-merging fs/xfs/linux-2.6/xfs_buf.c Auto-merging fs/xfs/linux-2.6/xfs_buf.h Auto-merging fs/xfs/xfs_log.c Auto-merging mm/swapfile.c Merge made by recursive. Documentation/block/00-INDEX | 4 +- Documentation/block/barrier.txt | 261 ------- Documentation/block/writeback_cache_control.txt | 86 +++ Documentation/lguest/lguest.c | 29 +- block/Makefile | 2 +- block/blk-barrier.c | 350 --------- block/blk-core.c | 72 +- block/blk-flush.c | 265 +++++++ block/blk-lib.c | 18 +- block/blk-settings.c | 20 + block/blk.h | 8 +- block/elevator.c | 79 +-- drivers/block/brd.c | 1 - drivers/block/cciss.c | 860 +++++++++++------------ drivers/block/loop.c | 121 +++- drivers/block/osdblk.c | 5 +- drivers/block/pktcdvd.c | 1 - drivers/block/ps3disk.c | 2 +- drivers/block/virtio_blk.c | 37 +- drivers/block/xen-blkfront.c | 47 +- drivers/ide/ide-disk.c | 13 +- drivers/ide/ide-io.c | 13 - drivers/md/dm-crypt.c | 2 +- drivers/md/dm-io.c | 20 +- drivers/md/dm-log.c | 2 +- drivers/md/dm-raid1.c | 8 +- drivers/md/dm-region-hash.c | 16 +- drivers/md/dm-snap-persistent.c | 2 +- drivers/md/dm-snap.c | 6 +- drivers/md/dm-stripe.c | 2 +- drivers/md/dm.c | 398 +++--------- drivers/md/linear.c | 4 +- drivers/md/md.c | 117 +--- drivers/md/md.h | 23 +- drivers/md/multipath.c | 4 +- drivers/md/raid0.c | 4 +- drivers/md/raid1.c | 176 ++--- drivers/md/raid1.h | 2 - drivers/md/raid10.c | 7 +- drivers/md/raid5.c | 43 +- drivers/md/raid5.h | 1 + drivers/mmc/card/queue.c | 1 - drivers/s390/block/dasd.c | 1 - drivers/scsi/aic7xxx_old.c | 21 +- drivers/scsi/libsas/sas_scsi_host.c | 13 +- drivers/scsi/sd.c | 18 +- fs/btrfs/disk-io.c | 19 +- fs/btrfs/extent-tree.c | 2 +- fs/btrfs/volumes.c | 4 - fs/btrfs/volumes.h | 1 - fs/buffer.c | 7 +- fs/ext4/mballoc.c | 3 +- fs/fat/fatent.c | 4 +- fs/fat/misc.c | 5 +- fs/gfs2/log.c | 19 +- fs/gfs2/rgrp.c | 5 +- fs/jbd/commit.c | 30 +- fs/jbd2/commit.c | 72 +-- fs/nilfs2/super.c | 10 +- fs/nilfs2/the_nilfs.c | 7 +- fs/reiserfs/journal.c | 106 +--- fs/xfs/linux-2.6/xfs_buf.c | 16 +- fs/xfs/linux-2.6/xfs_buf.h | 11 +- fs/xfs/linux-2.6/xfs_trace.h | 1 - fs/xfs/xfs_log.c | 13 - include/linux/blk_types.h | 5 +- include/linux/blkdev.h | 85 +-- include/linux/buffer_head.h | 2 - include/linux/fs.h | 28 +- include/scsi/scsi_tcq.h | 6 +- 70 files changed, 1335 insertions(+), 2311 deletions(-) delete mode 100644 Documentation/block/barrier.txt create mode 100644 Documentation/block/writeback_cache_control.txt delete mode 100644 block/blk-barrier.c create mode 100644 block/blk-flush.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 ## Merge made by recursive. Documentation/ABI/testing/sysfs-ata | 99 +++++ drivers/ata/Makefile | 2 +- drivers/ata/libata-core.c | 62 +++- drivers/ata/libata-eh.c | 35 +- drivers/ata/libata-pmp.c | 18 +- drivers/ata/libata-scsi.c | 117 +++--- drivers/ata/libata-sff.c | 2 +- drivers/ata/libata-transport.c | 774 +++++++++++++++++++++++++++++++++++ drivers/ata/libata-transport.h | 18 + drivers/ata/libata.h | 7 + drivers/ata/sata_fsl.c | 8 +- drivers/ata/sata_mv.c | 25 +- drivers/ata/sata_nv.c | 57 +-- include/linux/ata.h | 46 ++- include/linux/libata.h | 5 + 15 files changed, 1132 insertions(+), 143 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-ata create mode 100644 drivers/ata/libata-transport.c create mode 100644 drivers/ata/libata-transport.h ## # 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-change-clone-bi_private-pointer-during-cleanup.patch dm-delay-unplug-queue.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-iostats.patch dm-kcopyd-add-async-destruction-option.patch dm-loop.patch dm-memcache.patch dm-mpath-add-alua.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-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 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-4-dm-replicator-ringbuffer-replication-log-handler.patch v6-4-4-dm-replicator-blockdev-site-link-handler.patch sent 1087983 bytes received 1155 bytes 726092.00 bytes/sec total size is 1082222 speedup is 0.99 Using base v2.6.36-rc1 ## # 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.36-rc3-stor5. Already up-to-date. ## # check ## Differences exist, continuing ## # label ## [2.6.36-rc3-stor5 1f663f7] 2.6.36-rc3-stor5 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- ##