$ git checkout master Already on "master" $ git reset --hard stable HEAD is now at a15a82f Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip Merging origin/master $ git merge origin/master Updating a15a82f..8b805ef Fast forward arch/Kconfig | 2 +- arch/ia64/Kconfig | 19 +- arch/ia64/hp/common/hwsw_iommu.c | 9 +- arch/ia64/include/asm/io.h | 24 -- arch/ia64/include/asm/machvec.h | 22 +- arch/ia64/include/asm/meminit.h | 1 - arch/ia64/include/asm/sal.h | 15 +- arch/ia64/include/asm/sn/sn_sal.h | 45 +++ arch/ia64/kernel/acpi.c | 29 ++- arch/ia64/kernel/pci-dma.c | 2 - arch/ia64/kernel/setup.c | 9 +- arch/ia64/mm/discontig.c | 1 - arch/ia64/uv/kernel/setup.c | 6 + arch/x86/include/asm/msr.h | 2 - arch/x86/include/asm/tsc.h | 8 +- arch/x86/kernel/tsc.c | 2 +- arch/x86/oprofile/op_model_ppro.c | 9 +- arch/x86/xen/enlighten.c | 5 +- arch/x86/xen/mmu.c | 13 +- drivers/firmware/dmi_scan.c | 6 +- drivers/message/fusion/mptlan.c | 108 ----- drivers/mmc/core/bus.c | 3 +- drivers/mmc/core/core.c | 6 +- drivers/mmc/core/host.c | 5 +- drivers/mmc/core/sdio_bus.c | 3 +- drivers/mmc/host/mmc_spi.c | 2 +- drivers/mmc/host/sdhci.c | 2 +- drivers/mmc/host/tifm_sd.c | 16 +- drivers/net/wireless/ath5k/base.c | 4 +- drivers/net/wireless/ath5k/desc.c | 16 +- drivers/net/wireless/iwlwifi/iwl-agn.c | 6 +- drivers/net/wireless/iwlwifi/iwl-scan.c | 7 + drivers/net/wireless/iwlwifi/iwl3945-base.c | 15 +- drivers/net/wireless/zd1211rw/zd_usb.c | 2 + drivers/oprofile/event_buffer.c | 6 +- drivers/pci/pci-sysfs.c | 2 +- drivers/pci/quirks.c | 36 +- drivers/pci/rom.c | 6 +- drivers/regulator/Kconfig | 15 +- drivers/staging/Kconfig | 20 +- drivers/staging/usbip/Kconfig | 2 +- fs/ext4/ialloc.c | 2 + fs/ext4/inode.c | 7 +- fs/ext4/mballoc.c | 1 + fs/ext4/super.c | 24 +- fs/jbd/checkpoint.c | 31 ++- fs/jbd2/checkpoint.c | 32 ++- fs/jbd2/journal.c | 2 + fs/nfsd/vfs.c | 5 +- include/asm-generic/memory_model.h | 2 +- include/linux/cnt32_to_63.h | 22 +- include/linux/cpumask.h | 559 ++++++++++++++++++++++++++- include/linux/if_vlan.h | 7 + include/linux/mmc/card.h | 2 +- include/linux/mmc/host.h | 2 +- include/linux/mmc/sdio_func.h | 2 +- include/linux/pci.h | 2 +- include/linux/smp.h | 9 + include/linux/topology.h | 4 +- include/linux/workqueue.h | 8 + include/net/af_unix.h | 1 + kernel/cpu.c | 3 + kernel/sched.c | 7 +- kernel/workqueue.c | 45 +++ lib/cpumask.c | 79 ++++ mm/vmalloc.c | 7 + net/8021q/vlan_core.c | 46 ++- net/core/dev.c | 3 + net/ipv4/tcp.c | 3 +- net/ipv4/xfrm4_state.c | 1 + net/ipv6/addrconf.c | 4 +- net/ipv6/xfrm6_state.c | 1 + net/netfilter/nf_conntrack_helper.c | 3 + net/netfilter/nf_conntrack_proto.c | 5 + net/rfkill/rfkill.c | 2 +- net/unix/af_unix.c | 31 ++- net/unix/garbage.c | 49 ++- 77 files changed, 1166 insertions(+), 358 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_aux.c | 3 +- drivers/s390/scsi/zfcp_ccw.c | 4 ++- drivers/s390/scsi/zfcp_dbf.c | 42 +++++++++++++---------------------- drivers/s390/scsi/zfcp_dbf.h | 8 +----- drivers/s390/scsi/zfcp_erp.c | 1 + drivers/s390/scsi/zfcp_fsf.c | 23 ++++++++----------- drivers/s390/scsi/zfcp_scsi.c | 12 +++------ drivers/scsi/dpt_i2o.c | 4 +- drivers/scsi/megaraid.c | 11 ++++++-- drivers/scsi/megaraid.h | 2 +- drivers/scsi/qla2xxx/qla_def.h | 1 - drivers/scsi/qla2xxx/qla_init.c | 26 ++++------------------ drivers/scsi/qla2xxx/qla_mbx.c | 2 +- drivers/scsi/qla2xxx/qla_os.c | 1 + drivers/scsi/qla2xxx/qla_sup.c | 19 ++++++---------- drivers/scsi/qla2xxx/qla_version.h | 2 +- drivers/scsi/scsi_error.c | 5 ++- 17 files changed, 67 insertions(+), 99 deletions(-) Merging net-current/master $ git merge net-current/master Merge made by recursive. drivers/net/mlx4/en_netdev.c | 2 +- drivers/net/sfc/ethtool.c | 4 ++-- drivers/net/usb/hso.c | 12 +++++++----- net/key/af_key.c | 1 + 4 files changed, 11 insertions(+), 8 deletions(-) Merging sparc-current/master $ git merge sparc-current/master Already up-to-date. Merging sound-current/for-linus $ git merge sound-current/for-linus Merge made by recursive. include/sound/core.h | 10 +++++++--- sound/pci/hda/hda_proc.c | 2 ++ sound/pci/hda/patch_realtek.c | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) Merging arm-current/master $ git merge arm-current/master Merge made by recursive. arch/arm/include/asm/mach/map.h | 13 +++++++------ arch/arm/mach-realview/clock.c | 2 +- arch/arm/mach-versatile/clock.c | 2 +- arch/arm/mm/cache-feroceon-l2.c | 4 ++-- arch/arm/mm/mmu.c | 6 ++++++ arch/arm/plat-iop/setup.c | 5 +++-- 6 files changed, 20 insertions(+), 12 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 Merge made by recursive. scripts/package/builddeb | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) 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. drivers/usb/core/message.c | 1 + drivers/usb/core/sysfs.c | 2 +- drivers/usb/misc/vstusb.c | 2 +- drivers/usb/musb/musb_core.c | 6 +- drivers/usb/musb/musb_core.h | 3 +- drivers/usb/musb/musb_debug.h | 4 +- drivers/usb/musb/musb_host.c | 282 +++++++++++++++++++++++++----------- drivers/usb/musb/musb_host.h | 1 + drivers/usb/musb/omap2430.c | 2 + drivers/usb/musb/tusb6010.c | 2 +- drivers/usb/storage/unusual_devs.h | 7 + include/linux/usb.h | 2 + 12 files changed, 217 insertions(+), 97 deletions(-) Merging cpufreq-current/fixes $ git merge cpufreq-current/fixes Already up-to-date. Merging input-current/for-linus $ git merge input-current/for-linus Merge made by recursive. drivers/input/touchscreen/elo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Merging md-current/for-2.6.26 $ git merge md-current/for-2.6.26 Already up-to-date. Merging dwmw2/master $ git merge dwmw2/master Already up-to-date. Merging arm/devel $ git merge arm/devel Removed arch/arm/boot/compressed/head-clps7500.S Removed arch/arm/mach-clps7500/Makefile Removed arch/arm/mach-clps7500/Makefile.boot Removed arch/arm/mach-clps7500/core.c Removed arch/arm/mach-clps7500/include/mach/acornfb.h Removed arch/arm/mach-clps7500/include/mach/debug-macro.S Removed arch/arm/mach-clps7500/include/mach/dma.h Removed arch/arm/mach-clps7500/include/mach/entry-macro.S Removed arch/arm/mach-clps7500/include/mach/hardware.h Removed arch/arm/mach-clps7500/include/mach/io.h Removed arch/arm/mach-clps7500/include/mach/irq.h Removed arch/arm/mach-clps7500/include/mach/irqs.h Removed arch/arm/mach-clps7500/include/mach/memory.h Removed arch/arm/mach-clps7500/include/mach/system.h Removed arch/arm/mach-clps7500/include/mach/timex.h Removed arch/arm/mach-clps7500/include/mach/uncompress.h Removed arch/arm/mach-clps7500/include/mach/vmalloc.h Auto-merged arch/arm/mach-realview/clock.c CONFLICT (content): Merge conflict in arch/arm/mach-realview/clock.c Auto-merged arch/arm/mach-versatile/clock.c CONFLICT (content): Merge conflict in arch/arm/mach-versatile/clock.c Removed arch/arm/mm/copypage-feroceon.S Removed arch/arm/mm/copypage-v3.S Removed arch/arm/mm/copypage-v4wb.S Removed arch/arm/mm/copypage-v4wt.S Removed arch/arm/mm/copypage-xsc3.S Auto-merged arch/arm/mm/mmu.c Recorded preimage for 'arch/arm/mach-realview/clock.c' Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'arch/arm/mach-realview/clock.c'. Resolved 'arch/arm/mach-versatile/clock.c' using previous resolution. Created commit d0c55a8: Merge commit 'arm/devel' $ git diff -M --stat --summary HEAD^.. arch/arm/Kconfig | 36 ++- arch/arm/Makefile | 1 - arch/arm/boot/compressed/Makefile | 4 - arch/arm/boot/compressed/head-clps7500.S | 86 ----- arch/arm/boot/compressed/misc.c | 2 + arch/arm/include/asm/hardware/iomd.h | 41 --- arch/arm/include/asm/page.h | 32 +- arch/arm/include/asm/processor.h | 2 +- arch/arm/include/asm/setup.h | 6 +- arch/arm/include/asm/string.h | 9 - arch/arm/include/asm/uaccess.h | 2 +- arch/arm/kernel/setup.c | 37 ++- arch/arm/lib/Makefile | 1 - arch/arm/lib/memset.S | 2 +- arch/arm/mach-at91/Kconfig | 7 + arch/arm/mach-clps7500/Makefile | 11 - arch/arm/mach-clps7500/Makefile.boot | 2 - arch/arm/mach-clps7500/core.c | 395 --------------------- arch/arm/mach-clps7500/include/mach/acornfb.h | 33 -- arch/arm/mach-clps7500/include/mach/debug-macro.S | 21 -- arch/arm/mach-clps7500/include/mach/dma.h | 21 -- arch/arm/mach-clps7500/include/mach/entry-macro.S | 16 - arch/arm/mach-clps7500/include/mach/hardware.h | 67 ---- arch/arm/mach-clps7500/include/mach/io.h | 255 ------------- arch/arm/mach-clps7500/include/mach/irq.h | 32 -- arch/arm/mach-clps7500/include/mach/irqs.h | 66 ---- arch/arm/mach-clps7500/include/mach/memory.h | 43 --- arch/arm/mach-clps7500/include/mach/system.h | 23 -- arch/arm/mach-clps7500/include/mach/timex.h | 13 - arch/arm/mach-clps7500/include/mach/uncompress.h | 35 -- arch/arm/mach-clps7500/include/mach/vmalloc.h | 4 - arch/arm/mach-integrator/clock.c | 53 +-- arch/arm/mach-integrator/clock.h | 15 +- arch/arm/mach-integrator/core.c | 34 ++ arch/arm/mach-integrator/impd1.c | 29 ++- arch/arm/mach-integrator/integrator_cp.c | 15 +- arch/arm/mach-omap1/Kconfig | 3 + arch/arm/mach-pxa/Kconfig | 3 + arch/arm/mach-pxa/clock.c | 19 +- arch/arm/mach-pxa/pxa25x.c | 24 +- arch/arm/mach-pxa/pxa27x.c | 30 +- arch/arm/mach-pxa/pxa3xx.c | 30 +- arch/arm/mach-realview/Kconfig | 2 + arch/arm/mach-realview/clock.c | 58 +--- arch/arm/mach-realview/clock.h | 13 +- arch/arm/mach-realview/core.c | 51 +++- arch/arm/mach-realview/core.h | 1 - arch/arm/mach-realview/realview_eb.c | 2 - arch/arm/mach-realview/realview_pb1176.c | 2 - arch/arm/mach-realview/realview_pb11mp.c | 2 - arch/arm/mach-s3c2410/Kconfig | 1 + arch/arm/mach-s3c2412/Kconfig | 1 + arch/arm/mach-s3c2440/Kconfig | 1 + arch/arm/mach-s3c2442/Kconfig | 1 + arch/arm/mach-sa1100/clock.c | 100 ++---- arch/arm/mach-versatile/Kconfig | 2 + arch/arm/mach-versatile/clock.c | 57 +--- arch/arm/mach-versatile/clock.h | 14 +- arch/arm/mach-versatile/core.c | 55 +++- arch/arm/mm/Kconfig | 65 +--- arch/arm/mm/copypage-feroceon.S | 95 ----- arch/arm/mm/copypage-feroceon.c | 111 ++++++ arch/arm/mm/copypage-v3.S | 67 ---- arch/arm/mm/copypage-v3.c | 81 +++++ arch/arm/mm/copypage-v4mc.c | 53 ++-- arch/arm/mm/copypage-v4wb.S | 79 ---- arch/arm/mm/copypage-v4wb.c | 94 +++++ arch/arm/mm/copypage-v4wt.S | 73 ---- arch/arm/mm/copypage-v4wt.c | 88 +++++ arch/arm/mm/copypage-v6.c | 84 +++-- arch/arm/mm/copypage-xsc3.S | 97 ----- arch/arm/mm/copypage-xsc3.c | 113 ++++++ arch/arm/mm/copypage-xscale.c | 47 ++-- arch/arm/mm/init.c | 57 ++-- arch/arm/mm/mm.h | 2 +- arch/arm/mm/mmu.c | 109 +++--- arch/arm/mm/nommu.c | 18 +- arch/arm/mm/pgd.c | 2 +- arch/arm/mm/proc-syms.c | 4 +- arch/arm/plat-mxc/Kconfig | 2 + arch/arm/plat-omap/Kconfig | 2 + drivers/ide/Kconfig | 2 +- drivers/ide/ide_arm.c | 11 +- drivers/input/serio/Kconfig | 2 +- drivers/mfd/asic3.c | 6 +- drivers/mtd/maps/ixp2000.c | 2 +- drivers/mtd/maps/ixp4xx.c | 2 +- drivers/mtd/nand/s3c2410.c | 4 +- drivers/net/cs89x0.c | 6 +- drivers/video/Kconfig | 2 +- drivers/video/sa1100fb.c | 2 +- include/linux/highmem.h | 2 + 92 files changed, 1127 insertions(+), 2180 deletions(-) delete mode 100644 arch/arm/boot/compressed/head-clps7500.S delete mode 100644 arch/arm/mach-clps7500/Makefile delete mode 100644 arch/arm/mach-clps7500/Makefile.boot delete mode 100644 arch/arm/mach-clps7500/core.c delete mode 100644 arch/arm/mach-clps7500/include/mach/acornfb.h delete mode 100644 arch/arm/mach-clps7500/include/mach/debug-macro.S delete mode 100644 arch/arm/mach-clps7500/include/mach/dma.h delete mode 100644 arch/arm/mach-clps7500/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-clps7500/include/mach/hardware.h delete mode 100644 arch/arm/mach-clps7500/include/mach/io.h delete mode 100644 arch/arm/mach-clps7500/include/mach/irq.h delete mode 100644 arch/arm/mach-clps7500/include/mach/irqs.h delete mode 100644 arch/arm/mach-clps7500/include/mach/memory.h delete mode 100644 arch/arm/mach-clps7500/include/mach/system.h delete mode 100644 arch/arm/mach-clps7500/include/mach/timex.h delete mode 100644 arch/arm/mach-clps7500/include/mach/uncompress.h delete mode 100644 arch/arm/mach-clps7500/include/mach/vmalloc.h delete mode 100644 arch/arm/mm/copypage-feroceon.S create mode 100644 arch/arm/mm/copypage-feroceon.c delete mode 100644 arch/arm/mm/copypage-v3.S create mode 100644 arch/arm/mm/copypage-v3.c delete mode 100644 arch/arm/mm/copypage-v4wb.S create mode 100644 arch/arm/mm/copypage-v4wb.c delete mode 100644 arch/arm/mm/copypage-v4wt.S create mode 100644 arch/arm/mm/copypage-v4wt.c delete mode 100644 arch/arm/mm/copypage-xsc3.S create mode 100644 arch/arm/mm/copypage-xsc3.c Merging avr32/avr32-arch $ git merge avr32/avr32-arch Merge made by recursive. arch/avr32/mach-at32ap/at32ap700x.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) 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/include/arch-v10/arch/byteorder.h | 10 ++++++---- arch/cris/include/arch-v32/arch/byteorder.h | 6 ++++-- arch/cris/include/asm/byteorder.h | 20 ++++---------------- 3 files changed, 14 insertions(+), 22 deletions(-) Merging ia64/test $ git merge ia64/test Already up-to-date. Merging quilt/m68k $ git merge quilt/m68k Merge made by recursive. arch/m68k/fpsp040/setox.S | 4 +- arch/m68k/mac/baboon.c | 42 +++++++++++---- arch/m68k/mac/config.c | 3 - arch/m68k/mac/debug.c | 1 - arch/m68k/mac/macints.c | 9 ++-- arch/m68k/mac/misc.c | 16 ++++-- arch/m68k/mac/oss.c | 1 - arch/m68k/mac/via.c | 80 ++++++++++++----------------- drivers/ide/macide.c | 1 - drivers/macintosh/via-cuda.c | 1 - drivers/macintosh/via-macii.c | 1 - drivers/macintosh/via-maciisi.c | 1 - drivers/macintosh/via-pmu68k.c | 1 - drivers/scsi/mac_esp.c | 100 +++++++++++++++++++++++++------------ drivers/scsi/mac_scsi.c | 1 - drivers/video/console/fbcon.c | 78 ++-------------------------- drivers/video/macfb.c | 107 ++++++++++++++++++-------------------- include/asm-m68k/byteorder.h | 16 ++---- include/asm-m68k/machw.h | 22 -------- 19 files changed, 208 insertions(+), 277 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 Already up-to-date. Merging parisc/master $ git merge parisc/master Already up-to-date. Merging powerpc/next $ git merge powerpc/next Merge made by recursive. arch/powerpc/boot/dts/kuroboxHD.dts | 1 - arch/powerpc/boot/dts/kuroboxHG.dts | 1 - arch/powerpc/boot/dts/lite5200.dts | 1 - arch/powerpc/boot/dts/lite5200b.dts | 1 - arch/powerpc/boot/dts/motionpro.dts | 1 - arch/powerpc/boot/dts/mpc8315erdb.dts | 1 - arch/powerpc/boot/dts/mpc8349emitx.dts | 1 - arch/powerpc/boot/dts/mpc8349emitxgp.dts | 1 - arch/powerpc/boot/dts/mpc8377_rdb.dts | 1 - arch/powerpc/boot/dts/mpc8378_rdb.dts | 1 - arch/powerpc/boot/dts/mpc8379_rdb.dts | 1 - arch/powerpc/boot/dts/pcm030.dts | 2 - arch/powerpc/boot/dts/tqm5200.dts | 1 - arch/powerpc/boot/libfdt-wrapper.c | 2 +- arch/powerpc/include/asm/byteorder.h | 38 ++-- arch/powerpc/include/asm/cputable.h | 6 +- arch/powerpc/include/asm/dma-mapping.h | 36 +--- arch/powerpc/include/asm/eeh.h | 8 +- arch/powerpc/include/asm/lppaca.h | 3 +- arch/powerpc/include/asm/pci-bridge.h | 4 +- arch/powerpc/include/asm/pci.h | 11 +- arch/powerpc/include/asm/time.h | 20 -- arch/powerpc/include/asm/vdso_datapage.h | 3 + arch/powerpc/kernel/asm-offsets.c | 1 + arch/powerpc/kernel/paca.c | 1 + arch/powerpc/kernel/pci-common.c | 276 ++++++++++++++++++---------- arch/powerpc/kernel/pci_32.c | 101 ++++------- arch/powerpc/kernel/pci_64.c | 134 +++++++------- arch/powerpc/kernel/rtas_pci.c | 48 ----- arch/powerpc/kernel/smp-tbsync.c | 12 +- arch/powerpc/kernel/time.c | 36 +---- arch/powerpc/kernel/vdso32/gettimeofday.S | 208 +++++++++++++--------- arch/powerpc/kernel/vdso64/gettimeofday.S | 141 ++++++++------- arch/powerpc/lib/memcpy_64.S | 16 ++- arch/powerpc/mm/fault.c | 12 +- arch/powerpc/mm/hugetlbpage.c | 22 +- arch/powerpc/platforms/ps3/device-init.c | 29 +++- arch/powerpc/platforms/pseries/eeh.c | 44 +++-- arch/powerpc/platforms/pseries/pci_dlpar.c | 163 ++++++++-------- arch/powerpc/platforms/pseries/xics.c | 28 +++- drivers/pci/hotplug/rpadlpar_core.c | 69 +++---- 41 files changed, 757 insertions(+), 729 deletions(-) Merging 4xx/next $ git merge 4xx/next Already up-to-date. Merging galak/next $ git merge galak/next Merge made by recursive. arch/powerpc/Makefile | 1 - arch/powerpc/include/asm/processor.h | 6 + arch/powerpc/include/asm/sfp-machine.h | 58 ++- arch/powerpc/kernel/head_fsl_booke.S | 7 +- arch/powerpc/kernel/traps.c | 62 +++- arch/powerpc/math-emu/Makefile | 2 + arch/powerpc/math-emu/fadd.c | 1 - arch/powerpc/math-emu/fcmpo.c | 5 +- arch/powerpc/math-emu/fdiv.c | 9 +- arch/powerpc/math-emu/fdivs.c | 9 +- arch/powerpc/math-emu/fmadd.c | 5 +- arch/powerpc/math-emu/fmadds.c | 5 +- arch/powerpc/math-emu/fmsub.c | 5 +- arch/powerpc/math-emu/fmsubs.c | 5 +- arch/powerpc/math-emu/fmul.c | 3 +- arch/powerpc/math-emu/fmuls.c | 3 +- arch/powerpc/math-emu/fnmadd.c | 5 +- arch/powerpc/math-emu/fnmadds.c | 5 +- arch/powerpc/math-emu/fnmsub.c | 5 +- arch/powerpc/math-emu/fnmsubs.c | 5 +- arch/powerpc/math-emu/fsqrt.c | 5 +- arch/powerpc/math-emu/fsqrts.c | 5 +- arch/powerpc/math-emu/fsub.c | 3 +- arch/powerpc/math-emu/fsubs.c | 3 +- arch/powerpc/math-emu/math_efp.c | 720 ++++++++++++++++++++++++++++++++ 25 files changed, 862 insertions(+), 80 deletions(-) create mode 100644 arch/powerpc/math-emu/math_efp.c Merging pxa/for-next $ git merge pxa/for-next Auto-merged arch/arm/mach-pxa/Kconfig Merge made by recursive. arch/arm/configs/h5000_defconfig | 996 ++++++++++++++++++++++++++++++++ arch/arm/mach-pxa/Kconfig | 4 + arch/arm/mach-pxa/Makefile | 1 + arch/arm/mach-pxa/h5000.c | 200 +++++++ arch/arm/mach-pxa/include/mach/h5000.h | 113 ++++ 5 files changed, 1314 insertions(+), 0 deletions(-) create mode 100644 arch/arm/configs/h5000_defconfig create mode 100644 arch/arm/mach-pxa/h5000.c create mode 100644 arch/arm/mach-pxa/include/mach/h5000.h Merging s390/features $ git merge s390/features Auto-merged drivers/s390/scsi/zfcp_aux.c Auto-merged drivers/s390/scsi/zfcp_ccw.c Auto-merged drivers/s390/scsi/zfcp_dbf.c Auto-merged drivers/s390/scsi/zfcp_erp.c Auto-merged drivers/s390/scsi/zfcp_fsf.c Auto-merged drivers/s390/scsi/zfcp_scsi.c Auto-merged include/asm-generic/memory_model.h Merge made by recursive. Documentation/kernel-parameters.txt | 3 + Documentation/kmsg/s390/hvc_iucv | 50 ++ arch/powerpc/include/asm/elf.h | 2 +- arch/powerpc/kernel/vdso.c | 3 +- arch/s390/Kconfig | 5 + arch/s390/appldata/appldata.h | 4 - arch/s390/appldata/appldata_base.c | 11 +- arch/s390/appldata/appldata_os.c | 20 +- arch/s390/crypto/aes_s390.c | 13 +- arch/s390/hypfs/hypfs_diag.c | 9 +- arch/s390/hypfs/inode.c | 13 +- arch/s390/include/asm/auxvec.h | 2 + arch/s390/include/asm/bug.h | 5 +- arch/s390/include/asm/elf.h | 16 + arch/s390/include/asm/ftrace.h | 8 + arch/s390/include/asm/isc.h | 1 + arch/s390/include/asm/mmu.h | 1 + arch/s390/include/asm/page.h | 2 + arch/s390/include/asm/processor.h | 4 +- arch/s390/include/asm/ptrace.h | 2 +- arch/s390/include/asm/qdio.h | 16 +- arch/s390/include/asm/sigp.h | 1 + arch/s390/include/asm/smp.h | 5 +- arch/s390/include/asm/syscall.h | 4 +- arch/s390/include/asm/sysinfo.h | 11 + arch/s390/include/asm/system.h | 20 +- arch/s390/include/asm/vdso.h | 39 ++ arch/s390/kernel/Makefile | 17 +- arch/s390/kernel/asm-offsets.c | 17 +- arch/s390/kernel/compat_signal.c | 2 +- arch/s390/kernel/cpcmd.c | 6 +- arch/s390/kernel/debug.c | 36 +- arch/s390/kernel/entry.S | 41 +- arch/s390/kernel/entry64.S | 34 +- arch/s390/kernel/mcount.S | 48 ++ arch/s390/kernel/process.c | 3 + arch/s390/kernel/processor.c | 97 ++++ arch/s390/kernel/ptrace.c | 12 +- arch/s390/kernel/s390_ksyms.c | 5 + arch/s390/kernel/setup.c | 180 ++----- arch/s390/kernel/signal.c | 6 +- arch/s390/kernel/smp.c | 191 +------ arch/s390/kernel/time.c | 256 ++++++--- arch/s390/kernel/topology.c | 4 +- arch/s390/kernel/vdso.c | 232 ++++++++ arch/s390/kernel/vdso32/Makefile | 55 ++ arch/s390/kernel/vdso32/clock_getres.S | 39 ++ arch/s390/kernel/vdso32/clock_gettime.S | 128 +++++ arch/s390/kernel/vdso32/gettimeofday.S | 82 +++ arch/s390/kernel/vdso32/note.S | 12 + arch/s390/kernel/vdso32/vdso32.lds.S | 138 +++++ arch/s390/kernel/vdso32/vdso32_wrapper.S | 13 + arch/s390/kernel/vdso64/Makefile | 55 ++ arch/s390/kernel/vdso64/clock_getres.S | 39 ++ arch/s390/kernel/vdso64/clock_gettime.S | 89 ++++ arch/s390/kernel/vdso64/gettimeofday.S | 56 ++ arch/s390/kernel/vdso64/note.S | 12 + arch/s390/kernel/vdso64/vdso64.lds.S | 138 +++++ arch/s390/kernel/vdso64/vdso64_wrapper.S | 13 + arch/s390/mm/extmem.c | 105 ++--- arch/sh/include/asm/elf.h | 2 +- arch/sh/kernel/vsyscall/vsyscall.c | 3 +- arch/x86/include/asm/elf.h | 2 +- arch/x86/vdso/vdso32-setup.c | 2 +- arch/x86/vdso/vma.c | 2 +- drivers/char/Kconfig | 10 + drivers/char/Makefile | 1 + drivers/char/hvc_iucv.c | 850 ++++++++++++++++++++++++++++++ drivers/s390/block/dasd_devmap.c | 13 +- drivers/s390/block/dasd_proc.c | 28 +- drivers/s390/block/dcssblk.c | 76 ++-- drivers/s390/block/xpram.c | 40 +- drivers/s390/char/monreader.c | 40 +- drivers/s390/char/monwriter.c | 4 +- drivers/s390/char/sclp_cmd.c | 31 +- drivers/s390/char/sclp_config.c | 9 +- drivers/s390/char/sclp_cpi_sys.c | 11 +- drivers/s390/char/sclp_sdias.c | 17 +- drivers/s390/char/vmcp.c | 10 +- drivers/s390/char/vmlogrdr.c | 25 +- drivers/s390/char/vmur.c | 14 +- drivers/s390/char/zcore.c | 13 +- drivers/s390/cio/blacklist.c | 13 +- drivers/s390/cio/ccwgroup.c | 8 +- drivers/s390/cio/chsc.c | 7 +- drivers/s390/cio/cio.c | 79 ++-- drivers/s390/cio/cmf.c | 7 +- drivers/s390/cio/css.c | 7 +- drivers/s390/cio/device.c | 2 +- drivers/s390/cio/qdio.h | 3 + drivers/s390/cio/qdio_main.c | 25 +- drivers/s390/cio/qdio_perf.c | 6 + drivers/s390/cio/qdio_perf.h | 4 + drivers/s390/cio/qdio_setup.c | 33 +- drivers/s390/crypto/ap_bus.c | 211 +++++++- drivers/s390/crypto/ap_bus.h | 6 +- drivers/s390/kvm/kvm_virtio.c | 4 +- drivers/s390/net/ctcm_fsms.c | 45 +- drivers/s390/net/ctcm_main.c | 71 ++- drivers/s390/net/ctcm_main.h | 6 - drivers/s390/net/ctcm_mpc.c | 14 +- drivers/s390/net/ctcm_sysfs.c | 2 + drivers/s390/net/lcs.c | 91 ++-- drivers/s390/net/netiucv.c | 63 ++- drivers/s390/net/qeth_core.h | 9 +- drivers/s390/net/qeth_core_main.c | 174 ++++--- drivers/s390/net/qeth_l2_main.c | 36 +- drivers/s390/net/qeth_l3_main.c | 210 ++++---- drivers/s390/scsi/zfcp_aux.c | 27 +- drivers/s390/scsi/zfcp_ccw.c | 2 + drivers/s390/scsi/zfcp_cfdc.c | 2 + drivers/s390/scsi/zfcp_dbf.c | 2 + drivers/s390/scsi/zfcp_def.h | 2 + drivers/s390/scsi/zfcp_erp.c | 7 +- drivers/s390/scsi/zfcp_fc.c | 2 + drivers/s390/scsi/zfcp_fsf.c | 2 + drivers/s390/scsi/zfcp_qdio.c | 2 + drivers/s390/scsi/zfcp_scsi.c | 2 + drivers/s390/scsi/zfcp_sysfs.c | 2 + drivers/s390/sysinfo.c | 127 +++++- fs/binfmt_elf.c | 2 +- include/asm-generic/memory_model.h | 2 +- include/net/iucv/iucv.h | 45 ++ net/iucv/af_iucv.c | 18 +- net/iucv/iucv.c | 160 +++++-- 125 files changed, 3965 insertions(+), 1211 deletions(-) create mode 100644 Documentation/kmsg/s390/hvc_iucv create mode 100644 arch/s390/include/asm/ftrace.h create mode 100644 arch/s390/include/asm/vdso.h create mode 100644 arch/s390/kernel/mcount.S create mode 100644 arch/s390/kernel/processor.c create mode 100644 arch/s390/kernel/vdso.c create mode 100644 arch/s390/kernel/vdso32/Makefile create mode 100644 arch/s390/kernel/vdso32/clock_getres.S create mode 100644 arch/s390/kernel/vdso32/clock_gettime.S create mode 100644 arch/s390/kernel/vdso32/gettimeofday.S create mode 100644 arch/s390/kernel/vdso32/note.S create mode 100644 arch/s390/kernel/vdso32/vdso32.lds.S create mode 100644 arch/s390/kernel/vdso32/vdso32_wrapper.S create mode 100644 arch/s390/kernel/vdso64/Makefile create mode 100644 arch/s390/kernel/vdso64/clock_getres.S create mode 100644 arch/s390/kernel/vdso64/clock_gettime.S create mode 100644 arch/s390/kernel/vdso64/gettimeofday.S create mode 100644 arch/s390/kernel/vdso64/note.S create mode 100644 arch/s390/kernel/vdso64/vdso64.lds.S create mode 100644 arch/s390/kernel/vdso64/vdso64_wrapper.S create mode 100644 drivers/char/hvc_iucv.c Merging sh/master $ git merge sh/master Already up-to-date. Merging sparc/master $ git merge sparc/master Already up-to-date. Merging x86/auto-x86-next $ git merge x86/auto-x86-next Auto-merged Documentation/kernel-parameters.txt Auto-merged arch/x86/include/asm/msr.h Auto-merged arch/x86/kernel/tsc.c Merge made by recursive. Documentation/filesystems/proc.txt | 9 +- Documentation/kernel-parameters.txt | 33 +++- Documentation/nmi_watchdog.txt | 5 + Documentation/x86/x86_64/boot-options.txt | 11 - Documentation/x86/x86_64/mm.txt | 2 +- arch/x86/Kconfig | 67 ++++-- arch/x86/Kconfig.debug | 20 +-- arch/x86/ia32/ia32_signal.c | 14 +- arch/x86/include/asm/bitops.h | 10 +- arch/x86/include/asm/byteorder.h | 74 +++---- arch/x86/include/asm/cpufeature.h | 3 + arch/x86/include/asm/hypervisor.h | 26 +++ arch/x86/include/asm/io_apic.h | 10 + arch/x86/include/asm/irq.h | 4 - arch/x86/include/asm/kexec.h | 31 ++-- arch/x86/include/asm/msr.h | 8 +- arch/x86/include/asm/pci.h | 2 + arch/x86/include/asm/processor.h | 4 + arch/x86/include/asm/setup.h | 4 + arch/x86/include/asm/uv/bios.h | 34 +++- arch/x86/include/asm/uv/uv_hub.h | 87 ++++++- arch/x86/include/asm/vmware.h | 27 +++ arch/x86/kernel/Makefile | 5 +- arch/x86/kernel/bios_uv.c | 60 +++++- arch/x86/kernel/check.c | 161 +++++++++++++ arch/x86/kernel/cpu/Makefile | 1 + arch/x86/kernel/cpu/common.c | 2 + arch/x86/kernel/cpu/hypervisor.c | 57 +++++ arch/x86/kernel/cpu/mtrr/main.c | 346 ++++++++++++++--------------- arch/x86/kernel/cpu/vmware.c | 111 +++++++++ arch/x86/kernel/dumpstack.c | 319 ++++++++++++++++++++++++++ arch/x86/kernel/dumpstack.h | 39 ++++ arch/x86/kernel/dumpstack_32.c | 302 +------------------------- arch/x86/kernel/dumpstack_64.c | 282 +----------------------- arch/x86/kernel/entry_64.S | 2 + arch/x86/kernel/genx2apic_uv_x.c | 106 +++++++++- arch/x86/kernel/machine_kexec_32.c | 104 +++++++-- arch/x86/kernel/nmi.c | 58 ++++- arch/x86/kernel/relocate_kernel_32.S | 115 ---------- arch/x86/kernel/setup.c | 158 +------------- arch/x86/kernel/signal_32.c | 82 ++++++- arch/x86/kernel/signal_64.c | 103 +++++++-- arch/x86/kernel/tsc.c | 42 +++- arch/x86/kernel/tsc_sync.c | 8 +- arch/x86/mm/fault.c | 11 +- arch/x86/mm/init_32.c | 4 +- arch/x86/mm/init_64.c | 2 - arch/x86/pci/common.c | 17 ++ drivers/acpi/pci_irq.c | 56 +++++ drivers/firmware/dmi_scan.c | 11 + drivers/misc/sgi-xp/xp.h | 7 +- drivers/misc/sgi-xp/xp_main.c | 7 + drivers/misc/sgi-xp/xp_sn2.c | 34 +++ drivers/misc/sgi-xp/xp_uv.c | 70 ++++++- drivers/misc/sgi-xp/xpc.h | 12 + drivers/misc/sgi-xp/xpc_sn2.c | 15 +- drivers/misc/sgi-xp/xpc_uv.c | 290 +++++++++++++++++++----- drivers/pci/quirks.c | 170 +++++++++++++-- include/linux/dmi.h | 2 + include/linux/kexec.h | 4 + include/linux/pci.h | 6 + include/linux/pci_ids.h | 5 + 62 files changed, 2316 insertions(+), 1355 deletions(-) create mode 100644 arch/x86/include/asm/hypervisor.h create mode 100644 arch/x86/include/asm/vmware.h create mode 100644 arch/x86/kernel/check.c create mode 100644 arch/x86/kernel/cpu/hypervisor.c create mode 100644 arch/x86/kernel/cpu/vmware.c create mode 100644 arch/x86/kernel/dumpstack.c create mode 100644 arch/x86/kernel/dumpstack.h Merging xtensa/master $ git merge xtensa/master Merge made by recursive. arch/xtensa/Makefile | 28 +-- arch/xtensa/boot/boot-elf/boot.lds.S | 2 +- arch/xtensa/boot/boot-redboot/bootstrap.S | 2 +- .../asm-xtensa => arch/xtensa/include/asm}/Kbuild | 0 .../xtensa/include/asm}/asmmacro.h | 2 +- .../xtensa/include/asm}/atomic.h | 0 .../xtensa/include/asm}/auxvec.h | 0 .../xtensa/include/asm}/bitops.h | 0 .../xtensa/include/asm}/bootparam.h | 0 .../asm-xtensa => arch/xtensa/include/asm}/bug.h | 0 .../asm-xtensa => arch/xtensa/include/asm}/bugs.h | 0 .../xtensa/include/asm}/byteorder.h | 32 ++-- .../asm-xtensa => arch/xtensa/include/asm}/cache.h | 2 +- .../xtensa/include/asm}/cacheasm.h | 0 .../xtensa/include/asm}/cacheflush.h | 0 .../xtensa/include/asm}/checksum.h | 2 +- .../xtensa/include/asm}/coprocessor.h | 4 +- .../xtensa/include/asm}/cpumask.h | 0 .../xtensa/include/asm}/cputime.h | 0 .../xtensa/include/asm}/current.h | 0 .../asm-xtensa => arch/xtensa/include/asm}/delay.h | 0 .../xtensa/include/asm}/device.h | 0 .../asm-xtensa => arch/xtensa/include/asm}/div64.h | 0 .../xtensa/include/asm}/dma-mapping.h | 0 .../asm-xtensa => arch/xtensa/include/asm}/dma.h | 0 .../asm-xtensa => arch/xtensa/include/asm}/elf.h | 0 .../xtensa/include/asm}/emergency-restart.h | 0 .../asm-xtensa => arch/xtensa/include/asm}/errno.h | 0 .../asm-xtensa => arch/xtensa/include/asm}/fb.h | 0 .../asm-xtensa => arch/xtensa/include/asm}/fcntl.h | 0 .../asm-xtensa => arch/xtensa/include/asm}/futex.h | 0 .../xtensa/include/asm}/hardirq.h | 0 .../xtensa/include/asm}/highmem.h | 0 .../xtensa/include/asm}/hw_irq.h | 0 .../asm-xtensa => arch/xtensa/include/asm}/io.h | 0 .../asm-xtensa => arch/xtensa/include/asm}/ioctl.h | 0 .../xtensa/include/asm}/ioctls.h | 0 .../xtensa/include/asm}/ipcbuf.h | 0 .../asm-xtensa => arch/xtensa/include/asm}/irq.h | 4 +- .../xtensa/include/asm}/irq_regs.h | 0 .../xtensa/include/asm}/kdebug.h | 0 .../xtensa/include/asm}/kmap_types.h | 0 .../xtensa/include/asm}/linkage.h | 0 .../asm-xtensa => arch/xtensa/include/asm}/local.h | 0 .../asm-xtensa => arch/xtensa/include/asm}/mman.h | 0 .../asm-xtensa => arch/xtensa/include/asm}/mmu.h | 0 .../xtensa/include/asm}/mmu_context.h | 0 .../xtensa/include/asm}/module.h | 0 .../xtensa/include/asm}/msgbuf.h | 0 .../asm-xtensa => arch/xtensa/include/asm}/mutex.h | 0 .../asm-xtensa => arch/xtensa/include/asm}/page.h | 0 .../asm-xtensa => arch/xtensa/include/asm}/param.h | 0 .../xtensa/include/asm}/pci-bridge.h | 0 .../asm-xtensa => arch/xtensa/include/asm}/pci.h | 0 .../xtensa/include/asm}/percpu.h | 0 .../xtensa/include/asm}/pgalloc.h | 0 .../xtensa/include/asm}/pgtable.h | 0 .../xtensa/include/asm}/platform.h | 2 - .../asm-xtensa => arch/xtensa/include/asm}/poll.h | 0 .../xtensa/include/asm}/posix_types.h | 0 .../xtensa/include/asm}/processor.h | 2 +- .../xtensa/include/asm}/ptrace.h | 2 +- .../asm-xtensa => arch/xtensa/include/asm}/regs.h | 0 .../xtensa/include/asm}/resource.h | 0 .../asm-xtensa => arch/xtensa/include/asm}/rmap.h | 0 .../asm-xtensa => arch/xtensa/include/asm}/rwsem.h | 0 .../xtensa/include/asm}/scatterlist.h | 0 .../xtensa/include/asm}/sections.h | 0 .../xtensa/include/asm}/segment.h | 0 .../xtensa/include/asm}/sembuf.h | 0 .../xtensa/include/asm}/serial.h | 2 +- .../asm-xtensa => arch/xtensa/include/asm}/setup.h | 0 .../xtensa/include/asm}/shmbuf.h | 0 .../xtensa/include/asm}/shmparam.h | 0 .../xtensa/include/asm}/sigcontext.h | 0 .../xtensa/include/asm}/siginfo.h | 0 .../xtensa/include/asm}/signal.h | 0 .../asm-xtensa => arch/xtensa/include/asm}/smp.h | 0 .../xtensa/include/asm}/socket.h | 0 .../xtensa/include/asm}/sockios.h | 0 .../xtensa/include/asm}/spinlock.h | 0 .../asm-xtensa => arch/xtensa/include/asm}/stat.h | 0 .../xtensa/include/asm}/statfs.h | 0 .../xtensa/include/asm}/string.h | 0 .../xtensa/include/asm}/syscall.h | 0 .../xtensa/include/asm}/system.h | 0 .../xtensa/include/asm}/termbits.h | 0 .../xtensa/include/asm}/termios.h | 0 .../xtensa/include/asm}/thread_info.h | 0 .../asm-xtensa => arch/xtensa/include/asm}/timex.h | 0 .../asm-xtensa => arch/xtensa/include/asm}/tlb.h | 0 .../xtensa/include/asm}/tlbflush.h | 0 .../xtensa/include/asm}/topology.h | 0 .../asm-xtensa => arch/xtensa/include/asm}/types.h | 0 .../xtensa/include/asm}/uaccess.h | 0 .../xtensa/include/asm}/ucontext.h | 0 .../xtensa/include/asm}/unaligned.h | 0 .../xtensa/include/asm}/unistd.h | 0 .../asm-xtensa => arch/xtensa/include/asm}/user.h | 0 .../asm-xtensa => arch/xtensa/include/asm}/vga.h | 0 .../asm-xtensa => arch/xtensa/include/asm}/xor.h | 0 arch/xtensa/kernel/entry.S | 2 +- arch/xtensa/kernel/vmlinux.lds.S | 2 +- arch/xtensa/lib/checksum.S | 2 +- arch/xtensa/lib/memcopy.S | 2 +- arch/xtensa/lib/memset.S | 2 +- arch/xtensa/lib/strncpy_user.S | 2 +- arch/xtensa/lib/strnlen_user.S | 2 +- arch/xtensa/lib/usercopy.S | 2 +- arch/xtensa/platforms/iss/console.c | 2 +- .../platforms/iss/include/platform}/hardware.h | 0 .../platforms/iss/include/platform}/simcall.h | 0 arch/xtensa/platforms/iss/io.c | 2 +- arch/xtensa/platforms/iss/network.c | 2 +- arch/xtensa/platforms/xt2000/Makefile | 5 + .../platforms/xt2000/include/platform/hardware.h | 55 ++++++ .../platforms/xt2000/include/platform/serial.h | 28 +++ arch/xtensa/platforms/xt2000/setup.c | 181 ++++++++++++++++++++ .../xtensa/variants/dc232b/include/variant}/core.h | 0 .../variants/dc232b/include/variant}/tie-asm.h | 0 .../xtensa/variants/dc232b/include/variant}/tie.h | 0 .../xtensa/variants/fsf/include/variant}/core.h | 0 .../xtensa/variants/fsf/include/variant}/tie-asm.h | 0 .../xtensa/variants/fsf/include/variant}/tie.h | 0 124 files changed, 316 insertions(+), 61 deletions(-) rename {include/asm-xtensa => arch/xtensa/include/asm}/Kbuild (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/asmmacro.h (98%) rename {include/asm-xtensa => arch/xtensa/include/asm}/atomic.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/auxvec.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/bitops.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/bootparam.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/bug.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/bugs.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/byteorder.h (82%) rename {include/asm-xtensa => arch/xtensa/include/asm}/cache.h (96%) rename {include/asm-xtensa => arch/xtensa/include/asm}/cacheasm.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/cacheflush.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/checksum.h (99%) rename {include/asm-xtensa => arch/xtensa/include/asm}/coprocessor.h (98%) rename {include/asm-xtensa => arch/xtensa/include/asm}/cpumask.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/cputime.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/current.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/delay.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/device.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/div64.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/dma-mapping.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/dma.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/elf.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/emergency-restart.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/errno.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/fb.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/fcntl.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/futex.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/hardirq.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/highmem.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/hw_irq.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/io.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/ioctl.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/ioctls.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/ipcbuf.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/irq.h (89%) rename {include/asm-xtensa => arch/xtensa/include/asm}/irq_regs.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/kdebug.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/kmap_types.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/linkage.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/local.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/mman.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/mmu.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/mmu_context.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/module.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/msgbuf.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/mutex.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/page.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/param.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/pci-bridge.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/pci.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/percpu.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/pgalloc.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/pgtable.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/platform.h (98%) rename {include/asm-xtensa => arch/xtensa/include/asm}/poll.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/posix_types.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/processor.h (99%) rename {include/asm-xtensa => arch/xtensa/include/asm}/ptrace.h (99%) rename {include/asm-xtensa => arch/xtensa/include/asm}/regs.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/resource.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/rmap.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/rwsem.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/scatterlist.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/sections.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/segment.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/sembuf.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/serial.h (92%) rename {include/asm-xtensa => arch/xtensa/include/asm}/setup.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/shmbuf.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/shmparam.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/sigcontext.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/siginfo.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/signal.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/smp.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/socket.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/sockios.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/spinlock.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/stat.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/statfs.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/string.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/syscall.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/system.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/termbits.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/termios.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/thread_info.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/timex.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/tlb.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/tlbflush.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/topology.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/types.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/uaccess.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/ucontext.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/unaligned.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/unistd.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/user.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/vga.h (100%) rename {include/asm-xtensa => arch/xtensa/include/asm}/xor.h (100%) rename {include/asm-xtensa/platform-iss => arch/xtensa/platforms/iss/include/platform}/hardware.h (100%) rename {include/asm-xtensa/platform-iss => arch/xtensa/platforms/iss/include/platform}/simcall.h (100%) create mode 100644 arch/xtensa/platforms/xt2000/Makefile create mode 100644 arch/xtensa/platforms/xt2000/include/platform/hardware.h create mode 100644 arch/xtensa/platforms/xt2000/include/platform/serial.h create mode 100644 arch/xtensa/platforms/xt2000/setup.c rename {include/asm-xtensa/variant-dc232b => arch/xtensa/variants/dc232b/include/variant}/core.h (100%) rename {include/asm-xtensa/variant-dc232b => arch/xtensa/variants/dc232b/include/variant}/tie-asm.h (100%) rename {include/asm-xtensa/variant-dc232b => arch/xtensa/variants/dc232b/include/variant}/tie.h (100%) rename {include/asm-xtensa/variant-fsf => arch/xtensa/variants/fsf/include/variant}/core.h (100%) rename {include/asm-xtensa/variant-fsf => arch/xtensa/variants/fsf/include/variant}/tie-asm.h (100%) rename {include/asm-xtensa/variant-fsf => arch/xtensa/variants/fsf/include/variant}/tie.h (100%) Merging quilt/driver-core $ git merge quilt/driver-core Auto-merged include/linux/pci.h Merge made by recursive. drivers/base/attribute_container.c | 2 +- drivers/base/bus.c | 12 ++-- drivers/base/core.c | 36 +++++----- drivers/base/dd.c | 12 ++-- drivers/base/firmware_class.c | 8 +-- drivers/base/isa.c | 7 +- drivers/base/platform.c | 130 ++++++++++++++++++----------------- drivers/base/power/main.c | 21 +++--- drivers/base/power/trace.c | 4 +- drivers/pci/pci-driver.c | 46 +++++-------- drivers/uio/uio_cif.c | 3 +- drivers/uio/uio_pdrv_genirq.c | 5 +- drivers/usb/core/usb.c | 4 +- include/linux/device.h | 13 ++-- include/linux/init.h | 1 + include/linux/klist.h | 2 - include/linux/pci.h | 1 - include/linux/platform_device.h | 1 - include/linux/pm.h | 76 +++++++-------------- init/main.c | 9 +++ lib/klist.c | 43 +++++++++++- lib/kobject.c | 50 ++++++++++++++ 22 files changed, 271 insertions(+), 215 deletions(-) Merging quilt/usb $ git merge quilt/usb Auto-merged drivers/net/usb/hso.c CONFLICT (content): Merge conflict in drivers/net/usb/hso.c Recorded preimage for 'drivers/net/usb/hso.c' Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/net/usb/hso.c'. Created commit 1e75f92: Merge branch 'quilt/usb' $ git diff -M --stat --summary HEAD^.. drivers/net/usb/hso.c | 18 +- drivers/net/usb/kaweth.c | 6 +- drivers/net/usb/pegasus.c | 12 +- drivers/usb/core/hcd.h | 4 + drivers/usb/core/message.c | 6 +- drivers/usb/core/sysfs.c | 35 +- drivers/usb/gadget/net2280.c | 2 +- drivers/usb/host/Kconfig | 13 + drivers/usb/host/Makefile | 1 + drivers/usb/host/ehci-dbg.c | 8 +- drivers/usb/host/ehci-hub.c | 18 +- drivers/usb/host/oxu210hp-hcd.c | 3985 +++++++++++++++++++++++++++++++++++++++ drivers/usb/host/oxu210hp.h | 447 +++++ drivers/usb/host/pci-quirks.c | 12 +- drivers/usb/misc/usbtest.c | 2 - drivers/usb/serial/Kconfig | 9 + drivers/usb/serial/Makefile | 1 + drivers/usb/serial/opticon.c | 363 ++++ include/linux/oxu210hp.h | 7 + 19 files changed, 4884 insertions(+), 65 deletions(-) create mode 100644 drivers/usb/host/oxu210hp-hcd.c create mode 100644 drivers/usb/host/oxu210hp.h create mode 100644 drivers/usb/serial/opticon.c create mode 100644 include/linux/oxu210hp.h Merging tip-core/auto-core-next $ git merge tip-core/auto-core-next Auto-merged Documentation/filesystems/proc.txt Merge made by recursive. Documentation/filesystems/proc.txt | 1 + Documentation/lockstat.txt | 51 ++++--- arch/um/include/asm/system.h | 14 +- arch/x86/include/asm/percpu.h | 83 ++++++++++- arch/x86/include/asm/uaccess.h | 2 + arch/x86/include/asm/uaccess_32.h | 8 +- arch/x86/include/asm/uaccess_64.h | 6 + arch/x86/lib/usercopy_32.c | 8 +- arch/x86/lib/usercopy_64.c | 4 +- fs/proc/base.c | 50 ++++++- include/asm-generic/percpu.h | 11 ++- include/asm-generic/sections.h | 10 ++ include/asm-generic/vmlinux.lds.h | 16 ++ include/linux/debug_locks.h | 2 +- include/linux/futex.h | 2 + include/linux/kernel.h | 11 ++ include/linux/lockdep.h | 31 ++++- include/linux/mutex.h | 2 + include/linux/percpu.h | 17 ++- include/linux/uaccess.h | 2 +- kernel/extable.c | 16 ++ kernel/futex.c | 290 +++++++++++++----------------------- kernel/lockdep.c | 37 +++-- kernel/lockdep_proc.c | 28 +++- kernel/module.c | 7 +- kernel/mutex.c | 2 +- kernel/notifier.c | 8 + kernel/sched.c | 2 +- kernel/softlockup.c | 2 +- lib/Kconfig.debug | 10 ++ mm/memory.c | 15 ++ 31 files changed, 484 insertions(+), 264 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 Documentation/kernel-parameters.txt Auto-merged arch/x86/Kconfig Auto-merged arch/x86/Kconfig.debug Auto-merged arch/x86/kernel/entry_64.S Auto-merged arch/x86/mm/fault.c Auto-merged init/main.c Merge made by recursive. Documentation/ftrace.txt | 171 ++++++++---------- Documentation/kernel-parameters.txt | 8 + arch/x86/Kconfig | 1 + arch/x86/Kconfig.debug | 4 - arch/x86/include/asm/ftrace.h | 3 +- arch/x86/kernel/entry_32.S | 6 + arch/x86/kernel/entry_64.S | 5 + arch/x86/kernel/ftrace.c | 129 +++++++++++++- arch/x86/mm/Makefile | 3 +- arch/x86/mm/fault.c | 2 +- drivers/char/sysrq.c | 18 ++- include/linux/ftrace.h | 66 ++++++- include/linux/ftrace_irq.h | 13 ++ include/linux/hardirq.h | 15 ++- include/linux/marker.h | 2 - include/linux/tracepoint.h | 4 + init/main.c | 4 +- kernel/marker.c | 80 +++----- kernel/sysctl.c | 10 + kernel/trace/Kconfig | 7 + kernel/trace/ftrace.c | 50 ++++- kernel/trace/ring_buffer.c | 58 +++--- kernel/trace/trace.c | 349 ++++++++++++++++++++++++++--------- kernel/trace/trace.h | 61 ++++++- kernel/trace/trace_boot.c | 44 +++-- kernel/trace/trace_functions.c | 15 +- kernel/trace/trace_irqsoff.c | 52 ++++-- kernel/trace/trace_mmiotrace.c | 22 +-- kernel/trace/trace_nop.c | 16 +-- kernel/trace/trace_sched_switch.c | 103 +++++++---- kernel/trace/trace_sched_wakeup.c | 67 ++++--- kernel/trace/trace_selftest.c | 82 +++++--- kernel/trace/trace_stack.c | 8 +- kernel/trace/trace_sysprof.c | 16 +-- kernel/tracepoint.c | 261 ++++++++++++++++---------- scripts/Makefile.build | 12 +- scripts/recordmcount.pl | 4 + scripts/tracing/draw_functrace.py | 130 +++++++++++++ 38 files changed, 1299 insertions(+), 602 deletions(-) create mode 100644 include/linux/ftrace_irq.h create mode 100644 scripts/tracing/draw_functrace.py Merging genirq/auto-genirq-next $ git merge genirq/auto-genirq-next Already up-to-date. 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 arch/x86/Kconfig Auto-merged kernel/sched.c Merge made by recursive. Documentation/scheduler/sched-arch.txt | 4 +- arch/x86/Kconfig | 2 +- include/linux/rcuclassic.h | 2 +- kernel/Makefile | 1 - kernel/rcuclassic.c | 4 +- kernel/sched.c | 109 +++++++++----------------------- kernel/sched_debug.c | 14 +---- kernel/sched_rt.c | 7 +- 8 files changed, 43 insertions(+), 100 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/mm/fault.c Auto-merged include/linux/sched.h Auto-merged init/main.c Auto-merged kernel/sched.c Merge made by recursive. arch/x86/Kconfig | 23 ++++++++++------------- arch/x86/Kconfig.debug | 1 + arch/x86/Makefile | 2 +- arch/x86/include/asm/pda.h | 4 ++-- arch/x86/include/asm/system.h | 6 +++++- arch/x86/kernel/Makefile | 1 + arch/x86/kernel/process_64.c | 13 ++++++++++++- arch/x86/mm/fault.c | 7 +++++++ include/asm-x86/stackprotector.h | 38 ++++++++++++++++++++++++++++++++++++++ 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, 133 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 Merge made by recursive. kernel/hrtimer.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) Merging pci/linux-next $ git merge pci/linux-next Auto-merged drivers/pci/pci-sysfs.c Auto-merged drivers/pci/quirks.c Merge made by recursive. drivers/pci/hotplug/pciehp_ctrl.c | 26 ++++++++++++-------------- drivers/pci/pci-sysfs.c | 2 +- drivers/pci/pci.h | 4 ++++ drivers/pci/proc.c | 11 ++++++++++- drivers/pci/quirks.c | 5 +++-- 5 files changed, 30 insertions(+), 18 deletions(-) Merging quilt/device-mapper $ git merge quilt/device-mapper Merge made by recursive. drivers/md/dm-crypt.c | 6 +----- drivers/md/dm-delay.c | 6 +----- drivers/md/dm-linear.c | 5 +---- drivers/md/dm-mpath.c | 14 +++++++------- drivers/md/dm-raid1.c | 7 ++----- drivers/md/dm-snap.c | 11 ++--------- drivers/md/dm-stripe.c | 8 ++++---- drivers/md/dm-target.c | 15 +++++++-------- drivers/md/dm-zero.c | 5 +---- include/linux/device-mapper.h | 5 ++++- 10 files changed, 30 insertions(+), 52 deletions(-) Merging hid/mm $ git merge hid/mm Removed drivers/hid/hid-bright.c Removed drivers/hid/hid-dell.c Merge made by recursive. drivers/hid/Kconfig | 15 -------- drivers/hid/Makefile | 2 - drivers/hid/hid-bright.c | 71 -------------------------------------- drivers/hid/hid-core.c | 12 ++---- drivers/hid/hid-dell.c | 76 ----------------------------------------- drivers/hid/hid-ids.h | 11 ------ drivers/hid/hid-lg.c | 7 ---- drivers/hid/hidraw.c | 30 +++++++++------- drivers/hid/usbhid/hid-core.c | 15 ++++++-- 9 files changed, 31 insertions(+), 208 deletions(-) delete mode 100644 drivers/hid/hid-bright.c delete mode 100644 drivers/hid/hid-dell.c Merging quilt/i2c $ git merge quilt/i2c Merge made by recursive. drivers/i2c/busses/i2c-bfin-twi.c | 2 +- drivers/i2c/busses/i2c-pxa.c | 4 ++-- drivers/i2c/busses/i2c-s3c2410.c | 2 +- drivers/i2c/busses/i2c-sh7760.c | 2 +- drivers/i2c/busses/i2c-sh_mobile.c | 2 +- drivers/i2c/i2c-core.c | 8 ++++---- drivers/media/video/cafe_ccic.c | 1 - drivers/media/video/ov7670.c | 1 - drivers/media/video/ovcamchip/ovcamchip_core.c | 1 - drivers/media/video/w9968cf.c | 1 - include/linux/i2c.h | 4 ---- 11 files changed, 10 insertions(+), 18 deletions(-) Merging quilt/jdelvare-hwmon $ git merge quilt/jdelvare-hwmon Merge made by recursive. Documentation/hwmon/it87 | 20 +- Documentation/hwmon/ltc4245 | 81 +++ drivers/hwmon/Kconfig | 14 +- drivers/hwmon/Makefile | 1 + drivers/hwmon/asb100.c | 5 +- drivers/hwmon/f71882fg.c | 1130 ++++++++++++++++++++++++++++++++++++------- drivers/hwmon/i5k_amb.c | 7 + drivers/hwmon/it87.c | 30 +- drivers/hwmon/k8temp.c | 15 + drivers/hwmon/ltc4245.c | 567 ++++++++++++++++++++++ drivers/hwmon/w83781d.c | 5 +- drivers/hwmon/w83791d.c | 5 +- drivers/hwmon/w83792d.c | 5 +- drivers/hwmon/w83793.c | 5 +- 14 files changed, 1703 insertions(+), 187 deletions(-) create mode 100644 Documentation/hwmon/ltc4245 create mode 100644 drivers/hwmon/ltc4245.c Merging quilt/kernel-doc $ git merge quilt/kernel-doc Already up-to-date. Merging v4l-dvb/master $ git merge v4l-dvb/master Auto-merged MAINTAINERS Auto-merged drivers/hid/hid-core.c Auto-merged drivers/hid/hid-ids.h Auto-merged drivers/media/video/cafe_ccic.c Merge made by recursive. Documentation/feature-removal-schedule.txt | 24 - Documentation/video4linux/CARDLIST.cx88 | 2 +- Documentation/video4linux/README.cx88 | 12 +- Documentation/video4linux/si470x.txt | 118 ++ MAINTAINERS | 31 + drivers/hid/hid-core.c | 1 + drivers/hid/hid-ids.h | 3 + drivers/media/common/saa7146_fops.c | 2 +- drivers/media/common/saa7146_video.c | 10 +- drivers/media/common/tuners/tda9887.c | 5 +- drivers/media/dvb/Kconfig | 13 + drivers/media/dvb/dm1105/dm1105.c | 3 +- drivers/media/dvb/dvb-core/dvb_frontend.c | 77 +- drivers/media/dvb/dvb-core/dvb_frontend.h | 134 ++- drivers/media/dvb/dvb-core/dvbdev.c | 71 +- drivers/media/dvb/dvb-core/dvbdev.h | 1 + drivers/media/dvb/dvb-usb/Kconfig | 3 +- drivers/media/dvb/dvb-usb/af9015.c | 33 +- drivers/media/dvb/dvb-usb/af9015.h | 77 +- drivers/media/dvb/dvb-usb/anysee.c | 4 +- drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 1 + drivers/media/dvb/dvb-usb/dvb-usb-urb.c | 6 +- drivers/media/dvb/dvb-usb/dw2102.c | 1 - drivers/media/dvb/frontends/Kconfig | 45 + drivers/media/dvb/frontends/Makefile | 9 + drivers/media/dvb/frontends/af9013.c | 6 +- drivers/media/dvb/frontends/dvb-pll.c | 2 +- drivers/media/dvb/frontends/lgdt3304.c | 378 ++++ drivers/media/dvb/frontends/lgdt3304.h | 45 + drivers/media/dvb/frontends/s921_core.c | 216 +++ drivers/media/dvb/frontends/s921_core.h | 114 ++ drivers/media/dvb/frontends/s921_module.c | 190 ++ drivers/media/dvb/frontends/s921_module.h | 49 + drivers/media/dvb/frontends/si21xx.c | 1 - drivers/media/dvb/frontends/stb0899_algo.c | 1519 +++++++++++++++ drivers/media/dvb/frontends/stb0899_cfg.h | 287 +++ drivers/media/dvb/frontends/stb0899_drv.c | 1685 ++++++++++++++++ drivers/media/dvb/frontends/stb0899_drv.h | 162 ++ drivers/media/dvb/frontends/stb0899_priv.h | 267 +++ drivers/media/dvb/frontends/stb0899_reg.h | 2027 ++++++++++++++++++++ drivers/media/dvb/frontends/stb6100.c | 545 ++++++ drivers/media/dvb/frontends/stb6100.h | 115 ++ drivers/media/dvb/frontends/stb6100_cfg.h | 108 ++ drivers/media/dvb/frontends/tda8261.c | 230 +++ drivers/media/dvb/frontends/tda8261.h | 55 + drivers/media/dvb/frontends/tda8261_cfg.h | 84 + drivers/media/dvb/frontends/zl10353.c | 3 + drivers/media/dvb/ttpci/Kconfig | 4 + drivers/media/dvb/ttpci/budget-av.c | 298 +++ drivers/media/dvb/ttpci/budget-ci.c | 311 +++ drivers/media/dvb/ttpci/budget.h | 1 + drivers/media/radio/Kconfig | 14 + drivers/media/radio/radio-aimslab.c | 2 +- drivers/media/radio/radio-cadet.c | 2 +- drivers/media/radio/radio-gemtek.c | 2 +- drivers/media/radio/radio-mr800.c | 43 +- drivers/media/radio/radio-rtrack2.c | 2 +- drivers/media/radio/radio-sf16fmi.c | 2 +- drivers/media/radio/radio-si470x.c | 19 +- drivers/media/video/Kconfig | 14 +- drivers/media/video/Makefile | 3 +- drivers/media/video/arv.c | 5 +- drivers/media/video/bt8xx/bttv-gpio.c | 7 +- drivers/media/video/bt8xx/bttv.h | 2 +- drivers/media/video/bt8xx/bttvp.h | 2 +- drivers/media/video/bw-qcam.c | 5 +- drivers/media/video/c-qcam.c | 7 +- drivers/media/video/cafe_ccic.c | 6 +- drivers/media/video/cpia.c | 9 +- drivers/media/video/cpia2/cpia2_core.c | 2 +- drivers/media/video/cpia2/cpia2_usb.c | 2 +- drivers/media/video/cpia2/cpia2_v4l.c | 15 +- drivers/media/video/cx18/cx18-av-audio.c | 41 +- drivers/media/video/cx18/cx18-av-core.c | 95 +- drivers/media/video/cx18/cx18-av-core.h | 3 + drivers/media/video/cx18/cx18-av-firmware.c | 18 +- drivers/media/video/cx18/cx18-driver.c | 6 +- drivers/media/video/cx18/cx18-firmware.c | 60 +- drivers/media/video/cx18/cx18-gpio.c | 22 +- drivers/media/video/cx18/cx18-i2c.c | 24 +- drivers/media/video/cx18/cx18-io.c | 17 +- drivers/media/video/cx18/cx18-io.h | 17 + drivers/media/video/cx18/cx18-irq.c | 19 +- drivers/media/video/cx18/cx18-mailbox.c | 6 +- drivers/media/video/cx25840/Kconfig | 2 +- drivers/media/video/cx88/cx88-blackbird.c | 12 +- drivers/media/video/cx88/cx88-cards.c | 6 +- drivers/media/video/cx88/cx88-core.c | 3 + drivers/media/video/cx88/cx88-dvb.c | 54 +- drivers/media/video/cx88/cx88-mpeg.c | 28 +- drivers/media/video/cx88/cx88-video.c | 10 +- drivers/media/video/cx88/cx88.h | 12 +- drivers/media/video/em28xx/em28xx-video.c | 4 +- drivers/media/video/et61x251/et61x251_core.c | 2 +- drivers/media/video/gspca/Kconfig | 142 +- drivers/media/video/ir-kbd-i2c.c | 6 +- drivers/media/video/ivtv/Kconfig | 5 +- drivers/media/video/ivtv/ivtv-cards.c | 16 +- drivers/media/video/ivtv/ivtv-driver.c | 26 +- drivers/media/video/ov511.c | 5 +- drivers/media/video/ov772x.c | 964 ++++++++++ drivers/media/video/pms.c | 9 +- drivers/media/video/pvrusb2/pvrusb2-hdw.c | 2 +- drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 4 +- drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 13 +- drivers/media/video/pwc/pwc-if.c | 2 +- drivers/media/video/pwc/pwc-v4l.c | 3 +- drivers/media/video/pwc/pwc.h | 3 +- drivers/media/video/saa5246a.c | 7 +- drivers/media/video/saa5249.c | 7 +- drivers/media/video/saa7110.c | 4 +- drivers/media/video/saa7134/saa7134-core.c | 3 +- drivers/media/video/saa7134/saa7134.h | 2 +- drivers/media/video/se401.c | 5 +- drivers/media/video/sh_mobile_ceu_camera.c | 6 +- drivers/media/video/sn9c102/sn9c102_core.c | 2 +- drivers/media/video/soc_camera.c | 5 +- drivers/media/video/stv680.c | 5 +- drivers/media/video/tvp5150.c | 15 + drivers/media/video/usbvideo/ibmcam.c | 12 +- drivers/media/video/usbvideo/usbvideo.c | 5 +- drivers/media/video/usbvision/usbvision-video.c | 6 +- drivers/media/video/uvc/uvc_v4l2.c | 13 +- drivers/media/video/v4l2-common.c | 2 +- .../{compat_ioctl32.c => v4l2-compat-ioctl32.c} | 95 +- drivers/media/video/v4l2-dev.c | 4 +- drivers/media/video/v4l2-ioctl.c | 10 +- drivers/media/video/vino.c | 5 +- drivers/media/video/w9966.c | 5 +- drivers/media/video/zc0301/zc0301_core.c | 2 +- drivers/media/video/zoran/zoran_driver.c | 8 +- include/linux/videodev2.h | 1 + include/media/ov772x.h | 21 + include/media/saa7146_vv.h | 3 +- include/media/soc_camera.h | 4 +- include/media/v4l2-chip-ident.h | 1 + include/media/v4l2-ioctl.h | 6 +- 137 files changed, 10920 insertions(+), 558 deletions(-) create mode 100644 Documentation/video4linux/si470x.txt create mode 100644 drivers/media/dvb/frontends/lgdt3304.c create mode 100644 drivers/media/dvb/frontends/lgdt3304.h create mode 100644 drivers/media/dvb/frontends/s921_core.c create mode 100644 drivers/media/dvb/frontends/s921_core.h create mode 100644 drivers/media/dvb/frontends/s921_module.c create mode 100644 drivers/media/dvb/frontends/s921_module.h create mode 100644 drivers/media/dvb/frontends/stb0899_algo.c create mode 100644 drivers/media/dvb/frontends/stb0899_cfg.h create mode 100644 drivers/media/dvb/frontends/stb0899_drv.c create mode 100644 drivers/media/dvb/frontends/stb0899_drv.h create mode 100644 drivers/media/dvb/frontends/stb0899_priv.h create mode 100644 drivers/media/dvb/frontends/stb0899_reg.h create mode 100644 drivers/media/dvb/frontends/stb6100.c create mode 100644 drivers/media/dvb/frontends/stb6100.h create mode 100644 drivers/media/dvb/frontends/stb6100_cfg.h create mode 100644 drivers/media/dvb/frontends/tda8261.c create mode 100644 drivers/media/dvb/frontends/tda8261.h create mode 100644 drivers/media/dvb/frontends/tda8261_cfg.h create mode 100644 drivers/media/video/ov772x.c rename drivers/media/video/{compat_ioctl32.c => v4l2-compat-ioctl32.c} (92%) create mode 100644 include/media/ov772x.h Merging jfs/next $ git merge jfs/next Already up-to-date. Merging kbuild/master $ git merge kbuild/master Already up-to-date. Merging quilt/ide $ git merge quilt/ide Merge made by recursive. drivers/ide/cmd64x.c | 4 +- drivers/ide/cy82c693.c | 1 - drivers/ide/gayle.c | 6 +- drivers/ide/hpt366.c | 8 +-- drivers/ide/ide-cd.c | 127 +++++--------------------- drivers/ide/ide-cd.h | 2 - drivers/ide/ide-dma-sff.c | 2 +- drivers/ide/ide-io.c | 218 +++++++++++++++++++-------------------------- drivers/ide/ide-ioctls.c | 3 - drivers/ide/ide-iops.c | 48 +++++----- drivers/ide/ide-lib.c | 7 +-- drivers/ide/ide-park.c | 16 ++-- drivers/ide/ide-probe.c | 87 +++++------------- drivers/ide/ide-proc.c | 29 +----- drivers/ide/ide.c | 15 +--- drivers/ide/rz1000.c | 36 +++++--- drivers/ide/trm290.c | 4 +- drivers/ide/umc8672.c | 11 ++- drivers/scsi/ide-scsi.c | 32 +++++--- include/linux/ide.h | 31 ++----- 20 files changed, 255 insertions(+), 432 deletions(-) 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 Removed fs/xfs/xfs_clnt.h Auto-merged include/linux/fs.h Merge made by recursive. Documentation/filesystems/xfs.txt | 4 - fs/inode.c | 208 ++- fs/xfs/Makefile | 4 +- fs/xfs/linux-2.6/xfs_aops.c | 2 +- fs/xfs/linux-2.6/xfs_cred.h | 10 +- fs/xfs/linux-2.6/xfs_globals.c | 8 - fs/xfs/linux-2.6/xfs_globals.h | 1 - fs/xfs/linux-2.6/xfs_ioctl.c | 9 +- fs/xfs/linux-2.6/xfs_iops.c | 25 +- fs/xfs/linux-2.6/xfs_linux.h | 2 +- fs/xfs/linux-2.6/xfs_stats.c | 4 + fs/xfs/linux-2.6/xfs_stats.h | 65 + fs/xfs/linux-2.6/xfs_super.c | 851 ++++------ fs/xfs/linux-2.6/xfs_super.h | 3 - fs/xfs/linux-2.6/xfs_sync.c | 763 ++++++++ fs/xfs/linux-2.6/xfs_sync.h | 55 + fs/xfs/linux-2.6/xfs_sysctl.c | 11 - fs/xfs/linux-2.6/xfs_sysctl.h | 3 +- fs/xfs/linux-2.6/xfs_vfs.h | 31 - fs/xfs/linux-2.6/xfs_vnode.c | 15 +- fs/xfs/linux-2.6/xfs_vnode.h | 5 - fs/xfs/quota/xfs_dquot.c | 39 +- fs/xfs/quota/xfs_dquot.h | 4 +- fs/xfs/quota/xfs_dquot_item.c | 45 +- fs/xfs/quota/xfs_qm.c | 13 +- fs/xfs/quota/xfs_qm.h | 1 - fs/xfs/quota/xfs_qm_bhv.c | 1 - fs/xfs/quota/xfs_qm_syscalls.c | 137 +- fs/xfs/support/debug.c | 2 +- fs/xfs/xfs.h | 2 +- fs/xfs/xfs_acl.c | 8 +- fs/xfs/xfs_ag.h | 10 +- fs/xfs/xfs_alloc.c | 195 ++- fs/xfs/xfs_alloc.h | 27 +- fs/xfs/xfs_alloc_btree.c | 2387 ++++--------------------- fs/xfs/xfs_alloc_btree.h | 107 +- fs/xfs/xfs_arch.h | 39 +- fs/xfs/xfs_bit.h | 3 +- fs/xfs/xfs_bmap.c | 296 ++-- fs/xfs/xfs_bmap.h | 61 +- fs/xfs/xfs_bmap_btree.c | 2614 +++++---------------------- fs/xfs/xfs_bmap_btree.h | 171 +-- fs/xfs/xfs_btree.c | 3596 ++++++++++++++++++++++++++++++++----- fs/xfs/xfs_btree.h | 392 +++-- fs/xfs/xfs_btree_trace.c | 249 +++ fs/xfs/xfs_btree_trace.h | 116 ++ fs/xfs/xfs_buf_item.c | 25 +- fs/xfs/xfs_clnt.h | 105 -- fs/xfs/xfs_da_btree.c | 5 + fs/xfs/xfs_da_btree.h | 24 +- fs/xfs/xfs_dinode.h | 5 +- fs/xfs/xfs_dir2.c | 6 + fs/xfs/xfs_dmops.c | 5 +- fs/xfs/xfs_extfree_item.c | 45 +- fs/xfs/xfs_fsops.c | 24 +- fs/xfs/xfs_ialloc.c | 132 ++- fs/xfs/xfs_ialloc.h | 21 +- fs/xfs/xfs_ialloc_btree.c | 2193 +++-------------------- fs/xfs/xfs_ialloc_btree.h | 111 +- fs/xfs/xfs_iget.c | 501 ++---- fs/xfs/xfs_imap.h | 2 - fs/xfs/xfs_inode.c | 292 ++-- fs/xfs/xfs_inode.h | 288 ++-- fs/xfs/xfs_inode_item.c | 30 +- fs/xfs/xfs_inode_item.h | 41 +- fs/xfs/xfs_itable.c | 33 +- fs/xfs/xfs_log.c | 10 +- fs/xfs/xfs_log_priv.h | 1 + fs/xfs/xfs_log_recover.c | 105 +- fs/xfs/xfs_mount.c | 47 +- fs/xfs/xfs_mount.h | 55 +- fs/xfs/xfs_qmops.c | 5 +- fs/xfs/xfs_trans.c | 13 +- fs/xfs/xfs_trans.h | 322 ++-- fs/xfs/xfs_trans_ail.c | 362 +++-- fs/xfs/xfs_trans_buf.c | 7 +- fs/xfs/xfs_trans_item.c | 10 + fs/xfs/xfs_trans_priv.h | 98 +- fs/xfs/xfs_vfsops.c | 617 +------- fs/xfs/xfs_vfsops.h | 2 - fs/xfs/xfs_vnodeops.c | 141 +-- fs/xfs/xfs_vnodeops.h | 6 +- include/linux/fs.h | 2 + kernel/sysctl_check.c | 1 - 84 files changed, 8107 insertions(+), 10179 deletions(-) create mode 100644 fs/xfs/linux-2.6/xfs_sync.c create mode 100644 fs/xfs/linux-2.6/xfs_sync.h create mode 100644 fs/xfs/xfs_btree_trace.c create mode 100644 fs/xfs/xfs_btree_trace.h delete mode 100644 fs/xfs/xfs_clnt.h $ git reset --hard HEAD^ HEAD is now at 89f90b1 Merge branch 'quilt/ide' Merging infiniband/for-next $ git merge infiniband/for-next Merge made by recursive. drivers/infiniband/hw/cxgb3/iwch_qp.c | 1 - drivers/infiniband/hw/ipath/ipath_ruc.c | 10 ++-- drivers/infiniband/hw/nes/nes.c | 16 +++++++ drivers/infiniband/hw/nes/nes_hw.h | 1 + drivers/infiniband/hw/nes/nes_verbs.c | 64 +++++++++++++++++++--------- drivers/infiniband/ulp/ipoib/ipoib_main.c | 4 +- 6 files changed, 68 insertions(+), 28 deletions(-) Merging acpi/test $ git merge acpi/test Auto-merged Documentation/kernel-parameters.txt Auto-merged MAINTAINERS Merge made by recursive. Documentation/ABI/testing/sysfs-firmware-acpi | 16 +- Documentation/acpi/debug.txt | 148 +++++++++++++ Documentation/kernel-parameters.txt | 92 ++++----- MAINTAINERS | 11 +- arch/x86/include/asm/acpi.h | 1 - arch/x86/kernel/acpi/boot.c | 1 - arch/x86/kernel/acpi/sleep.c | 2 + arch/x86/kernel/e820.c | 21 ++ arch/x86/kernel/reboot.c | 2 +- drivers/acpi/Kconfig | 22 +-- drivers/acpi/Makefile | 8 +- drivers/acpi/ac.c | 3 +- drivers/acpi/acpi_memhotplug.c | 1 - drivers/acpi/battery.c | 3 +- drivers/acpi/bus.c | 11 +- drivers/acpi/button.c | 1 - drivers/acpi/cm_sbs.c | 7 - drivers/acpi/container.c | 1 - drivers/acpi/debug.c | 15 ++ drivers/acpi/ec.c | 20 ++- drivers/acpi/events/evgpe.c | 2 - drivers/acpi/events/evxfevnt.c | 6 + drivers/acpi/fan.c | 1 - drivers/acpi/glue.c | 40 ++++ drivers/acpi/osl.c | 44 ---- drivers/acpi/pci_link.c | 11 +- drivers/acpi/pci_root.c | 6 - drivers/acpi/power.c | 11 +- drivers/acpi/processor_core.c | 93 +++++---- drivers/acpi/processor_idle.c | 1 - drivers/acpi/processor_perflib.c | 2 +- drivers/acpi/processor_thermal.c | 1 - drivers/acpi/processor_throttling.c | 2 +- drivers/acpi/reboot.c | 25 +-- drivers/acpi/scan.c | 42 +---- drivers/acpi/sleep/main.c | 68 ++++++- drivers/acpi/sleep/proc.c | 4 +- drivers/acpi/system.c | 44 +++-- drivers/acpi/tables/tbfadt.c | 2 +- drivers/acpi/thermal.c | 9 +- drivers/acpi/video.c | 42 ++-- drivers/acpi/video_detect.c | 267 ++++++++++++++++++++++++ drivers/acpi/wmi.c | 2 +- drivers/char/sonypi.c | 4 +- drivers/idle/Kconfig | 3 +- drivers/misc/Kconfig | 6 +- drivers/misc/acer-wmi.c | 6 + drivers/misc/asus-laptop.c | 10 +- drivers/misc/compal-laptop.c | 277 +++++++++++-------------- drivers/misc/eeepc-laptop.c | 12 +- drivers/misc/fujitsu-laptop.c | 28 ++-- drivers/misc/intel_menlow.c | 10 +- drivers/misc/msi-laptop.c | 16 +- drivers/misc/sony-laptop.c | 6 +- drivers/misc/thinkpad_acpi.c | 29 ++- include/acpi/acpi_bus.h | 2 + include/acpi/acpi_drivers.h | 22 ++- include/acpi/actypes.h | 1 + include/linux/acpi.h | 49 ++++- include/linux/suspend.h | 13 ++ kernel/power/disk.c | 6 +- kernel/power/swsusp.c | 122 +++++++++++ 62 files changed, 1201 insertions(+), 532 deletions(-) create mode 100644 Documentation/acpi/debug.txt create mode 100644 drivers/acpi/video_detect.c Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Merge made by recursive. fs/lockd/svc.c | 8 ++++++++ fs/nfsd/nfs4recover.c | 2 +- fs/nfsd/nfs4state.c | 7 ++++--- fs/nfsd/nfsfh.c | 30 ++++++++++++++++++++++++------ include/linux/nfsd/nfsfh.h | 4 ++++ include/linux/sunrpc/svc.h | 5 ++++- net/sunrpc/svc_xprt.c | 22 ++++++++++++++++------ 7 files changed, 61 insertions(+), 17 deletions(-) Merging ieee1394/for-next $ git merge ieee1394/for-next Auto-merged drivers/media/dvb/Kconfig Merge made by recursive. drivers/firewire/fw-cdev.c | 36 +- drivers/firewire/fw-device.c | 3 + drivers/firewire/fw-device.h | 4 + drivers/firewire/fw-ohci.c | 73 +-- drivers/firewire/fw-sbp2.c | 21 +- drivers/ieee1394/dma.h | 1 + drivers/ieee1394/ieee1394_core.c | 1 + drivers/ieee1394/ieee1394_transactions.c | 29 + drivers/ieee1394/ieee1394_transactions.h | 2 + drivers/ieee1394/iso.h | 1 + drivers/ieee1394/nodemgr.c | 10 +- drivers/ieee1394/nodemgr.h | 18 + drivers/media/dvb/Kconfig | 2 + drivers/media/dvb/Makefile | 2 + drivers/media/dvb/firesat/Kconfig | 12 + drivers/media/dvb/firesat/Makefile | 13 + drivers/media/dvb/firesat/avc_api.c | 1051 ++++++++++++++++++++++++++++++ drivers/media/dvb/firesat/avc_api.h | 432 ++++++++++++ drivers/media/dvb/firesat/cmp.c | 171 +++++ drivers/media/dvb/firesat/cmp.h | 9 + drivers/media/dvb/firesat/firesat-ci.c | 255 ++++++++ drivers/media/dvb/firesat/firesat-ci.h | 9 + drivers/media/dvb/firesat/firesat-rc.c | 191 ++++++ drivers/media/dvb/firesat/firesat-rc.h | 11 + drivers/media/dvb/firesat/firesat.h | 227 +++++++ drivers/media/dvb/firesat/firesat_1394.c | 291 +++++++++ drivers/media/dvb/firesat/firesat_dvb.c | 276 ++++++++ drivers/media/dvb/firesat/firesat_fe.c | 245 +++++++ drivers/media/dvb/firesat/firesat_iso.c | 111 ++++ 29 files changed, 3430 insertions(+), 77 deletions(-) create mode 100644 drivers/media/dvb/firesat/Kconfig create mode 100644 drivers/media/dvb/firesat/Makefile create mode 100644 drivers/media/dvb/firesat/avc_api.c create mode 100644 drivers/media/dvb/firesat/avc_api.h create mode 100644 drivers/media/dvb/firesat/cmp.c create mode 100644 drivers/media/dvb/firesat/cmp.h create mode 100644 drivers/media/dvb/firesat/firesat-ci.c create mode 100644 drivers/media/dvb/firesat/firesat-ci.h create mode 100644 drivers/media/dvb/firesat/firesat-rc.c create mode 100644 drivers/media/dvb/firesat/firesat-rc.h create mode 100644 drivers/media/dvb/firesat/firesat.h create mode 100644 drivers/media/dvb/firesat/firesat_1394.c create mode 100644 drivers/media/dvb/firesat/firesat_dvb.c create mode 100644 drivers/media/dvb/firesat/firesat_fe.c create mode 100644 drivers/media/dvb/firesat/firesat_iso.c Merging ubi/linux-next $ git merge ubi/linux-next Merge made by recursive. drivers/mtd/ubi/eba.c | 2 +- drivers/mtd/ubi/scan.c | 2 +- drivers/mtd/ubi/wl.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) Merging kvm/master $ git merge kvm/master Auto-merged arch/powerpc/kernel/asm-offsets.c Removed arch/powerpc/kvm/booke_host.c Auto-merged arch/x86/kernel/cpu/mtrr/main.c Merge made by recursive. arch/ia64/include/asm/kvm_host.h | 192 ++++++++----- arch/ia64/kvm/Kconfig | 2 + arch/ia64/kvm/kvm-ia64.c | 74 +++--- arch/ia64/kvm/kvm_minstate.h | 4 +- arch/ia64/kvm/misc.h | 3 +- arch/ia64/kvm/vcpu.c | 5 +- arch/ia64/kvm/vcpu.h | 5 + arch/ia64/kvm/vtlb.c | 4 +- arch/powerpc/include/asm/disassemble.h | 80 +++++ arch/powerpc/include/asm/kvm_44x.h | 47 +++ arch/powerpc/include/asm/kvm_host.h | 62 ++--- arch/powerpc/include/asm/kvm_ppc.h | 79 ++--- arch/powerpc/kernel/asm-offsets.c | 16 +- arch/powerpc/kvm/44x.c | 234 ++++++++++++++ arch/powerpc/kvm/44x_emulate.c | 369 ++++++++++++++++++++++ arch/powerpc/kvm/44x_tlb.c | 179 ++++++++++- arch/powerpc/kvm/44x_tlb.h | 29 ++- arch/powerpc/kvm/Kconfig | 21 +- arch/powerpc/kvm/Makefile | 11 +- arch/powerpc/kvm/{booke_guest.c => booke.c} | 358 +++++++++------------- arch/powerpc/kvm/booke.h | 57 ++++ arch/powerpc/kvm/booke_host.c | 83 ----- arch/powerpc/kvm/booke_interrupts.S | 6 +- arch/powerpc/kvm/emulate.c | 443 ++------------------------- arch/powerpc/kvm/powerpc.c | 130 +------- arch/x86/include/asm/kvm_host.h | 22 +- arch/x86/include/asm/kvm_x86_emulate.h | 10 +- arch/x86/include/asm/mtrr.h | 25 ++ arch/x86/kernel/cpu/mtrr/generic.c | 12 +- arch/x86/kernel/cpu/mtrr/main.c | 4 +- arch/x86/kernel/cpu/mtrr/mtrr.h | 18 +- arch/x86/kernel/kvmclock.c | 2 +- arch/x86/kvm/Kconfig | 2 + arch/x86/kvm/i8254.c | 19 ++ arch/x86/kvm/irq.h | 1 + arch/x86/kvm/lapic.c | 58 +++- arch/x86/kvm/mmu.c | 137 ++++++++- arch/x86/kvm/svm.c | 23 ++ arch/x86/kvm/vmx.c | 344 ++++++++++++++------- arch/x86/kvm/vmx.h | 13 +- arch/x86/kvm/x86.c | 138 ++++++++-- arch/x86/kvm/x86_emulate.c | 12 +- include/linux/kvm.h | 11 +- include/linux/kvm_host.h | 3 +- virt/kvm/ioapic.c | 1 + virt/kvm/irq_comm.c | 8 +- virt/kvm/kvm_main.c | 18 +- 47 files changed, 2096 insertions(+), 1278 deletions(-) create mode 100644 arch/powerpc/include/asm/disassemble.h create mode 100644 arch/powerpc/include/asm/kvm_44x.h create mode 100644 arch/powerpc/kvm/44x.c create mode 100644 arch/powerpc/kvm/44x_emulate.c rename arch/powerpc/kvm/{booke_guest.c => booke.c} (61%) create mode 100644 arch/powerpc/kvm/booke.h delete mode 100644 arch/powerpc/kvm/booke_host.c Merging dlm/next $ git merge dlm/next Already up-to-date. Merging scsi/master $ git merge scsi/master Merge made by recursive. drivers/scsi/NCR5380.c | 2 +- drivers/scsi/a100u2w.c | 2 +- drivers/scsi/aacraid/aachba.c | 2 +- drivers/scsi/aacraid/commctrl.c | 14 +- drivers/scsi/aacraid/comminit.c | 2 +- drivers/scsi/aacraid/commsup.c | 2 +- drivers/scsi/aacraid/dpcsup.c | 2 +- drivers/scsi/aacraid/linit.c | 2 +- drivers/scsi/aacraid/rkt.c | 2 +- drivers/scsi/aacraid/rx.c | 2 +- drivers/scsi/aacraid/sa.c | 2 +- drivers/scsi/advansys.c | 3 +- drivers/scsi/aha1740.c | 2 +- drivers/scsi/arcmsr/arcmsr_hba.c | 8 +- drivers/scsi/atp870u.c | 4 +- drivers/scsi/device_handler/scsi_dh_rdac.c | 16 +- drivers/scsi/eata_pio.c | 4 +- drivers/scsi/esp_scsi.c | 6 +- drivers/scsi/fdomain.c | 2 +- drivers/scsi/ibmmca.c | 2 +- drivers/scsi/ibmvscsi/ibmvfc.c | 261 ++++-- drivers/scsi/ibmvscsi/ibmvfc.h | 9 +- drivers/scsi/in2000.c | 2 +- drivers/scsi/initio.c | 2 +- drivers/scsi/initio.h | 2 +- drivers/scsi/ipr.c | 2 +- drivers/scsi/ipr.h | 2 +- drivers/scsi/nsp32.c | 3 +- drivers/scsi/qla1280.c | 3 +- drivers/scsi/qla2xxx/qla_attr.c | 298 ++++--- drivers/scsi/qla2xxx/qla_dbg.c | 61 +- drivers/scsi/qla2xxx/qla_def.h | 525 ++++++------ drivers/scsi/qla2xxx/qla_dfs.c | 21 +- drivers/scsi/qla2xxx/qla_gbl.h | 13 +- drivers/scsi/qla2xxx/qla_gs.c | 479 ++++++------ drivers/scsi/qla2xxx/qla_init.c | 1113 +++++++++++++------------ drivers/scsi/qla2xxx/qla_inline.h | 27 +- drivers/scsi/qla2xxx/qla_iocb.c | 258 +++--- drivers/scsi/qla2xxx/qla_isr.c | 633 ++++++++------- drivers/scsi/qla2xxx/qla_mbx.c | 759 +++++++++-------- drivers/scsi/qla2xxx/qla_mid.c | 173 ++--- drivers/scsi/qla2xxx/qla_os.c | 1265 +++++++++++++++------------- drivers/scsi/qla2xxx/qla_sup.c | 537 ++++++------ drivers/scsi/qla2xxx/qla_version.h | 4 +- drivers/scsi/qlogicfas408.c | 2 +- drivers/scsi/scsi_error.c | 6 +- drivers/scsi/scsi_ioctl.c | 4 +- drivers/scsi/stex.c | 3 +- drivers/scsi/sym53c416.c | 2 +- drivers/scsi/tmscsim.c | 3 +- drivers/scsi/u14-34f.c | 3 +- drivers/scsi/wd7000.c | 4 +- 52 files changed, 3475 insertions(+), 3085 deletions(-) Merging ocfs2/linux-next $ git merge ocfs2/linux-next Auto-merged fs/ocfs2/file.c Merge made by recursive. fs/ocfs2/dlm/userdlm.h | 2 +- fs/ocfs2/file.c | 27 +++-- fs/ocfs2/inode.c | 6 + fs/ocfs2/journal.c | 1 + fs/ocfs2/mmap.c | 6 +- fs/ocfs2/namei.c | 8 +- fs/ocfs2/ocfs2.h | 5 +- fs/ocfs2/ocfs2_fs.h | 17 ++- fs/ocfs2/xattr.c | 372 ++++++++++++++++++++++++++---------------------- fs/ocfs2/xattr.h | 38 +---- 10 files changed, 258 insertions(+), 224 deletions(-) Merging ext4/next $ git merge ext4/next Auto-merged fs/ext3/super.c Merge made by recursive. fs/ext3/hash.c | 77 ++++++++++++++++++++++++++++++++++++++------ fs/ext3/namei.c | 7 ++++ fs/ext3/super.c | 12 +++++++ fs/ext4/balloc.c | 4 +- fs/ext4/ext4.h | 3 ++ fs/ext4/ext4_sb.h | 1 + fs/ext4/hash.c | 77 ++++++++++++++++++++++++++++++++++++++------ fs/ext4/ialloc.c | 4 +- fs/ext4/inode.c | 76 ++++++++++++++++++++++++++++++++----------- fs/ext4/namei.c | 7 ++++ fs/ext4/super.c | 12 +++++++ include/linux/ext3_fs.h | 28 +++++++++++++++- include/linux/ext3_fs_sb.h | 1 + 13 files changed, 264 insertions(+), 45 deletions(-) Merging async_tx/next $ git merge async_tx/next Merge made by recursive. arch/arm/include/asm/hardware/iop3xx-adma.h | 5 +++-- arch/arm/include/asm/hardware/iop_adma.h | 6 ++++++ arch/arm/mach-iop13xx/include/mach/adma.h | 3 ++- drivers/dca/dca-core.c | 2 +- drivers/dma/dmaengine.c | 4 ++-- drivers/dma/dmatest.c | 22 +++++++++++----------- drivers/dma/ioat_dma.c | 11 +++++++++-- drivers/dma/iop-adma.c | 11 ++++++----- drivers/dma/iovlock.c | 17 ++++++----------- 9 files changed, 46 insertions(+), 35 deletions(-) Merging udf/for_next $ git merge udf/for_next Already up-to-date. Merging net/master $ git merge net/master Auto-merged Documentation/feature-removal-schedule.txt Auto-merged MAINTAINERS Auto-merged arch/xtensa/platforms/iss/network.c Auto-merged drivers/infiniband/hw/nes/nes.c Auto-merged drivers/infiniband/ulp/ipoib/ipoib_main.c Auto-merged drivers/media/dvb/dm1105/dm1105.c Auto-merged drivers/message/fusion/mptlan.c CONFLICT (content): Merge conflict in drivers/message/fusion/mptlan.c Auto-merged drivers/net/cs89x0.c Removed drivers/net/eepro100.c Auto-merged drivers/net/sfc/ethtool.c CONFLICT (content): Merge conflict in drivers/net/sfc/ethtool.c Auto-merged drivers/net/usb/pegasus.c Auto-merged drivers/s390/net/qeth_l2_main.c Auto-merged fs/nfsd/nfs4state.c Auto-merged include/linux/kernel.h Auto-merged net/unix/af_unix.c Auto-merged net/unix/garbage.c Recorded preimage for 'drivers/message/fusion/mptlan.c' Recorded preimage for 'drivers/net/sfc/ethtool.c' Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/message/fusion/mptlan.c'. Recorded resolution for 'drivers/net/sfc/ethtool.c'. Created commit 3add2e3: Merge commit 'net/master' $ git diff -M --stat --summary HEAD^.. Documentation/feature-removal-schedule.txt | 7 - Documentation/networking/README.ipw2200 | 2 +- Documentation/networking/bonding.txt | 68 +- Documentation/networking/ip-sysctl.txt | 6 + Documentation/networking/regulatory.txt | 22 +- Documentation/rfkill.txt | 20 +- MAINTAINERS | 13 +- arch/arm/mach-ixp4xx/fsg-setup.c | 9 +- arch/arm/mach-ixp4xx/nas100d-setup.c | 5 +- arch/arm/mach-ixp4xx/nslu2-setup.c | 5 +- arch/sparc64/kernel/idprom.c | 5 +- arch/um/drivers/net_kern.c | 7 +- arch/xtensa/platforms/iss/network.c | 5 +- drivers/firmware/iscsi_ibft.c | 7 +- drivers/infiniband/core/sysfs.c | 10 +- drivers/infiniband/hw/mthca/mthca_mcg.c | 23 +- drivers/infiniband/hw/nes/nes.c | 17 +- drivers/infiniband/hw/nes/nes_cm.c | 31 +- drivers/infiniband/hw/nes/nes_nic.c | 10 +- drivers/infiniband/hw/nes/nes_utils.c | 5 +- drivers/infiniband/ulp/ipoib/ipoib.h | 23 - drivers/infiniband/ulp/ipoib/ipoib_cm.c | 8 +- drivers/infiniband/ulp/ipoib/ipoib_main.c | 25 +- drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 70 +- drivers/infiniband/ulp/iser/iser_verbs.c | 8 +- drivers/infiniband/ulp/srp/ib_srp.c | 31 +- drivers/isdn/i4l/isdn_net.c | 34 +- drivers/media/dvb/b2c2/flexcop.c | 2 +- drivers/media/dvb/bt8xx/dst.c | 4 +- drivers/media/dvb/dm1105/dm1105.c | 3 +- drivers/media/dvb/dvb-usb/dvb-usb-dvb.c | 5 +- drivers/media/dvb/pluto2/pluto2.c | 3 +- drivers/message/fusion/mptlan.c | 11 +- drivers/net/3c501.c | 1 - drivers/net/3c503.c | 3 +- drivers/net/3c505.c | 6 +- drivers/net/3c507.c | 4 +- drivers/net/3c509.c | 6 +- drivers/net/3c515.c | 5 +- drivers/net/3c523.c | 11 +- drivers/net/3c527.c | 4 +- drivers/net/3c59x.c | 5 +- drivers/net/7990.c | 1 - drivers/net/8139cp.c | 6 +- drivers/net/8139too.c | 6 +- drivers/net/82596.c | 14 +- drivers/net/Kconfig | 28 +- drivers/net/Makefile | 2 +- drivers/net/a2065.c | 5 +- drivers/net/ac3200.c | 5 +- drivers/net/acenic.c | 4 +- drivers/net/amd8111e.c | 6 +- drivers/net/apne.c | 3 +- drivers/net/appletalk/cops.c | 1 - drivers/net/appletalk/ltpc.c | 1 - drivers/net/arcnet/arc-rawmode.c | 1 - drivers/net/arcnet/capmode.c | 1 - drivers/net/arcnet/rfc1051.c | 1 - drivers/net/arcnet/rfc1201.c | 2 - drivers/net/ariadne.c | 21 +- drivers/net/arm/am79c961a.c | 7 +- drivers/net/arm/at91_ether.c | 11 +- drivers/net/arm/ep93xx_eth.c | 2 - drivers/net/arm/ether1.c | 5 +- drivers/net/arm/ether3.c | 5 +- drivers/net/arm/etherh.c | 5 +- drivers/net/arm/ixp4xx_eth.c | 1 - drivers/net/at1700.c | 4 +- drivers/net/atarilance.c | 18 +- drivers/net/atl1e/atl1e_main.c | 1 - drivers/net/atlx/atl1.c | 70 +- drivers/net/atlx/atl1.h | 4 +- drivers/net/atlx/atl2.c | 64 +- drivers/net/atlx/atl2.h | 1 - drivers/net/atlx/atlx.c | 13 - drivers/net/atp.c | 5 +- drivers/net/au1000_eth.c | 1 - drivers/net/ax88796.c | 9 +- drivers/net/b44.c | 6 +- drivers/net/bfin_mac.c | 1 - drivers/net/bmac.c | 7 +- drivers/net/bnx2.c | 6 +- drivers/net/bnx2x_main.c | 16 +- drivers/net/bonding/Makefile | 3 + drivers/net/bonding/bond_3ad.c | 326 ++-- drivers/net/bonding/bond_3ad.h | 10 +- drivers/net/bonding/bond_alb.c | 13 +- drivers/net/bonding/bond_ipv6.c | 218 ++ drivers/net/bonding/bond_main.c | 106 +- drivers/net/bonding/bond_sysfs.c | 126 +- drivers/net/bonding/bonding.h | 35 +- drivers/net/cassini.c | 6 +- drivers/net/chelsio/sge.c | 1 - drivers/net/cpmac.c | 5 +- drivers/net/cris/eth_v10.c | 4 +- drivers/net/cs89x0.c | 14 +- drivers/net/cxgb3/cxgb3_main.c | 69 +- drivers/net/cxgb3/sge.c | 1 - drivers/net/de600.c | 4 +- drivers/net/de620.c | 9 +- drivers/net/declance.c | 5 +- drivers/net/defxx.c | 1 - drivers/net/depca.c | 7 +- drivers/net/dl2k.c | 6 +- drivers/net/dm9000.c | 8 +- drivers/net/e100.c | 22 +- drivers/net/e1000/e1000_main.c | 12 +- drivers/net/e1000e/netdev.c | 13 +- drivers/net/eepro.c | 4 +- drivers/net/eepro100.c | 2401 ---------------------- drivers/net/eexpress.c | 1 - drivers/net/ehea/ehea.h | 2 +- drivers/net/ehea/ehea_main.c | 1 - drivers/net/ehea/ehea_qmr.c | 10 +- drivers/net/enc28j60.c | 17 +- drivers/net/enic/enic_main.c | 1 - drivers/net/enic/enic_res.c | 7 +- drivers/net/enic/vnic_dev.c | 10 +- drivers/net/epic100.c | 8 +- drivers/net/es3210.c | 9 +- drivers/net/eth16i.c | 1 - drivers/net/ewrk3.c | 8 +- drivers/net/fealnx.c | 6 +- drivers/net/fec.c | 4 +- drivers/net/fec_mpc52xx.c | 1 - drivers/net/forcedeth.c | 13 +- drivers/net/fs_enet/fs_enet-main.c | 5 +- drivers/net/gianfar.c | 6 +- drivers/net/hamachi.c | 6 +- drivers/net/hamradio/6pack.c | 1 - drivers/net/hamradio/baycom_epp.c | 1 - drivers/net/hamradio/bpqether.c | 8 +- drivers/net/hamradio/dmascc.c | 1 - drivers/net/hamradio/hdlcdrv.c | 1 - drivers/net/hamradio/mkiss.c | 1 - drivers/net/hamradio/scc.c | 1 - drivers/net/hamradio/yam.c | 1 - drivers/net/hp-plus.c | 3 +- drivers/net/hp.c | 3 +- drivers/net/hp100.c | 7 +- drivers/net/hydra.c | 5 +- drivers/net/ibm_newemac/core.c | 11 +- drivers/net/ibmlana.c | 6 +- drivers/net/ibmveth.c | 6 +- drivers/net/igb/igb_main.c | 8 +- drivers/net/ioc3-eth.c | 13 +- drivers/net/ipg.c | 9 - drivers/net/irda/ali-ircc.c | 1 - drivers/net/irda/au1k_ir.c | 1 - drivers/net/irda/irda-usb.c | 1 - drivers/net/irda/kingsun-sir.c | 1 - drivers/net/irda/ks959-sir.c | 1 - drivers/net/irda/ksdazzle-sir.c | 1 - drivers/net/irda/mcs7780.c | 1 - drivers/net/irda/nsc-ircc.c | 1 - drivers/net/irda/pxaficp_ir.c | 4 - drivers/net/irda/sa1100_ir.c | 2 - drivers/net/irda/stir4200.c | 1 - drivers/net/irda/vlsi_ir.c | 1 - drivers/net/irda/w83977af_ir.c | 1 - drivers/net/isa-skeleton.c | 4 +- drivers/net/ixgb/ixgb_main.c | 4 +- drivers/net/ixgbe/ixgbe.h | 1 + drivers/net/ixgbe/ixgbe_82598.c | 12 + drivers/net/ixgbe/ixgbe_ethtool.c | 27 + drivers/net/ixgbe/ixgbe_main.c | 40 +- drivers/net/ixgbe/ixgbe_phy.c | 68 + drivers/net/ixgbe/ixgbe_phy.h | 7 + drivers/net/ixgbe/ixgbe_type.h | 6 + drivers/net/ixp2000/ixpdev.c | 2 - drivers/net/jazzsonic.c | 4 +- drivers/net/jme.c | 13 +- drivers/net/korina.c | 1 - drivers/net/lance.c | 4 +- drivers/net/lib82596.c | 14 +- drivers/net/lib8390.c | 1 - drivers/net/lne390.c | 5 +- drivers/net/loopback.c | 15 +- drivers/net/lp486e.c | 1 - drivers/net/mac89x0.c | 5 +- drivers/net/macb.c | 8 +- drivers/net/mace.c | 6 +- drivers/net/macmace.c | 6 +- drivers/net/macsonic.c | 9 +- drivers/net/macvlan.c | 26 +- drivers/net/meth.c | 4 +- drivers/net/mlx4/en_rx.c | 2 - drivers/net/mlx4/mcg.c | 23 +- drivers/net/mv643xx_eth.c | 7 +- drivers/net/mvme147.c | 5 +- drivers/net/myri10ge/myri10ge.c | 5 +- drivers/net/myri_sbus.c | 15 +- drivers/net/natsemi.c | 6 +- drivers/net/ne-h8300.c | 3 +- drivers/net/ne.c | 3 +- drivers/net/ne2.c | 6 +- drivers/net/ne2k-pci.c | 5 +- drivers/net/ne3210.c | 5 +- drivers/net/netconsole.c | 9 +- drivers/net/netx-eth.c | 1 - drivers/net/netxen/netxen_nic_init.c | 2 - drivers/net/netxen/netxen_nic_main.c | 8 +- drivers/net/netxen/netxen_nic_niu.c | 7 +- drivers/net/ni5010.c | 4 +- drivers/net/ni52.c | 1 - drivers/net/ni65.c | 1 - drivers/net/niu.c | 6 +- drivers/net/ns83820.c | 6 +- drivers/net/pasemi_mac.c | 5 +- drivers/net/pci-skeleton.c | 6 +- drivers/net/pcmcia/3c574_cs.c | 6 +- drivers/net/pcmcia/3c589_cs.c | 6 +- drivers/net/pcmcia/axnet_cs.c | 6 +- drivers/net/pcmcia/fmvj18x_cs.c | 79 +- drivers/net/pcmcia/nmclan_cs.c | 6 +- drivers/net/pcmcia/pcnet_cs.c | 3 +- drivers/net/pcmcia/smc91c92_cs.c | 5 +- drivers/net/pcmcia/xirc2ps_cs.c | 6 +- drivers/net/pcnet32.c | 4 +- drivers/net/phy/broadcom.c | 195 ++- drivers/net/phy/smsc.c | 28 + drivers/net/plip.c | 1 - drivers/net/ppp_generic.c | 1 - drivers/net/pppoe.c | 5 +- drivers/net/ps3_gelic_net.c | 6 +- drivers/net/ps3_gelic_wireless.c | 20 +- drivers/net/qla3xxx.c | 11 +- drivers/net/qlge/qlge_main.c | 12 +- drivers/net/r6040.c | 1 - drivers/net/r8169.c | 1 - drivers/net/rionet.c | 5 +- drivers/net/rrunner.c | 4 +- drivers/net/s2io.c | 11 +- drivers/net/sb1000.c | 1 - drivers/net/sb1250-mac.c | 5 +- drivers/net/sc92031.c | 1 - drivers/net/seeq8005.c | 4 +- drivers/net/sfc/Kconfig | 8 + drivers/net/sfc/Makefile | 1 + drivers/net/sfc/boards.c | 136 ++ drivers/net/sfc/efx.c | 47 +- drivers/net/sfc/efx.h | 10 + drivers/net/sfc/enum.h | 4 +- drivers/net/sfc/ethtool.c | 15 +- drivers/net/sfc/falcon.c | 23 +- drivers/net/sfc/falcon_hwdefs.h | 1 - drivers/net/sfc/mdio_10g.c | 35 + drivers/net/sfc/mdio_10g.h | 7 + drivers/net/sfc/mtd.c | 268 +++ drivers/net/sfc/net_driver.h | 8 + drivers/net/sfc/rx.c | 2 +- drivers/net/sfc/sfe4001.c | 116 +- drivers/net/sfc/spi.h | 34 +- drivers/net/sfc/tenxpress.c | 18 +- drivers/net/sfc/workarounds.h | 2 + drivers/net/sfc/xfp_phy.c | 9 + drivers/net/sgiseeq.c | 5 +- drivers/net/sh_eth.c | 1 - drivers/net/sis190.c | 7 +- drivers/net/sis900.c | 6 +- drivers/net/skfp/skfddi.c | 2 - drivers/net/skge.c | 44 +- drivers/net/sky2.c | 5 +- drivers/net/slip.c | 1 - drivers/net/smc-mca.c | 5 +- drivers/net/smc-ultra.c | 5 +- drivers/net/smc-ultra32.c | 5 +- drivers/net/smc911x.c | 2 - drivers/net/smc9194.c | 5 +- drivers/net/smc91x.c | 8 +- drivers/net/smsc911x.c | 2091 +++++++++++++++++++ drivers/net/smsc911x.h | 394 ++++ drivers/net/sonic.c | 1 - drivers/net/starfire.c | 14 +- drivers/net/sun3lance.c | 10 +- drivers/net/sunbmac.c | 6 +- drivers/net/sundance.c | 6 +- drivers/net/sungem.c | 7 +- drivers/net/sunhme.c | 7 +- drivers/net/sunlance.c | 7 +- drivers/net/sunqe.c | 1 - drivers/net/sunvnet.c | 5 +- drivers/net/tc35815.c | 23 +- drivers/net/tehuti.c | 1 - drivers/net/tg3.c | 370 +++-- drivers/net/tg3.h | 111 +- drivers/net/tlan.c | 2 - drivers/net/tokenring/3c359.c | 2 - drivers/net/tokenring/abyss.c | 4 +- drivers/net/tokenring/ibmtr.c | 11 +- drivers/net/tokenring/lanstreamer.c | 36 +- drivers/net/tokenring/madgemc.c | 10 +- drivers/net/tokenring/olympic.c | 52 +- drivers/net/tokenring/proteon.c | 5 +- drivers/net/tokenring/skisa.c | 5 +- drivers/net/tokenring/smctr.c | 2 - drivers/net/tokenring/tms380tr.c | 1 - drivers/net/tokenring/tmspci.c | 5 +- drivers/net/tsi108_eth.c | 6 +- drivers/net/tulip/de2104x.c | 6 +- drivers/net/tulip/de4x5.c | 13 +- drivers/net/tulip/dmfe.c | 7 +- drivers/net/tulip/interrupt.c | 2 - drivers/net/tulip/tulip_core.c | 11 +- drivers/net/tulip/uli526x.c | 6 +- drivers/net/tulip/winbond-840.c | 16 +- drivers/net/tulip/xircom_cb.c | 4 +- drivers/net/tun.c | 6 +- drivers/net/typhoon.c | 6 +- drivers/net/ucc_geth.c | 2 - drivers/net/usb/catc.c | 2 - drivers/net/usb/pegasus.c | 5 +- drivers/net/usb/smsc95xx.c | 4 +- drivers/net/usb/usbnet.c | 5 +- drivers/net/veth.c | 16 - drivers/net/via-rhine.c | 6 +- drivers/net/via-velocity.c | 2 - drivers/net/virtio_net.c | 4 +- drivers/net/wan/cosa.c | 1 - drivers/net/wan/cycx_x25.c | 2 - drivers/net/wan/dlci.c | 1 - drivers/net/wan/dscc4.c | 4 +- drivers/net/wan/farsync.c | 2 - drivers/net/wan/hd6457x.c | 1 - drivers/net/wan/hostess_sv11.c | 1 - drivers/net/wan/lapbether.c | 3 - drivers/net/wan/lmc/lmc_main.c | 1 - drivers/net/wan/lmc/lmc_proto.c | 1 - drivers/net/wan/pc300too.c | 2 +- drivers/net/wan/pci200syn.c | 2 +- drivers/net/wan/sbni.c | 2 - drivers/net/wan/sealevel.c | 1 - drivers/net/wan/syncppp.c | 4 - drivers/net/wan/wanxl.c | 1 - drivers/net/wan/x25_asy.c | 4 - drivers/net/wd.c | 5 +- drivers/net/wireless/Kconfig | 1 + drivers/net/wireless/adm8211.c | 29 +- drivers/net/wireless/airo.c | 191 +- drivers/net/wireless/arlan-main.c | 27 +- drivers/net/wireless/ath5k/ath5k.h | 86 +- drivers/net/wireless/ath5k/base.c | 119 +- drivers/net/wireless/ath5k/dma.c | 190 ++- drivers/net/wireless/ath5k/initvals.c | 8 +- drivers/net/wireless/ath5k/phy.c | 5 +- drivers/net/wireless/ath5k/qcu.c | 37 +- drivers/net/wireless/ath5k/reg.h | 3 +- drivers/net/wireless/ath5k/reset.c | 3 +- drivers/net/wireless/ath9k/ath9k.h | 13 + drivers/net/wireless/ath9k/core.c | 3 - drivers/net/wireless/ath9k/core.h | 10 +- drivers/net/wireless/ath9k/hw.c | 10 +- drivers/net/wireless/ath9k/main.c | 142 +- drivers/net/wireless/ath9k/rc.c | 67 +- drivers/net/wireless/ath9k/rc.h | 1 - drivers/net/wireless/ath9k/recv.c | 5 +- drivers/net/wireless/ath9k/xmit.c | 85 +- drivers/net/wireless/atmel.c | 7 +- drivers/net/wireless/b43/dma.c | 4 +- drivers/net/wireless/b43/main.c | 95 +- drivers/net/wireless/b43/pio.c | 3 +- drivers/net/wireless/b43/xmit.c | 60 +- drivers/net/wireless/b43/xmit.h | 5 +- drivers/net/wireless/b43legacy/dma.c | 46 +- drivers/net/wireless/b43legacy/main.c | 76 +- drivers/net/wireless/b43legacy/pio.c | 31 +- drivers/net/wireless/b43legacy/xmit.c | 26 +- drivers/net/wireless/b43legacy/xmit.h | 2 +- drivers/net/wireless/hostap/hostap_80211_rx.c | 62 +- drivers/net/wireless/hostap/hostap_80211_tx.c | 15 +- drivers/net/wireless/hostap/hostap_ap.c | 241 +-- drivers/net/wireless/hostap/hostap_common.h | 13 - drivers/net/wireless/hostap/hostap_hw.c | 10 +- drivers/net/wireless/hostap/hostap_info.c | 16 +- drivers/net/wireless/hostap/hostap_ioctl.c | 16 +- drivers/net/wireless/hostap/hostap_main.c | 26 +- drivers/net/wireless/hostap/hostap_pci.c | 2 +- drivers/net/wireless/hostap/hostap_proc.c | 15 +- drivers/net/wireless/hostap/hostap_wlan.h | 2 +- drivers/net/wireless/ipw2100.c | 53 +- drivers/net/wireless/ipw2200.c | 415 ++-- drivers/net/wireless/ipw2200.h | 1 + drivers/net/wireless/iwlwifi/Kconfig | 2 + drivers/net/wireless/iwlwifi/iwl-3945-commands.h | 6 +- drivers/net/wireless/iwlwifi/iwl-3945-io.h | 2 +- drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 76 +- drivers/net/wireless/iwlwifi/iwl-3945.c | 74 +- drivers/net/wireless/iwlwifi/iwl-3945.h | 2 + drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 148 +- drivers/net/wireless/iwlwifi/iwl-4965.c | 136 +- drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 39 +- drivers/net/wireless/iwlwifi/iwl-5000.c | 272 ++-- drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 98 +- drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 12 +- drivers/net/wireless/iwlwifi/iwl-agn.c | 172 +- drivers/net/wireless/iwlwifi/iwl-calib.c | 8 +- drivers/net/wireless/iwlwifi/iwl-commands.h | 191 +- drivers/net/wireless/iwlwifi/iwl-core.c | 186 +- drivers/net/wireless/iwlwifi/iwl-core.h | 15 +- drivers/net/wireless/iwlwifi/iwl-csr.h | 4 +- drivers/net/wireless/iwlwifi/iwl-debug.h | 9 +- drivers/net/wireless/iwlwifi/iwl-debugfs.c | 5 +- drivers/net/wireless/iwlwifi/iwl-dev.h | 60 +- drivers/net/wireless/iwlwifi/iwl-eeprom.c | 18 +- drivers/net/wireless/iwlwifi/iwl-eeprom.h | 5 +- drivers/net/wireless/iwlwifi/iwl-fh.h | 8 + drivers/net/wireless/iwlwifi/iwl-helpers.h | 107 - drivers/net/wireless/iwlwifi/iwl-io.h | 2 +- drivers/net/wireless/iwlwifi/iwl-led.c | 2 +- drivers/net/wireless/iwlwifi/iwl-power.c | 18 +- drivers/net/wireless/iwlwifi/iwl-prph.h | 6 +- drivers/net/wireless/iwlwifi/iwl-rfkill.c | 8 +- drivers/net/wireless/iwlwifi/iwl-rx.c | 8 +- drivers/net/wireless/iwlwifi/iwl-scan.c | 124 +- drivers/net/wireless/iwlwifi/iwl-sta.c | 98 +- drivers/net/wireless/iwlwifi/iwl-tx.c | 355 ++-- drivers/net/wireless/iwlwifi/iwl3945-base.c | 154 +- drivers/net/wireless/libertas/assoc.c | 51 +- drivers/net/wireless/libertas/cmd.c | 9 +- drivers/net/wireless/libertas/debugfs.c | 11 +- drivers/net/wireless/libertas/decl.h | 4 - drivers/net/wireless/libertas/main.c | 36 +- drivers/net/wireless/libertas/scan.c | 26 +- drivers/net/wireless/libertas/wext.c | 7 +- drivers/net/wireless/libertas_tf/cmd.c | 5 +- drivers/net/wireless/libertas_tf/main.c | 8 +- drivers/net/wireless/mac80211_hwsim.c | 54 +- drivers/net/wireless/netwave_cs.c | 6 +- drivers/net/wireless/orinoco.c | 51 +- drivers/net/wireless/orinoco.h | 5 + drivers/net/wireless/p54/p54.h | 51 +- drivers/net/wireless/p54/p54common.c | 742 ++++--- drivers/net/wireless/p54/p54common.h | 287 +++- drivers/net/wireless/p54/p54pci.c | 24 +- drivers/net/wireless/p54/p54usb.c | 75 +- drivers/net/wireless/prism54/isl_ioctl.c | 24 +- drivers/net/wireless/ray_cs.c | 10 +- drivers/net/wireless/rndis_wlan.c | 9 +- drivers/net/wireless/rt2x00/rt2400pci.c | 6 +- drivers/net/wireless/rt2x00/rt2500pci.c | 7 +- drivers/net/wireless/rt2x00/rt2500usb.c | 4 +- drivers/net/wireless/rt2x00/rt2x00.h | 5 +- drivers/net/wireless/rt2x00/rt2x00config.c | 20 +- drivers/net/wireless/rt2x00/rt2x00debug.c | 25 +- drivers/net/wireless/rt2x00/rt2x00dev.c | 22 +- drivers/net/wireless/rt2x00/rt2x00mac.c | 26 +- drivers/net/wireless/rt2x00/rt2x00pci.c | 3 +- drivers/net/wireless/rt2x00/rt2x00queue.c | 24 +- drivers/net/wireless/rt2x00/rt2x00queue.h | 9 +- drivers/net/wireless/rt2x00/rt61pci.c | 8 +- drivers/net/wireless/rt2x00/rt73usb.c | 8 +- drivers/net/wireless/rtl8180_dev.c | 36 +- drivers/net/wireless/rtl8187.h | 1 - drivers/net/wireless/rtl8187_dev.c | 128 +- drivers/net/wireless/rtl8187_rtl8225.c | 8 - drivers/net/wireless/strip.c | 2 - drivers/net/wireless/wavelan.c | 34 +- drivers/net/wireless/wavelan_cs.c | 39 +- drivers/net/wireless/wl3501_cs.c | 11 +- drivers/net/wireless/zd1201.c | 2 - drivers/net/wireless/zd1211rw/zd_chip.c | 4 +- drivers/net/wireless/zd1211rw/zd_mac.c | 44 +- drivers/net/wireless/zd1211rw/zd_usb.c | 2 +- drivers/net/xen-netfront.c | 1 - drivers/net/xtsonic.c | 6 +- drivers/net/yellowfin.c | 14 +- drivers/net/znet.c | 6 +- drivers/net/zorro8390.c | 7 +- drivers/s390/net/qeth_l2_main.c | 18 +- drivers/scsi/iscsi_tcp.c | 4 +- drivers/scsi/qla4xxx/ql4_os.c | 3 +- drivers/usb/atm/cxacru.c | 4 +- drivers/usb/atm/usbatm.c | 5 +- drivers/usb/gadget/u_ether.c | 6 +- drivers/uwb/wlp/eda.c | 38 +- fs/afs/proc.c | 4 +- fs/afs/server.c | 9 +- fs/cifs/cifs_spnego.c | 6 +- fs/cifs/connect.c | 4 +- fs/lockd/host.c | 8 +- fs/lockd/mon.c | 2 +- fs/nfs/nfsroot.c | 6 +- fs/nfs/super.c | 6 +- fs/nfsd/nfs4state.c | 4 +- fs/nfsd/nfsctl.c | 2 +- fs/ocfs2/cluster/netdebug.c | 8 +- fs/ocfs2/cluster/nodemanager.c | 2 +- fs/ocfs2/cluster/tcp.c | 29 +- include/linux/cgroup_subsys.h | 6 + include/linux/dccp.h | 13 +- include/linux/ieee80211.h | 142 +- include/linux/if.h | 1 + include/linux/kernel.h | 12 - include/linux/netdevice.h | 33 +- include/linux/nl80211.h | 98 + include/linux/pkt_cls.h | 14 + include/linux/rculist.h | 17 + include/linux/skbuff.h | 19 +- include/linux/smsc911x.h | 42 + include/linux/sunrpc/svc_xprt.h | 8 +- include/linux/xfrm.h | 14 + include/net/cfg80211.h | 32 +- include/net/dst.h | 3 +- include/net/ieee80211.h | 133 +-- include/net/ip_vs.h | 11 +- include/net/lib80211.h | 18 + include/net/mac80211.h | 414 +++-- include/net/ndisc.h | 14 + include/net/netfilter/nf_conntrack_tuple.h | 12 +- include/net/netlink.h | 22 +- include/net/netns/ipv4.h | 2 + include/net/sch_generic.h | 35 + include/net/sctp/sctp.h | 8 +- include/net/sock.h | 43 +- include/net/udp.h | 25 +- include/net/udplite.h | 2 +- include/net/wireless.h | 58 +- include/net/xfrm.h | 5 +- lib/vsprintf.c | 74 + net/802/tr.c | 24 +- net/8021q/vlan.c | 8 +- net/8021q/vlan.h | 6 +- net/8021q/vlan_core.c | 2 - net/8021q/vlan_dev.c | 24 +- net/Kconfig | 2 +- net/appletalk/aarp.c | 3 +- net/appletalk/sysctl_net_atalk.c | 14 +- net/atm/br2684.c | 5 +- net/atm/clip.c | 4 +- net/atm/lec.c | 26 +- net/atm/mpc.c | 26 +- net/atm/mpoa_caches.c | 18 +- net/ax25/sysctl_net_ax25.c | 56 +- net/bluetooth/bnep/core.c | 1 - net/bridge/br_netfilter.c | 10 +- net/bridge/netfilter/ebt_log.c | 18 +- net/core/datagram.c | 5 +- net/core/dev.c | 68 +- net/core/fib_rules.c | 7 +- net/core/flow.c | 2 +- net/core/neighbour.c | 50 +- net/core/net-sysfs.c | 7 + net/core/net_namespace.c | 2 - net/core/netpoll.c | 5 +- net/core/pktgen.c | 9 +- net/core/skbuff.c | 3 +- net/core/sock.c | 3 +- net/core/sysctl_net_core.c | 34 +- net/dccp/dccp.h | 5 +- net/dccp/feat.c | 167 ++ net/dccp/feat.h | 62 + net/dccp/input.c | 2 - net/dccp/ipv4.c | 12 +- net/dccp/ipv6.c | 4 +- net/dccp/minisocks.c | 7 +- net/dccp/probe.c | 12 +- net/dccp/proto.c | 3 +- net/decnet/sysctl_net_decnet.c | 44 +- net/dsa/tag_dsa.c | 1 - net/dsa/tag_edsa.c | 1 - net/dsa/tag_trailer.c | 1 - net/ieee80211/Kconfig | 57 +- net/ieee80211/ieee80211_crypt_ccmp.c | 13 +- net/ieee80211/ieee80211_crypt_tkip.c | 29 +- net/ieee80211/ieee80211_module.c | 26 - net/ieee80211/ieee80211_rx.c | 116 +- net/ieee80211/ieee80211_wx.c | 26 +- net/ipv4/af_inet.c | 7 +- net/ipv4/ah4.c | 4 +- net/ipv4/arp.c | 18 +- net/ipv4/cipso_ipv4.c | 1 - net/ipv4/devinet.c | 19 +- net/ipv4/esp4.c | 4 +- net/ipv4/fib_frontend.c | 10 +- net/ipv4/fib_hash.c | 12 +- net/ipv4/fib_semantics.c | 8 +- net/ipv4/fib_trie.c | 6 +- net/ipv4/icmp.c | 27 +- net/ipv4/igmp.c | 46 +- net/ipv4/inet_connection_sock.c | 2 +- net/ipv4/inetpeer.c | 2 +- net/ipv4/ip_forward.c | 2 +- net/ipv4/ip_fragment.c | 21 +- net/ipv4/ip_gre.c | 14 +- net/ipv4/ip_input.c | 10 +- net/ipv4/ip_output.c | 6 +- net/ipv4/ip_sockglue.c | 32 +- net/ipv4/ipcomp.c | 4 +- net/ipv4/ipconfig.c | 40 +- net/ipv4/ipip.c | 2 +- net/ipv4/ipmr.c | 130 +- net/ipv4/netfilter/arp_tables.c | 16 +- net/ipv4/netfilter/ip_tables.c | 12 +- net/ipv4/netfilter/ipt_CLUSTERIP.c | 9 +- net/ipv4/netfilter/ipt_LOG.c | 7 +- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 27 +- net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 4 +- net/ipv4/netfilter/nf_nat_h323.c | 58 +- net/ipv4/netfilter/nf_nat_irc.c | 4 +- net/ipv4/netfilter/nf_nat_rule.c | 6 +- net/ipv4/netfilter/nf_nat_sip.c | 18 +- net/ipv4/netfilter/nf_nat_snmp_basic.c | 9 +- net/ipv4/raw.c | 8 +- net/ipv4/route.c | 223 ++- net/ipv4/sysctl_net_ipv4.c | 188 +- net/ipv4/tcp.c | 6 +- net/ipv4/tcp_cubic.c | 120 +- net/ipv4/tcp_input.c | 8 +- net/ipv4/tcp_ipv4.c | 29 +- net/ipv4/tcp_minisocks.c | 2 +- net/ipv4/tcp_output.c | 8 +- net/ipv4/tcp_probe.c | 7 +- net/ipv4/tcp_timer.c | 12 +- net/ipv4/tcp_yeah.c | 4 +- net/ipv4/udp.c | 258 ++- net/ipv4/udp_impl.h | 4 +- net/ipv4/udplite.c | 14 +- net/ipv4/xfrm4_policy.c | 2 +- net/ipv6/addrconf.c | 67 +- net/ipv6/addrlabel.c | 34 +- net/ipv6/ah6.c | 4 +- net/ipv6/anycast.c | 6 +- net/ipv6/esp6.c | 4 +- net/ipv6/exthdrs.c | 2 +- net/ipv6/icmp.c | 11 +- net/ipv6/ip6_flowlabel.c | 4 +- net/ipv6/ip6_output.c | 2 +- net/ipv6/ip6mr.c | 5 +- net/ipv6/ipcomp6.c | 4 +- net/ipv6/mcast.c | 10 +- net/ipv6/ndisc.c | 99 +- net/ipv6/netfilter/ip6t_LOG.c | 7 +- net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 5 +- net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 2 +- net/ipv6/netfilter/nf_conntrack_reasm.c | 6 +- net/ipv6/reassembly.c | 12 +- net/ipv6/route.c | 43 +- net/ipv6/sysctl_net_ipv6.c | 4 +- net/ipv6/tcp_ipv6.c | 8 +- net/ipv6/udp.c | 137 +- net/ipv6/udp_impl.h | 4 +- net/ipv6/udplite.c | 9 +- net/ipv6/xfrm6_policy.c | 9 +- net/ipx/sysctl_net_ipx.c | 2 +- net/irda/irlan/irlan_client.c | 4 +- net/irda/irsysctl.c | 50 +- net/llc/llc_proc.c | 3 +- net/llc/sysctl_net_llc.c | 20 +- net/mac80211/cfg.c | 96 +- net/mac80211/debugfs.c | 12 +- net/mac80211/debugfs_key.c | 4 +- net/mac80211/debugfs_netdev.c | 117 +- net/mac80211/debugfs_sta.c | 84 +- net/mac80211/event.c | 5 +- net/mac80211/ht.c | 242 ++- net/mac80211/ieee80211_i.h | 59 +- net/mac80211/iface.c | 27 +- net/mac80211/key.c | 10 +- net/mac80211/main.c | 209 +-- net/mac80211/mesh.c | 2 +- net/mac80211/mesh_hwmp.c | 6 +- net/mac80211/mesh_plink.c | 49 +- net/mac80211/mlme.c | 464 +++-- net/mac80211/rate.c | 52 +- net/mac80211/rate.h | 11 +- net/mac80211/rc80211_minstrel.c | 107 +- net/mac80211/rc80211_minstrel.h | 2 + net/mac80211/rc80211_pid.h | 3 +- net/mac80211/rc80211_pid_algo.c | 32 +- net/mac80211/rc80211_pid_debugfs.c | 5 +- net/mac80211/rx.c | 77 +- net/mac80211/scan.c | 22 +- net/mac80211/sta_info.c | 37 +- net/mac80211/sta_info.h | 42 +- net/mac80211/tkip.c | 10 +- net/mac80211/tx.c | 438 ++-- net/mac80211/util.c | 20 +- net/mac80211/wep.c | 26 +- net/mac80211/wep.h | 2 +- net/mac80211/wext.c | 72 +- net/mac80211/wme.c | 32 +- net/mac80211/wpa.c | 32 +- net/netfilter/ipvs/ip_vs_conn.c | 20 +- net/netfilter/ipvs/ip_vs_core.c | 20 +- net/netfilter/ipvs/ip_vs_ctl.c | 82 +- net/netfilter/ipvs/ip_vs_dh.c | 34 +- net/netfilter/ipvs/ip_vs_ftp.c | 13 +- net/netfilter/ipvs/ip_vs_lblc.c | 69 +- net/netfilter/ipvs/ip_vs_lblcr.c | 96 +- net/netfilter/ipvs/ip_vs_lc.c | 3 - net/netfilter/ipvs/ip_vs_nq.c | 3 - net/netfilter/ipvs/ip_vs_proto.c | 38 +- net/netfilter/ipvs/ip_vs_proto_ah_esp.c | 10 +- net/netfilter/ipvs/ip_vs_proto_tcp.c | 8 +- net/netfilter/ipvs/ip_vs_proto_udp.c | 8 +- net/netfilter/ipvs/ip_vs_rr.c | 3 - net/netfilter/ipvs/ip_vs_sed.c | 3 - net/netfilter/ipvs/ip_vs_sh.c | 34 +- net/netfilter/ipvs/ip_vs_sync.c | 4 +- net/netfilter/ipvs/ip_vs_wlc.c | 3 - net/netfilter/ipvs/ip_vs_wrr.c | 3 - net/netfilter/ipvs/ip_vs_xmit.c | 34 +- net/netfilter/nf_conntrack_acct.c | 2 +- net/netfilter/nf_conntrack_ftp.c | 15 +- net/netfilter/nf_conntrack_h323_main.c | 12 +- net/netfilter/nf_conntrack_irc.c | 13 +- net/netfilter/nf_conntrack_proto_generic.c | 4 +- net/netfilter/nf_conntrack_proto_sctp.c | 28 +- net/netfilter/nf_conntrack_proto_tcp.c | 50 +- net/netfilter/nf_conntrack_proto_udp.c | 8 +- net/netfilter/nf_conntrack_proto_udplite.c | 4 +- net/netfilter/nf_conntrack_standalone.c | 16 +- net/netfilter/xt_hashlimit.c | 14 +- net/netfilter/xt_iprange.c | 36 +- net/netfilter/xt_recent.c | 10 +- net/netlabel/netlabel_addrlist.c | 4 +- net/netlink/attr.c | 2 +- net/netrom/sysctl_net_netrom.c | 48 +- net/phonet/af_phonet.c | 11 +- net/phonet/pep-gprs.c | 8 +- net/phonet/sysctl.c | 2 +- net/rfkill/rfkill-input.c | 337 +++- net/rfkill/rfkill-input.h | 3 + net/rfkill/rfkill.c | 80 +- net/rose/sysctl_net_rose.c | 40 +- net/rxrpc/af_rxrpc.c | 4 +- net/rxrpc/ar-error.c | 3 +- net/rxrpc/ar-local.c | 16 +- net/rxrpc/ar-peer.c | 8 +- net/rxrpc/ar-proc.c | 16 +- net/rxrpc/ar-transport.c | 12 +- net/rxrpc/rxkad.c | 2 +- net/sched/Kconfig | 11 + net/sched/Makefile | 1 + net/sched/cls_cgroup.c | 290 +++ net/sched/sch_api.c | 12 + net/sched/sch_atm.c | 23 +- net/sched/sch_blackhole.c | 1 + net/sched/sch_cbq.c | 1 + net/sched/sch_dsmark.c | 10 + net/sched/sch_fifo.c | 2 + net/sched/sch_generic.c | 19 + net/sched/sch_gred.c | 1 + net/sched/sch_hfsc.c | 15 +- net/sched/sch_htb.c | 1 + net/sched/sch_multiq.c | 29 + net/sched/sch_netem.c | 138 +-- net/sched/sch_prio.c | 14 + net/sched/sch_red.c | 9 + net/sched/sch_sfq.c | 12 + net/sched/sch_tbf.c | 13 +- net/sched/sch_teql.c | 8 + net/sctp/ipv6.c | 35 +- net/sctp/protocol.c | 18 +- net/sctp/sm_statefuns.c | 10 +- net/sctp/sysctl.c | 82 +- net/socket.c | 1 - net/sunrpc/clnt.c | 8 +- net/sunrpc/rpcb_clnt.c | 17 +- net/sunrpc/svcauth_unix.c | 24 +- net/sunrpc/svcsock.c | 6 +- net/sunrpc/xprtrdma/svc_rdma_transport.c | 12 +- net/sunrpc/xprtrdma/transport.c | 14 +- net/sunrpc/xprtrdma/verbs.c | 14 +- net/sunrpc/xprtsock.c | 41 +- net/tipc/eth_media.c | 3 +- net/unix/af_unix.c | 73 +- net/unix/garbage.c | 12 +- net/unix/sysctl_net_unix.c | 3 +- net/wireless/Kconfig | 10 + net/wireless/Makefile | 1 + net/wireless/core.c | 6 +- net/wireless/lib80211.c | 65 + net/wireless/nl80211.c | 213 ++- net/wireless/reg.c | 290 +-- net/wireless/reg.h | 20 +- net/x25/sysctl_net_x25.c | 22 +- net/xfrm/xfrm_policy.c | 16 +- net/xfrm/xfrm_state.c | 24 +- net/xfrm/xfrm_user.c | 52 + security/selinux/avc.c | 4 +- security/selinux/hooks.c | 4 +- 782 files changed, 14422 insertions(+), 11936 deletions(-) create mode 100644 drivers/net/bonding/bond_ipv6.c delete mode 100644 drivers/net/eepro100.c create mode 100644 drivers/net/sfc/mtd.c create mode 100644 drivers/net/smsc911x.c create mode 100644 drivers/net/smsc911x.h create mode 100644 include/linux/smsc911x.h create mode 100644 include/net/lib80211.h create mode 100644 net/sched/cls_cgroup.c create mode 100644 net/wireless/lib80211.c Merging mtd/master $ git merge mtd/master Already up-to-date. 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/crc32c-intel.c | 20 +++-- crypto/camellia.c | 84 +++++++++----------- crypto/testmgr.c | 7 ++- drivers/crypto/hifn_795x.c | 5 + drivers/crypto/talitos.c | 171 +++++++++++++++++++++++++-------------- drivers/crypto/talitos.h | 11 +++- 6 files changed, 180 insertions(+), 118 deletions(-) Merging vfs/for-next $ git merge vfs/for-next Already up-to-date. Merging sound/for-next $ git merge sound/for-next Removed sound/soc/at32/Kconfig Removed sound/soc/at32/Makefile Removed sound/soc/at32/at32-pcm.h Removed sound/soc/at32/at32-ssc.c Removed sound/soc/at32/at32-ssc.h Removed sound/soc/at91/Kconfig Removed sound/soc/at91/Makefile Removed sound/soc/at91/at91-pcm.c Removed sound/soc/at91/at91-pcm.h Removed sound/soc/at91/at91-ssc.c Removed sound/soc/at91/at91-ssc.h Merge made by recursive. Documentation/sound/alsa/ALSA-Configuration.txt | 4 + arch/arm/mach-pxa/include/mach/palmasoc.h | 13 + include/linux/input.h | 1 + include/sound/ac97_codec.h | 2 + include/sound/asound.h | 1 + include/sound/core.h | 28 +- include/sound/jack.h | 1 + include/sound/soc-dapm.h | 2 - include/sound/soc.h | 6 +- include/sound/version.h | 2 +- sound/aoa/codecs/Makefile | 4 + sound/aoa/codecs/{snd-aoa-codec-onyx.c => onyx.c} | 12 +- sound/aoa/codecs/{snd-aoa-codec-onyx.h => onyx.h} | 0 ...aoa-codec-tas-basstreble.h => tas-basstreble.h} | 0 ...aoa-codec-tas-gain-table.h => tas-gain-table.h} | 0 sound/aoa/codecs/{snd-aoa-codec-tas.c => tas.c} | 8 +- sound/aoa/codecs/{snd-aoa-codec-tas.h => tas.h} | 0 .../codecs/{snd-aoa-codec-toonie.c => toonie.c} | 2 +- sound/aoa/core/Makefile | 8 +- sound/aoa/core/{snd-aoa-alsa.c => alsa.c} | 4 +- sound/aoa/core/{snd-aoa-alsa.h => alsa.h} | 0 sound/aoa/core/{snd-aoa-core.c => core.c} | 2 +- .../{snd-aoa-gpio-feature.c => gpio-feature.c} | 2 +- sound/aoa/core/{snd-aoa-gpio-pmf.c => gpio-pmf.c} | 0 sound/aoa/fabrics/Makefile | 2 + .../fabrics/{snd-aoa-fabric-layout.c => layout.c} | 2 +- sound/aoa/soundbus/i2sbus/Makefile | 2 +- .../i2sbus/{i2sbus-control.c => control.c} | 0 .../aoa/soundbus/i2sbus/{i2sbus-core.c => core.c} | 4 +- sound/aoa/soundbus/i2sbus/i2sbus.h | 2 +- .../i2sbus/{i2sbus-interface.h => interface.h} | 0 sound/aoa/soundbus/i2sbus/{i2sbus-pcm.c => pcm.c} | 0 sound/core/Kconfig | 21 + sound/core/Makefile | 2 + sound/core/device.c | 4 +- sound/core/hrtimer.c | 140 +++ sound/core/jack.c | 9 +- sound/core/seq/seq.c | 4 +- sound/drivers/pcsp/pcsp.c | 8 +- sound/drivers/pcsp/pcsp.h | 1 + sound/drivers/pcsp/pcsp_lib.c | 95 +- sound/pci/Kconfig | 9 + sound/pci/ac97/ac97_patch.c | 7 +- sound/pci/cs5535audio/cs5535audio.c | 3 +- sound/pci/cs5535audio/cs5535audio.h | 4 + sound/pci/cs5535audio/cs5535audio_pcm.c | 12 + sound/pci/emu10k1/emu10k1_main.c | 494 ++++---- sound/pci/hda/Makefile | 1 + sound/pci/hda/hda_codec.c | 504 ++++++-- sound/pci/hda/hda_codec.h | 54 +- sound/pci/hda/hda_generic.c | 20 +- sound/pci/hda/hda_hwdep.c | 228 ++++ sound/pci/hda/hda_intel.c | 266 ++--- sound/pci/hda/hda_local.h | 24 +- sound/pci/hda/hda_patch.h | 2 + sound/pci/hda/hda_proc.c | 44 +- sound/pci/hda/patch_analog.c | 57 +- sound/pci/hda/patch_conexant.c | 11 - sound/pci/hda/patch_intelhdmi.c | 928 ++++++++++++++ sound/pci/hda/patch_realtek.c | 1312 +++++++++----------- sound/pci/hda/patch_sigmatel.c | 249 +++- sound/pci/hda/patch_via.c | 71 +- sound/pci/ice1712/ice1724.c | 23 +- sound/pci/rme9652/hdsp.c | 27 +- sound/soc/Kconfig | 3 +- sound/soc/Makefile | 2 +- sound/soc/at32/Kconfig | 34 - sound/soc/at32/Makefile | 11 - sound/soc/at32/at32-pcm.h | 79 -- sound/soc/at32/at32-ssc.c | 849 ------------- sound/soc/at32/at32-ssc.h | 59 - sound/soc/at91/Kconfig | 10 - sound/soc/at91/Makefile | 6 - sound/soc/at91/at91-pcm.c | 434 ------- sound/soc/at91/at91-pcm.h | 72 -- sound/soc/at91/at91-ssc.c | 791 ------------ sound/soc/at91/at91-ssc.h | 27 - sound/soc/atmel/Kconfig | 43 + sound/soc/atmel/Makefile | 15 + sound/soc/{at32/at32-pcm.c => atmel/atmel-pcm.c} | 376 +++--- sound/soc/atmel/atmel-pcm.h | 86 ++ sound/soc/atmel/atmel_ssc_dai.c | 782 ++++++++++++ sound/soc/atmel/atmel_ssc_dai.h | 121 ++ sound/soc/{at32 => atmel}/playpaq_wm8510.c | 5 +- sound/soc/atmel/sam9g20_wm8731.c | 328 +++++ sound/soc/codecs/Kconfig | 49 +- sound/soc/codecs/Makefile | 2 + sound/soc/codecs/ad73311.c | 1 - sound/soc/codecs/cs4270.c | 13 + sound/soc/codecs/twl4030.c | 653 ++++++++++ sound/soc/codecs/twl4030.h | 197 +++ sound/soc/codecs/wm8580.c | 108 +- sound/soc/codecs/wm8580.h | 1 + sound/soc/codecs/wm8900.c | 113 +- sound/soc/codecs/wm8900.h | 1 + sound/soc/codecs/wm9713.c | 2 + sound/soc/omap/Kconfig | 10 + sound/soc/omap/Makefile | 3 + sound/soc/omap/omap3beagle.c | 149 +++ sound/soc/omap/overo.c | 148 +++ sound/soc/pxa/Kconfig | 22 + sound/soc/pxa/Makefile | 4 + sound/soc/pxa/palm27x.c | 269 ++++ sound/soc/pxa/pxa-ssp.c | 929 ++++++++++++++ sound/soc/pxa/pxa-ssp.h | 47 + sound/soc/s3c24xx/s3c24xx-pcm.c | 12 +- sound/soc/soc-core.c | 208 +++- sound/soc/soc-dapm.c | 70 +- 108 files changed, 7544 insertions(+), 4348 deletions(-) create mode 100644 arch/arm/mach-pxa/include/mach/palmasoc.h rename sound/aoa/codecs/{snd-aoa-codec-onyx.c => onyx.c} (99%) rename sound/aoa/codecs/{snd-aoa-codec-onyx.h => onyx.h} (100%) rename sound/aoa/codecs/{snd-aoa-codec-tas-basstreble.h => tas-basstreble.h} (100%) rename sound/aoa/codecs/{snd-aoa-codec-tas-gain-table.h => tas-gain-table.h} (100%) rename sound/aoa/codecs/{snd-aoa-codec-tas.c => tas.c} (99%) rename sound/aoa/codecs/{snd-aoa-codec-tas.h => tas.h} (100%) rename sound/aoa/codecs/{snd-aoa-codec-toonie.c => toonie.c} (98%) rename sound/aoa/core/{snd-aoa-alsa.c => alsa.c} (98%) rename sound/aoa/core/{snd-aoa-alsa.h => alsa.h} (100%) rename sound/aoa/core/{snd-aoa-core.c => core.c} (99%) rename sound/aoa/core/{snd-aoa-gpio-feature.c => gpio-feature.c} (99%) rename sound/aoa/core/{snd-aoa-gpio-pmf.c => gpio-pmf.c} (100%) rename sound/aoa/fabrics/{snd-aoa-fabric-layout.c => layout.c} (99%) rename sound/aoa/soundbus/i2sbus/{i2sbus-control.c => control.c} (100%) rename sound/aoa/soundbus/i2sbus/{i2sbus-core.c => core.c} (99%) rename sound/aoa/soundbus/i2sbus/{i2sbus-interface.h => interface.h} (100%) rename sound/aoa/soundbus/i2sbus/{i2sbus-pcm.c => pcm.c} (100%) create mode 100644 sound/core/hrtimer.c create mode 100644 sound/pci/hda/patch_intelhdmi.c delete mode 100644 sound/soc/at32/Kconfig delete mode 100644 sound/soc/at32/Makefile delete mode 100644 sound/soc/at32/at32-pcm.h delete mode 100644 sound/soc/at32/at32-ssc.c delete mode 100644 sound/soc/at32/at32-ssc.h delete mode 100644 sound/soc/at91/Kconfig delete mode 100644 sound/soc/at91/Makefile delete mode 100644 sound/soc/at91/at91-pcm.c delete mode 100644 sound/soc/at91/at91-pcm.h delete mode 100644 sound/soc/at91/at91-ssc.c delete mode 100644 sound/soc/at91/at91-ssc.h create mode 100644 sound/soc/atmel/Kconfig create mode 100644 sound/soc/atmel/Makefile rename sound/soc/{at32/at32-pcm.c => atmel/atmel-pcm.c} (50%) create mode 100644 sound/soc/atmel/atmel-pcm.h create mode 100644 sound/soc/atmel/atmel_ssc_dai.c create mode 100644 sound/soc/atmel/atmel_ssc_dai.h rename sound/soc/{at32 => atmel}/playpaq_wm8510.c (99%) create mode 100644 sound/soc/atmel/sam9g20_wm8731.c create mode 100644 sound/soc/codecs/twl4030.c create mode 100644 sound/soc/codecs/twl4030.h create mode 100644 sound/soc/omap/omap3beagle.c create mode 100644 sound/soc/omap/overo.c create mode 100644 sound/soc/pxa/palm27x.c create mode 100644 sound/soc/pxa/pxa-ssp.c create mode 100644 sound/soc/pxa/pxa-ssp.h Merging cpufreq/next $ git merge cpufreq/next Already up-to-date. Merging v9fs/for-next $ git merge v9fs/for-next Already up-to-date. Merging quilt/rr $ git merge quilt/rr Auto-merged drivers/net/virtio_net.c Merge made by recursive. Documentation/lguest/lguest.c | 60 ++----------- arch/x86/lguest/i386_head.S | 15 --- drivers/lguest/lg.h | 2 +- drivers/lguest/lguest_user.c | 13 +-- drivers/lguest/page_tables.c | 72 ++++++++++++++- drivers/net/virtio_net.c | 189 +++++++++++++++++++++++++++++++++----- drivers/virtio/virtio.c | 2 +- drivers/virtio/virtio_pci.c | 4 +- include/linux/lguest_launcher.h | 2 +- include/linux/virtio_net.h | 9 ++ init/Kconfig | 6 -- 11 files changed, 259 insertions(+), 115 deletions(-) Merging cifs/master $ git merge cifs/master Auto-merged fs/cifs/connect.c Merge made by recursive. fs/cifs/connect.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) Merging mmc/next $ git merge mmc/next Merge made by recursive. drivers/mmc/card/block.c | 6 ++---- drivers/mmc/host/sdhci-pci.c | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) Merging gfs2/master $ git merge gfs2/master Removed fs/gfs2/ops_dentry.h Auto-merged fs/gfs2/ops_export.c Removed fs/gfs2/ops_fstype.h Auto-merged fs/gfs2/ops_inode.c Removed fs/gfs2/ops_inode.h Removed fs/gfs2/ops_super.h Auto-merged include/linux/fs.h Merge made by recursive. fs/gfs2/glock.c | 8 ++++++++ fs/gfs2/inode.c | 1 - fs/gfs2/inode.h | 11 +++++++++++ fs/gfs2/main.c | 2 +- fs/gfs2/ops_address.c | 16 +++++++--------- fs/gfs2/ops_dentry.c | 2 +- fs/gfs2/ops_dentry.h | 17 ----------------- fs/gfs2/ops_export.c | 3 +-- fs/gfs2/ops_file.c | 1 - fs/gfs2/ops_fstype.c | 3 --- fs/gfs2/ops_fstype.h | 19 ------------------- fs/gfs2/ops_inode.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- fs/gfs2/ops_inode.h | 25 ------------------------- fs/gfs2/ops_super.c | 8 ++++---- fs/gfs2/ops_super.h | 17 ----------------- fs/gfs2/super.h | 8 ++++++++ fs/ioctl.c | 44 ++++++++++++++++++++++++++++++++++---------- include/linux/fs.h | 3 +++ 18 files changed, 125 insertions(+), 112 deletions(-) delete mode 100644 fs/gfs2/ops_dentry.h delete mode 100644 fs/gfs2/ops_fstype.h delete mode 100644 fs/gfs2/ops_inode.h delete mode 100644 fs/gfs2/ops_super.h Merging input/next $ git merge input/next Auto-merged drivers/input/evdev.c Auto-merged drivers/input/joydev.c Auto-merged drivers/input/mousedev.c Merge made by recursive. drivers/input/Makefile | 2 +- drivers/input/evbug.c | 6 +- drivers/input/evdev.c | 199 +----------------------- drivers/input/gameport/gameport.c | 3 +- drivers/input/gameport/ns558.c | 2 +- drivers/input/input-compat.c | 135 +++++++++++++++++ drivers/input/input-compat.h | 94 ++++++++++++ drivers/input/input.c | 4 +- drivers/input/joydev.c | 2 +- drivers/input/keyboard/gpio_keys.c | 4 + drivers/input/keyboard/omap-keypad.c | 6 +- drivers/input/misc/uinput.c | 172 ++++++++++++++++++---- drivers/input/mouse/appletouch.c | 274 +++++++++++++++++----------------- drivers/input/mousedev.c | 3 +- drivers/input/serio/pcips2.c | 2 +- drivers/input/serio/serio.c | 4 +- drivers/input/serio/xilinx_ps2.c | 220 ++++++++++++++------------- drivers/input/touchscreen/ads7846.c | 4 +- include/linux/gpio_keys.h | 1 + 19 files changed, 653 insertions(+), 484 deletions(-) create mode 100644 drivers/input/input-compat.c create mode 100644 drivers/input/input-compat.h Merging semaphore/semaphore $ git merge semaphore/semaphore Already up-to-date. Merging bkl-removal/bkl-removal $ git merge bkl-removal/bkl-removal Already up-to-date. Merging ubifs/linux-next $ git merge ubifs/linux-next Auto-merged MAINTAINERS Merge made by recursive. MAINTAINERS | 4 +- fs/ubifs/commit.c | 4 +- fs/ubifs/debug.c | 66 ++++++++++++++++++++++++++++++--------------------- fs/ubifs/dir.c | 5 ++- fs/ubifs/file.c | 4 +- fs/ubifs/journal.c | 8 ++++-- fs/ubifs/key.h | 4 +- fs/ubifs/orphan.c | 28 ++++++++++++--------- fs/ubifs/recovery.c | 17 +++++++------ fs/ubifs/replay.c | 2 +- fs/ubifs/sb.c | 9 ++++--- fs/ubifs/tnc.c | 5 ++- 12 files changed, 89 insertions(+), 67 deletions(-) Merging lsm/for-next $ git merge lsm/for-next Already up-to-date. Merging block/for-next $ git merge block/for-next Merge made by recursive. block/Kconfig | 1 + block/blk-core.c | 33 ++--- block/blk-timeout.c | 17 ++- block/blktrace.c | 332 +++++++++++++++++++++++++++++++++++++++++- block/elevator.c | 21 +++- drivers/block/virtio_blk.c | 2 + drivers/block/xen-blkfront.c | 2 +- drivers/md/dm.c | 6 +- fs/bio.c | 3 +- include/linux/blkdev.h | 1 + include/linux/blktrace_api.h | 172 +--------------------- include/trace/block.h | 60 ++++++++ mm/bounce.c | 3 +- 13 files changed, 446 insertions(+), 207 deletions(-) create mode 100644 include/trace/block.h $ git reset --hard HEAD^ HEAD is now at 8c5ebcb Merge commit 'ubifs/linux-next' Merging embedded/master $ git merge embedded/master Already up-to-date. Merging pcmcia/master $ git merge pcmcia/master Merge made by recursive. drivers/ata/pata_pcmcia.c | 1 + drivers/ide/ide-cs.c | 1 + drivers/pcmcia/cistpl.c | 3 ++- drivers/pcmcia/cs.c | 2 +- drivers/pcmcia/ds.c | 11 ++++++----- drivers/pcmcia/pcmcia_resource.c | 3 ++- drivers/pcmcia/rsrc_nonstatic.c | 6 +++--- 7 files changed, 16 insertions(+), 11 deletions(-) Merging battery/master $ git merge battery/master Already up-to-date. Merging leds/for-mm $ git merge leds/for-mm Already up-to-date. Merging backlight/for-mm $ git merge backlight/for-mm Already up-to-date. Merging kgdb/kgdb-next $ git merge kgdb/kgdb-next Merge made by recursive. include/linux/kgdb.h | 42 ++++++++++++++++++++++++++++++++++++++++-- kernel/kgdb.c | 6 +++--- 2 files changed, 43 insertions(+), 5 deletions(-) Merging slab/for-next $ git merge slab/for-next Auto-merged Documentation/kernel-parameters.txt Auto-merged MAINTAINERS Auto-merged fs/ext3/super.c Auto-merged fs/ext4/super.c Auto-merged include/linux/fs.h Auto-merged init/Kconfig Auto-merged init/main.c Auto-merged kernel/sysctl.c Auto-merged lib/Kconfig.debug 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 | 95 ++++- MAINTAINERS | 6 + fs/buffer.c | 102 +++++ 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 + 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/Kconfig | 6 +- init/main.c | 2 + kernel/sysctl.c | 20 + lib/Kconfig.debug | 20 + mm/Makefile | 1 + mm/kmemtrace.c | 333 +++++++++++++++++ mm/slab.c | 81 ++++- mm/slob.c | 37 ++- mm/slub.c | 535 ++++++++++++++++++++++----- mm/vmscan.c | 64 +++- mm/vmstat.c | 4 +- 36 files changed, 1955 insertions(+), 192 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 Auto-merged drivers/md/md.c Merge made by recursive. drivers/md/md.c | 19 +++-- drivers/md/raid0.c | 168 ++++++++++++++++++++++---------------------- include/linux/raid/md_k.h | 1 + include/linux/raid/raid0.h | 10 ++-- 4 files changed, 102 insertions(+), 96 deletions(-) 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/Makefile Auto-merged arch/x86/mm/Makefile CONFLICT (content): Merge conflict in arch/x86/mm/Makefile Auto-merged arch/x86/mm/fault.c Auto-merged arch/x86/mm/init_32.c Auto-merged arch/x86/mm/init_64.c Auto-merged include/linux/slab.h Auto-merged include/linux/slab_def.h Auto-merged init/main.c Auto-merged kernel/fork.c Auto-merged kernel/sysctl.c Auto-merged mm/Makefile 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/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 ed3d9e2: Merge commit 'kmemcheck/auto-kmemcheck-next' $ git diff -M --stat --summary HEAD^.. Documentation/kmemcheck.txt | 129 ++++++ MAINTAINERS | 8 + arch/x86/Kconfig.debug | 88 +++++ arch/x86/Makefile | 5 + arch/x86/include/asm/dma-mapping.h | 2 + arch/x86/include/asm/pgtable.h | 4 +- arch/x86/include/asm/pgtable_32.h | 6 + arch/x86/include/asm/pgtable_64.h | 6 + arch/x86/include/asm/string_32.h | 8 + arch/x86/include/asm/string_64.h | 8 + arch/x86/kernel/head_32.S | 2 +- arch/x86/kernel/process.c | 2 +- arch/x86/kernel/stacktrace.c | 7 + arch/x86/kernel/traps.c | 5 + arch/x86/mm/Makefile | 2 + arch/x86/mm/fault.c | 18 +- arch/x86/mm/init_32.c | 4 +- arch/x86/mm/init_64.c | 2 +- arch/x86/mm/kmemcheck/Makefile | 1 + arch/x86/mm/kmemcheck/error.c | 229 +++++++++++ arch/x86/mm/kmemcheck/error.h | 15 + arch/x86/mm/kmemcheck/kmemcheck.c | 752 ++++++++++++++++++++++++++++++++++++ arch/x86/mm/kmemcheck/opcode.c | 90 +++++ arch/x86/mm/kmemcheck/opcode.h | 10 + arch/x86/mm/kmemcheck/pte.c | 22 + arch/x86/mm/kmemcheck/pte.h | 10 + arch/x86/mm/kmemcheck/shadow.c | 124 ++++++ arch/x86/mm/kmemcheck/shadow.h | 16 + include/asm-x86/kmemcheck.h | 42 ++ include/linux/gfp.h | 3 +- include/linux/interrupt.h | 14 + include/linux/kmemcheck.h | 86 ++++ include/linux/mm_types.h | 8 + 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 | 11 + mm/Makefile | 1 + mm/kmemcheck.c | 103 +++++ mm/slab.c | 101 +---- mm/slub.c | 20 +- 44 files changed, 1982 insertions(+), 104 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 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/twl4030-core.c | 4 +- drivers/mfd/wm8350-core.c | 74 ++++++++++++++++++++++++++++++++- drivers/mfd/wm8350-i2c.c | 2 - drivers/mfd/wm8350-regmap.c | 2 +- include/linux/i2c/twl4030.h | 4 +- include/linux/mfd/wm8350/comparator.h | 8 ++++ include/linux/mfd/wm8350/core.h | 3 + 7 files changed, 88 insertions(+), 9 deletions(-) Merging hdlc/hdlc-next $ git merge hdlc/hdlc-next Renamed drivers/net/wan/hd6457x.c => drivers/net/wan/hd64570.c Auto-merged drivers/net/wan/hd64570.c Auto-merged Documentation/DocBook/Makefile CONFLICT (delete/modify): Documentation/DocBook/wanbook.tmpl deleted in hdlc/hdlc-next and modified in HEAD. Version HEAD of Documentation/DocBook/wanbook.tmpl left in tree. Auto-merged drivers/net/wan/pc300too.c Auto-merged drivers/net/wan/pci200syn.c CONFLICT (delete/modify): drivers/net/wan/syncppp.c deleted in hdlc/hdlc-next and modified in HEAD. Version HEAD of drivers/net/wan/syncppp.c left in tree. Removed include/net/syncppp.h Automatic merge failed; fix conflicts and then commit the result. $ git rm -f drivers/net/wan/syncppp.c Documentation/DocBook/wanbook.tmpl rm 'Documentation/DocBook/wanbook.tmpl' rm 'Documentation/DocBook/wanbook.tmpl' rm 'drivers/net/wan/syncppp.c' rm 'drivers/net/wan/syncppp.c' $ git commit -v -a Created commit aa78aff: Merge commit 'hdlc/hdlc-next' $ git diff -M --stat --summary HEAD^.. 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_fr.c | 10 +- drivers/net/wan/hdlc_ppp.c | 648 ++++++++++++- drivers/net/wan/n2.c | 9 +- drivers/net/wan/pc300_drv.c | 17 +- drivers/net/wan/pc300too.c | 73 +- drivers/net/wan/pci200syn.c | 77 +- drivers/net/wan/syncppp.c | 1476 ----------------------------- include/linux/hdlc.h | 2 +- include/net/syncppp.h | 102 -- 17 files changed, 1372 insertions(+), 2057 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 Already up-to-date. Merging voltage/for-next $ git merge voltage/for-next Merge made by recursive. drivers/regulator/core.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Merging security-testing/next $ git merge security-testing/next Auto-merged Documentation/kernel-parameters.txt Auto-merged security/selinux/hooks.c Merge made by recursive. Documentation/kernel-parameters.txt | 4 ++ include/linux/capability.h | 3 ++ kernel/capability.c | 11 ++++++ security/commoncap.c | 3 ++ security/selinux/hooks.c | 68 +++++++++++++++++++--------------- security/selinux/nlmsgtab.c | 3 ++ 6 files changed, 62 insertions(+), 30 deletions(-) Merging lblnet/master $ git merge lblnet/master Already up-to-date. Merging quilt/ttydev $ git merge quilt/ttydev Already up-to-date. Merging agp/agp-next $ git merge agp/agp-next Already up-to-date. Merging creds/creds-v4 $ git merge creds/creds-v4 Auto-merged arch/powerpc/mm/fault.c Auto-merged arch/s390/hypfs/inode.c Auto-merged arch/x86/mm/fault.c Auto-merged drivers/net/tun.c Auto-merged fs/autofs4/dev-ioctl.c Auto-merged fs/binfmt_elf.c Auto-merged fs/cifs/connect.c Auto-merged fs/ext4/balloc.c Auto-merged fs/ext4/ialloc.c Auto-merged fs/fat/file.c Auto-merged fs/fat/inode.c Auto-merged fs/gfs2/inode.c Auto-merged 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/proc/base.c Auto-merged fs/ubifs/dir.c Auto-merged include/linux/capability.h Auto-merged include/linux/fs.h Removed include/linux/key-ui.h Auto-merged include/linux/sched.h Auto-merged include/net/scm.h Auto-merged init/main.c Auto-merged kernel/Makefile Auto-merged kernel/capability.c Auto-merged kernel/cgroup.c Auto-merged kernel/exit.c Auto-merged kernel/fork.c Auto-merged kernel/futex.c Auto-merged kernel/sched.c Auto-merged kernel/sysctl.c Auto-merged kernel/timer.c Auto-merged kernel/trace/trace.c Auto-merged kernel/workqueue.c Auto-merged mm/mempolicy.c 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/core/scm.c Auto-merged net/ipv4/netfilter/ipt_LOG.c Auto-merged net/ipv6/ip6_flowlabel.c Auto-merged net/ipv6/netfilter/ip6t_LOG.c Auto-merged net/socket.c Auto-merged net/unix/af_unix.c Auto-merged security/commoncap.c Auto-merged security/selinux/hooks.c CONFLICT (content): Merge conflict in security/selinux/hooks.c Resolved 'security/selinux/hooks.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 4cb6b03: Merge commit 'creds/creds-v4' $ 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 | 8 +- arch/s390/hypfs/inode.c | 4 +- arch/s390/kernel/compat_linux.c | 28 +- arch/um/drivers/mconsole_kern.c | 3 +- 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/dev-ioctl.c | 3 +- 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/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 | 5 +- 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 | 21 + kernel/cred.c | 577 +++++++++++++ kernel/exit.c | 23 +- kernel/fork.c | 44 +- 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 | 469 +++++------ 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 | 1149 ++++++++++++++------------ 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, 5060 insertions(+), 3092 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 Already up-to-date. Merging fastboot/auto-fastboot-next $ git merge fastboot/auto-fastboot-next Already up-to-date. Merging sparseirq/auto-sparseirq-next $ git merge sparseirq/auto-sparseirq-next Already up-to-date. Merging iommu/auto-iommu-next $ git merge iommu/auto-iommu-next Already up-to-date. Merging uwb/for-upstream $ git merge uwb/for-upstream Merge made by recursive. drivers/usb/host/hwa-hc.c | 103 ++++---- drivers/usb/host/whci/hcd.c | 1 - drivers/usb/host/whci/hw.c | 8 +- drivers/usb/host/whci/int.c | 1 - drivers/usb/host/whci/whcd.h | 2 +- drivers/usb/host/whci/whci-hc.h | 2 + drivers/usb/host/whci/wusb.c | 16 +- drivers/usb/wusbcore/cbaf.c | 1 - drivers/usb/wusbcore/crypto.c | 15 +- drivers/usb/wusbcore/devconnect.c | 100 +-------- drivers/usb/wusbcore/mmc.c | 8 +- drivers/usb/wusbcore/reservation.c | 7 +- drivers/usb/wusbcore/rh.c | 40 ++-- drivers/usb/wusbcore/security.c | 3 +- drivers/usb/wusbcore/wusbhc.h | 28 ++- drivers/uwb/beacon.c | 24 +- drivers/uwb/drp-ie.c | 1 - drivers/uwb/hwa-rc.c | 1 - drivers/uwb/i1480/dfu/usb.c | 1 - drivers/uwb/i1480/i1480u-wlp/lc.c | 1 - drivers/uwb/i1480/i1480u-wlp/sysfs.c | 1 - drivers/uwb/ie.c | 463 +++++++++++----------------------- drivers/uwb/lc-rc.c | 25 -- drivers/uwb/rsv.c | 53 +++-- drivers/uwb/umc-dev.c | 3 +- drivers/uwb/uwb-debug.c | 13 +- drivers/uwb/uwb-internal.h | 16 +- drivers/uwb/whc-rc.c | 1 - drivers/uwb/whci.c | 2 +- drivers/uwb/wlp/wlp-internal.h | 4 - include/linux/usb/wusb-wa.h | 1 + include/linux/uwb.h | 19 +-- include/linux/uwb/debug.h | 2 +- 33 files changed, 344 insertions(+), 622 deletions(-) Merging watchdog/master $ git merge watchdog/master Auto-merged drivers/watchdog/Kconfig Auto-merged drivers/watchdog/ib700wdt.c Merge made by recursive. drivers/watchdog/Kconfig | 19 ++ drivers/watchdog/Makefile | 2 + drivers/watchdog/ib700wdt.c | 49 ++-- drivers/watchdog/sch311x_wdt.c | 578 ++++++++++++++++++++++++++++++++++++++++ drivers/watchdog/wm8350_wdt.c | 329 +++++++++++++++++++++++ 5 files changed, 947 insertions(+), 30 deletions(-) create mode 100644 drivers/watchdog/sch311x_wdt.c create mode 100644 drivers/watchdog/wm8350_wdt.c Merging proc/proc $ git merge proc/proc Auto-merged fs/proc/base.c Auto-merged fs/proc/inode.c Merge made by recursive. fs/proc/base.c | 187 +++++++++++++++++++++++++--------------------------- fs/proc/generic.c | 8 +-- fs/proc/inode.c | 3 - fs/proc/proc_net.c | 2 +- fs/proc/root.c | 8 +-- 5 files changed, 94 insertions(+), 114 deletions(-) $ git am -3 ../patches/0001-proc-merge-fix-1.patch Applying proc: merge fix 1 $ git reset HEAD^ fs/proc/base.c: needs update $ git add . $ git commit -v -a --amend Created commit 3bf2c0e: Merge commit 'proc/proc' Merging bdev/master $ git merge bdev/master Already up-to-date. Merging dwmw2-iommu/master $ git merge dwmw2-iommu/master Already up-to-date. Merging cpu_alloc/cpu_alloc $ git merge cpu_alloc/cpu_alloc Auto-merged Documentation/kernel-parameters.txt Auto-merged include/linux/percpu.h Auto-merged init/main.c Auto-merged kernel/lockdep.c CONFLICT (content): Merge conflict in kernel/lockdep.c Auto-merged kernel/module.c CONFLICT (content): Merge conflict in kernel/module.c Auto-merged mm/Makefile Auto-merged mm/vmstat.c Resolved 'kernel/lockdep.c' using previous resolution. Resolved 'kernel/module.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 18f7bf5: Merge commit 'cpu_alloc/cpu_alloc' $ git diff -M --stat --summary HEAD^.. Documentation/kernel-parameters.txt | 7 ++ arch/ia64/include/asm/percpu.h | 2 +- arch/powerpc/kernel/setup_64.c | 4 +- arch/sparc64/kernel/smp.c | 2 +- arch/x86/kernel/setup_percpu.c | 2 +- include/linux/module.h | 1 + include/linux/percpu.h | 67 ++++++++++-- include/linux/vmstat.h | 2 +- init/main.c | 18 +++- kernel/lockdep.c | 2 +- kernel/module.c | 173 ++---------------------------- mm/Makefile | 2 +- mm/cpu_alloc.c | 203 +++++++++++++++++++++++++++++++++++ mm/vmstat.c | 1 + 14 files changed, 306 insertions(+), 180 deletions(-) create mode 100644 mm/cpu_alloc.c $ git am -3 ../patches/cpu_alloc_merg_fix_1.patch Applying cpu_alloc: merge_fix_1 $ git reset HEAD^ arch/alpha/include/asm/percpu.h: needs update include/linux/percpu.h: needs update $ git add . $ git commit -v -a --amend Created commit aa0e77a: Merge commit 'cpu_alloc/cpu_alloc' Merging userns/next $ git merge userns/next Auto-merged include/linux/sched.h Auto-merged kernel/fork.c Merge made by recursive. fs/ecryptfs/messaging.c | 13 +++---- fs/ecryptfs/miscdev.c | 19 ++++------ include/linux/cred.h | 2 + include/linux/init_task.h | 1 - include/linux/nsproxy.h | 1 - include/linux/sched.h | 1 + include/linux/user_namespace.h | 13 ++----- kernel/cred.c | 15 +++++++- kernel/fork.c | 19 ++++++++-- kernel/nsproxy.c | 15 +------- kernel/sys.c | 4 +- kernel/user.c | 47 +++++++------------------ kernel/user_namespace.c | 75 ++++++++++++++++------------------------ 13 files changed, 96 insertions(+), 129 deletions(-) Merging cputime/cputime $ git merge cputime/cputime Auto-merged arch/powerpc/kernel/time.c Auto-merged arch/s390/kernel/process.c CONFLICT (content): Merge conflict in arch/s390/kernel/process.c Auto-merged arch/s390/kernel/smp.c Auto-merged drivers/s390/cio/cio.c Auto-merged include/linux/sched.h Auto-merged kernel/sched.c Auto-merged kernel/timer.c Recorded preimage for 'arch/s390/kernel/process.c' Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'arch/s390/kernel/process.c'. Created commit ea83d8b: Merge commit 'cputime/cputime' $ git diff -M --stat --summary HEAD^.. arch/ia64/kernel/time.c | 18 ++++--- arch/powerpc/kernel/process.c | 1 + arch/powerpc/kernel/time.c | 18 ++++--- arch/s390/include/asm/cpu.h | 4 +- arch/s390/kernel/process.c | 74 ++++++++++++++++++-------- arch/s390/kernel/s390_ext.c | 2 +- arch/s390/kernel/smp.c | 25 +++++---- arch/s390/kernel/vtime.c | 16 +++--- arch/x86/xen/time.c | 10 ++-- drivers/s390/cio/cio.c | 2 +- include/linux/kernel_stat.h | 13 +++-- include/linux/sched.h | 1 - kernel/sched.c | 116 +++++++++++++++++++++++++++-------------- kernel/time/tick-sched.c | 12 ++-- kernel/timer.c | 15 ----- 15 files changed, 193 insertions(+), 134 deletions(-) Merging perfmon3/master $ git merge perfmon3/master Auto-merged arch/ia64/Kconfig Auto-merged arch/ia64/kernel/perfmon.c Auto-merged arch/x86/Kconfig Auto-merged arch/x86/Makefile Auto-merged arch/x86/kernel/entry_32.S Auto-merged arch/x86/kernel/entry_64.S Auto-merged arch/x86/kernel/process_64.c Auto-merged arch/x86/kernel/signal_32.c Auto-merged arch/x86/kernel/signal_64.c Auto-merged include/linux/sched.h Merge made by recursive. Documentation/ABI/testing/sysfs-perfmon | 42 ++ Documentation/ABI/testing/sysfs-perfmon-pmu | 48 ++ Documentation/perfmon.txt | 206 +++++++ Makefile | 2 + arch/ia64/Kconfig | 2 +- arch/ia64/configs/bigsur_defconfig | 2 +- arch/ia64/configs/generic_defconfig | 2 +- arch/ia64/configs/gensparse_defconfig | 2 +- arch/ia64/configs/sim_defconfig | 2 +- arch/ia64/configs/tiger_defconfig | 2 +- arch/ia64/configs/zx1_defconfig | 2 +- arch/ia64/include/asm/processor.h | 2 +- arch/ia64/include/asm/system.h | 2 +- arch/ia64/kernel/Makefile | 2 +- arch/ia64/kernel/irq_ia64.c | 4 +- arch/ia64/kernel/perfmon.c | 6 +- arch/ia64/kernel/process.c | 16 +- arch/ia64/kernel/ptrace.c | 4 +- arch/ia64/kernel/smpboot.c | 4 +- arch/ia64/lib/Makefile | 2 +- arch/ia64/oprofile/Makefile | 2 +- arch/ia64/oprofile/init.c | 4 +- arch/x86/Kconfig | 2 + arch/x86/Makefile | 3 + arch/x86/ia32/ia32entry.S | 5 + arch/x86/include/asm/Kbuild | 1 + arch/x86/include/asm/irq_vectors.h | 5 + arch/x86/include/asm/mach-default/entry_arch.h | 4 + arch/x86/include/asm/perfmon.h | 34 ++ arch/x86/include/asm/perfmon_kern.h | 381 ++++++++++++ arch/x86/include/asm/thread_info.h | 8 +- arch/x86/include/asm/unistd_32.h | 5 + arch/x86/include/asm/unistd_64.h | 11 +- arch/x86/kernel/entry_32.S | 2 +- arch/x86/kernel/entry_64.S | 8 +- arch/x86/kernel/irqinit_64.c | 5 + arch/x86/kernel/process_32.c | 10 + arch/x86/kernel/process_64.c | 10 + arch/x86/kernel/signal_32.c | 5 + arch/x86/kernel/signal_64.c | 5 + arch/x86/kernel/syscall_table_32.S | 5 + arch/x86/oprofile/nmi_int.c | 10 +- arch/x86/perfmon/Kconfig | 33 + arch/x86/perfmon/Makefile | 7 + arch/x86/perfmon/perfmon.c | 621 ++++++++++++++++++++ arch/x86/perfmon/perfmon_amd64.c | 483 +++++++++++++++ arch/x86/perfmon/perfmon_intel_arch.c | 628 ++++++++++++++++++++ include/linux/perfmon.h | 102 ++++ include/linux/perfmon_kern.h | 287 +++++++++ include/linux/perfmon_pmu.h | 138 +++++ include/linux/sched.h | 4 + include/linux/syscalls.h | 11 + kernel/sys_ni.c | 7 + perfmon/Makefile | 10 + perfmon/perfmon_activate.c | 136 +++++ perfmon/perfmon_attach.c | 338 +++++++++++ perfmon/perfmon_ctx.c | 400 +++++++++++++ perfmon/perfmon_ctxsw.c | 252 ++++++++ perfmon/perfmon_file.c | 306 ++++++++++ perfmon/perfmon_init.c | 87 +++ perfmon/perfmon_intr.c | 295 ++++++++++ perfmon/perfmon_pmu.c | 269 +++++++++ perfmon/perfmon_priv.h | 131 +++++ perfmon/perfmon_res.c | 223 +++++++ perfmon/perfmon_rw.c | 449 ++++++++++++++ perfmon/perfmon_syscalls.c | 741 ++++++++++++++++++++++++ perfmon/perfmon_sysfs.c | 344 +++++++++++ 67 files changed, 7144 insertions(+), 37 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-perfmon create mode 100644 Documentation/ABI/testing/sysfs-perfmon-pmu create mode 100644 Documentation/perfmon.txt create mode 100644 arch/x86/include/asm/perfmon.h create mode 100644 arch/x86/include/asm/perfmon_kern.h create mode 100644 arch/x86/perfmon/Kconfig create mode 100644 arch/x86/perfmon/Makefile create mode 100644 arch/x86/perfmon/perfmon.c create mode 100644 arch/x86/perfmon/perfmon_amd64.c create mode 100644 arch/x86/perfmon/perfmon_intel_arch.c create mode 100644 include/linux/perfmon.h create mode 100644 include/linux/perfmon_kern.h create mode 100644 include/linux/perfmon_pmu.h create mode 100644 perfmon/Makefile create mode 100644 perfmon/perfmon_activate.c create mode 100644 perfmon/perfmon_attach.c create mode 100644 perfmon/perfmon_ctx.c create mode 100644 perfmon/perfmon_ctxsw.c create mode 100644 perfmon/perfmon_file.c create mode 100644 perfmon/perfmon_init.c create mode 100644 perfmon/perfmon_intr.c create mode 100644 perfmon/perfmon_pmu.c create mode 100644 perfmon/perfmon_priv.h create mode 100644 perfmon/perfmon_res.c create mode 100644 perfmon/perfmon_rw.c create mode 100644 perfmon/perfmon_syscalls.c create mode 100644 perfmon/perfmon_sysfs.c Merging osd/linux-next $ git merge osd/linux-next Auto-merged MAINTAINERS Merge made by recursive. Documentation/devices.txt | 6 + Documentation/scsi/osd.txt | 198 ++++++ MAINTAINERS | 10 + drivers/scsi/Kconfig | 2 + drivers/scsi/Makefile | 2 + drivers/scsi/osd/Kbuild | 33 + drivers/scsi/osd/Kconfig | 41 ++ drivers/scsi/osd/Makefile | 43 ++ drivers/scsi/osd/osd_debug.h | 27 + drivers/scsi/osd/osd_initiator.c | 1456 ++++++++++++++++++++++++++++++++++++++ drivers/scsi/osd/osd_ktests.c | 441 ++++++++++++ drivers/scsi/osd/osd_ktests.h | 31 + drivers/scsi/osd/osd_test.c | 74 ++ drivers/scsi/osd/osd_uld.c | 445 ++++++++++++ drivers/scsi/scsi_scan.c | 1 + include/linux/major.h | 1 + include/scsi/osd_attributes.h | 327 +++++++++ include/scsi/osd_initiator.h | 379 ++++++++++ include/scsi/osd_protocol.h | 575 +++++++++++++++ include/scsi/osd_sec.h | 45 ++ include/scsi/osd_types.h | 40 + include/scsi/scsi.h | 1 + 22 files changed, 4178 insertions(+), 0 deletions(-) create mode 100644 Documentation/scsi/osd.txt create mode 100644 drivers/scsi/osd/Kbuild create mode 100644 drivers/scsi/osd/Kconfig create mode 100755 drivers/scsi/osd/Makefile create mode 100644 drivers/scsi/osd/osd_debug.h create mode 100644 drivers/scsi/osd/osd_initiator.c create mode 100644 drivers/scsi/osd/osd_ktests.c create mode 100644 drivers/scsi/osd/osd_ktests.h create mode 100644 drivers/scsi/osd/osd_test.c create mode 100644 drivers/scsi/osd/osd_uld.c create mode 100644 include/scsi/osd_attributes.h create mode 100644 include/scsi/osd_initiator.h create mode 100644 include/scsi/osd_protocol.h create mode 100644 include/scsi/osd_sec.h create mode 100644 include/scsi/osd_types.h Merging scsi-post-merge/master $ git merge scsi-post-merge/master Already up-to-date.