diff options
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 1935 |
1 files changed, 1935 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..63a18cd31df8 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,1935 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at b1cdc46 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 +Merging origin/master +$ git merge origin/master +Updating b1cdc46..31f4671 +Fast-forward + Documentation/filesystems/squashfs.txt | 32 ++- + MAINTAINERS | 12 + + arch/alpha/math-emu/sfp-util.h | 5 + + arch/powerpc/include/asm/sfp-machine.h | 6 + + arch/s390/include/asm/sfp-util.h | 2 + + arch/sh/math-emu/sfp-util.h | 4 + + arch/sparc/math-emu/sfp-util_32.h | 6 + + arch/sparc/math-emu/sfp-util_64.h | 6 + + arch/x86/boot/compressed/relocs.c | 4 +- + drivers/char/agp/amd64-agp.c | 28 ++- + drivers/gpu/drm/drm_edid.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 3 +- + drivers/gpu/drm/nouveau/nv40_graph.c | 8 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 1 + + drivers/gpu/drm/radeon/radeon.h | 1 + + drivers/gpu/drm/radeon/radeon_agp.c | 5 + + drivers/gpu/drm/radeon/radeon_atombios.c | 13 +- + drivers/gpu/drm/radeon/radeon_device.c | 2 + + drivers/hid/Kconfig | 8 + + drivers/hid/Makefile | 1 + + drivers/hid/hid-core.c | 1 + + drivers/hid/hid-gyration.c | 1 + + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-roccat-kone.c | 73 ++++- + drivers/hid/hid-roccat-kone.h | 9 + + drivers/hid/hid-roccat.c | 428 +++++++++++++++++++++++++++ + drivers/hid/hid-roccat.h | 31 ++ + fs/fscache/object-list.c | 2 +- + fs/squashfs/Kconfig | 11 + + fs/squashfs/Makefile | 2 + + fs/squashfs/inode.c | 92 ++++++- + fs/squashfs/namei.c | 6 +- + fs/squashfs/squashfs.h | 12 +- + fs/squashfs/squashfs_fs.h | 76 +++++- + fs/squashfs/squashfs_fs_i.h | 3 + + fs/squashfs/squashfs_fs_sb.h | 3 + + fs/squashfs/super.c | 30 ++- + fs/squashfs/symlink.c | 11 + + fs/squashfs/xattr.c | 323 ++++++++++++++++++++ + fs/squashfs/xattr.h | 46 +++ + fs/squashfs/xattr_id.c | 100 +++++++ + include/linux/byteorder/big_endian.h | 3 - + include/linux/byteorder/little_endian.h | 3 - + lib/crc32.c | 2 +- + mm/filemap.c | 6 + + mm/mempolicy.c | 3 +- + mm/nommu.c | 32 ++- + sound/core/pcm_lib.c | 13 +- + sound/core/pcm_native.c | 39 +--- + sound/pci/aw2/aw2-alsa.c | 11 +- + sound/pci/emu10k1/emufx.c | 36 ++- + sound/pci/hda/hda_intel.c | 9 +- + sound/pci/hda/patch_realtek.c | 84 +++--- + sound/pci/hda/patch_sigmatel.c | 2 +- + sound/usb/caiaq/input.c | 2 +- + sound/usb/midi.c | 110 +++++++ + sound/usb/midi.h | 2 + + sound/usb/quirks-table.h | 11 + + sound/usb/quirks.c | 1 + + sound/usb/usbaudio.h | 1 + + 60 files changed, 1605 insertions(+), 178 deletions(-) + create mode 100644 drivers/hid/hid-roccat.c + create mode 100644 drivers/hid/hid-roccat.h + create mode 100644 fs/squashfs/xattr.c + create mode 100644 fs/squashfs/xattr.h + create mode 100644 fs/squashfs/xattr_id.c +Merging fixes/fixes +$ git merge fixes/fixes +Merge made by recursive. + arch/arm/mach-vexpress/ct-ca9x4.c | 1 + + drivers/rtc/rtc-davinci.c | 1 + + drivers/staging/tm6000/tm6000-alsa.c | 1 + + drivers/staging/tm6000/tm6000-cards.c | 1 + + drivers/staging/tm6000/tm6000-core.c | 1 + + drivers/staging/tm6000/tm6000-dvb.c | 1 + + fs/ocfs2/reservations.c | 1 - + 7 files changed, 6 insertions(+), 1 deletions(-) +Merging arm-current/master +$ git merge arm-current/master +Already up-to-date. +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Merge made by recursive. + arch/m68k/Kconfig | 1 + + arch/m68k/amiga/config.c | 174 ------------ + arch/m68k/amiga/platform.c | 116 ++++++++- + arch/m68k/include/asm/amigayle.h | 6 + + arch/m68k/include/asm/atomic.h | 2 + + arch/m68k/include/asm/cache.h | 2 + + drivers/char/amiserial.c | 61 +++-- + drivers/ide/gayle.c | 147 ++++++----- + drivers/input/keyboard/amikbd.c | 97 ++++--- + drivers/input/mouse/amimouse.c | 98 +++++--- + drivers/parport/parport_amiga.c | 64 +++-- + drivers/scsi/a2091.c | 245 ++++++++++-------- + drivers/scsi/a2091.h | 4 +- + drivers/scsi/a3000.c | 256 +++++++++++-------- + drivers/scsi/a3000.h | 4 +- + drivers/scsi/a4000t.c | 101 ++++---- + drivers/scsi/gvp11.c | 541 ++++++++++++++++++++------------------ + drivers/scsi/gvp11.h | 11 +- + drivers/scsi/mvme147.c | 33 ++-- + 19 files changed, 1045 insertions(+), 918 deletions(-) +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/net/benet/be_cmds.c | 2 +- + include/net/cls_cgroup.h | 2 +- + 2 files changed, 2 insertions(+), 2 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/ath/ar9170/usb.c | 14 ++++++++++++-- + drivers/net/wireless/ath/ath9k/xmit.c | 2 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00config.c | 8 -------- + 4 files changed, 14 insertions(+), 12 deletions(-) +Merging kbuild-current/for-linus +$ git merge kbuild-current/for-linus +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Already up-to-date. +Merging quilt/tty.current +$ git merge quilt/tty.current +Already up-to-date. +Merging quilt/usb.current +$ git merge quilt/usb.current +Already up-to-date. +Merging quilt/staging.current +$ git merge quilt/staging.current +Already up-to-date. +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Merge made by recursive. + drivers/hid/hid-debug.c | 2 +- + drivers/input/joydev.c | 10 +- + drivers/input/misc/Kconfig | 10 +++ + drivers/input/misc/Makefile | 1 + + drivers/input/misc/max8925_onkey.c | 148 ++++++++++++++++++++++++++++++++++++ + drivers/input/misc/twl4030-vibra.c | 2 +- + drivers/input/misc/uinput.c | 4 +- + include/linux/input.h | 12 ++-- + include/linux/joystick.h | 4 +- + include/linux/uinput.h | 10 +- + 10 files changed, 181 insertions(+), 22 deletions(-) + create mode 100644 drivers/input/misc/max8925_onkey.c +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 gcl-current/merge +$ git merge gcl-current/merge +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Already up-to-date. +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. +Merging msm/for-next +$ git merge msm/for-next +Merge made by recursive. + arch/arm/mach-msm/acpuclock-arm11.c | 1 - + arch/arm/mach-msm/clock.c | 1 - + arch/arm/mach-msm/dma.c | 1 + + drivers/mmc/host/Kconfig | 2 +- + drivers/serial/msm_serial.c | 21 ++----------- + drivers/serial/msm_serial.h | 56 +++++++++++++++++++++++++++++++++++ + 6 files changed, 61 insertions(+), 21 deletions(-) +Merging omap/for-next +$ git merge omap/for-next +Merge made by recursive. + arch/arm/mach-omap2/usb-ehci.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging samsung/next-samsung +$ git merge samsung/next-samsung +Merge made by recursive. + arch/arm/mach-s5p6440/include/mach/irqs.h | 9 ++++++++- + arch/arm/mach-s5p6442/include/mach/irqs.h | 5 +++-- + arch/arm/mach-s5pc100/include/mach/irqs.h | 3 --- + arch/arm/mach-s5pc100/include/mach/regs-gpio.h | 7 ++----- + arch/arm/mach-s5pv210/include/mach/irqs.h | 14 ++------------ + arch/arm/mach-s5pv210/include/mach/regs-gpio.h | 14 +++++++++----- + arch/arm/plat-s5p/Kconfig | 1 + + arch/arm/plat-s5p/include/plat/irqs.h | 7 +++++++ + arch/arm/plat-s5p/irq-eint.c | 15 ++++++++++----- + 9 files changed, 42 insertions(+), 33 deletions(-) +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/arch-v10/drivers/ds1302.c | 20 +++++++++++++++----- + arch/cris/arch-v10/drivers/pcf8563.c | 19 +++++++++++++++---- + arch/cris/arch-v32/drivers/i2c.c | 22 ++++++++++++++-------- + arch/cris/arch-v32/drivers/pcf8563.c | 21 ++++++++++++++++----- + 4 files changed, 60 insertions(+), 22 deletions(-) +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging m68k/for-next +$ git merge m68k/for-next +Merge made by recursive. + drivers/net/mac8390.c | 44 ++++++++++++++++++++++---------------------- + 1 files changed, 22 insertions(+), 22 deletions(-) +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Merge made by recursive. + arch/m68k/include/asm/m520xsim.h | 3 + + arch/m68k/include/asm/m523xsim.h | 3 + + arch/m68k/include/asm/m5249sim.h | 4 +- + arch/m68k/include/asm/m527xsim.h | 3 + + arch/m68knommu/Kconfig | 4 ++ + arch/m68knommu/platform/5272/intc.c | 39 +++++++++++--- + arch/m68knommu/platform/68328/ints.c | 8 +-- + arch/m68knommu/platform/68360/ints.c | 8 +-- + arch/m68knommu/platform/coldfire/intc-2.c | 76 ++++++++++++++++++++++++-- + arch/m68knommu/platform/coldfire/intc-simr.c | 68 ++++++++++++++++++++++-- + arch/m68knommu/platform/coldfire/intc.c | 59 +++++++++++++++++++-- + 11 files changed, 239 insertions(+), 36 deletions(-) +Merging microblaze/next +$ git merge microblaze/next +Auto-merging arch/microblaze/include/asm/system.h +Merge made by recursive. + arch/microblaze/Kconfig | 30 +++ + arch/microblaze/include/asm/elf.h | 2 +- + arch/microblaze/include/asm/exceptions.h | 5 + + arch/microblaze/include/asm/page.h | 12 +- + arch/microblaze/include/asm/system.h | 1 - + arch/microblaze/include/asm/uaccess.h | 4 +- + arch/microblaze/include/asm/unwind.h | 29 +++ + arch/microblaze/kernel/Makefile | 2 +- + arch/microblaze/kernel/cpu/mb.c | 1 + + arch/microblaze/kernel/entry-nommu.S | 28 +++ + arch/microblaze/kernel/entry.S | 27 ++ + arch/microblaze/kernel/head.S | 4 +- + arch/microblaze/kernel/hw_exception_handler.S | 4 +- + arch/microblaze/kernel/stacktrace.c | 44 +--- + arch/microblaze/kernel/traps.c | 91 +++---- + arch/microblaze/kernel/unwind.c | 318 +++++++++++++++++++++++++ + arch/microblaze/kernel/vmlinux.lds.S | 12 +- + 17 files changed, 506 insertions(+), 108 deletions(-) + create mode 100644 arch/microblaze/include/asm/unwind.h + create mode 100644 arch/microblaze/kernel/unwind.c +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Merge made by recursive. + arch/mips/dec/promcon.c | 3 +- + arch/mips/include/asm/mach-powertv/asic_reg_map.h | 2 +- + arch/mips/include/asm/mach-powertv/dma-coherence.h | 8 +- + arch/mips/include/asm/mach-powertv/ioremap.h | 165 +++++++--- + arch/mips/math-emu/dp_modf.c | 2 +- + arch/mips/math-emu/dp_tint.c | 3 +- + arch/mips/math-emu/dp_tlong.c | 3 +- + arch/mips/math-emu/sp_modf.c | 2 +- + arch/mips/math-emu/sp_tint.c | 3 +- + arch/mips/math-emu/sp_tlong.c | 3 +- + arch/mips/pci/ops-titan-ht.c | 4 +- + arch/mips/pmc-sierra/yosemite/ht-irq.c | 13 +- + arch/mips/powertv/Makefile | 3 +- + arch/mips/powertv/asic/asic-calliope.c | 2 +- + arch/mips/powertv/asic/asic-cronus.c | 4 +- + arch/mips/powertv/asic/asic-zeus.c | 2 +- + arch/mips/powertv/asic/asic_devices.c | 24 +- + arch/mips/powertv/ioremap.c | 136 ++++++++ + arch/mips/powertv/memory.c | 342 +++++++++++++++----- + arch/mips/sgi-ip27/ip27-klconfig.c | 8 +- + drivers/video/tdfxfb.c | 4 +- + 21 files changed, 558 insertions(+), 178 deletions(-) + create mode 100644 arch/mips/powertv/ioremap.c +Merging parisc/next +$ git merge parisc/next +Already up-to-date. +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Merge made by recursive. + arch/powerpc/boot/4xx.c | 12 +- + arch/powerpc/boot/dts/icon.dts | 447 +++++++++ + arch/powerpc/boot/dts/katmai.dts | 1 + + arch/powerpc/boot/dts/redwood.dts | 122 +++ + arch/powerpc/configs/44x/icon_defconfig | 1451 ++++++++++++++++++++++++++++ + arch/powerpc/platforms/44x/Kconfig | 11 + + arch/powerpc/platforms/44x/ppc44x_simple.c | 3 +- + arch/powerpc/sysdev/ppc4xx_pci.c | 119 +++ + arch/powerpc/sysdev/ppc4xx_pci.h | 58 ++ + 9 files changed, 2217 insertions(+), 7 deletions(-) + create mode 100644 arch/powerpc/boot/dts/icon.dts + create mode 100644 arch/powerpc/configs/44x/icon_defconfig +Merging 52xx-and-virtex/next +$ git merge 52xx-and-virtex/next +Resolved 'drivers/serial/mpc52xx_uart.c' using previous resolution. +Auto-merging drivers/serial/mpc52xx_uart.c +CONFLICT (content): Merge conflict in drivers/serial/mpc52xx_uart.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 29a78e9] Merge remote branch '52xx-and-virtex/next' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/platforms/512x/Kconfig | 13 +-- + drivers/serial/mpc52xx_uart.c | 145 ++++++++++++++++++++++++++++------- + 2 files changed, 120 insertions(+), 38 deletions(-) +Merging galak/next +$ git merge galak/next +Resolved 'arch/powerpc/sysdev/fsl_msi.c' using previous resolution. +Auto-merging arch/powerpc/kernel/traps.c +Auto-merging arch/powerpc/sysdev/fsl_msi.c +CONFLICT (content): Merge conflict in arch/powerpc/sysdev/fsl_msi.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 506c067] Merge remote branch 'galak/next' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/Kconfig | 2 +- + arch/powerpc/boot/dts/mpc8548cds.dts | 4 - + arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts | 15 +- + arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts | 7 +- + arch/powerpc/boot/dts/p1021mds.dts | 698 ++++++++++++++++++++++++ + arch/powerpc/include/asm/cputable.h | 1 + + arch/powerpc/include/asm/kexec.h | 13 + + arch/powerpc/include/asm/reg_booke.h | 33 +- + arch/powerpc/kernel/Makefile | 8 +- + arch/powerpc/kernel/cputable.c | 2 +- + arch/powerpc/kernel/crash.c | 4 + + arch/powerpc/kernel/fsl_booke_entry_mapping.S | 237 ++++++++ + arch/powerpc/kernel/head_fsl_booke.S | 200 +------- + arch/powerpc/kernel/misc_32.S | 17 + + arch/powerpc/kernel/swsusp_booke.S | 193 +++++++ + arch/powerpc/kernel/traps.c | 88 +++- + arch/powerpc/platforms/85xx/mpc85xx_mds.c | 102 ++++- + arch/powerpc/sysdev/fsl_msi.c | 117 ++++- + arch/powerpc/sysdev/fsl_msi.h | 3 + + 19 files changed, 1494 insertions(+), 250 deletions(-) + create mode 100644 arch/powerpc/boot/dts/p1021mds.dts + create mode 100644 arch/powerpc/kernel/fsl_booke_entry_mapping.S + create mode 100644 arch/powerpc/kernel/swsusp_booke.S +Merging s390/features +$ git merge s390/features +Merge made by recursive. + arch/s390/Kconfig | 7 --- + arch/s390/include/asm/atomic.h | 19 +++++++ + arch/s390/include/asm/ccwdev.h | 10 ++++ + arch/s390/kernel/asm-offsets.c | 4 +- + arch/s390/kernel/kprobes.c | 3 + + arch/s390/kernel/setup.c | 2 +- + arch/s390/mm/cmm.c | 109 ++++++++++++++-------------------------- + drivers/s390/block/dasd.c | 23 ++++++++ + drivers/s390/block/dasd_eckd.c | 1 + + drivers/s390/block/dasd_int.h | 1 + + drivers/s390/cio/ccwgroup.c | 7 +++ + drivers/s390/cio/ccwreq.c | 15 ++++++ + drivers/s390/cio/ioasm.h | 15 ------ + 13 files changed, 120 insertions(+), 96 deletions(-) +Merging sh/master +$ git merge sh/master +Merge made by recursive. + arch/sh/boards/mach-ecovec24/setup.c | 1 - + arch/sh/kernel/dwarf.c | 19 +++++++++++++++++-- + arch/sh/kernel/return_address.c | 2 ++ + drivers/video/sh_mobile_lcdcfb.c | 6 +++--- + include/linux/serial_sci.h | 4 +--- + 5 files changed, 23 insertions(+), 9 deletions(-) +Merging genesis/master +$ git merge genesis/master +Resolved 'include/linux/serial_sci.h' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging drivers/dma/shdma.c +Auto-merging drivers/serial/sh-sci.c +Auto-merging include/linux/serial_sci.h +CONFLICT (content): Merge conflict in include/linux/serial_sci.h +Auto-merging include/video/sh_mobile_lcdc.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9ad0b84] Merge remote branch 'genesis/master' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 3 +- + arch/arm/configs/ap4evb_defconfig | 71 +++- + arch/arm/configs/g3evm_defconfig | 73 +++- + arch/arm/configs/g4evm_defconfig | 72 +++- + arch/arm/mach-shmobile/Kconfig | 13 + + arch/arm/mach-shmobile/Makefile | 6 +- + arch/arm/mach-shmobile/board-ap4evb.c | 248 ++++++++++++- + arch/arm/mach-shmobile/board-g3evm.c | 56 +++- + arch/arm/mach-shmobile/board-g4evm.c | 151 +++++++- + arch/arm/mach-shmobile/clock-sh7367.c | 357 +++++++++++++++--- + arch/arm/mach-shmobile/clock-sh7372.c | 395 +++++++++++++++++++ + arch/arm/mach-shmobile/clock-sh7377.c | 369 ++++++++++++++++++ + arch/arm/mach-shmobile/clock.c | 44 +++ + arch/arm/mach-shmobile/include/mach/common.h | 10 + + arch/arm/mach-shmobile/include/mach/irqs.h | 6 + + arch/arm/mach-shmobile/include/mach/memory.h | 3 + + arch/arm/mach-shmobile/include/mach/vmalloc.h | 3 +- + arch/arm/mach-shmobile/intc-sh7367.c | 178 +++++++++- + arch/arm/mach-shmobile/intc-sh7372.c | 232 +++++++++++- + arch/arm/mach-shmobile/intc-sh7377.c | 300 +++++++++++++++- + arch/arm/mach-shmobile/setup-sh7367.c | 30 ++- + arch/arm/mach-shmobile/setup-sh7372.c | 98 ++++-- + arch/arm/mach-shmobile/setup-sh7377.c | 34 ++- + drivers/dma/Kconfig | 2 +- + drivers/dma/shdma.c | 8 +- + drivers/i2c/busses/Kconfig | 2 +- + drivers/i2c/busses/i2c-sh_mobile.c | 121 ++++-- + drivers/serial/sh-sci.c | 42 ++- + drivers/serial/sh-sci.h | 29 ++- + drivers/sh/Makefile | 5 +- + drivers/video/Kconfig | 8 + + drivers/video/Makefile | 1 + + drivers/video/sh_mipi_dsi.c | 505 +++++++++++++++++++++++++ + include/linux/serial_core.h | 3 + + include/video/mipi_display.h | 130 +++++++ + include/video/sh_mipi_dsi.h | 35 ++ + include/video/sh_mobile_lcdc.h | 39 +- + 37 files changed, 3434 insertions(+), 248 deletions(-) + create mode 100644 arch/arm/mach-shmobile/clock-sh7372.c + create mode 100644 arch/arm/mach-shmobile/clock-sh7377.c + create mode 100644 arch/arm/mach-shmobile/clock.c + create mode 100644 drivers/video/sh_mipi_dsi.c + create mode 100644 include/video/mipi_display.h + create mode 100644 include/video/sh_mipi_dsi.h +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging xtensa/master +$ git merge xtensa/master +Auto-merging arch/xtensa/kernel/time.c +Merge made by recursive. + arch/xtensa/Kconfig | 17 +- + arch/xtensa/Makefile | 7 +- + arch/xtensa/boot/Makefile | 1 + + arch/xtensa/configs/iss_defconfig | 1 + + arch/xtensa/include/asm/cacheflush.h | 1 + + arch/xtensa/include/asm/coprocessor.h | 9 +- + arch/xtensa/include/asm/elf.h | 1 + + arch/xtensa/include/asm/io.h | 40 ++-- + arch/xtensa/include/asm/irq.h | 7 +- + arch/xtensa/include/asm/pgalloc.h | 1 + + arch/xtensa/include/asm/processor.h | 1 - + arch/xtensa/include/asm/ptrace.h | 2 + + arch/xtensa/include/asm/serial.h | 12 +- + arch/xtensa/kernel/Makefile | 8 +- + arch/xtensa/kernel/asm-offsets.c | 1 + + arch/xtensa/kernel/entry.S | 1 + + arch/xtensa/kernel/head.S | 4 +- + arch/xtensa/kernel/time.c | 2 +- + arch/xtensa/platforms/iss/network.c | 22 +- + 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 ++++++++++++++++++++ + 25 files changed, 554 insertions(+), 50 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 +Auto-merging fs/ceph/file.c +Auto-merging fs/ceph/super.c +Merge made by recursive. + fs/ceph/Kconfig | 10 + + fs/ceph/Makefile | 2 + + fs/ceph/README | 1 + + fs/ceph/debugfs.c | 11 +- + fs/ceph/file.c | 46 ++ + fs/ceph/messenger.c | 188 +++++- + fs/ceph/messenger.h | 3 + + fs/ceph/mon_client.c | 173 +++++- + fs/ceph/mon_client.h | 5 + + fs/ceph/osd_client.c | 207 +++++-- + fs/ceph/osd_client.h | 30 + + fs/ceph/osdmap.c | 13 + + fs/ceph/osdmap.h | 2 + + fs/ceph/rbd.c | 1803 ++++++++++++++++++++++++++++++++++++++++++++++++++ + fs/ceph/rbd.h | 8 + + fs/ceph/rbd_types.h | 48 ++ + fs/ceph/super.c | 191 ++++-- + fs/ceph/super.h | 36 +- + 18 files changed, 2624 insertions(+), 153 deletions(-) + create mode 100644 fs/ceph/rbd.c + create mode 100644 fs/ceph/rbd.h + create mode 100644 fs/ceph/rbd_types.h +Merging cifs/master +$ git merge cifs/master +Already up-to-date. +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/main.c +CONFLICT (content): Merge conflict in fs/ecryptfs/main.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fa4ccef] Merge remote branch 'ecryptfs/next' +$ git diff -M --stat --summary HEAD^.. +Merging ext3/for_next +$ git merge ext3/for_next +Merge made by recursive. + drivers/staging/pohmelfs/inode.c | 8 -- + fs/ext2/super.c | 20 +++++ + fs/ext3/dir.c | 2 +- + fs/ext3/super.c | 38 ++++++---- + fs/ext4/super.c | 37 ++++++---- + fs/jfs/super.c | 16 ++++ + fs/ocfs2/super.c | 50 ++++++------- + fs/quota/dquot.c | 144 +++++++++++++++++-------------------- + fs/quota/quota.c | 4 +- + fs/reiserfs/super.c | 48 ++++++++----- + fs/super.c | 13 +--- + fs/udf/balloc.c | 43 +----------- + fs/udf/file.c | 26 +------- + fs/udf/ialloc.c | 21 +----- + fs/udf/inode.c | 5 -- + fs/udf/namei.c | 20 ----- + fs/udf/super.c | 13 ++-- + fs/udf/udfdecl.h | 1 - + fs/ufs/balloc.c | 24 ------ + fs/ufs/file.c | 3 +- + fs/ufs/ialloc.c | 13 ---- + fs/ufs/inode.c | 4 - + fs/ufs/namei.c | 16 ---- + fs/ufs/super.c | 110 +---------------------------- + fs/ufs/truncate.c | 10 --- + include/linux/quota.h | 4 +- + include/linux/quotaops.h | 79 ++++++++++----------- + 27 files changed, 257 insertions(+), 515 deletions(-) +Merging ext4/next +$ git merge ext4/next +Resolved 'fs/ext4/fsync.c' using previous resolution. +Resolved 'fs/ext4/super.c' using previous resolution. +Auto-merging fs/ext4/fsync.c +CONFLICT (content): Merge conflict in fs/ext4/fsync.c +Auto-merging fs/ext4/ialloc.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/super.c +CONFLICT (content): Merge conflict in fs/ext4/super.c +Auto-merging fs/ext4/xattr.c +Auto-merging fs/quota/dquot.c +Auto-merging include/linux/quotaops.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 24f6894] Merge remote branch 'ext4/next' +$ git diff -M --stat --summary HEAD^.. + fs/ext4/balloc.c | 5 +- + fs/ext4/block_validity.c | 4 +- + fs/ext4/dir.c | 26 +- + fs/ext4/ext4.h | 167 +++++++++-- + fs/ext4/ext4_jbd2.h | 8 +- + fs/ext4/extents.c | 417 ++++++++++++++----------- + fs/ext4/file.c | 2 +- + fs/ext4/fsync.c | 35 ++- + fs/ext4/ialloc.c | 89 +++--- + fs/ext4/inode.c | 723 ++++++++++++++++++++++--------------------- + fs/ext4/ioctl.c | 27 ++- + fs/ext4/mballoc.c | 120 +++++-- + fs/ext4/migrate.c | 2 +- + fs/ext4/move_extent.c | 13 +- + fs/ext4/namei.c | 61 ++-- + fs/ext4/resize.c | 3 +- + fs/ext4/super.c | 80 +++--- + fs/ext4/symlink.c | 2 + + fs/ext4/xattr.c | 39 +-- + fs/jbd2/transaction.c | 5 +- + fs/quota/dquot.c | 11 +- + include/linux/quotaops.h | 37 ++- + include/trace/events/ext4.h | 94 +++--- + 23 files changed, 1136 insertions(+), 834 deletions(-) +Merging fatfs/master +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next +$ git merge fuse/for-next +Auto-merging fs/fuse/dev.c +Auto-merging mm/filemap.c +Merge made by recursive. + fs/fuse/dev.c | 527 +++++++++++++++++++++++++++++++++++++++++++------- + fs/fuse/file.c | 39 +++-- + fs/fuse/fuse_i.h | 3 + + fs/pipe.c | 6 + + include/linux/fuse.h | 5 +- + mm/filemap.c | 1 + + mm/swap.c | 1 + + 7 files changed, 500 insertions(+), 82 deletions(-) +Merging gfs2/master +$ git merge gfs2/master +Already up-to-date. +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging logfs/master +$ git merge logfs/master +Auto-merging fs/logfs/dir.c +Auto-merging fs/logfs/logfs.h +Merge made by recursive. + fs/logfs/dir.c | 2 +- + fs/logfs/file.c | 6 +++--- + fs/logfs/logfs.h | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) +Merging nfs/linux-next +$ git merge nfs/linux-next +Merge made by recursive. + fs/nfs/dir.c | 1 + + fs/nfs/write.c | 20 ++++++++++++++++---- + net/sunrpc/xprtsock.c | 29 ++++++++++++++++++----------- + 3 files changed, 35 insertions(+), 15 deletions(-) +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 squashfs/master +$ git merge squashfs/master +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Auto-merging fs/udf/file.c +Merge made by recursive. + fs/udf/file.c | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) +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 pci/linux-next +$ git merge pci/linux-next +Already up-to-date. +Merging hid/for-next +$ git merge hid/for-next +Merge made by recursive. + drivers/hid/hidraw.c | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) +Merging quilt/i2c +$ git merge quilt/i2c +Merge made by recursive. + Documentation/i2c/busses/i2c-ali1535 | 4 +- + Documentation/i2c/busses/i2c-ali1563 | 2 +- + Documentation/i2c/busses/i2c-ali15x3 | 16 +++++----- + Documentation/i2c/busses/i2c-pca-isa | 14 ++++---- + Documentation/i2c/busses/i2c-sis5595 | 58 +++++++++++++++++----------------- + Documentation/i2c/busses/i2c-sis630 | 8 ++-- + Documentation/i2c/ten-bit-addresses | 6 ++-- + 7 files changed, 54 insertions(+), 54 deletions(-) +Merging bjdooks-i2c/next-i2c +$ git merge bjdooks-i2c/next-i2c +Resolved 'arch/arm/plat-omap/i2c.c' using previous resolution. +Resolved 'drivers/i2c/busses/i2c-cpm.c' using previous resolution. +Resolved 'drivers/i2c/busses/i2c-mpc.c' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/arm/plat-omap/i2c.c +CONFLICT (content): Merge conflict in arch/arm/plat-omap/i2c.c +Auto-merging drivers/i2c/busses/i2c-cpm.c +CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-cpm.c +Auto-merging drivers/i2c/busses/i2c-ibm_iic.c +Auto-merging drivers/i2c/busses/i2c-mpc.c +CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-mpc.c +Auto-merging drivers/i2c/busses/i2c-pxa.c +Auto-merging drivers/i2c/busses/i2c-s3c2410.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 79ce720] Merge remote branch 'bjdooks-i2c/next-i2c' +$ git diff -M --stat --summary HEAD^.. +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Merge made by recursive. + Documentation/hwmon/dme1737 | 51 ++++- + Documentation/hwmon/lm63 | 7 + + Documentation/hwmon/ltc4245 | 4 +- + Documentation/hwmon/sysfs-interface | 13 +- + Documentation/hwmon/tmp102 | 26 +++ + drivers/acpi/osl.c | 9 + + drivers/hwmon/Kconfig | 34 +++- + drivers/hwmon/Makefile | 2 + + drivers/hwmon/adm1031.c | 68 +++++++- + drivers/hwmon/applesmc.c | 186 +++++++++++++++++++- + drivers/hwmon/asus_atk0110.c | 7 + + drivers/hwmon/dme1737.c | 328 +++++++++++++++++++++++----------- + drivers/hwmon/emc1403.c | 344 +++++++++++++++++++++++++++++++++++ + drivers/hwmon/f71882fg.c | 170 +++++++++++++----- + drivers/hwmon/lm63.c | 16 ++- + drivers/hwmon/lm75.c | 2 + + drivers/hwmon/lm90.c | 3 +- + drivers/hwmon/ltc4245.c | 18 +-- + drivers/hwmon/tmp102.c | 321 ++++++++++++++++++++++++++++++++ + drivers/hwmon/tmp401.c | 255 +++++++++++++------------- + include/linux/acpi.h | 2 + + 21 files changed, 1543 insertions(+), 323 deletions(-) + create mode 100644 Documentation/hwmon/tmp102 + create mode 100644 drivers/hwmon/emc1403.c + create mode 100644 drivers/hwmon/tmp102.c +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Merge made by recursive. + Documentation/kbuild/makefiles.txt | 100 +++++++++++++++++------------------ + Documentation/vm/page-types.c | 2 +- + fs/aio.c | 21 ++++---- + 3 files changed, 61 insertions(+), 62 deletions(-) +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Auto-merging include/linux/input.h +Merge made by recursive. + drivers/input/evdev.c | 39 +++++++ + drivers/input/input.c | 267 ++++++++++++++++++++++++++++++++++++++++++++----- + include/linux/input.h | 39 ++++++- + 3 files changed, 313 insertions(+), 32 deletions(-) +Merging kbuild/for-next +$ git merge kbuild/for-next +Resolved 'Documentation/kbuild/makefiles.txt' using previous resolution. +Auto-merging .gitignore +Auto-merging Documentation/kbuild/makefiles.txt +CONFLICT (content): Merge conflict in Documentation/kbuild/makefiles.txt +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging arch/ia64/include/asm/percpu.h +Auto-merging arch/ia64/kernel/ivt.S +Auto-merging arch/parisc/include/asm/system.h +Auto-merging arch/powerpc/include/asm/cache.h +Auto-merging arch/s390/kernel/swsusp_asm64.S +Auto-merging arch/sh/include/asm/cache.h +Auto-merging arch/sparc/include/asm/cache.h +Auto-merging arch/x86/kernel/setup_percpu.c +Auto-merging arch/x86/kernel/vmlinux.lds.S +Auto-merging include/asm-generic/percpu.h +Auto-merging include/linux/init_task.h +Auto-merging include/linux/percpu-defs.h +Auto-merging include/linux/spinlock.h +Auto-merging init/Kconfig +Auto-merging kernel/module.c +Auto-merging scripts/Makefile.lib +Auto-merging scripts/kconfig/Makefile +Auto-merging scripts/kconfig/util.c +Auto-merging scripts/markup_oops.pl +Auto-merging scripts/package/mkspec +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c19f491] Merge remote branch 'kbuild/for-next' +$ git diff -M --stat --summary HEAD^.. + .gitignore | 1 + + Documentation/.gitignore | 7 + + Documentation/kbuild/kbuild.txt | 6 +- + Documentation/mutex-design.txt | 4 +- + MAINTAINERS | 5 +- + Makefile | 65 +- + arch/frv/kernel/break.S | 4 +- + arch/frv/kernel/entry.S | 2 +- + arch/frv/kernel/head.S | 2 +- + arch/frv/kernel/vmlinux.lds.S | 10 +- + arch/frv/mm/tlb-miss.S | 2 +- + arch/h8300/boot/compressed/head.S | 2 +- + arch/h8300/boot/compressed/vmlinux.lds | 2 +- + arch/ia64/include/asm/asmmacro.h | 12 +- + arch/ia64/include/asm/cache.h | 2 +- + arch/ia64/include/asm/percpu.h | 2 +- + arch/ia64/kernel/Makefile.gate | 2 +- + arch/ia64/kernel/gate-data.S | 2 +- + arch/ia64/kernel/gate.S | 8 +- + arch/ia64/kernel/gate.lds.S | 10 +- + arch/ia64/kernel/init_task.c | 2 +- + arch/ia64/kernel/ivt.S | 2 +- + arch/ia64/kernel/minstate.h | 4 +- + arch/ia64/kernel/paravirtentry.S | 2 +- + arch/ia64/kernel/vmlinux.lds.S | 28 +- + arch/ia64/kvm/vmm_ivt.S | 2 +- + arch/ia64/scripts/unwcheck.py | 2 +- + arch/ia64/xen/gate-data.S | 2 +- + arch/ia64/xen/xensetup.S | 2 +- + arch/m68knommu/kernel/vmlinux.lds.S | 4 +- + arch/m68knommu/platform/68360/head-ram.S | 2 +- + arch/m68knommu/platform/68360/head-rom.S | 2 +- + arch/mips/lasat/image/head.S | 2 +- + arch/mips/lasat/image/romscript.normal | 2 +- + arch/parisc/include/asm/cache.h | 2 +- + arch/parisc/include/asm/system.h | 2 +- + arch/parisc/kernel/head.S | 2 +- + arch/parisc/kernel/init_task.c | 6 +- + arch/parisc/kernel/vmlinux.lds.S | 12 +- + arch/powerpc/Makefile | 5 + + arch/powerpc/include/asm/cache.h | 2 +- + arch/powerpc/include/asm/page_64.h | 8 - + arch/powerpc/kernel/vmlinux.lds.S | 10 +- + arch/s390/include/asm/cache.h | 2 +- + arch/s390/kernel/swsusp_asm64.S | 2 +- + arch/sh/boot/compressed/vmlinux.scr | 2 +- + arch/sh/include/asm/cache.h | 2 +- + arch/sparc/boot/btfixupprep.c | 2 +- + arch/sparc/include/asm/cache.h | 2 +- + arch/um/kernel/dyn.lds.S | 2 +- + arch/um/kernel/init_task.c | 2 +- + arch/um/kernel/uml.lds.S | 2 +- + arch/x86/.gitignore | 3 + + arch/x86/boot/compressed/mkpiggy.c | 2 +- + arch/x86/boot/compressed/vmlinux.lds.S | 4 +- + arch/x86/include/asm/cache.h | 2 +- + arch/x86/kernel/acpi/wakeup_32.S | 2 +- + arch/x86/kernel/init_task.c | 2 +- + arch/x86/kernel/setup_percpu.c | 2 +- + arch/x86/kernel/vmlinux.lds.S | 4 +- + include/asm-generic/percpu.h | 10 +- + include/asm-generic/vmlinux.lds.h | 38 +- + include/linux/cache.h | 2 +- + include/linux/init.h | 2 +- + include/linux/init_task.h | 2 +- + include/linux/linkage.h | 8 +- + include/linux/percpu-defs.h | 4 +- + include/linux/spinlock.h | 2 +- + init/Kconfig | 8 + + kernel/module.c | 2 +- + scripts/Makefile.build | 2 +- + scripts/Makefile.lib | 2 +- + scripts/checkincludes.pl | 24 +- + scripts/checkstack.pl | 16 +- + scripts/checkversion.pl | 23 +- + scripts/decodecode | 48 +- + scripts/export_report.pl | 37 +- + scripts/gen_initramfs_list.sh | 3 +- + scripts/genksyms/genksyms.c | 4 +- + scripts/headerdep.pl | 3 +- + scripts/headers_check.pl | 11 +- + scripts/headers_install.pl | 19 +- + scripts/kallsyms.c | 6 +- + scripts/kconfig/Makefile | 16 +- + scripts/kconfig/expr.c | 27 +- + scripts/kconfig/expr.h | 5 +- + scripts/kconfig/gconf.c | 113 +-- + scripts/kconfig/gconf.glade | 26 +- + scripts/kconfig/lkc.h | 7 +- + scripts/kconfig/lkc_proto.h | 6 +- + scripts/kconfig/lxdialog/inputbox.c | 4 +- + scripts/kconfig/lxdialog/menubox.c | 22 +- + scripts/kconfig/mconf.c | 36 +- + scripts/kconfig/menu.c | 28 +- + scripts/kconfig/nconf.c | 1568 ++++++++++++++++++++++++++++++ + scripts/kconfig/nconf.gui.c | 617 ++++++++++++ + scripts/kconfig/nconf.h | 95 ++ + scripts/kconfig/symbol.c | 30 +- + scripts/kconfig/util.c | 2 + + scripts/kconfig/zconf.tab.c_shipped | 25 +- + scripts/kconfig/zconf.y | 25 +- + scripts/markup_oops.pl | 54 +- + scripts/mkcompile_h | 5 +- + scripts/mod/modpost.c | 152 ++-- + scripts/namespace.pl | 65 +- + scripts/package/builddeb | 2 + + scripts/package/mkspec | 2 +- + scripts/profile2linkerlist.pl | 8 +- + scripts/rt-tester/rt-tester.py | 2 +- + scripts/show_delta | 2 +- + scripts/tags.sh | 45 +- + 111 files changed, 3023 insertions(+), 538 deletions(-) + create mode 100644 Documentation/.gitignore + create mode 100644 arch/x86/.gitignore + create mode 100644 scripts/kconfig/nconf.c + create mode 100644 scripts/kconfig/nconf.gui.c + create mode 100644 scripts/kconfig/nconf.h +Merging kconfig/for-next +$ git merge kconfig/for-next +Already uptodate! +Merge made by recursive. +Merging ide/master +$ git merge ide/master +Already up-to-date. +Merging libata/NEXT +$ git merge libata/NEXT +Merge made by recursive. + Documentation/kernel-parameters.txt | 2 + + drivers/ata/Kconfig | 511 ++++++++++++++++++----------------- + drivers/ata/Makefile | 83 ++++--- + drivers/ata/ata_generic.c | 2 +- + drivers/ata/ata_piix.c | 4 +- + drivers/ata/libata-core.c | 16 +- + drivers/ata/libata-sff.c | 416 ++++++++++++++++++++--------- + drivers/ata/pata_acpi.c | 2 +- + drivers/ata/pata_ali.c | 5 +- + drivers/ata/pata_amd.c | 2 +- + drivers/ata/pata_artop.c | 2 +- + drivers/ata/pata_atiixp.c | 4 +- + drivers/ata/pata_atp867x.c | 2 +- + drivers/ata/pata_bf54x.c | 2 +- + drivers/ata/pata_cmd64x.c | 2 +- + drivers/ata/pata_cs5520.c | 2 +- + drivers/ata/pata_cs5530.c | 2 +- + drivers/ata/pata_cs5535.c | 2 +- + drivers/ata/pata_cs5536.c | 2 +- + drivers/ata/pata_cypress.c | 2 +- + drivers/ata/pata_efar.c | 4 +- + drivers/ata/pata_hpt366.c | 2 +- + drivers/ata/pata_hpt37x.c | 2 +- + drivers/ata/pata_hpt3x2n.c | 2 +- + drivers/ata/pata_hpt3x3.c | 2 +- + drivers/ata/pata_icside.c | 2 +- + drivers/ata/pata_it8213.c | 2 +- + drivers/ata/pata_it821x.c | 2 +- + drivers/ata/pata_jmicron.c | 2 +- + drivers/ata/pata_macio.c | 2 +- + drivers/ata/pata_marvell.c | 2 +- + drivers/ata/pata_mpc52xx.c | 2 +- + drivers/ata/pata_netcell.c | 2 +- + drivers/ata/pata_ninja32.c | 2 +- + drivers/ata/pata_ns87415.c | 2 +- + drivers/ata/pata_octeon_cf.c | 18 -- + drivers/ata/pata_oldpiix.c | 2 +- + drivers/ata/pata_optidma.c | 2 +- + drivers/ata/pata_pdc2027x.c | 2 +- + drivers/ata/pata_pdc202xx_old.c | 2 +- + drivers/ata/pata_piccolo.c | 2 +- + drivers/ata/pata_radisys.c | 2 +- + drivers/ata/pata_rdc.c | 4 +- + drivers/ata/pata_sc1200.c | 2 +- + drivers/ata/pata_scc.c | 4 +- + drivers/ata/pata_sch.c | 2 +- + drivers/ata/pata_serverworks.c | 2 +- + drivers/ata/pata_sil680.c | 4 +- + drivers/ata/pata_sis.c | 2 +- + drivers/ata/pata_sl82c105.c | 2 +- + drivers/ata/pata_triflex.c | 2 +- + drivers/ata/pata_via.c | 2 +- + drivers/ata/sata_mv.c | 4 +- + drivers/ata/sata_nv.c | 8 +- + drivers/ata/sata_qstor.c | 16 +- + drivers/ata/sata_sil.c | 4 +- + drivers/ata/sata_sis.c | 4 +- + drivers/ata/sata_svw.c | 2 +- + drivers/ata/sata_uli.c | 2 +- + drivers/ata/sata_via.c | 8 +- + drivers/ata/sata_vsc.c | 2 +- + include/linux/libata.h | 36 ++- + 62 files changed, 720 insertions(+), 519 deletions(-) +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/core/ucm.c | 11 +- + drivers/infiniband/hw/qib/qib_fs.c | 25 +- + drivers/infiniband/hw/qib/qib_iba6120.c | 12 - + drivers/infiniband/hw/qib/qib_iba7322.c | 582 ++++++++++--------------------- + drivers/infiniband/hw/qib/qib_init.c | 6 + + 5 files changed, 203 insertions(+), 433 deletions(-) +Merging acpi/test +$ git merge acpi/test +Auto-merging Documentation/kernel-parameters.txt +Auto-merging MAINTAINERS +Removing drivers/acpi/hest.c +Removing include/acpi/acpi_hest.h +Auto-merging include/linux/acpi.h +Merge made by recursive. + Documentation/acpi/apei/einj.txt | 59 ++ + Documentation/kernel-parameters.txt | 9 + + MAINTAINERS | 7 + + arch/ia64/pci/pci.c | 5 +- + arch/x86/include/asm/mce.h | 8 + + arch/x86/include/asm/thread_info.h | 4 +- + arch/x86/kernel/acpi/sleep.c | 2 - + arch/x86/kernel/cpu/mcheck/Makefile | 2 + + arch/x86/kernel/cpu/mcheck/mce-apei.c | 138 +++++ + arch/x86/kernel/cpu/mcheck/mce-internal.h | 23 + + arch/x86/kernel/cpu/mcheck/mce.c | 79 +++- + arch/x86/pci/acpi.c | 5 +- + drivers/Makefile | 2 +- + drivers/acpi/Kconfig | 9 + + drivers/acpi/Makefile | 5 +- + drivers/acpi/acpi_pad.c | 9 - + drivers/acpi/acpica/evxfevnt.c | 33 +- + drivers/acpi/acpica/hwacpi.c | 20 +- + drivers/acpi/apei/Kconfig | 30 + + drivers/acpi/apei/Makefile | 5 + + drivers/acpi/apei/apei-base.c | 593 ++++++++++++++++++++ + drivers/acpi/apei/apei-internal.h | 114 ++++ + drivers/acpi/apei/cper.c | 84 +++ + drivers/acpi/apei/einj.c | 548 ++++++++++++++++++ + drivers/acpi/apei/erst.c | 855 +++++++++++++++++++++++++++++ + drivers/acpi/apei/ghes.c | 427 ++++++++++++++ + drivers/acpi/apei/hest.c | 173 ++++++ + drivers/acpi/atomicio.c | 360 ++++++++++++ + drivers/acpi/ec.c | 3 +- + drivers/acpi/hed.c | 112 ++++ + drivers/acpi/hest.c | 139 ----- + drivers/acpi/pci_root.c | 67 ++- + drivers/acpi/processor_driver.c | 15 +- + drivers/acpi/processor_idle.c | 44 +- + drivers/acpi/sleep.c | 157 +------ + drivers/acpi/video.c | 118 ++++- + drivers/acpi/video_detect.c | 2 +- + drivers/cpuidle/cpuidle.c | 12 +- + drivers/cpuidle/cpuidle.h | 1 - + drivers/cpuidle/driver.c | 14 +- + drivers/cpuidle/sysfs.c | 5 +- + drivers/idle/Kconfig | 11 + + drivers/idle/Makefile | 1 + + drivers/idle/intel_idle.c | 431 +++++++++++++++ + drivers/pci/pcie/aer/aerdrv.h | 17 + + drivers/pci/pcie/aer/aerdrv_acpi.c | 77 +++ + drivers/pci/pcie/aer/aerdrv_core.c | 8 +- + drivers/pci/probe.c | 8 - + fs/debugfs/file.c | 21 +- + include/acpi/acpi_bus.h | 2 +- + include/acpi/acpi_drivers.h | 3 +- + include/acpi/acpi_hest.h | 12 - + include/acpi/apei.h | 34 ++ + include/acpi/atomicio.h | 10 + + include/acpi/hed.h | 18 + + include/acpi/processor.h | 13 - + include/acpi/video.h | 16 + + include/linux/acpi.h | 1 - + include/linux/cper.h | 314 +++++++++++ + include/linux/cpuidle.h | 7 +- + include/linux/debugfs.h | 2 + + include/linux/pci.h | 3 +- + include/linux/uuid.h | 70 +++ + lib/Makefile | 2 +- + lib/uuid.c | 53 ++ + 65 files changed, 4949 insertions(+), 482 deletions(-) + create mode 100644 Documentation/acpi/apei/einj.txt + create mode 100644 arch/x86/kernel/cpu/mcheck/mce-apei.c + create mode 100644 drivers/acpi/apei/Kconfig + create mode 100644 drivers/acpi/apei/Makefile + create mode 100644 drivers/acpi/apei/apei-base.c + create mode 100644 drivers/acpi/apei/apei-internal.h + create mode 100644 drivers/acpi/apei/cper.c + create mode 100644 drivers/acpi/apei/einj.c + create mode 100644 drivers/acpi/apei/erst.c + create mode 100644 drivers/acpi/apei/ghes.c + create mode 100644 drivers/acpi/apei/hest.c + create mode 100644 drivers/acpi/atomicio.c + create mode 100644 drivers/acpi/hed.c + delete mode 100644 drivers/acpi/hest.c + create mode 100755 drivers/idle/intel_idle.c + delete mode 100644 include/acpi/acpi_hest.h + create mode 100644 include/acpi/apei.h + create mode 100644 include/acpi/atomicio.h + create mode 100644 include/acpi/hed.h + create mode 100644 include/linux/cper.h + create mode 100644 include/linux/uuid.h + create mode 100644 lib/uuid.c +$ git am -3 ../patches/acpi__update_gfp_slab.h_includes +Applying: acpi: update gfp/slab.h includes +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/acpi/apei/apei-base.c +M drivers/acpi/atomicio.c +$ git add . +$ git commit -v -a --amend +[master 8717743] Merge remote branch 'acpi/test' +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution. +Auto-merging Documentation/feature-removal-schedule.txt +CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt +Auto-merging drivers/firewire/core-cdev.c +Auto-merging drivers/firewire/ohci.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 61a9631] Merge remote branch 'ieee1394/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 7 + + drivers/firewire/core-card.c | 22 +--- + drivers/firewire/core-cdev.c | 8 +- + drivers/firewire/core-transaction.c | 96 +++++++++------ + drivers/firewire/core.h | 6 +- + drivers/firewire/ohci.c | 188 +++++++++++++++++++++++----- + drivers/firewire/ohci.h | 10 ++- + drivers/ieee1394/dv1394.c | 11 +- + drivers/ieee1394/raw1394.c | 3 +- + drivers/ieee1394/video1394.c | 5 +- + include/linux/firewire.h | 5 +- + 11 files changed, 255 insertions(+), 106 deletions(-) +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/linux-next +$ git merge kvm/linux-next +Auto-merging arch/x86/include/asm/msr-index.h +Merge made by recursive. + arch/powerpc/kvm/e500.c | 2 +- + arch/x86/include/asm/msr-index.h | 1 + + arch/x86/kvm/svm.c | 98 +++++++++++++++++++++++++++++++++++++- + 3 files changed, 99 insertions(+), 2 deletions(-) +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging ibft/master +$ git merge ibft/master +Merge made by recursive. + drivers/firmware/Kconfig | 9 + + drivers/firmware/Makefile | 1 + + drivers/firmware/iscsi_boot_sysfs.c | 481 +++++++++++++++++++++++ + drivers/firmware/iscsi_ibft.c | 726 +++++++++++++---------------------- + drivers/firmware/iscsi_ibft_find.c | 56 +++- + include/linux/iscsi_boot_sysfs.h | 123 ++++++ + include/linux/iscsi_ibft.h | 12 +- + 7 files changed, 924 insertions(+), 484 deletions(-) + create mode 100644 drivers/firmware/iscsi_boot_sysfs.c + create mode 100644 include/linux/iscsi_boot_sysfs.h +Merging scsi/master +$ git merge scsi/master +Auto-merging drivers/scsi/scsi_scan.c +Merge made by recursive. + drivers/scsi/aacraid/commctrl.c | 4 +- + drivers/scsi/arcmsr/arcmsr.h | 29 ++- + drivers/scsi/arcmsr/arcmsr_attr.c | 3 + + drivers/scsi/arcmsr/arcmsr_hba.c | 684 +++++++++++++++++++++++++++---------- + drivers/scsi/be2iscsi/be_mgmt.c | 5 +- + drivers/scsi/bfa/bfa_core.c | 22 ++ + drivers/scsi/ipr.c | 221 +++++++------ + drivers/scsi/ipr.h | 31 ++- + drivers/scsi/iscsi_tcp.c | 6 +- + drivers/scsi/scsi_scan.c | 9 +- + 10 files changed, 708 insertions(+), 306 deletions(-) +Merging async_tx/next +$ git merge async_tx/next +Auto-merging drivers/dma/Kconfig +Merge made by recursive. + arch/arm/mach-ux500/clock.c | 2 +- + arch/arm/mach-ux500/cpu-db8500.c | 4 + + arch/arm/mach-ux500/devices-db8500.c | 219 ++++++ + arch/arm/mach-ux500/include/mach/db8500-regs.h | 12 + + arch/arm/mach-ux500/include/mach/devices.h | 3 + + arch/arm/mach-ux500/ste-dma40-db8500.h | 154 +++++ + drivers/dma/Kconfig | 9 + + drivers/dma/Makefile | 1 + + drivers/dma/pl330.c | 866 ++++++++++++++++++++++++ + include/linux/amba/pl330.h | 45 ++ + 10 files changed, 1314 insertions(+), 1 deletions(-) + create mode 100644 arch/arm/mach-ux500/ste-dma40-db8500.h + create mode 100644 drivers/dma/pl330.c + create mode 100644 include/linux/amba/pl330.h +Merging net/master +$ git merge net/master +Already up-to-date. +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging mtd/master +$ git merge mtd/master +Auto-merging drivers/mtd/mtdchar.c +Merge made by recursive. + drivers/mtd/mtdchar.c | 11 +++-------- + 1 files changed, 3 insertions(+), 8 deletions(-) +Merging crypto/master +$ git merge crypto/master +Merge made by recursive. + arch/s390/crypto/Makefile | 2 +- + arch/s390/crypto/crypto_des.h | 2 +- + arch/s390/crypto/des_s390.c | 238 ++----------------- + crypto/authenc.c | 2 +- + crypto/ctr.c | 2 +- + crypto/xts.c | 2 +- + drivers/crypto/mv_cesa.c | 10 +- + drivers/crypto/n2_core.c | 520 ++++++++++++++++++++++++++++------------- + drivers/crypto/omap-sham.c | 1 - + 9 files changed, 383 insertions(+), 396 deletions(-) +Merging sound/for-next +$ git merge sound/for-next +Already uptodate! +Merge made by recursive. +Merging cpufreq/next +$ git merge cpufreq/next +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging arch/x86/kernel/cpu/cpufreq/powernow-k8.c +Auto-merging drivers/cpufreq/cpufreq.c +Auto-merging drivers/cpufreq/cpufreq_ondemand.c +Auto-merging include/linux/cpufreq.h +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 10 -------- + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 2 + + drivers/cpufreq/cpufreq.c | 10 ++------ + drivers/cpufreq/cpufreq_ondemand.c | 33 +++++++++++++++------------ + include/linux/cpufreq.h | 5 ---- + 5 files changed, 23 insertions(+), 37 deletions(-) +Merging quilt/rr +$ git merge quilt/rr +Auto-merging arch/um/drivers/hostaudio_kern.c +Auto-merging drivers/char/ipmi/ipmi_watchdog.c +Auto-merging init/main.c +Auto-merging net/sunrpc/xprtsock.c +Auto-merging scripts/mod/modpost.c +Merge made by recursive. + Documentation/cpu-hotplug.txt | 2 +- + arch/um/drivers/hostaudio_kern.c | 10 + + drivers/acpi/debug.c | 32 +++- + drivers/block/virtio_blk.c | 4 +- + drivers/char/hvc_iucv.c | 9 +- + drivers/char/ipmi/ipmi_watchdog.c | 42 +++-- + drivers/ide/ide.c | 20 ++- + drivers/input/misc/ati_remote2.c | 26 ++- + drivers/input/mouse/psmouse-base.c | 14 +- + drivers/message/fusion/mptbase.c | 3 +- + drivers/misc/lkdtm.c | 4 +- + drivers/net/myri10ge/myri10ge.c | 54 ++++-- + drivers/net/virtio_net.c | 10 +- + drivers/net/wireless/libertas/if_sdio.c | 32 +++- + drivers/net/wireless/libertas/if_usb.c | 3 + + drivers/net/wireless/libertas_tf/if_usb.c | 3 + + drivers/scsi/bfa/bfad.c | 2 + + drivers/staging/rtl8187se/r8180_core.c | 6 +- + drivers/staging/rtl8192e/r8192E_core.c | 6 +- + drivers/staging/rtl8192su/r8192U_core.c | 6 +- + drivers/usb/atm/ueagle-atm.c | 2 + + drivers/video/uvesafb.c | 7 +- + drivers/video/vt8623fb.c | 2 + + drivers/virtio/virtio_ring.c | 21 ++- + fs/nfs/callback.c | 11 +- + include/linux/moduleparam.h | 282 ++++++++++++++++++++++------- + include/linux/virtio_ring.h | 12 ++ + init/main.c | 8 +- + kernel/params.c | 233 ++++++++++++++++-------- + net/mac80211/rate.c | 2 + + net/sunrpc/xprtsock.c | 26 ++- + scripts/mod/modpost.c | 13 ++ + 32 files changed, 657 insertions(+), 250 deletions(-) +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging input/next +$ git merge input/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 +Auto-merging drivers/block/drbd/drbd_worker.c +Auto-merging fs/fcntl.c +Auto-merging fs/pipe.c +Auto-merging kernel/sysctl.c +Auto-merging kernel/trace/trace.c +Auto-merging net/core/skbuff.c +Merge made by recursive. +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Merge made by recursive. + drivers/md/dm-crypt.c | 3 +- + drivers/md/dm-ioctl.c | 115 +++++++++++++++++++-------------------- + drivers/md/dm-snap-persistent.c | 6 +- + 3 files changed, 60 insertions(+), 64 deletions(-) +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master +$ git merge battery/master +Already up-to-date. +Merging leds/for-mm +$ git merge leds/for-mm +Merge made by recursive. + arch/arm/mach-mx3/mach-mx31moboard.c | 45 ++++- + arch/arm/mach-orion5x/dns323-setup.c | 22 +- + drivers/leds/Kconfig | 17 ++ + drivers/leds/Makefile | 2 + + drivers/leds/led-class.c | 2 +- + drivers/leds/leds-88pm860x.c | 11 +- + drivers/leds/leds-gpio.c | 31 ++- + drivers/leds/leds-lp3944.c | 9 +- + drivers/leds/leds-mc13783.c | 403 ++++++++++++++++++++++++++++++++++ + drivers/leds/leds-net5501.c | 94 ++++++++ + drivers/leds/leds-ss4200.c | 2 +- + drivers/mfd/mc13783-core.c | 4 + + include/linux/leds.h | 12 +- + include/linux/mfd/mc13783.h | 66 ++++++ + 14 files changed, 691 insertions(+), 29 deletions(-) + create mode 100644 drivers/leds/leds-mc13783.c + create mode 100644 drivers/leds/leds-net5501.c +$ git reset --hard HEAD^ +HEAD is now at 36ef7d9 Merge branch 'quilt/device-mapper' +Merging refs/next/20100526/leds +$ git merge refs/next/20100526/leds +Merge made by recursive. + drivers/leds/leds-88pm860x.c | 11 ++++++++--- + 1 files changed, 8 insertions(+), 3 deletions(-) +Merging backlight/for-mm +$ git merge backlight/for-mm +Merge made by recursive. + arch/arm/mach-s3c2440/mach-gta02.c | 76 +-- + drivers/mfd/pcf50633-core.c | 3 + + drivers/video/backlight/88pm860x_bl.c | 2 + + drivers/video/backlight/Kconfig | 116 ++-- + drivers/video/backlight/Makefile | 4 + + drivers/video/backlight/adp8860_bl.c | 838 +++++++++++++++++++++++ + drivers/video/backlight/adx_bl.c | 4 +- + drivers/video/backlight/ep93xx_bl.c | 160 +++++ + drivers/video/backlight/l4f00242t03.c | 11 +- + drivers/video/backlight/max8925_bl.c | 1 + + drivers/video/backlight/mbp_nvidia_bl.c | 47 ++- + drivers/video/backlight/pcf50633-backlight.c | 190 ++++++ + drivers/video/backlight/s6e63m0.c | 920 ++++++++++++++++++++++++++ + drivers/video/backlight/s6e63m0_gamma.h | 266 ++++++++ + include/linux/i2c/adp8860.h | 154 +++++ + include/linux/lcd.h | 23 + + include/linux/mfd/pcf50633/backlight.h | 51 ++ + include/linux/mfd/pcf50633/core.h | 4 + + 18 files changed, 2750 insertions(+), 120 deletions(-) + create mode 100644 drivers/video/backlight/adp8860_bl.c + create mode 100644 drivers/video/backlight/ep93xx_bl.c + create mode 100644 drivers/video/backlight/pcf50633-backlight.c + create mode 100644 drivers/video/backlight/s6e63m0.c + create mode 100644 drivers/video/backlight/s6e63m0_gamma.h + create mode 100644 include/linux/i2c/adp8860.h + create mode 100644 include/linux/mfd/pcf50633/backlight.h +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Merge made by recursive. + drivers/char/sysrq.c | 2 +- + kernel/debug/kdb/kdb_main.c | 9 ++++++++- + 2 files changed, 9 insertions(+), 2 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Auto-merging mm/slub.c +Merge made by recursive. + include/linux/slub_def.h | 9 +++------ + mm/slub.c | 33 +++++++++++---------------------- + 2 files changed, 14 insertions(+), 28 deletions(-) +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 +Resolved 'drivers/dma/Makefile' using previous resolution. +Resolved 'drivers/dma/timb_dma.c' using previous resolution. +Removing arch/x86/include/asm/rdc321x_defs.h +Auto-merging drivers/dma/Kconfig +Auto-merging drivers/dma/Makefile +CONFLICT (content): Merge conflict in drivers/dma/Makefile +Auto-merging drivers/dma/timb_dma.c +CONFLICT (add/add): Merge conflict in drivers/dma/timb_dma.c +Auto-merging drivers/mfd/88pm860x-core.c +Auto-merging drivers/mfd/Kconfig +Removing drivers/mfd/ab4500-core.c +Auto-merging drivers/mfd/pcf50633-core.c +Auto-merging drivers/regulator/ab3100.c +Auto-merging include/linux/mfd/88pm860x.h +Removing include/linux/mfd/ab3100.h +Removing include/linux/mfd/ab4500.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6d117b3] Merge remote branch 'mfd/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-davinci/board-da850-evm.c | 19 +- + arch/arm/mach-u300/i2c.c | 57 +- + arch/arm/mach-u300/include/mach/irqs.h | 7 + + arch/arm/mach-ux500/board-mop500.c | 2 +- + arch/x86/include/asm/rdc321x_defs.h | 12 - + drivers/gpio/Kconfig | 26 + + drivers/gpio/Makefile | 5 +- + drivers/gpio/janz-ttl.c | 258 +++++ + drivers/gpio/rdc321x-gpio.c | 246 +++++ + drivers/gpio/tc35892-gpio.c | 381 +++++++ + drivers/input/touchscreen/Kconfig | 13 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/tps6507x-ts.c | 400 +++++++ + drivers/mfd/88pm860x-core.c | 6 +- + drivers/mfd/88pm860x-i2c.c | 2 +- + drivers/mfd/Kconfig | 87 ++- + drivers/mfd/Makefile | 13 +- + drivers/mfd/ab3100-core.c | 99 ++- + drivers/mfd/ab3100-otp.c | 13 +- + drivers/mfd/ab3550-core.c | 1401 +++++++++++++++++++++++ + drivers/mfd/ab4500-core.c | 209 ---- + drivers/mfd/ab8500-core.c | 444 ++++++++ + drivers/mfd/ab8500-spi.c | 133 +++ + drivers/mfd/abx500-core.c | 157 +++ + drivers/mfd/da903x.c | 1 + + drivers/mfd/janz-cmodio.c | 304 +++++ + drivers/mfd/max8925-core.c | 7 +- + drivers/mfd/max8925-i2c.c | 2 - + drivers/mfd/menelaus.c | 3 +- + drivers/mfd/mfd-core.c | 2 +- + drivers/mfd/pcf50633-adc.c | 39 +- + drivers/mfd/pcf50633-core.c | 345 +------ + drivers/mfd/pcf50633-irq.c | 318 ++++++ + drivers/mfd/rdc321x-southbridge.c | 123 +++ + drivers/mfd/t7l66xb.c | 3 + + drivers/mfd/tc35892.c | 347 ++++++ + drivers/mfd/timberdale.c | 156 +++- + drivers/mfd/timberdale.h | 16 +- + drivers/mfd/tps65010.c | 2 +- + drivers/mfd/tps6507x.c | 159 +++ + drivers/mfd/twl4030-irq.c | 11 +- + drivers/mfd/wm831x-core.c | 112 ++- + drivers/mfd/wm831x-irq.c | 18 +- + drivers/mfd/wm8350-i2c.c | 6 +- + drivers/mfd/wm8400-core.c | 4 +- + drivers/net/can/Kconfig | 10 + + drivers/net/can/Makefile | 1 + + drivers/net/can/janz-ican3.c | 1830 +++++++++++++++++++++++++++++++ + drivers/regulator/ab3100.c | 35 +- + drivers/regulator/tps6507x-regulator.c | 373 +++---- + drivers/rtc/rtc-ab3100.c | 41 +- + drivers/watchdog/rdc321x_wdt.c | 53 +- + include/linux/input/tps6507x-ts.h | 24 + + include/linux/mfd/88pm860x.h | 4 +- + include/linux/mfd/ab3100.h | 129 --- + include/linux/mfd/ab4500.h | 262 ----- + include/linux/mfd/ab8500.h | 128 +++ + include/linux/mfd/abx500.h | 233 ++++ + include/linux/mfd/janz.h | 54 + + include/linux/mfd/rdc321x.h | 26 + + include/linux/mfd/tc35892.h | 132 +++ + include/linux/mfd/tps6507x.h | 169 +++ + include/linux/mfd/wm831x/core.h | 5 +- + 63 files changed, 8113 insertions(+), 1365 deletions(-) + delete mode 100644 arch/x86/include/asm/rdc321x_defs.h + create mode 100644 drivers/gpio/janz-ttl.c + create mode 100644 drivers/gpio/rdc321x-gpio.c + create mode 100644 drivers/gpio/tc35892-gpio.c + create mode 100644 drivers/input/touchscreen/tps6507x-ts.c + create mode 100644 drivers/mfd/ab3550-core.c + delete mode 100644 drivers/mfd/ab4500-core.c + create mode 100644 drivers/mfd/ab8500-core.c + create mode 100644 drivers/mfd/ab8500-spi.c + create mode 100644 drivers/mfd/abx500-core.c + create mode 100644 drivers/mfd/janz-cmodio.c + create mode 100644 drivers/mfd/pcf50633-irq.c + create mode 100644 drivers/mfd/rdc321x-southbridge.c + create mode 100644 drivers/mfd/tc35892.c + create mode 100644 drivers/mfd/tps6507x.c + create mode 100644 drivers/net/can/janz-ican3.c + create mode 100644 include/linux/input/tps6507x-ts.h + delete mode 100644 include/linux/mfd/ab3100.h + delete mode 100644 include/linux/mfd/ab4500.h + create mode 100644 include/linux/mfd/ab8500.h + create mode 100644 include/linux/mfd/abx500.h + create mode 100644 include/linux/mfd/janz.h + create mode 100644 include/linux/mfd/rdc321x.h + create mode 100644 include/linux/mfd/tc35892.h + create mode 100644 include/linux/mfd/tps6507x.h +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 viafb/viafb-next +$ git merge viafb/viafb-next +Auto-merging drivers/media/video/Kconfig +Auto-merging drivers/media/video/Makefile +Auto-merging include/media/v4l2-chip-ident.h +Merge made by recursive. + drivers/media/video/Kconfig | 10 + + drivers/media/video/Makefile | 2 + + drivers/media/video/via-camera.c | 1369 ++++++++++++++++++++++++++++++++++++++ + drivers/media/video/via-camera.h | 93 +++ + drivers/video/via/accel.c | 2 +- + drivers/video/via/via-core.c | 16 +- + include/linux/via-core.h | 4 +- + include/media/v4l2-chip-ident.h | 4 + + 8 files changed, 1496 insertions(+), 4 deletions(-) + create mode 100644 drivers/media/video/via-camera.c + create mode 100644 drivers/media/video/via-camera.h +Merging voltage/for-next +$ git merge voltage/for-next +Auto-merging drivers/mfd/88pm860x-core.c +Auto-merging drivers/regulator/ab3100.c +Auto-merging drivers/regulator/core.c +Auto-merging include/linux/mfd/88pm860x.h +Merge made by recursive. +Merging security-testing/next +$ git merge security-testing/next +Already up-to-date. +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging 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 uwb/for-upstream +$ git merge uwb/for-upstream +Merge made by recursive. + drivers/uwb/i1480/i1480u-wlp/lc.c | 16 ++++++------ + drivers/uwb/wlp/messages.c | 40 ++++++++++++++++---------------- + drivers/uwb/wlp/sysfs.c | 46 ++++++++++++++++++------------------ + drivers/uwb/wlp/wlp-lc.c | 12 +++++----- + include/linux/wlp.h | 2 +- + 5 files changed, 58 insertions(+), 58 deletions(-) +Merging watchdog/master +$ git merge watchdog/master +Already up-to-date. +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging cputime/cputime +$ git merge cputime/cputime +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 +Already up-to-date. +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging quilt/aoe +$ git merge quilt/aoe +Auto-merging drivers/block/aoe/aoecmd.c +Merge made by recursive. + drivers/block/aoe/aoecmd.c | 8 ++++++-- + 1 files changed, 6 insertions(+), 2 deletions(-) +Merging suspend/linux-next +$ git merge suspend/linux-next +Merge made by recursive. + Documentation/ioctl/ioctl-number.txt | 3 +- + Documentation/power/opportunistic-suspend.txt | 156 ++++++ + include/linux/suspend.h | 1 + + include/linux/suspend_blocker.h | 166 +++++++ + include/linux/suspend_ioctls.h | 4 + + kernel/power/Kconfig | 31 ++ + kernel/power/Makefile | 2 + + kernel/power/main.c | 132 +++++- + kernel/power/opportunistic_suspend.c | 639 +++++++++++++++++++++++++ + kernel/power/power.h | 14 + + kernel/power/process.c | 11 +- + kernel/power/suspend.c | 5 +- + kernel/power/user_suspend_blocker.c | 143 ++++++ + 13 files changed, 1296 insertions(+), 11 deletions(-) + create mode 100644 Documentation/power/opportunistic-suspend.txt + create mode 100644 include/linux/suspend_blocker.h + create mode 100644 kernel/power/opportunistic_suspend.c + create mode 100644 kernel/power/user_suspend_blocker.c +Merging bluetooth/master +$ git merge bluetooth/master +Already up-to-date. +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging fs/exec.c +Auto-merging fs/inode.c +Auto-merging fs/namei.c +Auto-merging fs/namespace.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/notify/inotify/Kconfig +CONFLICT (delete/modify): fs/notify/inotify/inotify.c deleted in fsnotify/for-next and modified in HEAD. Version HEAD of fs/notify/inotify/inotify.c left in tree. +Auto-merging fs/open.c +Auto-merging include/linux/Kbuild +Auto-merging include/linux/fs.h +Auto-merging include/linux/security.h +Auto-merging init/Kconfig +Auto-merging kernel/Makefile +Auto-merging kernel/sysctl.c +Auto-merging security/security.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f fs/notify/inotify/inotify.c +fs/notify/inotify/inotify.c: needs merge +rm 'fs/notify/inotify/inotify.c' +$ git commit -v -a +[master 4d5a22d] Merge remote branch 'fsnotify/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 8 - + arch/x86/ia32/ia32entry.S | 2 + + arch/x86/ia32/sys_ia32.c | 9 + + arch/x86/include/asm/sys_ia32.h | 3 + + arch/x86/include/asm/unistd_32.h | 4 +- + arch/x86/include/asm/unistd_64.h | 4 + + arch/x86/kernel/syscall_table_32.S | 2 + + fs/compat.c | 5 +- + fs/exec.c | 4 +- + fs/inode.c | 8 +- + fs/namei.c | 2 +- + fs/namespace.c | 5 + + fs/nfsd/vfs.c | 4 +- + fs/notify/Kconfig | 1 + + fs/notify/Makefile | 4 +- + fs/notify/dnotify/dnotify.c | 198 +++---- + fs/notify/fanotify/Kconfig | 26 + + fs/notify/fanotify/Makefile | 1 + + fs/notify/fanotify/fanotify.c | 255 ++++++++ + fs/notify/fanotify/fanotify_user.c | 776 ++++++++++++++++++++++++ + fs/notify/fsnotify.c | 141 ++++- + fs/notify/fsnotify.h | 33 +- + fs/notify/group.c | 178 +++--- + fs/notify/inode_mark.c | 309 +++------- + fs/notify/inotify/Kconfig | 15 - + fs/notify/inotify/Makefile | 1 - + fs/notify/inotify/inotify.c | 873 ---------------------------- + fs/notify/inotify/inotify.h | 7 +- + fs/notify/inotify/inotify_fsnotify.c | 114 +++- + fs/notify/inotify/inotify_user.c | 305 ++++++---- + fs/notify/mark.c | 325 +++++++++++ + fs/notify/notification.c | 180 ++++--- + fs/notify/vfsmount_mark.c | 176 ++++++ + fs/open.c | 3 +- + fs/read_write.c | 8 +- + include/asm-generic/fcntl.h | 8 + + include/linux/Kbuild | 1 + + include/linux/dnotify.h | 1 + + include/linux/fanotify.h | 105 ++++ + include/linux/fs.h | 16 +- + include/linux/fsnotify.h | 166 +++--- + include/linux/fsnotify_backend.h | 169 ++++-- + include/linux/inotify.h | 175 +------ + include/linux/mount.h | 6 +- + include/linux/security.h | 1 + + include/linux/syscalls.h | 5 + + init/Kconfig | 10 +- + kernel/Makefile | 5 +- + kernel/audit.c | 1 - + kernel/audit.h | 26 +- + kernel/audit_tree.c | 233 ++++---- + kernel/audit_watch.c | 295 ++++++---- + kernel/auditfilter.c | 39 +- + kernel/auditsc.c | 10 +- + kernel/sys_ni.c | 4 + + kernel/sysctl.c | 7 +- + security/security.c | 16 +- + 57 files changed, 3099 insertions(+), 2189 deletions(-) + create mode 100644 fs/notify/fanotify/Kconfig + create mode 100644 fs/notify/fanotify/Makefile + create mode 100644 fs/notify/fanotify/fanotify.c + create mode 100644 fs/notify/fanotify/fanotify_user.c + delete mode 100644 fs/notify/inotify/inotify.c + create mode 100644 fs/notify/mark.c + create mode 100644 fs/notify/vfsmount_mark.c + create mode 100644 include/linux/fanotify.h +$ git am -3 ../patches/fsnotify__update_gfp_slab.h_includes +Applying: fsnotify: update gfp/slab.h includes +$ git reset HEAD^ +Unstaged changes after reset: +M fs/notify/fanotify/fanotify_user.c +M fs/notify/vfsmount_mark.c +$ git add . +$ git commit -v -a --amend +[master 78cbc1c] Merge remote branch 'fsnotify/for-next' +Merging irda/for-next +$ git merge irda/for-next +Resolved 'drivers/net/irda/irda-usb.c' using previous resolution. +Auto-merging drivers/net/irda/irda-usb.c +CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 764cefb] Merge remote branch 'irda/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/net/irda/irda-usb.c | 9 +++++---- + 1 files changed, 5 insertions(+), 4 deletions(-) +Merging drbd/for-jens +$ git merge drbd/for-jens +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 +Auto-merging MAINTAINERS +Auto-merging arch/x86/Kconfig +Auto-merging drivers/Makefile +Auto-merging drivers/net/Kconfig +Auto-merging drivers/net/Makefile +Auto-merging include/linux/Kbuild +Auto-merging lib/Makefile +Merge made by recursive. + 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 arch/x86/include/asm/pci_x86.h +Auto-merging arch/x86/kernel/cpu/mcheck/mce.c +Auto-merging include/linux/pci.h +Auto-merging include/linux/pci_ids.h +Merge made by recursive. + Documentation/edac.txt | 152 +++ + arch/x86/include/asm/pci_x86.h | 2 + + arch/x86/kernel/cpu/mcheck/mce.c | 10 + + arch/x86/pci/legacy.c | 42 +- + drivers/edac/Kconfig | 13 + + drivers/edac/Makefile | 2 + + drivers/edac/edac_core.h | 23 +- + drivers/edac/edac_mc_sysfs.c | 175 +++- + drivers/edac/edac_mce.c | 61 ++ + drivers/edac/i7core_edac.c | 2078 ++++++++++++++++++++++++++++++++++++++ + include/linux/edac_mce.h | 31 + + include/linux/pci.h | 1 + + include/linux/pci_ids.h | 52 + + 13 files changed, 2598 insertions(+), 44 deletions(-) + create mode 100644 drivers/edac/edac_mce.c + create mode 100644 drivers/edac/i7core_edac.c + create mode 100644 include/linux/edac_mce.h +Merging devicetree/next-devicetree +$ git merge devicetree/next-devicetree +Merge made by recursive. + drivers/spi/spi_ppc4xx.c | 2 +- + drivers/usb/host/ehci-hcd.c | 14 ++++++++++++-- + drivers/usb/host/ehci-xilinx-of.c | 2 +- + 3 files changed, 14 insertions(+), 4 deletions(-) +Merging spi/next-spi +$ git merge spi/next-spi +Already up-to-date. +Merging omap_dss2/for-next +$ git merge omap_dss2/for-next +Already up-to-date. +Merging tip/auto-latest +$ git merge tip/auto-latest +Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution. +Resolved 'kernel/Makefile' using previous resolution. +Auto-merging Documentation/feature-removal-schedule.txt +CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt +Auto-merging Documentation/kernel-parameters.txt +Auto-merging arch/sparc/kernel/perf_event.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/traps.c +Auto-merging include/linux/ftrace_event.h +Auto-merging include/linux/sched.h +Auto-merging include/trace/ftrace.h +Auto-merging kernel/Makefile +CONFLICT (content): Merge conflict in kernel/Makefile +Removing kernel/softlockup.c +Auto-merging kernel/sysctl.c +Auto-merging kernel/timer.c +Auto-merging lib/Kconfig.debug +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 166f650] Merge remote branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 2 + + arch/Kconfig | 7 + + arch/sparc/kernel/perf_event.c | 108 ++++--- + arch/x86/Kconfig | 1 + + arch/x86/include/asm/nmi.h | 2 + + arch/x86/include/asm/perf_event_p4.h | 3 +- + arch/x86/kernel/apic/Makefile | 7 +- + arch/x86/kernel/apic/hw_nmi.c | 107 ++++++ + arch/x86/kernel/apic/nmi.c | 7 - + arch/x86/kernel/cpu/perf_event_p4.c | 41 ++-- + arch/x86/kernel/process.c | 1 - + arch/x86/kernel/traps.c | 7 + + include/linux/ftrace_event.h | 8 +- + include/linux/nmi.h | 13 + + include/linux/perf_event.h | 19 +- + include/linux/sched.h | 12 +- + include/trace/ftrace.h | 3 +- + kernel/Makefile | 2 +- + kernel/mutex.c | 7 + + kernel/perf_event.c | 153 ++++----- + kernel/softlockup.c | 293 ---------------- + kernel/sysctl.c | 55 ++-- + kernel/timer.c | 1 - + kernel/trace/trace_event_perf.c | 11 +- + kernel/trace/trace_kprobe.c | 4 +- + kernel/trace/trace_syscalls.c | 6 +- + kernel/watchdog.c | 568 ++++++++++++++++++++++++++++++++ + lib/Kconfig.debug | 34 ++- + tools/perf/Documentation/perf-stat.txt | 3 + + tools/perf/builtin-probe.c | 10 +- + tools/perf/builtin-record.c | 1 + + tools/perf/builtin-stat.c | 18 +- + tools/perf/util/abspath.c | 81 ----- + tools/perf/util/cache.h | 55 +--- + tools/perf/util/config.c | 461 +------------------------- + tools/perf/util/exec_cmd.c | 6 +- + tools/perf/util/exec_cmd.h | 1 - + tools/perf/util/help.c | 30 +-- + tools/perf/util/newt.c | 10 +- + tools/perf/util/path.c | 204 +------------ + tools/perf/util/probe-finder.c | 33 ++- + tools/perf/util/probe-finder.h | 3 + + tools/perf/util/quote.c | 433 +------------------------ + tools/perf/util/quote.h | 39 --- + tools/perf/util/run-command.c | 90 ----- + tools/perf/util/run-command.h | 30 -- + tools/perf/util/session.c | 1 + + tools/perf/util/sigchain.c | 2 +- + tools/perf/util/sigchain.h | 1 - + tools/perf/util/strbuf.c | 229 +------------- + tools/perf/util/strbuf.h | 45 --- + tools/perf/util/util.h | 162 --------- + tools/perf/util/wrapper.c | 110 ------ + 53 files changed, 1043 insertions(+), 2497 deletions(-) + create mode 100644 arch/x86/kernel/apic/hw_nmi.c + delete mode 100644 kernel/softlockup.c + create mode 100644 kernel/watchdog.c +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Already up-to-date. +Merging oprofile/for-next +$ git merge oprofile/for-next +Merge made by recursive. + arch/x86/oprofile/nmi_int.c | 16 ++++++++++++++-- + 1 files changed, 14 insertions(+), 2 deletions(-) +Merging percpu/for-next +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next +$ git merge workqueues/for-next +Already up-to-date. +Merging sfi/sfi-test +$ git merge sfi/sfi-test +Merge made by recursive. + drivers/sfi/sfi_core.c | 2 +- + include/linux/sfi.h | 24 +++++++++++++++++++++++- + 2 files changed, 24 insertions(+), 2 deletions(-) +Merging asm-generic/next +$ git merge asm-generic/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 bkl-core/bkl/core +$ git merge bkl-core/bkl/core +Already up-to-date. +Merging bkl-procfs/bkl/procfs +$ git merge bkl-procfs/bkl/procfs +Already up-to-date. +Merging bkl-ioctl/bkl/ioctl +$ git merge bkl-ioctl/bkl/ioctl +Already up-to-date. +Merging quilt/driver-core +$ git merge quilt/driver-core +Already up-to-date. +Merging quilt/tty +$ git merge quilt/tty +Already up-to-date. +Merging quilt/usb +$ git merge quilt/usb +Already up-to-date. +Merging staging-next/staging-next +$ git merge staging-next/staging-next +Already up-to-date. +Merging slabh/slabh +$ git merge slabh/slabh +Already up-to-date. +Merging scsi-post-merge/master +$ git merge scsi-post-merge/master +Already up-to-date. |