$ git checkout master Already on "master" $ git reset --hard stable HEAD is now at 2515ddc binfmt_elf_fdpic: Update for cputime changes. Merging origin/master $ git merge origin/master Updating 2515ddc..332edc2 Fast forward CREDITS | 11 + Documentation/ABI/testing/sysfs-bus-umc | 28 + Documentation/ABI/testing/sysfs-bus-usb | 43 + Documentation/ABI/testing/sysfs-class-usb_host | 25 + Documentation/ABI/testing/sysfs-class-uwb_rc | 144 ++ Documentation/ABI/testing/sysfs-wusb_cbaf | 100 + Documentation/feature-removal-schedule.txt | 8 + Documentation/i2c/busses/i2c-i801 | 7 +- Documentation/i2c/porting-clients | 160 -- Documentation/i2c/writing-clients | 495 ++---- Documentation/ia64/xen.txt | 183 ++ Documentation/kdump/kdump.txt | 14 +- Documentation/kernel-parameters.txt | 61 +- Documentation/laptops/acer-wmi.txt | 28 +- Documentation/powerpc/booting-without-of.txt | 2 + Documentation/powerpc/dts-bindings/fsl/board.txt | 4 +- Documentation/usb/WUSB-Design-overview.txt | 448 +++++ Documentation/usb/wusb-cbaf | 139 ++ MAINTAINERS | 53 +- Makefile | 2 +- arch/alpha/kernel/osf_sys.c | 20 +- arch/alpha/oprofile/common.c | 2 +- arch/arm/Kconfig | 4 +- arch/arm/common/Kconfig | 2 +- arch/arm/common/sa1111.c | 4 +- arch/arm/configs/trizeps4_defconfig | 1 + arch/arm/mach-clps711x/include/mach/memory.h | 2 + arch/arm/mach-ixp4xx/Kconfig | 5 - arch/arm/mach-kirkwood/common.c | 35 + arch/arm/mach-kirkwood/common.h | 2 + arch/arm/mach-kirkwood/rd88f6281-setup.c | 11 + arch/arm/mach-mv78xx0/db78x00-bp-setup.c | 5 + arch/arm/mach-orion5x/common.c | 38 +- arch/arm/mach-orion5x/common.h | 2 + arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 11 + arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 11 + arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 11 + arch/arm/mach-orion5x/wrt350n-v2-setup.c | 11 + arch/arm/mach-pxa/Kconfig | 1 - arch/arm/mach-pxa/include/mach/irqs.h | 5 +- arch/arm/mach-pxa/include/mach/spitz.h | 2 +- arch/arm/mach-pxa/pwm.c | 2 +- arch/arm/mach-pxa/trizeps4.c | 2 +- arch/arm/mach-s3c2443/clock.c | 3 +- arch/arm/mm/cache-v4.S | 6 +- arch/arm/plat-s3c24xx/pwm-clock.c | 2 +- arch/arm/plat-s3c24xx/pwm.c | 12 +- arch/avr32/Kconfig | 12 +- arch/avr32/Makefile | 2 + arch/avr32/boards/atngw100/Kconfig | 35 + arch/avr32/boards/atngw100/Makefile | 3 +- arch/avr32/boards/atngw100/evklcd10x.c | 155 ++ arch/avr32/boards/atngw100/setup.c | 7 +- arch/avr32/boards/atstk1000/atstk1002.c | 2 - arch/avr32/boards/atstk1000/atstk1003.c | 2 - arch/avr32/boards/atstk1000/atstk1004.c | 2 - arch/avr32/boards/favr-32/Kconfig | 22 + arch/avr32/boards/favr-32/Makefile | 1 + arch/avr32/boards/favr-32/flash.c | 98 + arch/avr32/boards/favr-32/setup.c | 352 ++++ arch/avr32/boards/mimc200/Makefile | 1 + arch/avr32/boards/mimc200/flash.c | 143 ++ arch/avr32/boards/mimc200/fram.c | 80 + arch/avr32/boards/mimc200/setup.c | 237 +++ arch/avr32/configs/atngw100_evklcd100_defconfig | 1264 +++++++++++++ arch/avr32/configs/atngw100_evklcd101_defconfig | 1264 +++++++++++++ arch/avr32/configs/favr-32_defconfig | 1235 +++++++++++++ arch/avr32/configs/mimc200_defconfig | 1109 +++++++++++ arch/avr32/mach-at32ap/at32ap700x.c | 11 +- arch/avr32/mach-at32ap/cpufreq.c | 14 + arch/avr32/mach-at32ap/include/mach/board.h | 10 +- arch/cris/Kconfig | 2 + arch/h8300/Kconfig | 2 + arch/ia64/Kconfig | 50 + arch/ia64/Makefile | 3 + arch/ia64/configs/generic_defconfig | 2 + arch/ia64/configs/tiger_defconfig | 2 + arch/ia64/dig/Makefile | 5 + arch/ia64/dig/dig_vtd_iommu.c | 59 + arch/ia64/dig/machvec_vtd.c | 3 + arch/ia64/ia32/audit.c | 2 +- arch/ia64/ia32/ia32_entry.S | 11 +- arch/ia64/ia32/sys_ia32.c | 106 +- arch/ia64/include/asm/break.h | 9 + arch/ia64/include/asm/cacheflush.h | 2 + arch/ia64/include/asm/device.h | 3 + arch/ia64/include/asm/dma-mapping.h | 50 + arch/ia64/include/asm/iommu.h | 16 + arch/ia64/include/asm/kregs.h | 2 +- arch/ia64/include/asm/machvec.h | 4 + arch/ia64/include/asm/machvec_dig_vtd.h | 38 + arch/ia64/include/asm/machvec_init.h | 1 + arch/ia64/include/asm/machvec_xen.h | 22 + arch/ia64/include/asm/meminit.h | 3 +- arch/ia64/include/asm/native/inst.h | 10 +- arch/ia64/include/asm/native/pvchk_inst.h | 263 +++ arch/ia64/include/asm/paravirt.h | 4 +- arch/ia64/include/asm/pci.h | 3 + arch/ia64/include/asm/ptrace.h | 8 + .../ia64/include/asm}/pvclock-abi.h | 12 +- .../asm-x86 => arch/ia64/include/asm}/swiotlb.h | 10 +- arch/ia64/include/asm/sync_bitops.h | 51 + arch/ia64/include/asm/syscall.h | 163 ++ arch/ia64/include/asm/thread_info.h | 3 - arch/ia64/include/asm/timex.h | 2 + arch/ia64/include/asm/unistd.h | 1 + arch/ia64/include/asm/xen/events.h | 50 + arch/ia64/include/asm/xen/grant_table.h | 29 + arch/ia64/include/asm/xen/hypercall.h | 265 +++ .../ia64/include/asm}/xen/hypervisor.h | 73 +- arch/ia64/include/asm/xen/inst.h | 458 +++++ arch/ia64/include/asm/xen/interface.h | 346 ++++ arch/ia64/include/asm/xen/irq.h | 44 + arch/ia64/include/asm/xen/minstate.h | 134 ++ arch/ia64/include/asm/xen/page.h | 65 + arch/ia64/include/asm/xen/privop.h | 129 ++ arch/ia64/include/asm/xen/xcom_hcall.h | 51 + arch/ia64/include/asm/xen/xencomm.h | 42 + arch/ia64/kernel/Makefile | 22 + arch/ia64/kernel/acpi.c | 22 + arch/ia64/kernel/asm-offsets.c | 31 + arch/ia64/kernel/entry.S | 5 + arch/ia64/kernel/ivt.S | 6 +- arch/ia64/kernel/msi_ia64.c | 80 + arch/ia64/kernel/nr-irqs.c | 1 + arch/ia64/kernel/paravirt.c | 2 +- arch/ia64/kernel/paravirt_inst.h | 4 +- arch/ia64/kernel/pci-dma.c | 129 ++ arch/ia64/kernel/pci-swiotlb.c | 46 + arch/ia64/kernel/perfmon.c | 7 +- arch/ia64/kernel/process.c | 22 +- arch/ia64/kernel/ptrace.c | 112 +- arch/ia64/kernel/setup.c | 42 +- arch/ia64/kernel/signal.c | 8 + arch/ia64/kvm/kvm-ia64.c | 2 +- arch/ia64/lib/flush.S | 55 + arch/ia64/mm/tlb.c | 8 +- arch/ia64/oprofile/init.c | 4 +- arch/ia64/oprofile/perfmon.c | 4 +- arch/ia64/scripts/pvcheck.sed | 32 + arch/ia64/sn/kernel/io_acpi_init.c | 10 +- arch/ia64/xen/Kconfig | 26 + arch/ia64/xen/Makefile | 22 + arch/ia64/xen/grant-table.c | 155 ++ arch/ia64/xen/hypercall.S | 91 + arch/ia64/xen/hypervisor.c | 96 + arch/ia64/xen/irq_xen.c | 435 +++++ arch/ia64/xen/irq_xen.h | 34 + arch/ia64/xen/machvec.c | 4 + arch/ia64/xen/suspend.c | 64 + arch/ia64/xen/time.c | 213 +++ arch/ia64/xen/time.h | 24 + arch/ia64/xen/xcom_hcall.c | 441 +++++ arch/ia64/xen/xen_pv_ops.c | 364 ++++ arch/ia64/xen/xencomm.c | 105 ++ arch/ia64/xen/xenivt.S | 52 + arch/ia64/xen/xensetup.S | 83 + arch/m32r/oprofile/init.c | 2 +- arch/m68k/amiga/config.c | 21 +- arch/m68k/atari/config.c | 15 +- arch/m68k/atari/stram.c | 28 +- arch/m68k/bvme6000/config.c | 11 - arch/m68k/kernel/setup.c | 35 +- arch/m68k/mvme147/config.c | 10 - arch/m68k/mvme16x/config.c | 15 +- arch/m68k/q40/config.c | 10 - arch/m68k/sun3/config.c | 12 +- arch/m68k/sun3x/config.c | 12 +- arch/mips/oprofile/common.c | 2 +- arch/mips/oprofile/op_impl.h | 2 +- arch/mips/oprofile/op_model_rm9000.c | 2 +- arch/parisc/hpux/fs.c | 5 +- arch/parisc/oprofile/init.c | 2 +- arch/powerpc/Kconfig | 13 +- arch/powerpc/boot/Makefile | 7 +- arch/powerpc/boot/addnote.c | 41 +- arch/powerpc/boot/cuboot-52xx.c | 4 + arch/powerpc/boot/cuboot-acadia.c | 174 ++ arch/powerpc/boot/dts/acadia.dts | 224 +++ arch/powerpc/boot/dts/hcu4.dts | 168 ++ arch/powerpc/boot/dts/mpc8315erdb.dts | 8 + arch/powerpc/boot/dts/mpc832x_mds.dts | 2 +- arch/powerpc/boot/dts/mpc8349emitx.dts | 16 + arch/powerpc/boot/dts/mpc8349emitxgp.dts | 8 + arch/powerpc/boot/dts/mpc834x_mds.dts | 2 +- arch/powerpc/boot/dts/mpc836x_mds.dts | 2 +- arch/powerpc/boot/dts/mpc8377_rdb.dts | 8 + arch/powerpc/boot/dts/mpc8378_rdb.dts | 8 + arch/powerpc/boot/dts/mpc8379_rdb.dts | 8 + arch/powerpc/boot/dts/mpc8536ds.dts | 12 +- arch/powerpc/boot/dts/mpc8568mds.dts | 2 +- arch/powerpc/boot/dts/mpc8572ds.dts | 27 +- arch/powerpc/boot/libfdt-wrapper.c | 22 +- arch/powerpc/boot/main.c | 14 +- arch/powerpc/boot/ops.h | 6 + arch/powerpc/boot/string.S | 4 +- arch/powerpc/boot/wrapper | 5 +- arch/powerpc/configs/40x/acadia_defconfig | 921 +++++++++ arch/powerpc/configs/40x/hcu4_defconfig | 929 ++++++++++ arch/powerpc/include/asm/kdump.h | 17 +- arch/powerpc/include/asm/page.h | 1 + arch/powerpc/include/asm/signal.h | 1 - arch/powerpc/kernel/cputable.c | 13 + arch/powerpc/kernel/crash_dump.c | 2 + arch/powerpc/kernel/head_64.S | 39 +- arch/powerpc/kernel/iommu.c | 69 +- arch/powerpc/kernel/machine_kexec.c | 2 + arch/powerpc/kernel/machine_kexec_64.c | 26 +- arch/powerpc/kernel/misc_64.S | 9 +- arch/powerpc/kernel/pci-common.c | 3 +- arch/powerpc/kernel/prom_init.c | 61 - arch/powerpc/kernel/prom_init_check.sh | 2 +- arch/powerpc/kernel/setup-common.c | 7 + arch/powerpc/kernel/signal.h | 2 + arch/powerpc/kernel/signal_64.c | 2 - arch/powerpc/kernel/udbg_16550.c | 2 +- arch/powerpc/mm/hash_utils_64.c | 6 +- arch/powerpc/mm/numa.c | 21 +- arch/powerpc/oprofile/cell/pr_util.h | 13 + arch/powerpc/oprofile/cell/spu_profiler.c | 6 +- arch/powerpc/oprofile/cell/spu_task_sync.c | 236 +++- arch/powerpc/oprofile/op_model_cell.c | 2 +- arch/powerpc/platforms/40x/Kconfig | 38 + arch/powerpc/platforms/40x/Makefile | 2 + arch/powerpc/platforms/40x/hcu4.c | 61 + arch/powerpc/platforms/40x/ppc40x_simple.c | 80 + arch/powerpc/platforms/44x/Kconfig | 8 + arch/powerpc/platforms/52xx/mpc52xx_common.c | 7 +- arch/powerpc/platforms/85xx/ksi8560.c | 4 - arch/powerpc/platforms/85xx/mpc85xx_ads.c | 4 - arch/powerpc/platforms/85xx/mpc85xx_cds.c | 4 - arch/powerpc/platforms/85xx/sbc8548.c | 4 - arch/powerpc/platforms/85xx/sbc8560.c | 4 - arch/powerpc/platforms/85xx/stx_gp3.c | 4 - arch/powerpc/platforms/85xx/tqm85xx.c | 4 - arch/powerpc/platforms/86xx/gef_sbc610.c | 2 - arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 2 - arch/powerpc/platforms/86xx/sbc8641d.c | 2 - arch/powerpc/platforms/cell/ras.c | 6 +- arch/powerpc/platforms/cell/smp.c | 10 +- arch/powerpc/platforms/cell/spufs/file.c | 155 +- arch/powerpc/platforms/cell/spufs/run.c | 3 +- arch/powerpc/platforms/cell/spufs/sched.c | 24 +- arch/powerpc/platforms/cell/spufs/spufs.h | 1 - arch/powerpc/platforms/cell/spufs/sputrace.c | 37 +- arch/powerpc/platforms/cell/spufs/syscalls.c | 4 +- arch/powerpc/platforms/embedded6xx/c2k.c | 3 - arch/powerpc/platforms/embedded6xx/prpmc2800.c | 3 - arch/powerpc/platforms/pseries/hotplug-memory.c | 6 + arch/powerpc/platforms/pseries/iommu.c | 6 +- arch/powerpc/platforms/pseries/smp.c | 13 +- arch/powerpc/sysdev/Makefile | 1 + arch/powerpc/sysdev/ppc4xx_gpio.c | 217 +++ arch/sh/boards/board-ap325rxa.c | 64 +- arch/sh/boards/board-rsk7203.c | 44 +- arch/sh/boards/mach-highlander/Kconfig | 1 + arch/sh/boards/mach-highlander/Makefile | 10 +- arch/sh/boards/mach-highlander/pinmux-r7785rp.c | 20 + arch/sh/boards/mach-highlander/setup.c | 2 + arch/sh/boards/mach-migor/setup.c | 18 +- arch/sh/configs/ap325rxa_defconfig | 72 +- arch/sh/configs/cayman_defconfig | 406 ++++- arch/sh/configs/dreamcast_defconfig | 76 +- arch/sh/configs/edosk7760_defconfig | 168 ++- arch/sh/configs/hp6xx_defconfig | 65 +- arch/sh/configs/landisk_defconfig | 129 +- arch/sh/configs/lboxre2_defconfig | 88 +- arch/sh/configs/magicpanelr2_defconfig | 78 +- arch/sh/configs/microdev_defconfig | 83 +- arch/sh/configs/migor_defconfig | 125 +- arch/sh/configs/r7780mp_defconfig | 223 ++- arch/sh/configs/r7785rp_defconfig | 280 +++- arch/sh/configs/rsk7203_defconfig | 111 +- arch/sh/configs/rts7751r2d1_defconfig | 121 +- arch/sh/configs/rts7751r2dplus_defconfig | 121 +- arch/sh/configs/rts7751r2dplus_qemu_defconfig | 72 +- arch/sh/configs/sdk7780_defconfig | 135 +- arch/sh/configs/se7206_defconfig | 75 +- arch/sh/configs/se7343_defconfig | 80 +- arch/sh/configs/se7619_defconfig | 56 +- arch/sh/configs/se7705_defconfig | 659 +++---- arch/sh/configs/se7712_defconfig | 113 +- arch/sh/configs/se7721_defconfig | 263 ++- arch/sh/configs/se7722_defconfig | 458 +++-- arch/sh/configs/se7750_defconfig | 700 ++++---- arch/sh/configs/se7751_defconfig | 693 ++++---- arch/sh/configs/se7780_defconfig | 292 +++- arch/sh/configs/sh03_defconfig | 801 +++++---- arch/sh/configs/sh7710voipgw_defconfig | 222 ++- arch/sh/configs/sh7763rdp_defconfig | 75 +- arch/sh/configs/sh7785lcr_defconfig | 199 ++- arch/sh/configs/shmin_defconfig | 639 +++---- arch/sh/configs/shx3_defconfig | 627 +++++-- arch/sh/configs/snapgear_defconfig | 237 ++- arch/sh/configs/systemh_defconfig | 478 +++--- arch/sh/configs/titan_defconfig | 1061 ++++++------ arch/sh/include/asm/gpio.h | 19 +- arch/sh/include/asm/kdebug.h | 1 + arch/sh/include/cpu-sh4/cpu/sh7785.h | 234 +++ arch/sh/include/mach-common/mach/highlander.h | 6 + arch/sh/kernel/cpu/sh2a/pinmux-sh7203.c | 30 +- arch/sh/kernel/cpu/sh4a/Makefile | 1 + arch/sh/kernel/cpu/sh4a/clock-sh7763.c | 1 - arch/sh/kernel/cpu/sh4a/pinmux-sh7785.c | 1310 +++++++++++++ arch/sh/kernel/gpio.c | 8 +- arch/sh/kernel/sh_ksyms_32.c | 7 +- arch/sh/kernel/smp.c | 1 + arch/sh/kernel/traps_32.c | 2 + arch/sh/mm/init.c | 17 - arch/sparc/oprofile/init.c | 2 +- arch/sparc64/oprofile/init.c | 2 +- arch/um/Kconfig.common | 77 + arch/um/Kconfig.rest | 42 + arch/um/{Kconfig => Kconfig.um} | 122 -- arch/um/{Kconfig.i386 => Kconfig.x86} | 43 +- arch/um/Kconfig.x86_64 | 39 - arch/um/Makefile | 93 +- arch/um/Makefile-os-Linux | 1 + arch/um/drivers/Makefile | 1 + arch/um/drivers/ubd_kern.c | 19 +- .../asm-um => arch/um/include/asm}/a.out-core.h | 0 {include/asm-um => arch/um/include/asm}/apic.h | 0 {include/asm-um => arch/um/include/asm}/auxvec.h | 0 {include/asm-um => arch/um/include/asm}/bugs.h | 0 {include/asm-um => arch/um/include/asm}/cache.h | 0 {include/asm-um => arch/um/include/asm}/checksum.h | 0 .../asm-um => arch/um/include/asm}/common.lds.S | 0 {include/asm-um => arch/um/include/asm}/cputime.h | 0 {include/asm-um => arch/um/include/asm}/current.h | 0 {include/asm-um => arch/um/include/asm}/delay.h | 0 {include/asm-um => arch/um/include/asm}/desc.h | 0 {include/asm-um => arch/um/include/asm}/device.h | 0 .../asm-um => arch/um/include/asm}/dma-mapping.h | 0 {include/asm-um => arch/um/include/asm}/dma.h | 0 .../um/include/asm}/emergency-restart.h | 0 {include/asm-um => arch/um/include/asm}/fixmap.h | 1 + {include/asm-um => arch/um/include/asm}/futex.h | 0 {include/asm-um => arch/um/include/asm}/hardirq.h | 0 {include/asm-um => arch/um/include/asm}/hw_irq.h | 0 {include/asm-um => arch/um/include/asm}/io.h | 0 {include/asm-um => arch/um/include/asm}/irq.h | 0 {include/asm-um => arch/um/include/asm}/irq_regs.h | 0 .../asm-um => arch/um/include/asm}/irq_vectors.h | 0 {include/asm-um => arch/um/include/asm}/irqflags.h | 0 {include/asm-um => arch/um/include/asm}/kdebug.h | 0 .../asm-um => arch/um/include/asm}/kmap_types.h | 0 {include/asm-um => arch/um/include/asm}/mmu.h | 0 .../asm-um => arch/um/include/asm}/mmu_context.h | 0 {include/asm-um => arch/um/include/asm}/mutex.h | 0 {include/asm-um => arch/um/include/asm}/page.h | 2 +- .../asm-um => arch/um/include/asm}/page_offset.h | 0 {include/asm-um => arch/um/include/asm}/param.h | 0 {include/asm-um => arch/um/include/asm}/pci.h | 0 {include/asm-um => arch/um/include/asm}/pda.h | 0 {include/asm-um => arch/um/include/asm}/pgalloc.h | 0 .../um/include/asm}/pgtable-2level.h | 0 .../um/include/asm}/pgtable-3level.h | 0 {include/asm-um => arch/um/include/asm}/pgtable.h | 8 + .../um/include/asm}/processor-generic.h | 0 .../um/include/asm}/ptrace-generic.h | 2 +- .../um/include/asm}/required-features.h | 0 {include/asm-um => arch/um/include/asm}/sections.h | 0 {include/asm-um => arch/um/include/asm}/segment.h | 0 {include/asm-um => arch/um/include/asm}/setup.h | 0 {include/asm-um => arch/um/include/asm}/smp.h | 0 {include/asm-um => arch/um/include/asm}/suspend.h | 0 .../um/include/asm/system.h | 14 +- .../asm-um => arch/um/include/asm}/thread_info.h | 0 {include/asm-um => arch/um/include/asm}/timex.h | 0 {include/asm-um => arch/um/include/asm}/tlb.h | 0 {include/asm-um => arch/um/include/asm}/tlbflush.h | 0 {include/asm-um => arch/um/include/asm}/topology.h | 0 {include/asm-um => arch/um/include/asm}/uaccess.h | 0 {include/asm-um => arch/um/include/asm}/xor.h | 0 arch/um/include/{ => shared}/aio.h | 0 arch/um/include/{ => shared}/arch.h | 0 arch/um/include/{ => shared}/as-layout.h | 1 - arch/um/include/{ => shared}/chan_kern.h | 0 arch/um/include/{ => shared}/chan_user.h | 0 arch/um/include/{ => shared}/common-offsets.h | 13 + arch/um/include/{ => shared}/elf_user.h | 0 arch/um/include/{ => shared}/frame_kern.h | 0 arch/um/include/{ => shared}/init.h | 0 arch/um/include/{ => shared}/initrd.h | 0 arch/um/include/{ => shared}/irq_kern.h | 0 arch/um/include/{ => shared}/irq_user.h | 0 arch/um/include/{ => shared}/kern.h | 0 arch/um/include/{ => shared}/kern_util.h | 0 {include/asm-um => arch/um/include/shared}/ldt.h | 2 +- arch/um/include/{ => shared}/line.h | 0 arch/um/include/{ => shared}/longjmp.h | 0 arch/um/include/{ => shared}/mconsole.h | 0 arch/um/include/{ => shared}/mconsole_kern.h | 0 arch/um/include/{ => shared}/mem.h | 0 arch/um/include/{ => shared}/mem_kern.h | 0 arch/um/include/{ => shared}/mem_user.h | 0 arch/um/include/{ => shared}/net_kern.h | 0 arch/um/include/{ => shared}/net_user.h | 0 arch/um/include/{ => shared}/os.h | 1 - arch/um/include/{ => shared}/process.h | 0 arch/um/include/{ => shared}/ptrace_user.h | 0 arch/um/include/{ => shared}/registers.h | 0 arch/um/include/{ => shared}/sigio.h | 0 arch/um/include/{ => shared}/skas/mm_id.h | 0 arch/um/include/{ => shared}/skas/proc_mm.h | 0 arch/um/include/{ => shared}/skas/skas.h | 0 arch/um/include/{ => shared}/skas/stub-data.h | 0 arch/um/include/{ => shared}/skas_ptrace.h | 0 arch/um/include/{ => shared}/skas_ptregs.h | 0 arch/um/include/{ => shared}/syscall.h | 0 arch/um/include/{ => shared}/sysrq.h | 0 arch/um/include/{ => shared}/task.h | 0 arch/um/include/{ => shared}/tlb.h | 0 arch/um/include/{ => shared}/ubd_user.h | 0 arch/um/include/{ => shared}/um_malloc.h | 0 arch/um/include/{ => shared}/um_mmu.h | 3 +- arch/um/include/{ => shared}/um_uaccess.h | 0 arch/um/include/{ => shared}/user.h | 2 +- arch/um/include/sigcontext.h | 25 - arch/um/kernel/exec.c | 1 + arch/um/kernel/internal.h | 1 + arch/um/kernel/signal.c | 2 +- arch/um/kernel/syscall.c | 1 + arch/um/os-Linux/include/file.h | 11 - arch/um/os-Linux/skas/mem.c | 1 - .../um/sys-i386/asm/archparam.h | 10 +- .../elf-i386.h => arch/um/sys-i386/asm/elf.h | 0 .../module-i386.h => arch/um/sys-i386/asm/module.h | 0 .../um/sys-i386/asm/processor.h | 4 +- .../ptrace-i386.h => arch/um/sys-i386/asm/ptrace.h | 4 - .../shared/sysdep}/archsetjmp.h | 0 .../shared/sysdep}/barrier.h | 0 .../shared/sysdep}/checksum.h | 0 .../shared/sysdep}/faultinfo.h | 0 .../um/sys-i386/shared/sysdep/host_ldt.h | 2 +- .../shared/sysdep}/kernel-offsets.h | 0 .../shared/sysdep}/ptrace.h | 1 - .../shared/sysdep}/ptrace_user.h | 0 .../sysdep-i386 => sys-i386/shared/sysdep}/sc.h | 0 .../shared/sysdep}/sigcontext.h | 0 .../shared/sysdep}/skas_ptrace.h | 0 .../sysdep-i386 => sys-i386/shared/sysdep}/stub.h | 1 - .../shared/sysdep}/syscalls.h | 0 arch/um/sys-i386/shared/sysdep/system.h | 132 ++ .../sysdep-i386 => sys-i386/shared/sysdep}/tls.h | 2 +- .../um/sys-i386/shared/sysdep/vm-flags.h | 0 arch/um/sys-i386/stub.S | 1 - arch/um/sys-i386/syscalls.c | 1 + .../sysdep-ia64 => sys-ia64/sysdep}/ptrace.h | 0 .../sysdep-ia64 => sys-ia64/sysdep}/sigcontext.h | 0 .../sysdep-ia64 => sys-ia64/sysdep}/skas_ptrace.h | 0 .../sysdep-ia64 => sys-ia64/sysdep}/syscalls.h | 0 .../um/sys-ppc/asm/archparam.h | 0 .../asm-um/elf-ppc.h => arch/um/sys-ppc/asm/elf.h | 0 .../um/sys-ppc/asm/processor.h | 0 .../sysdep-ppc => sys-ppc/shared/sysdep}/ptrace.h | 0 .../shared/sysdep}/sigcontext.h | 0 .../shared/sysdep}/skas_ptrace.h | 0 .../shared/sysdep}/syscalls.h | 0 .../um/sys-x86_64/asm/archparam.h | 0 .../elf-x86_64.h => arch/um/sys-x86_64/asm/elf.h | 0 .../um/sys-x86_64/asm/module.h | 0 .../um/sys-x86_64/asm/processor.h | 2 +- .../um/sys-x86_64/asm/ptrace.h | 13 +- .../shared/sysdep}/archsetjmp.h | 0 .../shared/sysdep}/barrier.h | 0 .../shared/sysdep}/checksum.h | 0 .../shared/sysdep}/faultinfo.h | 0 .../um/sys-x86_64/shared/sysdep/host_ldt.h | 2 +- .../shared/sysdep}/kernel-offsets.h | 0 .../shared/sysdep}/ptrace.h | 1 - .../shared/sysdep}/ptrace_user.h | 0 .../shared/sysdep}/sc.h | 0 .../shared/sysdep}/sigcontext.h | 0 .../shared/sysdep}/skas_ptrace.h | 0 .../shared/sysdep}/stub.h | 1 - .../shared/sysdep}/syscalls.h | 0 arch/um/sys-x86_64/shared/sysdep/system.h | 132 ++ .../shared/sysdep}/tls.h | 2 +- .../um/sys-x86_64/shared/sysdep/vm-flags.h | 0 arch/um/sys-x86_64/stub.S | 1 - arch/um/sys-x86_64/syscall_table.c | 8 +- arch/x86/Kconfig | 5 + arch/x86/Makefile | 6 +- arch/x86/boot/compressed/misc.c | 2 +- arch/x86/boot/video-bios.c | 4 +- arch/x86/boot/video-vesa.c | 4 +- {include/asm-x86 => arch/x86/include/asm}/Kbuild | 0 .../asm-x86 => arch/x86/include/asm}/a.out-core.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/a.out.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/acpi.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/agp.h | 6 +- .../x86/include/asm}/alternative-asm.h | 0 .../asm-x86 => arch/x86/include/asm}/alternative.h | 6 +- .../asm-x86 => arch/x86/include/asm}/amd_iommu.h | 6 +- .../x86/include/asm}/amd_iommu_types.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/apic.h | 6 +- .../asm-x86 => arch/x86/include/asm}/apicdef.h | 6 +- .../asm-x86 => arch/x86/include/asm}/arch_hooks.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/asm.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/atomic.h | 0 .../asm-x86 => arch/x86/include/asm}/atomic_32.h | 6 +- .../asm-x86 => arch/x86/include/asm}/atomic_64.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/auxvec.h | 6 +- .../asm-x86 => arch/x86/include/asm}/bigsmp/apic.h | 0 .../x86/include/asm}/bigsmp/apicdef.h | 0 .../asm-x86 => arch/x86/include/asm}/bigsmp/ipi.h | 0 .../asm-x86 => arch/x86/include/asm}/bios_ebda.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/bitops.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/boot.h | 6 +- .../asm-x86 => arch/x86/include/asm}/bootparam.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/bug.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/bugs.h | 6 +- .../asm-x86 => arch/x86/include/asm}/byteorder.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/cache.h | 6 +- .../asm-x86 => arch/x86/include/asm}/cacheflush.h | 6 +- .../asm-x86 => arch/x86/include/asm}/calgary.h | 6 +- .../asm-x86 => arch/x86/include/asm}/calling.h | 0 .../asm-x86 => arch/x86/include/asm}/checksum.h | 0 .../asm-x86 => arch/x86/include/asm}/checksum_32.h | 6 +- .../asm-x86 => arch/x86/include/asm}/checksum_64.h | 6 +- .../asm-x86 => arch/x86/include/asm}/cmpxchg.h | 0 .../asm-x86 => arch/x86/include/asm}/cmpxchg_32.h | 6 +- .../asm-x86 => arch/x86/include/asm}/cmpxchg_64.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/compat.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/cpu.h | 6 +- .../asm-x86 => arch/x86/include/asm}/cpufeature.h | 6 +- .../asm-x86 => arch/x86/include/asm}/cputime.h | 0 .../asm-x86 => arch/x86/include/asm}/current.h | 6 +- .../asm-x86 => arch/x86/include/asm}/debugreg.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/delay.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/desc.h | 6 +- .../asm-x86 => arch/x86/include/asm}/desc_defs.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/device.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/div64.h | 6 +- .../asm-x86 => arch/x86/include/asm}/dma-mapping.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/dma.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/dmi.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/ds.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/dwarf2.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/e820.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/edac.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/efi.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/elf.h | 6 +- .../x86/include/asm}/emergency-restart.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/errno.h | 0 .../asm-x86 => arch/x86/include/asm}/es7000/apic.h | 0 .../x86/include/asm}/es7000/apicdef.h | 0 .../asm-x86 => arch/x86/include/asm}/es7000/ipi.h | 0 .../x86/include/asm}/es7000/mpparse.h | 0 .../x86/include/asm}/es7000/wakecpu.h | 0 {include/asm-x86 => arch/x86/include/asm}/fb.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/fcntl.h | 0 {include/asm-x86 => arch/x86/include/asm}/fixmap.h | 6 +- .../asm-x86 => arch/x86/include/asm}/fixmap_32.h | 6 +- .../asm-x86 => arch/x86/include/asm}/fixmap_64.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/floppy.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/frame.h | 0 {include/asm-x86 => arch/x86/include/asm}/ftrace.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/futex.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/gart.h | 6 +- .../asm-x86 => arch/x86/include/asm}/genapic.h | 0 .../asm-x86 => arch/x86/include/asm}/genapic_32.h | 6 +- .../asm-x86 => arch/x86/include/asm}/genapic_64.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/geode.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/gpio.h | 6 +- .../asm-x86 => arch/x86/include/asm}/hardirq.h | 0 .../asm-x86 => arch/x86/include/asm}/hardirq_32.h | 6 +- .../asm-x86 => arch/x86/include/asm}/hardirq_64.h | 6 +- .../asm-x86 => arch/x86/include/asm}/highmem.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/hpet.h | 6 +- .../asm-x86 => arch/x86/include/asm}/hugetlb.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/hw_irq.h | 6 +- .../x86/include/asm}/hypertransport.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/i387.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/i8253.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/i8259.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/ia32.h | 6 +- .../asm-x86 => arch/x86/include/asm}/ia32_unistd.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/idle.h | 7 +- .../x86/include/asm}/intel_arch_perfmon.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/io.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/io_32.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/io_64.h | 6 +- .../asm-x86 => arch/x86/include/asm}/io_apic.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/ioctl.h | 0 {include/asm-x86 => arch/x86/include/asm}/ioctls.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/iommu.h | 10 +- {include/asm-x86 => arch/x86/include/asm}/ipcbuf.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/ipi.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/irq.h | 6 +- .../asm-x86 => arch/x86/include/asm}/irq_regs.h | 0 .../asm-x86 => arch/x86/include/asm}/irq_regs_32.h | 6 +- .../asm-x86 => arch/x86/include/asm}/irq_regs_64.h | 0 arch/x86/include/asm/irq_remapping.h | 8 + .../asm-x86 => arch/x86/include/asm}/irq_vectors.h | 6 +- .../asm-x86 => arch/x86/include/asm}/irqflags.h | 0 {include/asm-x86 => arch/x86/include/asm}/ist.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/k8.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/kdebug.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/kexec.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/kgdb.h | 6 +- .../asm-x86 => arch/x86/include/asm}/kmap_types.h | 6 +- .../asm-x86 => arch/x86/include/asm}/kprobes.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/kvm.h | 6 +- .../asm-x86 => arch/x86/include/asm}/kvm_host.h | 6 +- .../asm-x86 => arch/x86/include/asm}/kvm_para.h | 6 +- .../x86/include/asm}/kvm_x86_emulate.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/ldt.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/lguest.h | 6 +- .../x86/include/asm}/lguest_hcall.h | 6 +- .../asm-x86 => arch/x86/include/asm}/linkage.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/local.h | 6 +- .../x86/include/asm}/mach-default/apm.h | 6 +- .../x86/include/asm}/mach-default/do_timer.h | 0 .../x86/include/asm}/mach-default/entry_arch.h | 0 .../x86/include/asm}/mach-default/mach_apic.h | 6 +- .../x86/include/asm}/mach-default/mach_apicdef.h | 6 +- .../x86/include/asm}/mach-default/mach_ipi.h | 6 +- .../x86/include/asm}/mach-default/mach_mpparse.h | 6 +- arch/x86/include/asm/mach-default/mach_mpspec.h | 12 + .../x86/include/asm}/mach-default/mach_timer.h | 6 +- .../x86/include/asm}/mach-default/mach_traps.h | 6 +- .../x86/include/asm}/mach-default/mach_wakecpu.h | 6 +- .../x86/include/asm}/mach-default/pci-functions.h | 0 .../x86/include/asm}/mach-default/setup_arch.h | 0 .../x86/include/asm}/mach-default/smpboot_hooks.h | 0 .../x86/include/asm}/mach-generic/gpio.h | 6 +- .../x86/include/asm}/mach-generic/mach_apic.h | 6 +- .../x86/include/asm}/mach-generic/mach_apicdef.h | 6 +- .../x86/include/asm}/mach-generic/mach_ipi.h | 6 +- .../x86/include/asm}/mach-generic/mach_mpparse.h | 6 +- .../x86/include/asm}/mach-generic/mach_mpspec.h | 6 +- .../x86/include/asm}/mach-rdc321x/gpio.h | 6 +- .../x86/include/asm}/mach-rdc321x/rdc321x_defs.h | 0 .../x86/include/asm}/mach-voyager/do_timer.h | 0 .../x86/include/asm}/mach-voyager/entry_arch.h | 0 .../x86/include/asm}/mach-voyager/setup_arch.h | 0 .../asm-x86 => arch/x86/include/asm}/math_emu.h | 6 +- .../asm-x86 => arch/x86/include/asm}/mc146818rtc.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/mca.h | 6 +- .../asm-x86 => arch/x86/include/asm}/mca_dma.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/mce.h | 6 +- .../asm-x86 => arch/x86/include/asm}/microcode.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/mman.h | 6 +- .../asm-x86 => arch/x86/include/asm}/mmconfig.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/mmu.h | 6 +- .../asm-x86 => arch/x86/include/asm}/mmu_context.h | 6 +- .../x86/include/asm}/mmu_context_32.h | 6 +- .../x86/include/asm}/mmu_context_64.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/mmx.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/mmzone.h | 0 .../asm-x86 => arch/x86/include/asm}/mmzone_32.h | 6 +- .../asm-x86 => arch/x86/include/asm}/mmzone_64.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/module.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/mpspec.h | 6 +- .../asm-x86 => arch/x86/include/asm}/mpspec_def.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/msgbuf.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/msidef.h | 6 +- .../asm-x86 => arch/x86/include/asm}/msr-index.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/msr.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/mtrr.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/mutex.h | 0 .../asm-x86 => arch/x86/include/asm}/mutex_32.h | 6 +- .../asm-x86 => arch/x86/include/asm}/mutex_64.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/nmi.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/nops.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/numa.h | 0 .../asm-x86 => arch/x86/include/asm}/numa_32.h | 6 +- .../asm-x86 => arch/x86/include/asm}/numa_64.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/numaq.h | 6 +- .../asm-x86 => arch/x86/include/asm}/numaq/apic.h | 0 .../x86/include/asm}/numaq/apicdef.h | 0 .../asm-x86 => arch/x86/include/asm}/numaq/ipi.h | 0 .../x86/include/asm}/numaq/mpparse.h | 0 .../x86/include/asm}/numaq/wakecpu.h | 0 {include/asm-x86 => arch/x86/include/asm}/olpc.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/page.h | 6 +- .../asm-x86 => arch/x86/include/asm}/page_32.h | 6 +- .../asm-x86 => arch/x86/include/asm}/page_64.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/param.h | 6 +- .../asm-x86 => arch/x86/include/asm}/paravirt.h | 6 +- .../asm-x86 => arch/x86/include/asm}/parport.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/pat.h | 6 +- .../asm-x86 => arch/x86/include/asm}/pci-direct.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/pci.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/pci_32.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/pci_64.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/pda.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/percpu.h | 6 +- .../asm-x86 => arch/x86/include/asm}/pgalloc.h | 6 +- .../x86/include/asm}/pgtable-2level-defs.h | 6 +- .../x86/include/asm}/pgtable-2level.h | 6 +- .../x86/include/asm}/pgtable-3level-defs.h | 6 +- .../x86/include/asm}/pgtable-3level.h | 6 +- .../asm-x86 => arch/x86/include/asm}/pgtable.h | 9 +- .../asm-x86 => arch/x86/include/asm}/pgtable_32.h | 6 +- .../asm-x86 => arch/x86/include/asm}/pgtable_64.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/poll.h | 0 .../asm-x86 => arch/x86/include/asm}/posix_types.h | 0 .../x86/include/asm}/posix_types_32.h | 6 +- .../x86/include/asm}/posix_types_64.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/prctl.h | 6 +- .../x86/include/asm}/processor-cyrix.h | 0 .../x86/include/asm}/processor-flags.h | 6 +- .../asm-x86 => arch/x86/include/asm}/processor.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/proto.h | 6 +- .../asm-x86 => arch/x86/include/asm}/ptrace-abi.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/ptrace.h | 6 +- .../asm-x86 => arch/x86/include/asm}/pvclock-abi.h | 6 +- .../asm-x86 => arch/x86/include/asm}/pvclock.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/reboot.h | 6 +- arch/x86/include/asm/reboot_fixups.h | 6 + .../x86/include/asm}/required-features.h | 6 +- .../asm-x86 => arch/x86/include/asm}/resource.h | 0 .../x86/include/asm}/resume-trace.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/rio.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/rtc.h | 0 {include/asm-x86 => arch/x86/include/asm}/rwlock.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/rwsem.h | 6 +- .../asm-x86 => arch/x86/include/asm}/scatterlist.h | 6 +- .../asm-x86 => arch/x86/include/asm}/seccomp.h | 0 .../asm-x86 => arch/x86/include/asm}/seccomp_32.h | 6 +- .../asm-x86 => arch/x86/include/asm}/seccomp_64.h | 6 +- .../asm-x86 => arch/x86/include/asm}/sections.h | 0 .../asm-x86 => arch/x86/include/asm}/segment.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/sembuf.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/serial.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/setup.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/shmbuf.h | 6 +- arch/x86/include/asm/shmparam.h | 6 + .../asm-x86 => arch/x86/include/asm}/sigcontext.h | 6 +- .../x86/include/asm}/sigcontext32.h | 6 +- .../asm-x86 => arch/x86/include/asm}/siginfo.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/signal.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/smp.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/socket.h | 6 +- .../asm-x86 => arch/x86/include/asm}/sockios.h | 6 +- .../asm-x86 => arch/x86/include/asm}/sparsemem.h | 6 +- .../asm-x86 => arch/x86/include/asm}/spinlock.h | 6 +- .../x86/include/asm}/spinlock_types.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/srat.h | 6 +- .../asm-x86 => arch/x86/include/asm}/stacktrace.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/stat.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/statfs.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/string.h | 0 .../asm-x86 => arch/x86/include/asm}/string_32.h | 6 +- .../asm-x86 => arch/x86/include/asm}/string_64.h | 6 +- .../asm-x86 => arch/x86/include/asm}/summit/apic.h | 0 .../x86/include/asm}/summit/apicdef.h | 0 .../asm-x86 => arch/x86/include/asm}/summit/ipi.h | 0 .../x86/include/asm}/summit/mpparse.h | 0 .../asm-x86 => arch/x86/include/asm}/suspend.h | 0 .../asm-x86 => arch/x86/include/asm}/suspend_32.h | 6 +- .../asm-x86 => arch/x86/include/asm}/suspend_64.h | 6 +- .../asm-x86 => arch/x86/include/asm}/swiotlb.h | 6 +- .../asm-x86 => arch/x86/include/asm}/sync_bitops.h | 6 +- .../asm-x86 => arch/x86/include/asm}/syscall.h | 112 +- .../asm-x86 => arch/x86/include/asm}/syscalls.h | 0 {include/asm-x86 => arch/x86/include/asm}/system.h | 6 +- .../asm-x86 => arch/x86/include/asm}/system_64.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/tce.h | 6 +- .../asm-x86 => arch/x86/include/asm}/termbits.h | 6 +- .../asm-x86 => arch/x86/include/asm}/termios.h | 6 +- arch/x86/include/asm/therm_throt.h | 9 + .../asm-x86 => arch/x86/include/asm}/thread_info.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/time.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/timer.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/timex.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/tlb.h | 6 +- .../asm-x86 => arch/x86/include/asm}/tlbflush.h | 6 +- .../asm-x86 => arch/x86/include/asm}/topology.h | 6 +- .../asm-x86 => arch/x86/include/asm}/trampoline.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/traps.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/tsc.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/types.h | 6 +- .../asm-x86 => arch/x86/include/asm}/uaccess.h | 6 +- .../asm-x86 => arch/x86/include/asm}/uaccess_32.h | 6 +- .../asm-x86 => arch/x86/include/asm}/uaccess_64.h | 6 +- .../asm-x86 => arch/x86/include/asm}/ucontext.h | 6 +- .../asm-x86 => arch/x86/include/asm}/unaligned.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/unistd.h | 0 .../asm-x86 => arch/x86/include/asm}/unistd_32.h | 6 +- .../asm-x86 => arch/x86/include/asm}/unistd_64.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/unwind.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/user.h | 0 {include/asm-x86 => arch/x86/include/asm}/user32.h | 6 +- .../asm-x86 => arch/x86/include/asm}/user_32.h | 6 +- .../asm-x86 => arch/x86/include/asm}/user_64.h | 6 +- .../asm-x86 => arch/x86/include/asm}/uv/bios.h | 6 +- .../asm-x86 => arch/x86/include/asm}/uv/uv_bau.h | 6 +- .../asm-x86 => arch/x86/include/asm}/uv/uv_hub.h | 6 +- .../asm-x86 => arch/x86/include/asm}/uv/uv_irq.h | 6 +- .../asm-x86 => arch/x86/include/asm}/uv/uv_mmrs.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/vdso.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/vga.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/vgtod.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/vic.h | 0 .../x86/include/asm}/visws/cobalt.h | 6 +- .../x86/include/asm}/visws/lithium.h | 6 +- .../asm-x86 => arch/x86/include/asm}/visws/piix4.h | 6 +- .../asm-x86 => arch/x86/include/asm}/visws/sgivw.h | 0 {include/asm-x86 => arch/x86/include/asm}/vm86.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/vmi.h | 0 .../asm-x86 => arch/x86/include/asm}/vmi_time.h | 6 +- .../asm-x86 => arch/x86/include/asm}/voyager.h | 0 .../asm-x86 => arch/x86/include/asm}/vsyscall.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/xcr.h | 0 .../asm-x86 => arch/x86/include/asm}/xen/events.h | 6 +- arch/x86/include/asm/xen/grant_table.h | 7 + .../x86/include/asm}/xen/hypercall.h | 6 +- .../x86/include/asm}/xen/hypervisor.h | 6 +- .../x86/include/asm}/xen/interface.h | 6 +- .../x86/include/asm}/xen/interface_32.h | 6 +- .../x86/include/asm}/xen/interface_64.h | 6 +- .../asm-x86 => arch/x86/include/asm}/xen/page.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/xor.h | 0 {include/asm-x86 => arch/x86/include/asm}/xor_32.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/xor_64.h | 6 +- {include/asm-x86 => arch/x86/include/asm}/xsave.h | 0 arch/x86/kernel/acpi/boot.c | 15 +- arch/x86/kernel/acpi/sleep.c | 4 +- arch/x86/kernel/amd_iommu_init.c | 2 +- arch/x86/kernel/asm-offsets_64.c | 2 +- arch/x86/kernel/cpu/Makefile | 2 +- arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 3 + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 42 +- arch/x86/kernel/cpu/proc.c | 6 +- arch/x86/kernel/dumpstack_32.c | 2 +- arch/x86/kernel/early-quirks.c | 55 +- arch/x86/kernel/entry_32.S | 2 +- arch/x86/kernel/genapic_flat_64.c | 4 +- arch/x86/kernel/genx2apic_cluster.c | 2 +- arch/x86/kernel/genx2apic_phys.c | 2 +- arch/x86/kernel/genx2apic_uv_x.c | 2 +- arch/x86/kernel/irq.c | 4 +- arch/x86/kernel/pci-dma.c | 16 - arch/x86/kernel/process_64.c | 7 + arch/x86/kernel/setup_percpu.c | 2 +- arch/x86/kernel/smpboot.c | 8 +- arch/x86/kernel/syscall_64.c | 4 +- arch/x86/kernel/tlb_uv.c | 2 +- arch/x86/kernel/traps.c | 8 - arch/x86/kernel/xsave.c | 2 +- arch/x86/kvm/i8254.c | 8 +- arch/x86/kvm/lapic.c | 6 +- arch/x86/mm/memtest.c | 7 +- arch/x86/mm/pageattr.c | 11 +- arch/x86/oprofile/backtrace.c | 3 +- arch/x86/oprofile/nmi_int.c | 173 +- arch/x86/oprofile/op_counter.h | 18 +- arch/x86/oprofile/op_model_amd.c | 59 +- arch/x86/oprofile/op_model_p4.c | 32 +- arch/x86/oprofile/op_model_ppro.c | 120 +- arch/x86/oprofile/op_x86_model.h | 13 +- arch/xtensa/Kconfig | 7 +- arch/xtensa/Makefile | 1 + arch/xtensa/kernel/irq.c | 2 +- arch/xtensa/platforms/iss/network.c | 2 +- block/bsg.c | 9 +- block/cmd-filter.c | 2 +- block/compat_ioctl.c | 177 +-- block/genhd.c | 37 +- block/ioctl.c | 173 +- block/scsi_ioctl.c | 33 +- drivers/Kconfig | 2 + drivers/Makefile | 2 + drivers/acpi/Kconfig | 15 +- drivers/acpi/Makefile | 3 +- drivers/acpi/ac.c | 4 +- drivers/acpi/acpi_memhotplug.c | 11 +- drivers/acpi/asus_acpi.c | 227 ++-- drivers/acpi/battery.c | 2 +- drivers/acpi/bay.c | 411 ----- drivers/acpi/bus.c | 78 +- drivers/acpi/button.c | 6 +- drivers/acpi/cm_sbs.c | 8 +- drivers/acpi/container.c | 4 +- drivers/acpi/debug.c | 2 - drivers/acpi/dispatcher/dsmethod.c | 3 + drivers/acpi/dispatcher/dsmthdat.c | 83 +- drivers/acpi/dispatcher/dsobject.c | 62 +- drivers/acpi/dispatcher/dsopcode.c | 2 +- drivers/acpi/dispatcher/dswexec.c | 12 +- drivers/acpi/dock.c | 388 +++- drivers/acpi/ec.c | 400 +++-- drivers/acpi/executer/exconfig.c | 123 +- drivers/acpi/executer/exconvrt.c | 32 +- drivers/acpi/executer/exdump.c | 87 +- drivers/acpi/executer/exmisc.c | 14 +- drivers/acpi/executer/exoparg1.c | 26 +- drivers/acpi/executer/exoparg2.c | 4 +- drivers/acpi/executer/exresnte.c | 16 +- drivers/acpi/executer/exresolv.c | 60 +- drivers/acpi/executer/exresop.c | 50 +- drivers/acpi/executer/exstore.c | 61 +- drivers/acpi/executer/exstoren.c | 3 +- drivers/acpi/fan.c | 6 +- drivers/acpi/hardware/hwsleep.c | 44 +- drivers/acpi/namespace/Makefile | 2 +- drivers/acpi/namespace/nsdump.c | 5 +- drivers/acpi/namespace/nseval.c | 73 +- drivers/acpi/namespace/nsnames.c | 7 +- drivers/acpi/namespace/nspredef.c | 900 +++++++++ drivers/acpi/namespace/nssearch.c | 2 +- drivers/acpi/namespace/nsxfeval.c | 78 + drivers/acpi/namespace/nsxfname.c | 5 + drivers/acpi/numa.c | 2 +- drivers/acpi/osl.c | 55 +- drivers/acpi/parser/psloop.c | 2 + drivers/acpi/parser/psparse.c | 32 +- drivers/acpi/pci_link.c | 6 +- drivers/acpi/pci_root.c | 4 +- drivers/acpi/pci_slot.c | 12 +- drivers/acpi/power.c | 74 +- drivers/acpi/processor_core.c | 6 +- drivers/acpi/processor_idle.c | 1 + drivers/acpi/processor_perflib.c | 30 +- drivers/acpi/processor_throttling.c | 12 +- drivers/acpi/reboot.c | 25 +- drivers/acpi/resources/rscalc.c | 5 +- drivers/acpi/resources/rscreate.c | 10 +- drivers/acpi/sbs.c | 2 +- drivers/acpi/sbshc.c | 6 +- drivers/acpi/scan.c | 90 +- drivers/acpi/sleep/main.c | 66 +- drivers/acpi/system.c | 4 +- drivers/acpi/tables/tbfadt.c | 32 +- drivers/acpi/tables/tbinstal.c | 61 +- drivers/acpi/thermal.c | 57 +- drivers/acpi/toshiba_acpi.c | 2 +- drivers/acpi/utilities/utalloc.c | 53 +- drivers/acpi/utilities/utcopy.c | 29 +- drivers/acpi/utilities/utdelete.c | 12 +- drivers/acpi/utilities/utglobal.c | 52 +- drivers/acpi/utilities/utmisc.c | 9 + drivers/acpi/utilities/utobject.c | 15 +- drivers/acpi/utilities/utxface.c | 7 +- drivers/acpi/utils.c | 4 +- drivers/acpi/video.c | 60 +- drivers/acpi/wmi.c | 49 +- drivers/ata/libata-acpi.c | 135 +- drivers/ata/libata-core.c | 2 + drivers/ata/libata-eh.c | 26 +- drivers/ata/libata-sff.c | 11 +- drivers/ata/sata_via.c | 35 +- drivers/block/DAC960.c | 6 +- drivers/block/amiflop.c | 46 +- drivers/block/aoe/aoeblk.c | 12 +- drivers/block/ataflop.c | 37 +- drivers/block/brd.c | 5 +- drivers/block/cciss.c | 71 +- drivers/block/cpqarray.c | 28 +- drivers/block/floppy.c | 54 +- drivers/block/loop.c | 59 +- drivers/block/nbd.c | 28 +- drivers/block/paride/pcd.c | 21 +- drivers/block/paride/pd.c | 14 +- drivers/block/paride/pf.c | 22 +- drivers/block/paride/pt.c | 2 +- drivers/block/pktcdvd.c | 56 +- drivers/block/swim3.c | 32 +- drivers/block/ub.c | 22 +- drivers/block/viodasd.c | 10 +- drivers/block/virtio_blk.c | 8 +- drivers/block/xd.c | 4 +- drivers/block/xd.h | 2 +- drivers/block/xen-blkfront.c | 15 +- drivers/block/xsysace.c | 11 +- drivers/block/z2ram.c | 7 +- drivers/cdrom/cdrom.c | 23 +- drivers/cdrom/gdrom.c | 14 +- drivers/cdrom/viocd.c | 21 +- drivers/char/hvc_console.c | 86 +- drivers/char/hvc_console.h | 12 +- drivers/char/hvc_irq.c | 5 + drivers/char/hvc_iseries.c | 1 + drivers/char/hvc_vio.c | 1 + drivers/char/hvc_xen.c | 1 + drivers/char/nvram.c | 6 +- drivers/char/raw.c | 8 +- drivers/char/tty_port.c | 2 +- drivers/char/virtio_console.c | 1 + drivers/cpuidle/cpuidle.c | 16 +- drivers/dma/ioat_dma.c | 3 + drivers/gpio/Kconfig | 7 + drivers/gpio/Makefile | 1 + drivers/gpio/twl4030-gpio.c | 521 ++++++ drivers/gpu/drm/drm_drawable.c | 15 +- drivers/gpu/drm/drm_ioc32.c | 34 + drivers/gpu/drm/drm_irq.c | 5 +- drivers/gpu/drm/drm_lock.c | 2 + drivers/gpu/drm/i915/i915_dma.c | 5 +- drivers/gpu/drm/i915/i915_drv.h | 10 +- drivers/gpu/drm/i915/i915_gem.c | 2 - drivers/gpu/drm/i915/i915_gem_proc.c | 15 +- drivers/gpu/drm/i915/i915_irq.c | 277 ++-- drivers/i2c/algos/i2c-algo-pcf.c | 21 +- drivers/i2c/busses/Kconfig | 1 + drivers/i2c/busses/i2c-cpm.c | 1 - drivers/i2c/busses/i2c-elektor.c | 3 +- drivers/i2c/busses/i2c-hydra.c | 2 +- drivers/i2c/busses/i2c-i801.c | 3 + drivers/i2c/chips/Kconfig | 2 + drivers/i2c/chips/Makefile | 3 +- drivers/i2c/i2c-core.c | 3 + drivers/ide/Makefile | 84 +- drivers/ide/{pci => }/aec62xx.c | 0 drivers/ide/{legacy => }/ali14xx.c | 0 drivers/ide/{pci => }/alim15x3.c | 0 drivers/ide/{pci => }/amd74xx.c | 0 drivers/ide/arm/Makefile | 10 - drivers/ide/{pci => }/atiixp.c | 0 drivers/ide/{mips => }/au1xxx-ide.c | 0 drivers/ide/{legacy => }/buddha.c | 0 drivers/ide/{pci => }/cmd640.c | 0 drivers/ide/{pci => }/cmd64x.c | 0 drivers/ide/{pci => }/cs5520.c | 0 drivers/ide/{pci => }/cs5530.c | 0 drivers/ide/{pci => }/cs5535.c | 0 drivers/ide/{pci => }/cy82c693.c | 0 drivers/ide/{pci => }/delkin_cb.c | 0 drivers/ide/{legacy => }/dtc2278.c | 0 drivers/ide/{legacy => }/falconide.c | 0 drivers/ide/{legacy => }/gayle.c | 0 drivers/ide/{pci => }/generic.c | 0 drivers/ide/h8300/Makefile | 2 - drivers/ide/{pci => }/hpt366.c | 0 drivers/ide/{legacy => }/ht6560b.c | 0 drivers/ide/{arm => }/icside.c | 0 drivers/ide/{legacy => }/ide-4drives.c | 0 drivers/ide/ide-cd.c | 22 +- drivers/ide/{legacy => }/ide-cs.c | 0 drivers/ide/ide-disk.h | 2 +- drivers/ide/ide-disk_ioctl.c | 5 +- drivers/ide/ide-floppy.h | 4 +- drivers/ide/ide-floppy_ioctl.c | 17 +- drivers/ide/ide-gd.c | 20 +- drivers/ide/{h8300 => }/ide-h8300.c | 0 drivers/ide/ide-ioctls.c | 3 +- drivers/ide/ide-tape.c | 17 +- drivers/ide/{arm => }/ide_arm.c | 0 drivers/ide/{legacy => }/ide_platform.c | 0 drivers/ide/{pci => }/it8213.c | 0 drivers/ide/{pci => }/it821x.c | 0 drivers/ide/{pci => }/jmicron.c | 0 drivers/ide/legacy/Makefile | 25 - drivers/ide/{legacy => }/macide.c | 0 drivers/ide/mips/Makefile | 3 - drivers/ide/{pci => }/ns87415.c | 0 drivers/ide/{pci => }/opti621.c | 0 drivers/ide/{arm => }/palm_bk3710.c | 0 drivers/ide/pci/Makefile | 43 - drivers/ide/{pci => }/pdc202xx_new.c | 0 drivers/ide/{pci => }/pdc202xx_old.c | 0 drivers/ide/{pci => }/piix.c | 0 drivers/ide/{ppc => }/pmac.c | 0 drivers/ide/ppc/Makefile | 2 - drivers/ide/{legacy => }/q40ide.c | 0 drivers/ide/{legacy => }/qd65xx.c | 0 drivers/ide/{legacy => }/qd65xx.h | 0 drivers/ide/{arm => }/rapide.c | 0 drivers/ide/{pci => }/rz1000.c | 0 drivers/ide/{pci => }/sc1200.c | 0 drivers/ide/{pci => }/scc_pata.c | 0 drivers/ide/{pci => }/serverworks.c | 0 drivers/ide/{pci => }/sgiioc4.c | 0 drivers/ide/{pci => }/siimage.c | 0 drivers/ide/{pci => }/sis5513.c | 0 drivers/ide/{pci => }/sl82c105.c | 0 drivers/ide/{pci => }/slc90e66.c | 0 drivers/ide/{pci => }/tc86c001.c | 0 drivers/ide/{pci => }/triflex.c | 0 drivers/ide/{pci => }/trm290.c | 0 drivers/ide/{legacy => }/umc8672.c | 0 drivers/ide/{pci => }/via82cxxx.c | 0 drivers/idle/Kconfig | 16 + drivers/idle/Makefile | 2 + drivers/idle/i7300_idle.c | 674 +++++++ drivers/infiniband/core/mad.c | 14 +- drivers/infiniband/core/ucma.c | 4 +- drivers/infiniband/hw/cxgb3/iwch_cm.c | 1 + drivers/infiniband/hw/ehca/ehca_classes.h | 2 + drivers/infiniband/hw/ehca/ehca_cq.c | 4 +- drivers/infiniband/hw/ehca/ehca_main.c | 83 +- drivers/infiniband/hw/ehca/ehca_qp.c | 10 +- drivers/infiniband/hw/mlx4/mad.c | 6 +- drivers/infiniband/hw/mlx4/main.c | 11 +- drivers/infiniband/hw/mlx4/mlx4_ib.h | 1 + drivers/infiniband/hw/mlx4/qp.c | 21 +- drivers/infiniband/ulp/ipoib/ipoib.h | 1 + drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 9 +- drivers/infiniband/ulp/ipoib/ipoib_ib.c | 7 +- drivers/infiniband/ulp/ipoib/ipoib_main.c | 67 +- drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 4 + drivers/md/Makefile | 2 +- drivers/md/dm-crypt.c | 56 +- drivers/md/dm-delay.c | 3 +- drivers/md/dm-exception-store.c | 108 +- drivers/md/dm-io.c | 2 +- drivers/md/dm-ioctl.c | 4 +- drivers/md/dm-kcopyd.c | 14 +- drivers/md/dm-linear.c | 15 +- drivers/md/dm-log.c | 2 +- drivers/md/dm-mpath.c | 17 +- drivers/md/dm-path-selector.c | 3 +- drivers/md/dm-raid1.c | 791 +------- drivers/md/dm-region-hash.c | 704 +++++++ drivers/md/dm-round-robin.c | 3 +- drivers/md/dm-snap.c | 11 +- drivers/md/dm-snap.h | 5 +- drivers/md/dm-stripe.c | 6 +- drivers/md/dm-table.c | 37 +- drivers/md/dm-zero.c | 2 +- drivers/md/dm.c | 76 +- drivers/md/dm.h | 9 - drivers/md/md.c | 20 +- drivers/media/common/saa7146_fops.c | 4 +- drivers/media/common/saa7146_video.c | 12 +- drivers/media/dvb/frontends/s5h1411.c | 84 +- drivers/media/dvb/frontends/s5h1411.h | 2 +- drivers/media/radio/dsbr100.c | 62 +- drivers/media/radio/radio-mr800.c | 5 + drivers/media/video/arv.c | 2 +- drivers/media/video/bt8xx/bttv-driver.c | 6 +- drivers/media/video/c-qcam.c | 2 +- drivers/media/video/cafe_ccic.c | 4 +- drivers/media/video/cpia.c | 6 +- drivers/media/video/cpia2/cpia2_v4l.c | 2 +- drivers/media/video/cx18/cx18-driver.c | 11 +- drivers/media/video/cx18/cx18-io.h | 4 +- drivers/media/video/cx18/cx18-streams.c | 36 +- drivers/media/video/cx23885/cx23885-417.c | 2 +- drivers/media/video/cx23885/cx23885-video.c | 2 +- drivers/media/video/cx88/cx88-blackbird.c | 2 +- drivers/media/video/cx88/cx88-cards.c | 4 +- drivers/media/video/cx88/cx88-dvb.c | 11 +- drivers/media/video/cx88/cx88-i2c.c | 2 + drivers/media/video/cx88/cx88-mpeg.c | 15 +- drivers/media/video/cx88/cx88-video.c | 6 +- drivers/media/video/em28xx/em28xx-video.c | 2 +- drivers/media/video/et61x251/et61x251_core.c | 24 +- drivers/media/video/ivtv/ivtv-driver.c | 12 + drivers/media/video/ivtv/ivtv-i2c.c | 1 + drivers/media/video/ivtv/ivtv-ioctl.c | 13 +- drivers/media/video/ivtv/ivtv-ioctl.h | 3 +- drivers/media/video/ivtv/ivtv-streams.c | 4 +- drivers/media/video/ivtv/ivtvfb.c | 6 + drivers/media/video/pvrusb2/pvrusb2-encoder.c | 4 + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 6 - drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 17 +- drivers/media/video/pwc/pwc-if.c | 2 +- drivers/media/video/saa7134/saa7134-core.c | 6 +- drivers/media/video/saa7134/saa7134-empress.c | 2 +- drivers/media/video/se401.c | 2 +- drivers/media/video/sn9c102/sn9c102_core.c | 24 +- drivers/media/video/stk-webcam.c | 4 +- drivers/media/video/stv680.c | 3 +- drivers/media/video/usbvideo/usbvideo.c | 2 +- drivers/media/video/usbvideo/vicam.c | 3 +- drivers/media/video/usbvision/usbvision-i2c.c | 2 +- drivers/media/video/usbvision/usbvision-video.c | 12 +- drivers/media/video/uvc/uvc_v4l2.c | 12 +- drivers/media/video/v4l1-compat.c | 221 +-- drivers/media/video/v4l2-int-device.c | 5 +- drivers/media/video/v4l2-ioctl.c | 19 +- drivers/media/video/videobuf-dvb.c | 52 +- drivers/media/video/vivi.c | 6 +- drivers/media/video/w9968cf.c | 16 +- drivers/media/video/zc0301/zc0301_core.c | 24 +- drivers/media/video/zr364xx.c | 2 +- drivers/memstick/core/mspro_block.c | 9 +- drivers/message/fusion/mptscsih.c | 3 +- drivers/message/i2o/i2o_block.c | 13 +- drivers/mfd/Makefile | 2 +- drivers/mfd/sm501.c | 25 +- drivers/mfd/twl4030-core.c | 421 +---- drivers/mfd/twl4030-irq.c | 743 ++++++++ drivers/mfd/wm8350-core.c | 5 +- drivers/misc/Kconfig | 12 + drivers/misc/Makefile | 1 + drivers/misc/acer-wmi.c | 225 ++- drivers/misc/asus-laptop.c | 17 +- drivers/misc/eeepc-laptop.c | 232 +++- drivers/misc/fujitsu-laptop.c | 135 +- drivers/misc/intel_menlow.c | 31 +- drivers/misc/panasonic-laptop.c | 767 ++++++++ drivers/misc/sony-laptop.c | 2 +- drivers/misc/thinkpad_acpi.c | 65 +- drivers/mmc/card/block.c | 13 +- drivers/mtd/devices/block2mtd.c | 4 +- drivers/mtd/mtd_blkdevs.c | 24 +- drivers/mtd/mtdchar.c | 10 +- drivers/net/Kconfig | 15 + drivers/net/Makefile | 2 + drivers/net/fec_mpc52xx_phy.c | 55 +- drivers/net/ibm_newemac/core.c | 10 +- drivers/net/ibm_newemac/mal.c | 15 +- drivers/net/mlx4/Makefile | 7 +- drivers/net/mlx4/alloc.c | 97 +- drivers/net/mlx4/cq.c | 2 +- drivers/net/mlx4/en_cq.c | 146 ++ drivers/net/mlx4/en_main.c | 254 +++ drivers/net/mlx4/en_netdev.c | 1088 +++++++++++ drivers/net/mlx4/en_params.c | 480 +++++ drivers/net/mlx4/en_port.c | 261 +++ drivers/net/mlx4/en_port.h | 570 ++++++ drivers/net/mlx4/en_resources.c | 96 + drivers/net/mlx4/en_rx.c | 1080 +++++++++++ drivers/net/mlx4/en_tx.c | 820 +++++++++ drivers/net/mlx4/eq.c | 2 +- drivers/net/mlx4/fw.c | 20 +- drivers/net/mlx4/fw.h | 7 +- drivers/net/mlx4/main.c | 287 +++- drivers/net/mlx4/mcg.c | 4 +- drivers/net/mlx4/mlx4.h | 45 +- drivers/net/mlx4/mlx4_en.h | 561 ++++++ drivers/net/mlx4/mr.c | 2 +- drivers/net/mlx4/pd.c | 4 +- drivers/net/mlx4/port.c | 282 +++ drivers/net/mlx4/qp.c | 81 +- drivers/net/mlx4/srq.c | 2 +- drivers/net/xtsonic.c | 319 ++++ drivers/of/of_i2c.c | 2 +- drivers/of/of_spi.c | 2 + drivers/oprofile/buffer_sync.c | 41 +- drivers/oprofile/buffer_sync.h | 4 +- drivers/oprofile/cpu_buffer.c | 106 +- drivers/oprofile/cpu_buffer.h | 12 +- drivers/oprofile/event_buffer.c | 34 +- drivers/oprofile/event_buffer.h | 17 +- drivers/oprofile/oprof.c | 26 +- drivers/oprofile/oprof.h | 12 +- drivers/oprofile/oprofile_files.c | 36 +- drivers/oprofile/oprofile_stats.c | 24 +- drivers/oprofile/oprofile_stats.h | 10 +- drivers/oprofile/oprofilefs.c | 78 +- drivers/oprofile/timer_int.c | 4 +- drivers/parisc/eisa_eeprom.c | 2 +- drivers/parport/parport_pc.c | 20 +- drivers/pci/dmar.c | 119 +- drivers/pci/hotplug/acpiphp.h | 9 +- drivers/pci/hotplug/acpiphp_core.c | 32 +- drivers/pci/hotplug/acpiphp_glue.c | 20 +- drivers/pci/hotplug/acpiphp_ibm.c | 2 +- drivers/pci/hotplug/cpci_hotplug.h | 6 + drivers/pci/hotplug/cpci_hotplug_core.c | 75 +- drivers/pci/hotplug/cpci_hotplug_pci.c | 4 +- drivers/pci/hotplug/cpqphp.h | 13 +- drivers/pci/hotplug/cpqphp_core.c | 43 +- drivers/pci/hotplug/cpqphp_ctrl.c | 2 +- drivers/pci/hotplug/fakephp.c | 26 +- drivers/pci/hotplug/ibmphp.h | 5 +- drivers/pci/hotplug/ibmphp_ebda.c | 19 +- drivers/pci/hotplug/pci_hotplug_core.c | 64 +- drivers/pci/hotplug/pciehp.h | 10 +- drivers/pci/hotplug/pciehp_core.c | 49 +- drivers/pci/hotplug/pciehp_ctrl.c | 56 +- drivers/pci/hotplug/pciehp_hpc.c | 60 +- drivers/pci/hotplug/rpaphp_slot.c | 10 +- drivers/pci/hotplug/sgi_hotplug.c | 22 +- drivers/pci/hotplug/shpchp.h | 9 +- drivers/pci/hotplug/shpchp_core.c | 52 +- drivers/pci/hotplug/shpchp_ctrl.c | 48 +- drivers/pci/intel-iommu.c | 250 ++-- drivers/pci/msi.c | 21 + drivers/pci/pci-acpi.c | 85 +- drivers/pci/pci.c | 101 + drivers/pci/pci.h | 2 + drivers/pci/probe.c | 12 +- drivers/pci/quirks.c | 14 + drivers/pci/search.c | 9 +- drivers/pci/slot.c | 160 ++- drivers/pcmcia/Makefile | 2 +- drivers/pnp/Kconfig | 20 +- drivers/pnp/Makefile | 4 - drivers/pnp/base.h | 10 + drivers/pnp/core.c | 29 +- drivers/pnp/driver.c | 4 - drivers/pnp/isapnp/Makefile | 4 - drivers/pnp/isapnp/core.c | 12 +- drivers/pnp/manager.c | 34 +- drivers/pnp/pnpacpi/Makefile | 4 - drivers/pnp/pnpacpi/core.c | 16 +- drivers/pnp/pnpacpi/rsparser.c | 43 +- drivers/pnp/pnpbios/Makefile | 4 - drivers/pnp/pnpbios/core.c | 4 +- drivers/pnp/pnpbios/rsparser.c | 18 +- drivers/pnp/quirks.c | 5 +- drivers/pnp/resource.c | 12 +- drivers/pnp/support.c | 14 +- drivers/rtc/Kconfig | 14 +- drivers/rtc/Makefile | 1 + drivers/rtc/rtc-twl4030.c | 564 ++++++ drivers/s390/block/dasd.c | 11 +- drivers/s390/block/dasd_genhd.c | 4 +- drivers/s390/block/dasd_int.h | 3 +- drivers/s390/block/dasd_ioctl.c | 15 +- drivers/s390/block/dcssblk.c | 17 +- drivers/s390/char/tape_block.c | 25 +- drivers/s390/crypto/ap_bus.c | 6 +- drivers/scsi/3w-9xxx.c | 3 - drivers/scsi/3w-xxxx.c | 7 +- drivers/scsi/aic7xxx/aic79xx.reg | 185 ++ drivers/scsi/aic7xxx/aic79xx_core.c | 15 +- drivers/scsi/aic7xxx/aic79xx_pci.c | 12 +- drivers/scsi/aic7xxx/aic79xx_reg.h_shipped | 567 ++----- drivers/scsi/aic7xxx/aic79xx_reg_print.c_shipped | 1723 ----------------- drivers/scsi/aic7xxx/aic7xxx.reg | 124 ++ drivers/scsi/aic7xxx/aic7xxx_core.c | 7 + drivers/scsi/aic7xxx/aic7xxx_reg.h_shipped | 875 --------- drivers/scsi/aic7xxx/aic7xxx_reg_print.c_shipped | 1165 ------------ drivers/scsi/aic7xxx/aicasm/aicasm_gram.y | 10 + drivers/scsi/aic7xxx/aicasm/aicasm_scan.l | 1 + drivers/scsi/aic7xxx/aicasm/aicasm_symbol.c | 3 + drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h | 3 +- drivers/scsi/device_handler/scsi_dh_rdac.c | 3 + drivers/scsi/ide-scsi.c | 22 +- drivers/scsi/ipr.c | 16 +- drivers/scsi/scsi_ioctl.c | 6 +- drivers/scsi/scsi_lib.c | 83 +- drivers/scsi/scsi_netlink.c | 9 +- drivers/scsi/sd.c | 56 +- drivers/scsi/sg.c | 2 +- drivers/scsi/sr.c | 40 +- drivers/scsi/st.c | 7 +- drivers/scsi/sun3x_esp.c | 4 +- drivers/serial/8250_pci.c | 231 +++ drivers/serial/Kconfig | 2 +- drivers/staging/Kconfig | 2 + drivers/staging/Makefile | 1 + drivers/staging/at76_usb/at76_usb.c | 4 +- drivers/staging/echo/bit_operations.h | 205 +-- drivers/staging/echo/echo.c | 847 +++++----- drivers/staging/echo/echo.h | 58 +- drivers/staging/echo/fir.h | 376 ++--- drivers/staging/echo/mmx.h | 29 +- drivers/staging/echo/oslec.h | 86 + drivers/staging/et131x/et1310_phy.c | 2 - drivers/staging/et131x/et131x_debug.c | 1 - drivers/staging/et131x/et131x_initpci.c | 1 - drivers/staging/go7007/go7007-driver.c | 1 - drivers/staging/go7007/go7007-fw.c | 1 - drivers/staging/go7007/go7007-i2c.c | 1 - drivers/staging/go7007/go7007-usb.c | 1 - drivers/staging/go7007/snd-go7007.c | 1 - drivers/staging/go7007/wis-ov7640.c | 1 - drivers/staging/go7007/wis-saa7113.c | 1 - drivers/staging/go7007/wis-saa7115.c | 1 - drivers/staging/go7007/wis-sony-tuner.c | 1 - drivers/staging/go7007/wis-tw2804.c | 1 - drivers/staging/go7007/wis-tw9903.c | 1 - drivers/staging/go7007/wis-uda1342.c | 1 - drivers/staging/me4000/me4000.c | 908 +++++----- drivers/staging/me4000/me4000.h | 194 +- drivers/staging/poch/Kconfig | 6 + drivers/staging/poch/Makefile | 1 + drivers/staging/poch/README | 7 + drivers/staging/poch/poch.c | 1425 ++++++++++++++ drivers/staging/poch/poch.h | 29 + drivers/staging/slicoss/slicoss.c | 18 +- drivers/staging/sxg/README | 1 + drivers/staging/sxg/sxg.c | 1379 +++++++------- drivers/staging/sxg/sxg_os.h | 41 +- drivers/staging/sxg/sxgdbg.h | 2 +- drivers/staging/sxg/sxghif.h | 410 ++--- drivers/staging/sxg/sxghw.h | 404 ++-- drivers/staging/sxg/sxgphycode.h | 12 +- drivers/staging/usbip/usbip_common.c | 2 +- drivers/staging/usbip/vhci_rx.c | 2 +- drivers/staging/winbond/Kconfig | 2 +- drivers/staging/winbond/README | 1 + drivers/staging/winbond/bss_f.h | 6 +- drivers/staging/winbond/ds_tkip.h | 6 +- drivers/staging/winbond/linux/common.h | 17 +- drivers/staging/winbond/linux/wb35reg.c | 63 +- drivers/staging/winbond/linux/wb35reg_f.h | 12 +- drivers/staging/winbond/linux/wb35reg_s.h | 4 +- drivers/staging/winbond/linux/wb35rx.c | 175 +- drivers/staging/winbond/linux/wb35rx_s.h | 2 +- drivers/staging/winbond/linux/wb35tx.c | 138 +- drivers/staging/winbond/linux/wb35tx_f.h | 2 +- drivers/staging/winbond/linux/wbusb.c | 259 ++-- drivers/staging/winbond/mds.c | 30 +- drivers/staging/winbond/mds_f.h | 6 +- drivers/staging/winbond/mds_s.h | 8 +- drivers/staging/winbond/mlme_s.h | 4 +- drivers/staging/winbond/mlmetxrx.c | 4 +- drivers/staging/winbond/mlmetxrx_f.h | 4 +- drivers/staging/winbond/reg.c | 24 +- drivers/staging/winbond/sme_api.c | 1 + drivers/staging/winbond/sme_api.h | 2 +- drivers/staging/winbond/wbhal.c | 32 +- drivers/staging/winbond/wbhal_f.h | 28 +- drivers/staging/winbond/wbhal_s.h | 4 +- drivers/staging/winbond/wblinux.c | 208 +-- drivers/staging/winbond/wblinux_s.h | 4 +- drivers/staging/wlan-ng/Kconfig | 2 +- drivers/staging/wlan-ng/hfa384x.h | 2 +- drivers/staging/wlan-ng/p80211wep.c | 1 - drivers/staging/wlan-ng/prism2mib.c | 2 - drivers/staging/wlan-ng/wlan_compat.h | 8 +- drivers/usb/Kconfig | 5 +- drivers/usb/Makefile | 3 + drivers/usb/atm/speedtch.c | 12 + drivers/usb/class/cdc-acm.c | 3 +- drivers/usb/class/cdc-wdm.c | 2 + drivers/usb/core/driver.c | 3 +- drivers/usb/core/hub.c | 2 +- drivers/usb/gadget/config.c | 2 +- drivers/usb/gadget/pxa27x_udc.c | 2 +- drivers/usb/gadget/s3c2410_udc.c | 7 +- drivers/usb/host/Kconfig | 29 +- drivers/usb/host/Makefile | 3 + drivers/usb/host/hwa-hc.c | 925 ++++++++++ drivers/usb/host/ohci-hcd.c | 21 + drivers/usb/host/ohci-tmio.c | 376 ++++ drivers/usb/host/whci/Kbuild | 11 + drivers/usb/host/whci/asl.c | 367 ++++ drivers/usb/host/whci/hcd.c | 339 ++++ drivers/usb/host/whci/hw.c | 87 + drivers/usb/host/whci/init.c | 188 ++ drivers/usb/host/whci/int.c | 95 + drivers/usb/host/whci/pzl.c | 398 ++++ drivers/usb/host/whci/qset.c | 567 ++++++ drivers/usb/host/whci/whcd.h | 197 ++ drivers/usb/host/whci/whci-hc.h | 416 +++++ drivers/usb/host/whci/wusb.c | 241 +++ drivers/usb/misc/usbtest.c | 3 +- drivers/usb/serial/option.c | 96 + drivers/usb/storage/initializers.c | 3 +- drivers/usb/storage/unusual_devs.h | 291 +++- drivers/usb/wusbcore/Kconfig | 41 + drivers/usb/wusbcore/Makefile | 26 + drivers/usb/wusbcore/cbaf.c | 673 +++++++ drivers/usb/wusbcore/crypto.c | 538 ++++++ drivers/usb/wusbcore/dev-sysfs.c | 143 ++ drivers/usb/wusbcore/devconnect.c | 1297 +++++++++++++ drivers/usb/wusbcore/mmc.c | 321 ++++ drivers/usb/wusbcore/pal.c | 42 + drivers/usb/wusbcore/reservation.c | 115 ++ drivers/usb/wusbcore/rh.c | 477 +++++ drivers/usb/wusbcore/security.c | 642 +++++++ drivers/usb/wusbcore/wa-hc.c | 95 + drivers/usb/wusbcore/wa-hc.h | 417 +++++ drivers/usb/wusbcore/wa-nep.c | 310 ++++ drivers/usb/wusbcore/wa-rpipe.c | 562 ++++++ drivers/usb/wusbcore/wa-xfer.c | 1709 +++++++++++++++++ drivers/usb/wusbcore/wusbhc.c | 418 +++++ drivers/usb/wusbcore/wusbhc.h | 495 +++++ drivers/uwb/Kconfig | 90 + drivers/uwb/Makefile | 29 + drivers/uwb/address.c | 374 ++++ drivers/uwb/beacon.c | 642 +++++++ drivers/uwb/driver.c | 144 ++ drivers/uwb/drp-avail.c | 288 +++ drivers/uwb/drp-ie.c | 232 +++ drivers/uwb/drp.c | 461 +++++ drivers/uwb/est.c | 477 +++++ drivers/uwb/hwa-rc.c | 926 ++++++++++ drivers/uwb/i1480/Makefile | 2 + drivers/uwb/i1480/dfu/Makefile | 9 + drivers/uwb/i1480/dfu/dfu.c | 217 +++ drivers/uwb/i1480/dfu/i1480-dfu.h | 260 +++ drivers/uwb/i1480/dfu/mac.c | 527 ++++++ drivers/uwb/i1480/dfu/phy.c | 203 ++ drivers/uwb/i1480/dfu/usb.c | 500 +++++ drivers/uwb/i1480/i1480-est.c | 99 + drivers/uwb/i1480/i1480-wlp.h | 200 ++ drivers/uwb/i1480/i1480u-wlp/Makefile | 8 + drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h | 284 +++ drivers/uwb/i1480/i1480u-wlp/lc.c | 421 +++++ drivers/uwb/i1480/i1480u-wlp/netdev.c | 368 ++++ drivers/uwb/i1480/i1480u-wlp/rx.c | 486 +++++ drivers/uwb/i1480/i1480u-wlp/sysfs.c | 408 ++++ drivers/uwb/i1480/i1480u-wlp/tx.c | 632 +++++++ drivers/uwb/ie.c | 541 ++++++ drivers/uwb/lc-dev.c | 492 +++++ drivers/uwb/lc-rc.c | 495 +++++ drivers/uwb/neh.c | 616 +++++++ drivers/uwb/pal.c | 91 + drivers/uwb/reset.c | 362 ++++ drivers/uwb/rsv.c | 680 +++++++ drivers/uwb/scan.c | 133 ++ drivers/uwb/umc-bus.c | 218 +++ drivers/uwb/umc-dev.c | 104 ++ drivers/uwb/umc-drv.c | 31 + drivers/uwb/uwb-debug.c | 367 ++++ drivers/uwb/uwb-internal.h | 305 +++ drivers/uwb/uwbd.c | 410 ++++ drivers/uwb/whc-rc.c | 520 ++++++ drivers/uwb/whci.c | 269 +++ drivers/uwb/wlp/Makefile | 10 + drivers/uwb/wlp/driver.c | 43 + drivers/uwb/wlp/eda.c | 449 +++++ drivers/uwb/wlp/messages.c | 1946 ++++++++++++++++++++ drivers/uwb/wlp/sysfs.c | 709 +++++++ drivers/uwb/wlp/txrx.c | 374 ++++ drivers/uwb/wlp/wlp-internal.h | 228 +++ drivers/uwb/wlp/wlp-lc.c | 585 ++++++ drivers/uwb/wlp/wss-lc.c | 1055 +++++++++++ drivers/watchdog/w83697ug_wdt.c | 2 +- drivers/xen/cpu_hotplug.c | 2 +- fs/9p/vfs_file.c | 2 +- fs/Kconfig | 7 +- fs/afs/dir.c | 1 + fs/attr.c | 10 +- fs/bfs/dir.c | 1 + fs/block_dev.c | 125 +- fs/char_dev.c | 21 +- fs/cifs/CHANGES | 9 + fs/cifs/README | 19 + fs/cifs/cifsfs.c | 52 +- fs/cifs/cifsfs.h | 2 +- fs/cifs/cifsglob.h | 2 + fs/cifs/cifssmb.c | 2 + fs/cifs/connect.c | 94 +- fs/cifs/inode.c | 211 ++- fs/cifs/readdir.c | 3 +- fs/coda/dir.c | 3 + fs/coda/pioctl.c | 2 +- fs/compat.c | 209 +-- fs/configfs/symlink.c | 16 +- fs/dcache.c | 184 +- fs/dquot.c | 10 +- fs/ecryptfs/main.c | 23 +- fs/efs/namei.c | 29 +- fs/exportfs/expfs.c | 20 +- fs/ext2/dir.c | 14 +- fs/ext2/ext2.h | 4 +- fs/ext2/namei.c | 30 +- fs/ext2/xip.c | 1 + fs/ext3/ioctl.c | 12 +- fs/ext3/namei.c | 84 +- fs/ext3/super.c | 49 +- fs/ext4/namei.c | 12 +- fs/ext4/super.c | 28 +- fs/fat/dir.c | 1 + fs/fat/inode.c | 52 +- fs/fifo.c | 6 +- fs/file_table.c | 4 +- fs/filesystems.c | 39 + fs/fuse/inode.c | 23 +- fs/gfs2/ops_export.c | 33 +- fs/gfs2/ops_inode.c | 2 +- fs/hfs/inode.c | 8 - fs/hfsplus/inode.c | 13 - fs/hostfs/hostfs_kern.c | 5 +- fs/hpfs/file.c | 2 +- fs/hpfs/hpfs_fn.h | 2 +- fs/hpfs/inode.c | 29 +- fs/hpfs/namei.c | 2 +- fs/isofs/export.c | 33 +- fs/jbd/checkpoint.c | 68 +- fs/jbd/journal.c | 28 +- fs/jbd/recovery.c | 7 +- fs/jffs2/dir.c | 7 +- fs/jffs2/super.c | 48 + fs/jfs/jfs_logmgr.c | 4 +- fs/jfs/namei.c | 16 +- fs/libfs.c | 26 +- fs/locks.c | 25 +- fs/namei.c | 146 +- fs/namespace.c | 133 +- fs/nfs/dir.c | 9 +- fs/nfs/getroot.c | 14 +- fs/nfsd/export.c | 144 +- fs/nfsd/nfs4recover.c | 50 +- fs/nfsd/nfs4state.c | 8 +- fs/nfsd/nfsctl.c | 8 +- fs/nfsd/nfssvc.c | 4 + fs/nfsd/vfs.c | 132 ++- fs/ntfs/namei.c | 22 +- fs/ocfs2/cluster/heartbeat.c | 6 +- fs/ocfs2/export.c | 30 +- fs/omfs/dir.c | 1 + fs/open.c | 2 +- fs/openpromfs/inode.c | 1 + fs/partitions/check.c | 4 +- fs/proc/Makefile | 13 +- fs/proc/base.c | 4 +- fs/proc/cmdline.c | 29 + fs/proc/cpuinfo.c | 24 + fs/proc/devices.c | 70 + fs/proc/generic.c | 3 +- fs/proc/inode.c | 3 +- fs/proc/internal.h | 3 +- fs/proc/interrupts.c | 53 + fs/proc/kcore.c | 14 +- fs/proc/kmsg.c | 12 +- fs/proc/loadavg.c | 51 + fs/proc/meminfo.c | 168 ++ fs/proc/page.c | 147 ++ fs/proc/proc_devtree.c | 3 +- fs/proc/proc_misc.c | 933 ---------- fs/proc/proc_sysctl.c | 15 +- fs/proc/root.c | 8 +- fs/proc/stat.c | 153 ++ fs/proc/task_mmu.c | 25 +- fs/proc/uptime.c | 43 + fs/proc/version.c | 34 + fs/proc/vmcore.c | 6 +- fs/read_write.c | 58 +- fs/readdir.c | 22 +- fs/reiserfs/file.c | 1 + fs/reiserfs/inode.c | 13 +- fs/reiserfs/journal.c | 11 +- fs/reiserfs/namei.c | 11 +- fs/reiserfs/super.c | 18 +- fs/select.c | 396 +++-- fs/super.c | 29 +- fs/sysfs/dir.c | 1 + fs/timerfd.c | 8 +- fs/udf/namei.c | 43 +- fs/ufs/dir.c | 1 + fs/xfs/linux-2.6/xfs_export.c | 32 +- fs/xfs/linux-2.6/xfs_file.c | 128 -- fs/xfs/linux-2.6/xfs_ioctl.c | 7 +- fs/xfs/linux-2.6/xfs_super.c | 4 +- include/acpi/acconfig.h | 2 +- include/acpi/acdebug.h | 8 + include/acpi/acdisasm.h | 4 + include/acpi/acdispat.h | 6 +- include/acpi/acexcep.h | 128 +- include/acpi/aclocal.h | 77 + include/acpi/acmacros.h | 253 ++-- include/acpi/acnamesp.h | 16 + include/acpi/acobject.h | 37 +- include/acpi/acoutput.h | 32 +- include/acpi/acpi_bus.h | 11 +- include/acpi/acpi_drivers.h | 11 +- include/acpi/acpiosxf.h | 3 + include/acpi/acpredef.h | 371 ++++ include/acpi/actbl1.h | 51 +- include/acpi/actypes.h | 37 +- include/acpi/acutils.h | 4 +- include/acpi/platform/aclinux.h | 6 + include/asm-generic/mutex-dec.h | 26 +- include/asm-generic/mutex-xchg.h | 9 +- include/asm-m68k/machdep.h | 2 +- include/asm-um/a.out.h | 11 - include/asm-um/alternative-asm.h | 6 - include/asm-um/alternative.h | 6 - include/asm-um/asm.h | 6 - include/asm-um/atomic.h | 11 - include/asm-um/bitops.h | 10 - include/asm-um/boot.h | 6 - include/asm-um/bug.h | 6 - include/asm-um/byteorder.h | 6 - include/asm-um/cacheflush.h | 6 - include/asm-um/calling.h | 9 - include/asm-um/cmpxchg.h | 6 - include/asm-um/cobalt.h | 6 - include/asm-um/cpufeature.h | 6 - include/asm-um/div64.h | 6 - include/asm-um/dwarf2.h | 11 - include/asm-um/errno.h | 6 - include/asm-um/fcntl.h | 6 - include/asm-um/floppy.h | 6 - include/asm-um/frame.h | 6 - include/asm-um/highmem.h | 12 - include/asm-um/ide.h | 6 - include/asm-um/ioctl.h | 6 - include/asm-um/ioctls.h | 6 - include/asm-um/ipcbuf.h | 6 - include/asm-um/linkage.h | 6 - include/asm-um/local.h | 6 - include/asm-um/locks.h | 6 - include/asm-um/mca_dma.h | 6 - include/asm-um/mman.h | 6 - include/asm-um/module-generic.h | 6 - include/asm-um/msgbuf.h | 6 - include/asm-um/mtrr.h | 6 - include/asm-um/nops.h | 6 - include/asm-um/paravirt.h | 6 - include/asm-um/percpu.h | 6 - include/asm-um/poll.h | 6 - include/asm-um/posix_types.h | 6 - include/asm-um/prctl.h | 6 - include/asm-um/resource.h | 6 - include/asm-um/rwlock.h | 6 - include/asm-um/rwsem.h | 6 - include/asm-um/scatterlist.h | 6 - include/asm-um/sembuf.h | 6 - include/asm-um/serial.h | 6 - include/asm-um/shmbuf.h | 6 - include/asm-um/shmparam.h | 6 - include/asm-um/sigcontext-generic.h | 6 - include/asm-um/sigcontext-i386.h | 6 - include/asm-um/sigcontext-ppc.h | 10 - include/asm-um/sigcontext-x86_64.h | 22 - include/asm-um/siginfo.h | 6 - include/asm-um/signal.h | 29 - include/asm-um/socket.h | 6 - include/asm-um/sockios.h | 6 - include/asm-um/spinlock.h | 6 - include/asm-um/spinlock_types.h | 6 - include/asm-um/stat.h | 6 - include/asm-um/statfs.h | 6 - include/asm-um/string.h | 7 - include/asm-um/system-i386.h | 6 - include/asm-um/system-ppc.h | 12 - include/asm-um/system-x86_64.h | 23 - include/asm-um/termbits.h | 6 - include/asm-um/termios.h | 6 - include/asm-um/types.h | 6 - include/asm-um/ucontext.h | 6 - include/asm-um/unaligned.h | 6 - include/asm-um/unistd.h | 41 - include/asm-um/user.h | 6 - include/asm-um/vga.h | 6 - include/asm-um/vm86.h | 6 - include/asm-x86/irq_remapping.h | 8 - include/asm-x86/mach-default/mach_mpspec.h | 12 - include/asm-x86/reboot_fixups.h | 6 - include/asm-x86/shmparam.h | 6 - include/asm-x86/therm_throt.h | 9 - include/asm-x86/xen/grant_table.h | 7 - include/asm-xtensa/io.h | 8 +- include/asm-xtensa/rwsem.h | 4 + include/asm-xtensa/variant-dc232b/core.h | 424 +++++ include/asm-xtensa/variant-dc232b/tie-asm.h | 122 ++ include/asm-xtensa/variant-dc232b/tie.h | 131 ++ include/linux/acpi.h | 8 - include/linux/bitmap.h | 1 + include/linux/blkdev.h | 27 +- include/linux/cdrom.h | 10 +- include/linux/crash_dump.h | 2 - include/linux/dcache.h | 3 +- include/linux/device-mapper.h | 14 +- include/linux/device.h | 2 +- include/linux/dm-region-hash.h | 104 ++ include/linux/dma_remapping.h | 27 +- include/linux/file.h | 4 +- include/linux/fs.h | 58 +- include/linux/fsnotify.h | 2 +- include/linux/genhd.h | 3 - include/linux/hrtimer.h | 105 +- include/linux/hugetlb.h | 6 +- include/linux/i2c-algo-pcf.h | 5 +- include/linux/i2c.h | 163 +- include/linux/i2c/twl4030.h | 28 +- include/linux/ide.h | 7 +- include/linux/init_task.h | 1 + include/linux/intel-iommu.h | 66 +- include/linux/irqnr.h | 6 +- include/linux/jbd.h | 2 +- include/linux/kernel.h | 24 + include/linux/libata.h | 3 + include/linux/mlx4/cmd.h | 9 + include/linux/mlx4/device.h | 54 +- include/linux/module.h | 6 +- include/linux/moduleparam.h | 25 +- include/linux/namei.h | 8 +- include/linux/oprofile.h | 16 +- include/linux/page_cgroup.h | 5 + include/linux/pci.h | 13 +- include/linux/pci_hotplug.h | 11 +- include/linux/pci_ids.h | 9 + include/linux/pci_regs.h | 2 + include/linux/pnp.h | 10 - include/linux/poll.h | 8 +- include/linux/prctl.h | 7 + include/linux/proc_fs.h | 5 - include/linux/profile.h | 7 +- include/linux/reiserfs_fs_sb.h | 1 + include/linux/sched.h | 12 +- include/linux/slab.h | 5 - include/linux/thread_info.h | 8 + include/linux/time.h | 4 + include/linux/types.h | 1 + include/linux/usb/wusb-wa.h | 271 +++ include/linux/usb/wusb.h | 376 ++++ include/linux/uwb.h | 765 ++++++++ include/linux/uwb/debug-cmd.h | 57 + include/linux/uwb/debug.h | 82 + include/linux/uwb/spec.h | 727 ++++++++ include/linux/uwb/umc.h | 194 ++ include/linux/uwb/whci.h | 117 ++ include/linux/videodev2.h | 7 + include/linux/vmalloc.h | 2 - include/linux/vmstat.h | 4 - include/linux/wlp.h | 735 ++++++++ include/linux/workqueue.h | 18 +- include/media/v4l2-int-device.h | 28 +- include/media/v4l2-ioctl.h | 24 +- include/media/videobuf-dvb.h | 1 + include/net/9p/9p.h | 2 +- include/net/9p/client.h | 2 + include/scsi/scsi_ioctl.h | 2 +- init/Kconfig | 3 +- init/main.c | 15 +- ipc/shm.c | 2 +- kernel/audit_tree.c | 48 +- kernel/exec_domain.c | 33 +- kernel/fork.c | 2 + kernel/futex.c | 11 +- kernel/hrtimer.c | 206 ++- kernel/irq/chip.c | 3 +- kernel/module.c | 343 ++-- kernel/panic.c | 17 +- kernel/params.c | 276 ++-- kernel/posix-timers.c | 10 +- kernel/power/disk.c | 2 +- kernel/power/power.h | 2 +- kernel/power/swap.c | 14 +- kernel/rcupdate.c | 19 +- kernel/rtmutex.c | 3 +- kernel/sched.c | 59 +- kernel/sched_fair.c | 62 +- kernel/sched_features.h | 2 +- kernel/sched_stats.h | 11 +- kernel/stop_machine.c | 120 +- kernel/sys.c | 10 + kernel/sysctl.c | 10 + kernel/time.c | 18 + kernel/time/ntp.c | 3 +- kernel/time/tick-sched.c | 35 +- kernel/time/timer_list.c | 8 +- kernel/workqueue.c | 7 +- lib/bitmap.c | 22 + lib/string_helpers.c | 34 +- mm/hugetlb.c | 5 +- mm/memcontrol.c | 1 - mm/page_cgroup.c | 33 +- mm/slab.c | 52 +- mm/slub.c | 29 +- mm/vmalloc.c | 33 +- mm/vmstat.c | 69 +- net/9p/Kconfig | 6 + net/9p/Makefile | 4 + net/9p/client.c | 1 + net/9p/protocol.c | 33 +- net/9p/trans_fd.c | 4 +- net/9p/trans_rdma.c | 712 +++++++ net/sched/sch_cbq.c | 7 +- net/unix/af_unix.c | 18 +- scripts/checksyscalls.sh | 2 +- scripts/kconfig/Makefile | 4 + sound/aoa/soundbus/i2sbus/i2sbus-core.c | 6 +- sound/arm/pxa2xx-pcm-lib.c | 2 +- sound/core/oss/pcm_oss.c | 2 +- sound/drivers/pcsp/pcsp_lib.c | 5 +- sound/oss/au1550_ac97.c | 2 +- sound/oss/dmasound/dmasound.h | 4 +- sound/oss/dmasound/dmasound_atari.c | 4 +- sound/oss/dmasound/dmasound_core.c | 10 +- sound/oss/msnd.h | 2 +- sound/oss/sound_config.h | 20 +- sound/oss/swarm_cs4297a.c | 2 +- sound/oss/vwsnd.c | 2 +- sound/pci/hda/patch_realtek.c | 22 +- sound/pci/hda/patch_sigmatel.c | 2 +- sound/soc/codecs/tlv320aic3x.c | 16 +- sound/soc/omap/omap-mcbsp.c | 7 +- 1855 files changed, 90688 insertions(+), 24170 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-umc create mode 100644 Documentation/ABI/testing/sysfs-class-usb_host create mode 100644 Documentation/ABI/testing/sysfs-class-uwb_rc create mode 100644 Documentation/ABI/testing/sysfs-wusb_cbaf delete mode 100644 Documentation/i2c/porting-clients create mode 100644 Documentation/ia64/xen.txt create mode 100644 Documentation/usb/WUSB-Design-overview.txt create mode 100644 Documentation/usb/wusb-cbaf create mode 100644 arch/avr32/boards/atngw100/Kconfig create mode 100644 arch/avr32/boards/atngw100/evklcd10x.c create mode 100644 arch/avr32/boards/favr-32/Kconfig create mode 100644 arch/avr32/boards/favr-32/Makefile create mode 100644 arch/avr32/boards/favr-32/flash.c create mode 100644 arch/avr32/boards/favr-32/setup.c create mode 100644 arch/avr32/boards/mimc200/Makefile create mode 100644 arch/avr32/boards/mimc200/flash.c create mode 100644 arch/avr32/boards/mimc200/fram.c create mode 100644 arch/avr32/boards/mimc200/setup.c create mode 100644 arch/avr32/configs/atngw100_evklcd100_defconfig create mode 100644 arch/avr32/configs/atngw100_evklcd101_defconfig create mode 100644 arch/avr32/configs/favr-32_defconfig create mode 100644 arch/avr32/configs/mimc200_defconfig create mode 100644 arch/ia64/dig/dig_vtd_iommu.c create mode 100644 arch/ia64/dig/machvec_vtd.c create mode 100644 arch/ia64/include/asm/iommu.h create mode 100644 arch/ia64/include/asm/machvec_dig_vtd.h create mode 100644 arch/ia64/include/asm/machvec_xen.h create mode 100644 arch/ia64/include/asm/native/pvchk_inst.h copy {include/asm-x86 => arch/ia64/include/asm}/pvclock-abi.h (81%) copy {include/asm-x86 => arch/ia64/include/asm}/swiotlb.h (91%) create mode 100644 arch/ia64/include/asm/sync_bitops.h create mode 100644 arch/ia64/include/asm/syscall.h create mode 100644 arch/ia64/include/asm/xen/events.h create mode 100644 arch/ia64/include/asm/xen/grant_table.h create mode 100644 arch/ia64/include/asm/xen/hypercall.h copy {include/asm-x86 => arch/ia64/include/asm}/xen/hypervisor.h (63%) create mode 100644 arch/ia64/include/asm/xen/inst.h create mode 100644 arch/ia64/include/asm/xen/interface.h create mode 100644 arch/ia64/include/asm/xen/irq.h create mode 100644 arch/ia64/include/asm/xen/minstate.h create mode 100644 arch/ia64/include/asm/xen/page.h create mode 100644 arch/ia64/include/asm/xen/privop.h create mode 100644 arch/ia64/include/asm/xen/xcom_hcall.h create mode 100644 arch/ia64/include/asm/xen/xencomm.h create mode 100644 arch/ia64/kernel/pci-dma.c create mode 100644 arch/ia64/kernel/pci-swiotlb.c create mode 100644 arch/ia64/scripts/pvcheck.sed create mode 100644 arch/ia64/xen/Kconfig create mode 100644 arch/ia64/xen/Makefile create mode 100644 arch/ia64/xen/grant-table.c create mode 100644 arch/ia64/xen/hypercall.S create mode 100644 arch/ia64/xen/hypervisor.c create mode 100644 arch/ia64/xen/irq_xen.c create mode 100644 arch/ia64/xen/irq_xen.h create mode 100644 arch/ia64/xen/machvec.c create mode 100644 arch/ia64/xen/suspend.c create mode 100644 arch/ia64/xen/time.c create mode 100644 arch/ia64/xen/time.h create mode 100644 arch/ia64/xen/xcom_hcall.c create mode 100644 arch/ia64/xen/xen_pv_ops.c create mode 100644 arch/ia64/xen/xencomm.c create mode 100644 arch/ia64/xen/xenivt.S create mode 100644 arch/ia64/xen/xensetup.S create mode 100644 arch/powerpc/boot/cuboot-acadia.c create mode 100644 arch/powerpc/boot/dts/acadia.dts create mode 100644 arch/powerpc/boot/dts/hcu4.dts create mode 100644 arch/powerpc/configs/40x/acadia_defconfig create mode 100644 arch/powerpc/configs/40x/hcu4_defconfig create mode 100644 arch/powerpc/platforms/40x/hcu4.c create mode 100644 arch/powerpc/platforms/40x/ppc40x_simple.c create mode 100644 arch/powerpc/sysdev/ppc4xx_gpio.c create mode 100644 arch/sh/boards/mach-highlander/pinmux-r7785rp.c create mode 100644 arch/sh/include/cpu-sh4/cpu/sh7785.h create mode 100644 arch/sh/kernel/cpu/sh4a/pinmux-sh7785.c create mode 100644 arch/um/Kconfig.common create mode 100644 arch/um/Kconfig.rest rename arch/um/{Kconfig => Kconfig.um} (77%) rename arch/um/{Kconfig.i386 => Kconfig.x86} (59%) delete mode 100644 arch/um/Kconfig.x86_64 rename {include/asm-um => arch/um/include/asm}/a.out-core.h (100%) rename {include/asm-um => arch/um/include/asm}/apic.h (100%) rename {include/asm-um => arch/um/include/asm}/auxvec.h (100%) rename {include/asm-um => arch/um/include/asm}/bugs.h (100%) rename {include/asm-um => arch/um/include/asm}/cache.h (100%) rename {include/asm-um => arch/um/include/asm}/checksum.h (100%) rename {include/asm-um => arch/um/include/asm}/common.lds.S (100%) rename {include/asm-um => arch/um/include/asm}/cputime.h (100%) rename {include/asm-um => arch/um/include/asm}/current.h (100%) rename {include/asm-um => arch/um/include/asm}/delay.h (100%) rename {include/asm-um => arch/um/include/asm}/desc.h (100%) rename {include/asm-um => arch/um/include/asm}/device.h (100%) rename {include/asm-um => arch/um/include/asm}/dma-mapping.h (100%) rename {include/asm-um => arch/um/include/asm}/dma.h (100%) rename {include/asm-um => arch/um/include/asm}/emergency-restart.h (100%) rename {include/asm-um => arch/um/include/asm}/fixmap.h (99%) rename {include/asm-um => arch/um/include/asm}/futex.h (100%) rename {include/asm-um => arch/um/include/asm}/hardirq.h (100%) rename {include/asm-um => arch/um/include/asm}/hw_irq.h (100%) rename {include/asm-um => arch/um/include/asm}/io.h (100%) rename {include/asm-um => arch/um/include/asm}/irq.h (100%) rename {include/asm-um => arch/um/include/asm}/irq_regs.h (100%) rename {include/asm-um => arch/um/include/asm}/irq_vectors.h (100%) rename {include/asm-um => arch/um/include/asm}/irqflags.h (100%) rename {include/asm-um => arch/um/include/asm}/kdebug.h (100%) rename {include/asm-um => arch/um/include/asm}/kmap_types.h (100%) rename {include/asm-um => arch/um/include/asm}/mmu.h (100%) rename {include/asm-um => arch/um/include/asm}/mmu_context.h (100%) rename {include/asm-um => arch/um/include/asm}/mutex.h (100%) rename {include/asm-um => arch/um/include/asm}/page.h (99%) rename {include/asm-um => arch/um/include/asm}/page_offset.h (100%) rename {include/asm-um => arch/um/include/asm}/param.h (100%) rename {include/asm-um => arch/um/include/asm}/pci.h (100%) rename {include/asm-um => arch/um/include/asm}/pda.h (100%) rename {include/asm-um => arch/um/include/asm}/pgalloc.h (100%) rename {include/asm-um => arch/um/include/asm}/pgtable-2level.h (100%) rename {include/asm-um => arch/um/include/asm}/pgtable-3level.h (100%) rename {include/asm-um => arch/um/include/asm}/pgtable.h (97%) rename {include/asm-um => arch/um/include/asm}/processor-generic.h (100%) rename {include/asm-um => arch/um/include/asm}/ptrace-generic.h (97%) rename {include/asm-um => arch/um/include/asm}/required-features.h (100%) rename {include/asm-um => arch/um/include/asm}/sections.h (100%) rename {include/asm-um => arch/um/include/asm}/segment.h (100%) rename {include/asm-um => arch/um/include/asm}/setup.h (100%) rename {include/asm-um => arch/um/include/asm}/smp.h (100%) rename {include/asm-um => arch/um/include/asm}/suspend.h (100%) rename include/asm-um/system-generic.h => arch/um/include/asm/system.h (79%) rename {include/asm-um => arch/um/include/asm}/thread_info.h (100%) rename {include/asm-um => arch/um/include/asm}/timex.h (100%) rename {include/asm-um => arch/um/include/asm}/tlb.h (100%) rename {include/asm-um => arch/um/include/asm}/tlbflush.h (100%) rename {include/asm-um => arch/um/include/asm}/topology.h (100%) rename {include/asm-um => arch/um/include/asm}/uaccess.h (100%) rename {include/asm-um => arch/um/include/asm}/xor.h (100%) rename arch/um/include/{ => shared}/aio.h (100%) rename arch/um/include/{ => shared}/arch.h (100%) rename arch/um/include/{ => shared}/as-layout.h (98%) rename arch/um/include/{ => shared}/chan_kern.h (100%) rename arch/um/include/{ => shared}/chan_user.h (100%) rename arch/um/include/{ => shared}/common-offsets.h (80%) rename arch/um/include/{ => shared}/elf_user.h (100%) rename arch/um/include/{ => shared}/frame_kern.h (100%) rename arch/um/include/{ => shared}/init.h (100%) rename arch/um/include/{ => shared}/initrd.h (100%) rename arch/um/include/{ => shared}/irq_kern.h (100%) rename arch/um/include/{ => shared}/irq_user.h (100%) rename arch/um/include/{ => shared}/kern.h (100%) rename arch/um/include/{ => shared}/kern_util.h (100%) rename {include/asm-um => arch/um/include/shared}/ldt.h (95%) rename arch/um/include/{ => shared}/line.h (100%) rename arch/um/include/{ => shared}/longjmp.h (100%) rename arch/um/include/{ => shared}/mconsole.h (100%) rename arch/um/include/{ => shared}/mconsole_kern.h (100%) rename arch/um/include/{ => shared}/mem.h (100%) rename arch/um/include/{ => shared}/mem_kern.h (100%) rename arch/um/include/{ => shared}/mem_user.h (100%) rename arch/um/include/{ => shared}/net_kern.h (100%) rename arch/um/include/{ => shared}/net_user.h (100%) rename arch/um/include/{ => shared}/os.h (99%) rename arch/um/include/{ => shared}/process.h (100%) rename arch/um/include/{ => shared}/ptrace_user.h (100%) rename arch/um/include/{ => shared}/registers.h (100%) rename arch/um/include/{ => shared}/sigio.h (100%) rename arch/um/include/{ => shared}/skas/mm_id.h (100%) rename arch/um/include/{ => shared}/skas/proc_mm.h (100%) rename arch/um/include/{ => shared}/skas/skas.h (100%) rename arch/um/include/{ => shared}/skas/stub-data.h (100%) rename arch/um/include/{ => shared}/skas_ptrace.h (100%) rename arch/um/include/{ => shared}/skas_ptregs.h (100%) rename arch/um/include/{ => shared}/syscall.h (100%) rename arch/um/include/{ => shared}/sysrq.h (100%) rename arch/um/include/{ => shared}/task.h (100%) rename arch/um/include/{ => shared}/tlb.h (100%) rename arch/um/include/{ => shared}/ubd_user.h (100%) rename arch/um/include/{ => shared}/um_malloc.h (100%) rename arch/um/include/{ => shared}/um_mmu.h (91%) rename arch/um/include/{ => shared}/um_uaccess.h (100%) rename arch/um/include/{ => shared}/user.h (97%) delete mode 100644 arch/um/include/sigcontext.h create mode 100644 arch/um/kernel/internal.h delete mode 100644 arch/um/os-Linux/include/file.h rename include/asm-um/archparam-i386.h => arch/um/sys-i386/asm/archparam.h (77%) rename include/asm-um/elf-i386.h => arch/um/sys-i386/asm/elf.h (100%) rename include/asm-um/module-i386.h => arch/um/sys-i386/asm/module.h (100%) rename include/asm-um/processor-i386.h => arch/um/sys-i386/asm/processor.h (97%) rename include/asm-um/ptrace-i386.h => arch/um/sys-i386/asm/ptrace.h (93%) rename arch/um/{include/sysdep-i386 => sys-i386/shared/sysdep}/archsetjmp.h (100%) rename arch/um/{include/sysdep-i386 => sys-i386/shared/sysdep}/barrier.h (100%) rename arch/um/{include/sysdep-i386 => sys-i386/shared/sysdep}/checksum.h (100%) rename arch/um/{include/sysdep-i386 => sys-i386/shared/sysdep}/faultinfo.h (100%) rename include/asm-um/host_ldt-i386.h => arch/um/sys-i386/shared/sysdep/host_ldt.h (97%) rename arch/um/{include/sysdep-i386 => sys-i386/shared/sysdep}/kernel-offsets.h (100%) rename arch/um/{include/sysdep-i386 => sys-i386/shared/sysdep}/ptrace.h (99%) rename arch/um/{include/sysdep-i386 => sys-i386/shared/sysdep}/ptrace_user.h (100%) rename arch/um/{include/sysdep-i386 => sys-i386/shared/sysdep}/sc.h (100%) rename arch/um/{include/sysdep-i386 => sys-i386/shared/sysdep}/sigcontext.h (100%) rename arch/um/{include/sysdep-i386 => sys-i386/shared/sysdep}/skas_ptrace.h (100%) rename arch/um/{include/sysdep-i386 => sys-i386/shared/sysdep}/stub.h (98%) rename arch/um/{include/sysdep-i386 => sys-i386/shared/sysdep}/syscalls.h (100%) create mode 100644 arch/um/sys-i386/shared/sysdep/system.h rename arch/um/{include/sysdep-i386 => sys-i386/shared/sysdep}/tls.h (97%) rename include/asm-um/vm-flags-i386.h => arch/um/sys-i386/shared/sysdep/vm-flags.h (100%) rename arch/um/{include/sysdep-ia64 => sys-ia64/sysdep}/ptrace.h (100%) rename arch/um/{include/sysdep-ia64 => sys-ia64/sysdep}/sigcontext.h (100%) rename arch/um/{include/sysdep-ia64 => sys-ia64/sysdep}/skas_ptrace.h (100%) rename arch/um/{include/sysdep-ia64 => sys-ia64/sysdep}/syscalls.h (100%) rename include/asm-um/archparam-ppc.h => arch/um/sys-ppc/asm/archparam.h (100%) rename include/asm-um/elf-ppc.h => arch/um/sys-ppc/asm/elf.h (100%) rename include/asm-um/processor-ppc.h => arch/um/sys-ppc/asm/processor.h (100%) rename arch/um/{include/sysdep-ppc => sys-ppc/shared/sysdep}/ptrace.h (100%) rename arch/um/{include/sysdep-ppc => sys-ppc/shared/sysdep}/sigcontext.h (100%) rename arch/um/{include/sysdep-ppc => sys-ppc/shared/sysdep}/skas_ptrace.h (100%) rename arch/um/{include/sysdep-ppc => sys-ppc/shared/sysdep}/syscalls.h (100%) rename include/asm-um/archparam-x86_64.h => arch/um/sys-x86_64/asm/archparam.h (100%) rename include/asm-um/elf-x86_64.h => arch/um/sys-x86_64/asm/elf.h (100%) rename include/asm-um/module-x86_64.h => arch/um/sys-x86_64/asm/module.h (100%) rename include/asm-um/processor-x86_64.h => arch/um/sys-x86_64/asm/processor.h (97%) rename include/asm-um/ptrace-x86_64.h => arch/um/sys-x86_64/asm/ptrace.h (85%) rename arch/um/{include/sysdep-x86_64 => sys-x86_64/shared/sysdep}/archsetjmp.h (100%) rename arch/um/{include/sysdep-x86_64 => sys-x86_64/shared/sysdep}/barrier.h (100%) rename arch/um/{include/sysdep-x86_64 => sys-x86_64/shared/sysdep}/checksum.h (100%) rename arch/um/{include/sysdep-x86_64 => sys-x86_64/shared/sysdep}/faultinfo.h (100%) rename include/asm-um/host_ldt-x86_64.h => arch/um/sys-x86_64/shared/sysdep/host_ldt.h (97%) rename arch/um/{include/sysdep-x86_64 => sys-x86_64/shared/sysdep}/kernel-offsets.h (100%) rename arch/um/{include/sysdep-x86_64 => sys-x86_64/shared/sysdep}/ptrace.h (99%) rename arch/um/{include/sysdep-x86_64 => sys-x86_64/shared/sysdep}/ptrace_user.h (100%) rename arch/um/{include/sysdep-x86_64 => sys-x86_64/shared/sysdep}/sc.h (100%) rename arch/um/{include/sysdep-x86_64 => sys-x86_64/shared/sysdep}/sigcontext.h (100%) rename arch/um/{include/sysdep-x86_64 => sys-x86_64/shared/sysdep}/skas_ptrace.h (100%) rename arch/um/{include/sysdep-x86_64 => sys-x86_64/shared/sysdep}/stub.h (98%) rename arch/um/{include/sysdep-x86_64 => sys-x86_64/shared/sysdep}/syscalls.h (100%) create mode 100644 arch/um/sys-x86_64/shared/sysdep/system.h rename arch/um/{include/sysdep-x86_64 => sys-x86_64/shared/sysdep}/tls.h (96%) rename include/asm-um/vm-flags-x86_64.h => arch/um/sys-x86_64/shared/sysdep/vm-flags.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/Kbuild (100%) rename {include/asm-x86 => arch/x86/include/asm}/a.out-core.h (95%) rename {include/asm-x86 => arch/x86/include/asm}/a.out.h (88%) rename {include/asm-x86 => arch/x86/include/asm}/acpi.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/agp.h (93%) rename {include/asm-x86 => arch/x86/include/asm}/alternative-asm.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/alternative.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/amd_iommu.h (92%) rename {include/asm-x86 => arch/x86/include/asm}/amd_iommu_types.h (99%) rename {include/asm-x86 => arch/x86/include/asm}/apic.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/apicdef.h (99%) rename {include/asm-x86 => arch/x86/include/asm}/arch_hooks.h (86%) rename {include/asm-x86 => arch/x86/include/asm}/asm.h (93%) rename {include/asm-x86 => arch/x86/include/asm}/atomic.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/atomic_32.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/atomic_64.h (99%) rename {include/asm-x86 => arch/x86/include/asm}/auxvec.h (70%) rename {include/asm-x86 => arch/x86/include/asm}/bigsmp/apic.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/bigsmp/apicdef.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/bigsmp/ipi.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/bios_ebda.h (88%) rename {include/asm-x86 => arch/x86/include/asm}/bitops.h (99%) rename {include/asm-x86 => arch/x86/include/asm}/boot.h (89%) rename {include/asm-x86 => arch/x86/include/asm}/bootparam.h (96%) rename {include/asm-x86 => arch/x86/include/asm}/bug.h (90%) rename {include/asm-x86 => arch/x86/include/asm}/bugs.h (71%) rename {include/asm-x86 => arch/x86/include/asm}/byteorder.h (94%) rename {include/asm-x86 => arch/x86/include/asm}/cache.h (85%) rename {include/asm-x86 => arch/x86/include/asm}/cacheflush.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/calgary.h (96%) rename {include/asm-x86 => arch/x86/include/asm}/calling.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/checksum.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/checksum_32.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/checksum_64.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/cmpxchg.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/cmpxchg_32.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/cmpxchg_64.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/compat.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/cpu.h (80%) rename {include/asm-x86 => arch/x86/include/asm}/cpufeature.h (99%) rename {include/asm-x86 => arch/x86/include/asm}/cputime.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/current.h (87%) rename {include/asm-x86 => arch/x86/include/asm}/debugreg.h (96%) rename {include/asm-x86 => arch/x86/include/asm}/delay.h (90%) rename {include/asm-x86 => arch/x86/include/asm}/desc.h (99%) rename {include/asm-x86 => arch/x86/include/asm}/desc_defs.h (96%) rename {include/asm-x86 => arch/x86/include/asm}/device.h (72%) rename {include/asm-x86 => arch/x86/include/asm}/div64.h (94%) rename {include/asm-x86 => arch/x86/include/asm}/dma-mapping.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/dma.h (99%) rename {include/asm-x86 => arch/x86/include/asm}/dmi.h (88%) rename {include/asm-x86 => arch/x86/include/asm}/ds.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/dwarf2.h (95%) rename {include/asm-x86 => arch/x86/include/asm}/e820.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/edac.h (82%) rename {include/asm-x86 => arch/x86/include/asm}/efi.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/elf.h (99%) rename {include/asm-x86 => arch/x86/include/asm}/emergency-restart.h (65%) rename {include/asm-x86 => arch/x86/include/asm}/errno.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/es7000/apic.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/es7000/apicdef.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/es7000/ipi.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/es7000/mpparse.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/es7000/wakecpu.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/fb.h (85%) rename {include/asm-x86 => arch/x86/include/asm}/fcntl.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/fixmap.h (95%) rename {include/asm-x86 => arch/x86/include/asm}/fixmap_32.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/fixmap_64.h (96%) rename {include/asm-x86 => arch/x86/include/asm}/floppy.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/frame.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/ftrace.h (84%) rename {include/asm-x86 => arch/x86/include/asm}/futex.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/gart.h (95%) rename {include/asm-x86 => arch/x86/include/asm}/genapic.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/genapic_32.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/genapic_64.h (94%) rename {include/asm-x86 => arch/x86/include/asm}/geode.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/gpio.h (92%) rename {include/asm-x86 => arch/x86/include/asm}/hardirq.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/hardirq_32.h (87%) rename {include/asm-x86 => arch/x86/include/asm}/hardirq_64.h (84%) rename {include/asm-x86 => arch/x86/include/asm}/highmem.h (96%) rename {include/asm-x86 => arch/x86/include/asm}/hpet.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/hugetlb.h (95%) rename {include/asm-x86 => arch/x86/include/asm}/hw_irq.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/hypertransport.h (91%) rename {include/asm-x86 => arch/x86/include/asm}/i387.h (99%) rename {include/asm-x86 => arch/x86/include/asm}/i8253.h (77%) rename {include/asm-x86 => arch/x86/include/asm}/i8259.h (95%) rename {include/asm-x86 => arch/x86/include/asm}/ia32.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/ia32_unistd.h (81%) rename {include/asm-x86 => arch/x86/include/asm}/idle.h (59%) rename {include/asm-x86 => arch/x86/include/asm}/intel_arch_perfmon.h (87%) rename {include/asm-x86 => arch/x86/include/asm}/io.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/io_32.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/io_64.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/io_apic.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/ioctl.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/ioctls.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/iommu.h (84%) rename {include/asm-x86 => arch/x86/include/asm}/ipcbuf.h (86%) rename {include/asm-x86 => arch/x86/include/asm}/ipi.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/irq.h (93%) rename {include/asm-x86 => arch/x86/include/asm}/irq_regs.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/irq_regs_32.h (84%) rename {include/asm-x86 => arch/x86/include/asm}/irq_regs_64.h (100%) create mode 100644 arch/x86/include/asm/irq_remapping.h rename {include/asm-x86 => arch/x86/include/asm}/irq_vectors.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/irqflags.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/ist.h (91%) rename {include/asm-x86 => arch/x86/include/asm}/k8.h (81%) rename {include/asm-x86 => arch/x86/include/asm}/kdebug.h (90%) rename {include/asm-x86 => arch/x86/include/asm}/kexec.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/kgdb.h (95%) rename {include/asm-x86 => arch/x86/include/asm}/kmap_types.h (81%) rename {include/asm-x86 => arch/x86/include/asm}/kprobes.h (96%) rename {include/asm-x86 => arch/x86/include/asm}/kvm.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/kvm_host.h (99%) rename {include/asm-x86 => arch/x86/include/asm}/kvm_para.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/kvm_x86_emulate.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/ldt.h (92%) rename {include/asm-x86 => arch/x86/include/asm}/lguest.h (96%) rename {include/asm-x86 => arch/x86/include/asm}/lguest_hcall.h (95%) rename {include/asm-x86 => arch/x86/include/asm}/linkage.h (95%) rename {include/asm-x86 => arch/x86/include/asm}/local.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/mach-default/apm.h (93%) rename {include/asm-x86 => arch/x86/include/asm}/mach-default/do_timer.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/mach-default/entry_arch.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/mach-default/mach_apic.h (96%) rename {include/asm-x86 => arch/x86/include/asm}/mach-default/mach_apicdef.h (76%) rename {include/asm-x86 => arch/x86/include/asm}/mach-default/mach_ipi.h (91%) rename {include/asm-x86 => arch/x86/include/asm}/mach-default/mach_mpparse.h (62%) create mode 100644 arch/x86/include/asm/mach-default/mach_mpspec.h rename {include/asm-x86 => arch/x86/include/asm}/mach-default/mach_timer.h (91%) rename {include/asm-x86 => arch/x86/include/asm}/mach-default/mach_traps.h (80%) rename {include/asm-x86 => arch/x86/include/asm}/mach-default/mach_wakecpu.h (85%) rename {include/asm-x86 => arch/x86/include/asm}/mach-default/pci-functions.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/mach-default/setup_arch.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/mach-default/smpboot_hooks.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/mach-generic/gpio.h (76%) rename {include/asm-x86 => arch/x86/include/asm}/mach-generic/mach_apic.h (91%) rename {include/asm-x86 => arch/x86/include/asm}/mach-generic/mach_apicdef.h (50%) rename {include/asm-x86 => arch/x86/include/asm}/mach-generic/mach_ipi.h (57%) rename {include/asm-x86 => arch/x86/include/asm}/mach-generic/mach_mpparse.h (52%) rename {include/asm-x86 => arch/x86/include/asm}/mach-generic/mach_mpspec.h (67%) rename {include/asm-x86 => arch/x86/include/asm}/mach-rdc321x/gpio.h (91%) rename {include/asm-x86 => arch/x86/include/asm}/mach-rdc321x/rdc321x_defs.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/mach-voyager/do_timer.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/mach-voyager/entry_arch.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/mach-voyager/setup_arch.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/math_emu.h (86%) rename {include/asm-x86 => arch/x86/include/asm}/mc146818rtc.h (96%) rename {include/asm-x86 => arch/x86/include/asm}/mca.h (94%) rename {include/asm-x86 => arch/x86/include/asm}/mca_dma.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/mce.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/microcode.h (91%) rename {include/asm-x86 => arch/x86/include/asm}/mman.h (90%) rename {include/asm-x86 => arch/x86/include/asm}/mmconfig.h (74%) rename {include/asm-x86 => arch/x86/include/asm}/mmu.h (81%) rename {include/asm-x86 => arch/x86/include/asm}/mmu_context.h (87%) rename {include/asm-x86 => arch/x86/include/asm}/mmu_context_32.h (92%) rename {include/asm-x86 => arch/x86/include/asm}/mmu_context_64.h (92%) rename {include/asm-x86 => arch/x86/include/asm}/mmx.h (75%) rename {include/asm-x86 => arch/x86/include/asm}/mmzone.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/mmzone_32.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/mmzone_64.h (93%) rename {include/asm-x86 => arch/x86/include/asm}/module.h (96%) rename {include/asm-x86 => arch/x86/include/asm}/mpspec.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/mpspec_def.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/msgbuf.h (92%) rename {include/asm-x86 => arch/x86/include/asm}/msidef.h (95%) rename {include/asm-x86 => arch/x86/include/asm}/msr-index.h (99%) rename {include/asm-x86 => arch/x86/include/asm}/msr.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/mtrr.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/mutex.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/mutex_32.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/mutex_64.h (96%) rename {include/asm-x86 => arch/x86/include/asm}/nmi.h (96%) rename {include/asm-x86 => arch/x86/include/asm}/nops.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/numa.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/numa_32.h (62%) rename {include/asm-x86 => arch/x86/include/asm}/numa_64.h (92%) rename {include/asm-x86 => arch/x86/include/asm}/numaq.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/numaq/apic.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/numaq/apicdef.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/numaq/ipi.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/numaq/mpparse.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/numaq/wakecpu.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/olpc.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/page.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/page_32.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/page_64.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/param.h (82%) rename {include/asm-x86 => arch/x86/include/asm}/paravirt.h (99%) rename {include/asm-x86 => arch/x86/include/asm}/parport.h (70%) rename {include/asm-x86 => arch/x86/include/asm}/pat.h (86%) rename {include/asm-x86 => arch/x86/include/asm}/pci-direct.h (88%) rename {include/asm-x86 => arch/x86/include/asm}/pci.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/pci_32.h (91%) rename {include/asm-x86 => arch/x86/include/asm}/pci_64.h (95%) rename {include/asm-x86 => arch/x86/include/asm}/pda.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/percpu.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/pgalloc.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/pgtable-2level-defs.h (67%) rename {include/asm-x86 => arch/x86/include/asm}/pgtable-2level.h (94%) rename {include/asm-x86 => arch/x86/include/asm}/pgtable-3level-defs.h (78%) rename {include/asm-x86 => arch/x86/include/asm}/pgtable-3level.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/pgtable.h (99%) rename {include/asm-x86 => arch/x86/include/asm}/pgtable_32.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/pgtable_64.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/poll.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/posix_types.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/posix_types_32.h (95%) rename {include/asm-x86 => arch/x86/include/asm}/posix_types_64.h (96%) rename {include/asm-x86 => arch/x86/include/asm}/prctl.h (58%) rename {include/asm-x86 => arch/x86/include/asm}/processor-cyrix.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/processor-flags.h (96%) rename {include/asm-x86 => arch/x86/include/asm}/processor.h (99%) rename {include/asm-x86 => arch/x86/include/asm}/proto.h (88%) rename {include/asm-x86 => arch/x86/include/asm}/ptrace-abi.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/ptrace.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/pvclock-abi.h (92%) rename {include/asm-x86 => arch/x86/include/asm}/pvclock.h (82%) rename {include/asm-x86 => arch/x86/include/asm}/reboot.h (83%) create mode 100644 arch/x86/include/asm/reboot_fixups.h rename {include/asm-x86 => arch/x86/include/asm}/required-features.h (94%) rename {include/asm-x86 => arch/x86/include/asm}/resource.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/resume-trace.h (81%) rename {include/asm-x86 => arch/x86/include/asm}/rio.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/rtc.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/rwlock.h (55%) rename {include/asm-x86 => arch/x86/include/asm}/rwsem.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/scatterlist.h (87%) rename {include/asm-x86 => arch/x86/include/asm}/seccomp.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/seccomp_32.h (74%) rename {include/asm-x86 => arch/x86/include/asm}/seccomp_64.h (84%) rename {include/asm-x86 => arch/x86/include/asm}/sections.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/segment.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/sembuf.h (88%) rename {include/asm-x86 => arch/x86/include/asm}/serial.h (92%) rename {include/asm-x86 => arch/x86/include/asm}/setup.h (96%) rename {include/asm-x86 => arch/x86/include/asm}/shmbuf.h (93%) create mode 100644 arch/x86/include/asm/shmparam.h rename {include/asm-x86 => arch/x86/include/asm}/sigcontext.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/sigcontext32.h (93%) rename {include/asm-x86 => arch/x86/include/asm}/siginfo.h (56%) rename {include/asm-x86 => arch/x86/include/asm}/signal.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/smp.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/socket.h (93%) rename {include/asm-x86 => arch/x86/include/asm}/sockios.h (76%) rename {include/asm-x86 => arch/x86/include/asm}/sparsemem.h (89%) rename {include/asm-x86 => arch/x86/include/asm}/spinlock.h (99%) rename {include/asm-x86 => arch/x86/include/asm}/spinlock_types.h (74%) rename {include/asm-x86 => arch/x86/include/asm}/srat.h (93%) rename {include/asm-x86 => arch/x86/include/asm}/stacktrace.h (85%) rename {include/asm-x86 => arch/x86/include/asm}/stat.h (96%) rename {include/asm-x86 => arch/x86/include/asm}/statfs.h (76%) rename {include/asm-x86 => arch/x86/include/asm}/string.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/string_32.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/string_64.h (94%) rename {include/asm-x86 => arch/x86/include/asm}/summit/apic.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/summit/apicdef.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/summit/ipi.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/summit/mpparse.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/suspend.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/suspend_32.h (92%) rename {include/asm-x86 => arch/x86/include/asm}/suspend_64.h (92%) rename {include/asm-x86 => arch/x86/include/asm}/swiotlb.h (95%) rename {include/asm-x86 => arch/x86/include/asm}/sync_bitops.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/syscall.h (96%) rename {include/asm-x86 => arch/x86/include/asm}/syscalls.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/system.h (99%) rename {include/asm-x86 => arch/x86/include/asm}/system_64.h (77%) rename {include/asm-x86 => arch/x86/include/asm}/tce.h (95%) rename {include/asm-x86 => arch/x86/include/asm}/termbits.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/termios.h (97%) create mode 100644 arch/x86/include/asm/therm_throt.h rename {include/asm-x86 => arch/x86/include/asm}/thread_info.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/time.h (93%) rename {include/asm-x86 => arch/x86/include/asm}/timer.h (95%) rename {include/asm-x86 => arch/x86/include/asm}/timex.h (84%) rename {include/asm-x86 => arch/x86/include/asm}/tlb.h (76%) rename {include/asm-x86 => arch/x86/include/asm}/tlbflush.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/topology.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/trampoline.h (79%) rename {include/asm-x86 => arch/x86/include/asm}/traps.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/tsc.h (93%) rename {include/asm-x86 => arch/x86/include/asm}/types.h (87%) rename {include/asm-x86 => arch/x86/include/asm}/uaccess.h (99%) rename {include/asm-x86 => arch/x86/include/asm}/uaccess_32.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/uaccess_64.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/ucontext.h (81%) rename {include/asm-x86 => arch/x86/include/asm}/unaligned.h (69%) rename {include/asm-x86 => arch/x86/include/asm}/unistd.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/unistd_32.h (99%) rename {include/asm-x86 => arch/x86/include/asm}/unistd_64.h (99%) rename {include/asm-x86 => arch/x86/include/asm}/unwind.h (70%) rename {include/asm-x86 => arch/x86/include/asm}/user.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/user32.h (96%) rename {include/asm-x86 => arch/x86/include/asm}/user_32.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/user_64.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/uv/bios.h (96%) rename {include/asm-x86 => arch/x86/include/asm}/uv/uv_bau.h (99%) rename {include/asm-x86 => arch/x86/include/asm}/uv/uv_hub.h (99%) rename {include/asm-x86 => arch/x86/include/asm}/uv/uv_irq.h (90%) rename {include/asm-x86 => arch/x86/include/asm}/uv/uv_mmrs.h (99%) rename {include/asm-x86 => arch/x86/include/asm}/vdso.h (94%) rename {include/asm-x86 => arch/x86/include/asm}/vga.h (81%) rename {include/asm-x86 => arch/x86/include/asm}/vgtod.h (87%) rename {include/asm-x86 => arch/x86/include/asm}/vic.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/visws/cobalt.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/visws/lithium.h (92%) rename {include/asm-x86 => arch/x86/include/asm}/visws/piix4.h (96%) rename {include/asm-x86 => arch/x86/include/asm}/visws/sgivw.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/vm86.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/vmi.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/vmi_time.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/voyager.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/vsyscall.h (92%) rename {include/asm-x86 => arch/x86/include/asm}/xcr.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/xen/events.h (78%) create mode 100644 arch/x86/include/asm/xen/grant_table.h rename {include/asm-x86 => arch/x86/include/asm}/xen/hypercall.h (99%) rename {include/asm-x86 => arch/x86/include/asm}/xen/hypervisor.h (96%) rename {include/asm-x86 => arch/x86/include/asm}/xen/interface.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/xen/interface_32.h (95%) rename {include/asm-x86 => arch/x86/include/asm}/xen/interface_64.h (97%) rename {include/asm-x86 => arch/x86/include/asm}/xen/page.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/xor.h (100%) rename {include/asm-x86 => arch/x86/include/asm}/xor_32.h (99%) rename {include/asm-x86 => arch/x86/include/asm}/xor_64.h (98%) rename {include/asm-x86 => arch/x86/include/asm}/xsave.h (100%) delete mode 100644 drivers/acpi/bay.c create mode 100644 drivers/acpi/namespace/nspredef.c create mode 100644 drivers/gpio/twl4030-gpio.c rename drivers/ide/{pci => }/aec62xx.c (100%) rename drivers/ide/{legacy => }/ali14xx.c (100%) rename drivers/ide/{pci => }/alim15x3.c (100%) rename drivers/ide/{pci => }/amd74xx.c (100%) delete mode 100644 drivers/ide/arm/Makefile rename drivers/ide/{pci => }/atiixp.c (100%) rename drivers/ide/{mips => }/au1xxx-ide.c (100%) rename drivers/ide/{legacy => }/buddha.c (100%) rename drivers/ide/{pci => }/cmd640.c (100%) rename drivers/ide/{pci => }/cmd64x.c (100%) rename drivers/ide/{pci => }/cs5520.c (100%) rename drivers/ide/{pci => }/cs5530.c (100%) rename drivers/ide/{pci => }/cs5535.c (100%) rename drivers/ide/{pci => }/cy82c693.c (100%) rename drivers/ide/{pci => }/delkin_cb.c (100%) rename drivers/ide/{legacy => }/dtc2278.c (100%) rename drivers/ide/{legacy => }/falconide.c (100%) rename drivers/ide/{legacy => }/gayle.c (100%) rename drivers/ide/{pci => }/generic.c (100%) delete mode 100644 drivers/ide/h8300/Makefile rename drivers/ide/{pci => }/hpt366.c (100%) rename drivers/ide/{legacy => }/ht6560b.c (100%) rename drivers/ide/{arm => }/icside.c (100%) rename drivers/ide/{legacy => }/ide-4drives.c (100%) rename drivers/ide/{legacy => }/ide-cs.c (100%) rename drivers/ide/{h8300 => }/ide-h8300.c (100%) rename drivers/ide/{arm => }/ide_arm.c (100%) rename drivers/ide/{legacy => }/ide_platform.c (100%) rename drivers/ide/{pci => }/it8213.c (100%) rename drivers/ide/{pci => }/it821x.c (100%) rename drivers/ide/{pci => }/jmicron.c (100%) delete mode 100644 drivers/ide/legacy/Makefile rename drivers/ide/{legacy => }/macide.c (100%) delete mode 100644 drivers/ide/mips/Makefile rename drivers/ide/{pci => }/ns87415.c (100%) rename drivers/ide/{pci => }/opti621.c (100%) rename drivers/ide/{arm => }/palm_bk3710.c (100%) delete mode 100644 drivers/ide/pci/Makefile rename drivers/ide/{pci => }/pdc202xx_new.c (100%) rename drivers/ide/{pci => }/pdc202xx_old.c (100%) rename drivers/ide/{pci => }/piix.c (100%) rename drivers/ide/{ppc => }/pmac.c (100%) delete mode 100644 drivers/ide/ppc/Makefile rename drivers/ide/{legacy => }/q40ide.c (100%) rename drivers/ide/{legacy => }/qd65xx.c (100%) rename drivers/ide/{legacy => }/qd65xx.h (100%) rename drivers/ide/{arm => }/rapide.c (100%) rename drivers/ide/{pci => }/rz1000.c (100%) rename drivers/ide/{pci => }/sc1200.c (100%) rename drivers/ide/{pci => }/scc_pata.c (100%) rename drivers/ide/{pci => }/serverworks.c (100%) rename drivers/ide/{pci => }/sgiioc4.c (100%) rename drivers/ide/{pci => }/siimage.c (100%) rename drivers/ide/{pci => }/sis5513.c (100%) rename drivers/ide/{pci => }/sl82c105.c (100%) rename drivers/ide/{pci => }/slc90e66.c (100%) rename drivers/ide/{pci => }/tc86c001.c (100%) rename drivers/ide/{pci => }/triflex.c (100%) rename drivers/ide/{pci => }/trm290.c (100%) rename drivers/ide/{legacy => }/umc8672.c (100%) rename drivers/ide/{pci => }/via82cxxx.c (100%) create mode 100644 drivers/idle/Kconfig create mode 100644 drivers/idle/Makefile create mode 100644 drivers/idle/i7300_idle.c create mode 100644 drivers/md/dm-region-hash.c create mode 100644 drivers/mfd/twl4030-irq.c create mode 100644 drivers/misc/panasonic-laptop.c create mode 100644 drivers/net/mlx4/en_cq.c create mode 100644 drivers/net/mlx4/en_main.c create mode 100644 drivers/net/mlx4/en_netdev.c create mode 100644 drivers/net/mlx4/en_params.c create mode 100644 drivers/net/mlx4/en_port.c create mode 100644 drivers/net/mlx4/en_port.h create mode 100644 drivers/net/mlx4/en_resources.c create mode 100644 drivers/net/mlx4/en_rx.c create mode 100644 drivers/net/mlx4/en_tx.c create mode 100644 drivers/net/mlx4/mlx4_en.h create mode 100644 drivers/net/mlx4/port.c create mode 100644 drivers/net/xtsonic.c create mode 100644 drivers/rtc/rtc-twl4030.c create mode 100644 drivers/staging/echo/oslec.h create mode 100644 drivers/staging/poch/Kconfig create mode 100644 drivers/staging/poch/Makefile create mode 100644 drivers/staging/poch/README create mode 100644 drivers/staging/poch/poch.c create mode 100644 drivers/staging/poch/poch.h create mode 100644 drivers/usb/host/hwa-hc.c create mode 100644 drivers/usb/host/ohci-tmio.c create mode 100644 drivers/usb/host/whci/Kbuild create mode 100644 drivers/usb/host/whci/asl.c create mode 100644 drivers/usb/host/whci/hcd.c create mode 100644 drivers/usb/host/whci/hw.c create mode 100644 drivers/usb/host/whci/init.c create mode 100644 drivers/usb/host/whci/int.c create mode 100644 drivers/usb/host/whci/pzl.c create mode 100644 drivers/usb/host/whci/qset.c create mode 100644 drivers/usb/host/whci/whcd.h create mode 100644 drivers/usb/host/whci/whci-hc.h create mode 100644 drivers/usb/host/whci/wusb.c create mode 100644 drivers/usb/wusbcore/Kconfig create mode 100644 drivers/usb/wusbcore/Makefile create mode 100644 drivers/usb/wusbcore/cbaf.c create mode 100644 drivers/usb/wusbcore/crypto.c create mode 100644 drivers/usb/wusbcore/dev-sysfs.c create mode 100644 drivers/usb/wusbcore/devconnect.c create mode 100644 drivers/usb/wusbcore/mmc.c create mode 100644 drivers/usb/wusbcore/pal.c create mode 100644 drivers/usb/wusbcore/reservation.c create mode 100644 drivers/usb/wusbcore/rh.c create mode 100644 drivers/usb/wusbcore/security.c create mode 100644 drivers/usb/wusbcore/wa-hc.c create mode 100644 drivers/usb/wusbcore/wa-hc.h create mode 100644 drivers/usb/wusbcore/wa-nep.c create mode 100644 drivers/usb/wusbcore/wa-rpipe.c create mode 100644 drivers/usb/wusbcore/wa-xfer.c create mode 100644 drivers/usb/wusbcore/wusbhc.c create mode 100644 drivers/usb/wusbcore/wusbhc.h create mode 100644 drivers/uwb/Kconfig create mode 100644 drivers/uwb/Makefile create mode 100644 drivers/uwb/address.c create mode 100644 drivers/uwb/beacon.c create mode 100644 drivers/uwb/driver.c create mode 100644 drivers/uwb/drp-avail.c create mode 100644 drivers/uwb/drp-ie.c create mode 100644 drivers/uwb/drp.c create mode 100644 drivers/uwb/est.c create mode 100644 drivers/uwb/hwa-rc.c create mode 100644 drivers/uwb/i1480/Makefile create mode 100644 drivers/uwb/i1480/dfu/Makefile create mode 100644 drivers/uwb/i1480/dfu/dfu.c create mode 100644 drivers/uwb/i1480/dfu/i1480-dfu.h create mode 100644 drivers/uwb/i1480/dfu/mac.c create mode 100644 drivers/uwb/i1480/dfu/phy.c create mode 100644 drivers/uwb/i1480/dfu/usb.c create mode 100644 drivers/uwb/i1480/i1480-est.c create mode 100644 drivers/uwb/i1480/i1480-wlp.h create mode 100644 drivers/uwb/i1480/i1480u-wlp/Makefile create mode 100644 drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h create mode 100644 drivers/uwb/i1480/i1480u-wlp/lc.c create mode 100644 drivers/uwb/i1480/i1480u-wlp/netdev.c create mode 100644 drivers/uwb/i1480/i1480u-wlp/rx.c create mode 100644 drivers/uwb/i1480/i1480u-wlp/sysfs.c create mode 100644 drivers/uwb/i1480/i1480u-wlp/tx.c create mode 100644 drivers/uwb/ie.c create mode 100644 drivers/uwb/lc-dev.c create mode 100644 drivers/uwb/lc-rc.c create mode 100644 drivers/uwb/neh.c create mode 100644 drivers/uwb/pal.c create mode 100644 drivers/uwb/reset.c create mode 100644 drivers/uwb/rsv.c create mode 100644 drivers/uwb/scan.c create mode 100644 drivers/uwb/umc-bus.c create mode 100644 drivers/uwb/umc-dev.c create mode 100644 drivers/uwb/umc-drv.c create mode 100644 drivers/uwb/uwb-debug.c create mode 100644 drivers/uwb/uwb-internal.h create mode 100644 drivers/uwb/uwbd.c create mode 100644 drivers/uwb/whc-rc.c create mode 100644 drivers/uwb/whci.c create mode 100644 drivers/uwb/wlp/Makefile create mode 100644 drivers/uwb/wlp/driver.c create mode 100644 drivers/uwb/wlp/eda.c create mode 100644 drivers/uwb/wlp/messages.c create mode 100644 drivers/uwb/wlp/sysfs.c create mode 100644 drivers/uwb/wlp/txrx.c create mode 100644 drivers/uwb/wlp/wlp-internal.h create mode 100644 drivers/uwb/wlp/wlp-lc.c create mode 100644 drivers/uwb/wlp/wss-lc.c create mode 100644 fs/proc/cmdline.c create mode 100644 fs/proc/cpuinfo.c create mode 100644 fs/proc/devices.c create mode 100644 fs/proc/interrupts.c create mode 100644 fs/proc/loadavg.c create mode 100644 fs/proc/meminfo.c create mode 100644 fs/proc/page.c delete mode 100644 fs/proc/proc_misc.c create mode 100644 fs/proc/stat.c create mode 100644 fs/proc/uptime.c create mode 100644 fs/proc/version.c create mode 100644 include/acpi/acpredef.h delete mode 100644 include/asm-um/a.out.h delete mode 100644 include/asm-um/alternative-asm.h delete mode 100644 include/asm-um/alternative.h delete mode 100644 include/asm-um/asm.h delete mode 100644 include/asm-um/atomic.h delete mode 100644 include/asm-um/bitops.h delete mode 100644 include/asm-um/boot.h delete mode 100644 include/asm-um/bug.h delete mode 100644 include/asm-um/byteorder.h delete mode 100644 include/asm-um/cacheflush.h delete mode 100644 include/asm-um/calling.h delete mode 100644 include/asm-um/cmpxchg.h delete mode 100644 include/asm-um/cobalt.h delete mode 100644 include/asm-um/cpufeature.h delete mode 100644 include/asm-um/div64.h delete mode 100644 include/asm-um/dwarf2.h delete mode 100644 include/asm-um/errno.h delete mode 100644 include/asm-um/fcntl.h delete mode 100644 include/asm-um/floppy.h delete mode 100644 include/asm-um/frame.h delete mode 100644 include/asm-um/highmem.h delete mode 100644 include/asm-um/ide.h delete mode 100644 include/asm-um/ioctl.h delete mode 100644 include/asm-um/ioctls.h delete mode 100644 include/asm-um/ipcbuf.h delete mode 100644 include/asm-um/linkage.h delete mode 100644 include/asm-um/local.h delete mode 100644 include/asm-um/locks.h delete mode 100644 include/asm-um/mca_dma.h delete mode 100644 include/asm-um/mman.h delete mode 100644 include/asm-um/module-generic.h delete mode 100644 include/asm-um/msgbuf.h delete mode 100644 include/asm-um/mtrr.h delete mode 100644 include/asm-um/nops.h delete mode 100644 include/asm-um/paravirt.h delete mode 100644 include/asm-um/percpu.h delete mode 100644 include/asm-um/poll.h delete mode 100644 include/asm-um/posix_types.h delete mode 100644 include/asm-um/prctl.h delete mode 100644 include/asm-um/resource.h delete mode 100644 include/asm-um/rwlock.h delete mode 100644 include/asm-um/rwsem.h delete mode 100644 include/asm-um/scatterlist.h delete mode 100644 include/asm-um/sembuf.h delete mode 100644 include/asm-um/serial.h delete mode 100644 include/asm-um/shmbuf.h delete mode 100644 include/asm-um/shmparam.h delete mode 100644 include/asm-um/sigcontext-generic.h delete mode 100644 include/asm-um/sigcontext-i386.h delete mode 100644 include/asm-um/sigcontext-ppc.h delete mode 100644 include/asm-um/sigcontext-x86_64.h delete mode 100644 include/asm-um/siginfo.h delete mode 100644 include/asm-um/signal.h delete mode 100644 include/asm-um/socket.h delete mode 100644 include/asm-um/sockios.h delete mode 100644 include/asm-um/spinlock.h delete mode 100644 include/asm-um/spinlock_types.h delete mode 100644 include/asm-um/stat.h delete mode 100644 include/asm-um/statfs.h delete mode 100644 include/asm-um/string.h delete mode 100644 include/asm-um/system-i386.h delete mode 100644 include/asm-um/system-ppc.h delete mode 100644 include/asm-um/system-x86_64.h delete mode 100644 include/asm-um/termbits.h delete mode 100644 include/asm-um/termios.h delete mode 100644 include/asm-um/types.h delete mode 100644 include/asm-um/ucontext.h delete mode 100644 include/asm-um/unaligned.h delete mode 100644 include/asm-um/unistd.h delete mode 100644 include/asm-um/user.h delete mode 100644 include/asm-um/vga.h delete mode 100644 include/asm-um/vm86.h delete mode 100644 include/asm-x86/irq_remapping.h delete mode 100644 include/asm-x86/mach-default/mach_mpspec.h delete mode 100644 include/asm-x86/reboot_fixups.h delete mode 100644 include/asm-x86/shmparam.h delete mode 100644 include/asm-x86/therm_throt.h delete mode 100644 include/asm-x86/xen/grant_table.h create mode 100644 include/asm-xtensa/variant-dc232b/core.h create mode 100644 include/asm-xtensa/variant-dc232b/tie-asm.h create mode 100644 include/asm-xtensa/variant-dc232b/tie.h create mode 100644 include/linux/dm-region-hash.h create mode 100644 include/linux/usb/wusb-wa.h create mode 100644 include/linux/usb/wusb.h create mode 100644 include/linux/uwb.h create mode 100644 include/linux/uwb/debug-cmd.h create mode 100644 include/linux/uwb/debug.h create mode 100644 include/linux/uwb/spec.h create mode 100644 include/linux/uwb/umc.h create mode 100644 include/linux/uwb/whci.h create mode 100644 include/linux/wlp.h create mode 100644 net/9p/trans_rdma.c Merging powerpc-merge/merge $ git merge powerpc-merge/merge Already up-to-date. Merging scsi-rc-fixes/master $ git merge scsi-rc-fixes/master Already up-to-date. Merging net-current/master $ git merge net-current/master Auto-merged drivers/net/Kconfig Merge made by recursive. drivers/net/8139cp.c | 5 +- drivers/net/8139too.c | 5 +- drivers/net/Kconfig | 9 ++- drivers/net/ax88796.c | 6 +- drivers/net/bonding/bond_main.c | 16 +++- drivers/net/cxgb3/l2t.c | 1 + drivers/net/dm9000.c | 9 -- drivers/net/ehea/ehea.h | 2 +- drivers/net/ehea/ehea_main.c | 25 ++++--- drivers/net/ehea/ehea_qmr.c | 131 +++++++++++++++++++++++++-------- drivers/net/ehea/ehea_qmr.h | 2 + drivers/net/fec_mpc52xx.c | 18 +++++ drivers/net/gianfar.c | 24 ++++-- drivers/net/igb/igb_main.c | 60 +++++++++++----- drivers/net/myri10ge/myri10ge.c | 6 +- drivers/net/qlge/qlge.h | 5 +- drivers/net/qlge/qlge_main.c | 89 ++++++++++++----------- drivers/net/r8169.c | 38 ++++++++-- drivers/net/sis190.c | 1 + drivers/net/smc911x.c | 38 ++++----- drivers/net/smc911x.h | 6 +- drivers/net/wireless/ath5k/base.c | 27 +++++-- drivers/net/wireless/ath5k/base.h | 3 +- drivers/net/wireless/orinoco.c | 42 +++++++--- drivers/net/wireless/p54/p54common.c | 28 +++----- include/linux/netdevice.h | 12 +++- include/linux/smc911x.h | 1 + include/net/sctp/sm.h | 1 + net/bridge/br_device.c | 2 +- net/bridge/br_if.c | 14 +++- net/core/dev.c | 135 ++++++++++++++++++---------------- net/ipv4/tcp_output.c | 25 +++++-- net/sctp/input.c | 2 +- net/sctp/sm_statefuns.c | 54 ++++++++++++++ net/sctp/sm_statetable.c | 4 +- 35 files changed, 556 insertions(+), 290 deletions(-) Merging sparc-current/master $ git merge sparc-current/master Merge made by recursive. arch/sparc/kernel/apc.c | 2 +- arch/sparc/kernel/head.S | 1 + arch/sparc64/kernel/trampoline.S | 18 ++++++++++++++---- include/math-emu/op-common.h | 19 +++++++++++++++---- scripts/checkstack.pl | 4 ++++ 5 files changed, 35 insertions(+), 9 deletions(-) Merging sound-current/for-linus $ git merge sound-current/for-linus Already up-to-date. Merging arm-current/master $ git merge arm-current/master Already up-to-date. Merging pci-current/for-linus $ git merge pci-current/for-linus Already up-to-date. Merging wireless-current/master $ git merge wireless-current/master Already up-to-date. Merging kbuild-current/master $ git merge kbuild-current/master Already up-to-date. Merging quilt/driver-core.current $ git merge quilt/driver-core.current Merge made by recursive. Documentation/sysctl/kernel.txt | 24 +++++++++++++++++------- drivers/base/sys.c | 10 ++++++---- 2 files changed, 23 insertions(+), 11 deletions(-) Merging quilt/usb.current $ git merge quilt/usb.current Auto-merged drivers/usb/Kconfig Auto-merged drivers/usb/host/Kconfig Merge made by recursive. 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. Documentation/input/elantech.txt | 405 ++++++++++++++++++++ drivers/input/mouse/Kconfig | 25 ++- drivers/input/mouse/Makefile | 1 + drivers/input/mouse/elantech.c | 674 +++++++++++++++++++++++++++++++++ drivers/input/mouse/elantech.h | 124 ++++++ drivers/input/mouse/psmouse-base.c | 23 ++ drivers/input/mouse/psmouse.h | 1 + drivers/input/serio/i8042-x86ia64io.h | 8 + 8 files changed, 1259 insertions(+), 2 deletions(-) create mode 100644 Documentation/input/elantech.txt create mode 100644 drivers/input/mouse/elantech.c create mode 100644 drivers/input/mouse/elantech.h 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 Auto-merged arch/arm/Kconfig Removed arch/arm/mach-msm/common.c Merge made by recursive. arch/arm/Kconfig | 9 +- arch/arm/Makefile | 2 +- arch/arm/configs/corgi_defconfig | 1396 ++++++++++++++++---------- arch/arm/configs/msm_defconfig | 2 +- arch/arm/configs/spitz_defconfig | 1294 +++++++++++++++--------- arch/arm/include/asm/div64.h | 6 +- arch/arm/mach-at91/gpio.c | 1 + arch/arm/mach-kirkwood/Makefile | 2 +- arch/arm/mach-msm/Kconfig | 17 +- arch/arm/mach-msm/Makefile | 7 +- arch/arm/mach-msm/board-halibut.c | 38 +- arch/arm/mach-msm/clock-7x01a.c | 126 +++ arch/arm/mach-msm/clock.c | 218 ++++ arch/arm/mach-msm/clock.h | 48 + arch/arm/mach-msm/common.c | 116 --- arch/arm/mach-msm/devices.c | 267 +++++ arch/arm/mach-msm/devices.h | 36 + arch/arm/mach-msm/dma.c | 72 +- arch/arm/mach-msm/include/mach/board.h | 1 + arch/arm/mach-msm/include/mach/debug-macro.S | 8 +- arch/arm/mach-msm/include/mach/dma.h | 24 +- arch/arm/mach-msm/include/mach/msm_iomap.h | 69 +- arch/arm/mach-msm/include/mach/vreg.h | 29 + arch/arm/mach-msm/io.c | 12 +- arch/arm/mach-msm/irq.c | 10 +- arch/arm/mach-msm/proc_comm.c | 110 ++ arch/arm/mach-msm/proc_comm.h | 165 +++ arch/arm/mach-msm/timer.c | 2 +- arch/arm/mach-msm/vreg.c | 143 +++ arch/arm/mach-pxa/Kconfig | 8 + arch/arm/mach-pxa/Makefile | 1 + arch/arm/mach-pxa/corgi_lcd.c | 289 ++++++ arch/arm/mach-pxa/corgi_ssp.c | 276 +++++ arch/arm/mach-pxa/include/mach/corgi.h | 1 + arch/arm/mach-pxa/include/mach/spitz.h | 1 + arch/arm/mach-pxa/sharpsl_pm.c | 17 +- arch/arm/mm/Kconfig | 4 +- arch/arm/mm/proc-v7.S | 4 +- drivers/input/touchscreen/Kconfig | 6 +- drivers/video/backlight/Kconfig | 5 +- 40 files changed, 3594 insertions(+), 1248 deletions(-) create mode 100644 arch/arm/mach-msm/clock-7x01a.c create mode 100644 arch/arm/mach-msm/clock.c create mode 100644 arch/arm/mach-msm/clock.h delete mode 100644 arch/arm/mach-msm/common.c create mode 100644 arch/arm/mach-msm/devices.c create mode 100644 arch/arm/mach-msm/devices.h create mode 100644 arch/arm/mach-msm/include/mach/vreg.h create mode 100644 arch/arm/mach-msm/proc_comm.c create mode 100644 arch/arm/mach-msm/proc_comm.h create mode 100644 arch/arm/mach-msm/vreg.c create mode 100644 arch/arm/mach-pxa/corgi_lcd.c create mode 100644 arch/arm/mach-pxa/corgi_ssp.c Merging avr32/avr32-arch $ git merge avr32/avr32-arch Already up-to-date. Merging blackfin/for-linus $ git merge blackfin/for-linus Already up-to-date. Merging cris/for-next $ git merge cris/for-next Merge made by recursive. include/asm-cris/arch-v32/io.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Merging ia64/test $ git merge ia64/test Already up-to-date. Merging quilt/m68k $ git merge quilt/m68k Merge made by recursive. drivers/char/amiserial.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 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 Already up-to-date. Merging 4xx/next $ git merge 4xx/next Already up-to-date. Merging galak/powerpc-next $ git merge galak/powerpc-next Already up-to-date. Merging pxa/for-next $ git merge pxa/for-next Auto-merged arch/arm/mach-pxa/Kconfig Merge made by recursive. arch/arm/configs/eseries_pxa_defconfig | 2 +- arch/arm/configs/magician_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Merging s390/features $ git merge s390/features Merge made by recursive. arch/s390/include/asm/mmu.h | 3 ++- arch/s390/include/asm/mmu_context.h | 19 ++++++++++++++++--- arch/s390/include/asm/pgtable.h | 8 ++++---- arch/s390/kernel/smp.c | 24 +++++++++--------------- arch/s390/mm/pgtable.c | 16 ++++++++-------- drivers/s390/char/vmcp.c | 3 --- drivers/s390/cio/qdio_debug.c | 19 ++++++------------- drivers/s390/cio/qdio_main.c | 1 - 8 files changed, 45 insertions(+), 48 deletions(-) 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 Merge made by recursive. arch/x86/Kconfig.debug | 8 ++-- arch/x86/kernel/dumpstack_32.c | 82 ++++++++++++++++++---------------------- arch/x86/kernel/dumpstack_64.c | 35 +++++++++-------- arch/x86/mm/fault.c | 11 +++-- 4 files changed, 67 insertions(+), 69 deletions(-) Merging xtensa/master $ git merge xtensa/master Merge made by recursive. Merging quilt/driver-core $ git merge quilt/driver-core Already up-to-date. Merging quilt/usb $ git merge quilt/usb Merge made by recursive. drivers/net/usb/hso.c | 24 ++++++++++++------------ include/linux/usb.h | 4 ---- 2 files changed, 12 insertions(+), 16 deletions(-) $ git revert a90c554298c14c6b79a19726cb55989003a72ff9 Finished one revert. Created commit b36580a: Revert "USB: remove info() macro from usb.h" 1 files changed, 2 insertions(+), 0 deletions(-) $ git revert 7527fd66ca3a20bafdf81f5fc92c9e32fc0a6984 Finished one revert. Created commit 82717d9: Revert "USB: remove warn() macro from usb.h" 1 files changed, 2 insertions(+), 0 deletions(-) Merging tip-core/auto-core-next $ git merge tip-core/auto-core-next Renamed include/asm-um/system-generic.h => arch/um/include/asm/system.h Auto-merged arch/um/include/asm/system.h CONFLICT (rename/modify): Merge conflict in arch/um/include/asm/system.h Renamed include/asm-x86/percpu.h => arch/x86/include/asm/percpu.h Auto-merged arch/x86/include/asm/percpu.h Renamed include/asm-x86/uaccess.h => arch/x86/include/asm/uaccess.h Auto-merged arch/x86/include/asm/uaccess.h Renamed include/asm-x86/uaccess_32.h => arch/x86/include/asm/uaccess_32.h Auto-merged arch/x86/include/asm/uaccess_32.h Renamed include/asm-x86/uaccess_64.h => arch/x86/include/asm/uaccess_64.h Auto-merged arch/x86/include/asm/uaccess_64.h Auto-merged include/linux/kernel.h Auto-merged kernel/futex.c Auto-merged kernel/module.c Auto-merged kernel/sched.c Auto-merged mm/memory.c Recorded preimage for 'arch/um/include/asm/system.h' Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'arch/um/include/asm/system.h'. Created commit f6bcbc0: Merge commit 'tip-core/auto-core-next' $ git diff -M --stat --summary HEAD^.. 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 +- 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/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 ++ 28 files changed, 433 insertions(+), 262 deletions(-) Merging cpus4096/auto-cpus4096-next $ git merge cpus4096/auto-cpus4096-next Renamed include/asm-x86/smp.h => arch/x86/include/asm/smp.h Auto-merged arch/x86/include/asm/smp.h Auto-merged arch/x86/Kconfig Merge made by recursive. arch/x86/Kconfig | 17 +++++++++++------ arch/x86/include/asm/smp.h | 6 +++--- arch/x86/kernel/smp.c | 6 +++--- arch/x86/xen/smp.c | 6 +++--- kernel/smp.c | 12 +++++------- 5 files changed, 25 insertions(+), 22 deletions(-) Merging ftrace/auto-ftrace-next $ git merge ftrace/auto-ftrace-next Renamed include/asm-x86/ftrace.h => arch/x86/include/asm/ftrace.h Auto-merged arch/x86/include/asm/ftrace.h Auto-merged Makefile Auto-merged arch/arm/Kconfig Auto-merged arch/powerpc/Kconfig Auto-merged arch/x86/Kconfig Auto-merged arch/x86/kernel/entry_32.S Auto-merged kernel/sysctl.c Merge made by recursive. Makefile | 2 +- arch/arm/Kconfig | 4 +- arch/arm/boot/compressed/Makefile | 2 +- arch/arm/include/asm/ftrace.h | 2 +- arch/arm/kernel/armksyms.c | 2 +- arch/arm/kernel/entry-common.S | 4 +- arch/powerpc/Kconfig | 2 +- arch/powerpc/Makefile | 2 +- arch/powerpc/include/asm/ftrace.h | 2 +- arch/powerpc/kernel/Makefile | 2 +- arch/powerpc/kernel/entry_32.S | 2 +- arch/powerpc/kernel/entry_64.S | 2 +- arch/powerpc/kernel/ppc_ksyms.c | 2 +- arch/powerpc/platforms/powermac/Makefile | 2 +- arch/sparc64/Kconfig | 2 +- arch/sparc64/Kconfig.debug | 2 +- arch/sparc64/lib/mcount.S | 4 +- arch/x86/Kconfig | 2 +- arch/x86/include/asm/ftrace.h | 4 +- arch/x86/kernel/Makefile | 2 +- arch/x86/kernel/entry_32.S | 4 +- arch/x86/kernel/entry_64.S | 4 +- arch/x86/kernel/ftrace.c | 8 ++- arch/x86/kernel/i386_ksyms_32.c | 2 +- arch/x86/kernel/x8664_ksyms_64.c | 2 +- arch/x86/xen/Makefile | 2 +- include/linux/ftrace.h | 12 ++-- include/linux/marker.h | 2 - kernel/Makefile | 4 +- kernel/marker.c | 77 ++++++++++------------------- kernel/sysctl.c | 2 +- kernel/trace/Kconfig | 22 ++++----- kernel/trace/Makefile | 6 +- kernel/trace/ftrace.c | 43 +++++++++++++++++ kernel/trace/trace.c | 2 +- kernel/trace/trace.h | 2 +- kernel/trace/trace_functions.c | 2 +- kernel/trace/trace_irqsoff.c | 4 +- kernel/trace/trace_sched_wakeup.c | 4 +- kernel/trace/trace_selftest.c | 4 +- kernel/trace/trace_stack.c | 4 ++ lib/Makefile | 2 +- 42 files changed, 141 insertions(+), 121 deletions(-) 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 Already uptodate! Merge made by recursive. Merging stackprotector/auto-stackprotector-next $ git merge stackprotector/auto-stackprotector-next Renamed include/asm-x86/pda.h => arch/x86/include/asm/pda.h Auto-merged arch/x86/include/asm/pda.h CONFLICT (rename/modify): Merge conflict in arch/x86/include/asm/pda.h Renamed include/asm-x86/system.h => arch/x86/include/asm/system.h Auto-merged arch/x86/include/asm/system.h Auto-merged arch/x86/Kconfig Auto-merged arch/x86/Kconfig.debug Auto-merged arch/x86/Makefile Auto-merged arch/x86/kernel/Makefile Auto-merged arch/x86/kernel/process_64.c Auto-merged arch/x86/mm/fault.c Auto-merged include/linux/sched.h Auto-merged init/main.c Auto-merged kernel/fork.c Auto-merged kernel/panic.c Auto-merged kernel/sched.c Recorded preimage for 'arch/x86/include/asm/pda.h' Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'arch/x86/include/asm/pda.h'. Created commit 46818d8: Merge commit 'stackprotector/auto-stackprotector-next' $ git diff -M --stat --summary HEAD^.. arch/x86/Kconfig | 23 ++++++++++------------- arch/x86/Kconfig.debug | 1 + arch/x86/Makefile | 2 +- arch/x86/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 Already up-to-date. Merging pci/linux-next $ git merge pci/linux-next Already up-to-date. Merging quilt/device-mapper $ git merge quilt/device-mapper Auto-merged drivers/md/dm-linear.c Auto-merged drivers/md/dm-mpath.c Auto-merged drivers/md/dm.c Auto-merged include/linux/device-mapper.h Merge made by recursive. Merging hid/mm $ git merge hid/mm Auto-merged drivers/hid/usbhid/hid-core.c Merge made by recursive. drivers/hid/usbhid/hid-core.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) Merging quilt/i2c $ git merge quilt/i2c Merge made by recursive. Merging quilt/jdelvare-hwmon $ git merge quilt/jdelvare-hwmon Merge made by recursive. Documentation/hwmon/lm90 | 2 +- drivers/hwmon/asb100.c | 5 +- drivers/hwmon/f71882fg.c | 853 +++++++++++++++++++++++++++++++++++++++------ drivers/hwmon/hwmon-vid.c | 1 + drivers/hwmon/lm90.c | 52 +++- drivers/hwmon/w83781d.c | 5 +- drivers/hwmon/w83791d.c | 5 +- drivers/hwmon/w83792d.c | 5 +- drivers/hwmon/w83793.c | 5 +- 9 files changed, 822 insertions(+), 111 deletions(-) Merging quilt/kernel-doc $ git merge quilt/kernel-doc Auto-merged Documentation/00-INDEX Auto-merged include/linux/kernel.h Merge made by recursive. Documentation/00-INDEX | 2 -- Documentation/early-userspace/00-INDEX | 8 ++++++++ Documentation/{ => early-userspace}/initrd.txt | 6 +++--- include/linux/kernel.h | 4 ++-- scripts/kernel-doc | 6 +++--- 5 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 Documentation/early-userspace/00-INDEX rename Documentation/{ => early-userspace}/initrd.txt (99%) 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 Already up-to-date. 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 Auto-merged fs/xfs/linux-2.6/xfs_super.c Removed fs/xfs/xfs_clnt.h Auto-merged include/linux/fs.h Merge made by recursive. fs/inode.c | 208 ++- fs/xfs/Makefile | 4 +- fs/xfs/linux-2.6/xfs_aops.c | 2 +- fs/xfs/linux-2.6/xfs_iops.c | 19 +- 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_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_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 | 487 +++---- 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 | 122 +-- include/linux/fs.h | 2 + 73 files changed, 8076 insertions(+), 10108 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 Merging infiniband/for-next $ git merge infiniband/for-next Auto-merged MAINTAINERS Merge made by recursive. Merging acpi/test $ git merge acpi/test Already up-to-date. Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Already up-to-date. Merging ieee1394/for-next $ git merge ieee1394/for-next 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 | 3 +- drivers/firewire/fw-transaction.h | 2 +- 6 files changed, 60 insertions(+), 61 deletions(-) Merging ubi/linux-next $ git merge ubi/linux-next Already up-to-date. Merging kvm/master $ git merge kvm/master Renamed include/asm-x86/kvm_host.h => arch/x86/include/asm/kvm_host.h Auto-merged arch/x86/include/asm/kvm_host.h Renamed include/asm-x86/kvm_x86_emulate.h => arch/x86/include/asm/kvm_x86_emulate.h Auto-merged arch/x86/include/asm/kvm_x86_emulate.h Renamed include/asm-x86/mtrr.h => arch/x86/include/asm/mtrr.h Auto-merged arch/x86/include/asm/mtrr.h Auto-merged arch/ia64/kvm/kvm-ia64.c Auto-merged arch/x86/kvm/i8254.c Auto-merged arch/x86/kvm/lapic.c Merge made by recursive. arch/ia64/include/asm/kvm_host.h | 6 +- arch/ia64/kvm/Makefile | 8 +- arch/ia64/kvm/kvm-ia64.c | 80 ++++---- arch/ia64/kvm/kvm_fw.c | 9 +- arch/ia64/kvm/process.c | 2 +- arch/x86/include/asm/kvm_host.h | 23 ++- 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/kvm/i8254.c | 30 +++- arch/x86/kvm/i8254.h | 1 + arch/x86/kvm/irq.h | 1 + arch/x86/kvm/lapic.c | 58 +++++- arch/x86/kvm/mmu.c | 122 ++++++++++++- arch/x86/kvm/svm.c | 6 + arch/x86/kvm/vmx.c | 315 ++++++++++++++++++++++---------- arch/x86/kvm/vmx.h | 12 +- arch/x86/kvm/x86.c | 135 ++++++++++++-- arch/x86/kvm/x86_emulate.c | 10 +- include/linux/kvm.h | 17 ++- include/linux/kvm_host.h | 10 +- virt/kvm/ioapic.c | 1 + virt/kvm/irq_comm.c | 50 +++++- virt/kvm/kvm_main.c | 14 +- 26 files changed, 746 insertions(+), 233 deletions(-) Merging dlm/next $ git merge dlm/next Already up-to-date. Merging scsi/master $ git merge scsi/master Already up-to-date. Merging tests/master $ git merge tests/master Auto-merged Makefile Auto-merged drivers/misc/Makefile Auto-merged kernel/Makefile Auto-merged lib/Kconfig.debug CONFLICT (content): Merge conflict in lib/Kconfig.debug Auto-merged lib/Makefile Resolved 'lib/Kconfig.debug' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 9ddb3e0: Merge commit 'tests/master' $ git diff -M --stat --summary HEAD^.. Makefile | 1 + drivers/misc/Makefile | 1 - kernel/Makefile | 4 - lib/Kconfig.debug | 93 +-------------------- lib/Makefile | 1 - tests/Kconfig | 101 +++++++++++++++++++++++ tests/Makefile | 10 ++ {kernel => tests}/backtracetest.c | 0 {drivers/misc => tests}/lkdtm.c | 0 {lib => tests}/locking-selftest-hardirq.h | 0 {lib => tests}/locking-selftest-mutex.h | 0 {lib => tests}/locking-selftest-rlock-hardirq.h | 0 {lib => tests}/locking-selftest-rlock-softirq.h | 0 {lib => tests}/locking-selftest-rlock.h | 0 {lib => tests}/locking-selftest-rsem.h | 0 {lib => tests}/locking-selftest-softirq.h | 0 {lib => tests}/locking-selftest-spin-hardirq.h | 0 {lib => tests}/locking-selftest-spin-softirq.h | 0 {lib => tests}/locking-selftest-spin.h | 0 {lib => tests}/locking-selftest-wlock-hardirq.h | 0 {lib => tests}/locking-selftest-wlock-softirq.h | 0 {lib => tests}/locking-selftest-wlock.h | 0 {lib => tests}/locking-selftest-wsem.h | 0 {lib => tests}/locking-selftest.c | 0 {kernel => tests}/rcutorture.c | 0 {kernel => tests}/rtmutex-tester.c | 2 +- {kernel => tests}/test_kprobes.c | 0 27 files changed, 115 insertions(+), 98 deletions(-) create mode 100644 tests/Kconfig create mode 100644 tests/Makefile rename {kernel => tests}/backtracetest.c (100%) rename {drivers/misc => tests}/lkdtm.c (100%) rename {lib => tests}/locking-selftest-hardirq.h (100%) rename {lib => tests}/locking-selftest-mutex.h (100%) rename {lib => tests}/locking-selftest-rlock-hardirq.h (100%) rename {lib => tests}/locking-selftest-rlock-softirq.h (100%) rename {lib => tests}/locking-selftest-rlock.h (100%) rename {lib => tests}/locking-selftest-rsem.h (100%) rename {lib => tests}/locking-selftest-softirq.h (100%) rename {lib => tests}/locking-selftest-spin-hardirq.h (100%) rename {lib => tests}/locking-selftest-spin-softirq.h (100%) rename {lib => tests}/locking-selftest-spin.h (100%) rename {lib => tests}/locking-selftest-wlock-hardirq.h (100%) rename {lib => tests}/locking-selftest-wlock-softirq.h (100%) rename {lib => tests}/locking-selftest-wlock.h (100%) rename {lib => tests}/locking-selftest-wsem.h (100%) rename {lib => tests}/locking-selftest.c (100%) rename {kernel => tests}/rcutorture.c (100%) rename {kernel => tests}/rtmutex-tester.c (99%) rename {kernel => tests}/test_kprobes.c (100%) Merging ocfs2/linux-next $ git merge ocfs2/linux-next Merge made by recursive. fs/ocfs2/mmap.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) Merging ext4/next $ git merge ext4/next Already up-to-date. Merging async_tx/next $ git merge async_tx/next Already up-to-date. Merging udf/for_next $ git merge udf/for_next Already up-to-date. Merging net/master $ git merge net/master Already up-to-date. Merging mtd/master $ git merge mtd/master Merge made by recursive. drivers/mtd/onenand/omap2.c | 1 - fs/jffs2/nodemgmt.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletions(-) Merging wireless/master $ git merge wireless/master Already up-to-date. Merging crypto/master $ git merge crypto/master Merge made by recursive. crypto/camellia.c | 84 +++++++++------------ crypto/testmgr.c | 7 ++- drivers/crypto/hifn_795x.c | 5 ++ drivers/crypto/talitos.c | 171 ++++++++++++++++++++++++++++---------------- drivers/crypto/talitos.h | 11 +++- 5 files changed, 166 insertions(+), 112 deletions(-) Merging vfs/for-next $ git merge vfs/for-next Auto-merged arch/alpha/kernel/osf_sys.c Auto-merged drivers/md/dm-table.c Auto-merged fs/block_dev.c Auto-merged fs/char_dev.c Auto-merged fs/compat.c Auto-merged fs/dcache.c CONFLICT (content): Merge conflict in fs/dcache.c Auto-merged fs/dquot.c Auto-merged fs/ecryptfs/main.c Auto-merged fs/exportfs/expfs.c Auto-merged fs/ext2/dir.c Auto-merged fs/ext2/ext2.h Auto-merged fs/ext3/super.c Auto-merged fs/ext4/namei.c CONFLICT (content): Merge conflict in fs/ext4/namei.c Auto-merged fs/ext4/super.c Auto-merged fs/fat/inode.c CONFLICT (content): Merge conflict in fs/fat/inode.c Auto-merged fs/fuse/inode.c CONFLICT (content): Merge conflict in fs/fuse/inode.c Auto-merged fs/gfs2/ops_export.c CONFLICT (content): Merge conflict in fs/gfs2/ops_export.c Auto-merged fs/gfs2/ops_inode.c Auto-merged fs/jffs2/dir.c Auto-merged fs/jfs/namei.c Auto-merged fs/namei.c Auto-merged fs/namespace.c CONFLICT (content): Merge conflict in fs/namespace.c Auto-merged fs/nfs/dir.c Auto-merged fs/nfs/getroot.c CONFLICT (content): Merge conflict in fs/nfs/getroot.c Auto-merged fs/nfsd/export.c Auto-merged fs/nfsd/nfs4state.c Auto-merged fs/nfsd/nfsctl.c Auto-merged fs/nfsd/vfs.c Auto-merged fs/ocfs2/export.c CONFLICT (content): Merge conflict in fs/ocfs2/export.c Auto-merged fs/super.c Auto-merged fs/udf/namei.c Auto-merged fs/xfs/linux-2.6/xfs_export.c CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_export.c Auto-merged fs/xfs/linux-2.6/xfs_ioctl.c CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_ioctl.c Auto-merged include/linux/dcache.h Auto-merged include/linux/fs.h Auto-merged include/linux/namei.h CONFLICT (content): Merge conflict in include/linux/namei.h Auto-merged init/main.c Auto-merged net/unix/af_unix.c Recorded preimage for 'fs/dcache.c' Recorded preimage for 'fs/ext4/namei.c' Recorded preimage for 'fs/fat/inode.c' Recorded preimage for 'fs/fuse/inode.c' Recorded preimage for 'fs/gfs2/ops_export.c' Recorded preimage for 'fs/namespace.c' Recorded preimage for 'fs/nfs/getroot.c' Recorded preimage for 'fs/ocfs2/export.c' Recorded preimage for 'fs/xfs/linux-2.6/xfs_export.c' Recorded preimage for 'fs/xfs/linux-2.6/xfs_ioctl.c' Recorded preimage for 'include/linux/namei.h' Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'fs/dcache.c'. Recorded resolution for 'fs/ext4/namei.c'. Recorded resolution for 'fs/fat/inode.c'. Recorded resolution for 'fs/fuse/inode.c'. Recorded resolution for 'fs/gfs2/ops_export.c'. Recorded resolution for 'fs/namespace.c'. Recorded resolution for 'fs/nfs/getroot.c'. Recorded resolution for 'fs/ocfs2/export.c'. Recorded resolution for 'fs/xfs/linux-2.6/xfs_export.c'. Recorded resolution for 'fs/xfs/linux-2.6/xfs_ioctl.c'. Recorded resolution for 'include/linux/namei.h'. Created commit 7ef0a54: Merge commit 'vfs/for-next' $ git diff -M --stat --summary HEAD^.. Merging sound/for-next $ git merge sound/for-next Already uptodate! Merge made by recursive. Merging cpufreq/next $ git merge cpufreq/next Already up-to-date. Merging v9fs/for-next $ git merge v9fs/for-next Merge made by recursive. net/9p/client.c | 19 +++++++++---------- net/9p/trans_rdma.c | 4 +++- 2 files changed, 12 insertions(+), 11 deletions(-) Merging quilt/rr $ git merge quilt/rr Renamed include/asm-x86/genapic_32.h => arch/x86/include/asm/genapic_32.h Auto-merged arch/x86/include/asm/genapic_32.h Renamed include/asm-x86/genapic_64.h => arch/x86/include/asm/genapic_64.h Auto-merged arch/x86/include/asm/genapic_64.h Renamed include/asm-x86/ipi.h => arch/x86/include/asm/ipi.h Auto-merged arch/x86/include/asm/ipi.h CONFLICT (rename/modify): Merge conflict in arch/x86/include/asm/ipi.h Renamed include/asm-x86/mach-default/mach_apic.h => arch/x86/include/asm/mach-default/mach_apic.h Auto-merged arch/x86/include/asm/mach-default/mach_apic.h Renamed include/asm-x86/mach-default/mach_ipi.h => arch/x86/include/asm/mach-default/mach_ipi.h Auto-merged arch/x86/include/asm/mach-default/mach_ipi.h Auto-merged arch/ia64/kernel/acpi.c Auto-merged arch/ia64/kernel/perfmon.c Auto-merged arch/ia64/kernel/setup.c Auto-merged arch/powerpc/kernel/machine_kexec_64.c Auto-merged arch/powerpc/kernel/setup-common.c Auto-merged arch/powerpc/mm/numa.c Auto-merged arch/s390/kernel/smp.c Auto-merged arch/sh/kernel/smp.c Auto-merged arch/x86/Kconfig CONFLICT (content): Merge conflict in arch/x86/Kconfig Auto-merged arch/x86/kernel/genapic_flat_64.c Auto-merged arch/x86/kernel/genx2apic_cluster.c Auto-merged arch/x86/kernel/genx2apic_phys.c Auto-merged arch/x86/kernel/genx2apic_uv_x.c Auto-merged arch/x86/kernel/setup_percpu.c Auto-merged arch/x86/kernel/smp.c Auto-merged arch/x86/kernel/smpboot.c Auto-merged arch/x86/xen/smp.c Auto-merged drivers/pci/probe.c Auto-merged include/linux/workqueue.h Auto-merged init/Kconfig Auto-merged init/main.c Auto-merged kernel/module.c Auto-merged kernel/panic.c Auto-merged kernel/params.c CONFLICT (content): Merge conflict in kernel/params.c Auto-merged kernel/sched.c CONFLICT (content): Merge conflict in kernel/sched.c Auto-merged kernel/sched_stats.h Auto-merged kernel/smp.c CONFLICT (content): Merge conflict in kernel/smp.c Auto-merged kernel/time/timer_list.c Auto-merged kernel/trace/trace.c Auto-merged kernel/workqueue.c Auto-merged lib/Kconfig.debug Auto-merged mm/slub.c Auto-merged mm/vmstat.c Recorded preimage for 'arch/x86/Kconfig' Recorded preimage for 'arch/x86/include/asm/ipi.h' Recorded preimage for 'kernel/params.c' Resolved 'kernel/sched.c' using previous resolution. Resolved 'kernel/smp.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'arch/x86/Kconfig'. Recorded resolution for 'arch/x86/include/asm/ipi.h'. Recorded resolution for 'kernel/params.c'. Created commit a84d261: Merge branch 'quilt/rr' $ git diff -M --stat --summary HEAD^.. Documentation/lguest/lguest.c | 60 +-- arch/alpha/include/asm/smp.h | 1 - arch/alpha/kernel/irq.c | 3 +- arch/alpha/kernel/process.c | 2 + arch/alpha/kernel/smp.c | 15 +- arch/arm/kernel/irq.c | 2 +- arch/arm/kernel/smp.c | 10 - arch/cris/arch-v32/kernel/smp.c | 4 - arch/cris/kernel/setup.c | 2 +- arch/frv/kernel/setup.c | 2 +- arch/h8300/kernel/setup.c | 2 +- arch/ia64/include/asm/smp.h | 1 - arch/ia64/kernel/acpi.c | 2 +- arch/ia64/kernel/iosapic.c | 4 +- arch/ia64/kernel/irq.c | 2 +- arch/ia64/kernel/mca.c | 6 +- arch/ia64/kernel/perfmon.c | 4 +- arch/ia64/kernel/salinfo.c | 6 +- arch/ia64/kernel/setup.c | 4 +- arch/ia64/kernel/smpboot.c | 6 - arch/ia64/kernel/topology.c | 2 +- arch/ia64/sn/kernel/setup.c | 2 +- arch/ia64/sn/kernel/sn2/sn2_smp.c | 6 +- arch/ia64/sn/kernel/sn2/sn_hwperf.c | 2 +- arch/m32r/Kconfig | 1 + arch/m32r/kernel/setup.c | 2 +- arch/m32r/kernel/smpboot.c | 8 +- arch/m68knommu/kernel/setup.c | 2 +- arch/mips/include/asm/smp.h | 3 - arch/mips/kernel/irq-gic.c | 2 +- arch/mips/kernel/proc.c | 2 +- arch/mips/kernel/smp-cmp.c | 8 +- arch/mips/kernel/smp-mt.c | 2 +- arch/mips/kernel/smp.c | 7 +- arch/mips/kernel/smtc.c | 12 +- arch/mips/pmc-sierra/yosemite/smp.c | 6 +- arch/mips/sgi-ip27/ip27-smp.c | 2 +- arch/mips/sibyte/bcm1480/irq.c | 2 +- arch/mips/sibyte/bcm1480/smp.c | 10 +- arch/mips/sibyte/sb1250/smp.c | 10 +- arch/mn10300/kernel/irq.c | 4 +- arch/mn10300/kernel/setup.c | 2 +- arch/parisc/Kconfig | 1 + arch/parisc/kernel/irq.c | 4 +- arch/parisc/kernel/processor.c | 4 +- arch/parisc/kernel/smp.c | 15 - arch/powerpc/include/asm/cputhreads.h | 2 +- arch/powerpc/kernel/irq.c | 2 +- arch/powerpc/kernel/machine_kexec_64.c | 2 +- arch/powerpc/kernel/process.c | 2 +- arch/powerpc/kernel/setup-common.c | 10 +- arch/powerpc/kernel/smp.c | 4 - arch/powerpc/mm/numa.c | 4 +- arch/powerpc/platforms/cell/spu_base.c | 5 +- arch/powerpc/platforms/powermac/setup.c | 2 +- arch/powerpc/platforms/powermac/smp.c | 4 +- arch/powerpc/platforms/pseries/hotplug-cpu.c | 2 +- arch/powerpc/platforms/pseries/rtasd.c | 2 +- arch/powerpc/platforms/pseries/xics.c | 4 +- arch/powerpc/xmon/xmon.c | 4 +- arch/s390/Kconfig | 1 + arch/s390/include/asm/smp.h | 3 - arch/s390/kernel/smp.c | 25 +- arch/sh/kernel/setup.c | 2 +- arch/sh/kernel/smp.c | 6 - arch/sparc/include/asm/smp_32.h | 2 - arch/sparc/kernel/smp.c | 17 +- arch/sparc/kernel/sparc_ksyms.c | 4 - arch/sparc/kernel/sun4d_smp.c | 9 +- arch/sparc/kernel/sun4m_smp.c | 8 +- arch/sparc/mm/srmmu.c | 2 +- arch/sparc64/kernel/ds.c | 2 +- arch/sparc64/kernel/irq.c | 4 +- arch/sparc64/kernel/smp.c | 4 - arch/sparc64/mm/init.c | 2 +- arch/um/kernel/smp.c | 7 - arch/um/kernel/um_arch.c | 2 +- arch/x86/Kconfig | 11 +- arch/x86/include/asm/bigsmp/apic.h | 14 +- arch/x86/include/asm/bigsmp/ipi.h | 9 +- arch/x86/include/asm/es7000/apic.h | 18 +- arch/x86/include/asm/es7000/ipi.h | 9 +- arch/x86/include/asm/genapic_32.h | 11 +- arch/x86/include/asm/genapic_64.h | 11 +- arch/x86/include/asm/ipi.h | 21 +- arch/x86/include/asm/mach-default/mach_apic.h | 17 +- arch/x86/include/asm/mach-default/mach_ipi.h | 18 +- arch/x86/include/asm/numaq/apic.h | 4 +- arch/x86/include/asm/numaq/ipi.h | 9 +- arch/x86/include/asm/summit/apic.h | 12 +- arch/x86/include/asm/summit/ipi.h | 9 +- arch/x86/kernel/apic.c | 4 +- arch/x86/kernel/cpu/intel_cacheinfo.c | 4 +- arch/x86/kernel/crash.c | 5 +- arch/x86/kernel/genapic_flat_64.c | 76 ++- arch/x86/kernel/genx2apic_cluster.c | 60 +- arch/x86/kernel/genx2apic_phys.c | 54 +- arch/x86/kernel/genx2apic_uv_x.c | 43 +- arch/x86/kernel/io_apic.c | 118 ++-- arch/x86/kernel/ipi.c | 26 +- arch/x86/kernel/irq_32.c | 2 +- arch/x86/kernel/setup_percpu.c | 9 +- arch/x86/kernel/smp.c | 4 +- arch/x86/kernel/smpboot.c | 6 - arch/x86/kernel/tlb_32.c | 2 +- arch/x86/kernel/tlb_64.c | 2 +- arch/x86/lguest/boot.c | 32 +- arch/x86/lguest/i386_head.S | 15 - arch/x86/mach-generic/bigsmp.c | 5 +- arch/x86/mach-generic/es7000.c | 5 +- arch/x86/mach-generic/numaq.c | 5 +- arch/x86/mach-generic/summit.c | 5 +- arch/x86/mach-voyager/voyager_smp.c | 11 +- arch/x86/mm/numa_64.c | 4 +- arch/x86/mm/srat_64.c | 2 +- arch/x86/xen/smp.c | 13 +- drivers/base/cpu.c | 2 +- drivers/base/node.c | 4 +- drivers/base/topology.c | 4 +- drivers/infiniband/hw/ehca/ehca_irq.c | 2 +- drivers/lguest/lg.h | 2 +- drivers/lguest/lguest_user.c | 13 +- drivers/lguest/page_tables.c | 72 ++- drivers/net/virtio_net.c | 189 ++++- drivers/pci/pci-sysfs.c | 4 +- drivers/pci/probe.c | 4 +- drivers/pnp/pnpbios/bioscalls.c | 2 +- include/asm-cris/smp.h | 1 - include/asm-m32r/smp.h | 2 - include/linux/cpumask.h | 794 +++++++++++--------- include/linux/lguest_launcher.h | 2 +- include/linux/seq_file.h | 2 +- include/linux/smp.h | 13 +- include/linux/threads.h | 16 +- include/linux/virtio_net.h | 9 + include/linux/workqueue.h | 8 + init/Kconfig | 15 +- init/main.c | 14 +- kernel/Kconfig.preempt | 10 + kernel/cpu.c | 93 ++- kernel/cpuset.c | 4 +- kernel/irq/proc.c | 4 +- kernel/kexec.c | 2 +- kernel/kmod.c | 2 +- kernel/kthread.c | 4 +- kernel/profile.c | 4 +- kernel/sched.c | 192 +++--- kernel/sched_stats.h | 2 +- kernel/smp.c | 68 +- kernel/taskstats.c | 2 +- kernel/time/timer_list.c | 4 +- kernel/trace/trace.c | 4 +- kernel/workqueue.c | 51 ++- lib/Kconfig.debug | 6 + lib/cpumask.c | 68 ++- mm/allocpercpu.c | 4 +- mm/slub.c | 2 +- mm/vmstat.c | 2 +- net/core/neighbour.c | 4 +- .../netfilter/nf_conntrack_l3proto_ipv4_compat.c | 4 +- net/ipv4/route.c | 4 +- net/netfilter/nf_conntrack_standalone.c | 4 +- security/selinux/selinuxfs.c | 2 +- 163 files changed, 1588 insertions(+), 1225 deletions(-) $ git am -3 ../patches/0001-x86-cpumask-change-fallout.patch Applying x86: cpumask change fallout $ git reset HEAD^ arch/x86/kernel/smp.c: needs update arch/x86/xen/smp.c: needs update $ git add . $ git commit -v -a --amend Created commit 9707591: Merge branch 'quilt/rr' Merging cifs/master $ git merge cifs/master Already up-to-date. Merging mmc/next $ git merge mmc/next Already up-to-date. Merging gfs2/master $ git merge gfs2/master 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/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 +++ 17 files changed, 117 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 Already up-to-date. Merging semaphore/semaphore $ git merge semaphore/semaphore Already up-to-date. Merging semaphore-removal/semaphore-removal $ git merge semaphore-removal/semaphore-removal Auto-merged arch/arm/mach-lh7a40x/clocks.c Auto-merged drivers/net/bonding/bond_main.c Auto-merged drivers/net/bonding/bond_sysfs.c Auto-merged drivers/net/ps3_gelic_wireless.c Auto-merged drivers/scsi/qla2xxx/qla_def.h Auto-merged include/net/bluetooth/hci_core.h Auto-merged net/9p/trans_virtio.c CONFLICT (content): Merge conflict in net/9p/trans_virtio.c Auto-merged net/bluetooth/hci_core.c Auto-merged sound/soc/s3c24xx/s3c2443-ac97.c Resolved 'net/9p/trans_virtio.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 6ac1ec9: Merge commit 'semaphore-removal/semaphore-removal' $ git diff -M --stat --summary HEAD^.. arch/arm/mach-lh7a40x/clocks.c | 15 ++++++++------- drivers/net/bonding/bond_main.c | 21 +++++++++++---------- drivers/net/bonding/bond_sysfs.c | 15 ++++++++------- drivers/net/ppp_async.c | 8 ++++---- drivers/net/ps3_gelic_net.c | 1 + drivers/net/ps3_gelic_wireless.c | 1 + drivers/pci/hotplug/ibmphp_hpc.c | 30 ++++++++++++++---------------- include/net/bluetooth/hci_core.h | 7 ++++--- net/9p/trans_virtio.c | 21 +++++++++++---------- net/bluetooth/hci_core.c | 2 +- sound/soc/s3c24xx/s3c2443-ac97.c | 11 ++++++----- 11 files changed, 69 insertions(+), 63 deletions(-) Merging bkl-removal/bkl-removal $ git merge bkl-removal/bkl-removal Already up-to-date. Merging trivial/next $ git merge trivial/next Auto-merged Documentation/edac.txt CONFLICT (content): Merge conflict in Documentation/edac.txt Auto-merged arch/mips/kernel/vpe.c Auto-merged drivers/base/sys.c Auto-merged drivers/media/dvb/ttpci/av7110.c Auto-merged drivers/message/i2o/i2o_block.c Auto-merged drivers/net/spider_net.c Auto-merged drivers/serial/mpc52xx_uart.c Auto-merged drivers/usb/serial/ftdi_sio.c Auto-merged fs/jffs2/fs.c Auto-merged fs/ntfs/aops.c Auto-merged fs/proc/nommu.c Auto-merged include/linux/securebits.h CONFLICT (content): Merge conflict in include/linux/securebits.h Auto-merged mm/migrate.c Auto-merged mm/slub.c Auto-merged net/wireless/wext.c Resolved 'Documentation/edac.txt' using previous resolution. Resolved 'include/linux/securebits.h' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 61ac412: Merge commit 'trivial/next' $ git diff -M --stat --summary HEAD^.. Documentation/filesystems/hfs.txt | 2 +- Documentation/ja_JP/SubmittingPatches | 4 ++-- Documentation/zh_CN/SubmittingPatches | 4 ++-- arch/mips/kernel/vpe.c | 2 +- arch/sh/lib64/c-checksum.c | 4 ++-- drivers/base/sys.c | 2 +- drivers/char/serial167.c | 2 +- drivers/media/dvb/ttpci/av7110.c | 2 +- drivers/message/i2o/i2o_block.c | 2 +- drivers/misc/ibmasm/event.c | 2 +- drivers/net/spider_net.c | 2 +- drivers/serial/mpc52xx_uart.c | 4 ++-- drivers/usb/serial/ftdi_sio.c | 2 +- fs/jffs2/fs.c | 2 +- fs/ntfs/aops.c | 2 +- fs/proc/nommu.c | 2 +- mm/migrate.c | 2 +- mm/slub.c | 4 ++-- net/wireless/wext.c | 2 +- 19 files changed, 24 insertions(+), 24 deletions(-) Merging ubifs/linux-next $ git merge ubifs/linux-next Already up-to-date. Merging lsm/for-next $ git merge lsm/for-next Already up-to-date. Merging block/for-next $ git merge block/for-next Merge made by recursive. block/blk-merge.c | 21 --------------------- block/cfq-iosched.c | 8 ++------ 2 files changed, 2 insertions(+), 27 deletions(-) Merging embedded/master $ git merge embedded/master Already up-to-date. Merging firmware/master $ git merge firmware/master Auto-merged drivers/media/dvb/ttpci/Kconfig Auto-merged drivers/media/dvb/ttpci/av7110.c Removed drivers/media/dvb/ttpci/fdump.c Removed drivers/net/acenic_firmware.h Auto-merged drivers/net/e100.c Removed drivers/net/starfire_firmware.h Removed drivers/net/starfire_firmware.pl Auto-merged drivers/net/tg3.c Auto-merged drivers/net/tg3.h Removed drivers/scsi/ql1040_fw.h Removed drivers/scsi/ql12160_fw.h Removed drivers/scsi/ql1280_fw.h Auto-merged drivers/scsi/qla1280.c Auto-merged drivers/scsi/qlogicpti.c CONFLICT (content): Merge conflict in drivers/scsi/qlogicpti.c Removed drivers/scsi/qlogicpti_asm.c Auto-merged firmware/Makefile Auto-merged firmware/WHENCE CONFLICT (content): Merge conflict in firmware/WHENCE Auto-merged sound/isa/Kconfig Auto-merged sound/isa/wavefront/wavefront_fx.c Removed sound/isa/wavefront/yss225.c Resolved 'drivers/scsi/qlogicpti.c' using previous resolution. Resolved 'firmware/WHENCE' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 3ab0276: Merge commit 'firmware/master' $ git diff -M --stat --summary HEAD^.. drivers/media/dvb/ttpci/Kconfig | 23 +- drivers/media/dvb/ttpci/Makefile | 9 - drivers/media/dvb/ttpci/av7110.c | 16 - drivers/media/dvb/ttpci/av7110_hw.c | 35 +- drivers/media/dvb/ttpci/av7110_hw.h | 3 +- drivers/media/dvb/ttpci/fdump.c | 44 - drivers/net/acenic.c | 117 +- drivers/net/acenic.h | 4 + drivers/net/acenic_firmware.h | 9456 ----------------------------- drivers/net/e100.c | 283 +- drivers/net/starfire.c | 51 +- drivers/net/starfire_firmware.h | 346 -- drivers/net/starfire_firmware.pl | 31 - drivers/net/tg3.c | 789 +--- drivers/net/tg3.h | 4 + drivers/scsi/advansys.c | 1731 +----- drivers/scsi/ql1040_fw.h | 2130 ------- drivers/scsi/ql12160_fw.h | 1811 ------ drivers/scsi/ql1280_fw.h | 2048 ------- drivers/scsi/qla1280.c | 114 +- drivers/scsi/qla1280.h | 6 + drivers/scsi/qlogicpti.c | 63 +- drivers/scsi/qlogicpti_asm.c | 1160 ---- firmware/Makefile | 20 + firmware/WHENCE | 121 + firmware/acenic/tg1.bin.ihex | 4573 ++++++++++++++ firmware/acenic/tg2.bin.ihex | 4844 +++++++++++++++ firmware/adaptec/starfire_rx.bin.ihex | 53 + firmware/adaptec/starfire_tx.bin.ihex | 53 + firmware/advansys/3550.bin.ihex | 317 + firmware/advansys/38C0800.bin.ihex | 336 + firmware/advansys/38C1600.bin.ihex | 398 ++ firmware/advansys/mcode.bin.ihex | 147 + firmware/av7110/Boot.S | 109 + firmware/av7110/bootcode.bin.ihex | 15 + firmware/e100/d101m_ucode.bin.ihex | 38 + firmware/e100/d101s_ucode.bin.ihex | 38 + firmware/e100/d102e_ucode.bin.ihex | 38 + firmware/qlogic/1040.bin.ihex | 2111 +++++++ firmware/qlogic/12160.bin.ihex | 1771 ++++++ firmware/qlogic/1280.bin.ihex | 2008 ++++++ firmware/qlogic/isp1000.bin.ihex | 1158 ++++ firmware/tigon/tg3.bin.ihex | 175 + firmware/tigon/tg3_tso.bin.ihex | 446 ++ firmware/tigon/tg3_tso5.bin.ihex | 252 + firmware/yamaha/yss225_registers.bin.ihex | 998 +++ sound/isa/Kconfig | 10 - sound/isa/wavefront/wavefront_fx.c | 16 - sound/isa/wavefront/yss225.c | 2739 --------- 49 files changed, 20560 insertions(+), 22498 deletions(-) delete mode 100644 drivers/media/dvb/ttpci/fdump.c delete mode 100644 drivers/net/acenic_firmware.h delete mode 100644 drivers/net/starfire_firmware.h delete mode 100644 drivers/net/starfire_firmware.pl delete mode 100644 drivers/scsi/ql1040_fw.h delete mode 100644 drivers/scsi/ql12160_fw.h delete mode 100644 drivers/scsi/ql1280_fw.h delete mode 100644 drivers/scsi/qlogicpti_asm.c create mode 100644 firmware/acenic/tg1.bin.ihex create mode 100644 firmware/acenic/tg2.bin.ihex create mode 100644 firmware/adaptec/starfire_rx.bin.ihex create mode 100644 firmware/adaptec/starfire_tx.bin.ihex create mode 100644 firmware/advansys/3550.bin.ihex create mode 100644 firmware/advansys/38C0800.bin.ihex create mode 100644 firmware/advansys/38C1600.bin.ihex create mode 100644 firmware/advansys/mcode.bin.ihex create mode 100644 firmware/av7110/Boot.S create mode 100644 firmware/av7110/bootcode.bin.ihex create mode 100644 firmware/e100/d101m_ucode.bin.ihex create mode 100644 firmware/e100/d101s_ucode.bin.ihex create mode 100644 firmware/e100/d102e_ucode.bin.ihex create mode 100644 firmware/qlogic/1040.bin.ihex create mode 100644 firmware/qlogic/12160.bin.ihex create mode 100644 firmware/qlogic/1280.bin.ihex create mode 100644 firmware/qlogic/isp1000.bin.ihex create mode 100644 firmware/tigon/tg3.bin.ihex create mode 100644 firmware/tigon/tg3_tso.bin.ihex create mode 100644 firmware/tigon/tg3_tso5.bin.ihex create mode 100644 firmware/yamaha/yss225_registers.bin.ihex delete mode 100644 sound/isa/wavefront/yss225.c Merging pcmcia/master $ git merge pcmcia/master Merge made by recursive. drivers/bluetooth/bluecard_cs.c | 2 +- drivers/bluetooth/bt3c_cs.c | 6 ++++-- drivers/bluetooth/btuart_cs.c | 6 ++++-- drivers/bluetooth/dtl1_cs.c | 7 +++++-- drivers/char/pcmcia/synclink_cs.c | 2 +- drivers/parport/parport_cs.c | 2 +- drivers/pcmcia/pcmcia_resource.c | 3 ++- drivers/scsi/fdomain.c | 2 ++ 8 files changed, 20 insertions(+), 10 deletions(-) Merging battery/master $ git merge battery/master Already up-to-date. Merging leds/for-mm $ git merge leds/for-mm Auto-merged drivers/leds/Kconfig Removed drivers/leds/leds-cm-x270.c Merge made by recursive. drivers/leds/Kconfig | 25 +++++- drivers/leds/Makefile | 4 +- drivers/leds/led-class.c | 12 +-- drivers/leds/leds-ams-delta.c | 20 ++-- drivers/leds/leds-cm-x270.c | 124 --------------------------- drivers/leds/leds-da903x.c | 175 ++++++++++++++++++++++++++++++++++++++ drivers/leds/leds-hp-disk.c | 156 +++++++++++++++++++++++++++++++++ drivers/leds/leds-pca955x.c | 2 +- drivers/leds/leds-wrap.c | 5 +- drivers/leds/ledtrig-backlight.c | 110 ++++++++++++++++++++++++ drivers/leds/ledtrig-timer.c | 8 +-- include/linux/leds.h | 4 +- 12 files changed, 488 insertions(+), 157 deletions(-) delete mode 100644 drivers/leds/leds-cm-x270.c create mode 100644 drivers/leds/leds-da903x.c create mode 100644 drivers/leds/leds-hp-disk.c create mode 100644 drivers/leds/ledtrig-backlight.c Merging backlight/for-mm $ git merge backlight/for-mm Auto-merged drivers/video/backlight/Kconfig Merge made by recursive. arch/arm/mach-pxa/include/mach/tosa.h | 3 + arch/arm/mach-pxa/tosa.c | 21 +++- drivers/video/backlight/Kconfig | 32 ++++ drivers/video/backlight/Makefile | 4 + drivers/video/backlight/da903x.c | 201 +++++++++++++++++++++++ drivers/video/backlight/kb3886_bl.c | 204 ++++++++++++++++++++++++ drivers/video/backlight/tosa_bl.c | 198 +++++++++++++++++++++++ drivers/video/backlight/tosa_lcd.c | 280 +++++++++++++++++++++++++++++++++ 8 files changed, 942 insertions(+), 1 deletions(-) create mode 100644 drivers/video/backlight/da903x.c create mode 100644 drivers/video/backlight/kb3886_bl.c create mode 100644 drivers/video/backlight/tosa_bl.c create mode 100644 drivers/video/backlight/tosa_lcd.c 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 include/linux/slab.h Auto-merged init/main.c Auto-merged lib/Kconfig.debug Auto-merged mm/Makefile CONFLICT (content): Merge conflict in mm/Makefile Auto-merged mm/slab.c Auto-merged mm/slob.c Auto-merged mm/slub.c Resolved 'mm/Makefile' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 1a38d5e: Merge commit 'slab/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/debugfs-kmemtrace | 71 ++++++ Documentation/kernel-parameters.txt | 10 + Documentation/vm/kmemtrace.txt | 126 ++++++++++ MAINTAINERS | 6 + include/linux/kmemtrace.h | 86 +++++++ include/linux/slab.h | 8 +- include/linux/slab_def.h | 68 +++++- include/linux/slob_def.h | 9 +- include/linux/slub_def.h | 53 ++++- init/main.c | 2 + kernel/relay.c | 7 +- lib/Kconfig.debug | 20 ++ mm/Makefile | 1 + mm/kmemtrace.c | 333 +++++++++++++++++++++++++++ mm/slab.c | 79 ++++++- mm/slob.c | 37 +++- mm/slub.c | 141 +++++++++--- 17 files changed, 980 insertions(+), 77 deletions(-) create mode 100644 Documentation/ABI/testing/debugfs-kmemtrace create mode 100644 Documentation/vm/kmemtrace.txt create mode 100644 include/linux/kmemtrace.h create mode 100644 mm/kmemtrace.c Merging uclinux/for-next $ git merge uclinux/for-next Already up-to-date. Merging md/for-next $ git merge md/for-next Already up-to-date. Merging kmemcheck/auto-kmemcheck-next $ git merge kmemcheck/auto-kmemcheck-next Renamed include/asm-x86/dma-mapping.h => arch/x86/include/asm/dma-mapping.h Auto-merged arch/x86/include/asm/dma-mapping.h Renamed include/asm-x86/pgtable.h => arch/x86/include/asm/pgtable.h Auto-merged arch/x86/include/asm/pgtable.h Renamed include/asm-x86/pgtable_32.h => arch/x86/include/asm/pgtable_32.h Auto-merged arch/x86/include/asm/pgtable_32.h Renamed include/asm-x86/pgtable_64.h => arch/x86/include/asm/pgtable_64.h Auto-merged arch/x86/include/asm/pgtable_64.h Renamed include/asm-x86/string_32.h => arch/x86/include/asm/string_32.h Auto-merged arch/x86/include/asm/string_32.h Renamed include/asm-x86/string_64.h => arch/x86/include/asm/string_64.h Auto-merged arch/x86/include/asm/string_64.h Auto-merged MAINTAINERS CONFLICT (content): Merge conflict in MAINTAINERS Auto-merged arch/x86/Kconfig.debug Auto-merged arch/x86/Makefile Auto-merged arch/x86/kernel/traps.c Auto-merged arch/x86/mm/fault.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 '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 e3836a1: Merge commit 'kmemcheck/auto-kmemcheck-next' $ git diff -M --stat --summary HEAD^.. Documentation/kmemcheck.txt | 135 +++++++ MAINTAINERS | 8 + arch/x86/Kconfig.debug | 87 +++++ 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/cpu/common.c | 4 + 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 | 3 + 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 | 25 +- mm/Makefile | 1 + mm/kmemcheck.c | 103 +++++ mm/slab.c | 101 +---- mm/slub.c | 20 +- 45 files changed, 1993 insertions(+), 111 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 Already up-to-date. Merging hdlc/hdlc-next $ git merge hdlc/hdlc-next Removed Documentation/DocBook/wanbook.tmpl Removed drivers/net/wan/syncppp.c Removed include/net/syncppp.h Merge made by recursive. Documentation/DocBook/Makefile | 2 +- Documentation/DocBook/networking.tmpl | 3 - Documentation/DocBook/wanbook.tmpl | 99 -- Documentation/networking/generic-hdlc.txt | 8 +- drivers/net/wan/Makefile | 2 +- drivers/net/wan/c101.c | 6 +- drivers/net/wan/{hd6457x.c => hd64570.c} | 254 ++---- drivers/net/wan/hd64572.c | 641 +++++++++++++ drivers/net/wan/hdlc_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 | 1479 ----------------------------- include/linux/hdlc.h | 2 +- include/net/syncppp.h | 102 -- 17 files changed, 1372 insertions(+), 2060 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-linus $ git merge voltage/for-linus Auto-merged drivers/Kconfig Merge made by recursive. drivers/Kconfig | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Merging security-testing/next $ git merge security-testing/next Already up-to-date. Merging lblnet/master $ git merge lblnet/master Already up-to-date. Merging quilt/ttydev $ git merge quilt/ttydev Auto-merged drivers/serial/8250_pci.c CONFLICT (content): Merge conflict in drivers/serial/8250_pci.c Auto-merged include/linux/pci_ids.h Recorded preimage for 'drivers/serial/8250_pci.c' Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/serial/8250_pci.c'. Created commit 34ac20f: Merge branch 'quilt/ttydev' $ git diff -M --stat --summary HEAD^.. Documentation/filesystems/devpts.txt | 132 ++++++ drivers/char/Kconfig | 11 + drivers/char/n_tty.c | 741 +++++++++++++++++++++++++++------- drivers/char/pty.c | 54 +++- drivers/char/tty_io.c | 37 +- drivers/char/vt.c | 16 +- drivers/serial/bfin_5xx.c | 239 ++++++----- fs/devpts/inode.c | 472 +++++++++++++++++++--- include/linux/tty.h | 9 +- include/linux/tty_driver.h | 6 +- 10 files changed, 1363 insertions(+), 354 deletions(-) create mode 100644 Documentation/filesystems/devpts.txt $ git am -3 ../patches/0001-hvc_console-fallout-from-tty_do_resize-change.patch Applying hvc_console: fallout from tty_do_resize change $ git reset HEAD^ drivers/char/hvc_console.c: needs update $ git add . $ git commit -v -a --amend Created commit 6523a87: Merge branch 'quilt/ttydev' Merging agp/agp-next $ git merge agp/agp-next Already up-to-date. Merging creds/creds-v3 $ git merge creds/creds-v3 Auto-merged arch/ia64/ia32/sys_ia32.c Auto-merged arch/ia64/kernel/perfmon.c Auto-merged arch/ia64/kernel/signal.c Auto-merged arch/mips/kernel/vpe.c Auto-merged arch/x86/mm/fault.c Auto-merged drivers/block/loop.c Auto-merged fs/attr.c Auto-merged fs/bfs/dir.c Auto-merged fs/binfmt_elf_fdpic.c Auto-merged fs/cifs/connect.c Auto-merged fs/cifs/inode.c Auto-merged fs/compat.c Auto-merged fs/devpts/inode.c CONFLICT (content): Merge conflict in fs/devpts/inode.c Auto-merged fs/dquot.c Auto-merged fs/ecryptfs/main.c Auto-merged fs/exportfs/expfs.c Auto-merged fs/fat/inode.c Auto-merged fs/file_table.c Auto-merged fs/gfs2/inode.c Auto-merged fs/hfs/inode.c Auto-merged fs/hfsplus/inode.c Auto-merged fs/hpfs/namei.c Auto-merged fs/locks.c Auto-merged fs/namei.c Auto-merged fs/namespace.c CONFLICT (content): Merge conflict in fs/namespace.c Auto-merged fs/nfsd/nfs4recover.c CONFLICT (content): Merge conflict in fs/nfsd/nfs4recover.c Auto-merged fs/nfsd/vfs.c Auto-merged fs/open.c Auto-merged fs/proc/base.c Auto-merged fs/reiserfs/namei.c Auto-merged fs/udf/namei.c Auto-merged fs/xfs/linux-2.6/xfs_ioctl.c Auto-merged fs/xfs/xfs_inode.h Auto-merged include/linux/fs.h Auto-merged include/linux/init_task.h Removed include/linux/key-ui.h Auto-merged include/linux/sched.h Auto-merged init/main.c Auto-merged ipc/shm.c Auto-merged kernel/Makefile Auto-merged kernel/exit.c Auto-merged kernel/fork.c Auto-merged kernel/futex.c Auto-merged kernel/kmod.c Auto-merged kernel/sched.c Auto-merged kernel/sys.c Auto-merged kernel/sysctl.c Auto-merged kernel/trace/trace.c Auto-merged kernel/workqueue.c Auto-merged lib/Makefile Auto-merged mm/migrate.c Auto-merged net/9p/client.c Auto-merged net/core/dev.c Auto-merged net/unix/af_unix.c Auto-merged security/selinux/selinuxfs.c Resolved 'fs/devpts/inode.c' using previous resolution. Resolved 'fs/namespace.c' using previous resolution. Resolved 'fs/nfsd/nfs4recover.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 9690efc: Merge commit 'creds/creds-v3' $ 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 | 2 +- fs/coda/upcall.c | 2 +- fs/compat.c | 42 +- fs/devpts/inode.c | 4 +- fs/dquot.c | 4 +- fs/ecryptfs/ecryptfs_kernel.h | 3 +- fs/ecryptfs/kthread.c | 9 +- fs/ecryptfs/main.c | 3 +- fs/ecryptfs/messaging.c | 18 +- fs/ecryptfs/miscdev.c | 20 +- fs/exec.c | 183 +++-- fs/exportfs/expfs.c | 4 +- fs/ext2/balloc.c | 2 +- fs/ext2/ialloc.c | 4 +- fs/ext3/balloc.c | 2 +- fs/ext3/ialloc.c | 4 +- fs/ext4/balloc.c | 5 +- fs/ext4/ialloc.c | 4 +- fs/fat/file.c | 2 +- fs/fat/inode.c | 4 +- fs/fcntl.c | 18 +- fs/file_table.c | 10 +- fs/fuse/dev.c | 4 +- fs/fuse/dir.c | 25 +- fs/gfs2/inode.c | 10 +- fs/hfs/inode.c | 4 +- fs/hfs/super.c | 4 +- fs/hfsplus/inode.c | 4 +- fs/hfsplus/options.c | 4 +- fs/hpfs/namei.c | 24 +- fs/hpfs/super.c | 4 +- fs/hppfs/hppfs.c | 6 +- fs/hugetlbfs/inode.c | 21 +- fs/inotify_user.c | 2 +- fs/internal.h | 6 + fs/ioprio.c | 18 +- fs/jfs/jfs_inode.c | 4 +- fs/locks.c | 2 +- fs/minix/bitmap.c | 4 +- fs/namei.c | 10 +- fs/namespace.c | 2 +- fs/ncpfs/ioctl.c | 91 +-- fs/nfsctl.c | 3 +- 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 | 1151 ++++++++++++++------------ 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 +- 213 files changed, 5062 insertions(+), 3098 deletions(-) create mode 100644 Documentation/credentials.txt create mode 100644 include/keys/keyring-type.h delete mode 100644 include/linux/key-ui.h create mode 100644 kernel/cred-internals.h create mode 100644 kernel/cred.c create mode 100644 lib/is_single_threaded.c Merging oprofile/auto-oprofile-next $ git merge oprofile/auto-oprofile-next Auto-merged drivers/oprofile/buffer_sync.c Auto-merged drivers/oprofile/cpu_buffer.c Auto-merged drivers/oprofile/event_buffer.h CONFLICT (content): Merge conflict in drivers/oprofile/event_buffer.h Recorded preimage for 'drivers/oprofile/event_buffer.h' Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/oprofile/event_buffer.h'. Created commit 3047253: Merge commit 'oprofile/auto-oprofile-next' $ git diff -M --stat --summary HEAD^.. 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 Already up-to-date. Merging watchdog/master $ git merge watchdog/master Merge made by recursive. drivers/watchdog/Kconfig | 12 + drivers/watchdog/Makefile | 1 + drivers/watchdog/i6300esb.c | 3 +- drivers/watchdog/ib700wdt.c | 49 ++-- drivers/watchdog/sch311x_wdt.c | 578 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 611 insertions(+), 32 deletions(-) create mode 100644 drivers/watchdog/sch311x_wdt.c Merging proc/proc $ git merge proc/proc Already up-to-date. Merging bdev/master $ git merge bdev/master Already up-to-date. Merging dwmw2-iommu/master $ git merge dwmw2-iommu/master Already up-to-date. Merging scsi-post-merge/master $ git merge scsi-post-merge/master Already up-to-date. $ git am -3 ../patches/0001-sparc-qlogicpti-fallout-from-sbus-removal.patch Applying sparc: qlogicpti fallout from sbus removal $ git am -3 ../patches/Work_around_ld_bug_in_older_binutils Applying Work around ld bug in older binutils $ git am -3 ../patches/ftrace__rename_FTRACE_to_FUNCTION_TRACER_more_successfully. Applying ftrace: rename FTRACE to FUNCTION_TRACER more successfully. $ git am -3 ../patches/rr_tree_build_warning Applying linux-next: rr tree build warning $ git am -3 ../patches/build_failure_at_x86_kernel_pci-dma.c_with_!CONFIG_PCI Applying build failure at x86/kernel/pci-dma.c with !CONFIG_PCI $ git am -3 ../patches/nfsctl__credentials_error Applying nfsctl: credentials error $ git am -3 ../patches/coda__credentials_error Applying coda: credentials error