diff options
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 1722 |
1 files changed, 1722 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..6ba2c5df2e9b --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,1722 @@ +$ git checkout master +Already on "master" +$ git reset --hard stable +HEAD is now at c19f836 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev +Merging origin/master +$ git merge origin/master +Updating c19f836..d91dfbb +Fast forward + .gitignore | 1 + + Documentation/driver-model/platform.txt | 59 + + .../filesystems/pohmelfs/design_notes.txt | 5 +- + Documentation/filesystems/pohmelfs/info.txt | 21 +- + Documentation/kbuild/makefiles.txt | 10 + + Documentation/kernel-parameters.txt | 78 +- + Documentation/lguest/.gitignore | 1 + + Documentation/lguest/lguest.txt | 11 +- + MAINTAINERS | 76 ++- + Makefile | 2 +- + arch/arm/common/vic.c | 9 +- + arch/arm/configs/imx27ads_defconfig | 826 --------------- + .../configs/{mx31ads_defconfig => mx1_defconfig} | 536 +++++++--- + .../configs/{pcm038_defconfig => mx27_defconfig} | 354 +++++-- + .../{mx31litekit_defconfig => mx3_defconfig} | 783 +++++++------- + arch/arm/configs/pcm037_defconfig | 769 -------------- + arch/arm/configs/s3c2410_defconfig | 1112 ++++++++++++++++---- + arch/arm/include/asm/tlb.h | 25 +- + arch/arm/kernel/sys_oabi-compat.c | 1 + + arch/arm/mach-ep93xx/core.c | 2 +- + arch/arm/mach-mx1/mx1ads.c | 6 - + arch/arm/mach-mx2/clock_imx21.c | 8 +- + arch/arm/mach-mx3/Kconfig | 2 + + arch/arm/mach-mx3/mx31ads.c | 4 +- + arch/arm/mach-mx3/pcm037.c | 4 +- + arch/arm/mach-mx3/qong.c | 28 +- + arch/arm/mach-pxa/em-x270.c | 6 +- + arch/arm/mach-pxa/generic.h | 3 + + arch/arm/mach-pxa/include/mach/colibri.h | 4 +- + arch/arm/mach-pxa/include/mach/palmt5.h | 1 - + arch/arm/mach-pxa/include/mach/palmtx.h | 1 - + arch/arm/mach-pxa/palmt5.c | 11 +- + arch/arm/mach-pxa/palmtx.c | 11 +- + arch/arm/mach-s3c2412/mach-jive.c | 5 +- + arch/arm/mach-s3c2440/mach-anubis.c | 2 +- + arch/arm/mach-s3c2440/mach-osiris.c | 1 - + arch/arm/mach-s3c6410/mach-smdk6410.c | 4 + + arch/arm/plat-mxc/include/mach/imx-uart.h | 2 - + arch/arm/plat-mxc/include/mach/iomux-mx3.h | 48 + + arch/arm/plat-mxc/include/mach/irqs.h | 2 +- + arch/arm/plat-mxc/include/mach/mx21.h | 3 - + arch/arm/plat-mxc/irq.c | 14 +- + arch/arm/plat-s3c/gpio-config.c | 3 + + arch/arm/plat-s3c/include/plat/devs.h | 1 + + arch/arm/plat-s3c24xx/adc.c | 19 +- + arch/arm/plat-s3c24xx/gpiolib.c | 2 +- + .../asm-h8300 => arch/h8300/include/asm}/timer.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/Kbuild | 0 + .../asm-m32r => arch/m32r/include/asm}/addrspace.h | 0 + .../asm-m32r => arch/m32r/include/asm}/assembler.h | 0 + .../asm-m32r => arch/m32r/include/asm}/atomic.h | 0 + .../asm-m32r => arch/m32r/include/asm}/auxvec.h | 0 + .../asm-m32r => arch/m32r/include/asm}/bitops.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/bug.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/bugs.h | 0 + .../asm-m32r => arch/m32r/include/asm}/byteorder.h | 0 + .../asm-m32r => arch/m32r/include/asm}/cache.h | 0 + .../asm-m32r => arch/m32r/include/asm}/cachectl.h | 0 + .../m32r/include/asm}/cacheflush.h | 0 + .../asm-m32r => arch/m32r/include/asm}/checksum.h | 0 + .../asm-m32r => arch/m32r/include/asm}/cputime.h | 0 + .../asm-m32r => arch/m32r/include/asm}/current.h | 0 + .../asm-m32r => arch/m32r/include/asm}/delay.h | 0 + .../asm-m32r => arch/m32r/include/asm}/device.h | 0 + .../asm-m32r => arch/m32r/include/asm}/div64.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/dma.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/elf.h | 0 + .../m32r/include/asm}/emergency-restart.h | 0 + .../asm-m32r => arch/m32r/include/asm}/errno.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/fb.h | 0 + .../asm-m32r => arch/m32r/include/asm}/fcntl.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/flat.h | 0 + .../asm-m32r => arch/m32r/include/asm}/ftrace.h | 0 + .../asm-m32r => arch/m32r/include/asm}/futex.h | 0 + .../asm-m32r => arch/m32r/include/asm}/hardirq.h | 0 + .../asm-m32r => arch/m32r/include/asm}/hw_irq.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/io.h | 0 + .../asm-m32r => arch/m32r/include/asm}/ioctl.h | 0 + .../asm-m32r => arch/m32r/include/asm}/ioctls.h | 0 + .../asm-m32r => arch/m32r/include/asm}/ipcbuf.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/irq.h | 0 + .../asm-m32r => arch/m32r/include/asm}/irq_regs.h | 0 + .../asm-m32r => arch/m32r/include/asm}/kdebug.h | 0 + .../m32r/include/asm}/kmap_types.h | 0 + .../asm-m32r => arch/m32r/include/asm}/linkage.h | 0 + .../asm-m32r => arch/m32r/include/asm}/local.h | 0 + .../asm-m32r => arch/m32r/include/asm}/m32102.h | 0 + .../m32r/include/asm}/m32104ut/m32104ut_pld.h | 0 + .../m32r/include/asm}/m32700ut/m32700ut_lan.h | 0 + .../m32r/include/asm}/m32700ut/m32700ut_lcd.h | 0 + .../m32r/include/asm}/m32700ut/m32700ut_pld.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/m32r.h | 0 + .../m32r/include/asm}/m32r_mp_fpga.h | 0 + .../m32r/include/asm}/mappi2/mappi2_pld.h | 0 + .../m32r/include/asm}/mappi3/mappi3_pld.h | 0 + .../m32r/include/asm}/mc146818rtc.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/mman.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/mmu.h | 0 + .../m32r/include/asm}/mmu_context.h | 0 + .../asm-m32r => arch/m32r/include/asm}/mmzone.h | 0 + .../asm-m32r => arch/m32r/include/asm}/module.h | 0 + .../asm-m32r => arch/m32r/include/asm}/msgbuf.h | 0 + .../asm-m32r => arch/m32r/include/asm}/mutex.h | 0 + .../m32r/include/asm}/opsput/opsput_lan.h | 0 + .../m32r/include/asm}/opsput/opsput_lcd.h | 0 + .../m32r/include/asm}/opsput/opsput_pld.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/page.h | 0 + .../asm-m32r => arch/m32r/include/asm}/param.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/pci.h | 0 + .../asm-m32r => arch/m32r/include/asm}/percpu.h | 0 + .../asm-m32r => arch/m32r/include/asm}/pgalloc.h | 0 + .../m32r/include/asm}/pgtable-2level.h | 0 + .../asm-m32r => arch/m32r/include/asm}/pgtable.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/poll.h | 0 + .../m32r/include/asm}/posix_types.h | 0 + .../asm-m32r => arch/m32r/include/asm}/processor.h | 0 + .../asm-m32r => arch/m32r/include/asm}/ptrace.h | 0 + .../asm-m32r => arch/m32r/include/asm}/resource.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/rtc.h | 0 + .../asm-m32r => arch/m32r/include/asm}/s1d13806.h | 0 + .../m32r/include/asm}/scatterlist.h | 0 + .../asm-m32r => arch/m32r/include/asm}/sections.h | 0 + .../asm-m32r => arch/m32r/include/asm}/segment.h | 0 + .../asm-m32r => arch/m32r/include/asm}/sembuf.h | 0 + .../asm-m32r => arch/m32r/include/asm}/serial.h | 0 + .../asm-m32r => arch/m32r/include/asm}/setup.h | 0 + .../asm-m32r => arch/m32r/include/asm}/shmbuf.h | 0 + .../asm-m32r => arch/m32r/include/asm}/shmparam.h | 0 + .../m32r/include/asm}/sigcontext.h | 0 + .../asm-m32r => arch/m32r/include/asm}/siginfo.h | 0 + .../asm-m32r => arch/m32r/include/asm}/signal.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/smp.h | 0 + .../asm-m32r => arch/m32r/include/asm}/socket.h | 0 + .../asm-m32r => arch/m32r/include/asm}/sockios.h | 0 + .../asm-m32r => arch/m32r/include/asm}/spinlock.h | 0 + .../m32r/include/asm}/spinlock_types.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/stat.h | 0 + .../asm-m32r => arch/m32r/include/asm}/statfs.h | 0 + .../asm-m32r => arch/m32r/include/asm}/string.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/swab.h | 0 + .../asm-m32r => arch/m32r/include/asm}/syscall.h | 0 + .../asm-m32r => arch/m32r/include/asm}/system.h | 0 + .../asm-m32r => arch/m32r/include/asm}/termbits.h | 0 + .../asm-m32r => arch/m32r/include/asm}/termios.h | 0 + .../m32r/include/asm}/thread_info.h | 0 + .../asm-m32r => arch/m32r/include/asm}/timex.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/tlb.h | 0 + .../asm-m32r => arch/m32r/include/asm}/tlbflush.h | 0 + .../asm-m32r => arch/m32r/include/asm}/topology.h | 0 + .../asm-m32r => arch/m32r/include/asm}/types.h | 0 + .../asm-m32r => arch/m32r/include/asm}/uaccess.h | 0 + .../asm-m32r => arch/m32r/include/asm}/ucontext.h | 0 + .../asm-m32r => arch/m32r/include/asm}/unaligned.h | 0 + .../asm-m32r => arch/m32r/include/asm}/unistd.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/user.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/vga.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/xor.h | 0 + arch/x86/Kconfig | 1 + + arch/x86/Kconfig.cpu | 1 + + arch/x86/include/asm/lguest_hcall.h | 2 +- + arch/x86/include/asm/pat.h | 4 - + arch/x86/include/asm/uv/uv_mmrs.h | 5 + + arch/x86/kernel/apic/x2apic_uv_x.c | 16 +- + arch/x86/kernel/bios_uv.c | 3 +- + arch/x86/kernel/microcode_core.c | 2 - + arch/x86/kernel/pci-swiotlb.c | 2 +- + arch/x86/kernel/tlb_uv.c | 189 +++-- + arch/x86/kernel/uv_sysfs.c | 4 + + arch/x86/lguest/boot.c | 16 +- + arch/x86/mm/ioremap.c | 10 +- + arch/x86/mm/pageattr.c | 127 ++- + arch/x86/mm/pat.c | 189 +--- + drivers/ata/pata_legacy.c | 13 +- + drivers/ata/pata_via.c | 74 ++- + drivers/ata/sata_mv.c | 58 +- + drivers/base/base.h | 2 +- + drivers/base/core.c | 3 + + drivers/base/platform.c | 239 +++++ + drivers/block/ub.c | 20 +- + drivers/char/mem.c | 27 - + drivers/char/vt.c | 2 +- + drivers/ide/cs5536.c | 1 + + drivers/ide/hpt366.c | 14 +- + drivers/ide/ide-io.c | 11 +- + drivers/ide/pmac.c | 2 +- + drivers/input/gameport/gameport.c | 14 +- + drivers/input/input.c | 1 - + drivers/input/keyboard/atkbd.c | 20 +- + drivers/input/keyboard/bf54x-keys.c | 2 +- + drivers/input/misc/Kconfig | 2 +- + drivers/input/mouse/pc110pad.c | 1 - + drivers/input/serio/i8042-x86ia64io.h | 28 + + drivers/input/serio/i8042.c | 37 +- + drivers/input/touchscreen/ad7877.c | 4 +- + drivers/input/touchscreen/ad7879.c | 3 +- + drivers/input/touchscreen/ads7846.c | 12 +- + drivers/input/touchscreen/da9034-ts.c | 29 +- + drivers/input/touchscreen/mainstone-wm97xx.c | 7 +- + drivers/input/touchscreen/wm97xx-core.c | 3 +- + drivers/isdn/hisax/st5481_usb.c | 9 +- + drivers/lguest/lg.h | 3 +- + drivers/lguest/segments.c | 13 +- + drivers/lguest/x86/core.c | 9 +- + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 1 - + drivers/net/arm/ep93xx_eth.c | 2 +- + drivers/serial/samsung.c | 4 +- + drivers/spi/pxa2xx_spi.c | 2 +- + drivers/staging/android/binder.c | 201 +++- + drivers/staging/at76_usb/at76_usb.c | 20 +- + drivers/staging/epl/VirtualEthernetLinux.c | 17 +- + drivers/staging/et131x/et131x_netdev.c | 23 +- + drivers/staging/go7007/go7007-driver.c | 15 - + drivers/staging/go7007/wis-sony-tuner.c | 2 + + drivers/staging/line6/audio.c | 9 +- + drivers/staging/otus/usbdrv.c | 47 +- + drivers/staging/otus/zdusb.c | 3 +- + drivers/staging/otus/zdusb.h | 4 + + drivers/staging/pohmelfs/config.c | 61 +- + drivers/staging/pohmelfs/dir.c | 24 +- + drivers/staging/pohmelfs/inode.c | 137 ++- + drivers/staging/pohmelfs/lock.c | 3 +- + drivers/staging/pohmelfs/net.c | 72 +- + drivers/staging/pohmelfs/netfs.h | 21 +- + drivers/staging/pohmelfs/trans.c | 33 +- + drivers/staging/rt2860/rt_main_dev.c | 25 +- + drivers/staging/rt2870/rt2870.h | 1 + + drivers/staging/rt2870/rt_main_dev.c | 28 +- + drivers/staging/rt3070/rt_main_dev.c | 29 +- + drivers/staging/slicoss/README | 31 +- + drivers/staging/slicoss/slicoss.c | 25 +- + drivers/staging/stlc45xx/Kconfig | 2 +- + drivers/staging/sxg/sxg.c | 127 ++- + drivers/staging/uc2322/aten2011.c | 28 +- + drivers/staging/wlan-ng/p80211netdev.c | 20 +- + drivers/uio/uio_cif.c | 1 + + drivers/usb/class/cdc-wdm.c | 2 +- + drivers/usb/core/devio.c | 2 +- + drivers/usb/core/hcd.c | 26 + + drivers/usb/core/hcd.h | 14 + + drivers/usb/core/message.c | 58 +- + drivers/usb/core/usb.c | 2 +- + drivers/usb/gadget/u_ether.c | 8 +- + drivers/usb/host/whci/asl.c | 15 +- + drivers/usb/host/whci/hcd.c | 23 + + drivers/usb/host/whci/pzl.c | 16 +- + drivers/usb/host/whci/qset.c | 24 +- + drivers/usb/host/whci/whcd.h | 1 + + drivers/usb/host/whci/whci-hc.h | 1 + + drivers/usb/musb/cppi_dma.c | 23 +- + drivers/usb/musb/musb_core.c | 12 +- + drivers/usb/musb/musb_gadget.c | 33 +- + drivers/usb/musb/musb_host.c | 406 ++++---- + drivers/usb/musb/musbhsdma.c | 66 +- + drivers/usb/serial/ftdi_sio.c | 1 + + drivers/usb/serial/ftdi_sio.h | 7 + + drivers/usb/serial/moto_modem.c | 1 + + drivers/usb/serial/option.c | 5 + + drivers/usb/serial/qcserial.c | 21 + + drivers/usb/storage/Makefile | 3 +- + drivers/usb/storage/transport.c | 4 +- + drivers/usb/storage/unusual_devs.h | 14 +- + drivers/usb/wusbcore/devconnect.c | 21 +- + drivers/usb/wusbcore/wusbhc.c | 32 +- + drivers/virtio/virtio_balloon.c | 3 +- + fs/afs/file.c | 2 + + fs/cifs/CHANGES | 3 +- + fs/cifs/cifs_spnego.c | 2 +- + fs/cifs/cifsfs.c | 48 +- + fs/cifs/cifsglob.h | 3 +- + fs/cifs/cifspdu.h | 8 +- + fs/cifs/cifssmb.c | 6 +- + fs/cifs/connect.c | 205 +++-- + fs/cifs/dir.c | 145 ++- + fs/cifs/dns_resolve.c | 2 +- + fs/cifs/file.c | 127 ++- + fs/cifs/inode.c | 77 +- + fs/cifs/readdir.c | 6 +- + fs/cifs/sess.c | 47 +- + fs/fat/Kconfig | 3 + + fs/namespace.c | 5 +- + fs/proc/base.c | 4 +- + fs/splice.c | 3 +- + fs/sysfs/file.c | 16 +- + include/asm-arm/.gitignore | 2 - + include/linux/dynamic_debug.h | 2 +- + include/linux/init.h | 1 + + include/linux/kernel.h | 9 + + include/linux/platform_device.h | 42 + + include/linux/rcutree.h | 3 +- + include/linux/seccomp.h | 2 + + include/linux/spi/ads7846.h | 1 + + include/linux/usb.h | 9 +- + init/main.c | 7 +- + kernel/rcutree.c | 19 +- + kernel/rcutree_trace.c | 14 +- + kernel/resource.c | 46 +- + kernel/sched.c | 10 +- + kernel/softirq.c | 4 +- + kernel/trace/trace_branch.c | 8 + + kernel/trace/trace_power.c | 7 + + lib/kobject_uevent.c | 2 +- + mm/vmscan.c | 5 +- + scripts/Makefile.build | 3 + + scripts/Makefile.lib | 9 +- + security/smack/smack_lsm.c | 11 +- + sound/pci/emu10k1/io.c | 2 +- + sound/pci/hda/hda_codec.c | 8 +- + sound/pci/hda/hda_intel.c | 2 +- + sound/pci/hda/patch_analog.c | 8 + + sound/pci/hda/patch_sigmatel.c | 10 +- + sound/pci/intel8x0.c | 12 +- + sound/soc/omap/omap-mcbsp.c | 7 +- + sound/soc/omap/osk5912.c | 4 +- + sound/soc/pxa/pxa-ssp.c | 1 + + sound/soc/s3c24xx/jive_wm8750.c | 12 +- + sound/soc/s3c24xx/s3c-i2s-v2.c | 18 +- + sound/soc/s3c24xx/s3c2412-i2s.c | 2 +- + 317 files changed, 4958 insertions(+), 4028 deletions(-) + create mode 100644 Documentation/lguest/.gitignore + delete mode 100644 arch/arm/configs/imx27ads_defconfig + rename arch/arm/configs/{mx31ads_defconfig => mx1_defconfig} (60%) + rename arch/arm/configs/{pcm038_defconfig => mx27_defconfig} (77%) + rename arch/arm/configs/{mx31litekit_defconfig => mx3_defconfig} (61%) + delete mode 100644 arch/arm/configs/pcm037_defconfig + rename {include/asm-h8300 => arch/h8300/include/asm}/timer.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/Kbuild (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/addrspace.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/assembler.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/atomic.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/auxvec.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/bitops.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/bug.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/bugs.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/byteorder.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/cache.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/cachectl.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/cacheflush.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/checksum.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/cputime.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/current.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/delay.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/device.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/div64.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/dma.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/elf.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/emergency-restart.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/errno.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/fb.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/fcntl.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/flat.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/ftrace.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/futex.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/hardirq.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/hw_irq.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/io.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/ioctl.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/ioctls.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/ipcbuf.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/irq.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/irq_regs.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/kdebug.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/kmap_types.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/linkage.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/local.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/m32102.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/m32104ut/m32104ut_pld.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/m32700ut/m32700ut_lan.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/m32700ut/m32700ut_lcd.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/m32700ut/m32700ut_pld.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/m32r.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/m32r_mp_fpga.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/mappi2/mappi2_pld.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/mappi3/mappi3_pld.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/mc146818rtc.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/mman.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/mmu.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/mmu_context.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/mmzone.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/module.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/msgbuf.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/mutex.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/opsput/opsput_lan.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/opsput/opsput_lcd.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/opsput/opsput_pld.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/page.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/param.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/pci.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/percpu.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/pgalloc.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/pgtable-2level.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/pgtable.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/poll.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/posix_types.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/processor.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/ptrace.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/resource.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/rtc.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/s1d13806.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/scatterlist.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/sections.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/segment.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/sembuf.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/serial.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/setup.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/shmbuf.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/shmparam.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/sigcontext.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/siginfo.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/signal.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/smp.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/socket.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/sockios.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/spinlock.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/spinlock_types.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/stat.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/statfs.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/string.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/swab.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/syscall.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/system.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/termbits.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/termios.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/thread_info.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/timex.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/tlb.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/tlbflush.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/topology.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/types.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/uaccess.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/ucontext.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/unaligned.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/unistd.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/user.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/vga.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/xor.h (100%) + delete mode 100644 include/asm-arm/.gitignore +Merging arm-current/master +$ git merge arm-current/master +Already up-to-date. +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 +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 11 ++++++- + drivers/net/e1000/e1000_main.c | 6 ++-- + drivers/net/e1000e/netdev.c | 8 ++-- + drivers/net/ixgbe/ixgbe_dcb_82599.c | 28 +++++++++++------- + drivers/net/ixgbe/ixgbe_main.c | 54 +++++++++++++++++++++++++++++++--- + drivers/net/macb.c | 28 ++++-------------- + drivers/net/usb/pegasus.c | 1 + + include/net/netfilter/nf_nat.h | 1 + + net/can/af_can.c | 4 +- + net/ipv4/netfilter/nf_nat_core.c | 3 +- + net/ipv4/tcp.c | 6 ++- + net/netfilter/nf_conntrack_helper.c | 2 +- + net/netfilter/nf_log.c | 4 ++ + 13 files changed, 103 insertions(+), 53 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/ps3_gelic_wireless.c | 3 ++ + drivers/net/wireless/airo.c | 2 +- + drivers/net/wireless/ar9170/hw.h | 8 ++-- + drivers/net/wireless/ar9170/usb.c | 4 ++ + drivers/net/wireless/at76c50x-usb.c | 2 + + drivers/net/wireless/ath9k/recv.c | 4 ++- + drivers/net/wireless/b43/dma.c | 50 +++++++++++++++++++++----- + drivers/net/wireless/b43/main.c | 5 +++ + drivers/net/wireless/b43/phy_common.c | 16 ++++++-- + drivers/net/wireless/b43/phy_common.h | 4 ++- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 + + drivers/net/wireless/libertas/rx.c | 2 + + drivers/net/wireless/orinoco/hw.c | 8 ++--- + drivers/net/wireless/p54/p54.h | 12 +++--- + drivers/net/wireless/p54/p54spi.c | 25 +++++++------ + drivers/net/wireless/p54/p54usb.c | 1 + + drivers/net/wireless/rt2x00/rt2x00dev.c | 4 +-- + drivers/net/wireless/rt2x00/rt73usb.c | 2 + + net/mac80211/main.c | 2 +- + net/mac80211/mlme.c | 26 ++++++++++---- + net/mac80211/rx.c | 13 +++++-- + net/mac80211/wext.c | 43 ++++++++++++++++++----- + net/wireless/core.h | 2 +- + net/wireless/reg.c | 5 ++- + net/wireless/scan.c | 40 +++++++++++++++++---- + 25 files changed, 207 insertions(+), 78 deletions(-) +Merging kbuild-current/master +$ git merge kbuild-current/master +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Already up-to-date. +Merging quilt/usb.current +$ git merge quilt/usb.current +Already up-to-date. +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Merge made by recursive. + arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) +Merging input-current/for-linus +$ git merge input-current/for-linus +Merge made by recursive. + drivers/input/keyboard/omap-keypad.c | 16 +++++++++- + drivers/input/mouse/elantech.c | 48 +++++++++++++++++++++++++++---- + drivers/input/mouse/elantech.h | 5 ++- + drivers/input/serio/sa1111ps2.c | 2 +- + drivers/input/touchscreen/tsc2007.c | 2 +- + drivers/input/touchscreen/ucb1400_ts.c | 2 +- + 6 files changed, 61 insertions(+), 14 deletions(-) +Merging md-current/for-linus +$ git merge md-current/for-linus +Merge made by recursive. + drivers/md/bitmap.c | 1 + + drivers/md/md.c | 41 ++++++++++++++++++++++++++++------------- + drivers/md/md.h | 21 +++++++++++++-------- + drivers/md/raid5.c | 7 ++++++- + 4 files changed, 48 insertions(+), 22 deletions(-) +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master +$ git merge crypto-current/master +Auto-merging drivers/crypto/ixp4xx_crypto.c +Merge made by recursive. + crypto/eseqiv.c | 3 ++- + drivers/crypto/ixp4xx_crypto.c | 33 ++++++++++++++++++++++++++++++++- + 2 files changed, 34 insertions(+), 2 deletions(-) +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Already up-to-date. +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Merge made by recursive. + arch/avr32/boards/merisc/setup.c | 7 ++++--- + drivers/mmc/host/atmel-mci.c | 12 +++++++++--- + include/linux/atmel-mci.h | 2 ++ + 3 files changed, 15 insertions(+), 6 deletions(-) +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Already up-to-date. +Merging ia64/test +$ git merge ia64/test +Merge made by recursive. + arch/ia64/kernel/smp.c | 14 ++++++-------- + 1 files changed, 6 insertions(+), 8 deletions(-) +Merging m68k/for-next +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Already up-to-date. +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Already up-to-date. +Merging parisc/master +$ git merge parisc/master +Already up-to-date. +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Merge made by recursive. + arch/powerpc/configs/40x/acadia_defconfig | 2 +- + arch/powerpc/configs/40x/ep405_defconfig | 2 +- + arch/powerpc/configs/40x/kilauea_defconfig | 2 +- + arch/powerpc/configs/40x/makalu_defconfig | 2 +- + arch/powerpc/configs/40x/virtex_defconfig | 2 +- + arch/powerpc/configs/44x/arches_defconfig | 2 +- + arch/powerpc/configs/44x/bamboo_defconfig | 2 +- + arch/powerpc/configs/44x/canyonlands_defconfig | 6 +++--- + arch/powerpc/configs/44x/ebony_defconfig | 2 +- + arch/powerpc/configs/44x/katmai_defconfig | 2 +- + arch/powerpc/configs/44x/rainier_defconfig | 2 +- + arch/powerpc/configs/44x/redwood_defconfig | 2 +- + arch/powerpc/configs/44x/sam440ep_defconfig | 2 +- + arch/powerpc/configs/44x/sequoia_defconfig | 2 +- + arch/powerpc/configs/44x/taishan_defconfig | 2 +- + arch/powerpc/configs/44x/virtex5_defconfig | 2 +- + 16 files changed, 18 insertions(+), 18 deletions(-) +Merging galak/next +$ git merge galak/next +Merge made by recursive. + arch/powerpc/oprofile/op_model_fsl_emb.c | 14 -------------- + 1 files changed, 0 insertions(+), 14 deletions(-) +Merging pxa/for-next +$ git merge pxa/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm/mach-pxa/include/mach/colibri.h +Auto-merging arch/arm/mach-pxa/include/mach/palmt5.h +Auto-merging arch/arm/mach-pxa/include/mach/palmtx.h +Auto-merging arch/arm/mach-pxa/palmt5.c +Auto-merging arch/arm/mach-pxa/palmtx.c +Merge made by recursive. + arch/arm/mach-pxa/corgi.c | 55 ++++++-------------------- + arch/arm/mach-pxa/include/mach/colibri.h | 4 ++ + arch/arm/mach-pxa/poodle.c | 18 ++------- + arch/arm/mach-pxa/spitz.c | 63 ++++++----------------------- + 4 files changed, 34 insertions(+), 106 deletions(-) +Merging s390/features +$ git merge s390/features +Removing arch/s390/include/asm/cpu.h +Merge made by recursive. + arch/s390/appldata/appldata_base.c | 32 ++++++++++++++-------------- + arch/s390/appldata/appldata_mem.c | 2 +- + arch/s390/include/asm/cpu.h | 32 ---------------------------- + arch/s390/include/asm/cputime.h | 20 ++++++++++++++++++ + arch/s390/include/asm/spinlock.h | 19 ++++++++++++++-- + arch/s390/kernel/ipl.c | 1 + + arch/s390/kernel/nmi.c | 2 +- + arch/s390/kernel/s390_ext.c | 2 +- + arch/s390/kernel/smp.c | 2 +- + arch/s390/kernel/vtime.c | 2 +- + arch/s390/lib/spinlock.c | 40 ++++++++++++++++++++++++++++++++++++ + drivers/s390/cio/cio.c | 2 +- + 12 files changed, 99 insertions(+), 57 deletions(-) + delete mode 100644 arch/s390/include/asm/cpu.h +Merging sh/master +$ git merge sh/master +Merge made by recursive. + arch/sh/Kconfig | 11 + + arch/sh/configs/sh7724_generic_defconfig | 707 ++++++++++ + arch/sh/include/asm/device.h | 2 + + arch/sh/include/asm/processor.h | 2 +- + arch/sh/include/cpu-sh4/cpu/freq.h | 18 + + arch/sh/include/cpu-sh4/cpu/sh7724.h | 255 ++++ + arch/sh/kernel/cpu/sh4/probe.c | 6 + + arch/sh/kernel/cpu/sh4a/Makefile | 3 + + arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 112 ++- + arch/sh/kernel/cpu/sh4a/pinmux-sh7724.c | 2230 ++++++++++++++++++++++++++++++ + arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 10 + + arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 10 + + arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 11 +- + arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 11 +- + arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 556 ++++++++ + arch/sh/kernel/setup.c | 10 +- + arch/sh/kernel/time_32.c | 9 + + arch/sh/oprofile/common.c | 1 + + drivers/clocksource/sh_cmt.c | 18 +- + drivers/rtc/Kconfig | 2 +- + drivers/rtc/rtc-sh.c | 67 +- + drivers/serial/sh-sci.h | 23 +- + 22 files changed, 4034 insertions(+), 40 deletions(-) + create mode 100644 arch/sh/configs/sh7724_generic_defconfig + create mode 100644 arch/sh/include/cpu-sh4/cpu/sh7724.h + create mode 100644 arch/sh/kernel/cpu/sh4a/pinmux-sh7724.c + create mode 100644 arch/sh/kernel/cpu/sh4a/setup-sh7724.c +Merging sparc/master +$ git merge sparc/master +Auto-merging arch/sparc/kernel/smp_64.c +Merge made by recursive. + arch/sparc/Kconfig | 3 + + arch/sparc/include/asm/cpudata_64.h | 197 +----------------------------- + arch/sparc/include/asm/mdesc.h | 3 +- + arch/sparc/include/asm/percpu_64.h | 8 +- + arch/sparc/include/asm/prom.h | 2 + + arch/sparc/include/asm/trap_block.h | 207 +++++++++++++++++++++++++++++++ + arch/sparc/kernel/ds.c | 3 +- + arch/sparc/kernel/head_64.S | 22 ---- + arch/sparc/kernel/mdesc.c | 149 +++++++++++++--------- + arch/sparc/kernel/prom.h | 1 - + arch/sparc/kernel/prom_64.c | 234 +++++++++++++++++++---------------- + arch/sparc/kernel/prom_common.c | 2 - + arch/sparc/kernel/smp_64.c | 192 ++++++++++++++++++++++++----- + arch/sparc/kernel/traps_64.c | 170 ++++++++++++++------------ + arch/sparc/mm/init_32.c | 1 + + arch/sparc/mm/init_64.c | 16 +-- + 16 files changed, 692 insertions(+), 518 deletions(-) + create mode 100644 arch/sparc/include/asm/trap_block.h +Merging x86/auto-x86-next +$ git merge x86/auto-x86-next +Already up-to-date. +Merging xtensa/master +$ git merge xtensa/master +Merge made by recursive. + arch/xtensa/Kconfig | 6 ++---- + arch/xtensa/include/asm/checksum.h | 6 ++++-- + 2 files changed, 6 insertions(+), 6 deletions(-) +Merging tip-core/auto-core-next +$ git merge tip-core/auto-core-next +Merge made by recursive. + Documentation/RCU/trace.txt | 102 ++- + arch/sparc/include/asm/thread_info_64.h | 4 +- + include/linux/futex.h | 8 + + include/linux/rcutree.h | 9 +- + include/linux/thread_info.h | 3 +- + init/Kconfig | 2 +- + kernel/futex.c | 1202 +++++++++++++++++++++++------- + kernel/rcutree.c | 25 +- + kernel/rcutree_trace.c | 64 ++- + kernel/rtmutex.c | 240 +++++-- + kernel/rtmutex_common.h | 8 + + lib/vsprintf.c | 37 +- + mm/percpu.c | 141 ++--- + 13 files changed, 1375 insertions(+), 470 deletions(-) +Merging cpus4096/auto-cpus4096-next +$ git merge cpus4096/auto-cpus4096-next +Auto-merging arch/parisc/kernel/irq.c +Merge made by recursive. +Merging tracing/auto-tracing-next +$ git merge tracing/auto-tracing-next +Already up-to-date. +Merging genirq/auto-genirq-next +$ git merge genirq/auto-genirq-next +Already uptodate! +Merge made by recursive. +Merging safe-poison-pointers/auto-safe-poison-pointers-next +$ git merge safe-poison-pointers/auto-safe-poison-pointers-next +Auto-merging arch/x86/Kconfig +Auto-merging include/linux/poison.h +Merge made by recursive. + arch/x86/Kconfig | 5 +++++ + include/linux/poison.h | 16 ++++++++++++++-- + 2 files changed, 19 insertions(+), 2 deletions(-) +Merging sched/auto-sched-next +$ git merge sched/auto-sched-next +Already uptodate! +Merge made by recursive. +Merging stackprotector/auto-stackprotector-next +$ git merge stackprotector/auto-stackprotector-next +Already up-to-date. +Merging timers/auto-timers-next +$ git merge timers/auto-timers-next +Already uptodate! +Merge made by recursive. +Merging pci/linux-next +$ git merge pci/linux-next +Already up-to-date. +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Already up-to-date. +Merging hid/for-next +$ git merge hid/for-next +Merge made by recursive. + drivers/hid/hid-core.c | 1 + + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-lg.c | 2 ++ + drivers/hid/hidraw.c | 12 ++++++++---- + 4 files changed, 12 insertions(+), 4 deletions(-) +Merging quilt/i2c +$ git merge quilt/i2c +Merge made by recursive. + drivers/i2c/i2c-core.c | 2 +- + drivers/macintosh/therm_pm72.c | 95 ++++++++++++++++++++-------------------- + sound/aoa/codecs/onyx.c | 76 ++++++++++++++++++++++---------- + sound/aoa/codecs/tas.c | 66 ++++++++++++++++++---------- + sound/ppc/keywest.c | 85 +++++++++++++++++------------------- + 5 files changed, 183 insertions(+), 141 deletions(-) +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Auto-merging drivers/hwmon/Kconfig +Merge made by recursive. + Documentation/hwmon/ibmaem | 2 +- + drivers/hwmon/Kconfig | 2 +- + drivers/hwmon/ibmaem.c | 1 + + 3 files changed, 3 insertions(+), 2 deletions(-) +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Already up-to-date. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Merge made by recursive. + Documentation/video4linux/CARDLIST.saa7134 | 1 + + drivers/media/dvb/siano/smssdio.c | 356 +++++++++++++++++++++++++++ + drivers/media/video/cx88/Makefile | 2 +- + drivers/media/video/cx88/cx88-core.c | 26 ++- + drivers/media/video/cx88/cx88-dsp.c | 312 +++++++++++++++++++++++ + drivers/media/video/cx88/cx88-tvaudio.c | 115 +++++++--- + drivers/media/video/cx88/cx88.h | 10 + + drivers/media/video/saa7134/saa7134-cards.c | 44 ++++ + drivers/media/video/saa7134/saa7134-input.c | 1 + + drivers/media/video/saa7134/saa7134.h | 1 + + include/linux/mmc/sdio_ids.h | 8 + + 11 files changed, 842 insertions(+), 34 deletions(-) + create mode 100644 drivers/media/dvb/siano/smssdio.c + create mode 100644 drivers/media/video/cx88/cx88-dsp.c +Merging quota/for_next +$ git merge quota/for_next +Merge made by recursive. + fs/ext2/super.c | 4 +++- + fs/quota/Makefile | 9 --------- + 2 files changed, 3 insertions(+), 10 deletions(-) +Merging jfs/next +$ git merge jfs/next +Merge made by recursive. + fs/jfs/super.c | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) +Merging kbuild/master +$ git merge kbuild/master +Already up-to-date. +Merging quilt/ide +$ git merge quilt/ide +Merge made by recursive. +Merging libata/NEXT +$ git merge libata/NEXT +Merge made by recursive. + drivers/ata/ahci.c | 17 ++++++++--------- + drivers/ata/libata-eh.c | 6 ++++-- + drivers/ata/libata-sff.c | 20 +++++++++++++------- + drivers/ata/sata_sil.c | 15 ++++++++++++++- + drivers/ata/sata_sx4.c | 11 +++++++---- + 5 files changed, 46 insertions(+), 23 deletions(-) +Merging nfs/linux-next +$ git merge nfs/linux-next +Auto-merging fs/nfs/super.c +Merge made by recursive. + fs/nfs/Kconfig | 9 + + fs/nfs/client.c | 124 ++++- + fs/nfs/direct.c | 9 + + fs/nfs/internal.h | 62 +++ + fs/nfs/nfs4_fs.h | 37 ++- + fs/nfs/nfs4proc.c | 1229 ++++++++++++++++++++++++++++++++++++++++-- + fs/nfs/nfs4renewd.c | 6 +- + fs/nfs/nfs4state.c | 130 ++++- + fs/nfs/nfs4xdr.c | 1078 ++++++++++++++++++++++++++++++++----- + fs/nfs/read.c | 33 +- + fs/nfs/super.c | 12 + + fs/nfs/unlink.c | 20 +- + fs/nfs/write.c | 31 +- + include/linux/nfs4.h | 18 + + include/linux/nfs_fs_sb.h | 67 +++- + include/linux/nfs_xdr.h | 174 ++++++ + include/linux/nfsd/state.h | 1 - + include/linux/sunrpc/clnt.h | 1 + + include/linux/sunrpc/sched.h | 1 + + net/sunrpc/clnt.c | 13 + + net/sunrpc/sched.c | 2 +- + 21 files changed, 2838 insertions(+), 219 deletions(-) +Merging xfs/master +$ git merge xfs/master +Already up-to-date. +Merging infiniband/for-next +$ git merge infiniband/for-next +Already up-to-date. +Merging acpi/test +$ git merge acpi/test +Merge made by recursive. + Documentation/laptops/thinkpad-acpi.txt | 4 +- + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 30 ++-- + arch/x86/kernel/reboot.c | 2 +- + drivers/acpi/acpica/hwsleep.c | 43 ++++--- + drivers/acpi/acpica/rscreate.c | 27 +---- + drivers/acpi/button.c | 140 ++++++------------- + drivers/acpi/ec.c | 1 + + drivers/acpi/sleep.c | 27 ++++ + drivers/acpi/thermal.c | 2 +- + drivers/acpi/video.c | 43 +++--- + drivers/platform/x86/sony-laptop.c | 27 +++- + drivers/platform/x86/thinkpad_acpi.c | 81 ++++++----- + drivers/platform/x86/toshiba_acpi.c | 207 +++++++++++++++++++++++++++- + 13 files changed, 406 insertions(+), 228 deletions(-) +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Merge made by recursive. +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/master +$ git merge kvm/master +Auto-merging arch/ia64/kvm/kvm-ia64.c +Auto-merging arch/ia64/kvm/vcpu.c +Auto-merging arch/ia64/kvm/vtlb.c +Auto-merging arch/x86/kernel/kvm.c +Merge made by recursive. + arch/ia64/include/asm/kvm_host.h | 5 +- + arch/ia64/include/asm/pgtable.h | 2 + + arch/ia64/kvm/Kconfig | 2 +- + arch/ia64/kvm/kvm-ia64.c | 173 ++++++++--- + arch/ia64/kvm/kvm_fw.c | 28 ++- + arch/ia64/kvm/lapic.h | 6 +- + arch/ia64/kvm/optvfault.S | 30 ++ + arch/ia64/kvm/process.c | 5 + + arch/ia64/kvm/vcpu.c | 20 +- + arch/ia64/kvm/vmm.c | 12 +- + arch/ia64/kvm/vmm_ivt.S | 18 +- + arch/ia64/kvm/vtlb.c | 3 +- + arch/powerpc/kvm/powerpc.c | 6 + + arch/s390/kvm/interrupt.c | 6 + + arch/x86/include/asm/kvm.h | 1 + + arch/x86/include/asm/kvm_host.h | 7 +- + arch/x86/include/asm/svm.h | 1 + + arch/x86/kernel/kvm.c | 4 + + arch/x86/kvm/Makefile | 2 +- + arch/x86/kvm/i8254.c | 109 ++++--- + arch/x86/kvm/i8254.h | 12 +- + arch/x86/kvm/kvm_timer.h | 18 + + arch/x86/kvm/lapic.c | 251 +++++---------- + arch/x86/kvm/lapic.h | 12 +- + arch/x86/kvm/mmu.c | 88 +++++- + arch/x86/kvm/mmu.h | 5 + + arch/x86/kvm/paging_tmpl.h | 10 +- + arch/x86/kvm/svm.c | 68 ++--- + arch/x86/kvm/timer.c | 46 +++ + arch/x86/kvm/vmx.c | 349 ++++++++++++--------- + arch/x86/kvm/x86.c | 136 ++++++-- + arch/x86/kvm/x86.h | 18 + + arch/x86/kvm/x86_emulate.c | 1 - + include/linux/kvm.h | 40 +++- + include/linux/kvm_host.h | 20 +- + include/linux/kvm_types.h | 27 ++ + virt/kvm/ioapic.c | 153 ++-------- + virt/kvm/ioapic.h | 27 +-- + virt/kvm/irq_comm.c | 109 ++++--- + virt/kvm/kvm_main.c | 642 +++++++++++++++++++++++++++----------- + 40 files changed, 1548 insertions(+), 924 deletions(-) + create mode 100644 arch/x86/kvm/kvm_timer.h + create mode 100644 arch/x86/kvm/timer.c +Merging dlm/next +$ git merge dlm/next +Merge made by recursive. + fs/dlm/lockspace.c | 17 ++++++++--------- + include/linux/dlm.h | 4 ++-- + 2 files changed, 10 insertions(+), 11 deletions(-) +Merging scsi/master +$ git merge scsi/master +Already up-to-date. +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Already up-to-date. +Merging configfs/linux-next +$ git merge configfs/linux-next +Already up-to-date. +Merging ext4/next +$ git merge ext4/next +Auto-merging fs/jbd/revoke.c +Merge made by recursive. + fs/ext4/ialloc.c | 3 ++- + fs/jbd/commit.c | 2 +- + fs/jbd/revoke.c | 20 +++++++++++--------- + fs/jbd2/commit.c | 3 ++- + fs/jbd2/revoke.c | 21 ++++++++++++--------- + include/linux/jbd.h | 3 ++- + include/linux/jbd2.h | 3 ++- + 7 files changed, 32 insertions(+), 23 deletions(-) +Merging async_tx/next +$ git merge async_tx/next +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging net/master +$ git merge net/master +Auto-merging MAINTAINERS +Auto-merging drivers/net/benet/be_main.c +Auto-merging drivers/net/ixgbe/ixgbe_main.c +Auto-merging drivers/net/wireless/at76c50x-usb.c +Merge made by recursive. + Documentation/isdn/00-INDEX | 45 +- + MAINTAINERS | 2 +- + drivers/net/8390.c | 10 +- + drivers/net/8390p.c | 10 +- + drivers/net/atl1e/atl1e_main.c | 3 +- + drivers/net/atlx/atl1.c | 7 +- + drivers/net/benet/be_main.c | 28 +- + drivers/net/bmac.c | 16 +- + drivers/net/chelsio/sge.c | 4 +- + drivers/net/cpmac.c | 23 +- + drivers/net/cxgb3/adapter.h | 2 +- + drivers/net/cxgb3/sge.c | 53 +- + drivers/net/dm9000.c | 30 +- + drivers/net/fec.c | 897 +++++++++++--------------- + drivers/net/fec.h | 127 ++--- + drivers/net/fs_enet/mii-fec.c | 6 +- + drivers/net/hplance.c | 21 +- + drivers/net/ibmveth.c | 26 +- + drivers/net/irda/au1k_ir.c | 18 +- + drivers/net/irda/pxaficp_ir.c | 16 +- + drivers/net/irda/sa1100_ir.c | 18 +- + drivers/net/iseries_veth.c | 17 +- + drivers/net/ixgb/ixgb_osdep.h | 2 +- + drivers/net/ixgbe/ixgbe_82598.c | 186 ++++-- + drivers/net/ixgbe/ixgbe_82599.c | 249 +++++-- + drivers/net/ixgbe/ixgbe_common.c | 9 +- + drivers/net/ixgbe/ixgbe_main.c | 11 +- + drivers/net/ixgbe/ixgbe_phy.c | 19 +- + drivers/net/ixgbe/ixgbe_phy.h | 1 + + drivers/net/ixgbe/ixgbe_type.h | 18 +- + drivers/net/ixp2000/ixpdev.c | 19 +- + drivers/net/jazzsonic.c | 19 +- + drivers/net/korina.c | 25 +- + drivers/net/lib82596.c | 23 +- + drivers/net/mace.c | 16 +- + drivers/net/macmace.c | 18 +- + drivers/net/meth.c | 28 +- + drivers/net/mipsnet.c | 15 +- + drivers/net/mvme147.c | 17 +- + drivers/net/myri10ge/myri10ge.c | 38 +- + drivers/net/netx-eth.c | 17 +- + drivers/net/netxen/netxen_nic.h | 594 ++++++++---------- + drivers/net/netxen/netxen_nic_ctx.c | 204 ++++--- + drivers/net/netxen/netxen_nic_ethtool.c | 105 ++-- + drivers/net/netxen/netxen_nic_hdr.h | 8 - + drivers/net/netxen/netxen_nic_hw.c | 393 +++++------- + drivers/net/netxen/netxen_nic_hw.h | 66 +-- + drivers/net/netxen/netxen_nic_init.c | 291 +++++---- + drivers/net/netxen/netxen_nic_main.c | 268 ++++---- + drivers/net/netxen/netxen_nic_niu.c | 203 ++---- + drivers/net/netxen/netxen_nic_phan_reg.h | 27 +- + drivers/net/pasemi_mac.c | 23 +- + drivers/net/pci-skeleton.c | 19 +- + drivers/net/pppol2tp.c | 3 +- + drivers/net/r8169.c | 61 ++- + drivers/net/rionet.c | 14 +- + drivers/net/sb1250-mac.c | 29 +- + drivers/net/sfc/boards.c | 2 - + drivers/net/sfc/rx.c | 26 +- + drivers/net/sfc/sfe4001.c | 3 - + drivers/net/sgiseeq.c | 18 +- + drivers/net/smc911x.c | 23 +- + drivers/net/sun3lance.c | 17 +- + drivers/net/tulip/winbond-840.c | 3 +- + drivers/net/usb/kaweth.c | 33 +- + drivers/net/usb/usbnet.c | 6 - + drivers/net/virtio_net.c | 12 +- + drivers/net/wan/pc300_drv.c | 20 +- + drivers/net/wireless/at76c50x-usb.c | 3 +- + drivers/net/wireless/ath5k/reset.c | 5 +- + drivers/net/wireless/ath9k/ath9k.h | 6 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 7 +- + drivers/net/wireless/ipw2x00/libipw_module.c | 4 - + drivers/net/wireless/libertas/if_usb.c | 3 +- + drivers/net/wireless/libertas_tf/if_usb.c | 3 +- + include/linux/if_vlan.h | 6 +- + include/linux/netdevice.h | 22 +- + net/8021q/vlan_core.c | 4 +- + net/core/dev.c | 81 +-- + net/ipv4/af_inet.c | 2 - + net/rds/af_rds.c | 1 - + net/rds/connection.c | 4 +- + net/rds/ib.c | 4 +- + net/rds/ib.h | 2 +- + net/rds/ib_recv.c | 2 +- + net/rds/ib_ring.c | 2 +- + net/rds/ib_send.c | 10 +- + net/rds/info.c | 5 +- + net/rds/iw.c | 4 +- + net/rds/iw.h | 2 +- + net/rds/iw_recv.c | 2 +- + net/rds/iw_ring.c | 2 +- + net/rds/iw_send.c | 10 +- + net/rds/rdma.c | 7 +- + net/rds/rdma_transport.c | 12 +- + net/rds/rds.h | 2 +- + net/rds/send.c | 10 +- + 97 files changed, 2467 insertions(+), 2340 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at a6d77dc Merge commit 'ext4/next' +Merging refs/next/20090417/net +$ git merge refs/next/20090417/net +Auto-merging MAINTAINERS +Auto-merging drivers/net/benet/be_main.c +Auto-merging drivers/net/ixgbe/ixgbe_82598.c +Auto-merging drivers/net/ixgbe/ixgbe_82599.c +Auto-merging drivers/net/ixgbe/ixgbe_common.c +Auto-merging drivers/net/ixgbe/ixgbe_main.c +Auto-merging drivers/net/wireless/at76c50x-usb.c +Merge made by recursive. + Documentation/isdn/00-INDEX | 45 ++- + MAINTAINERS | 2 +- + drivers/net/atl1e/atl1e_main.c | 3 +- + drivers/net/atlx/atl1.c | 7 +- + drivers/net/benet/be_main.c | 28 +- + drivers/net/chelsio/sge.c | 4 +- + drivers/net/fs_enet/mii-fec.c | 6 +- + drivers/net/ixgb/ixgb_osdep.h | 2 +- + drivers/net/ixgbe/ixgbe_82598.c | 186 ++++++--- + drivers/net/ixgbe/ixgbe_82599.c | 249 +++++++++---- + drivers/net/ixgbe/ixgbe_common.c | 9 +- + drivers/net/ixgbe/ixgbe_main.c | 11 +- + drivers/net/ixgbe/ixgbe_phy.c | 19 +- + drivers/net/ixgbe/ixgbe_phy.h | 1 + + drivers/net/ixgbe/ixgbe_type.h | 18 +- + drivers/net/netxen/netxen_nic.h | 594 +++++++++++++---------------- + drivers/net/netxen/netxen_nic_ctx.c | 204 ++++++---- + drivers/net/netxen/netxen_nic_ethtool.c | 105 +++--- + drivers/net/netxen/netxen_nic_hdr.h | 8 - + drivers/net/netxen/netxen_nic_hw.c | 393 ++++++++----------- + drivers/net/netxen/netxen_nic_hw.h | 66 +--- + drivers/net/netxen/netxen_nic_init.c | 291 +++++++++------ + drivers/net/netxen/netxen_nic_main.c | 268 +++++++------- + drivers/net/netxen/netxen_nic_niu.c | 203 ++++------- + drivers/net/netxen/netxen_nic_phan_reg.h | 27 +- + drivers/net/pppol2tp.c | 3 +- + drivers/net/r8169.c | 61 ++- + drivers/net/sfc/boards.c | 2 - + drivers/net/sfc/sfe4001.c | 3 - + drivers/net/tulip/winbond-840.c | 3 +- + drivers/net/usb/kaweth.c | 33 ++- + drivers/net/virtio_net.c | 12 +- + drivers/net/wireless/at76c50x-usb.c | 3 +- + drivers/net/wireless/ath5k/reset.c | 5 +- + drivers/net/wireless/ath9k/ath9k.h | 6 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 7 +- + drivers/net/wireless/libertas/if_usb.c | 3 +- + drivers/net/wireless/libertas_tf/if_usb.c | 3 +- + net/rds/af_rds.c | 1 - + net/rds/connection.c | 4 +- + net/rds/ib.c | 4 +- + net/rds/ib.h | 2 +- + net/rds/ib_recv.c | 2 +- + net/rds/ib_ring.c | 2 +- + net/rds/ib_send.c | 10 +- + net/rds/info.c | 5 +- + net/rds/iw.c | 4 +- + net/rds/iw.h | 2 +- + net/rds/iw_recv.c | 2 +- + net/rds/iw_ring.c | 2 +- + net/rds/iw_send.c | 10 +- + net/rds/rdma.c | 7 +- + net/rds/rdma_transport.c | 12 +- + net/rds/rds.h | 2 +- + net/rds/send.c | 10 +- + 55 files changed, 1548 insertions(+), 1426 deletions(-) +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging mtd/master +$ git merge mtd/master +Merge made by recursive. + drivers/mtd/mtdcore.c | 18 +++++++++++++++--- + 1 files changed, 15 insertions(+), 3 deletions(-) +Merging crypto/master +$ git merge crypto/master +Auto-merging drivers/char/hw_random/omap-rng.c +Merge made by recursive. + arch/x86/crypto/Makefile | 2 + + arch/x86/crypto/aesni-intel_glue.c | 267 ++++++++++++++- + arch/x86/crypto/fpu.c | 166 +++++++++ + crypto/Kconfig | 10 + + crypto/api.c | 5 +- + crypto/cryptd.c | 14 +- + crypto/pcompress.c | 1 + + crypto/tcrypt.c | 16 +- + crypto/testmgr.c | 6 +- + drivers/char/hw_random/omap-rng.c | 2 +- + drivers/crypto/talitos.c | 713 ++++++++++++++++++++++++++---------- + 11 files changed, 987 insertions(+), 215 deletions(-) + create mode 100644 arch/x86/crypto/fpu.c +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging sound/for-next +$ git merge sound/for-next +Merge made by recursive. + Documentation/sound/alsa/ALSA-Configuration.txt | 7 + + include/linux/pci_ids.h | 5 + + include/sound/soc-dai.h | 1 + + include/sound/soc-dapm.h | 10 + + include/sound/soc.h | 6 + + sound/isa/Kconfig | 7 +- + sound/isa/sc6000.c | 127 ++- + sound/pci/Kconfig | 10 + + sound/pci/Makefile | 1 + + sound/pci/hda/Kconfig | 13 + + sound/pci/hda/Makefile | 4 + + sound/pci/hda/hda_codec.c | 3 + + sound/pci/hda/hda_intel.c | 15 +- + sound/pci/hda/patch_ca0110.c | 574 +++++++++ + sound/pci/lx6464es/Makefile | 2 + + sound/pci/lx6464es/lx6464es.c | 1152 ++++++++++++++++++ + sound/pci/lx6464es/lx6464es.h | 114 ++ + sound/pci/lx6464es/lx_core.c | 1444 +++++++++++++++++++++++ + sound/pci/lx6464es/lx_core.h | 242 ++++ + sound/pci/lx6464es/lx_defs.h | 376 ++++++ + sound/soc/Kconfig | 1 + + sound/soc/Makefile | 1 + + sound/soc/codecs/Kconfig | 8 + + sound/soc/codecs/Makefile | 4 + + sound/soc/codecs/tlv320aic23.c | 2 + + sound/soc/codecs/wm8903.c | 1 + + sound/soc/codecs/wm8960.c | 969 +++++++++++++++ + sound/soc/codecs/wm8960.h | 127 ++ + sound/soc/codecs/wm8988.c | 1097 +++++++++++++++++ + sound/soc/codecs/wm8988.h | 60 + + sound/soc/codecs/wm9713.c | 40 +- + sound/soc/omap/n810.c | 7 +- + sound/soc/omap/omap-mcbsp.c | 38 +- + sound/soc/pxa/pxa-ssp.c | 11 +- + sound/soc/s6000/Kconfig | 19 + + sound/soc/s6000/Makefile | 11 + + sound/soc/s6000/s6000-i2s.c | 629 ++++++++++ + sound/soc/s6000/s6000-i2s.h | 25 + + sound/soc/s6000/s6000-pcm.c | 497 ++++++++ + sound/soc/s6000/s6000-pcm.h | 35 + + sound/soc/s6000/s6105-ipcam.c | 244 ++++ + sound/soc/soc-core.c | 58 +- + sound/soc/soc-dapm.c | 131 ++- + 43 files changed, 7992 insertions(+), 136 deletions(-) + create mode 100644 sound/pci/hda/patch_ca0110.c + create mode 100644 sound/pci/lx6464es/Makefile + create mode 100644 sound/pci/lx6464es/lx6464es.c + create mode 100644 sound/pci/lx6464es/lx6464es.h + create mode 100644 sound/pci/lx6464es/lx_core.c + create mode 100644 sound/pci/lx6464es/lx_core.h + create mode 100644 sound/pci/lx6464es/lx_defs.h + create mode 100644 sound/soc/codecs/wm8960.c + create mode 100644 sound/soc/codecs/wm8960.h + create mode 100644 sound/soc/codecs/wm8988.c + create mode 100644 sound/soc/codecs/wm8988.h + create mode 100644 sound/soc/s6000/Kconfig + create mode 100644 sound/soc/s6000/Makefile + create mode 100644 sound/soc/s6000/s6000-i2s.c + create mode 100644 sound/soc/s6000/s6000-i2s.h + create mode 100644 sound/soc/s6000/s6000-pcm.c + create mode 100644 sound/soc/s6000/s6000-pcm.h + create mode 100644 sound/soc/s6000/s6105-ipcam.c +Merging cpufreq/next +$ git merge cpufreq/next +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Resolved 'net/9p/protocol.c' using previous resolution. +Auto-merging net/9p/protocol.c +CONFLICT (content): Merge conflict in net/9p/protocol.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e995f12] Merge commit 'v9fs/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging quilt/rr +$ git merge quilt/rr +Resolved 'arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c' using previous resolution. +Auto-merging arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +Auto-merging drivers/video/uvesafb.c +Auto-merging init/main.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2ebe8f1] Merge branch 'quilt/rr' +$ git diff -M --stat --summary HEAD^.. + arch/frv/include/asm/gdb-stub.h | 1 - + arch/mn10300/include/asm/gdb-stub.h | 1 - + arch/x86/kernel/acpi/cstate.c | 36 ++++-- + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 134 +++++++++++----------- + arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c | 60 +++------- + arch/x86/kernel/cpu/cpufreq/speedstep-ich.c | 81 +++++++------ + arch/x86/kernel/cpu/cpufreq/speedstep-lib.c | 1 + + drivers/acpi/processor_throttling.c | 72 +++++------- + drivers/firmware/dcdbas.c | 49 +++----- + drivers/video/aty/aty128fb.c | 2 +- + drivers/video/cyber2000fb.c | 9 +- + drivers/video/uvesafb.c | 10 +- + include/linux/compiler.h | 5 + + include/linux/cpu.h | 5 - + include/linux/moduleparam.h | 40 +++++-- + init/main.c | 1 - + kernel/cpu.c | 11 +-- + kernel/params.c | 46 +++++--- + 18 files changed, 280 insertions(+), 284 deletions(-) +Merging cifs/master +$ git merge cifs/master +Already up-to-date. +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Merge made by recursive. + fs/gfs2/log.c | 6 +++--- + fs/gfs2/lops.c | 14 ++++++++------ + fs/gfs2/meta_io.c | 38 +++++++++++++++++++++++++++----------- + 3 files changed, 38 insertions(+), 20 deletions(-) +Merging input/next +$ git merge input/next +Auto-merging drivers/input/keyboard/Kconfig +Merge made by recursive. + Documentation/input/input.txt | 2 +- + Documentation/input/rotary-encoder.txt | 9 +- + arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h | 42 ++ + drivers/input/gameport/fm801-gp.c | 1 + + drivers/input/gameport/gameport.c | 19 +- + drivers/input/keyboard/Kconfig | 10 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/ep93xx_keypad.c | 470 +++++++++++++++++++++ + drivers/input/keyboard/gpio_keys.c | 3 +- + drivers/input/misc/rotary_encoder.c | 61 ++- + drivers/input/serio/serio.c | 21 +- + drivers/input/tablet/gtco.c | 1 + + drivers/input/touchscreen/Kconfig | 15 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/atmel-wm97xx.c | 446 +++++++++++++++++++ + include/linux/rotary_encoder.h | 2 + + 16 files changed, 1059 insertions(+), 45 deletions(-) + create mode 100644 arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h + create mode 100644 drivers/input/keyboard/ep93xx_keypad.c + create mode 100644 drivers/input/touchscreen/atmel-wm97xx.c +Merging bkl-removal/bkl-removal +$ git merge bkl-removal/bkl-removal +Already up-to-date. +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Merge made by recursive. + block/blk-settings.c | 20 ++++---- + block/blk-timeout.c | 6 ++ + block/genhd.c | 12 +++-- + block/scsi_ioctl.c | 13 +++++- + drivers/block/loop.c | 26 +++-------- + fs/bio.c | 124 ++++++++++++++++++++++-------------------------- + include/linux/bio.h | 3 +- + include/linux/genhd.h | 1 + + include/linux/loop.h | 3 +- + lib/scatterlist.c | 9 ++- + 10 files changed, 111 insertions(+), 106 deletions(-) +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Merge made by recursive. + drivers/base/firmware_class.c | 129 ++++++++++++++++++++++++++++++++-------- + 1 files changed, 103 insertions(+), 26 deletions(-) +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 +Already up-to-date. +Merging backlight/for-mm +$ git merge backlight/for-mm +Already up-to-date. +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Auto-merging arch/x86/kernel/kgdb.c +Merge made by recursive. + Documentation/DocBook/kgdb.tmpl | 2 +- + arch/x86/kernel/kgdb.c | 3 +- + include/linux/kgdb.h | 50 +++++++++++++++++++++++++++++++++----- + kernel/kgdb.c | 6 ++-- + 4 files changed, 49 insertions(+), 12 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Auto-merging init/Kconfig +Merge made by recursive. + Documentation/vm/slqbinfo.c | 1054 ++++++++++++ + include/linux/rcu_types.h | 18 + + include/linux/rcupdate.h | 11 +- + include/linux/slab.h | 10 +- + include/linux/slqb_def.h | 299 ++++ + init/Kconfig | 28 +- + lib/Kconfig.debug | 20 + + mm/Makefile | 1 + + mm/slqb.c | 3732 +++++++++++++++++++++++++++++++++++++++++++ + 9 files changed, 5157 insertions(+), 16 deletions(-) + create mode 100644 Documentation/vm/slqbinfo.c + create mode 100644 include/linux/rcu_types.h + create mode 100644 include/linux/slqb_def.h + create mode 100644 mm/slqb.c +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +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 voltage/for-next +$ git merge voltage/for-next +Merge made by recursive. + drivers/regulator/core.c | 8 ++++---- + include/linux/regulator/driver.h | 1 + + 2 files changed, 5 insertions(+), 4 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Auto-merging Documentation/sysctl/kernel.txt +Auto-merging kernel/module.c +Auto-merging kernel/sysctl.c +Auto-merging security/commoncap.c +Auto-merging security/smack/smack_lsm.c +Auto-merging security/tomoyo/common.c +Auto-merging security/tomoyo/common.h +Auto-merging security/tomoyo/domain.c +Merge made by recursive. + Documentation/Smack.txt | 20 ++- + Documentation/sysctl/kernel.txt | 11 + + include/linux/lsm_audit.h | 111 ++++++++++ + kernel/module.c | 7 +- + kernel/sysctl.c | 12 + + security/Makefile | 3 + + security/commoncap.c | 32 +++ + security/lsm_audit.c | 386 ++++++++++++++++++++++++++++++++++ + security/selinux/avc.c | 2 +- + security/selinux/include/security.h | 4 +- + security/selinux/selinuxfs.c | 4 +- + security/selinux/ss/services.c | 30 +--- + security/smack/smack.h | 108 ++++++++++- + security/smack/smack_access.c | 141 +++++++++++-- + security/smack/smack_lsm.c | 390 ++++++++++++++++++++++++++-------- + security/smack/smackfs.c | 66 ++++++ + 16 files changed, 1185 insertions(+), 142 deletions(-) + create mode 100644 include/linux/lsm_audit.h + create mode 100644 security/lsm_audit.c +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging quilt/ttydev +$ git merge quilt/ttydev +Auto-merging drivers/usb/serial/ftdi_sio.c +Auto-merging drivers/usb/serial/option.c +Merge made by recursive. + drivers/char/cyclades.c | 23 ++------ + drivers/char/epca.c | 4 +- + drivers/char/isicom.c | 19 ++++-- + drivers/char/istallion.c | 8 +- + drivers/char/mxser.c | 12 +++- + drivers/char/pcmcia/synclink_cs.c | 11 ++- + drivers/char/rocket.c | 13 +++- + drivers/char/stallion.c | 6 +- + drivers/char/synclink.c | 9 ++- + drivers/char/synclink_gt.c | 9 ++- + drivers/char/synclinkmp.c | 9 ++- + drivers/char/tty_port.c | 38 +++++++++++- + drivers/usb/serial/belkin_sa.c | 6 +- + drivers/usb/serial/ch341.c | 46 +++++++++------- + drivers/usb/serial/console.c | 6 +- + drivers/usb/serial/cp210x.c | 6 +- + drivers/usb/serial/cyberjack.c | 6 +- + drivers/usb/serial/cypress_m8.c | 85 ++++++++-------------------- + drivers/usb/serial/digi_acceleport.c | 17 +----- + drivers/usb/serial/empeg.c | 6 +- + drivers/usb/serial/ftdi_sio.c | 50 +++++++++------- + drivers/usb/serial/garmin_gps.c | 3 +- + drivers/usb/serial/generic.c | 9 +--- + drivers/usb/serial/io_edgeport.c | 10 +-- + drivers/usb/serial/io_ti.c | 3 +- + drivers/usb/serial/ipaq.c | 6 +- + drivers/usb/serial/ipw.c | 18 +++--- + drivers/usb/serial/ir-usb.c | 6 +- + drivers/usb/serial/iuu_phoenix.c | 25 +-------- + drivers/usb/serial/keyspan.c | 13 +++- + drivers/usb/serial/keyspan.h | 8 ++- + drivers/usb/serial/keyspan_pda.c | 17 ++++-- + drivers/usb/serial/kl5kusb105.c | 6 +- + drivers/usb/serial/kobil_sct.c | 9 +-- + drivers/usb/serial/mct_u232.c | 37 ++++++------ + drivers/usb/serial/mos7720.c | 3 +- + drivers/usb/serial/mos7840.c | 48 +---------------- + drivers/usb/serial/navman.c | 3 +- + drivers/usb/serial/omninet.c | 6 +- + drivers/usb/serial/opticon.c | 3 +- + drivers/usb/serial/option.c | 71 +++++++++++------------ + drivers/usb/serial/oti6858.c | 57 ++----------------- + drivers/usb/serial/pl2303.c | 79 ++++++++++---------------- + drivers/usb/serial/sierra.c | 87 ++++++++++++++--------------- + drivers/usb/serial/spcp8x5.c | 85 ++++++++++------------------ + drivers/usb/serial/symbolserial.c | 3 +- + drivers/usb/serial/ti_usb_3410_5052.c | 6 +- + drivers/usb/serial/usb-serial.c | 99 ++++++++++++++++++++------------- + drivers/usb/serial/visor.c | 6 +- + drivers/usb/serial/whiteheat.c | 33 +---------- + include/linux/tty.h | 6 ++- + include/linux/usb/serial.h | 10 ++- + 52 files changed, 496 insertions(+), 668 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 3bdd90d Merge commit 'security-testing/next' +Merging refs/next/20090417/ttydev +$ git merge refs/next/20090417/ttydev +Resolved 'drivers/serial/8250_pci.c' using previous resolution. +Resolved 'fs/devpts/inode.c' using previous resolution. +Auto-merging arch/x86/kernel/kprobes.c +Auto-merging drivers/char/cyclades.c +Auto-merging drivers/char/vt.c +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/serial/8250_pci.c +CONFLICT (content): Merge conflict in drivers/serial/8250_pci.c +Auto-merging drivers/serial/Kconfig +Auto-merging drivers/serial/bfin_5xx.c +Auto-merging drivers/serial/cpm_uart/cpm_uart_core.c +Auto-merging drivers/serial/jsm/jsm_tty.c +Auto-merging drivers/usb/class/cdc-acm.c +Auto-merging fs/devpts/inode.c +CONFLICT (content): Merge conflict in fs/devpts/inode.c +Auto-merging include/linux/pci_ids.h +Auto-merging include/linux/serial_core.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e8b3412] Merge commit 'refs/next/20090417/ttydev' +$ git diff -M --stat --summary HEAD^.. + drivers/serial/Kconfig | 2 +- + drivers/serial/bfin_5xx.c | 7 ++++++- + 2 files changed, 7 insertions(+), 2 deletions(-) +Merging agp/agp-next +$ git merge agp/agp-next +Already up-to-date. +Merging generic-ipi/auto-generic-ipi-next +$ git merge generic-ipi/auto-generic-ipi-next +Already up-to-date. +Merging oprofile/auto-oprofile-next +$ git merge oprofile/auto-oprofile-next +Already uptodate! +Merge made by recursive. +Merging fastboot/auto-fastboot-next +$ git merge fastboot/auto-fastboot-next +Already up-to-date. +Merging sparseirq/auto-sparseirq-next +$ git merge sparseirq/auto-sparseirq-next +Already uptodate! +Merge made by recursive. +Merging iommu/auto-iommu-next +$ git merge iommu/auto-iommu-next +Already up-to-date. +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Already up-to-date. +Merging watchdog/master +$ git merge watchdog/master +Merge made by recursive. + drivers/watchdog/alim7101_wdt.c | 15 +++++++++++---- + drivers/watchdog/at91rm9200_wdt.c | 3 ++- + drivers/watchdog/bfin_wdt.c | 14 ++++++++++---- + drivers/watchdog/cpwd.c | 6 +++--- + drivers/watchdog/davinci_wdt.c | 6 +++--- + drivers/watchdog/iTCO_vendor_support.c | 6 +++--- + drivers/watchdog/iTCO_wdt.c | 22 +++++++++++----------- + drivers/watchdog/ks8695_wdt.c | 4 ++-- + drivers/watchdog/machzwd.c | 9 ++++++--- + drivers/watchdog/mpcore_wdt.c | 7 +++++-- + drivers/watchdog/mtx-1_wdt.c | 6 +++--- + drivers/watchdog/pnx4008_wdt.c | 6 +++--- + drivers/watchdog/rdc321x_wdt.c | 4 ++-- + drivers/watchdog/rm9k_wdt.c | 6 +++--- + drivers/watchdog/s3c2410_wdt.c | 32 ++++++++++++++------------------ + drivers/watchdog/sb_wdog.c | 7 ++++--- + drivers/watchdog/sbc60xxwdt.c | 5 +++-- + drivers/watchdog/sbc8360.c | 4 ++-- + drivers/watchdog/sbc_epx_c3.c | 9 ++++++--- + drivers/watchdog/scx200_wdt.c | 4 +++- + drivers/watchdog/shwdt.c | 4 +++- + drivers/watchdog/softdog.c | 7 +++++-- + drivers/watchdog/w83697hf_wdt.c | 3 ++- + drivers/watchdog/wdrtas.c | 7 +------ + 24 files changed, 110 insertions(+), 86 deletions(-) +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 fatfs/master +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next +$ git merge fuse/for-next +Already up-to-date. +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Merge made by recursive. + Documentation/SubmittingPatches | 9 ++++++++- + 1 files changed, 8 insertions(+), 1 deletions(-) +Merging nommu/master +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next +$ git merge trivial/for-next +Auto-merging fs/inode.c +Merge made by recursive. + drivers/char/amiserial.c | 2 +- + drivers/media/video/hdpvr/hdpvr-video.c | 2 +- + drivers/mtd/Kconfig | 3 ++- + drivers/net/b44.h | 2 +- + drivers/net/e100.c | 2 +- + drivers/net/niu.h | 4 ++-- + drivers/scsi/megaraid.h | 2 +- + drivers/scsi/megaraid/mbox_defs.h | 2 +- + drivers/staging/rt2860/common/mlme.c | 2 +- + drivers/staging/rt2870/common/mlme.c | 2 +- + drivers/staging/rt3070/common/mlme.c | 2 +- + drivers/watchdog/iop_wdt.c | 2 +- + fs/compat.c | 2 +- + fs/ext2/ext2.h | 2 +- + fs/inode.c | 2 +- + include/linux/ultrasound.h | 2 +- + sound/pci/aw2/aw2-saa7146.c | 2 +- + sound/usb/usbmixer.c | 2 +- + 18 files changed, 20 insertions(+), 19 deletions(-) +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging squashfs/master +$ git merge squashfs/master +Already up-to-date. +Merging omap/for-next +$ git merge omap/for-next +Already up-to-date. +Merging quilt/aoe +$ git merge quilt/aoe +Already up-to-date. +Merging kmemleak/kmemleak +$ git merge kmemleak/kmemleak +Recorded preimage for 'Documentation/kernel-parameters.txt' +Resolved 'init/main.c' using previous resolution. +Resolved 'lib/Kconfig.debug' using previous resolution. +Resolved 'mm/slob.c' using previous resolution. +Auto-merging Documentation/kernel-parameters.txt +CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging drivers/char/vt.c +Auto-merging fs/block_dev.c +Auto-merging include/linux/percpu.h +Auto-merging include/linux/slab.h +Auto-merging init/main.c +CONFLICT (content): Merge conflict in init/main.c +Auto-merging kernel/module.c +Auto-merging lib/Kconfig.debug +CONFLICT (content): Merge conflict in lib/Kconfig.debug +Auto-merging mm/Makefile +Auto-merging mm/page_alloc.c +Auto-merging mm/slab.c +Auto-merging mm/slob.c +CONFLICT (content): Merge conflict in mm/slob.c +Auto-merging mm/slub.c +Auto-merging mm/vmalloc.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'Documentation/kernel-parameters.txt'. +[master bac7034] Merge commit 'kmemleak/kmemleak' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 4 + + Documentation/kmemleak.txt | 142 ++++ + MAINTAINERS | 6 + + arch/arm/kernel/vmlinux.lds.S | 2 + + arch/x86/kernel/vmlinux_32.lds.S | 1 + + arch/x86/kernel/vmlinux_64.lds.S | 1 + + drivers/char/vt.c | 7 + + fs/block_dev.c | 6 + + include/linux/kmemleak.h | 96 +++ + include/linux/percpu.h | 5 + + include/linux/slab.h | 2 + + init/main.c | 4 +- + kernel/module.c | 56 ++ + lib/Kconfig.debug | 33 + + mm/Makefile | 2 + + mm/kmemleak-test.c | 111 +++ + mm/kmemleak.c | 1498 +++++++++++++++++++++++++++++++++++ + mm/page_alloc.c | 11 + + mm/slab.c | 32 +- + mm/slob.c | 7 + + mm/slub.c | 5 +- + mm/vmalloc.c | 30 +- + 22 files changed, 2054 insertions(+), 7 deletions(-) + create mode 100644 Documentation/kmemleak.txt + create mode 100644 include/linux/kmemleak.h + create mode 100644 mm/kmemleak-test.c + create mode 100644 mm/kmemleak.c +Merging suspend/linux-next +$ git merge suspend/linux-next +Auto-merging drivers/acpi/sleep.c +Merge made by recursive. + drivers/acpi/sleep.c | 8 ++++---- + include/linux/suspend.h | 36 ++++++++++++++++++++++++++---------- + kernel/power/main.c | 24 +++++++++++++++++------- + 3 files changed, 47 insertions(+), 21 deletions(-) +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Already up-to-date. +Merging quilt/driver-core +$ git merge quilt/driver-core +Auto-merging init/Kconfig +Merge made by recursive. + include/linux/sched.h | 2 +- + init/Kconfig | 6 ++-- + kernel/user.c | 67 ++++++++++++++++++++++++++++-------------------- + 3 files changed, 43 insertions(+), 32 deletions(-) +Merging scsi-post-merge/master +$ git merge scsi-post-merge/master +Already up-to-date. |