diff options
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 2426 |
1 files changed, 2426 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..6261d0158768 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2426 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 6ab8219 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block +Merging origin/master +$ git merge origin/master +Updating 6ab8219..8a335bc +Fast-forward + Documentation/filesystems/Locking | 4 + + Documentation/filesystems/vfs.txt | 43 + + Documentation/target/tcm_mod_builder.py | 1094 ++++ + Documentation/target/tcm_mod_builder.txt | 145 + + MAINTAINERS | 4 +- + arch/arm/Kconfig | 23 +- + arch/arm/common/gic.c | 66 +- + arch/arm/common/it8152.c | 14 +- + arch/arm/common/locomo.c | 24 +- + arch/arm/common/sa1111.c | 96 +- + arch/arm/common/vic.c | 32 +- + arch/arm/include/asm/bitops.h | 2 +- + arch/arm/include/asm/sched_clock.h | 2 + + arch/arm/kernel/ecard.c | 28 +- + arch/arm/kernel/head-common.S | 2 + + arch/arm/kernel/irq.c | 17 +- + arch/arm/kernel/process.c | 2 + + arch/arm/kernel/sched_clock.c | 9 +- + arch/arm/kernel/setup.c | 22 +- + arch/arm/kernel/smp_twd.c | 2 +- + arch/arm/kernel/stacktrace.c | 9 +- + arch/arm/kernel/time.c | 4 + + arch/arm/lib/delay.S | 4 + + arch/arm/mach-aaec2000/core.c | 18 +- + arch/arm/mach-at91/Kconfig | 13 + + arch/arm/mach-at91/Makefile | 2 + + arch/arm/mach-at91/board-foxg20.c | 274 + + arch/arm/mach-at91/board-gsia18s.c | 584 ++ + arch/arm/mach-at91/board-sam9m10g45ek.c | 1 - + arch/arm/mach-at91/gpio.c | 34 +- + arch/arm/mach-at91/include/mach/gsia18s.h | 33 + + arch/arm/mach-at91/irq.c | 36 +- + arch/arm/mach-bcmring/irq.c | 42 +- + arch/arm/mach-clps711x/irq.c | 40 +- + arch/arm/mach-davinci/cp_intc.c | 30 +- + arch/arm/mach-davinci/gpio.c | 46 +- + arch/arm/mach-davinci/irq.c | 26 +- + arch/arm/mach-dove/irq.c | 18 +- + arch/arm/mach-ebsa110/core.c | 14 +- + arch/arm/mach-ep93xx/gpio.c | 36 +- + arch/arm/mach-footbridge/common.c | 14 +- + arch/arm/mach-footbridge/isa-irq.c | 36 +- + arch/arm/mach-gemini/gpio.c | 26 +- + arch/arm/mach-gemini/irq.c | 20 +- + arch/arm/mach-h720x/common.c | 38 +- + arch/arm/mach-h720x/cpu-h7202.c | 14 +- + arch/arm/mach-h720x/h7201-eval.c | 1 - + arch/arm/mach-h720x/h7202-eval.c | 1 - + arch/arm/mach-imx/Kconfig | 1 + + arch/arm/mach-imx/mach-mx27_3ds.c | 10 +- + arch/arm/mach-integrator/cpu.c | 2 +- + arch/arm/mach-integrator/integrator_ap.c | 16 +- + arch/arm/mach-integrator/integrator_cp.c | 48 +- + arch/arm/mach-iop13xx/irq.c | 64 +- + arch/arm/mach-iop13xx/msi.c | 4 +- + arch/arm/mach-iop32x/irq.c | 16 +- + arch/arm/mach-iop33x/irq.c | 32 +- + arch/arm/mach-ixp2000/core.c | 70 +- + arch/arm/mach-ixp2000/ixdp2x00.c | 18 +- + arch/arm/mach-ixp2000/ixdp2x01.c | 18 +- + arch/arm/mach-ixp23xx/core.c | 55 +- + arch/arm/mach-ixp23xx/ixdp2351.c | 36 +- + arch/arm/mach-ixp4xx/common.c | 42 +- + arch/arm/mach-ks8695/irq.c | 43 +- + arch/arm/mach-lh7a40x/arch-kev7a400.c | 20 +- + arch/arm/mach-lh7a40x/arch-lpd7a40x.c | 25 +- + arch/arm/mach-lh7a40x/irq-lh7a400.c | 30 +- + arch/arm/mach-lh7a40x/irq-lh7a404.c | 60 +- + arch/arm/mach-lh7a40x/irq-lpd7a40x.c | 22 +- + arch/arm/mach-lpc32xx/irq.c | 56 +- + arch/arm/mach-mmp/include/mach/mfp-mmp2.h | 2 +- + arch/arm/mach-mmp/include/mach/mfp-pxa910.h | 2 +- + arch/arm/mach-mmp/irq-mmp2.c | 46 +- + arch/arm/mach-mmp/irq-pxa168.c | 18 +- + arch/arm/mach-msm/board-trout-gpio.c | 42 +- + arch/arm/mach-msm/gpio.c | 48 +- + arch/arm/mach-msm/irq-vic.c | 65 +- + arch/arm/mach-msm/irq.c | 45 +- + arch/arm/mach-msm/sirc.c | 39 +- + arch/arm/mach-mx3/mach-mx31_3ds.c | 4 +- + arch/arm/mach-mx3/mach-mx31ads.c | 18 +- + arch/arm/mach-mx5/Kconfig | 20 + + arch/arm/mach-mx5/Makefile | 2 + + arch/arm/mach-mx5/board-mx51_3ds.c | 5 +- + arch/arm/mach-mx5/board-mx53_evk.c | 74 + + arch/arm/mach-mx5/board-mx53_loco.c | 111 + + arch/arm/mach-mx5/board-mx53_smd.c | 111 + + arch/arm/mach-mx5/clock-mx51-mx53.c | 18 +- + arch/arm/mach-mx5/devices-imx51.h | 8 + + arch/arm/mach-mx5/devices-imx53.h | 18 + + arch/arm/mach-mx5/devices.c | 19 - + arch/arm/mach-mx5/devices.h | 1 - + arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c | 5 +- + arch/arm/mach-mxs/Kconfig | 4 +- + arch/arm/mach-mxs/clock-mx23.c | 13 +- + arch/arm/mach-mxs/clock-mx28.c | 14 +- + arch/arm/mach-mxs/devices-mx23.h | 4 +- + arch/arm/mach-mxs/devices-mx28.h | 4 +- + arch/arm/mach-mxs/devices.c | 17 +- + arch/arm/mach-mxs/devices/Kconfig | 3 +- + arch/arm/mach-mxs/devices/Makefile | 2 +- + arch/arm/mach-mxs/devices/amba-duart.c | 40 + + arch/arm/mach-mxs/devices/platform-duart.c | 48 - + arch/arm/mach-mxs/devices/platform-fec.c | 2 +- + arch/arm/mach-mxs/include/mach/devices-common.h | 11 +- + arch/arm/mach-mxs/mach-mx28evk.c | 26 +- + arch/arm/mach-netx/generic.c | 30 +- + arch/arm/mach-ns9xxx/board-a9m9750dev.c | 28 +- + arch/arm/mach-ns9xxx/irq.c | 28 +- + arch/arm/mach-nuc93x/irq.c | 16 +- + arch/arm/mach-omap1/ams-delta-fiq.c | 8 +- + arch/arm/mach-omap1/fpga.c | 28 +- + arch/arm/mach-omap1/irq.c | 44 +- + arch/arm/mach-omap2/irq.c | 22 +- + arch/arm/mach-pnx4008/irq.c | 62 +- + arch/arm/mach-pxa/balloon3.c | 23 +- + arch/arm/mach-pxa/clock-pxa3xx.c | 1 - + arch/arm/mach-pxa/cm-x2xx-pci.c | 2 +- + arch/arm/mach-pxa/generic.c | 1 - + arch/arm/mach-pxa/generic.h | 4 +- + arch/arm/mach-pxa/irq.c | 83 +- + arch/arm/mach-pxa/lpd270.c | 17 +- + arch/arm/mach-pxa/lubbock.c | 17 +- + arch/arm/mach-pxa/mainstone.c | 17 +- + arch/arm/mach-pxa/pcm990-baseboard.c | 15 +- + arch/arm/mach-pxa/pxa25x.c | 7 +- + arch/arm/mach-pxa/pxa27x.c | 9 +- + arch/arm/mach-pxa/pxa3xx.c | 36 +- + arch/arm/mach-pxa/spitz.c | 1 + + arch/arm/mach-pxa/viper.c | 22 +- + arch/arm/mach-pxa/zeus.c | 26 +- + arch/arm/mach-rpc/irq.c | 60 +- + arch/arm/mach-s3c2410/bast-irq.c | 22 +- + arch/arm/mach-s3c2410/include/mach/irqs.h | 4 +- + arch/arm/mach-s3c2410/include/mach/map.h | 4 +- + .../mach-s3c2410/include/mach/regs-s3c2443-clock.h | 1 + + arch/arm/mach-s3c2412/irq.c | 50 +- + arch/arm/mach-s3c2416/Kconfig | 12 + + arch/arm/mach-s3c2416/Makefile | 4 + + arch/arm/mach-s3c2416/clock.c | 18 +- + arch/arm/mach-s3c2416/irq.c | 76 +- + arch/arm/mach-s3c2416/mach-smdk2416.c | 23 + + arch/arm/mach-s3c2416/s3c2416.c | 5 + + arch/arm/mach-s3c2416/setup-sdhci-gpio.c | 34 + + arch/arm/mach-s3c2416/setup-sdhci.c | 61 + + arch/arm/mach-s3c2440/irq.c | 18 +- + arch/arm/mach-s3c2440/s3c244x-irq.c | 18 +- + arch/arm/mach-s3c2443/Kconfig | 3 +- + arch/arm/mach-s3c2443/clock.c | 4 +- + arch/arm/mach-s3c2443/irq.c | 95 +- + arch/arm/mach-s3c2443/mach-smdk2443.c | 9 +- + arch/arm/mach-s3c2443/s3c2443.c | 7 + + arch/arm/mach-s3c64xx/clock.c | 19 +- + arch/arm/mach-s3c64xx/dma.c | 1 + + arch/arm/mach-s3c64xx/irq-eint.c | 37 +- + arch/arm/mach-s5p6442/clock.c | 16 +- + arch/arm/mach-s5p6442/include/mach/map.h | 3 + + arch/arm/mach-s5p6442/mach-smdk6442.c | 10 + + arch/arm/mach-s5p6442/setup-i2c0.c | 5 +- + arch/arm/mach-s5p64x0/Makefile | 4 +- + arch/arm/mach-s5p64x0/clock-s5p6440.c | 22 +- + arch/arm/mach-s5p64x0/clock-s5p6450.c | 34 +- + arch/arm/mach-s5p64x0/dev-audio.c | 123 +- + arch/arm/mach-s5p64x0/{gpio.c => gpiolib.c} | 221 +- + arch/arm/mach-s5p64x0/include/mach/map.h | 5 + + arch/arm/mach-s5p64x0/include/mach/regs-gpio.h | 57 +- + arch/arm/mach-s5p64x0/mach-smdk6440.c | 1 + + arch/arm/mach-s5p64x0/mach-smdk6450.c | 1 + + arch/arm/mach-s5pc100/clock.c | 16 +- + arch/arm/mach-s5pc100/include/mach/map.h | 2 + + arch/arm/mach-s5pv210/Kconfig | 2 + + arch/arm/mach-s5pv210/clock.c | 25 +- + arch/arm/mach-s5pv210/cpu.c | 5 - + arch/arm/mach-s5pv210/include/mach/irqs.h | 3 +- + arch/arm/mach-s5pv210/include/mach/map.h | 6 + + arch/arm/mach-s5pv210/include/mach/regs-clock.h | 5 +- + arch/arm/mach-s5pv210/mach-smdkc110.c | 1 + + arch/arm/mach-s5pv210/mach-smdkv210.c | 139 +- + arch/arm/mach-s5pv310/Kconfig | 21 + + arch/arm/mach-s5pv310/Makefile | 6 +- + arch/arm/mach-s5pv310/clock.c | 77 +- + arch/arm/mach-s5pv310/cpu.c | 21 +- + arch/arm/mach-s5pv310/cpufreq.c | 580 ++ + arch/arm/mach-s5pv310/dev-pd.c | 139 + + arch/arm/mach-s5pv310/dev-sysmmu.c | 187 + + arch/arm/mach-s5pv310/hotplug.c | 4 +- + arch/arm/mach-s5pv310/include/mach/irqs.h | 34 +- + arch/arm/mach-s5pv310/include/mach/map.h | 29 + + arch/arm/mach-s5pv310/include/mach/regs-clock.h | 80 +- + arch/arm/mach-s5pv310/include/mach/regs-mem.h | 23 + + arch/arm/mach-s5pv310/include/mach/regs-pmu.h | 30 + + arch/arm/mach-s5pv310/include/mach/regs-srom.h | 50 - + arch/arm/mach-s5pv310/include/mach/regs-sysmmu.h | 24 + + arch/arm/mach-s5pv310/include/mach/sysmmu.h | 119 + + arch/arm/mach-s5pv310/irq-combiner.c | 32 +- + arch/arm/mach-s5pv310/irq-eint.c | 55 +- + arch/arm/mach-s5pv310/mach-smdkc210.c | 52 +- + arch/arm/mach-s5pv310/mach-smdkv310.c | 52 +- + arch/arm/mach-s5pv310/mach-universal_c210.c | 80 + + arch/arm/mach-sa1100/generic.c | 1 - + arch/arm/mach-sa1100/irq.c | 84 +- + arch/arm/mach-sa1100/neponset.c | 8 +- + arch/arm/mach-shark/irq.c | 26 +- + arch/arm/mach-stmp378x/stmp378x.c | 16 +- + arch/arm/mach-stmp37xx/stmp37xx.c | 24 +- + arch/arm/mach-tcc8k/irq.c | 56 +- + arch/arm/mach-tegra/gpio.c | 38 +- + arch/arm/mach-tegra/hotplug.c | 4 +- + arch/arm/mach-tegra/irq.c | 36 +- + arch/arm/mach-versatile/core.c | 18 +- + arch/arm/mach-w90x900/irq.c | 20 +- + arch/arm/mm/dma-mapping.c | 2 +- + arch/arm/mm/proc-v7.S | 4 +- + arch/arm/plat-mxc/3ds_debugboard.c | 28 +- + arch/arm/plat-mxc/avic.c | 14 +- + arch/arm/plat-mxc/devices/Kconfig | 2 +- + arch/arm/plat-mxc/devices/platform-fec.c | 5 + + arch/arm/plat-mxc/devices/platform-imx-i2c.c | 9 + + arch/arm/plat-mxc/devices/platform-imx-keypad.c | 5 + + arch/arm/plat-mxc/devices/platform-mxc_pwm.c | 9 + + .../plat-mxc/devices/platform-sdhci-esdhc-imx.c | 12 + + arch/arm/plat-mxc/devices/platform-spi_imx.c | 12 + + arch/arm/plat-mxc/gpio.c | 30 +- + arch/arm/plat-mxc/include/mach/iomux-mx53.h | 4 +- + arch/arm/plat-mxc/include/mach/iomux-v3.h | 1 + + arch/arm/plat-mxc/include/mach/mx51.h | 6 +- + arch/arm/plat-mxc/include/mach/mx53.h | 28 +- + arch/arm/plat-mxc/pwm.c | 2 +- + arch/arm/plat-mxc/tzic.c | 38 +- + arch/arm/plat-nomadik/gpio.c | 56 +- + arch/arm/plat-omap/gpio.c | 95 +- + arch/arm/plat-orion/gpio.c | 37 +- + arch/arm/plat-orion/irq.c | 18 +- + arch/arm/plat-pxa/gpio.c | 28 +- + arch/arm/plat-pxa/include/plat/gpio.h | 4 +- + arch/arm/plat-s3c24xx/devs.c | 1 - + arch/arm/plat-s3c24xx/include/plat/irq.h | 4 +- + arch/arm/plat-s3c24xx/irq-pm.c | 9 +- + arch/arm/plat-s3c24xx/irq.c | 182 +- + arch/arm/plat-s3c24xx/s3c2443-clock.c | 2 +- + arch/arm/plat-s5p/Kconfig | 26 + + arch/arm/plat-s5p/Makefile | 3 + + arch/arm/plat-s5p/cpu.c | 5 + + arch/arm/plat-s5p/dev-csis0.c | 34 + + arch/arm/plat-s5p/dev-csis1.c | 34 + + arch/arm/plat-s5p/include/plat/csis.h | 28 + + arch/arm/plat-s5p/include/plat/map-s5p.h | 1 + + arch/arm/plat-s5p/include/plat/regs-srom.h | 54 + + arch/arm/plat-s5p/include/plat/sysmmu.h | 23 + + arch/arm/plat-s5p/irq-eint.c | 86 +- + arch/arm/plat-s5p/irq-gpioint.c | 50 +- + arch/arm/plat-s5p/irq-pm.c | 6 +- + arch/arm/plat-s5p/sysmmu.c | 328 ++ + arch/arm/plat-samsung/Kconfig | 14 + + arch/arm/plat-samsung/Makefile | 4 + + arch/arm/plat-samsung/clock.c | 92 + + arch/arm/plat-samsung/dev-nand.c | 2 - + arch/arm/plat-samsung/gpio-config.c | 42 + + arch/arm/plat-samsung/gpiolib.c | 7 + + arch/arm/plat-samsung/include/plat/clock.h | 3 + + arch/arm/plat-samsung/include/plat/devs.h | 8 + + .../plat-samsung/include/plat/gpio-cfg-helpers.h | 2 +- + arch/arm/plat-samsung/include/plat/gpio-core.h | 2 + + arch/arm/plat-samsung/include/plat/pd.h | 30 + + arch/arm/plat-samsung/include/plat/pm.h | 4 +- + arch/arm/plat-samsung/include/plat/sdhci.h | 35 + + arch/arm/plat-samsung/irq-uart.c | 40 +- + arch/arm/plat-samsung/irq-vic-timer.c | 26 +- + arch/arm/plat-samsung/pd.c | 95 + + arch/arm/plat-samsung/pm.c | 6 +- + arch/arm/plat-spear/shirq.c | 22 +- + arch/arm/plat-stmp3xxx/irq.c | 2 +- + arch/arm/plat-stmp3xxx/pinmux.c | 32 +- + arch/parisc/include/asm/pgtable.h | 4 +- + arch/x86/Kconfig | 1 + + arch/x86/kernel/apb_timer.c | 14 +- + arch/x86/kernel/tsc.c | 4 +- + arch/x86/xen/mmu.c | 1 + + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/acpi/acpica/acglobal.h | 2 + + drivers/acpi/acpica/evmisc.c | 2 - + drivers/acpi/acpica/utmutex.c | 1 + + drivers/acpi/apei/hest.c | 6 +- + drivers/acpi/numa.c | 8 +- + drivers/acpi/pci_root.c | 4 +- + drivers/gpu/drm/drm_fb_helper.c | 41 +- + drivers/gpu/drm/i915/intel_fb.c | 1 + + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 1 + + drivers/gpu/drm/radeon/radeon_fb.c | 2 + + drivers/i2c/i2c-core.c | 90 +- + drivers/mmc/host/sdhci-of-core.c | 9 + + drivers/mtd/mtdchar.c | 2 +- + drivers/net/Kconfig | 3 +- + drivers/scsi/sd.c | 103 +- + drivers/scsi/sd.h | 1 - + drivers/scsi/sr.c | 4 - + drivers/serial/samsung.c | 4 +- + drivers/spi/Kconfig | 8 +- + drivers/spi/amba-pl022.c | 2 +- + drivers/spi/dw_spi_mmio.c | 5 +- + drivers/spi/spi_imx.c | 6 + + drivers/spi/spi_tegra.c | 2 +- + drivers/staging/autofs/dirhash.c | 5 +- + drivers/target/Kconfig | 32 + + drivers/target/Makefile | 24 + + drivers/target/target_core_alua.c | 1991 +++++++ + drivers/target/target_core_alua.h | 126 + + drivers/target/target_core_cdb.c | 1131 ++++ + drivers/target/target_core_configfs.c | 3225 ++++++++++ + drivers/target/target_core_device.c | 1694 ++++++ + drivers/target/target_core_fabric_configfs.c | 996 ++++ + drivers/target/target_core_fabric_lib.c | 451 ++ + drivers/target/target_core_file.c | 688 +++ + drivers/target/target_core_file.h | 50 + + drivers/target/target_core_hba.c | 185 + + drivers/target/target_core_hba.h | 7 + + drivers/target/target_core_iblock.c | 808 +++ + drivers/target/target_core_iblock.h | 40 + + drivers/target/target_core_mib.c | 1078 ++++ + drivers/target/target_core_mib.h | 28 + + drivers/target/target_core_pr.c | 4252 ++++++++++++++ + drivers/target/target_core_pr.h | 67 + + drivers/target/target_core_pscsi.c | 1470 +++++ + drivers/target/target_core_pscsi.h | 65 + + drivers/target/target_core_rd.c | 1091 ++++ + drivers/target/target_core_rd.h | 73 + + drivers/target/target_core_scdb.c | 105 + + drivers/target/target_core_scdb.h | 10 + + drivers/target/target_core_tmr.c | 404 ++ + drivers/target/target_core_tpg.c | 826 +++ + drivers/target/target_core_transport.c | 6134 ++++++++++++++++++++ + drivers/target/target_core_ua.c | 332 ++ + drivers/target/target_core_ua.h | 36 + + drivers/video/ep93xx-fb.c | 6 +- + fs/afs/dir.c | 1 + + fs/afs/inode.c | 3 +- + fs/afs/internal.h | 1 + + fs/afs/mntpt.c | 56 +- + fs/anon_inodes.c | 2 +- + fs/autofs4/autofs_i.h | 99 +- + fs/autofs4/dev-ioctl.c | 2 +- + fs/autofs4/expire.c | 51 +- + fs/autofs4/inode.c | 26 +- + fs/autofs4/root.c | 673 +-- + fs/autofs4/waitq.c | 17 +- + fs/btrfs/ctree.h | 1 + + fs/cifs/cifs_dfs_ref.c | 120 +- + fs/cifs/cifsfs.h | 6 + + fs/cifs/dir.c | 2 + + fs/cifs/inode.c | 8 +- + fs/configfs/Kconfig | 4 +- + fs/dcache.c | 5 +- + fs/dlm/Kconfig | 3 +- + fs/fs_struct.c | 35 +- + fs/internal.h | 5 + + fs/namei.c | 379 +- + fs/namespace.c | 196 +- + fs/nfs/dir.c | 4 +- + fs/nfs/inode.c | 4 +- + fs/nfs/internal.h | 1 + + fs/nfs/namespace.c | 79 +- + fs/nfsd/vfs.c | 5 +- + fs/ocfs2/Kconfig | 3 +- + fs/pipe.c | 2 +- + fs/squashfs/Kconfig | 18 +- + fs/squashfs/Makefile | 1 + + fs/squashfs/block.c | 1 - + fs/squashfs/cache.c | 1 - + fs/squashfs/decompressor.c | 16 +- + fs/squashfs/decompressor.h | 9 + + fs/squashfs/fragment.c | 1 - + fs/squashfs/id.c | 1 - + fs/squashfs/lzo_wrapper.c | 1 - + fs/squashfs/squashfs.h | 8 - + fs/squashfs/squashfs_fs.h | 1 + + fs/squashfs/squashfs_fs_i.h | 6 + + fs/squashfs/xattr_id.c | 1 - + fs/squashfs/xz_wrapper.c | 153 + + fs/squashfs/zlib_wrapper.c | 15 +- + fs/stat.c | 4 +- + fs/super.c | 2 +- + fs/xfs/Makefile | 1 + + fs/xfs/linux-2.6/xfs_buf.c | 7 +- + fs/xfs/linux-2.6/xfs_buf.h | 7 +- + fs/xfs/linux-2.6/xfs_discard.c | 191 + + fs/xfs/linux-2.6/xfs_discard.h | 8 + + fs/xfs/linux-2.6/xfs_file.c | 535 +- + fs/xfs/linux-2.6/xfs_ioctl.c | 3 + + fs/xfs/linux-2.6/xfs_super.c | 2 +- + fs/xfs/linux-2.6/xfs_sync.c | 11 +- + fs/xfs/linux-2.6/xfs_sysctl.c | 23 +- + fs/xfs/linux-2.6/xfs_trace.h | 33 + + fs/xfs/support/debug.c | 112 +- + fs/xfs/support/debug.h | 25 +- + fs/xfs/xfs_alloc.c | 10 +- + fs/xfs/xfs_alloc.h | 25 +- + fs/xfs/xfs_buf_item.c | 151 +- + fs/xfs/xfs_error.c | 31 - + fs/xfs/xfs_error.h | 18 +- + fs/xfs/xfs_fsops.c | 10 +- + fs/xfs/xfs_fsops.h | 2 +- + fs/xfs/xfs_log.c | 2 +- + fs/xfs/xfs_log_recover.c | 2 +- + fs/xfs/xfs_trans.c | 2 +- + include/asm-generic/pgtable.h | 14 +- + include/drm/drm_fb_helper.h | 3 + + include/linux/auto_fs4.h | 2 +- + include/linux/dcache.h | 16 +- + include/linux/fcntl.h | 1 + + include/linux/fs.h | 2 + + include/linux/memory_hotplug.h | 6 + + include/linux/mount.h | 11 +- + include/linux/namei.h | 5 +- + include/linux/nfs_fs.h | 1 - + include/linux/path.h | 2 - + include/linux/pci-acpi.h | 3 - + include/linux/pci.h | 5 + + include/target/configfs_macros.h | 147 + + include/target/target_core_base.h | 937 +++ + include/target/target_core_configfs.h | 52 + + include/target/target_core_device.h | 61 + + include/target/target_core_fabric_configfs.h | 106 + + include/target/target_core_fabric_lib.h | 28 + + include/target/target_core_fabric_ops.h | 100 + + include/target/target_core_tmr.h | 43 + + include/target/target_core_tpg.h | 35 + + include/target/target_core_transport.h | 351 ++ + include/trace/events/module.h | 10 + + init/Kconfig | 15 - + kernel/futex.c | 7 +- + kernel/rcutiny.c | 3 +- + kernel/srcu.c | 15 +- + kernel/time/clocksource.c | 8 +- + kernel/time/timekeeping.c | 4 +- + kernel/trace/trace_syscalls.c | 33 +- + mm/memory_hotplug.c | 4 + + mm/pgtable-generic.c | 11 +- + mm/slab.c | 6 +- + mm/slub.c | 4 +- + tools/perf/Documentation/perf-record.txt | 3 + + tools/perf/builtin-record.c | 12 +- + tools/perf/builtin-sched.c | 18 +- + tools/perf/builtin-stat.c | 1 + + tools/perf/builtin-top.c | 5 +- + tools/perf/perf.c | 2 - + 446 files changed, 39340 insertions(+), 4058 deletions(-) + create mode 100755 Documentation/target/tcm_mod_builder.py + create mode 100644 Documentation/target/tcm_mod_builder.txt + create mode 100644 arch/arm/mach-at91/board-foxg20.c + create mode 100644 arch/arm/mach-at91/board-gsia18s.c + create mode 100644 arch/arm/mach-at91/include/mach/gsia18s.h + create mode 100644 arch/arm/mach-mx5/board-mx53_loco.c + create mode 100644 arch/arm/mach-mx5/board-mx53_smd.c + create mode 100644 arch/arm/mach-mxs/devices/amba-duart.c + delete mode 100644 arch/arm/mach-mxs/devices/platform-duart.c + create mode 100644 arch/arm/mach-s3c2416/setup-sdhci-gpio.c + create mode 100644 arch/arm/mach-s3c2416/setup-sdhci.c + rename arch/arm/mach-s5p64x0/{gpio.c => gpiolib.c} (58%) + create mode 100644 arch/arm/mach-s5pv310/cpufreq.c + create mode 100644 arch/arm/mach-s5pv310/dev-pd.c + create mode 100644 arch/arm/mach-s5pv310/dev-sysmmu.c + create mode 100644 arch/arm/mach-s5pv310/include/mach/regs-mem.h + create mode 100644 arch/arm/mach-s5pv310/include/mach/regs-pmu.h + delete mode 100644 arch/arm/mach-s5pv310/include/mach/regs-srom.h + create mode 100644 arch/arm/mach-s5pv310/include/mach/regs-sysmmu.h + create mode 100644 arch/arm/mach-s5pv310/include/mach/sysmmu.h + create mode 100644 arch/arm/plat-s5p/dev-csis0.c + create mode 100644 arch/arm/plat-s5p/dev-csis1.c + create mode 100644 arch/arm/plat-s5p/include/plat/csis.h + create mode 100644 arch/arm/plat-s5p/include/plat/regs-srom.h + create mode 100644 arch/arm/plat-s5p/include/plat/sysmmu.h + create mode 100644 arch/arm/plat-s5p/sysmmu.c + create mode 100644 arch/arm/plat-samsung/include/plat/pd.h + create mode 100644 arch/arm/plat-samsung/pd.c + create mode 100644 drivers/target/Kconfig + create mode 100644 drivers/target/Makefile + create mode 100644 drivers/target/target_core_alua.c + create mode 100644 drivers/target/target_core_alua.h + create mode 100644 drivers/target/target_core_cdb.c + create mode 100644 drivers/target/target_core_configfs.c + create mode 100644 drivers/target/target_core_device.c + create mode 100644 drivers/target/target_core_fabric_configfs.c + create mode 100644 drivers/target/target_core_fabric_lib.c + create mode 100644 drivers/target/target_core_file.c + create mode 100644 drivers/target/target_core_file.h + create mode 100644 drivers/target/target_core_hba.c + create mode 100644 drivers/target/target_core_hba.h + create mode 100644 drivers/target/target_core_iblock.c + create mode 100644 drivers/target/target_core_iblock.h + create mode 100644 drivers/target/target_core_mib.c + create mode 100644 drivers/target/target_core_mib.h + create mode 100644 drivers/target/target_core_pr.c + create mode 100644 drivers/target/target_core_pr.h + create mode 100644 drivers/target/target_core_pscsi.c + create mode 100644 drivers/target/target_core_pscsi.h + create mode 100644 drivers/target/target_core_rd.c + create mode 100644 drivers/target/target_core_rd.h + create mode 100644 drivers/target/target_core_scdb.c + create mode 100644 drivers/target/target_core_scdb.h + create mode 100644 drivers/target/target_core_tmr.c + create mode 100644 drivers/target/target_core_tpg.c + create mode 100644 drivers/target/target_core_transport.c + create mode 100644 drivers/target/target_core_ua.c + create mode 100644 drivers/target/target_core_ua.h + create mode 100644 fs/squashfs/xz_wrapper.c + create mode 100644 fs/xfs/linux-2.6/xfs_discard.c + create mode 100644 fs/xfs/linux-2.6/xfs_discard.h + create mode 100644 include/target/configfs_macros.h + create mode 100644 include/target/target_core_base.h + create mode 100644 include/target/target_core_configfs.h + create mode 100644 include/target/target_core_device.h + create mode 100644 include/target/target_core_fabric_configfs.h + create mode 100644 include/target/target_core_fabric_lib.h + create mode 100644 include/target/target_core_fabric_ops.h + create mode 100644 include/target/target_core_tmr.h + create mode 100644 include/target/target_core_tpg.h + create mode 100644 include/target/target_core_transport.h +Merging fixes/fixes +$ git merge fixes/fixes +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Already up-to-date! +Merge made by recursive. +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 +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Merge made by recursive. + drivers/s390/net/qeth_l2_main.c | 18 ++++++++++++++++-- + drivers/s390/net/qeth_l3_main.c | 22 +++++++++++++++++++--- + 2 files changed, 35 insertions(+), 5 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 +Merge made by recursive. + drivers/net/wireless/iwmc3200wifi/netdev.c | 2 ++ + drivers/net/wireless/rt2x00/rt2x00firmware.c | 1 + + include/linux/ieee80211.h | 2 +- + net/mac80211/agg-rx.c | 11 ++--------- + net/mac80211/main.c | 12 +++++++++++- + 5 files changed, 17 insertions(+), 11 deletions(-) +Merging kbuild-current/rc-fixes +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging driver-core.current/driver-core-linus +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus +$ git merge tty.current/tty-linus +Auto-merging MAINTAINERS +Auto-merging drivers/Makefile +Merge made by recursive. + MAINTAINERS | 50 ++++++++++---------- + drivers/Makefile | 3 +- + drivers/char/Kconfig | 2 +- + drivers/char/Makefile | 13 ----- + drivers/tty/Makefile | 2 + + drivers/tty/hvc/Makefile | 13 +++++ + drivers/{char => tty/hvc}/hvc_beat.c | 0 + drivers/{char => tty/hvc}/hvc_console.c | 0 + drivers/{char => tty/hvc}/hvc_console.h | 0 + drivers/{char => tty/hvc}/hvc_dcc.c | 0 + drivers/{char => tty/hvc}/hvc_irq.c | 0 + drivers/{char => tty/hvc}/hvc_iseries.c | 0 + drivers/{char => tty/hvc}/hvc_iucv.c | 0 + drivers/{char => tty/hvc}/hvc_rtas.c | 0 + drivers/{char => tty/hvc}/hvc_tile.c | 0 + drivers/{char => tty/hvc}/hvc_udbg.c | 0 + drivers/{char => tty/hvc}/hvc_vio.c | 0 + drivers/{char => tty/hvc}/hvc_xen.c | 0 + drivers/{char => tty/hvc}/hvcs.c | 0 + drivers/{char => tty/hvc}/hvsi.c | 0 + drivers/{char => tty/hvc}/virtio_console.c | 0 + drivers/{ => tty}/serial/21285.c | 0 + drivers/{ => tty}/serial/68328serial.c | 0 + drivers/{ => tty}/serial/68328serial.h | 0 + drivers/{ => tty}/serial/68360serial.c | 0 + drivers/{ => tty}/serial/8250.c | 0 + drivers/{ => tty}/serial/8250.h | 0 + drivers/{ => tty}/serial/8250_accent.c | 0 + drivers/{ => tty}/serial/8250_acorn.c | 0 + drivers/{ => tty}/serial/8250_boca.c | 0 + drivers/{ => tty}/serial/8250_early.c | 0 + drivers/{ => tty}/serial/8250_exar_st16c554.c | 0 + drivers/{ => tty}/serial/8250_fourport.c | 0 + drivers/{ => tty}/serial/8250_gsc.c | 0 + drivers/{ => tty}/serial/8250_hp300.c | 0 + drivers/{ => tty}/serial/8250_hub6.c | 0 + drivers/{ => tty}/serial/8250_mca.c | 0 + drivers/{ => tty}/serial/8250_pci.c | 0 + drivers/{ => tty}/serial/8250_pnp.c | 0 + drivers/{ => tty}/serial/Kconfig | 0 + drivers/{ => tty}/serial/Makefile | 0 + drivers/{ => tty}/serial/altera_jtaguart.c | 0 + drivers/{ => tty}/serial/altera_uart.c | 0 + drivers/{ => tty}/serial/amba-pl010.c | 0 + drivers/{ => tty}/serial/amba-pl011.c | 0 + drivers/{ => tty}/serial/apbuart.c | 0 + drivers/{ => tty}/serial/apbuart.h | 0 + drivers/{ => tty}/serial/atmel_serial.c | 0 + drivers/{ => tty}/serial/bcm63xx_uart.c | 0 + drivers/{ => tty}/serial/bfin_5xx.c | 0 + drivers/{ => tty}/serial/bfin_sport_uart.c | 0 + drivers/{ => tty}/serial/bfin_sport_uart.h | 0 + drivers/{ => tty}/serial/clps711x.c | 0 + drivers/{ => tty}/serial/cpm_uart/Makefile | 0 + drivers/{ => tty}/serial/cpm_uart/cpm_uart.h | 0 + drivers/{ => tty}/serial/cpm_uart/cpm_uart_core.c | 0 + drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm1.c | 0 + drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm1.h | 0 + drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm2.c | 0 + drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm2.h | 0 + drivers/{ => tty}/serial/crisv10.c | 0 + drivers/{ => tty}/serial/crisv10.h | 0 + drivers/{ => tty}/serial/dz.c | 0 + drivers/{ => tty}/serial/dz.h | 0 + drivers/{ => tty}/serial/icom.c | 0 + drivers/{ => tty}/serial/icom.h | 0 + drivers/{ => tty}/serial/ifx6x60.c | 0 + drivers/{ => tty}/serial/ifx6x60.h | 0 + drivers/{ => tty}/serial/imx.c | 0 + drivers/{ => tty}/serial/ioc3_serial.c | 0 + drivers/{ => tty}/serial/ioc4_serial.c | 0 + drivers/{ => tty}/serial/ip22zilog.c | 0 + drivers/{ => tty}/serial/ip22zilog.h | 0 + drivers/{ => tty}/serial/jsm/Makefile | 0 + drivers/{ => tty}/serial/jsm/jsm.h | 0 + drivers/{ => tty}/serial/jsm/jsm_driver.c | 0 + drivers/{ => tty}/serial/jsm/jsm_neo.c | 0 + drivers/{ => tty}/serial/jsm/jsm_tty.c | 0 + drivers/{ => tty}/serial/kgdboc.c | 0 + drivers/{ => tty}/serial/m32r_sio.c | 0 + drivers/{ => tty}/serial/m32r_sio.h | 0 + drivers/{ => tty}/serial/m32r_sio_reg.h | 0 + drivers/{ => tty}/serial/max3100.c | 0 + drivers/{ => tty}/serial/max3107-aava.c | 0 + drivers/{ => tty}/serial/max3107.c | 0 + drivers/{ => tty}/serial/max3107.h | 0 + drivers/{ => tty}/serial/mcf.c | 0 + drivers/{ => tty}/serial/mfd.c | 0 + drivers/{ => tty}/serial/mpc52xx_uart.c | 0 + drivers/{ => tty}/serial/mpsc.c | 0 + drivers/{ => tty}/serial/mrst_max3110.c | 0 + drivers/{ => tty}/serial/mrst_max3110.h | 0 + drivers/{ => tty}/serial/msm_serial.c | 0 + drivers/{ => tty}/serial/msm_serial.h | 0 + drivers/{ => tty}/serial/mux.c | 0 + drivers/{ => tty}/serial/netx-serial.c | 0 + drivers/{ => tty}/serial/nwpserial.c | 0 + drivers/{ => tty}/serial/of_serial.c | 0 + drivers/{ => tty}/serial/omap-serial.c | 0 + drivers/{ => tty}/serial/pch_uart.c | 0 + drivers/{ => tty}/serial/pmac_zilog.c | 0 + drivers/{ => tty}/serial/pmac_zilog.h | 0 + drivers/{ => tty}/serial/pnx8xxx_uart.c | 0 + drivers/{ => tty}/serial/pxa.c | 0 + drivers/{ => tty}/serial/s3c2400.c | 0 + drivers/{ => tty}/serial/s3c2410.c | 0 + drivers/{ => tty}/serial/s3c2412.c | 0 + drivers/{ => tty}/serial/s3c2440.c | 0 + drivers/{ => tty}/serial/s3c24a0.c | 0 + drivers/{ => tty}/serial/s3c6400.c | 0 + drivers/{ => tty}/serial/s5pv210.c | 0 + drivers/{ => tty}/serial/sa1100.c | 0 + drivers/{ => tty}/serial/samsung.c | 0 + drivers/{ => tty}/serial/samsung.h | 0 + drivers/{ => tty}/serial/sb1250-duart.c | 0 + drivers/{ => tty}/serial/sc26xx.c | 0 + drivers/{ => tty}/serial/serial_core.c | 0 + drivers/{ => tty}/serial/serial_cs.c | 0 + drivers/{ => tty}/serial/serial_ks8695.c | 0 + drivers/{ => tty}/serial/serial_lh7a40x.c | 0 + drivers/{ => tty}/serial/serial_txx9.c | 0 + drivers/{ => tty}/serial/sh-sci.c | 0 + drivers/{ => tty}/serial/sh-sci.h | 0 + drivers/{ => tty}/serial/sn_console.c | 0 + drivers/{ => tty}/serial/suncore.c | 0 + drivers/{ => tty}/serial/suncore.h | 0 + drivers/{ => tty}/serial/sunhv.c | 0 + drivers/{ => tty}/serial/sunsab.c | 0 + drivers/{ => tty}/serial/sunsab.h | 0 + drivers/{ => tty}/serial/sunsu.c | 0 + drivers/{ => tty}/serial/sunzilog.c | 0 + drivers/{ => tty}/serial/sunzilog.h | 0 + drivers/{ => tty}/serial/timbuart.c | 0 + drivers/{ => tty}/serial/timbuart.h | 0 + drivers/{ => tty}/serial/uartlite.c | 0 + drivers/{ => tty}/serial/ucc_uart.c | 0 + drivers/{ => tty}/serial/vr41xx_siu.c | 0 + drivers/{ => tty}/serial/vt8500_serial.c | 0 + drivers/{ => tty}/serial/zs.c | 0 + drivers/{ => tty}/serial/zs.h | 0 + 140 files changed, 42 insertions(+), 41 deletions(-) + create mode 100644 drivers/tty/hvc/Makefile + rename drivers/{char => tty/hvc}/hvc_beat.c (100%) + rename drivers/{char => tty/hvc}/hvc_console.c (100%) + rename drivers/{char => tty/hvc}/hvc_console.h (100%) + rename drivers/{char => tty/hvc}/hvc_dcc.c (100%) + rename drivers/{char => tty/hvc}/hvc_irq.c (100%) + rename drivers/{char => tty/hvc}/hvc_iseries.c (100%) + rename drivers/{char => tty/hvc}/hvc_iucv.c (100%) + rename drivers/{char => tty/hvc}/hvc_rtas.c (100%) + rename drivers/{char => tty/hvc}/hvc_tile.c (100%) + rename drivers/{char => tty/hvc}/hvc_udbg.c (100%) + rename drivers/{char => tty/hvc}/hvc_vio.c (100%) + rename drivers/{char => tty/hvc}/hvc_xen.c (100%) + rename drivers/{char => tty/hvc}/hvcs.c (100%) + rename drivers/{char => tty/hvc}/hvsi.c (100%) + rename drivers/{char => tty/hvc}/virtio_console.c (100%) + rename drivers/{ => tty}/serial/21285.c (100%) + rename drivers/{ => tty}/serial/68328serial.c (100%) + rename drivers/{ => tty}/serial/68328serial.h (100%) + rename drivers/{ => tty}/serial/68360serial.c (100%) + rename drivers/{ => tty}/serial/8250.c (100%) + rename drivers/{ => tty}/serial/8250.h (100%) + rename drivers/{ => tty}/serial/8250_accent.c (100%) + rename drivers/{ => tty}/serial/8250_acorn.c (100%) + rename drivers/{ => tty}/serial/8250_boca.c (100%) + rename drivers/{ => tty}/serial/8250_early.c (100%) + rename drivers/{ => tty}/serial/8250_exar_st16c554.c (100%) + rename drivers/{ => tty}/serial/8250_fourport.c (100%) + rename drivers/{ => tty}/serial/8250_gsc.c (100%) + rename drivers/{ => tty}/serial/8250_hp300.c (100%) + rename drivers/{ => tty}/serial/8250_hub6.c (100%) + rename drivers/{ => tty}/serial/8250_mca.c (100%) + rename drivers/{ => tty}/serial/8250_pci.c (100%) + rename drivers/{ => tty}/serial/8250_pnp.c (100%) + rename drivers/{ => tty}/serial/Kconfig (100%) + rename drivers/{ => tty}/serial/Makefile (100%) + rename drivers/{ => tty}/serial/altera_jtaguart.c (100%) + rename drivers/{ => tty}/serial/altera_uart.c (100%) + rename drivers/{ => tty}/serial/amba-pl010.c (100%) + rename drivers/{ => tty}/serial/amba-pl011.c (100%) + rename drivers/{ => tty}/serial/apbuart.c (100%) + rename drivers/{ => tty}/serial/apbuart.h (100%) + rename drivers/{ => tty}/serial/atmel_serial.c (100%) + rename drivers/{ => tty}/serial/bcm63xx_uart.c (100%) + rename drivers/{ => tty}/serial/bfin_5xx.c (100%) + rename drivers/{ => tty}/serial/bfin_sport_uart.c (100%) + rename drivers/{ => tty}/serial/bfin_sport_uart.h (100%) + rename drivers/{ => tty}/serial/clps711x.c (100%) + rename drivers/{ => tty}/serial/cpm_uart/Makefile (100%) + rename drivers/{ => tty}/serial/cpm_uart/cpm_uart.h (100%) + rename drivers/{ => tty}/serial/cpm_uart/cpm_uart_core.c (100%) + rename drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm1.c (100%) + rename drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm1.h (100%) + rename drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm2.c (100%) + rename drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm2.h (100%) + rename drivers/{ => tty}/serial/crisv10.c (100%) + rename drivers/{ => tty}/serial/crisv10.h (100%) + rename drivers/{ => tty}/serial/dz.c (100%) + rename drivers/{ => tty}/serial/dz.h (100%) + rename drivers/{ => tty}/serial/icom.c (100%) + rename drivers/{ => tty}/serial/icom.h (100%) + rename drivers/{ => tty}/serial/ifx6x60.c (100%) + rename drivers/{ => tty}/serial/ifx6x60.h (100%) + rename drivers/{ => tty}/serial/imx.c (100%) + rename drivers/{ => tty}/serial/ioc3_serial.c (100%) + rename drivers/{ => tty}/serial/ioc4_serial.c (100%) + rename drivers/{ => tty}/serial/ip22zilog.c (100%) + rename drivers/{ => tty}/serial/ip22zilog.h (100%) + rename drivers/{ => tty}/serial/jsm/Makefile (100%) + rename drivers/{ => tty}/serial/jsm/jsm.h (100%) + rename drivers/{ => tty}/serial/jsm/jsm_driver.c (100%) + rename drivers/{ => tty}/serial/jsm/jsm_neo.c (100%) + rename drivers/{ => tty}/serial/jsm/jsm_tty.c (100%) + rename drivers/{ => tty}/serial/kgdboc.c (100%) + rename drivers/{ => tty}/serial/m32r_sio.c (100%) + rename drivers/{ => tty}/serial/m32r_sio.h (100%) + rename drivers/{ => tty}/serial/m32r_sio_reg.h (100%) + rename drivers/{ => tty}/serial/max3100.c (100%) + rename drivers/{ => tty}/serial/max3107-aava.c (100%) + rename drivers/{ => tty}/serial/max3107.c (100%) + rename drivers/{ => tty}/serial/max3107.h (100%) + rename drivers/{ => tty}/serial/mcf.c (100%) + rename drivers/{ => tty}/serial/mfd.c (100%) + rename drivers/{ => tty}/serial/mpc52xx_uart.c (100%) + rename drivers/{ => tty}/serial/mpsc.c (100%) + rename drivers/{ => tty}/serial/mrst_max3110.c (100%) + rename drivers/{ => tty}/serial/mrst_max3110.h (100%) + rename drivers/{ => tty}/serial/msm_serial.c (100%) + rename drivers/{ => tty}/serial/msm_serial.h (100%) + rename drivers/{ => tty}/serial/mux.c (100%) + rename drivers/{ => tty}/serial/netx-serial.c (100%) + rename drivers/{ => tty}/serial/nwpserial.c (100%) + rename drivers/{ => tty}/serial/of_serial.c (100%) + rename drivers/{ => tty}/serial/omap-serial.c (100%) + rename drivers/{ => tty}/serial/pch_uart.c (100%) + rename drivers/{ => tty}/serial/pmac_zilog.c (100%) + rename drivers/{ => tty}/serial/pmac_zilog.h (100%) + rename drivers/{ => tty}/serial/pnx8xxx_uart.c (100%) + rename drivers/{ => tty}/serial/pxa.c (100%) + rename drivers/{ => tty}/serial/s3c2400.c (100%) + rename drivers/{ => tty}/serial/s3c2410.c (100%) + rename drivers/{ => tty}/serial/s3c2412.c (100%) + rename drivers/{ => tty}/serial/s3c2440.c (100%) + rename drivers/{ => tty}/serial/s3c24a0.c (100%) + rename drivers/{ => tty}/serial/s3c6400.c (100%) + rename drivers/{ => tty}/serial/s5pv210.c (100%) + rename drivers/{ => tty}/serial/sa1100.c (100%) + rename drivers/{ => tty}/serial/samsung.c (100%) + rename drivers/{ => tty}/serial/samsung.h (100%) + rename drivers/{ => tty}/serial/sb1250-duart.c (100%) + rename drivers/{ => tty}/serial/sc26xx.c (100%) + rename drivers/{ => tty}/serial/serial_core.c (100%) + rename drivers/{ => tty}/serial/serial_cs.c (100%) + rename drivers/{ => tty}/serial/serial_ks8695.c (100%) + rename drivers/{ => tty}/serial/serial_lh7a40x.c (100%) + rename drivers/{ => tty}/serial/serial_txx9.c (100%) + rename drivers/{ => tty}/serial/sh-sci.c (100%) + rename drivers/{ => tty}/serial/sh-sci.h (100%) + rename drivers/{ => tty}/serial/sn_console.c (100%) + rename drivers/{ => tty}/serial/suncore.c (100%) + rename drivers/{ => tty}/serial/suncore.h (100%) + rename drivers/{ => tty}/serial/sunhv.c (100%) + rename drivers/{ => tty}/serial/sunsab.c (100%) + rename drivers/{ => tty}/serial/sunsab.h (100%) + rename drivers/{ => tty}/serial/sunsu.c (100%) + rename drivers/{ => tty}/serial/sunzilog.c (100%) + rename drivers/{ => tty}/serial/sunzilog.h (100%) + rename drivers/{ => tty}/serial/timbuart.c (100%) + rename drivers/{ => tty}/serial/timbuart.h (100%) + rename drivers/{ => tty}/serial/uartlite.c (100%) + rename drivers/{ => tty}/serial/ucc_uart.c (100%) + rename drivers/{ => tty}/serial/vr41xx_siu.c (100%) + rename drivers/{ => tty}/serial/vt8500_serial.c (100%) + rename drivers/{ => tty}/serial/zs.c (100%) + rename drivers/{ => tty}/serial/zs.h (100%) +Merging usb.current/usb-linus +$ git merge usb.current/usb-linus +Already up-to-date. +Merging staging.current/staging-linus +$ git merge staging.current/staging-linus +Already up-to-date. +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Auto-merging arch/x86/kernel/cpu/cpufreq/powernow-k8.c +Merge made by recursive. + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 13 ++++++++++--- + 1 files changed, 10 insertions(+), 3 deletions(-) +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 +Already up-to-date. +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 ide-curent/master +$ git merge ide-curent/master +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging sh-current/sh-fixes-for-linus +$ git merge sh-current/sh-fixes-for-linus +Already up-to-date. +Merging rmobile-current/rmobile-fixes-for-linus +$ git merge rmobile-current/rmobile-fixes-for-linus +Already up-to-date. +Merging fbdev-current/fbdev-fixes-for-linus +$ git merge fbdev-current/fbdev-fixes-for-linus +Already up-to-date. +Merging gcl-current/merge +$ git merge gcl-current/merge +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Auto-merging arch/arm/mm/dma-mapping.c +Auto-merging arch/arm/mm/pgd.c +Merge made by recursive. + arch/arm/include/asm/pgalloc.h | 2 +- + arch/arm/include/asm/pgtable.h | 24 ++++++++++++++---------- + arch/arm/include/asm/tlb.h | 1 + + arch/arm/lib/uaccess_with_memcpy.c | 7 ++++++- + arch/arm/mm/dma-mapping.c | 11 ++++++++++- + arch/arm/mm/fault-armv.c | 7 ++++++- + arch/arm/mm/fault.c | 29 +++++++++++++++++++++++++---- + arch/arm/mm/idmap.c | 35 +++++++++++++++++++++++++++++------ + arch/arm/mm/mm.h | 2 +- + arch/arm/mm/mmu.c | 22 ++++++++++++++++++---- + arch/arm/mm/pgd.c | 24 ++++++++++++++++++++---- + 11 files changed, 131 insertions(+), 33 deletions(-) +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Already up-to-date. +Merging i.MX/for-next +$ git merge i.MX/for-next +Already up-to-date! +Merge made by recursive. +Merging linux-spec/for-next +$ git merge linux-spec/for-next +Already up-to-date. +Merging msm/for-next +$ git merge msm/for-next +Already up-to-date. +Merging omap/for-next +$ git merge omap/for-next +Already up-to-date. +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging samsung/next-samsung +$ git merge samsung/next-samsung +Auto-merging arch/arm/mach-s3c2410/mach-h1940.c +Auto-merging arch/arm/mach-s3c2440/mach-rx1950.c +Merge made by recursive. + arch/arm/mach-s3c2410/h1940-bluetooth.c | 11 +- + arch/arm/mach-s3c2410/include/mach/h1940.h | 3 + + arch/arm/mach-s3c2410/mach-h1940.c | 302 ++++++++++++++++++++++++++-- + arch/arm/mach-s3c2440/mach-rx1950.c | 57 ++++++ + 4 files changed, 356 insertions(+), 17 deletions(-) +Merging s5p/for-next +$ git merge s5p/for-next +Already up-to-date. +Merging tegra/for-next +$ git merge tegra/for-next +Resolved 'arch/arm/mach-tegra/timer.c' using previous resolution. +Auto-merging arch/arm/mach-tegra/timer.c +CONFLICT (content): Merge conflict in arch/arm/mach-tegra/timer.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 33dc282] Merge remote branch 'tegra/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging ux500-core/ux500-core +$ git merge ux500-core/ux500-core +Merge made by recursive. +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 +Merge made by recursive. + arch/cris/Kconfig | 1 - + arch/cris/arch-v10/drivers/axisflashmap.c | 6 ------ + arch/cris/arch-v32/drivers/Kconfig | 1 - + arch/cris/arch-v32/drivers/axisflashmap.c | 6 ------ + 4 files changed, 0 insertions(+), 14 deletions(-) +Merging ia64/test +$ git merge ia64/test +Merge made by recursive. + Documentation/ABI/testing/pstore | 35 ++++ + Documentation/ABI/testing/sysfs-fs-pstore | 7 + + arch/ia64/include/asm/dma-mapping.h | 2 + + drivers/acpi/apei/Kconfig | 1 + + drivers/acpi/apei/erst.c | 136 ++++++++++++++ + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/pstore/Kconfig | 13 ++ + fs/pstore/Makefile | 7 + + fs/pstore/inode.c | 285 +++++++++++++++++++++++++++++ + fs/pstore/internal.h | 7 + + fs/pstore/platform.c | 202 ++++++++++++++++++++ + include/linux/magic.h | 1 + + include/linux/pstore.h | 60 ++++++ + 14 files changed, 758 insertions(+), 0 deletions(-) + create mode 100644 Documentation/ABI/testing/pstore + create mode 100644 Documentation/ABI/testing/sysfs-fs-pstore + create mode 100644 fs/pstore/Kconfig + create mode 100644 fs/pstore/Makefile + create mode 100644 fs/pstore/inode.c + create mode 100644 fs/pstore/internal.h + create mode 100644 fs/pstore/platform.c + create mode 100644 include/linux/pstore.h +Merging m68k/for-next +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Renaming arch/m68k/include/asm/m548xgpt.h => arch/m68k/include/asm/m54xxgpt.h +Auto-merging arch/m68k/include/asm/m54xxgpt.h +Removing arch/m68k/include/asm/mcfcache.h +Removing arch/m68knommu/mm/fault.c +Removing arch/m68knommu/mm/memory.c +Auto-merging arch/m68knommu/platform/coldfire/entry.S +Merge made by recursive. + arch/m68k/include/asm/cacheflush_no.h | 95 ++++++-------- + arch/m68k/include/asm/coldfire.h | 2 +- + arch/m68k/include/asm/entry_no.h | 59 +++++---- + arch/m68k/include/asm/gpio.h | 2 +- + arch/m68k/include/asm/io_no.h | 1 - + arch/m68k/include/asm/m5206sim.h | 14 ++- + arch/m68k/include/asm/m520xsim.h | 17 +++- + arch/m68k/include/asm/m523xsim.h | 11 ++ + arch/m68k/include/asm/m5249sim.h | 10 ++ + arch/m68k/include/asm/m5272sim.h | 8 + + arch/m68k/include/asm/m527xsim.h | 10 ++ + arch/m68k/include/asm/m528xsim.h | 11 ++ + arch/m68k/include/asm/m52xxacr.h | 94 ++++++++++++++ + arch/m68k/include/asm/m5307sim.h | 43 +++---- + arch/m68k/include/asm/m532xsim.h | 33 ++---- + arch/m68k/include/asm/m53xxacr.h | 101 +++++++++++++++ + arch/m68k/include/asm/m5407sim.h | 42 +----- + arch/m68k/include/asm/m54xxacr.h | 97 ++++++++++++++ + arch/m68k/include/asm/{m548xgpt.h => m54xxgpt.h} | 10 +- + arch/m68k/include/asm/{m548xsim.h => m54xxsim.h} | 23 +++- + arch/m68k/include/asm/mcfcache.h | 150 ---------------------- + arch/m68k/include/asm/mcfsim.h | 4 +- + arch/m68k/include/asm/mcfuart.h | 45 +------- + arch/m68k/include/asm/processor.h | 13 +- + arch/m68knommu/Kconfig | 99 +++++++++++++-- + arch/m68knommu/Makefile | 14 +- + arch/m68knommu/kernel/setup.c | 72 +++-------- + arch/m68knommu/mm/Makefile | 2 +- + arch/m68knommu/mm/fault.c | 57 -------- + arch/m68knommu/mm/kmap.c | 9 -- + arch/m68knommu/mm/memory.c | 33 ----- + arch/m68knommu/platform/{548x => 54xx}/Makefile | 0 + arch/m68knommu/platform/{548x => 54xx}/config.c | 32 +++--- + arch/m68knommu/platform/coldfire/Makefile | 4 +- + arch/m68knommu/platform/coldfire/cache.c | 48 +++++++ + arch/m68knommu/platform/coldfire/entry.S | 56 ++------- + arch/m68knommu/platform/coldfire/head.S | 26 +++- + 37 files changed, 726 insertions(+), 621 deletions(-) + create mode 100644 arch/m68k/include/asm/m52xxacr.h + create mode 100644 arch/m68k/include/asm/m53xxacr.h + create mode 100644 arch/m68k/include/asm/m54xxacr.h + rename arch/m68k/include/asm/{m548xgpt.h => m54xxgpt.h} (95%) + rename arch/m68k/include/asm/{m548xsim.h => m54xxsim.h} (73%) + delete mode 100644 arch/m68k/include/asm/mcfcache.h + delete mode 100644 arch/m68knommu/mm/fault.c + delete mode 100644 arch/m68knommu/mm/memory.c + rename arch/m68knommu/platform/{548x => 54xx}/Makefile (100%) + rename arch/m68knommu/platform/{548x => 54xx}/config.c (74%) + create mode 100644 arch/m68knommu/platform/coldfire/cache.c +Merging microblaze/next +$ git merge microblaze/next +Merge made by recursive. + arch/microblaze/include/asm/pgtable.h | 6 ++++-- + arch/microblaze/include/asm/tlb.h | 1 + + 2 files changed, 5 insertions(+), 2 deletions(-) +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Auto-merging arch/mips/Kconfig +Auto-merging arch/mips/kernel/module.c +Auto-merging arch/mips/txx9/generic/pci.c +Merge made by recursive. + arch/mips/Kconfig | 4 + + arch/mips/include/asm/cpu-info.h | 1 + + arch/mips/include/asm/inst.h | 14 + + arch/mips/include/asm/jump_label.h | 48 +++ + arch/mips/include/asm/mips_machine.h | 54 +++ + arch/mips/include/asm/mmu_context.h | 8 +- + arch/mips/include/asm/uasm.h | 7 + + arch/mips/kernel/Makefile | 3 + + arch/mips/kernel/cpu-probe.c | 2 + + arch/mips/kernel/jump_label.c | 54 +++ + arch/mips/kernel/mips_machine.c | 86 +++++ + arch/mips/kernel/module.c | 5 + + arch/mips/kernel/proc.c | 9 +- + arch/mips/kernel/traps.c | 2 +- + arch/mips/kernel/vmlinux.lds.S | 7 + + arch/mips/mm/tlbex.c | 590 +++++++++++++++++++++++++++++----- + arch/mips/mm/uasm.c | 56 ++-- + arch/mips/sibyte/common/sb_tbprof.c | 3 +- + arch/mips/txx9/generic/pci.c | 7 +- + 19 files changed, 832 insertions(+), 128 deletions(-) + create mode 100644 arch/mips/include/asm/jump_label.h + create mode 100644 arch/mips/include/asm/mips_machine.h + create mode 100644 arch/mips/kernel/jump_label.c + create mode 100644 arch/mips/kernel/mips_machine.c +Merging parisc/for-next +$ git merge parisc/for-next +Auto-merging arch/parisc/include/asm/pgtable.h +Merge made by recursive. + arch/parisc/include/asm/cacheflush.h | 7 +- + arch/parisc/include/asm/pgtable.h | 14 +-- + arch/parisc/kernel/cache.c | 109 +++------------- + arch/parisc/kernel/entry.S | 217 +++++++++++++++++------------- + arch/parisc/kernel/firmware.c | 13 +-- + arch/parisc/kernel/pacache.S | 245 +++++++++++++++------------------- + 6 files changed, 261 insertions(+), 344 deletions(-) +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging 52xx-and-virtex/next +$ git merge 52xx-and-virtex/next +Already up-to-date. +Merging galak/next +$ git merge galak/next +Auto-merging arch/powerpc/boot/dts/mpc8308rdb.dts +Auto-merging arch/powerpc/sysdev/fsl_rio.c +Merge made by recursive. + arch/powerpc/boot/dts/mpc8308rdb.dts | 2 +- + arch/powerpc/boot/dts/p1022ds.dts | 4 ++-- + arch/powerpc/include/asm/immap_qe.h | 21 +++++++++++++++------ + arch/powerpc/include/asm/reg.h | 2 ++ + arch/powerpc/include/asm/reg_booke.h | 14 ++++++++++++++ + arch/powerpc/kernel/cpu_setup_fsl_booke.S | 6 ++++++ + arch/powerpc/platforms/83xx/mpc83xx.h | 2 ++ + arch/powerpc/platforms/83xx/usb.c | 21 ++++++++++++++++----- + arch/powerpc/sysdev/fsl_rio.c | 2 -- + 9 files changed, 58 insertions(+), 16 deletions(-) +Merging s390/features +$ git merge s390/features +Already up-to-date. +Merging sh/sh-latest +$ git merge sh/sh-latest +Merge made by recursive. + arch/sh/Kconfig | 1 + + arch/sh/Makefile | 3 ++- + arch/sh/boot/Makefile | 11 +++++++++-- + arch/sh/boot/compressed/Makefile | 4 +++- + arch/sh/boot/compressed/misc.c | 4 ++++ + arch/sh/include/asm/pgtable.h | 1 + + 6 files changed, 20 insertions(+), 4 deletions(-) +Merging rmobile/rmobile-latest +$ git merge rmobile/rmobile-latest +Merge made by recursive. + arch/arm/mach-shmobile/Kconfig | 1 + + arch/arm/mach-shmobile/intc-sh73a0.c | 5 +++-- + include/linux/mmc/sh_mmcif.h | 4 ++-- + 3 files changed, 6 insertions(+), 4 deletions(-) +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging tile/master +$ git merge tile/master +Already up-to-date. +Merging xtensa/master +$ git merge xtensa/master +Resolved 'arch/xtensa/configs/iss_defconfig' using previous resolution. +Auto-merging arch/xtensa/Kconfig +Auto-merging arch/xtensa/Makefile +Auto-merging arch/xtensa/configs/iss_defconfig +CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig +Auto-merging arch/xtensa/include/asm/coprocessor.h +Auto-merging arch/xtensa/kernel/Makefile +Auto-merging arch/xtensa/kernel/time.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 259b67e] Merge remote branch 'xtensa/master' +$ git diff -M --stat --summary HEAD^.. + arch/xtensa/Kconfig | 17 +- + arch/xtensa/Makefile | 5 +- + arch/xtensa/boot/Makefile | 1 + + arch/xtensa/include/asm/coprocessor.h | 9 +- + arch/xtensa/include/asm/io.h | 40 ++-- + arch/xtensa/include/asm/irq.h | 7 +- + arch/xtensa/include/asm/serial.h | 12 +- + arch/xtensa/kernel/Makefile | 4 +- + arch/xtensa/kernel/time.c | 2 +- + arch/xtensa/platforms/xtavnet/Makefile | 10 + + .../platforms/xtavnet/include/platform/hardware.h | 85 ++++++ + .../platforms/xtavnet/include/platform/lcd.h | 22 ++ + .../platforms/xtavnet/include/platform/serial.h | 1 + + arch/xtensa/platforms/xtavnet/lcd.c | 79 ++++++ + arch/xtensa/platforms/xtavnet/setup.c | 269 ++++++++++++++++++++ + 15 files changed, 526 insertions(+), 37 deletions(-) + create mode 100644 arch/xtensa/platforms/xtavnet/Makefile + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/hardware.h + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/lcd.h + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/serial.h + create mode 100644 arch/xtensa/platforms/xtavnet/lcd.c + create mode 100644 arch/xtensa/platforms/xtavnet/setup.c +Merging ceph/for-next +$ git merge ceph/for-next +Already up-to-date. +Merging cifs/master +$ git merge cifs/master +Merge made by recursive. + fs/cifs/connect.c | 2 ++ + fs/cifs/netmisc.c | 4 ++-- + 2 files changed, 4 insertions(+), 2 deletions(-) +Merging configfs/linux-next +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next +$ git merge ecryptfs/next +Resolved 'fs/ecryptfs/main.c' using previous resolution. +Auto-merging fs/ecryptfs/inode.c +Auto-merging fs/ecryptfs/main.c +CONFLICT (content): Merge conflict in fs/ecryptfs/main.c +Auto-merging include/linux/magic.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 78da590] Merge remote branch 'ecryptfs/next' +$ git diff -M --stat --summary HEAD^.. + fs/ecryptfs/crypto.c | 30 ++++++++++++++---------------- + fs/ecryptfs/ecryptfs_kernel.h | 5 ++--- + fs/ecryptfs/file.c | 28 +++++++++++++--------------- + fs/ecryptfs/inode.c | 32 ++++++++++++++------------------ + fs/ecryptfs/keystore.c | 26 +++++++++++++------------- + fs/ecryptfs/kthread.c | 19 +++++++++++++++---- + fs/ecryptfs/main.c | 12 +++++++----- + fs/ecryptfs/mmap.c | 35 +++++++++++++++++++++-------------- + include/linux/magic.h | 1 + + 9 files changed, 100 insertions(+), 88 deletions(-) +Merging ext3/for_next +$ git merge ext3/for_next +Auto-merging fs/ext3/super.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ocfs2/super.c +Merge made by recursive. + fs/ext3/super.c | 25 +++++++------------------ + fs/ext4/super.c | 25 +++++++------------------ + fs/ocfs2/super.c | 5 ++--- + fs/quota/dquot.c | 18 ++---------------- + fs/quota/quota.c | 41 +++++++++++++++++++++++++++-------------- + fs/reiserfs/super.c | 17 ++++++----------- + include/linux/quota.h | 5 ++++- + include/linux/quotaops.h | 4 +--- + 8 files changed, 56 insertions(+), 84 deletions(-) +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 +Auto-merging fs/fuse/dir.c +Merge made by recursive. + fs/fuse/dir.c | 36 +++++++++++++++++++++++++----------- + 1 files changed, 25 insertions(+), 11 deletions(-) +Merging gfs2/master +$ git merge gfs2/master +Already up-to-date. +Merging hfsplus/for-next +$ git merge hfsplus/for-next +Already up-to-date. +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging logfs/master +$ git merge logfs/master +Resolved 'fs/logfs/logfs.h' using previous resolution. +Auto-merging fs/logfs/dir.c +Auto-merging fs/logfs/file.c +Auto-merging fs/logfs/logfs.h +CONFLICT (content): Merge conflict in fs/logfs/logfs.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 571af84] Merge remote branch 'logfs/master' +$ git diff -M --stat --summary HEAD^.. +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 +Already up-to-date. +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Already up-to-date. +Merging omfs/for-next +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master +$ git merge squashfs/master +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Already up-to-date. +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 vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging vfs-scale/vfs-scale-working +$ git merge vfs-scale/vfs-scale-working +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 +Already up-to-date. +Merging quilt/i2c +$ git merge quilt/i2c +Already up-to-date. +Merging bjdooks-i2c/next-i2c +$ git merge bjdooks-i2c/next-i2c +Recorded preimage for 'arch/arm/mach-pxa/pxa27x.c' +Resolved 'arch/arm/mach-pxa/devices.c' using previous resolution. +Resolved 'arch/arm/mach-pxa/poodle.c' using previous resolution. +Resolved 'arch/arm/mach-pxa/pxa3xx.c' using previous resolution. +Resolved 'arch/arm/mach-pxa/z2.c' using previous resolution. +CONFLICT (rename/rename): Rename "arch/arm/mach-pxa/include/mach/pxa2xx_spi.h"->"arch/arm/mach-s5pv310/include/mach/dma.h" in branch "HEAD" rename "arch/arm/mach-pxa/include/mach/pxa2xx_spi.h"->"include/linux/spi/pxa2xx_spi.h" in "bjdooks-i2c/next-i2c" +Renaming arch/arm/plat-pxa/include/plat/ssp.h->include/linux/pxa2xx_ssp.h +Auto-merging include/linux/pxa2xx_ssp.h +Auto-merging arch/arm/mach-mmp/include/mach/mmp2.h +Auto-merging arch/arm/mach-pxa/balloon3.c +Auto-merging arch/arm/mach-pxa/cm-x300.c +Auto-merging arch/arm/mach-pxa/colibri-pxa270-income.c +Auto-merging arch/arm/mach-pxa/corgi.c +Auto-merging arch/arm/mach-pxa/csb726.c +Auto-merging arch/arm/mach-pxa/devices.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/devices.c +Auto-merging arch/arm/mach-pxa/em-x270.c +Auto-merging arch/arm/mach-pxa/ezx.c +Auto-merging arch/arm/mach-pxa/hx4700.c +Auto-merging arch/arm/mach-pxa/icontrol.c +Auto-merging arch/arm/mach-pxa/littleton.c +Auto-merging arch/arm/mach-pxa/lubbock.c +Auto-merging arch/arm/mach-pxa/magician.c +Auto-merging arch/arm/mach-pxa/mainstone.c +Auto-merging arch/arm/mach-pxa/mioa701.c +Auto-merging arch/arm/mach-pxa/mxm8x10.c +Auto-merging arch/arm/mach-pxa/pcm027.c +Auto-merging arch/arm/mach-pxa/pcm990-baseboard.c +Auto-merging arch/arm/mach-pxa/poodle.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/poodle.c +Auto-merging arch/arm/mach-pxa/pxa27x.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/pxa27x.c +Auto-merging arch/arm/mach-pxa/pxa3xx.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/pxa3xx.c +Auto-merging arch/arm/mach-pxa/raumfeld.c +Auto-merging arch/arm/mach-pxa/saar.c +Auto-merging arch/arm/mach-pxa/spitz.c +Auto-merging arch/arm/mach-pxa/stargate2.c +Auto-merging arch/arm/mach-pxa/tavorevb3.c +Auto-merging arch/arm/mach-pxa/tosa.c +Auto-merging arch/arm/mach-pxa/trizeps4.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/trizeps4.c +Auto-merging arch/arm/mach-pxa/viper.c +Auto-merging arch/arm/mach-pxa/vpac270.c +Auto-merging arch/arm/mach-pxa/xcep.c +Auto-merging arch/arm/mach-pxa/z2.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/z2.c +Auto-merging arch/arm/mach-pxa/zeus.c +Auto-merging drivers/spi/pxa2xx_spi.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/arm/mach-pxa/include/mach/pxa2xx_spi.h +arch/arm/mach-pxa/devices.c: needs merge +arch/arm/mach-pxa/include/mach/pxa2xx_spi.h: needs merge +arch/arm/mach-pxa/poodle.c: needs merge +arch/arm/mach-pxa/pxa27x.c: needs merge +arch/arm/mach-pxa/pxa3xx.c: needs merge +arch/arm/mach-pxa/trizeps4.c: needs merge +arch/arm/mach-pxa/z2.c: needs merge +arch/arm/mach-s5pv310/include/mach/dma.h: needs merge +include/linux/spi/pxa2xx_spi.h: needs merge +rm 'arch/arm/mach-pxa/include/mach/pxa2xx_spi.h' +$ git commit -v -a +Recorded resolution for 'arch/arm/mach-pxa/pxa27x.c'. +Recorded resolution for 'arch/arm/mach-pxa/trizeps4.c'. +[master 387666a] Merge remote branch 'bjdooks-i2c/next-i2c' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-mmp/include/mach/mmp2.h | 2 +- + arch/arm/mach-mmp/include/mach/pxa168.h | 2 +- + arch/arm/mach-mmp/include/mach/pxa910.h | 2 +- + arch/arm/mach-pxa/balloon3.c | 3 +- + arch/arm/mach-pxa/cm-x300.c | 2 +- + arch/arm/mach-pxa/colibri-pxa270-income.c | 3 +- + arch/arm/mach-pxa/corgi.c | 2 +- + arch/arm/mach-pxa/csb726.c | 2 +- + arch/arm/mach-pxa/devices.c | 2 +- + arch/arm/mach-pxa/em-x270.c | 2 +- + arch/arm/mach-pxa/ezx.c | 2 +- + arch/arm/mach-pxa/hx4700.c | 2 +- + arch/arm/mach-pxa/littleton.c | 2 +- + arch/arm/mach-pxa/magician.c | 2 +- + arch/arm/mach-pxa/mainstone.c | 2 +- + arch/arm/mach-pxa/mioa701.c | 2 +- + arch/arm/mach-pxa/mxm8x10.c | 2 +- + arch/arm/mach-pxa/palm27x.c | 3 +- + arch/arm/mach-pxa/pcm990-baseboard.c | 2 +- + arch/arm/mach-pxa/poodle.c | 2 +- + arch/arm/mach-pxa/pxa27x.c | 3 +- + arch/arm/mach-pxa/pxa3xx.c | 2 +- + arch/arm/mach-pxa/raumfeld.c | 2 +- + arch/arm/mach-pxa/saar.c | 2 +- + arch/arm/mach-pxa/spitz.c | 3 +- + arch/arm/mach-pxa/stargate2.c | 2 +- + arch/arm/mach-pxa/tavorevb3.c | 3 +- + arch/arm/mach-pxa/tosa.c | 2 +- + arch/arm/mach-pxa/trizeps4.c | 2 +- + arch/arm/mach-pxa/viper.c | 2 +- + arch/arm/mach-pxa/vpac270.c | 3 +- + arch/arm/mach-pxa/xcep.c | 3 +- + arch/arm/mach-pxa/z2.c | 3 +- + arch/arm/mach-pxa/zeus.c | 3 +- + arch/arm/mach-pxa/zylonite_pxa300.c | 2 +- + drivers/i2c/busses/Kconfig | 7 +- + drivers/i2c/busses/Makefile | 1 + + drivers/i2c/busses/i2c-pxa-pci.c | 173 ++++++++++++++++++++ + drivers/i2c/busses/i2c-pxa.c | 116 ++++++++++--- + .../plat/i2c.h => include/linux/i2c/pxa-i2c.h | 0 + 40 files changed, 304 insertions(+), 73 deletions(-) + create mode 100644 drivers/i2c/busses/i2c-pxa-pci.c + rename arch/arm/plat-pxa/include/plat/i2c.h => include/linux/i2c/pxa-i2c.h (100%) +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Already up-to-date. +Merging hwmon-staging/hwmon-next +$ git merge hwmon-staging/hwmon-next +Already up-to-date. +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Already up-to-date. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Removing drivers/media/radio/radio-gemtek-pci.c +Auto-merging drivers/media/video/cafe_ccic.c +Auto-merging drivers/media/video/davinci/vpif.h +Removing drivers/media/video/mt9v011.h +Removing drivers/media/video/tda9875.c +Auto-merging drivers/media/video/tvp7002.c +Auto-merging scripts/checkpatch.pl +Merge made by recursive. + Documentation/DocBook/media-entities.tmpl | 8 + + Documentation/DocBook/v4l/common.xml | 2 + + Documentation/DocBook/v4l/compat.xml | 11 + + Documentation/DocBook/v4l/dev-capture.xml | 13 +- + Documentation/DocBook/v4l/dev-output.xml | 13 +- + Documentation/DocBook/v4l/func-mmap.xml | 10 +- + Documentation/DocBook/v4l/func-munmap.xml | 3 +- + Documentation/DocBook/v4l/io.xml | 283 +++- + Documentation/DocBook/v4l/pixfmt-nv12m.xml | 154 ++ + Documentation/DocBook/v4l/pixfmt-yuv420m.xml | 162 ++ + Documentation/DocBook/v4l/pixfmt.xml | 118 +- + Documentation/DocBook/v4l/planar-apis.xml | 81 + + Documentation/DocBook/v4l/v4l2.xml | 21 +- + Documentation/DocBook/v4l/vidioc-enum-fmt.xml | 2 + + Documentation/DocBook/v4l/vidioc-g-fmt.xml | 15 +- + Documentation/DocBook/v4l/vidioc-qbuf.xml | 24 +- + Documentation/DocBook/v4l/vidioc-querybuf.xml | 14 +- + Documentation/DocBook/v4l/vidioc-querycap.xml | 24 +- + Documentation/video4linux/v4l2-controls.txt | 12 + + drivers/media/common/saa7146_core.c | 2 +- + drivers/media/common/saa7146_fops.c | 8 +- + drivers/media/common/saa7146_vbi.c | 2 +- + drivers/media/common/saa7146_video.c | 20 +- + drivers/media/common/tuners/tda8290.c | 130 +- + drivers/media/dvb/dvb-usb/Kconfig | 8 + + drivers/media/dvb/dvb-usb/Makefile | 3 + + drivers/media/dvb/dvb-usb/dib0700.h | 2 + + drivers/media/dvb/dvb-usb/dib0700_core.c | 53 +- + drivers/media/dvb/dvb-usb/dib0700_devices.c | 1410 ++++++++++++-- + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 6 + + drivers/media/dvb/dvb-usb/dvb-usb-remote.c | 2 +- + drivers/media/dvb/dvb-usb/dvb-usb.h | 2 + + drivers/media/dvb/dvb-usb/technisat-usb2.c | 808 ++++++++ + drivers/media/dvb/firewire/firedtv-rc.c | 8 +- + drivers/media/dvb/frontends/Kconfig | 8 + + drivers/media/dvb/frontends/Makefile | 1 + + drivers/media/dvb/frontends/af9013.c | 4 +- + drivers/media/dvb/frontends/dib0090.c | 1595 ++++++++++++--- + drivers/media/dvb/frontends/dib0090.h | 31 + + drivers/media/dvb/frontends/dib7000p.c | 1945 +++++++++++++----- + drivers/media/dvb/frontends/dib7000p.h | 96 +- + drivers/media/dvb/frontends/dib8000.c | 821 +++++--- + drivers/media/dvb/frontends/dib8000.h | 20 + + drivers/media/dvb/frontends/dib9000.c | 2350 ++++++++++++++++++++++ + drivers/media/dvb/frontends/dib9000.h | 131 ++ + drivers/media/dvb/frontends/dibx000_common.c | 279 +++- + drivers/media/dvb/frontends/dibx000_common.h | 152 +- + drivers/media/dvb/frontends/ix2505v.c | 2 +- + drivers/media/dvb/frontends/mb86a20s.c | 36 +- + drivers/media/dvb/frontends/stv090x.c | 22 + + drivers/media/dvb/frontends/stv090x.h | 15 + + drivers/media/dvb/ttpci/av7110_ca.c | 2 +- + drivers/media/radio/Kconfig | 14 - + drivers/media/radio/Makefile | 1 - + drivers/media/radio/radio-aimslab.c | 1 + + drivers/media/radio/radio-gemtek-pci.c | 478 ----- + drivers/media/radio/radio-maxiradio.c | 4 +- + drivers/media/radio/radio-wl1273.c | 2 +- + drivers/media/radio/si470x/radio-si470x-common.c | 9 +- + drivers/media/rc/ene_ir.c | 23 +- + drivers/media/rc/ene_ir.h | 2 - + drivers/media/rc/imon.c | 60 +- + drivers/media/rc/ir-raw.c | 2 +- + drivers/media/rc/keymaps/Makefile | 1 + + drivers/media/rc/keymaps/rc-dib0700-nec.c | 52 +- + drivers/media/rc/keymaps/rc-technisat-usb2.c | 93 + + drivers/media/rc/mceusb.c | 7 +- + drivers/media/video/Kconfig | 45 +- + drivers/media/video/Makefile | 8 +- + drivers/media/video/adv7175.c | 11 + + drivers/media/video/adv7343.c | 167 +- + drivers/media/video/adv7343_regs.h | 8 +- + drivers/media/video/bt819.c | 129 +- + drivers/media/video/bt8xx/bttv-cards.c | 39 - + drivers/media/video/bt8xx/bttv.h | 1 - + drivers/media/video/cafe_ccic.c | 11 +- + drivers/media/video/cpia2/cpia2.h | 2 +- + drivers/media/video/cpia2/cpia2_core.c | 65 +- + drivers/media/video/cpia2/cpia2_v4l.c | 104 +- + drivers/media/video/cs5345.c | 87 +- + drivers/media/video/cx18/cx18-av-audio.c | 92 +- + drivers/media/video/cx18/cx18-av-core.c | 175 +- + drivers/media/video/cx18/cx18-av-core.h | 12 +- + drivers/media/video/cx18/cx18-controls.c | 285 +--- + drivers/media/video/cx18/cx18-controls.h | 7 +- + drivers/media/video/cx18/cx18-driver.c | 54 +- + drivers/media/video/cx18/cx18-driver.h | 5 +- + drivers/media/video/cx18/cx18-fileops.c | 32 +- + drivers/media/video/cx18/cx18-ioctl.c | 24 +- + drivers/media/video/cx18/cx18-mailbox.c | 5 +- + drivers/media/video/cx18/cx18-mailbox.h | 5 - + drivers/media/video/cx18/cx18-streams.c | 16 +- + drivers/media/video/cx18/cx18-streams.h | 3 +- + drivers/media/video/cx231xx/cx231xx-dvb.c | 5 +- + drivers/media/video/cx25840/cx25840-core.c | 22 +- + drivers/media/video/davinci/vpif.c | 177 ++ + drivers/media/video/davinci/vpif.h | 18 +- + drivers/media/video/davinci/vpif_capture.c | 451 ++++- + drivers/media/video/davinci/vpif_capture.h | 2 + + drivers/media/video/davinci/vpif_display.c | 474 ++++- + drivers/media/video/davinci/vpif_display.h | 2 + + drivers/media/video/em28xx/em28xx-cards.c | 19 +- + drivers/media/video/et61x251/et61x251.h | 24 - + drivers/media/video/gspca/benq.c | 2 +- + drivers/media/video/gspca/conex.c | 4 +- + drivers/media/video/gspca/cpia1.c | 2 +- + drivers/media/video/gspca/etoms.c | 4 +- + drivers/media/video/gspca/finepix.c | 2 +- + drivers/media/video/gspca/gl860/gl860.c | 2 +- + drivers/media/video/gspca/gspca.c | 210 +-- + drivers/media/video/gspca/gspca.h | 2 - + drivers/media/video/gspca/jeilinj.c | 2 +- + drivers/media/video/gspca/jpeg.h | 4 +- + drivers/media/video/gspca/konica.c | 2 +- + drivers/media/video/gspca/m5602/m5602_core.c | 2 +- + drivers/media/video/gspca/mars.c | 2 +- + drivers/media/video/gspca/mr97310a.c | 2 +- + drivers/media/video/gspca/ov519.c | 8 +- + drivers/media/video/gspca/ov534.c | 29 +- + drivers/media/video/gspca/ov534_9.c | 2 +- + drivers/media/video/gspca/pac207.c | 2 +- + drivers/media/video/gspca/pac7302.c | 4 +- + drivers/media/video/gspca/pac7311.c | 4 +- + drivers/media/video/gspca/sn9c2028.c | 2 +- + drivers/media/video/gspca/sn9c20x.c | 2 +- + drivers/media/video/gspca/sonixb.c | 270 ++-- + drivers/media/video/gspca/sonixj.c | 155 +- + drivers/media/video/gspca/spca1528.c | 2 +- + drivers/media/video/gspca/spca500.c | 2 +- + drivers/media/video/gspca/spca501.c | 2 +- + drivers/media/video/gspca/spca505.c | 2 +- + drivers/media/video/gspca/spca508.c | 2 +- + drivers/media/video/gspca/spca561.c | 2 +- + drivers/media/video/gspca/sq905.c | 2 +- + drivers/media/video/gspca/sq905c.c | 2 +- + drivers/media/video/gspca/sq930x.c | 2 +- + drivers/media/video/gspca/stk014.c | 2 +- + drivers/media/video/gspca/stv0680.c | 2 +- + drivers/media/video/gspca/stv06xx/stv06xx.c | 2 +- + drivers/media/video/gspca/sunplus.c | 2 +- + drivers/media/video/gspca/t613.c | 2 +- + drivers/media/video/gspca/tv8532.c | 2 +- + drivers/media/video/gspca/vc032x.c | 2 +- + drivers/media/video/gspca/xirlink_cit.c | 2 +- + drivers/media/video/gspca/zc3xx.c | 2 +- + drivers/media/video/ir-kbd-i2c.c | 6 +- + drivers/media/video/ivtv/ivtv-i2c.c | 9 +- + drivers/media/video/mem2mem_testdev.c | 227 +-- + drivers/media/video/mt9v011.c | 54 +- + drivers/media/video/mt9v011.h | 36 - + drivers/media/video/noon010pc30.c | 792 ++++++++ + drivers/media/video/ov7670.c | 74 +- + drivers/media/video/s5p-fimc/fimc-capture.c | 550 +++--- + drivers/media/video/s5p-fimc/fimc-core.c | 872 +++++---- + drivers/media/video/s5p-fimc/fimc-core.h | 134 +- + drivers/media/video/s5p-fimc/fimc-reg.c | 199 +- + drivers/media/video/s5p-fimc/regs-fimc.h | 29 +- + drivers/media/video/saa7110.c | 115 +- + drivers/media/video/saa7134/saa7134-cards.c | 51 +- + drivers/media/video/saa7134/saa7134-dvb.c | 80 +- + drivers/media/video/sn9c102/sn9c102_devtable.h | 74 +- + drivers/media/video/sr030pc30.c | 10 - + drivers/media/video/tda9875.c | 411 ---- + drivers/media/video/tlg2300/pd-video.c | 13 +- + drivers/media/video/tlv320aic23b.c | 74 +- + drivers/media/video/tvp514x.c | 236 +-- + drivers/media/video/tvp5150.c | 157 +- + drivers/media/video/tvp7002.c | 117 +- + drivers/media/video/v4l2-common.c | 19 +- + drivers/media/video/v4l2-compat-ioctl32.c | 229 ++- + drivers/media/video/v4l2-ctrls.c | 24 +- + drivers/media/video/v4l2-device.c | 14 +- + drivers/media/video/v4l2-ioctl.c | 475 ++++- + drivers/media/video/v4l2-mem2mem.c | 232 ++-- + drivers/media/video/videobuf2-core.c | 1804 +++++++++++++++++ + drivers/media/video/videobuf2-dma-contig.c | 185 ++ + drivers/media/video/videobuf2-dma-sg.c | 292 +++ + drivers/media/video/videobuf2-memops.c | 232 +++ + drivers/media/video/videobuf2-vmalloc.c | 132 ++ + drivers/media/video/vivi.c | 585 ++++--- + drivers/media/video/vpx3220.c | 137 +- + drivers/staging/tm6000/tm6000-video.c | 46 +- + include/linux/videodev2.h | 131 ++- + include/media/mt9v011.h | 17 + + include/media/noon010pc30.h | 28 + + include/media/rc-core.h | 3 + + include/media/rc-map.h | 1 + + include/media/{s3c_fimc.h => s5p_fimc.h} | 20 +- + include/media/saa7146.h | 2 +- + include/media/v4l2-chip-ident.h | 3 + + include/media/v4l2-common.h | 13 +- + include/media/v4l2-ctrls.h | 6 +- + include/media/v4l2-ioctl.h | 16 + + include/media/v4l2-mem2mem.h | 56 +- + include/media/v4l2-subdev.h | 23 +- + include/media/videobuf2-core.h | 380 ++++ + include/media/videobuf2-dma-contig.h | 29 + + include/media/videobuf2-dma-sg.h | 32 + + include/media/videobuf2-memops.h | 45 + + include/media/videobuf2-vmalloc.h | 20 + + scripts/checkpatch.pl | 2 +- + 201 files changed, 18190 insertions(+), 6398 deletions(-) + create mode 100644 Documentation/DocBook/v4l/pixfmt-nv12m.xml + create mode 100644 Documentation/DocBook/v4l/pixfmt-yuv420m.xml + create mode 100644 Documentation/DocBook/v4l/planar-apis.xml + create mode 100644 drivers/media/dvb/dvb-usb/technisat-usb2.c + create mode 100644 drivers/media/dvb/frontends/dib9000.c + create mode 100644 drivers/media/dvb/frontends/dib9000.h + delete mode 100644 drivers/media/radio/radio-gemtek-pci.c + create mode 100644 drivers/media/rc/keymaps/rc-technisat-usb2.c + delete mode 100644 drivers/media/video/mt9v011.h + create mode 100644 drivers/media/video/noon010pc30.c + delete mode 100644 drivers/media/video/tda9875.c + create mode 100644 drivers/media/video/videobuf2-core.c + create mode 100644 drivers/media/video/videobuf2-dma-contig.c + create mode 100644 drivers/media/video/videobuf2-dma-sg.c + create mode 100644 drivers/media/video/videobuf2-memops.c + create mode 100644 drivers/media/video/videobuf2-vmalloc.c + create mode 100644 include/media/mt9v011.h + create mode 100644 include/media/noon010pc30.h + rename include/media/{s3c_fimc.h => s5p_fimc.h} (75%) + create mode 100644 include/media/videobuf2-core.h + create mode 100644 include/media/videobuf2-dma-contig.h + create mode 100644 include/media/videobuf2-dma-sg.h + create mode 100644 include/media/videobuf2-memops.h + create mode 100644 include/media/videobuf2-vmalloc.h +Merging kbuild/for-next +$ git merge kbuild/for-next +Already up-to-date! +Merge made by recursive. +Merging kconfig/for-next +$ git merge kconfig/for-next +Already up-to-date! +Merge made by recursive. +Merging ide/master +$ git merge ide/master +Already up-to-date. +Merging libata/NEXT +$ git merge libata/NEXT +Already up-to-date. +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/hw/amso1100/c2_rnic.c | 5 +- + drivers/infiniband/hw/ehca/ipz_pt_fn.c | 5 +- + drivers/infiniband/hw/ipath/ipath_driver.c | 3 +- + drivers/infiniband/hw/ipath/ipath_file_ops.c | 11 +-- + drivers/infiniband/hw/ipath/ipath_init_chip.c | 5 +- + drivers/infiniband/hw/mlx4/main.c | 12 ++-- + drivers/infiniband/hw/mthca/mthca_catas.c | 5 +- + drivers/infiniband/hw/mthca/mthca_cmd.c | 2 +- + drivers/infiniband/hw/mthca/mthca_eq.c | 2 +- + drivers/infiniband/hw/mthca/mthca_main.c | 2 +- + drivers/infiniband/hw/mthca/mthca_mr.c | 2 +- + drivers/infiniband/hw/nes/nes.c | 35 ++++++++-- + drivers/infiniband/hw/nes/nes.h | 4 + + drivers/infiniband/hw/nes/nes_cm.c | 8 ++- + drivers/infiniband/hw/nes/nes_hw.c | 95 +++++++++++++++++++++++++ + drivers/infiniband/hw/nes/nes_hw.h | 10 +++ + drivers/infiniband/hw/nes/nes_nic.c | 78 +++++++++++++++++--- + drivers/infiniband/hw/nes/nes_verbs.c | 37 +++++++++- + drivers/infiniband/hw/qib/qib_init.c | 7 +-- + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 10 +-- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 3 +- + drivers/infiniband/ulp/srp/ib_srp.c | 15 ++-- + drivers/net/mlx4/catas.c | 6 +- + drivers/net/mlx4/en_main.c | 3 +- + drivers/net/mlx4/main.c | 2 +- + drivers/net/mlx4/mcg.c | 23 ++++--- + include/linux/mlx4/device.h | 10 ++- + include/linux/mlx4/driver.h | 6 +-- + 28 files changed, 312 insertions(+), 94 deletions(-) +Merging acpi/test +$ git merge acpi/test +Already up-to-date. +Merging idle-test/idle-test +$ git merge idle-test/idle-test +Already up-to-date. +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Already up-to-date. +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/linux-next +$ git merge kvm/linux-next +Merge made by recursive. + arch/x86/kvm/svm.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/master +$ git merge swiotlb/master +Already up-to-date. +Merging ibft/master +$ git merge ibft/master +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 +Auto-merging drivers/dma/at_hdmac.c +Auto-merging drivers/dma/fsldma.c +Auto-merging drivers/dma/intel_mid_dma.c +Auto-merging include/linux/dmaengine.h +Merge made by recursive. + arch/arm/plat-nomadik/include/plat/ste_dma40.h | 8 + + drivers/dma/Kconfig | 9 +- + drivers/dma/amba-pl08x.c | 1040 +++++++++++------------- + drivers/dma/at_hdmac.c | 19 +- + drivers/dma/fsldma.c | 4 +- + drivers/dma/intel_mid_dma.c | 33 +- + drivers/dma/iop-adma.c | 4 +- + drivers/dma/pch_dma.c | 19 +- + drivers/dma/ste_dma40.c | 191 ++++- + drivers/dma/ste_dma40_ll.c | 246 ++++-- + drivers/dma/ste_dma40_ll.h | 36 +- + include/linux/amba/pl08x.h | 58 +- + include/linux/dmaengine.h | 2 +- + 13 files changed, 932 insertions(+), 737 deletions(-) +Merging net/master +$ git merge net/master +Already up-to-date. +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging bluetooth/master +$ git merge bluetooth/master +Merge made by recursive. + drivers/bluetooth/ath3k.c | 75 ++++++++++++--------------------------------- + 1 files changed, 20 insertions(+), 55 deletions(-) +Merging mtd/master +$ git merge mtd/master +Resolved 'drivers/mtd/Kconfig' using previous resolution. +Auto-merging arch/arm/mach-omap1/board-ams-delta.c +Auto-merging drivers/mtd/Kconfig +CONFLICT (content): Merge conflict in drivers/mtd/Kconfig +Auto-merging drivers/mtd/mtdchar.c +Auto-merging drivers/mtd/mtdoops.c +Auto-merging drivers/mtd/nand/nand_base.c +Auto-merging drivers/mtd/onenand/omap2.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d702751] Merge remote branch 'mtd/master' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-omap1/board-ams-delta.c | 17 ++++ + arch/arm/plat-omap/include/plat/onenand.h | 1 + + drivers/mtd/Kconfig | 19 +++-- + drivers/mtd/Makefile | 2 +- + drivers/mtd/chips/cfi_cmdset_0001.c | 55 +++++++------- + drivers/mtd/chips/cfi_cmdset_0002.c | 116 ++++++++++++++++------------ + drivers/mtd/chips/cfi_cmdset_0020.c | 1 + + drivers/mtd/chips/cfi_util.c | 2 +- + drivers/mtd/chips/fwh_lock.h | 2 +- + drivers/mtd/devices/m25p80.c | 39 +++++++++- + drivers/mtd/devices/sst25l.c | 4 +- + drivers/mtd/maps/amd76xrom.c | 7 +- + drivers/mtd/maps/bcm963xx-flash.c | 5 + + drivers/mtd/maps/ck804xrom.c | 7 +- + drivers/mtd/maps/esb2rom.c | 9 +-- + drivers/mtd/maps/ichxrom.c | 9 +-- + drivers/mtd/maps/physmap_of.c | 4 +- + drivers/mtd/maps/scx200_docflash.c | 5 +- + drivers/mtd/maps/tqm8xxl.c | 2 +- + drivers/mtd/mtdchar.c | 10 +- + drivers/mtd/mtdconcat.c | 1 + + drivers/mtd/mtdoops.c | 3 +- + drivers/mtd/mtdpart.c | 11 ++- + drivers/mtd/nand/Kconfig | 1 + + drivers/mtd/nand/ams-delta.c | 80 +++++++++++++++++--- + drivers/mtd/nand/fsl_elbc_nand.c | 2 + + drivers/mtd/nand/fsmc_nand.c | 89 +++++++++++++++++----- + drivers/mtd/nand/jz4740_nand.c | 57 +-------------- + drivers/mtd/nand/mxc_nand.c | 2 +- + drivers/mtd/nand/nand_base.c | 25 ++++--- + drivers/mtd/nand/nand_bbt.c | 3 +- + drivers/mtd/nand/nandsim.c | 39 +++++----- + drivers/mtd/nand/pasemi_nand.c | 2 +- + drivers/mtd/nand/pxa3xx_nand.c | 2 +- + drivers/mtd/nand/txx9ndfmc.c | 5 +- + drivers/mtd/onenand/omap2.c | 80 +++++++++++++++----- + drivers/mtd/onenand/onenand_base.c | 81 +++++++++++++------- + drivers/mtd/onenand/onenand_bbt.c | 10 ++- + drivers/mtd/onenand/samsung.c | 7 +- + drivers/mtd/ubi/build.c | 28 +++++++- + drivers/mtd/ubi/vtbl.c | 6 +- + fs/jffs2/build.c | 5 +- + fs/jffs2/jffs2_fs_sb.h | 2 +- + fs/jffs2/xattr.c | 12 ++-- + include/linux/mtd/cfi.h | 3 +- + include/linux/mtd/fsmc.h | 26 +------ + include/linux/mtd/mtd.h | 11 +++ + include/linux/mtd/nand.h | 2 + + include/linux/mtd/onenand.h | 14 ++++ + include/linux/mtd/partitions.h | 2 +- + 50 files changed, 577 insertions(+), 350 deletions(-) +Merging crypto/master +$ git merge crypto/master +Already up-to-date. +Merging sound-asoc/for-next +$ git merge sound-asoc/for-next +Merge made by recursive. + sound/soc/codecs/Kconfig | 2 +- + sound/soc/codecs/wl1273.c | 29 +++++++----------- + sound/soc/codecs/wl1273.h | 71 --------------------------------------------- + 3 files changed, 13 insertions(+), 89 deletions(-) +Merging sound/for-next +$ git merge sound/for-next +Merge made by recursive. + include/sound/ac97_codec.h | 2 +- + sound/pci/ac97/ac97_codec.c | 2 +- + sound/pci/ac97/ac97_patch.c | 62 ++++---- + sound/pci/hda/patch_hdmi.c | 12 ++ + sound/pci/hda/patch_realtek.c | 343 ++++++++++++++++++++++++----------------- + sound/pci/oxygen/xonar_dg.c | 2 +- + 6 files changed, 250 insertions(+), 173 deletions(-) +Merging cpufreq/next +$ git merge cpufreq/next +Merge made by recursive. + drivers/cpufreq/cpufreq_conservative.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging quilt/rr +$ git merge quilt/rr +Auto-merging Documentation/lguest/lguest.txt +Auto-merging arch/x86/kernel/head_32.S +Auto-merging arch/x86/lguest/boot.c +Merge made by recursive. + Documentation/lguest/lguest.c | 73 ++++++++++++++++++++++++--- + Documentation/lguest/lguest.txt | 5 ++ + arch/x86/kernel/head_32.S | 4 +- + arch/x86/lguest/boot.c | 2 +- + arch/x86/lguest/i386_head.S | 105 +++++++++++++++++++++++++++++++++++++++ + drivers/lguest/page_tables.c | 2 +- + drivers/lguest/x86/core.c | 4 +- + 7 files changed, 181 insertions(+), 14 deletions(-) +Merging input/next +$ git merge input/next +Already up-to-date. +Merging input-mt/next +$ git merge input-mt/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 +Already up-to-date. +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 +Resolved 'drivers/leds/Kconfig' using previous resolution. +Auto-merging drivers/leds/Kconfig +CONFLICT (content): Merge conflict in drivers/leds/Kconfig +Auto-merging drivers/leds/leds-gpio.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master afa838a] Merge remote branch 'leds/for-mm' +$ git diff -M --stat --summary HEAD^.. +Merging backlight/for-mm +$ git merge backlight/for-mm +Already up-to-date. +Merging mmc/mmc-next +$ git merge mmc/mmc-next +Merge made by recursive. + drivers/mmc/host/bfin_sdh.c | 2 +- + drivers/mmc/host/jz4740_mmc.c | 5 +++-- + drivers/mmc/host/mmci.c | 10 +++++----- + drivers/mmc/host/sdhci-s3c.c | 36 ++++++++++++++++++++++++++++++++++++ + drivers/mmc/host/ushc.c | 1 - + 5 files changed, 45 insertions(+), 9 deletions(-) +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Renaming drivers/serial/kgdboc.c => drivers/tty/serial/kgdboc.c +Auto-merging drivers/tty/serial/kgdboc.c +Auto-merging arch/x86/kernel/kgdb.c +Auto-merging kernel/debug/kdb/kdb_main.c +Merge made by recursive. + arch/x86/kernel/kgdb.c | 4 ++-- + drivers/misc/kgdbts.c | 2 +- + drivers/tty/serial/kgdboc.c | 2 +- + kernel/debug/kdb/kdb_main.c | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Already up-to-date! +Merge made by recursive. +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 +Already up-to-date. +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 fbdev/master +$ git merge fbdev/master +Already up-to-date. +Merging viafb/viafb-next +$ git merge viafb/viafb-next +Already up-to-date. +Merging omap_dss2/for-next +$ git merge omap_dss2/for-next +Already up-to-date. +Merging voltage/for-next +$ git merge voltage/for-next +Resolved 'include/linux/mfd/ab8500.h' using previous resolution. +Auto-merging arch/arm/mach-imx/mach-pcm038.c +Auto-merging arch/arm/mach-mx3/mach-mx31_3ds.c +Auto-merging arch/arm/mach-mx3/mach-mx31moboard.c +Auto-merging arch/arm/mach-ux500/board-mop500.c +Auto-merging drivers/regulator/max8998.c +Auto-merging drivers/regulator/wm8994-regulator.c +Auto-merging include/linux/mfd/ab8500.h +CONFLICT (content): Merge conflict in include/linux/mfd/ab8500.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master be784f7] Merge remote branch 'voltage/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging security-testing/next +$ git merge security-testing/next +Already up-to-date. +Merging selinux/master +$ git merge selinux/master +Already up-to-date. +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging agp/agp-next +$ git merge agp/agp-next +Auto-merging drivers/char/agp/backend.c +Auto-merging drivers/char/agp/hp-agp.c +Merge made by recursive. +Merging watchdog/master +$ git merge watchdog/master +Merge made by recursive. + arch/mips/include/asm/mach-jz4740/platform.h | 1 + + arch/mips/jz4740/platform.c | 16 ++ + drivers/watchdog/Kconfig | 6 + + drivers/watchdog/Makefile | 1 + + drivers/watchdog/jz4740_wdt.c | 322 ++++++++++++++++++++++++++ + 5 files changed, 346 insertions(+), 0 deletions(-) + create mode 100644 drivers/watchdog/jz4740_wdt.c +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 +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Already up-to-date. +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 Documentation/device-mapper/dm-crypt.txt +Merge made by recursive. + Documentation/device-mapper/dm-crypt.txt | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging suspend/linux-next +$ git merge suspend/linux-next +Already up-to-date. +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Auto-merging fs/nfsd/vfs.c +Auto-merging include/linux/fsnotify_backend.h +Merge made by recursive. + fs/cachefiles/namei.c | 1 - + fs/cachefiles/xattr.c | 1 - + fs/nfsd/vfs.c | 3 - + fs/notify/dnotify/dnotify.c | 15 +++--- + fs/notify/fanotify/fanotify.c | 24 +++++---- + fs/notify/fanotify/fanotify_user.c | 101 +++++++++++++++++++++++++----------- + fs/notify/group.c | 1 + + fs/notify/mark.c | 36 +++++-------- + include/linux/fanotify.h | 5 ++- + include/linux/fsnotify_backend.h | 14 ++++- + 10 files changed, 121 insertions(+), 80 deletions(-) +Merging irda/for-next +$ git merge irda/for-next +Already up-to-date. +Merging catalin/for-next +$ git merge catalin/for-next +Already up-to-date. +Merging alacrity/linux-next +$ git merge alacrity/linux-next +Resolved 'drivers/Makefile' using previous resolution. +Resolved 'include/linux/Kbuild' using previous resolution. +Resolved 'lib/Kconfig' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/x86/Kconfig +Auto-merging drivers/Makefile +CONFLICT (content): Merge conflict in drivers/Makefile +Auto-merging drivers/net/Kconfig +Auto-merging drivers/net/Makefile +Auto-merging include/linux/Kbuild +CONFLICT (content): Merge conflict in include/linux/Kbuild +Auto-merging lib/Kconfig +CONFLICT (content): Merge conflict in lib/Kconfig +Auto-merging lib/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 758ab7a] Merge remote branch 'alacrity/linux-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 25 + + arch/x86/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/net/Kconfig | 14 + + drivers/net/Makefile | 1 + + drivers/net/vbus-enet.c | 1560 +++++++++++++++++++++++++++++++++++++++++++ + drivers/vbus/Kconfig | 25 + + drivers/vbus/Makefile | 6 + + drivers/vbus/bus-proxy.c | 248 +++++++ + drivers/vbus/pci-bridge.c | 1016 ++++++++++++++++++++++++++++ + include/linux/Kbuild | 4 + + include/linux/ioq.h | 414 ++++++++++++ + include/linux/shm_signal.h | 189 ++++++ + include/linux/vbus_driver.h | 83 +++ + include/linux/vbus_pci.h | 145 ++++ + include/linux/venet.h | 133 ++++ + lib/Kconfig | 21 + + lib/Makefile | 2 + + lib/ioq.c | 304 +++++++++ + lib/shm_signal.c | 196 ++++++ + 20 files changed, 4389 insertions(+), 0 deletions(-) + create mode 100644 drivers/net/vbus-enet.c + create mode 100644 drivers/vbus/Kconfig + create mode 100644 drivers/vbus/Makefile + create mode 100644 drivers/vbus/bus-proxy.c + create mode 100644 drivers/vbus/pci-bridge.c + create mode 100644 include/linux/ioq.h + create mode 100644 include/linux/shm_signal.h + create mode 100644 include/linux/vbus_driver.h + create mode 100644 include/linux/vbus_pci.h + create mode 100644 include/linux/venet.h + create mode 100644 lib/ioq.c + create mode 100644 lib/shm_signal.c +Merging i7core_edac/linux_next +$ git merge i7core_edac/linux_next +Auto-merging drivers/edac/i7core_edac.c +Merge made by recursive. + drivers/edac/i7core_edac.c | 23 ++++++++++++++++++++--- + 1 files changed, 20 insertions(+), 3 deletions(-) +Merging i7300_edac/linux_next +$ git merge i7300_edac/linux_next +Already up-to-date! +Merge made by recursive. +Merging devicetree/next-devicetree +$ git merge devicetree/next-devicetree +Already up-to-date. +Merging spi/next-spi +$ git merge spi/next-spi +Already up-to-date. +Merging tip/auto-latest +$ git merge tip/auto-latest +Already up-to-date! +Merge made by recursive. +Merging rcu/rcu/next +$ git merge rcu/rcu/next +Already up-to-date. +Merging oprofile/for-next +$ git merge oprofile/for-next +Already up-to-date! +Merge made by recursive. +Merging swiotlb-xen/master +$ git merge swiotlb-xen/master +Resolved 'drivers/xen/Kconfig' using previous resolution. +Auto-merging arch/x86/xen/mmu.c +Removing arch/x86/xen/p2m.c +Auto-merging drivers/xen/Kconfig +CONFLICT (content): Merge conflict in drivers/xen/Kconfig +Removing drivers/xen/gntdev.c +Removing include/xen/gntdev.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 66db040] Merge remote branch 'swiotlb-xen/master' +$ git diff -M --stat --summary HEAD^.. + arch/x86/include/asm/xen/page.h | 16 +- + arch/x86/xen/Makefile | 3 +- + arch/x86/xen/irq.c | 2 +- + arch/x86/xen/mmu.c | 365 +++++++++++++++++++++ + arch/x86/xen/p2m.c | 510 ------------------------------ + drivers/xen/Makefile | 2 - + drivers/xen/gntdev.c | 665 --------------------------------------- + drivers/xen/grant-table.c | 46 --- + include/xen/gntdev.h | 119 ------- + include/xen/grant_table.h | 44 +--- + 10 files changed, 371 insertions(+), 1401 deletions(-) + delete mode 100644 arch/x86/xen/p2m.c + delete mode 100644 drivers/xen/gntdev.c + delete mode 100644 include/xen/gntdev.h +Merging xen-pvhvm/linux-next +$ git merge xen-pvhvm/linux-next +Auto-merging arch/x86/include/asm/xen/page.h +Auto-merging arch/x86/xen/enlighten.c +Auto-merging arch/x86/xen/mmu.c +Auto-merging include/xen/interface/memory.h +Merge made by recursive. +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Auto-merging drivers/edac/edac_core.h +Merge made by recursive. +Merging percpu/for-next +$ git merge percpu/for-next +Merge made by recursive. + arch/x86/include/asm/percpu.h | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) +Merging workqueues/for-next +$ git merge workqueues/for-next +Merge made by recursive. + include/linux/lockdep.h | 3 +++ + kernel/workqueue.c | 20 +++++++++++++++++--- + 2 files changed, 20 insertions(+), 3 deletions(-) +Merging sfi/sfi-test +$ git merge sfi/sfi-test +Already up-to-date. +Merging asm-generic/next +$ git merge asm-generic/next +Already up-to-date. +Merging drivers-x86/linux-next +$ git merge drivers-x86/linux-next +Already up-to-date. +Merging hwpoison/hwpoison +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master +$ git merge sysctl/master +Already up-to-date. +Merging driver-core/driver-core-next +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next +$ git merge usb/usb-next +Already up-to-date. +Merging staging/staging-next +$ git merge staging/staging-next +Already up-to-date. +Merging slabh/slabh +$ git merge slabh/slabh +Already up-to-date. +Merging bkl-trivial/trivial +$ git merge bkl-trivial/trivial +Already up-to-date. +Merging bkl-llseek/llseek +$ git merge bkl-llseek/llseek +Already up-to-date. +Merging bkl-vfs/vfs +$ git merge bkl-vfs/vfs +Already up-to-date. +Merging bkl-config/config +$ git merge bkl-config/config +Resolved 'arch/powerpc/kernel/setup_64.c' using previous resolution. +Resolved 'fs/nfsd/nfs4state.c' using previous resolution. +Resolved 'include/linux/hardirq.h' using previous resolution. +Resolved 'include/linux/smp_lock.h' using previous resolution. +Auto-merging arch/powerpc/kernel/setup_64.c +CONFLICT (content): Merge conflict in arch/powerpc/kernel/setup_64.c +Auto-merging arch/tile/kernel/compat.c +Auto-merging arch/tile/kernel/compat_signal.c +Auto-merging arch/tile/kernel/signal.c +Auto-merging block/compat_ioctl.c +Auto-merging block/ioctl.c +Auto-merging drivers/block/drbd/drbd_receiver.c +Auto-merging drivers/block/drbd/drbd_worker.c +Auto-merging drivers/char/agp/frontend.c +Auto-merging drivers/char/amiserial.c +Auto-merging drivers/char/specialix.c +Auto-merging drivers/gpu/drm/Kconfig +Auto-merging drivers/gpu/drm/drm_fops.c +Auto-merging drivers/hid/hidraw.c +Auto-merging drivers/hid/usbhid/hiddev.c +Auto-merging drivers/infiniband/hw/ipath/ipath_file_ops.c +Auto-merging drivers/input/input.c +Auto-merging drivers/media/dvb/ngene/ngene-core.c +Auto-merging drivers/media/radio/si470x/radio-si470x.h +Auto-merging drivers/media/video/bt8xx/bttv-driver.c +Auto-merging drivers/media/video/cx88/cx88-blackbird.c +Auto-merging drivers/media/video/cx88/cx88-video.c +Auto-merging drivers/media/video/pwc/pwc-if.c +Auto-merging drivers/media/video/s2255drv.c +Auto-merging drivers/media/video/saa7134/saa7134-empress.c +Auto-merging drivers/media/video/saa7164/saa7164.h +Auto-merging drivers/media/video/usbvision/usbvision-video.c +Auto-merging drivers/media/video/v4l2-compat-ioctl32.c +Auto-merging drivers/pci/proc.c +Auto-merging drivers/s390/block/dasd_eer.c +Auto-merging drivers/s390/char/vmlogrdr.c +Auto-merging drivers/s390/char/vmur.c +Auto-merging drivers/s390/crypto/zcrypt_api.c +Auto-merging drivers/scsi/hpsa.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/staging/Kconfig +Auto-merging drivers/staging/cx25821/cx25821.h +Auto-merging drivers/staging/easycap/easycap.h +Auto-merging drivers/staging/intel_sst/intel_sst_app_interface.c +Auto-merging drivers/staging/rtl8712/osdep_service.h +CONFLICT (delete/modify): drivers/staging/stradis/Kconfig deleted in HEAD and modified in bkl-config/config. Version bkl-config/config of drivers/staging/stradis/Kconfig left in tree. +Auto-merging drivers/usb/core/devio.c +Auto-merging drivers/usb/core/inode.c +Auto-merging drivers/usb/gadget/f_fs.c +Auto-merging drivers/usb/host/isp1362-hcd.c +Auto-merging drivers/usb/mon/mon_bin.c +Auto-merging drivers/usb/serial/usb-serial.c +Auto-merging drivers/video/console/vgacon.c +Auto-merging drivers/xen/xenfs/privcmd.c +Auto-merging fs/block_dev.c +Auto-merging fs/ceph/inode.c +Auto-merging fs/ceph/mds_client.c +Auto-merging fs/compat_ioctl.c +Auto-merging fs/ecryptfs/super.c +Auto-merging fs/ext3/super.c +Auto-merging fs/ioctl.c +Auto-merging fs/lockd/clntlock.c +Auto-merging fs/lockd/clntproc.c +Auto-merging fs/lockd/svc4proc.c +Auto-merging fs/lockd/svclock.c +Auto-merging fs/lockd/svcproc.c +Auto-merging fs/locks.c +Auto-merging fs/namespace.c +Auto-merging fs/ncpfs/dir.c +Auto-merging fs/ncpfs/file.c +Auto-merging fs/ncpfs/inode.c +Auto-merging fs/ncpfs/ioctl.c +Auto-merging fs/nfs/callback.c +Auto-merging fs/nfs/delegation.c +Auto-merging fs/nfs/super.c +Auto-merging fs/nfsd/nfs4state.c +CONFLICT (content): Merge conflict in fs/nfsd/nfs4state.c +Auto-merging fs/ocfs2/super.c +Auto-merging fs/proc/inode.c +Auto-merging fs/read_write.c +Auto-merging fs/reiserfs/ioctl.c +Auto-merging fs/reiserfs/journal.c +Auto-merging fs/reiserfs/super.c +Auto-merging include/linux/hardirq.h +CONFLICT (content): Merge conflict in include/linux/hardirq.h +Auto-merging include/linux/smp_lock.h +CONFLICT (content): Merge conflict in include/linux/smp_lock.h +Auto-merging include/linux/tty.h +Auto-merging init/main.c +Auto-merging kernel/trace/trace.c +Auto-merging lib/Kconfig.debug +Auto-merging net/irda/af_irda.c +Auto-merging net/sunrpc/svc_xprt.c +Auto-merging sound/core/pcm_native.c +Auto-merging sound/core/sound.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/stradis/Kconfig +arch/powerpc/kernel/setup_64.c: needs merge +drivers/staging/stradis/Kconfig: needs merge +fs/nfsd/nfs4state.c: needs merge +include/linux/hardirq.h: needs merge +include/linux/smp_lock.h: needs merge +rm 'drivers/staging/stradis/Kconfig' +$ git commit -v -a +[master f800255] Merge remote branch 'bkl-config/config' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/Kconfig | 4 ++-- + drivers/gpu/drm/i810/i810_dma.c | 18 +----------------- + drivers/gpu/drm/i810/i810_drv.c | 6 +++++- + drivers/staging/Kconfig | 11 +++++++++++ + drivers/staging/cx25821/cx25821.h | 1 - + include/linux/smp_lock.h | 15 ++------------- + lib/Kconfig.debug | 9 --------- + 7 files changed, 21 insertions(+), 43 deletions(-) +Merging irqflags/master +$ git merge irqflags/master +Already up-to-date. +Merging cleancache/linux-next +$ git merge cleancache/linux-next +Resolved 'fs/ocfs2/super.c' using previous resolution. +Resolved 'fs/super.c' using previous resolution. +Resolved 'include/linux/fs.h' using previous resolution. +Resolved 'mm/Kconfig' using previous resolution. +Auto-merging arch/x86/include/asm/xen/hypercall.h +Auto-merging drivers/xen/Makefile +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/buffer.c +Auto-merging fs/ext3/super.c +Auto-merging fs/ext4/super.c +Auto-merging fs/mpage.c +Auto-merging fs/ocfs2/super.c +CONFLICT (content): Merge conflict in fs/ocfs2/super.c +Auto-merging fs/super.c +CONFLICT (content): Merge conflict in fs/super.c +Auto-merging include/linux/fs.h +CONFLICT (content): Merge conflict in include/linux/fs.h +Auto-merging mm/Kconfig +CONFLICT (content): Merge conflict in mm/Kconfig +Auto-merging mm/Makefile +Auto-merging mm/filemap.c +Auto-merging mm/truncate.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ca6df6d] Merge remote branch 'cleancache/linux-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-kernel-mm-cleancache | 11 + + Documentation/vm/cleancache.txt | 267 ++++++++++++++++++++ + arch/x86/include/asm/xen/hypercall.h | 7 + + drivers/xen/Makefile | 1 + + drivers/xen/tmem.c | 264 +++++++++++++++++++ + fs/btrfs/extent_io.c | 9 + + fs/btrfs/super.c | 2 + + fs/buffer.c | 5 + + fs/ext3/super.c | 2 + + fs/ext4/super.c | 2 + + fs/mpage.c | 7 + + fs/ocfs2/super.c | 2 + + fs/super.c | 3 + + include/linux/cleancache.h | 118 +++++++++ + include/linux/fs.h | 5 + + include/xen/interface/xen.h | 22 ++ + mm/Kconfig | 22 ++ + mm/Makefile | 1 + + mm/cleancache.c | 245 ++++++++++++++++++ + mm/filemap.c | 11 + + mm/truncate.c | 10 + + 21 files changed, 1016 insertions(+), 0 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cleancache + create mode 100644 Documentation/vm/cleancache.txt + create mode 100644 drivers/xen/tmem.c + create mode 100644 include/linux/cleancache.h + create mode 100644 mm/cleancache.c +Merging scsi-post-merge/merge-base:master +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git fetch --no-tags ../next refs/remotes/scsi-post-merge/master:scsi-post-merge/master +From ../next + * [new branch] scsi-post-merge/master -> scsi-post-merge/master +$ git fetch --no-tags ../next refs/remotes/scsi-post-merge/merge-base:scsi-post-merge/merge-base +From ../next + * [new branch] scsi-post-merge/merge-base -> scsi-post-merge/merge-base +$ git checkout scsi-post-merge/master +Switched to branch 'scsi-post-merge/master' +$ git rebase --onto master scsi-post-merge/merge-base +First, rewinding head to replay your work on top of it... +Fast-forwarded scsi-post-merge/master to master. +$ cd ../next +$ git pull -f ../rebase-tmp scsi-post-merge/master +From ../rebase-tmp + * branch scsi-post-merge/master -> FETCH_HEAD +Already up-to-date. +$ rm -rf ../rebase-tmp |