$ git checkout master Already on "master" $ git reset --hard stable HEAD is now at 10fec20 Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd Merging origin/master $ git merge origin/master Updating 10fec20..ddc752a Fast forward Documentation/DocBook/Makefile | 7 + Documentation/DocBook/procfs_example.c | 4 +- Documentation/Makefile | 3 + Documentation/accounting/Makefile | 10 + Documentation/accounting/getdelays.c | 25 ++- Documentation/auxdisplay/Makefile | 10 + Documentation/connector/Makefile | 11 + Documentation/cpu-hotplug.txt | 5 - Documentation/feature-removal-schedule.txt | 9 - Documentation/filesystems/configfs/Makefile | 3 + Documentation/filesystems/quota.txt | 22 +- Documentation/ia64/Makefile | 8 + Documentation/lguest/lguest.c | 23 +-- Documentation/networking/Makefile | 8 + Documentation/networking/ifenslave.c | 2 +- Documentation/pcmcia/Makefile | 10 + Documentation/pcmcia/crc32hash.c | 2 +- Documentation/spi/Makefile | 11 + Documentation/video4linux/Makefile | 8 + Documentation/vm/Makefile | 8 + Documentation/watchdog/src/Makefile | 8 + Makefile | 5 +- arch/h8300/mm/init.c | 9 +- arch/ia64/include/asm/sal.h | 2 +- arch/ia64/kernel/head.S | 26 ++- arch/ia64/kernel/setup.c | 18 +- arch/ia64/kernel/smpboot.c | 2 + arch/ia64/kernel/vmlinux.lds.S | 3 + arch/ia64/mm/contig.c | 10 +- arch/ia64/mm/discontig.c | 6 +- arch/powerpc/Kconfig | 3 - arch/x86/Kconfig | 1 - arch/x86/kernel/apic_32.c | 14 +- arch/x86/kernel/cpu/bugs.c | 6 +- arch/x86/kernel/io_apic_32.c | 6 +- arch/x86/kernel/io_apic_64.c | 25 +- arch/x86/kernel/mpparse.c | 11 +- arch/x86/kernel/pci-calgary_64.c | 2 +- arch/x86/kernel/setup.c | 22 +- arch/x86/kernel/smpboot.c | 22 ++- arch/x86/kernel/vmi_32.c | 3 +- arch/x86/mm/Makefile | 3 +- arch/x86/mm/pgtable.c | 3 + drivers/char/agp/agp.h | 3 + drivers/char/agp/ali-agp.c | 10 +- drivers/char/agp/amd-k7-agp.c | 10 +- drivers/char/agp/amd64-agp.c | 51 +++-- drivers/char/agp/ati-agp.c | 7 +- drivers/char/agp/backend.c | 28 ++- drivers/char/agp/generic.c | 41 +++- drivers/char/agp/intel-agp.c | 83 ++++--- drivers/char/agp/isoch.c | 37 ++-- drivers/char/agp/sis-agp.c | 17 +- drivers/char/agp/sworks-agp.c | 25 +- drivers/char/agp/uninorth-agp.c | 32 ++-- drivers/char/hvc_console.c | 5 +- drivers/char/rtc.c | 1 - drivers/cpuidle/sysfs.c | 29 +- drivers/firmware/memmap.c | 61 +++-- drivers/lguest/page_tables.c | 25 +-- drivers/misc/sgi-gru/grutables.h | 2 +- drivers/rtc/rtc-dev.c | 12 +- drivers/rtc/rtc-isl1208.c | 2 +- drivers/scsi/device_handler/scsi_dh_alua.c | 2 +- drivers/scsi/device_handler/scsi_dh_emc.c | 2 +- drivers/scsi/device_handler/scsi_dh_hp_sw.c | 2 +- drivers/scsi/device_handler/scsi_dh_rdac.c | 2 +- drivers/usb/misc/isight_firmware.c | 4 +- drivers/video/atmel_lcdfb.c | 13 +- drivers/video/aty/radeon_accel.c | 8 + drivers/video/console/fbcon.c | 4 +- drivers/video/matrox/i2c-matroxfb.c | 21 +- drivers/video/matrox/matroxfb_maven.c | 97 +++---- drivers/watchdog/Kconfig | 5 +- fs/eventpoll.c | 5 +- fs/jbd/transaction.c | 4 +- fs/jbd2/transaction.c | 4 +- fs/reiserfs/super.c | 1 - fs/seq_file.c | 14 + include/asm-generic/ioctl.h | 4 + include/asm-x86/efi.h | 2 +- include/asm-x86/hw_irq.h | 12 +- include/asm-x86/irq_vectors.h | 10 +- include/linux/Kbuild | 1 + include/linux/agp_backend.h | 5 + include/linux/bitmap.h | 1 + include/linux/bootmem.h | 4 + include/linux/byteorder.h | 372 +++++++++++++++++++++++++++ include/linux/firmware-map.h | 26 -- include/linux/i2c-id.h | 2 - include/linux/init.h | 1 + include/linux/kernel.h | 14 +- include/linux/lockdep.h | 70 ++++-- include/linux/mm.h | 20 -- include/linux/rcuclassic.h | 2 +- include/linux/sched.h | 31 +-- include/linux/seq_file.h | 12 + include/linux/spinlock.h | 6 + include/linux/spinlock_api_smp.h | 2 + include/linux/swab.h | 309 ++++++++++++++++++++++ include/video/atmel_lcdc.h | 1 + include/video/radeon.h | 4 + init/main.c | 6 +- kernel/Kconfig.hz | 2 +- kernel/cpu.c | 7 +- kernel/irq/proc.c | 96 ++++---- kernel/lockdep.c | 295 +++++++++++++++++---- kernel/lockdep_internals.h | 6 +- kernel/lockdep_proc.c | 37 +--- kernel/module.c | 2 +- kernel/posix-timers.c | 19 +- kernel/sched.c | 23 +- kernel/sched_clock.c | 178 ++++--------- kernel/sched_fair.c | 21 +- kernel/sched_rt.c | 8 +- kernel/signal.c | 1 + kernel/smp.c | 58 ++++- kernel/spinlock.c | 11 + kernel/stop_machine.c | 1 - kernel/time/tick-sched.c | 2 - kernel/workqueue.c | 24 +- lib/Kconfig.debug | 9 + lib/bitmap.c | 11 + lib/debug_locks.c | 2 + lib/vsprintf.c | 2 +- mm/Kconfig | 3 - mm/hugetlb.c | 62 ++++- mm/memcontrol.c | 2 + mm/mempolicy.c | 1 - mm/mmap.c | 20 +- mm/page_alloc.c | 2 +- mm/sparse.c | 1 - mm/util.c | 15 + sound/pci/hda/hda_intel.c | 4 + sound/soc/codecs/wm8750.c | 3 +- sound/soc/pxa/spitz.c | 2 +- 136 files changed, 2043 insertions(+), 872 deletions(-) create mode 100644 Documentation/Makefile create mode 100644 Documentation/accounting/Makefile create mode 100644 Documentation/auxdisplay/Makefile create mode 100644 Documentation/connector/Makefile create mode 100644 Documentation/filesystems/configfs/Makefile create mode 100644 Documentation/ia64/Makefile create mode 100644 Documentation/networking/Makefile create mode 100644 Documentation/pcmcia/Makefile create mode 100644 Documentation/spi/Makefile create mode 100644 Documentation/video4linux/Makefile create mode 100644 Documentation/vm/Makefile create mode 100644 Documentation/watchdog/src/Makefile create mode 100644 include/linux/byteorder.h create mode 100644 include/linux/swab.h Merging powerpc-merge/merge $ git merge powerpc-merge/merge Already up-to-date. Merging scsi-rc-fixes/master $ git merge scsi-rc-fixes/master Merge made by recursive. include/scsi/scsi_device.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) Merging net-current/master $ git merge net-current/master Auto-merged MAINTAINERS Merge made by recursive. MAINTAINERS | 1 + net/ipv4/udp.c | 6 ++++-- net/ipv6/udp.c | 6 +++--- net/sched/sch_api.c | 36 +++++++++++++++++++++++------------- 4 files changed, 31 insertions(+), 18 deletions(-) Merging sparc-current/master $ git merge sparc-current/master Merge made by recursive. arch/sparc64/kernel/smp.c | 4 ---- arch/sparc64/mm/ultra.S | 2 -- drivers/input/serio/i8042-sparcio.h | 3 ++- drivers/sbus/sbus.c | 2 +- drivers/serial/sunhv.c | 2 +- drivers/serial/sunsab.c | 2 +- drivers/serial/sunsu.c | 2 +- drivers/serial/sunzilog.c | 2 +- 8 files changed, 7 insertions(+), 12 deletions(-) Merging sound-current/for-linus $ git merge sound-current/for-linus Already up-to-date. Merging arm-current/master $ git merge arm-current/master Auto-merged drivers/watchdog/at91rm9200_wdt.c CONFLICT (content): Merge conflict in drivers/watchdog/at91rm9200_wdt.c Resolved 'drivers/watchdog/at91rm9200_wdt.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 2af5f10: Merge commit 'arm-current/master' $ git diff -M --stat --summary HEAD^.. Documentation/arm/Samsung-S3C24XX/GPIO.txt | 15 ++ Documentation/arm/Samsung-S3C24XX/Overview.txt | 35 +++- arch/arm/boot/compressed/.gitignore | 3 +- arch/arm/common/dmabounce.c | 56 +++--- arch/arm/configs/orion5x_defconfig | 13 +- arch/arm/include/asm/dma-mapping.h | 86 ++++++-- arch/arm/include/asm/memory.h | 22 +-- arch/arm/include/asm/processor.h | 4 +- arch/arm/include/asm/tlbflush.h | 7 +- arch/arm/include/asm/unistd.h | 6 + arch/arm/kernel/.gitignore | 1 + arch/arm/kernel/calls.S | 10 +- arch/arm/kernel/setup.c | 13 + arch/arm/kernel/traps.c | 31 ++- arch/arm/mach-footbridge/cats-pci.c | 3 + arch/arm/mach-kirkwood/common.c | 247 +++++++++++++++++++- arch/arm/mach-kirkwood/common.h | 3 + arch/arm/mach-kirkwood/include/mach/kirkwood.h | 9 + arch/arm/mach-kirkwood/irq.c | 2 +- arch/arm/mach-kirkwood/pcie.c | 2 +- arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 23 ++ arch/arm/mach-kirkwood/rd88f6281-setup.c | 2 +- arch/arm/mach-loki/common.c | 4 +- arch/arm/mach-loki/irq.c | 2 +- arch/arm/mach-mv78xx0/common.c | 8 +- arch/arm/mach-mv78xx0/irq.c | 2 +- arch/arm/mach-mv78xx0/pcie.c | 2 +- arch/arm/mach-orion5x/common.c | 115 +++++++++- arch/arm/mach-orion5x/common.h | 1 + arch/arm/mach-orion5x/db88f5281-setup.c | 2 +- arch/arm/mach-orion5x/include/mach/orion5x.h | 5 + arch/arm/mach-orion5x/irq.c | 2 +- arch/arm/mach-orion5x/kurobox_pro-setup.c | 3 +- arch/arm/mach-orion5x/mss2-setup.c | 1 + arch/arm/mach-orion5x/mv2120-setup.c | 1 + arch/arm/mach-orion5x/pci.c | 2 +- arch/arm/mach-orion5x/rd88f5182-setup.c | 1 + arch/arm/mach-orion5x/ts209-setup.c | 5 +- arch/arm/mach-orion5x/ts409-setup.c | 48 ++++ arch/arm/mach-orion5x/ts78xx-setup.c | 1 + arch/arm/mach-pxa/include/mach/poodle.h | 6 + arch/arm/mach-s3c2410/mach-bast.c | 2 +- arch/arm/mach-s3c2410/mach-vr1000.c | 2 +- arch/arm/mach-s3c2412/mach-jive.c | 3 - arch/arm/mach-s3c2440/mach-anubis.c | 2 +- arch/arm/mach-s3c2440/mach-osiris.c | 2 +- arch/arm/mm/cache-feroceon-l2.c | 2 +- arch/arm/mm/mmu.c | 50 ++++ arch/arm/mm/proc-arm940.S | 1 + arch/arm/mm/proc-arm946.S | 1 + arch/arm/plat-omap/include/mach/memory.h | 15 +- .../plat-orion/include/plat}/cache-feroceon-l2.h | 2 +- .../arm/plat-orion/include/plat}/ehci-orion.h | 6 +- .../arm/plat-orion/include/plat}/irq.h | 6 +- .../arm/plat-orion/include/plat}/mv_xor.h | 6 +- .../arm/plat-orion/include/plat}/orion_nand.h | 6 +- .../arm/plat-orion/include/plat}/pcie.h | 6 +- .../arm/plat-orion/include/plat}/time.h | 6 +- arch/arm/plat-orion/irq.c | 2 +- arch/arm/plat-orion/pcie.c | 2 +- arch/arm/plat-s3c24xx/cpu.c | 4 +- drivers/dma/mv_xor.c | 2 +- drivers/mtd/nand/orion_nand.c | 2 +- drivers/serial/Kconfig | 1 + drivers/usb/host/ehci-orion.c | 2 +- drivers/watchdog/s3c2410_wdt.c | 2 - include/asm-arm/plat-s3c24xx/s3c2410.h | 4 +- 67 files changed, 791 insertions(+), 152 deletions(-) create mode 100644 arch/arm/kernel/.gitignore rename {include/asm-arm/plat-orion => arch/arm/plat-orion/include/plat}/cache-feroceon-l2.h (84%) rename {include/asm-arm/plat-orion => arch/arm/plat-orion/include/plat}/ehci-orion.h (71%) rename {include/asm-arm/plat-orion => arch/arm/plat-orion/include/plat}/irq.h (76%) rename {include/asm-arm/plat-orion => arch/arm/plat-orion/include/plat}/mv_xor.h (82%) rename {include/asm-arm/plat-orion => arch/arm/plat-orion/include/plat}/orion_nand.h (79%) rename {include/asm-arm/plat-orion => arch/arm/plat-orion/include/plat}/pcie.h (91%) rename {include/asm-arm/plat-orion => arch/arm/plat-orion/include/plat}/time.h (75%) Merging pci-current/for-linus $ git merge pci-current/for-linus Merge made by recursive. arch/x86/pci/legacy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Merging wireless-current/master $ git merge wireless-current/master Already up-to-date. Merging kbuild-current/master $ git merge kbuild-current/master Already up-to-date. Merging quilt/driver-core.current $ git merge quilt/driver-core.current Auto-merged drivers/char/tty_io.c Auto-merged drivers/i2c/i2c-dev.c Auto-merged drivers/net/wan/cosa.c Auto-merged drivers/video/console/fbcon.c Merge made by recursive. Documentation/ja_JP/SubmitChecklist | 111 ++++++++++++++++++++++++++ Documentation/kobject.txt | 4 + arch/mips/kernel/rtlx.c | 4 +- arch/mips/sibyte/common/sb_tbprof.c | 3 +- arch/x86/kernel/cpuid.c | 4 +- arch/x86/kernel/msr.c | 4 +- block/bsg.c | 3 +- drivers/base/class.c | 11 +++ drivers/base/core.c | 36 ++++++--- drivers/base/driver.c | 3 - drivers/base/power/main.c | 19 +--- drivers/base/power/power.h | 9 ++- drivers/block/aoe/aoechr.c | 6 +- drivers/block/paride/pg.c | 5 +- drivers/block/paride/pt.c | 10 +-- drivers/block/pktcdvd.c | 5 +- drivers/char/bsr.c | 5 +- drivers/char/dsp56k.c | 4 +- drivers/char/ip2/ip2main.c | 12 ++-- drivers/char/ipmi/ipmi_devintf.c | 2 +- drivers/char/istallion.c | 5 +- drivers/char/lp.c | 4 +- drivers/char/mem.c | 6 +- drivers/char/misc.c | 4 +- drivers/char/pcmcia/cm4000_cs.c | 2 +- drivers/char/pcmcia/cm4040_cs.c | 3 +- drivers/char/ppdev.c | 5 +- drivers/char/raw.c | 7 +- drivers/char/snsc.c | 4 +- drivers/char/stallion.c | 4 +- drivers/char/tty_io.c | 12 +-- drivers/char/vc_screen.c | 12 ++-- drivers/char/viotape.c | 8 +- drivers/char/vt.c | 14 ++-- drivers/char/xilinx_hwicap/xilinx_hwicap.c | 3 +- drivers/dca/dca-sysfs.c | 8 +- drivers/hid/hidraw.c | 5 +- drivers/hwmon/hwmon.c | 4 +- drivers/i2c/i2c-dev.c | 6 +- drivers/ide/ide-probe.c | 4 +- drivers/ide/ide-tape.c | 11 +-- drivers/ieee1394/dv1394.c | 8 +- drivers/ieee1394/raw1394.c | 8 +- drivers/ieee1394/video1394.c | 5 +- drivers/infiniband/core/cm.c | 6 +- drivers/infiniband/core/user_mad.c | 12 ++-- drivers/infiniband/core/uverbs_main.c | 9 +-- drivers/infiniband/hw/ipath/ipath_file_ops.c | 2 +- drivers/isdn/capi/capi.c | 3 +- drivers/leds/led-class.c | 4 +- drivers/macintosh/adb.c | 3 +- drivers/media/dvb/dvb-core/dvbdev.c | 2 +- drivers/misc/phantom.c | 6 +- drivers/mtd/mtdchar.c | 10 +-- drivers/net/ppp_generic.c | 4 +- drivers/net/wan/cosa.c | 4 +- drivers/net/wireless/mac80211_hwsim.c | 6 +- drivers/power/power_supply_core.c | 4 +- drivers/s390/char/raw3270.c | 14 ++-- drivers/s390/char/tape_class.c | 6 +- drivers/s390/char/vmlogrdr.c | 8 +- drivers/s390/char/vmur.c | 5 +- drivers/scsi/ch.c | 6 +- drivers/scsi/dpt_i2o.c | 2 +- drivers/scsi/osst.c | 3 +- drivers/scsi/sg.c | 10 +-- drivers/scsi/st.c | 11 +-- drivers/spi/spidev.c | 7 +- drivers/uio/uio.c | 6 +- drivers/usb/core/devio.c | 6 +- drivers/usb/core/file.c | 6 +- drivers/usb/core/hcd.c | 5 +- drivers/usb/gadget/printer.c | 4 +- drivers/usb/misc/phidgetkit.c | 5 +- drivers/usb/misc/phidgetmotorcontrol.c | 5 +- drivers/usb/misc/phidgetservo.c | 5 +- drivers/usb/mon/mon_bin.c | 6 +- drivers/video/console/fbcon.c | 4 +- drivers/video/display/display-sysfs.c | 9 +-- drivers/video/fbmem.c | 5 +- fs/coda/psdev.c | 5 +- include/linux/device.h | 6 +- include/linux/sysfs.h | 4 +- lib/kobject.c | 21 ++---- sound/core/init.c | 6 +- sound/core/sound.c | 5 +- sound/oss/soundcard.c | 15 ++-- sound/sound_core.c | 5 +- 88 files changed, 385 insertions(+), 307 deletions(-) create mode 100644 Documentation/ja_JP/SubmitChecklist Merging quilt/usb.current $ git merge quilt/usb.current Removed Documentation/usb/auerswald.txt Auto-merged MAINTAINERS Auto-merged arch/arm/mach-omap2/usb-tusb6010.c Auto-merged drivers/i2c/chips/isp1301_omap.c Auto-merged drivers/usb/gadget/omap_udc.c CONFLICT (content): Merge conflict in drivers/usb/gadget/omap_udc.c Auto-merged drivers/usb/host/ohci-omap.c Removed drivers/usb/misc/auerswald.c Resolved 'drivers/usb/gadget/omap_udc.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit f2a9481: Merge branch 'quilt/usb.current' $ git diff -M --stat --summary HEAD^.. Documentation/devices.txt | 3 - Documentation/ioctl-number.txt | 1 - Documentation/usb/auerswald.txt | 30 - Documentation/usb/power-management.txt | 7 +- MAINTAINERS | 12 +- arch/arm/mach-omap2/usb-tusb6010.c | 1 - drivers/Makefile | 1 + drivers/block/ub.c | 3 - drivers/i2c/chips/isp1301_omap.c | 2 +- drivers/usb/Kconfig | 6 +- drivers/usb/atm/cxacru.c | 2 +- drivers/usb/class/cdc-acm.c | 86 +- drivers/usb/class/cdc-acm.h | 3 +- drivers/usb/class/usblp.c | 18 +- drivers/usb/core/driver.c | 5 +- drivers/usb/core/message.c | 2 +- drivers/usb/core/urb.c | 95 ++- drivers/usb/gadget/Kconfig | 10 + drivers/usb/gadget/dummy_hcd.c | 5 +- drivers/usb/gadget/f_acm.c | 196 +++- drivers/usb/gadget/f_ecm.c | 2 - drivers/usb/gadget/f_rndis.c | 2 - drivers/usb/gadget/f_serial.c | 2 - drivers/usb/gadget/f_subset.c | 2 - drivers/usb/gadget/gadget_chips.h | 6 + drivers/usb/gadget/omap_udc.c | 5 +- drivers/usb/gadget/u_serial.c | 290 +++-- drivers/usb/gadget/u_serial.h | 12 +- drivers/usb/host/isp1760-hcd.c | 53 +- drivers/usb/host/isp1760-hcd.h | 5 + drivers/usb/host/ohci-hcd.c | 23 +- drivers/usb/host/ohci-hub.c | 11 +- drivers/usb/host/ohci-omap.c | 3 +- drivers/usb/host/ohci-pci.c | 132 ++ drivers/usb/host/ohci-q.c | 6 + drivers/usb/host/ohci.h | 11 + drivers/usb/host/r8a66597-hcd.c | 49 +- drivers/usb/misc/Kconfig | 10 - drivers/usb/misc/Makefile | 1 - drivers/usb/misc/auerswald.c | 2152 ------------------------------ drivers/usb/musb/Kconfig | 176 +++ drivers/usb/musb/Makefile | 86 ++ drivers/usb/musb/cppi_dma.c | 1540 ++++++++++++++++++++++ drivers/usb/musb/cppi_dma.h | 133 ++ drivers/usb/musb/davinci.c | 462 +++++++ drivers/usb/musb/davinci.h | 100 ++ drivers/usb/musb/musb_core.c | 2261 ++++++++++++++++++++++++++++++++ drivers/usb/musb/musb_core.h | 507 +++++++ drivers/usb/musb/musb_debug.h | 66 + drivers/usb/musb/musb_dma.h | 172 +++ drivers/usb/musb/musb_gadget.c | 2031 ++++++++++++++++++++++++++++ drivers/usb/musb/musb_gadget.h | 108 ++ drivers/usb/musb/musb_gadget_ep0.c | 981 ++++++++++++++ drivers/usb/musb/musb_host.c | 2170 ++++++++++++++++++++++++++++++ drivers/usb/musb/musb_host.h | 110 ++ drivers/usb/musb/musb_io.h | 115 ++ drivers/usb/musb/musb_procfs.c | 830 ++++++++++++ drivers/usb/musb/musb_regs.h | 300 +++++ drivers/usb/musb/musb_virthub.c | 425 ++++++ drivers/usb/musb/musbhsdma.c | 433 ++++++ drivers/usb/musb/omap2430.c | 324 +++++ drivers/usb/musb/omap2430.h | 56 + drivers/usb/musb/tusb6010.c | 1151 ++++++++++++++++ drivers/usb/musb/tusb6010.h | 233 ++++ drivers/usb/musb/tusb6010_omap.c | 719 ++++++++++ drivers/usb/serial/Kconfig | 7 +- drivers/usb/serial/ftdi_sio.c | 6 + drivers/usb/serial/ftdi_sio.h | 7 + drivers/usb/serial/option.c | 44 +- drivers/usb/serial/pl2303.c | 1 - drivers/usb/serial/pl2303.h | 4 - drivers/usb/serial/sierra.c | 170 ++-- drivers/usb/serial/usb-serial.c | 7 +- drivers/usb/storage/Kconfig | 12 + drivers/usb/storage/Makefile | 1 + drivers/usb/storage/sierra_ms.c | 207 +++ drivers/usb/storage/sierra_ms.h | 4 + drivers/usb/storage/transport.c | 17 +- drivers/usb/storage/unusual_devs.h | 40 +- drivers/usb/storage/usb.c | 3 + include/linux/usb.h | 6 + include/linux/usb/musb.h | 98 ++ include/linux/usb/serial.h | 3 +- 83 files changed, 16825 insertions(+), 2566 deletions(-) delete mode 100644 Documentation/usb/auerswald.txt delete mode 100644 drivers/usb/misc/auerswald.c create mode 100644 drivers/usb/musb/Kconfig create mode 100644 drivers/usb/musb/Makefile create mode 100644 drivers/usb/musb/cppi_dma.c create mode 100644 drivers/usb/musb/cppi_dma.h create mode 100644 drivers/usb/musb/davinci.c create mode 100644 drivers/usb/musb/davinci.h create mode 100644 drivers/usb/musb/musb_core.c create mode 100644 drivers/usb/musb/musb_core.h create mode 100644 drivers/usb/musb/musb_debug.h create mode 100644 drivers/usb/musb/musb_dma.h create mode 100644 drivers/usb/musb/musb_gadget.c create mode 100644 drivers/usb/musb/musb_gadget.h create mode 100644 drivers/usb/musb/musb_gadget_ep0.c create mode 100644 drivers/usb/musb/musb_host.c create mode 100644 drivers/usb/musb/musb_host.h create mode 100644 drivers/usb/musb/musb_io.h create mode 100644 drivers/usb/musb/musb_procfs.c create mode 100644 drivers/usb/musb/musb_regs.h create mode 100644 drivers/usb/musb/musb_virthub.c create mode 100644 drivers/usb/musb/musbhsdma.c create mode 100644 drivers/usb/musb/omap2430.c create mode 100644 drivers/usb/musb/omap2430.h create mode 100644 drivers/usb/musb/tusb6010.c create mode 100644 drivers/usb/musb/tusb6010.h create mode 100644 drivers/usb/musb/tusb6010_omap.c create mode 100644 drivers/usb/storage/sierra_ms.c create mode 100644 drivers/usb/storage/sierra_ms.h create mode 100644 include/linux/usb/musb.h Merging cpufreq-current/fixes $ git merge cpufreq-current/fixes Already up-to-date. Merging input-current/for-linus $ git merge input-current/for-linus Merge made by recursive. drivers/hid/usbhid/hid-quirks.c | 12 +- drivers/input/evdev.c | 63 ++- drivers/input/joystick/xpad.c | 1 + drivers/input/keyboard/gpio_keys.c | 3 +- drivers/input/mouse/Kconfig | 23 ++ drivers/input/mouse/Makefile | 1 + drivers/input/mouse/bcm5974.c | 681 +++++++++++++++++++++++++++++++++ drivers/input/serio/i8042-x86ia64io.h | 7 + drivers/input/serio/xilinx_ps2.c | 4 +- drivers/input/touchscreen/Kconfig | 21 +- 10 files changed, 775 insertions(+), 41 deletions(-) create mode 100644 drivers/input/mouse/bcm5974.c Merging md-current/for-2.6.26 $ git merge md-current/for-2.6.26 Already up-to-date. Merging dwmw2/master $ git merge dwmw2/master Already up-to-date. Merging quilt/driver-core $ git merge quilt/driver-core Auto-merged include/linux/init.h Auto-merged init/main.c Merge made by recursive. arch/x86/kernel/traps_32.c | 1 + arch/x86/kernel/traps_64.c | 1 + drivers/base/core.c | 1 + drivers/base/platform.c | 2 +- drivers/net/phy/phy_device.c | 8 +------ fs/sysfs/dir.c | 1 + fs/sysfs/file.c | 44 ++++++++++++++++++++++++++----------- fs/sysfs/mount.c | 17 +++++++++++++- fs/sysfs/sysfs.h | 7 ++++- include/linux/init.h | 1 + include/linux/sysfs.h | 31 ++++++++++++++++++++++++- init/main.c | 9 +++++++ lib/kobject.c | 50 ++++++++++++++++++++++++++++++++++++++++++ 13 files changed, 147 insertions(+), 26 deletions(-) Merging quilt/usb $ git merge quilt/usb Auto-merged drivers/usb/host/ehci-orion.c Auto-merged drivers/usb/host/ehci-q.c Auto-merged drivers/usb/host/ohci-at91.c Auto-merged drivers/usb/host/ohci-omap.c Auto-merged drivers/usb/host/ohci-pnx4008.c Auto-merged drivers/usb/host/ohci-s3c2410.c Merge made by recursive. drivers/net/usb/hso.c | 53 ++++--- drivers/usb/core/Kconfig | 16 ++- drivers/usb/core/Makefile | 4 - drivers/usb/core/config.c | 6 +- drivers/usb/core/devio.c | 2 +- drivers/usb/core/driver.c | 25 ++-- drivers/usb/core/hcd-pci.c | 24 ++-- drivers/usb/core/hcd.c | 34 +++-- drivers/usb/core/hub.c | 160 +++++++++++---------- drivers/usb/core/message.c | 18 ++-- drivers/usb/core/quirks.c | 2 +- drivers/usb/core/urb.c | 3 +- drivers/usb/core/usb.c | 12 ++- drivers/usb/core/usb.h | 14 ++ drivers/usb/host/Makefile | 4 - drivers/usb/host/ehci-dbg.c | 2 +- drivers/usb/host/ehci-fsl.c | 4 +- drivers/usb/host/ehci-hcd.c | 1 + drivers/usb/host/ehci-ixp4xx.c | 4 +- drivers/usb/host/ehci-orion.c | 4 +- drivers/usb/host/ehci-ppc-of.c | 4 +- drivers/usb/host/ehci-ps3.c | 30 ++-- drivers/usb/host/ehci-q.c | 5 +- drivers/usb/host/ehci-sched.c | 4 +- drivers/usb/host/ohci-at91.c | 4 +- drivers/usb/host/ohci-omap.c | 8 +- drivers/usb/host/ohci-pnx4008.c | 4 +- drivers/usb/host/ohci-ppc-of.c | 4 +- drivers/usb/host/ohci-ps3.c | 30 ++-- drivers/usb/host/ohci-s3c2410.c | 22 ++-- drivers/usb/host/uhci-hcd.c | 9 +- drivers/usb/host/uhci-hub.c | 2 +- drivers/usb/host/uhci-q.c | 8 +- drivers/usb/misc/Kconfig | 10 ++ drivers/usb/misc/Makefile | 1 + drivers/usb/misc/gotemp.c | 301 +++++++++++++++++++++++++++++++++++++++ 36 files changed, 594 insertions(+), 244 deletions(-) create mode 100644 drivers/usb/misc/gotemp.c Merging tip-core/auto-core-next $ git merge tip-core/auto-core-next Auto-merged include/asm-generic/vmlinux.lds.h CONFLICT (content): Merge conflict in include/asm-generic/vmlinux.lds.h Auto-merged include/asm-x86/percpu.h Auto-merged include/linux/percpu.h Auto-merged kernel/lockdep.c Auto-merged kernel/module.c Auto-merged mm/filemap.c Resolved 'include/asm-generic/vmlinux.lds.h' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 75b7299: Merge commit 'tip-core/auto-core-next' $ git diff -M --stat --summary HEAD^.. arch/x86/kernel/cpu/common.c | 2 +- arch/x86/kernel/vmlinux_32.lds.S | 1 + include/asm-generic/percpu.h | 11 ++++- include/asm-generic/sections.h | 10 ++++ include/asm-generic/vmlinux.lds.h | 17 ++++++++ include/asm-x86/percpu.h | 83 ++++++++++++++++++++++++++++++++++-- include/linux/percpu.h | 24 ++++++++++- kernel/lockdep.c | 4 +- kernel/module.c | 7 ++- mm/filemap.c | 15 ++++--- 10 files changed, 154 insertions(+), 20 deletions(-) Merging cpus4096/auto-cpus4096-next $ git merge cpus4096/auto-cpus4096-next Auto-merged drivers/cpufreq/cpufreq.c Auto-merged net/sunrpc/svc.c CONFLICT (content): Merge conflict in net/sunrpc/svc.c Resolved 'net/sunrpc/svc.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 853a3b9: Merge commit 'cpus4096/auto-cpus4096-next' $ git diff -M --stat --summary HEAD^.. drivers/net/sfc/efx.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Merging ftrace/auto-ftrace-next $ git merge ftrace/auto-ftrace-next Already uptodate! Merge made by recursive. Merging genirq/auto-genirq-next $ git merge genirq/auto-genirq-next Merge made by recursive. kernel/irq/spurious.c | 146 ++++++++++++++++++++++++++++++------------------ 1 files changed, 91 insertions(+), 55 deletions(-) Merging safe-poison-pointers/auto-safe-poison-pointers-next $ git merge safe-poison-pointers/auto-safe-poison-pointers-next Auto-merged arch/x86/Kconfig Merge made by recursive. arch/x86/Kconfig | 5 +++++ include/linux/poison.h | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) Merging sched/auto-sched-next $ git merge sched/auto-sched-next Auto-merged include/asm-x86/thread_info.h Auto-merged include/linux/rcuclassic.h Auto-merged kernel/rcuclassic.c Merge made by recursive. include/linux/rcuclassic.h | 28 +++++--- kernel/rcuclassic.c | 177 ++++++++++++++++++++++++++------------------ 2 files changed, 122 insertions(+), 83 deletions(-) Merging stackprotector/auto-stackprotector-next $ git merge stackprotector/auto-stackprotector-next Auto-merged arch/x86/Kconfig Auto-merged arch/x86/Kconfig.debug Auto-merged arch/x86/Makefile Auto-merged arch/x86/kernel/Makefile Auto-merged arch/x86/kernel/process_64.c Auto-merged include/linux/sched.h Auto-merged init/main.c Auto-merged kernel/exit.c Auto-merged kernel/fork.c Auto-merged kernel/panic.c Auto-merged kernel/sched.c Merge made by recursive. arch/x86/Kconfig | 23 ++++++++++------------- arch/x86/Kconfig.debug | 1 + arch/x86/Makefile | 2 +- arch/x86/kernel/Makefile | 1 + arch/x86/kernel/process_64.c | 13 ++++++++++++- arch/x86/mm/fault.c | 7 +++++++ include/asm-x86/pda.h | 3 +-- include/asm-x86/stackprotector.h | 38 ++++++++++++++++++++++++++++++++++++++ include/asm-x86/system.h | 6 +++++- include/linux/magic.h | 1 + include/linux/sched.h | 16 ++++++++++++++-- include/linux/stackprotector.h | 16 ++++++++++++++++ init/main.c | 7 +++++++ kernel/exit.c | 5 +---- kernel/fork.c | 5 +++++ kernel/panic.c | 12 +++++++++++- kernel/sched.c | 7 +------ 17 files changed, 132 insertions(+), 31 deletions(-) create mode 100644 include/asm-x86/stackprotector.h create mode 100644 include/linux/stackprotector.h Merging timers/auto-timers-next $ git merge timers/auto-timers-next Auto-merged drivers/char/hpet.c Merge made by recursive. drivers/char/hpet.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/hpet.h | 3 +- 2 files changed, 65 insertions(+), 1 deletions(-) Merging x86/auto-x86-next $ git merge x86/auto-x86-next Auto-merged Documentation/kernel-parameters.txt Auto-merged arch/x86/Kconfig Auto-merged arch/x86/kernel/Makefile Auto-merged arch/x86/kernel/apic_32.c Auto-merged arch/x86/kernel/genapic_64.c CONFLICT (content): Merge conflict in arch/x86/kernel/genapic_64.c Auto-merged arch/x86/kernel/genapic_flat_64.c Auto-merged arch/x86/kernel/genx2apic_uv_x.c Auto-merged arch/x86/kernel/io_apic_32.c Auto-merged arch/x86/kernel/io_apic_64.c Auto-merged arch/x86/kernel/mpparse.c Auto-merged arch/x86/kernel/paravirt.c Auto-merged arch/x86/kernel/setup.c Auto-merged arch/x86/kernel/smpboot.c Auto-merged arch/x86/kernel/vmi_32.c Auto-merged arch/x86/lguest/boot.c Auto-merged arch/x86/xen/enlighten.c Auto-merged drivers/pci/dmar.c CONFLICT (content): Merge conflict in drivers/pci/dmar.c Auto-merged include/asm-x86/hw_irq.h Auto-merged include/asm-x86/ipi.h Auto-merged include/asm-x86/paravirt.h Auto-merged kernel/irq/manage.c Resolved 'arch/x86/kernel/genapic_64.c' using previous resolution. Resolved 'drivers/pci/dmar.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 086fb6f: Merge commit 'x86/auto-x86-next' $ git diff -M --stat --summary HEAD^.. Documentation/kernel-parameters.txt | 6 + arch/x86/Kconfig | 8 + arch/x86/kernel/Makefile | 2 + arch/x86/kernel/acpi/boot.c | 4 +- arch/x86/kernel/apic_32.c | 41 ++- arch/x86/kernel/apic_64.c | 237 ++++++++++- arch/x86/kernel/cpu/common_64.c | 2 + arch/x86/kernel/cpu/feature_names.c | 2 +- arch/x86/kernel/genapic_64.c | 84 ++--- arch/x86/kernel/genapic_flat_64.c | 62 +++- arch/x86/kernel/genx2apic_cluster.c | 164 +++++++ arch/x86/kernel/genx2apic_phys.c | 161 +++++++ arch/x86/kernel/genx2apic_uv_x.c | 66 +++- arch/x86/kernel/i8259.c | 24 + arch/x86/kernel/io_apic_32.c | 5 +- arch/x86/kernel/io_apic_64.c | 608 +++++++++++++++++++++++++-- arch/x86/kernel/mpparse.c | 2 + arch/x86/kernel/paravirt.c | 2 - arch/x86/kernel/setup.c | 2 + arch/x86/kernel/smpboot.c | 38 +- arch/x86/kernel/vmi_32.c | 4 +- arch/x86/lguest/boot.c | 38 ++- arch/x86/mach-generic/bigsmp.c | 5 +- arch/x86/mach-generic/es7000.c | 3 +- arch/x86/mach-generic/numaq.c | 4 +- arch/x86/mach-generic/summit.c | 5 +- arch/x86/xen/enlighten.c | 45 ++- drivers/pci/Makefile | 2 + drivers/pci/dma_remapping.h | 157 +++++++ drivers/pci/dmar.c | 397 +++++++++++++++++- drivers/pci/intel-iommu.c | 164 ++------ drivers/pci/intel-iommu.h | 233 +++++------ drivers/pci/intr_remapping.c | 471 +++++++++++++++++++++ drivers/pci/intr_remapping.h | 8 + include/asm-x86/apic.h | 65 +++- include/asm-x86/apicdef.h | 3 + include/asm-x86/cpufeature.h | 2 + include/asm-x86/genapic_64.h | 8 + include/asm-x86/hw_irq.h | 2 + include/asm-x86/i8259.h | 3 + include/asm-x86/io_apic.h | 20 + include/asm-x86/ipi.h | 16 +- include/asm-x86/irq_remapping.h | 8 + include/asm-x86/mach-default/mach_apic.h | 4 +- include/asm-x86/mach-default/mach_apicdef.h | 6 +- include/asm-x86/mach-es7000/mach_apic.h | 2 +- include/asm-x86/msidef.h | 4 + include/asm-x86/paravirt.h | 19 - include/asm-x86/smp.h | 17 +- include/linux/dmar.h | 127 +++++-- include/linux/irq.h | 1 + kernel/irq/manage.c | 9 +- 52 files changed, 2854 insertions(+), 518 deletions(-) create mode 100644 arch/x86/kernel/genx2apic_cluster.c create mode 100644 arch/x86/kernel/genx2apic_phys.c create mode 100644 drivers/pci/dma_remapping.h create mode 100644 drivers/pci/intr_remapping.c create mode 100644 drivers/pci/intr_remapping.h create mode 100644 include/asm-x86/irq_remapping.h $ git am -3 ../patches/0001-x86-export-is_uv_system.patch Applying x86: export is_uv_system $ git reset HEAD^ arch/x86/kernel/genx2apic_uv_x.c: needs update $ git commit -v -a --amend Created commit e248676: Merge commit 'x86/auto-x86-next' Merging pci/linux-next $ git merge pci/linux-next Already up-to-date. Merging quilt/device-mapper $ git merge quilt/device-mapper Merge made by recursive. drivers/md/dm-exception-store.c | 29 +++++++++++++++++++---------- drivers/md/dm-mpath.c | 35 +++++++++++++++++++---------------- drivers/md/dm-mpath.h | 2 -- drivers/md/dm-raid1.c | 4 +++- 4 files changed, 41 insertions(+), 29 deletions(-) Merging hid/mm $ git merge hid/mm Already up-to-date. Merging quilt/i2c $ git merge quilt/i2c Auto-merged drivers/i2c/chips/isp1301_omap.c Merge made by recursive. arch/arm/mach-omap1/board-h3.c | 4 + arch/arm/mach-omap2/board-h4.c | 11 + drivers/hwmon/dme1737.c | 320 +++++++++++------------ drivers/i2c/busses/Kconfig | 12 + drivers/i2c/busses/Makefile | 1 + drivers/i2c/busses/i2c-highlander.c | 498 +++++++++++++++++++++++++++++++++++ drivers/i2c/busses/i2c-pca-isa.c | 20 ++- drivers/i2c/chips/isp1301_omap.c | 141 ++++------ drivers/i2c/i2c-core.c | 6 +- 9 files changed, 755 insertions(+), 258 deletions(-) create mode 100644 drivers/i2c/busses/i2c-highlander.c Merging quilt/jdelvare-hwmon $ git merge quilt/jdelvare-hwmon Merge made by recursive. Documentation/hwmon/lm90 | 30 ++-- drivers/hwmon/Kconfig | 7 +- drivers/hwmon/ad7414.c | 2 +- drivers/hwmon/lm90.c | 371 +++++++++++++++++++++++++++++++--------------- 4 files changed, 266 insertions(+), 144 deletions(-) Merging quilt/kernel-doc $ git merge quilt/kernel-doc Auto-merged Documentation/00-INDEX Auto-merged arch/x86/Kconfig Merge made by recursive. Documentation/00-INDEX | 6 ------ Documentation/early-userspace/00-INDEX | 8 ++++++++ Documentation/{ => early-userspace}/initrd.txt | 6 +++--- Documentation/timers/00-INDEX | 10 ++++++++++ Documentation/{ => timers}/hpet.txt | 0 Documentation/x86/00-INDEX | 4 ++++ Documentation/{ => x86}/mtrr.txt | 4 ++-- arch/x86/Kconfig | 2 +- 8 files changed, 28 insertions(+), 12 deletions(-) create mode 100644 Documentation/early-userspace/00-INDEX rename Documentation/{ => early-userspace}/initrd.txt (99%) create mode 100644 Documentation/timers/00-INDEX rename Documentation/{ => timers}/hpet.txt (100%) create mode 100644 Documentation/x86/00-INDEX rename Documentation/{ => x86}/mtrr.txt (99%) Merging avr32/avr32-arch $ git merge avr32/avr32-arch Already up-to-date. Merging v4l-dvb/stable $ git merge v4l-dvb/stable Merge made by recursive. Documentation/video4linux/CARDLIST.au0828 | 1 + Documentation/video4linux/CARDLIST.bttv | 1 + Documentation/video4linux/CARDLIST.tuner | 1 + drivers/media/common/ir-keymaps.c | 55 +++++++++- drivers/media/common/tuners/tuner-simple.c | 2 + drivers/media/common/tuners/tuner-types.c | 22 ++++ drivers/media/dvb/frontends/au8522.c | 45 +++++++- drivers/media/dvb/frontends/au8522.h | 9 ++ drivers/media/dvb/frontends/drx397xD.c | 34 +++--- drivers/media/dvb/frontends/drx397xD.h | 2 +- drivers/media/radio/dsbr100.c | 3 + drivers/media/radio/radio-si470x.c | 2 + drivers/media/video/Kconfig | 121 ++++++++++---------- drivers/media/video/au0828/Kconfig | 1 + drivers/media/video/au0828/au0828-cards.c | 7 + drivers/media/video/au0828/au0828-cards.h | 1 + drivers/media/video/au0828/au0828-dvb.c | 23 ++++ drivers/media/video/bt8xx/bttv-cards.c | 27 ++++- drivers/media/video/bt8xx/bttv-driver.c | 25 ++++- drivers/media/video/bt8xx/bttv-input.c | 62 ++++++++++- drivers/media/video/bt8xx/bttv.h | 2 +- drivers/media/video/cafe_ccic.c | 6 +- drivers/media/video/cx23885/cx23885-417.c | 10 ++- drivers/media/video/cx23885/cx23885-core.c | 2 +- drivers/media/video/cx23885/cx23885-video.c | 10 ++- drivers/media/video/cx88/cx88-blackbird.c | 8 +- drivers/media/video/cx88/cx88-video.c | 10 ++- drivers/media/video/em28xx/em28xx-video.c | 7 +- drivers/media/video/ivtv/ivtv-fileops.c | 2 +- drivers/media/video/ivtv/ivtv-fileops.h | 5 - drivers/media/video/meye.c | 7 +- drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 6 + drivers/media/video/s2255drv.c | 6 + drivers/media/video/saa5246a.c | 8 +- drivers/media/video/saa5249.c | 8 +- drivers/media/video/saa7134/saa7134-empress.c | 3 + drivers/media/video/saa7134/saa7134-input.c | 140 ++++++++++++++++++++++- drivers/media/video/saa7134/saa7134-video.c | 8 +- drivers/media/video/se401.c | 6 +- drivers/media/video/stk-webcam.c | 6 +- drivers/media/video/stradis.c | 6 +- drivers/media/video/stv680.c | 2 + drivers/media/video/usbvideo/vicam.c | 6 + drivers/media/video/usbvision/usbvision-video.c | 2 + drivers/media/video/v4l2-dev.c | 3 - drivers/media/video/vino.c | 1 - drivers/media/video/vivi.c | 7 +- drivers/media/video/zoran_driver.c | 3 + drivers/media/video/zr364xx.c | 8 +- include/media/ir-common.h | 6 + include/media/saa7146.h | 2 +- include/media/tuner.h | 1 + 52 files changed, 617 insertions(+), 134 deletions(-) Merging s390/features $ git merge s390/features Merge made by recursive. arch/s390/include/asm/qdio.h | 8 +++- drivers/s390/block/dasd_eer.c | 3 +- drivers/s390/char/tape_char.c | 2 +- drivers/s390/char/tape_std.c | 2 +- drivers/s390/cio/blacklist.c | 11 +++-- drivers/s390/cio/device.c | 96 +++++++++++++++++++++++++++------------- drivers/s390/cio/device.h | 1 + drivers/s390/cio/device_fsm.c | 7 +++ drivers/s390/cio/qdio.h | 3 + drivers/s390/cio/qdio_main.c | 24 ++++++++-- 10 files changed, 113 insertions(+), 44 deletions(-) Merging sh/master $ git merge sh/master Merge made by recursive. arch/sh/boards/board-ap325rxa.c | 4 + arch/sh/boards/mach-migor/setup.c | 8 ++ arch/sh/boards/mach-sh7763rdp/setup.c | 84 +++++++++++++++++- arch/sh/boards/mach-x3proto/setup.c | 10 ++- arch/sh/configs/sh7763rdp_defconfig | 113 ++++++++++++++++++++---- arch/sh/include/asm/bitops-llsc.h | 144 ++++++++++++++++++++++++++++++ arch/sh/include/asm/bitops.h | 2 + arch/sh/include/asm/cmpxchg-llsc.h | 71 +++++++++++++++ arch/sh/include/asm/flat.h | 7 ++ arch/sh/include/asm/migor.h | 3 - arch/sh/include/asm/sh_mobile_lcdc.h | 6 ++ arch/sh/include/asm/system.h | 2 + arch/sh/include/cpu-sh3/cpu/cacheflush.h | 10 ++ arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 4 +- arch/sh/kernel/sh_ksyms_32.c | 4 +- arch/sh/mm/Kconfig | 2 + arch/sh/mm/consistent.c | 27 ++++++ drivers/input/touchscreen/migor_ts.c | 11 ++- drivers/video/sh_mobile_lcdcfb.c | 2 + fs/binfmt_flat.c | 4 +- 20 files changed, 490 insertions(+), 28 deletions(-) create mode 100644 arch/sh/include/asm/bitops-llsc.h create mode 100644 arch/sh/include/asm/cmpxchg-llsc.h Merging jfs/next $ git merge jfs/next Already up-to-date. Merging kbuild/master $ git merge kbuild/master Already up-to-date. Merging quilt/ide $ git merge quilt/ide Auto-merged drivers/ide/ide-probe.c Auto-merged drivers/ide/ide-tape.c Merge made by recursive. arch/powerpc/include/asm/ide.h | 43 +--- drivers/ata/libata-scsi.c | 2 +- drivers/block/hd.c | 9 +- drivers/cdrom/cdrom.c | 9 +- drivers/ide/Kconfig | 23 -- drivers/ide/Makefile | 7 +- drivers/ide/arm/icside.c | 5 +- drivers/ide/arm/palm_bk3710.c | 8 +- drivers/ide/ide-acpi.c | 6 +- drivers/ide/ide-atapi.c | 236 +++++++++++++-- drivers/ide/ide-cd.c | 92 +++--- drivers/ide/ide-disk.c | 336 ++++++++------------- drivers/ide/ide-dma.c | 52 ++-- drivers/ide/ide-floppy.c | 668 +++++++--------------------------------- drivers/ide/ide-floppy.h | 63 ++++ drivers/ide/ide-floppy_ioctl.c | 243 +++++++++++++++ drivers/ide/ide-generic.c | 55 +++- drivers/ide/ide-io.c | 77 ++--- drivers/ide/ide-ioctls.c | 289 +++++++++++++++++ drivers/ide/ide-iops.c | 225 ++++---------- drivers/ide/ide-lib.c | 73 +++--- drivers/ide/ide-probe.c | 252 +++++++-------- drivers/ide/ide-proc.c | 300 ++++++------------- drivers/ide/ide-tape.c | 471 ++++++++-------------------- drivers/ide/ide-taskfile.c | 156 ++-------- drivers/ide/ide-timings.c | 22 +- drivers/ide/ide.c | 167 ++--------- drivers/ide/legacy/ali14xx.c | 1 - drivers/ide/legacy/buddha.c | 1 - drivers/ide/legacy/dtc2278.c | 1 - drivers/ide/legacy/falconide.c | 1 - drivers/ide/legacy/gayle.c | 1 - drivers/ide/legacy/ht6560b.c | 1 - drivers/ide/legacy/ide-cs.c | 1 - drivers/ide/legacy/macide.c | 1 - drivers/ide/legacy/q40ide.c | 2 - drivers/ide/legacy/qd65xx.c | 23 +- drivers/ide/legacy/umc8672.c | 1 - drivers/ide/pci/aec62xx.c | 9 +- drivers/ide/pci/alim15x3.c | 11 +- drivers/ide/pci/amd74xx.c | 10 +- drivers/ide/pci/atiixp.c | 5 +- drivers/ide/pci/cmd640.c | 43 ++-- drivers/ide/pci/cmd64x.c | 7 +- drivers/ide/pci/cs5520.c | 5 +- drivers/ide/pci/cs5530.c | 21 +- drivers/ide/pci/cs5535.c | 16 +- drivers/ide/pci/cy82c693.c | 8 +- drivers/ide/pci/delkin_cb.c | 1 - drivers/ide/pci/generic.c | 5 +- drivers/ide/pci/hpt34x.c | 7 +- drivers/ide/pci/hpt366.c | 81 +++-- drivers/ide/pci/it8213.c | 5 +- drivers/ide/pci/it821x.c | 62 ++-- drivers/ide/pci/jmicron.c | 5 +- drivers/ide/pci/ns87415.c | 11 +- drivers/ide/pci/opti621.c | 9 +- drivers/ide/pci/pdc202xx_new.c | 19 +- drivers/ide/pci/pdc202xx_old.c | 13 +- drivers/ide/pci/piix.c | 7 +- drivers/ide/pci/rz1000.c | 1 - drivers/ide/pci/sc1200.c | 15 +- drivers/ide/pci/scc_pata.c | 7 +- drivers/ide/pci/serverworks.c | 11 +- drivers/ide/pci/sgiioc4.c | 5 +- drivers/ide/pci/siimage.c | 21 +- drivers/ide/pci/sis5513.c | 9 +- drivers/ide/pci/sl82c105.c | 9 +- drivers/ide/pci/slc90e66.c | 5 +- drivers/ide/pci/tc86c001.c | 2 +- drivers/ide/pci/triflex.c | 5 +- drivers/ide/pci/trm290.c | 1 - drivers/ide/pci/via82cxxx.c | 14 +- drivers/ide/ppc/pmac.c | 6 +- drivers/ide/setup-pci.c | 33 ++ drivers/scsi/ide-scsi.c | 120 +++----- include/linux/ata.h | 265 +++++++++++++--- include/linux/ide.h | 285 +++++++++++------ 78 files changed, 2498 insertions(+), 2599 deletions(-) create mode 100644 drivers/ide/ide-floppy.h create mode 100644 drivers/ide/ide-floppy_ioctl.c create mode 100644 drivers/ide/ide-ioctls.c Merging libata/NEXT $ git merge libata/NEXT Already up-to-date. Merging nfs/linux-next $ git merge nfs/linux-next Already up-to-date. Merging xfs/master $ git merge xfs/master Merge made by recursive. fs/xfs/linux-2.6/xfs_aops.c | 3 +- fs/xfs/linux-2.6/xfs_buf.c | 8 +-- fs/xfs/linux-2.6/xfs_export.c | 10 +- fs/xfs/linux-2.6/xfs_fs_subr.c | 6 +- fs/xfs/linux-2.6/xfs_ioctl.c | 4 +- fs/xfs/linux-2.6/xfs_iops.c | 119 ++++++++++++++++++++++--- fs/xfs/linux-2.6/xfs_iops.h | 12 +-- fs/xfs/linux-2.6/xfs_linux.h | 2 +- fs/xfs/linux-2.6/xfs_lrw.c | 2 +- fs/xfs/linux-2.6/xfs_super.c | 193 ++++++++++++---------------------------- fs/xfs/linux-2.6/xfs_super.h | 3 - fs/xfs/linux-2.6/xfs_vnode.c | 20 +---- fs/xfs/linux-2.6/xfs_vnode.h | 67 +++++--------- fs/xfs/quota/xfs_dquot.c | 2 +- fs/xfs/quota/xfs_qm_syscalls.c | 4 +- fs/xfs/xfs_acl.c | 52 +++++------ fs/xfs/xfs_acl.h | 14 ++-- fs/xfs/xfs_arch.h | 68 -------------- fs/xfs/xfs_attr.c | 110 ++++++++++++++--------- fs/xfs/xfs_attr.h | 1 + fs/xfs/xfs_attr_leaf.c | 75 ++-------------- fs/xfs/xfs_attr_leaf.h | 2 - fs/xfs/xfs_bit.c | 103 --------------------- fs/xfs/xfs_bit.h | 34 ++++++- fs/xfs/xfs_bmap.c | 8 +- fs/xfs/xfs_btree.c | 105 ++++++++-------------- fs/xfs/xfs_btree.h | 8 +-- fs/xfs/xfs_dfrag.c | 33 ++----- fs/xfs/xfs_error.c | 5 +- fs/xfs/xfs_error.h | 12 +-- fs/xfs/xfs_ialloc_btree.c | 30 +++--- fs/xfs/xfs_iget.c | 16 +++- fs/xfs/xfs_inode.c | 30 +++---- fs/xfs/xfs_inode.h | 18 +++- fs/xfs/xfs_itable.c | 4 +- fs/xfs/xfs_mount.c | 9 +-- fs/xfs/xfs_mount.h | 1 + fs/xfs/xfs_rtalloc.c | 19 ++--- fs/xfs/xfs_trans.c | 75 ++++++++++++++-- fs/xfs/xfs_trans.h | 12 +--- fs/xfs/xfs_trans_buf.c | 12 ++-- fs/xfs/xfs_trans_item.c | 66 +++++++------- fs/xfs/xfs_utils.c | 4 +- fs/xfs/xfs_utils.h | 3 - fs/xfs/xfs_vfsops.c | 13 ++-- fs/xfs/xfs_vnodeops.c | 189 +++++++++++---------------------------- 46 files changed, 634 insertions(+), 952 deletions(-) Merging infiniband/for-next $ git merge infiniband/for-next Already up-to-date. Merging acpi/test $ git merge acpi/test Auto-merged Documentation/kernel-parameters.txt Auto-merged MAINTAINERS Merge made by recursive. Documentation/kernel-parameters.txt | 118 ++++-- MAINTAINERS | 9 +- drivers/acpi/Kconfig | 11 + drivers/acpi/Makefile | 6 + drivers/acpi/bus.c | 53 ++- drivers/acpi/dock.c | 11 +- drivers/acpi/ec.c | 2 + drivers/acpi/events/evgpe.c | 2 - drivers/acpi/executer/exconfig.c | 119 ++++-- drivers/acpi/glue.c | 40 ++ drivers/acpi/hardware/hwsleep.c | 7 + drivers/acpi/namespace/nsnames.c | 34 +- drivers/acpi/namespace/nsxfeval.c | 79 ++++ drivers/acpi/namespace/nsxfname.c | 5 + drivers/acpi/pcc_acpi.c | 779 +++++++++++++++++++++++++++++++++++ drivers/acpi/pci_link.c | 12 +- drivers/acpi/power.c | 68 ++- drivers/acpi/resources/rscalc.c | 3 + drivers/acpi/scan.c | 80 ++-- drivers/acpi/tables/tbinstal.c | 61 +++- drivers/acpi/utilities/utalloc.c | 8 +- drivers/acpi/utilities/utdelete.c | 13 +- drivers/acpi/utilities/utglobal.c | 44 ++- drivers/acpi/utilities/utobject.c | 21 +- drivers/acpi/utilities/utxface.c | 7 +- drivers/acpi/video.c | 35 +- drivers/acpi/video_detect.c | 268 ++++++++++++ drivers/acpi/wmi.c | 12 +- drivers/misc/acer-wmi.c | 42 ++- drivers/misc/asus-laptop.c | 10 +- drivers/misc/compal-laptop.c | 12 +- drivers/misc/eeepc-laptop.c | 12 +- drivers/misc/fujitsu-laptop.c | 26 +- drivers/misc/msi-laptop.c | 16 +- drivers/misc/sony-laptop.c | 6 +- drivers/misc/thinkpad_acpi.c | 29 +- drivers/pnp/pnpacpi/core.c | 6 +- include/acpi/acconfig.h | 2 +- include/acpi/acdisasm.h | 4 + include/acpi/acmacros.h | 248 +++++------ include/acpi/acnamesp.h | 2 +- include/acpi/acpi_bus.h | 2 + include/acpi/acpi_drivers.h | 1 + include/acpi/actbl1.h | 51 ++- include/acpi/actypes.h | 3 +- include/acpi/acutils.h | 4 +- include/linux/acpi.h | 52 ++- 47 files changed, 2033 insertions(+), 402 deletions(-) create mode 100644 drivers/acpi/pcc_acpi.c create mode 100644 drivers/acpi/video_detect.c $ git am -3 ../patches/0001-acpi-missing-status-declaration-in-acer-wmi.c.patch Applying acpi: missing status declaration in acer-wmi.c $ git reset HEAD^ drivers/misc/acer-wmi.c: needs update $ git commit -v -a --amend Created commit 376348a: Merge commit 'acpi/test' Merging blackfin/for-linus $ git merge blackfin/for-linus Already up-to-date. Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Auto-merged MAINTAINERS Merge made by recursive. MAINTAINERS | 4 +- fs/Kconfig | 8 ++ fs/Makefile | 3 +- fs/lockd/svc.c | 2 +- fs/lockd/svc4proc.c | 4 +- fs/lockd/svcproc.c | 4 +- fs/nfs/callback.c | 3 +- fs/nfsd/export.c | 6 +- fs/nfsd/nfs3proc.c | 8 ++- fs/nfsd/nfs4callback.c | 3 +- fs/nfsd/nfs4xdr.c | 171 +++++++++++++++++++++++--------------------- fs/nfsd/nfsfh.c | 30 +++++--- fs/nfsd/nfsproc.c | 6 +- fs/nfsd/nfssvc.c | 1 + fs/nfsd/vfs.c | 4 +- fs/proc/proc_misc.c | 4 + include/linux/fs.h | 55 ++++++++++++-- include/linux/nfsd/nfsd.h | 3 +- include/linux/sunrpc/svc.h | 9 ++- kernel/sys_ni.c | 1 + kernel/sysctl.c | 6 ++- net/sunrpc/svc.c | 11 ++-- net/sunrpc/svc_xprt.c | 39 +++++++++-- 23 files changed, 248 insertions(+), 137 deletions(-) Merging ieee1394/for-next $ git merge ieee1394/for-next Auto-merged drivers/firewire/fw-sbp2.c Merge made by recursive. drivers/firewire/fw-card.c | 56 +++++++++--------------------------- drivers/firewire/fw-device.c | 37 ++++-------------------- drivers/firewire/fw-sbp2.c | 46 ++++++++---------------------- drivers/firewire/fw-transaction.c | 48 +++++++++++++++++++++++++++++-- drivers/firewire/fw-transaction.h | 9 ++++-- drivers/ieee1394/csr1212.c | 2 +- drivers/ieee1394/eth1394.c | 2 +- 7 files changed, 84 insertions(+), 116 deletions(-) Merging ubi/linux-next $ git merge ubi/linux-next Already up-to-date. Merging kvm/master $ git merge kvm/master Merge made by recursive. arch/powerpc/include/asm/kvm_host.h | 14 +- arch/powerpc/include/asm/kvm_ppc.h | 12 + arch/powerpc/kernel/asm-offsets.c | 4 +- arch/powerpc/kvm/44x_tlb.c | 49 +++- arch/powerpc/kvm/Kconfig | 11 + arch/powerpc/kvm/Makefile | 6 +- arch/powerpc/kvm/booke_guest.c | 17 + arch/powerpc/kvm/booke_interrupts.S | 79 +++-- arch/powerpc/kvm/emulate.c | 8 +- arch/powerpc/kvm/powerpc.c | 99 ++++++- arch/x86/kernel/kvmclock.c | 30 ++ arch/x86/kernel/pvclock.c | 12 + arch/x86/kvm/i8254.c | 70 ++-- arch/x86/kvm/i8254.h | 7 +- arch/x86/kvm/i8259.c | 30 ++- arch/x86/kvm/irq.c | 36 ++- arch/x86/kvm/irq.h | 10 +- arch/x86/kvm/kvm_cache_regs.h | 32 ++ arch/x86/kvm/lapic.c | 11 +- arch/x86/kvm/mmu.c | 43 +-- arch/x86/kvm/svm.c | 138 +++----- arch/x86/kvm/vmx.c | 428 +++++++++++++------------ arch/x86/kvm/vmx.h | 4 +- arch/x86/kvm/x86.c | 621 ++++++++++++++++++++++++++--------- arch/x86/kvm/x86.h | 22 ++ arch/x86/kvm/x86_emulate.c | 19 +- arch/x86/xen/time.c | 11 +- include/asm-x86/kvm.h | 22 -- include/asm-x86/kvm_host.h | 77 +++-- include/asm-x86/pvclock.h | 1 + include/linux/kvm.h | 67 ++++- include/linux/kvm_host.h | 19 + virt/kvm/ioapic.c | 20 +- virt/kvm/ioapic.h | 3 +- virt/kvm/kvm_main.c | 68 +++-- virt/kvm/kvm_trace.c | 30 +- 36 files changed, 1426 insertions(+), 704 deletions(-) create mode 100644 arch/x86/kvm/kvm_cache_regs.h create mode 100644 arch/x86/kvm/x86.h Merging dlm/next $ git merge dlm/next Merge made by recursive. fs/dlm/config.c | 203 +++++++++++++++++++++++++++++-------------------------- fs/dlm/user.c | 10 ++- 2 files changed, 114 insertions(+), 99 deletions(-) Merging scsi/master $ git merge scsi/master Already up-to-date. Merging ia64/test $ git merge ia64/test Already up-to-date. Merging tests/master $ git merge tests/master Auto-merged Makefile Auto-merged drivers/misc/Makefile Auto-merged kernel/Makefile Auto-merged lib/Kconfig.debug Merge made by recursive. Makefile | 1 + drivers/misc/Makefile | 1 - kernel/Makefile | 4 - lib/Kconfig.debug | 93 +-------------------- lib/Makefile | 1 - tests/Kconfig | 101 +++++++++++++++++++++++ tests/Makefile | 10 ++ {kernel => tests}/backtracetest.c | 0 {drivers/misc => tests}/lkdtm.c | 0 {lib => tests}/locking-selftest-hardirq.h | 0 {lib => tests}/locking-selftest-mutex.h | 0 {lib => tests}/locking-selftest-rlock-hardirq.h | 0 {lib => tests}/locking-selftest-rlock-softirq.h | 0 {lib => tests}/locking-selftest-rlock.h | 0 {lib => tests}/locking-selftest-rsem.h | 0 {lib => tests}/locking-selftest-softirq.h | 0 {lib => tests}/locking-selftest-spin-hardirq.h | 0 {lib => tests}/locking-selftest-spin-softirq.h | 0 {lib => tests}/locking-selftest-spin.h | 0 {lib => tests}/locking-selftest-wlock-hardirq.h | 0 {lib => tests}/locking-selftest-wlock-softirq.h | 0 {lib => tests}/locking-selftest-wlock.h | 0 {lib => tests}/locking-selftest-wsem.h | 0 {lib => tests}/locking-selftest.c | 0 {kernel => tests}/rcutorture.c | 0 {kernel => tests}/rtmutex-tester.c | 2 +- {kernel => tests}/test_kprobes.c | 0 27 files changed, 115 insertions(+), 98 deletions(-) create mode 100644 tests/Kconfig create mode 100644 tests/Makefile rename {kernel => tests}/backtracetest.c (100%) rename {drivers/misc => tests}/lkdtm.c (100%) rename {lib => tests}/locking-selftest-hardirq.h (100%) rename {lib => tests}/locking-selftest-mutex.h (100%) rename {lib => tests}/locking-selftest-rlock-hardirq.h (100%) rename {lib => tests}/locking-selftest-rlock-softirq.h (100%) rename {lib => tests}/locking-selftest-rlock.h (100%) rename {lib => tests}/locking-selftest-rsem.h (100%) rename {lib => tests}/locking-selftest-softirq.h (100%) rename {lib => tests}/locking-selftest-spin-hardirq.h (100%) rename {lib => tests}/locking-selftest-spin-softirq.h (100%) rename {lib => tests}/locking-selftest-spin.h (100%) rename {lib => tests}/locking-selftest-wlock-hardirq.h (100%) rename {lib => tests}/locking-selftest-wlock-softirq.h (100%) rename {lib => tests}/locking-selftest-wlock.h (100%) rename {lib => tests}/locking-selftest-wsem.h (100%) rename {lib => tests}/locking-selftest.c (100%) rename {kernel => tests}/rcutorture.c (100%) rename {kernel => tests}/rtmutex-tester.c (99%) rename {kernel => tests}/test_kprobes.c (100%) Merging ocfs2/linux-next $ git merge ocfs2/linux-next Merge made by recursive. fs/ocfs2/cluster/netdebug.c | 26 ++++++++++---------- fs/ocfs2/cluster/tcp.c | 44 ++++++++++++++++++++++++++++----- fs/ocfs2/cluster/tcp_internal.h | 32 ------------------------ fs/ocfs2/dir.c | 7 ++++- fs/ocfs2/file.c | 51 +++++++++++++++++++++++++++++++++++++++ fs/ocfs2/file.h | 2 + fs/ocfs2/inode.c | 15 ++++++++++- fs/ocfs2/locks.c | 15 +++++++++++ fs/ocfs2/locks.h | 1 + fs/ocfs2/stack_user.c | 33 +++++++++++++++++++++++++ fs/ocfs2/stackglue.c | 20 +++++++++++++++ fs/ocfs2/stackglue.h | 19 ++++++++++++++ 12 files changed, 210 insertions(+), 55 deletions(-) Merging quilt/m68k $ git merge quilt/m68k Merge made by recursive. arch/m68k/atari/time.c | 35 ++++++++++++++++++----------------- arch/m68k/bvme6000/config.c | 15 +-------------- arch/m68k/bvme6000/rtc.c | 30 +++++++++++++++--------------- arch/m68k/kernel/traps.c | 9 +++------ arch/m68k/mvme16x/rtc.c | 26 +++++++++++++------------- arch/m68k/q40/config.c | 12 +----------- arch/m68k/sun3x/time.c | 28 ++++++++++++++-------------- 7 files changed, 65 insertions(+), 90 deletions(-) Merging powerpc/powerpc-next $ git merge powerpc/powerpc-next Already up-to-date. Merging ext4/next $ git merge ext4/next Already up-to-date. Merging 4xx/next $ git merge 4xx/next Already up-to-date. Merging async_tx/next $ git merge async_tx/next Already up-to-date. Merging udf/for_next $ git merge udf/for_next Already uptodate! Merge made by recursive. Merging net/master $ git merge net/master Already up-to-date. Merging sparc/master $ git merge sparc/master Already up-to-date. Merging galak/powerpc-next $ git merge galak/powerpc-next Already up-to-date. Merging mtd/master $ git merge mtd/master Removed drivers/mtd/maps/ebony.c Removed drivers/mtd/maps/ocotea.c Removed drivers/mtd/maps/omap-toto-flash.c Removed drivers/mtd/maps/walnut.c Auto-merged drivers/mtd/mtdchar.c Removed drivers/mtd/nand/toto.c Merge made by recursive. arch/arm/plat-omap/include/mach/onenand.h | 6 +- drivers/mtd/Kconfig | 5 + drivers/mtd/chips/Kconfig | 3 +- drivers/mtd/chips/cfi_cmdset_0001.c | 54 ++- drivers/mtd/chips/cfi_probe.c | 58 +-- drivers/mtd/chips/cfi_util.c | 66 +++- drivers/mtd/chips/gen_probe.c | 2 +- drivers/mtd/devices/Kconfig | 21 + drivers/mtd/devices/m25p80.c | 136 ++++-- drivers/mtd/devices/mtd_dataflash.c | 214 ++++++++- drivers/mtd/maps/Kconfig | 31 -- drivers/mtd/maps/Makefile | 4 - drivers/mtd/maps/ebony.c | 163 ------ drivers/mtd/maps/ocotea.c | 154 ------ drivers/mtd/maps/omap-toto-flash.c | 133 ----- drivers/mtd/maps/walnut.c | 122 ----- drivers/mtd/mtdchar.c | 4 +- drivers/mtd/mtdconcat.c | 4 +- drivers/mtd/mtdpart.c | 4 +- drivers/mtd/nand/Kconfig | 6 - drivers/mtd/nand/Makefile | 1 - drivers/mtd/nand/nand_base.c | 2 +- drivers/mtd/nand/nandsim.c | 1 - drivers/mtd/nand/toto.c | 206 -------- drivers/mtd/onenand/Kconfig | 8 + drivers/mtd/onenand/Makefile | 1 + drivers/mtd/onenand/omap2.c | 777 +++++++++++++++++++++++++++++ drivers/mtd/onenand/onenand_base.c | 2 +- drivers/mtd/ssfdc.c | 3 +- fs/jffs2/erase.c | 4 +- include/linux/mtd/cfi.h | 9 +- include/linux/mtd/flashchip.h | 4 + include/linux/mtd/mtd.h | 4 +- include/linux/mtd/onenand_regs.h | 2 + 34 files changed, 1249 insertions(+), 965 deletions(-) delete mode 100644 drivers/mtd/maps/ebony.c delete mode 100644 drivers/mtd/maps/ocotea.c delete mode 100644 drivers/mtd/maps/omap-toto-flash.c delete mode 100644 drivers/mtd/maps/walnut.c delete mode 100644 drivers/mtd/nand/toto.c create mode 100644 drivers/mtd/onenand/omap2.c Merging wireless/master $ git merge wireless/master Already up-to-date. Merging crypto/master $ git merge crypto/master Auto-merged include/asm-x86/cpufeature.h CONFLICT (content): Merge conflict in include/asm-x86/cpufeature.h Resolved 'include/asm-x86/cpufeature.h' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit ab1804e: Merge commit 'crypto/master' $ git diff -M --stat --summary HEAD^.. arch/x86/crypto/Makefile | 2 + arch/x86/crypto/crc32c-intel.c | 197 + crypto/Kconfig | 101 +- crypto/Makefile | 2 + crypto/algapi.c | 147 +- crypto/{cryptomgr.c => algboss.c} | 86 +- crypto/api.c | 95 +- crypto/digest.c | 2 +- crypto/internal.h | 14 +- crypto/proc.c | 42 +- crypto/tcrypt.c | 1337 +----- crypto/tcrypt.h | 8709 +------------------------------------ crypto/testmgr.c | 1744 ++++++++ crypto/testmgr.h | 8738 +++++++++++++++++++++++++++++++++++++ drivers/crypto/talitos.c | 54 +- include/asm-x86/cpufeature.h | 2 + include/crypto/hash.h | 18 + include/linux/crypto.h | 10 + 18 files changed, 11292 insertions(+), 10008 deletions(-) create mode 100644 arch/x86/crypto/crc32c-intel.c rename crypto/{cryptomgr.c => algboss.c} (70%) create mode 100644 crypto/testmgr.c create mode 100644 crypto/testmgr.h Merging vfs/for-next $ git merge vfs/for-next Auto-merged fs/nfsd/export.c CONFLICT (content): Merge conflict in fs/nfsd/export.c Auto-merged fs/nfsd/vfs.c Auto-merged fs/reiserfs/super.c Auto-merged fs/xfs/linux-2.6/xfs_export.c CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_export.c Auto-merged fs/xfs/linux-2.6/xfs_ioctl.c Auto-merged fs/xfs/linux-2.6/xfs_iops.c CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_iops.c Resolved 'fs/nfsd/export.c' using previous resolution. Resolved 'fs/xfs/linux-2.6/xfs_export.c' using previous resolution. Resolved 'fs/xfs/linux-2.6/xfs_iops.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit aeb55d9: Merge commit 'vfs/for-next' $ git diff -M --stat --summary HEAD^.. arch/alpha/kernel/osf_sys.c | 19 +++-- arch/ia64/ia32/sys_ia32.c | 14 ++- arch/parisc/hpux/fs.c | 30 ++++-- arch/powerpc/kernel/sys_ppc32.c | 17 ++- arch/powerpc/platforms/cell/spufs/syscalls.c | 4 +- drivers/md/dm-table.c | 21 +--- fs/block_dev.c | 14 ++-- fs/char_dev.c | 21 +++-- fs/compat.c | 8 +- fs/configfs/symlink.c | 16 ++-- fs/dcache.c | 87 +++++++++--------- fs/dquot.c | 10 +- fs/ecryptfs/main.c | 23 ++--- fs/efs/namei.c | 32 +------ fs/exportfs/expfs.c | 9 +- fs/ext2/namei.c | 13 +--- fs/ext3/namei.c | 14 +--- fs/ext3/super.c | 22 ++-- fs/ext4/namei.c | 14 +--- fs/ext4/super.c | 22 ++-- fs/fat/inode.c | 52 ++++------- fs/fuse/inode.c | 23 ++--- fs/gfs2/ops_export.c | 33 ++----- fs/gfs2/ops_inode.c | 2 +- fs/hpfs/file.c | 2 +- fs/hpfs/hpfs_fn.h | 2 +- fs/hpfs/inode.c | 29 ++++-- fs/hpfs/namei.c | 2 +- fs/isofs/export.c | 33 +------ fs/jffs2/super.c | 48 ++++++++++ fs/jfs/namei.c | 15 +--- fs/libfs.c | 26 +----- fs/namei.c | 75 +++++++-------- fs/namespace.c | 126 ++++++++++++------------- fs/nfs/dir.c | 6 +- fs/nfs/getroot.c | 6 +- fs/nfsd/export.c | 125 ++++++++++++------------- fs/nfsd/nfs4recover.c | 50 +++++----- fs/nfsd/nfs4state.c | 8 +- fs/nfsd/nfsctl.c | 8 +- fs/nfsd/vfs.c | 118 ++++++++++++++++++++--- fs/ntfs/namei.c | 111 +--------------------- fs/ocfs2/export.c | 30 +----- fs/proc/generic.c | 1 + fs/read_write.c | 58 ++++++++---- fs/readdir.c | 8 +- fs/reiserfs/inode.c | 13 +-- fs/reiserfs/namei.c | 11 +-- fs/reiserfs/super.c | 18 ++-- fs/udf/namei.c | 17 +--- fs/xfs/linux-2.6/xfs_export.c | 32 +------ fs/xfs/linux-2.6/xfs_file.c | 128 -------------------------- fs/xfs/linux-2.6/xfs_ioctl.c | 3 +- fs/xfs/linux-2.6/xfs_iops.c | 2 +- include/linux/dcache.h | 4 +- include/linux/namei.h | 7 +- kernel/audit_tree.c | 48 +++++----- net/unix/af_unix.c | 18 ++-- 58 files changed, 709 insertions(+), 999 deletions(-) Merging sound/for-next $ git merge sound/for-next Removed include/sound/cs4231.h Auto-merged sound/arm/sa11xx-uda1341.c Auto-merged sound/core/init.c Auto-merged sound/core/sound.c Removed sound/isa/cs423x/cs4231_lib.c Auto-merged sound/pci/hda/hda_intel.c Auto-merged sound/soc/pxa/pxa2xx-pcm.c Auto-merged sound/soc/pxa/spitz.c Merge made by recursive. Documentation/sound/alsa/ALSA-Configuration.txt | 10 +- .../sound/alsa/DocBook/writing-an-alsa-driver.tmpl | 62 +- drivers/media/video/saa7134/saa7134-alsa.c | 13 +- include/sound/ad1848.h | 218 -- include/sound/asound.h | 3 +- include/sound/asoundef.h | 89 +- include/sound/core.h | 30 +- include/sound/cs4231.h | 175 -- include/sound/jack.h | 75 + include/sound/minors.h | 2 + include/sound/pcm.h | 11 +- include/sound/snd_wavefront.h | 1 - include/sound/soc-of-simple.h | 25 + include/sound/soc.h | 74 +- include/sound/vx_core.h | 9 - include/sound/wss.h | 235 ++ sound/arm/sa11xx-uda1341.c | 5 +- sound/core/Kconfig | 6 + sound/core/Makefile | 1 + sound/core/control.c | 50 +- sound/core/control_compat.c | 3 +- sound/core/device.c | 26 +- sound/core/hwdep.c | 16 +- sound/core/info.c | 23 +- sound/core/info_oss.c | 6 +- sound/core/init.c | 3 +- sound/core/jack.c | 163 ++ sound/core/memalloc.c | 41 +- sound/core/oss/copy.c | 30 +- sound/core/oss/io.c | 24 +- sound/core/oss/linear.c | 29 +- sound/core/oss/mixer_oss.c | 18 +- sound/core/oss/mulaw.c | 27 +- sound/core/oss/pcm_oss.c | 52 +- sound/core/oss/pcm_plugin.c | 38 +- sound/core/oss/rate.c | 42 +- sound/core/oss/route.c | 12 +- sound/core/pcm.c | 84 +- sound/core/pcm_compat.c | 3 +- sound/core/pcm_lib.c | 102 +- sound/core/pcm_memory.c | 14 +- sound/core/pcm_native.c | 127 +- sound/core/pcm_timer.c | 6 +- sound/core/rawmidi.c | 25 +- sound/core/rtctimer.c | 6 +- sound/core/seq/oss/seq_oss.c | 12 +- sound/core/seq/oss/seq_oss_synth.c | 6 +- sound/core/seq/seq_clientmgr.c | 30 +- sound/core/seq/seq_compat.c | 3 +- sound/core/seq/seq_device.c | 6 +- sound/core/seq/seq_fifo.c | 15 +- sound/core/seq/seq_memory.c | 12 +- sound/core/seq/seq_midi.c | 15 +- sound/core/seq/seq_ports.c | 13 +- sound/core/seq/seq_prioq.c | 4 +- sound/core/seq/seq_queue.c | 6 +- sound/core/seq/seq_timer.c | 24 +- sound/core/sound.c | 14 +- sound/core/sound_oss.c | 12 +- sound/core/timer.c | 33 +- sound/core/timer_compat.c | 9 +- sound/drivers/dummy.c | 3 +- sound/drivers/opl3/opl3_lib.c | 6 +- sound/drivers/opl3/opl3_midi.c | 6 +- sound/drivers/opl3/opl3_oss.c | 15 +- sound/drivers/opl3/opl3_synth.c | 3 +- sound/drivers/opl4/opl4_synth.c | 2 +- sound/drivers/vx/vx_cmd.c | 3 +- sound/drivers/vx/vx_core.c | 21 +- sound/drivers/vx/vx_hwdep.c | 6 +- sound/drivers/vx/vx_mixer.c | 3 +- sound/drivers/vx/vx_pcm.c | 9 +- sound/drivers/vx/vx_uer.c | 6 +- sound/i2c/cs8427.c | 15 +- sound/i2c/i2c.c | 6 +- sound/i2c/l3/uda1341.c | 3 +- sound/i2c/other/ak4114.c | 3 +- sound/i2c/other/ak4117.c | 3 +- sound/isa/Kconfig | 42 +- sound/isa/Makefile | 2 +- sound/isa/ad1816a/ad1816a_lib.c | 6 +- sound/isa/ad1848/Makefile | 2 - sound/isa/ad1848/ad1848.c | 17 +- sound/isa/ad1848/ad1848_lib.c | 1267 ----------- sound/isa/azt2320.c | 29 +- sound/isa/cmi8330.c | 106 +- sound/isa/cs423x/Makefile | 2 - sound/isa/cs423x/cs4231.c | 18 +- sound/isa/cs423x/cs4231_lib.c | 1945 ---------------- sound/isa/cs423x/cs4236.c | 51 +- sound/isa/cs423x/cs4236_lib.c | 349 ++-- sound/isa/es1688/es1688_lib.c | 3 +- sound/isa/gus/gus_main.c | 6 +- sound/isa/gus/gus_mixer.c | 6 +- sound/isa/gus/gus_pcm.c | 12 +- sound/isa/gus/gusmax.c | 50 +- sound/isa/gus/interwave.c | 67 +- sound/isa/opl3sa2.c | 36 +- sound/isa/opti9xx/miro.c | 28 +- sound/isa/opti9xx/opti92x-ad1848.c | 70 +- sound/isa/sb/emu8000.c | 3 +- sound/isa/sb/emu8000_patch.c | 3 +- sound/isa/sb/sb16_csp.c | 9 +- sound/isa/sb/sb16_main.c | 3 +- sound/isa/sb/sb8_main.c | 8 +- sound/isa/sb/sb_common.c | 3 +- sound/isa/sb/sb_mixer.c | 9 +- sound/isa/sc6000.c | 18 +- sound/isa/sgalaxy.c | 43 +- sound/isa/sscape.c | 63 +- sound/isa/wavefront/wavefront.c | 62 +- sound/isa/wavefront/wavefront_fx.c | 8 +- sound/isa/wavefront/wavefront_midi.c | 24 +- sound/isa/wavefront/wavefront_synth.c | 7 +- sound/isa/wss/Makefile | 10 + sound/isa/wss/wss_lib.c | 2322 ++++++++++++++++++++ sound/mips/au1x00.c | 6 +- sound/parisc/harmony.c | 3 +- sound/pci/Kconfig | 24 +- sound/pci/ac97/ac97_codec.c | 39 +- sound/pci/ac97/ac97_patch.c | 8 + sound/pci/ad1889.c | 6 +- sound/pci/ak4531_codec.c | 10 +- sound/pci/atiixp.c | 10 +- sound/pci/atiixp_modem.c | 10 +- sound/pci/au88x0/au88x0_core.c | 2 +- sound/pci/azt3328.c | 6 +- sound/pci/ca0106/ca_midi.c | 20 +- sound/pci/cmipci.c | 9 +- sound/pci/cs4281.c | 13 +- sound/pci/cs46xx/cs46xx_lib.c | 72 +- sound/pci/cs46xx/dsp_spos.c | 51 +- sound/pci/cs46xx/dsp_spos_scb_lib.c | 115 +- sound/pci/echoaudio/darla20_dsp.c | 3 +- sound/pci/echoaudio/darla24_dsp.c | 8 +- sound/pci/echoaudio/echo3g_dsp.c | 9 +- sound/pci/echoaudio/echoaudio.c | 8 +- sound/pci/echoaudio/echoaudio_3g.c | 11 +- sound/pci/echoaudio/echoaudio_dsp.c | 21 +- sound/pci/echoaudio/echoaudio_gml.c | 6 +- sound/pci/echoaudio/gina20_dsp.c | 6 +- sound/pci/echoaudio/gina24_dsp.c | 11 +- sound/pci/echoaudio/indigo_dsp.c | 8 +- sound/pci/echoaudio/indigodj_dsp.c | 8 +- sound/pci/echoaudio/indigoio_dsp.c | 8 +- sound/pci/echoaudio/layla20_dsp.c | 9 +- sound/pci/echoaudio/layla24_dsp.c | 11 +- sound/pci/echoaudio/mia_dsp.c | 13 +- sound/pci/echoaudio/midi.c | 6 +- sound/pci/echoaudio/mona_dsp.c | 6 +- sound/pci/emu10k1/emu10k1_callback.c | 6 +- sound/pci/emu10k1/emu10k1_patch.c | 23 +- sound/pci/emu10k1/emu10k1x.c | 18 +- sound/pci/emu10k1/emufx.c | 6 +- sound/pci/emu10k1/emumpu401.c | 18 +- sound/pci/emu10k1/memory.c | 19 +- sound/pci/emu10k1/voice.c | 9 +- sound/pci/es1938.c | 3 +- sound/pci/es1968.c | 6 +- sound/pci/hda/Makefile | 1 + sound/pci/hda/hda_beep.c | 134 ++ sound/pci/hda/hda_beep.h | 44 + sound/pci/hda/hda_codec.c | 25 +- sound/pci/hda/hda_codec.h | 10 + sound/pci/hda/hda_generic.c | 3 +- sound/pci/hda/hda_intel.c | 3 +- sound/pci/hda/patch_analog.c | 6 + sound/pci/hda/patch_realtek.c | 56 +- sound/pci/hda/patch_sigmatel.c | 346 +++- sound/pci/ice1712/ak4xxx.c | 3 +- sound/pci/ice1712/ews.c | 9 +- sound/pci/ice1712/ice1712.c | 3 +- sound/pci/ice1712/ice1724.c | 3 +- sound/pci/ice1712/juli.c | 3 +- sound/pci/ice1712/phase.c | 12 + sound/pci/ice1712/phase.h | 4 +- sound/pci/ice1712/revo.c | 12 +- sound/pci/intel8x0.c | 4 +- sound/pci/intel8x0m.c | 3 +- sound/pci/korg1212/korg1212.c | 9 +- sound/pci/maestro3.c | 10 +- sound/pci/mixart/mixart.c | 4 +- sound/pci/mixart/mixart_core.c | 18 +- sound/pci/mixart/mixart_hwdep.c | 19 +- sound/pci/mixart/mixart_mixer.c | 8 +- sound/pci/nm256/nm256.c | 15 +- sound/pci/oxygen/virtuoso.c | 73 +- sound/pci/pcxhr/pcxhr.c | 6 +- sound/pci/pcxhr/pcxhr_core.c | 27 +- sound/pci/pcxhr/pcxhr_hwdep.c | 15 +- sound/pci/riptide/riptide.c | 18 +- sound/pci/rme9652/hdsp.c | 25 +- sound/pci/rme9652/hdspm.c | 34 +- sound/pci/rme9652/rme9652.c | 23 +- sound/pci/sonicvibes.c | 10 +- sound/pci/trident/trident_main.c | 22 +- sound/pci/trident/trident_memory.c | 24 +- sound/pci/via82xx.c | 8 +- sound/pci/via82xx_modem.c | 3 +- sound/pci/vx222/vx222_ops.c | 12 +- sound/pci/ymfpci/ymfpci_main.c | 21 +- sound/pcmcia/vx/vxp_ops.c | 3 +- sound/ppc/awacs.c | 23 +- sound/ppc/beep.c | 6 +- sound/ppc/tumbler.c | 17 +- sound/sh/aica.c | 3 +- sound/soc/codecs/Kconfig | 38 + sound/soc/codecs/Makefile | 8 + sound/soc/codecs/ad1980.c | 309 +++ sound/soc/codecs/ad1980.h | 23 + sound/soc/codecs/cs4270.c | 71 +- sound/soc/codecs/tlv320aic26.c | 520 +++++ sound/soc/codecs/tlv320aic26.h | 96 + sound/soc/codecs/wm8580.c | 1055 +++++++++ sound/soc/codecs/wm8580.h | 42 + sound/soc/codecs/wm8900.c | 1542 +++++++++++++ sound/soc/codecs/wm8900.h | 64 + sound/soc/fsl/Kconfig | 10 + sound/soc/fsl/Makefile | 5 + sound/soc/fsl/mpc5200_psc_i2s.c | 884 ++++++++ sound/soc/fsl/mpc8610_hpcd.c | 26 +- sound/soc/fsl/soc-of-simple.c | 171 ++ sound/soc/pxa/pxa2xx-pcm.c | 4 +- sound/soc/soc-core.c | 132 +- sound/soc/soc-dapm.c | 66 +- sound/sparc/amd7930.c | 19 +- sound/sparc/cs4231.c | 3 +- sound/sparc/dbri.c | 17 +- sound/synth/emux/emux.c | 8 +- sound/synth/emux/emux_nrpn.c | 8 +- sound/synth/emux/emux_oss.c | 42 +- sound/synth/emux/emux_seq.c | 15 +- sound/synth/emux/emux_synth.c | 47 +- sound/synth/util_mem.c | 10 +- sound/usb/Kconfig | 11 + sound/usb/Makefile | 1 + sound/usb/usbaudio.c | 12 +- sound/usb/usbaudio.h | 1 + sound/usb/usbmidi.c | 39 + sound/usb/usbmixer.c | 12 +- sound/usb/usbquirks.h | 31 +- sound/usb/usx2y/Makefile | 2 + sound/usb/usx2y/us122l.c | 692 ++++++ sound/usb/usx2y/us122l.h | 27 + sound/usb/usx2y/usb_stream.c | 761 +++++++ sound/usb/usx2y/usb_stream.h | 112 + 246 files changed, 12417 insertions(+), 5373 deletions(-) delete mode 100644 include/sound/cs4231.h create mode 100644 include/sound/jack.h create mode 100644 include/sound/soc-of-simple.h create mode 100644 include/sound/wss.h create mode 100644 sound/core/jack.c delete mode 100644 sound/isa/cs423x/cs4231_lib.c create mode 100644 sound/isa/wss/Makefile create mode 100644 sound/isa/wss/wss_lib.c create mode 100644 sound/pci/hda/hda_beep.c create mode 100644 sound/pci/hda/hda_beep.h create mode 100644 sound/soc/codecs/ad1980.c create mode 100644 sound/soc/codecs/ad1980.h create mode 100644 sound/soc/codecs/tlv320aic26.c create mode 100644 sound/soc/codecs/tlv320aic26.h create mode 100644 sound/soc/codecs/wm8580.c create mode 100644 sound/soc/codecs/wm8580.h create mode 100644 sound/soc/codecs/wm8900.c create mode 100644 sound/soc/codecs/wm8900.h create mode 100644 sound/soc/fsl/mpc5200_psc_i2s.c create mode 100644 sound/soc/fsl/soc-of-simple.c create mode 100644 sound/usb/usx2y/us122l.c create mode 100644 sound/usb/usx2y/us122l.h create mode 100644 sound/usb/usx2y/usb_stream.c create mode 100644 sound/usb/usx2y/usb_stream.h Merging arm/devel $ git merge arm/devel Auto-merged drivers/watchdog/ixp4xx_wdt.c Merge made by recursive. arch/arm/Kconfig | 5 + arch/arm/include/asm/cacheflush.h | 90 ------ arch/arm/include/asm/cachetype.h | 96 +++++++ arch/arm/include/asm/cputype.h | 64 ++++ arch/arm/include/asm/mmu_context.h | 1 + arch/arm/include/asm/system.h | 58 ---- arch/arm/kernel/setup.c | 46 ++-- arch/arm/mach-iop32x/iq31244.c | 4 +- arch/arm/mach-ixp4xx/common-pci.c | 7 +- arch/arm/mach-ixp4xx/include/mach/cpu.h | 9 +- arch/arm/mach-omap2/id.c | 1 + arch/arm/mach-pxa/include/mach/hardware.h | 2 + arch/arm/mach-sa1100/cpu-sa1100.c | 4 +- arch/arm/mach-sa1100/cpu-sa1110.c | 1 + arch/arm/mach-sa1100/include/mach/SA-1100.h | 8 +- arch/arm/mm/copypage-v6.c | 1 + arch/arm/mm/fault-armv.c | 1 + arch/arm/mm/flush.c | 1 + arch/arm/mm/ioremap.c | 1 + arch/arm/mm/mmap.c | 5 +- arch/arm/mm/mmu.c | 1 + arch/arm/oprofile/Makefile | 1 + arch/arm/oprofile/common.c | 4 + arch/arm/oprofile/op_arm_model.h | 1 + arch/arm/oprofile/op_model_v7.c | 411 +++++++++++++++++++++++++++ arch/arm/oprofile/op_model_v7.h | 103 +++++++ arch/arm/oprofile/op_model_xscale.c | 2 +- arch/arm/plat-omap/include/mach/irqs.h | 2 + drivers/watchdog/ixp4xx_wdt.c | 4 +- 29 files changed, 742 insertions(+), 192 deletions(-) create mode 100644 arch/arm/include/asm/cachetype.h create mode 100644 arch/arm/include/asm/cputype.h create mode 100644 arch/arm/oprofile/op_model_v7.c create mode 100644 arch/arm/oprofile/op_model_v7.h Merging cpufreq/next $ git merge cpufreq/next Auto-merged arch/x86/kernel/cpu/cpufreq/elanfreq.c Auto-merged drivers/cpufreq/cpufreq_conservative.c Auto-merged kernel/time/tick-sched.c Merge made by recursive. arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 13 ++- arch/x86/kernel/cpu/cpufreq/elanfreq.c | 42 ++++---- arch/x86/kernel/cpu/cpufreq/powernow-k6.c | 41 ++++---- drivers/cpufreq/cpufreq.c | 30 ++++-- drivers/cpufreq/cpufreq_conservative.c | 1 + drivers/cpufreq/cpufreq_ondemand.c | 140 ++++++++++++++++++++-------- include/linux/cpufreq.h | 7 +- include/linux/tick.h | 2 +- kernel/time/tick-sched.c | 11 ++- 9 files changed, 186 insertions(+), 101 deletions(-) Merging v9fs/for-next $ git merge v9fs/for-next Already up-to-date. Merging quilt/rr $ git merge quilt/rr Auto-merged arch/x86/Kconfig Auto-merged include/linux/init.h Auto-merged include/linux/kernel.h Auto-merged init/main.c Auto-merged kernel/module.c Auto-merged kernel/stop_machine.c Merge made by recursive. include/linux/compiler-gcc.h | 18 ++++++++++++++++++ include/linux/compiler-intel.h | 2 ++ include/linux/kernel.h | 35 +++++++++++++++++++++++++++++++++++ include/linux/kthread.h | 28 +++++++++++++++++++++++++--- include/linux/stop_machine.h | 13 ++++++++----- kernel/kthread.c | 29 +++++------------------------ kernel/stop_machine.c | 4 ++-- 7 files changed, 95 insertions(+), 34 deletions(-) Merging cifs/master $ git merge cifs/master Merge made by recursive. fs/cifs/cifsfs.c | 2 ++ fs/cifs/inode.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) Merging mmc/next $ git merge mmc/next Already up-to-date. Merging gfs2/master $ git merge gfs2/master Merge made by recursive. fs/gfs2/glock.c | 11 +- fs/gfs2/incore.h | 7 +- fs/gfs2/mount.c | 7 + fs/gfs2/ops_fstype.c | 566 ++++++++++++++++++++++++++++++++++---------------- fs/gfs2/ops_super.c | 57 +++++- fs/gfs2/super.c | 340 ------------------------------ fs/gfs2/super.h | 6 - 7 files changed, 454 insertions(+), 540 deletions(-) Merging input/next $ git merge input/next Auto-merged drivers/input/keyboard/gpio_keys.c Merge made by recursive. drivers/input/gameport/gameport.c | 88 +++- drivers/input/joystick/a3d.c | 3 +- drivers/input/joystick/adi.c | 3 +- drivers/input/joystick/analog.c | 4 +- drivers/input/joystick/cobra.c | 3 +- drivers/input/joystick/gf2k.c | 3 +- drivers/input/joystick/grip.c | 3 +- drivers/input/joystick/grip_mp.c | 3 +- drivers/input/joystick/guillemot.c | 3 +- drivers/input/joystick/interact.c | 3 +- drivers/input/joystick/joydump.c | 3 +- drivers/input/joystick/sidewinder.c | 3 +- drivers/input/joystick/tmdc.c | 3 +- drivers/input/keyboard/atkbd.c | 20 +- drivers/input/keyboard/gpio_keys.c | 42 +- drivers/input/misc/Kconfig | 13 + drivers/input/misc/Makefile | 1 + drivers/input/misc/ati_remote2.c | 263 +++++++++-- drivers/input/misc/cm109.c | 884 +++++++++++++++++++++++++++++++++++ drivers/input/misc/wistron_btns.c | 19 + drivers/input/mouse/appletouch.c | 299 +++++++++--- drivers/input/mouse/logips2pp.c | 4 +- drivers/input/mouse/psmouse-base.c | 12 +- drivers/input/mouse/trackpoint.c | 8 +- drivers/input/tablet/aiptek.c | 53 ++- drivers/input/touchscreen/ads7846.c | 6 +- include/linux/gameport.h | 7 +- include/linux/input.h | 15 +- include/linux/mod_devicetable.h | 2 +- 29 files changed, 1534 insertions(+), 239 deletions(-) create mode 100644 drivers/input/misc/cm109.c Merging semaphore/semaphore $ git merge semaphore/semaphore Already up-to-date. Merging semaphore-removal/semaphore-removal $ git merge semaphore-removal/semaphore-removal Auto-merged arch/arm/mach-lh7a40x/clocks.c Auto-merged drivers/net/bonding/bond_main.c Auto-merged drivers/net/bonding/bond_sysfs.c Auto-merged drivers/net/ps3_gelic_wireless.c Auto-merged drivers/scsi/qla2xxx/qla_def.h Auto-merged sound/soc/s3c24xx/s3c2443-ac97.c Merge made by recursive. arch/arm/mach-lh7a40x/clocks.c | 15 ++++++++------- drivers/net/bonding/bond_main.c | 21 +++++++++++---------- drivers/net/bonding/bond_sysfs.c | 15 ++++++++------- drivers/net/ppp_async.c | 8 ++++---- drivers/net/ps3_gelic_net.c | 1 + drivers/net/ps3_gelic_wireless.c | 1 + drivers/pci/hotplug/ibmphp_hpc.c | 30 ++++++++++++++---------------- drivers/scsi/qla2xxx/qla_def.h | 1 - include/net/bluetooth/hci_core.h | 7 ++++--- net/9p/trans_virtio.c | 21 +++++++++++---------- net/bluetooth/hci_core.c | 2 +- sound/soc/s3c24xx/s3c2443-ac97.c | 11 ++++++----- 12 files changed, 69 insertions(+), 64 deletions(-) Merging bkl-removal/bkl-removal $ git merge bkl-removal/bkl-removal Auto-merged drivers/infiniband/core/ucma.c Merge made by recursive. Merging trivial/next $ git merge trivial/next Auto-merged Documentation/edac.txt CONFLICT (content): Merge conflict in Documentation/edac.txt Auto-merged arch/mips/kernel/vpe.c Auto-merged drivers/base/sys.c Auto-merged drivers/media/dvb/ttpci/av7110.c Auto-merged drivers/net/spider_net.c Auto-merged drivers/serial/mpc52xx_uart.c Auto-merged drivers/usb/serial/ftdi_sio.c Auto-merged fs/ntfs/aops.c Auto-merged include/linux/securebits.h CONFLICT (content): Merge conflict in include/linux/securebits.h Auto-merged mm/migrate.c Auto-merged mm/slub.c Auto-merged net/wireless/wext.c Resolved 'Documentation/edac.txt' using previous resolution. Resolved 'include/linux/securebits.h' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 6d07976: Merge commit 'trivial/next' $ git diff -M --stat --summary HEAD^.. Documentation/filesystems/hfs.txt | 2 +- Documentation/ja_JP/SubmittingPatches | 4 ++-- Documentation/zh_CN/SubmittingPatches | 4 ++-- arch/mips/kernel/vpe.c | 2 +- arch/sh/lib64/c-checksum.c | 4 ++-- drivers/base/sys.c | 2 +- drivers/char/serial167.c | 2 +- drivers/media/dvb/ttpci/av7110.c | 2 +- drivers/message/i2o/i2o_block.c | 2 +- drivers/misc/ibmasm/event.c | 2 +- drivers/net/spider_net.c | 2 +- drivers/serial/mpc52xx_uart.c | 4 ++-- drivers/usb/serial/ftdi_sio.c | 2 +- fs/jffs2/fs.c | 2 +- fs/ntfs/aops.c | 2 +- fs/proc/nommu.c | 2 +- mm/migrate.c | 2 +- mm/slub.c | 4 ++-- net/wireless/wext.c | 2 +- 19 files changed, 24 insertions(+), 24 deletions(-) Merging ubifs/linux-next $ git merge ubifs/linux-next Merge made by recursive. Documentation/filesystems/ubifs.txt | 2 +- fs/ubifs/budget.c | 33 +++++++++-- fs/ubifs/commit.c | 3 +- fs/ubifs/debug.c | 27 +++++---- fs/ubifs/debug.h | 104 ++++++++++++++++++---------------- fs/ubifs/dir.c | 21 +++---- fs/ubifs/file.c | 8 ++- fs/ubifs/find.c | 9 ++- fs/ubifs/io.c | 14 +++++ fs/ubifs/journal.c | 108 ++++++++++++++++++++++++++--------- fs/ubifs/log.c | 4 +- fs/ubifs/misc.h | 16 +----- fs/ubifs/orphan.c | 4 +- fs/ubifs/super.c | 104 ++++++++++++++++++++++++++------- fs/ubifs/tnc_commit.c | 37 ++++++------ fs/ubifs/ubifs-media.h | 4 +- fs/ubifs/ubifs.h | 31 +++++++--- fs/ubifs/xattr.c | 4 +- 18 files changed, 346 insertions(+), 187 deletions(-) $ git revert b51e4badb0248ac75fe3128bb369d987e28b2f88 Auto-merged fs/ubifs/dir.c Auto-merged fs/ubifs/super.c CONFLICT (content): Merge conflict in fs/ubifs/super.c Automatic revert failed. After resolving the conflicts, mark the corrected paths with 'git add ' or 'git rm ' and commit the result. $ git commit -a Created commit 695543a: Revert "UBIFS: add NFS support" 2 files changed, 14 insertions(+), 57 deletions(-) Merging lsm/for-next $ git merge lsm/for-next Already up-to-date. Merging block/for-next $ git merge block/for-next Already up-to-date. Merging embedded/master $ git merge embedded/master Already up-to-date. Merging firmware/master $ git merge firmware/master Auto-merged drivers/media/dvb/ttpci/Kconfig CONFLICT (content): Merge conflict in drivers/media/dvb/ttpci/Kconfig Auto-merged drivers/media/dvb/ttpci/Makefile CONFLICT (content): Merge conflict in drivers/media/dvb/ttpci/Makefile Auto-merged drivers/media/dvb/ttpci/av7110.c Auto-merged drivers/media/dvb/ttpci/av7110_hw.h Removed drivers/media/dvb/ttpci/fdump.c Auto-merged drivers/net/acenic.c Auto-merged drivers/net/acenic.h Removed drivers/net/acenic_firmware.h Auto-merged drivers/net/e100.c Auto-merged drivers/net/starfire.c Removed drivers/net/starfire_firmware.h Removed drivers/net/starfire_firmware.pl Auto-merged drivers/net/tg3.c Auto-merged drivers/net/tg3.h Auto-merged drivers/scsi/advansys.c Removed drivers/scsi/ql1040_fw.h Removed drivers/scsi/ql12160_fw.h Removed drivers/scsi/ql1280_fw.h Auto-merged drivers/scsi/qla1280.c Removed drivers/scsi/qlogicpti_asm.c Resolved 'drivers/media/dvb/ttpci/Kconfig' using previous resolution. Resolved 'drivers/media/dvb/ttpci/Makefile' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 9f069a1: Merge commit 'firmware/master' $ git diff -M --stat --summary HEAD^.. drivers/media/dvb/ttpci/Kconfig | 23 +- drivers/media/dvb/ttpci/Makefile | 9 - drivers/media/dvb/ttpci/av7110.c | 16 - drivers/media/dvb/ttpci/av7110_hw.c | 35 +- drivers/media/dvb/ttpci/av7110_hw.h | 3 +- drivers/media/dvb/ttpci/fdump.c | 44 - drivers/net/acenic.c | 117 +- drivers/net/acenic.h | 4 + drivers/net/acenic_firmware.h | 9456 --------------------------------- drivers/net/e100.c | 283 +- drivers/net/starfire.c | 51 +- drivers/net/starfire_firmware.h | 346 -- drivers/net/starfire_firmware.pl | 31 - drivers/net/tg3.c | 789 +--- drivers/net/tg3.h | 4 + drivers/scsi/advansys.c | 1731 +------ drivers/scsi/ql1040_fw.h | 2130 -------- drivers/scsi/ql12160_fw.h | 1811 ------- drivers/scsi/ql1280_fw.h | 2048 ------- drivers/scsi/qla1280.c | 114 +- drivers/scsi/qla1280.h | 6 + drivers/scsi/qlogicpti.c | 63 +- drivers/scsi/qlogicpti_asm.c | 1160 ---- firmware/Makefile | 19 + firmware/WHENCE | 109 + firmware/acenic/tg1.bin.ihex | 4573 ++++++++++++++++ firmware/acenic/tg2.bin.ihex | 4844 +++++++++++++++++ firmware/adaptec/starfire_rx.bin.ihex | 53 + firmware/adaptec/starfire_tx.bin.ihex | 53 + firmware/advansys/3550.bin.ihex | 317 ++ firmware/advansys/38C0800.bin.ihex | 336 ++ firmware/advansys/38C1600.bin.ihex | 398 ++ firmware/advansys/mcode.bin.ihex | 147 + firmware/av7110/Boot.S | 109 + firmware/av7110/bootcode.bin.ihex | 15 + firmware/e100/d101m_ucode.bin.ihex | 38 + firmware/e100/d101s_ucode.bin.ihex | 38 + firmware/e100/d102e_ucode.bin.ihex | 38 + firmware/qlogic/1040.bin.ihex | 2111 ++++++++ firmware/qlogic/12160.bin.ihex | 1771 ++++++ firmware/qlogic/1280.bin.ihex | 2008 +++++++ firmware/qlogic/isp1000.bin.ihex | 1158 ++++ firmware/tigon/tg3.bin.ihex | 175 + firmware/tigon/tg3_tso.bin.ihex | 446 ++ firmware/tigon/tg3_tso5.bin.ihex | 252 + 45 files changed, 19549 insertions(+), 19733 deletions(-) delete mode 100644 drivers/media/dvb/ttpci/fdump.c delete mode 100644 drivers/net/acenic_firmware.h delete mode 100644 drivers/net/starfire_firmware.h delete mode 100644 drivers/net/starfire_firmware.pl delete mode 100644 drivers/scsi/ql1040_fw.h delete mode 100644 drivers/scsi/ql12160_fw.h delete mode 100644 drivers/scsi/ql1280_fw.h delete mode 100644 drivers/scsi/qlogicpti_asm.c create mode 100644 firmware/acenic/tg1.bin.ihex create mode 100644 firmware/acenic/tg2.bin.ihex create mode 100644 firmware/adaptec/starfire_rx.bin.ihex create mode 100644 firmware/adaptec/starfire_tx.bin.ihex create mode 100644 firmware/advansys/3550.bin.ihex create mode 100644 firmware/advansys/38C0800.bin.ihex create mode 100644 firmware/advansys/38C1600.bin.ihex create mode 100644 firmware/advansys/mcode.bin.ihex create mode 100644 firmware/av7110/Boot.S create mode 100644 firmware/av7110/bootcode.bin.ihex create mode 100644 firmware/e100/d101m_ucode.bin.ihex create mode 100644 firmware/e100/d101s_ucode.bin.ihex create mode 100644 firmware/e100/d102e_ucode.bin.ihex create mode 100644 firmware/qlogic/1040.bin.ihex create mode 100644 firmware/qlogic/12160.bin.ihex create mode 100644 firmware/qlogic/1280.bin.ihex create mode 100644 firmware/qlogic/isp1000.bin.ihex create mode 100644 firmware/tigon/tg3.bin.ihex create mode 100644 firmware/tigon/tg3_tso.bin.ihex create mode 100644 firmware/tigon/tg3_tso5.bin.ihex Merging pcmcia/master $ git merge pcmcia/master Auto-merged drivers/char/pcmcia/cm4000_cs.c Auto-merged drivers/char/pcmcia/cm4040_cs.c Auto-merged drivers/ide/legacy/ide-cs.c Auto-merged drivers/net/wireless/wavelan_cs.c Auto-merged drivers/pcmcia/soc_common.c Merge made by recursive. Documentation/pcmcia/driver-changes.txt | 6 + drivers/ata/pata_pcmcia.c | 168 ++++++-------- drivers/bluetooth/bluecard_cs.c | 8 +- drivers/bluetooth/bt3c_cs.c | 123 ++++------ drivers/bluetooth/btuart_cs.c | 124 ++++------ drivers/bluetooth/dtl1_cs.c | 67 ++----- drivers/char/pcmcia/cm4000_cs.c | 73 ++---- drivers/char/pcmcia/cm4040_cs.c | 79 +++---- drivers/char/pcmcia/ipwireless/main.c | 46 ++--- drivers/ide/legacy/ide-cs.c | 155 ++++++------- drivers/isdn/hardware/avm/avm_cs.c | 85 +++----- drivers/isdn/hisax/avma1_cs.c | 81 ++----- drivers/isdn/hisax/elsa_cs.c | 77 ++----- drivers/isdn/hisax/sedlbauer_cs.c | 197 ++++++++--------- drivers/isdn/hisax/teles_cs.c | 77 ++----- drivers/mtd/maps/pcmciamtd.c | 26 +-- drivers/net/pcmcia/3c574_cs.c | 6 +- drivers/net/pcmcia/3c589_cs.c | 6 +- drivers/net/pcmcia/axnet_cs.c | 77 +++---- drivers/net/pcmcia/com20020_cs.c | 8 +- drivers/net/pcmcia/fmvj18x_cs.c | 18 +- drivers/net/pcmcia/ibmtr_cs.c | 2 +- drivers/net/pcmcia/pcnet_cs.c | 85 ++++---- drivers/net/pcmcia/smc91c92_cs.c | 138 +++++------- drivers/net/pcmcia/xirc2ps_cs.c | 75 ++++--- drivers/net/wireless/airo_cs.c | 222 +++++++++--------- drivers/net/wireless/atmel_cs.c | 119 +++++------ drivers/net/wireless/b43/pcmcia.c | 14 +- drivers/net/wireless/hostap/hostap_cs.c | 235 +++++++++----------- drivers/net/wireless/netwave_cs.c | 4 +- drivers/net/wireless/orinoco_cs.c | 163 ++++++-------- drivers/net/wireless/ray_cs.c | 4 +- drivers/net/wireless/spectrum_cs.c | 162 ++++++-------- drivers/net/wireless/wavelan_cs.c | 16 +- drivers/net/wireless/wl3501_cs.c | 4 +- drivers/parport/parport_cs.c | 70 +++---- drivers/pcmcia/Makefile | 4 - drivers/pcmcia/cardbus.c | 2 +- drivers/pcmcia/cistpl.c | 240 +++++++++++---------- drivers/pcmcia/cs.c | 72 +++--- drivers/pcmcia/cs_internal.h | 11 +- drivers/pcmcia/ds.c | 236 ++++++++----------- drivers/pcmcia/ds_internal.h | 2 +- drivers/pcmcia/m32r_cfc.c | 2 +- drivers/pcmcia/m32r_pcc.c | 2 +- drivers/pcmcia/o2micro.h | 6 +- drivers/pcmcia/pcmcia_ioctl.c | 114 ++++++++-- drivers/pcmcia/pcmcia_resource.c | 374 +++++++++++++++++-------------- drivers/pcmcia/rsrc_nonstatic.c | 67 +++--- drivers/pcmcia/soc_common.c | 2 +- drivers/pcmcia/socket_sysfs.c | 13 +- drivers/pcmcia/tcic.c | 2 +- drivers/pcmcia/ti113x.h | 70 +++--- drivers/pcmcia/yenta_socket.c | 77 ++++--- drivers/scsi/pcmcia/aha152x_stub.c | 58 +++--- drivers/scsi/pcmcia/fdomain_stub.c | 37 ++-- drivers/scsi/pcmcia/nsp_cs.c | 180 ++++++++-------- drivers/scsi/pcmcia/qlogic_stub.c | 47 ++--- drivers/scsi/pcmcia/sym53c500_cs.c | 46 ++-- drivers/serial/serial_cs.c | 300 +++++++++++-------------- drivers/ssb/pcmcia.c | 22 +- drivers/telephony/ixj_pcmcia.c | 72 +++---- drivers/usb/host/sl811_cs.c | 130 +++++------- include/pcmcia/cistpl.h | 18 +- include/pcmcia/cs.h | 55 ----- include/pcmcia/ds.h | 43 ++++- include/pcmcia/ss.h | 4 +- 67 files changed, 2338 insertions(+), 2790 deletions(-) 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 Merge made by recursive. drivers/serial/serial_txx9.c | 113 ++++++++++++++++++++++++++++++++++-------- 1 files changed, 92 insertions(+), 21 deletions(-) Merging slab/for-next $ git merge slab/for-next Auto-merged Documentation/kernel-parameters.txt Auto-merged MAINTAINERS Auto-merged include/linux/mm.h Auto-merged init/main.c Auto-merged kernel/sysctl.c Auto-merged lib/Kconfig.debug CONFLICT (content): Merge conflict in lib/Kconfig.debug Auto-merged mm/slub.c Recorded preimage for 'lib/Kconfig.debug' Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'lib/Kconfig.debug'. Created commit a60f5ed: Merge commit 'slab/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/debugfs-kmemtrace | 71 +++++ Documentation/kernel-parameters.txt | 10 + Documentation/sysctl/vm.txt | 12 + Documentation/vm/kmemtrace.txt | 126 +++++++++ Documentation/vm/slabinfo.c | 91 ++++++- MAINTAINERS | 6 + fs/drop_caches.c | 2 +- include/linux/kmemtrace.h | 85 ++++++ include/linux/mm.h | 3 +- include/linux/mmzone.h | 1 + include/linux/page-flags.h | 2 + include/linux/slab.h | 53 ++++ include/linux/slab_def.h | 68 ++++- include/linux/slob_def.h | 9 +- include/linux/slub_def.h | 16 ++ include/linux/swap.h | 3 + init/main.c | 2 + kernel/sysctl.c | 20 ++ lib/Kconfig.debug | 28 ++ mm/Makefile | 2 +- mm/kmemtrace.c | 335 +++++++++++++++++++++++ mm/slab.c | 71 +++++- mm/slob.c | 37 +++- mm/slub.c | 390 ++++++++++++++++++++++----- mm/vmscan.c | 64 ++++- mm/vmstat.c | 4 +- 26 files changed, 1400 insertions(+), 111 deletions(-) create mode 100644 Documentation/ABI/testing/debugfs-kmemtrace create mode 100644 Documentation/vm/kmemtrace.txt create mode 100644 include/linux/kmemtrace.h create mode 100644 mm/kmemtrace.c Merging m68knommu/for-next $ git merge m68knommu/for-next Merge made by recursive. arch/m68knommu/platform/coldfire/entry.S | 15 ++------------- 1 files changed, 2 insertions(+), 13 deletions(-) Merging uclinux/for-next $ git merge uclinux/for-next Already up-to-date. Merging md/for-next $ git merge md/for-next Merge made by recursive. drivers/md/md.c | 29 +++++++++++++++++++++++++++-- drivers/md/raid10.c | 9 +++++---- drivers/md/raid5.c | 32 ++++++++++++++++++++++++-------- 3 files changed, 56 insertions(+), 14 deletions(-) Merging cris/for-next $ git merge cris/for-next Merge made by recursive. arch/cris/arch-v10/boot/compressed/Makefile | 2 +- .../compressed/{decompress.ld => decompress.lds} | 0 arch/cris/arch-v10/boot/rescue/Makefile | 2 +- .../arch-v10/boot/rescue/{rescue.ld => rescue.lds} | 0 arch/cris/arch-v32/boot/compressed/Makefile | 2 +- .../compressed/{decompress.ld => decompress.lds} | 0 arch/cris/arch-v32/boot/rescue/Makefile | 2 +- .../arch-v32/boot/rescue/{rescue.ld => rescue.lds} | 0 8 files changed, 4 insertions(+), 4 deletions(-) rename arch/cris/arch-v10/boot/compressed/{decompress.ld => decompress.lds} (100%) rename arch/cris/arch-v10/boot/rescue/{rescue.ld => rescue.lds} (100%) rename arch/cris/arch-v32/boot/compressed/{decompress.ld => decompress.lds} (100%) rename arch/cris/arch-v32/boot/rescue/{rescue.ld => rescue.lds} (100%) Merging kmemcheck/auto-kmemcheck-next $ git merge kmemcheck/auto-kmemcheck-next Auto-merged MAINTAINERS CONFLICT (content): Merge conflict in MAINTAINERS Auto-merged arch/x86/Kconfig.debug Auto-merged arch/x86/kernel/process_64.c Auto-merged arch/x86/kernel/traps_32.c Auto-merged arch/x86/kernel/traps_64.c Auto-merged arch/x86/mm/Makefile Auto-merged arch/x86/mm/fault.c Auto-merged include/linux/interrupt.h Auto-merged include/linux/mm_types.h Auto-merged include/linux/slab.h Auto-merged include/linux/slab_def.h Auto-merged init/main.c Auto-merged kernel/fork.c Auto-merged kernel/sysctl.c Auto-merged mm/Makefile CONFLICT (content): Merge conflict in mm/Makefile Auto-merged mm/slab.c CONFLICT (content): Merge conflict in mm/slab.c Auto-merged mm/slub.c Recorded preimage for 'MAINTAINERS' Recorded preimage for 'mm/Makefile' Recorded preimage for 'mm/slab.c' Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'MAINTAINERS'. Recorded resolution for 'mm/Makefile'. Recorded resolution for 'mm/slab.c'. Created commit bbaf701: Merge commit 'kmemcheck/auto-kmemcheck-next' $ git diff -M --stat --summary HEAD^.. Documentation/kmemcheck.txt | 135 ++++++++++ MAINTAINERS | 8 + arch/x86/Kconfig.debug | 109 +++++++++ arch/x86/kernel/process.c | 2 +- arch/x86/kernel/process_32.c | 4 +- arch/x86/kernel/process_64.c | 12 +- arch/x86/kernel/stacktrace.c | 7 + arch/x86/kernel/traps_32.c | 11 +- arch/x86/kernel/traps_64.c | 11 +- arch/x86/mm/Makefile | 2 + arch/x86/mm/fault.c | 18 ++- arch/x86/mm/kmemcheck/Makefile | 3 + arch/x86/mm/kmemcheck/error.c | 216 ++++++++++++++++ arch/x86/mm/kmemcheck/error.h | 15 ++ arch/x86/mm/kmemcheck/kmemcheck.c | 485 +++++++++++++++++++++++++++++++++++++ arch/x86/mm/kmemcheck/opcode.c | 72 ++++++ arch/x86/mm/kmemcheck/opcode.h | 9 + arch/x86/mm/kmemcheck/pte.c | 22 ++ arch/x86/mm/kmemcheck/pte.h | 10 + arch/x86/mm/kmemcheck/shadow.c | 178 ++++++++++++++ arch/x86/mm/kmemcheck/shadow.h | 16 ++ arch/x86/mm/kmemcheck/smp.c | 80 ++++++ arch/x86/mm/kmemcheck/smp.h | 23 ++ arch/x86/mm/kmemcheck/string.c | 95 +++++++ include/asm-x86/kdebug.h | 3 +- include/asm-x86/kmemcheck.h | 36 +++ include/asm-x86/pgtable.h | 4 +- include/asm-x86/pgtable_32.h | 6 + include/asm-x86/pgtable_64.h | 6 + include/asm-x86/string_32.h | 8 + include/asm-x86/string_64.h | 1 + include/linux/gfp.h | 3 +- include/linux/interrupt.h | 14 + include/linux/kmemcheck.h | 70 ++++++ include/linux/mm_types.h | 4 + include/linux/slab.h | 7 + include/linux/slab_def.h | 81 ++++++ include/linux/stacktrace.h | 3 + init/main.c | 4 + kernel/fork.c | 16 +- kernel/softirq.c | 11 + kernel/sysctl.c | 26 ++- mm/Makefile | 1 + mm/kmemcheck.c | 97 ++++++++ mm/slab.c | 101 ++------- mm/slub.c | 20 ++- 46 files changed, 1948 insertions(+), 117 deletions(-) create mode 100644 Documentation/kmemcheck.txt create mode 100644 arch/x86/mm/kmemcheck/Makefile create mode 100644 arch/x86/mm/kmemcheck/error.c create mode 100644 arch/x86/mm/kmemcheck/error.h create mode 100644 arch/x86/mm/kmemcheck/kmemcheck.c create mode 100644 arch/x86/mm/kmemcheck/opcode.c create mode 100644 arch/x86/mm/kmemcheck/opcode.h create mode 100644 arch/x86/mm/kmemcheck/pte.c create mode 100644 arch/x86/mm/kmemcheck/pte.h create mode 100644 arch/x86/mm/kmemcheck/shadow.c create mode 100644 arch/x86/mm/kmemcheck/shadow.h create mode 100644 arch/x86/mm/kmemcheck/smp.c create mode 100644 arch/x86/mm/kmemcheck/smp.h create mode 100644 arch/x86/mm/kmemcheck/string.c create mode 100644 include/asm-x86/kmemcheck.h create mode 100644 include/linux/kmemcheck.h create mode 100644 mm/kmemcheck.c Merging generic-ipi/auto-generic-ipi-next $ git merge generic-ipi/auto-generic-ipi-next Already up-to-date. Merging mips/mips-for-linux-next $ git merge mips/mips-for-linux-next Already up-to-date. Merging mfd/for-next $ git merge mfd/for-next Merge made by recursive. drivers/mfd/mfd-core.c | 15 +++++++++++---- drivers/mfd/sm501.c | 6 +++--- 2 files changed, 14 insertions(+), 7 deletions(-) Merging hdlc/hdlc-next $ git merge hdlc/hdlc-next Merge made by recursive. drivers/net/wan/c101.c | 6 +- drivers/net/wan/{hd6457x.c => hd64570.c} | 254 +++--------- drivers/net/wan/hd64572.c | 641 ++++++++++++++++++++++++++++++ drivers/net/wan/n2.c | 9 +- drivers/net/wan/pc300too.c | 73 +--- drivers/net/wan/pci200syn.c | 77 ++--- 6 files changed, 750 insertions(+), 310 deletions(-) rename drivers/net/wan/{hd6457x.c => hd64570.c} (78%) create mode 100644 drivers/net/wan/hd64572.c Merging drm/drm-next $ git merge drm/drm-next Merge made by recursive. drivers/gpu/drm/drm_irq.c | 20 +- drivers/gpu/drm/i915/Makefile | 2 +- drivers/gpu/drm/i915/i915_dma.c | 171 +++-- drivers/gpu/drm/i915/i915_drv.c | 58 +- drivers/gpu/drm/i915/i915_drv.h | 860 ++-------------------- drivers/gpu/drm/i915/i915_irq.c | 189 ++++-- drivers/gpu/drm/i915/i915_opregion.c | 371 +++++++++ drivers/gpu/drm/i915/i915_reg.h | 1406 ++++++++++++++++++++++++++++++++++ drivers/gpu/drm/sis/sis_mm.c | 10 +- include/drm/drm.h | 17 - 10 files changed, 2107 insertions(+), 997 deletions(-) create mode 100644 drivers/gpu/drm/i915/i915_opregion.c create mode 100644 drivers/gpu/drm/i915/i915_reg.h Merging voltage/reg-for-linus $ git merge voltage/reg-for-linus Already up-to-date. Merging security-testing/next $ git merge security-testing/next Merge made by recursive. security/selinux/hooks.c | 45 ++++++++++-------- security/selinux/ss/avtab.c | 6 +-- security/selinux/ss/conditional.c | 2 +- security/selinux/ss/conditional.h | 2 +- security/selinux/ss/mls.c | 14 +++--- security/selinux/ss/policydb.c | 20 ++++---- security/smack/smack.h | 1 + security/smack/smack_access.c | 10 ++++- security/smack/smackfs.c | 92 +++++++++++++++++++++++++++++++++++++ 9 files changed, 149 insertions(+), 43 deletions(-) Merging lblnet/master $ git merge lblnet/master Already up-to-date. Merging quilt/ttydev $ git merge quilt/ttydev Auto-merged Documentation/feature-removal-schedule.txt Auto-merged drivers/char/istallion.c Auto-merged drivers/char/stallion.c Auto-merged drivers/char/tty_io.c Auto-merged drivers/char/vt.c Auto-merged drivers/serial/Kconfig Removed drivers/serial/mcfserial.c Removed drivers/serial/mcfserial.h Auto-merged drivers/usb/class/cdc-acm.c CONFLICT (content): Merge conflict in drivers/usb/class/cdc-acm.c Auto-merged drivers/usb/serial/ftdi_sio.c Auto-merged drivers/usb/serial/option.c Auto-merged drivers/usb/serial/pl2303.c Auto-merged drivers/usb/serial/sierra.c Auto-merged drivers/usb/serial/usb-serial.c Auto-merged fs/dquot.c Auto-merged kernel/fork.c Resolved 'drivers/usb/class/cdc-acm.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit d8c9be6: Merge branch 'quilt/ttydev' $ git diff -M --stat --summary HEAD^.. Documentation/feature-removal-schedule.txt | 8 - arch/blackfin/kernel/bfin_dma_5xx.c | 13 +- arch/um/drivers/line.c | 2 + drivers/char/Kconfig | 4 +- drivers/char/Makefile | 2 +- drivers/char/epca.c | 5 +- drivers/char/isicom.c | 61 +- drivers/char/istallion.c | 107 +- drivers/char/moxa.c | 61 +- drivers/char/mxser.c | 192 ++- drivers/char/stallion.c | 105 +- drivers/char/tty_buffer.c | 511 ++++++ drivers/char/tty_io.c | 753 ++------- drivers/char/tty_port.c | 96 + drivers/char/vt.c | 84 +- drivers/char/vt_ioctl.c | 9 +- drivers/serial/68328serial.c | 11 +- drivers/serial/8250.c | 73 +- drivers/serial/Kconfig | 16 +- drivers/serial/Makefile | 1 - drivers/serial/bfin_5xx.c | 123 +- drivers/serial/mcfserial.c | 1965 --------------------- drivers/serial/mcfserial.h | 74 - drivers/usb/serial/aircable.c | 12 +- drivers/usb/serial/belkin_sa.c | 3 +- drivers/usb/serial/console.c | 8 +- drivers/usb/serial/cyberjack.c | 3 +- drivers/usb/serial/cypress_m8.c | 5 +- drivers/usb/serial/digi_acceleport.c | 19 +- drivers/usb/serial/empeg.c | 8 +- drivers/usb/serial/ftdi_sio.c | 19 +- drivers/usb/serial/garmin_gps.c | 3 +- drivers/usb/serial/generic.c | 3 +- drivers/usb/serial/io_edgeport.c | 43 +- drivers/usb/serial/io_ti.c | 26 +- drivers/usb/serial/ipaq.c | 3 +- drivers/usb/serial/ipw.c | 3 +- drivers/usb/serial/ir-usb.c | 3 +- drivers/usb/serial/iuu_phoenix.c | 3 +- drivers/usb/serial/keyspan.c | 77 +- drivers/usb/serial/keyspan_pda.c | 11 +- drivers/usb/serial/kl5kusb105.c | 3 +- drivers/usb/serial/kobil_sct.c | 3 +- drivers/usb/serial/mct_u232.c | 6 +- drivers/usb/serial/mos7720.c | 36 +- drivers/usb/serial/mos7840.c | 7 +- drivers/usb/serial/navman.c | 3 +- drivers/usb/serial/omninet.c | 10 +- drivers/usb/serial/option.c | 18 +- drivers/usb/serial/oti6858.c | 3 +- drivers/usb/serial/pl2303.c | 4 +- drivers/usb/serial/safe_serial.c | 11 +- drivers/usb/serial/sierra.c | 16 +- drivers/usb/serial/spcp8x5.c | 3 +- drivers/usb/serial/ti_usb_3410_5052.c | 44 +- drivers/usb/serial/usb-serial.c | 24 +- drivers/usb/serial/visor.c | 18 +- drivers/usb/serial/whiteheat.c | 8 +- fs/dquot.c | 6 +- fs/open.c | 3 +- include/asm-blackfin/mach-bf527/bfin_serial_5xx.h | 6 +- include/asm-blackfin/mach-bf533/bfin_serial_5xx.h | 4 +- include/asm-blackfin/mach-bf537/bfin_serial_5xx.h | 6 +- include/asm-blackfin/mach-bf548/bfin_serial_5xx.h | 6 +- include/asm-blackfin/mach-bf561/bfin_serial_5xx.h | 4 +- include/linux/tty.h | 27 + include/linux/tty_driver.h | 14 + include/linux/vt_kern.h | 1 - kernel/acct.c | 2 +- kernel/auditsc.c | 10 +- kernel/fork.c | 2 +- kernel/printk.c | 16 - kernel/sys.c | 4 +- 73 files changed, 1622 insertions(+), 3234 deletions(-) create mode 100644 drivers/char/tty_buffer.c create mode 100644 drivers/char/tty_port.c delete mode 100644 drivers/serial/mcfserial.c delete mode 100644 drivers/serial/mcfserial.h Merging agp/agp-next $ git merge agp/agp-next Already up-to-date. Merging creds/next-creds $ git merge creds/next-creds Auto-merged arch/ia64/ia32/sys_ia32.c Auto-merged arch/mips/kernel/vpe.c Auto-merged arch/x86/mm/fault.c Auto-merged drivers/usb/core/devio.c Auto-merged fs/binfmt_flat.c Auto-merged fs/cifs/inode.c Auto-merged fs/compat.c Auto-merged fs/dquot.c Auto-merged fs/ecryptfs/main.c Auto-merged fs/exportfs/expfs.c Auto-merged fs/fat/inode.c Auto-merged fs/hpfs/namei.c Auto-merged fs/jffs2/fs.c Auto-merged fs/namei.c Auto-merged fs/namespace.c CONFLICT (content): Merge conflict in fs/namespace.c Auto-merged fs/nfsd/nfs4recover.c CONFLICT (content): Merge conflict in fs/nfsd/nfs4recover.c Auto-merged fs/nfsd/nfsfh.c Auto-merged fs/nfsd/vfs.c Auto-merged fs/open.c Auto-merged fs/reiserfs/namei.c Auto-merged fs/ubifs/budget.c Auto-merged fs/ubifs/dir.c Auto-merged fs/udf/namei.c Auto-merged fs/xfs/linux-2.6/xfs_ioctl.c Auto-merged fs/xfs/linux-2.6/xfs_linux.h Auto-merged fs/xfs/xfs_acl.c CONFLICT (content): Merge conflict in fs/xfs/xfs_acl.c Auto-merged fs/xfs/xfs_inode.c Auto-merged fs/xfs/xfs_inode.h Auto-merged fs/xfs/xfs_vnodeops.c Auto-merged include/linux/fs.h Removed include/linux/key-ui.h Auto-merged include/linux/sched.h Auto-merged init/main.c Auto-merged kernel/Makefile Auto-merged kernel/acct.c Auto-merged kernel/auditsc.c Auto-merged kernel/exit.c Auto-merged kernel/fork.c Auto-merged kernel/sched.c Auto-merged kernel/signal.c Auto-merged kernel/sys.c Auto-merged kernel/sysctl.c Auto-merged kernel/workqueue.c Auto-merged lib/Makefile Auto-merged mm/mempolicy.c Auto-merged mm/migrate.c Auto-merged net/unix/af_unix.c Resolved 'fs/namespace.c' using previous resolution. Resolved 'fs/nfsd/nfs4recover.c' using previous resolution. Resolved 'fs/xfs/xfs_acl.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 15ed2ca: Merge commit 'creds/next-creds' $ git diff -M --stat --summary HEAD^.. Documentation/credentials.txt | 563 +++++++++++++ arch/alpha/kernel/asm-offsets.c | 11 +- arch/alpha/kernel/entry.S | 10 +- arch/ia64/ia32/sys_ia32.c | 7 +- arch/ia64/kernel/mca_drv.c | 2 +- arch/ia64/kernel/perfmon.c | 43 +- arch/ia64/kernel/signal.c | 4 +- arch/mips/kernel/kspd.c | 4 +- arch/mips/kernel/mips-mt-fpaff.c | 5 +- arch/mips/kernel/vpe.c | 4 +- arch/parisc/kernel/signal.c | 2 +- arch/powerpc/mm/fault.c | 2 +- arch/powerpc/platforms/cell/spufs/inode.c | 9 +- arch/s390/hypfs/inode.c | 4 +- arch/s390/kernel/compat_linux.c | 28 +- arch/x86/ia32/ia32_aout.c | 2 +- arch/x86/mm/fault.c | 2 +- drivers/block/loop.c | 6 +- drivers/char/tty_audit.c | 6 +- drivers/connector/cn_proc.c | 16 +- drivers/gpu/drm/drm_fops.c | 2 +- drivers/isdn/capi/capifs.c | 4 +- drivers/isdn/hysdn/hysdn_procconf.c | 6 +- drivers/media/video/cpia.c | 2 +- drivers/net/tun.c | 8 +- drivers/net/wan/sbni.c | 9 +- drivers/usb/core/devio.c | 10 +- drivers/usb/core/inode.c | 4 +- fs/9p/fid.c | 2 +- fs/9p/vfs_inode.c | 4 +- fs/9p/vfs_super.c | 4 +- fs/affs/inode.c | 4 +- fs/affs/super.c | 4 +- fs/anon_inodes.c | 4 +- fs/attr.c | 4 +- fs/autofs/inode.c | 4 +- fs/autofs4/inode.c | 4 +- fs/autofs4/waitq.c | 4 +- fs/bfs/dir.c | 4 +- fs/binfmt_aout.c | 2 +- fs/binfmt_elf.c | 20 +- fs/binfmt_elf_fdpic.c | 19 +- fs/binfmt_flat.c | 2 +- fs/binfmt_som.c | 2 +- fs/cifs/cifs_fs_sb.h | 2 +- fs/cifs/cifsproto.h | 2 +- fs/cifs/connect.c | 4 +- fs/cifs/dir.c | 12 +- fs/cifs/inode.c | 8 +- fs/cifs/ioctl.c | 2 +- fs/cifs/misc.c | 4 +- fs/coda/cache.c | 6 +- fs/coda/file.c | 3 +- fs/coda/upcall.c | 2 +- fs/compat.c | 20 +- fs/devpts/inode.c | 4 +- fs/dquot.c | 4 +- fs/ecryptfs/ecryptfs_kernel.h | 3 +- fs/ecryptfs/kthread.c | 9 +- fs/ecryptfs/main.c | 3 +- fs/ecryptfs/messaging.c | 18 +- fs/ecryptfs/miscdev.c | 20 +- fs/exec.c | 158 ++-- fs/exportfs/expfs.c | 4 +- fs/ext2/balloc.c | 2 +- fs/ext2/ialloc.c | 4 +- fs/ext3/balloc.c | 2 +- fs/ext3/ialloc.c | 4 +- fs/ext4/balloc.c | 3 +- fs/ext4/ialloc.c | 4 +- fs/fat/file.c | 2 +- fs/fat/inode.c | 4 +- fs/fcntl.c | 18 +- fs/file_table.c | 10 +- fs/fuse/dev.c | 4 +- fs/fuse/dir.c | 25 +- fs/gfs2/inode.c | 10 +- fs/hfs/inode.c | 4 +- fs/hfs/super.c | 4 +- fs/hfsplus/inode.c | 4 +- fs/hfsplus/options.c | 4 +- fs/hpfs/namei.c | 24 +- fs/hpfs/super.c | 4 +- fs/hppfs/hppfs.c | 6 +- fs/hugetlbfs/inode.c | 21 +- fs/inotify_user.c | 2 +- fs/internal.h | 6 + fs/ioprio.c | 18 +- fs/jffs2/fs.c | 4 +- fs/jfs/jfs_inode.c | 4 +- fs/locks.c | 2 +- fs/minix/bitmap.c | 4 +- fs/namei.c | 10 +- fs/namespace.c | 2 +- fs/ncpfs/ioctl.c | 91 +- fs/nfsctl.c | 4 +- fs/nfsd/auth.c | 95 ++- fs/nfsd/nfs4recover.c | 71 +- fs/nfsd/nfsfh.c | 11 +- fs/nfsd/vfs.c | 9 +- fs/ocfs2/dlm/dlmfs.c | 8 +- fs/ocfs2/namei.c | 4 +- fs/omfs/inode.c | 8 +- fs/open.c | 59 +- fs/pipe.c | 4 +- fs/posix_acl.c | 4 +- fs/proc/array.c | 32 +- fs/proc/base.c | 32 +- fs/quota.c | 4 +- fs/ramfs/inode.c | 4 +- fs/reiserfs/namei.c | 4 +- fs/smbfs/dir.c | 3 +- fs/smbfs/inode.c | 2 +- fs/smbfs/proc.c | 2 +- fs/sysv/ialloc.c | 4 +- fs/ubifs/budget.c | 2 +- fs/ubifs/dir.c | 4 +- fs/udf/ialloc.c | 4 +- fs/udf/namei.c | 2 +- fs/ufs/ialloc.c | 4 +- fs/xfs/linux-2.6/xfs_cred.h | 6 +- fs/xfs/linux-2.6/xfs_globals.h | 2 +- fs/xfs/linux-2.6/xfs_ioctl.c | 5 +- fs/xfs/linux-2.6/xfs_linux.h | 4 +- fs/xfs/xfs_acl.c | 6 +- fs/xfs/xfs_inode.c | 4 +- fs/xfs/xfs_inode.h | 2 +- fs/xfs/xfs_vnodeops.c | 8 +- fs/xfs/xfs_vnodeops.h | 10 +- include/keys/keyring-type.h | 31 + include/linux/binfmts.h | 16 +- include/linux/capability.h | 15 +- include/linux/cred.h | 334 ++++++++ include/linux/fs.h | 8 +- include/linux/init_task.h | 13 +- include/linux/key-ui.h | 66 -- include/linux/key.h | 32 +- include/linux/keyctl.h | 4 +- include/linux/sched.h | 65 +-- include/linux/securebits.h | 2 +- include/linux/security.h | 365 ++++----- include/net/scm.h | 4 +- init/main.c | 1 + ipc/mqueue.c | 19 +- ipc/shm.c | 9 +- ipc/util.c | 18 +- kernel/Makefile | 2 +- kernel/acct.c | 7 +- kernel/auditsc.c | 57 +- kernel/capability.c | 289 +------ kernel/cgroup.c | 17 +- kernel/cred-internals.h | 26 + kernel/cred.c | 591 +++++++++++++ kernel/exit.c | 23 +- kernel/fork.c | 45 +- kernel/futex.c | 20 +- kernel/futex_compat.c | 7 +- kernel/kmod.c | 30 +- kernel/ptrace.c | 34 +- kernel/sched.c | 26 +- kernel/signal.c | 60 +- kernel/sys.c | 579 +++++++------ kernel/sysctl.c | 2 +- kernel/timer.c | 8 +- kernel/trace/trace.c | 2 +- kernel/tsacct.c | 6 +- kernel/uid16.c | 31 +- kernel/user.c | 37 +- kernel/user_namespace.c | 14 +- kernel/workqueue.c | 8 +- lib/Makefile | 2 +- lib/is_single_threaded.c | 45 + mm/mempolicy.c | 9 +- mm/migrate.c | 9 +- mm/oom_kill.c | 12 +- mm/shmem.c | 8 +- net/9p/client.c | 2 +- net/ax25/af_ax25.c | 2 +- net/ax25/ax25_route.c | 2 +- net/core/dev.c | 8 +- net/core/scm.c | 10 +- net/ipv4/netfilter/ipt_LOG.c | 4 +- net/ipv6/ip6_flowlabel.c | 2 +- net/ipv6/netfilter/ip6t_LOG.c | 4 +- net/netfilter/nfnetlink_log.c | 5 +- net/netfilter/xt_owner.c | 16 +- net/netrom/af_netrom.c | 4 +- net/rose/af_rose.c | 4 +- net/rxrpc/ar-key.c | 6 +- net/sched/cls_flow.c | 4 +- net/socket.c | 4 +- net/sunrpc/auth.c | 14 +- net/unix/af_unix.c | 11 +- security/capability.c | 59 +- security/commoncap.c | 697 ++++++++++------ security/keys/internal.h | 47 +- security/keys/key.c | 25 +- security/keys/keyctl.c | 210 +++-- security/keys/keyring.c | 15 +- security/keys/permission.c | 29 +- security/keys/proc.c | 8 +- security/keys/process_keys.c | 468 +++++------ security/keys/request_key.c | 133 ++-- security/keys/request_key_auth.c | 46 +- security/root_plug.c | 16 +- security/security.c | 106 ++-- security/selinux/exports.c | 8 +- security/selinux/hooks.c | 1169 ++++++++++++++------------ security/selinux/include/av_perm_to_string.h | 2 + security/selinux/include/av_permissions.h | 2 + security/selinux/include/class_to_string.h | 5 + security/selinux/include/flask.h | 1 + security/selinux/include/objsec.h | 11 - security/selinux/selinuxfs.c | 13 +- security/selinux/xfrm.c | 6 +- security/smack/smack_access.c | 4 +- security/smack/smack_lsm.c | 218 ++++-- security/smack/smackfs.c | 6 +- 218 files changed, 5184 insertions(+), 3113 deletions(-) create mode 100644 Documentation/credentials.txt create mode 100644 include/keys/keyring-type.h create mode 100644 include/linux/cred.h delete mode 100644 include/linux/key-ui.h create mode 100644 kernel/cred-internals.h create mode 100644 kernel/cred.c create mode 100644 lib/is_single_threaded.c $ git fetch origin master:master_tmp From ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 * [new branch] master -> master_tmp * [new tag] v2.6.27-rc3 -> v2.6.27-rc3 Merging master_tmp $ git merge master_tmp Auto-merged Makefile Merge made by recursive. Makefile | 2 +- drivers/infiniband/hw/ehca/ehca_classes.h | 9 ++++ drivers/infiniband/hw/ehca/ehca_qes.h | 1 + drivers/infiniband/hw/ehca/ehca_qp.c | 48 +++++++++++++++++------ drivers/infiniband/hw/ehca/ehca_reqs.c | 60 ++++++++++++++++++++++------ drivers/infiniband/ulp/ipoib/ipoib_cm.c | 17 ++++++-- 6 files changed, 105 insertions(+), 32 deletions(-) $ git am -3 ../patches/Add_cuImage.mpc866ads_to_the_bootwrapper_as_a_cuboot-8xx_target Applying Add cuImage.mpc866ads to the bootwrapper as a cuboot-8xx target $ git am -3 ../patches/xen_fixup_balloon_sysfs_issues Applying xen-balloon: fix up sysfs issues $ git am -3 ../patches/0001-ath9k-work-around-gcc-ICE-again.patch Applying ath9k: work around gcc ICE again Applying usb: fix up use of usb_dbg