$ git checkout master Already on "master" $ git reset --hard stable HEAD is now at ec0c15a Split up PIT part of TSC calibration from native_calibrate_tsc Merging origin/master $ git merge origin/master Updating ec0c15a..b380b0d Fast forward arch/powerpc/Makefile | 5 ++ arch/powerpc/include/asm/pgtable-ppc64.h | 6 +-- arch/powerpc/kernel/Makefile | 7 ++- arch/powerpc/kernel/align.c | 2 +- arch/powerpc/kernel/idle_6xx.S | 2 +- arch/powerpc/kernel/idle_e500.S | 3 +- arch/powerpc/kernel/vmlinux.lds.S | 7 ++- arch/powerpc/mm/hash_utils_64.c | 18 ++++--- arch/powerpc/platforms/powermac/Makefile | 2 +- arch/x86/kernel/tsc.c | 3 +- drivers/net/bnx2x.h | 5 +- drivers/net/bnx2x_main.c | 34 ++++++------ drivers/net/ixgbe/ixgbe_main.c | 6 ++ drivers/net/netxen/netxen_nic_main.c | 10 ---- drivers/net/pcmcia/axnet_cs.c | 1 + drivers/net/pcmcia/pcnet_cs.c | 2 +- drivers/net/usb/pegasus.c | 11 ++-- drivers/net/wireless/ath9k/main.c | 12 ++++- drivers/net/wireless/ath9k/xmit.c | 4 +- drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 3 +- drivers/net/wireless/iwlwifi/iwl-agn.c | 27 ++++++----- drivers/net/wireless/iwlwifi/iwl-core.c | 77 +++++++++++++++++------------ drivers/net/wireless/iwlwifi/iwl-dev.h | 1 - drivers/net/wireless/iwlwifi/iwl-rx.c | 5 ++- drivers/net/wireless/iwlwifi/iwl-scan.c | 2 +- drivers/net/wireless/iwlwifi/iwl-tx.c | 27 ++++++---- drivers/pci/setup-bus.c | 5 +- kernel/sysctl.c | 1 + lib/Kconfig.debug | 6 +- mm/mmap.c | 4 ++ net/tipc/bcast.c | 22 ++++---- net/tipc/bcast.h | 22 ++++---- net/tipc/bearer.c | 2 +- net/tipc/bearer.h | 2 +- net/tipc/cluster.c | 16 +++--- net/tipc/cluster.h | 10 ++-- net/tipc/discover.c | 2 +- net/tipc/link.c | 26 +++++----- net/tipc/link.h | 2 +- net/tipc/name_table.h | 2 +- net/tipc/net.c | 2 +- net/tipc/net.h | 2 +- net/tipc/node.c | 60 +++++++++++----------- net/tipc/node.h | 42 ++++++++-------- net/tipc/node_subscr.c | 4 +- net/tipc/node_subscr.h | 10 ++-- net/tipc/port.h | 2 +- net/tipc/zone.c | 4 +- net/tipc/zone.h | 2 +- security/selinux/ss/services.c | 6 +- 50 files changed, 294 insertions(+), 244 deletions(-) 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. drivers/s390/scsi/zfcp_ccw.c | 6 +-- drivers/s390/scsi/zfcp_fc.c | 33 ++++------- drivers/s390/scsi/zfcp_fsf.c | 88 ++++++++++++++-------------- drivers/s390/scsi/zfcp_qdio.c | 4 +- drivers/scsi/Kconfig | 2 +- drivers/scsi/device_handler/scsi_dh_alua.c | 12 ++-- drivers/scsi/device_handler/scsi_dh_emc.c | 4 +- drivers/scsi/device_handler/scsi_dh_rdac.c | 4 +- drivers/scsi/scsi_error.c | 2 +- drivers/scsi/scsi_scan.c | 3 +- include/scsi/scsi.h | 14 +++++ 11 files changed, 87 insertions(+), 85 deletions(-) Merging net-current/master $ git merge net-current/master Already up-to-date. Merging sparc-current/master $ git merge sparc-current/master Already up-to-date. Merging sound-current/for-linus $ git merge sound-current/for-linus Already up-to-date. Merging arm-current/master $ git merge arm-current/master Merge made by recursive. arch/arm/mach-omap1/mcbsp.c | 8 ++++++++ arch/arm/mach-omap2/mcbsp.c | 4 ++++ arch/arm/plat-mxc/clock.c | 1 - arch/arm/plat-omap/gpio.c | 2 +- arch/arm/plat-omap/include/mach/mcbsp.h | 2 ++ arch/arm/plat-omap/mcbsp.c | 5 +++-- drivers/usb/host/ohci-omap.c | 2 +- 7 files changed, 19 insertions(+), 5 deletions(-) Merging pci-current/for-linus $ git merge pci-current/for-linus Already up-to-date. Merging wireless-current/master $ git merge wireless-current/master Already up-to-date. Merging kbuild-current/master $ git merge kbuild-current/master Already up-to-date. Merging quilt/driver-core.current $ git merge quilt/driver-core.current Already up-to-date. Merging quilt/usb.current $ git merge quilt/usb.current Merge made by recursive. Documentation/ABI/stable/sysfs-driver-usb-usbtmc | 62 ++ .../ABI/testing/sysfs-bus-usb-devices-usbsevseg | 43 + Documentation/devices.txt | 3 + Documentation/ioctl-number.txt | 2 + Documentation/usb/anchors.txt | 12 + Documentation/usb/misc_usbsevseg.txt | 46 + drivers/usb/class/Kconfig | 10 + drivers/usb/class/Makefile | 1 + drivers/usb/class/usbtmc.c | 1087 ++++++++++++++++++++ drivers/usb/core/hcd.c | 3 +- drivers/usb/gadget/omap_udc.c | 4 +- drivers/usb/host/ehci-hcd.c | 26 +- drivers/usb/host/ehci-sched.c | 32 +- drivers/usb/misc/Kconfig | 9 + drivers/usb/misc/Makefile | 1 + drivers/usb/misc/usbsevseg.c | 394 +++++++ drivers/usb/musb/musb_core.c | 4 +- drivers/usb/musb/omap2430.c | 4 +- drivers/usb/musb/omap2430.h | 4 +- drivers/usb/serial/sierra.c | 11 +- drivers/usb/storage/Kconfig | 12 - drivers/usb/storage/Makefile | 3 +- drivers/usb/storage/unusual_devs.h | 16 +- drivers/usb/storage/usb.c | 2 - include/linux/usb/Kbuild | 2 +- include/linux/usb/tmc.h | 43 + 26 files changed, 1775 insertions(+), 61 deletions(-) create mode 100644 Documentation/ABI/stable/sysfs-driver-usb-usbtmc create mode 100644 Documentation/ABI/testing/sysfs-bus-usb-devices-usbsevseg create mode 100644 Documentation/usb/misc_usbsevseg.txt create mode 100644 drivers/usb/class/usbtmc.c create mode 100644 drivers/usb/misc/usbsevseg.c create mode 100644 include/linux/usb/tmc.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 Auto-merged MAINTAINERS Merge made by recursive. 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 Removed arch/sparc/include/asm/statfs_32.h Removed arch/sparc/include/asm/statfs_64.h Merge made by recursive. arch/alpha/include/asm/statfs.h | 4 ++ arch/arm/include/asm/statfs.h | 34 +----------------- arch/ia64/include/asm/statfs.h | 52 +++-------------------------- arch/powerpc/include/asm/statfs.h | 54 ----------------------------- arch/s390/include/asm/statfs.h | 11 ++---- arch/sparc/include/asm/statfs.h | 8 ++--- arch/sparc/include/asm/statfs_32.h | 6 --- arch/sparc/include/asm/statfs_64.h | 54 ----------------------------- arch/x86/kernel/early-quirks.c | 18 ++++++++++ drivers/media/video/cafe_ccic.c | 13 ++----- drivers/mmc/host/sdhci-pci.c | 2 +- drivers/mtd/nand/cafe_nand.c | 6 +++- drivers/pci/intel-iommu.c | 2 +- fs/efs/super.c | 2 - include/asm-generic/statfs.h | 65 ++++++++++++++++++++++++++--------- include/asm-parisc/statfs.h | 55 +----------------------------- include/asm-x86/iommu.h | 1 + include/asm-x86/statfs.h | 61 +++------------------------------- include/linux/pci_ids.h | 4 ++- 19 files changed, 105 insertions(+), 347 deletions(-) delete mode 100644 arch/sparc/include/asm/statfs_32.h delete mode 100644 arch/sparc/include/asm/statfs_64.h Merging arm/devel $ git merge arm/devel Auto-merged arch/arm/mach-omap1/mcbsp.c CONFLICT (content): Merge conflict in arch/arm/mach-omap1/mcbsp.c Auto-merged arch/arm/mach-omap2/mcbsp.c CONFLICT (content): Merge conflict in arch/arm/mach-omap2/mcbsp.c Removed arch/arm/mach-pxa/e400_lcd.c Removed arch/arm/mach-pxa/e740_lcd.c Removed arch/arm/mach-pxa/eseries_udc.c Auto-merged arch/arm/plat-omap/include/mach/mcbsp.h CONFLICT (content): Merge conflict in arch/arm/plat-omap/include/mach/mcbsp.h Auto-merged arch/arm/plat-omap/mcbsp.c CONFLICT (content): Merge conflict in arch/arm/plat-omap/mcbsp.c Removed drivers/video/am200epd.c Recorded preimage for 'arch/arm/mach-omap1/mcbsp.c' Recorded preimage for 'arch/arm/mach-omap2/mcbsp.c' Recorded preimage for 'arch/arm/plat-omap/include/mach/mcbsp.h' Recorded preimage for 'arch/arm/plat-omap/mcbsp.c' Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'arch/arm/mach-omap1/mcbsp.c'. Recorded resolution for 'arch/arm/mach-omap2/mcbsp.c'. Recorded resolution for 'arch/arm/plat-omap/include/mach/mcbsp.h'. Recorded resolution for 'arch/arm/plat-omap/mcbsp.c'. Created commit 328d651: Merge commit 'arm/devel' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 14 +- arch/arm/Kconfig | 47 +- arch/arm/boot/compressed/head.S | 1 + arch/arm/configs/afeb9260_defconfig | 1259 ++++++++++++++++++++ arch/arm/configs/cm_x300_defconfig | 1466 ++++++++++++++++++++++++ arch/arm/configs/palmz72_defconfig | 951 +++++++++++++++ arch/arm/include/asm/bug.h | 2 +- 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/futex.h | 124 ++- arch/arm/include/asm/kprobes.h | 1 - arch/arm/include/asm/memory.h | 30 +- arch/arm/include/asm/mmu_context.h | 1 + arch/arm/include/asm/system.h | 58 - arch/arm/include/asm/uaccess.h | 10 +- arch/arm/kernel/debug.S | 5 + arch/arm/kernel/entry-armv.S | 16 + arch/arm/kernel/entry-common.S | 25 +- arch/arm/kernel/head-common.S | 19 +- arch/arm/kernel/head-nommu.S | 4 +- arch/arm/kernel/head.S | 12 +- arch/arm/kernel/kprobes-decode.c | 4 +- arch/arm/kernel/kprobes.c | 5 +- arch/arm/kernel/setup.c | 46 +- arch/arm/kernel/traps.c | 12 - arch/arm/lib/ashldi3.S | 2 + arch/arm/lib/ashrdi3.S | 2 + arch/arm/lib/backtrace.S | 4 + arch/arm/lib/changebit.S | 2 + arch/arm/lib/clear_user.S | 3 +- arch/arm/lib/clearbit.S | 2 + arch/arm/lib/copy_from_user.S | 2 + arch/arm/lib/copy_page.S | 1 + arch/arm/lib/copy_to_user.S | 2 + arch/arm/lib/csumipv6.S | 1 + arch/arm/lib/csumpartial.S | 1 + arch/arm/lib/csumpartialcopy.S | 7 +- arch/arm/lib/csumpartialcopygeneric.S | 1 + arch/arm/lib/csumpartialcopyuser.S | 7 +- arch/arm/lib/delay.S | 3 + arch/arm/lib/div64.S | 1 + arch/arm/lib/findbit.S | 8 + arch/arm/lib/getuser.S | 14 +- arch/arm/lib/io-readsb.S | 1 + arch/arm/lib/io-readsl.S | 1 + arch/arm/lib/io-readsw-armv4.S | 1 + arch/arm/lib/io-writesb.S | 1 + arch/arm/lib/io-writesl.S | 1 + arch/arm/lib/io-writesw-armv4.S | 1 + arch/arm/lib/lib1funcs.S | 11 + arch/arm/lib/lshrdi3.S | 2 + arch/arm/lib/memchr.S | 1 + arch/arm/lib/memcpy.S | 1 + arch/arm/lib/memmove.S | 1 + arch/arm/lib/memset.S | 1 + arch/arm/lib/memzero.S | 1 + arch/arm/lib/muldi3.S | 2 + arch/arm/lib/putuser.S | 18 +- arch/arm/lib/setbit.S | 2 + arch/arm/lib/sha1.S | 3 + arch/arm/lib/strchr.S | 1 + arch/arm/lib/strncpy_from_user.S | 1 + arch/arm/lib/strnlen_user.S | 1 + arch/arm/lib/strrchr.S | 1 + arch/arm/lib/testchangebit.S | 2 + arch/arm/lib/testclearbit.S | 2 + arch/arm/lib/testsetbit.S | 2 + arch/arm/lib/uaccess.S | 2 + arch/arm/lib/ucmpdi2.S | 4 + arch/arm/mach-at91/Kconfig | 9 + arch/arm/mach-at91/Makefile | 1 + arch/arm/mach-at91/board-afeb-9260v1.c | 210 ++++ arch/arm/mach-footbridge/include/mach/memory.h | 10 - arch/arm/mach-iop13xx/include/mach/memory.h | 3 - 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-omap1/mcbsp.c | 8 - arch/arm/mach-omap1/serial.c | 12 +- arch/arm/mach-omap2/Makefile | 3 +- arch/arm/mach-omap2/clock.c | 46 +- arch/arm/mach-omap2/clock.h | 1 + arch/arm/mach-omap2/clock24xx.h | 238 +++- arch/arm/mach-omap2/clock34xx.c | 31 +- arch/arm/mach-omap2/clock34xx.h | 248 ++++- arch/arm/mach-omap2/clockdomain.c | 623 ++++++++++ arch/arm/mach-omap2/clockdomains.h | 305 +++++ arch/arm/mach-omap2/cm-regbits-24xx.h | 24 +- arch/arm/mach-omap2/cm-regbits-34xx.h | 42 +- arch/arm/mach-omap2/cm.h | 2 +- arch/arm/mach-omap2/gpmc.c | 6 +- arch/arm/mach-omap2/id.c | 7 +- arch/arm/mach-omap2/io.c | 9 + arch/arm/mach-omap2/irq.c | 4 +- arch/arm/mach-omap2/mcbsp.c | 4 - arch/arm/mach-omap2/powerdomain.c | 1113 ++++++++++++++++++ arch/arm/mach-omap2/powerdomains.h | 187 +++ arch/arm/mach-omap2/powerdomains24xx.h | 200 ++++ arch/arm/mach-omap2/powerdomains34xx.h | 327 ++++++ arch/arm/mach-omap2/prcm-common.h | 3 +- arch/arm/mach-omap2/prm-regbits-24xx.h | 12 +- arch/arm/mach-omap2/prm-regbits-34xx.h | 11 +- arch/arm/mach-omap2/prm.h | 5 +- arch/arm/mach-omap2/serial.c | 14 +- arch/arm/mach-pxa/Kconfig | 73 ++- arch/arm/mach-pxa/Makefile | 16 +- arch/arm/mach-pxa/am200epd.c | 374 ++++++ arch/arm/mach-pxa/cm-x300.c | 473 ++++++++ arch/arm/mach-pxa/devices.h | 1 + arch/arm/mach-pxa/e330.c | 43 + arch/arm/mach-pxa/e350.c | 43 + arch/arm/mach-pxa/e400.c | 94 ++ arch/arm/mach-pxa/e400_lcd.c | 56 - arch/arm/mach-pxa/e740.c | 169 +++ arch/arm/mach-pxa/e740_lcd.c | 123 -- arch/arm/mach-pxa/{e750_lcd.c => e750.c} | 67 +- arch/arm/mach-pxa/{e800_lcd.c => e800.c} | 79 +- arch/arm/mach-pxa/eseries.c | 157 +--- arch/arm/mach-pxa/eseries.h | 4 + arch/arm/mach-pxa/eseries_udc.c | 57 - arch/arm/mach-pxa/gumstix.c | 100 ++- arch/arm/mach-pxa/include/mach/hardware.h | 2 + arch/arm/mach-pxa/include/mach/i2c.h | 6 +- arch/arm/mach-pxa/include/mach/irqs.h | 8 +- arch/arm/mach-pxa/include/mach/mfp-pxa320.h | 8 +- arch/arm/mach-pxa/include/mach/mioa701.h | 67 ++ arch/arm/mach-pxa/include/mach/palmz72.h | 67 ++ arch/arm/mach-pxa/include/mach/pm.h | 2 + arch/arm/mach-pxa/include/mach/ssp.h | 24 + arch/arm/mach-pxa/include/mach/trizeps4.h | 84 ++- arch/arm/mach-pxa/mioa701.c | 905 +++++++++++++++ arch/arm/mach-pxa/mioa701_bootresume.S | 36 + arch/arm/mach-pxa/palmz72.c | 481 ++++++++ arch/arm/mach-pxa/pm.c | 18 + arch/arm/mach-pxa/pxa25x.c | 20 +- arch/arm/mach-pxa/pxa27x.c | 22 +- arch/arm/mach-pxa/pxa3xx.c | 45 + arch/arm/mach-pxa/trizeps4.c | 549 ++++++---- arch/arm/mach-pxa/zylonite_pxa300.c | 8 +- arch/arm/mach-pxa/zylonite_pxa320.c | 6 + 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 | 16 - arch/arm/mach-sa1100/include/mach/hardware.h | 18 + arch/arm/mm/abort-ev7.S | 1 + arch/arm/mm/abort-nommu.S | 1 + arch/arm/mm/cache-v7.S | 10 + arch/arm/mm/cache-xsc3l2.c | 3 +- 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/mm/proc-v7.S | 8 + arch/arm/mm/tlb-v7.S | 2 + 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/Kconfig | 24 + arch/arm/plat-omap/Makefile | 2 +- arch/arm/plat-omap/common.c | 36 +- arch/arm/plat-omap/dma.c | 6 +- arch/arm/plat-omap/dmtimer.c | 2 +- arch/arm/plat-omap/include/mach/clock.h | 3 + arch/arm/plat-omap/include/mach/clockdomain.h | 106 ++ arch/arm/plat-omap/include/mach/control.h | 6 +- arch/arm/plat-omap/include/mach/fpga.h | 12 +- arch/arm/plat-omap/include/mach/hardware.h | 2 +- arch/arm/plat-omap/include/mach/io.h | 59 +- arch/arm/plat-omap/include/mach/irqs.h | 2 + arch/arm/plat-omap/include/mach/mcbsp.h | 3 +- arch/arm/plat-omap/include/mach/pm.h | 4 +- arch/arm/plat-omap/include/mach/powerdomain.h | 166 +++ arch/arm/plat-omap/include/mach/sdrc.h | 6 +- arch/arm/plat-omap/include/mach/serial.h | 12 +- arch/arm/plat-omap/io.c | 81 ++ arch/arm/plat-omap/mcbsp.c | 42 +- arch/arm/vfp/entry.S | 8 +- arch/arm/vfp/vfphw.S | 25 +- drivers/char/hw_random/omap-rng.c | 33 +- drivers/i2c/busses/i2c-omap.c | 12 +- drivers/i2c/busses/i2c-pxa.c | 49 +- drivers/input/touchscreen/Kconfig | 1 + drivers/input/touchscreen/ucb1400_ts.c | 382 +++---- drivers/mfd/Kconfig | 9 + drivers/mfd/Makefile | 1 + drivers/mfd/ucb1400_core.c | 106 ++ drivers/mmc/host/omap.c | 7 +- drivers/pcmcia/Makefile | 3 +- drivers/pcmcia/pxa2xx_palmld.c | 151 +++ drivers/serial/8250.c | 23 +- drivers/spi/omap2_mcspi.c | 18 +- drivers/spi/omap_uwire.c | 23 +- drivers/usb/host/ohci-omap.c | 14 +- drivers/video/Kconfig | 31 +- drivers/video/Makefile | 1 - drivers/video/am200epd.c | 295 ----- drivers/video/atmel_lcdfb.c | 4 + drivers/video/metronomefb.c | 288 +++--- drivers/video/omap/dispc.c | 21 +- drivers/video/omap/rfbi.c | 9 +- drivers/video/omap/sossi.c | 8 +- drivers/watchdog/ixp4xx_wdt.c | 4 +- include/linux/ucb1400.h | 161 +++ include/video/atmel_lcdc.h | 1 + include/video/metronomefb.h | 31 +- 211 files changed, 13318 insertions(+), 2086 deletions(-) create mode 100644 arch/arm/configs/afeb9260_defconfig create mode 100644 arch/arm/configs/cm_x300_defconfig create mode 100644 arch/arm/configs/palmz72_defconfig create mode 100644 arch/arm/include/asm/cachetype.h create mode 100644 arch/arm/include/asm/cputype.h create mode 100644 arch/arm/mach-at91/board-afeb-9260v1.c create mode 100644 arch/arm/mach-omap2/clockdomain.c create mode 100644 arch/arm/mach-omap2/clockdomains.h create mode 100644 arch/arm/mach-omap2/powerdomain.c create mode 100644 arch/arm/mach-omap2/powerdomains.h create mode 100644 arch/arm/mach-omap2/powerdomains24xx.h create mode 100644 arch/arm/mach-omap2/powerdomains34xx.h create mode 100644 arch/arm/mach-pxa/am200epd.c create mode 100644 arch/arm/mach-pxa/cm-x300.c create mode 100644 arch/arm/mach-pxa/e330.c create mode 100644 arch/arm/mach-pxa/e350.c create mode 100644 arch/arm/mach-pxa/e400.c delete mode 100644 arch/arm/mach-pxa/e400_lcd.c create mode 100644 arch/arm/mach-pxa/e740.c delete mode 100644 arch/arm/mach-pxa/e740_lcd.c rename arch/arm/mach-pxa/{e750_lcd.c => e750.c} (61%) rename arch/arm/mach-pxa/{e800_lcd.c => e800.c} (65%) create mode 100644 arch/arm/mach-pxa/eseries.h delete mode 100644 arch/arm/mach-pxa/eseries_udc.c create mode 100644 arch/arm/mach-pxa/include/mach/mioa701.h create mode 100644 arch/arm/mach-pxa/include/mach/palmz72.h create mode 100644 arch/arm/mach-pxa/mioa701.c create mode 100644 arch/arm/mach-pxa/mioa701_bootresume.S create mode 100644 arch/arm/mach-pxa/palmz72.c create mode 100644 arch/arm/oprofile/op_model_v7.c create mode 100644 arch/arm/oprofile/op_model_v7.h create mode 100644 arch/arm/plat-omap/include/mach/clockdomain.h create mode 100644 arch/arm/plat-omap/include/mach/powerdomain.h create mode 100644 arch/arm/plat-omap/io.c create mode 100644 drivers/mfd/ucb1400_core.c create mode 100644 drivers/pcmcia/pxa2xx_palmld.c delete mode 100644 drivers/video/am200epd.c create mode 100644 include/linux/ucb1400.h Merging avr32/avr32-arch $ git merge avr32/avr32-arch Merge made by recursive. arch/avr32/include/asm/byteorder.h | 22 +++++--- arch/avr32/kernel/asm-offsets.c | 6 ++ arch/avr32/kernel/entry-avr32b.S | 59 +++++++++++++++++++++- arch/avr32/mach-at32ap/include/mach/io.h | 3 +- arch/avr32/mach-at32ap/pm-at32ap700x.S | 2 +- arch/avr32/oprofile/Makefile | 2 +- arch/avr32/oprofile/backtrace.c | 81 ++++++++++++++++++++++++++++++ arch/avr32/oprofile/op_model_avr32.c | 4 ++ 8 files changed, 165 insertions(+), 14 deletions(-) create mode 100644 arch/avr32/oprofile/backtrace.c Merging blackfin/for-linus $ git merge blackfin/for-linus Already up-to-date. Merging cris/for-next $ git merge cris/for-next Merge made by recursive. arch/cris/arch-v10/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 ia64/test $ git merge ia64/test Already up-to-date. Merging quilt/m68k $ git merge quilt/m68k Merge made by recursive. arch/m68k/Kconfig | 43 ++++++++++++----------- arch/m68k/amiga/config.c | 9 +++++ arch/m68k/atari/atakeyb.c | 12 ------ arch/m68k/atari/time.c | 38 +++++++++++--------- arch/m68k/bvme6000/config.c | 15 +-------- arch/m68k/bvme6000/rtc.c | 30 ++++++++-------- arch/m68k/configs/amiga_defconfig | 53 +++++++++++++++++----------- arch/m68k/configs/apollo_defconfig | 53 +++++++++++++++++----------- arch/m68k/configs/atari_defconfig | 60 +++++++++++++++++++------------- arch/m68k/configs/bvme6000_defconfig | 52 +++++++++++++++++----------- arch/m68k/configs/hp300_defconfig | 52 +++++++++++++++++----------- arch/m68k/configs/mac_defconfig | 53 +++++++++++++++++----------- arch/m68k/configs/multi_defconfig | 62 +++++++++++++++++++-------------- arch/m68k/configs/mvme147_defconfig | 52 +++++++++++++++++----------- arch/m68k/configs/mvme16x_defconfig | 52 +++++++++++++++++----------- arch/m68k/configs/q40_defconfig | 53 +++++++++++++++++----------- arch/m68k/configs/sun3_defconfig | 54 +++++++++++++++++------------ arch/m68k/configs/sun3x_defconfig | 52 +++++++++++++++++----------- arch/m68k/kernel/dma.c | 4 +- arch/m68k/kernel/traps.c | 9 ++--- arch/m68k/kernel/vmlinux-std.lds | 9 +++-- arch/m68k/mvme16x/rtc.c | 26 +++++++------- arch/m68k/q40/config.c | 12 +------ arch/m68k/sun3x/time.c | 28 ++++++++-------- drivers/char/amiserial.c | 6 ++- include/asm-m68k/dma-mapping.h | 16 +++++++++ include/asm-m68k/pci.h | 1 + 27 files changed, 517 insertions(+), 389 deletions(-) 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 mips/mips-for-linux-next $ git merge mips/mips-for-linux-next Merge made by recursive. Documentation/kernel-parameters.txt | 4 + arch/mips/Kconfig | 2 +- arch/mips/Makefile | 8 +- arch/mips/kernel/ptrace32.c | 43 +-- arch/mips/kernel/scall64-n32.S | 2 +- arch/mips/kernel/scall64-o32.S | 2 +- arch/mips/kernel/signal32.c | 12 + arch/mips/pci/Makefile | 1 + arch/mips/pci/pci-tx4938.c | 2 +- arch/mips/pci/pci-tx4939.c | 109 ++++ arch/mips/pmc-sierra/msp71xx/Makefile | 1 + arch/mips/pmc-sierra/msp71xx/gpio.c | 218 ++++++++ arch/mips/pmc-sierra/msp71xx/gpio_extended.c | 148 ++++++ arch/mips/rb532/devices.c | 22 +- arch/mips/rb532/gpio.c | 238 +++++++--- arch/mips/rb532/irq.c | 2 +- arch/mips/rb532/prom.c | 12 - arch/mips/rb532/serial.c | 6 +- arch/mips/rb532/setup.c | 4 +- arch/mips/txx9/Kconfig | 24 +- arch/mips/txx9/generic/Makefile | 2 + arch/mips/txx9/generic/irq_tx4927.c | 11 + arch/mips/txx9/generic/irq_tx4938.c | 11 + arch/mips/txx9/generic/irq_tx4939.c | 215 ++++++++ arch/mips/txx9/generic/setup.c | 431 ++++++++++++++++- arch/mips/txx9/generic/setup_tx3927.c | 37 +- arch/mips/txx9/generic/setup_tx4927.c | 97 ++++ arch/mips/txx9/generic/setup_tx4938.c | 122 +++++ arch/mips/txx9/generic/setup_tx4939.c | 460 +++++++++++++++++ arch/mips/txx9/{rbtx4938 => generic}/spi_eeprom.c | 28 +- arch/mips/txx9/jmr3927/prom.c | 1 - arch/mips/txx9/jmr3927/setup.c | 25 +- arch/mips/txx9/rbtx4927/irq.c | 11 +- arch/mips/txx9/rbtx4927/prom.c | 1 - arch/mips/txx9/rbtx4927/setup.c | 25 +- arch/mips/txx9/rbtx4938/Makefile | 2 +- arch/mips/txx9/rbtx4938/irq.c | 8 +- arch/mips/txx9/rbtx4938/prom.c | 3 - arch/mips/txx9/rbtx4938/setup.c | 63 ++- arch/mips/txx9/rbtx4939/Makefile | 3 + arch/mips/txx9/rbtx4939/irq.c | 96 ++++ arch/mips/txx9/rbtx4939/prom.c | 17 + arch/mips/txx9/rbtx4939/setup.c | 306 ++++++++++++ include/asm-mips/mach-rc32434/gpio.h | 74 +--- include/asm-mips/mach-rc32434/irq.h | 25 + include/asm-mips/mach-rc32434/prom.h | 4 - include/asm-mips/mach-rc32434/rb.h | 5 +- include/asm-mips/mach-rc32434/rc32434.h | 42 -- include/asm-mips/pmc-sierra/msp71xx/gpio.h | 46 ++ include/asm-mips/ptrace.h | 3 + include/asm-mips/txx9/boards.h | 13 + include/asm-mips/txx9/generic.h | 29 +- include/asm-mips/txx9/rbtx4927.h | 3 + include/asm-mips/txx9/rbtx4939.h | 133 +++++ include/asm-mips/txx9/smsc_fdc37m81x.h | 1 + include/asm-mips/txx9/spi.h | 19 +- include/asm-mips/txx9/tx3927.h | 2 + include/asm-mips/txx9/tx4927.h | 14 + include/asm-mips/txx9/tx4938.h | 2 + include/asm-mips/txx9/tx4939.h | 544 +++++++++++++++++++++ 60 files changed, 3449 insertions(+), 345 deletions(-) create mode 100644 arch/mips/pci/pci-tx4939.c create mode 100644 arch/mips/pmc-sierra/msp71xx/gpio.c create mode 100644 arch/mips/pmc-sierra/msp71xx/gpio_extended.c create mode 100644 arch/mips/txx9/generic/irq_tx4939.c create mode 100644 arch/mips/txx9/generic/setup_tx4939.c rename arch/mips/txx9/{rbtx4938 => generic}/spi_eeprom.c (79%) create mode 100644 arch/mips/txx9/rbtx4939/Makefile create mode 100644 arch/mips/txx9/rbtx4939/irq.c create mode 100644 arch/mips/txx9/rbtx4939/prom.c create mode 100644 arch/mips/txx9/rbtx4939/setup.c create mode 100644 include/asm-mips/pmc-sierra/msp71xx/gpio.h create mode 100644 include/asm-mips/txx9/boards.h create mode 100644 include/asm-mips/txx9/rbtx4939.h create mode 100644 include/asm-mips/txx9/tx4939.h Merging parisc/master $ git merge parisc/master Merge made by recursive. .../asm-parisc => arch/parisc/include/asm}/Kbuild | 0 .../asm-parisc => arch/parisc/include/asm}/a.out.h | 0 .../asm-parisc => arch/parisc/include/asm}/agp.h | 0 .../parisc/include/asm}/asmregs.h | 0 .../parisc/include/asm}/assembly.h | 0 .../parisc/include/asm}/atomic.h | 0 .../parisc/include/asm}/auxvec.h | 0 .../parisc/include/asm}/bitops.h | 0 .../asm-parisc => arch/parisc/include/asm}/bug.h | 0 .../asm-parisc => arch/parisc/include/asm}/bugs.h | 0 .../parisc/include/asm}/byteorder.h | 0 .../asm-parisc => arch/parisc/include/asm}/cache.h | 0 .../parisc/include/asm}/cacheflush.h | 0 .../parisc/include/asm}/checksum.h | 0 .../parisc/include/asm}/compat.h | 0 .../parisc/include/asm}/compat_rt_sigframe.h | 0 .../parisc/include/asm}/compat_signal.h | 0 .../parisc/include/asm}/compat_ucontext.h | 0 .../parisc/include/asm}/cputime.h | 0 .../parisc/include/asm}/current.h | 0 .../asm-parisc => arch/parisc/include/asm}/delay.h | 0 .../parisc/include/asm}/device.h | 0 .../asm-parisc => arch/parisc/include/asm}/div64.h | 0 .../parisc/include/asm}/dma-mapping.h | 0 .../asm-parisc => arch/parisc/include/asm}/dma.h | 0 .../parisc/include/asm}/eisa_bus.h | 0 .../parisc/include/asm}/eisa_eeprom.h | 0 .../asm-parisc => arch/parisc/include/asm}/elf.h | 0 .../parisc/include/asm}/emergency-restart.h | 0 .../asm-parisc => arch/parisc/include/asm}/errno.h | 0 .../asm-parisc => arch/parisc/include/asm}/fb.h | 0 .../asm-parisc => arch/parisc/include/asm}/fcntl.h | 0 .../parisc/include/asm}/fixmap.h | 0 .../parisc/include/asm}/floppy.h | 0 .../asm-parisc => arch/parisc/include/asm}/futex.h | 0 .../parisc/include/asm}/grfioctl.h | 0 .../parisc/include/asm}/hardirq.h | 0 .../parisc/include/asm}/hardware.h | 0 .../parisc/include/asm}/hw_irq.h | 0 .../asm-parisc => arch/parisc/include/asm}/ide.h | 0 .../asm-parisc => arch/parisc/include/asm}/io.h | 0 .../asm-parisc => arch/parisc/include/asm}/ioctl.h | 0 .../parisc/include/asm}/ioctls.h | 0 .../parisc/include/asm}/ipcbuf.h | 0 .../asm-parisc => arch/parisc/include/asm}/irq.h | 0 .../parisc/include/asm}/irq_regs.h | 0 .../parisc/include/asm}/kdebug.h | 0 .../parisc/include/asm}/kmap_types.h | 0 .../asm-parisc => arch/parisc/include/asm}/led.h | 0 .../parisc/include/asm}/linkage.h | 0 .../asm-parisc => arch/parisc/include/asm}/local.h | 0 .../parisc/include/asm}/machdep.h | 0 .../parisc/include/asm}/mc146818rtc.h | 0 .../parisc/include/asm}/mckinley.h | 0 .../asm-parisc => arch/parisc/include/asm}/mman.h | 0 .../asm-parisc => arch/parisc/include/asm}/mmu.h | 0 .../parisc/include/asm}/mmu_context.h | 0 .../parisc/include/asm}/mmzone.h | 0 .../parisc/include/asm}/module.h | 0 .../parisc/include/asm}/msgbuf.h | 0 .../asm-parisc => arch/parisc/include/asm}/mutex.h | 0 .../asm-parisc => arch/parisc/include/asm}/page.h | 0 .../asm-parisc => arch/parisc/include/asm}/param.h | 0 .../parisc/include/asm}/parisc-device.h | 0 .../parisc/include/asm}/parport.h | 0 .../asm-parisc => arch/parisc/include/asm}/pci.h | 0 .../asm-parisc => arch/parisc/include/asm}/pdc.h | 5 ++ .../parisc/include/asm}/pdc_chassis.h | 0 .../parisc/include/asm}/pdcpat.h | 0 .../parisc/include/asm}/percpu.h | 0 .../asm-parisc => arch/parisc/include/asm}/perf.h | 0 .../parisc/include/asm}/pgalloc.h | 0 .../parisc/include/asm}/pgtable.h | 0 .../asm-parisc => arch/parisc/include/asm}/poll.h | 0 .../parisc/include/asm}/posix_types.h | 0 .../parisc/include/asm}/prefetch.h | 0 .../parisc/include/asm}/processor.h | 0 .../asm-parisc => arch/parisc/include/asm}/psw.h | 0 .../parisc/include/asm}/ptrace.h | 0 .../asm-parisc => arch/parisc/include/asm}/real.h | 0 .../parisc/include/asm}/resource.h | 0 .../asm-parisc => arch/parisc/include/asm}/ropes.h | 2 +- .../parisc/include/asm}/rt_sigframe.h | 0 .../asm-parisc => arch/parisc/include/asm}/rtc.h | 0 .../parisc/include/asm}/runway.h | 0 .../parisc/include/asm}/scatterlist.h | 0 .../parisc/include/asm}/sections.h | 0 .../parisc/include/asm}/segment.h | 0 .../parisc/include/asm}/sembuf.h | 0 .../parisc/include/asm}/serial.h | 0 .../asm-parisc => arch/parisc/include/asm}/setup.h | 0 .../parisc/include/asm}/shmbuf.h | 0 .../parisc/include/asm}/shmparam.h | 0 .../parisc/include/asm}/sigcontext.h | 0 .../parisc/include/asm}/siginfo.h | 0 .../parisc/include/asm}/signal.h | 0 .../asm-parisc => arch/parisc/include/asm}/smp.h | 0 .../parisc/include/asm}/socket.h | 0 .../parisc/include/asm}/sockios.h | 0 .../parisc/include/asm}/spinlock.h | 0 .../parisc/include/asm}/spinlock_types.h | 0 .../asm-parisc => arch/parisc/include/asm}/stat.h | 0 .../parisc/include/asm}/statfs.h | 0 .../parisc/include/asm}/string.h | 0 .../parisc/include/asm}/superio.h | 0 .../parisc/include/asm}/system.h | 0 .../parisc/include/asm}/termbits.h | 0 .../parisc/include/asm}/termios.h | 0 .../parisc/include/asm}/thread_info.h | 0 .../asm-parisc => arch/parisc/include/asm}/timex.h | 0 .../asm-parisc => arch/parisc/include/asm}/tlb.h | 0 .../parisc/include/asm}/tlbflush.h | 0 .../parisc/include/asm}/topology.h | 0 .../asm-parisc => arch/parisc/include/asm}/traps.h | 0 .../asm-parisc => arch/parisc/include/asm}/types.h | 0 .../parisc/include/asm}/uaccess.h | 0 .../parisc/include/asm}/ucontext.h | 0 .../parisc/include/asm}/unaligned.h | 0 .../parisc/include/asm}/unistd.h | 0 .../parisc/include/asm}/unwind.h | 0 .../asm-parisc => arch/parisc/include/asm}/user.h | 0 .../asm-parisc => arch/parisc/include/asm}/vga.h | 0 .../asm-parisc => arch/parisc/include/asm}/xor.h | 0 arch/parisc/kernel/.gitignore | 1 + arch/parisc/kernel/asm-offsets.c | 3 + arch/parisc/kernel/firmware.c | 69 +++++++++++++------- arch/parisc/kernel/head.S | 2 +- arch/parisc/kernel/real2.S | 12 ++++ arch/parisc/kernel/setup.c | 27 +++++++- drivers/char/agp/parisc-agp.c | 4 +- drivers/parisc/ccio-dma.c | 43 +++++------- 131 files changed, 114 insertions(+), 54 deletions(-) rename {include/asm-parisc => arch/parisc/include/asm}/Kbuild (100%) rename {include/asm-parisc => arch/parisc/include/asm}/a.out.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/agp.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/asmregs.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/assembly.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/atomic.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/auxvec.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/bitops.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/bug.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/bugs.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/byteorder.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/cache.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/cacheflush.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/checksum.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/compat.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/compat_rt_sigframe.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/compat_signal.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/compat_ucontext.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/cputime.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/current.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/delay.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/device.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/div64.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/dma-mapping.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/dma.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/eisa_bus.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/eisa_eeprom.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/elf.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/emergency-restart.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/errno.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/fb.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/fcntl.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/fixmap.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/floppy.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/futex.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/grfioctl.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/hardirq.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/hardware.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/hw_irq.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/ide.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/io.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/ioctl.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/ioctls.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/ipcbuf.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/irq.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/irq_regs.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/kdebug.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/kmap_types.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/led.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/linkage.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/local.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/machdep.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/mc146818rtc.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/mckinley.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/mman.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/mmu.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/mmu_context.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/mmzone.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/module.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/msgbuf.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/mutex.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/page.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/param.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/parisc-device.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/parport.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/pci.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/pdc.h (99%) rename {include/asm-parisc => arch/parisc/include/asm}/pdc_chassis.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/pdcpat.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/percpu.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/perf.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/pgalloc.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/pgtable.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/poll.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/posix_types.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/prefetch.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/processor.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/psw.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/ptrace.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/real.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/resource.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/ropes.h (99%) rename {include/asm-parisc => arch/parisc/include/asm}/rt_sigframe.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/rtc.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/runway.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/scatterlist.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/sections.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/segment.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/sembuf.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/serial.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/setup.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/shmbuf.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/shmparam.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/sigcontext.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/siginfo.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/signal.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/smp.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/socket.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/sockios.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/spinlock.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/spinlock_types.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/stat.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/statfs.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/string.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/superio.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/system.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/termbits.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/termios.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/thread_info.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/timex.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/tlb.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/tlbflush.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/topology.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/traps.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/types.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/uaccess.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/ucontext.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/unaligned.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/unistd.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/unwind.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/user.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/vga.h (100%) rename {include/asm-parisc => arch/parisc/include/asm}/xor.h (100%) create mode 100644 arch/parisc/kernel/.gitignore Merging powerpc/powerpc-next $ git merge powerpc/powerpc-next Auto-merged arch/powerpc/kernel/Makefile Auto-merged arch/powerpc/mm/hash_utils_64.c Merge made by recursive. arch/powerpc/Kconfig.debug | 5 + arch/powerpc/boot/dtc-src/Makefile.dtc | 18 +- arch/powerpc/boot/dtc-src/checks.c | 305 +++---------- arch/powerpc/boot/dtc-src/data.c | 62 ++-- arch/powerpc/boot/dtc-src/dtc-lexer.l | 120 +++--- arch/powerpc/boot/dtc-src/dtc-lexer.lex.c_shipped | 445 ++++++++++---------- arch/powerpc/boot/dtc-src/dtc-parser.tab.c_shipped | 387 ++++++++++-------- arch/powerpc/boot/dtc-src/dtc-parser.tab.h_shipped | 12 +- arch/powerpc/boot/dtc-src/dtc-parser.y | 67 +++- arch/powerpc/boot/dtc-src/dtc.c | 41 +- arch/powerpc/boot/dtc-src/dtc.h | 43 +-- arch/powerpc/boot/dtc-src/flattree.c | 232 ++++------- arch/powerpc/boot/dtc-src/fstree.c | 8 +- arch/powerpc/boot/dtc-src/libfdt_env.h | 23 + arch/powerpc/boot/dtc-src/livetree.c | 9 +- arch/powerpc/boot/dtc-src/srcpos.c | 121 +++--- arch/powerpc/boot/dtc-src/srcpos.h | 30 +- arch/powerpc/boot/dtc-src/treesource.c | 15 +- arch/powerpc/boot/dtc-src/version_gen.h | 2 +- arch/powerpc/boot/libfdt/Makefile.libfdt | 8 +- arch/powerpc/boot/libfdt/fdt.c | 61 +++- arch/powerpc/boot/libfdt/fdt_ro.c | 329 +++++---------- arch/powerpc/boot/libfdt/fdt_rw.c | 200 +++++---- arch/powerpc/boot/libfdt/fdt_strerror.c | 34 +- arch/powerpc/boot/libfdt/fdt_sw.c | 55 ++-- arch/powerpc/boot/libfdt/fdt_wip.c | 9 +- arch/powerpc/boot/libfdt/libfdt.h | 383 ++++++++++++++++- arch/powerpc/boot/libfdt/libfdt_internal.h | 24 +- arch/powerpc/boot/libfdt_env.h | 1 + arch/powerpc/include/asm/cputable.h | 1 + arch/powerpc/include/asm/mpic.h | 4 +- arch/powerpc/include/asm/msi_bitmap.h | 35 ++ arch/powerpc/include/asm/of_device.h | 3 - arch/powerpc/include/asm/of_platform.h | 3 - arch/powerpc/include/asm/smp.h | 39 ++- arch/powerpc/kernel/Makefile | 4 +- arch/powerpc/kernel/btext.c | 34 +- arch/powerpc/kernel/cputable.c | 24 + arch/powerpc/kernel/entry_64.S | 53 ++- arch/powerpc/kernel/lparcfg.c | 8 +- arch/powerpc/kernel/setup_32.c | 11 - arch/powerpc/kernel/sysfs.c | 117 ++++-- arch/powerpc/mm/hash_utils_64.c | 2 + arch/powerpc/oprofile/op_model_power4.c | 4 +- arch/powerpc/platforms/chrp/time.c | 24 +- arch/powerpc/platforms/iseries/mf.c | 26 +- arch/powerpc/platforms/maple/time.c | 24 +- arch/powerpc/platforms/powermac/time.c | 3 + arch/powerpc/platforms/pseries/cmm.c | 4 +- arch/powerpc/platforms/pseries/eeh_driver.c | 2 +- arch/powerpc/sysdev/Kconfig | 6 + arch/powerpc/sysdev/Makefile | 1 + arch/powerpc/sysdev/fsl_msi.c | 109 +---- arch/powerpc/sysdev/fsl_msi.h | 8 +- arch/powerpc/sysdev/mpic.h | 2 - arch/powerpc/sysdev/mpic_msi.c | 123 +----- arch/powerpc/sysdev/mpic_pasemi_msi.c | 24 +- arch/powerpc/sysdev/mpic_u3msi.c | 22 +- arch/powerpc/sysdev/msi_bitmap.c | 247 +++++++++++ drivers/hwmon/ams/ams.h | 2 +- drivers/pci/hotplug/rpaphp_slot.c | 4 - sound/aoa/soundbus/soundbus.h | 2 +- 62 files changed, 2216 insertions(+), 1808 deletions(-) create mode 100644 arch/powerpc/boot/dtc-src/libfdt_env.h create mode 100644 arch/powerpc/include/asm/msi_bitmap.h create mode 100644 arch/powerpc/sysdev/msi_bitmap.c Merging 4xx/next $ git merge 4xx/next Already up-to-date. Merging galak/powerpc-next $ git merge galak/powerpc-next Auto-merged arch/powerpc/configs/83xx/mpc836x_mds_defconfig Merge made by recursive. arch/powerpc/boot/dts/mgcoge.dts | 174 +++++ arch/powerpc/boot/dts/mgsuvd.dts | 163 ++++ arch/powerpc/boot/dts/mpc836x_mds.dts | 23 +- arch/powerpc/configs/83xx/mpc836x_mds_defconfig | 79 ++- arch/powerpc/configs/mgcoge_defconfig | 900 +++++++++++++++++++++++ arch/powerpc/configs/mgsuvd_defconfig | 872 ++++++++++++++++++++++ arch/powerpc/mm/fsl_booke_mmu.c | 5 +- arch/powerpc/platforms/82xx/Kconfig | 8 + arch/powerpc/platforms/82xx/Makefile | 1 + arch/powerpc/platforms/82xx/mgcoge.c | 129 ++++ arch/powerpc/platforms/8xx/Kconfig | 6 + arch/powerpc/platforms/8xx/Makefile | 1 + arch/powerpc/platforms/8xx/mgsuvd.c | 92 +++ drivers/serial/Kconfig | 36 - include/math-emu/op-2.h | 2 +- include/math-emu/op-common.h | 12 +- include/math-emu/soft-fp.h | 19 + 17 files changed, 2475 insertions(+), 47 deletions(-) create mode 100644 arch/powerpc/boot/dts/mgcoge.dts create mode 100644 arch/powerpc/boot/dts/mgsuvd.dts create mode 100644 arch/powerpc/configs/mgcoge_defconfig create mode 100644 arch/powerpc/configs/mgsuvd_defconfig create mode 100644 arch/powerpc/platforms/82xx/mgcoge.c create mode 100644 arch/powerpc/platforms/8xx/mgsuvd.c Merging s390/features $ git merge s390/features Merge made by recursive. arch/s390/Kconfig | 1 + arch/s390/include/asm/ptrace.h | 1 + arch/s390/include/asm/qdio.h | 8 +- arch/s390/include/asm/syscall.h | 80 ++++++ arch/s390/include/asm/thread_info.h | 2 + arch/s390/kernel/compat_linux.c | 8 - arch/s390/kernel/compat_linux.h | 1 - arch/s390/kernel/compat_wrapper.S | 2 - arch/s390/kernel/entry.S | 50 +++- arch/s390/kernel/entry64.S | 42 +++- arch/s390/kernel/ptrace.c | 61 +++-- arch/s390/kernel/signal.c | 13 + arch/s390/kernel/syscalls.S | 2 +- arch/s390/mm/extmem.c | 251 ++++++++++++++--- drivers/s390/block/dcssblk.c | 516 ++++++++++++++++++++++++++--------- drivers/s390/cio/blacklist.c | 11 +- drivers/s390/cio/chp.c | 7 +- drivers/s390/cio/css.c | 32 ++- 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 ++- 23 files changed, 931 insertions(+), 288 deletions(-) create mode 100644 arch/s390/include/asm/syscall.h Merging sh/master $ git merge sh/master Merge made by recursive. arch/sh/Kconfig | 4 + arch/sh/boot/compressed/misc_32.c | 2 +- arch/sh/configs/ap325rxa_defconfig | 22 +++-- arch/sh/configs/migor_defconfig | 21 +++-- arch/sh/include/asm/bitops-llsc.h | 144 +++++++++++++++++++++++++++++++ arch/sh/include/asm/bitops.h | 2 + arch/sh/include/asm/clock.h | 1 + arch/sh/include/asm/cmpxchg-llsc.h | 71 +++++++++++++++ arch/sh/include/asm/io.h | 4 +- arch/sh/include/asm/irq.h | 3 + arch/sh/include/asm/processor.h | 4 + arch/sh/include/asm/processor_32.h | 3 + arch/sh/include/asm/processor_64.h | 2 - arch/sh/include/asm/rtc.h | 1 + arch/sh/include/asm/setup.h | 2 + arch/sh/include/asm/smp.h | 26 +++--- arch/sh/include/asm/syscalls.h | 25 ++++++ arch/sh/include/asm/syscalls_32.h | 56 ++++++++++++ arch/sh/include/asm/syscalls_64.h | 34 +++++++ arch/sh/include/asm/system.h | 8 ++- arch/sh/include/asm/system_32.h | 16 ++++ arch/sh/include/asm/uaccess_64.h | 2 + arch/sh/kernel/cpu/clock.c | 5 +- arch/sh/kernel/cpu/sh4a/smp-shx3.c | 67 ++++++--------- arch/sh/kernel/io_generic.c | 6 +- arch/sh/kernel/machine_kexec.c | 2 +- arch/sh/kernel/machvec.c | 1 + arch/sh/kernel/process_32.c | 13 ++- arch/sh/kernel/process_64.c | 1 + arch/sh/kernel/ptrace_32.c | 6 +- arch/sh/kernel/ptrace_64.c | 3 + arch/sh/kernel/setup.c | 7 +- arch/sh/kernel/signal_32.c | 10 +-- arch/sh/kernel/smp.c | 43 +++++++++- arch/sh/kernel/sys_sh.c | 9 +- arch/sh/kernel/sys_sh32.c | 5 +- arch/sh/kernel/time_32.c | 11 ++- arch/sh/kernel/timers/Makefile | 1 + arch/sh/kernel/timers/timer-broadcast.c | 57 ++++++++++++ arch/sh/kernel/timers/timer-cmt.c | 2 +- arch/sh/kernel/traps_32.c | 68 ++++++++------- arch/sh/lib/div64-generic.c | 1 + arch/sh/mm/consistent.c | 8 +- arch/sh/mm/pg-nommu.c | 1 + arch/sh/mm/tlb-nommu.c | 1 + drivers/serial/sh-sci.c | 2 +- 46 files changed, 634 insertions(+), 149 deletions(-) create mode 100644 arch/sh/include/asm/bitops-llsc.h create mode 100644 arch/sh/include/asm/cmpxchg-llsc.h create mode 100644 arch/sh/include/asm/syscalls.h create mode 100644 arch/sh/include/asm/syscalls_32.h create mode 100644 arch/sh/include/asm/syscalls_64.h create mode 100644 arch/sh/kernel/timers/timer-broadcast.c Merging sparc/master $ git merge sparc/master Removed Documentation/sparc/sbus_drivers.txt Removed arch/sparc/include/asm/bpp.h Removed arch/sparc/include/asm/dma_32.h Removed arch/sparc/include/asm/dma_64.h Removed arch/sparc/include/asm/ebus.h Removed arch/sparc/include/asm/ebus_32.h Removed arch/sparc/include/asm/ebus_64.h Removed arch/sparc/include/asm/mostek.h Removed arch/sparc/include/asm/mostek_32.h Removed arch/sparc/include/asm/mostek_64.h Removed arch/sparc/include/asm/reboot.h Removed arch/sparc/include/asm/rtc.h Removed arch/sparc/include/asm/sbus.h Removed arch/sparc/include/asm/sbus_32.h Removed arch/sparc/include/asm/sbus_64.h Removed arch/sparc/include/asm/sstate.h Removed arch/sparc/include/asm/sun4paddr.h Removed arch/sparc/include/asm/sun4prom.h Removed arch/sparc/include/asm/vfc_ioctls.h Removed arch/sparc/kernel/ebus.c Auto-merged arch/sparc/kernel/of_device.c CONFLICT (content): Merge conflict in arch/sparc/kernel/of_device.c Auto-merged arch/sparc/kernel/sun4d_smp.c Removed arch/sparc/kernel/sun4setup.c Removed arch/sparc/mm/nosrmmu.c Removed arch/sparc/prom/sun4prom.c Auto-merged arch/sparc64/Kconfig Auto-merged arch/sparc64/kernel/of_device.c Auto-merged arch/sparc64/mm/init.c Auto-merged drivers/rtc/rtc-cmos.c Removed drivers/sbus/char/bpp.c Removed drivers/sbus/char/cpwatchdog.c Removed drivers/sbus/char/rtc.c Removed drivers/sbus/char/vfc.h Removed drivers/sbus/char/vfc_dev.c Removed drivers/sbus/char/vfc_i2c.c Removed drivers/sbus/char/vfc_i2c.h Removed drivers/sbus/dvma.c Removed drivers/sbus/sbus.c Auto-merged drivers/watchdog/Makefile Resolved 'arch/sparc/kernel/of_device.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit a3376c7: Merge commit 'sparc/master' $ git diff -M --stat --summary HEAD^.. .../sound/alsa/DocBook/writing-an-alsa-driver.tmpl | 3 +- Documentation/sparc/sbus_drivers.txt | 309 ------ arch/sparc/Kconfig | 26 +- arch/sparc/include/asm/Kbuild | 2 - arch/sparc/include/asm/asmmacro.h | 5 - arch/sparc/include/asm/bpp.h | 73 -- arch/sparc/include/asm/bugs.h | 7 - arch/sparc/include/asm/cpudata_64.h | 1 - arch/sparc/include/asm/dma-mapping_32.h | 59 +- arch/sparc/include/asm/dma.h | 141 +++- arch/sparc/include/asm/dma_32.h | 288 ----- arch/sparc/include/asm/dma_64.h | 205 ---- arch/sparc/include/asm/ebus.h | 8 - arch/sparc/include/asm/ebus_32.h | 99 -- arch/sparc/include/asm/ebus_64.h | 95 -- arch/sparc/include/asm/ebus_dma.h | 35 + arch/sparc/include/asm/elf_32.h | 7 +- arch/sparc/include/asm/fhc.h | 43 +- arch/sparc/include/asm/floppy_32.h | 16 +- arch/sparc/include/asm/floppy_64.h | 130 ++-- arch/sparc/include/asm/gpio.h | 36 + arch/sparc/include/asm/io-unit.h | 4 - arch/sparc/include/asm/io_32.h | 19 +- arch/sparc/include/asm/io_64.h | 22 +- arch/sparc/include/asm/irq_64.h | 1 - arch/sparc/include/asm/mc146818rtc_64.h | 10 +- arch/sparc/include/asm/memctrl.h | 9 + arch/sparc/include/asm/mostek.h | 8 - arch/sparc/include/asm/mostek_32.h | 171 --- arch/sparc/include/asm/mostek_64.h | 143 --- arch/sparc/include/asm/of_device.h | 2 + arch/sparc/include/asm/of_platform.h | 3 - arch/sparc/include/asm/oplib_32.h | 1 - arch/sparc/include/asm/page_32.h | 5 +- arch/sparc/include/asm/parport.h | 4 +- arch/sparc/include/asm/pci_32.h | 2 + arch/sparc/include/asm/pgtable_32.h | 4 - arch/sparc/include/asm/prom.h | 12 + arch/sparc/include/asm/reboot.h | 6 - arch/sparc/include/asm/rtc.h | 26 - arch/sparc/include/asm/sbus.h | 8 - arch/sparc/include/asm/sbus_32.h | 153 --- arch/sparc/include/asm/sbus_64.h | 190 ---- arch/sparc/include/asm/sstate.h | 13 - arch/sparc/include/asm/starfire.h | 1 - arch/sparc/include/asm/sun4paddr.h | 56 - arch/sparc/include/asm/sun4prom.h | 83 -- arch/sparc/include/asm/system_32.h | 8 +- arch/sparc/include/asm/system_64.h | 5 +- arch/sparc/include/asm/thread_info_32.h | 4 - arch/sparc/include/asm/timer_32.h | 8 +- arch/sparc/include/asm/vac-ops.h | 7 - arch/sparc/include/asm/vfc_ioctls.h | 58 - arch/sparc/kernel/Makefile | 4 +- arch/sparc/kernel/apc.c | 72 +- arch/sparc/kernel/auxio.c | 6 +- arch/sparc/kernel/devices.c | 2 +- arch/sparc/kernel/dma.c | 227 ++++ arch/sparc/kernel/dma.h | 14 + arch/sparc/kernel/ebus.c | 393 ------- arch/sparc/kernel/entry.S | 54 - arch/sparc/kernel/head.S | 28 +- arch/sparc/kernel/idprom.c | 7 - arch/sparc/kernel/ioport.c | 227 +---- arch/sparc/kernel/of_device.c | 74 +- arch/sparc/kernel/pcic.c | 9 +- arch/sparc/kernel/pmc.c | 57 +- arch/sparc/kernel/process.c | 2 +- arch/sparc/kernel/prom.c | 7 +- arch/sparc/kernel/setup.c | 8 +- arch/sparc/kernel/sparc_ksyms.c | 25 - arch/sparc/kernel/sun4c_irq.c | 74 +- arch/sparc/kernel/sun4d_irq.c | 109 +- arch/sparc/kernel/sun4d_smp.c | 1 - arch/sparc/kernel/sun4m_irq.c | 24 +- arch/sparc/kernel/sun4setup.c | 75 -- arch/sparc/kernel/sys_sparc.c | 8 +- arch/sparc/kernel/tick14.c | 1 - arch/sparc/kernel/time.c | 380 +------ arch/sparc/mm/Makefile | 9 +- arch/sparc/mm/btfixup.c | 6 +- arch/sparc/mm/fault.c | 2 +- arch/sparc/mm/init.c | 14 +- arch/sparc/mm/io-unit.c | 136 +-- arch/sparc/mm/iommu.c | 113 +- arch/sparc/mm/nosrmmu.c | 59 - arch/sparc/mm/srmmu.c | 1 - arch/sparc/mm/sun4c.c | 204 +--- arch/sparc/prom/Makefile | 2 - arch/sparc/prom/bootstr.c | 4 - arch/sparc/prom/console.c | 3 - arch/sparc/prom/init.c | 12 - arch/sparc/prom/memory.c | 14 - arch/sparc/prom/ranges.c | 1 - arch/sparc/prom/sun4prom.c | 161 --- arch/sparc64/Kconfig | 23 + arch/sparc64/kernel/Makefile | 9 +- arch/sparc64/kernel/auxio.c | 2 +- arch/sparc64/kernel/central.c | 617 ++++------- arch/sparc64/kernel/chmc.c | 817 +++++++++++---- arch/sparc64/kernel/cpu.c | 208 ++-- arch/sparc64/kernel/ds.c | 4 +- arch/sparc64/kernel/ebus.c | 299 +----- arch/sparc64/kernel/entry.h | 7 +- arch/sparc64/kernel/head.S | 1 + arch/sparc64/kernel/hvapi.c | 3 - arch/sparc64/kernel/hvcalls.S | 354 ++---- arch/sparc64/kernel/irq.c | 1 - arch/sparc64/kernel/of_device.c | 59 +- arch/sparc64/kernel/pci.c | 152 +--- arch/sparc64/kernel/pci_fire.c | 91 +- arch/sparc64/kernel/pci_impl.h | 4 +- arch/sparc64/kernel/pci_psycho.c | 117 ++- arch/sparc64/kernel/pci_sabre.c | 138 ++- arch/sparc64/kernel/pci_schizo.c | 155 ++- arch/sparc64/kernel/pci_sun4v.c | 153 ++- arch/sparc64/kernel/pci_sun4v_asm.S | 99 +- arch/sparc64/kernel/power.c | 55 +- arch/sparc64/kernel/process.c | 33 - arch/sparc64/kernel/prom.c | 6 + arch/sparc64/kernel/ptrace.c | 38 +- arch/sparc64/kernel/reboot.c | 52 + arch/sparc64/kernel/sbus.c | 166 ++-- arch/sparc64/kernel/sparc64_ksyms.c | 23 +- arch/sparc64/kernel/sstate.c | 67 +- arch/sparc64/kernel/starfire.c | 5 - arch/sparc64/kernel/sys_sparc32.c | 8 - arch/sparc64/kernel/syscalls.S | 20 +- arch/sparc64/kernel/systbls.S | 2 +- arch/sparc64/kernel/time.c | 1164 +++----------------- arch/sparc64/kernel/traps.c | 63 +- arch/sparc64/mm/init.c | 48 +- drivers/ata/Kconfig | 1 - drivers/atm/fore200e.c | 410 ++++---- drivers/atm/fore200e.h | 7 +- drivers/block/sunvdc.c | 4 +- drivers/char/hw_random/n2-drv.c | 2 +- drivers/char/rtc.c | 30 +- drivers/hwmon/Kconfig | 7 + drivers/hwmon/Makefile | 1 + drivers/hwmon/ultra45_env.c | 320 ++++++ drivers/input/misc/sparcspkr.c | 4 +- drivers/input/serio/i8042-sparcio.h | 2 +- drivers/leds/Kconfig | 8 + drivers/leds/Makefile | 1 + drivers/leds/leds-sunfire.c | 273 +++++ drivers/mtd/maps/sun_uflash.c | 75 +- drivers/net/myri_sbus.c | 196 ++-- drivers/net/myri_sbus.h | 2 +- drivers/net/niu.c | 2 +- drivers/net/sunbmac.c | 204 ++-- drivers/net/sunbmac.h | 4 +- drivers/net/sunhme.c | 322 +++---- drivers/net/sunhme.h | 7 +- drivers/net/sunlance.c | 180 ++-- drivers/net/sunqe.c | 162 ++-- drivers/net/sunqe.h | 4 +- drivers/net/sunvnet.c | 4 +- drivers/parport/parport_sunbpp.c | 49 +- drivers/rtc/Kconfig | 32 +- drivers/rtc/Makefile | 3 + drivers/rtc/rtc-bq4802.c | 229 ++++ drivers/rtc/rtc-cmos.c | 5 +- drivers/rtc/rtc-m48t59.c | 63 +- drivers/rtc/rtc-starfire.c | 120 ++ drivers/rtc/rtc-sun4v.c | 153 +++ drivers/sbus/Makefile | 4 - drivers/sbus/char/Kconfig | 29 +- drivers/sbus/char/Makefile | 6 - drivers/sbus/char/bbc_envctrl.c | 121 +-- drivers/sbus/char/bbc_i2c.c | 267 ++--- drivers/sbus/char/bbc_i2c.h | 75 ++- drivers/sbus/char/bpp.c | 1055 ------------------ drivers/sbus/char/cpwatchdog.c | 858 --------------- drivers/sbus/char/display7seg.c | 251 +++-- drivers/sbus/char/envctrl.c | 147 ++-- drivers/sbus/char/flash.c | 130 +-- drivers/sbus/char/rtc.c | 275 ----- drivers/sbus/char/uctrl.c | 216 ++-- drivers/sbus/char/vfc.h | 171 --- drivers/sbus/char/vfc_dev.c | 736 ------------- drivers/sbus/char/vfc_i2c.c | 335 ------ drivers/sbus/char/vfc_i2c.h | 44 - drivers/sbus/dvma.c | 136 --- drivers/sbus/sbus.c | 316 ------ drivers/scsi/esp_scsi.h | 3 +- drivers/scsi/qlogicpti.c | 146 ++-- drivers/scsi/qlogicpti.h | 2 +- drivers/scsi/sun_esp.c | 267 +++-- drivers/serial/sunhv.c | 2 +- drivers/serial/sunsab.c | 2 +- drivers/serial/sunsu.c | 2 +- drivers/serial/sunzilog.c | 2 +- drivers/video/bw2.c | 2 +- drivers/video/cg14.c | 2 +- drivers/video/cg3.c | 2 +- drivers/video/cg6.c | 2 +- drivers/video/ffb.c | 2 +- drivers/video/leo.c | 2 +- drivers/video/p9100.c | 2 +- drivers/video/tcx.c | 2 +- drivers/watchdog/Makefile | 3 + drivers/watchdog/cpwd.c | 695 ++++++++++++ .../{sbus/char/riowatchdog.c => watchdog/riowd.c} | 236 ++--- include/linux/rtc/m48t59.h | 47 +- include/sound/core.h | 3 - include/sound/memalloc.h | 2 - sound/core/memalloc.c | 48 +- sound/sparc/amd7930.c | 85 +-- sound/sparc/cs4231.c | 199 ++-- sound/sparc/dbri.c | 89 +- 211 files changed, 6954 insertions(+), 13279 deletions(-) delete mode 100644 Documentation/sparc/sbus_drivers.txt delete mode 100644 arch/sparc/include/asm/bpp.h delete mode 100644 arch/sparc/include/asm/dma_32.h delete mode 100644 arch/sparc/include/asm/dma_64.h delete mode 100644 arch/sparc/include/asm/ebus.h delete mode 100644 arch/sparc/include/asm/ebus_32.h delete mode 100644 arch/sparc/include/asm/ebus_64.h create mode 100644 arch/sparc/include/asm/ebus_dma.h create mode 100644 arch/sparc/include/asm/gpio.h create mode 100644 arch/sparc/include/asm/memctrl.h delete mode 100644 arch/sparc/include/asm/mostek.h delete mode 100644 arch/sparc/include/asm/mostek_32.h delete mode 100644 arch/sparc/include/asm/mostek_64.h delete mode 100644 arch/sparc/include/asm/reboot.h delete mode 100644 arch/sparc/include/asm/rtc.h delete mode 100644 arch/sparc/include/asm/sbus.h delete mode 100644 arch/sparc/include/asm/sbus_32.h delete mode 100644 arch/sparc/include/asm/sbus_64.h delete mode 100644 arch/sparc/include/asm/sstate.h delete mode 100644 arch/sparc/include/asm/sun4paddr.h delete mode 100644 arch/sparc/include/asm/sun4prom.h delete mode 100644 arch/sparc/include/asm/vfc_ioctls.h create mode 100644 arch/sparc/kernel/dma.c create mode 100644 arch/sparc/kernel/dma.h delete mode 100644 arch/sparc/kernel/ebus.c delete mode 100644 arch/sparc/kernel/sun4setup.c delete mode 100644 arch/sparc/mm/nosrmmu.c delete mode 100644 arch/sparc/prom/sun4prom.c create mode 100644 arch/sparc64/kernel/reboot.c create mode 100644 drivers/hwmon/ultra45_env.c create mode 100644 drivers/leds/leds-sunfire.c create mode 100644 drivers/rtc/rtc-bq4802.c create mode 100644 drivers/rtc/rtc-starfire.c create mode 100644 drivers/rtc/rtc-sun4v.c delete mode 100644 drivers/sbus/char/bpp.c delete mode 100644 drivers/sbus/char/cpwatchdog.c delete mode 100644 drivers/sbus/char/rtc.c delete mode 100644 drivers/sbus/char/vfc.h delete mode 100644 drivers/sbus/char/vfc_dev.c delete mode 100644 drivers/sbus/char/vfc_i2c.c delete mode 100644 drivers/sbus/char/vfc_i2c.h delete mode 100644 drivers/sbus/dvma.c delete mode 100644 drivers/sbus/sbus.c create mode 100644 drivers/watchdog/cpwd.c rename drivers/{sbus/char/riowatchdog.c => watchdog/riowd.c} (51%) Merging x86/auto-x86-next $ git merge x86/auto-x86-next Auto-merged Documentation/kernel-parameters.txt Auto-merged MAINTAINERS Auto-merged arch/x86/Kconfig Auto-merged arch/x86/kernel/cpuid.c Auto-merged drivers/char/agp/parisc-agp.c Auto-merged drivers/pci/intel-iommu.c Auto-merged include/asm-x86/cpufeature.h CONFLICT (content): Merge conflict in include/asm-x86/cpufeature.h Auto-merged include/asm-x86/iommu.h Auto-merged include/asm-x86/kvm_host.h Removed include/asm-x86/mach-es7000/mach_apicdef.h Removed include/asm-x86/mach-summit/mach_apicdef.h Auto-merged include/asm-x86/mce.h Auto-merged include/asm-x86/msr.h Auto-merged include/asm-x86/statfs.h CONFLICT (content): Merge conflict in include/asm-x86/statfs.h Auto-merged include/asm-x86/xen/hypervisor.h Resolved 'include/asm-x86/cpufeature.h' using previous resolution. Resolved 'include/asm-x86/statfs.h' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit cee82e8: Merge commit 'x86/auto-x86-next' $ git diff -M --stat --summary HEAD^.. Documentation/00-INDEX | 2 - Documentation/kernel-parameters.txt | 15 +- Documentation/x86/00-INDEX | 4 + Documentation/x86/{i386 => }/boot.txt | 2 +- Documentation/{ => x86}/mtrr.txt | 4 +- Documentation/x86/pat.txt | 54 ++- .../x86/{i386 => }/usb-legacy-support.txt | 0 Documentation/x86/{i386 => }/zero-page.txt | 0 MAINTAINERS | 5 + arch/um/sys-x86_64/syscall_table.c | 4 +- arch/x86/Kconfig | 120 +++- arch/x86/Kconfig.cpu | 70 ++ arch/x86/Kconfig.debug | 13 + arch/x86/boot/compressed/head_32.S | 5 +- arch/x86/boot/compressed/misc.c | 12 +- arch/x86/boot/cpucheck.c | 8 +- arch/x86/{mach-es7000 => es7000}/Makefile | 0 arch/x86/{mach-es7000 => es7000}/es7000.h | 18 +- arch/x86/{mach-es7000 => es7000}/es7000plat.c | 2 +- arch/x86/ia32/ia32_aout.c | 11 +- arch/x86/ia32/ia32_signal.c | 72 +- arch/x86/kernel/Makefile | 10 +- arch/x86/kernel/acpi/boot.c | 9 +- arch/x86/kernel/alternative.c | 44 +- arch/x86/kernel/amd_iommu.c | 2 - arch/x86/kernel/apic_32.c | 437 +++++++----- arch/x86/kernel/apic_64.c | 626 ++++++++++++++--- arch/x86/kernel/apm_32.c | 1 - arch/x86/kernel/asm-offsets_64.c | 2 +- arch/x86/kernel/bios_uv.c | 10 +- arch/x86/kernel/cpu/Makefile | 21 +- arch/x86/kernel/cpu/addon_cpuid_features.c | 88 +++ arch/x86/kernel/cpu/cmpxchg.c | 72 ++ arch/x86/kernel/cpu/common.c | 45 ++- arch/x86/kernel/cpu/common_64.c | 130 +++- arch/x86/kernel/cpu/cyrix.c | 16 +- arch/x86/kernel/cpu/feature_names.c | 7 +- arch/x86/kernel/cpu/intel.c | 82 +-- arch/x86/kernel/cpu/intel_64.c | 5 +- arch/x86/kernel/cpu/intel_cacheinfo.c | 169 ++++- arch/x86/kernel/cpu/mtrr/main.c | 2 +- arch/x86/kernel/cpuid.c | 1 - arch/x86/kernel/crash_dump_64.c | 7 +- arch/x86/kernel/e820.c | 4 + arch/x86/kernel/early_printk.c | 762 +++++++++++++++++++- arch/x86/kernel/entry_64.S | 4 +- arch/x86/kernel/genapic_64.c | 88 +-- arch/x86/kernel/genapic_flat_64.c | 62 ++- arch/x86/kernel/genx2apic_cluster.c | 159 ++++ arch/x86/kernel/genx2apic_phys.c | 154 ++++ arch/x86/kernel/genx2apic_uv_x.c | 70 ++- arch/x86/kernel/i387.c | 154 ++++- arch/x86/kernel/i8259.c | 24 + arch/x86/kernel/io_apic_32.c | 47 +- arch/x86/kernel/io_apic_64.c | 639 +++++++++++++++-- arch/x86/kernel/ioport.c | 1 + arch/x86/kernel/ipi.c | 3 +- arch/x86/kernel/irqinit_32.c | 49 ++ arch/x86/kernel/kvm.c | 2 +- arch/x86/kernel/ldt.c | 10 +- arch/x86/kernel/microcode.c | 634 ++++------------- arch/x86/kernel/microcode_amd.c | 467 ++++++++++++ arch/x86/kernel/microcode_intel.c | 489 +++++++++++++ arch/x86/kernel/mpparse.c | 2 + arch/x86/kernel/numaq_32.c | 7 + arch/x86/kernel/paravirt-spinlocks.c | 37 + arch/x86/kernel/paravirt.c | 30 +- arch/x86/kernel/paravirt_patch_32.c | 2 +- arch/x86/kernel/pci-calgary_64.c | 14 + arch/x86/kernel/pci-dma.c | 148 +---- arch/x86/kernel/pci-gart_64.c | 76 ++- arch/x86/kernel/pci-nommu.c | 62 ++ arch/x86/kernel/process_32.c | 2 + arch/x86/kernel/process_64.c | 132 ++-- arch/x86/kernel/ptrace.c | 73 ++- arch/x86/kernel/setup.c | 18 + arch/x86/kernel/setup_percpu.c | 9 +- arch/x86/kernel/sigframe.h | 19 +- arch/x86/kernel/signal_32.c | 57 +- arch/x86/kernel/signal_64.c | 201 ++---- arch/x86/kernel/smpboot.c | 47 +- arch/x86/kernel/summit_32.c | 2 +- arch/x86/kernel/sys_i386_32.c | 2 + arch/x86/kernel/sys_x86_64.c | 44 +- arch/x86/kernel/syscall_64.c | 4 +- arch/x86/kernel/time_32.c | 1 + arch/x86/kernel/tls.c | 1 + arch/x86/kernel/traps_32.c | 1 - arch/x86/kernel/traps_64.c | 72 +- arch/x86/kernel/visws_quirks.c | 16 +- arch/x86/kernel/vm86_32.c | 1 + arch/x86/kernel/vmi_32.c | 14 +- arch/x86/kernel/xsave.c | 316 ++++++++ arch/x86/lguest/boot.c | 38 +- arch/x86/lib/string_32.c | 42 +- arch/x86/lib/strstr_32.c | 6 +- arch/x86/lib/usercopy_32.c | 7 + arch/x86/mach-default/setup.c | 19 +- arch/x86/mach-generic/Makefile | 2 +- arch/x86/mach-generic/bigsmp.c | 9 +- arch/x86/mach-generic/es7000.c | 13 +- arch/x86/mach-generic/numaq.c | 12 +- arch/x86/mach-generic/summit.c | 11 +- arch/x86/mm/discontig_32.c | 2 +- arch/x86/mm/dump_pagetables.c | 4 +- arch/x86/mm/fault.c | 3 +- arch/x86/mm/init_32.c | 1 + arch/x86/mm/init_64.c | 8 +- arch/x86/mm/ioremap.c | 4 +- arch/x86/mm/numa_64.c | 10 +- arch/x86/mm/pageattr-test.c | 7 +- arch/x86/mm/pageattr.c | 247 +++++-- arch/x86/mm/pat.c | 4 +- arch/x86/mm/pgtable_32.c | 3 +- arch/x86/oprofile/op_model_p4.c | 175 +++--- arch/x86/pci/acpi.c | 5 - arch/x86/pci/irq.c | 67 +- arch/x86/power/hibernate_asm_32.S | 14 +- arch/x86/xen/Kconfig | 10 +- arch/x86/xen/Makefile | 12 +- arch/x86/xen/debugfs.c | 123 ++++ arch/x86/xen/debugfs.h | 10 + arch/x86/xen/enlighten.c | 252 ++++---- arch/x86/xen/irq.c | 143 ++++ arch/x86/xen/mmu.c | 268 ++++++- arch/x86/xen/multicalls.c | 115 +++- arch/x86/xen/smp.c | 167 ----- arch/x86/xen/spinlock.c | 423 +++++++++++ arch/x86/xen/time.c | 4 +- arch/x86/xen/xen-asm_32.S | 2 +- arch/x86/xen/xen-asm_64.S | 2 +- arch/x86/xen/xen-ops.h | 6 + drivers/block/xen-blkfront.c | 2 +- drivers/char/agp/agp.h | 5 + drivers/char/agp/alpha-agp.c | 2 + drivers/char/agp/amd-k7-agp.c | 2 + drivers/char/agp/amd64-agp.c | 2 + drivers/char/agp/ati-agp.c | 2 + drivers/char/agp/efficeon-agp.c | 2 + drivers/char/agp/generic.c | 97 +++- drivers/char/agp/hp-agp.c | 2 + drivers/char/agp/i460-agp.c | 2 + drivers/char/agp/intel-agp.c | 28 + drivers/char/agp/nvidia-agp.c | 2 + drivers/char/agp/parisc-agp.c | 2 + drivers/char/agp/sis-agp.c | 2 + drivers/char/agp/sworks-agp.c | 2 + drivers/char/agp/uninorth-agp.c | 4 + drivers/char/agp/via-agp.c | 4 + drivers/char/hvc_xen.c | 6 +- drivers/input/xen-kbdfront.c | 4 +- drivers/net/xen-netfront.c | 6 +- drivers/pci/Makefile | 2 + drivers/pci/dma_remapping.h | 157 ++++ drivers/pci/dmar.c | 397 ++++++++++- drivers/pci/intel-iommu.c | 162 +---- drivers/pci/intel-iommu.h | 233 +++---- drivers/pci/intr_remapping.c | 471 ++++++++++++ drivers/pci/intr_remapping.h | 8 + drivers/usb/host/ehci.h | 138 +---- drivers/video/xen-fbfront.c | 4 +- drivers/xen/balloon.c | 176 +---- drivers/xen/events.c | 36 +- drivers/xen/grant-table.c | 2 +- drivers/xen/xenbus/xenbus_probe.c | 8 +- include/asm-x86/a.out-core.h | 6 +- include/asm-x86/a.out.h | 6 +- include/asm-x86/acpi.h | 6 +- include/asm-x86/agp.h | 6 +- include/asm-x86/alternative.h | 6 +- include/asm-x86/amd_iommu.h | 6 +- include/asm-x86/amd_iommu_types.h | 6 +- include/asm-x86/apic.h | 80 ++- include/asm-x86/apicdef.h | 9 +- include/asm-x86/arch_hooks.h | 8 +- include/asm-x86/asm.h | 13 +- include/asm-x86/atomic_32.h | 6 +- include/asm-x86/atomic_64.h | 6 +- include/asm-x86/auxvec.h | 6 +- .../{mach-bigsmp/mach_apic.h => bigsmp/apic.h} | 4 +- .../mach_apicdef.h => bigsmp/apicdef.h} | 6 +- .../{mach-bigsmp/mach_ipi.h => bigsmp/ipi.h} | 0 include/asm-x86/bios_ebda.h | 6 +- include/asm-x86/bitops.h | 6 +- include/asm-x86/boot.h | 6 +- include/asm-x86/bootparam.h | 6 +- include/asm-x86/bug.h | 6 +- include/asm-x86/bugs.h | 11 +- include/asm-x86/byteorder.h | 6 +- include/asm-x86/cache.h | 6 +- include/asm-x86/cacheflush.h | 9 +- include/asm-x86/calgary.h | 6 +- include/asm-x86/checksum_32.h | 6 +- include/asm-x86/checksum_64.h | 6 +- include/asm-x86/cmpxchg_32.h | 6 +- include/asm-x86/cmpxchg_64.h | 6 +- include/asm-x86/compat.h | 6 +- include/asm-x86/cpu.h | 6 +- include/asm-x86/cpufeature.h | 22 +- include/asm-x86/current.h | 6 +- include/asm-x86/debugreg.h | 6 +- include/asm-x86/delay.h | 6 +- include/asm-x86/desc.h | 21 +- include/asm-x86/desc_defs.h | 6 +- include/asm-x86/device.h | 6 +- include/asm-x86/div64.h | 6 +- include/asm-x86/dma-mapping.h | 56 +- include/asm-x86/dma.h | 6 +- include/asm-x86/dmi.h | 6 +- include/asm-x86/ds.h | 6 +- include/asm-x86/dwarf2.h | 6 +- include/asm-x86/e820.h | 8 +- include/asm-x86/edac.h | 6 +- include/asm-x86/efi.h | 6 +- include/asm-x86/elf.h | 11 +- include/asm-x86/emergency-restart.h | 6 +- .../{mach-es7000/mach_apic.h => es7000/apic.h} | 32 +- include/asm-x86/es7000/apicdef.h | 13 + .../{mach-es7000/mach_ipi.h => es7000/ipi.h} | 6 +- .../mach_mpparse.h => es7000/mpparse.h} | 4 +- .../mach_wakecpu.h => es7000/wakecpu.h} | 6 +- include/asm-x86/fb.h | 6 +- include/asm-x86/fixmap.h | 6 +- include/asm-x86/fixmap_32.h | 6 +- include/asm-x86/fixmap_64.h | 6 +- include/asm-x86/floppy.h | 6 +- include/asm-x86/ftrace.h | 6 +- include/asm-x86/futex.h | 12 +- include/asm-x86/gart.h | 6 +- include/asm-x86/genapic_32.h | 6 +- include/asm-x86/genapic_64.h | 14 +- include/asm-x86/geode.h | 6 +- include/asm-x86/gpio.h | 2 +- include/asm-x86/hardirq_32.h | 6 +- include/asm-x86/hardirq_64.h | 6 +- include/asm-x86/highmem.h | 6 +- include/asm-x86/hpet.h | 6 +- include/asm-x86/hugetlb.h | 6 +- include/asm-x86/hw_irq.h | 29 +- include/asm-x86/hypertransport.h | 6 +- include/asm-x86/i387.h | 91 ++- include/asm-x86/i8253.h | 6 +- include/asm-x86/i8259.h | 9 +- include/asm-x86/ia32.h | 6 +- include/asm-x86/ia32_unistd.h | 6 +- include/asm-x86/idle.h | 6 +- include/asm-x86/intel_arch_perfmon.h | 6 +- include/asm-x86/io.h | 8 +- include/asm-x86/io_32.h | 6 +- include/asm-x86/io_64.h | 7 +- include/asm-x86/io_apic.h | 26 +- include/asm-x86/ioctls.h | 6 +- include/asm-x86/iommu.h | 6 +- include/asm-x86/ipcbuf.h | 6 +- include/asm-x86/ipi.h | 22 +- include/asm-x86/irq.h | 6 +- include/asm-x86/irq_regs_32.h | 6 +- include/asm-x86/irq_remapping.h | 8 + include/asm-x86/irq_vectors.h | 6 +- include/asm-x86/ist.h | 6 +- include/asm-x86/k8.h | 6 +- include/asm-x86/kdebug.h | 6 +- include/asm-x86/kexec.h | 6 +- include/asm-x86/kgdb.h | 6 +- include/asm-x86/kmap_types.h | 6 +- include/asm-x86/kprobes.h | 6 +- include/asm-x86/kvm.h | 6 +- include/asm-x86/kvm_host.h | 8 +- include/asm-x86/kvm_para.h | 6 +- include/asm-x86/kvm_x86_emulate.h | 6 +- include/asm-x86/ldt.h | 6 +- include/asm-x86/lguest.h | 6 +- include/asm-x86/lguest_hcall.h | 6 +- include/asm-x86/linkage.h | 6 +- include/asm-x86/local.h | 6 +- include/asm-x86/mach-default/apm.h | 6 +- include/asm-x86/mach-default/mach_apic.h | 10 +- include/asm-x86/mach-default/mach_apicdef.h | 12 +- include/asm-x86/mach-default/mach_ipi.h | 6 +- include/asm-x86/mach-default/mach_mpparse.h | 6 +- include/asm-x86/mach-default/mach_mpspec.h | 6 +- include/asm-x86/mach-default/mach_timer.h | 6 +- include/asm-x86/mach-default/mach_traps.h | 6 +- include/asm-x86/mach-default/mach_wakecpu.h | 6 +- include/asm-x86/mach-es7000/mach_apicdef.h | 13 - include/asm-x86/mach-generic/gpio.h | 6 +- include/asm-x86/mach-generic/irq_vectors_limits.h | 6 +- include/asm-x86/mach-generic/mach_apic.h | 6 +- include/asm-x86/mach-generic/mach_apicdef.h | 6 +- include/asm-x86/mach-generic/mach_ipi.h | 6 +- include/asm-x86/mach-generic/mach_mpparse.h | 6 +- include/asm-x86/mach-generic/mach_mpspec.h | 6 +- include/asm-x86/mach-rdc321x/gpio.h | 6 +- include/asm-x86/mach-summit/mach_apicdef.h | 13 - include/asm-x86/math_emu.h | 6 +- include/asm-x86/mc146818rtc.h | 6 +- include/asm-x86/mca.h | 6 +- include/asm-x86/mca_dma.h | 6 +- include/asm-x86/mce.h | 6 +- include/asm-x86/microcode.h | 99 +++ include/asm-x86/mman.h | 6 +- include/asm-x86/mmconfig.h | 6 +- include/asm-x86/mmu.h | 6 +- include/asm-x86/mmu_context.h | 6 +- include/asm-x86/mmu_context_32.h | 6 +- include/asm-x86/mmu_context_64.h | 6 +- include/asm-x86/mmx.h | 6 +- include/asm-x86/mmzone_32.h | 6 +- include/asm-x86/mmzone_64.h | 6 +- include/asm-x86/module.h | 6 +- include/asm-x86/mpspec.h | 9 +- include/asm-x86/mpspec_def.h | 6 +- include/asm-x86/msgbuf.h | 6 +- include/asm-x86/msidef.h | 10 +- include/asm-x86/msr-index.h | 6 +- include/asm-x86/msr.h | 29 +- include/asm-x86/mtrr.h | 6 +- include/asm-x86/mutex_32.h | 6 +- include/asm-x86/mutex_64.h | 6 +- include/asm-x86/nmi.h | 6 +- include/asm-x86/nops.h | 6 +- include/asm-x86/numa_32.h | 6 +- include/asm-x86/numa_64.h | 6 +- include/asm-x86/numaq.h | 6 +- .../{mach-numaq/mach_apic.h => numaq/apic.h} | 6 +- .../{mach-numaq/mach_apicdef.h => numaq/apicdef.h} | 4 +- .../asm-x86/{mach-numaq/mach_ipi.h => numaq/ipi.h} | 6 +- .../{mach-numaq/mach_mpparse.h => numaq/mpparse.h} | 6 +- .../{mach-numaq/mach_wakecpu.h => numaq/wakecpu.h} | 6 +- include/asm-x86/olpc.h | 6 +- include/asm-x86/page.h | 6 +- include/asm-x86/page_32.h | 10 +- include/asm-x86/page_64.h | 7 +- include/asm-x86/param.h | 6 +- include/asm-x86/paravirt.h | 87 ++- include/asm-x86/parport.h | 6 +- include/asm-x86/pat.h | 6 +- include/asm-x86/pci-direct.h | 6 +- include/asm-x86/pci.h | 6 +- include/asm-x86/pci_32.h | 6 +- include/asm-x86/pci_64.h | 6 +- include/asm-x86/pda.h | 6 +- include/asm-x86/percpu.h | 6 +- include/asm-x86/pgalloc.h | 6 +- include/asm-x86/pgtable-2level-defs.h | 6 +- include/asm-x86/pgtable-2level.h | 6 +- include/asm-x86/pgtable-3level-defs.h | 6 +- include/asm-x86/pgtable-3level.h | 6 +- include/asm-x86/pgtable.h | 8 +- include/asm-x86/pgtable_32.h | 12 +- include/asm-x86/pgtable_64.h | 6 +- include/asm-x86/posix_types_32.h | 6 +- include/asm-x86/posix_types_64.h | 6 +- include/asm-x86/prctl.h | 6 +- include/asm-x86/processor-cyrix.h | 8 + include/asm-x86/processor-flags.h | 7 +- include/asm-x86/processor.h | 66 +- include/asm-x86/proto.h | 6 +- include/asm-x86/ptrace-abi.h | 6 +- include/asm-x86/ptrace.h | 14 +- include/asm-x86/pvclock-abi.h | 6 +- include/asm-x86/pvclock.h | 6 +- include/asm-x86/reboot.h | 6 +- include/asm-x86/reboot_fixups.h | 6 +- include/asm-x86/required-features.h | 14 +- include/asm-x86/resume-trace.h | 8 +- include/asm-x86/rio.h | 6 +- include/asm-x86/rwlock.h | 6 +- include/asm-x86/rwsem.h | 6 +- include/asm-x86/scatterlist.h | 6 +- include/asm-x86/seccomp_32.h | 6 +- include/asm-x86/seccomp_64.h | 6 +- include/asm-x86/segment.h | 6 +- include/asm-x86/sembuf.h | 6 +- include/asm-x86/serial.h | 6 +- include/asm-x86/setup.h | 8 +- include/asm-x86/shmbuf.h | 6 +- include/asm-x86/shmparam.h | 6 +- include/asm-x86/sigcontext.h | 93 +++- include/asm-x86/sigcontext32.h | 12 +- include/asm-x86/siginfo.h | 6 +- include/asm-x86/signal.h | 9 +- include/asm-x86/smp.h | 27 +- include/asm-x86/socket.h | 6 +- include/asm-x86/sockios.h | 6 +- include/asm-x86/sparsemem.h | 6 +- include/asm-x86/spinlock.h | 21 +- include/asm-x86/spinlock_types.h | 6 +- include/asm-x86/srat.h | 6 +- include/asm-x86/stacktrace.h | 6 +- include/asm-x86/stat.h | 6 +- include/asm-x86/statfs.h | 6 +- include/asm-x86/string_32.h | 6 +- include/asm-x86/string_64.h | 6 +- .../{mach-summit/mach_apic.h => summit/apic.h} | 24 +- include/asm-x86/summit/apicdef.h | 13 + .../{mach-summit/mach_ipi.h => summit/ipi.h} | 6 +- .../{mach-summit => summit}/irq_vectors_limits.h | 0 .../mach_mpparse.h => summit/mpparse.h} | 13 +- include/asm-x86/suspend_32.h | 6 +- include/asm-x86/suspend_64.h | 6 +- include/asm-x86/swiotlb.h | 6 +- include/asm-x86/sync_bitops.h | 6 +- include/asm-x86/syscall.h | 210 ++++++ include/asm-x86/syscalls.h | 93 +++ include/asm-x86/system.h | 6 +- include/asm-x86/system_64.h | 6 +- include/asm-x86/tce.h | 6 +- include/asm-x86/termbits.h | 6 +- include/asm-x86/termios.h | 6 +- include/asm-x86/therm_throt.h | 6 +- include/asm-x86/thread_info.h | 11 +- include/asm-x86/time.h | 8 +- include/asm-x86/timer.h | 11 +- include/asm-x86/timex.h | 6 +- include/asm-x86/tlb.h | 6 +- include/asm-x86/tlbflush.h | 6 +- include/asm-x86/topology.h | 6 +- include/asm-x86/trampoline.h | 6 +- include/asm-x86/traps.h | 10 +- include/asm-x86/tsc.h | 6 +- include/asm-x86/types.h | 6 +- include/asm-x86/uaccess.h | 6 +- include/asm-x86/uaccess_32.h | 6 +- include/asm-x86/uaccess_64.h | 6 +- include/asm-x86/ucontext.h | 12 +- include/asm-x86/unaligned.h | 6 +- include/asm-x86/unistd_32.h | 6 +- include/asm-x86/unistd_64.h | 6 +- include/asm-x86/unwind.h | 6 +- include/asm-x86/user32.h | 6 +- include/asm-x86/user_32.h | 6 +- include/asm-x86/user_64.h | 6 +- include/asm-x86/uv/bios.h | 6 +- include/asm-x86/uv/uv_bau.h | 6 +- include/asm-x86/uv/uv_hub.h | 6 +- include/asm-x86/uv/uv_mmrs.h | 6 +- include/asm-x86/vdso.h | 6 +- include/asm-x86/vga.h | 6 +- include/asm-x86/vgtod.h | 6 +- include/asm-x86/visws/cobalt.h | 6 +- include/asm-x86/visws/lithium.h | 6 +- include/asm-x86/visws/piix4.h | 6 +- include/asm-x86/vm86.h | 6 +- include/asm-x86/vmi_time.h | 6 +- include/asm-x86/vsyscall.h | 6 +- include/asm-x86/xcr.h | 49 ++ include/asm-x86/xen/events.h | 6 +- include/asm-x86/xen/grant_table.h | 6 +- include/asm-x86/xen/hypercall.h | 6 +- include/asm-x86/xen/hypervisor.h | 20 +- include/asm-x86/xen/interface.h | 6 +- include/asm-x86/xen/interface_32.h | 6 +- include/asm-x86/xen/interface_64.h | 6 +- include/asm-x86/xen/page.h | 6 +- include/asm-x86/xsave.h | 118 +++ include/linux/dmar.h | 127 +++- include/linux/elf.h | 1 + include/linux/irq.h | 1 + include/linux/kernel.h | 2 +- include/linux/usb/ehci_def.h | 160 ++++ include/xen/events.h | 2 + kernel/dma-coherent.c | 2 + kernel/irq/manage.c | 9 +- lib/cmdline.c | 2 +- mm/highmem.c | 5 +- 466 files changed, 10975 insertions(+), 4074 deletions(-) create mode 100644 Documentation/x86/00-INDEX rename Documentation/x86/{i386 => }/boot.txt (99%) rename Documentation/{ => x86}/mtrr.txt (99%) rename Documentation/x86/{i386 => }/usb-legacy-support.txt (100%) rename Documentation/x86/{i386 => }/zero-page.txt (100%) rename arch/x86/{mach-es7000 => es7000}/Makefile (100%) rename arch/x86/{mach-es7000 => es7000}/es7000.h (89%) rename arch/x86/{mach-es7000 => es7000}/es7000plat.c (99%) create mode 100644 arch/x86/kernel/cpu/cmpxchg.c create mode 100644 arch/x86/kernel/genx2apic_cluster.c create mode 100644 arch/x86/kernel/genx2apic_phys.c create mode 100644 arch/x86/kernel/microcode_amd.c create mode 100644 arch/x86/kernel/microcode_intel.c create mode 100644 arch/x86/kernel/paravirt-spinlocks.c create mode 100644 arch/x86/kernel/xsave.c create mode 100644 arch/x86/xen/debugfs.c create mode 100644 arch/x86/xen/debugfs.h create mode 100644 arch/x86/xen/irq.c create mode 100644 arch/x86/xen/spinlock.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 rename include/asm-x86/{mach-bigsmp/mach_apic.h => bigsmp/apic.h} (98%) rename include/asm-x86/{mach-bigsmp/mach_apicdef.h => bigsmp/apicdef.h} (74%) rename include/asm-x86/{mach-bigsmp/mach_ipi.h => bigsmp/ipi.h} (100%) rename include/asm-x86/{mach-es7000/mach_apic.h => es7000/apic.h} (92%) create mode 100644 include/asm-x86/es7000/apicdef.h rename include/asm-x86/{mach-es7000/mach_ipi.h => es7000/ipi.h} (83%) rename include/asm-x86/{mach-es7000/mach_mpparse.h => es7000/mpparse.h} (91%) rename include/asm-x86/{mach-es7000/mach_wakecpu.h => es7000/wakecpu.h} (95%) create mode 100644 include/asm-x86/irq_remapping.h delete mode 100644 include/asm-x86/mach-es7000/mach_apicdef.h delete mode 100644 include/asm-x86/mach-summit/mach_apicdef.h create mode 100644 include/asm-x86/microcode.h rename include/asm-x86/{mach-numaq/mach_apic.h => numaq/apic.h} (97%) rename include/asm-x86/{mach-numaq/mach_apicdef.h => numaq/apicdef.h} (75%) rename include/asm-x86/{mach-numaq/mach_ipi.h => numaq/ipi.h} (83%) rename include/asm-x86/{mach-numaq/mach_mpparse.h => numaq/mpparse.h} (50%) rename include/asm-x86/{mach-numaq/mach_wakecpu.h => numaq/wakecpu.h} (91%) rename include/asm-x86/{mach-summit/mach_apic.h => summit/apic.h} (94%) create mode 100644 include/asm-x86/summit/apicdef.h rename include/asm-x86/{mach-summit/mach_ipi.h => summit/ipi.h} (83%) rename include/asm-x86/{mach-summit => summit}/irq_vectors_limits.h (100%) rename include/asm-x86/{mach-summit/mach_mpparse.h => summit/mpparse.h} (96%) create mode 100644 include/asm-x86/syscall.h create mode 100644 include/asm-x86/syscalls.h create mode 100644 include/asm-x86/xcr.h create mode 100644 include/asm-x86/xsave.h create mode 100644 include/linux/usb/ehci_def.h Merging xtensa/master $ git merge xtensa/master Merge made by recursive. arch/xtensa/kernel/irq.c | 2 +- arch/xtensa/kernel/setup.c | 5 ----- arch/xtensa/platforms/iss/network.c | 2 +- include/asm-xtensa/rwsem.h | 4 ++++ 4 files changed, 6 insertions(+), 7 deletions(-) Merging quilt/driver-core $ git merge quilt/driver-core Auto-merged Documentation/kernel-parameters.txt Auto-merged arch/x86/kernel/cpuid.c Auto-merged arch/x86/kernel/traps_32.c Auto-merged arch/x86/kernel/traps_64.c Auto-merged drivers/firmware/iscsi_ibft.c Auto-merged drivers/mtd/mtdchar.c Auto-merged include/linux/kernel.h Auto-merged lib/Kconfig.debug Merge made by recursive. Documentation/kernel-parameters.txt | 5 + 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 +- arch/x86/kernel/traps_32.c | 1 + arch/x86/kernel/traps_64.c | 1 + block/bsg.c | 3 +- drivers/base/base.h | 2 +- drivers/base/bus.c | 50 +++ drivers/base/class.c | 136 +++++++-- drivers/base/core.c | 11 +- drivers/base/platform.c | 2 +- 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/firmware/iscsi_ibft.c | 18 +- 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/phy/phy_device.c | 8 +- drivers/net/ppp_generic.c | 4 +- drivers/net/wan/cosa.c | 4 +- drivers/net/wireless/mac80211_hwsim.c | 6 +- drivers/pci/probe.c | 50 +--- 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/Makefile | 23 +- drivers/usb/gadget/cdc2.c | 25 ++- drivers/usb/gadget/ether.c | 28 ++- drivers/usb/gadget/f_ecm.c | 108 ++++---- drivers/usb/gadget/f_loopback.c | 34 ++- drivers/usb/gadget/f_subset.c | 44 ++-- drivers/usb/gadget/file_storage.c | 12 + drivers/usb/gadget/gmidi.c | 15 + drivers/usb/gadget/printer.c | 18 +- drivers/usb/gadget/rndis.c | 115 ++++---- drivers/usb/gadget/serial.c | 18 ++ drivers/usb/gadget/u_ether.c | 4 +- drivers/usb/gadget/zero.c | 17 + 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 +- fs/sysfs/dir.c | 245 +++++++++++---- fs/sysfs/file.c | 88 ++++-- fs/sysfs/inode.c | 23 +- fs/sysfs/mount.c | 94 ++++++- fs/sysfs/sysfs.h | 20 +- include/asm-generic/vmlinux.lds.h | 10 +- include/linux/device.h | 24 ++- include/linux/dynamic_printk.h | 93 ++++++ include/linux/init.h | 1 + include/linux/kernel.h | 7 +- include/linux/klist.h | 3 +- include/linux/module.h | 4 + include/linux/sysfs.h | 31 ++- init/main.c | 9 + kernel/module.c | 37 +++ lib/Kconfig.debug | 55 ++++ lib/Makefile | 2 + lib/dynamic_printk.c | 418 ++++++++++++++++++++++++++ lib/klist.c | 96 +++++-- lib/kobject.c | 85 +++++- net/netfilter/nf_conntrack_pptp.c | 2 +- scripts/Makefile.lib | 11 +- scripts/basic/Makefile | 2 +- scripts/basic/hash.c | 64 ++++ sound/core/init.c | 6 +- sound/core/sound.c | 5 +- sound/oss/soundcard.c | 15 +- sound/sound_core.c | 5 +- 126 files changed, 1940 insertions(+), 697 deletions(-) create mode 100644 include/linux/dynamic_printk.h create mode 100644 lib/dynamic_printk.c create mode 100644 scripts/basic/hash.c Merging quilt/usb $ git merge quilt/usb Auto-merged drivers/media/video/dabusb.c Merge made by recursive. Documentation/DocBook/gadget.tmpl | 3 + drivers/block/ub.c | 3 - drivers/hid/usbhid/hid-core.c | 20 +- drivers/hid/usbhid/hid-tmff.c | 19 +- drivers/hid/usbhid/usbkbd.c | 12 +- drivers/hid/usbhid/usbmouse.c | 3 +- drivers/input/joystick/iforce/iforce-ff.c | 36 +- drivers/input/joystick/iforce/iforce-main.c | 14 +- drivers/input/joystick/iforce/iforce-packets.c | 8 +- drivers/input/joystick/iforce/iforce-usb.c | 2 +- drivers/input/joystick/xpad.c | 2 +- drivers/input/misc/ati_remote.c | 20 +- drivers/input/misc/yealink.c | 3 +- drivers/input/tablet/acecad.c | 3 +- drivers/input/tablet/aiptek.c | 26 +- drivers/input/tablet/gtco.c | 4 +- drivers/input/tablet/kbtab.c | 3 +- drivers/input/tablet/wacom_sys.c | 3 +- drivers/media/dvb/cinergyT2/cinergyT2.c | 3 +- drivers/media/radio/dsbr100.c | 16 +- drivers/media/video/dabusb.c | 7 +- drivers/media/video/ov511.c | 124 +++--- drivers/media/video/ov511.h | 3 +- drivers/media/video/pvrusb2/pvrusb2-main.c | 8 +- drivers/media/video/se401.c | 37 +- drivers/media/video/stv680.c | 6 +- drivers/media/video/usbvideo/ibmcam.c | 78 ++-- drivers/media/video/usbvideo/konicawc.c | 25 +- drivers/media/video/usbvideo/quickcam_messenger.c | 17 +- drivers/media/video/usbvideo/ultracam.c | 29 +- drivers/media/video/usbvideo/usbvideo.c | 163 +++++--- drivers/media/video/usbvision/usbvision-core.c | 3 +- drivers/media/video/usbvision/usbvision-i2c.c | 3 +- drivers/media/video/usbvision/usbvision-video.c | 3 +- drivers/media/video/zr364xx.c | 50 ++- drivers/mtd/nand/alauda.c | 4 +- drivers/net/irda/kingsun-sir.c | 3 +- drivers/net/irda/ks959-sir.c | 3 +- drivers/net/irda/ksdazzle-sir.c | 3 +- drivers/net/irda/stir4200.c | 18 +- drivers/net/usb/catc.c | 8 +- drivers/net/usb/hso.c | 26 +- drivers/net/usb/kaweth.c | 27 +- drivers/net/usb/rtl8150.c | 31 +- drivers/usb/atm/usbatm.c | 10 +- drivers/usb/atm/usbatm.h | 10 +- drivers/usb/atm/xusbatm.c | 2 +- drivers/usb/class/cdc-acm.c | 3 +- drivers/usb/class/usblp.c | 18 +- drivers/usb/core/devio.c | 3 +- drivers/usb/core/inode.c | 6 +- drivers/usb/core/message.c | 3 +- drivers/usb/core/urb.c | 95 ++++- drivers/usb/gadget/Kconfig | 273 +++++++----- drivers/usb/gadget/composite.c | 64 +++ drivers/usb/gadget/dummy_hcd.c | 33 ++- drivers/usb/gadget/f_obex.c | 493 +++++++++++++++++++++ drivers/usb/gadget/file_storage.c | 10 +- drivers/usb/gadget/fsl_usb2_udc.c | 176 ++++---- drivers/usb/gadget/fsl_usb2_udc.h | 21 +- drivers/usb/gadget/net2280.c | 40 ++- drivers/usb/gadget/net2280.h | 1 + drivers/usb/gadget/serial.c | 14 + drivers/usb/gadget/u_serial.h | 1 + drivers/usb/host/isp116x-hcd.c | 13 +- drivers/usb/host/r8a66597-hcd.c | 54 ++- drivers/usb/host/sl811-hcd.c | 15 +- drivers/usb/image/mdc800.c | 15 +- drivers/usb/misc/Kconfig | 10 + drivers/usb/misc/Makefile | 1 + drivers/usb/misc/adutux.c | 5 +- drivers/usb/misc/cytherm.c | 3 +- drivers/usb/misc/emi26.c | 4 +- drivers/usb/misc/emi62.c | 4 +- drivers/usb/misc/gotemp.c | 301 +++++++++++++ drivers/usb/misc/idmouse.c | 5 +- drivers/usb/misc/legousbtower.c | 23 +- drivers/usb/misc/rio500.c | 11 +- drivers/usb/misc/trancevibrator.c | 3 +- drivers/usb/misc/usblcd.c | 13 +- drivers/usb/misc/uss720.c | 19 +- drivers/usb/serial/aircable.c | 11 +- drivers/usb/serial/belkin_sa.c | 39 +- drivers/usb/serial/cp2101.c | 3 +- drivers/usb/serial/cyberjack.c | 28 +- drivers/usb/serial/cypress_m8.c | 21 +- drivers/usb/serial/digi_acceleport.c | 68 ++-- drivers/usb/serial/empeg.c | 11 +- drivers/usb/serial/ezusb.c | 3 +- drivers/usb/serial/ftdi_sio.c | 90 +++-- drivers/usb/serial/garmin_gps.c | 3 +- drivers/usb/serial/hp4x.c | 3 +- drivers/usb/serial/io_edgeport.c | 19 +- drivers/usb/serial/io_ti.c | 3 +- drivers/usb/serial/ipaq.c | 30 +- 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 | 3 +- drivers/usb/serial/keyspan_pda.c | 22 +- drivers/usb/serial/kl5kusb105.c | 69 ++-- drivers/usb/serial/kobil_sct.c | 4 +- drivers/usb/serial/mct_u232.c | 42 ++- drivers/usb/serial/mos7720.c | 22 +- drivers/usb/serial/mos7840.c | 29 +- drivers/usb/serial/omninet.c | 22 +- drivers/usb/serial/option.c | 3 +- drivers/usb/serial/pl2303.c | 2 +- drivers/usb/serial/safe_serial.c | 28 +- drivers/usb/serial/sierra.c | 3 +- drivers/usb/serial/spcp8x5.c | 10 +- drivers/usb/serial/ti_usb_3410_5052.c | 3 +- drivers/usb/serial/usb-serial.c | 26 +- drivers/usb/serial/visor.c | 17 +- drivers/usb/serial/whiteheat.c | 121 +++-- include/linux/usb.h | 8 +- include/linux/usb/cdc.h | 9 + include/linux/usb/composite.h | 11 +- 118 files changed, 2432 insertions(+), 1020 deletions(-) create mode 100644 drivers/usb/gadget/f_obex.c create mode 100644 drivers/usb/misc/gotemp.c Merging tip-core/auto-core-next $ git merge tip-core/auto-core-next Auto-merged arch/x86/kernel/cpu/common.c Auto-merged include/asm-generic/vmlinux.lds.h Auto-merged include/asm-x86/percpu.h Auto-merged include/linux/kernel.h Auto-merged kernel/lockdep.c Auto-merged kernel/module.c Auto-merged kernel/softlockup.c Auto-merged kernel/time/tick-sched.c Auto-merged lib/Kconfig.debug Auto-merged mm/filemap.c Merge made by recursive. arch/x86/boot/boot.h | 3 - 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/compiler.h | 30 +++++++++++++ include/linux/kernel.h | 15 +----- include/linux/percpu.h | 24 ++++++++++- kernel/lockdep.c | 4 +- kernel/module.c | 7 ++- kernel/notifier.c | 16 +++++++ kernel/printk.c | 22 ++++++++-- kernel/softlockup.c | 2 +- kernel/time/tick-sched.c | 2 +- kernel/timer.c | 1 + lib/Kconfig.debug | 10 ++++ mm/filemap.c | 15 ++++--- 19 files changed, 233 insertions(+), 42 deletions(-) Merging cpus4096/auto-cpus4096-next $ git merge cpus4096/auto-cpus4096-next Already up-to-date. Merging ftrace/auto-ftrace-next $ git merge ftrace/auto-ftrace-next Auto-merged arch/x86/Kconfig Auto-merged arch/x86/kernel/asm-offsets_64.c Auto-merged arch/x86/kernel/entry_64.S Auto-merged arch/x86/kernel/paravirt.c Auto-merged arch/x86/kernel/paravirt_patch_32.c Auto-merged arch/x86/kernel/traps_32.c Auto-merged arch/x86/kernel/traps_64.c Auto-merged arch/x86/kernel/vmi_32.c Auto-merged arch/x86/lguest/boot.c Auto-merged arch/x86/mm/fault.c Auto-merged arch/x86/xen/enlighten.c Auto-merged include/asm-generic/vmlinux.lds.h Auto-merged include/asm-x86/ftrace.h Auto-merged include/asm-x86/paravirt.h Auto-merged include/linux/compiler.h Auto-merged include/linux/init.h Auto-merged include/linux/kernel.h Auto-merged include/linux/module.h Auto-merged init/main.c Auto-merged kernel/exit.c Auto-merged kernel/module.c CONFLICT (content): Merge conflict in kernel/module.c Auto-merged kernel/notifier.c Auto-merged kernel/sched_clock.c Resolved 'kernel/module.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit cd61fb9: Merge commit 'ftrace/auto-ftrace-next' $ git diff -M --stat --summary HEAD^.. Documentation/tracepoints.txt | 101 ++++ arch/alpha/include/asm/thread_info.h | 2 +- arch/avr32/include/asm/thread_info.h | 2 +- arch/x86/Kconfig | 1 + arch/x86/kernel/asm-offsets_32.c | 1 + arch/x86/kernel/asm-offsets_64.c | 1 + arch/x86/kernel/cpu/perfctr-watchdog.c | 11 +- arch/x86/kernel/entry_32.S | 44 +- arch/x86/kernel/entry_64.S | 60 +- arch/x86/kernel/ftrace.c | 120 +++-- arch/x86/kernel/paravirt.c | 3 + arch/x86/kernel/paravirt_patch_32.c | 6 +- arch/x86/kernel/paravirt_patch_64.c | 6 +- arch/x86/kernel/traps_32.c | 3 + arch/x86/kernel/traps_64.c | 4 + arch/x86/kernel/vmi_32.c | 2 + arch/x86/lguest/boot.c | 1 + arch/x86/mm/fault.c | 4 +- arch/x86/mm/pf_in.c | 121 +++-- arch/x86/xen/enlighten.c | 1 + include/asm-generic/vmlinux.lds.h | 14 +- include/asm-x86/ftrace.h | 10 + include/asm-x86/irqflags.h | 56 ++ include/asm-x86/paravirt.h | 5 + include/linux/compiler.h | 2 + include/linux/ftrace.h | 50 ++- include/linux/hardirq.h | 27 +- include/linux/init.h | 2 +- include/linux/kernel.h | 5 + include/linux/kprobes.h | 5 +- include/linux/linkage.h | 2 - include/linux/module.h | 17 + include/linux/rcupdate.h | 20 + include/linux/stringify.h | 5 + include/linux/tracepoint.h | 127 ++++ include/trace/sched.h | 56 ++ init/Kconfig | 7 + init/main.c | 3 + kernel/Makefile | 1 + kernel/exit.c | 10 +- kernel/fork.c | 3 + kernel/kthread.c | 5 + kernel/module.c | 81 +++- kernel/notifier.c | 2 +- kernel/sched.c | 17 +- kernel/sched_clock.c | 8 + kernel/signal.c | 3 + kernel/trace/Kconfig | 9 + kernel/trace/ftrace.c | 244 ++++++-- kernel/trace/trace.c | 737 ++++++++++++++++++------ kernel/trace/trace.h | 28 +- kernel/trace/trace_mmiotrace.c | 12 +- kernel/trace/trace_sched_switch.c | 120 +--- kernel/trace/trace_sched_wakeup.c | 135 ++---- kernel/trace/trace_selftest.c | 11 +- kernel/tracepoint.c | 476 +++++++++++++++ samples/Kconfig | 6 + samples/Makefile | 2 +- samples/tracepoints/Makefile | 6 + samples/tracepoints/tp-samples-trace.h | 13 + samples/tracepoints/tracepoint-probe-sample.c | 55 ++ samples/tracepoints/tracepoint-probe-sample2.c | 42 ++ samples/tracepoints/tracepoint-sample.c | 53 ++ scripts/Makefile.build | 6 + scripts/recordmcount.pl | 401 +++++++++++++ 65 files changed, 2785 insertions(+), 608 deletions(-) create mode 100644 Documentation/tracepoints.txt create mode 100644 include/linux/tracepoint.h create mode 100644 include/trace/sched.h create mode 100644 kernel/tracepoint.c create mode 100644 samples/tracepoints/Makefile create mode 100644 samples/tracepoints/tp-samples-trace.h create mode 100644 samples/tracepoints/tracepoint-probe-sample.c create mode 100644 samples/tracepoints/tracepoint-probe-sample2.c create mode 100644 samples/tracepoints/tracepoint-sample.c create mode 100755 scripts/recordmcount.pl $ git am -3 ../patches/ftrace__remove_warning_of_old_objcopy_and_local_functions Applying ftrace: remove warning of old objcopy and local functions Merging genirq/auto-genirq-next $ git merge genirq/auto-genirq-next Auto-merged include/linux/irq.h Auto-merged kernel/irq/manage.c Merge made by recursive. include/linux/irq.h | 4 - kernel/irq/handle.c | 2 - kernel/irq/manage.c | 17 +++-- kernel/irq/spurious.c | 146 ++++++++++++++++++++++++++++++------------------ 4 files changed, 101 insertions(+), 68 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 | 16 ++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) Merging sched/auto-sched-next $ git merge sched/auto-sched-next Auto-merged include/linux/compiler.h Auto-merged kernel/sched.c Auto-merged kernel/sched_rt.c Auto-merged lib/Kconfig.debug Merge made by recursive. Documentation/RCU/checklist.txt | 2 +- Documentation/RCU/whatisRCU.txt | 2 - Documentation/scheduler/sched-design-CFS.txt | 371 +++++++++++++++----------- include/linux/compiler.h | 4 +- include/linux/proportions.h | 2 +- include/linux/rcuclassic.h | 31 ++- include/linux/rculist.h | 14 - include/linux/rcupreempt.h | 11 +- include/linux/sched.h | 4 +- kernel/cpuset.c | 312 +++++++++++++--------- kernel/rcuclassic.c | 331 +++++++++++++++++------ kernel/rcupreempt.c | 8 - kernel/rcupreempt_trace.c | 7 +- kernel/sched.c | 227 +++++++++-------- kernel/sched_rt.c | 5 +- kernel/user.c | 4 +- lib/Kconfig.debug | 13 + 17 files changed, 827 insertions(+), 521 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/kernel/Makefile Auto-merged arch/x86/kernel/process_64.c Auto-merged arch/x86/mm/fault.c Auto-merged include/asm-x86/pda.h CONFLICT (content): Merge conflict in include/asm-x86/pda.h Auto-merged include/asm-x86/system.h Auto-merged include/linux/sched.h Auto-merged init/main.c Auto-merged kernel/exit.c Auto-merged kernel/fork.c CONFLICT (content): Merge conflict in kernel/fork.c Auto-merged kernel/sched.c Resolved 'include/asm-x86/pda.h' using previous resolution. Resolved 'kernel/fork.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 41a1c62: Merge commit 'stackprotector/auto-stackprotector-next' $ git diff -M --stat --summary HEAD^.. 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 Documentation/00-INDEX Auto-merged kernel/timer.c Merge made by recursive. Documentation/00-INDEX | 2 - Documentation/timers/00-INDEX | 10 ++ Documentation/{ => timers}/hpet.txt | 43 +++++----- arch/x86/kernel/hpet.c | 6 +- drivers/char/hpet.c | 155 ++++++++++++++++++++--------------- drivers/clocksource/acpi_pm.c | 7 +- include/linux/clocksource.h | 14 ++- include/linux/hpet.h | 14 +--- include/linux/time.h | 2 + include/linux/timex.h | 9 ++- kernel/hrtimer.c | 11 ++- kernel/posix-timers.c | 15 ++++ kernel/time/clocksource.c | 3 + kernel/time/jiffies.c | 1 + kernel/time/ntp.c | 76 +++++++++-------- kernel/time/timekeeping.c | 113 +++++++++++++++++-------- kernel/timer.c | 11 ++- 17 files changed, 300 insertions(+), 192 deletions(-) create mode 100644 Documentation/timers/00-INDEX rename Documentation/{ => timers}/hpet.txt (81%) Merging pci/linux-next $ git merge pci/linux-next Auto-merged Documentation/kernel-parameters.txt Auto-merged arch/x86/pci/irq.c Auto-merged drivers/pci/probe.c Auto-merged drivers/pci/setup-bus.c Auto-merged init/Kconfig Merge made by recursive. Documentation/PCI/pci.txt | 4 + Documentation/kernel-parameters.txt | 25 +++--- arch/x86/pci/irq.c | 8 +- drivers/i2c/busses/i2c-amd756.c | 5 - drivers/i2c/busses/i2c-viapro.c | 5 - drivers/pci/hotplug/ibmphp_ebda.c | 92 +++++-------------- drivers/pci/hotplug/pciehp.h | 1 + drivers/pci/hotplug/pciehp_hpc.c | 5 +- drivers/pci/pci-driver.c | 21 ++++- drivers/pci/pci.c | 48 +++++++--- drivers/pci/pcie/portdrv_pci.c | 2 +- drivers/pci/probe.c | 13 ++- drivers/pci/quirks.c | 177 ++++++++++++++++++----------------- drivers/pci/search.c | 6 +- drivers/pci/setup-bus.c | 6 +- drivers/scsi/ipr.c | 1 - drivers/scsi/qla2xxx/qla_def.h | 2 +- include/linux/pci.h | 12 +- init/Kconfig | 8 ++ 19 files changed, 223 insertions(+), 218 deletions(-) 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 Removed drivers/hid/hid-input-quirks.c Auto-merged drivers/hid/hidraw.c Auto-merged drivers/hid/usbhid/hid-core.c CONFLICT (content): Merge conflict in drivers/hid/usbhid/hid-core.c Auto-merged drivers/hid/usbhid/usbmouse.c Resolved 'drivers/hid/usbhid/hid-core.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 3826c5a: Merge commit 'hid/mm' $ git diff -M --stat --summary HEAD^.. Documentation/feature-removal-schedule.txt | 7 + drivers/hid/Kconfig | 162 ++++ drivers/hid/Makefile | 31 +- drivers/hid/hid-a4tech.c | 162 ++++ drivers/hid/hid-apple.c | 482 ++++++++++++ drivers/hid/hid-belkin.c | 105 +++ drivers/hid/hid-cherry.c | 87 +++ drivers/hid/hid-chicony.c | 80 ++ drivers/hid/hid-core.c | 1158 ++++++++++++++++++++++------ drivers/hid/hid-cypress.c | 158 ++++ drivers/hid/hid-dell.c | 74 ++ drivers/hid/hid-dummy.c | 60 ++ drivers/hid/hid-ezkey.c | 95 +++ drivers/hid/hid-gyration.c | 96 +++ drivers/hid/hid-ids.h | 386 +++++++++ drivers/hid/hid-input-quirks.c | 484 ------------ drivers/hid/hid-input.c | 915 ++++++++-------------- drivers/hid/hid-lg.c | 342 ++++++++ drivers/hid/hid-lg.h | 18 + drivers/hid/{usbhid => }/hid-lg2ff.c | 6 +- drivers/hid/{usbhid => }/hid-lgff.c | 34 +- drivers/hid/hid-microsoft.c | 219 ++++++ drivers/hid/hid-monterey.c | 82 ++ drivers/hid/hid-petalynx.c | 122 +++ drivers/hid/hid-samsung.c | 100 +++ drivers/hid/hid-sony.c | 110 +++ drivers/hid/hid-sunplus.c | 82 ++ drivers/hid/hidraw.c | 6 +- drivers/hid/usbhid/Kconfig | 35 - drivers/hid/usbhid/Makefile | 6 - drivers/hid/usbhid/hid-core.c | 424 +++++------ drivers/hid/usbhid/hid-ff.c | 12 - drivers/hid/usbhid/hid-quirks.c | 933 +---------------------- drivers/hid/usbhid/hiddev.c | 20 +- drivers/hid/usbhid/usbhid.h | 2 +- drivers/hid/usbhid/usbmouse.c | 5 + include/linux/hid.h | 357 +++++++-- include/linux/hiddev.h | 6 +- include/linux/mod_devicetable.h | 10 + net/bluetooth/hidp/core.c | 214 ++++-- net/bluetooth/hidp/hidp.h | 2 + scripts/mod/file2alias.c | 18 + 42 files changed, 5005 insertions(+), 2702 deletions(-) create mode 100644 drivers/hid/hid-a4tech.c create mode 100644 drivers/hid/hid-apple.c create mode 100644 drivers/hid/hid-belkin.c create mode 100644 drivers/hid/hid-cherry.c create mode 100644 drivers/hid/hid-chicony.c create mode 100644 drivers/hid/hid-cypress.c create mode 100644 drivers/hid/hid-dell.c create mode 100644 drivers/hid/hid-dummy.c create mode 100644 drivers/hid/hid-ezkey.c create mode 100644 drivers/hid/hid-gyration.c create mode 100644 drivers/hid/hid-ids.h delete mode 100644 drivers/hid/hid-input-quirks.c create mode 100644 drivers/hid/hid-lg.c create mode 100644 drivers/hid/hid-lg.h rename drivers/hid/{usbhid => }/hid-lg2ff.c (97%) rename drivers/hid/{usbhid => }/hid-lgff.c (81%) create mode 100644 drivers/hid/hid-microsoft.c create mode 100644 drivers/hid/hid-monterey.c create mode 100644 drivers/hid/hid-petalynx.c create mode 100644 drivers/hid/hid-samsung.c create mode 100644 drivers/hid/hid-sony.c create mode 100644 drivers/hid/hid-sunplus.c $ git am -3 ../patches/0001-HID-fix-for-warn-removal.patch Applying HID: fix for warn() removal Merging quilt/i2c $ git merge quilt/i2c Auto-merged drivers/i2c/busses/i2c-viapro.c Merge made by recursive. Documentation/i2c/busses/i2c-floppy | 37 +++ Documentation/i2c/busses/i2c-viapro | 8 +- 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 | 33 +++- drivers/i2c/busses/Makefile | 2 + drivers/i2c/busses/i2c-floppy.c | 245 +++++++++++++++++ drivers/i2c/busses/i2c-highlander.c | 498 +++++++++++++++++++++++++++++++++++ drivers/i2c/busses/i2c-pca-isa.c | 20 ++- drivers/i2c/busses/i2c-viapro.c | 4 + drivers/i2c/chips/isp1301_omap.c | 141 ++++------ drivers/i2c/chips/tps65010.c | 12 +- 13 files changed, 1073 insertions(+), 262 deletions(-) create mode 100644 Documentation/i2c/busses/i2c-floppy create mode 100644 drivers/i2c/busses/i2c-floppy.c create mode 100644 drivers/i2c/busses/i2c-highlander.c Merging quilt/jdelvare-hwmon $ git merge quilt/jdelvare-hwmon Auto-merged drivers/hwmon/Kconfig Auto-merged drivers/hwmon/ams/ams.h Merge made by recursive. Documentation/hwmon/lm87 | 9 +- Documentation/hwmon/lm90 | 45 +++-- drivers/hwmon/Kconfig | 8 +- drivers/hwmon/ad7414.c | 2 +- drivers/hwmon/ams/ams-core.c | 82 +++---- drivers/hwmon/ams/ams-i2c.c | 60 ++---- drivers/hwmon/ams/ams-input.c | 63 +++--- drivers/hwmon/ams/ams-pmu.c | 18 +- drivers/hwmon/ams/ams.h | 4 +- drivers/hwmon/atxp1.c | 18 +- drivers/hwmon/lm87.c | 33 ++- drivers/hwmon/lm90.c | 444 ++++++++++++++++++++++++++----------- drivers/i2c/busses/i2c-powermac.c | 29 +++ 13 files changed, 501 insertions(+), 314 deletions(-) Merging quilt/kernel-doc $ git merge quilt/kernel-doc Renamed Documentation/mtrr.txt->Documentation/x86/mtrr.txt Auto-merged Documentation/x86/mtrr.txt Auto-merged Documentation/00-INDEX Auto-merged arch/x86/Kconfig Auto-merged block/blk-core.c Auto-merged block/blk-tag.c Auto-merged block/genhd.c Auto-merged include/linux/kernel.h Merge made by recursive. Documentation/00-INDEX | 2 - Documentation/DocBook/kernel-api.tmpl | 5 ++ Documentation/Makefile | 2 +- Documentation/early-userspace/00-INDEX | 8 ++ Documentation/{ => early-userspace}/initrd.txt | 6 +- Documentation/filesystems/Makefile | 8 ++ Documentation/filesystems/dnotify.txt | 36 +---------- Documentation/filesystems/dnotify_test.c | 34 ++++++++++ Documentation/filesystems/sharedsubtree.txt | 82 +---------------------- Documentation/filesystems/smount.c | 73 +++++++++++++++++++++ block/blk-core.c | 72 ++++++++++---------- block/blk-exec.c | 6 +- block/blk-integrity.c | 4 +- block/blk-map.c | 16 ++-- block/blk-settings.c | 8 +- block/blk-tag.c | 8 +- block/genhd.c | 5 +- include/linux/kernel.h | 4 +- scripts/kernel-doc | 6 +- security/inode.c | 33 +++++----- security/security.c | 8 +- 21 files changed, 222 insertions(+), 204 deletions(-) create mode 100644 Documentation/early-userspace/00-INDEX rename Documentation/{ => early-userspace}/initrd.txt (99%) create mode 100644 Documentation/filesystems/Makefile create mode 100644 Documentation/filesystems/dnotify_test.c create mode 100644 Documentation/filesystems/smount.c Merging v4l-dvb/stable $ git merge v4l-dvb/stable Auto-merged drivers/media/radio/dsbr100.c CONFLICT (content): Merge conflict in drivers/media/radio/dsbr100.c Removed drivers/media/radio/miropcm20-radio.c Removed drivers/media/radio/miropcm20-rds-core.c Removed drivers/media/radio/miropcm20-rds-core.h Removed drivers/media/radio/miropcm20-rds.c Auto-merged drivers/media/video/cafe_ccic.c Removed drivers/media/video/dpc7146.c Auto-merged drivers/media/video/ov511.c Auto-merged drivers/media/video/se401.c Auto-merged drivers/media/video/stv680.c Removed drivers/media/video/tuner-3036.c Auto-merged drivers/media/video/usbvideo/ibmcam.c Auto-merged drivers/media/video/usbvideo/usbvideo.c Auto-merged drivers/media/video/usbvision/usbvision-video.c Auto-merged drivers/media/video/zr364xx.c CONFLICT (content): Merge conflict in drivers/media/video/zr364xx.c Resolved 'drivers/media/radio/dsbr100.c' using previous resolution. Resolved 'drivers/media/video/zr364xx.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 51a892a: Merge commit 'v4l-dvb/stable' $ git diff -M --stat --summary HEAD^.. Documentation/video4linux/CARDLIST.au0828 | 1 + Documentation/video4linux/CARDLIST.bttv | 1 + Documentation/video4linux/CARDLIST.cx23885 | 2 + Documentation/video4linux/CARDLIST.tuner | 1 + Documentation/video4linux/gspca.txt | 29 +- Documentation/video4linux/soc-camera.txt | 120 +++ arch/arm/mach-pxa/include/mach/camera.h | 2 - drivers/media/common/ir-keymaps.c | 55 +- drivers/media/common/saa7146_core.c | 2 +- drivers/media/common/saa7146_fops.c | 2 +- drivers/media/common/saa7146_video.c | 4 +- drivers/media/common/tuners/mt2131.c | 2 +- drivers/media/common/tuners/mt2131.h | 2 +- drivers/media/common/tuners/mt2131_priv.h | 2 +- drivers/media/common/tuners/mxl5005s.c | 4 +- drivers/media/common/tuners/mxl5005s.h | 2 +- drivers/media/common/tuners/tuner-simple.c | 35 +- drivers/media/common/tuners/tuner-types.c | 22 + drivers/media/common/tuners/xc5000.c | 2 +- drivers/media/common/tuners/xc5000.h | 2 +- drivers/media/common/tuners/xc5000_priv.h | 2 +- drivers/media/dvb/b2c2/flexcop-dma.c | 2 +- drivers/media/dvb/b2c2/flexcop-i2c.c | 12 +- drivers/media/dvb/bt8xx/dvb-bt8xx.c | 2 +- drivers/media/dvb/dvb-core/dmxdev.c | 1 - drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 4 +- drivers/media/dvb/dvb-core/dvb_frontend.c | 8 +- drivers/media/dvb/dvb-usb/Kconfig | 9 + drivers/media/dvb/dvb-usb/Makefile | 3 + drivers/media/dvb/dvb-usb/cxusb.c | 497 +++++++++- drivers/media/dvb/dvb-usb/dib0700_devices.c | 9 +- drivers/media/dvb/dvb-usb/dtv5100.c | 240 +++++ drivers/media/dvb/dvb-usb/dtv5100.h | 51 + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 4 + drivers/media/dvb/frontends/Kconfig | 13 + drivers/media/dvb/frontends/Makefile | 2 + drivers/media/dvb/frontends/au8522.c | 47 +- drivers/media/dvb/frontends/au8522.h | 11 +- drivers/media/dvb/frontends/cx22702.c | 2 +- drivers/media/dvb/frontends/cx22702.h | 2 +- drivers/media/dvb/frontends/cx24123.c | 6 +- drivers/media/dvb/frontends/cx24123.h | 2 +- drivers/media/dvb/frontends/dib0070.h | 8 +- drivers/media/dvb/frontends/dib7000p.c | 3 +- drivers/media/dvb/frontends/dib7000p.h | 41 +- drivers/media/dvb/frontends/drx397xD.c | 288 +++--- drivers/media/dvb/frontends/drx397xD.h | 6 +- drivers/media/dvb/frontends/dvb_dummy_fe.c | 7 +- drivers/media/dvb/frontends/lgs8gl5.c | 454 ++++++++ drivers/media/dvb/frontends/lgs8gl5.h | 45 + drivers/media/dvb/frontends/nxt200x.c | 4 +- drivers/media/dvb/frontends/or51211.c | 2 +- drivers/media/dvb/frontends/s5h1409.c | 3 +- drivers/media/dvb/frontends/s5h1409.h | 2 +- drivers/media/dvb/frontends/s5h1411.c | 3 +- drivers/media/dvb/frontends/s5h1411.h | 2 +- drivers/media/dvb/frontends/s5h1420.c | 3 +- drivers/media/dvb/frontends/tda10048.c | 4 +- drivers/media/dvb/frontends/tda10048.h | 2 +- drivers/media/dvb/siano/sms-cards.c | 2 +- drivers/media/dvb/siano/sms-cards.h | 2 +- drivers/media/dvb/siano/smscoreapi.c | 2 +- drivers/media/dvb/siano/smscoreapi.h | 2 +- drivers/media/dvb/siano/smsdvb.c | 2 +- drivers/media/dvb/siano/smsusb.c | 2 +- drivers/media/dvb/ttpci/av7110.c | 2 +- drivers/media/dvb/ttpci/budget-av.c | 2 +- drivers/media/dvb/ttpci/budget-ci.c | 2 +- drivers/media/dvb/ttpci/budget-patch.c | 2 +- drivers/media/dvb/ttpci/budget.c | 2 +- drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 2 +- drivers/media/dvb/ttusb-dec/ttusb_dec.c | 2 +- drivers/media/radio/Makefile | 4 - drivers/media/radio/dsbr100.c | 19 +- drivers/media/radio/miropcm20-radio.c | 266 ----- drivers/media/radio/miropcm20-rds-core.c | 211 ---- drivers/media/radio/miropcm20-rds-core.h | 19 - drivers/media/radio/miropcm20-rds.c | 136 --- drivers/media/radio/radio-aimslab.c | 37 +- drivers/media/radio/radio-aztech.c | 43 +- drivers/media/radio/radio-cadet.c | 3 +- drivers/media/radio/radio-gemtek-pci.c | 44 +- drivers/media/radio/radio-gemtek.c | 40 +- drivers/media/radio/radio-maestro.c | 37 +- drivers/media/radio/radio-maxiradio.c | 68 +- drivers/media/radio/radio-rtrack2.c | 37 +- drivers/media/radio/radio-sf16fmi.c | 36 +- drivers/media/radio/radio-sf16fmr2.c | 34 +- drivers/media/radio/radio-si470x.c | 28 +- drivers/media/radio/radio-terratec.c | 37 +- drivers/media/radio/radio-trust.c | 20 +- drivers/media/radio/radio-typhoon.c | 35 +- drivers/media/radio/radio-zoltrix.c | 37 +- drivers/media/video/Kconfig | 150 ++-- drivers/media/video/Makefile | 7 +- drivers/media/video/arv.c | 29 +- drivers/media/video/au0828/Kconfig | 1 + drivers/media/video/au0828/au0828-cards.c | 9 +- drivers/media/video/au0828/au0828-cards.h | 3 +- drivers/media/video/au0828/au0828-core.c | 4 +- drivers/media/video/au0828/au0828-dvb.c | 25 +- drivers/media/video/au0828/au0828-i2c.c | 2 +- drivers/media/video/au0828/au0828-reg.h | 2 +- drivers/media/video/au0828/au0828.h | 2 +- drivers/media/video/bt856.c | 8 +- drivers/media/video/bt8xx/bttv-cards.c | 97 ++- drivers/media/video/bt8xx/bttv-driver.c | 28 +- drivers/media/video/bt8xx/bttv-input.c | 62 +- drivers/media/video/bt8xx/bttv-risc.c | 3 +- drivers/media/video/bt8xx/bttv.h | 2 +- drivers/media/video/bt8xx/bttvp.h | 5 + drivers/media/video/btcx-risc.c | 6 +- drivers/media/video/btcx-risc.h | 2 +- drivers/media/video/bw-qcam.c | 29 +- drivers/media/video/bw-qcam.h | 1 + drivers/media/video/c-qcam.c | 26 +- drivers/media/video/cafe_ccic.c | 6 +- drivers/media/video/cpia.c | 17 +- drivers/media/video/cpia2/cpia2_v4l.c | 20 +- drivers/media/video/cx18/cx18-av-firmware.c | 16 +- drivers/media/video/cx18/cx18-driver.c | 10 +- drivers/media/video/cx18/cx18-driver.h | 7 +- drivers/media/video/cx18/cx18-dvb.c | 2 +- drivers/media/video/cx18/cx18-dvb.h | 2 +- drivers/media/video/cx18/cx18-fileops.c | 47 +- drivers/media/video/cx18/cx18-i2c.c | 2 - drivers/media/video/cx18/cx18-ioctl.c | 20 +- drivers/media/video/cx18/cx18-irq.c | 2 +- drivers/media/video/cx18/cx18-mailbox.c | 1 + drivers/media/video/cx18/cx18-queue.c | 135 +-- drivers/media/video/cx18/cx18-queue.h | 2 +- drivers/media/video/cx18/cx18-streams.c | 19 +- drivers/media/video/cx18/cx23418.h | 2 +- drivers/media/video/cx2341x.c | 5 +- drivers/media/video/cx23885/Kconfig | 1 + drivers/media/video/cx23885/cx23885-417.c | 12 +- drivers/media/video/cx23885/cx23885-cards.c | 86 ++- drivers/media/video/cx23885/cx23885-core.c | 6 +- drivers/media/video/cx23885/cx23885-dvb.c | 104 ++- drivers/media/video/cx23885/cx23885-i2c.c | 2 +- drivers/media/video/cx23885/cx23885-reg.h | 2 +- drivers/media/video/cx23885/cx23885-vbi.c | 2 +- drivers/media/video/cx23885/cx23885-video.c | 14 +- drivers/media/video/cx23885/cx23885.h | 4 +- drivers/media/video/cx25840/cx25840-core.c | 2 +- drivers/media/video/cx88/cx88-blackbird.c | 8 +- drivers/media/video/cx88/cx88-video.c | 10 +- drivers/media/video/dpc7146.c | 408 ------- drivers/media/video/em28xx/em28xx-cards.c | 2 + drivers/media/video/em28xx/em28xx-video.c | 7 +- drivers/media/video/et61x251/et61x251_core.c | 14 +- drivers/media/video/gspca/conex.c | 24 +- drivers/media/video/gspca/etoms.c | 30 +- drivers/media/video/gspca/gspca.c | 119 ++- drivers/media/video/gspca/gspca.h | 21 +- drivers/media/video/gspca/mars.c | 41 +- drivers/media/video/gspca/ov519.c | 1167 +++++++++++---------- drivers/media/video/gspca/pac207.c | 87 +-- drivers/media/video/gspca/pac7311.c | 1110 +++++++++++++------- drivers/media/video/gspca/pac_common.h | 60 ++ drivers/media/video/gspca/sonixb.c | 594 ++++++----- drivers/media/video/gspca/sonixj.c | 539 +++++++---- drivers/media/video/gspca/spca500.c | 20 +- drivers/media/video/gspca/spca501.c | 16 +- drivers/media/video/gspca/spca505.c | 16 +- drivers/media/video/gspca/spca506.c | 20 +- drivers/media/video/gspca/spca508.c | 21 +- drivers/media/video/gspca/spca561.c | 723 ++++++++----- drivers/media/video/gspca/stk014.c | 20 +- drivers/media/video/gspca/sunplus.c | 167 ++-- drivers/media/video/gspca/t613.c | 41 +- drivers/media/video/gspca/tv8532.c | 20 +- drivers/media/video/gspca/vc032x.c | 31 +- drivers/media/video/gspca/zc3xx.c | 85 +- drivers/media/video/ivtv/ivtv-driver.c | 6 +- drivers/media/video/ivtv/ivtv-driver.h | 2 +- drivers/media/video/ivtv/ivtv-fileops.c | 2 +- drivers/media/video/ivtv/ivtv-fileops.h | 5 - drivers/media/video/ivtv/ivtv-i2c.c | 2 - drivers/media/video/ivtv/ivtv-irq.c | 29 +- drivers/media/video/ivtv/ivtv-queue.h | 2 +- drivers/media/video/ivtv/ivtv-streams.c | 2 +- drivers/media/video/ivtv/ivtv-vbi.c | 4 +- drivers/media/video/ivtv/ivtv-version.h | 2 +- drivers/media/video/ks0127.c | 31 +- drivers/media/video/meye.c | 15 +- drivers/media/video/meye.h | 1 + drivers/media/video/mt9m001.c | 55 +- drivers/media/video/mt9m111.c | 973 +++++++++++++++++ drivers/media/video/mt9v022.c | 52 +- drivers/media/video/mxb.c | 25 +- drivers/media/video/ov511.c | 14 +- drivers/media/video/pms.c | 36 +- drivers/media/video/pvrusb2/pvrusb2-hdw.c | 3 +- drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 6 + drivers/media/video/pwc/pwc-ctrl.c | 18 +- drivers/media/video/pwc/pwc-if.c | 12 +- drivers/media/video/pwc/pwc-v4l.c | 2 +- drivers/media/video/pxa_camera.c | 24 - drivers/media/video/s2255drv.c | 572 ++++++----- drivers/media/video/saa5246a.c | 44 +- drivers/media/video/saa5249.c | 56 +- drivers/media/video/saa7115.c | 5 +- drivers/media/video/saa7134/saa6752hs.c | 335 ++++-- drivers/media/video/saa7134/saa7134-core.c | 58 +- drivers/media/video/saa7134/saa7134-empress.c | 40 +- drivers/media/video/saa7134/saa7134-input.c | 140 +++- drivers/media/video/saa7134/saa7134-ts.c | 56 +- drivers/media/video/saa7134/saa7134-video.c | 8 +- drivers/media/video/saa7134/saa7134.h | 8 + drivers/media/video/se401.c | 9 +- drivers/media/video/sh_mobile_ceu_camera.c | 5 - drivers/media/video/sn9c102/sn9c102_core.c | 14 +- drivers/media/video/sn9c102/sn9c102_devtable.h | 21 +- drivers/media/video/stk-webcam.c | 10 +- drivers/media/video/stradis.c | 7 +- drivers/media/video/stv680.c | 4 +- drivers/media/video/tda9840.c | 166 +-- drivers/media/video/tea6415c.c | 131 +-- drivers/media/video/tea6420.c | 147 +-- drivers/media/video/tuner-3036.c | 214 ---- drivers/media/video/usbvideo/ibmcam.c | 6 +- drivers/media/video/usbvideo/usbvideo.c | 3 +- drivers/media/video/usbvideo/vicam.c | 19 +- drivers/media/video/usbvision/usbvision-video.c | 124 +-- drivers/media/video/uvc/uvc_driver.c | 24 +- drivers/media/video/uvc/uvc_v4l2.c | 13 +- drivers/media/video/uvc/uvc_video.c | 7 +- drivers/media/video/v4l2-common.c | 183 +++- drivers/media/video/v4l2-dev.c | 211 ++--- drivers/media/video/v4l2-ioctl.c | 4 +- drivers/media/video/vino.c | 25 +- drivers/media/video/vivi.c | 59 +- drivers/media/video/vpx3220.c | 2 - drivers/media/video/w9966.c | 31 +- drivers/media/video/wm8739.c | 4 +- drivers/media/video/zc0301/zc0301_core.c | 14 +- drivers/media/video/zc0301/zc0301_sensor.h | 19 - drivers/media/video/zoran_device.c | 4 +- drivers/media/video/zoran_driver.c | 3 + drivers/media/video/zr364xx.c | 37 +- include/linux/i2c-id.h | 1 - include/linux/videodev2.h | 32 +- include/media/ir-common.h | 6 + include/media/saa7146.h | 2 +- include/media/sh_mobile_ceu.h | 2 - include/media/soc_camera.h | 3 + include/media/tuner.h | 1 + include/media/v4l2-chip-ident.h | 5 + include/media/v4l2-common.h | 3 + include/media/v4l2-dev.h | 65 +- include/sound/tea575x-tuner.h | 1 + sound/i2c/other/tea575x-tuner.c | 25 +- 253 files changed, 8489 insertions(+), 5611 deletions(-) create mode 100644 Documentation/video4linux/soc-camera.txt create mode 100644 drivers/media/dvb/dvb-usb/dtv5100-fe.c create mode 100644 drivers/media/dvb/dvb-usb/dtv5100.c create mode 100644 drivers/media/dvb/dvb-usb/dtv5100.h create mode 100644 drivers/media/dvb/frontends/lgs8gl5.c create mode 100644 drivers/media/dvb/frontends/lgs8gl5.h delete mode 100644 drivers/media/radio/miropcm20-radio.c delete mode 100644 drivers/media/radio/miropcm20-rds-core.c delete mode 100644 drivers/media/radio/miropcm20-rds-core.h delete mode 100644 drivers/media/radio/miropcm20-rds.c delete mode 100644 drivers/media/video/dpc7146.c create mode 100644 drivers/media/video/gspca/pac_common.h create mode 100644 drivers/media/video/mt9m111.c delete mode 100644 drivers/media/video/tuner-3036.c 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. drivers/ata/libata-scsi.c | 2 +- drivers/block/hd.c | 9 +- drivers/ide/Kconfig | 61 +--- drivers/ide/Makefile | 23 +- drivers/ide/arm/icside.c | 5 +- drivers/ide/arm/palm_bk3710.c | 8 +- drivers/ide/h8300/ide-h8300.c | 2 +- drivers/ide/ide-acpi.c | 18 +- drivers/ide/ide-atapi.c | 393 ++++++++++++--- drivers/ide/ide-cd.c | 108 ++--- drivers/ide/ide-disk.c | 560 +++++++-------------- drivers/ide/ide-disk.h | 32 ++ drivers/ide/ide-disk_ioctl.c | 29 + drivers/ide/ide-disk_proc.c | 129 +++++ drivers/ide/ide-dma.c | 65 ++-- drivers/ide/ide-floppy.c | 954 +++++++---------------------------- drivers/ide/ide-floppy.h | 62 +++ drivers/ide/ide-floppy_ioctl.c | 293 +++++++++++ drivers/ide/ide-floppy_proc.c | 33 ++ drivers/ide/ide-generic.c | 102 +++-- drivers/ide/ide-io.c | 313 +++++------- drivers/ide/ide-ioctls.c | 299 +++++++++++ drivers/ide/ide-iops.c | 289 ++++------- drivers/ide/ide-lib.c | 75 ++-- drivers/ide/ide-probe.c | 450 ++++++++--------- drivers/ide/ide-proc.c | 310 ++++-------- drivers/ide/ide-tape.c | 594 ++++++---------------- drivers/ide/ide-taskfile.c | 241 ++-------- drivers/ide/ide-timings.c | 22 +- drivers/ide/ide.c | 347 ++++--------- drivers/ide/legacy/ali14xx.c | 3 +- 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 | 10 +- drivers/ide/legacy/ide-4drives.c | 2 +- drivers/ide/legacy/ide-cs.c | 1 - drivers/ide/legacy/macide.c | 1 - drivers/ide/legacy/q40ide.c | 2 - drivers/ide/legacy/qd65xx.c | 25 +- drivers/ide/legacy/umc8672.c | 1 - drivers/ide/mips/au1xxx-ide.c | 6 +- drivers/ide/pci/aec62xx.c | 15 +- drivers/ide/pci/alim15x3.c | 24 +- drivers/ide/pci/amd74xx.c | 18 +- drivers/ide/pci/atiixp.c | 11 +- drivers/ide/pci/cmd640.c | 51 +- drivers/ide/pci/cmd64x.c | 13 +- drivers/ide/pci/cs5520.c | 9 +- drivers/ide/pci/cs5530.c | 27 +- drivers/ide/pci/cs5535.c | 24 +- drivers/ide/pci/cy82c693.c | 128 +----- drivers/ide/pci/delkin_cb.c | 7 +- drivers/ide/pci/generic.c | 11 +- drivers/ide/pci/hpt34x.c | 13 +- drivers/ide/pci/hpt366.c | 88 ++-- drivers/ide/pci/it8213.c | 11 +- drivers/ide/pci/it821x.c | 104 ++-- drivers/ide/pci/jmicron.c | 11 +- drivers/ide/pci/ns87415.c | 32 +- drivers/ide/pci/opti621.c | 17 +- drivers/ide/pci/pdc202xx_new.c | 23 +- drivers/ide/pci/pdc202xx_old.c | 23 +- drivers/ide/pci/piix.c | 52 ++- drivers/ide/pci/rz1000.c | 7 +- drivers/ide/pci/sc1200.c | 27 +- drivers/ide/pci/scc_pata.c | 20 +- drivers/ide/pci/serverworks.c | 19 +- drivers/ide/pci/sgiioc4.c | 1 - drivers/ide/pci/siimage.c | 34 +- drivers/ide/pci/sis5513.c | 13 +- drivers/ide/pci/sl82c105.c | 15 +- drivers/ide/pci/slc90e66.c | 11 +- drivers/ide/pci/tc86c001.c | 6 +- drivers/ide/pci/triflex.c | 20 +- drivers/ide/pci/trm290.c | 11 +- drivers/ide/pci/via82cxxx.c | 18 +- drivers/ide/ppc/pmac.c | 24 +- drivers/ide/setup-pci.c | 33 ++ drivers/scsi/ide-scsi.c | 218 +++----- include/asm-mips/mach-generic/ide.h | 29 - include/linux/ata.h | 112 ++++- include/linux/ide.h | 854 ++++++++++++++++++------------- 84 files changed, 3830 insertions(+), 4237 deletions(-) create mode 100644 drivers/ide/ide-disk.h create mode 100644 drivers/ide/ide-disk_ioctl.c create mode 100644 drivers/ide/ide-disk_proc.c create mode 100644 drivers/ide/ide-floppy.h create mode 100644 drivers/ide/ide-floppy_ioctl.c create mode 100644 drivers/ide/ide-floppy_proc.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_super.c | 11 ++++++++++- fs/xfs/xfs_mount.h | 1 + 2 files changed, 11 insertions(+), 1 deletions(-) Merging infiniband/for-next $ git merge infiniband/for-next Auto-merged drivers/infiniband/core/cm.c Merge made by recursive. drivers/infiniband/core/cm.c | 2 ++ drivers/infiniband/core/mad.c | 5 ++--- drivers/infiniband/core/ucma.c | 4 ++-- drivers/infiniband/hw/ipath/ipath_rc.c | 3 ++- drivers/infiniband/hw/ipath/ipath_ruc.c | 3 ++- drivers/net/mlx4/mr.c | 8 ++++++-- 6 files changed, 16 insertions(+), 9 deletions(-) Merging acpi/test $ git merge acpi/test Auto-merged Documentation/kernel-parameters.txt Auto-merged MAINTAINERS Auto-merged arch/x86/kernel/cpu/cpufreq/powernow-k8.c Auto-merged drivers/misc/acer-wmi.c CONFLICT (content): Merge conflict in drivers/misc/acer-wmi.c Auto-merged drivers/misc/eeepc-laptop.c Auto-merged include/linux/kernel.h Resolved 'drivers/misc/acer-wmi.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 5d820d9: Merge commit 'acpi/test' $ git diff -M --stat --summary HEAD^.. Documentation/kernel-parameters.txt | 122 ++++- Documentation/laptops/thinkpad-acpi.txt | 11 +- MAINTAINERS | 9 +- arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 42 +- drivers/acpi/Kconfig | 11 + drivers/acpi/Makefile | 6 + drivers/acpi/acpi_memhotplug.c | 4 +- drivers/acpi/bay.c | 3 +- drivers/acpi/bus.c | 53 ++- drivers/acpi/cm_sbs.c | 6 +- drivers/acpi/dispatcher/dsobject.c | 2 +- drivers/acpi/dock.c | 10 +- drivers/acpi/ec.c | 248 ++++----- drivers/acpi/events/evgpe.c | 2 - drivers/acpi/executer/exconfig.c | 116 +++-- drivers/acpi/fan.c | 4 +- drivers/acpi/glue.c | 40 ++ drivers/acpi/hardware/hwsleep.c | 7 + drivers/acpi/namespace/nsxfeval.c | 79 +++ drivers/acpi/namespace/nsxfname.c | 5 + drivers/acpi/osl.c | 3 +- drivers/acpi/pcc_acpi.c | 779 +++++++++++++++++++++++++++++ drivers/acpi/power.c | 68 ++- drivers/acpi/processor_perflib.c | 37 +- drivers/acpi/processor_throttling.c | 17 +- drivers/acpi/sbshc.c | 7 + drivers/acpi/scan.c | 105 ++--- drivers/acpi/sleep/main.c | 49 ++- drivers/acpi/system.c | 4 +- drivers/acpi/tables.c | 2 + drivers/acpi/tables/tbinstal.c | 61 ++- drivers/acpi/thermal.c | 4 +- drivers/acpi/utilities/utglobal.c | 44 ++- drivers/acpi/utilities/utobject.c | 8 +- drivers/acpi/utilities/utxface.c | 7 +- drivers/acpi/video.c | 46 +- drivers/acpi/video_detect.c | 268 ++++++++++ drivers/acpi/wmi.c | 10 +- drivers/misc/acer-wmi.c | 25 +- drivers/misc/asus-laptop.c | 10 +- drivers/misc/compal-laptop.c | 12 +- drivers/misc/eeepc-laptop.c | 12 +- drivers/misc/fujitsu-laptop.c | 33 +- drivers/misc/msi-laptop.c | 16 +- drivers/misc/sony-laptop.c | 6 +- drivers/misc/thinkpad_acpi.c | 30 +- drivers/pnp/Kconfig | 20 +- drivers/pnp/Makefile | 4 - drivers/pnp/base.h | 10 + drivers/pnp/core.c | 29 +- drivers/pnp/driver.c | 4 - drivers/pnp/isapnp/Makefile | 4 - drivers/pnp/isapnp/core.c | 12 +- drivers/pnp/manager.c | 34 +- drivers/pnp/pnpacpi/Makefile | 4 - drivers/pnp/pnpacpi/core.c | 16 +- drivers/pnp/pnpacpi/rsparser.c | 45 +- drivers/pnp/pnpbios/Makefile | 4 - drivers/pnp/pnpbios/core.c | 4 +- drivers/pnp/pnpbios/rsparser.c | 18 +- drivers/pnp/quirks.c | 6 +- drivers/pnp/resource.c | 12 +- drivers/pnp/support.c | 14 +- include/acpi/acconfig.h | 2 +- include/acpi/acdisasm.h | 4 + include/acpi/acmacros.h | 248 +++++----- 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 ++- include/linux/kernel.h | 24 + include/linux/pnp.h | 10 - 74 files changed, 2351 insertions(+), 733 deletions(-) create mode 100644 drivers/acpi/pcc_acpi.c create mode 100644 drivers/acpi/video_detect.c Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Auto-merged fs/proc/proc_misc.c Auto-merged kernel/sysctl.c Merge made by recursive. fs/Kconfig | 30 ++++++++ fs/Makefile | 3 +- fs/lockd/host.c | 123 +++++++++++++++++++++++-------- fs/lockd/svc.c | 33 ++++----- fs/nfs/callback.c | 3 +- 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 | 63 +++++++++------- fs/proc/proc_misc.c | 4 + include/linux/fs.h | 57 ++++++++++++-- include/linux/lockd/lockd.h | 4 + include/linux/nfsd/nfsd.h | 3 +- include/linux/sunrpc/clnt.h | 4 +- include/linux/sunrpc/svc.h | 19 +++-- kernel/sys_ni.c | 1 + kernel/sysctl.c | 6 +- net/sunrpc/rpcb_clnt.c | 65 +++++++--------- net/sunrpc/svc.c | 174 +++++++++++++++++++++++++++++++++++------- net/sunrpc/svc_xprt.c | 39 ++++++++-- net/sunrpc/svcsock.c | 13 +++ 24 files changed, 596 insertions(+), 267 deletions(-) Merging ieee1394/for-next $ git merge ieee1394/for-next Merge made by recursive. drivers/firewire/fw-card.c | 56 +++------- drivers/firewire/fw-device.c | 37 +----- drivers/firewire/fw-sbp2.c | 116 ++++++++------------ drivers/firewire/fw-transaction.c | 48 ++++++++- drivers/firewire/fw-transaction.h | 9 +- drivers/ieee1394/csr1212.c | 2 +- drivers/ieee1394/eth1394.c | 2 +- drivers/ieee1394/sbp2.c | 218 +++++++++++++++--------------------- drivers/ieee1394/sbp2.h | 33 ++---- 9 files changed, 218 insertions(+), 303 deletions(-) Merging ubi/linux-next $ git merge ubi/linux-next Merge made by recursive. drivers/mtd/ubi/cdev.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) Merging kvm/master $ git merge kvm/master Auto-merged arch/s390/Kconfig Auto-merged arch/x86/xen/time.c Auto-merged include/asm-x86/kvm.h CONFLICT (content): Merge conflict in include/asm-x86/kvm.h Auto-merged include/asm-x86/kvm_host.h Auto-merged include/asm-x86/pvclock.h Resolved 'include/asm-x86/kvm.h' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 66b0abe: Merge commit 'kvm/master' $ git diff -M --stat --summary HEAD^.. arch/ia64/kvm/Kconfig | 2 + arch/ia64/kvm/irq.h | 32 ++ arch/ia64/kvm/kvm-ia64.c | 37 ++- 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/s390/Kconfig | 7 +- arch/s390/kvm/priv.c | 4 +- arch/x86/kernel/kvmclock.c | 30 ++ arch/x86/kernel/pvclock.c | 12 + arch/x86/kvm/i8254.c | 76 ++-- arch/x86/kvm/i8254.h | 7 +- arch/x86/kvm/i8259.c | 36 ++- 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 | 189 ++++++---- arch/x86/kvm/paging_tmpl.h | 161 +++++---- arch/x86/kvm/svm.c | 151 +++----- arch/x86/kvm/vmx.c | 689 ++++++++++++++++++++++++----------- arch/x86/kvm/vmx.h | 4 +- arch/x86/kvm/x86.c | 671 +++++++++++++++++++++++++--------- arch/x86/kvm/x86.h | 22 ++ arch/x86/kvm/x86_emulate.c | 48 ++- arch/x86/xen/time.c | 11 +- include/asm-x86/kvm.h | 22 -- include/asm-x86/kvm_host.h | 90 +++-- include/asm-x86/pvclock.h | 1 + include/linux/kvm.h | 67 +++- include/linux/kvm_host.h | 19 + virt/kvm/ioapic.c | 22 +- virt/kvm/ioapic.h | 3 +- virt/kvm/kvm_main.c | 70 +++-- virt/kvm/kvm_trace.c | 30 +- 42 files changed, 2018 insertions(+), 883 deletions(-) create mode 100644 arch/ia64/kvm/irq.h 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 | 33 +++++++++- fs/dlm/dlm_internal.h | 7 ++- fs/dlm/lockspace.c | 158 ++++++++++++++++++++++++++++++++----------- fs/dlm/lockspace.h | 1 + fs/dlm/user.c | 124 +++++++++++++++++++++++++-------- fs/dlm/user.h | 4 +- fs/gfs2/locking/dlm/mount.c | 3 +- include/linux/dlm.h | 5 +- include/linux/dlm_device.h | 2 +- 9 files changed, 259 insertions(+), 78 deletions(-) Merging scsi/master $ git merge scsi/master Auto-merged block/blk-core.c Auto-merged drivers/md/dm-mpath.c Auto-merged drivers/scsi/device_handler/scsi_dh_alua.c Auto-merged drivers/scsi/device_handler/scsi_dh_emc.c Auto-merged drivers/scsi/device_handler/scsi_dh_rdac.c Auto-merged drivers/scsi/lpfc/lpfc_debugfs.c Auto-merged drivers/scsi/qla2xxx/qla_def.h Auto-merged drivers/scsi/scsi_error.c Auto-merged drivers/scsi/scsi_scan.c Auto-merged drivers/scsi/sd.c Auto-merged include/linux/blkdev.h Auto-merged include/scsi/scsi.h Auto-merged lib/Makefile Merge made by recursive. Documentation/scsi/scsi_fc_transport.txt | 36 + block/blk-core.c | 11 +- drivers/md/dm-mpath.c | 2 +- drivers/md/multipath.c | 4 +- drivers/message/fusion/mptfc.c | 7 +- drivers/s390/block/dasd_diag.c | 2 +- drivers/s390/block/dasd_eckd.c | 2 +- drivers/s390/block/dasd_fba.c | 2 +- drivers/scsi/constants.c | 3 +- drivers/scsi/device_handler/scsi_dh_alua.c | 3 +- drivers/scsi/device_handler/scsi_dh_emc.c | 4 +- drivers/scsi/device_handler/scsi_dh_hp_sw.c | 8 +- drivers/scsi/device_handler/scsi_dh_rdac.c | 5 +- drivers/scsi/hosts.c | 2 +- drivers/scsi/ibmvscsi/ibmvfc.c | 2 - drivers/scsi/libiscsi.c | 16 +- drivers/scsi/lpfc/lpfc.h | 63 +- drivers/scsi/lpfc/lpfc_attr.c | 988 +++++++++++++++- drivers/scsi/lpfc/lpfc_crtn.h | 45 +- drivers/scsi/lpfc/lpfc_ct.c | 19 +- drivers/scsi/lpfc/lpfc_debugfs.c | 399 ++++++-- drivers/scsi/lpfc/lpfc_els.c | 1598 +++++++++++++++++++++++-- drivers/scsi/lpfc/lpfc_hbadisc.c | 96 ++- drivers/scsi/lpfc/lpfc_hw.h | 183 +++- drivers/scsi/lpfc/lpfc_init.c | 902 +++++++++++---- drivers/scsi/lpfc/lpfc_mbox.c | 623 ++++++++-- drivers/scsi/lpfc/lpfc_mem.c | 115 ++- drivers/scsi/lpfc/lpfc_nportdisc.c | 23 +- drivers/scsi/lpfc/lpfc_scsi.c | 212 +++- drivers/scsi/lpfc/lpfc_sli.c | 1703 ++++++++++++++++++++++++--- drivers/scsi/lpfc/lpfc_sli.h | 1 + drivers/scsi/lpfc/lpfc_version.h | 6 +- drivers/scsi/lpfc/lpfc_vport.c | 88 ++- drivers/scsi/qla2xxx/qla_attr.c | 1 - drivers/scsi/qla2xxx/qla_def.h | 1 - drivers/scsi/qla2xxx/qla_isr.c | 14 +- drivers/scsi/qla2xxx/qla_os.c | 26 +- drivers/scsi/qla4xxx/ql4_isr.c | 4 +- drivers/scsi/qla4xxx/ql4_os.c | 2 +- drivers/scsi/scsi.c | 24 +- drivers/scsi/scsi_error.c | 53 +- drivers/scsi/scsi_lib.c | 145 ++- drivers/scsi/scsi_netlink.c | 523 ++++++++- drivers/scsi/scsi_priv.h | 1 + drivers/scsi/scsi_proc.c | 8 +- drivers/scsi/scsi_scan.c | 21 +- drivers/scsi/scsi_sysfs.c | 1 + drivers/scsi/scsi_tgt_lib.c | 6 +- drivers/scsi/scsi_transport_fc.c | 101 +- drivers/scsi/scsi_transport_iscsi.c | 8 +- drivers/scsi/scsi_transport_spi.c | 4 +- drivers/scsi/sd.c | 27 +- drivers/scsi/tmscsim.c | 4 +- include/linux/bio.h | 26 +- include/linux/blkdev.h | 15 +- include/linux/string_helpers.h | 16 + include/scsi/scsi.h | 6 + include/scsi/scsi_device.h | 31 +- include/scsi/scsi_netlink.h | 62 +- include/scsi/scsi_transport_fc.h | 31 +- lib/Makefile | 3 +- lib/string_helpers.c | 63 + 62 files changed, 7307 insertions(+), 1093 deletions(-) create mode 100644 include/linux/string_helpers.h create mode 100644 lib/string_helpers.c Merging tests/master $ git merge tests/master Auto-merged Makefile Auto-merged drivers/misc/Makefile Auto-merged kernel/Makefile Auto-merged lib/Kconfig.debug CONFLICT (content): Merge conflict in lib/Kconfig.debug Auto-merged lib/Makefile Resolved 'lib/Kconfig.debug' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit e1324f3: Merge commit 'tests/master' $ git diff -M --stat --summary HEAD^.. 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/Makefile | 5 +- fs/ocfs2/alloc.c | 829 ++++++-- fs/ocfs2/alloc.h | 86 +- fs/ocfs2/aops.c | 30 +- fs/ocfs2/cluster/masklog.c | 1 + fs/ocfs2/cluster/masklog.h | 1 + fs/ocfs2/dir.c | 26 +- fs/ocfs2/extent_map.c | 60 + fs/ocfs2/extent_map.h | 3 + fs/ocfs2/file.c | 299 +-- fs/ocfs2/file.h | 32 +- fs/ocfs2/inode.c | 23 +- fs/ocfs2/inode.h | 3 + fs/ocfs2/journal.h | 27 +- fs/ocfs2/localalloc.c | 307 +++- fs/ocfs2/localalloc.h | 4 + fs/ocfs2/locks.c | 15 + fs/ocfs2/locks.h | 1 + fs/ocfs2/namei.c | 13 +- fs/ocfs2/ocfs2.h | 48 +- fs/ocfs2/ocfs2_fs.h | 220 ++- fs/ocfs2/stack_user.c | 33 + fs/ocfs2/stackglue.c | 20 + fs/ocfs2/stackglue.h | 19 + fs/ocfs2/suballoc.c | 129 +- fs/ocfs2/suballoc.h | 15 +- fs/ocfs2/super.c | 27 +- fs/ocfs2/symlink.c | 9 + fs/ocfs2/uptodate.c | 32 +- fs/ocfs2/uptodate.h | 3 + fs/ocfs2/xattr.c | 4867 ++++++++++++++++++++++++++++++++++++++++++++ fs/ocfs2/xattr.h | 75 + fs/ocfs2/xattr_trusted.c | 82 + fs/ocfs2/xattr_user.c | 94 + 34 files changed, 6914 insertions(+), 524 deletions(-) create mode 100644 fs/ocfs2/xattr.c create mode 100644 fs/ocfs2/xattr.h create mode 100644 fs/ocfs2/xattr_trusted.c create mode 100644 fs/ocfs2/xattr_user.c Merging ext4/next $ git merge ext4/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 Merge made by recursive. fs/udf/ialloc.c | 44 +++++++++++++++++++------------------------- 1 files changed, 19 insertions(+), 25 deletions(-) Merging net/master $ git merge net/master Auto-merged drivers/net/ixgbe/ixgbe_main.c Auto-merged drivers/net/wireless/ath9k/hw.c Auto-merged drivers/net/wireless/ath9k/main.c Auto-merged drivers/net/wireless/ath9k/recv.c Auto-merged drivers/net/wireless/ath9k/xmit.c Removed drivers/net/wireless/b43/phy.h Auto-merged drivers/net/wireless/iwlwifi/iwl-agn.c Auto-merged drivers/net/wireless/iwlwifi/iwl-core.c Auto-merged drivers/net/wireless/iwlwifi/iwl-dev.h Auto-merged drivers/net/wireless/iwlwifi/iwl-rx.c Auto-merged drivers/net/wireless/iwlwifi/iwl-tx.c Auto-merged drivers/net/wireless/libertas/if_cs.c Auto-merged drivers/net/wireless/mac80211_hwsim.c Auto-merged drivers/net/wireless/orinoco.c Auto-merged drivers/net/wireless/rt2x00/rt2x00reg.h Removed net/ipv4/ipvs/ip_vs_proto_esp.c Auto-merged net/mac80211/ieee80211_i.h Merge made by recursive. drivers/net/8139cp.c | 14 +- drivers/net/8139too.c | 4 +- drivers/net/Makefile | 2 +- drivers/net/bonding/bond_alb.c | 4 +- drivers/net/bonding/bond_main.c | 6 +- drivers/net/e1000e/82571.c | 153 +- drivers/net/e1000e/defines.h | 15 + drivers/net/e1000e/e1000.h | 31 +- drivers/net/e1000e/es2lan.c | 2 +- drivers/net/e1000e/ethtool.c | 60 +- drivers/net/e1000e/hw.h | 15 +- drivers/net/e1000e/ich8lan.c | 173 +- drivers/net/e1000e/lib.c | 7 +- drivers/net/e1000e/netdev.c | 435 +++- drivers/net/e1000e/param.c | 27 + drivers/net/e1000e/phy.c | 194 ++- drivers/net/ibm_newemac/mal.h | 4 +- drivers/net/igb/igb_main.c | 12 +- drivers/net/ixgbe/ixgbe.h | 43 +- drivers/net/ixgbe/ixgbe_82598.c | 6 +- drivers/net/ixgbe/ixgbe_common.c | 140 +- drivers/net/ixgbe/ixgbe_common.h | 4 +- drivers/net/ixgbe/ixgbe_ethtool.c | 6 +- drivers/net/ixgbe/ixgbe_main.c | 721 +++-- drivers/net/ixgbe/ixgbe_type.h | 47 +- drivers/net/r8169.c | 401 ++- drivers/net/s2io.c | 4 +- drivers/net/sfc/bitfield.h | 178 +- drivers/net/sfc/boards.c | 12 +- drivers/net/sfc/boards.h | 2 - drivers/net/sfc/efx.c | 471 ++-- drivers/net/sfc/efx.h | 14 +- drivers/net/sfc/enum.h | 9 +- drivers/net/sfc/ethtool.c | 184 +- drivers/net/sfc/falcon.c | 767 ++++-- drivers/net/sfc/falcon.h | 16 +- drivers/net/sfc/falcon_hwdefs.h | 79 +- drivers/net/sfc/falcon_xmac.c | 330 +-- drivers/net/sfc/mac.h | 4 - drivers/net/sfc/mdio_10g.c | 16 +- drivers/net/sfc/mdio_10g.h | 13 +- drivers/net/sfc/net_driver.h | 136 +- drivers/net/sfc/phy.h | 10 +- drivers/net/sfc/rx.c | 78 +- drivers/net/sfc/rx.h | 4 +- drivers/net/sfc/selftest.c | 391 ++- drivers/net/sfc/selftest.h | 13 +- drivers/net/sfc/sfe4001.c | 244 +- drivers/net/sfc/spi.h | 89 +- drivers/net/sfc/tenxpress.c | 90 +- drivers/net/sfc/tx.c | 383 ++- drivers/net/sfc/tx.h | 2 +- drivers/net/sfc/workarounds.h | 2 - drivers/net/sfc/xfp_phy.c | 11 +- drivers/net/sky2.c | 170 +- drivers/net/via-rhine.c | 8 +- drivers/net/wireless/Kconfig | 17 +- drivers/net/wireless/Makefile | 4 +- drivers/net/wireless/airo.c | 16 +- drivers/net/wireless/airport.c | 3 +- drivers/net/wireless/ath5k/ath5k.h | 162 +- drivers/net/wireless/ath5k/base.c | 383 +-- drivers/net/wireless/ath5k/base.h | 8 +- drivers/net/wireless/ath5k/hw.c | 77 +- drivers/net/wireless/ath9k/ath9k.h | 55 +- drivers/net/wireless/ath9k/beacon.c | 259 +- drivers/net/wireless/ath9k/core.c | 306 +-- drivers/net/wireless/ath9k/core.h | 248 +- drivers/net/wireless/ath9k/hw.c | 150 +- drivers/net/wireless/ath9k/hw.h | 120 +- drivers/net/wireless/ath9k/main.c | 244 ++- drivers/net/wireless/ath9k/phy.h | 12 +- drivers/net/wireless/ath9k/rc.c | 183 +- drivers/net/wireless/ath9k/rc.h | 222 +- drivers/net/wireless/ath9k/recv.c | 81 +- drivers/net/wireless/ath9k/reg.h | 6 - drivers/net/wireless/ath9k/xmit.c | 400 +-- drivers/net/wireless/b43/Makefile | 4 +- drivers/net/wireless/b43/b43.h | 137 +- drivers/net/wireless/b43/debugfs.c | 79 +- drivers/net/wireless/b43/lo.c | 120 +- drivers/net/wireless/b43/lo.h | 4 +- drivers/net/wireless/b43/main.c | 184 +- drivers/net/wireless/b43/nphy.c | 148 +- drivers/net/wireless/b43/nphy.h | 54 +- drivers/net/wireless/b43/phy.c | 3421 +------------------- drivers/net/wireless/b43/phy.h | 340 -- drivers/net/wireless/b43/phy_a.c | 543 ++++ drivers/net/wireless/b43/phy_a.h | 124 + drivers/net/wireless/b43/phy_common.c | 367 +++ drivers/net/wireless/b43/phy_common.h | 381 +++ drivers/net/wireless/b43/phy_g.c | 3251 +++++++++++++++++++ drivers/net/wireless/b43/phy_g.h | 209 ++ drivers/net/wireless/b43/rfkill.c | 5 +- drivers/net/wireless/b43/sysfs.c | 23 +- drivers/net/wireless/b43/tables.c | 43 +- drivers/net/wireless/b43/tables_nphy.c | 2 +- drivers/net/wireless/b43/wa.c | 2 +- drivers/net/wireless/b43/xmit.c | 8 +- drivers/net/wireless/b43legacy/xmit.c | 4 +- drivers/net/wireless/hermes.c | 124 +- drivers/net/wireless/hermes.h | 45 + drivers/net/wireless/hermes_dld.c | 730 +++++ drivers/net/wireless/hermes_dld.h | 48 + drivers/net/wireless/hermes_rid.h | 17 + drivers/net/wireless/ipw2100.c | 2 +- drivers/net/wireless/ipw2200.h | 4 +- drivers/net/wireless/iwlwifi/iwl-3945-debug.h | 4 +- drivers/net/wireless/iwlwifi/iwl-3945.c | 104 +- drivers/net/wireless/iwlwifi/iwl-3945.h | 1 - drivers/net/wireless/iwlwifi/iwl-agn.c | 2 - drivers/net/wireless/iwlwifi/iwl-core.c | 1 - drivers/net/wireless/iwlwifi/iwl-debug.h | 12 +- drivers/net/wireless/iwlwifi/iwl-dev.h | 16 - drivers/net/wireless/iwlwifi/iwl-hcmd.c | 14 +- drivers/net/wireless/iwlwifi/iwl-rx.c | 125 +- drivers/net/wireless/iwlwifi/iwl-tx.c | 32 +- drivers/net/wireless/iwlwifi/iwl3945-base.c | 8 +- drivers/net/wireless/libertas/assoc.c | 744 ++--- drivers/net/wireless/libertas/assoc.h | 18 +- drivers/net/wireless/libertas/cmd.c | 168 +- drivers/net/wireless/libertas/cmd.h | 6 + drivers/net/wireless/libertas/cmdresp.c | 33 - drivers/net/wireless/libertas/decl.h | 1 - drivers/net/wireless/libertas/defs.h | 6 +- drivers/net/wireless/libertas/dev.h | 7 +- drivers/net/wireless/libertas/host.h | 26 +- drivers/net/wireless/libertas/hostcmd.h | 50 +- drivers/net/wireless/libertas/if_cs.c | 2 +- drivers/net/wireless/libertas/if_usb.c | 177 +- drivers/net/wireless/libertas/if_usb.h | 5 + drivers/net/wireless/libertas/main.c | 21 +- drivers/net/wireless/libertas/scan.c | 5 + drivers/net/wireless/libertas/wext.c | 148 +- drivers/net/wireless/libertas_tf/Makefile | 6 + drivers/net/wireless/libertas_tf/cmd.c | 669 ++++ drivers/net/wireless/libertas_tf/if_usb.c | 766 +++++ drivers/net/wireless/libertas_tf/if_usb.h | 98 + drivers/net/wireless/libertas_tf/libertas_tf.h | 514 +++ drivers/net/wireless/libertas_tf/main.c | 662 ++++ drivers/net/wireless/mac80211_hwsim.c | 16 +- drivers/net/wireless/orinoco.c | 1949 ++++++++++- drivers/net/wireless/orinoco.h | 61 +- drivers/net/wireless/orinoco_cs.c | 3 +- drivers/net/wireless/orinoco_nortel.c | 3 +- drivers/net/wireless/orinoco_pci.c | 3 +- drivers/net/wireless/orinoco_plx.c | 3 +- drivers/net/wireless/orinoco_tmd.c | 3 +- drivers/net/wireless/p54/p54.h | 8 +- drivers/net/wireless/p54/p54common.c | 170 +- drivers/net/wireless/p54/p54common.h | 29 +- drivers/net/wireless/p54/p54pci.c | 276 +- drivers/net/wireless/p54/p54pci.h | 20 +- drivers/net/wireless/p54/p54usb.c | 32 +- drivers/net/wireless/p54/p54usb.h | 6 +- drivers/net/wireless/prism54/isl_ioctl.c | 8 +- drivers/net/wireless/rt2x00/Kconfig | 6 + drivers/net/wireless/rt2x00/Makefile | 1 + drivers/net/wireless/rt2x00/rt2400pci.c | 42 +- drivers/net/wireless/rt2x00/rt2400pci.h | 22 +- drivers/net/wireless/rt2x00/rt2500pci.c | 43 +- drivers/net/wireless/rt2x00/rt2500pci.h | 17 +- drivers/net/wireless/rt2x00/rt2500usb.c | 46 +- drivers/net/wireless/rt2x00/rt2500usb.h | 17 +- drivers/net/wireless/rt2x00/rt2x00.h | 88 +- drivers/net/wireless/rt2x00/rt2x00config.c | 8 +- drivers/net/wireless/rt2x00/rt2x00crypto.c | 215 ++ drivers/net/wireless/rt2x00/rt2x00debug.c | 97 + drivers/net/wireless/rt2x00/rt2x00dev.c | 116 +- drivers/net/wireless/rt2x00/rt2x00lib.h | 47 + drivers/net/wireless/rt2x00/rt2x00mac.c | 226 +- drivers/net/wireless/rt2x00/rt2x00queue.c | 112 +- drivers/net/wireless/rt2x00/rt2x00queue.h | 82 +- drivers/net/wireless/rt2x00/rt2x00reg.h | 19 +- drivers/net/wireless/rt2x00/rt2x00rfkill.c | 6 +- drivers/net/wireless/rt2x00/rt2x00usb.c | 21 +- drivers/net/wireless/rt2x00/rt61pci.c | 427 +++- drivers/net/wireless/rt2x00/rt61pci.h | 38 +- drivers/net/wireless/rt2x00/rt73usb.c | 437 +++- drivers/net/wireless/rt2x00/rt73usb.h | 38 +- drivers/net/wireless/rtl8180.h | 31 - drivers/net/wireless/rtl8180_dev.c | 34 +- drivers/net/wireless/rtl8187.h | 6 - drivers/net/wireless/rtl8187_dev.c | 10 +- drivers/net/wireless/rtl818x.h | 35 + drivers/net/wireless/spectrum_cs.c | 426 +--- drivers/net/wireless/wl3501_cs.c | 8 +- drivers/ssb/pci.c | 84 +- include/linux/ieee80211.h | 1 + include/linux/if_ether.h | 1 + include/linux/ip_vs.h | 160 + include/linux/nl80211.h | 31 + include/linux/rfkill.h | 7 +- include/linux/ssb/ssb_regs.h | 19 +- include/net/cfg80211.h | 23 + include/net/inet_connection_sock.h | 2 + include/net/ip_vs.h | 2 + include/net/mac80211.h | 31 +- include/net/netlink.h | 82 - include/net/sock.h | 2 + net/Kconfig | 8 +- net/dccp/ccids/ccid2.c | 2 +- net/dccp/ccids/ccid3.c | 2 +- net/dccp/ccids/lib/loss_interval.c | 6 +- net/dccp/ccids/lib/tfrc.c | 2 +- net/dccp/input.c | 4 +- net/dccp/options.c | 13 +- net/dccp/proto.c | 4 +- net/ieee80211/ieee80211_module.c | 8 +- net/ipv4/inet_diag.c | 6 +- net/ipv4/ipvs/Kconfig | 6 + net/ipv4/ipvs/Makefile | 3 +- net/ipv4/ipvs/ip_vs_core.c | 8 +- net/ipv4/ipvs/ip_vs_ctl.c | 896 +++++- net/ipv4/ipvs/ip_vs_est.c | 18 +- net/ipv4/ipvs/ip_vs_lblc.c | 213 +- net/ipv4/ipvs/ip_vs_lblcr.c | 238 +- net/ipv4/ipvs/ip_vs_lc.c | 21 - net/ipv4/ipvs/ip_vs_nq.c | 24 - .../{ip_vs_proto_ah.c => ip_vs_proto_ah_esp.c} | 69 +- net/ipv4/ipvs/ip_vs_proto_esp.c | 176 - net/ipv4/ipvs/ip_vs_rr.c | 7 - net/ipv4/ipvs/ip_vs_sed.c | 24 - net/ipv4/ipvs/ip_vs_wlc.c | 24 - net/ipv4/route.c | 14 +- net/ipv4/tcp_input.c | 208 +- net/ipv4/tcp_ipv4.c | 26 +- net/mac80211/cfg.c | 63 +- net/mac80211/debugfs_sta.c | 2 +- net/mac80211/event.c | 5 +- net/mac80211/ieee80211_i.h | 121 +- net/mac80211/iface.c | 8 +- net/mac80211/main.c | 86 +- net/mac80211/mesh.c | 29 +- net/mac80211/mesh.h | 61 +- net/mac80211/mesh_hwmp.c | 120 +- net/mac80211/mesh_pathtbl.c | 76 +- net/mac80211/mesh_plink.c | 56 +- net/mac80211/mlme.c | 1082 +++---- net/mac80211/rx.c | 140 +- net/mac80211/tx.c | 46 +- net/mac80211/util.c | 46 +- net/mac80211/wep.c | 14 +- net/mac80211/wext.c | 53 +- net/mac80211/wme.c | 2 - net/mac80211/wme.h | 2 - net/mac80211/wpa.c | 2 +- net/rfkill/rfkill-input.h | 1 + net/rfkill/rfkill.c | 238 ++- net/sched/sch_netem.c | 18 +- net/sched/sch_prio.c | 6 +- net/wireless/nl80211.c | 62 + 252 files changed, 21932 insertions(+), 12279 deletions(-) delete mode 100644 drivers/net/wireless/b43/phy.h create mode 100644 drivers/net/wireless/b43/phy_a.c create mode 100644 drivers/net/wireless/b43/phy_a.h create mode 100644 drivers/net/wireless/b43/phy_common.c create mode 100644 drivers/net/wireless/b43/phy_common.h create mode 100644 drivers/net/wireless/b43/phy_g.c create mode 100644 drivers/net/wireless/b43/phy_g.h create mode 100644 drivers/net/wireless/hermes_dld.c create mode 100644 drivers/net/wireless/hermes_dld.h create mode 100644 drivers/net/wireless/libertas_tf/Makefile create mode 100644 drivers/net/wireless/libertas_tf/cmd.c create mode 100644 drivers/net/wireless/libertas_tf/if_usb.c create mode 100644 drivers/net/wireless/libertas_tf/if_usb.h create mode 100644 drivers/net/wireless/libertas_tf/libertas_tf.h create mode 100644 drivers/net/wireless/libertas_tf/main.c create mode 100644 drivers/net/wireless/rt2x00/rt2x00crypto.c rename net/ipv4/ipvs/{ip_vs_proto_ah.c => ip_vs_proto_ah_esp.c} (63%) delete mode 100644 net/ipv4/ipvs/ip_vs_proto_esp.c 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 Auto-merged fs/Kconfig Merge made by recursive. Documentation/mtd/nand_ecc.txt | 714 +++++++++++++++++ arch/arm/mach-pxa/include/mach/pxa3xx_nand.h | 44 +- arch/arm/plat-mxc/include/mach/mxc_nand.h | 27 + arch/arm/plat-omap/include/mach/onenand.h | 6 +- drivers/mtd/Kconfig | 5 + drivers/mtd/chips/Kconfig | 4 +- 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 | 20 +- drivers/mtd/nand/Makefile | 2 +- drivers/mtd/nand/mxc_nand.c | 1077 ++++++++++++++++++++++++++ drivers/mtd/nand/nand_base.c | 8 +- drivers/mtd/nand/nand_ecc.c | 554 ++++++++++--- drivers/mtd/nand/nandsim.c | 1 - drivers/mtd/nand/pxa3xx_nand.c | 147 ++-- drivers/mtd/nand/toto.c | 206 ----- drivers/mtd/onenand/Kconfig | 8 + drivers/mtd/onenand/Makefile | 1 + drivers/mtd/onenand/omap2.c | 782 +++++++++++++++++++ drivers/mtd/onenand/onenand_base.c | 2 +- drivers/mtd/ssfdc.c | 3 +- fs/Kconfig | 190 +----- fs/jffs2/Kconfig | 188 +++++ fs/jffs2/dir.c | 2 +- fs/jffs2/erase.c | 4 +- fs/jffs2/fs.c | 6 +- include/linux/mtd/cfi.h | 9 +- include/linux/mtd/flashchip.h | 4 + include/linux/mtd/mtd.h | 4 +- include/linux/mtd/nand.h | 1 + include/linux/mtd/onenand_regs.h | 2 + 45 files changed, 3835 insertions(+), 1356 deletions(-) create mode 100644 Documentation/mtd/nand_ecc.txt create mode 100644 arch/arm/plat-mxc/include/mach/mxc_nand.h 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 create mode 100644 drivers/mtd/nand/mxc_nand.c delete mode 100644 drivers/mtd/nand/toto.c create mode 100644 drivers/mtd/onenand/omap2.c create mode 100644 fs/jffs2/Kconfig Merging wireless/master $ git merge wireless/master Already up-to-date. Merging crypto/master $ git merge crypto/master Merge made by recursive. arch/x86/crypto/Makefile | 2 + arch/x86/crypto/crc32c-intel.c | 197 + crypto/Kconfig | 127 +- crypto/Makefile | 12 +- crypto/algapi.c | 147 +- crypto/{cryptomgr.c => algboss.c} | 92 +- crypto/ansi_cprng.c | 417 ++ crypto/api.c | 81 +- crypto/blkcipher.c | 29 - crypto/chainiv.c | 44 +- crypto/eseqiv.c | 35 +- crypto/fips.c | 27 + crypto/internal.h | 18 +- crypto/krng.c | 66 + crypto/proc.c | 57 +- crypto/rng.c | 126 + crypto/seqiv.c | 27 +- crypto/tcrypt.c | 1347 +----- crypto/tcrypt.h | 8709 +----------------------------------- crypto/testmgr.c | 1868 ++++++++ crypto/testmgr.h | 8738 ++++++++++++++++++++++++++++++++++++ include/crypto/internal/rng.h | 26 + include/crypto/internal/skcipher.h | 6 - include/crypto/rng.h | 75 + include/linux/crypto.h | 35 + 25 files changed, 12249 insertions(+), 10059 deletions(-) create mode 100644 arch/x86/crypto/crc32c-intel.c rename crypto/{cryptomgr.c => algboss.c} (69%) create mode 100644 crypto/ansi_cprng.c create mode 100644 crypto/fips.c create mode 100644 crypto/krng.c create mode 100644 crypto/rng.c create mode 100644 crypto/testmgr.c create mode 100644 crypto/testmgr.h create mode 100644 include/crypto/internal/rng.h create mode 100644 include/crypto/rng.h Merging vfs/for-next $ git merge vfs/for-next Auto-merged arch/parisc/hpux/fs.c Auto-merged fs/jffs2/dir.c Auto-merged fs/nfsd/vfs.c Auto-merged include/linux/fs.h Auto-merged init/main.c Merge made by recursive. arch/alpha/kernel/osf_sys.c | 7 +- arch/parisc/hpux/fs.c | 5 +- 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 | 22 ++--- fs/configfs/symlink.c | 16 ++-- fs/dcache.c | 85 +++++++++--------- fs/dquot.c | 10 +- fs/ecryptfs/main.c | 23 ++--- fs/efs/namei.c | 29 +----- fs/exportfs/expfs.c | 16 ++-- fs/ext2/dir.c | 14 ++-- fs/ext2/ext2.h | 4 +- fs/ext2/namei.c | 30 ++----- fs/ext3/namei.c | 84 +++++++---------- 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/dir.c | 4 +- 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 | 126 ++++++++++++++++++++++--- fs/ntfs/namei.c | 22 +---- fs/ocfs2/export.c | 30 +----- fs/read_write.c | 58 ++++++++---- fs/readdir.c | 22 ++--- fs/reiserfs/inode.c | 13 +-- fs/reiserfs/namei.c | 11 +-- fs/reiserfs/super.c | 18 ++-- fs/super.c | 15 +-- 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 +- include/linux/dcache.h | 2 +- include/linux/fs.h | 1 - include/linux/namei.h | 7 +- init/main.c | 1 - kernel/audit_tree.c | 48 +++++----- net/unix/af_unix.c | 18 ++-- 60 files changed, 724 insertions(+), 986 deletions(-) Merging sound/for-next $ git merge sound/for-next Auto-merged Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl Auto-merged MAINTAINERS Removed include/sound/ad1848.h Auto-merged include/sound/core.h Removed include/sound/cs4231.h Auto-merged include/sound/memalloc.h Auto-merged sound/core/init.c Auto-merged sound/core/memalloc.c Auto-merged sound/core/sound.c Removed sound/isa/ad1848/ad1848_lib.c Removed sound/isa/cs423x/cs4231_lib.c Removed sound/oss/hal2.c Removed sound/oss/hal2.h Auto-merged sound/sound_core.c Auto-merged sound/sparc/amd7930.c Auto-merged sound/sparc/cs4231.c Auto-merged sound/sparc/dbri.c Merge made by recursive. Documentation/sound/alsa/ALSA-Configuration.txt | 60 +- .../sound/alsa/DocBook/writing-an-alsa-driver.tmpl | 62 +- MAINTAINERS | 2 + arch/um/Kconfig.char | 4 + 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/memalloc.h | 16 +- include/sound/minors.h | 2 + include/sound/pcm.h | 39 +- include/sound/sb.h | 5 + include/sound/snd_wavefront.h | 1 - include/sound/soc-of-simple.h | 25 + include/sound/soc.h | 74 +- include/sound/version.h | 2 +- include/sound/vx_core.h | 9 - include/sound/wss.h | 235 ++ sound/Kconfig | 5 + sound/aoa/codecs/snd-aoa-codec-tas.c | 6 +- sound/arm/aaci.c | 6 +- sound/arm/sa11xx-uda1341.c | 5 +- sound/core/Kconfig | 7 + 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 | 52 +- 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 | 40 +- sound/core/pcm_native.c | 140 +- 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/sgbuf.c | 62 +- 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 | 41 +- 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/i2c/other/ak4xxx-adda.c | 4 +- sound/isa/Kconfig | 44 +- sound/isa/Makefile | 2 +- sound/isa/ad1816a/ad1816a.c | 4 +- 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 | 99 +- 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/oss/Kconfig | 7 - sound/oss/Makefile | 1 - sound/oss/dmasound/Kconfig | 1 + sound/oss/hal2.c | 1558 ------------- sound/oss/hal2.h | 248 --- sound/oss/mpu401.c | 2 +- sound/parisc/harmony.c | 3 +- sound/pci/Kconfig | 22 +- sound/pci/ac97/ac97_codec.c | 41 +- sound/pci/ac97/ac97_patch.c | 208 ++- sound/pci/ad1889.c | 6 +- sound/pci/ak4531_codec.c | 10 +- sound/pci/als4000.c | 391 +++- sound/pci/atiixp.c | 13 +- sound/pci/atiixp_modem.c | 10 +- sound/pci/au88x0/au88x0.h | 7 +- sound/pci/au88x0/au88x0_core.c | 40 +- sound/pci/au88x0/au88x0_pcm.c | 14 +- sound/pci/azt3328.c | 6 +- sound/pci/bt87x.c | 5 +- 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 | 22 +- 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 | 31 +- 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 | 29 +- sound/pci/hda/hda_codec.h | 92 +- sound/pci/hda/hda_generic.c | 3 +- sound/pci/hda/hda_intel.c | 105 +- sound/pci/hda/hda_proc.c | 23 +- sound/pci/hda/patch_analog.c | 80 +- sound/pci/hda/patch_atihdmi.c | 45 +- sound/pci/hda/patch_realtek.c | 1788 ++++++++++++++-- sound/pci/hda/patch_sigmatel.c | 485 ++++- sound/pci/ice1712/ak4xxx.c | 3 +- sound/pci/ice1712/aureon.c | 22 +- sound/pci/ice1712/delta.h | 1 + sound/pci/ice1712/ews.c | 9 +- sound/pci/ice1712/ice1712.c | 3 +- sound/pci/ice1712/ice1724.c | 8 +- sound/pci/ice1712/juli.c | 3 +- sound/pci/ice1712/phase.c | 35 +- sound/pci/ice1712/phase.h | 4 +- sound/pci/ice1712/revo.c | 17 +- sound/pci/intel8x0.c | 44 +- 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/pcxhr/pcxhr.c | 6 +- sound/pci/pcxhr/pcxhr_core.c | 27 +- sound/pci/pcxhr/pcxhr_hwdep.c | 15 +- sound/pci/riptide/riptide.c | 31 +- sound/pci/rme9652/hdsp.c | 25 +- sound/pci/rme9652/hdspm.c | 52 +- sound/pci/rme9652/rme9652.c | 23 +- sound/pci/sonicvibes.c | 10 +- sound/pci/trident/trident_main.c | 22 +- sound/pci/trident/trident_memory.c | 37 +- sound/pci/via82xx.c | 60 +- sound/pci/via82xx_modem.c | 8 +- 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 | 73 +- sound/ppc/beep.c | 6 +- sound/ppc/tumbler.c | 17 +- sound/sh/aica.c | 3 +- sound/soc/at91/at91-ssc.c | 2 +- sound/soc/at91/eti_b1_wm8731.c | 1 + sound/soc/codecs/Kconfig | 43 + sound/soc/codecs/Makefile | 10 + sound/soc/codecs/ad1980.c | 309 +++ sound/soc/codecs/ad1980.h | 23 + sound/soc/codecs/ak4535.c | 116 +- sound/soc/codecs/ak4535.h | 1 + sound/soc/codecs/cs4270.c | 71 +- sound/soc/codecs/tlv320aic26.c | 520 +++++ sound/soc/codecs/tlv320aic26.h | 96 + sound/soc/codecs/uda1380.c | 115 +- sound/soc/codecs/uda1380.h | 1 + sound/soc/codecs/wm8580.c | 1055 +++++++++ sound/soc/codecs/wm8580.h | 42 + sound/soc/codecs/wm8731.c | 177 +- sound/soc/codecs/wm8731.h | 2 + sound/soc/codecs/wm8750.c | 111 +- sound/soc/codecs/wm8750.h | 1 + sound/soc/codecs/wm8900.c | 1542 +++++++++++++ sound/soc/codecs/wm8900.h | 64 + sound/soc/codecs/wm8903.c | 1813 +++++++++++++++ sound/soc/codecs/wm8903.h | 1463 ++++++++++++ sound/soc/codecs/wm8990.c | 109 +- sound/soc/codecs/wm8990.h | 1 + sound/soc/davinci/davinci-i2s.c | 2 +- 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/corgi.c | 1 + sound/soc/pxa/poodle.c | 1 + sound/soc/pxa/pxa2xx-pcm.c | 4 +- sound/soc/pxa/spitz.c | 1 + sound/soc/soc-core.c | 132 +- sound/soc/soc-dapm.c | 119 +- sound/sound_core.c | 79 +- 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 | 19 +- sound/usb/usbaudio.h | 4 +- sound/usb/usbmidi.c | 39 + sound/usb/usbmixer.c | 19 +- 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 + 289 files changed, 18980 insertions(+), 8108 deletions(-) delete mode 100644 include/sound/ad1848.h 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/ad1848/ad1848_lib.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 delete mode 100644 sound/oss/hal2.c delete mode 100644 sound/oss/hal2.h 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/codecs/wm8903.c create mode 100644 sound/soc/codecs/wm8903.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 cpufreq/next $ git merge cpufreq/next Auto-merged arch/x86/kernel/cpu/cpufreq/elanfreq.c Auto-merged drivers/cpufreq/cpufreq_conservative.c Auto-merged include/linux/tick.h 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 Merge made by recursive. include/net/9p/9p.h | 1 + include/net/9p/transport.h | 9 +- net/9p/client.c | 10 +- net/9p/mod.c | 92 +++++++++---- net/9p/trans_fd.c | 340 +++++++++++++++----------------------------- net/9p/trans_virtio.c | 2 + 6 files changed, 198 insertions(+), 256 deletions(-) Merging quilt/rr $ git merge quilt/rr Auto-merged drivers/md/md.c Auto-merged drivers/media/video/cpia.c Auto-merged drivers/media/video/usbvision/usbvision-core.c Auto-merged drivers/media/video/usbvision/usbvision-video.c Auto-merged drivers/media/video/v4l2-common.c Auto-merged drivers/media/video/vino.c Auto-merged drivers/mtd/mtdpart.c Auto-merged drivers/net/ppp_generic.c Auto-merged drivers/video/fbmem.c Auto-merged fs/char_dev.c Auto-merged init/Kconfig Auto-merged net/ipv4/devinet.c Auto-merged net/ipv4/inet_diag.c Auto-merged net/sched/cls_api.c Auto-merged net/sched/sch_api.c Merge made by recursive. drivers/md/md.c | 7 ------- drivers/media/video/cpia.c | 4 ---- drivers/media/video/usbvision/usbvision-core.c | 4 ---- drivers/media/video/usbvision/usbvision-video.c | 4 ---- drivers/media/video/v4l1-compat.c | 4 ---- drivers/media/video/v4l2-common.c | 4 ---- drivers/media/video/vino.c | 5 +---- drivers/media/video/w9968cf.c | 4 ++-- drivers/mtd/mtdpart.c | 2 -- drivers/net/irda/sir_dongle.c | 2 -- drivers/net/ppp_generic.c | 10 +++------- drivers/net/pppox.c | 9 ++------- drivers/video/fbmem.c | 17 ++--------------- fs/char_dev.c | 3 --- fs/exec.c | 9 +++------ fs/nls/nls_base.c | 21 +-------------------- include/linux/netdevice.h | 5 ++++- init/Kconfig | 6 ------ kernel/kmod.c | 2 +- net/bluetooth/af_bluetooth.c | 8 +------- net/bridge/netfilter/ebtables.c | 15 +++------------ net/can/af_can.c | 4 ++-- net/core/dev.c | 2 -- net/core/rtnetlink.c | 4 ++-- net/dccp/ccid.c | 2 +- net/decnet/dn_dev.c | 2 -- net/ipv4/devinet.c | 2 -- net/ipv4/inet_diag.c | 2 -- net/ipv4/tcp_cong.c | 4 ++-- net/netfilter/nfnetlink.c | 2 +- net/netlink/af_netlink.c | 2 +- net/sched/act_api.c | 2 +- net/sched/cls_api.c | 2 +- net/sched/ematch.c | 2 +- net/sched/sch_api.c | 2 +- net/socket.c | 2 +- net/sunrpc/auth.c | 2 -- 37 files changed, 37 insertions(+), 146 deletions(-) Merging cifs/master $ git merge cifs/master Already up-to-date. Merging mmc/next $ git merge mmc/next Auto-merged drivers/mmc/host/sdhci-pci.c Merge made by recursive. drivers/mmc/card/block.c | 46 +------- drivers/mmc/card/queue.c | 23 +++- drivers/mmc/core/sdio_io.c | 249 +++++++++++++++++++++++++++++++++++++++++ drivers/mmc/core/sdio_irq.c | 16 ++- drivers/mmc/core/sdio_ops.c | 10 ++- drivers/mmc/host/sdhci-pci.c | 3 +- drivers/mmc/host/sdhci.c | 44 ++++++-- drivers/mmc/host/sdhci.h | 2 + include/linux/mmc/sdio_func.h | 41 +++++++- 9 files changed, 371 insertions(+), 63 deletions(-) Merging gfs2/master $ git merge gfs2/master Auto-merged fs/gfs2/ops_inode.c Merge made by recursive. fs/gfs2/glock.c | 13 +- fs/gfs2/incore.h | 7 +- fs/gfs2/inode.c | 48 ----- fs/gfs2/inode.h | 1 - fs/gfs2/mount.c | 7 + fs/gfs2/ops_fstype.c | 566 ++++++++++++++++++++++++++++++++++---------------- fs/gfs2/ops_inode.c | 127 +++++++++--- fs/gfs2/ops_super.c | 57 +++++- fs/gfs2/super.c | 340 ------------------------------ fs/gfs2/super.h | 6 - 10 files changed, 554 insertions(+), 618 deletions(-) Merging input/next $ git merge input/next Auto-merged drivers/input/keyboard/bf54x-keys.c Auto-merged drivers/input/keyboard/gpio_keys.c Auto-merged drivers/input/tablet/aiptek.c Auto-merged include/linux/mod_devicetable.h 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 | 30 +- drivers/input/keyboard/bf54x-keys.c | 13 +- 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 +- drivers/input/touchscreen/atmel_tsadcc.c | 37 +- include/linux/gameport.h | 7 +- include/linux/input.h | 15 +- include/linux/mod_devicetable.h | 2 +- 31 files changed, 1575 insertions(+), 258 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 net/9p/trans_virtio.c 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 ++++++++++++++---------------- 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 ++++++----- 11 files changed, 69 insertions(+), 63 deletions(-) Merging bkl-removal/bkl-removal $ git merge bkl-removal/bkl-removal Auto-merged drivers/uio/uio.c Merge made by recursive. drivers/uio/uio.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) 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/jffs2/fs.c Auto-merged fs/ntfs/aops.c Auto-merged fs/proc/nommu.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 c8b2797: 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(-) $ git am -3 ../patches/0001-rr-build-fix-for-remove-CONFIG_KMOD-from-net.patch Applying rr: build fix for remove CONFIG_KMOD from net Merging ubifs/linux-next $ git merge ubifs/linux-next Merge made by recursive. fs/ubifs/budget.c | 113 +++++++++++++++++++++++++++++++++++++++------------ fs/ubifs/dir.c | 1 - fs/ubifs/file.c | 20 +++++++-- fs/ubifs/find.c | 18 ++++----- fs/ubifs/gc.c | 6 +++ fs/ubifs/misc.h | 49 ++++++++--------------- fs/ubifs/super.c | 22 ++++++---- fs/ubifs/tnc.c | 116 ++++++++++++++++++++++++++++------------------------- fs/ubifs/ubifs.h | 14 +++++- 9 files changed, 219 insertions(+), 140 deletions(-) Merging lsm/for-next $ git merge lsm/for-next Already up-to-date. Merging block/for-next $ git merge block/for-next Auto-merged Documentation/DocBook/kernel-api.tmpl Auto-merged block/blk-core.c Auto-merged block/blk-integrity.c Auto-merged block/blk-map.c Auto-merged block/blk-settings.c Auto-merged block/bsg.c Auto-merged block/genhd.c Auto-merged drivers/base/core.c Auto-merged drivers/block/pktcdvd.c Auto-merged drivers/ide/ide-cd.c Auto-merged drivers/ide/ide-disk.c CONFLICT (content): Merge conflict in drivers/ide/ide-disk.c Auto-merged drivers/ide/ide-probe.c Auto-merged drivers/md/md.c Auto-merged drivers/md/multipath.c Auto-merged drivers/mmc/card/block.c Auto-merged drivers/s390/block/dcssblk.c Auto-merged drivers/scsi/scsi_tgt_lib.c Auto-merged drivers/scsi/sd.c Auto-merged drivers/scsi/sg.c Auto-merged fs/block_dev.c Auto-merged include/linux/bio.h CONFLICT (content): Merge conflict in include/linux/bio.h Auto-merged include/linux/blkdev.h CONFLICT (content): Merge conflict in include/linux/blkdev.h Auto-merged include/linux/device.h Auto-merged include/linux/fs.h Auto-merged lib/Kconfig.debug CONFLICT (content): Merge conflict in lib/Kconfig.debug Recorded preimage for 'include/linux/bio.h' Recorded preimage for 'include/linux/blkdev.h' Resolved 'drivers/ide/ide-disk.c' using previous resolution. Resolved 'lib/Kconfig.debug' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'include/linux/bio.h'. Recorded resolution for 'include/linux/blkdev.h'. Created commit f644676: Merge commit 'block/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/block/deadline-iosched.txt | 14 +- block/Makefile | 4 +- block/as-iosched.c | 6 +- block/blk-barrier.c | 71 +++- block/blk-core.c | 299 ++++------ block/blk-integrity.c | 5 +- block/blk-map.c | 52 +- block/blk-merge.c | 129 +---- block/blk-settings.c | 17 + block/blk-softirq.c | 167 ++++++ block/blk-sysfs.c | 35 +- block/blk.h | 12 + block/blktrace.c | 29 +- block/bsg.c | 6 +- block/cfq-iosched.c | 49 ++- block/cmd-filter.c | 9 +- block/compat_ioctl.c | 1 + block/deadline-iosched.c | 40 +- block/elevator.c | 17 +- block/genhd.c | 952 +++++++++++++++++++----------- block/ioctl.c | 124 ++++- block/scsi_ioctl.c | 8 +- drivers/block/aoe/aoeblk.c | 6 +- drivers/block/aoe/aoecmd.c | 19 +- drivers/block/aoe/aoedev.c | 2 +- drivers/block/nbd.c | 4 +- drivers/block/pktcdvd.c | 2 +- drivers/block/ps3disk.c | 11 +- drivers/block/virtio_blk.c | 4 +- drivers/cdrom/cdrom.c | 2 +- drivers/char/random.c | 6 +- drivers/ide/ide-cd.c | 2 +- drivers/ide/ide-disk.c | 14 +- drivers/ide/ide-probe.c | 2 +- drivers/md/dm-ioctl.c | 6 +- drivers/md/dm-stripe.c | 4 +- drivers/md/dm.c | 40 +- drivers/md/linear.c | 8 +- drivers/md/md.c | 15 +- drivers/md/multipath.c | 8 +- drivers/md/raid0.c | 8 +- drivers/md/raid1.c | 13 +- drivers/md/raid10.c | 12 +- drivers/md/raid5.c | 75 ++- drivers/memstick/core/mspro_block.c | 2 +- drivers/mmc/card/block.c | 2 +- drivers/mtd/ftl.c | 24 + drivers/mtd/mtd_blkdevs.c | 16 + drivers/s390/block/dasd_proc.c | 3 +- drivers/s390/block/dcssblk.c | 4 +- drivers/scsi/scsi_tgt_lib.c | 2 +- drivers/scsi/sd.c | 82 ++- drivers/scsi/sg.c | 594 ++++++-------------- drivers/scsi/sr.c | 2 +- fs/bio.c | 156 ++--- fs/block_dev.c | 92 ++-- fs/fat/fatent.c | 14 + fs/partitions/check.c | 265 +++++---- fs/partitions/check.h | 4 +- include/linux/bio.h | 79 ++-- include/linux/blkdev.h | 70 ++- include/linux/blktrace_api.h | 4 + include/linux/elevator.h | 8 +- include/linux/fs.h | 6 +- include/linux/genhd.h | 363 ++++++------ include/linux/major.h | 2 + include/linux/mtd/blktrans.h | 2 + init/do_mounts.c | 4 + lib/Kconfig.debug | 22 + mm/bounce.c | 2 +- 70 files changed, 2322 insertions(+), 1811 deletions(-) create mode 100644 block/blk-softirq.c Merging embedded/master $ git merge embedded/master Already up-to-date. Merging firmware/master $ git merge firmware/master Auto-merged drivers/media/dvb/ttpci/av7110.c Removed drivers/media/dvb/ttpci/fdump.c Removed drivers/net/acenic_firmware.h Auto-merged drivers/net/e100.c Removed drivers/net/starfire_firmware.h Removed drivers/net/starfire_firmware.pl Removed drivers/scsi/ql1040_fw.h Removed drivers/scsi/ql12160_fw.h Removed drivers/scsi/ql1280_fw.h Auto-merged drivers/scsi/qlogicpti.c CONFLICT (content): Merge conflict in drivers/scsi/qlogicpti.c Removed drivers/scsi/qlogicpti_asm.c Auto-merged firmware/Makefile Auto-merged sound/isa/Kconfig Auto-merged sound/isa/wavefront/wavefront_fx.c Removed sound/isa/wavefront/yss225.c Resolved 'drivers/scsi/qlogicpti.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 621d6f8: 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 | 20 + firmware/WHENCE | 121 + 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 + firmware/yamaha/yss225_registers.bin.ihex | 998 +++ sound/isa/Kconfig | 10 - sound/isa/wavefront/wavefront_fx.c | 16 - sound/isa/wavefront/yss225.c | 2739 --------- 49 files changed, 20560 insertions(+), 22498 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 create mode 100644 firmware/yamaha/yss225_registers.bin.ihex delete mode 100644 sound/isa/wavefront/yss225.c Merging pcmcia/master $ git merge pcmcia/master Auto-merged drivers/bluetooth/bt3c_cs.c 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/pcmcia/axnet_cs.c Auto-merged drivers/net/pcmcia/pcnet_cs.c Auto-merged drivers/net/wireless/orinoco_cs.c Auto-merged drivers/net/wireless/spectrum_cs.c Auto-merged drivers/net/wireless/wavelan_cs.c Auto-merged drivers/net/wireless/wl3501_cs.c Auto-merged drivers/pcmcia/Makefile Removed drivers/pcmcia/ds_internal.h Auto-merged drivers/pcmcia/pxa2xx_base.c Auto-merged drivers/pcmcia/rsrc_nonstatic.c Auto-merged drivers/pcmcia/soc_common.c Auto-merged drivers/scsi/pcmcia/nsp_cs.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 | 125 ++++------ drivers/bluetooth/btuart_cs.c | 126 ++++------ drivers/bluetooth/dtl1_cs.c | 67 ++---- drivers/char/pcmcia/cm4000_cs.c | 73 ++---- drivers/char/pcmcia/cm4040_cs.c | 80 +++---- drivers/char/pcmcia/ipwireless/main.c | 46 ++--- drivers/ide/legacy/ide-cs.c | 158 ++++++------- drivers/isdn/hardware/avm/avm_cs.c | 85 ++----- drivers/isdn/hisax/avma1_cs.c | 81 ++----- drivers/isdn/hisax/elsa_cs.c | 79 ++----- drivers/isdn/hisax/sedlbauer_cs.c | 197 ++++++++--------- drivers/isdn/hisax/teles_cs.c | 79 ++----- drivers/mtd/maps/pcmciamtd.c | 29 +-- drivers/net/pcmcia/3c574_cs.c | 7 +- drivers/net/pcmcia/3c589_cs.c | 7 +- drivers/net/pcmcia/axnet_cs.c | 80 +++---- drivers/net/pcmcia/com20020_cs.c | 8 +- drivers/net/pcmcia/fmvj18x_cs.c | 19 +- drivers/net/pcmcia/ibmtr_cs.c | 2 +- drivers/net/pcmcia/pcnet_cs.c | 86 ++++---- drivers/net/pcmcia/smc91c92_cs.c | 147 +++++------- 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 | 5 +- 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/au1000_generic.c | 2 +- drivers/pcmcia/au1000_generic.h | 2 +- drivers/pcmcia/au1000_pb1x00.c | 1 - drivers/pcmcia/au1000_xxs1500.c | 1 - drivers/pcmcia/cardbus.c | 2 +- drivers/pcmcia/cistpl.c | 291 ++++++++++++++---------- drivers/pcmcia/cs.c | 74 ++++--- drivers/pcmcia/cs_internal.h | 214 +++++++++++++----- drivers/pcmcia/ds.c | 239 ++++++++----------- drivers/pcmcia/ds_internal.h | 23 -- drivers/pcmcia/hd64465_ss.c | 1 - drivers/pcmcia/i82365.c | 2 +- drivers/pcmcia/m32r_cfc.c | 4 +- drivers/pcmcia/m32r_pcc.c | 4 +- drivers/pcmcia/m8xx_pcmcia.c | 4 +- drivers/pcmcia/o2micro.h | 10 +- drivers/pcmcia/pcmcia_ioctl.c | 116 ++++++++-- drivers/pcmcia/pcmcia_resource.c | 381 +++++++++++++++++-------------- drivers/pcmcia/pxa2xx_base.c | 1 - drivers/pcmcia/rsrc_nonstatic.c | 67 +++--- drivers/pcmcia/soc_common.c | 2 +- drivers/pcmcia/soc_common.h | 3 +- drivers/pcmcia/socket_sysfs.c | 13 +- drivers/pcmcia/tcic.c | 2 +- drivers/pcmcia/ti113x.h | 78 ++++--- drivers/pcmcia/yenta_socket.c | 86 ++++---- drivers/scsi/pcmcia/aha152x_stub.c | 58 +++--- drivers/scsi/pcmcia/fdomain_stub.c | 37 ++-- drivers/scsi/pcmcia/nsp_cs.c | 194 ++++++++-------- 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 | 133 +++++------- include/pcmcia/ciscode.h | 2 +- include/pcmcia/cistpl.h | 18 +- include/pcmcia/cs.h | 92 +-------- include/pcmcia/cs_types.h | 8 - include/pcmcia/device_id.h | 18 ++- include/pcmcia/ds.h | 318 ++++++++++++++++++-------- include/pcmcia/ss.h | 202 ++++++++--------- 79 files changed, 2887 insertions(+), 3159 deletions(-) delete mode 100644 drivers/pcmcia/ds_internal.h Merging battery/master $ git merge battery/master Auto-merged drivers/power/power_supply_core.c Merge made by recursive. drivers/power/Kconfig | 6 + drivers/power/Makefile | 1 + drivers/power/bq27x00_battery.c | 382 +++++++++++++++++++++++++++++++++++++ drivers/power/pda_power.c | 11 +- drivers/power/power_supply_core.c | 25 +++ include/linux/power_supply.h | 6 + 6 files changed, 427 insertions(+), 4 deletions(-) create mode 100644 drivers/power/bq27x00_battery.c Merging leds/for-mm $ git merge leds/for-mm Already up-to-date. Merging backlight/for-mm $ git merge backlight/for-mm Already up-to-date. Merging kgdb/kgdb-next $ git merge kgdb/kgdb-next Auto-merged drivers/char/tty_io.c Merge made by recursive. drivers/char/tty_io.c | 17 +++++- drivers/serial/serial_txx9.c | 113 ++++++++++++++++++++++++++++++++++-------- 2 files changed, 106 insertions(+), 24 deletions(-) Merging slab/for-next $ git merge slab/for-next Auto-merged Documentation/kernel-parameters.txt Auto-merged MAINTAINERS Auto-merged fs/buffer.c Auto-merged fs/dcache.c Auto-merged fs/ext3/super.c Auto-merged fs/ext4/super.c Auto-merged fs/inode.c Auto-merged fs/reiserfs/super.c Auto-merged fs/xfs/linux-2.6/xfs_super.c Auto-merged include/linux/fs.h Auto-merged include/linux/mm.h Auto-merged init/main.c Auto-merged kernel/sysctl.c Auto-merged lib/Kconfig.debug Auto-merged mm/slub.c Auto-merged mm/vmstat.c Merge made by recursive. 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/buffer.c | 99 +++++ fs/dcache.c | 148 +++++++-- fs/drop_caches.c | 2 +- fs/ext2/super.c | 9 + fs/ext3/super.c | 8 + fs/ext4/super.c | 8 + fs/inode.c | 123 +++++++ fs/proc/inode.c | 8 + fs/reiserfs/super.c | 8 + fs/xfs/linux-2.6/xfs_super.c | 2 + include/linux/fs.h | 6 + include/linux/kmemtrace.h | 86 +++++ include/linux/mm.h | 3 +- include/linux/mmzone.h | 1 + include/linux/page-flags.h | 2 + include/linux/slab.h | 61 +++- include/linux/slab_def.h | 68 +++- include/linux/slob_def.h | 9 +- include/linux/slub_def.h | 69 ++++- 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 | 79 ++++- mm/slob.c | 37 ++- mm/slub.c | 513 ++++++++++++++++++++++----- mm/vmscan.c | 64 +++- mm/vmstat.c | 4 +- 36 files changed, 1945 insertions(+), 178 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 uclinux/for-next $ git merge uclinux/for-next Already up-to-date. Merging md/for-next $ git merge md/for-next Already up-to-date. Merging 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_32.c Auto-merged arch/x86/kernel/process_64.c CONFLICT (content): Merge conflict in arch/x86/kernel/process_64.c Auto-merged arch/x86/kernel/traps_32.c Auto-merged arch/x86/kernel/traps_64.c CONFLICT (content): Merge conflict in arch/x86/kernel/traps_64.c Auto-merged arch/x86/mm/fault.c Auto-merged include/asm-x86/kdebug.h Auto-merged include/asm-x86/pgtable.h Auto-merged include/asm-x86/pgtable_32.h Auto-merged include/asm-x86/pgtable_64.h Auto-merged include/asm-x86/string_32.h Auto-merged include/asm-x86/string_64.h Auto-merged include/linux/slab.h Auto-merged include/linux/slab_def.h Auto-merged init/main.c CONFLICT (content): Merge conflict in 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 CONFLICT (content): Merge conflict in mm/slub.c Resolved 'MAINTAINERS' using previous resolution. Resolved 'arch/x86/kernel/process_64.c' using previous resolution. Resolved 'arch/x86/kernel/traps_64.c' using previous resolution. Resolved 'init/main.c' using previous resolution. Resolved 'mm/Makefile' using previous resolution. Resolved 'mm/slab.c' using previous resolution. Resolved 'mm/slub.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit a63931e: 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 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 Removed Documentation/DocBook/wanbook.tmpl Removed drivers/net/wan/syncppp.c Removed include/net/syncppp.h Merge made by recursive. Documentation/DocBook/Makefile | 2 +- Documentation/DocBook/networking.tmpl | 3 - Documentation/DocBook/wanbook.tmpl | 99 -- Documentation/networking/generic-hdlc.txt | 8 +- drivers/net/wan/Makefile | 2 +- drivers/net/wan/c101.c | 6 +- drivers/net/wan/{hd6457x.c => hd64570.c} | 254 ++---- drivers/net/wan/hd64572.c | 641 +++++++++++++ drivers/net/wan/hdlc_ppp.c | 648 ++++++++++++- drivers/net/wan/n2.c | 9 +- drivers/net/wan/pc300too.c | 73 +- drivers/net/wan/pci200syn.c | 77 +- drivers/net/wan/syncppp.c | 1479 ----------------------------- include/net/syncppp.h | 102 -- 14 files changed, 1357 insertions(+), 2046 deletions(-) delete mode 100644 Documentation/DocBook/wanbook.tmpl rename drivers/net/wan/{hd6457x.c => hd64570.c} (78%) create mode 100644 drivers/net/wan/hd64572.c delete mode 100644 drivers/net/wan/syncppp.c delete mode 100644 include/net/syncppp.h Merging drm/drm-next $ git merge drm/drm-next Auto-merged drivers/gpu/drm/radeon/radeon_cp.c Merge made by recursive. drivers/gpu/drm/Kconfig | 1 + drivers/gpu/drm/drm_fops.c | 2 +- drivers/gpu/drm/drm_irq.c | 20 +- drivers/gpu/drm/drm_sysfs.c | 2 +- drivers/gpu/drm/i915/Makefile | 3 +- drivers/gpu/drm/i915/i915_dma.c | 171 +++-- drivers/gpu/drm/i915/i915_drv.c | 462 +----------- drivers/gpu/drm/i915/i915_drv.h | 877 ++-------------------- 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/i915/i915_suspend.c | 509 ++++++++++++ drivers/gpu/drm/radeon/radeon_cp.c | 5 +- drivers/gpu/drm/sis/sis_mm.c | 10 +- include/drm/drm.h | 17 - 15 files changed, 2610 insertions(+), 1435 deletions(-) create mode 100644 drivers/gpu/drm/i915/i915_opregion.c create mode 100644 drivers/gpu/drm/i915/i915_reg.h create mode 100644 drivers/gpu/drm/i915/i915_suspend.c Merging voltage/reg-for-linus $ git merge voltage/reg-for-linus Already up-to-date. Merging security-testing/next $ git merge security-testing/next Auto-merged Documentation/DocBook/kernel-api.tmpl Auto-merged security/selinux/ss/services.c Merge made by recursive. Documentation/SELinux.txt | 27 ++++ drivers/char/tpm/Kconfig | 1 + include/linux/security.h | 54 +++++---- scripts/Makefile | 3 +- scripts/selinux/Makefile | 2 + scripts/selinux/README | 2 + scripts/selinux/install_policy.sh | 69 ++++++++++ scripts/selinux/mdp/Makefile | 5 + scripts/selinux/mdp/dbus_contexts | 6 + scripts/selinux/mdp/mdp.c | 242 +++++++++++++++++++++++++++++++++++ security/Kconfig | 8 + security/Makefile | 3 +- security/selinux/avc.c | 2 +- security/selinux/hooks.c | 60 ++++++--- security/selinux/include/avc.h | 4 + security/selinux/include/security.h | 15 ++- security/selinux/ss/avtab.c | 8 +- security/selinux/ss/conditional.c | 18 ++-- security/selinux/ss/conditional.h | 2 +- security/selinux/ss/ebitmap.c | 4 +- security/selinux/ss/hashtab.c | 6 +- security/selinux/ss/mls.c | 14 +- security/selinux/ss/policydb.c | 225 +++++++++++++++++++++++++++++---- security/selinux/ss/policydb.h | 5 + security/selinux/ss/services.c | 180 +++++++++++++++++++++++++- security/selinux/ss/sidtab.c | 12 +- security/smack/smack.h | 1 + security/smack/smack_access.c | 10 ++- security/smack/smackfs.c | 92 +++++++++++++ 29 files changed, 967 insertions(+), 113 deletions(-) create mode 100644 Documentation/SELinux.txt create mode 100644 scripts/selinux/Makefile create mode 100644 scripts/selinux/README create mode 100644 scripts/selinux/install_policy.sh create mode 100644 scripts/selinux/mdp/Makefile create mode 100644 scripts/selinux/mdp/dbus_contexts create mode 100644 scripts/selinux/mdp/mdp.c Merging lblnet/master $ git merge lblnet/master Auto-merged security/selinux/hooks.c Auto-merged security/selinux/ss/services.c Auto-merged security/smack/smackfs.c Merge made by recursive. include/net/cipso_ipv4.h | 55 +++- include/net/netlabel.h | 50 ++- net/ipv4/cipso_ipv4.c | 609 ++++++++++++++++++++++++----------- net/ipv4/ip_options.c | 2 +- net/netlabel/Makefile | 3 +- net/netlabel/netlabel_addrlist.c | 388 ++++++++++++++++++++++ net/netlabel/netlabel_addrlist.h | 189 +++++++++++ net/netlabel/netlabel_cipso_v4.c | 132 ++++++--- net/netlabel/netlabel_cipso_v4.h | 10 +- net/netlabel/netlabel_domainhash.c | 377 +++++++++++++++++----- net/netlabel/netlabel_domainhash.h | 40 +++- net/netlabel/netlabel_kapi.c | 270 +++++++++++----- net/netlabel/netlabel_mgmt.c | 399 +++++++++++++++++------ net/netlabel/netlabel_mgmt.h | 59 +++- net/netlabel/netlabel_unlabeled.c | 425 ++++++++----------------- security/selinux/hooks.c | 110 ++++++- security/selinux/include/netlabel.h | 34 ++ security/selinux/include/objsec.h | 9 +- security/selinux/netlabel.c | 181 ++++++++++- security/selinux/ss/services.c | 13 +- security/smack/smack_lsm.c | 5 +- security/smack/smackfs.c | 4 +- 22 files changed, 2495 insertions(+), 869 deletions(-) create mode 100644 net/netlabel/netlabel_addrlist.c create mode 100644 net/netlabel/netlabel_addrlist.h Merging quilt/ttydev $ git merge quilt/ttydev Auto-merged Documentation/feature-removal-schedule.txt CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt Auto-merged drivers/char/amiserial.c Auto-merged drivers/char/ip2/ip2main.c Auto-merged drivers/char/istallion.c Auto-merged drivers/char/stallion.c Auto-merged drivers/char/tty_io.c CONFLICT (content): Merge conflict in drivers/char/tty_io.c Auto-merged drivers/char/vt.c CONFLICT (content): Merge conflict in drivers/char/vt.c Auto-merged drivers/isdn/capi/capi.c Auto-merged drivers/net/usb/hso.c Auto-merged drivers/serial/8250.c Auto-merged drivers/serial/Kconfig Removed drivers/serial/mcfserial.c Removed drivers/serial/mcfserial.h Auto-merged drivers/usb/serial/aircable.c CONFLICT (content): Merge conflict in drivers/usb/serial/aircable.c Auto-merged drivers/usb/serial/belkin_sa.c Auto-merged drivers/usb/serial/cyberjack.c Auto-merged drivers/usb/serial/cypress_m8.c Auto-merged drivers/usb/serial/digi_acceleport.c Auto-merged drivers/usb/serial/empeg.c Auto-merged drivers/usb/serial/ftdi_sio.c Auto-merged drivers/usb/serial/garmin_gps.c Auto-merged drivers/usb/serial/io_edgeport.c Auto-merged drivers/usb/serial/io_ti.c Auto-merged drivers/usb/serial/ipaq.c Auto-merged drivers/usb/serial/ipw.c Auto-merged drivers/usb/serial/ir-usb.c Auto-merged drivers/usb/serial/iuu_phoenix.c Auto-merged drivers/usb/serial/keyspan.c Auto-merged drivers/usb/serial/keyspan_pda.c CONFLICT (content): Merge conflict in drivers/usb/serial/keyspan_pda.c Auto-merged drivers/usb/serial/kl5kusb105.c Auto-merged drivers/usb/serial/kobil_sct.c Auto-merged drivers/usb/serial/mct_u232.c Auto-merged drivers/usb/serial/mos7720.c Auto-merged drivers/usb/serial/mos7840.c Auto-merged drivers/usb/serial/omninet.c Auto-merged drivers/usb/serial/option.c Auto-merged drivers/usb/serial/pl2303.c Auto-merged drivers/usb/serial/safe_serial.c CONFLICT (content): Merge conflict in drivers/usb/serial/safe_serial.c Auto-merged drivers/usb/serial/sierra.c Auto-merged drivers/usb/serial/spcp8x5.c Auto-merged drivers/usb/serial/ti_usb_3410_5052.c Auto-merged drivers/usb/serial/usb-serial.c Auto-merged drivers/usb/serial/visor.c Auto-merged drivers/usb/serial/whiteheat.c Auto-merged fs/dquot.c Auto-merged include/asm-x86/ioctls.h Auto-merged kernel/auditsc.c CONFLICT (content): Merge conflict in kernel/auditsc.c Auto-merged kernel/fork.c Auto-merged kernel/printk.c Auto-merged security/selinux/hooks.c Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution. Resolved 'drivers/char/tty_io.c' using previous resolution. Resolved 'drivers/char/vt.c' using previous resolution. Resolved 'drivers/usb/serial/aircable.c' using previous resolution. Resolved 'drivers/usb/serial/keyspan_pda.c' using previous resolution. Resolved 'drivers/usb/serial/safe_serial.c' using previous resolution. Resolved 'kernel/auditsc.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit f7518da: Merge branch 'quilt/ttydev' $ git diff -M --stat --summary HEAD^.. Documentation/feature-removal-schedule.txt | 8 - arch/blackfin/kernel/bfin_dma_5xx.c | 13 +- .../mach-bf527/include/mach/bfin_serial_5xx.h | 6 +- .../mach-bf533/include/mach/bfin_serial_5xx.h | 4 +- .../mach-bf537/include/mach/bfin_serial_5xx.h | 6 +- .../mach-bf548/include/mach/bfin_serial_5xx.h | 6 +- .../mach-bf561/include/mach/bfin_serial_5xx.h | 4 +- arch/um/drivers/line.c | 2 + drivers/bluetooth/hci_ldisc.c | 2 +- drivers/char/Kconfig | 4 +- drivers/char/Makefile | 2 +- drivers/char/amiserial.c | 6 - drivers/char/cyclades.c | 21 +- drivers/char/epca.c | 5 +- drivers/char/generic_serial.c | 21 - drivers/char/hvc_console.c | 4 +- drivers/char/ip2/ip2main.c | 6 +- drivers/char/isicom.c | 61 +- drivers/char/istallion.c | 113 +- drivers/char/moxa.c | 61 +- drivers/char/mxser.c | 193 +- drivers/char/n_hdlc.c | 2 +- drivers/char/n_r3964.c | 9 +- drivers/char/n_tty.c | 99 +- drivers/char/pcmcia/ipwireless/tty.c | 19 +- drivers/char/pty.c | 335 +++- drivers/char/stallion.c | 139 +- drivers/char/sx.c | 4 +- drivers/char/tty_buffer.c | 511 +++++ drivers/char/tty_io.c | 1371 ++++---------- drivers/char/tty_ioctl.c | 212 ++- drivers/char/tty_port.c | 96 + drivers/char/vt.c | 80 +- drivers/char/vt_ioctl.c | 2 + drivers/isdn/capi/capi.c | 2 +- drivers/isdn/gigaset/ser-gigaset.c | 27 +- drivers/net/usb/hso.c | 46 +- drivers/net/wan/Kconfig | 2 +- drivers/s390/char/fs3270.c | 3 +- drivers/serial/68328serial.c | 11 +- drivers/serial/8250.c | 83 +- drivers/serial/Kconfig | 16 +- drivers/serial/Makefile | 1 - drivers/serial/bfin_5xx.c | 123 +- drivers/serial/crisv10.c | 5 +- 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/devpts/inode.c | 66 +- fs/dquot.c | 6 +- fs/open.c | 3 +- include/asm-x86/ioctls.h | 6 + include/linux/devpts_fs.h | 31 +- include/linux/serial.h | 16 + include/linux/termios.h | 15 + include/linux/tty.h | 45 +- include/linux/tty_driver.h | 56 +- include/linux/vt_kern.h | 2 +- kernel/acct.c | 2 +- kernel/auditsc.c | 9 +- kernel/fork.c | 5 +- kernel/printk.c | 16 - kernel/sys.c | 4 +- security/selinux/hooks.c | 3 +- 98 files changed, 2590 insertions(+), 3949 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/s390/kernel/compat_linux.c Auto-merged arch/x86/ia32/ia32_aout.c Auto-merged arch/x86/mm/fault.c Auto-merged drivers/media/video/cpia.c Auto-merged drivers/net/tun.c Auto-merged drivers/net/wan/sbni.c CONFLICT (content): Merge conflict in drivers/net/wan/sbni.c Auto-merged drivers/usb/core/devio.c Auto-merged drivers/usb/core/inode.c Auto-merged fs/binfmt_flat.c Auto-merged fs/cifs/connect.c Auto-merged fs/cifs/inode.c Auto-merged fs/compat.c Auto-merged fs/devpts/inode.c Auto-merged fs/dquot.c Auto-merged fs/ecryptfs/main.c Auto-merged fs/exec.c Auto-merged fs/exportfs/expfs.c Auto-merged fs/ext4/balloc.c Auto-merged fs/ext4/ialloc.c Auto-merged fs/fat/inode.c Auto-merged fs/gfs2/inode.c Auto-merged fs/hpfs/namei.c Auto-merged fs/ioprio.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/ocfs2/namei.c Auto-merged fs/omfs/inode.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/ialloc.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 CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_linux.h Auto-merged fs/xfs/xfs_inode.c CONFLICT (content): Merge conflict in fs/xfs/xfs_inode.c Auto-merged fs/xfs/xfs_vnodeops.c CONFLICT (content): Merge conflict in fs/xfs/xfs_vnodeops.c Auto-merged include/linux/capability.h CONFLICT (content): Merge conflict in include/linux/capability.h Auto-merged include/linux/cred.h CONFLICT (add/add): Merge conflict in include/linux/cred.h Auto-merged include/linux/fs.h Removed include/linux/key-ui.h Auto-merged include/linux/sched.h Auto-merged include/linux/security.h CONFLICT (content): Merge conflict in include/linux/security.h Auto-merged init/main.c Auto-merged kernel/Makefile Auto-merged kernel/acct.c Auto-merged kernel/auditsc.c Auto-merged kernel/capability.c Auto-merged kernel/exit.c CONFLICT (content): Merge conflict in kernel/exit.c Auto-merged kernel/fork.c CONFLICT (content): Merge conflict in kernel/fork.c Auto-merged kernel/kmod.c Auto-merged kernel/ptrace.c Auto-merged kernel/sched.c Auto-merged kernel/signal.c Auto-merged kernel/sys.c Auto-merged kernel/sysctl.c Auto-merged kernel/timer.c Auto-merged kernel/trace/trace.c Auto-merged kernel/user.c Auto-merged kernel/user_namespace.c Auto-merged lib/Makefile Auto-merged mm/migrate.c Auto-merged mm/oom_kill.c Auto-merged net/9p/client.c Auto-merged net/core/dev.c Auto-merged net/socket.c Auto-merged net/sunrpc/auth.c Auto-merged net/unix/af_unix.c Auto-merged security/capability.c Auto-merged security/commoncap.c CONFLICT (content): Merge conflict in security/commoncap.c Auto-merged security/root_plug.c Auto-merged security/security.c Auto-merged security/selinux/hooks.c CONFLICT (content): Merge conflict in security/selinux/hooks.c Auto-merged security/selinux/include/objsec.h Auto-merged security/smack/smack_lsm.c CONFLICT (content): Merge conflict in security/smack/smack_lsm.c Auto-merged security/smack/smackfs.c Resolved 'drivers/net/wan/sbni.c' using previous resolution. Resolved 'fs/namespace.c' using previous resolution. Resolved 'fs/nfsd/nfs4recover.c' using previous resolution. Resolved 'fs/xfs/linux-2.6/xfs_linux.h' using previous resolution. Resolved 'fs/xfs/xfs_inode.c' using previous resolution. Resolved 'fs/xfs/xfs_vnodeops.c' using previous resolution. Resolved 'include/linux/capability.h' using previous resolution. Resolved 'include/linux/cred.h' using previous resolution. Resolved 'include/linux/security.h' using previous resolution. Resolved 'kernel/exit.c' using previous resolution. Resolved 'kernel/fork.c' using previous resolution. Resolved 'security/commoncap.c' using previous resolution. Resolved 'security/selinux/hooks.c' using previous resolution. Resolved 'security/smack/smack_lsm.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 48330f7: Merge commit 'creds/next-creds' $ git diff -M --stat --summary HEAD^.. Documentation/credentials.txt | 582 +++++++++++++ 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/isdn/capi/capifs.c | 4 +- drivers/isdn/hysdn/hysdn_procconf.c | 6 +- drivers/net/tun.c | 8 +- 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 | 42 +- 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 | 183 +++-- 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/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/xfs_acl.c | 6 +- fs/xfs/xfs_inode.h | 2 +- fs/xfs/xfs_vnodeops.h | 10 +- include/keys/keyring-type.h | 31 + include/linux/binfmts.h | 16 +- include/linux/capability.h | 2 - include/linux/cred.h | 340 +++++++- 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 | 64 +-- include/linux/securebits.h | 2 +- include/linux/security.h | 326 ++++---- 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 | 268 +------ 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 | 29 +- 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 | 6 +- 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 | 56 +- security/commoncap.c | 699 ++++++++++------ 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 | 13 +- security/security.c | 96 +-- security/selinux/exports.c | 8 +- security/selinux/hooks.c | 1154 ++++++++++++++------------ 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 | 173 +++-- security/smack/smackfs.c | 6 +- 211 files changed, 5082 insertions(+), 3095 deletions(-) create mode 100644 Documentation/credentials.txt create mode 100644 include/keys/keyring-type.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 Merging oprofile/auto-oprofile-next $ git merge oprofile/auto-oprofile-next Auto-merged arch/x86/kernel/apic_32.c CONFLICT (content): Merge conflict in arch/x86/kernel/apic_32.c Auto-merged arch/x86/kernel/apic_64.c Removed arch/x86/oprofile/op_model_athlon.c Auto-merged drivers/oprofile/cpu_buffer.c Auto-merged include/linux/pci_ids.h Resolved 'arch/x86/kernel/apic_32.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 42e7ec3: Merge commit 'oprofile/auto-oprofile-next' $ git diff -M --stat --summary HEAD^.. arch/Kconfig | 14 + arch/x86/kernel/apic_32.c | 4 + arch/x86/kernel/apic_64.c | 4 + arch/x86/oprofile/Makefile | 2 +- arch/x86/oprofile/nmi_int.c | 127 +++++++- arch/x86/oprofile/op_counter.h | 3 +- arch/x86/oprofile/op_model_amd.c | 559 +++++++++++++++++++++++++++++++++++ arch/x86/oprofile/op_model_athlon.c | 190 ------------ arch/x86/oprofile/op_model_p4.c | 4 + arch/x86/oprofile/op_model_ppro.c | 2 + arch/x86/oprofile/op_x86_model.h | 7 +- drivers/oprofile/buffer_sync.c | 209 +++++++++---- drivers/oprofile/cpu_buffer.c | 74 +++++- drivers/oprofile/cpu_buffer.h | 2 + drivers/oprofile/oprof.c | 58 ++++- drivers/oprofile/oprof.h | 4 +- drivers/oprofile/oprofile_files.c | 39 +++- include/linux/oprofile.h | 5 + include/linux/pci_ids.h | 5 + 19 files changed, 1031 insertions(+), 281 deletions(-) create mode 100644 arch/x86/oprofile/op_model_amd.c delete mode 100644 arch/x86/oprofile/op_model_athlon.c Merging fastboot/auto-fastboot-next $ git merge fastboot/auto-fastboot-next Auto-merged drivers/acpi/thermal.c Auto-merged drivers/pci/pci.c Auto-merged drivers/usb/host/ehci-hcd.c Auto-merged include/asm-generic/vmlinux.lds.h Auto-merged include/linux/init.h CONFLICT (content): Merge conflict in include/linux/init.h Auto-merged init/Kconfig Auto-merged init/do_mounts.c Auto-merged init/main.c Resolved 'include/linux/init.h' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 3ead078: Merge commit 'fastboot/auto-fastboot-next' $ git diff -M --stat --summary HEAD^.. drivers/acpi/battery.c | 2 +- drivers/acpi/button.c | 2 +- drivers/acpi/thermal.c | 2 +- drivers/pci/pci.c | 2 +- drivers/usb/host/ehci-hcd.c | 2 +- drivers/usb/host/ohci-hcd.c | 2 +- drivers/usb/host/uhci-hcd.c | 2 +- include/asm-generic/vmlinux.lds.h | 6 ++- include/linux/init.h | 8 ++++ init/Kconfig | 11 +++++ init/do_mounts.c | 2 + init/do_mounts_md.c | 29 ++++++++++--- init/initramfs.c | 71 +++++++++++++++++++++++++++------- init/main.c | 77 +++++++++++++++++++++++++++++++++++- 14 files changed, 185 insertions(+), 33 deletions(-) Merging sparseirq/auto-sparseirq-next $ git merge sparseirq/auto-sparseirq-next Auto-merged arch/x86/Kconfig Auto-merged arch/x86/configs/i386_defconfig Auto-merged arch/x86/kernel/Makefile Auto-merged arch/x86/kernel/acpi/boot.c CONFLICT (delete/modify): arch/x86/kernel/apic_64.c deleted in sparseirq/auto-sparseirq-next and modified in HEAD. Version HEAD of arch/x86/kernel/apic_64.c left in tree. Auto-merged arch/x86/kernel/entry_32.S Removed arch/x86/kernel/io_apic_32.c Auto-merged arch/x86/kernel/setup.c Auto-merged arch/x86/kernel/visws_quirks.c Auto-merged arch/x86/kernel/vmlinux_32.lds.S Auto-merged arch/x86/lguest/boot.c Auto-merged arch/x86/xen/enlighten.c Auto-merged arch/x86/xen/spinlock.c CONFLICT (content): Merge conflict in arch/x86/xen/spinlock.c Auto-merged drivers/char/random.c Auto-merged drivers/mfd/asic3.c Auto-merged drivers/net/wan/sbni.c Auto-merged drivers/pcmcia/hd64465_ss.c Auto-merged drivers/scsi/qla2xxx/qla_def.h Auto-merged drivers/serial/68328serial.c CONFLICT (content): Merge conflict in drivers/serial/68328serial.c Auto-merged drivers/serial/8250.c CONFLICT (content): Merge conflict in drivers/serial/8250.c Auto-merged drivers/serial/sh-sci.c Auto-merged drivers/xen/events.c Auto-merged fs/proc/proc_misc.c Auto-merged include/asm-generic/vmlinux.lds.h Auto-merged include/asm-x86/apic.h Auto-merged include/asm-x86/genapic_32.h Auto-merged include/asm-x86/irq_vectors.h Removed include/asm-x86/mach-generic/irq_vectors_limits.h Removed include/asm-x86/summit/irq_vectors_limits.h Auto-merged include/linux/init.h Auto-merged include/linux/interrupt.h Auto-merged include/linux/pci.h Auto-merged init/main.c Auto-merged kernel/irq/manage.c Resolved 'arch/x86/xen/spinlock.c' using previous resolution. Resolved 'drivers/serial/68328serial.c' using previous resolution. Resolved 'drivers/serial/8250.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git rm arch/x86/kernel/apic_64.c rm 'arch/x86/kernel/apic_64.c' rm 'arch/x86/kernel/apic_64.c' $ git commit -v -a Created commit 69de6fa: Merge commit 'sparseirq/auto-sparseirq-next' $ git diff -M --stat --summary HEAD^.. arch/Kconfig | 3 + arch/m68k/kernel/ints.c | 3 + arch/s390/kernel/irq.c | 3 + arch/sparc/kernel/irq.c | 4 + arch/x86/Kconfig | 20 +- arch/x86/configs/i386_defconfig | 1 - arch/x86/kernel/Makefile | 4 +- arch/x86/kernel/acpi/boot.c | 5 +- arch/x86/kernel/{apic_32.c => apic.c} | 468 +++- arch/x86/kernel/apic_64.c | 1848 ------------- arch/x86/kernel/entry_32.S | 2 +- arch/x86/kernel/{io_apic_64.c => io_apic.c} | 1470 +++++++++-- arch/x86/kernel/io_apic_32.c | 2908 --------------------- arch/x86/kernel/irq_32.c | 71 +- arch/x86/kernel/irq_64.c | 74 +- arch/x86/kernel/irqinit_32.c | 48 +- arch/x86/kernel/irqinit_64.c | 28 +- arch/x86/kernel/quirks.c | 3 - arch/x86/kernel/setup.c | 4 + arch/x86/kernel/setup_percpu.c | 19 +- arch/x86/kernel/visws_quirks.c | 32 +- arch/x86/kernel/vmiclock_32.c | 3 + arch/x86/kernel/vmlinux_32.lds.S | 1 + arch/x86/kernel/vmlinux_64.lds.S | 3 + arch/x86/lguest/boot.c | 2 +- arch/x86/mach-generic/bigsmp.c | 4 + arch/x86/mach-generic/es7000.c | 14 + arch/x86/mach-generic/numaq.c | 14 + arch/x86/mach-generic/summit.c | 14 + arch/x86/mach-voyager/voyager_smp.c | 4 +- arch/x86/mm/init_32.c | 3 + arch/x86/xen/irq.c | 2 - arch/x86/xen/spinlock.c | 2 +- drivers/char/hpet.c | 2 +- drivers/char/random.c | 72 +- drivers/char/vr41xx_giu.c | 2 +- drivers/gpio/gpiolib.c | 2 +- drivers/mfd/asic3.c | 4 +- drivers/mfd/htc-egpio.c | 2 +- drivers/net/3c59x.c | 4 +- drivers/net/hamradio/baycom_ser_fdx.c | 4 +- drivers/net/hamradio/scc.c | 6 +- drivers/net/wan/sbni.c | 2 +- drivers/parisc/dino.c | 6 +- drivers/parisc/eisa.c | 4 +- drivers/parisc/gsc.c | 12 +- drivers/parisc/iosapic.c | 4 +- drivers/parisc/superio.c | 4 +- drivers/pci/htirq.c | 22 +- drivers/pci/intr_remapping.c | 221 ++- drivers/pcmcia/at91_cf.c | 2 +- drivers/pcmcia/hd64465_ss.c | 12 +- drivers/pcmcia/vrc4171_card.c | 2 +- drivers/rtc/rtc-vr41xx.c | 4 +- drivers/scsi/aha152x.c | 2 +- drivers/serial/8250.c | 2 +- drivers/serial/amba-pl010.c | 2 +- drivers/serial/amba-pl011.c | 2 +- drivers/serial/cpm_uart/cpm_uart_core.c | 2 +- drivers/serial/m32r_sio.c | 4 +- drivers/serial/serial_core.c | 2 +- drivers/serial/serial_lh7a40x.c | 2 +- drivers/serial/sh-sci.c | 2 +- drivers/serial/ucc_uart.c | 2 +- drivers/xen/events.c | 20 +- fs/proc/proc_misc.c | 72 +- include/asm-generic/vmlinux.lds.h | 13 + include/asm-x86/apic.h | 2 - include/asm-x86/bigsmp/apic.h | 15 +- include/asm-x86/es7000/apic.h | 3 +- include/asm-x86/genapic_32.h | 2 + include/asm-x86/hw_irq.h | 13 +- include/asm-x86/io_apic.h | 24 +- include/asm-x86/irq_vectors.h | 24 +- include/asm-x86/mach-default/entry_arch.h | 1 + include/asm-x86/mach-default/mach_apic.h | 15 +- include/asm-x86/mach-generic/irq_vectors_limits.h | 14 - include/asm-x86/mach-generic/mach_apic.h | 1 + include/asm-x86/numaq/apic.h | 2 - include/asm-x86/summit/apic.h | 1 - include/asm-x86/summit/irq_vectors_limits.h | 14 - include/linux/init.h | 44 + include/linux/interrupt.h | 7 + include/linux/irq.h | 85 +- include/linux/kernel_stat.h | 26 +- init/Makefile | 2 +- init/dyn_array.c | 124 + init/main.c | 11 +- kernel/irq/autoprobe.c | 30 +- kernel/irq/chip.c | 100 +- kernel/irq/handle.c | 272 ++- kernel/irq/internals.h | 4 +- kernel/irq/manage.c | 65 +- kernel/irq/migration.c | 14 +- kernel/irq/proc.c | 44 +- kernel/irq/resend.c | 6 +- kernel/irq/spurious.c | 9 +- 97 files changed, 3044 insertions(+), 5534 deletions(-) rename arch/x86/kernel/{apic_32.c => apic.c} (83%) delete mode 100644 arch/x86/kernel/apic_64.c rename arch/x86/kernel/{io_apic_64.c => io_apic.c} (69%) delete mode 100644 arch/x86/kernel/io_apic_32.c delete mode 100644 include/asm-x86/mach-generic/irq_vectors_limits.h delete mode 100644 include/asm-x86/summit/irq_vectors_limits.h create mode 100644 init/dyn_array.c $ git am -3 ../patches/0001-revert-BUILD_BUG_ON-change.patch Applying revert BUILD_BUG_ON change $ git am -3 ../patches/0001-ftrace-protect-the-definition-of-ftrace_release.patch Applying ftrace: protect the definition of ftrace_release $ git revert 16f9b13de93c8bfdac16b4d15577af2c132358ef Auto-merged kernel/notifier.c Auto-merged lib/Kconfig.debug Finished one revert. Created commit 5e8cacc: Revert "debug: add notifier chain debugging" 2 files changed, 0 insertions(+), 26 deletions(-) $ git am -3 ../patches/0001-debug-add-notifier-chain-debugging.patch Applying debug: add notifier chain debugging $ git am -3 ../patches/0001-sparc-qlogicpti-fallout-from-sbus-removal.patch Applying sparc: qlogicpti fallout from sbus removal $ git am -3 ../patches/PATCH__SND_USB Applying fix SND_USB_US122L selection $ git am -3 ../patches/PATCH__IXGBE Applying fix IXGBE dependencies