$ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at 28d0325 Linux 2.6.31-rc1 Merging origin/master $ git merge origin/master Updating 28d0325..987fed3 Fast forward arch/um/drivers/slip_kern.c | 1 - arch/um/drivers/slirp_kern.c | 1 - arch/um/include/asm/dma-mapping.h | 4 +- drivers/gpu/drm/Kconfig | 1 + drivers/gpu/drm/Makefile | 2 +- drivers/gpu/drm/drm_edid.c | 12 +- drivers/gpu/drm/i915/Makefile | 2 + drivers/gpu/drm/i915/dvo.h | 4 +- drivers/gpu/drm/i915/dvo_ch7017.c | 20 +- drivers/gpu/drm/i915/dvo_ch7xxx.c | 25 +- drivers/gpu/drm/i915/dvo_ivch.c | 21 +- drivers/gpu/drm/i915/dvo_sil164.c | 25 +- drivers/gpu/drm/i915/dvo_tfp410.c | 25 +- drivers/gpu/drm/i915/i915_drv.c | 4 +- drivers/gpu/drm/i915/i915_drv.h | 12 + drivers/gpu/drm/i915/i915_gem.c | 19 +- drivers/gpu/drm/i915/i915_gem_debug.c | 6 +- drivers/gpu/drm/i915/i915_gem_tiling.c | 2 + drivers/gpu/drm/i915/i915_irq.c | 12 +- drivers/gpu/drm/i915/i915_reg.h | 29 + drivers/gpu/drm/i915/i915_suspend.c | 34 +- drivers/gpu/drm/i915/intel_bios.c | 12 +- drivers/gpu/drm/i915/intel_display.c | 199 ++++-- drivers/gpu/drm/i915/intel_dp.c | 1153 ++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_dp.h | 144 ++++ drivers/gpu/drm/i915/intel_dp_i2c.c | 272 ++++++++ drivers/gpu/drm/i915/intel_drv.h | 17 +- drivers/gpu/drm/i915/intel_dvo.c | 16 +- drivers/gpu/drm/i915/intel_hdmi.c | 35 +- drivers/gpu/drm/i915/intel_i2c.c | 16 +- drivers/gpu/drm/i915/intel_lvds.c | 344 +++++++++- drivers/gpu/drm/i915/intel_modes.c | 14 +- drivers/gpu/drm/i915/intel_sdvo.c | 72 +-- drivers/gpu/drm/i915/intel_tv.c | 53 +- drivers/gpu/drm/radeon/radeon_device.c | 22 +- drivers/gpu/drm/radeon/radeon_drv.c | 2 +- drivers/gpu/drm/radeon/radeon_fb.c | 33 +- drivers/gpu/drm/radeon/radeon_object.c | 30 - drivers/gpu/drm/ttm/ttm_bo_util.c | 1 - drivers/gpu/drm/ttm/ttm_bo_vm.c | 1 - drivers/gpu/drm/ttm/ttm_tt.c | 1 - drivers/i2c/busses/Kconfig | 1 + drivers/ide/cs5520.c | 1 + drivers/ide/ide-cd.c | 10 +- drivers/ide/ide-dma.c | 21 - drivers/ide/ide-io.c | 54 +- drivers/ide/ide-iops.c | 4 +- drivers/ide/ide-probe.c | 23 +- drivers/usb/class/cdc-acm.c | 4 +- drivers/usb/serial/usb-serial.c | 3 + include/drm/drm_edid.h | 38 +- include/linux/ide.h | 2 - include/linux/mm.h | 2 +- kernel/futex.c | 2 +- mm/memory.c | 26 +- mm/nommu.c | 12 +- 56 files changed, 2472 insertions(+), 429 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_dp.c create mode 100644 drivers/gpu/drm/i915/intel_dp.h create mode 100644 drivers/gpu/drm/i915/intel_dp_i2c.c Merging fixes/fixes $ git merge fixes/fixes Merge made by recursive. scripts/pnmtologo.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Merging arm-current/master $ git merge arm-current/master Merge made by recursive. MAINTAINERS | 43 ++++++++++++++++++++++++++ arch/arm/Kconfig.debug | 8 ----- arch/arm/configs/s3c2410_defconfig | 2 +- arch/arm/configs/s3c6400_defconfig | 1 - arch/arm/configs/tct_hammer_defconfig | 1 - arch/arm/include/asm/page.h | 2 +- arch/arm/kernel/irq.c | 24 +++----------- arch/arm/kernel/vmlinux.lds.S | 15 +++++---- arch/arm/mach-omap1/board-nokia770.c | 3 +- arch/arm/mach-omap1/mailbox.c | 2 +- arch/arm/mach-omap2/board-rx51-peripherals.c | 1 + arch/arm/mach-omap2/gpmc-onenand.c | 21 +++++++++++- arch/arm/mach-omap2/id.c | 22 +++++++++++++ arch/arm/mach-omap2/mailbox.c | 6 ++-- arch/arm/mach-omap2/mmc-twl4030.c | 13 +++++++- arch/arm/mach-s3c2440/mach-mini2440.c | 3 +- arch/arm/mach-s3c2442/mach-gta02.c | 3 +- arch/arm/plat-omap/dma.c | 13 ++++++++ arch/arm/plat-omap/gpio.c | 1 + arch/arm/plat-omap/include/mach/cpu.h | 22 ++++++------ arch/arm/plat-omap/include/mach/dma.h | 15 +++++++++ arch/arm/plat-omap/include/mach/io.h | 2 +- arch/arm/plat-omap/iommu.c | 2 +- arch/arm/plat-omap/sram.c | 7 +++- arch/arm/plat-s3c/Makefile | 2 +- arch/arm/plat-s3c/include/plat/devs.h | 1 + arch/arm/plat-s3c24xx/Makefile | 2 +- arch/arm/plat-s3c24xx/spi-bus0-gpe11_12_13.c | 3 +- arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c | 3 +- 29 files changed, 174 insertions(+), 69 deletions(-) Merging m68k-current/for-linus $ git merge m68k-current/for-linus Already up-to-date. Merging powerpc-merge/merge $ git merge powerpc-merge/merge Already up-to-date. Merging sparc-current/master $ git merge sparc-current/master Already up-to-date. Merging scsi-rc-fixes/master $ git merge scsi-rc-fixes/master Merge made by recursive. drivers/scsi/fnic/fnic_main.c | 8 ++++---- drivers/scsi/fnic/fnic_scsi.c | 7 ++----- drivers/scsi/ibmvscsi/ibmvscsi.c | 7 ++++++- drivers/scsi/zalon.c | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) Merging net-current/master $ git merge net-current/master Merge made by recursive. drivers/net/cpmac.c | 2 +- net/xfrm/xfrm_algo.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) Merging sound-current/for-linus $ git merge sound-current/for-linus Already up-to-date. 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. drivers/base/base.h | 5 +++++ drivers/base/core.c | 20 ++++++++++++++------ drivers/base/dd.c | 31 +++++++++++++++++++++++++++++-- drivers/base/devres.c | 3 +++ drivers/power/wm97xx_battery.c | 4 ++-- drivers/video/omap/omapfb_main.c | 14 +++++++------- fs/partitions/check.c | 2 +- include/linux/device.h | 16 ++++------------ sound/soc/codecs/wm8988.c | 4 ++-- 9 files changed, 67 insertions(+), 32 deletions(-) Merging quilt/usb.current $ git merge quilt/usb.current Removing drivers/usb/otg/langwell_otg.c Removing include/linux/usb/langwell_otg.h Merge made by recursive. drivers/usb/gadget/Kconfig | 42 +- drivers/usb/gadget/audio.c | 6 +- drivers/usb/host/ehci-hcd.c | 35 +- drivers/usb/host/ehci-q.c | 19 +- drivers/usb/host/fhci-sched.c | 8 +- drivers/usb/host/isp1760-if.c | 2 +- drivers/usb/otg/Kconfig | 14 - drivers/usb/otg/Makefile | 1 - drivers/usb/otg/langwell_otg.c | 1915 -------------------------------------- drivers/usb/serial/ftdi_sio.c | 3 + drivers/usb/serial/ftdi_sio.h | 3 + drivers/usb/serial/option.c | 12 +- drivers/usb/serial/pl2303.c | 1 + drivers/usb/serial/pl2303.h | 4 + include/linux/usb/langwell_otg.h | 177 ---- 15 files changed, 83 insertions(+), 2159 deletions(-) delete mode 100644 drivers/usb/otg/langwell_otg.c delete mode 100644 include/linux/usb/langwell_otg.h Merging cpufreq-current/fixes $ git merge cpufreq-current/fixes Already up-to-date. Merging input-current/for-linus $ git merge input-current/for-linus Already up-to-date. Merging md-current/for-linus $ git merge md-current/for-linus Merge made by recursive. drivers/md/linear.c | 4 ++-- drivers/md/multipath.c | 7 ++++--- drivers/md/raid0.c | 9 +++++++-- drivers/md/raid1.c | 9 ++++----- drivers/md/raid10.c | 19 +++++++++++++------ drivers/md/raid5.c | 10 +++++++++- 6 files changed, 39 insertions(+), 19 deletions(-) Merging audit-current/for-linus $ git merge audit-current/for-linus Already up-to-date. Merging crypto-current/master $ git merge crypto-current/master Already up-to-date. Merging dwmw2/master $ git merge dwmw2/master Already up-to-date. Merging arm/devel $ git merge arm/devel Already up-to-date. Merging davinci/for-next $ git merge davinci/for-next Auto-merging MAINTAINERS Merge made by recursive. MAINTAINERS | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) Merging pxa/for-next $ git merge pxa/for-next Already up-to-date. Merging avr32/avr32-arch $ git merge avr32/avr32-arch Already up-to-date. 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 Already up-to-date. Merging m68k/for-next $ git merge m68k/for-next Auto-merging drivers/rtc/Kconfig Auto-merging drivers/rtc/Makefile Merge made by recursive. drivers/rtc/Kconfig | 19 +++ drivers/rtc/Makefile | 2 + drivers/rtc/rtc-msm6242.c | 268 +++++++++++++++++++++++++++++++++++++++++++++ drivers/rtc/rtc-rp5c01.c | 222 +++++++++++++++++++++++++++++++++++++ 4 files changed, 511 insertions(+), 0 deletions(-) create mode 100644 drivers/rtc/rtc-msm6242.c create mode 100644 drivers/rtc/rtc-rp5c01.c Merging m68knommu/for-next $ git merge m68knommu/for-next Removing arch/m68k/include/asm/checksum_mm.h Removing arch/m68k/include/asm/checksum_no.h Removing arch/m68k/include/asm/dma_mm.h Removing arch/m68k/include/asm/dma_no.h Removing arch/m68k/include/asm/hardirq_mm.h Removing arch/m68k/include/asm/hardirq_no.h Removing arch/m68k/include/asm/irq_mm.h Removing arch/m68k/include/asm/irq_no.h Removing arch/m68k/include/asm/processor_mm.h Removing arch/m68k/include/asm/processor_no.h Merge made by recursive. arch/m68k/include/asm/checksum.h | 160 ++++++++- arch/m68k/include/asm/checksum_mm.h | 148 -------- arch/m68k/include/asm/checksum_no.h | 132 ------- arch/m68k/include/asm/dma.h | 492 +++++++++++++++++++++++++- arch/m68k/include/asm/dma_mm.h | 16 - arch/m68k/include/asm/dma_no.h | 494 -------------------------- arch/m68k/include/asm/hardirq.h | 21 +- arch/m68k/include/asm/hardirq_mm.h | 16 - arch/m68k/include/asm/hardirq_no.h | 27 -- arch/m68k/include/asm/irq.h | 135 +++++++- arch/m68k/include/asm/irq_mm.h | 126 ------- arch/m68k/include/asm/irq_no.h | 26 -- arch/m68k/include/asm/m5206sim.h | 22 +- arch/m68k/include/asm/m520xsim.h | 21 +- arch/m68k/include/asm/m5249sim.h | 33 +- arch/m68k/include/asm/m5272sim.h | 5 + arch/m68k/include/asm/m5307sim.h | 21 +- arch/m68k/include/asm/m532xsim.h | 44 +-- arch/m68k/include/asm/m5407sim.h | 18 +- arch/m68k/include/asm/mcfintc.h | 89 +++++ arch/m68k/include/asm/mcfsim.h | 93 +----- arch/m68k/include/asm/processor.h | 171 +++++++++- arch/m68k/include/asm/processor_mm.h | 130 ------- arch/m68k/include/asm/processor_no.h | 143 -------- arch/m68knommu/kernel/irq.c | 21 -- arch/m68knommu/lib/checksum.c | 9 - arch/m68knommu/platform/5206/config.c | 56 ++-- arch/m68knommu/platform/5206e/config.c | 57 ++-- arch/m68knommu/platform/520x/config.c | 30 -- arch/m68knommu/platform/523x/config.c | 63 ---- arch/m68knommu/platform/5249/Makefile | 2 +- arch/m68knommu/platform/5249/config.c | 49 +-- arch/m68knommu/platform/5249/intc2.c | 59 +++ arch/m68knommu/platform/5272/config.c | 29 +-- arch/m68knommu/platform/527x/config.c | 49 --- arch/m68knommu/platform/528x/config.c | 51 +--- arch/m68knommu/platform/5307/config.c | 65 ++--- arch/m68knommu/platform/532x/config.c | 49 +--- arch/m68knommu/platform/5407/config.c | 68 ++--- arch/m68knommu/platform/68328/ints.c | 72 ++-- arch/m68knommu/platform/68360/ints.c | 44 ++- arch/m68knommu/platform/coldfire/Makefile | 22 +- arch/m68knommu/platform/coldfire/intc-2.c | 93 +++++ arch/m68knommu/platform/coldfire/intc-simr.c | 78 ++++ arch/m68knommu/platform/coldfire/intc.c | 153 ++++++++ arch/m68knommu/platform/coldfire/pit.c | 8 - arch/m68knommu/platform/coldfire/timers.c | 18 +- arch/m68knommu/platform/coldfire/vectors.c | 20 +- 48 files changed, 1704 insertions(+), 2044 deletions(-) delete mode 100644 arch/m68k/include/asm/checksum_mm.h delete mode 100644 arch/m68k/include/asm/checksum_no.h delete mode 100644 arch/m68k/include/asm/dma_mm.h delete mode 100644 arch/m68k/include/asm/dma_no.h delete mode 100644 arch/m68k/include/asm/hardirq_mm.h delete mode 100644 arch/m68k/include/asm/hardirq_no.h delete mode 100644 arch/m68k/include/asm/irq_mm.h delete mode 100644 arch/m68k/include/asm/irq_no.h create mode 100644 arch/m68k/include/asm/mcfintc.h delete mode 100644 arch/m68k/include/asm/processor_mm.h delete mode 100644 arch/m68k/include/asm/processor_no.h create mode 100644 arch/m68knommu/platform/5249/intc2.c create mode 100644 arch/m68knommu/platform/coldfire/intc-2.c create mode 100644 arch/m68knommu/platform/coldfire/intc-simr.c create mode 100644 arch/m68knommu/platform/coldfire/intc.c Merging microblaze/next $ git merge microblaze/next Already up-to-date. Merging mips/mips-for-linux-next $ git merge mips/mips-for-linux-next Resolved 'arch/mips/cavium-octeon/executive/cvmx-helper-errata.c' using previous resolution. Resolved 'arch/mips/mm/tlbex.c' using previous resolution. Resolved 'arch/mips/sibyte/swarm/setup.c' using previous resolution. Resolved 'drivers/char/hw_random/Kconfig' using previous resolution. Resolved 'drivers/char/hw_random/Makefile' using previous resolution. Resolved 'drivers/dma/txx9dmac.c' using previous resolution. Auto-merging arch/mips/Kconfig Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-errata.c CONFLICT (add/add): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-errata.c Auto-merging arch/mips/cavium-octeon/octeon-irq.c Auto-merging arch/mips/include/asm/cpu-features.h Auto-merging arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h Auto-merging arch/mips/mm/c-r4k.c Auto-merging arch/mips/mm/tlbex.c CONFLICT (content): Merge conflict in arch/mips/mm/tlbex.c Auto-merging arch/mips/sibyte/Kconfig Auto-merging arch/mips/sibyte/swarm/setup.c CONFLICT (content): Merge conflict in arch/mips/sibyte/swarm/setup.c Auto-merging drivers/char/hw_random/Kconfig CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig Auto-merging drivers/char/hw_random/Makefile CONFLICT (content): Merge conflict in drivers/char/hw_random/Makefile Auto-merging drivers/dma/txx9dmac.c CONFLICT (add/add): Merge conflict in drivers/dma/txx9dmac.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 5f58c4b] Merge commit 'mips/mips-for-linux-next' $ git diff -M --stat --summary HEAD^.. Merging parisc/master $ git merge parisc/master Already up-to-date. Merging powerpc/next $ git merge powerpc/next Already up-to-date. Merging 4xx/next $ git merge 4xx/next Already up-to-date. Merging galak/next $ git merge galak/next Merge made by recursive. Documentation/powerpc/booting-without-of.txt | 1168 +--------------------- Documentation/powerpc/dts-bindings/4xx/emac.txt | 148 +++ Documentation/powerpc/dts-bindings/gpio/gpio.txt | 50 + Documentation/powerpc/dts-bindings/gpio/mdio.txt | 19 + Documentation/powerpc/dts-bindings/marvell.txt | 521 ++++++++++ Documentation/powerpc/dts-bindings/phy.txt | 25 + Documentation/powerpc/dts-bindings/spi-bus.txt | 57 ++ Documentation/powerpc/dts-bindings/usb-ehci.txt | 25 + Documentation/powerpc/dts-bindings/xilinx.txt | 295 ++++++ arch/powerpc/boot/dts/mpc8569mds.dts | 1 + arch/powerpc/include/asm/cpm1.h | 2 - arch/powerpc/platforms/85xx/mpc85xx_mds.c | 1 + arch/powerpc/platforms/85xx/smp.c | 9 +- arch/powerpc/platforms/85xx/socrates.c | 6 +- arch/powerpc/platforms/85xx/xes_mpc85xx.c | 1 - arch/powerpc/sysdev/qe_lib/qe.c | 9 +- 16 files changed, 1157 insertions(+), 1180 deletions(-) create mode 100644 Documentation/powerpc/dts-bindings/4xx/emac.txt create mode 100644 Documentation/powerpc/dts-bindings/gpio/gpio.txt create mode 100644 Documentation/powerpc/dts-bindings/gpio/mdio.txt create mode 100644 Documentation/powerpc/dts-bindings/marvell.txt create mode 100644 Documentation/powerpc/dts-bindings/phy.txt create mode 100644 Documentation/powerpc/dts-bindings/spi-bus.txt create mode 100644 Documentation/powerpc/dts-bindings/usb-ehci.txt create mode 100644 Documentation/powerpc/dts-bindings/xilinx.txt Merging s390/features $ git merge s390/features Merge made by recursive. arch/s390/include/asm/chsc.h | 28 ++ arch/s390/include/asm/cio.h | 223 +------------- .../cio/scsw.c => arch/s390/include/asm/scsw.h | 345 +++++++++++++------- arch/s390/include/asm/timex.h | 16 +- arch/s390/kernel/early.c | 2 +- arch/s390/kernel/head.S | 2 +- arch/s390/kernel/time.c | 9 +- arch/s390/lib/delay.c | 2 + drivers/s390/block/dasd_eckd.c | 43 +-- drivers/s390/block/dasd_erp.c | 2 +- drivers/s390/block/dasd_fba.c | 21 +- drivers/s390/block/dasd_int.h | 3 +- drivers/s390/char/monreader.c | 4 +- drivers/s390/char/sclp_rw.h | 5 + drivers/s390/cio/Makefile | 2 +- drivers/s390/cio/chsc.h | 24 -- 16 files changed, 314 insertions(+), 417 deletions(-) rename drivers/s390/cio/scsw.c => arch/s390/include/asm/scsw.h (70%) Merging sh/master $ git merge sh/master Auto-merging mm/nommu.c Merge made by recursive. arch/sh/Kconfig.debug | 4 -- arch/sh/include/asm/perf_counter.h | 2 +- arch/sh/mm/fault_32.c | 61 +++++++++++++++++++----------------- arch/sh/mm/tlbflush_64.c | 15 +++++++-- drivers/clocksource/sh_tmu.c | 2 +- mm/nommu.c | 21 ++++++++++++ tools/perf/perf.h | 10 ++++++ 7 files changed, 77 insertions(+), 38 deletions(-) Merging sparc/master $ git merge sparc/master Already up-to-date. Merging xtensa/master $ git merge xtensa/master Auto-merging arch/xtensa/Kconfig Merge made by recursive. Merging cifs/master $ git merge cifs/master Merge made by recursive. fs/cifs/CHANGES | 2 +- fs/cifs/asn1.c | 55 ++++++++++++++++-- fs/cifs/cifsfs.c | 146 +++++++++++++++++++++++++------------------------ fs/cifs/cifsglob.h | 2 +- fs/cifs/cifsproto.h | 2 +- fs/cifs/cifssmb.c | 4 +- fs/cifs/connect.c | 37 +++--------- fs/cifs/dir.c | 6 +- fs/cifs/dns_resolve.c | 23 +------ fs/cifs/file.c | 24 +++++--- fs/cifs/inode.c | 15 +++-- fs/cifs/link.c | 3 +- fs/cifs/netmisc.c | 56 +++++++++++++++++- fs/cifs/sess.c | 2 +- fs/cifs/xattr.c | 12 +++- 15 files changed, 235 insertions(+), 154 deletions(-) Merging configfs/linux-next $ git merge configfs/linux-next Resolved 'fs/configfs/dir.c' using previous resolution. Auto-merging fs/configfs/dir.c CONFLICT (content): Merge conflict in fs/configfs/dir.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 95f8d86] Merge commit 'configfs/linux-next' $ git diff -M --stat --summary HEAD^.. Merging ext4/next $ git merge ext4/next Already up-to-date. Merging fatfs/master $ git merge fatfs/master Already up-to-date. Merging fuse/for-next $ git merge fuse/for-next Merge made by recursive. fs/fuse/dev.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++ fs/fuse/dir.c | 57 +++++++++++++++++++++++++++++++++-- fs/fuse/fuse_i.h | 27 ++++++++++++++++ fs/fuse/inode.c | 68 +++++++++++++++++++++++++++++++++++++++-- include/linux/fuse.h | 36 +++++++++++++++++++++- 5 files changed, 260 insertions(+), 9 deletions(-) Merging gfs2/master $ git merge gfs2/master Merge made by recursive. fs/gfs2/glock.c | 23 +++++------------------ 1 files changed, 5 insertions(+), 18 deletions(-) Merging jfs/next $ git merge jfs/next Already up-to-date. Merging nfs/linux-next $ git merge nfs/linux-next Already up-to-date. Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Already up-to-date. Merging nilfs2/for-next $ git merge nilfs2/for-next Auto-merging fs/nilfs2/cpfile.c Auto-merging fs/nilfs2/inode.c Auto-merging fs/nilfs2/nilfs.h Auto-merging fs/nilfs2/super.c Auto-merging fs/nilfs2/the_nilfs.c Merge made by recursive. Merging ocfs2/linux-next $ git merge ocfs2/linux-next Already up-to-date. Merging squashfs/master $ git merge squashfs/master Already up-to-date. Merging v9fs/for-next $ git merge v9fs/for-next Resolved 'net/9p/protocol.c' using previous resolution. Auto-merging net/9p/protocol.c CONFLICT (content): Merge conflict in net/9p/protocol.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master d9ee084] Merge commit 'v9fs/for-next' $ git diff -M --stat --summary HEAD^.. Merging ubifs/linux-next $ git merge ubifs/linux-next Already up-to-date. Merging xfs/master $ git merge xfs/master Already up-to-date. Merging reiserfs-bkl/reiserfs/kill-bkl-rc6 $ git merge reiserfs-bkl/reiserfs/kill-bkl-rc6 Resolved 'fs/reiserfs/super.c' using previous resolution. Auto-merging fs/reiserfs/dir.c Auto-merging fs/reiserfs/do_balan.c Auto-merging fs/reiserfs/inode.c Auto-merging fs/reiserfs/resize.c Auto-merging fs/reiserfs/super.c CONFLICT (content): Merge conflict in fs/reiserfs/super.c Auto-merging fs/reiserfs/xattr.c Auto-merging include/linux/reiserfs_fs.h Auto-merging include/linux/reiserfs_fs_sb.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 82aac5b] Merge commit 'reiserfs-bkl/reiserfs/kill-bkl-rc6' $ git diff -M --stat --summary HEAD^.. fs/reiserfs/Makefile | 2 +- fs/reiserfs/bitmap.c | 4 ++ fs/reiserfs/dir.c | 8 +++ fs/reiserfs/do_balan.c | 17 ++---- fs/reiserfs/fix_node.c | 19 ++++++-- fs/reiserfs/inode.c | 73 ++++++++++++++++++--------- fs/reiserfs/ioctl.c | 6 ++- fs/reiserfs/journal.c | 109 ++++++++++++++++++++++++++++------------ fs/reiserfs/lock.c | 89 ++++++++++++++++++++++++++++++++ fs/reiserfs/namei.c | 13 ++++- fs/reiserfs/prints.c | 4 -- fs/reiserfs/resize.c | 2 + fs/reiserfs/stree.c | 53 ++++++++++++++++--- fs/reiserfs/super.c | 55 +++++++++++++++++--- fs/reiserfs/xattr.c | 4 +- include/linux/reiserfs_fs.h | 68 +++++++++++++++++++++++-- include/linux/reiserfs_fs_sb.h | 20 +++++++ 17 files changed, 441 insertions(+), 105 deletions(-) create mode 100644 fs/reiserfs/lock.c Merging vfs/for-next $ git merge vfs/for-next Already up-to-date. Merging pci/linux-next $ git merge pci/linux-next Already up-to-date. Merging hid/for-next $ git merge hid/for-next Auto-merging drivers/hid/usbhid/hiddev.c Merge made by recursive. drivers/hid/Kconfig | 16 +-- drivers/hid/Makefile | 5 +- drivers/hid/hid-core.c | 52 ++++- drivers/hid/hid-debug.c | 438 ++++++++++++++++++++++++++++++++++------- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-input.c | 13 +-- drivers/hid/hid-lg.c | 2 + drivers/hid/hid-lgff.c | 1 + drivers/hid/hid-ntrig.c | 33 +++- drivers/hid/hid-samsung.c | 39 ++++- drivers/hid/usbhid/hid-core.c | 9 +- drivers/hid/usbhid/hiddev.c | 4 +- include/linux/hid-debug.h | 48 ++++-- include/linux/hid.h | 22 +-- 14 files changed, 522 insertions(+), 161 deletions(-) Merging quilt/i2c $ git merge quilt/i2c Merge made by recursive. include/linux/i2c-id.h | 11 ----------- include/linux/i2c.h | 2 -- 2 files changed, 0 insertions(+), 13 deletions(-) Merging quilt/jdelvare-hwmon $ git merge quilt/jdelvare-hwmon Merge made by recursive. drivers/hwmon/abituguru3.c | 6 +++--- drivers/hwmon/hwmon-vid.c | 10 +++++++++- drivers/hwmon/max6650.c | 1 + 3 files changed, 13 insertions(+), 4 deletions(-) Merging quilt/kernel-doc $ git merge quilt/kernel-doc Already up-to-date. Merging v4l-dvb/master $ git merge v4l-dvb/master Already uptodate! Merge made by recursive. Merging quota/for_next $ git merge quota/for_next Already up-to-date. Merging kbuild/master $ git merge kbuild/master Already up-to-date. Merging ide/master $ git merge ide/master Already up-to-date. Merging libata/NEXT $ git merge libata/NEXT Auto-merging drivers/ata/libata-eh.c Merge made by recursive. drivers/ata/libata-eh.c | 6 ++++-- drivers/ata/sata_sil.c | 13 +++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) Merging infiniband/for-next $ git merge infiniband/for-next Already up-to-date. Merging acpi/test $ git merge acpi/test Merge made by recursive. arch/x86/kernel/reboot.c | 2 +- drivers/acpi/Kconfig | 17 ++- drivers/acpi/Makefile | 2 + drivers/acpi/acpi_memhotplug.c | 40 ++--- drivers/acpi/acpica/evevent.c | 13 +- drivers/acpi/acpica/hwsleep.c | 24 +-- drivers/acpi/ec.c | 118 ++++------- drivers/acpi/processor_aggregator.c | 389 +++++++++++++++++++++++++++++++++++ drivers/acpi/processor_core.c | 244 +++++++++++------------ drivers/acpi/processor_idle.c | 10 +- drivers/acpi/processor_thermal.c | 3 +- drivers/acpi/processor_throttling.c | 3 +- drivers/acpi/scan.c | 5 - drivers/acpi/sleep.c | 14 -- drivers/acpi/video.c | 12 +- drivers/platform/x86/Kconfig | 2 + drivers/platform/x86/eeepc-laptop.c | 346 +++++++++++++++++++++---------- include/acpi/acpi_bus.h | 2 - 18 files changed, 852 insertions(+), 394 deletions(-) create mode 100644 drivers/acpi/processor_aggregator.c Merging ieee1394/for-next $ git merge ieee1394/for-next Merge made by recursive. drivers/firewire/core-card.c | 14 +++++++------- drivers/firewire/core-cdev.c | 4 +++- drivers/firewire/core-iso.c | 24 +++++++++++++----------- drivers/firewire/core.h | 3 ++- include/linux/firewire.h | 1 + 5 files changed, 26 insertions(+), 20 deletions(-) Merging ubi/linux-next $ git merge ubi/linux-next Already up-to-date. Merging kvm/master $ git merge kvm/master Removing arch/x86/kvm/kvm_svm.h Merge made by recursive. arch/ia64/include/asm/kvm_host.h | 4 +- arch/ia64/kvm/Kconfig | 8 +- arch/ia64/kvm/kvm-ia64.c | 37 +-- arch/ia64/kvm/kvm_lib.c | 6 + arch/ia64/kvm/vcpu.c | 4 +- arch/powerpc/include/asm/kvm_host.h | 4 +- arch/powerpc/kvm/44x.c | 4 +- arch/powerpc/kvm/Kconfig | 3 +- arch/powerpc/kvm/booke.c | 2 +- arch/powerpc/kvm/e500.c | 7 +- arch/powerpc/kvm/e500_emulate.c | 3 + arch/powerpc/kvm/e500_tlb.c | 10 +- arch/powerpc/kvm/e500_tlb.h | 6 +- arch/powerpc/kvm/emulate.c | 4 +- arch/powerpc/kvm/powerpc.c | 16 +- arch/s390/include/asm/kvm_host.h | 19 +- arch/s390/kvm/Kconfig | 6 +- arch/s390/kvm/gaccess.h | 23 +- arch/s390/kvm/intercept.c | 18 +- arch/s390/kvm/kvm-s390.c | 101 ++++--- arch/s390/kvm/kvm-s390.h | 32 ++- arch/s390/kvm/priv.c | 2 +- arch/s390/kvm/sigp.c | 60 +++-- arch/x86/include/asm/kvm.h | 1 + arch/x86/include/asm/kvm_host.h | 47 ++-- arch/x86/include/asm/msr-index.h | 1 + arch/x86/include/asm/vmx.h | 8 + arch/x86/kvm/Kconfig | 9 +- arch/x86/kvm/Makefile | 36 ++-- arch/x86/kvm/i8254.c | 72 +++-- arch/x86/kvm/i8254.h | 2 +- arch/x86/kvm/i8259.c | 28 ++- arch/x86/kvm/kvm_cache_regs.h | 9 + arch/x86/kvm/kvm_svm.h | 51 ---- arch/x86/kvm/kvm_timer.h | 2 +- arch/x86/kvm/lapic.c | 78 ++++-- arch/x86/kvm/lapic.h | 1 + arch/x86/kvm/mmu.c | 355 ++++++++++++++++-------- arch/x86/kvm/mmu.h | 4 +- arch/x86/kvm/paging_tmpl.h | 45 ++-- arch/x86/kvm/svm.c | 259 ++++++++++++------ arch/x86/kvm/timer.c | 16 +- arch/x86/kvm/trace.h | 260 ++++++++++++++++++ arch/x86/kvm/vmx.c | 433 ++++++++++++++++++++++------- arch/x86/kvm/x86.c | 519 ++++++++++++++++++++++++++++------- arch/x86/kvm/x86_emulate.c | 259 +++++++++++++++++- fs/eventfd.c | 10 +- include/linux/kvm.h | 62 ++++- include/linux/kvm_host.h | 60 ++++- include/trace/events/kvm.h | 57 ++++ mm/hugetlb.c | 1 + virt/kvm/Kconfig | 14 + virt/kvm/coalesced_mmio.c | 44 ++-- virt/kvm/coalesced_mmio.h | 1 + virt/kvm/eventfd.c | 216 +++++++++++++++ virt/kvm/ioapic.c | 31 ++- virt/kvm/iodev.h | 29 ++- virt/kvm/irq_comm.c | 45 +++- virt/kvm/kvm_main.c | 215 ++++++++++----- 59 files changed, 2753 insertions(+), 906 deletions(-) delete mode 100644 arch/x86/kvm/kvm_svm.h create mode 100644 arch/x86/kvm/trace.h create mode 100644 include/trace/events/kvm.h create mode 100644 virt/kvm/Kconfig create mode 100644 virt/kvm/eventfd.c Merging dlm/next $ git merge dlm/next Already up-to-date. Merging scsi/master $ git merge scsi/master Already up-to-date. Merging async_tx/next $ git merge async_tx/next Auto-merging drivers/dma/Kconfig Merge made by recursive. arch/powerpc/include/asm/fsldma.h | 136 +++++++++++++++++ drivers/dma/Kconfig | 4 +- drivers/dma/fsldma.c | 287 ++++++++++++++++++++++++++++++++++--- drivers/dma/fsldma.h | 4 +- 4 files changed, 408 insertions(+), 23 deletions(-) create mode 100644 arch/powerpc/include/asm/fsldma.h 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 wireless/master $ git merge wireless/master Already up-to-date. Merging mtd/master $ git merge mtd/master Merge made by recursive. drivers/mtd/cmdlinepart.c | 2 +- drivers/mtd/maps/integrator-flash.c | 22 ++++++++++++++-------- drivers/mtd/nand/atmel_nand.c | 2 +- fs/jffs2/scan.c | 4 ++-- 4 files changed, 18 insertions(+), 12 deletions(-) Merging crypto/master $ git merge crypto/master Merge made by recursive. arch/s390/crypto/des_s390.c | 11 ++++++----- arch/x86/crypto/aesni-intel_glue.c | 2 +- crypto/Kconfig | 2 +- crypto/internal.h | 7 +------ crypto/tcrypt.c | 15 ++++++++++++++- crypto/testmgr.c | 4 ---- drivers/char/hw_random/amd-rng.c | 4 ++-- drivers/char/hw_random/geode-rng.c | 3 +-- drivers/char/random.c | 14 ++++++++++++++ include/linux/fips.h | 10 ++++++++++ 10 files changed, 50 insertions(+), 22 deletions(-) create mode 100644 include/linux/fips.h Merging sound/for-next $ git merge sound/for-next Auto-merging MAINTAINERS Merge made by recursive. MAINTAINERS | 7 ++++++ sound/oss/kahlua.c | 2 +- sound/pci/atiixp.c | 8 +++--- sound/pci/atiixp_modem.c | 4 +- sound/pci/au88x0/au8810.c | 3 +- sound/pci/au88x0/au8820.c | 3 +- sound/pci/au88x0/au8830.c | 3 +- sound/pci/ca0106/ca0106_main.c | 2 +- sound/pci/cmipci.c | 10 ++++---- sound/pci/cs4281.c | 2 +- sound/pci/cs46xx/cs46xx.c | 6 ++-- sound/pci/emu10k1/emu10k1.c | 6 ++-- sound/pci/emu10k1/emu10k1x.c | 2 +- sound/pci/ens1370.c | 8 +++--- sound/pci/es1938.c | 2 +- sound/pci/hda/patch_realtek.c | 32 ++++++++++++++++++++++----- sound/pci/ice1712/ice1712.c | 2 +- sound/pci/ice1712/ice1724.c | 2 +- sound/pci/intel8x0.c | 46 +++++++++++++++++++------------------- sound/pci/intel8x0m.c | 34 ++++++++++++++-------------- sound/pci/lx6464es/lx6464es.c | 7 ++--- sound/pci/mixart/mixart.c | 2 +- sound/pci/nm256/nm256.c | 6 ++-- sound/pci/oxygen/oxygen_mixer.c | 28 +++++++++++++++-------- sound/pci/rme32.c | 9 ++----- sound/pci/rme96.c | 12 +++------ sound/pci/sonicvibes.c | 2 +- sound/pci/via82xx.c | 4 +- sound/pci/via82xx_modem.c | 2 +- sound/pci/ymfpci/ymfpci.c | 12 +++++----- 30 files changed, 146 insertions(+), 122 deletions(-) Merging cpufreq/next $ git merge cpufreq/next Already up-to-date. Merging quilt/rr $ git merge quilt/rr Resolved 'kernel/cpu.c' using previous resolution. Auto-merging arch/mips/include/asm/mmu_context.h Auto-merging arch/mips/include/asm/smp-ops.h Auto-merging arch/mips/include/asm/smp.h Auto-merging arch/mips/kernel/smp-cmp.c Auto-merging arch/mips/kernel/smp-up.c Auto-merging arch/mips/kernel/smp.c Auto-merging arch/mips/mm/c-octeon.c Auto-merging arch/mips/pmc-sierra/yosemite/smp.c Auto-merging arch/x86/kernel/acpi/cstate.c Auto-merging arch/x86/kernel/apic/io_apic.c Auto-merging drivers/acpi/processor_throttling.c Auto-merging init/main.c Auto-merging kernel/cpu.c CONFLICT (content): Merge conflict in kernel/cpu.c Auto-merging virt/kvm/kvm_main.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 50f6ac5] Merge branch 'quilt/rr' $ git diff -M --stat --summary HEAD^.. arch/alpha/include/asm/smp.h | 2 +- arch/alpha/include/asm/topology.h | 18 - arch/alpha/kernel/smp.c | 14 +- arch/arm/include/asm/cacheflush.h | 8 +- arch/arm/include/asm/mmu_context.h | 7 +- arch/arm/include/asm/smp.h | 1 - arch/arm/include/asm/tlbflush.h | 4 +- arch/arm/kernel/smp.c | 10 +- arch/arm/mm/context.c | 2 +- arch/arm/mm/flush.c | 10 +- arch/frv/include/asm/gdb-stub.h | 1 - arch/ia64/include/asm/smp.h | 1 - arch/ia64/include/asm/topology.h | 3 - arch/ia64/kernel/smp.c | 2 +- arch/m32r/include/asm/mmu_context.h | 4 +- arch/m32r/include/asm/smp.h | 2 +- arch/m32r/kernel/smp.c | 30 +- arch/m32r/kernel/smpboot.c | 2 +- arch/mips/alchemy/common/time.c | 2 +- arch/mips/include/asm/mach-ip27/topology.h | 2 - arch/mips/include/asm/mmu_context.h | 10 +- arch/mips/include/asm/smp-ops.h | 2 +- arch/mips/include/asm/smp.h | 2 +- arch/mips/kernel/smp-cmp.c | 9 +- arch/mips/kernel/smp-mt.c | 4 +- arch/mips/kernel/smp-up.c | 3 +- arch/mips/kernel/smp.c | 4 +- arch/mips/mipssim/sim_smtc.c | 5 +- arch/mips/mm/c-octeon.c | 2 +- arch/mips/mti-malta/malta-smtc.c | 4 +- arch/mips/pmc-sierra/yosemite/smp.c | 4 +- arch/mips/sgi-ip27/ip27-memory.c | 2 +- arch/mips/sgi-ip27/ip27-smp.c | 4 +- arch/mips/sibyte/bcm1480/smp.c | 5 +- arch/mips/sibyte/sb1250/smp.c | 5 +- arch/mn10300/include/asm/gdb-stub.h | 1 - arch/mn10300/include/asm/mmu_context.h | 12 +- arch/parisc/include/asm/smp.h | 1 - arch/powerpc/include/asm/smp.h | 2 +- arch/powerpc/include/asm/topology.h | 12 - arch/powerpc/kernel/setup-common.c | 4 +- arch/powerpc/kernel/smp.c | 4 +- arch/powerpc/platforms/powermac/setup.c | 2 +- arch/s390/include/asm/smp.h | 2 +- arch/s390/include/asm/topology.h | 1 - arch/s390/kernel/smp.c | 4 +- arch/sh/include/asm/smp.h | 1 - arch/sh/include/asm/topology.h | 1 - arch/sparc/include/asm/smp_64.h | 1 - arch/sparc/include/asm/topology_64.h | 16 - arch/um/include/asm/mmu_context.h | 4 +- arch/um/kernel/smp.c | 2 +- arch/x86/include/asm/lguest_hcall.h | 2 +- arch/x86/include/asm/mmu_context.h | 6 +- arch/x86/include/asm/smp.h | 1 - arch/x86/kernel/acpi/cstate.c | 36 +- arch/x86/kernel/apic/io_apic.c | 7 +- arch/x86/kernel/ldt.c | 4 +- arch/x86/kernel/process.c | 6 +- arch/x86/kernel/setup.c | 1 - arch/x86/kernel/smpboot.c | 9 +- arch/x86/lguest/boot.c | 2 +- arch/x86/mm/tlb.c | 15 +- arch/x86/xen/mmu.c | 4 +- drivers/acpi/processor_perflib.c | 3 +- drivers/acpi/processor_throttling.c | 85 ++-- drivers/block/virtio_blk.c | 5 +- drivers/firmware/dcdbas.c | 49 +-- drivers/net/sfc/efx.c | 3 +- drivers/oprofile/buffer_sync.c | 3 +- include/asm-generic/topology.h | 17 - include/linux/cpumask.h | 709 ++++++++++------------------ include/linux/interrupt.h | 2 - include/linux/lguest.h | 2 +- include/linux/sched.h | 3 + include/linux/smp.h | 11 - include/linux/topology.h | 6 - init/main.c | 5 - kernel/kthread.c | 10 +- kernel/module.c | 3 +- kernel/smp.c | 7 - kernel/trace/trace.c | 7 +- mm/quicklist.c | 3 +- virt/kvm/kvm_main.c | 3 +- 84 files changed, 489 insertions(+), 800 deletions(-) $ git am -3 ../patches/UML__Fix_some_apparent_bitrot_in_mmu_context.h Applying: UML: Fix some apparent bitrot in mmu_context.h Merging mmc/next $ git merge mmc/next Already up-to-date. Merging input/next $ git merge input/next Already up-to-date. Merging bkl-removal/bkl-removal $ git merge bkl-removal/bkl-removal 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 Auto-merging fs/fuse/inode.c Removing mm/pdflush.c Merge made by recursive. Documentation/block/data-integrity.txt | 4 +- block/blk-core.c | 11 +- drivers/block/aoe/aoeblk.c | 1 + drivers/char/mem.c | 1 + fs/btrfs/disk-io.c | 1 + fs/buffer.c | 2 +- fs/char_dev.c | 1 + fs/configfs/inode.c | 1 + fs/fs-writeback.c | 775 +++++++++++++++++++++++++------- fs/fuse/inode.c | 1 + fs/hugetlbfs/inode.c | 1 + fs/nfs/client.c | 1 + fs/ocfs2/dlm/dlmfs.c | 1 + fs/ramfs/inode.c | 1 + fs/super.c | 3 - fs/sysfs/inode.c | 1 + fs/ubifs/super.c | 1 + include/linux/backing-dev.h | 71 +++- include/linux/fs.h | 11 +- include/linux/writeback.h | 15 +- kernel/cgroup.c | 1 + mm/Makefile | 2 +- mm/backing-dev.c | 533 ++++++++++++++++++++++- mm/page-writeback.c | 157 +------ mm/pdflush.c | 269 ----------- mm/swap_state.c | 1 + mm/vmscan.c | 2 +- 27 files changed, 1266 insertions(+), 603 deletions(-) delete mode 100644 mm/pdflush.c $ git revert 6cf2a6c8d01514e86a8d38e4eeed402378b635dc Finished one revert. [master fdbcf39] Revert "Restore barrier support for md and probably other virtual devices." 1 files changed, 5 insertions(+), 5 deletions(-) Merging quilt/device-mapper $ git merge quilt/device-mapper Already up-to-date. Merging embedded/master $ git merge embedded/master Already up-to-date. Merging firmware/master $ git merge firmware/master Already up-to-date. Merging pcmcia/master $ git merge pcmcia/master Already up-to-date. Merging battery/master $ git merge battery/master Already up-to-date. Merging leds/for-mm $ git merge leds/for-mm Merge made by recursive. Documentation/leds-lp3944.txt | 50 +++ Documentation/powerpc/dts-bindings/gpio/led.txt | 17 +- drivers/leds/Kconfig | 14 +- drivers/leds/Makefile | 1 + drivers/leds/leds-alix2.c | 7 +- drivers/leds/leds-bd2802.c | 96 ++++- drivers/leds/leds-gpio.c | 22 +- drivers/leds/leds-lp3944.c | 466 +++++++++++++++++++++++ drivers/leds/leds-pca9532.c | 58 ++-- include/linux/leds-lp3944.h | 53 +++ include/linux/leds.h | 14 +- 11 files changed, 733 insertions(+), 65 deletions(-) create mode 100644 Documentation/leds-lp3944.txt create mode 100644 drivers/leds/leds-lp3944.c create mode 100644 include/linux/leds-lp3944.h Merging backlight/for-mm $ git merge backlight/for-mm Merge made by recursive. drivers/video/backlight/tdo24m.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Merging kgdb/kgdb-next $ git merge kgdb/kgdb-next Auto-merging arch/x86/kernel/kgdb.c Merge made by recursive. arch/x86/kernel/kgdb.c | 9 +++++++-- include/linux/kgdb.h | 48 ++++++++++++++++++++++++++++++++++++++++++------ kernel/kgdb.c | 6 +++--- 3 files changed, 52 insertions(+), 11 deletions(-) Merging slab/for-next $ git merge slab/for-next Auto-merging lib/Kconfig.debug Auto-merging mm/Makefile Merge made by recursive. Documentation/vm/slqbinfo.c | 1047 ++++++++++++ include/linux/rcu_types.h | 18 + include/linux/rcupdate.h | 11 +- include/linux/slab.h | 10 +- include/linux/slqb_def.h | 298 ++++ init/Kconfig | 28 +- lib/Kconfig.debug | 20 + mm/Makefile | 1 + mm/slqb.c | 3755 +++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 5172 insertions(+), 16 deletions(-) create mode 100644 Documentation/vm/slqbinfo.c create mode 100644 include/linux/rcu_types.h create mode 100644 include/linux/slqb_def.h create mode 100644 mm/slqb.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 mfd/for-next $ git merge mfd/for-next Merge made by recursive. drivers/mfd/ab3100-core.c | 8 ++++---- drivers/mfd/sm501.c | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) Merging hdlc/hdlc-next $ git merge hdlc/hdlc-next Already up-to-date. Merging drm/drm-next $ git merge drm/drm-next Already up-to-date. Merging voltage/for-next $ git merge voltage/for-next Merge made by recursive. drivers/regulator/core.c | 62 ++++++++++++++++++++++++++-------- drivers/regulator/virtual.c | 44 +++++++++++++++--------- drivers/regulator/wm8350-regulator.c | 2 + include/linux/regulator/machine.h | 7 +++- 4 files changed, 84 insertions(+), 31 deletions(-) Merging security-testing/next $ git merge security-testing/next Merge made by recursive. fs/proc/base.c | 23 +++---- include/linux/security.h | 14 ++-- kernel/ptrace.c | 2 +- security/capability.c | 2 +- security/commoncap.c | 4 +- security/keys/proc.c | 4 + security/security.c | 4 +- security/selinux/avc.c | 8 ++- security/selinux/hooks.c | 24 +++++-- security/selinux/include/avc.h | 6 +- security/selinux/ss/services.c | 142 +++++++++++++++++++++++++++++++++------ security/smack/smack_lsm.c | 8 +- security/tomoyo/common.c | 30 +++++++++ security/tomoyo/common.h | 2 - security/tomoyo/domain.c | 42 ++---------- security/tomoyo/tomoyo.c | 10 +-- security/tomoyo/tomoyo.h | 3 +- 17 files changed, 216 insertions(+), 112 deletions(-) Merging lblnet/master $ git merge lblnet/master Already up-to-date. Merging quilt/ttydev $ git merge quilt/ttydev Merge made by recursive. arch/x86/include/asm/termios.h | 25 +- drivers/ata/Kconfig | 10 + drivers/ata/Makefile | 1 + drivers/ata/pata_rdc.c | 400 +++++++ drivers/char/cyclades.c | 2278 ++++++++++------------------------------ drivers/firmware/dmi_scan.c | 34 +- drivers/media/video/se401.c | 74 +- drivers/net/slip.c | 96 +-- drivers/pci/quirks.c | 5 + drivers/serial/8250.c | 22 +- drivers/serial/8250.h | 1 + drivers/serial/8250_f81216.c | 311 ++++++ drivers/serial/Kconfig | 11 + drivers/serial/Makefile | 1 + include/linux/cyclades.h | 10 + include/linux/kfifo.h | 4 +- include/linux/serial_8250.h | 1 + include/linux/serial_core.h | 1 + kernel/kfifo.c | 2 +- 19 files changed, 1427 insertions(+), 1860 deletions(-) create mode 100644 drivers/ata/pata_rdc.c create mode 100644 drivers/serial/8250_f81216.c Merging agp/agp-next $ git merge agp/agp-next Already up-to-date. Merging uwb/for-upstream $ git merge uwb/for-upstream Already up-to-date. Merging watchdog/master $ git merge watchdog/master Already up-to-date. Merging bdev/master $ git merge bdev/master Already up-to-date. Merging dwmw2-iommu/master $ git merge dwmw2-iommu/master Already up-to-date. Merging cputime/cputime $ git merge cputime/cputime Merge made by recursive. fs/proc/uptime.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) Merging osd/linux-next $ git merge osd/linux-next Auto-merging MAINTAINERS Merge made by recursive. MAINTAINERS | 5 +- drivers/block/Kconfig | 16 ++ drivers/block/Makefile | 1 + drivers/block/osdblk.c | 701 ++++++++++++++++++++++++++++++++++++++++++++++++ fs/exofs/common.h | 4 +- fs/exofs/dir.c | 4 +- fs/exofs/exofs.h | 7 +- fs/exofs/file.c | 21 +- fs/exofs/inode.c | 7 +- fs/exofs/namei.c | 4 +- fs/exofs/osd.c | 4 +- fs/exofs/super.c | 6 +- fs/exofs/symlink.c | 4 +- 13 files changed, 750 insertions(+), 34 deletions(-) create mode 100644 drivers/block/osdblk.c Merging jc_docs/docs-next $ git merge jc_docs/docs-next Already up-to-date. Merging nommu/master $ git merge nommu/master Already up-to-date. Merging trivial/for-next $ git merge trivial/for-next Auto-merging MAINTAINERS Merge made by recursive. Documentation/hwmon/hpfall.c | 64 ++++++++++++++++++++--------------------- MAINTAINERS | 12 ++++---- arch/h8300/kernel/timer/tpu.c | 1 - drivers/block/DAC960.c | 4 +- drivers/usb/host/ohci-q.c | 2 +- include/linux/capability.h | 2 +- include/linux/namei.h | 2 +- include/linux/workqueue.h | 2 +- scripts/basic/fixdep.c | 3 +- scripts/mod/sumversion.c | 2 - 10 files changed, 44 insertions(+), 50 deletions(-) Merging audit/for-next $ git merge audit/for-next Already up-to-date. Merging omap/for-next $ git merge omap/for-next Already up-to-date. Merging quilt/aoe $ git merge quilt/aoe Already up-to-date. Merging suspend/linux-next $ git merge suspend/linux-next Already up-to-date. Merging bluetooth/master $ git merge bluetooth/master Merge made by recursive. include/net/bluetooth/l2cap.h | 8 +++-- net/bluetooth/l2cap.c | 72 +++++++++++++++++++++++++++++++++++----- net/bluetooth/sco.c | 49 +++++++++++++++++++-------- 3 files changed, 102 insertions(+), 27 deletions(-) Merging edac-amd/for-next $ git merge edac-amd/for-next Merge made by recursive. drivers/edac/amd64_edac.c | 25 +++++++++++++++---------- drivers/edac/amd64_edac.h | 2 +- 2 files changed, 16 insertions(+), 11 deletions(-) Merging fsnotify/for-next $ git merge fsnotify/for-next Already up-to-date. Merging irda/for-next $ git merge irda/for-next Already up-to-date. Merging hwlat/for-linus $ git merge hwlat/for-linus Auto-merging MAINTAINERS Merge made by recursive. Documentation/hwlat_detector.txt | 64 ++ MAINTAINERS | 9 + drivers/misc/Kconfig | 28 + drivers/misc/Makefile | 1 + drivers/misc/hwlat_detector.c | 1208 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 1310 insertions(+), 0 deletions(-) create mode 100644 Documentation/hwlat_detector.txt create mode 100644 drivers/misc/hwlat_detector.c Merging tip/auto-latest $ git merge tip/auto-latest Recorded preimage for 'arch/x86/include/asm/termios.h' Auto-merging Documentation/kernel-parameters.txt Auto-merging arch/x86/include/asm/termios.h CONFLICT (content): Merge conflict in arch/x86/include/asm/termios.h Auto-merging arch/x86/kernel/setup.c Auto-merging include/linux/sched.h Auto-merging kernel/trace/trace.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'arch/x86/include/asm/termios.h'. [master 0a70531] Merge commit 'tip/auto-latest' $ git diff -M --stat --summary HEAD^.. Documentation/kernel-parameters.txt | 9 +- Documentation/scheduler/sched-rt-group.txt | 13 +- arch/x86/Kconfig | 5 + arch/x86/include/asm/i387.h | 1 + arch/x86/include/asm/ioctls.h | 95 +---- arch/x86/include/asm/ipcbuf.h | 29 +-- arch/x86/include/asm/mce.h | 2 +- arch/x86/include/asm/mman.h | 14 +- arch/x86/include/asm/module.h | 13 +- arch/x86/include/asm/msgbuf.h | 40 +-- arch/x86/include/asm/param.h | 23 +- arch/x86/include/asm/paravirt.h | 711 +--------------------------- arch/x86/include/asm/paravirt_types.h | 720 ++++++++++++++++++++++++++++ arch/x86/include/asm/percpu.h | 10 + arch/x86/include/asm/scatterlist.h | 27 +- arch/x86/include/asm/shmbuf.h | 52 +-- arch/x86/include/asm/socket.h | 61 +--- arch/x86/include/asm/sockios.h | 14 +- arch/x86/include/asm/termbits.h | 199 +-------- arch/x86/include/asm/termios.h | 114 +----- arch/x86/include/asm/types.h | 12 +- arch/x86/include/asm/ucontext.h | 8 +- arch/x86/kernel/cpu/amd.c | 4 +- arch/x86/kernel/cpu/mcheck/mce.c | 4 +- arch/x86/kernel/cpu/perf_counter.c | 12 +- arch/x86/kernel/cpu/proc.c | 2 - arch/x86/kernel/ds.c | 6 +- arch/x86/kernel/process_32.c | 27 +- arch/x86/kernel/process_64.c | 33 +- arch/x86/kernel/setup.c | 16 + arch/x86/kernel/setup_percpu.c | 219 +++++++--- arch/x86/kernel/traps.c | 33 +- arch/x86/mm/init.c | 17 - arch/x86/mm/pageattr.c | 65 ++- arch/x86/oprofile/nmi_int.c | 101 ++-- arch/x86/oprofile/op_model_amd.c | 267 +++++------ arch/x86/oprofile/op_model_p4.c | 60 ++-- arch/x86/oprofile/op_model_ppro.c | 95 ++-- arch/x86/oprofile/op_x86_model.h | 47 +- arch/x86/power/cpu.c | 2 +- drivers/oprofile/cpu_buffer.c | 16 +- drivers/oprofile/oprofile_stats.c | 1 + include/linux/hrtimer.h | 5 + include/linux/oprofile.h | 2 +- include/linux/perf_counter.h | 11 +- include/linux/poison.h | 16 +- include/linux/sched.h | 6 + include/linux/timer.h | 4 + kernel/irq/manage.c | 2 +- kernel/perf_counter.c | 60 ++- kernel/sched.c | 54 ++- kernel/sysctl.c | 5 +- kernel/time/timer_stats.c | 16 +- kernel/timer.c | 2 + kernel/trace/ftrace.c | 52 ++- kernel/trace/trace.c | 23 +- kernel/trace/trace_events.c | 28 +- kernel/trace/trace_printk.c | 26 +- kernel/trace/trace_stat.c | 6 +- mm/percpu.c | 24 +- tools/perf/Documentation/perf-report.txt | 2 +- tools/perf/Documentation/perf-stat.txt | 6 +- tools/perf/builtin-report.c | 29 +- tools/perf/builtin-stat.c | 20 +- tools/perf/util/parse-events.c | 97 +++-- tools/perf/util/strbuf.c | 2 +- tools/perf/util/symbol.c | 6 +- 67 files changed, 1659 insertions(+), 2044 deletions(-) create mode 100644 arch/x86/include/asm/paravirt_types.h Merging asm-generic/next $ git merge asm-generic/next Merge made by recursive. lib/checksum.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) Merging quilt/driver-core $ git merge quilt/driver-core Auto-merging include/linux/shmem_fs.h Auto-merging init/main.c Auto-merging mm/shmem.c Merge made by recursive. drivers/base/Kconfig | 25 +++ drivers/base/Makefile | 1 + drivers/base/base.h | 6 + drivers/base/core.c | 3 + drivers/base/devtmpfs.c | 367 ++++++++++++++++++++++++++++++++++++++++++++++ drivers/base/init.c | 1 + include/linux/device.h | 10 ++ include/linux/shmem_fs.h | 3 + init/do_mounts.c | 2 +- init/main.c | 2 + mm/shmem.c | 9 +- 11 files changed, 422 insertions(+), 7 deletions(-) create mode 100644 drivers/base/devtmpfs.c Merging quilt/usb $ git merge quilt/usb Removing drivers/usb/mon/mon_dma.c Merge made by recursive. Documentation/usb/usbmon.txt | 2 +- drivers/usb/core/message.c | 32 ++++-------- drivers/usb/host/ehci-dbg.c | 3 +- drivers/usb/misc/sisusbvga/sisusb.c | 53 +++++--------------- drivers/usb/misc/sisusbvga/sisusb.h | 2 - drivers/usb/mon/Kconfig | 4 +- drivers/usb/mon/Makefile | 2 +- drivers/usb/mon/mon_bin.c | 12 +---- drivers/usb/mon/mon_dma.c | 95 ----------------------------------- drivers/usb/mon/mon_main.c | 1 - drivers/usb/mon/mon_text.c | 14 ----- drivers/usb/mon/usb_mon.h | 14 ----- include/linux/usb.h | 19 +++++-- 13 files changed, 41 insertions(+), 212 deletions(-) delete mode 100644 drivers/usb/mon/mon_dma.c Merging quilt/staging $ git merge quilt/staging Merge made by recursive. drivers/staging/android/binder.c | 715 +++++----- drivers/staging/et131x/et1310_address_map.h | 2138 +++++++++++++------------- drivers/staging/et131x/et1310_eeprom.c | 46 +- drivers/staging/et131x/et1310_eeprom.h | 6 +- drivers/staging/et131x/et1310_jagcore.c | 20 +- drivers/staging/et131x/et1310_jagcore.h | 17 +- drivers/staging/et131x/et1310_mac.c | 112 +- drivers/staging/et131x/et1310_mac.h | 8 +- drivers/staging/et131x/et1310_phy.c | 202 ++-- drivers/staging/et131x/et1310_phy.h | 904 ++++++------ drivers/staging/et131x/et1310_pm.c | 19 +- drivers/staging/et131x/et1310_pm.h | 8 +- drivers/staging/et131x/et1310_rx.c | 115 +- drivers/staging/et131x/et1310_rx.h | 194 ++-- drivers/staging/et131x/et1310_tx.c | 120 +- drivers/staging/et131x/et1310_tx.h | 102 +- drivers/staging/et131x/et131x_adapter.h | 72 +- drivers/staging/et131x/et131x_config.c | 38 +- drivers/staging/et131x/et131x_debug.c | 12 +- drivers/staging/et131x/et131x_debug.h | 24 +- drivers/staging/et131x/et131x_defs.h | 12 +- drivers/staging/et131x/et131x_initpci.c | 74 +- drivers/staging/et131x/et131x_initpci.h | 6 +- drivers/staging/et131x/et131x_isr.c | 44 +- drivers/staging/et131x/et131x_isr.h | 6 +- drivers/staging/et131x/et131x_netdev.c | 123 +- drivers/staging/et131x/et131x_netdev.h | 6 +- drivers/staging/et131x/et131x_version.h | 6 +- drivers/staging/rspiusb/rspiusb.c | 14 +- drivers/staging/rt2870/rt2870.h | 1 + drivers/staging/vt6655/device_main.c | 10 +- drivers/staging/wlan-ng/hfa384x_usb.c | 202 ++-- drivers/staging/wlan-ng/p80211conv.c | 12 +- drivers/staging/wlan-ng/p80211netdev.c | 54 +- drivers/staging/wlan-ng/p80211req.c | 12 +- drivers/staging/wlan-ng/p80211wep.c | 12 +- drivers/staging/wlan-ng/p80211wext.c | 66 +- drivers/staging/wlan-ng/prism2fw.c | 46 +- drivers/staging/wlan-ng/prism2mgmt.c | 20 +- drivers/staging/wlan-ng/prism2mib.c | 144 +- drivers/staging/wlan-ng/prism2sta.c | 148 +- drivers/staging/wlan-ng/prism2usb.c | 10 +- 42 files changed, 2937 insertions(+), 2963 deletions(-) Merging scsi-post-merge/master $ git merge scsi-post-merge/master Already up-to-date. $ git am -3 ../patches/0001-kvm-powerpc-fix-build-error.patch Applying: kvm/powerpc: fix build error $ git revert cd667ce24796700e1a0e6e7528efc61c96ff832e Finished one revert. [master 8957949] Revert "HID: use debugfs for events/reports dumping" 4 files changed, 49 insertions(+), 276 deletions(-) $ git revert a635f9dd83f3382577f4544a96df12356e951a40 Finished one revert. [master 275f907] Revert "HID: use debugfs for report dumping descriptor" 8 files changed, 122 insertions(+), 195 deletions(-)