summaryrefslogtreecommitdiff
path: root/Next/merge.log
diff options
context:
space:
mode:
Diffstat (limited to 'Next/merge.log')
-rw-r--r--Next/merge.log2606
1 files changed, 2606 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log
new file mode 100644
index 000000000000..3d274b7e994e
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,2606 @@
+$ git checkout master
+Already on "master"
+$ git reset --hard stable
+HEAD is now at f6f286f fix WARN() for PPC
+Merging origin/master
+$ git merge origin/master
+Updating f6f286f..2515ddc
+Fast forward
+ Documentation/DocBook/kernel-hacking.tmpl | 2 +-
+ arch/arm/mach-iop13xx/include/mach/time.h | 4 ++--
+ arch/arm/mach-pxa/include/mach/zylonite.h | 4 ++--
+ arch/powerpc/include/asm/ptrace.h | 2 +-
+ drivers/gpu/drm/Kconfig | 2 +-
+ drivers/gpu/drm/i915/i915_gem.c | 5 +++--
+ drivers/net/usb/pegasus.c | 4 ++--
+ fs/binfmt_elf_fdpic.c | 19 +++++++------------
+ mm/memory.c | 2 --
+ mm/tiny-shmem.c | 1 +
+ mm/vmalloc.c | 1 -
+ 11 files changed, 20 insertions(+), 26 deletions(-)
+Merging powerpc-merge/merge
+$ git merge powerpc-merge/merge
+Already up-to-date.
+Merging scsi-rc-fixes/master
+$ git merge scsi-rc-fixes/master
+Already up-to-date.
+Merging net-current/master
+$ git merge net-current/master
+Updating 2515ddc..75e3d8d
+Fast forward
+ net/ipv4/tcp_output.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+Merging sparc-current/master
+$ git merge sparc-current/master
+Already up-to-date.
+Merging sound-current/for-linus
+$ git merge sound-current/for-linus
+Already up-to-date.
+Merging arm-current/master
+$ git merge arm-current/master
+Auto-merged arch/arm/Kconfig
+Merge made by recursive.
+ arch/arm/Kconfig | 2 +-
+ arch/arm/common/Kconfig | 2 +-
+ arch/arm/common/sa1111.c | 2 ++
+ arch/arm/configs/trizeps4_defconfig | 1 +
+ arch/arm/mach-ixp4xx/Kconfig | 5 -----
+ arch/arm/mach-pxa/Kconfig | 1 -
+ arch/arm/mach-pxa/include/mach/irqs.h | 5 ++++-
+ arch/arm/mach-pxa/include/mach/spitz.h | 2 +-
+ arch/arm/mach-pxa/pwm.c | 2 +-
+ arch/arm/mach-pxa/trizeps4.c | 2 +-
+ arch/arm/mach-s3c2443/clock.c | 3 +--
+ arch/arm/mm/cache-v4.S | 6 +++---
+ arch/arm/plat-s3c24xx/pwm-clock.c | 2 +-
+ arch/arm/plat-s3c24xx/pwm.c | 12 ++++++------
+ drivers/pcmcia/Makefile | 2 +-
+ drivers/serial/Kconfig | 2 +-
+ 16 files changed, 25 insertions(+), 26 deletions(-)
+Merging pci-current/for-linus
+$ git merge pci-current/for-linus
+Already up-to-date.
+Merging wireless-current/master
+$ git merge wireless-current/master
+Already up-to-date.
+Merging kbuild-current/master
+$ git merge kbuild-current/master
+Already up-to-date.
+Merging quilt/driver-core.current
+$ git merge quilt/driver-core.current
+Merge made by recursive.
+ Documentation/sysctl/kernel.txt | 24 +++++++++++++++++-------
+ drivers/base/sys.c | 10 ++++++----
+ 2 files changed, 23 insertions(+), 11 deletions(-)
+Merging quilt/usb.current
+$ git merge quilt/usb.current
+Merge made by recursive.
+ drivers/usb/Kconfig | 3 +-
+ drivers/usb/atm/speedtch.c | 12 ++
+ drivers/usb/class/cdc-wdm.c | 2 +
+ drivers/usb/gadget/config.c | 2 +-
+ drivers/usb/gadget/pxa27x_udc.c | 2 +-
+ drivers/usb/gadget/s3c2410_udc.c | 7 +-
+ drivers/usb/host/Kconfig | 1 -
+ drivers/usb/host/ohci-hcd.c | 21 ++
+ drivers/usb/host/ohci-tmio.c | 376 ++++++++++++++++++++++++++++++++++++
+ drivers/usb/misc/usbtest.c | 3 +-
+ drivers/usb/serial/option.c | 96 +++++++++
+ drivers/usb/storage/initializers.c | 3 +-
+ drivers/usb/storage/unusual_devs.h | 291 ++++++++++++++++++++++++++--
+ 13 files changed, 787 insertions(+), 32 deletions(-)
+ create mode 100644 drivers/usb/host/ohci-tmio.c
+Merging cpufreq-current/fixes
+$ git merge cpufreq-current/fixes
+Already up-to-date.
+Merging input-current/for-linus
+$ git merge input-current/for-linus
+Merge made by recursive.
+ Documentation/input/elantech.txt | 405 ++++++++++++++++++++
+ drivers/input/mouse/Kconfig | 25 ++-
+ drivers/input/mouse/Makefile | 1 +
+ drivers/input/mouse/elantech.c | 674 +++++++++++++++++++++++++++++++++
+ drivers/input/mouse/elantech.h | 124 ++++++
+ drivers/input/mouse/psmouse-base.c | 23 ++
+ drivers/input/mouse/psmouse.h | 1 +
+ drivers/input/serio/i8042-x86ia64io.h | 8 +
+ 8 files changed, 1259 insertions(+), 2 deletions(-)
+ create mode 100644 Documentation/input/elantech.txt
+ create mode 100644 drivers/input/mouse/elantech.c
+ create mode 100644 drivers/input/mouse/elantech.h
+Merging md-current/for-2.6.26
+$ git merge md-current/for-2.6.26
+Already up-to-date.
+Merging dwmw2/master
+$ git merge dwmw2/master
+Already up-to-date.
+Merging arm/devel
+$ git merge arm/devel
+Merge made by recursive.
+ arch/arm/common/sa1111.c | 2 +-
+ arch/arm/mach-clps711x/include/mach/memory.h | 2 +
+ arch/arm/mach-kirkwood/common.c | 35 +++++++++++++++++++++++
+ arch/arm/mach-kirkwood/common.h | 2 +
+ arch/arm/mach-kirkwood/rd88f6281-setup.c | 11 +++++++
+ arch/arm/mach-mv78xx0/db78x00-bp-setup.c | 5 +++
+ arch/arm/mach-orion5x/common.c | 38 +++++++++++++++++++++++++-
+ arch/arm/mach-orion5x/common.h | 2 +
+ arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 11 +++++++
+ arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 11 +++++++
+ arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 11 +++++++
+ arch/arm/mach-orion5x/wrt350n-v2-setup.c | 11 +++++++
+ 12 files changed, 139 insertions(+), 2 deletions(-)
+Merging avr32/avr32-arch
+$ git merge avr32/avr32-arch
+Auto-merged arch/avr32/Kconfig
+Merge made by recursive.
+ arch/avr32/Kconfig | 12 +-
+ arch/avr32/Makefile | 2 +
+ arch/avr32/boards/atngw100/Kconfig | 35 +
+ arch/avr32/boards/atngw100/Makefile | 3 +-
+ arch/avr32/boards/atngw100/evklcd10x.c | 155 +++
+ arch/avr32/boards/atngw100/setup.c | 5 +
+ arch/avr32/boards/favr-32/Kconfig | 22 +
+ arch/avr32/boards/favr-32/Makefile | 1 +
+ arch/avr32/boards/favr-32/flash.c | 98 ++
+ arch/avr32/boards/favr-32/setup.c | 352 +++++++
+ arch/avr32/boards/mimc200/Makefile | 1 +
+ arch/avr32/boards/mimc200/flash.c | 143 +++
+ arch/avr32/boards/mimc200/fram.c | 80 ++
+ arch/avr32/boards/mimc200/setup.c | 237 +++++
+ arch/avr32/configs/atngw100_evklcd100_defconfig | 1264 +++++++++++++++++++++++
+ arch/avr32/configs/atngw100_evklcd101_defconfig | 1264 +++++++++++++++++++++++
+ arch/avr32/configs/favr-32_defconfig | 1235 ++++++++++++++++++++++
+ arch/avr32/configs/mimc200_defconfig | 1109 ++++++++++++++++++++
+ arch/avr32/mach-at32ap/at32ap700x.c | 6 +-
+ 19 files changed, 6020 insertions(+), 4 deletions(-)
+ create mode 100644 arch/avr32/boards/atngw100/Kconfig
+ create mode 100644 arch/avr32/boards/atngw100/evklcd10x.c
+ create mode 100644 arch/avr32/boards/favr-32/Kconfig
+ create mode 100644 arch/avr32/boards/favr-32/Makefile
+ create mode 100644 arch/avr32/boards/favr-32/flash.c
+ create mode 100644 arch/avr32/boards/favr-32/setup.c
+ create mode 100644 arch/avr32/boards/mimc200/Makefile
+ create mode 100644 arch/avr32/boards/mimc200/flash.c
+ create mode 100644 arch/avr32/boards/mimc200/fram.c
+ create mode 100644 arch/avr32/boards/mimc200/setup.c
+ create mode 100644 arch/avr32/configs/atngw100_evklcd100_defconfig
+ create mode 100644 arch/avr32/configs/atngw100_evklcd101_defconfig
+ create mode 100644 arch/avr32/configs/favr-32_defconfig
+ create mode 100644 arch/avr32/configs/mimc200_defconfig
+Merging blackfin/for-linus
+$ git merge blackfin/for-linus
+Already up-to-date.
+Merging cris/for-next
+$ git merge cris/for-next
+Already up-to-date.
+Merging ia64/test
+$ git merge ia64/test
+Auto-merged arch/ia64/Kconfig
+Auto-merged arch/ia64/include/asm/pci.h
+Auto-merged arch/ia64/kernel/setup.c
+Merge made by recursive.
+ Documentation/ia64/xen.txt | 183 ++++++++++++
+ arch/ia64/Kconfig | 50 ++++
+ arch/ia64/Makefile | 3 +
+ arch/ia64/configs/generic_defconfig | 2 +
+ arch/ia64/configs/tiger_defconfig | 2 +
+ arch/ia64/dig/Makefile | 5 +
+ arch/ia64/dig/dig_vtd_iommu.c | 59 ++++
+ arch/ia64/dig/machvec_vtd.c | 3 +
+ arch/ia64/ia32/ia32_entry.S | 11 +-
+ arch/ia64/ia32/sys_ia32.c | 106 +-------
+ arch/ia64/include/asm/break.h | 9 +
+ arch/ia64/include/asm/cacheflush.h | 2 +
+ arch/ia64/include/asm/device.h | 3 +
+ arch/ia64/include/asm/dma-mapping.h | 50 ++++
+ arch/ia64/include/asm/iommu.h | 16 +
+ arch/ia64/include/asm/kregs.h | 2 +-
+ arch/ia64/include/asm/machvec.h | 4 +
+ arch/ia64/include/asm/machvec_dig_vtd.h | 38 +++
+ arch/ia64/include/asm/machvec_init.h | 1 +
+ arch/ia64/include/asm/machvec_xen.h | 22 ++
+ arch/ia64/include/asm/meminit.h | 3 +-
+ arch/ia64/include/asm/native/inst.h | 10 +-
+ arch/ia64/include/asm/native/pvchk_inst.h | 263 +++++++++++++++++
+ arch/ia64/include/asm/paravirt.h | 4 +-
+ arch/ia64/include/asm/pci.h | 3 +
+ arch/ia64/include/asm/ptrace.h | 8 +
+ arch/ia64/include/asm/pvclock-abi.h | 48 +++
+ arch/ia64/include/asm/swiotlb.h | 56 ++++
+ arch/ia64/include/asm/sync_bitops.h | 51 ++++
+ arch/ia64/include/asm/syscall.h | 163 ++++++++++
+ arch/ia64/include/asm/thread_info.h | 3 -
+ arch/ia64/include/asm/timex.h | 2 +
+ arch/ia64/include/asm/unistd.h | 1 +
+ arch/ia64/include/asm/xen/events.h | 50 ++++
+ arch/ia64/include/asm/xen/grant_table.h | 29 ++
+ arch/ia64/include/asm/xen/hypercall.h | 265 +++++++++++++++++
+ arch/ia64/include/asm/xen/hypervisor.h | 89 ++++++
+ arch/ia64/include/asm/xen/inst.h | 458 +++++++++++++++++++++++++++++
+ arch/ia64/include/asm/xen/interface.h | 346 ++++++++++++++++++++++
+ arch/ia64/include/asm/xen/irq.h | 44 +++
+ arch/ia64/include/asm/xen/minstate.h | 134 +++++++++
+ arch/ia64/include/asm/xen/page.h | 65 ++++
+ arch/ia64/include/asm/xen/privop.h | 129 ++++++++
+ arch/ia64/include/asm/xen/xcom_hcall.h | 51 ++++
+ arch/ia64/include/asm/xen/xencomm.h | 42 +++
+ arch/ia64/kernel/Makefile | 22 ++
+ arch/ia64/kernel/acpi.c | 22 ++
+ arch/ia64/kernel/asm-offsets.c | 31 ++
+ arch/ia64/kernel/entry.S | 5 +
+ arch/ia64/kernel/ivt.S | 6 +-
+ arch/ia64/kernel/msi_ia64.c | 80 +++++
+ arch/ia64/kernel/nr-irqs.c | 1 +
+ arch/ia64/kernel/paravirt.c | 2 +-
+ arch/ia64/kernel/paravirt_inst.h | 4 +-
+ arch/ia64/kernel/pci-dma.c | 129 ++++++++
+ arch/ia64/kernel/pci-swiotlb.c | 46 +++
+ arch/ia64/kernel/perfmon.c | 7 +-
+ arch/ia64/kernel/process.c | 22 +-
+ arch/ia64/kernel/ptrace.c | 112 +++++--
+ arch/ia64/kernel/setup.c | 42 ++-
+ arch/ia64/kernel/signal.c | 8 +
+ arch/ia64/lib/flush.S | 55 ++++
+ arch/ia64/mm/tlb.c | 8 +-
+ arch/ia64/scripts/pvcheck.sed | 32 ++
+ arch/ia64/xen/Kconfig | 26 ++
+ arch/ia64/xen/Makefile | 22 ++
+ arch/ia64/xen/grant-table.c | 155 ++++++++++
+ arch/ia64/xen/hypercall.S | 91 ++++++
+ arch/ia64/xen/hypervisor.c | 96 ++++++
+ arch/ia64/xen/irq_xen.c | 435 +++++++++++++++++++++++++++
+ arch/ia64/xen/irq_xen.h | 34 +++
+ arch/ia64/xen/machvec.c | 4 +
+ arch/ia64/xen/suspend.c | 64 ++++
+ arch/ia64/xen/time.c | 213 +++++++++++++
+ arch/ia64/xen/time.h | 24 ++
+ arch/ia64/xen/xcom_hcall.c | 441 +++++++++++++++++++++++++++
+ arch/ia64/xen/xen_pv_ops.c | 364 +++++++++++++++++++++++
+ arch/ia64/xen/xencomm.c | 105 +++++++
+ arch/ia64/xen/xenivt.S | 52 ++++
+ arch/ia64/xen/xensetup.S | 83 ++++++
+ 80 files changed, 5546 insertions(+), 185 deletions(-)
+ create mode 100644 Documentation/ia64/xen.txt
+ create mode 100644 arch/ia64/dig/dig_vtd_iommu.c
+ create mode 100644 arch/ia64/dig/machvec_vtd.c
+ create mode 100644 arch/ia64/include/asm/iommu.h
+ create mode 100644 arch/ia64/include/asm/machvec_dig_vtd.h
+ create mode 100644 arch/ia64/include/asm/machvec_xen.h
+ create mode 100644 arch/ia64/include/asm/native/pvchk_inst.h
+ create mode 100644 arch/ia64/include/asm/pvclock-abi.h
+ create mode 100644 arch/ia64/include/asm/swiotlb.h
+ create mode 100644 arch/ia64/include/asm/sync_bitops.h
+ create mode 100644 arch/ia64/include/asm/syscall.h
+ create mode 100644 arch/ia64/include/asm/xen/events.h
+ create mode 100644 arch/ia64/include/asm/xen/grant_table.h
+ create mode 100644 arch/ia64/include/asm/xen/hypercall.h
+ create mode 100644 arch/ia64/include/asm/xen/hypervisor.h
+ create mode 100644 arch/ia64/include/asm/xen/inst.h
+ create mode 100644 arch/ia64/include/asm/xen/interface.h
+ create mode 100644 arch/ia64/include/asm/xen/irq.h
+ create mode 100644 arch/ia64/include/asm/xen/minstate.h
+ create mode 100644 arch/ia64/include/asm/xen/page.h
+ create mode 100644 arch/ia64/include/asm/xen/privop.h
+ create mode 100644 arch/ia64/include/asm/xen/xcom_hcall.h
+ create mode 100644 arch/ia64/include/asm/xen/xencomm.h
+ create mode 100644 arch/ia64/kernel/pci-dma.c
+ create mode 100644 arch/ia64/kernel/pci-swiotlb.c
+ create mode 100644 arch/ia64/scripts/pvcheck.sed
+ create mode 100644 arch/ia64/xen/Kconfig
+ create mode 100644 arch/ia64/xen/Makefile
+ create mode 100644 arch/ia64/xen/grant-table.c
+ create mode 100644 arch/ia64/xen/hypercall.S
+ create mode 100644 arch/ia64/xen/hypervisor.c
+ create mode 100644 arch/ia64/xen/irq_xen.c
+ create mode 100644 arch/ia64/xen/irq_xen.h
+ create mode 100644 arch/ia64/xen/machvec.c
+ create mode 100644 arch/ia64/xen/suspend.c
+ create mode 100644 arch/ia64/xen/time.c
+ create mode 100644 arch/ia64/xen/time.h
+ create mode 100644 arch/ia64/xen/xcom_hcall.c
+ create mode 100644 arch/ia64/xen/xen_pv_ops.c
+ create mode 100644 arch/ia64/xen/xencomm.c
+ create mode 100644 arch/ia64/xen/xenivt.S
+ create mode 100644 arch/ia64/xen/xensetup.S
+Merging quilt/m68k
+$ git merge quilt/m68k
+Merge made by recursive.
+ drivers/char/amiserial.c | 6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+Merging m68knommu/for-next
+$ git merge m68knommu/for-next
+Merge made by recursive.
+ arch/m68knommu/platform/coldfire/entry.S | 15 ++-------------
+ 1 files changed, 2 insertions(+), 13 deletions(-)
+Merging mips/mips-for-linux-next
+$ git merge mips/mips-for-linux-next
+Already up-to-date.
+Merging parisc/master
+$ git merge parisc/master
+Already up-to-date.
+Merging powerpc/next
+$ git merge powerpc/next
+Merge made by recursive.
+ Documentation/powerpc/booting-without-of.txt | 2 +
+ Documentation/powerpc/dts-bindings/fsl/board.txt | 4 +-
+ arch/powerpc/Kconfig | 3 -
+ arch/powerpc/boot/Makefile | 7 +-
+ arch/powerpc/boot/addnote.c | 41 +-
+ arch/powerpc/boot/cuboot-52xx.c | 4 +
+ arch/powerpc/boot/cuboot-acadia.c | 174 ++++
+ arch/powerpc/boot/dts/acadia.dts | 224 ++++++
+ arch/powerpc/boot/dts/hcu4.dts | 168 ++++
+ arch/powerpc/boot/dts/mpc8315erdb.dts | 8 +
+ arch/powerpc/boot/dts/mpc832x_mds.dts | 2 +-
+ arch/powerpc/boot/dts/mpc8349emitx.dts | 16 +
+ arch/powerpc/boot/dts/mpc8349emitxgp.dts | 8 +
+ arch/powerpc/boot/dts/mpc834x_mds.dts | 2 +-
+ arch/powerpc/boot/dts/mpc836x_mds.dts | 2 +-
+ arch/powerpc/boot/dts/mpc8377_rdb.dts | 8 +
+ arch/powerpc/boot/dts/mpc8378_rdb.dts | 8 +
+ arch/powerpc/boot/dts/mpc8379_rdb.dts | 8 +
+ arch/powerpc/boot/dts/mpc8536ds.dts | 12 +-
+ arch/powerpc/boot/dts/mpc8568mds.dts | 2 +-
+ arch/powerpc/boot/dts/mpc8572ds.dts | 27 +-
+ arch/powerpc/boot/libfdt-wrapper.c | 16 +-
+ arch/powerpc/boot/main.c | 14 +-
+ arch/powerpc/boot/string.S | 4 +-
+ arch/powerpc/boot/wrapper | 5 +-
+ arch/powerpc/configs/40x/acadia_defconfig | 921 +++++++++++++++++++++
+ arch/powerpc/configs/40x/hcu4_defconfig | 929 ++++++++++++++++++++++
+ arch/powerpc/include/asm/page.h | 1 +
+ arch/powerpc/kernel/cputable.c | 13 +
+ arch/powerpc/kernel/machine_kexec_64.c | 13 +
+ arch/powerpc/kernel/prom_init.c | 61 --
+ arch/powerpc/kernel/prom_init_check.sh | 2 +-
+ arch/powerpc/kernel/udbg_16550.c | 2 +-
+ arch/powerpc/mm/numa.c | 21 +-
+ arch/powerpc/oprofile/cell/pr_util.h | 13 +
+ arch/powerpc/oprofile/cell/spu_profiler.c | 4 +-
+ arch/powerpc/oprofile/cell/spu_task_sync.c | 236 +++++-
+ arch/powerpc/platforms/40x/Kconfig | 38 +
+ arch/powerpc/platforms/40x/Makefile | 2 +
+ arch/powerpc/platforms/40x/hcu4.c | 61 ++
+ arch/powerpc/platforms/40x/ppc40x_simple.c | 80 ++
+ arch/powerpc/platforms/44x/Kconfig | 8 +
+ arch/powerpc/platforms/52xx/mpc52xx_common.c | 7 +-
+ arch/powerpc/platforms/cell/smp.c | 10 +-
+ arch/powerpc/platforms/cell/spufs/file.c | 155 +++--
+ arch/powerpc/platforms/cell/spufs/run.c | 3 +-
+ arch/powerpc/platforms/cell/spufs/sched.c | 24 +-
+ arch/powerpc/platforms/cell/spufs/spufs.h | 1 -
+ arch/powerpc/platforms/cell/spufs/sputrace.c | 37 +-
+ arch/powerpc/platforms/pseries/hotplug-memory.c | 6 +
+ arch/powerpc/platforms/pseries/smp.c | 13 +-
+ arch/powerpc/sysdev/Makefile | 1 +
+ arch/powerpc/sysdev/ppc4xx_gpio.c | 217 +++++
+ drivers/i2c/busses/i2c-cpm.c | 1 -
+ drivers/net/fec_mpc52xx_phy.c | 55 +-
+ drivers/net/ibm_newemac/core.c | 10 +-
+ drivers/net/ibm_newemac/mal.c | 15 +-
+ drivers/of/of_i2c.c | 2 +-
+ drivers/of/of_spi.c | 2 +
+ drivers/oprofile/buffer_sync.c | 24 +
+ drivers/oprofile/cpu_buffer.c | 15 +-
+ drivers/oprofile/event_buffer.h | 7 +
+ include/linux/oprofile.h | 16 +-
+ 63 files changed, 3507 insertions(+), 288 deletions(-)
+ create mode 100644 arch/powerpc/boot/cuboot-acadia.c
+ create mode 100644 arch/powerpc/boot/dts/acadia.dts
+ create mode 100644 arch/powerpc/boot/dts/hcu4.dts
+ create mode 100644 arch/powerpc/configs/40x/acadia_defconfig
+ create mode 100644 arch/powerpc/configs/40x/hcu4_defconfig
+ create mode 100644 arch/powerpc/platforms/40x/hcu4.c
+ create mode 100644 arch/powerpc/platforms/40x/ppc40x_simple.c
+ create mode 100644 arch/powerpc/sysdev/ppc4xx_gpio.c
+Merging 4xx/next
+$ git merge 4xx/next
+Already up-to-date.
+Merging galak/powerpc-next
+$ git merge galak/powerpc-next
+Already up-to-date.
+Merging pxa/for-next
+$ git merge pxa/for-next
+Auto-merged arch/arm/mach-pxa/Kconfig
+Auto-merged arch/arm/mach-pxa/include/mach/spitz.h
+Auto-merged drivers/input/touchscreen/Kconfig
+Merge made by recursive.
+ arch/arm/configs/corgi_defconfig | 1396 ++++++++++++++++++++------------
+ arch/arm/configs/spitz_defconfig | 1294 +++++++++++++++++++-----------
+ arch/arm/mach-pxa/Kconfig | 8 +
+ arch/arm/mach-pxa/Makefile | 1 +
+ arch/arm/mach-pxa/corgi_lcd.c | 289 +++++++
+ arch/arm/mach-pxa/corgi_ssp.c | 276 +++++++
+ arch/arm/mach-pxa/include/mach/corgi.h | 1 +
+ arch/arm/mach-pxa/include/mach/spitz.h | 1 +
+ arch/arm/mach-pxa/sharpsl_pm.c | 17 +-
+ drivers/input/touchscreen/Kconfig | 6 +-
+ drivers/video/backlight/Kconfig | 6 +-
+ 11 files changed, 2291 insertions(+), 1004 deletions(-)
+ create mode 100644 arch/arm/mach-pxa/corgi_lcd.c
+ create mode 100644 arch/arm/mach-pxa/corgi_ssp.c
+Merging s390/features
+$ git merge s390/features
+Merge made by recursive.
+ arch/s390/include/asm/mmu.h | 3 ++-
+ arch/s390/include/asm/mmu_context.h | 19 ++++++++++++++++---
+ arch/s390/include/asm/pgtable.h | 8 ++++----
+ arch/s390/kernel/smp.c | 24 +++++++++---------------
+ arch/s390/mm/pgtable.c | 16 ++++++++--------
+ drivers/s390/char/vmcp.c | 3 ---
+ drivers/s390/cio/qdio_debug.c | 19 ++++++-------------
+ drivers/s390/cio/qdio_main.c | 1 -
+ 8 files changed, 45 insertions(+), 48 deletions(-)
+Merging sh/master
+$ git merge sh/master
+Merge made by recursive.
+ arch/sh/boards/board-ap325rxa.c | 64 ++++++++++++++++++++++++++++---
+ arch/sh/boards/board-rsk7203.c | 44 ++++++++++++++++++---
+ arch/sh/boards/mach-migor/setup.c | 13 +++++-
+ arch/sh/include/asm/gpio.h | 17 +++++++-
+ arch/sh/include/asm/kdebug.h | 1 +
+ arch/sh/kernel/cpu/sh2a/pinmux-sh7203.c | 19 ++++-----
+ arch/sh/kernel/gpio.c | 2 +-
+ arch/sh/kernel/sh_ksyms_32.c | 7 +++-
+ arch/sh/kernel/smp.c | 1 +
+ arch/sh/kernel/traps_32.c | 2 +
+ arch/sh/mm/init.c | 17 --------
+ drivers/rtc/Kconfig | 4 +-
+ 12 files changed, 143 insertions(+), 48 deletions(-)
+Merging sparc/master
+$ git merge sparc/master
+Already up-to-date.
+Merging x86/auto-x86-next
+$ git merge x86/auto-x86-next
+Already up-to-date.
+Merging xtensa/master
+$ git merge xtensa/master
+Merge made by recursive.
+ arch/xtensa/kernel/irq.c | 2 +-
+ arch/xtensa/platforms/iss/network.c | 2 +-
+ include/asm-xtensa/rwsem.h | 4 ++++
+ 3 files changed, 6 insertions(+), 2 deletions(-)
+Merging quilt/driver-core
+$ git merge quilt/driver-core
+Already up-to-date.
+Merging quilt/usb
+$ git merge quilt/usb
+Merge made by recursive.
+ drivers/net/usb/hso.c | 24 ++++++++++++------------
+ include/linux/usb.h | 4 ----
+ 2 files changed, 12 insertions(+), 16 deletions(-)
+$ git revert 12323313b184c30952fca89a85339ddabb5b25fc
+Finished one revert.
+Created commit cb276b5: Revert "USB: remove info() macro from usb.h"
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+$ git revert f149767b9220564a19e91c976e8d5c6f98db11ed
+Finished one revert.
+Created commit f56529d: Revert "USB: remove warn() macro from usb.h"
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+Merging tip-core/auto-core-next
+$ git merge tip-core/auto-core-next
+Auto-merged mm/memory.c
+Merge made by recursive.
+ Documentation/lockstat.txt | 51 ++++---
+ arch/x86/lib/usercopy_32.c | 8 +-
+ arch/x86/lib/usercopy_64.c | 4 +-
+ include/asm-generic/percpu.h | 11 ++-
+ include/asm-generic/sections.h | 10 ++
+ include/asm-generic/vmlinux.lds.h | 16 ++
+ include/asm-um/system-generic.h | 32 ++--
+ include/asm-x86/percpu.h | 83 ++++++++++-
+ include/asm-x86/uaccess.h | 2 +
+ include/asm-x86/uaccess_32.h | 8 +-
+ include/asm-x86/uaccess_64.h | 6 +
+ include/linux/debug_locks.h | 2 +-
+ include/linux/futex.h | 2 +
+ include/linux/kernel.h | 11 ++
+ include/linux/lockdep.h | 31 ++++-
+ include/linux/percpu.h | 17 ++-
+ include/linux/profile.h | 7 +
+ include/linux/uaccess.h | 2 +-
+ kernel/extable.c | 16 ++
+ kernel/futex.c | 290 +++++++++++++------------------------
+ kernel/lockdep.c | 37 +++--
+ kernel/lockdep_proc.c | 28 +++-
+ kernel/module.c | 7 +-
+ kernel/mutex.c | 2 +-
+ kernel/notifier.c | 8 +
+ kernel/rcupdate.c | 19 ++-
+ kernel/sched.c | 2 +-
+ kernel/softlockup.c | 2 +-
+ lib/Kconfig.debug | 10 ++
+ mm/memory.c | 15 ++
+ 30 files changed, 459 insertions(+), 280 deletions(-)
+Merging cpus4096/auto-cpus4096-next
+$ git merge cpus4096/auto-cpus4096-next
+Merge made by recursive.
+ arch/x86/Kconfig | 17 +++++++++++------
+ arch/x86/kernel/smp.c | 6 +++---
+ arch/x86/xen/smp.c | 6 +++---
+ include/asm-x86/smp.h | 6 +++---
+ kernel/smp.c | 12 +++++-------
+ 5 files changed, 25 insertions(+), 22 deletions(-)
+Merging ftrace/auto-ftrace-next
+$ git merge ftrace/auto-ftrace-next
+Auto-merged arch/arm/Kconfig
+Auto-merged arch/powerpc/Kconfig
+Auto-merged arch/x86/Kconfig
+Merge made by recursive.
+ Makefile | 2 +-
+ arch/arm/Kconfig | 4 +-
+ arch/arm/boot/compressed/Makefile | 2 +-
+ arch/arm/include/asm/ftrace.h | 2 +-
+ arch/arm/kernel/armksyms.c | 2 +-
+ arch/arm/kernel/entry-common.S | 4 +-
+ arch/powerpc/Kconfig | 2 +-
+ arch/powerpc/Makefile | 2 +-
+ arch/powerpc/include/asm/ftrace.h | 2 +-
+ arch/powerpc/kernel/Makefile | 2 +-
+ arch/powerpc/kernel/entry_32.S | 2 +-
+ arch/powerpc/kernel/entry_64.S | 2 +-
+ arch/powerpc/kernel/ppc_ksyms.c | 2 +-
+ arch/powerpc/platforms/powermac/Makefile | 2 +-
+ arch/sparc64/Kconfig | 2 +-
+ arch/sparc64/Kconfig.debug | 2 +-
+ arch/sparc64/lib/mcount.S | 4 +-
+ arch/x86/Kconfig | 2 +-
+ arch/x86/kernel/Makefile | 2 +-
+ arch/x86/kernel/entry_32.S | 4 +-
+ arch/x86/kernel/entry_64.S | 4 +-
+ arch/x86/kernel/ftrace.c | 8 ++-
+ arch/x86/kernel/i386_ksyms_32.c | 2 +-
+ arch/x86/kernel/x8664_ksyms_64.c | 2 +-
+ arch/x86/xen/Makefile | 2 +-
+ include/asm-x86/ftrace.h | 4 +-
+ include/linux/ftrace.h | 12 ++--
+ include/linux/marker.h | 2 -
+ kernel/Makefile | 4 +-
+ kernel/marker.c | 77 ++++++++++-------------------
+ kernel/sysctl.c | 2 +-
+ kernel/trace/Kconfig | 22 ++++-----
+ kernel/trace/Makefile | 6 +-
+ kernel/trace/ftrace.c | 43 +++++++++++++++++
+ kernel/trace/trace.c | 2 +-
+ kernel/trace/trace.h | 2 +-
+ kernel/trace/trace_functions.c | 2 +-
+ kernel/trace/trace_irqsoff.c | 4 +-
+ kernel/trace/trace_sched_wakeup.c | 4 +-
+ kernel/trace/trace_selftest.c | 4 +-
+ kernel/trace/trace_stack.c | 4 ++
+ lib/Makefile | 2 +-
+ 42 files changed, 141 insertions(+), 121 deletions(-)
+Merging genirq/auto-genirq-next
+$ git merge genirq/auto-genirq-next
+Already up-to-date.
+Merging safe-poison-pointers/auto-safe-poison-pointers-next
+$ git merge safe-poison-pointers/auto-safe-poison-pointers-next
+Auto-merged arch/x86/Kconfig
+Merge made by recursive.
+ arch/x86/Kconfig | 5 +++++
+ include/linux/poison.h | 16 ++++++++++++++--
+ 2 files changed, 19 insertions(+), 2 deletions(-)
+Merging sched/auto-sched-next
+$ git merge sched/auto-sched-next
+Auto-merged kernel/sched.c
+Auto-merged kernel/sysctl.c
+Merge made by recursive.
+ include/linux/sched.h | 2 +-
+ kernel/sched.c | 51 +++++++++++++++++++-------------------
+ kernel/sched_fair.c | 62 ++++++++++++++++++++++++++++++----------------
+ kernel/sched_features.h | 2 +-
+ kernel/sched_stats.h | 2 +-
+ kernel/sysctl.c | 10 +++++++
+ 6 files changed, 79 insertions(+), 50 deletions(-)
+Merging stackprotector/auto-stackprotector-next
+$ git merge stackprotector/auto-stackprotector-next
+Auto-merged arch/x86/Kconfig
+Auto-merged arch/x86/kernel/Makefile
+Auto-merged include/linux/sched.h
+Auto-merged kernel/sched.c
+Merge made by recursive.
+ arch/x86/Kconfig | 23 ++++++++++-------------
+ arch/x86/Kconfig.debug | 1 +
+ arch/x86/Makefile | 2 +-
+ arch/x86/kernel/Makefile | 1 +
+ arch/x86/kernel/process_64.c | 13 ++++++++++++-
+ arch/x86/mm/fault.c | 7 +++++++
+ include/asm-x86/pda.h | 4 ++--
+ include/asm-x86/stackprotector.h | 38 ++++++++++++++++++++++++++++++++++++++
+ include/asm-x86/system.h | 6 +++++-
+ include/linux/magic.h | 1 +
+ include/linux/sched.h | 16 ++++++++++++++--
+ include/linux/stackprotector.h | 16 ++++++++++++++++
+ init/main.c | 7 +++++++
+ kernel/exit.c | 5 +----
+ kernel/fork.c | 7 +++++++
+ kernel/panic.c | 12 +++++++++++-
+ kernel/sched.c | 7 +------
+ 17 files changed, 135 insertions(+), 31 deletions(-)
+ create mode 100644 include/asm-x86/stackprotector.h
+ create mode 100644 include/linux/stackprotector.h
+$ git am -3 ../patches/0001-stackprotector-fix-up-bad-merge.patch
+Applying stackprotector: fix up bad merge
+$ git reset HEAD^
+kernel/fork.c: needs update
+$ git add .
+$ git commit -v -a --amend
+Created commit d03b3fe: Merge commit 'stackprotector/auto-stackprotector-next'
+Merging timers/auto-timers-next
+$ git merge timers/auto-timers-next
+Already up-to-date.
+Merging pci/linux-next
+$ git merge pci/linux-next
+Merge made by recursive.
+ MAINTAINERS | 5 -
+ drivers/acpi/pci_slot.c | 2 +-
+ drivers/pci/hotplug/acpiphp.h | 9 +-
+ drivers/pci/hotplug/acpiphp_core.c | 32 ++++---
+ drivers/pci/hotplug/cpci_hotplug.h | 6 +
+ drivers/pci/hotplug/cpci_hotplug_core.c | 75 ++++++---------
+ drivers/pci/hotplug/cpci_hotplug_pci.c | 4 +-
+ drivers/pci/hotplug/cpqphp.h | 13 +--
+ drivers/pci/hotplug/cpqphp_core.c | 43 ++++-----
+ drivers/pci/hotplug/cpqphp_ctrl.c | 2 +-
+ drivers/pci/hotplug/fakephp.c | 26 ++++--
+ drivers/pci/hotplug/ibmphp.h | 5 +-
+ drivers/pci/hotplug/ibmphp_ebda.c | 19 ++---
+ drivers/pci/hotplug/pci_hotplug_core.c | 64 +++++--------
+ drivers/pci/hotplug/pciehp.h | 9 +-
+ drivers/pci/hotplug/pciehp_core.c | 49 ++++------
+ drivers/pci/hotplug/pciehp_ctrl.c | 53 ++++++-----
+ drivers/pci/hotplug/pciehp_hpc.c | 1 -
+ drivers/pci/hotplug/rpaphp_slot.c | 10 +-
+ drivers/pci/hotplug/sgi_hotplug.c | 18 +---
+ drivers/pci/hotplug/shpchp.h | 9 +-
+ drivers/pci/hotplug/shpchp_core.c | 52 ++++-------
+ drivers/pci/hotplug/shpchp_ctrl.c | 48 +++++-----
+ drivers/pci/msi.c | 21 ++++
+ drivers/pci/pci-acpi.c | 85 ++++++++++------
+ drivers/pci/pci.c | 101 +++++++++++++++++++
+ drivers/pci/pci.h | 2 +
+ drivers/pci/probe.c | 12 ++-
+ drivers/pci/search.c | 9 +-
+ drivers/pci/slot.c | 160 +++++++++++++++++++++++--------
+ include/linux/pci.h | 13 ++-
+ include/linux/pci_hotplug.h | 11 ++-
+ include/linux/pci_regs.h | 2 +
+ 33 files changed, 578 insertions(+), 392 deletions(-)
+Applying pci: move include of io.h so it doesn't need to be exported
+Merging quilt/device-mapper
+$ git merge quilt/device-mapper
+Merge made by recursive.
+ drivers/md/Makefile | 2 +-
+ drivers/md/dm-crypt.c | 56 +++-
+ drivers/md/dm-delay.c | 3 +-
+ drivers/md/dm-exception-store.c | 108 ++++--
+ drivers/md/dm-io.c | 2 +-
+ drivers/md/dm-kcopyd.c | 14 +-
+ drivers/md/dm-linear.c | 2 +-
+ drivers/md/dm-log.c | 2 +-
+ drivers/md/dm-mpath.c | 3 +-
+ drivers/md/dm-path-selector.c | 3 +-
+ drivers/md/dm-raid1.c | 791 +++++----------------------------------
+ drivers/md/dm-region-hash.c | 704 ++++++++++++++++++++++++++++++++++
+ drivers/md/dm-round-robin.c | 3 +-
+ drivers/md/dm-snap.c | 11 +-
+ drivers/md/dm-snap.h | 5 +-
+ drivers/md/dm-stripe.c | 6 +-
+ drivers/md/dm-zero.c | 2 +-
+ drivers/md/dm.c | 49 +--
+ drivers/md/dm.h | 9 -
+ include/linux/device-mapper.h | 3 +
+ include/linux/dm-region-hash.h | 104 +++++
+ 21 files changed, 1084 insertions(+), 798 deletions(-)
+ create mode 100644 drivers/md/dm-region-hash.c
+ create mode 100644 include/linux/dm-region-hash.h
+Merging hid/mm
+$ git merge hid/mm
+Merge made by recursive.
+ drivers/hid/Kconfig | 2 --
+ drivers/hid/hid-core.c | 4 ++--
+ drivers/hid/hid-gyration.c | 4 +++-
+ drivers/hid/hid-ids.h | 4 ++--
+ drivers/hid/hid-lg.c | 5 -----
+ drivers/hid/hidraw.c | 2 +-
+ 6 files changed, 8 insertions(+), 13 deletions(-)
+Merging quilt/i2c
+$ git merge quilt/i2c
+Removed Documentation/i2c/porting-clients
+Merge made by recursive.
+ Documentation/feature-removal-schedule.txt | 8 +
+ Documentation/i2c/busses/i2c-i801 | 7 +-
+ Documentation/i2c/porting-clients | 160 ---------
+ Documentation/i2c/writing-clients | 495 +++++++---------------------
+ drivers/i2c/algos/i2c-algo-pcf.c | 21 +-
+ drivers/i2c/busses/Kconfig | 1 +
+ drivers/i2c/busses/i2c-elektor.c | 3 +-
+ drivers/i2c/busses/i2c-i801.c | 3 +
+ include/linux/device.h | 2 +-
+ include/linux/i2c-algo-pcf.h | 5 +-
+ include/linux/i2c.h | 161 +++++-----
+ 11 files changed, 235 insertions(+), 631 deletions(-)
+ delete mode 100644 Documentation/i2c/porting-clients
+Merging quilt/jdelvare-hwmon
+$ git merge quilt/jdelvare-hwmon
+Merge made by recursive.
+ Documentation/hwmon/lm90 | 2 +-
+ drivers/hwmon/asb100.c | 5 +-
+ drivers/hwmon/f71882fg.c | 853 +++++++++++++++++++++++++++++++++++++++------
+ drivers/hwmon/hwmon-vid.c | 1 +
+ drivers/hwmon/lm90.c | 52 +++-
+ drivers/hwmon/w83781d.c | 5 +-
+ drivers/hwmon/w83791d.c | 5 +-
+ drivers/hwmon/w83792d.c | 5 +-
+ drivers/hwmon/w83793.c | 5 +-
+ 9 files changed, 822 insertions(+), 111 deletions(-)
+Merging quilt/kernel-doc
+$ git merge quilt/kernel-doc
+Auto-merged Documentation/00-INDEX
+Auto-merged include/linux/kernel.h
+Merge made by recursive.
+ Documentation/00-INDEX | 2 --
+ Documentation/early-userspace/00-INDEX | 8 ++++++++
+ Documentation/{ => early-userspace}/initrd.txt | 6 +++---
+ include/linux/kernel.h | 4 ++--
+ scripts/kernel-doc | 6 +++---
+ 5 files changed, 16 insertions(+), 10 deletions(-)
+ create mode 100644 Documentation/early-userspace/00-INDEX
+ rename Documentation/{ => early-userspace}/initrd.txt (99%)
+Merging jfs/next
+$ git merge jfs/next
+Already up-to-date.
+Merging kbuild/master
+$ git merge kbuild/master
+Already up-to-date.
+Merging quilt/ide
+$ git merge quilt/ide
+Merge made by recursive.
+ drivers/ide/Kconfig | 6 +
+ drivers/ide/mips/Makefile | 1 +
+ drivers/ide/mips/tx4939ide.c | 775 ++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 782 insertions(+), 0 deletions(-)
+ create mode 100644 drivers/ide/mips/tx4939ide.c
+Merging libata/NEXT
+$ git merge libata/NEXT
+Already up-to-date.
+Merging nfs/linux-next
+$ git merge nfs/linux-next
+Already up-to-date.
+Merging xfs/master
+$ git merge xfs/master
+Merge made by recursive.
+ fs/inode.c | 207 ++-
+ fs/xfs/Makefile | 4 +-
+ fs/xfs/linux-2.6/xfs_aops.c | 2 +-
+ fs/xfs/linux-2.6/xfs_iops.c | 19 +-
+ fs/xfs/linux-2.6/xfs_stats.c | 4 +
+ fs/xfs/linux-2.6/xfs_stats.h | 65 +
+ fs/xfs/linux-2.6/xfs_super.c | 351 ++---
+ fs/xfs/linux-2.6/xfs_super.h | 3 -
+ fs/xfs/linux-2.6/xfs_sync.c | 802 +++++++++
+ fs/xfs/linux-2.6/xfs_sync.h | 55 +
+ fs/xfs/linux-2.6/xfs_vfs.h | 31 -
+ fs/xfs/linux-2.6/xfs_vnode.c | 15 +-
+ fs/xfs/linux-2.6/xfs_vnode.h | 5 -
+ fs/xfs/quota/xfs_dquot.c | 39 +-
+ fs/xfs/quota/xfs_dquot.h | 4 +-
+ fs/xfs/quota/xfs_dquot_item.c | 45 +-
+ fs/xfs/quota/xfs_qm.c | 12 +-
+ fs/xfs/quota/xfs_qm.h | 1 -
+ fs/xfs/quota/xfs_qm_syscalls.c | 137 +-
+ fs/xfs/support/debug.c | 2 +-
+ fs/xfs/xfs.h | 2 +-
+ fs/xfs/xfs_ag.h | 10 +-
+ fs/xfs/xfs_alloc.c | 195 ++-
+ fs/xfs/xfs_alloc.h | 27 +-
+ fs/xfs/xfs_alloc_btree.c | 2387 ++++-----------------------
+ fs/xfs/xfs_alloc_btree.h | 107 +-
+ fs/xfs/xfs_arch.h | 39 +-
+ fs/xfs/xfs_bit.h | 3 +-
+ fs/xfs/xfs_bmap.c | 296 ++--
+ fs/xfs/xfs_bmap.h | 61 +-
+ fs/xfs/xfs_bmap_btree.c | 2614 ++++++------------------------
+ fs/xfs/xfs_bmap_btree.h | 171 +--
+ fs/xfs/xfs_btree.c | 3596 +++++++++++++++++++++++++++++++++++-----
+ fs/xfs/xfs_btree.h | 392 +++--
+ fs/xfs/xfs_btree_trace.c | 249 +++
+ fs/xfs/xfs_btree_trace.h | 116 ++
+ fs/xfs/xfs_buf_item.c | 25 +-
+ fs/xfs/xfs_da_btree.c | 5 +
+ fs/xfs/xfs_da_btree.h | 24 +-
+ fs/xfs/xfs_dinode.h | 5 +-
+ fs/xfs/xfs_dir2.c | 6 +
+ fs/xfs/xfs_extfree_item.c | 45 +-
+ fs/xfs/xfs_fsops.c | 24 +-
+ fs/xfs/xfs_ialloc.c | 132 ++-
+ fs/xfs/xfs_ialloc.h | 21 +-
+ fs/xfs/xfs_ialloc_btree.c | 2193 +++----------------------
+ fs/xfs/xfs_ialloc_btree.h | 111 +-
+ fs/xfs/xfs_iget.c | 483 ++----
+ fs/xfs/xfs_imap.h | 2 -
+ fs/xfs/xfs_inode.c | 266 ++--
+ fs/xfs/xfs_inode.h | 269 ++--
+ fs/xfs/xfs_inode_item.c | 30 +-
+ fs/xfs/xfs_inode_item.h | 41 +-
+ fs/xfs/xfs_itable.c | 26 +-
+ fs/xfs/xfs_log.c | 10 +-
+ fs/xfs/xfs_log_priv.h | 1 +
+ fs/xfs/xfs_log_recover.c | 105 +-
+ fs/xfs/xfs_mount.c | 47 +-
+ fs/xfs/xfs_mount.h | 51 +-
+ fs/xfs/xfs_trans.c | 13 +-
+ fs/xfs/xfs_trans.h | 322 ++--
+ fs/xfs/xfs_trans_ail.c | 362 +++--
+ fs/xfs/xfs_trans_buf.c | 7 +-
+ fs/xfs/xfs_trans_item.c | 10 +
+ fs/xfs/xfs_trans_priv.h | 98 +-
+ fs/xfs/xfs_vfsops.c | 616 +-------
+ fs/xfs/xfs_vfsops.h | 2 -
+ fs/xfs/xfs_vnodeops.c | 118 +--
+ include/linux/fs.h | 2 +
+ 69 files changed, 7878 insertions(+), 9662 deletions(-)
+ create mode 100644 fs/xfs/linux-2.6/xfs_sync.c
+ create mode 100644 fs/xfs/linux-2.6/xfs_sync.h
+ create mode 100644 fs/xfs/xfs_btree_trace.c
+ create mode 100644 fs/xfs/xfs_btree_trace.h
+Merging infiniband/for-next
+$ git merge infiniband/for-next
+Merge made by recursive.
+ drivers/infiniband/core/mad.c | 14 +++++---------
+ drivers/infiniband/core/ucma.c | 4 ++--
+ drivers/infiniband/hw/cxgb3/iwch_cm.c | 1 +
+ drivers/infiniband/hw/ehca/ehca_qp.c | 6 ++++++
+ drivers/infiniband/ulp/ipoib/ipoib_ib.c | 7 +++----
+ 5 files changed, 17 insertions(+), 15 deletions(-)
+Merging acpi/test
+$ git merge acpi/test
+Auto-merged Documentation/kernel-parameters.txt
+Auto-merged MAINTAINERS
+CONFLICT (content): Merge conflict in MAINTAINERS
+Auto-merged arch/x86/Kconfig
+Auto-merged arch/x86/kernel/acpi/boot.c
+CONFLICT (content): Merge conflict in arch/x86/kernel/acpi/boot.c
+Auto-merged arch/x86/kernel/acpi/sleep.c
+CONFLICT (content): Merge conflict in arch/x86/kernel/acpi/sleep.c
+Auto-merged arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
+Auto-merged arch/x86/kernel/cpu/cpufreq/powernow-k8.c
+Auto-merged arch/x86/kernel/process_64.c
+Auto-merged drivers/Makefile
+Auto-merged drivers/acpi/Kconfig
+CONFLICT (content): Merge conflict in drivers/acpi/Kconfig
+Auto-merged drivers/acpi/battery.c
+Removed drivers/acpi/bay.c
+Auto-merged drivers/acpi/pci_slot.c
+Auto-merged drivers/acpi/sbs.c
+Auto-merged drivers/acpi/system.c
+Auto-merged drivers/acpi/toshiba_acpi.c
+Auto-merged drivers/dma/ioat_dma.c
+Auto-merged drivers/misc/Kconfig
+Auto-merged drivers/pci/hotplug/sgi_hotplug.c
+Auto-merged drivers/pnp/Makefile
+CONFLICT (content): Merge conflict in drivers/pnp/Makefile
+Auto-merged drivers/pnp/base.h
+Auto-merged drivers/pnp/core.c
+Auto-merged drivers/pnp/driver.c
+Auto-merged drivers/pnp/isapnp/core.c
+Auto-merged drivers/pnp/pnpacpi/core.c
+Auto-merged drivers/pnp/pnpbios/core.c
+Auto-merged drivers/pnp/quirks.c
+CONFLICT (content): Merge conflict in drivers/pnp/quirks.c
+Auto-merged drivers/pnp/resource.c
+Auto-merged include/acpi/acmacros.h
+Auto-merged include/asm-x86/idle.h
+Auto-merged include/linux/kernel.h
+Auto-merged include/linux/pci_ids.h
+Auto-merged include/linux/pnp.h
+Resolved 'MAINTAINERS' using previous resolution.
+Resolved 'arch/x86/kernel/acpi/sleep.c' using previous resolution.
+Resolved 'drivers/acpi/Kconfig' using previous resolution.
+Resolved 'drivers/pnp/Makefile' using previous resolution.
+Resolved 'drivers/pnp/quirks.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'arch/x86/kernel/acpi/boot.c'.
+Created commit 941a0a3: Merge commit 'acpi/test'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/kernel-parameters.txt | 61 ++-
+ Documentation/laptops/acer-wmi.txt | 28 +-
+ MAINTAINERS | 15 +-
+ arch/ia64/sn/kernel/io_acpi_init.c | 8 +-
+ arch/x86/Kconfig | 5 +
+ arch/x86/kernel/acpi/boot.c | 3 +
+ arch/x86/kernel/acpi/sleep.c | 4 +-
+ arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 3 +
+ arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 42 +-
+ arch/x86/kernel/process_64.c | 7 +
+ drivers/Makefile | 1 +
+ drivers/acpi/Kconfig | 11 +-
+ drivers/acpi/Makefile | 1 -
+ drivers/acpi/ac.c | 4 +-
+ drivers/acpi/acpi_memhotplug.c | 11 +-
+ drivers/acpi/asus_acpi.c | 227 ++++----
+ drivers/acpi/battery.c | 2 +-
+ drivers/acpi/bay.c | 411 ---------------
+ drivers/acpi/bus.c | 78 +++-
+ drivers/acpi/button.c | 6 +-
+ drivers/acpi/cm_sbs.c | 6 +-
+ drivers/acpi/container.c | 4 +-
+ drivers/acpi/dock.c | 388 +++++++++++----
+ drivers/acpi/ec.c | 400 ++++++++-------
+ drivers/acpi/executer/exconfig.c | 116 +++--
+ drivers/acpi/fan.c | 6 +-
+ drivers/acpi/hardware/hwsleep.c | 44 +-
+ drivers/acpi/namespace/nsxfeval.c | 79 +++
+ drivers/acpi/namespace/nsxfname.c | 5 +
+ drivers/acpi/numa.c | 2 +-
+ drivers/acpi/osl.c | 54 ++-
+ drivers/acpi/parser/psloop.c | 2 +
+ drivers/acpi/pci_link.c | 6 +-
+ drivers/acpi/pci_root.c | 4 +-
+ drivers/acpi/pci_slot.c | 10 +-
+ drivers/acpi/power.c | 74 ++-
+ drivers/acpi/processor_core.c | 6 +-
+ drivers/acpi/processor_idle.c | 1 +
+ drivers/acpi/processor_perflib.c | 37 +-
+ drivers/acpi/processor_throttling.c | 19 +-
+ drivers/acpi/reboot.c | 25 +-
+ drivers/acpi/sbs.c | 2 +-
+ drivers/acpi/sbshc.c | 6 +-
+ drivers/acpi/scan.c | 91 ++--
+ drivers/acpi/sleep/main.c | 61 +++-
+ drivers/acpi/system.c | 4 +-
+ drivers/acpi/tables/tbfadt.c | 32 +-
+ drivers/acpi/tables/tbinstal.c | 61 ++-
+ drivers/acpi/thermal.c | 57 ++-
+ drivers/acpi/toshiba_acpi.c | 2 +-
+ drivers/acpi/utilities/utglobal.c | 44 ++-
+ drivers/acpi/utilities/utobject.c | 8 +-
+ drivers/acpi/utilities/utxface.c | 7 +-
+ drivers/acpi/utils.c | 4 +-
+ drivers/acpi/video.c | 59 +--
+ drivers/acpi/wmi.c | 49 ++-
+ drivers/ata/libata-acpi.c | 135 ++----
+ drivers/cpuidle/cpuidle.c | 9 +-
+ drivers/dma/ioat_dma.c | 3 +
+ drivers/idle/Kconfig | 16 +
+ drivers/idle/Makefile | 2 +
+ drivers/idle/i7300_idle.c | 674 ++++++++++++++++++++++++
+ drivers/misc/Kconfig | 12 +
+ drivers/misc/Makefile | 1 +
+ drivers/misc/acer-wmi.c | 225 +++++---
+ drivers/misc/asus-laptop.c | 15 +-
+ drivers/misc/eeepc-laptop.c | 232 ++++++++-
+ drivers/misc/fujitsu-laptop.c | 135 +++---
+ drivers/misc/intel_menlow.c | 29 +-
+ drivers/misc/panasonic-laptop.c | 767 ++++++++++++++++++++++++++++
+ drivers/misc/sony-laptop.c | 2 +-
+ drivers/misc/thinkpad_acpi.c | 50 ++-
+ drivers/pci/hotplug/acpiphp_glue.c | 20 +-
+ drivers/pci/hotplug/acpiphp_ibm.c | 2 +-
+ drivers/pci/hotplug/sgi_hotplug.c | 4 +-
+ drivers/pnp/Kconfig | 20 +-
+ drivers/pnp/Makefile | 4 -
+ drivers/pnp/base.h | 10 +
+ drivers/pnp/core.c | 29 +-
+ drivers/pnp/driver.c | 4 -
+ drivers/pnp/isapnp/Makefile | 4 -
+ drivers/pnp/isapnp/core.c | 12 +-
+ drivers/pnp/manager.c | 34 +-
+ drivers/pnp/pnpacpi/Makefile | 4 -
+ drivers/pnp/pnpacpi/core.c | 16 +-
+ drivers/pnp/pnpacpi/rsparser.c | 43 +-
+ drivers/pnp/pnpbios/Makefile | 4 -
+ drivers/pnp/pnpbios/core.c | 4 +-
+ drivers/pnp/pnpbios/rsparser.c | 18 +-
+ drivers/pnp/quirks.c | 5 +-
+ drivers/pnp/resource.c | 12 +-
+ drivers/pnp/support.c | 14 +-
+ include/acpi/acconfig.h | 2 +-
+ include/acpi/acdisasm.h | 4 +
+ include/acpi/acmacros.h | 253 +++++-----
+ include/acpi/acpi_bus.h | 11 +-
+ include/acpi/acpi_drivers.h | 11 +-
+ include/acpi/acpiosxf.h | 3 +
+ include/acpi/actbl1.h | 51 ++-
+ include/acpi/actypes.h | 3 +-
+ include/acpi/acutils.h | 4 +-
+ include/acpi/platform/aclinux.h | 6 +
+ include/asm-x86/idle.h | 1 +
+ include/linux/acpi.h | 8 -
+ include/linux/kernel.h | 24 +
+ include/linux/pci_ids.h | 1 +
+ include/linux/pnp.h | 10 -
+ 107 files changed, 3919 insertions(+), 1746 deletions(-)
+ delete mode 100644 drivers/acpi/bay.c
+ create mode 100644 drivers/idle/Kconfig
+ create mode 100644 drivers/idle/Makefile
+ create mode 100644 drivers/idle/i7300_idle.c
+ create mode 100644 drivers/misc/panasonic-laptop.c
+$ git am -3 ../patches/0001-acpi-merge-fix-for-dpulicate-acpi_mcfg_64bit_base_a.patch
+Applying acpi: merge fix for dpulicate acpi_mcfg_64bit_base_addr
+$ git reset HEAD^
+arch/x86/kernel/acpi/boot.c: needs update
+$ git add .
+$ git commit -v -a --amend
+Created commit 938d25f: Merge commit 'acpi/test'
+$ git am -3 ../patches/0001-acpi-acpi_os_hotplug_execute-needs-to-be-exported.patch
+Applying acpi: acpi_os_hotplug_execute needs to be exported
+$ git reset HEAD^
+drivers/acpi/osl.c: needs update
+$ git add .
+$ git commit -v -a --amend
+Created commit 9c287c2: Merge commit 'acpi/test'
+Merging nfsd/nfsd-next
+$ git merge nfsd/nfsd-next
+Auto-merged fs/proc/proc_misc.c
+Auto-merged include/linux/fs.h
+Merge made by recursive.
+ fs/lockd/svc.c | 8 ++++++++
+ fs/locks.c | 22 +++++++++++++++++++++-
+ fs/nfsd/export.c | 19 ++++++++++---------
+ fs/nfsd/nfs4recover.c | 2 +-
+ fs/nfsd/nfs4state.c | 7 ++++---
+ fs/nfsd/nfsfh.c | 30 ++++++++++++++++++++++++------
+ fs/proc/proc_misc.c | 17 -----------------
+ include/linux/fs.h | 1 -
+ include/linux/nfsd/nfsfh.h | 4 ++++
+ include/linux/sunrpc/svc.h | 5 ++++-
+ net/sunrpc/svc_xprt.c | 22 ++++++++++++++++------
+ 11 files changed, 92 insertions(+), 45 deletions(-)
+Merging ieee1394/for-next
+$ git merge ieee1394/for-next
+Merge made by recursive.
+ drivers/firewire/fw-cdev.c | 36 ++++++++-----------
+ drivers/firewire/fw-device.c | 3 ++
+ drivers/firewire/fw-device.h | 4 ++
+ drivers/firewire/fw-ohci.c | 73 ++++++++++++++++++-------------------
+ drivers/firewire/fw-sbp2.c | 3 +-
+ drivers/firewire/fw-transaction.h | 2 +-
+ 6 files changed, 60 insertions(+), 61 deletions(-)
+Merging ubi/linux-next
+$ git merge ubi/linux-next
+Already up-to-date.
+Merging kvm/master
+$ git merge kvm/master
+Merge made by recursive.
+ arch/ia64/include/asm/kvm_host.h | 6 +-
+ arch/ia64/kvm/Makefile | 3 +-
+ arch/ia64/kvm/kvm-ia64.c | 80 +++++-----
+ arch/ia64/kvm/kvm_fw.c | 9 +-
+ arch/ia64/kvm/process.c | 2 +-
+ arch/x86/kernel/cpu/mtrr/generic.c | 12 +-
+ arch/x86/kernel/cpu/mtrr/main.c | 4 +-
+ arch/x86/kernel/cpu/mtrr/mtrr.h | 18 +--
+ arch/x86/kvm/i8254.c | 26 +++-
+ arch/x86/kvm/i8254.h | 1 +
+ arch/x86/kvm/irq.h | 1 +
+ arch/x86/kvm/lapic.c | 35 ++++-
+ arch/x86/kvm/mmu.c | 122 ++++++++++++++-
+ arch/x86/kvm/svm.c | 6 +
+ arch/x86/kvm/vmx.c | 315 +++++++++++++++++++++++++-----------
+ arch/x86/kvm/vmx.h | 12 ++-
+ arch/x86/kvm/x86.c | 125 +++++++++++++-
+ arch/x86/kvm/x86_emulate.c | 8 +-
+ include/asm-x86/kvm_host.h | 22 ++-
+ include/asm-x86/kvm_x86_emulate.h | 10 +-
+ include/asm-x86/mtrr.h | 25 +++
+ include/linux/kvm.h | 17 ++-
+ include/linux/kvm_host.h | 7 +-
+ virt/kvm/ioapic.c | 1 +
+ virt/kvm/irq_comm.c | 42 +++++-
+ virt/kvm/kvm_main.c | 12 +-
+ 26 files changed, 702 insertions(+), 219 deletions(-)
+Merging dlm/next
+$ git merge dlm/next
+Already up-to-date.
+Merging scsi/master
+$ git merge scsi/master
+Auto-merged drivers/scsi/ipr.c
+Merge made by recursive.
+ drivers/message/fusion/mptscsih.c | 3 +-
+ drivers/scsi/3w-9xxx.c | 3 -
+ drivers/scsi/3w-xxxx.c | 7 +-
+ drivers/scsi/aic7xxx/aic79xx.reg | 185 +++
+ drivers/scsi/aic7xxx/aic79xx_core.c | 15 +-
+ drivers/scsi/aic7xxx/aic79xx_pci.c | 12 +-
+ drivers/scsi/aic7xxx/aic79xx_reg.h_shipped | 567 ++------
+ drivers/scsi/aic7xxx/aic79xx_reg_print.c_shipped | 1723 ----------------------
+ drivers/scsi/aic7xxx/aic7xxx.reg | 124 ++
+ drivers/scsi/aic7xxx/aic7xxx_core.c | 7 +
+ drivers/scsi/aic7xxx/aic7xxx_reg.h_shipped | 875 -----------
+ drivers/scsi/aic7xxx/aic7xxx_reg_print.c_shipped | 1165 ---------------
+ drivers/scsi/aic7xxx/aicasm/aicasm_gram.y | 10 +
+ drivers/scsi/aic7xxx/aicasm/aicasm_scan.l | 1 +
+ drivers/scsi/aic7xxx/aicasm/aicasm_symbol.c | 3 +
+ drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h | 3 +-
+ drivers/scsi/device_handler/scsi_dh_rdac.c | 3 +
+ drivers/scsi/ipr.c | 16 +-
+ drivers/scsi/scsi_lib.c | 83 +-
+ drivers/scsi/scsi_netlink.c | 9 +-
+ drivers/scsi/sd.c | 21 +-
+ drivers/scsi/sun3x_esp.c | 4 +-
+ lib/string_helpers.c | 34 +-
+ 23 files changed, 580 insertions(+), 4293 deletions(-)
+Merging ocfs2/linux-next
+$ git merge ocfs2/linux-next
+Merge made by recursive.
+ fs/ocfs2/mmap.c | 6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+Merging ext4/next
+$ git merge ext4/next
+Already up-to-date.
+Merging async_tx/next
+$ git merge async_tx/next
+Already up-to-date.
+Merging udf/for_next
+$ git merge udf/for_next
+Already up-to-date.
+Merging net/master
+$ git merge net/master
+Already up-to-date.
+Merging mtd/master
+$ git merge mtd/master
+Merge made by recursive.
+ drivers/mtd/onenand/omap2.c | 1 -
+ fs/jffs2/nodemgmt.c | 2 ++
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+Merging wireless/master
+$ git merge wireless/master
+Already up-to-date.
+Merging crypto/master
+$ git merge crypto/master
+Merge made by recursive.
+ crypto/camellia.c | 84 +++++++++------------
+ crypto/testmgr.c | 7 ++-
+ drivers/crypto/hifn_795x.c | 5 ++
+ drivers/crypto/talitos.c | 171 ++++++++++++++++++++++++++++----------------
+ drivers/crypto/talitos.h | 11 +++-
+ 5 files changed, 166 insertions(+), 112 deletions(-)
+Merging vfs/for-next
+$ git merge vfs/for-next
+Auto-merged arch/parisc/hpux/fs.c
+Auto-merged drivers/md/dm-table.c
+Auto-merged fs/block_dev.c
+Auto-merged fs/char_dev.c
+Auto-merged fs/compat.c
+Auto-merged fs/dcache.c
+Auto-merged fs/dquot.c
+Auto-merged fs/ecryptfs/main.c
+Auto-merged fs/ext2/dir.c
+Auto-merged fs/ext2/ext2.h
+Auto-merged fs/ext3/super.c
+Auto-merged fs/ext4/namei.c
+CONFLICT (content): Merge conflict in fs/ext4/namei.c
+Auto-merged fs/ext4/super.c
+Auto-merged fs/fat/inode.c
+Auto-merged fs/fuse/inode.c
+Auto-merged fs/gfs2/ops_inode.c
+Auto-merged fs/jffs2/dir.c
+Auto-merged fs/nfs/dir.c
+Auto-merged fs/nfsd/export.c
+Auto-merged fs/nfsd/nfs4recover.c
+Auto-merged fs/nfsd/nfs4state.c
+Auto-merged fs/nfsd/nfsctl.c
+Auto-merged fs/nfsd/vfs.c
+Auto-merged include/linux/fs.h
+Auto-merged init/main.c
+Auto-merged net/unix/af_unix.c
+Resolved 'fs/ext4/namei.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Created commit 596d3bf: Merge commit 'vfs/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/alpha/kernel/osf_sys.c | 7 +-
+ arch/parisc/hpux/fs.c | 5 +-
+ arch/powerpc/platforms/cell/spufs/syscalls.c | 4 +-
+ drivers/md/dm-table.c | 21 +---
+ fs/block_dev.c | 14 ++--
+ fs/char_dev.c | 21 +++--
+ fs/compat.c | 22 ++---
+ fs/configfs/symlink.c | 16 ++--
+ fs/dcache.c | 85 +++++++++---------
+ fs/dquot.c | 10 +-
+ fs/ecryptfs/main.c | 23 ++---
+ fs/efs/namei.c | 29 +-----
+ fs/exportfs/expfs.c | 16 ++--
+ fs/ext2/dir.c | 14 ++--
+ fs/ext2/ext2.h | 4 +-
+ fs/ext2/namei.c | 30 ++-----
+ fs/ext3/namei.c | 84 +++++++----------
+ fs/ext3/super.c | 22 ++--
+ fs/ext4/namei.c | 14 +---
+ fs/ext4/super.c | 22 ++--
+ fs/fat/inode.c | 52 ++++-------
+ fs/fuse/inode.c | 23 ++---
+ fs/gfs2/ops_export.c | 33 ++-----
+ fs/gfs2/ops_inode.c | 2 +-
+ fs/hpfs/file.c | 2 +-
+ fs/hpfs/hpfs_fn.h | 2 +-
+ fs/hpfs/inode.c | 29 ++++--
+ fs/hpfs/namei.c | 2 +-
+ fs/isofs/export.c | 33 +------
+ fs/jffs2/dir.c | 4 +-
+ fs/jffs2/super.c | 48 ++++++++++
+ fs/jfs/namei.c | 15 +---
+ fs/libfs.c | 26 +-----
+ fs/namei.c | 75 +++++++--------
+ fs/namespace.c | 126 ++++++++++++-------------
+ fs/nfs/dir.c | 6 +-
+ fs/nfs/getroot.c | 6 +-
+ fs/nfsd/export.c | 125 ++++++++++++-------------
+ fs/nfsd/nfs4recover.c | 50 +++++-----
+ fs/nfsd/nfs4state.c | 8 +-
+ fs/nfsd/nfsctl.c | 8 +-
+ fs/nfsd/vfs.c | 126 ++++++++++++++++++++++---
+ fs/ntfs/namei.c | 22 +----
+ fs/ocfs2/export.c | 30 +-----
+ fs/read_write.c | 58 ++++++++----
+ fs/readdir.c | 22 ++---
+ fs/reiserfs/inode.c | 13 +--
+ fs/reiserfs/namei.c | 11 +--
+ fs/reiserfs/super.c | 18 ++--
+ fs/super.c | 15 +--
+ fs/udf/namei.c | 17 +---
+ fs/xfs/linux-2.6/xfs_export.c | 32 +------
+ fs/xfs/linux-2.6/xfs_file.c | 128 --------------------------
+ fs/xfs/linux-2.6/xfs_ioctl.c | 3 +-
+ include/linux/dcache.h | 2 +-
+ include/linux/fs.h | 1 -
+ include/linux/namei.h | 7 +-
+ init/main.c | 1 -
+ kernel/audit_tree.c | 48 +++++-----
+ net/unix/af_unix.c | 18 ++--
+ 60 files changed, 724 insertions(+), 986 deletions(-)
+$ git am -3 ../patches/0001-vfs-xfs-fallout-from-i_vnode-change.patch
+Applying vfs/xfs: fallout from i_vnode change
+$ git reset HEAD^
+fs/xfs/linux-2.6/xfs_export.c: needs update
+$ git add .
+$ git commit -v -a --amend
+Created commit c64c5b5: Merge commit 'vfs/for-next'
+$ git am -3 ../patches/0001-vfs-fix-up-merge-of-ext4.patch
+Applying vfs: fix up merge of ext4
+$ git reset HEAD^
+fs/ext4/super.c: needs update
+$ git add .
+$ git commit -v -a --amend
+Created commit ba299e0: Merge commit 'vfs/for-next'
+Merging sound/for-next
+$ git merge sound/for-next
+Merge made by recursive.
+ sound/pci/hda/patch_realtek.c | 22 ++++++++++++++--------
+ 1 files changed, 14 insertions(+), 8 deletions(-)
+Merging cpufreq/next
+$ git merge cpufreq/next
+Already up-to-date.
+Merging v9fs/for-next
+$ git merge v9fs/for-next
+Merge made by recursive.
+ fs/9p/vfs_file.c | 3 ++-
+ include/net/9p/9p.h | 2 +-
+ net/9p/protocol.c | 9 +++++++++
+ net/9p/trans_fd.c | 4 +---
+ 4 files changed, 13 insertions(+), 5 deletions(-)
+Merging quilt/rr
+$ git merge quilt/rr
+Auto-merged init/main.c
+Auto-merged kernel/module.c
+Auto-merged kernel/panic.c
+Merge made by recursive.
+ Documentation/lguest/lguest.c | 60 +----
+ arch/x86/lguest/Kconfig | 1 -
+ arch/x86/lguest/boot.c | 80 +++++-
+ arch/x86/lguest/i386_head.S | 15 -
+ drivers/firmware/dmi_scan.c | 5 +
+ drivers/lguest/Kconfig | 2 +-
+ drivers/lguest/hypercalls.c | 5 +
+ drivers/lguest/lg.h | 9 +-
+ drivers/lguest/lguest_user.c | 13 +-
+ drivers/lguest/page_tables.c | 627 ++++++++++++++++++++++++++++++++++++---
+ drivers/net/virtio_net.c | 21 +-
+ include/asm-x86/lguest.h | 5 +
+ include/asm-x86/lguest_hcall.h | 3 +-
+ include/linux/lguest_launcher.h | 2 +-
+ include/linux/module.h | 6 +-
+ include/linux/moduleparam.h | 25 ++-
+ include/linux/workqueue.h | 18 +-
+ init/Kconfig | 6 -
+ init/main.c | 12 +-
+ kernel/module.c | 284 ++++++++----------
+ kernel/panic.c | 17 +-
+ kernel/params.c | 274 +++++++++--------
+ kernel/stop_machine.c | 111 +++-----
+ kernel/workqueue.c | 7 +-
+ 24 files changed, 1065 insertions(+), 543 deletions(-)
+Merging cifs/master
+$ git merge cifs/master
+Merge made by recursive.
+ fs/cifs/CHANGES | 8 ++
+ fs/cifs/README | 3 +
+ fs/cifs/cifsfs.c | 1 +
+ fs/cifs/cifsfs.h | 2 +-
+ fs/cifs/cifsglob.h | 1 +
+ fs/cifs/cifssmb.c | 2 +
+ fs/cifs/connect.c | 53 +++++------
+ fs/cifs/inode.c | 278 ++++++++++++++++++++++++++++++++++++---------------
+ fs/cifs/readdir.c | 3 +-
+ 9 files changed, 238 insertions(+), 113 deletions(-)
+Merging mmc/next
+$ git merge mmc/next
+Already up-to-date.
+Merging gfs2/master
+$ git merge gfs2/master
+Removed fs/gfs2/ops_dentry.h
+Auto-merged fs/gfs2/ops_export.c
+Removed fs/gfs2/ops_fstype.h
+Auto-merged fs/gfs2/ops_inode.c
+Removed fs/gfs2/ops_inode.h
+Removed fs/gfs2/ops_super.h
+Auto-merged include/linux/fs.h
+Merge made by recursive.
+ fs/gfs2/inode.c | 1 -
+ fs/gfs2/inode.h | 11 +++++++++++
+ fs/gfs2/main.c | 2 +-
+ fs/gfs2/ops_address.c | 16 +++++++---------
+ fs/gfs2/ops_dentry.c | 2 +-
+ fs/gfs2/ops_dentry.h | 17 -----------------
+ fs/gfs2/ops_export.c | 3 +--
+ fs/gfs2/ops_file.c | 1 -
+ fs/gfs2/ops_fstype.c | 3 ---
+ fs/gfs2/ops_fstype.h | 19 -------------------
+ fs/gfs2/ops_inode.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
+ fs/gfs2/ops_inode.h | 25 -------------------------
+ fs/gfs2/ops_super.c | 8 ++++----
+ fs/gfs2/ops_super.h | 17 -----------------
+ fs/gfs2/super.h | 8 ++++++++
+ fs/ioctl.c | 44 ++++++++++++++++++++++++++++++++++----------
+ include/linux/fs.h | 3 +++
+ 17 files changed, 117 insertions(+), 112 deletions(-)
+ delete mode 100644 fs/gfs2/ops_dentry.h
+ delete mode 100644 fs/gfs2/ops_fstype.h
+ delete mode 100644 fs/gfs2/ops_inode.h
+ delete mode 100644 fs/gfs2/ops_super.h
+Merging input/next
+$ git merge input/next
+Already up-to-date.
+Merging semaphore/semaphore
+$ git merge semaphore/semaphore
+Already up-to-date.
+Merging semaphore-removal/semaphore-removal
+$ git merge semaphore-removal/semaphore-removal
+Auto-merged arch/arm/mach-lh7a40x/clocks.c
+Auto-merged drivers/net/bonding/bond_main.c
+Auto-merged drivers/net/bonding/bond_sysfs.c
+Auto-merged drivers/net/ps3_gelic_wireless.c
+Auto-merged drivers/scsi/qla2xxx/qla_def.h
+Auto-merged include/net/bluetooth/hci_core.h
+Auto-merged net/9p/trans_virtio.c
+CONFLICT (content): Merge conflict in net/9p/trans_virtio.c
+Auto-merged net/bluetooth/hci_core.c
+Auto-merged sound/soc/s3c24xx/s3c2443-ac97.c
+Resolved 'net/9p/trans_virtio.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Created commit a0e800c: Merge commit 'semaphore-removal/semaphore-removal'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/mach-lh7a40x/clocks.c | 15 ++++++++-------
+ drivers/net/bonding/bond_main.c | 21 +++++++++++----------
+ drivers/net/bonding/bond_sysfs.c | 15 ++++++++-------
+ drivers/net/ppp_async.c | 8 ++++----
+ drivers/net/ps3_gelic_net.c | 1 +
+ drivers/net/ps3_gelic_wireless.c | 1 +
+ drivers/pci/hotplug/ibmphp_hpc.c | 30 ++++++++++++++----------------
+ include/net/bluetooth/hci_core.h | 7 ++++---
+ net/9p/trans_virtio.c | 21 +++++++++++----------
+ net/bluetooth/hci_core.c | 2 +-
+ sound/soc/s3c24xx/s3c2443-ac97.c | 11 ++++++-----
+ 11 files changed, 69 insertions(+), 63 deletions(-)
+Merging bkl-removal/bkl-removal
+$ git merge bkl-removal/bkl-removal
+Already up-to-date.
+Merging trivial/next
+$ git merge trivial/next
+Auto-merged Documentation/edac.txt
+CONFLICT (content): Merge conflict in Documentation/edac.txt
+Auto-merged arch/mips/kernel/vpe.c
+Auto-merged drivers/base/sys.c
+Auto-merged drivers/media/dvb/ttpci/av7110.c
+Auto-merged drivers/net/spider_net.c
+Auto-merged drivers/serial/mpc52xx_uart.c
+Auto-merged drivers/usb/serial/ftdi_sio.c
+Auto-merged fs/jffs2/fs.c
+Auto-merged fs/ntfs/aops.c
+Auto-merged fs/proc/nommu.c
+Auto-merged include/linux/securebits.h
+CONFLICT (content): Merge conflict in include/linux/securebits.h
+Auto-merged mm/migrate.c
+Auto-merged mm/slub.c
+Auto-merged net/wireless/wext.c
+Resolved 'Documentation/edac.txt' using previous resolution.
+Resolved 'include/linux/securebits.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Created commit 1390eb6: Merge commit 'trivial/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/filesystems/hfs.txt | 2 +-
+ Documentation/ja_JP/SubmittingPatches | 4 ++--
+ Documentation/zh_CN/SubmittingPatches | 4 ++--
+ arch/mips/kernel/vpe.c | 2 +-
+ arch/sh/lib64/c-checksum.c | 4 ++--
+ drivers/base/sys.c | 2 +-
+ drivers/char/serial167.c | 2 +-
+ drivers/media/dvb/ttpci/av7110.c | 2 +-
+ drivers/message/i2o/i2o_block.c | 2 +-
+ drivers/misc/ibmasm/event.c | 2 +-
+ drivers/net/spider_net.c | 2 +-
+ drivers/serial/mpc52xx_uart.c | 4 ++--
+ drivers/usb/serial/ftdi_sio.c | 2 +-
+ fs/jffs2/fs.c | 2 +-
+ fs/ntfs/aops.c | 2 +-
+ fs/proc/nommu.c | 2 +-
+ mm/migrate.c | 2 +-
+ mm/slub.c | 4 ++--
+ net/wireless/wext.c | 2 +-
+ 19 files changed, 24 insertions(+), 24 deletions(-)
+Merging ubifs/linux-next
+$ git merge ubifs/linux-next
+Already up-to-date.
+Merging lsm/for-next
+$ git merge lsm/for-next
+Already up-to-date.
+Merging block/for-next
+$ git merge block/for-next
+Merge made by recursive.
+ block/blk-merge.c | 21 ---------------------
+ block/cfq-iosched.c | 8 ++------
+ 2 files changed, 2 insertions(+), 27 deletions(-)
+Merging embedded/master
+$ git merge embedded/master
+Already up-to-date.
+Merging firmware/master
+$ git merge firmware/master
+Auto-merged drivers/media/dvb/ttpci/Kconfig
+Auto-merged drivers/media/dvb/ttpci/av7110.c
+Removed drivers/media/dvb/ttpci/fdump.c
+Removed drivers/net/acenic_firmware.h
+Auto-merged drivers/net/e100.c
+Removed drivers/net/starfire_firmware.h
+Removed drivers/net/starfire_firmware.pl
+Auto-merged drivers/net/tg3.c
+Auto-merged drivers/net/tg3.h
+Removed drivers/scsi/ql1040_fw.h
+Removed drivers/scsi/ql12160_fw.h
+Removed drivers/scsi/ql1280_fw.h
+Auto-merged drivers/scsi/qla1280.c
+Auto-merged drivers/scsi/qlogicpti.c
+CONFLICT (content): Merge conflict in drivers/scsi/qlogicpti.c
+Removed drivers/scsi/qlogicpti_asm.c
+Auto-merged firmware/Makefile
+Auto-merged firmware/WHENCE
+CONFLICT (content): Merge conflict in firmware/WHENCE
+Auto-merged sound/isa/Kconfig
+Auto-merged sound/isa/wavefront/wavefront_fx.c
+Removed sound/isa/wavefront/yss225.c
+Resolved 'drivers/scsi/qlogicpti.c' using previous resolution.
+Resolved 'firmware/WHENCE' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Created commit 3f7ed7b: Merge commit 'firmware/master'
+$ git diff -M --stat --summary HEAD^..
+ drivers/media/dvb/ttpci/Kconfig | 23 +-
+ drivers/media/dvb/ttpci/Makefile | 9 -
+ drivers/media/dvb/ttpci/av7110.c | 16 -
+ drivers/media/dvb/ttpci/av7110_hw.c | 35 +-
+ drivers/media/dvb/ttpci/av7110_hw.h | 3 +-
+ drivers/media/dvb/ttpci/fdump.c | 44 -
+ drivers/net/acenic.c | 117 +-
+ drivers/net/acenic.h | 4 +
+ drivers/net/acenic_firmware.h | 9456 -----------------------------
+ drivers/net/e100.c | 283 +-
+ drivers/net/starfire.c | 51 +-
+ drivers/net/starfire_firmware.h | 346 --
+ drivers/net/starfire_firmware.pl | 31 -
+ drivers/net/tg3.c | 789 +---
+ drivers/net/tg3.h | 4 +
+ drivers/scsi/advansys.c | 1731 +-----
+ drivers/scsi/ql1040_fw.h | 2130 -------
+ drivers/scsi/ql12160_fw.h | 1811 ------
+ drivers/scsi/ql1280_fw.h | 2048 -------
+ drivers/scsi/qla1280.c | 114 +-
+ drivers/scsi/qla1280.h | 6 +
+ drivers/scsi/qlogicpti.c | 63 +-
+ drivers/scsi/qlogicpti_asm.c | 1160 ----
+ firmware/Makefile | 20 +
+ firmware/WHENCE | 121 +
+ firmware/acenic/tg1.bin.ihex | 4573 ++++++++++++++
+ firmware/acenic/tg2.bin.ihex | 4844 +++++++++++++++
+ firmware/adaptec/starfire_rx.bin.ihex | 53 +
+ firmware/adaptec/starfire_tx.bin.ihex | 53 +
+ firmware/advansys/3550.bin.ihex | 317 +
+ firmware/advansys/38C0800.bin.ihex | 336 +
+ firmware/advansys/38C1600.bin.ihex | 398 ++
+ firmware/advansys/mcode.bin.ihex | 147 +
+ firmware/av7110/Boot.S | 109 +
+ firmware/av7110/bootcode.bin.ihex | 15 +
+ firmware/e100/d101m_ucode.bin.ihex | 38 +
+ firmware/e100/d101s_ucode.bin.ihex | 38 +
+ firmware/e100/d102e_ucode.bin.ihex | 38 +
+ firmware/qlogic/1040.bin.ihex | 2111 +++++++
+ firmware/qlogic/12160.bin.ihex | 1771 ++++++
+ firmware/qlogic/1280.bin.ihex | 2008 ++++++
+ firmware/qlogic/isp1000.bin.ihex | 1158 ++++
+ firmware/tigon/tg3.bin.ihex | 175 +
+ firmware/tigon/tg3_tso.bin.ihex | 446 ++
+ firmware/tigon/tg3_tso5.bin.ihex | 252 +
+ firmware/yamaha/yss225_registers.bin.ihex | 998 +++
+ sound/isa/Kconfig | 10 -
+ sound/isa/wavefront/wavefront_fx.c | 16 -
+ sound/isa/wavefront/yss225.c | 2739 ---------
+ 49 files changed, 20560 insertions(+), 22498 deletions(-)
+ delete mode 100644 drivers/media/dvb/ttpci/fdump.c
+ delete mode 100644 drivers/net/acenic_firmware.h
+ delete mode 100644 drivers/net/starfire_firmware.h
+ delete mode 100644 drivers/net/starfire_firmware.pl
+ delete mode 100644 drivers/scsi/ql1040_fw.h
+ delete mode 100644 drivers/scsi/ql12160_fw.h
+ delete mode 100644 drivers/scsi/ql1280_fw.h
+ delete mode 100644 drivers/scsi/qlogicpti_asm.c
+ create mode 100644 firmware/acenic/tg1.bin.ihex
+ create mode 100644 firmware/acenic/tg2.bin.ihex
+ create mode 100644 firmware/adaptec/starfire_rx.bin.ihex
+ create mode 100644 firmware/adaptec/starfire_tx.bin.ihex
+ create mode 100644 firmware/advansys/3550.bin.ihex
+ create mode 100644 firmware/advansys/38C0800.bin.ihex
+ create mode 100644 firmware/advansys/38C1600.bin.ihex
+ create mode 100644 firmware/advansys/mcode.bin.ihex
+ create mode 100644 firmware/av7110/Boot.S
+ create mode 100644 firmware/av7110/bootcode.bin.ihex
+ create mode 100644 firmware/e100/d101m_ucode.bin.ihex
+ create mode 100644 firmware/e100/d101s_ucode.bin.ihex
+ create mode 100644 firmware/e100/d102e_ucode.bin.ihex
+ create mode 100644 firmware/qlogic/1040.bin.ihex
+ create mode 100644 firmware/qlogic/12160.bin.ihex
+ create mode 100644 firmware/qlogic/1280.bin.ihex
+ create mode 100644 firmware/qlogic/isp1000.bin.ihex
+ create mode 100644 firmware/tigon/tg3.bin.ihex
+ create mode 100644 firmware/tigon/tg3_tso.bin.ihex
+ create mode 100644 firmware/tigon/tg3_tso5.bin.ihex
+ create mode 100644 firmware/yamaha/yss225_registers.bin.ihex
+ delete mode 100644 sound/isa/wavefront/yss225.c
+Merging pcmcia/master
+$ git merge pcmcia/master
+Merge made by recursive.
+ drivers/bluetooth/bluecard_cs.c | 2 +-
+ drivers/bluetooth/bt3c_cs.c | 6 ++++--
+ drivers/bluetooth/btuart_cs.c | 6 ++++--
+ drivers/bluetooth/dtl1_cs.c | 7 +++++--
+ drivers/char/pcmcia/synclink_cs.c | 2 +-
+ drivers/parport/parport_cs.c | 2 +-
+ drivers/pcmcia/pcmcia_resource.c | 3 ++-
+ drivers/scsi/fdomain.c | 2 ++
+ 8 files changed, 20 insertions(+), 10 deletions(-)
+Merging battery/master
+$ git merge battery/master
+Already up-to-date.
+Merging leds/for-mm
+$ git merge leds/for-mm
+Auto-merged drivers/leds/Kconfig
+Removed drivers/leds/leds-cm-x270.c
+Merge made by recursive.
+ drivers/leds/Kconfig | 25 +++++-
+ drivers/leds/Makefile | 4 +-
+ drivers/leds/led-class.c | 12 +--
+ drivers/leds/leds-ams-delta.c | 20 ++--
+ drivers/leds/leds-cm-x270.c | 124 ---------------------------
+ drivers/leds/leds-da903x.c | 175 ++++++++++++++++++++++++++++++++++++++
+ drivers/leds/leds-hp-disk.c | 156 +++++++++++++++++++++++++++++++++
+ drivers/leds/leds-pca955x.c | 2 +-
+ drivers/leds/leds-wrap.c | 5 +-
+ drivers/leds/ledtrig-backlight.c | 110 ++++++++++++++++++++++++
+ drivers/leds/ledtrig-timer.c | 8 +--
+ include/linux/leds.h | 4 +-
+ 12 files changed, 488 insertions(+), 157 deletions(-)
+ delete mode 100644 drivers/leds/leds-cm-x270.c
+ create mode 100644 drivers/leds/leds-da903x.c
+ create mode 100644 drivers/leds/leds-hp-disk.c
+ create mode 100644 drivers/leds/ledtrig-backlight.c
+$ git am -3 ../patches/0001-leds-acpi-fix-merge-fallout-from-acpi_driver_data-c.patch
+Applying leds/acpi: fix merge fallout from acpi_driver_data change
+$ git reset HEAD^
+drivers/leds/leds-hp-disk.c: needs update
+$ git add .
+$ git commit -v -a --amend
+Created commit 4e99334: Merge commit 'leds/for-mm'
+Merging backlight/for-mm
+$ git merge backlight/for-mm
+Auto-merged drivers/video/backlight/Kconfig
+Merge made by recursive.
+ arch/arm/mach-pxa/include/mach/tosa.h | 3 +
+ arch/arm/mach-pxa/tosa.c | 21 +++-
+ drivers/video/backlight/Kconfig | 32 ++++
+ drivers/video/backlight/Makefile | 4 +
+ drivers/video/backlight/da903x.c | 201 +++++++++++++++++++++++
+ drivers/video/backlight/kb3886_bl.c | 204 ++++++++++++++++++++++++
+ drivers/video/backlight/tosa_bl.c | 198 +++++++++++++++++++++++
+ drivers/video/backlight/tosa_lcd.c | 280 +++++++++++++++++++++++++++++++++
+ 8 files changed, 942 insertions(+), 1 deletions(-)
+ create mode 100644 drivers/video/backlight/da903x.c
+ create mode 100644 drivers/video/backlight/kb3886_bl.c
+ create mode 100644 drivers/video/backlight/tosa_bl.c
+ create mode 100644 drivers/video/backlight/tosa_lcd.c
+Merging kgdb/kgdb-next
+$ git merge kgdb/kgdb-next
+Merge made by recursive.
+ Documentation/DocBook/kgdb.tmpl | 49 ++++++++++++++---
+ drivers/char/tty_io.c | 105 +++++++++++++++++++++++++++++++-----
+ drivers/serial/8250.c | 4 ++
+ drivers/serial/amba-pl011.c | 5 ++-
+ drivers/serial/kgdboc.c | 82 +++++++++++++++++++++++++++-
+ drivers/serial/serial_core.c | 24 ++++++++-
+ drivers/serial/serial_txx9.c | 113 +++++++++++++++++++++++++++++++-------
+ include/linux/kgdb.h | 43 ++++++++++++++-
+ include/linux/serial_core.h | 3 +
+ include/linux/tty_driver.h | 8 +++-
+ kernel/kgdb.c | 33 ++++++++++-
+ 11 files changed, 417 insertions(+), 52 deletions(-)
+Merging slab/for-next
+$ git merge slab/for-next
+Auto-merged Documentation/kernel-parameters.txt
+Auto-merged MAINTAINERS
+Auto-merged init/main.c
+Auto-merged lib/Kconfig.debug
+Auto-merged mm/Makefile
+CONFLICT (content): Merge conflict in mm/Makefile
+Auto-merged mm/slob.c
+Auto-merged mm/slub.c
+Resolved 'mm/Makefile' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Created commit 825635c: Merge commit 'slab/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/debugfs-kmemtrace | 71 ++++++
+ Documentation/kernel-parameters.txt | 10 +
+ Documentation/vm/kmemtrace.txt | 126 ++++++++++
+ MAINTAINERS | 6 +
+ include/linux/kmemtrace.h | 86 +++++++
+ include/linux/slab.h | 8 +-
+ include/linux/slab_def.h | 68 +++++-
+ include/linux/slob_def.h | 9 +-
+ include/linux/slub_def.h | 53 ++++-
+ init/main.c | 2 +
+ kernel/relay.c | 7 +-
+ lib/Kconfig.debug | 20 ++
+ mm/Makefile | 1 +
+ mm/kmemtrace.c | 333 +++++++++++++++++++++++++++
+ mm/slab.c | 79 ++++++-
+ mm/slob.c | 37 +++-
+ mm/slub.c | 123 ++++++++---
+ 17 files changed, 969 insertions(+), 70 deletions(-)
+ create mode 100644 Documentation/ABI/testing/debugfs-kmemtrace
+ create mode 100644 Documentation/vm/kmemtrace.txt
+ create mode 100644 include/linux/kmemtrace.h
+ create mode 100644 mm/kmemtrace.c
+Merging uclinux/for-next
+$ git merge uclinux/for-next
+Already up-to-date.
+Merging md/for-next
+$ git merge md/for-next
+Already up-to-date.
+Merging kmemcheck/auto-kmemcheck-next
+$ git merge kmemcheck/auto-kmemcheck-next
+Auto-merged MAINTAINERS
+CONFLICT (content): Merge conflict in MAINTAINERS
+Auto-merged arch/x86/Kconfig.debug
+Auto-merged arch/x86/Makefile
+Auto-merged arch/x86/mm/fault.c
+Auto-merged include/linux/slab.h
+Auto-merged include/linux/slab_def.h
+Auto-merged init/main.c
+Auto-merged kernel/fork.c
+Auto-merged kernel/sysctl.c
+Auto-merged mm/Makefile
+Auto-merged mm/slab.c
+CONFLICT (content): Merge conflict in mm/slab.c
+Auto-merged mm/slub.c
+CONFLICT (content): Merge conflict in mm/slub.c
+Resolved 'MAINTAINERS' using previous resolution.
+Resolved 'mm/slab.c' using previous resolution.
+Resolved 'mm/slub.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Created commit 5d84760: Merge commit 'kmemcheck/auto-kmemcheck-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/kmemcheck.txt | 135 +++++++
+ MAINTAINERS | 8 +
+ arch/x86/Kconfig.debug | 87 +++++
+ arch/x86/Makefile | 5 +
+ arch/x86/kernel/cpu/common.c | 4 +
+ arch/x86/kernel/head_32.S | 2 +-
+ arch/x86/kernel/process.c | 2 +-
+ arch/x86/kernel/stacktrace.c | 7 +
+ arch/x86/kernel/traps.c | 5 +
+ arch/x86/mm/Makefile | 2 +
+ arch/x86/mm/fault.c | 18 +-
+ arch/x86/mm/init_32.c | 4 +-
+ arch/x86/mm/init_64.c | 2 +-
+ arch/x86/mm/kmemcheck/Makefile | 1 +
+ arch/x86/mm/kmemcheck/error.c | 229 +++++++++++
+ arch/x86/mm/kmemcheck/error.h | 15 +
+ arch/x86/mm/kmemcheck/kmemcheck.c | 752 +++++++++++++++++++++++++++++++++++++
+ arch/x86/mm/kmemcheck/opcode.c | 90 +++++
+ arch/x86/mm/kmemcheck/opcode.h | 10 +
+ arch/x86/mm/kmemcheck/pte.c | 22 ++
+ arch/x86/mm/kmemcheck/pte.h | 10 +
+ arch/x86/mm/kmemcheck/shadow.c | 124 ++++++
+ arch/x86/mm/kmemcheck/shadow.h | 16 +
+ include/asm-x86/dma-mapping.h | 2 +
+ include/asm-x86/kmemcheck.h | 42 ++
+ include/asm-x86/pgtable.h | 4 +-
+ include/asm-x86/pgtable_32.h | 6 +
+ include/asm-x86/pgtable_64.h | 6 +
+ include/asm-x86/string_32.h | 8 +
+ include/asm-x86/string_64.h | 8 +
+ include/linux/gfp.h | 3 +-
+ include/linux/interrupt.h | 14 +
+ include/linux/kmemcheck.h | 86 +++++
+ include/linux/mm_types.h | 3 +
+ include/linux/slab.h | 7 +
+ include/linux/slab_def.h | 81 ++++
+ include/linux/stacktrace.h | 3 +
+ init/main.c | 4 +
+ kernel/fork.c | 16 +-
+ kernel/softirq.c | 11 +
+ kernel/sysctl.c | 25 +-
+ mm/Makefile | 1 +
+ mm/kmemcheck.c | 103 +++++
+ mm/slab.c | 101 +----
+ mm/slub.c | 20 +-
+ 45 files changed, 1993 insertions(+), 111 deletions(-)
+ create mode 100644 Documentation/kmemcheck.txt
+ create mode 100644 arch/x86/mm/kmemcheck/Makefile
+ create mode 100644 arch/x86/mm/kmemcheck/error.c
+ create mode 100644 arch/x86/mm/kmemcheck/error.h
+ create mode 100644 arch/x86/mm/kmemcheck/kmemcheck.c
+ create mode 100644 arch/x86/mm/kmemcheck/opcode.c
+ create mode 100644 arch/x86/mm/kmemcheck/opcode.h
+ create mode 100644 arch/x86/mm/kmemcheck/pte.c
+ create mode 100644 arch/x86/mm/kmemcheck/pte.h
+ create mode 100644 arch/x86/mm/kmemcheck/shadow.c
+ create mode 100644 arch/x86/mm/kmemcheck/shadow.h
+ create mode 100644 include/asm-x86/kmemcheck.h
+ create mode 100644 include/linux/kmemcheck.h
+ create mode 100644 mm/kmemcheck.c
+Merging generic-ipi/auto-generic-ipi-next
+$ git merge generic-ipi/auto-generic-ipi-next
+Already up-to-date.
+Merging mfd/for-next
+$ git merge mfd/for-next
+Already up-to-date.
+Merging hdlc/hdlc-next
+$ git merge hdlc/hdlc-next
+Removed Documentation/DocBook/wanbook.tmpl
+Removed drivers/net/wan/syncppp.c
+Removed include/net/syncppp.h
+Merge made by recursive.
+ Documentation/DocBook/Makefile | 2 +-
+ Documentation/DocBook/networking.tmpl | 3 -
+ Documentation/DocBook/wanbook.tmpl | 99 --
+ Documentation/networking/generic-hdlc.txt | 8 +-
+ drivers/net/wan/Makefile | 2 +-
+ drivers/net/wan/c101.c | 6 +-
+ drivers/net/wan/{hd6457x.c => hd64570.c} | 254 ++----
+ drivers/net/wan/hd64572.c | 641 +++++++++++++
+ drivers/net/wan/hdlc_fr.c | 10 +-
+ drivers/net/wan/hdlc_ppp.c | 648 ++++++++++++-
+ drivers/net/wan/n2.c | 9 +-
+ drivers/net/wan/pc300_drv.c | 17 +-
+ drivers/net/wan/pc300too.c | 73 +-
+ drivers/net/wan/pci200syn.c | 77 +-
+ drivers/net/wan/syncppp.c | 1479 -----------------------------
+ include/linux/hdlc.h | 2 +-
+ include/net/syncppp.h | 102 --
+ 17 files changed, 1372 insertions(+), 2060 deletions(-)
+ delete mode 100644 Documentation/DocBook/wanbook.tmpl
+ rename drivers/net/wan/{hd6457x.c => hd64570.c} (78%)
+ create mode 100644 drivers/net/wan/hd64572.c
+ delete mode 100644 drivers/net/wan/syncppp.c
+ delete mode 100644 include/net/syncppp.h
+Merging drm/drm-next
+$ git merge drm/drm-next
+Already up-to-date.
+Merging voltage/for-linus
+$ git merge voltage/for-linus
+Auto-merged drivers/Kconfig
+Merge made by recursive.
+ drivers/Kconfig | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+Merging security-testing/next
+$ git merge security-testing/next
+Already up-to-date.
+Merging lblnet/master
+$ git merge lblnet/master
+Already up-to-date.
+Merging quilt/ttydev
+$ git merge quilt/ttydev
+Auto-merged drivers/char/tty_io.c
+Auto-merged include/linux/pci_ids.h
+Auto-merged include/linux/tty_driver.h
+Merge made by recursive.
+ Documentation/filesystems/devpts.txt | 132 ++++++
+ drivers/char/Kconfig | 11 +
+ drivers/char/n_tty.c | 741 +++++++++++++++++++++++++++-------
+ drivers/char/pty.c | 54 +++-
+ drivers/char/tty_io.c | 37 +-
+ drivers/char/tty_port.c | 2 +-
+ drivers/char/vt.c | 16 +-
+ drivers/parport/parport_pc.c | 20 +-
+ drivers/serial/8250_pci.c | 231 +++++++++++
+ drivers/serial/bfin_5xx.c | 239 ++++++-----
+ fs/devpts/inode.c | 472 +++++++++++++++++++---
+ include/linux/pci_ids.h | 8 +
+ include/linux/tty.h | 9 +-
+ include/linux/tty_driver.h | 6 +-
+ 14 files changed, 1622 insertions(+), 356 deletions(-)
+ create mode 100644 Documentation/filesystems/devpts.txt
+Merging agp/agp-next
+$ git merge agp/agp-next
+Already up-to-date.
+Merging creds/next-creds-subsys
+$ git merge creds/next-creds-subsys
+Auto-merged arch/ia64/ia32/sys_ia32.c
+Auto-merged arch/ia64/kernel/perfmon.c
+Auto-merged arch/ia64/kernel/signal.c
+Auto-merged arch/mips/kernel/vpe.c
+Auto-merged arch/x86/mm/fault.c
+Auto-merged drivers/gpu/drm/drm_fops.c
+Auto-merged drivers/usb/core/devio.c
+Auto-merged drivers/usb/core/inode.c
+Auto-merged fs/9p/vfs_inode.c
+Auto-merged fs/9p/vfs_super.c
+Auto-merged fs/binfmt_elf.c
+Auto-merged fs/binfmt_elf_fdpic.c
+Auto-merged fs/cifs/connect.c
+Auto-merged fs/cifs/inode.c
+Auto-merged fs/compat.c
+Auto-merged fs/devpts/inode.c
+CONFLICT (content): Merge conflict in fs/devpts/inode.c
+Auto-merged fs/dquot.c
+Auto-merged fs/ecryptfs/main.c
+Auto-merged fs/exec.c
+Auto-merged fs/exportfs/expfs.c
+Auto-merged fs/ext3/balloc.c
+Auto-merged fs/ext4/balloc.c
+Auto-merged fs/fat/inode.c
+Auto-merged fs/gfs2/inode.c
+Auto-merged fs/hfsplus/inode.c
+Auto-merged fs/hpfs/namei.c
+Auto-merged fs/jffs2/fs.c
+Auto-merged fs/locks.c
+Auto-merged fs/namei.c
+Auto-merged fs/namespace.c
+CONFLICT (content): Merge conflict in fs/namespace.c
+Auto-merged fs/nfsd/nfs4recover.c
+CONFLICT (content): Merge conflict in fs/nfsd/nfs4recover.c
+Auto-merged fs/nfsd/nfsfh.c
+Auto-merged fs/nfsd/vfs.c
+Auto-merged fs/proc/array.c
+Auto-merged fs/ramfs/inode.c
+Auto-merged fs/reiserfs/namei.c
+Auto-merged fs/ubifs/budget.c
+Auto-merged fs/udf/namei.c
+Auto-merged fs/xfs/linux-2.6/xfs_ioctl.c
+Auto-merged fs/xfs/xfs_inode.h
+Auto-merged include/linux/fs.h
+Removed include/linux/key-ui.h
+Auto-merged include/linux/sched.h
+CONFLICT (content): Merge conflict in include/linux/sched.h
+Auto-merged init/main.c
+Auto-merged ipc/mqueue.c
+Auto-merged ipc/shm.c
+Auto-merged kernel/Makefile
+Auto-merged kernel/cgroup.c
+Auto-merged kernel/exit.c
+CONFLICT (content): Merge conflict in kernel/exit.c
+Auto-merged kernel/fork.c
+CONFLICT (content): Merge conflict in kernel/fork.c
+Auto-merged kernel/futex.c
+Auto-merged kernel/kmod.c
+Auto-merged kernel/ptrace.c
+Auto-merged kernel/sched.c
+Auto-merged kernel/signal.c
+CONFLICT (content): Merge conflict in kernel/signal.c
+Auto-merged kernel/sys.c
+Auto-merged kernel/sysctl.c
+Auto-merged kernel/timer.c
+Auto-merged kernel/trace/trace.c
+Auto-merged kernel/workqueue.c
+Auto-merged lib/Makefile
+Auto-merged mm/mempolicy.c
+Auto-merged mm/migrate.c
+CONFLICT (content): Merge conflict in mm/migrate.c
+Auto-merged mm/shmem.c
+Auto-merged net/9p/client.c
+CONFLICT (content): Merge conflict in net/9p/client.c
+Auto-merged net/core/dev.c
+Auto-merged net/socket.c
+Auto-merged net/sunrpc/auth.c
+Auto-merged net/unix/af_unix.c
+Auto-merged security/selinux/hooks.c
+CONFLICT (content): Merge conflict in security/selinux/hooks.c
+Resolved 'fs/devpts/inode.c' using previous resolution.
+Resolved 'fs/namespace.c' using previous resolution.
+Resolved 'fs/nfsd/nfs4recover.c' using previous resolution.
+Resolved 'include/linux/sched.h' using previous resolution.
+Resolved 'kernel/exit.c' using previous resolution.
+Resolved 'kernel/fork.c' using previous resolution.
+Resolved 'kernel/signal.c' using previous resolution.
+Resolved 'mm/migrate.c' using previous resolution.
+Resolved 'net/9p/client.c' using previous resolution.
+Resolved 'security/selinux/hooks.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Created commit 6cbc4db: Merge commit 'creds/next-creds-subsys'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/credentials.txt | 582 +++++++++++++
+ arch/alpha/kernel/asm-offsets.c | 11 +-
+ arch/alpha/kernel/entry.S | 10 +-
+ arch/ia64/ia32/sys_ia32.c | 7 +-
+ arch/ia64/kernel/mca_drv.c | 2 +-
+ arch/ia64/kernel/perfmon.c | 43 +-
+ arch/ia64/kernel/signal.c | 4 +-
+ arch/mips/kernel/kspd.c | 4 +-
+ arch/mips/kernel/mips-mt-fpaff.c | 5 +-
+ arch/mips/kernel/vpe.c | 4 +-
+ arch/parisc/kernel/signal.c | 2 +-
+ arch/powerpc/mm/fault.c | 2 +-
+ arch/powerpc/platforms/cell/spufs/inode.c | 8 +-
+ arch/s390/hypfs/inode.c | 4 +-
+ arch/s390/kernel/compat_linux.c | 28 +-
+ arch/um/drivers/mconsole_kern.c | 3 +-
+ arch/x86/ia32/ia32_aout.c | 2 +-
+ arch/x86/mm/fault.c | 2 +-
+ drivers/block/loop.c | 6 +-
+ drivers/char/tty_audit.c | 6 +-
+ drivers/connector/cn_proc.c | 16 +-
+ drivers/isdn/capi/capifs.c | 4 +-
+ drivers/isdn/hysdn/hysdn_procconf.c | 6 +-
+ drivers/net/tun.c | 8 +-
+ drivers/usb/core/devio.c | 10 +-
+ drivers/usb/core/inode.c | 4 +-
+ fs/9p/fid.c | 2 +-
+ fs/9p/vfs_inode.c | 4 +-
+ fs/9p/vfs_super.c | 4 +-
+ fs/affs/inode.c | 4 +-
+ fs/affs/super.c | 4 +-
+ fs/anon_inodes.c | 4 +-
+ fs/attr.c | 4 +-
+ fs/autofs/inode.c | 4 +-
+ fs/autofs4/dev-ioctl.c | 3 +-
+ fs/autofs4/inode.c | 4 +-
+ fs/autofs4/waitq.c | 4 +-
+ fs/bfs/dir.c | 4 +-
+ fs/binfmt_aout.c | 2 +-
+ fs/binfmt_elf.c | 20 +-
+ fs/binfmt_elf_fdpic.c | 19 +-
+ fs/binfmt_flat.c | 2 +-
+ fs/binfmt_som.c | 2 +-
+ fs/cifs/cifs_fs_sb.h | 2 +-
+ fs/cifs/cifsproto.h | 2 +-
+ fs/cifs/connect.c | 4 +-
+ fs/cifs/dir.c | 12 +-
+ fs/cifs/inode.c | 8 +-
+ fs/cifs/ioctl.c | 2 +-
+ fs/cifs/misc.c | 4 +-
+ fs/coda/cache.c | 6 +-
+ fs/coda/file.c | 2 +-
+ fs/coda/upcall.c | 2 +-
+ fs/compat.c | 42 +-
+ fs/devpts/inode.c | 4 +-
+ fs/dquot.c | 4 +-
+ fs/ecryptfs/ecryptfs_kernel.h | 3 +-
+ fs/ecryptfs/kthread.c | 9 +-
+ fs/ecryptfs/main.c | 3 +-
+ fs/ecryptfs/messaging.c | 18 +-
+ fs/ecryptfs/miscdev.c | 20 +-
+ fs/exec.c | 183 +++--
+ fs/exportfs/expfs.c | 4 +-
+ fs/ext2/balloc.c | 2 +-
+ fs/ext2/ialloc.c | 4 +-
+ fs/ext3/balloc.c | 2 +-
+ fs/ext3/ialloc.c | 4 +-
+ fs/ext4/balloc.c | 5 +-
+ fs/ext4/ialloc.c | 4 +-
+ fs/fat/file.c | 2 +-
+ fs/fat/inode.c | 4 +-
+ fs/fcntl.c | 18 +-
+ fs/file_table.c | 10 +-
+ fs/fuse/dev.c | 4 +-
+ fs/fuse/dir.c | 25 +-
+ fs/gfs2/inode.c | 10 +-
+ fs/hfs/inode.c | 4 +-
+ fs/hfs/super.c | 4 +-
+ fs/hfsplus/inode.c | 4 +-
+ fs/hfsplus/options.c | 4 +-
+ fs/hpfs/namei.c | 24 +-
+ fs/hpfs/super.c | 4 +-
+ fs/hppfs/hppfs.c | 6 +-
+ fs/hugetlbfs/inode.c | 21 +-
+ fs/inotify_user.c | 2 +-
+ fs/internal.h | 6 +
+ fs/ioprio.c | 18 +-
+ fs/jfs/jfs_inode.c | 4 +-
+ fs/locks.c | 2 +-
+ fs/minix/bitmap.c | 4 +-
+ fs/namei.c | 10 +-
+ fs/namespace.c | 2 +-
+ fs/ncpfs/ioctl.c | 91 +--
+ fs/nfsctl.c | 3 +-
+ fs/nfsd/auth.c | 95 ++-
+ fs/nfsd/nfs4recover.c | 71 +-
+ fs/nfsd/nfsfh.c | 11 +-
+ fs/nfsd/vfs.c | 9 +-
+ fs/ocfs2/dlm/dlmfs.c | 8 +-
+ fs/ocfs2/namei.c | 4 +-
+ fs/omfs/inode.c | 8 +-
+ fs/open.c | 59 +-
+ fs/pipe.c | 4 +-
+ fs/posix_acl.c | 4 +-
+ fs/proc/array.c | 32 +-
+ fs/proc/base.c | 32 +-
+ fs/quota.c | 4 +-
+ fs/ramfs/inode.c | 4 +-
+ fs/reiserfs/namei.c | 4 +-
+ fs/smbfs/dir.c | 3 +-
+ fs/smbfs/inode.c | 2 +-
+ fs/smbfs/proc.c | 2 +-
+ fs/sysv/ialloc.c | 4 +-
+ fs/ubifs/budget.c | 2 +-
+ fs/ubifs/dir.c | 4 +-
+ fs/udf/ialloc.c | 4 +-
+ fs/udf/namei.c | 2 +-
+ fs/ufs/ialloc.c | 4 +-
+ fs/xfs/linux-2.6/xfs_cred.h | 6 +-
+ fs/xfs/linux-2.6/xfs_globals.h | 2 +-
+ fs/xfs/linux-2.6/xfs_ioctl.c | 5 +-
+ fs/xfs/xfs_acl.c | 6 +-
+ fs/xfs/xfs_inode.h | 2 +-
+ fs/xfs/xfs_vnodeops.h | 10 +-
+ include/keys/keyring-type.h | 31 +
+ include/linux/binfmts.h | 16 +-
+ include/linux/capability.h | 2 -
+ include/linux/cred.h | 340 +++++++-
+ include/linux/fs.h | 8 +-
+ include/linux/init_task.h | 13 +-
+ include/linux/key-ui.h | 66 --
+ include/linux/key.h | 32 +-
+ include/linux/keyctl.h | 4 +-
+ include/linux/sched.h | 64 +--
+ include/linux/securebits.h | 2 +-
+ include/linux/security.h | 326 ++++----
+ include/net/scm.h | 4 +-
+ init/main.c | 1 +
+ ipc/mqueue.c | 19 +-
+ ipc/shm.c | 9 +-
+ ipc/util.c | 18 +-
+ kernel/Makefile | 2 +-
+ kernel/acct.c | 7 +-
+ kernel/auditsc.c | 57 +-
+ kernel/capability.c | 268 +------
+ kernel/cgroup.c | 17 +-
+ kernel/cred-internals.h | 21 +
+ kernel/cred.c | 577 +++++++++++++
+ kernel/exit.c | 23 +-
+ kernel/fork.c | 47 +-
+ kernel/futex.c | 20 +-
+ kernel/futex_compat.c | 7 +-
+ kernel/kmod.c | 30 +-
+ kernel/ptrace.c | 29 +-
+ kernel/sched.c | 26 +-
+ kernel/signal.c | 60 +-
+ kernel/sys.c | 579 ++++++++------
+ kernel/sysctl.c | 2 +-
+ kernel/timer.c | 8 +-
+ kernel/trace/trace.c | 2 +-
+ kernel/tsacct.c | 6 +-
+ kernel/uid16.c | 31 +-
+ kernel/user.c | 37 +-
+ kernel/user_namespace.c | 14 +-
+ kernel/workqueue.c | 8 +-
+ lib/Makefile | 2 +-
+ lib/is_single_threaded.c | 45 +
+ mm/mempolicy.c | 9 +-
+ mm/migrate.c | 9 +-
+ mm/oom_kill.c | 6 +-
+ mm/shmem.c | 8 +-
+ net/9p/client.c | 2 +-
+ net/ax25/af_ax25.c | 2 +-
+ net/ax25/ax25_route.c | 2 +-
+ net/core/dev.c | 8 +-
+ net/core/scm.c | 10 +-
+ net/ipv4/netfilter/ipt_LOG.c | 4 +-
+ net/ipv6/ip6_flowlabel.c | 2 +-
+ net/ipv6/netfilter/ip6t_LOG.c | 4 +-
+ net/netfilter/nfnetlink_log.c | 5 +-
+ net/netfilter/xt_owner.c | 16 +-
+ net/netrom/af_netrom.c | 4 +-
+ net/rose/af_rose.c | 4 +-
+ net/rxrpc/ar-key.c | 6 +-
+ net/sched/cls_flow.c | 4 +-
+ net/socket.c | 4 +-
+ net/sunrpc/auth.c | 14 +-
+ net/unix/af_unix.c | 11 +-
+ security/capability.c | 56 +-
+ security/commoncap.c | 699 ++++++++++------
+ security/keys/internal.h | 47 +-
+ security/keys/key.c | 25 +-
+ security/keys/keyctl.c | 210 +++--
+ security/keys/keyring.c | 15 +-
+ security/keys/permission.c | 29 +-
+ security/keys/proc.c | 8 +-
+ security/keys/process_keys.c | 469 +++++------
+ security/keys/request_key.c | 133 ++--
+ security/keys/request_key_auth.c | 46 +-
+ security/root_plug.c | 13 +-
+ security/security.c | 96 +--
+ security/selinux/exports.c | 8 +-
+ security/selinux/hooks.c | 1151 ++++++++++++++------------
+ security/selinux/include/av_perm_to_string.h | 2 +
+ security/selinux/include/av_permissions.h | 2 +
+ security/selinux/include/class_to_string.h | 5 +
+ security/selinux/include/flask.h | 1 +
+ security/selinux/include/objsec.h | 11 -
+ security/selinux/selinuxfs.c | 13 +-
+ security/selinux/xfrm.c | 6 +-
+ security/smack/smack_access.c | 4 +-
+ security/smack/smack_lsm.c | 173 +++--
+ security/smack/smackfs.c | 6 +-
+ 213 files changed, 5063 insertions(+), 3100 deletions(-)
+ create mode 100644 Documentation/credentials.txt
+ create mode 100644 include/keys/keyring-type.h
+ delete mode 100644 include/linux/key-ui.h
+ create mode 100644 kernel/cred-internals.h
+ create mode 100644 kernel/cred.c
+ create mode 100644 lib/is_single_threaded.c
+Merging oprofile/auto-oprofile-next
+$ git merge oprofile/auto-oprofile-next
+Auto-merged drivers/oprofile/buffer_sync.c
+Auto-merged drivers/oprofile/cpu_buffer.c
+CONFLICT (content): Merge conflict in drivers/oprofile/cpu_buffer.c
+Auto-merged drivers/oprofile/event_buffer.h
+CONFLICT (content): Merge conflict in drivers/oprofile/event_buffer.h
+Recorded preimage for 'drivers/oprofile/cpu_buffer.c'
+Recorded preimage for 'drivers/oprofile/event_buffer.h'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/oprofile/cpu_buffer.c'.
+Recorded resolution for 'drivers/oprofile/event_buffer.h'.
+Created commit 2b0263f: Merge commit 'oprofile/auto-oprofile-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/alpha/oprofile/common.c | 2 +-
+ arch/ia64/oprofile/init.c | 4 +-
+ arch/ia64/oprofile/perfmon.c | 4 +-
+ arch/m32r/oprofile/init.c | 2 +-
+ arch/mips/oprofile/common.c | 2 +-
+ arch/mips/oprofile/op_impl.h | 2 +-
+ arch/mips/oprofile/op_model_rm9000.c | 2 +-
+ arch/parisc/oprofile/init.c | 2 +-
+ arch/powerpc/oprofile/op_model_cell.c | 2 +-
+ arch/sparc/oprofile/init.c | 2 +-
+ arch/sparc64/oprofile/init.c | 2 +-
+ arch/x86/oprofile/backtrace.c | 3 +-
+ arch/x86/oprofile/nmi_int.c | 173 +++++++++++++++++----------------
+ arch/x86/oprofile/op_counter.h | 18 ++--
+ arch/x86/oprofile/op_model_amd.c | 59 ++++++------
+ arch/x86/oprofile/op_model_p4.c | 32 +++---
+ arch/x86/oprofile/op_model_ppro.c | 120 +++++++++++++++++------
+ arch/x86/oprofile/op_x86_model.h | 13 ++-
+ drivers/oprofile/buffer_sync.c | 17 ++--
+ drivers/oprofile/buffer_sync.h | 4 +-
+ drivers/oprofile/cpu_buffer.c | 91 ++++++++----------
+ drivers/oprofile/cpu_buffer.h | 12 +-
+ drivers/oprofile/event_buffer.c | 34 +++---
+ drivers/oprofile/event_buffer.h | 10 +-
+ drivers/oprofile/oprof.c | 26 +++---
+ drivers/oprofile/oprof.h | 12 +-
+ drivers/oprofile/oprofile_files.c | 36 ++++----
+ drivers/oprofile/oprofile_stats.c | 24 +++---
+ drivers/oprofile/oprofile_stats.h | 10 +-
+ drivers/oprofile/oprofilefs.c | 78 ++++++++--------
+ drivers/oprofile/timer_int.c | 4 +-
+ 31 files changed, 431 insertions(+), 371 deletions(-)
+Merging fastboot/auto-fastboot-next
+$ git merge fastboot/auto-fastboot-next
+Already up-to-date.
+Merging sparseirq/auto-sparseirq-next
+$ git merge sparseirq/auto-sparseirq-next
+Merge made by recursive.
+ arch/x86/kernel/irq.c | 4 ++--
+ include/linux/irqnr.h | 6 +++---
+ kernel/irq/chip.c | 3 ++-
+ 3 files changed, 7 insertions(+), 6 deletions(-)
+Merging iommu/auto-iommu-next
+$ git merge iommu/auto-iommu-next
+Already up-to-date.
+Merging uwb/for-upstream
+$ git merge uwb/for-upstream
+Auto-merged CREDITS
+Auto-merged MAINTAINERS
+Auto-merged arch/arm/Kconfig
+Auto-merged arch/cris/Kconfig
+Auto-merged arch/h8300/Kconfig
+Auto-merged drivers/Kconfig
+Auto-merged drivers/Makefile
+Auto-merged drivers/usb/Kconfig
+Auto-merged drivers/usb/host/Kconfig
+Auto-merged include/linux/bitmap.h
+Auto-merged lib/bitmap.c
+Merge made by recursive.
+ CREDITS | 11 +
+ Documentation/ABI/testing/sysfs-bus-umc | 28 +
+ Documentation/ABI/testing/sysfs-bus-usb | 43 +
+ Documentation/ABI/testing/sysfs-class-usb_host | 25 +
+ Documentation/ABI/testing/sysfs-class-uwb_rc | 144 ++
+ Documentation/ABI/testing/sysfs-wusb_cbaf | 100 ++
+ Documentation/usb/WUSB-Design-overview.txt | 448 ++++++
+ Documentation/usb/wusb-cbaf | 139 ++
+ MAINTAINERS | 17 +
+ arch/arm/Kconfig | 2 +
+ arch/cris/Kconfig | 2 +
+ arch/h8300/Kconfig | 2 +
+ drivers/Kconfig | 2 +
+ drivers/Makefile | 1 +
+ drivers/usb/Kconfig | 2 +
+ drivers/usb/Makefile | 3 +
+ drivers/usb/host/Kconfig | 28 +
+ drivers/usb/host/Makefile | 3 +
+ drivers/usb/host/hwa-hc.c | 925 +++++++++++
+ drivers/usb/host/whci/Kbuild | 11 +
+ drivers/usb/host/whci/asl.c | 367 +++++
+ drivers/usb/host/whci/hcd.c | 339 ++++
+ drivers/usb/host/whci/hw.c | 87 ++
+ drivers/usb/host/whci/init.c | 188 +++
+ drivers/usb/host/whci/int.c | 95 ++
+ drivers/usb/host/whci/pzl.c | 398 +++++
+ drivers/usb/host/whci/qset.c | 567 +++++++
+ drivers/usb/host/whci/whcd.h | 197 +++
+ drivers/usb/host/whci/whci-hc.h | 416 +++++
+ drivers/usb/host/whci/wusb.c | 241 +++
+ drivers/usb/wusbcore/Kconfig | 41 +
+ drivers/usb/wusbcore/Makefile | 26 +
+ drivers/usb/wusbcore/cbaf.c | 673 ++++++++
+ drivers/usb/wusbcore/crypto.c | 538 +++++++
+ drivers/usb/wusbcore/dev-sysfs.c | 143 ++
+ drivers/usb/wusbcore/devconnect.c | 1297 ++++++++++++++++
+ drivers/usb/wusbcore/mmc.c | 321 ++++
+ drivers/usb/wusbcore/pal.c | 42 +
+ drivers/usb/wusbcore/reservation.c | 115 ++
+ drivers/usb/wusbcore/rh.c | 477 ++++++
+ drivers/usb/wusbcore/security.c | 642 ++++++++
+ drivers/usb/wusbcore/wa-hc.c | 95 ++
+ drivers/usb/wusbcore/wa-hc.h | 417 +++++
+ drivers/usb/wusbcore/wa-nep.c | 310 ++++
+ drivers/usb/wusbcore/wa-rpipe.c | 562 +++++++
+ drivers/usb/wusbcore/wa-xfer.c | 1709 +++++++++++++++++++++
+ drivers/usb/wusbcore/wusbhc.c | 418 +++++
+ drivers/usb/wusbcore/wusbhc.h | 495 ++++++
+ drivers/uwb/Kconfig | 90 ++
+ drivers/uwb/Makefile | 29 +
+ drivers/uwb/address.c | 374 +++++
+ drivers/uwb/beacon.c | 642 ++++++++
+ drivers/uwb/driver.c | 144 ++
+ drivers/uwb/drp-avail.c | 288 ++++
+ drivers/uwb/drp-ie.c | 232 +++
+ drivers/uwb/drp.c | 461 ++++++
+ drivers/uwb/est.c | 477 ++++++
+ drivers/uwb/hwa-rc.c | 926 +++++++++++
+ drivers/uwb/i1480/Makefile | 2 +
+ drivers/uwb/i1480/dfu/Makefile | 9 +
+ drivers/uwb/i1480/dfu/dfu.c | 217 +++
+ drivers/uwb/i1480/dfu/i1480-dfu.h | 260 ++++
+ drivers/uwb/i1480/dfu/mac.c | 527 +++++++
+ drivers/uwb/i1480/dfu/phy.c | 203 +++
+ drivers/uwb/i1480/dfu/usb.c | 500 ++++++
+ drivers/uwb/i1480/i1480-est.c | 99 ++
+ drivers/uwb/i1480/i1480-wlp.h | 200 +++
+ drivers/uwb/i1480/i1480u-wlp/Makefile | 8 +
+ drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h | 284 ++++
+ drivers/uwb/i1480/i1480u-wlp/lc.c | 421 +++++
+ drivers/uwb/i1480/i1480u-wlp/netdev.c | 368 +++++
+ drivers/uwb/i1480/i1480u-wlp/rx.c | 486 ++++++
+ drivers/uwb/i1480/i1480u-wlp/sysfs.c | 408 +++++
+ drivers/uwb/i1480/i1480u-wlp/tx.c | 632 ++++++++
+ drivers/uwb/ie.c | 541 +++++++
+ drivers/uwb/lc-dev.c | 492 ++++++
+ drivers/uwb/lc-rc.c | 495 ++++++
+ drivers/uwb/neh.c | 616 ++++++++
+ drivers/uwb/pal.c | 91 ++
+ drivers/uwb/reset.c | 362 +++++
+ drivers/uwb/rsv.c | 680 +++++++++
+ drivers/uwb/scan.c | 133 ++
+ drivers/uwb/umc-bus.c | 218 +++
+ drivers/uwb/umc-dev.c | 104 ++
+ drivers/uwb/umc-drv.c | 31 +
+ drivers/uwb/uwb-debug.c | 367 +++++
+ drivers/uwb/uwb-internal.h | 305 ++++
+ drivers/uwb/uwbd.c | 410 +++++
+ drivers/uwb/whc-rc.c | 520 +++++++
+ drivers/uwb/whci.c | 269 ++++
+ drivers/uwb/wlp/Makefile | 10 +
+ drivers/uwb/wlp/driver.c | 43 +
+ drivers/uwb/wlp/eda.c | 449 ++++++
+ drivers/uwb/wlp/messages.c | 1946 ++++++++++++++++++++++++
+ drivers/uwb/wlp/sysfs.c | 709 +++++++++
+ drivers/uwb/wlp/txrx.c | 374 +++++
+ drivers/uwb/wlp/wlp-internal.h | 228 +++
+ drivers/uwb/wlp/wlp-lc.c | 585 +++++++
+ drivers/uwb/wlp/wss-lc.c | 1055 +++++++++++++
+ include/linux/bitmap.h | 1 +
+ include/linux/usb/wusb-wa.h | 271 ++++
+ include/linux/usb/wusb.h | 376 +++++
+ include/linux/uwb.h | 765 ++++++++++
+ include/linux/uwb/debug-cmd.h | 57 +
+ include/linux/uwb/debug.h | 82 +
+ include/linux/uwb/spec.h | 727 +++++++++
+ include/linux/uwb/umc.h | 194 +++
+ include/linux/uwb/whci.h | 117 ++
+ include/linux/wlp.h | 735 +++++++++
+ lib/bitmap.c | 22 +
+ 110 files changed, 35819 insertions(+), 0 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-bus-umc
+ create mode 100644 Documentation/ABI/testing/sysfs-class-usb_host
+ create mode 100644 Documentation/ABI/testing/sysfs-class-uwb_rc
+ create mode 100644 Documentation/ABI/testing/sysfs-wusb_cbaf
+ create mode 100644 Documentation/usb/WUSB-Design-overview.txt
+ create mode 100644 Documentation/usb/wusb-cbaf
+ create mode 100644 drivers/usb/host/hwa-hc.c
+ create mode 100644 drivers/usb/host/whci/Kbuild
+ create mode 100644 drivers/usb/host/whci/asl.c
+ create mode 100644 drivers/usb/host/whci/hcd.c
+ create mode 100644 drivers/usb/host/whci/hw.c
+ create mode 100644 drivers/usb/host/whci/init.c
+ create mode 100644 drivers/usb/host/whci/int.c
+ create mode 100644 drivers/usb/host/whci/pzl.c
+ create mode 100644 drivers/usb/host/whci/qset.c
+ create mode 100644 drivers/usb/host/whci/whcd.h
+ create mode 100644 drivers/usb/host/whci/whci-hc.h
+ create mode 100644 drivers/usb/host/whci/wusb.c
+ create mode 100644 drivers/usb/wusbcore/Kconfig
+ create mode 100644 drivers/usb/wusbcore/Makefile
+ create mode 100644 drivers/usb/wusbcore/cbaf.c
+ create mode 100644 drivers/usb/wusbcore/crypto.c
+ create mode 100644 drivers/usb/wusbcore/dev-sysfs.c
+ create mode 100644 drivers/usb/wusbcore/devconnect.c
+ create mode 100644 drivers/usb/wusbcore/mmc.c
+ create mode 100644 drivers/usb/wusbcore/pal.c
+ create mode 100644 drivers/usb/wusbcore/reservation.c
+ create mode 100644 drivers/usb/wusbcore/rh.c
+ create mode 100644 drivers/usb/wusbcore/security.c
+ create mode 100644 drivers/usb/wusbcore/wa-hc.c
+ create mode 100644 drivers/usb/wusbcore/wa-hc.h
+ create mode 100644 drivers/usb/wusbcore/wa-nep.c
+ create mode 100644 drivers/usb/wusbcore/wa-rpipe.c
+ create mode 100644 drivers/usb/wusbcore/wa-xfer.c
+ create mode 100644 drivers/usb/wusbcore/wusbhc.c
+ create mode 100644 drivers/usb/wusbcore/wusbhc.h
+ create mode 100644 drivers/uwb/Kconfig
+ create mode 100644 drivers/uwb/Makefile
+ create mode 100644 drivers/uwb/address.c
+ create mode 100644 drivers/uwb/beacon.c
+ create mode 100644 drivers/uwb/driver.c
+ create mode 100644 drivers/uwb/drp-avail.c
+ create mode 100644 drivers/uwb/drp-ie.c
+ create mode 100644 drivers/uwb/drp.c
+ create mode 100644 drivers/uwb/est.c
+ create mode 100644 drivers/uwb/hwa-rc.c
+ create mode 100644 drivers/uwb/i1480/Makefile
+ create mode 100644 drivers/uwb/i1480/dfu/Makefile
+ create mode 100644 drivers/uwb/i1480/dfu/dfu.c
+ create mode 100644 drivers/uwb/i1480/dfu/i1480-dfu.h
+ create mode 100644 drivers/uwb/i1480/dfu/mac.c
+ create mode 100644 drivers/uwb/i1480/dfu/phy.c
+ create mode 100644 drivers/uwb/i1480/dfu/usb.c
+ create mode 100644 drivers/uwb/i1480/i1480-est.c
+ create mode 100644 drivers/uwb/i1480/i1480-wlp.h
+ create mode 100644 drivers/uwb/i1480/i1480u-wlp/Makefile
+ create mode 100644 drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h
+ create mode 100644 drivers/uwb/i1480/i1480u-wlp/lc.c
+ create mode 100644 drivers/uwb/i1480/i1480u-wlp/netdev.c
+ create mode 100644 drivers/uwb/i1480/i1480u-wlp/rx.c
+ create mode 100644 drivers/uwb/i1480/i1480u-wlp/sysfs.c
+ create mode 100644 drivers/uwb/i1480/i1480u-wlp/tx.c
+ create mode 100644 drivers/uwb/ie.c
+ create mode 100644 drivers/uwb/lc-dev.c
+ create mode 100644 drivers/uwb/lc-rc.c
+ create mode 100644 drivers/uwb/neh.c
+ create mode 100644 drivers/uwb/pal.c
+ create mode 100644 drivers/uwb/reset.c
+ create mode 100644 drivers/uwb/rsv.c
+ create mode 100644 drivers/uwb/scan.c
+ create mode 100644 drivers/uwb/umc-bus.c
+ create mode 100644 drivers/uwb/umc-dev.c
+ create mode 100644 drivers/uwb/umc-drv.c
+ create mode 100644 drivers/uwb/uwb-debug.c
+ create mode 100644 drivers/uwb/uwb-internal.h
+ create mode 100644 drivers/uwb/uwbd.c
+ create mode 100644 drivers/uwb/whc-rc.c
+ create mode 100644 drivers/uwb/whci.c
+ create mode 100644 drivers/uwb/wlp/Makefile
+ create mode 100644 drivers/uwb/wlp/driver.c
+ create mode 100644 drivers/uwb/wlp/eda.c
+ create mode 100644 drivers/uwb/wlp/messages.c
+ create mode 100644 drivers/uwb/wlp/sysfs.c
+ create mode 100644 drivers/uwb/wlp/txrx.c
+ create mode 100644 drivers/uwb/wlp/wlp-internal.h
+ create mode 100644 drivers/uwb/wlp/wlp-lc.c
+ create mode 100644 drivers/uwb/wlp/wss-lc.c
+ create mode 100644 include/linux/usb/wusb-wa.h
+ create mode 100644 include/linux/usb/wusb.h
+ create mode 100644 include/linux/uwb.h
+ create mode 100644 include/linux/uwb/debug-cmd.h
+ create mode 100644 include/linux/uwb/debug.h
+ create mode 100644 include/linux/uwb/spec.h
+ create mode 100644 include/linux/uwb/umc.h
+ create mode 100644 include/linux/uwb/whci.h
+ create mode 100644 include/linux/wlp.h
+Merging watchdog/master
+$ git merge watchdog/master
+Merge made by recursive.
+ drivers/watchdog/i6300esb.c | 3 +-
+ drivers/watchdog/ib700wdt.c | 49 +++++++++++++++-----------------------
+ drivers/watchdog/w83697ug_wdt.c | 2 +-
+ 3 files changed, 21 insertions(+), 33 deletions(-)
+Merging bdev/master
+$ git merge bdev/master
+Auto-merged drivers/block/loop.c
+Auto-merged drivers/md/dm-linear.c
+Auto-merged drivers/md/dm-mpath.c
+Auto-merged drivers/md/dm-table.c
+Auto-merged drivers/md/dm.c
+Auto-merged drivers/message/i2o/i2o_block.c
+Auto-merged drivers/scsi/sd.c
+Auto-merged fs/block_dev.c
+Auto-merged fs/ext3/super.c
+Auto-merged fs/ext4/super.c
+Auto-merged fs/file_table.c
+Auto-merged fs/locks.c
+Auto-merged fs/open.c
+Auto-merged fs/proc/base.c
+Auto-merged fs/super.c
+Auto-merged fs/xfs/linux-2.6/xfs_super.c
+Auto-merged include/linux/device-mapper.h
+Auto-merged include/linux/fs.h
+Auto-merged ipc/shm.c
+Merge made by recursive.
+ arch/um/drivers/ubd_kern.c | 19 ++--
+ block/bsg.c | 9 +-
+ block/cmd-filter.c | 2 +-
+ block/compat_ioctl.c | 175 ++++++++++++++---------------------
+ block/ioctl.c | 173 ++++++++++++++++++-----------------
+ block/scsi_ioctl.c | 33 +++----
+ drivers/block/DAC960.c | 6 +-
+ drivers/block/amiflop.c | 46 +++++-----
+ drivers/block/aoe/aoeblk.c | 12 +--
+ drivers/block/ataflop.c | 37 ++++----
+ drivers/block/brd.c | 5 +-
+ drivers/block/cciss.c | 71 +++++++-------
+ drivers/block/cpqarray.c | 28 +++---
+ drivers/block/floppy.c | 54 +++++------
+ drivers/block/loop.c | 59 ++++++------
+ drivers/block/nbd.c | 28 +++---
+ drivers/block/paride/pcd.c | 21 ++--
+ drivers/block/paride/pd.c | 14 ++--
+ drivers/block/paride/pf.c | 22 ++--
+ drivers/block/paride/pt.c | 2 +-
+ drivers/block/pktcdvd.c | 56 ++++++------
+ drivers/block/swim3.c | 32 +++---
+ drivers/block/ub.c | 22 ++---
+ drivers/block/viodasd.c | 10 +-
+ drivers/block/virtio_blk.c | 8 +-
+ drivers/block/xd.c | 4 +-
+ drivers/block/xd.h | 2 +-
+ drivers/block/xen-blkfront.c | 15 ++--
+ drivers/block/xsysace.c | 11 +-
+ drivers/block/z2ram.c | 7 +-
+ drivers/cdrom/cdrom.c | 23 ++---
+ drivers/cdrom/gdrom.c | 14 ++--
+ drivers/cdrom/viocd.c | 21 ++--
+ drivers/char/nvram.c | 6 +-
+ drivers/char/raw.c | 8 +-
+ drivers/ide/ide-cd.c | 22 ++---
+ drivers/ide/ide-disk.h | 2 +-
+ drivers/ide/ide-disk_ioctl.c | 5 +-
+ drivers/ide/ide-floppy.h | 4 +-
+ drivers/ide/ide-floppy_ioctl.c | 17 ++--
+ drivers/ide/ide-gd.c | 20 ++--
+ drivers/ide/ide-ioctls.c | 3 +-
+ drivers/ide/ide-tape.c | 17 +--
+ drivers/md/dm-ioctl.c | 4 +-
+ drivers/md/dm-linear.c | 13 +--
+ drivers/md/dm-mpath.c | 14 +--
+ drivers/md/dm-table.c | 16 ++--
+ drivers/md/dm.c | 27 ++----
+ drivers/md/md.c | 20 ++--
+ drivers/memstick/core/mspro_block.c | 9 +-
+ drivers/message/i2o/i2o_block.c | 13 +--
+ drivers/mmc/card/block.c | 13 +--
+ drivers/mtd/devices/block2mtd.c | 4 +-
+ drivers/mtd/mtd_blkdevs.c | 24 ++---
+ drivers/mtd/mtdchar.c | 10 +-
+ drivers/parisc/eisa_eeprom.c | 2 +-
+ drivers/s390/block/dasd.c | 11 +--
+ drivers/s390/block/dasd_genhd.c | 4 +-
+ drivers/s390/block/dasd_int.h | 3 +-
+ drivers/s390/block/dasd_ioctl.c | 15 +---
+ drivers/s390/block/dcssblk.c | 17 ++--
+ drivers/s390/char/tape_block.c | 25 ++---
+ drivers/scsi/ide-scsi.c | 22 ++---
+ drivers/scsi/scsi_ioctl.c | 6 +-
+ drivers/scsi/sd.c | 35 +++----
+ drivers/scsi/sg.c | 2 +-
+ drivers/scsi/sr.c | 40 ++++-----
+ drivers/scsi/st.c | 7 +-
+ fs/block_dev.c | 111 ++++++++++------------
+ fs/ext2/xip.c | 1 +
+ fs/ext3/super.c | 4 +-
+ fs/ext4/super.c | 4 +-
+ fs/fifo.c | 6 +-
+ fs/file_table.c | 4 +-
+ fs/hostfs/hostfs_kern.c | 5 +-
+ fs/jfs/jfs_logmgr.c | 4 +-
+ fs/locks.c | 3 +-
+ fs/ocfs2/cluster/heartbeat.c | 6 +-
+ fs/open.c | 2 +-
+ fs/partitions/check.c | 4 +-
+ fs/proc/base.c | 4 +-
+ fs/reiserfs/journal.c | 11 ++-
+ fs/super.c | 14 ++-
+ fs/xfs/linux-2.6/xfs_super.c | 4 +-
+ include/linux/blkdev.h | 27 +++++-
+ include/linux/cdrom.h | 10 +-
+ include/linux/device-mapper.h | 11 +-
+ include/linux/file.h | 4 +-
+ include/linux/fs.h | 49 ++++------
+ include/linux/fsnotify.h | 2 +-
+ include/linux/ide.h | 7 +-
+ include/linux/reiserfs_fs_sb.h | 1 +
+ include/linux/types.h | 1 +
+ include/scsi/scsi_ioctl.h | 2 +-
+ ipc/shm.c | 2 +-
+ kernel/power/disk.c | 2 +-
+ kernel/power/power.h | 2 +-
+ kernel/power/swap.c | 14 ++--
+ sound/core/oss/pcm_oss.c | 2 +-
+ sound/oss/au1550_ac97.c | 2 +-
+ sound/oss/dmasound/dmasound.h | 4 +-
+ sound/oss/dmasound/dmasound_atari.c | 4 +-
+ sound/oss/dmasound/dmasound_core.c | 10 +-
+ sound/oss/msnd.h | 2 +-
+ sound/oss/sound_config.h | 20 +---
+ sound/oss/swarm_cs4297a.c | 2 +-
+ sound/oss/vwsnd.c | 2 +-
+ 107 files changed, 868 insertions(+), 1002 deletions(-)
+Merging dwmw2-iommu/master
+$ git merge dwmw2-iommu/master
+Auto-merged MAINTAINERS
+Merge made by recursive.
+ MAINTAINERS | 7 +
+ arch/x86/kernel/amd_iommu_init.c | 2 +-
+ arch/x86/kernel/pci-dma.c | 16 ---
+ drivers/pci/dmar.c | 119 +++++++++++++-----
+ drivers/pci/intel-iommu.c | 250 ++++++++++++++++++++------------------
+ drivers/pci/quirks.c | 14 ++
+ include/asm-x86/iommu.h | 4 +
+ include/linux/dma_remapping.h | 27 ++--
+ include/linux/intel-iommu.h | 66 ++++++++---
+ 9 files changed, 305 insertions(+), 200 deletions(-)
+Merging scsi-post-merge/master
+$ git merge scsi-post-merge/master
+Already up-to-date.
+$ git am -3 ../patches/0001-sparc-qlogicpti-fallout-from-sbus-removal.patch
+Applying sparc: qlogicpti fallout from sbus removal
+$ git am -3 ../patches/Fix_page_cgroup_build_breakage
+Applying Fix page_cgroup build breakage
+$ git am -3 ../patches/0001-mfd-wm8350-don-t-export-static-functions.patch
+Applying mfd/wm8350: don't export static functions