$ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at d39dd11 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 Merging origin/master $ git merge origin/master Updating d39dd11..16c29da Fast-forward Documentation/ABI/testing/sysfs-fs-ext4 | 13 +- Documentation/device-mapper/dm-flakey.txt | 17 + Documentation/filesystems/ext4.txt | 207 +++- Documentation/scheduler/sched-design-CFS.txt | 7 +- Documentation/target/tcm_mod_builder.py | 18 +- MAINTAINERS | 5 + arch/arm/mach-ep93xx/gpio.c | 46 +- arch/arm/plat-nomadik/gpio.c | 45 - arch/avr32/Kconfig | 14 +- arch/avr32/boards/atngw100/mrmt.c | 2 +- arch/avr32/boards/atngw100/setup.c | 2 +- arch/avr32/kernel/irq.c | 37 - arch/avr32/mach-at32ap/extint.c | 82 +- arch/avr32/mach-at32ap/intc.c | 14 +- arch/avr32/mach-at32ap/pio.c | 37 +- arch/h8300/Kconfig | 1 + arch/h8300/kernel/irq.c | 33 +- arch/m32r/Kconfig | 1 + arch/m32r/kernel/irq.c | 45 - arch/m32r/platforms/m32104ut/setup.c | 8 +- arch/m32r/platforms/m32700ut/setup.c | 28 +- arch/m32r/platforms/mappi/setup.c | 16 +- arch/m32r/platforms/mappi2/setup.c | 20 +- arch/m32r/platforms/mappi3/setup.c | 20 +- arch/m32r/platforms/oaks32r/setup.c | 12 +- arch/m32r/platforms/opsput/setup.c | 28 +- arch/m32r/platforms/usrv/setup.c | 18 +- arch/m68k/Kconfig | 456 +----- arch/m68k/Kconfig.debug | 34 + arch/m68k/Kconfig.mmu | 417 +++++ arch/{m68knommu/Kconfig => m68k/Kconfig.nommu} | 94 - arch/m68k/Makefile | 122 +-- arch/m68k/Makefile_mm | 121 ++ arch/{m68knommu/Makefile => m68k/Makefile_no} | 16 +- .../{m68knommu => m68k}/configs/m5208evb_defconfig | 2 + .../{m68knommu => m68k}/configs/m5249evb_defconfig | 2 + arch/{m68knommu => m68k}/configs/m5272c3_defconfig | 2 + .../{m68knommu => m68k}/configs/m5275evb_defconfig | 2 + arch/{m68knommu => m68k}/configs/m5307c3_defconfig | 2 + arch/{m68knommu => m68k}/configs/m5407c3_defconfig | 2 + arch/m68k/kernel/Makefile | 18 +- arch/m68k/kernel/Makefile_mm | 17 + .../kernel/Makefile => m68k/kernel/Makefile_no} | 0 arch/m68k/kernel/asm-offsets.c | 101 +-- arch/m68k/kernel/asm-offsets_mm.c | 100 ++ .../asm-offsets.c => m68k/kernel/asm-offsets_no.c} | 0 arch/m68k/kernel/dma.c | 135 +-- arch/m68k/kernel/dma_mm.c | 130 ++ .../kernel/dma.c => m68k/kernel/dma_no.c} | 0 arch/m68k/kernel/entry.S | 756 +-------- arch/m68k/kernel/entry_mm.S | 753 ++++++++ .../kernel/entry.S => m68k/kernel/entry_no.S} | 0 arch/{m68knommu => m68k}/kernel/init_task.c | 0 arch/{m68knommu => m68k}/kernel/irq.c | 0 arch/m68k/kernel/m68k_ksyms.c | 21 +- arch/m68k/kernel/m68k_ksyms_mm.c | 16 + .../m68k_ksyms.c => m68k/kernel/m68k_ksyms_no.c} | 0 arch/m68k/kernel/module.c | 156 +-- arch/m68k/kernel/module_mm.c | 155 ++ .../kernel/module.c => m68k/kernel/module_no.c} | 0 arch/m68k/kernel/process.c | 355 +---- arch/m68k/kernel/process_mm.c | 354 ++++ .../kernel/process.c => m68k/kernel/process_no.c} | 0 arch/m68k/kernel/ptrace.c | 282 +--- arch/m68k/kernel/ptrace_mm.c | 277 +++ .../kernel/ptrace.c => m68k/kernel/ptrace_no.c} | 0 arch/m68k/kernel/setup.c | 534 +------ arch/m68k/kernel/setup_mm.c | 533 ++++++ .../kernel/setup.c => m68k/kernel/setup_no.c} | 0 arch/m68k/kernel/signal.c | 1018 +----------- arch/m68k/kernel/signal_mm.c | 1017 +++++++++++ .../kernel/signal.c => m68k/kernel/signal_no.c} | 0 arch/m68k/kernel/sys_m68k.c | 551 +------ arch/m68k/kernel/sys_m68k_mm.c | 546 ++++++ .../sys_m68k.c => m68k/kernel/sys_m68k_no.c} | 0 arch/{m68knommu => m68k}/kernel/syscalltable.S | 0 arch/m68k/kernel/time.c | 119 +-- arch/m68k/kernel/time_mm.c | 114 ++ .../kernel/time.c => m68k/kernel/time_no.c} | 0 arch/m68k/kernel/traps.c | 1208 +------------- arch/m68k/kernel/traps_mm.c | 1207 +++++++++++++ .../kernel/traps.c => m68k/kernel/traps_no.c} | 0 arch/m68k/kernel/vmlinux.lds.S | 11 +- arch/m68k/kernel/vmlinux.lds_mm.S | 10 + .../vmlinux.lds.S => m68k/kernel/vmlinux.lds_no.S} | 0 arch/m68k/lib/Makefile | 11 +- arch/m68k/lib/Makefile_mm | 6 + .../lib/Makefile => m68k/lib/Makefile_no} | 0 arch/m68k/lib/checksum.c | 430 +----- arch/m68k/lib/checksum_mm.c | 425 +++++ .../lib/checksum.c => m68k/lib/checksum_no.c} | 0 arch/{m68knommu => m68k}/lib/delay.c | 0 arch/{m68knommu => m68k}/lib/divsi3.S | 0 arch/{m68knommu => m68k}/lib/memcpy.c | 0 arch/{m68knommu => m68k}/lib/memmove.c | 0 arch/{m68knommu => m68k}/lib/memset.c | 0 arch/{m68knommu => m68k}/lib/modsi3.S | 0 arch/m68k/lib/muldi3.c | 68 +- .../lib/ashrdi3.c => m68k/lib/muldi3_mm.c} | 48 +- .../lib/muldi3.c => m68k/lib/muldi3_no.c} | 0 arch/{m68knommu => m68k}/lib/mulsi3.S | 0 arch/{m68knommu => m68k}/lib/udivsi3.S | 0 arch/{m68knommu => m68k}/lib/umodsi3.S | 0 arch/m68k/mm/Makefile | 13 +- arch/m68k/mm/Makefile_mm | 8 + .../{m68knommu/mm/Makefile => m68k/mm/Makefile_no} | 0 arch/m68k/mm/init.c | 153 +-- arch/m68k/mm/init_mm.c | 150 ++ arch/{m68knommu/mm/init.c => m68k/mm/init_no.c} | 0 arch/m68k/mm/kmap.c | 368 +---- arch/m68k/mm/kmap_mm.c | 367 ++++ arch/{m68knommu/mm/kmap.c => m68k/mm/kmap_no.c} | 0 arch/{m68knommu => m68k}/platform/5206/Makefile | 0 arch/{m68knommu => m68k}/platform/5206/config.c | 0 arch/{m68knommu => m68k}/platform/5206/gpio.c | 0 arch/{m68knommu => m68k}/platform/5206e/Makefile | 0 arch/{m68knommu => m68k}/platform/5206e/config.c | 0 arch/{m68knommu => m68k}/platform/5206e/gpio.c | 0 arch/{m68knommu => m68k}/platform/520x/Makefile | 0 arch/{m68knommu => m68k}/platform/520x/config.c | 0 arch/{m68knommu => m68k}/platform/520x/gpio.c | 0 arch/{m68knommu => m68k}/platform/523x/Makefile | 0 arch/{m68knommu => m68k}/platform/523x/config.c | 0 arch/{m68knommu => m68k}/platform/523x/gpio.c | 0 arch/{m68knommu => m68k}/platform/5249/Makefile | 0 arch/{m68knommu => m68k}/platform/5249/config.c | 0 arch/{m68knommu => m68k}/platform/5249/gpio.c | 0 arch/{m68knommu => m68k}/platform/5249/intc2.c | 0 arch/{m68knommu => m68k}/platform/5272/Makefile | 0 arch/{m68knommu => m68k}/platform/5272/config.c | 0 arch/{m68knommu => m68k}/platform/5272/gpio.c | 0 arch/{m68knommu => m68k}/platform/5272/intc.c | 0 arch/{m68knommu => m68k}/platform/527x/Makefile | 0 arch/{m68knommu => m68k}/platform/527x/config.c | 0 arch/{m68knommu => m68k}/platform/527x/gpio.c | 0 arch/{m68knommu => m68k}/platform/528x/Makefile | 0 arch/{m68knommu => m68k}/platform/528x/config.c | 0 arch/{m68knommu => m68k}/platform/528x/gpio.c | 0 arch/{m68knommu => m68k}/platform/5307/Makefile | 0 arch/{m68knommu => m68k}/platform/5307/config.c | 0 arch/{m68knommu => m68k}/platform/5307/gpio.c | 0 arch/{m68knommu => m68k}/platform/5307/nettel.c | 0 arch/{m68knommu => m68k}/platform/532x/Makefile | 0 arch/{m68knommu => m68k}/platform/532x/config.c | 0 arch/{m68knommu => m68k}/platform/532x/gpio.c | 0 arch/{m68knommu => m68k}/platform/5407/Makefile | 0 arch/{m68knommu => m68k}/platform/5407/config.c | 0 arch/{m68knommu => m68k}/platform/5407/gpio.c | 0 arch/{m68knommu => m68k}/platform/54xx/Makefile | 0 arch/{m68knommu => m68k}/platform/54xx/config.c | 0 arch/{m68knommu => m68k}/platform/54xx/firebee.c | 0 arch/{m68knommu => m68k}/platform/68328/Makefile | 0 arch/{m68knommu => m68k}/platform/68328/bootlogo.h | 0 .../{m68knommu => m68k}/platform/68328/bootlogo.pl | 0 arch/{m68knommu => m68k}/platform/68328/config.c | 0 arch/{m68knommu => m68k}/platform/68328/entry.S | 0 arch/{m68knommu => m68k}/platform/68328/head-de2.S | 0 .../platform/68328/head-pilot.S | 0 arch/{m68knommu => m68k}/platform/68328/head-ram.S | 0 arch/{m68knommu => m68k}/platform/68328/head-rom.S | 0 arch/{m68knommu => m68k}/platform/68328/ints.c | 0 arch/{m68knommu => m68k}/platform/68328/romvec.S | 0 arch/{m68knommu => m68k}/platform/68328/timers.c | 0 arch/{m68knommu => m68k}/platform/68360/Makefile | 0 arch/{m68knommu => m68k}/platform/68360/commproc.c | 0 arch/{m68knommu => m68k}/platform/68360/config.c | 0 arch/{m68knommu => m68k}/platform/68360/entry.S | 0 arch/{m68knommu => m68k}/platform/68360/head-ram.S | 0 arch/{m68knommu => m68k}/platform/68360/head-rom.S | 0 arch/{m68knommu => m68k}/platform/68360/ints.c | 0 arch/{m68knommu => m68k}/platform/68EZ328/Makefile | 0 .../platform/68EZ328/bootlogo.h | 0 arch/{m68knommu => m68k}/platform/68EZ328/config.c | 0 arch/{m68knommu => m68k}/platform/68VZ328/Makefile | 0 arch/{m68knommu => m68k}/platform/68VZ328/config.c | 0 arch/{m68knommu => m68k}/platform/Makefile | 0 .../{m68knommu => m68k}/platform/coldfire/Makefile | 0 arch/{m68knommu => m68k}/platform/coldfire/cache.c | 0 arch/{m68knommu => m68k}/platform/coldfire/clk.c | 0 arch/{m68knommu => m68k}/platform/coldfire/dma.c | 0 .../platform/coldfire/dma_timer.c | 0 arch/{m68knommu => m68k}/platform/coldfire/entry.S | 0 arch/{m68knommu => m68k}/platform/coldfire/gpio.c | 0 arch/{m68knommu => m68k}/platform/coldfire/head.S | 0 .../{m68knommu => m68k}/platform/coldfire/intc-2.c | 0 .../platform/coldfire/intc-simr.c | 0 arch/{m68knommu => m68k}/platform/coldfire/intc.c | 0 .../{m68knommu => m68k}/platform/coldfire/pinmux.c | 0 arch/{m68knommu => m68k}/platform/coldfire/pit.c | 0 .../platform/coldfire/sltimers.c | 0 .../{m68knommu => m68k}/platform/coldfire/timers.c | 0 .../platform/coldfire/vectors.c | 0 arch/m68knommu/Kconfig.debug | 35 - arch/m68knommu/defconfig | 74 - arch/m68knommu/kernel/.gitignore | 1 - arch/m68knommu/lib/ashldi3.c | 62 - arch/m68knommu/lib/lshrdi3.c | 62 - arch/mips/Kconfig | 4 + arch/mips/alchemy/common/irq.c | 98 +- arch/mips/alchemy/devboards/bcsr.c | 18 +- arch/mips/ar7/irq.c | 42 +- arch/mips/ath79/irq.c | 24 +- arch/mips/bcm63xx/irq.c | 77 +- arch/mips/dec/ioasic-irq.c | 60 +- arch/mips/dec/kn02-irq.c | 23 +- arch/mips/emma/markeins/irq.c | 67 +- arch/mips/include/asm/irq.h | 64 +- .../asm/pmc-sierra/msp71xx/cpu-feature-overrides.h | 21 + .../asm/pmc-sierra/msp71xx/msp_gpio_macros.h | 343 ++++ .../mips/include/asm/pmc-sierra/msp71xx/msp_regs.h | 17 +- arch/mips/include/asm/pmc-sierra/msp71xx/msp_usb.h | 144 ++ arch/mips/include/asm/spinlock.h | 22 +- arch/mips/include/asm/unistd.h | 24 +- arch/mips/jazz/irq.c | 14 +- arch/mips/jz4740/board-qi_lb60.c | 32 +- arch/mips/jz4740/gpio.c | 111 +- arch/mips/jz4740/irq.c | 32 +- arch/mips/kernel/i8259.c | 37 +- arch/mips/kernel/irq-gic.c | 43 +- arch/mips/kernel/irq-gt641xx.c | 26 +- arch/mips/kernel/irq-msc01.c | 51 +- arch/mips/kernel/irq-rm7000.c | 18 +- arch/mips/kernel/irq-rm9000.c | 49 +- arch/mips/kernel/irq.c | 49 +- arch/mips/kernel/irq_cpu.c | 46 +- arch/mips/kernel/irq_txx9.c | 28 +- arch/mips/kernel/scall32-o32.S | 4 + arch/mips/kernel/scall64-64.S | 4 + arch/mips/kernel/scall64-n32.S | 4 + arch/mips/kernel/scall64-o32.S | 4 + arch/mips/kernel/smtc.c | 13 +- arch/mips/lasat/interrupt.c | 16 +- arch/mips/loongson/common/bonito-irq.c | 16 +- arch/mips/mipssim/sim_smtc.c | 3 +- arch/mips/mti-malta/malta-smtc.c | 10 +- arch/mips/pmc-sierra/Kconfig | 15 + arch/mips/pmc-sierra/msp71xx/Makefile | 8 +- arch/mips/pmc-sierra/msp71xx/msp_eth.c | 187 ++ arch/mips/pmc-sierra/msp71xx/msp_irq.c | 56 +- arch/mips/pmc-sierra/msp71xx/msp_irq_cic.c | 239 ++- arch/mips/pmc-sierra/msp71xx/msp_irq_per.c | 135 ++ arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c | 18 +- arch/mips/pmc-sierra/msp71xx/msp_setup.c | 10 + arch/mips/pmc-sierra/msp71xx/msp_smp.c | 77 + arch/mips/pmc-sierra/msp71xx/msp_smtc.c | 105 ++ arch/mips/pmc-sierra/msp71xx/msp_time.c | 16 +- arch/mips/pmc-sierra/msp71xx/msp_usb.c | 239 ++- arch/mips/pnx833x/common/interrupts.c | 98 +- arch/mips/pnx8550/common/int.c | 18 +- arch/mips/powertv/asic/irq_asic.c | 13 +- arch/mips/rb532/irq.c | 32 +- arch/mips/sgi-ip22/ip22-int.c | 60 +- arch/mips/sgi-ip27/ip27-irq.c | 38 +- arch/mips/sgi-ip27/ip27-timer.c | 11 +- arch/mips/sgi-ip32/ip32-irq.c | 134 +- arch/mips/sibyte/bcm1480/irq.c | 55 +- arch/mips/sibyte/sb1250/irq.c | 53 +- arch/mips/sni/a20r.c | 23 +- arch/mips/sni/pcimt.c | 21 +- arch/mips/sni/pcit.c | 21 +- arch/mips/sni/rm200.c | 42 +- arch/mips/txx9/generic/irq_tx4939.c | 28 +- arch/mips/txx9/jmr3927/irq.c | 14 +- arch/mips/txx9/rbtx4927/irq.c | 58 +- arch/mips/txx9/rbtx4938/irq.c | 54 +- arch/mips/txx9/rbtx4939/irq.c | 14 +- arch/mips/vr41xx/common/icu.c | 72 +- arch/mips/vr41xx/common/irq.c | 19 +- arch/s390/include/asm/ccwdev.h | 4 - arch/s390/include/asm/ccwgroup.h | 4 - arch/s390/include/asm/cmpxchg.h | 225 +++ arch/s390/include/asm/system.h | 196 +--- arch/s390/include/asm/unistd.h | 6 +- arch/s390/kernel/compat_wrapper.S | 27 + arch/s390/kernel/early.c | 22 +- arch/s390/kernel/setup.c | 88 +- arch/s390/kernel/syscalls.S | 4 + arch/s390/oprofile/Makefile | 3 +- arch/s390/oprofile/init.c | 15 +- arch/sparc/kernel/time_32.c | 4 + arch/um/Kconfig.common | 1 + arch/um/kernel/irq.c | 53 +- arch/x86/Kconfig | 1 + arch/x86/kernel/amd_iommu_init.c | 26 +- arch/x86/kernel/apic/apic.c | 33 +- arch/x86/kernel/apic/io_apic.c | 97 +- arch/x86/kernel/cpu/mcheck/mce.c | 21 +- arch/x86/kernel/cpu/mtrr/main.c | 10 +- arch/x86/kernel/cpu/perf_event.c | 11 +- arch/x86/kernel/cpu/perf_event_p4.c | 1 + arch/x86/kernel/devicetree.c | 6 +- arch/x86/kernel/dumpstack.c | 2 +- arch/x86/kernel/i8237.c | 30 +- arch/x86/kernel/i8259.c | 33 +- arch/x86/kernel/kgdb.c | 4 +- arch/x86/kernel/microcode_core.c | 34 +- arch/x86/kernel/mpparse.c | 8 +- arch/x86/kernel/pci-gart_64.c | 32 +- arch/x86/oprofile/nmi_int.c | 44 +- arch/xtensa/Kconfig | 6 +- arch/xtensa/kernel/irq.c | 106 +- arch/xtensa/platforms/s6105/device.c | 2 +- arch/xtensa/variants/s6000/gpio.c | 45 +- block/blk-core.c | 7 +- drivers/acpi/pci_root.c | 11 +- drivers/base/Kconfig | 7 + drivers/base/sys.c | 3 +- drivers/cpufreq/cpufreq.c | 66 +- drivers/gpio/adp5588-gpio.c | 8 +- drivers/gpio/gpiolib.c | 45 - drivers/gpio/max732x.c | 8 +- drivers/gpio/pca953x.c | 6 +- drivers/gpio/pl061.c | 14 +- drivers/gpio/stmpe-gpio.c | 12 +- drivers/gpio/sx150x.c | 9 +- drivers/gpio/tc3589x-gpio.c | 12 +- drivers/gpio/timbgpio.c | 18 +- drivers/gpio/vr41xx_giu.c | 12 +- drivers/infiniband/hw/mlx4/main.c | 11 +- drivers/infiniband/hw/nes/nes_cm.c | 2 +- drivers/input/touchscreen/Kconfig | 2 +- drivers/input/touchscreen/tsc2005.c | 18 +- drivers/leds/led-triggers.c | 20 + drivers/md/Kconfig | 6 + drivers/md/Makefile | 1 + drivers/md/dm-crypt.c | 19 +- drivers/md/dm-flakey.c | 212 +++ drivers/md/dm-ioctl.c | 46 +- drivers/md/dm-log.c | 2 +- drivers/md/dm-mpath.c | 17 +- drivers/md/dm-snap.c | 2 +- drivers/md/dm-stripe.c | 23 +- drivers/memstick/host/Kconfig | 12 + drivers/memstick/host/Makefile | 1 + drivers/memstick/host/r592.c | 908 ++++++++++ drivers/memstick/host/r592.h | 175 ++ drivers/misc/kgdbts.c | 2 +- drivers/net/a2065.c | 10 +- drivers/net/ariadne.c | 10 +- drivers/net/bonding/bond_main.c | 56 +- drivers/net/bonding/bonding.h | 1 + drivers/net/davinci_cpdma.c | 11 +- drivers/net/davinci_cpdma.h | 1 + drivers/net/davinci_emac.c | 5 +- drivers/net/mlx4/alloc.c | 13 + drivers/net/mlx4/cq.c | 2 +- drivers/net/mlx4/en_cq.c | 38 +- drivers/net/mlx4/en_ethtool.c | 66 +- drivers/net/mlx4/en_main.c | 22 +- drivers/net/mlx4/en_netdev.c | 199 ++- drivers/net/mlx4/en_port.c | 13 +- drivers/net/mlx4/en_port.h | 19 +- drivers/net/mlx4/en_rx.c | 11 +- drivers/net/mlx4/en_tx.c | 72 +- drivers/net/mlx4/eq.c | 107 ++- drivers/net/mlx4/fw.c | 25 + drivers/net/mlx4/fw.h | 3 + drivers/net/mlx4/main.c | 119 ++- drivers/net/mlx4/mcg.c | 646 +++++++- drivers/net/mlx4/mlx4.h | 50 + drivers/net/mlx4/mlx4_en.h | 27 +- drivers/net/mlx4/pd.c | 102 ++ drivers/net/mlx4/port.c | 165 ++- drivers/net/mlx4/profile.c | 4 +- drivers/net/myri10ge/myri10ge.c | 1 + drivers/net/pch_gbe/pch_gbe_main.c | 6 +- drivers/net/sfc/efx.c | 18 +- drivers/net/sfc/workarounds.h | 2 + drivers/net/usb/smsc95xx.c | 17 +- drivers/net/wireless/ath/ath9k/main.c | 2 + drivers/net/wireless/ath/ath9k/rc.c | 2 +- drivers/net/wireless/ath/ath9k/xmit.c | 4 +- drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 2 +- drivers/net/wireless/iwlwifi/iwl-agn.c | 7 +- drivers/net/wireless/orinoco/cfg.c | 3 + drivers/net/wireless/orinoco/main.c | 2 +- drivers/net/wireless/rt2x00/rt2800usb.c | 7 +- drivers/net/wireless/rtlwifi/efuse.c | 31 +- drivers/net/wireless/zd1211rw/zd_usb.c | 1 + drivers/pci/intel-iommu.c | 38 +- drivers/pci/pci.c | 6 + drivers/pci/pcie/aspm.c | 33 + drivers/pci/pcie/portdrv_core.c | 5 +- drivers/power/Kconfig | 14 + drivers/power/bq20z75.c | 310 +++- drivers/power/bq27x00_battery.c | 725 ++++++-- drivers/power/ds2782_battery.c | 1 + drivers/power/power_supply_core.c | 4 +- drivers/power/power_supply_leds.c | 19 + drivers/power/power_supply_sysfs.c | 2 +- drivers/power/s3c_adc_battery.c | 4 +- drivers/power/twl4030_charger.c | 25 +- drivers/power/z2_battery.c | 3 + drivers/s390/block/dasd_eckd.c | 6 +- drivers/s390/block/dasd_fba.c | 6 +- drivers/s390/char/con3215.c | 6 +- drivers/s390/char/raw3270.c | 6 +- drivers/s390/char/tape_34xx.c | 6 +- drivers/s390/char/tape_3590.c | 6 +- drivers/s390/char/vmur.c | 6 +- drivers/s390/cio/ccwgroup.c | 6 +- drivers/s390/cio/device.c | 11 +- drivers/s390/cio/device.h | 1 - drivers/s390/cio/qdio_main.c | 3 +- drivers/s390/net/claw.c | 12 +- drivers/s390/net/ctcm_main.c | 12 +- drivers/s390/net/lcs.c | 12 +- drivers/s390/net/qeth_core_main.c | 10 +- drivers/s390/scsi/zfcp_ccw.c | 6 +- drivers/scsi/aacraid/Makefile | 2 +- drivers/scsi/aacraid/aachba.c | 7 +- drivers/scsi/aacraid/aacraid.h | 106 +- drivers/scsi/aacraid/commctrl.c | 3 +- drivers/scsi/aacraid/comminit.c | 58 +- drivers/scsi/aacraid/commsup.c | 41 +- drivers/scsi/aacraid/dpcsup.c | 85 +- drivers/scsi/aacraid/linit.c | 15 +- drivers/scsi/aacraid/nark.c | 3 +- drivers/scsi/aacraid/rkt.c | 3 +- drivers/scsi/aacraid/rx.c | 33 +- drivers/scsi/aacraid/sa.c | 7 +- drivers/scsi/aacraid/src.c | 594 +++++++ drivers/scsi/bnx2fc/bnx2fc.h | 22 +- drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 98 +- drivers/scsi/bnx2fc/bnx2fc_hwi.c | 15 +- drivers/scsi/bnx2fc/bnx2fc_io.c | 73 +- drivers/scsi/bnx2fc/bnx2fc_tgt.c | 4 +- drivers/scsi/libiscsi_tcp.c | 15 +- drivers/scsi/lpfc/Makefile | 2 +- drivers/scsi/lpfc/lpfc.h | 27 +- drivers/scsi/lpfc/lpfc_attr.c | 14 +- drivers/scsi/lpfc/lpfc_bsg.c | 36 +- drivers/scsi/lpfc/lpfc_crtn.h | 6 +- drivers/scsi/lpfc/lpfc_els.c | 3 +- drivers/scsi/lpfc/lpfc_hw.h | 15 +- drivers/scsi/lpfc/lpfc_hw4.h | 113 +- drivers/scsi/lpfc/lpfc_init.c | 41 +- drivers/scsi/lpfc/lpfc_scsi.c | 43 +- drivers/scsi/lpfc/lpfc_sli.c | 513 ++++-- drivers/scsi/lpfc/lpfc_sli4.h | 2 +- drivers/scsi/lpfc/lpfc_version.h | 2 +- drivers/scsi/mpt2sas/mpt2sas_base.c | 49 + drivers/scsi/mpt2sas/mpt2sas_base.h | 20 + drivers/scsi/mvsas/mv_init.c | 7 + drivers/scsi/qla4xxx/ql4_def.h | 12 +- drivers/scsi/qla4xxx/ql4_fw.h | 1 + drivers/scsi/qla4xxx/ql4_glbl.h | 1 - drivers/scsi/qla4xxx/ql4_init.c | 207 +-- drivers/scsi/qla4xxx/ql4_isr.c | 31 +- drivers/scsi/qla4xxx/ql4_mbx.c | 34 +- drivers/scsi/qla4xxx/ql4_nx.c | 3 +- drivers/scsi/qla4xxx/ql4_os.c | 146 +- drivers/scsi/qla4xxx/ql4_version.h | 2 +- drivers/scsi/scsi_transport_iscsi.c | 2 +- drivers/scsi/sd.c | 63 +- drivers/scsi/ses.c | 48 +- drivers/target/Kconfig | 2 + drivers/target/Makefile | 7 +- drivers/target/loopback/Kconfig | 11 + drivers/target/loopback/Makefile | 1 + drivers/target/loopback/tcm_loop.c | 1579 +++++++++++++++++ drivers/target/loopback/tcm_loop.h | 77 + drivers/target/target_core_configfs.c | 117 ++- drivers/target/target_core_device.c | 40 +- drivers/target/target_core_fabric_configfs.c | 209 +++- drivers/target/target_core_fabric_lib.c | 1 + drivers/target/target_core_file.c | 28 +- drivers/target/target_core_hba.c | 15 +- drivers/target/target_core_iblock.c | 28 +- drivers/target/target_core_pscsi.c | 22 +- drivers/target/target_core_rd.c | 15 +- drivers/target/target_core_rd.h | 2 - drivers/target/target_core_stat.c | 1810 ++++++++++++++++++++ drivers/target/target_core_stat.h | 8 + drivers/target/target_core_transport.c | 37 +- drivers/tty/serial/kgdboc.c | 2 +- fs/coda/sysctl.c | 9 + fs/ext4/balloc.c | 3 + fs/ext4/ext4_jbd2.h | 7 - fs/ext4/extents.c | 213 ++- fs/ext4/fsync.c | 14 +- fs/ext4/ialloc.c | 8 +- fs/ext4/inode.c | 410 ++--- fs/ext4/ioctl.c | 7 + fs/ext4/mballoc.c | 34 +- fs/ext4/mballoc.h | 2 +- fs/ext4/migrate.c | 10 +- fs/ext4/namei.c | 13 +- fs/ext4/page-io.c | 13 +- fs/ext4/resize.c | 12 +- fs/ext4/super.c | 48 +- fs/ext4/xattr.c | 4 +- fs/nfs/dir.c | 89 +- fs/nfs/file.c | 3 + fs/nfs/getroot.c | 4 + fs/nfs/inode.c | 10 +- fs/nfs/internal.h | 27 +- fs/nfs/namespace.c | 115 ++- fs/nfs/nfs3proc.c | 2 +- fs/nfs/nfs4_fs.h | 5 +- fs/nfs/nfs4filelayout.c | 352 ++++- fs/nfs/nfs4filelayout.h | 2 + fs/nfs/nfs4filelayoutdev.c | 178 ++- fs/nfs/nfs4proc.c | 302 +++- fs/nfs/nfs4xdr.c | 313 ++++- fs/nfs/pagelist.c | 8 +- fs/nfs/pnfs.c | 142 ++ fs/nfs/pnfs.h | 83 +- fs/nfs/proc.c | 2 +- fs/nfs/write.c | 214 ++- fs/nfs_common/nfsacl.c | 1 - include/asm-generic/bug.h | 28 +- include/linux/davinci_emac.h | 1 + include/linux/device.h | 4 + include/linux/dm-ioctl.h | 12 +- include/linux/ethtool.h | 3 + include/linux/irq.h | 4 + include/linux/irqdesc.h | 45 +- include/linux/jbd2.h | 28 +- include/linux/journal-head.h | 7 + include/linux/kallsyms.h | 7 + include/linux/leds.h | 3 + include/linux/mlx4/device.h | 51 +- include/linux/mlx4/qp.h | 1 + include/linux/nfs4.h | 2 + include/linux/nfs_fs.h | 10 + include/linux/nfs_page.h | 7 +- include/linux/nfs_xdr.h | 70 +- include/linux/pci-aspm.h | 4 + include/linux/pci.h | 7 +- include/linux/perf_event.h | 2 - include/linux/pm.h | 10 +- include/linux/power/bq20z75.h | 39 + include/linux/power/bq27x00_battery.h | 19 + include/linux/power_supply.h | 47 + include/linux/sched.h | 2 +- include/linux/sunrpc/gss_api.h | 3 + include/linux/sysdev.h | 7 +- include/net/cfg80211.h | 3 +- include/net/ip6_route.h | 2 +- include/net/ip_fib.h | 18 +- include/net/mac80211.h | 2 +- include/net/netns/ipv4.h | 1 + include/net/route.h | 5 +- include/net/sch_generic.h | 8 +- include/scsi/libiscsi_tcp.h | 1 + include/scsi/scsi_device.h | 2 +- include/target/target_core_base.h | 73 +- include/target/target_core_configfs.h | 4 + include/target/target_core_fabric_ops.h | 2 +- include/target/target_core_tmr.h | 52 +- include/target/target_core_transport.h | 4 + include/trace/events/ext4.h | 775 +++++++--- include/trace/events/jbd2.h | 78 +- ipc/namespace.c | 2 +- kernel/debug/kdb/kdb_main.c | 4 +- kernel/futex.c | 4 +- kernel/irq/Kconfig | 4 + kernel/irq/irqdesc.c | 14 - kernel/irq/proc.c | 15 +- kernel/kallsyms.c | 44 +- kernel/lockdep_proc.c | 9 +- kernel/perf_event.c | 15 +- kernel/sched.c | 5 +- kernel/sched_idletask.c | 2 - kernel/sched_stoptask.c | 2 - kernel/time/timekeeping.c | 27 +- kernel/trace/ftrace.c | 3 +- lib/vsprintf.c | 7 +- net/bridge/br_multicast.c | 2 +- net/core/dev.c | 19 +- net/core/ethtool.c | 2 +- net/ipv4/devinet.c | 30 +- net/ipv4/fib_frontend.c | 112 +- net/ipv4/fib_lookup.h | 3 +- net/ipv4/fib_semantics.c | 47 +- net/ipv4/fib_trie.c | 14 +- net/ipv4/route.c | 8 +- net/ipv4/tcp_input.c | 22 +- net/ipv6/route.c | 2 +- net/mac80211/sta_info.c | 1 + net/sunrpc/auth_gss/gss_mech_switch.c | 38 + net/sunrpc/xprtsock.c | 2 + tools/perf/builtin-annotate.c | 18 +- tools/perf/builtin-diff.c | 1 + tools/perf/builtin-inject.c | 11 +- tools/perf/builtin-kmem.c | 1 + tools/perf/builtin-lock.c | 4 +- tools/perf/builtin-report.c | 19 +- tools/perf/builtin-sched.c | 1 + tools/perf/builtin-script.c | 15 +- tools/perf/builtin-timechart.c | 11 + tools/perf/builtin-top.c | 4 +- tools/perf/util/build-id.c | 1 + tools/perf/util/header.c | 57 +- tools/perf/util/hist.h | 1 + .../perf/util/scripting-engines/trace-event-perl.c | 1 + .../util/scripting-engines/trace-event-python.c | 1 + tools/perf/util/session.c | 25 +- tools/perf/util/session.h | 7 +- tools/perf/util/symbol.c | 25 +- tools/perf/util/trace-event-scripting.c | 1 + tools/perf/util/trace-event.h | 1 + virt/kvm/kvm_main.c | 34 +- 604 files changed, 23724 insertions(+), 12315 deletions(-) create mode 100644 Documentation/device-mapper/dm-flakey.txt create mode 100644 arch/m68k/Kconfig.mmu rename arch/{m68knommu/Kconfig => m68k/Kconfig.nommu} (93%) create mode 100644 arch/m68k/Makefile_mm rename arch/{m68knommu/Makefile => m68k/Makefile_no} (92%) rename arch/{m68knommu => m68k}/configs/m5208evb_defconfig (97%) rename arch/{m68knommu => m68k}/configs/m5249evb_defconfig (97%) rename arch/{m68knommu => m68k}/configs/m5272c3_defconfig (96%) rename arch/{m68knommu => m68k}/configs/m5275evb_defconfig (97%) rename arch/{m68knommu => m68k}/configs/m5307c3_defconfig (97%) rename arch/{m68knommu => m68k}/configs/m5407c3_defconfig (97%) create mode 100644 arch/m68k/kernel/Makefile_mm rename arch/{m68knommu/kernel/Makefile => m68k/kernel/Makefile_no} (100%) create mode 100644 arch/m68k/kernel/asm-offsets_mm.c rename arch/{m68knommu/kernel/asm-offsets.c => m68k/kernel/asm-offsets_no.c} (100%) create mode 100644 arch/m68k/kernel/dma_mm.c rename arch/{m68knommu/kernel/dma.c => m68k/kernel/dma_no.c} (100%) create mode 100644 arch/m68k/kernel/entry_mm.S rename arch/{m68knommu/kernel/entry.S => m68k/kernel/entry_no.S} (100%) rename arch/{m68knommu => m68k}/kernel/init_task.c (100%) rename arch/{m68knommu => m68k}/kernel/irq.c (100%) create mode 100644 arch/m68k/kernel/m68k_ksyms_mm.c rename arch/{m68knommu/kernel/m68k_ksyms.c => m68k/kernel/m68k_ksyms_no.c} (100%) create mode 100644 arch/m68k/kernel/module_mm.c rename arch/{m68knommu/kernel/module.c => m68k/kernel/module_no.c} (100%) create mode 100644 arch/m68k/kernel/process_mm.c rename arch/{m68knommu/kernel/process.c => m68k/kernel/process_no.c} (100%) create mode 100644 arch/m68k/kernel/ptrace_mm.c rename arch/{m68knommu/kernel/ptrace.c => m68k/kernel/ptrace_no.c} (100%) create mode 100644 arch/m68k/kernel/setup_mm.c rename arch/{m68knommu/kernel/setup.c => m68k/kernel/setup_no.c} (100%) create mode 100644 arch/m68k/kernel/signal_mm.c rename arch/{m68knommu/kernel/signal.c => m68k/kernel/signal_no.c} (100%) create mode 100644 arch/m68k/kernel/sys_m68k_mm.c rename arch/{m68knommu/kernel/sys_m68k.c => m68k/kernel/sys_m68k_no.c} (100%) rename arch/{m68knommu => m68k}/kernel/syscalltable.S (100%) create mode 100644 arch/m68k/kernel/time_mm.c rename arch/{m68knommu/kernel/time.c => m68k/kernel/time_no.c} (100%) create mode 100644 arch/m68k/kernel/traps_mm.c rename arch/{m68knommu/kernel/traps.c => m68k/kernel/traps_no.c} (100%) create mode 100644 arch/m68k/kernel/vmlinux.lds_mm.S rename arch/{m68knommu/kernel/vmlinux.lds.S => m68k/kernel/vmlinux.lds_no.S} (100%) create mode 100644 arch/m68k/lib/Makefile_mm rename arch/{m68knommu/lib/Makefile => m68k/lib/Makefile_no} (100%) create mode 100644 arch/m68k/lib/checksum_mm.c rename arch/{m68knommu/lib/checksum.c => m68k/lib/checksum_no.c} (100%) rename arch/{m68knommu => m68k}/lib/delay.c (100%) rename arch/{m68knommu => m68k}/lib/divsi3.S (100%) rename arch/{m68knommu => m68k}/lib/memcpy.c (100%) rename arch/{m68knommu => m68k}/lib/memmove.c (100%) rename arch/{m68knommu => m68k}/lib/memset.c (100%) rename arch/{m68knommu => m68k}/lib/modsi3.S (100%) rename arch/{m68knommu/lib/ashrdi3.c => m68k/lib/muldi3_mm.c} (60%) rename arch/{m68knommu/lib/muldi3.c => m68k/lib/muldi3_no.c} (100%) rename arch/{m68knommu => m68k}/lib/mulsi3.S (100%) rename arch/{m68knommu => m68k}/lib/udivsi3.S (100%) rename arch/{m68knommu => m68k}/lib/umodsi3.S (100%) create mode 100644 arch/m68k/mm/Makefile_mm rename arch/{m68knommu/mm/Makefile => m68k/mm/Makefile_no} (100%) create mode 100644 arch/m68k/mm/init_mm.c rename arch/{m68knommu/mm/init.c => m68k/mm/init_no.c} (100%) create mode 100644 arch/m68k/mm/kmap_mm.c rename arch/{m68knommu/mm/kmap.c => m68k/mm/kmap_no.c} (100%) rename arch/{m68knommu => m68k}/platform/5206/Makefile (100%) rename arch/{m68knommu => m68k}/platform/5206/config.c (100%) rename arch/{m68knommu => m68k}/platform/5206/gpio.c (100%) rename arch/{m68knommu => m68k}/platform/5206e/Makefile (100%) rename arch/{m68knommu => m68k}/platform/5206e/config.c (100%) rename arch/{m68knommu => m68k}/platform/5206e/gpio.c (100%) rename arch/{m68knommu => m68k}/platform/520x/Makefile (100%) rename arch/{m68knommu => m68k}/platform/520x/config.c (100%) rename arch/{m68knommu => m68k}/platform/520x/gpio.c (100%) rename arch/{m68knommu => m68k}/platform/523x/Makefile (100%) rename arch/{m68knommu => m68k}/platform/523x/config.c (100%) rename arch/{m68knommu => m68k}/platform/523x/gpio.c (100%) rename arch/{m68knommu => m68k}/platform/5249/Makefile (100%) rename arch/{m68knommu => m68k}/platform/5249/config.c (100%) rename arch/{m68knommu => m68k}/platform/5249/gpio.c (100%) rename arch/{m68knommu => m68k}/platform/5249/intc2.c (100%) rename arch/{m68knommu => m68k}/platform/5272/Makefile (100%) rename arch/{m68knommu => m68k}/platform/5272/config.c (100%) rename arch/{m68knommu => m68k}/platform/5272/gpio.c (100%) rename arch/{m68knommu => m68k}/platform/5272/intc.c (100%) rename arch/{m68knommu => m68k}/platform/527x/Makefile (100%) rename arch/{m68knommu => m68k}/platform/527x/config.c (100%) rename arch/{m68knommu => m68k}/platform/527x/gpio.c (100%) rename arch/{m68knommu => m68k}/platform/528x/Makefile (100%) rename arch/{m68knommu => m68k}/platform/528x/config.c (100%) rename arch/{m68knommu => m68k}/platform/528x/gpio.c (100%) rename arch/{m68knommu => m68k}/platform/5307/Makefile (100%) rename arch/{m68knommu => m68k}/platform/5307/config.c (100%) rename arch/{m68knommu => m68k}/platform/5307/gpio.c (100%) rename arch/{m68knommu => m68k}/platform/5307/nettel.c (100%) rename arch/{m68knommu => m68k}/platform/532x/Makefile (100%) rename arch/{m68knommu => m68k}/platform/532x/config.c (100%) rename arch/{m68knommu => m68k}/platform/532x/gpio.c (100%) rename arch/{m68knommu => m68k}/platform/5407/Makefile (100%) rename arch/{m68knommu => m68k}/platform/5407/config.c (100%) rename arch/{m68knommu => m68k}/platform/5407/gpio.c (100%) rename arch/{m68knommu => m68k}/platform/54xx/Makefile (100%) rename arch/{m68knommu => m68k}/platform/54xx/config.c (100%) rename arch/{m68knommu => m68k}/platform/54xx/firebee.c (100%) rename arch/{m68knommu => m68k}/platform/68328/Makefile (100%) rename arch/{m68knommu => m68k}/platform/68328/bootlogo.h (100%) rename arch/{m68knommu => m68k}/platform/68328/bootlogo.pl (100%) rename arch/{m68knommu => m68k}/platform/68328/config.c (100%) rename arch/{m68knommu => m68k}/platform/68328/entry.S (100%) rename arch/{m68knommu => m68k}/platform/68328/head-de2.S (100%) rename arch/{m68knommu => m68k}/platform/68328/head-pilot.S (100%) rename arch/{m68knommu => m68k}/platform/68328/head-ram.S (100%) rename arch/{m68knommu => m68k}/platform/68328/head-rom.S (100%) rename arch/{m68knommu => m68k}/platform/68328/ints.c (100%) rename arch/{m68knommu => m68k}/platform/68328/romvec.S (100%) rename arch/{m68knommu => m68k}/platform/68328/timers.c (100%) rename arch/{m68knommu => m68k}/platform/68360/Makefile (100%) rename arch/{m68knommu => m68k}/platform/68360/commproc.c (100%) rename arch/{m68knommu => m68k}/platform/68360/config.c (100%) rename arch/{m68knommu => m68k}/platform/68360/entry.S (100%) rename arch/{m68knommu => m68k}/platform/68360/head-ram.S (100%) rename arch/{m68knommu => m68k}/platform/68360/head-rom.S (100%) rename arch/{m68knommu => m68k}/platform/68360/ints.c (100%) rename arch/{m68knommu => m68k}/platform/68EZ328/Makefile (100%) rename arch/{m68knommu => m68k}/platform/68EZ328/bootlogo.h (100%) rename arch/{m68knommu => m68k}/platform/68EZ328/config.c (100%) rename arch/{m68knommu => m68k}/platform/68VZ328/Makefile (100%) rename arch/{m68knommu => m68k}/platform/68VZ328/config.c (100%) rename arch/{m68knommu => m68k}/platform/Makefile (100%) rename arch/{m68knommu => m68k}/platform/coldfire/Makefile (100%) rename arch/{m68knommu => m68k}/platform/coldfire/cache.c (100%) rename arch/{m68knommu => m68k}/platform/coldfire/clk.c (100%) rename arch/{m68knommu => m68k}/platform/coldfire/dma.c (100%) rename arch/{m68knommu => m68k}/platform/coldfire/dma_timer.c (100%) rename arch/{m68knommu => m68k}/platform/coldfire/entry.S (100%) rename arch/{m68knommu => m68k}/platform/coldfire/gpio.c (100%) rename arch/{m68knommu => m68k}/platform/coldfire/head.S (100%) rename arch/{m68knommu => m68k}/platform/coldfire/intc-2.c (100%) rename arch/{m68knommu => m68k}/platform/coldfire/intc-simr.c (100%) rename arch/{m68knommu => m68k}/platform/coldfire/intc.c (100%) rename arch/{m68knommu => m68k}/platform/coldfire/pinmux.c (100%) rename arch/{m68knommu => m68k}/platform/coldfire/pit.c (100%) rename arch/{m68knommu => m68k}/platform/coldfire/sltimers.c (100%) rename arch/{m68knommu => m68k}/platform/coldfire/timers.c (100%) rename arch/{m68knommu => m68k}/platform/coldfire/vectors.c (100%) delete mode 100644 arch/m68knommu/Kconfig.debug delete mode 100644 arch/m68knommu/defconfig delete mode 100644 arch/m68knommu/kernel/.gitignore delete mode 100644 arch/m68knommu/lib/ashldi3.c delete mode 100644 arch/m68knommu/lib/lshrdi3.c create mode 100644 arch/mips/include/asm/pmc-sierra/msp71xx/cpu-feature-overrides.h create mode 100644 arch/mips/include/asm/pmc-sierra/msp71xx/msp_gpio_macros.h create mode 100644 arch/mips/include/asm/pmc-sierra/msp71xx/msp_usb.h create mode 100644 arch/mips/pmc-sierra/msp71xx/msp_eth.c create mode 100644 arch/mips/pmc-sierra/msp71xx/msp_irq_per.c create mode 100644 arch/mips/pmc-sierra/msp71xx/msp_smp.c create mode 100644 arch/mips/pmc-sierra/msp71xx/msp_smtc.c create mode 100644 arch/s390/include/asm/cmpxchg.h create mode 100644 drivers/md/dm-flakey.c create mode 100644 drivers/memstick/host/r592.c create mode 100644 drivers/memstick/host/r592.h create mode 100644 drivers/scsi/aacraid/src.c create mode 100644 drivers/target/loopback/Kconfig create mode 100644 drivers/target/loopback/Makefile create mode 100644 drivers/target/loopback/tcm_loop.c create mode 100644 drivers/target/loopback/tcm_loop.h create mode 100644 drivers/target/target_core_stat.c create mode 100644 drivers/target/target_core_stat.h create mode 100644 include/linux/power/bq20z75.h create mode 100644 include/linux/power/bq27x00_battery.h Merging fixes/fixes $ git merge fixes/fixes Already up-to-date. Merging kbuild-current/rc-fixes $ git merge kbuild-current/rc-fixes Already up-to-date. Merging arm-current/master $ git merge arm-current/master Already up-to-date. Merging m68k-current/for-linus $ git merge m68k-current/for-linus Already up-to-date. Merging powerpc-merge/merge $ git merge powerpc-merge/merge Already up-to-date. Merging 52xx-and-virtex-current/powerpc/merge $ git merge 52xx-and-virtex-current/powerpc/merge Already up-to-date. Merging sparc-current/master $ git merge sparc-current/master Already up-to-date. Merging scsi-rc-fixes/master $ git merge scsi-rc-fixes/master Already up-to-date. Merging net-current/master $ git merge net-current/master Merge made by recursive. net/ipv4/fib_trie.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Merging sound-current/for-linus $ git merge sound-current/for-linus Merge made by recursive. include/sound/pcm.h | 4 +- sound/core/init.c | 4 + sound/core/pcm_native.c | 9 --- sound/oss/dev_table.h | 2 +- sound/oss/midi_synth.c | 30 ++++----- sound/oss/midi_synth.h | 2 +- sound/oss/opl3.c | 23 +++++--- sound/oss/sequencer.c | 2 +- sound/pci/asihpi/asihpi.c | 137 +++++++++++++++++++---------------------- sound/pci/hda/patch_analog.c | 89 ++++++++++++++++++++++++++ sound/pci/hda/patch_realtek.c | 2 +- sound/usb/quirks-table.h | 40 ++++++++++++ 12 files changed, 230 insertions(+), 114 deletions(-) Merging pci-current/for-linus $ git merge pci-current/for-linus Already up-to-date. Merging wireless-current/master $ git merge wireless-current/master Already up-to-date. Merging driver-core.current/driver-core-linus $ git merge driver-core.current/driver-core-linus Already up-to-date. Merging tty.current/tty-linus $ git merge tty.current/tty-linus Already up-to-date. Merging usb.current/usb-linus $ git merge usb.current/usb-linus Already up-to-date. Merging staging.current/staging-linus $ git merge staging.current/staging-linus Already up-to-date. Merging cpufreq-current/fixes $ git merge cpufreq-current/fixes Already up-to-date. Merging input-current/for-linus $ git merge input-current/for-linus Merge made by recursive. drivers/input/tablet/wacom_wac.c | 287 ++++++++++++++++++---------- drivers/input/tablet/wacom_wac.h | 2 + drivers/input/touchscreen/h3600_ts_input.c | 2 +- 3 files changed, 190 insertions(+), 101 deletions(-) Merging md-current/for-linus $ git merge md-current/for-linus Already up-to-date. Merging audit-current/for-linus $ git merge audit-current/for-linus Already up-to-date. Merging crypto-current/master $ git merge crypto-current/master Merge made by recursive. arch/x86/crypto/aesni-intel_asm.S | 5 ++++- arch/x86/crypto/aesni-intel_glue.c | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) Merging ide-curent/master $ git merge ide-curent/master Already up-to-date. Merging dwmw2/master $ git merge dwmw2/master Already up-to-date. Merging sh-current/sh-fixes-for-linus $ git merge sh-current/sh-fixes-for-linus Already up-to-date. Merging rmobile-current/rmobile-fixes-for-linus $ git merge rmobile-current/rmobile-fixes-for-linus Already up-to-date. Merging fbdev-current/fbdev-fixes-for-linus $ git merge fbdev-current/fbdev-fixes-for-linus Merge made by recursive. drivers/video/via/chip.h | 1 - drivers/video/via/hw.c | 17 ++++------ drivers/video/via/hw.h | 3 +- drivers/video/via/viafbdev.c | 74 +++++++++++++++++++++-------------------- 4 files changed, 46 insertions(+), 49 deletions(-) Merging devicetree-current/devicetree/merge $ git merge devicetree-current/devicetree/merge Already up-to-date. Merging spi-current/spi/merge $ git merge spi-current/spi/merge Already up-to-date. Merging arm/for-next $ git merge arm/for-next Already up-to-date. Merging davinci/davinci-next $ git merge davinci/davinci-next Already up-to-date. Merging i.MX/for-next $ git merge i.MX/for-next Resolved 'arch/arm/mach-mxs/mach-mx28evk.c' using previous resolution. Auto-merging arch/arm/mach-mxs/mach-mx28evk.c CONFLICT (content): Merge conflict in arch/arm/mach-mxs/mach-mx28evk.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 73945f7] Merge remote-tracking branch 'i.MX/for-next' $ git diff -M --stat --summary HEAD^.. Merging linux-spec/for-next $ git merge linux-spec/for-next Already up-to-date. Merging msm/for-next $ git merge msm/for-next Already up-to-date. Merging omap/for-next $ git merge omap/for-next Auto-merging arch/arm/mach-omap2/board-omap4panda.c Auto-merging arch/arm/mach-omap2/devices.c Merge made by recursive. arch/arm/mach-omap2/board-omap4panda.c | 28 ---------------------------- arch/arm/mach-omap2/devices.c | 2 +- arch/arm/mach-omap2/gpmc.c | 13 ++++++++----- arch/arm/mach-omap2/omap_l3_smx.c | 11 ++++------- arch/arm/plat-omap/include/plat/irqs.h | 2 +- drivers/hwspinlock/Kconfig | 1 + 6 files changed, 15 insertions(+), 42 deletions(-) Merging pxa/for-next $ git merge pxa/for-next Already up-to-date. Merging samsung/next-samsung $ git merge samsung/next-samsung Already up-to-date. Merging s5p/for-next $ git merge s5p/for-next Already up-to-date. Merging tegra/for-next $ git merge tegra/for-next Already up-to-date. Merging ux500-core/ux500-core $ git merge ux500-core/ux500-core Recorded preimage for 'arch/arm/plat-nomadik/gpio.c' Resolved 'arch/arm/configs/u8500_defconfig' using previous resolution. Auto-merging arch/arm/configs/u8500_defconfig CONFLICT (content): Merge conflict in arch/arm/configs/u8500_defconfig Auto-merging arch/arm/plat-nomadik/gpio.c CONFLICT (content): Merge conflict in arch/arm/plat-nomadik/gpio.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'arch/arm/plat-nomadik/gpio.c'. [master 3db8caa] Merge remote-tracking branch 'ux500-core/ux500-core' $ git diff -M --stat --summary HEAD^.. arch/arm/configs/u8500_defconfig | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) Merging avr32/avr32-arch $ git merge avr32/avr32-arch Already up-to-date. Merging blackfin/for-linus $ git merge blackfin/for-linus Merge made by recursive. arch/blackfin/configs/BF527-AD7160-EVAL_defconfig | 1 - arch/blackfin/configs/BF538-EZKIT_defconfig | 1 - arch/blackfin/configs/BF561-ACVILON_defconfig | 1 - arch/blackfin/configs/BlackStamp_defconfig | 1 + arch/blackfin/configs/CM-BF527_defconfig | 1 - arch/blackfin/configs/CM-BF533_defconfig | 1 - arch/blackfin/configs/CM-BF548_defconfig | 1 - arch/blackfin/configs/DNP5370_defconfig | 1 - arch/blackfin/configs/H8606_defconfig | 1 + arch/blackfin/configs/SRV1_defconfig | 1 + arch/blackfin/include/asm/bitops.h | 4 +- arch/blackfin/kernel/module.c | 45 ++++++++------------ 12 files changed, 24 insertions(+), 35 deletions(-) Merging cris/for-next $ git merge cris/for-next Auto-merging arch/cris/Kconfig Removing arch/cris/arch-v32/drivers/pcf8563.c Merge made by recursive. arch/cris/Kconfig | 3 +- arch/cris/arch-v10/drivers/pcf8563.c | 2 +- arch/cris/arch-v32/drivers/Makefile | 1 - arch/cris/arch-v32/drivers/pcf8563.c | 377 ---------------------------------- 4 files changed, 2 insertions(+), 381 deletions(-) delete mode 100644 arch/cris/arch-v32/drivers/pcf8563.c Merging ia64/test $ git merge ia64/test Already up-to-date. Merging m68k/for-next $ git merge m68k/for-next Already up-to-date. Merging m68knommu/for-next $ git merge m68knommu/for-next Merge made by recursive. Merging microblaze/next $ git merge microblaze/next Already up-to-date. Merging mips/mips-for-linux-next $ git merge mips/mips-for-linux-next Merge made by recursive. Merging parisc/for-next $ git merge parisc/for-next 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 52xx-and-virtex/powerpc/next $ git merge 52xx-and-virtex/powerpc/next Already up-to-date. Merging galak/next $ git merge galak/next Already up-to-date. Merging s390/features $ git merge s390/features Merge made by recursive. arch/s390/oprofile/hwsampler.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) Merging sh/sh-latest $ git merge sh/sh-latest Already up-to-date. Merging rmobile/rmobile-latest $ git merge rmobile/rmobile-latest Already up-to-date. Merging sparc/master $ git merge sparc/master Already up-to-date. Merging tile/master $ git merge tile/master Already up-to-date. Merging unicore32/unicore32 $ git merge unicore32/unicore32 Already up-to-date. Merging xtensa/master $ git merge xtensa/master Resolved 'arch/xtensa/configs/iss_defconfig' using previous resolution. Auto-merging arch/xtensa/Kconfig Auto-merging arch/xtensa/Makefile Auto-merging arch/xtensa/boot/Makefile Auto-merging arch/xtensa/configs/iss_defconfig CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig Auto-merging arch/xtensa/include/asm/coprocessor.h Auto-merging arch/xtensa/kernel/Makefile Auto-merging arch/xtensa/kernel/time.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 34666b0] Merge remote-tracking branch 'xtensa/master' $ git diff -M --stat --summary HEAD^.. arch/xtensa/Kconfig | 17 +- arch/xtensa/Makefile | 5 +- arch/xtensa/boot/Makefile | 1 + arch/xtensa/include/asm/coprocessor.h | 9 +- arch/xtensa/include/asm/io.h | 40 ++-- arch/xtensa/include/asm/irq.h | 7 +- arch/xtensa/include/asm/serial.h | 12 +- arch/xtensa/kernel/Makefile | 4 +- arch/xtensa/kernel/time.c | 2 +- arch/xtensa/platforms/xtavnet/Makefile | 10 + .../platforms/xtavnet/include/platform/hardware.h | 85 ++++++ .../platforms/xtavnet/include/platform/lcd.h | 22 ++ .../platforms/xtavnet/include/platform/serial.h | 1 + arch/xtensa/platforms/xtavnet/lcd.c | 79 ++++++ arch/xtensa/platforms/xtavnet/setup.c | 269 ++++++++++++++++++++ 15 files changed, 526 insertions(+), 37 deletions(-) create mode 100644 arch/xtensa/platforms/xtavnet/Makefile create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/hardware.h create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/lcd.h create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/serial.h create mode 100644 arch/xtensa/platforms/xtavnet/lcd.c create mode 100644 arch/xtensa/platforms/xtavnet/setup.c Merging ceph/for-next $ git merge ceph/for-next Already up-to-date. Merging cifs/master $ git merge cifs/master Auto-merging fs/cifs/file.c Removing fs/cifs/smbdes.c Merge made by recursive. fs/cifs/Kconfig | 35 +- fs/cifs/Makefile | 4 +- fs/cifs/README | 28 - fs/cifs/TODO | 2 + fs/cifs/cache.c | 8 +- fs/cifs/cifs_debug.c | 386 ++++---- fs/cifs/cifs_debug.h | 12 +- fs/cifs/cifs_dfs_ref.c | 2 +- fs/cifs/cifs_fs_sb.h | 4 +- fs/cifs/cifs_spnego.c | 6 +- fs/cifs/cifs_spnego.h | 2 +- fs/cifs/cifs_unicode.c | 61 ++ fs/cifs/cifs_unicode.h | 10 + fs/cifs/cifsacl.c | 6 +- fs/cifs/cifsacl.h | 2 +- fs/cifs/cifsencrypt.c | 32 +- fs/cifs/cifsfs.c | 69 +- fs/cifs/cifsfs.h | 14 +- fs/cifs/cifsglob.h | 197 +++-- fs/cifs/cifspdu.h | 6 +- fs/cifs/cifsproto.h | 182 ++-- fs/cifs/cifssmb.c | 532 ++++++----- fs/cifs/connect.c | 190 +++-- fs/cifs/dir.c | 8 +- fs/cifs/export.c | 4 +- fs/cifs/file.c | 139 +--- fs/cifs/fscache.c | 6 +- fs/cifs/fscache.h | 8 +- fs/cifs/inode.c | 52 +- fs/cifs/ioctl.c | 2 +- fs/cifs/link.c | 16 +- fs/cifs/maperror.c | 1830 ++++++++++++++++++++++++++++++++++ fs/cifs/misc.c | 45 +- fs/cifs/ntlmssp.h | 10 + fs/cifs/readdir.c | 8 +- fs/cifs/sess.c | 78 +- fs/cifs/smb2glob.h | 258 +++++ fs/cifs/smb2misc.c | 336 +++++++ fs/cifs/smb2pdu.c | 2506 +++++++++++++++++++++++++++++++++++++++++++++++ fs/cifs/smb2pdu.h | 996 +++++++++++++++++++ fs/cifs/smb2proto.h | 200 ++++ fs/cifs/smb2sess.c | 80 ++ fs/cifs/smb2status.h | 1782 +++++++++++++++++++++++++++++++++ fs/cifs/smb2transport.c | 322 ++++++ fs/cifs/smbdes.c | 418 -------- fs/cifs/smbencrypt.c | 124 ++- fs/cifs/transport.c | 135 ++-- fs/cifs/xattr.c | 28 +- 48 files changed, 9677 insertions(+), 1504 deletions(-) create mode 100644 fs/cifs/maperror.c create mode 100644 fs/cifs/smb2glob.h create mode 100644 fs/cifs/smb2misc.c create mode 100644 fs/cifs/smb2pdu.c create mode 100644 fs/cifs/smb2pdu.h create mode 100644 fs/cifs/smb2proto.h create mode 100644 fs/cifs/smb2sess.c create mode 100644 fs/cifs/smb2status.h create mode 100644 fs/cifs/smb2transport.c delete mode 100644 fs/cifs/smbdes.c Merging configfs/linux-next $ git merge configfs/linux-next Already up-to-date. Merging ecryptfs/next $ git merge ecryptfs/next Merge made by recursive. fs/ecryptfs/crypto.c | 23 ++++- fs/ecryptfs/ecryptfs_kernel.h | 32 +++--- fs/ecryptfs/file.c | 12 ++- fs/ecryptfs/inode.c | 42 +------ fs/ecryptfs/keystore.c | 272 ++++++++++++++++++++++++++--------------- fs/ecryptfs/main.c | 10 +- fs/ecryptfs/mmap.c | 61 +++++---- fs/ecryptfs/read_write.c | 12 +-- fs/ecryptfs/super.c | 3 +- 9 files changed, 263 insertions(+), 204 deletions(-) Merging ext3/for_next $ git merge ext3/for_next Already up-to-date. Merging ext4/next $ git merge ext4/next Already up-to-date. Merging fatfs/master $ git merge fatfs/master Already up-to-date. Merging fuse/for-next $ git merge fuse/for-next Already up-to-date. Merging gfs2/master $ git merge gfs2/master Already up-to-date. Merging hfsplus/for-next $ git merge hfsplus/for-next Merge made by recursive. fs/hfsplus/extents.c | 9 ++++++--- fs/hfsplus/super.c | 9 +++++++++ fs/hfsplus/unicode.c | 35 +++++++++++++++++++++++++++-------- fs/hfsplus/wrapper.c | 9 +++------ 4 files changed, 45 insertions(+), 17 deletions(-) Merging jfs/next $ git merge jfs/next Already up-to-date. Merging logfs/master $ git merge logfs/master Resolved 'fs/logfs/logfs.h' using previous resolution. Auto-merging fs/logfs/logfs.h CONFLICT (content): Merge conflict in fs/logfs/logfs.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master e29a571] Merge remote-tracking branch 'logfs/master' $ git diff -M --stat --summary HEAD^.. Merging nfs/linux-next $ git merge nfs/linux-next Already up-to-date. Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Merge made by recursive. fs/nfsd/lockd.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) Merging nilfs2/for-next $ git merge nilfs2/for-next Auto-merging fs/nilfs2/inode.c Merge made by recursive. fs/nilfs2/inode.c | 3 +-- fs/nilfs2/nilfs.h | 14 +++++++------- fs/nilfs2/segment.c | 6 ++---- 3 files changed, 10 insertions(+), 13 deletions(-) Merging ocfs2/linux-next $ git merge ocfs2/linux-next Recorded preimage for 'fs/ocfs2/super.c' Auto-merging fs/ocfs2/acl.c Auto-merging fs/ocfs2/aops.c Auto-merging fs/ocfs2/cluster/heartbeat.c Auto-merging fs/ocfs2/dir.c Auto-merging fs/ocfs2/ioctl.c Auto-merging fs/ocfs2/namei.c Auto-merging fs/ocfs2/ocfs2.h Auto-merging fs/ocfs2/quota_global.c Auto-merging fs/ocfs2/refcounttree.c Auto-merging fs/ocfs2/super.c CONFLICT (content): Merge conflict in fs/ocfs2/super.c Auto-merging fs/ocfs2/xattr.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'fs/ocfs2/super.c'. [master 694f187] Merge remote-tracking branch 'ocfs2/linux-next' $ git diff -M --stat --summary HEAD^.. fs/ocfs2/acl.c | 1 - fs/ocfs2/alloc.c | 214 ++-- fs/ocfs2/aops.c | 82 +- fs/ocfs2/buffer_head_io.c | 49 +- fs/ocfs2/cluster/heartbeat.c | 3 - fs/ocfs2/cluster/masklog.c | 20 +- fs/ocfs2/cluster/masklog.h | 105 +-- fs/ocfs2/cluster/tcp.c | 10 +- fs/ocfs2/dcache.c | 45 +- fs/ocfs2/dir.c | 121 +-- fs/ocfs2/dlm/dlmconvert.c | 6 +- fs/ocfs2/dlm/dlmdomain.c | 36 +- fs/ocfs2/dlm/dlmlock.c | 10 +- fs/ocfs2/dlm/dlmmaster.c | 6 +- fs/ocfs2/dlm/dlmrecovery.c | 9 +- fs/ocfs2/dlm/dlmunlock.c | 4 +- fs/ocfs2/dlmglue.c | 246 +--- fs/ocfs2/export.c | 47 +- fs/ocfs2/extent_map.c | 10 +- fs/ocfs2/file.c | 220 ++-- fs/ocfs2/heartbeat.c | 4 +- fs/ocfs2/inode.c | 134 +-- fs/ocfs2/ioctl.c | 41 +- fs/ocfs2/journal.c | 168 +-- fs/ocfs2/localalloc.c | 109 +- fs/ocfs2/locks.c | 1 - fs/ocfs2/mmap.c | 7 +- fs/ocfs2/namei.c | 175 ++-- fs/ocfs2/ocfs2.h | 23 +- fs/ocfs2/ocfs2_trace.h | 2739 ++++++++++++++++++++++++++++++++++++++++++ fs/ocfs2/quota_global.c | 45 +- fs/ocfs2/quota_local.c | 16 +- fs/ocfs2/refcounttree.c | 158 ++-- fs/ocfs2/reservations.c | 57 +- fs/ocfs2/resize.c | 23 +- fs/ocfs2/slot_map.c | 16 +- fs/ocfs2/suballoc.c | 189 ++-- fs/ocfs2/super.c | 89 +- fs/ocfs2/symlink.c | 14 +- fs/ocfs2/sysfile.c | 1 - fs/ocfs2/uptodate.c | 73 +- fs/ocfs2/xattr.c | 155 ++-- 42 files changed, 3855 insertions(+), 1626 deletions(-) create mode 100644 fs/ocfs2/ocfs2_trace.h Merging omfs/for-next $ git merge omfs/for-next Already up-to-date. Merging squashfs/master $ git merge squashfs/master Already up-to-date. Merging udf/for_next $ git merge udf/for_next Already up-to-date. Merging v9fs/for-next $ git merge v9fs/for-next Already up-to-date. Merging ubifs/linux-next $ git merge ubifs/linux-next Already up-to-date. Merging xfs/master $ git merge xfs/master Recorded preimage for 'fs/xfs/linux-2.6/xfs_buf.c' Auto-merging fs/xfs/linux-2.6/xfs_buf.c CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_buf.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'fs/xfs/linux-2.6/xfs_buf.c'. [master a51a3e8] Merge remote-tracking branch 'xfs/master' $ git diff -M --stat --summary HEAD^.. fs/xfs/linux-2.6/xfs_buf.c | 356 +++++++++++------------------------------- fs/xfs/linux-2.6/xfs_buf.h | 40 +----- fs/xfs/linux-2.6/xfs_file.c | 6 +- fs/xfs/linux-2.6/xfs_ioctl.c | 4 + fs/xfs/linux-2.6/xfs_super.c | 36 +++-- fs/xfs/linux-2.6/xfs_sync.c | 30 ++++- fs/xfs/xfs_inode.c | 2 +- fs/xfs/xfs_inode_item.c | 6 +- fs/xfs/xfs_trans_buf.c | 3 +- fs/xfs/xfs_vnodeops.c | 3 +- fs/xfs/xfs_vnodeops.h | 1 + 11 files changed, 167 insertions(+), 320 deletions(-) $ git reset --hard HEAD^ HEAD is now at 694f187 Merge remote-tracking branch 'ocfs2/linux-next' Merging refs/next/20110325/xfs $ git merge refs/next/20110325/xfs Already up-to-date. Merging vfs/for-next $ git merge vfs/for-next Already up-to-date. Merging vfs-scale/vfs-scale-working $ git merge vfs-scale/vfs-scale-working Already up-to-date. Merging pci/linux-next $ git merge pci/linux-next Already up-to-date. Merging hid/for-next $ git merge hid/for-next Already up-to-date. Merging quilt/i2c $ git merge quilt/i2c Already up-to-date. Merging bjdooks-i2c/next-i2c $ git merge bjdooks-i2c/next-i2c Resolved 'drivers/i2c/busses/i2c-pxa.c' using previous resolution. Auto-merging drivers/i2c/busses/Kconfig Auto-merging drivers/i2c/busses/Makefile Auto-merging drivers/i2c/busses/i2c-designware-core.c Removing drivers/i2c/busses/i2c-intel-mid.c Auto-merging drivers/i2c/busses/i2c-pxa.c CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-pxa.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 052088a] Merge remote-tracking branch 'bjdooks-i2c/next-i2c' $ git diff -M --stat --summary HEAD^.. drivers/i2c/busses/Kconfig | 25 +- drivers/i2c/busses/Makefile | 6 +- .../{i2c-designware.c => i2c-designware-core.c} | 383 ++----- drivers/i2c/busses/i2c-designware-core.h | 106 ++ drivers/i2c/busses/i2c-designware-pcidrv.c | 405 +++++++ drivers/i2c/busses/i2c-designware-platdrv.c | 215 ++++ drivers/i2c/busses/i2c-intel-mid.c | 1135 -------------------- 7 files changed, 862 insertions(+), 1413 deletions(-) rename drivers/i2c/busses/{i2c-designware.c => i2c-designware-core.c} (65%) create mode 100644 drivers/i2c/busses/i2c-designware-core.h create mode 100644 drivers/i2c/busses/i2c-designware-pcidrv.c create mode 100644 drivers/i2c/busses/i2c-designware-platdrv.c delete mode 100644 drivers/i2c/busses/i2c-intel-mid.c Merging quilt/jdelvare-hwmon $ git merge quilt/jdelvare-hwmon Merge made by recursive. Documentation/hwmon/f71882fg | 19 ++++++ drivers/hwmon/Kconfig | 17 +++++- drivers/hwmon/f71882fg.c | 126 ++++++++++++++++++++++++++++-------------- 3 files changed, 117 insertions(+), 45 deletions(-) Merging hwmon-staging/hwmon-next $ git merge hwmon-staging/hwmon-next Merge made by recursive. drivers/hwmon/pmbus_core.c | 70 ++++++++++++++++++++++--------------------- 1 files changed, 36 insertions(+), 34 deletions(-) Merging quilt/kernel-doc $ git merge quilt/kernel-doc Auto-merging kernel/signal.c Merge made by recursive. .../ABI/testing/sysfs-driver-hid-roccat-kone | 2 +- .../ABI/testing/sysfs-driver-hid-roccat-koneplus | 8 +- .../ABI/testing/sysfs-driver-hid-roccat-kovaplus | 8 +- .../ABI/testing/sysfs-driver-hid-roccat-pyra | 8 +- .../ABI/testing/sysfs-platform-asus-laptop | 2 +- Documentation/devicetree/booting-without-of.txt | 6 +- Documentation/dvb/udev.txt | 2 +- Documentation/edac.txt | 2 +- Documentation/kernel-parameters.txt | 11 +- Documentation/kmemleak.txt | 4 +- Documentation/laptops/asus-laptop.txt | 4 +- Documentation/networking/batman-adv.txt | 2 +- Documentation/s390/Debugging390.txt | 2 +- Documentation/scsi/sym53c8xx_2.txt | 2 +- Documentation/sound/alsa/ALSA-Configuration.txt | 2 +- Documentation/sound/oss/AudioExcelDSP16 | 6 +- Documentation/sound/oss/README.ymfsb | 2 +- Documentation/video4linux/bttv/Insmod-options | 2 +- Documentation/video4linux/bttv/Sound-FAQ | 2 +- Documentation/video4linux/et61x251.txt | 4 +- Documentation/video4linux/sn9c102.txt | 4 +- Documentation/video4linux/w9968cf.txt | 2 +- Documentation/video4linux/zc0301.txt | 6 +- arch/powerpc/mm/tlb_low_64e.S | 2 +- arch/powerpc/platforms/Kconfig | 2 +- kernel/signal.c | 153 ++++++++++++++------ 26 files changed, 159 insertions(+), 91 deletions(-) Merging v4l-dvb/master $ git merge v4l-dvb/master Resolved 'arch/arm/mach-omap2/devices.c' using previous resolution. Resolved 'drivers/staging/Kconfig' using previous resolution. Resolved 'drivers/staging/easycap/easycap_ioctl.c' using previous resolution. Auto-merging arch/arm/mach-omap2/devices.c CONFLICT (content): Merge conflict in arch/arm/mach-omap2/devices.c Auto-merging drivers/staging/Kconfig CONFLICT (content): Merge conflict in drivers/staging/Kconfig Auto-merging drivers/staging/easycap/easycap_ioctl.c CONFLICT (content): Merge conflict in drivers/staging/easycap/easycap_ioctl.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 53849d8] Merge remote-tracking branch 'v4l-dvb/master' $ git diff -M --stat --summary HEAD^.. Merging kbuild/for-next $ git merge kbuild/for-next Already up-to-date! Merge made by recursive. Merging kconfig/for-next $ git merge kconfig/for-next Already up-to-date! Merge made by recursive. Merging ide/master $ git merge ide/master Already up-to-date. Merging libata/NEXT $ git merge libata/NEXT Already up-to-date. Merging infiniband/for-next $ git merge infiniband/for-next Already up-to-date. Merging acpi/test $ git merge acpi/test Merge made by recursive. drivers/acpi/acpica/acglobal.h | 13 +++---- drivers/acpi/acpica/evmisc.c | 74 +++++++++++++++++++++------------------ drivers/acpi/acpica/utmutex.c | 12 +++++-- drivers/acpi/osl.c | 33 +++++++++++++---- include/acpi/acpiosxf.h | 3 ++ 5 files changed, 83 insertions(+), 52 deletions(-) Merging idle-test/idle-test $ git merge idle-test/idle-test Already up-to-date. Merging powertools/tools-test $ git merge powertools/tools-test Already up-to-date. Merging ieee1394/for-next $ git merge ieee1394/for-next Already up-to-date! Merge made by recursive. Merging ubi/linux-next $ git merge ubi/linux-next Already up-to-date. Merging kvm/linux-next $ git merge kvm/linux-next Auto-merging virt/kvm/kvm_main.c Merge made by recursive. virt/kvm/eventfd.c | 2 +- virt/kvm/kvm_main.c | 23 +++++++++++++++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) Merging dlm/next $ git merge dlm/next Already up-to-date. Merging swiotlb/master $ git merge swiotlb/master Already up-to-date. Merging ibft/master $ git merge ibft/master Already up-to-date. Merging scsi/master $ git merge scsi/master Already up-to-date. Merging async_tx/next $ git merge async_tx/next Already up-to-date. Merging net/master $ git merge net/master Already up-to-date. Merging wireless/master $ git merge wireless/master Already up-to-date. Merging bluetooth/master $ git merge bluetooth/master Auto-merging net/bluetooth/hidp/core.c Auto-merging net/bluetooth/hidp/hidp.h Merge made by recursive. include/net/bluetooth/hci.h | 32 +++++- include/net/bluetooth/hci_core.h | 21 +++- include/net/bluetooth/l2cap.h | 1 - include/net/bluetooth/mgmt.h | 33 +++++ net/bluetooth/bnep/bnep.h | 146 +++++++++++----------- net/bluetooth/bnep/core.c | 50 +++++--- net/bluetooth/bnep/sock.c | 2 +- net/bluetooth/cmtp/cmtp.h | 2 +- net/bluetooth/cmtp/core.c | 9 +- net/bluetooth/cmtp/sock.c | 2 +- net/bluetooth/hci_core.c | 68 ++++++++++- net/bluetooth/hci_event.c | 70 ++++++++++- net/bluetooth/hci_sysfs.c | 6 +- net/bluetooth/hidp/core.c | 37 +++--- net/bluetooth/hidp/hidp.h | 4 +- net/bluetooth/hidp/sock.c | 7 +- net/bluetooth/l2cap_core.c | 3 +- net/bluetooth/mgmt.c | 252 ++++++++++++++++++++++++++++++++++++- 18 files changed, 600 insertions(+), 145 deletions(-) Merging mtd/master $ git merge mtd/master Auto-merging arch/arm/plat-omap/include/plat/onenand.h Auto-merging arch/cris/Kconfig Auto-merging drivers/mtd/maps/physmap_of.c Auto-merging drivers/mtd/nand/Kconfig Auto-merging drivers/mtd/nand/mpc5121_nfc.c Auto-merging drivers/mtd/nand/mxc_nand.c Auto-merging drivers/mtd/nand/omap2.c Auto-merging drivers/mtd/onenand/omap2.c Auto-merging drivers/mtd/sm_ftl.c Auto-merging lib/Kconfig Auto-merging lib/Makefile Merge made by recursive. arch/arm/plat-omap/include/plat/onenand.h | 1 + arch/arm/plat-pxa/include/plat/pxa3xx_nand.h | 2 +- arch/cris/Kconfig | 1 - arch/cris/arch-v10/drivers/axisflashmap.c | 6 - arch/cris/arch-v32/drivers/Kconfig | 1 - arch/cris/arch-v32/drivers/axisflashmap.c | 6 - drivers/mtd/Kconfig | 26 +- drivers/mtd/Makefile | 4 +- drivers/mtd/chips/cfi_cmdset_0001.c | 2 +- drivers/mtd/chips/cfi_cmdset_0002.c | 3 +- drivers/mtd/chips/cfi_cmdset_0020.c | 2 +- drivers/mtd/devices/m25p80.c | 5 +- drivers/mtd/devices/mtdram.c | 1 + drivers/mtd/devices/phram.c | 3 + drivers/mtd/maps/Kconfig | 13 +- drivers/mtd/maps/Makefile | 1 + drivers/mtd/maps/ceiva.c | 6 - drivers/mtd/maps/integrator-flash.c | 10 - drivers/mtd/maps/latch-addr-flash.c | 272 +++++ drivers/mtd/maps/physmap.c | 8 - drivers/mtd/maps/physmap_of.c | 8 - drivers/mtd/maps/sa1100-flash.c | 8 - drivers/mtd/maps/ts5500_flash.c | 1 - drivers/mtd/mtd_blkdevs.c | 37 +- drivers/mtd/mtdconcat.c | 8 +- drivers/mtd/mtdcore.c | 6 +- drivers/mtd/mtdswap.c | 1593 ++++++++++++++++++++++++++ drivers/mtd/nand/Kconfig | 15 + drivers/mtd/nand/Makefile | 1 + drivers/mtd/nand/atmel_nand.c | 166 +++- drivers/mtd/nand/davinci_nand.c | 3 - drivers/mtd/nand/mpc5121_nfc.c | 5 +- drivers/mtd/nand/mxc_nand.c | 31 +- drivers/mtd/nand/nand_base.c | 42 +- drivers/mtd/nand/nand_bbt.c | 8 +- drivers/mtd/nand/nand_bch.c | 243 ++++ drivers/mtd/nand/nandsim.c | 43 +- drivers/mtd/nand/omap2.c | 16 +- drivers/mtd/nand/pxa3xx_nand.c | 977 ++++++++--------- drivers/mtd/onenand/omap2.c | 7 +- drivers/mtd/onenand/onenand_base.c | 15 +- drivers/mtd/sm_ftl.c | 18 + drivers/mtd/tests/mtd_speedtest.c | 80 ++- drivers/mtd/tests/mtd_subpagetest.c | 10 +- fs/jffs2/xattr.c | 2 +- include/linux/bch.h | 79 ++ include/linux/mtd/blktrans.h | 2 + include/linux/mtd/cfi.h | 1 + include/linux/mtd/latch-addr-flash.h | 29 + include/linux/mtd/nand.h | 3 + include/linux/mtd/nand_bch.h | 72 ++ include/linux/mtd/onenand.h | 1 + lib/Kconfig | 39 + lib/Makefile | 1 + lib/bch.c | 1368 ++++++++++++++++++++++ 55 files changed, 4664 insertions(+), 647 deletions(-) create mode 100644 drivers/mtd/maps/latch-addr-flash.c create mode 100644 drivers/mtd/mtdswap.c create mode 100644 drivers/mtd/nand/nand_bch.c create mode 100644 include/linux/bch.h create mode 100644 include/linux/mtd/latch-addr-flash.h create mode 100644 include/linux/mtd/nand_bch.h create mode 100644 lib/bch.c $ git revert 89d8d32060de [master c4911eb] Revert "mtd: fix printf format warnings, mostly lack of %zd for size_t, in mtdswap" 1 files changed, 8 insertions(+), 8 deletions(-) $ git revert a32159024620 [master 659a010] Revert "mtd: Add mtdswap block driver" 3 files changed, 0 insertions(+), 1612 deletions(-) delete mode 100644 drivers/mtd/mtdswap.c $ git revert c7519dbf6f4b [master ccd14ed] Revert "mtd_blkdevs: Add background processing support" 2 files changed, 0 insertions(+), 28 deletions(-) Merging crypto/master $ git merge crypto/master Merge made by recursive. .../devicetree/bindings/crypto/fsl-sec4.txt | 397 +++++ arch/powerpc/boot/dts/p4080ds.dts | 86 +- drivers/crypto/Kconfig | 2 + drivers/crypto/Makefile | 1 + drivers/crypto/caam/Kconfig | 72 + drivers/crypto/caam/Makefile | 8 + drivers/crypto/caam/caamalg.c | 1163 ++++++++++++++ drivers/crypto/caam/compat.h | 35 + drivers/crypto/caam/ctrl.c | 270 ++++ drivers/crypto/caam/desc.h | 1605 ++++++++++++++++++++ drivers/crypto/caam/desc_constr.h | 204 +++ drivers/crypto/caam/error.c | 248 +++ drivers/crypto/caam/error.h | 10 + drivers/crypto/caam/intern.h | 113 ++ drivers/crypto/caam/jr.c | 523 +++++++ drivers/crypto/caam/jr.h | 21 + drivers/crypto/caam/regs.h | 663 ++++++++ drivers/crypto/padlock-sha.c | 269 ++++- drivers/crypto/picoxcell_crypto.c | 64 +- 19 files changed, 5719 insertions(+), 35 deletions(-) create mode 100644 Documentation/devicetree/bindings/crypto/fsl-sec4.txt create mode 100644 drivers/crypto/caam/Kconfig create mode 100644 drivers/crypto/caam/Makefile create mode 100644 drivers/crypto/caam/caamalg.c create mode 100644 drivers/crypto/caam/compat.h create mode 100644 drivers/crypto/caam/ctrl.c create mode 100644 drivers/crypto/caam/desc.h create mode 100644 drivers/crypto/caam/desc_constr.h create mode 100644 drivers/crypto/caam/error.c create mode 100644 drivers/crypto/caam/error.h create mode 100644 drivers/crypto/caam/intern.h create mode 100644 drivers/crypto/caam/jr.c create mode 100644 drivers/crypto/caam/jr.h create mode 100644 drivers/crypto/caam/regs.h Merging sound/for-next $ git merge sound/for-next Already up-to-date! Merge made by recursive. Merging sound-asoc/for-next $ git merge sound-asoc/for-next Merge made by recursive. include/sound/soc-dapm.h | 16 ++++++++-------- sound/soc/imx/imx-pcm-dma-mx2.c | 9 +++++++-- sound/soc/imx/imx-ssi.h | 3 --- 3 files changed, 15 insertions(+), 13 deletions(-) Merging cpufreq/next $ git merge cpufreq/next Already up-to-date. Merging quilt/rr $ git merge quilt/rr Auto-merging drivers/char/virtio_console.c Auto-merging kernel/module.c Merge made by recursive. drivers/block/virtio_blk.c | 88 ++++++++++++++++++++++++++++++++++++----- drivers/char/virtio_console.c | 16 ------- drivers/virtio/virtio_pci.c | 15 ++++--- include/linux/module.h | 28 +++++++------ include/linux/moduleparam.h | 7 ++- kernel/module.c | 4 +- kernel/params.c | 9 +++- 7 files changed, 113 insertions(+), 54 deletions(-) Merging input/next $ git merge input/next Already up-to-date. Merging input-mt/next $ git merge input-mt/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 Auto-merging drivers/block/drbd/drbd_nl.c Merge made by recursive. .../ABI/testing/sysfs-bus-pci-devices-cciss | 12 + drivers/block/cciss.c | 86 ++- drivers/block/cciss.h | 1 + drivers/block/cciss_cmd.h | 1 + drivers/block/cciss_scsi.c | 13 +- drivers/block/drbd/drbd_actlog.c | 335 +++------- drivers/block/drbd/drbd_bitmap.c | 752 +++++++++++++------- drivers/block/drbd/drbd_int.h | 270 +++++--- drivers/block/drbd/drbd_main.c | 673 ++++++++++++------ drivers/block/drbd/drbd_nl.c | 183 ++++-- drivers/block/drbd/drbd_proc.c | 114 +++- drivers/block/drbd/drbd_receiver.c | 608 ++++++++++------ drivers/block/drbd/drbd_req.c | 169 ++++- drivers/block/drbd/drbd_req.h | 36 +- drivers/block/drbd/drbd_strings.c | 6 +- drivers/block/drbd/drbd_worker.c | 360 +++++----- drivers/block/drbd/drbd_wrappers.h | 2 +- include/linux/drbd.h | 23 +- include/linux/drbd_limits.h | 12 +- include/linux/drbd_nl.h | 13 +- include/linux/drbd_tag_magic.h | 1 + 21 files changed, 2267 insertions(+), 1403 deletions(-) $ git am -3 ../patches/0001-drbd-update-for-bitop-api-changes.patch Applying: drbd: update for bitop api changes $ git reset HEAD^ Unstaged changes after reset: M drivers/block/drbd/drbd_bitmap.c $ git add . $ git commit -v -a --amend [master 45eb919] Merge remote-tracking branch 'block/for-next' $ git revert f0ff1357ce39 [master db69d5b6] Revert "drbd: need include for bitops functions declarations" 1 files changed, 0 insertions(+), 3 deletions(-) Merging quilt/device-mapper $ git merge quilt/device-mapper Already up-to-date. Merging embedded/master $ git merge embedded/master Already up-to-date. Merging firmware/master $ git merge firmware/master Already up-to-date. Merging pcmcia/master $ git merge pcmcia/master Already up-to-date. Merging battery/master $ git merge battery/master Already up-to-date. Merging leds/for-mm $ git merge leds/for-mm Resolved 'drivers/leds/Kconfig' using previous resolution. Auto-merging drivers/leds/Kconfig CONFLICT (content): Merge conflict in drivers/leds/Kconfig Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 76b1fcc] Merge remote-tracking branch 'leds/for-mm' $ git diff -M --stat --summary HEAD^.. Merging backlight/for-mm $ git merge backlight/for-mm Already up-to-date. Merging mmc/mmc-next $ git merge mmc/mmc-next Auto-merging drivers/mmc/host/sh_mobile_sdhi.c Merge made by recursive. arch/arm/mach-shmobile/board-ap4evb.c | 6 +- arch/arm/mach-shmobile/board-g4evm.c | 6 +- arch/arm/mach-shmobile/board-mackerel.c | 8 +- arch/sh/boards/mach-ap325rxa/setup.c | 6 +- arch/sh/boards/mach-ecovec24/setup.c | 12 +- arch/sh/boards/mach-kfr2r09/setup.c | 4 +- arch/sh/boards/mach-migor/setup.c | 4 +- arch/sh/boards/mach-se/7724/setup.c | 6 +- drivers/mfd/Kconfig | 14 - drivers/mfd/Makefile | 1 - drivers/mmc/card/mmc_test.c | 3 +- drivers/mmc/core/sd_ops.c | 14 +- drivers/mmc/host/Kconfig | 13 +- drivers/mmc/host/Makefile | 8 +- drivers/mmc/host/dw_mmc.c | 4 +- drivers/mmc/host/mmci.c | 13 +- drivers/mmc/host/of_mmc_spi.c | 2 + drivers/mmc/host/sdhci-esdhc-imx.c | 86 ++- drivers/mmc/host/sdhci-esdhc.h | 3 +- drivers/mmc/host/sdhci-of-esdhc.c | 3 +- drivers/mmc/host/sdhci-pci.c | 6 +- drivers/mmc/host/sdhci-pltfm.h | 2 +- drivers/mmc/host/sdhci.h | 1 + drivers/{mfd => mmc/host}/sh_mobile_sdhi.c | 95 +-- drivers/mmc/host/tmio_mmc.c | 1285 +-------------------------- drivers/mmc/host/tmio_mmc.h | 123 +++ drivers/mmc/host/tmio_mmc_dma.c | 317 +++++++ drivers/mmc/host/tmio_mmc_pio.c | 897 +++++++++++++++++++ drivers/mmc/host/via-sdmmc.c | 5 +- include/linux/{mfd => mmc}/sh_mobile_sdhi.h | 0 include/linux/mmc/tmio.h | 63 ++ 31 files changed, 1614 insertions(+), 1396 deletions(-) rename drivers/{mfd => mmc/host}/sh_mobile_sdhi.c (63%) create mode 100644 drivers/mmc/host/tmio_mmc.h create mode 100644 drivers/mmc/host/tmio_mmc_dma.c create mode 100644 drivers/mmc/host/tmio_mmc_pio.c rename include/linux/{mfd => mmc}/sh_mobile_sdhi.h (100%) create mode 100644 include/linux/mmc/tmio.h $ git reset --hard HEAD^ HEAD is now at 76b1fcc Merge remote-tracking branch 'leds/for-mm' Merging refs/next/20110325/mmc $ git merge refs/next/20110325/mmc Auto-merging drivers/mmc/host/mmci.c Merge made by recursive. drivers/mmc/card/mmc_test.c | 3 +-- drivers/mmc/host/dw_mmc.c | 4 ++-- drivers/mmc/host/mmci.c | 13 ++++++++++++- drivers/mmc/host/sdhci-pci.c | 6 ++---- drivers/mmc/host/via-sdmmc.c | 5 ++--- 5 files changed, 19 insertions(+), 12 deletions(-) Merging kgdb/kgdb-next $ git merge kgdb/kgdb-next Merge made by recursive. Merging slab/for-next $ git merge slab/for-next Already up-to-date. Merging uclinux/for-next $ git merge uclinux/for-next Already up-to-date. Merging md/for-next $ git merge md/for-next Already up-to-date. Merging mfd/for-next $ git merge mfd/for-next Merge made by recursive. arch/x86/platform/olpc/olpc-xo1.c | 23 +- drivers/mfd/88pm860x-core.c | 11 +- drivers/mfd/Kconfig | 1 + drivers/mfd/Makefile | 2 +- drivers/mfd/ab3550-core.c | 12 +- drivers/mfd/ab8500-core.c | 12 +- drivers/mfd/asic3.c | 38 ++-- drivers/mfd/cs5535-mfd.c | 16 ++ drivers/mfd/ezx-pcap.c | 34 ++-- drivers/mfd/htc-egpio.c | 23 +-- drivers/mfd/htc-i2cpld.c | 33 +-- drivers/mfd/jz4740-adc.c | 16 +- drivers/mfd/max8925-core.c | 10 +- drivers/mfd/max8997-irq.c | 377 +++++++++++++++++++++++++++++++++++ drivers/mfd/max8998-irq.c | 8 +- drivers/mfd/max8998.c | 4 +- drivers/mfd/mfd-core.c | 53 +---- drivers/mfd/pcf50633-core.c | 2 +- drivers/mfd/rdc321x-southbridge.c | 1 + drivers/mfd/stmpe.c | 12 +- drivers/mfd/t7l66xb.c | 21 +- drivers/mfd/tc3589x.c | 12 +- drivers/mfd/tc6393xb.c | 21 +- drivers/mfd/tps6586x.c | 6 +- drivers/mfd/twl4030-irq.c | 66 ++----- drivers/mfd/twl6030-irq.c | 25 +-- drivers/mfd/wl1273-core.c | 2 +- drivers/mfd/wm831x-irq.c | 8 +- drivers/mfd/wm8350-irq.c | 8 +- drivers/mfd/wm8994-irq.c | 8 +- include/linux/mfd/core.h | 27 ++- include/linux/mfd/max8997-private.h | 21 ++ include/linux/mfd/max8997.h | 7 +- 33 files changed, 618 insertions(+), 302 deletions(-) create mode 100644 drivers/mfd/max8997-irq.c Merging hdlc/hdlc-next $ git merge hdlc/hdlc-next Already up-to-date. Merging drm/drm-next $ git merge drm/drm-next Already up-to-date. Merging fbdev/master $ git merge fbdev/master Already up-to-date. Merging viafb/viafb-next $ git merge viafb/viafb-next Already up-to-date. Merging omap_dss2/for-next $ git merge omap_dss2/for-next Already up-to-date. Merging voltage/for-next $ git merge voltage/for-next Auto-merging arch/arm/mach-ux500/board-mop500.c Auto-merging drivers/regulator/Kconfig Auto-merging drivers/regulator/ab3100.c Auto-merging drivers/regulator/wm831x-dcdc.c Auto-merging include/linux/mfd/ab8500.h Merge made by recursive. arch/arm/mach-ux500/board-mop500-regulators.h | 2 + arch/arm/mach-ux500/board-mop500.c | 1 + drivers/regulator/Kconfig | 2 +- drivers/regulator/ab3100.c | 51 +++-- drivers/regulator/ab8500.c | 270 ++++++++++++++++++++++++- drivers/regulator/core.c | 116 +++++++++++- drivers/regulator/tps6524x-regulator.c | 2 +- drivers/regulator/wm831x-dcdc.c | 32 ++-- drivers/regulator/wm831x-isink.c | 8 +- drivers/regulator/wm831x-ldo.c | 17 +- include/linux/mfd/ab8500.h | 6 + include/linux/regulator/ab8500.h | 51 +++++- include/linux/regulator/consumer.h | 2 + include/linux/regulator/driver.h | 11 +- include/linux/regulator/machine.h | 1 + 15 files changed, 507 insertions(+), 65 deletions(-) Merging security-testing/next $ git merge security-testing/next Already up-to-date. Merging selinux/master $ git merge selinux/master Already up-to-date. Merging lblnet/master $ git merge lblnet/master Already up-to-date. Merging agp/agp-next $ git merge agp/agp-next Merge made by recursive. Merging watchdog/master $ git merge watchdog/master Auto-merging drivers/watchdog/max63xx_wdt.c Auto-merging drivers/watchdog/nv_tco.c Auto-merging drivers/watchdog/pnx4008_wdt.c Auto-merging drivers/watchdog/s3c2410_wdt.c Auto-merging drivers/watchdog/sp5100_tco.c Merge made by recursive. drivers/watchdog/davinci_wdt.c | 22 ++++++++++------------ drivers/watchdog/max63xx_wdt.c | 20 ++++++++------------ drivers/watchdog/nv_tco.c | 2 +- drivers/watchdog/pnx4008_wdt.c | 28 +++++++++++++--------------- drivers/watchdog/s3c2410_wdt.c | 19 ++++++++----------- drivers/watchdog/sp5100_tco.c | 16 ++++++++++++++-- 6 files changed, 54 insertions(+), 53 deletions(-) Merging bdev/master $ git merge bdev/master Already up-to-date. Merging dwmw2-iommu/master $ git merge dwmw2-iommu/master Auto-merging drivers/pci/intel-iommu.c Merge made by recursive. drivers/pci/intel-iommu.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) Merging cputime/cputime $ git merge cputime/cputime Already up-to-date. Merging osd/linux-next $ git merge osd/linux-next Already up-to-date. Merging jc_docs/docs-next $ git merge jc_docs/docs-next Auto-merging Documentation/dynamic-debug-howto.txt Merge made by recursive. Documentation/development-process/1.Intro | 18 +- Documentation/development-process/2.Process | 177 ++++++++++---------- Documentation/development-process/3.Early-stage | 31 +++- Documentation/development-process/4.Coding | 21 ++- Documentation/development-process/5.Posting | 28 ++-- Documentation/development-process/6.Followthrough | 16 +- Documentation/development-process/7.AdvancedTopics | 4 +- Documentation/dynamic-debug-howto.txt | 4 +- 8 files changed, 169 insertions(+), 130 deletions(-) Merging nommu/master $ git merge nommu/master Already up-to-date. Merging trivial/for-next $ git merge trivial/for-next Already up-to-date. Merging audit/for-next $ git merge audit/for-next Already up-to-date. Merging suspend/linux-next $ git merge suspend/linux-next Merge made by recursive. arch/x86/power/Makefile | 3 ++- include/linux/suspend.h | 15 +++++---------- kernel/power/Kconfig | 4 ++++ kernel/power/Makefile | 4 ++-- kernel/power/main.c | 2 +- kernel/power/power.h | 6 +++--- 6 files changed, 17 insertions(+), 17 deletions(-) Merging fsnotify/for-next $ git merge fsnotify/for-next Auto-merging fs/cachefiles/namei.c Auto-merging fs/nfsd/vfs.c Auto-merging fs/notify/fanotify/fanotify_user.c Auto-merging fs/notify/mark.c Auto-merging include/linux/fsnotify_backend.h Merge made by recursive. fs/cachefiles/namei.c | 1 - fs/cachefiles/xattr.c | 1 - fs/nfsd/vfs.c | 3 - fs/notify/dnotify/dnotify.c | 15 +++--- fs/notify/fanotify/fanotify.c | 24 +++++---- fs/notify/fanotify/fanotify_user.c | 101 +++++++++++++++++++++++++----------- fs/notify/group.c | 1 + fs/notify/mark.c | 36 +++++-------- include/linux/fanotify.h | 5 ++- include/linux/fsnotify_backend.h | 14 ++++- 10 files changed, 121 insertions(+), 80 deletions(-) Merging irda/for-next $ git merge irda/for-next Already up-to-date. Merging alacrity/linux-next $ git merge alacrity/linux-next Resolved 'MAINTAINERS' using previous resolution. Resolved 'arch/x86/Kconfig' using previous resolution. Resolved 'drivers/Makefile' using previous resolution. Resolved 'lib/Kconfig' using previous resolution. Auto-merging MAINTAINERS CONFLICT (content): Merge conflict in MAINTAINERS Auto-merging arch/x86/Kconfig CONFLICT (content): Merge conflict in arch/x86/Kconfig Auto-merging drivers/Makefile CONFLICT (content): Merge conflict in drivers/Makefile Auto-merging drivers/net/Kconfig Auto-merging drivers/net/Makefile Auto-merging include/linux/Kbuild CONFLICT (content): Merge conflict in include/linux/Kbuild Auto-merging lib/Kconfig CONFLICT (content): Merge conflict in lib/Kconfig Auto-merging lib/Makefile Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'include/linux/Kbuild'. [master d3d7691] Merge remote-tracking branch 'alacrity/linux-next' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 25 + arch/x86/Kconfig | 2 + drivers/Makefile | 1 + drivers/net/Kconfig | 14 + drivers/net/Makefile | 1 + drivers/net/vbus-enet.c | 1560 +++++++++++++++++++++++++++++++++++++++++++ drivers/vbus/Kconfig | 25 + drivers/vbus/Makefile | 6 + drivers/vbus/bus-proxy.c | 248 +++++++ drivers/vbus/pci-bridge.c | 1016 ++++++++++++++++++++++++++++ include/linux/Kbuild | 4 + include/linux/ioq.h | 414 ++++++++++++ include/linux/shm_signal.h | 189 ++++++ include/linux/vbus_driver.h | 83 +++ include/linux/vbus_pci.h | 145 ++++ include/linux/venet.h | 133 ++++ lib/Kconfig | 21 + lib/Makefile | 2 + lib/ioq.c | 304 +++++++++ lib/shm_signal.c | 196 ++++++ 20 files changed, 4389 insertions(+), 0 deletions(-) create mode 100644 drivers/net/vbus-enet.c create mode 100644 drivers/vbus/Kconfig create mode 100644 drivers/vbus/Makefile create mode 100644 drivers/vbus/bus-proxy.c create mode 100644 drivers/vbus/pci-bridge.c create mode 100644 include/linux/ioq.h create mode 100644 include/linux/shm_signal.h create mode 100644 include/linux/vbus_driver.h create mode 100644 include/linux/vbus_pci.h create mode 100644 include/linux/venet.h create mode 100644 lib/ioq.c create mode 100644 lib/shm_signal.c Merging i7core_edac/linux_next $ git merge i7core_edac/linux_next Auto-merging drivers/edac/i7core_edac.c Merge made by recursive. drivers/edac/i7core_edac.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) Merging i7300_edac/linux_next $ git merge i7300_edac/linux_next Already up-to-date! Merge made by recursive. Merging devicetree/devicetree/next $ git merge devicetree/devicetree/next Already up-to-date. Merging spi/spi/next $ git merge spi/spi/next Already up-to-date. Merging tip/auto-latest $ git merge tip/auto-latest Auto-merging arch/x86/Kconfig Auto-merging arch/x86/kernel/probe_roms.c Merge made by recursive. arch/tile/Kconfig | 1 + arch/tile/kernel/irq.c | 45 +--------- arch/x86/Kconfig | 2 +- arch/x86/include/asm/mach_traps.h | 18 +++- arch/x86/include/asm/olpc_ofw.h | 9 +-- arch/x86/include/asm/probe_roms.h | 8 ++ arch/x86/include/asm/setup.h | 2 +- arch/x86/kernel/Makefile | 2 +- arch/x86/kernel/head32.c | 1 - arch/x86/kernel/mpparse.c | 4 +- arch/x86/kernel/{probe_roms_32.c => probe_roms.c} | 101 +++++++++++++++++++++ arch/x86/kernel/x86_init.c | 2 +- arch/x86/platform/olpc/Makefile | 4 +- arch/x86/platform/olpc/olpc.c | 51 ++++++----- arch/x86/platform/olpc/olpc_dt.c | 19 ++++ drivers/dma/ipu/ipu_irq.c | 58 ++++++------ 16 files changed, 209 insertions(+), 118 deletions(-) create mode 100644 arch/x86/include/asm/probe_roms.h rename arch/x86/kernel/{probe_roms_32.c => probe_roms.c} (65%) Merging rcu/rcu/next $ git merge rcu/rcu/next Auto-merging include/linux/interrupt.h Auto-merging init/Kconfig Auto-merging kernel/softirq.c Auto-merging lib/Kconfig.debug Auto-merging tools/perf/util/trace-event-parse.c Merge made by recursive. Documentation/RCU/00-INDEX | 2 +- Documentation/RCU/stallwarn.txt | 23 +- Documentation/RCU/trace.txt | 77 +++--- include/linux/interrupt.h | 1 - include/linux/rcupdate.h | 54 ++++ include/trace/events/irq.h | 3 +- init/Kconfig | 2 +- kernel/rcupdate.c | 32 ++- kernel/rcutiny.c | 2 +- kernel/rcutiny_plugin.h | 203 ++++++------- kernel/rcutorture.c | 4 +- kernel/rcutree.c | 546 +++++++++++++++++++++++++------- kernel/rcutree.h | 102 +++++-- kernel/rcutree_plugin.h | 588 +++++++++++++++++++++++++++-------- kernel/rcutree_trace.c | 91 +++++- kernel/softirq.c | 2 +- lib/Kconfig.debug | 32 +-- tools/perf/util/trace-event-parse.c | 1 - 18 files changed, 1284 insertions(+), 481 deletions(-) Merging oprofile/for-next $ git merge oprofile/for-next Auto-merging arch/s390/oprofile/init.c Auto-merging arch/x86/oprofile/nmi_int.c Merge made by recursive. arch/alpha/oprofile/common.c | 5 +---- arch/avr32/oprofile/op_model_avr32.c | 5 +---- arch/blackfin/oprofile/bfin_oprofile.c | 4 +--- arch/ia64/oprofile/init.c | 2 +- arch/m32r/oprofile/init.c | 4 +--- arch/microblaze/oprofile/microblaze_oprofile.c | 4 +--- arch/mips/oprofile/common.c | 2 +- arch/mn10300/oprofile/op_model_null.c | 5 +---- arch/parisc/oprofile/init.c | 4 +--- arch/powerpc/oprofile/common.c | 4 +--- arch/s390/oprofile/init.c | 2 +- arch/sparc/oprofile/init.c | 4 +--- arch/x86/oprofile/init.c | 2 +- arch/x86/oprofile/nmi_int.c | 5 +++++ arch/x86/oprofile/op_counter.h | 1 + 15 files changed, 19 insertions(+), 34 deletions(-) Merging xen-two/linux-next $ git merge xen-two/linux-next Merge made by recursive. Merging xen-pvhvm/linux-next $ git merge xen-pvhvm/linux-next Already up-to-date. Merging edac-amd/for-next $ git merge edac-amd/for-next Resolved 'include/linux/pci_ids.h' using previous resolution. Auto-merging include/linux/pci_ids.h CONFLICT (content): Merge conflict in include/linux/pci_ids.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master eaf0387] Merge remote-tracking branch 'edac-amd/for-next' $ git diff -M --stat --summary HEAD^.. Merging percpu/for-next $ git merge percpu/for-next Merge made by recursive. arch/alpha/kernel/vmlinux.lds.S | 2 +- arch/arm/kernel/vmlinux.lds.S | 2 +- arch/blackfin/kernel/vmlinux.lds.S | 2 +- arch/cris/kernel/vmlinux.lds.S | 2 +- arch/frv/kernel/vmlinux.lds.S | 2 +- arch/m32r/kernel/vmlinux.lds.S | 2 +- arch/mips/kernel/vmlinux.lds.S | 2 +- arch/mn10300/kernel/vmlinux.lds.S | 2 +- arch/parisc/kernel/vmlinux.lds.S | 2 +- arch/powerpc/kernel/vmlinux.lds.S | 2 +- arch/s390/kernel/vmlinux.lds.S | 2 +- arch/sh/kernel/vmlinux.lds.S | 2 +- arch/sparc/kernel/vmlinux.lds.S | 2 +- arch/tile/kernel/vmlinux.lds.S | 2 +- arch/um/include/asm/common.lds.S | 2 +- arch/x86/kernel/vmlinux.lds.S | 2 +- arch/xtensa/kernel/vmlinux.lds.S | 2 +- include/asm-generic/vmlinux.lds.h | 17 ++++++++--------- kernel/workqueue.c | 4 +--- mm/percpu.c | 6 ++++-- 20 files changed, 30 insertions(+), 31 deletions(-) Merging workqueues/for-next $ git merge workqueues/for-next Already up-to-date. Merging sfi/sfi-test $ git merge sfi/sfi-test Already up-to-date. Merging asm-generic/next $ git merge asm-generic/next Already up-to-date. Merging drivers-x86/linux-next $ git merge drivers-x86/linux-next Resolved 'drivers/platform/x86/sony-laptop.c' using previous resolution. Removing Documentation/ABI/testing/sysfs-platform-eeepc-wmi Auto-merging MAINTAINERS Auto-merging drivers/platform/x86/Kconfig Auto-merging drivers/platform/x86/Makefile Auto-merging drivers/platform/x86/acer-wmi.c Auto-merging drivers/platform/x86/asus-laptop.c Auto-merging drivers/platform/x86/msi-laptop.c Auto-merging drivers/platform/x86/sony-laptop.c CONFLICT (content): Merge conflict in drivers/platform/x86/sony-laptop.c Auto-merging include/linux/input.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 158e592] Merge remote-tracking branch 'drivers-x86/linux-next' $ git diff -M --stat --summary HEAD^.. .../ABI/testing/sysfs-driver-samsung-laptop | 19 + Documentation/ABI/testing/sysfs-platform-asus-wmi | 31 + Documentation/ABI/testing/sysfs-platform-eeepc-wmi | 10 - Documentation/laptops/sony-laptop.txt | 37 +- MAINTAINERS | 30 +- drivers/platform/x86/Kconfig | 90 +- drivers/platform/x86/Makefile | 9 +- drivers/platform/x86/acer-wmi.c | 20 +- drivers/platform/x86/asus-laptop.c | 180 +-- drivers/platform/x86/asus-nb-wmi.c | 98 ++ drivers/platform/x86/asus-wmi.c | 1655 ++++++++++++++++++++ drivers/platform/x86/asus-wmi.h | 58 + drivers/platform/x86/dell-wmi-aio.c | 171 ++ drivers/platform/x86/eeepc-wmi.c | 912 +---------- drivers/platform/x86/hp-wmi.c | 312 ++++- drivers/platform/x86/ideapad-laptop.c | 2 + drivers/platform/x86/intel_mid_powerbtn.c | 148 ++ drivers/platform/x86/intel_mid_thermal.c | 576 +++++++ drivers/platform/x86/msi-laptop.c | 94 +- drivers/platform/x86/samsung-laptop.c | 832 ++++++++++ drivers/platform/x86/sony-laptop.c | 496 +++++-- drivers/platform/x86/xo15-ebook.c | 181 +++ include/linux/input.h | 7 + include/linux/sonypi.h | 1 + 24 files changed, 4770 insertions(+), 1199 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-driver-samsung-laptop create mode 100644 Documentation/ABI/testing/sysfs-platform-asus-wmi delete mode 100644 Documentation/ABI/testing/sysfs-platform-eeepc-wmi create mode 100644 drivers/platform/x86/asus-nb-wmi.c create mode 100644 drivers/platform/x86/asus-wmi.c create mode 100644 drivers/platform/x86/asus-wmi.h create mode 100644 drivers/platform/x86/dell-wmi-aio.c create mode 100644 drivers/platform/x86/intel_mid_powerbtn.c create mode 100644 drivers/platform/x86/intel_mid_thermal.c create mode 100644 drivers/platform/x86/samsung-laptop.c create mode 100644 drivers/platform/x86/xo15-ebook.c $ git am -3 ../patches/0001-OLPC-fix-for-removal-of-run_wake_count.patch Applying: OLPC: fix for removal of run_wake_count $ git reset HEAD^ Unstaged changes after reset: M drivers/platform/x86/xo15-ebook.c $ git add . $ git commit -v -a --amend [master 456a989] Merge remote-tracking branch 'drivers-x86/linux-next' Merging hwpoison/hwpoison $ git merge hwpoison/hwpoison Already up-to-date. Merging sysctl/master $ git merge sysctl/master Already up-to-date. Merging driver-core/driver-core-next $ git merge driver-core/driver-core-next Already up-to-date. Merging tty/tty-next $ git merge tty/tty-next Already up-to-date. Merging usb/usb-next $ git merge usb/usb-next Already up-to-date. Merging staging/staging-next $ git merge staging/staging-next Already up-to-date. Merging slabh/slabh $ git merge slabh/slabh Already up-to-date. Merging bkl-config/config $ git merge bkl-config/config Already up-to-date. Merging cleancache/linux-next $ git merge cleancache/linux-next Resolved 'fs/ocfs2/super.c' using previous resolution. Resolved 'fs/super.c' using previous resolution. Resolved 'include/linux/fs.h' using previous resolution. Resolved 'mm/Kconfig' using previous resolution. Resolved 'mm/truncate.c' using previous resolution. Auto-merging arch/x86/include/asm/xen/hypercall.h Auto-merging drivers/xen/Makefile Auto-merging fs/btrfs/extent_io.c Auto-merging fs/btrfs/super.c Auto-merging fs/buffer.c Auto-merging fs/ext3/super.c Auto-merging fs/ext4/super.c Auto-merging fs/mpage.c Auto-merging fs/ocfs2/super.c CONFLICT (content): Merge conflict in fs/ocfs2/super.c Auto-merging fs/super.c CONFLICT (content): Merge conflict in fs/super.c Auto-merging include/linux/fs.h CONFLICT (content): Merge conflict in include/linux/fs.h Auto-merging include/xen/interface/xen.h Auto-merging mm/Kconfig CONFLICT (content): Merge conflict in mm/Kconfig Auto-merging mm/Makefile Auto-merging mm/filemap.c Auto-merging mm/truncate.c CONFLICT (content): Merge conflict in mm/truncate.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 9eca43f] Merge remote-tracking branch 'cleancache/linux-next' $ git diff -M --stat --summary HEAD^.. .../ABI/testing/sysfs-kernel-mm-cleancache | 11 + Documentation/vm/cleancache.txt | 267 ++++++++++++++++++++ arch/x86/include/asm/xen/hypercall.h | 7 + drivers/xen/Makefile | 1 + drivers/xen/tmem.c | 264 +++++++++++++++++++ fs/btrfs/extent_io.c | 9 + fs/btrfs/super.c | 2 + fs/buffer.c | 5 + fs/ext3/super.c | 2 + fs/ext4/super.c | 2 + fs/mpage.c | 7 + fs/ocfs2/super.c | 2 + fs/super.c | 3 + include/linux/cleancache.h | 118 +++++++++ include/linux/fs.h | 5 + include/xen/interface/xen.h | 22 ++ mm/Kconfig | 22 ++ mm/Makefile | 1 + mm/cleancache.c | 245 ++++++++++++++++++ mm/filemap.c | 11 + mm/truncate.c | 10 + 21 files changed, 1016 insertions(+), 0 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cleancache create mode 100644 Documentation/vm/cleancache.txt create mode 100644 drivers/xen/tmem.c create mode 100644 include/linux/cleancache.h create mode 100644 mm/cleancache.c Merging scsi-post-merge/merge-base:master $ git clone -s -l -n -q . ../rebase-tmp $ cd ../rebase-tmp $ git fetch --no-tags ../next refs/remotes/scsi-post-merge/master:scsi-post-merge/master From ../next * [new branch] scsi-post-merge/master -> scsi-post-merge/master $ git fetch --no-tags ../next refs/remotes/scsi-post-merge/merge-base:scsi-post-merge/merge-base From ../next * [new branch] scsi-post-merge/merge-base -> scsi-post-merge/merge-base $ git checkout scsi-post-merge/master Switched to branch 'scsi-post-merge/master' $ git rebase --onto master scsi-post-merge/merge-base First, rewinding head to replay your work on top of it... Fast-forwarded scsi-post-merge/master to master. $ cd ../next $ git pull -f ../rebase-tmp scsi-post-merge/master From ../rebase-tmp * branch scsi-post-merge/master -> FETCH_HEAD Already up-to-date. $ rm -rf ../rebase-tmp $ git revert 926341250102 [master 69222a5] Revert "memstick: add driver for Ricoh R5C592 card reader" 5 files changed, 0 insertions(+), 1101 deletions(-) delete mode 100644 drivers/memstick/host/r592.c delete mode 100644 drivers/memstick/host/r592.h $ git revert adfa4bd4a8bf [master 5541b93] Revert "mfd: OLPC: Clean up names to match what OLPC actually uses" 2 files changed, 9 insertions(+), 7 deletions(-) $ git revert fa1df691688f [master 2c348fb] Revert "mfd: Add mfd_clone_cell(), convert cs5535-mfd/olpc-xo1 to it" 4 files changed, 57 insertions(+), 52 deletions(-)