diff options
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 2870 |
1 files changed, 2870 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..e6936a77e435 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2870 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 7fa0772 Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip +Merging origin/master +$ git merge origin/master +Updating 7fa0772..0dd52d0 +Fast forward + Documentation/ABI/stable/sysfs-class-backlight | 36 + + Documentation/ABI/testing/sysfs-class-lcd | 23 + + Documentation/ABI/testing/sysfs-class-led | 28 + + Documentation/ABI/testing/sysfs-gpio | 1 + + .../ABI/testing/sysfs-platform-asus-laptop | 52 + + .../ABI/testing/sysfs-platform-eeepc-laptop | 50 + + Documentation/Intel-IOMMU.txt | 6 +- + Documentation/accounting/getdelays.c | 12 +- + Documentation/auxdisplay/cfag12864b-example.c | 22 +- + Documentation/fb/ep93xx-fb.txt | 135 + + Documentation/fb/matroxfb.txt | 4 +- + Documentation/feature-removal-schedule.txt | 8 - + Documentation/filesystems/9p.txt | 40 +- + Documentation/filesystems/ncpfs.txt | 6 +- + Documentation/filesystems/proc.txt | 5 +- + Documentation/gpio.txt | 17 + + Documentation/hwmon/acpi_power_meter | 51 + + Documentation/hwmon/coretemp | 4 +- + Documentation/hwmon/fscher | 169 - + Documentation/i2c/busses/i2c-piix4 | 2 + + Documentation/i2c/chips/pca9539 | 58 - + Documentation/i2c/chips/pcf8574 | 65 - + Documentation/i2c/chips/pcf8575 | 69 - + Documentation/ia64/aliasing-test.c | 8 +- + Documentation/kbuild/kbuild.txt | 16 + + Documentation/kbuild/makefiles.txt | 20 +- + Documentation/kernel-parameters.txt | 2 +- + Documentation/laptops/asus-laptop.txt | 258 ++ + Documentation/laptops/thinkpad-acpi.txt | 8 +- + Documentation/leds-class.txt | 9 +- + Documentation/lguest/lguest.c | 26 +- + Documentation/pcmcia/crc32hash.c | 2 +- + Documentation/power/power_supply_class.txt | 7 + + Documentation/power/regulator/design.txt | 33 + + Documentation/power/regulator/machine.txt | 4 +- + Documentation/power/regulator/overview.txt | 4 +- + Documentation/power/regulator/regulator.txt | 5 +- + Documentation/powerpc/dts-bindings/fsl/esdhc.txt | 2 + + Documentation/powerpc/dts-bindings/mtd-physmap.txt | 42 +- + Documentation/rtc.txt | 26 + + Documentation/spi/spi-summary | 2 +- + Documentation/spi/spidev_test.c | 4 +- + Documentation/sysctl/kernel.txt | 8 + + Documentation/usb/authorization.txt | 10 +- + Documentation/usb/usbmon.txt | 8 +- + Documentation/video4linux/v4lgrab.c | 2 +- + Documentation/vm/page-types.c | 52 +- + Documentation/vm/slabinfo.c | 68 +- + Documentation/watchdog/src/watchdog-test.c | 2 +- + Documentation/x86/earlyprintk.txt | 39 +- + MAINTAINERS | 55 +- + Makefile | 62 +- + arch/arm/Makefile | 6 +- + arch/arm/boot/install.sh | 4 +- + arch/arm/configs/n770_defconfig | 2 +- + arch/arm/configs/nhk8815_defconfig | 2 +- + arch/arm/configs/omap3_beagle_defconfig | 47 +- + arch/arm/configs/omap_3430sdp_defconfig | 39 +- + arch/arm/configs/omap_ldp_defconfig | 54 +- + arch/arm/kernel/Makefile | 3 +- + arch/arm/kernel/init_task.c | 5 +- + arch/arm/mach-at91/Kconfig | 7 + + arch/arm/mach-at91/Makefile | 1 + + arch/arm/mach-at91/at91sam9260_devices.c | 96 + + arch/arm/mach-at91/board-sam9g20ek-2slot-mmc.c | 277 ++ + arch/arm/mach-at91/include/mach/board.h | 5 + + arch/arm/mach-ep93xx/clock.c | 88 +- + arch/arm/mach-ep93xx/core.c | 32 + + arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 6 + + arch/arm/mach-ep93xx/include/mach/fb.h | 56 + + arch/arm/mach-ep93xx/include/mach/platform.h | 2 + + arch/arm/mach-ixp4xx/common.c | 16 +- + arch/arm/mach-ixp4xx/include/mach/system.h | 6 +- + arch/arm/mach-nomadik/board-nhk8815.c | 155 + + arch/arm/mach-nomadik/include/mach/fsmc.h | 29 + + arch/arm/mach-nomadik/include/mach/nand.h | 16 + + arch/arm/mach-omap2/board-apollon.c | 4 +- + arch/arm/mach-omap2/board-rx51-peripherals.c | 4 + + arch/arm/mach-omap2/devices.c | 71 +- + arch/arm/mach-omap2/gpmc.c | 63 +- + arch/arm/mach-omap2/mmc-twl4030.c | 78 + + arch/arm/mach-omap2/mmc-twl4030.h | 2 + + arch/arm/plat-mxc/include/mach/spi.h | 27 + + arch/arm/plat-omap/include/mach/gpmc.h | 4 + + arch/arm/plat-omap/include/mach/irqs.h | 2 + + arch/arm/plat-omap/include/mach/lcd_mipid.h | 5 + + arch/arm/plat-omap/include/mach/mmc.h | 20 +- + arch/arm/plat-omap/include/mach/omapfb.h | 4 +- + arch/avr32/kernel/init_task.c | 5 +- + arch/avr32/mm/init.c | 4 +- + arch/blackfin/Makefile | 4 +- + arch/blackfin/boot/install.sh | 6 +- + arch/blackfin/include/asm/sections.h | 38 +- + arch/cris/Makefile | 2 - + arch/cris/kernel/Makefile | 1 + + arch/cris/kernel/process.c | 5 +- + arch/frv/include/asm/gdb-stub.h | 1 - + arch/frv/include/asm/hardirq.h | 17 +- + arch/frv/kernel/debug-stub.c | 1 + + arch/frv/kernel/init_task.c | 5 +- + arch/frv/kernel/process.c | 4 - + arch/h8300/kernel/init_task.c | 5 +- + arch/ia64/Kconfig | 4 + + arch/ia64/hp/common/sba_iommu.c | 7 +- + arch/ia64/include/asm/cputime.h | 1 + + arch/ia64/install.sh | 4 +- + arch/ia64/kernel/Makefile.gate | 2 +- + arch/ia64/kernel/init_task.c | 3 +- + arch/ia64/kernel/pci-swiotlb.c | 2 +- + arch/ia64/mm/init.c | 5 - + arch/m32r/boot/compressed/install.sh | 4 +- + arch/m32r/kernel/init_task.c | 5 +- + arch/m68k/install.sh | 4 +- + arch/m68k/kernel/process.c | 6 +- + arch/m68knommu/kernel/init_task.c | 5 +- + arch/microblaze/kernel/init_task.c | 5 +- + arch/mips/Makefile | 27 +- + arch/mips/kernel/init_task.c | 5 +- + arch/mips/kernel/vmlinux.lds.S | 13 +- + arch/mips/mm/init.c | 7 +- + arch/mn10300/include/asm/gdb-stub.h | 1 - + arch/mn10300/kernel/asm-offsets.c | 2 +- + arch/mn10300/kernel/init_task.c | 5 +- + arch/mn10300/kernel/mn10300-serial-low.S | 2 +- + arch/mn10300/kernel/mn10300-serial.c | 14 +- + arch/mn10300/kernel/setup.c | 2 +- + arch/parisc/Makefile | 4 +- + arch/parisc/install.sh | 4 +- + arch/parisc/kernel/init_task.c | 4 +- + arch/powerpc/Makefile | 6 +- + arch/powerpc/boot/dts/mpc8377_mds.dts | 1 + + arch/powerpc/boot/dts/mpc8377_rdb.dts | 1 + + arch/powerpc/boot/dts/mpc8377_wlan.dts | 1 + + arch/powerpc/boot/dts/mpc8378_mds.dts | 1 + + arch/powerpc/boot/dts/mpc8378_rdb.dts | 1 + + arch/powerpc/boot/dts/mpc8379_mds.dts | 1 + + arch/powerpc/boot/dts/mpc8379_rdb.dts | 1 + + arch/powerpc/boot/install.sh | 4 +- + arch/powerpc/include/asm/cputime.h | 13 + + arch/powerpc/kernel/init_task.c | 5 +- + arch/powerpc/kernel/machine_kexec_64.c | 5 +- + arch/powerpc/kernel/setup-common.c | 2 +- + arch/powerpc/kernel/time.c | 4 + + arch/powerpc/kernel/vdso.c | 3 +- + arch/powerpc/kernel/vdso32/Makefile | 2 +- + arch/powerpc/kernel/vdso32/vdso32_wrapper.S | 3 +- + arch/powerpc/kernel/vdso64/Makefile | 2 +- + arch/powerpc/kernel/vdso64/vdso64_wrapper.S | 3 +- + arch/powerpc/mm/init_32.c | 36 - + arch/powerpc/mm/init_64.c | 29 - + arch/powerpc/mm/mem.c | 6 +- + arch/powerpc/platforms/pseries/hvCall_inst.c | 2 +- + arch/s390/boot/install.sh | 4 +- + arch/s390/defconfig | 37 +- + arch/s390/include/asm/cputime.h | 1 + + arch/s390/include/asm/lowcore.h | 9 + + arch/s390/include/asm/processor.h | 2 +- + arch/s390/kernel/asm-offsets.c | 7 +- + arch/s390/kernel/compat_linux.c | 83 +- + arch/s390/kernel/compat_linux.h | 4 +- + arch/s390/kernel/compat_wrapper.S | 27 +- + arch/s390/kernel/entry.h | 6 +- + arch/s390/kernel/init_task.c | 5 +- + arch/s390/kernel/process.c | 40 +- + arch/s390/kernel/ptrace.c | 19 +- + arch/s390/kernel/sclp.S | 5 +- + arch/s390/kernel/smp.c | 50 +- + arch/s390/kernel/suspend.c | 24 +- + arch/s390/kernel/swsusp_asm64.S | 102 +- + arch/s390/kernel/syscalls.S | 8 +- + arch/s390/kernel/vdso.c | 2 +- + arch/s390/kernel/vdso32/Makefile | 2 +- + arch/s390/kernel/vdso32/vdso32_wrapper.S | 3 +- + arch/s390/kernel/vdso64/Makefile | 2 +- + arch/s390/kernel/vdso64/vdso64_wrapper.S | 3 +- + arch/s390/mm/page-states.c | 52 +- + arch/s390/mm/pgtable.c | 17 +- + arch/score/include/asm/page.h | 3 +- + arch/score/include/asm/thread_info.h | 15 +- + arch/score/kernel/init_task.c | 5 +- + arch/score/kernel/vmlinux.lds.S | 77 +- + arch/sh/boot/compressed/install.sh | 4 +- + arch/sh/kernel/init_task.c | 5 +- + arch/sh/kernel/irq.c | 6 +- + arch/sh/kernel/vsyscall/Makefile | 2 +- + arch/sh/mm/init.c | 6 - + arch/sparc/Makefile | 4 - + arch/sparc/include/asm/vio.h | 2 +- + arch/sparc/kernel/Makefile | 6 +- + arch/sparc/kernel/init_task.c | 5 +- + arch/um/Makefile | 9 +- + arch/um/kernel/Makefile | 3 + + arch/um/kernel/init_task.c | 5 +- + arch/um/kernel/vmlinux.lds.S | 3 + + arch/x86/Kconfig | 10 +- + arch/x86/Makefile | 4 +- + arch/x86/boot/install.sh | 4 +- + arch/x86/include/asm/acpi.h | 1 - + arch/x86/include/asm/cache.h | 4 +- + arch/x86/include/asm/syscall.h | 14 +- + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/early_printk.c | 780 +---- + arch/x86/kernel/entry_64.S | 22 +- + arch/x86/kernel/head_32.S | 4 +- + arch/x86/kernel/head_64.S | 2 +- + arch/x86/kernel/init_task.c | 5 +- + arch/x86/kernel/pci-swiotlb.c | 5 +- + arch/x86/kernel/ptrace.c | 21 +- + arch/x86/kernel/setup.c | 3 + + arch/x86/kernel/sfi.c | 122 + + arch/x86/lguest/boot.c | 10 +- + arch/x86/mm/init_32.c | 6 - + arch/x86/mm/init_64.c | 10 +- + arch/x86/pci/mmconfig-shared.c | 8 +- + arch/x86/pci/mmconfig_32.c | 2 +- + arch/x86/vdso/Makefile | 2 +- + arch/xtensa/kernel/Makefile | 3 +- + arch/xtensa/kernel/head.S | 2 +- + arch/xtensa/kernel/init_task.c | 5 +- + drivers/Makefile | 5 +- + drivers/acpi/Kconfig | 17 +- + drivers/acpi/Makefile | 1 + + drivers/acpi/ac.c | 2 + + drivers/acpi/acpi_memhotplug.c | 51 +- + drivers/acpi/acpica/Makefile | 4 +- + drivers/acpi/acpica/acconfig.h | 10 +- + drivers/acpi/acpica/acdebug.h | 4 - + drivers/acpi/acpica/acglobal.h | 37 +- + drivers/acpi/acpica/achware.h | 8 + + drivers/acpi/acpica/acinterp.h | 4 +- + drivers/acpi/acpica/aclocal.h | 16 + + drivers/acpi/acpica/acmacros.h | 2 + + drivers/acpi/acpica/acnamesp.h | 25 + + drivers/acpi/acpica/acobject.h | 1 + + drivers/acpi/acpica/acparser.h | 2 + + drivers/acpi/acpica/acpredef.h | 584 ++- + drivers/acpi/acpica/acutils.h | 30 +- + drivers/acpi/acpica/amlcode.h | 1 + + drivers/acpi/acpica/dsfield.c | 18 +- + drivers/acpi/acpica/dsmethod.c | 15 +- + drivers/acpi/acpica/dsmthdat.c | 8 +- + drivers/acpi/acpica/dsobject.c | 23 +- + drivers/acpi/acpica/dswload.c | 41 +- + drivers/acpi/acpica/evgpe.c | 8 +- + drivers/acpi/acpica/evgpeblk.c | 4 +- + drivers/acpi/acpica/evrgnini.c | 45 +- + drivers/acpi/acpica/exconfig.c | 7 + + drivers/acpi/acpica/exdump.c | 6 +- + drivers/acpi/acpica/exfield.c | 82 +- + drivers/acpi/acpica/exfldio.c | 7 +- + drivers/acpi/acpica/exutils.c | 53 +- + drivers/acpi/acpica/hwgpe.c | 34 +- + drivers/acpi/acpica/hwregs.c | 206 +- + drivers/acpi/acpica/hwtimer.c | 2 +- + drivers/acpi/acpica/hwxface.c | 195 +- + drivers/acpi/acpica/nsalloc.c | 88 +- + drivers/acpi/acpica/nsdumpdv.c | 7 +- + drivers/acpi/acpica/nseval.c | 137 + + drivers/acpi/acpica/nsinit.c | 15 + + drivers/acpi/acpica/nsload.c | 3 +- + drivers/acpi/acpica/nspredef.c | 718 ++-- + drivers/acpi/acpica/nsrepair.c | 203 + + drivers/acpi/acpica/nsutils.c | 5 +- + drivers/acpi/acpica/nsxfeval.c | 23 +- + drivers/acpi/acpica/nsxfname.c | 237 +- + drivers/acpi/acpica/psloop.c | 119 +- + drivers/acpi/acpica/psxface.c | 4 + + drivers/acpi/acpica/tbutils.c | 82 +- + drivers/acpi/acpica/utdelete.c | 6 + + drivers/acpi/acpica/uteval.c | 378 +-- + drivers/acpi/acpica/utglobal.c | 12 +- + drivers/acpi/acpica/utids.c | 382 ++ + drivers/acpi/acpica/utinit.c | 22 +- + drivers/acpi/acpica/utmisc.c | 85 +- + drivers/acpi/acpica/utxface.c | 26 +- + drivers/acpi/battery.c | 22 + + drivers/acpi/blacklist.c | 2 + + drivers/acpi/bus.c | 3 +- + drivers/acpi/button.c | 2 + + drivers/acpi/cm_sbs.c | 2 + + drivers/acpi/container.c | 13 +- + drivers/acpi/debug.c | 82 +- + drivers/acpi/dock.c | 10 +- + drivers/acpi/ec.c | 270 +- + drivers/acpi/event.c | 2 + + drivers/acpi/fan.c | 2 + + drivers/acpi/glue.c | 10 +- + drivers/acpi/internal.h | 22 +- + drivers/acpi/numa.c | 2 + + drivers/acpi/osl.c | 126 +- + drivers/acpi/pci_irq.c | 2 + + drivers/acpi/pci_link.c | 2 + + drivers/acpi/pci_root.c | 2 + + drivers/acpi/pci_slot.c | 5 +- + drivers/acpi/power.c | 3 +- + drivers/acpi/power_meter.c | 1018 +++++ + drivers/acpi/processor_core.c | 246 +- + drivers/acpi/processor_idle.c | 12 +- + drivers/acpi/processor_perflib.c | 2 + + drivers/acpi/processor_thermal.c | 5 +- + drivers/acpi/processor_throttling.c | 5 +- + drivers/acpi/sbs.c | 2 + + drivers/acpi/sbshc.c | 2 + + drivers/acpi/scan.c | 183 +- + drivers/acpi/sleep.c | 8 + + drivers/acpi/system.c | 2 + + drivers/acpi/tables.c | 6 + + drivers/acpi/thermal.c | 2 + + drivers/acpi/utils.c | 2 + + drivers/acpi/video.c | 80 +- + drivers/acpi/video_detect.c | 2 + + drivers/block/DAC960.c | 2 +- + drivers/block/cciss.c | 2 +- + drivers/block/virtio_blk.c | 33 +- + drivers/char/agp/hp-agp.c | 9 +- + drivers/char/hw_random/virtio-rng.c | 3 +- + drivers/char/misc.c | 2 +- + drivers/char/tpm/tpm.c | 7 +- + drivers/char/tpm/tpm_bios.c | 4 +- + drivers/char/virtio_console.c | 5 +- + drivers/connector/cn_proc.c | 25 + + drivers/firewire/core-card.c | 13 +- + drivers/firewire/core-transaction.c | 2 +- + drivers/firewire/core.h | 14 + + drivers/firewire/ohci.c | 4 +- + drivers/firewire/sbp2.c | 16 +- + drivers/gpio/Kconfig | 35 + + drivers/gpio/Makefile | 4 + + drivers/gpio/adp5520-gpio.c | 206 + + drivers/gpio/bt8xxgpio.c | 3 +- + drivers/gpio/gpiolib.c | 253 ++- + drivers/gpio/langwell_gpio.c | 297 ++ + drivers/gpio/max7301.c | 1 + + drivers/gpio/mc33880.c | 196 + + drivers/gpio/mcp23s08.c | 5 +- + drivers/gpio/pca953x.c | 4 +- + drivers/gpio/pcf857x.c | 4 +- + drivers/gpio/ucb1400_gpio.c | 125 + + drivers/gpu/drm/radeon/r600_blit.c | 2 +- + drivers/gpu/drm/radeon/r600_blit_kms.c | 2 +- + drivers/gpu/drm/radeon/radeon.h | 59 +- + drivers/gpu/drm/radeon/radeon_drv.h | 65 +- + drivers/gpu/drm/radeon/radeon_family.h | 97 + + drivers/hwmon/Kconfig | 34 +- + drivers/hwmon/Makefile | 2 - + drivers/hwmon/adcxx.c | 101 +- + drivers/hwmon/adm1031.c | 40 + + drivers/hwmon/coretemp.c | 57 +- + drivers/hwmon/dme1737.c | 2 +- + drivers/hwmon/fscher.c | 680 --- + drivers/hwmon/fscpos.c | 654 --- + drivers/hwmon/lis3lv02d_spi.c | 2 +- + drivers/hwmon/lm70.c | 55 +- + drivers/hwmon/ltc4215.c | 2 +- + drivers/hwmon/ltc4245.c | 3 +- + drivers/hwmon/max1111.c | 1 + + drivers/i2c/Kconfig | 8 + + drivers/i2c/busses/Kconfig | 19 +- + drivers/i2c/busses/Makefile | 3 + + drivers/i2c/busses/i2c-piix4.c | 9 +- + drivers/i2c/busses/i2c-pnx.c | 7 +- + drivers/i2c/busses/i2c-scmi.c | 430 ++ + drivers/i2c/busses/i2c-taos-evm.c | 45 +- + drivers/i2c/busses/scx200_acb.c | 6 +- + drivers/i2c/chips/Kconfig | 48 - + drivers/i2c/chips/Makefile | 3 - + drivers/i2c/chips/pca9539.c | 152 - + drivers/i2c/chips/pcf8574.c | 215 - + drivers/i2c/chips/pcf8575.c | 198 - + drivers/i2c/chips/tsl2550.c | 42 +- + drivers/i2c/i2c-core.c | 165 +- + drivers/ide/ide-acpi.c | 5 +- + drivers/ieee1394/raw1394.c | 4 +- + drivers/ieee1394/sbp2.c | 3 +- + drivers/infiniband/hw/ehca/ehca_mrmw.c | 2 +- + drivers/input/input.c | 64 +- + drivers/input/keyboard/Kconfig | 40 + + drivers/input/keyboard/Makefile | 4 + + drivers/input/keyboard/adp5588-keys.c | 361 ++ + drivers/input/keyboard/atkbd.c | 25 - + drivers/input/keyboard/max7359_keypad.c | 330 ++ + drivers/input/keyboard/opencores-kbd.c | 180 + + drivers/input/keyboard/qt2160.c | 397 ++ + drivers/input/misc/dm355evm_keys.c | 26 +- + drivers/input/mouse/sentelic.c | 18 +- + drivers/input/mouse/synaptics_i2c.c | 51 +- + drivers/input/serio/i8042.c | 41 + + drivers/input/serio/libps2.c | 28 +- + drivers/input/touchscreen/Kconfig | 17 +- + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/ad7877.c | 1 + + drivers/input/touchscreen/ad7879.c | 7 +- + drivers/input/touchscreen/ads7846.c | 1 + + drivers/input/touchscreen/mcs5000_ts.c | 318 ++ + drivers/input/touchscreen/wm97xx-core.c | 3 + + drivers/isdn/capi/kcapi_proc.c | 10 +- + drivers/leds/leds-clevo-mail.c | 8 + + drivers/leds/leds-dac124s085.c | 1 + + drivers/lguest/core.c | 5 +- + drivers/lguest/page_tables.c | 45 +- + drivers/mfd/ezx-pcap.c | 1 + + drivers/mfd/ucb1400_core.c | 31 +- + drivers/misc/eeprom/at25.c | 2 +- + drivers/misc/lkdtm.c | 2 +- + drivers/mmc/core/core.c | 318 ++- + drivers/mmc/core/core.h | 8 +- + drivers/mmc/core/host.c | 1 + + drivers/mmc/core/host.h | 2 + + drivers/mmc/core/mmc.c | 149 +- + drivers/mmc/core/mmc_ops.c | 59 + + drivers/mmc/core/mmc_ops.h | 1 + + drivers/mmc/core/sd.c | 75 +- + drivers/mmc/core/sdio.c | 316 +- + drivers/mmc/core/sdio_bus.c | 3 - + drivers/mmc/core/sdio_cis.c | 2 +- + drivers/mmc/core/sdio_io.c | 2 +- + drivers/mmc/host/Kconfig | 29 +- + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/atmel-mci.c | 33 +- + drivers/mmc/host/mmc_spi.c | 1 + + drivers/mmc/host/msm_sdcc.c | 1287 ++++++ + drivers/mmc/host/msm_sdcc.h | 238 ++ + drivers/mmc/host/omap_hsmmc.c | 1083 ++++- + drivers/mmc/host/sdhci-of.c | 49 +- + drivers/mmc/host/sdhci-pci.c | 5 +- + drivers/mmc/host/sdhci.c | 54 +- + drivers/mmc/host/sdhci.h | 6 +- + drivers/mtd/Kconfig | 16 +- + drivers/mtd/afs.c | 2 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 11 - + drivers/mtd/chips/cfi_util.c | 4 + + drivers/mtd/chips/jedec_probe.c | 41 +- + drivers/mtd/devices/Kconfig | 10 + + drivers/mtd/devices/Makefile | 1 + + drivers/mtd/devices/lart.c | 6 +- + drivers/mtd/devices/m25p80.c | 137 +- + drivers/mtd/devices/mtd_dataflash.c | 5 +- + drivers/mtd/devices/phram.c | 25 +- + drivers/mtd/devices/slram.c | 2 +- + drivers/mtd/devices/sst25l.c | 512 +++ + drivers/mtd/inftlcore.c | 2 +- + drivers/mtd/maps/Kconfig | 12 +- + drivers/mtd/maps/Makefile | 3 +- + drivers/mtd/maps/gpio-addr-flash.c | 311 ++ + drivers/mtd/maps/physmap_of.c | 24 +- + drivers/mtd/maps/plat-ram.c | 2 +- + drivers/mtd/maps/pmcmsp-flash.c | 76 +- + drivers/mtd/maps/uclinux.c | 8 + + drivers/mtd/mtdblock.c | 2 +- + drivers/mtd/mtdconcat.c | 6 +- + drivers/mtd/mtdcore.c | 4 +- + drivers/mtd/mtdpart.c | 3 +- + drivers/mtd/nand/Kconfig | 30 + + drivers/mtd/nand/Makefile | 2 + + drivers/mtd/nand/atmel_nand.c | 2 +- + drivers/mtd/nand/cafe_nand.c | 2 +- + drivers/mtd/nand/davinci_nand.c | 45 +- + drivers/mtd/nand/fsl_elbc_nand.c | 3 +- + drivers/mtd/nand/mxc_nand.c | 16 +- + drivers/mtd/nand/nand_base.c | 167 +- + drivers/mtd/nand/nand_ecc.c | 31 +- + drivers/mtd/nand/ndfc.c | 4 +- + drivers/mtd/nand/nomadik_nand.c | 250 ++ + drivers/mtd/nand/omap2.c | 347 ++- + drivers/mtd/nand/orion_nand.c | 3 +- + drivers/mtd/nand/pxa3xx_nand.c | 17 +- + drivers/mtd/nand/sh_flctl.c | 5 +- + drivers/mtd/nand/tmio_nand.c | 17 +- + drivers/mtd/nand/txx9ndfmc.c | 52 +- + drivers/mtd/nand/w90p910_nand.c | 382 ++ + drivers/mtd/ofpart.c | 21 +- + drivers/mtd/onenand/Kconfig | 3 +- + drivers/mtd/onenand/generic.c | 24 +- + drivers/mtd/onenand/onenand_base.c | 20 +- + drivers/mtd/tests/mtd_oobtest.c | 2 +- + drivers/mtd/tests/mtd_pagetest.c | 12 +- + drivers/net/ehea/ehea_qmr.c | 2 +- + drivers/net/enc28j60.c | 1 + + drivers/net/ks8851.c | 1 + + drivers/net/niu.c | 2 +- + drivers/net/usb/cdc_eem.c | 17 +- + drivers/net/virtio_net.c | 15 +- + drivers/net/wireless/libertas/if_spi.c | 1 + + drivers/net/wireless/p54/p54spi.c | 1 + + drivers/net/wireless/wl12xx/wl1251_main.c | 1 + + drivers/of/base.c | 1 - + drivers/pci/dmar.c | 41 +- + drivers/pci/hotplug/acpiphp_ibm.c | 12 +- + drivers/pci/intel-iommu.c | 323 +- + drivers/pci/intr_remapping.c | 8 + + drivers/pci/iova.c | 16 +- + drivers/platform/x86/Kconfig | 10 + + drivers/platform/x86/Makefile | 1 + + drivers/platform/x86/acer-wmi.c | 2 + + drivers/platform/x86/acerhdf.c | 121 +- + drivers/platform/x86/asus-laptop.c | 227 +- + drivers/platform/x86/eeepc-laptop.c | 340 +- + drivers/platform/x86/fujitsu-laptop.c | 109 +- + drivers/platform/x86/hp-wmi.c | 2 +- + drivers/platform/x86/sony-laptop.c | 7 +- + drivers/platform/x86/thinkpad_acpi.c | 382 ++- + drivers/platform/x86/topstar-laptop.c | 265 ++ + drivers/platform/x86/wmi.c | 1 - + drivers/pnp/pnpacpi/core.c | 6 +- + drivers/power/Kconfig | 7 + + drivers/power/Makefile | 1 + + drivers/power/ds2760_battery.c | 147 +- + drivers/power/olpc_battery.c | 50 + + drivers/power/power_supply_core.c | 44 +- + drivers/power/power_supply_sysfs.c | 12 + + drivers/power/wm831x_power.c | 779 ++++ + drivers/power/wm8350_power.c | 22 + + drivers/power/wm97xx_battery.c | 79 +- + drivers/regulator/Kconfig | 24 +- + drivers/regulator/Makefile | 3 + + drivers/regulator/core.c | 285 +- + drivers/regulator/da903x.c | 77 +- + drivers/regulator/fixed.c | 91 +- + drivers/regulator/lp3971.c | 2 +- + drivers/regulator/pcf50633-regulator.c | 98 +- + drivers/regulator/tps65023-regulator.c | 632 +++ + drivers/regulator/tps6507x-regulator.c | 714 ++++ + drivers/regulator/userspace-consumer.c | 45 +- + drivers/regulator/virtual.c | 56 +- + drivers/regulator/wm8350-regulator.c | 2 + + drivers/rtc/Kconfig | 49 + + drivers/rtc/Makefile | 17 +- + drivers/rtc/rtc-at91rm9200.c | 24 +- + drivers/rtc/rtc-bfin.c | 2 +- + drivers/rtc/rtc-coh901331.c | 311 ++ + drivers/rtc/rtc-ds1305.c | 1 + + drivers/rtc/rtc-ds1307.c | 3 +- + drivers/rtc/rtc-ds1390.c | 1 + + drivers/rtc/rtc-ds3234.c | 1 + + drivers/rtc/rtc-ep93xx.c | 14 +- + drivers/rtc/rtc-m41t94.c | 1 + + drivers/rtc/rtc-max6902.c | 1 + + drivers/rtc/rtc-mxc.c | 507 +++ + drivers/rtc/rtc-pcap.c | 224 + + drivers/rtc/rtc-pcf2123.c | 364 ++ + drivers/rtc/rtc-r9701.c | 1 + + drivers/rtc/rtc-rs5c348.c | 1 + + drivers/rtc/rtc-stmp3xxx.c | 304 ++ + drivers/rtc/rtc-sysfs.c | 14 + + drivers/s390/block/dasd_eckd.c | 13 +- + drivers/s390/cio/css.c | 252 +- + drivers/s390/cio/css.h | 3 + + drivers/s390/cio/device.c | 38 +- + drivers/s390/cio/device.h | 1 + + drivers/s390/cio/idset.c | 22 +- + drivers/s390/cio/idset.h | 2 + + drivers/s390/cio/qdio_main.c | 32 +- + drivers/s390/crypto/ap_bus.c | 40 +- + drivers/scsi/sg.c | 6 +- + drivers/serial/max3100.c | 1 + + drivers/serial/serial_core.c | 4 +- + drivers/sfi/Kconfig | 17 + + drivers/sfi/Makefile | 3 + + drivers/sfi/sfi_acpi.c | 175 + + drivers/sfi/sfi_core.c | 407 ++ + drivers/sfi/sfi_core.h | 70 + + drivers/spi/Kconfig | 23 +- + drivers/spi/Makefile | 4 +- + drivers/spi/mxc_spi.c | 685 ++++ + drivers/spi/omap2_mcspi.c | 210 +- + drivers/spi/pxa2xx_spi.c | 2 +- + drivers/spi/spi.c | 85 +- + drivers/spi/spi_imx.c | 1770 -------- + drivers/spi/spi_ppc4xx.c | 612 +++ + drivers/spi/spi_s3c24xx.c | 157 +- + drivers/spi/spi_stmp.c | 679 +++ + drivers/spi/spidev.c | 1 + + drivers/spi/tle62x0.c | 1 + + drivers/staging/stlc45xx/stlc45xx.c | 1 + + drivers/thermal/Kconfig | 1 + + drivers/usb/Kconfig | 3 + + drivers/usb/Makefile | 2 + + drivers/usb/class/cdc-acm.c | 2 + + drivers/usb/class/cdc-wdm.c | 30 +- + drivers/usb/class/usbtmc.c | 84 +- + drivers/usb/core/config.c | 2 +- + drivers/usb/core/devio.c | 247 +- + drivers/usb/core/driver.c | 75 +- + drivers/usb/core/generic.c | 4 +- + drivers/usb/core/hcd.c | 113 +- + drivers/usb/core/hcd.h | 5 + + drivers/usb/core/hub.c | 126 +- + drivers/usb/core/message.c | 32 +- + drivers/usb/core/usb.c | 13 +- + drivers/usb/core/usb.h | 7 + + drivers/usb/early/Makefile | 5 + + drivers/usb/early/ehci-dbgp.c | 996 +++++ + drivers/usb/gadget/Kconfig | 31 +- + drivers/usb/gadget/amd5536udc.c | 56 +- + drivers/usb/gadget/at91_udc.c | 1 - + drivers/usb/gadget/audio.c | 24 +- + drivers/usb/gadget/composite.c | 2 +- + drivers/usb/gadget/dummy_hcd.c | 5 - + drivers/usb/gadget/ether.c | 31 +- + drivers/usb/gadget/f_audio.c | 97 +- + drivers/usb/gadget/f_eem.c | 562 +++ + drivers/usb/gadget/f_rndis.c | 15 +- + drivers/usb/gadget/fsl_qe_udc.c | 4 + + drivers/usb/gadget/gmidi.c | 8 +- + drivers/usb/gadget/pxa25x_udc.c | 49 +- + drivers/usb/gadget/pxa25x_udc.h | 1 + + drivers/usb/gadget/rndis.c | 13 +- + drivers/usb/gadget/rndis.h | 3 +- + drivers/usb/gadget/s3c-hsotg.c | 6 +- + drivers/usb/gadget/s3c2410_udc.c | 3 +- + drivers/usb/gadget/u_audio.c | 10 +- + drivers/usb/gadget/u_ether.c | 85 +- + drivers/usb/gadget/u_ether.h | 12 +- + drivers/usb/gadget/u_serial.c | 1 - + drivers/usb/host/Kconfig | 18 + + drivers/usb/host/Makefile | 1 + + drivers/usb/host/ehci-atmel.c | 230 ++ + drivers/usb/host/ehci-au1xxx.c | 29 +- + drivers/usb/host/ehci-dbg.c | 46 +- + drivers/usb/host/ehci-hcd.c | 89 +- + drivers/usb/host/ehci-hub.c | 84 +- + drivers/usb/host/ehci-mem.c | 26 +- + drivers/usb/host/ehci-pci.c | 42 +- + drivers/usb/host/ehci-q.c | 95 +- + drivers/usb/host/ehci-sched.c | 100 +- + drivers/usb/host/ehci-w90x900.c | 181 + + drivers/usb/host/ehci.h | 14 +- + drivers/usb/host/isp1362-hcd.c | 2909 +++++++++++++ + drivers/usb/host/isp1362.h | 1079 +++++ + drivers/usb/host/isp1760-hcd.c | 4 + + drivers/usb/host/isp1760-hcd.h | 2 + + drivers/usb/host/isp1760-if.c | 21 +- + drivers/usb/host/ohci-at91.c | 2 +- + drivers/usb/host/ohci-au1xxx.c | 27 +- + drivers/usb/host/ohci-ep93xx.c | 1 - + drivers/usb/host/ohci-hcd.c | 1 - + drivers/usb/host/ohci-pxa27x.c | 4 + + drivers/usb/host/oxu210hp-hcd.c | 1 - + drivers/usb/host/pci-quirks.c | 2 +- + drivers/usb/host/sl811-hcd.c | 8 +- + drivers/usb/host/uhci-q.c | 1 - + drivers/usb/host/whci/asl.c | 12 +- + drivers/usb/host/whci/hcd.c | 8 +- + drivers/usb/host/whci/pzl.c | 12 +- + drivers/usb/host/whci/qset.c | 4 +- + drivers/usb/host/whci/whci-hc.h | 1 + + drivers/usb/host/xhci-dbg.c | 5 +- + drivers/usb/host/xhci-hcd.c | 530 ++- + drivers/usb/host/xhci-mem.c | 140 +- + drivers/usb/host/xhci-pci.c | 16 + + drivers/usb/host/xhci-ring.c | 377 ++- + drivers/usb/host/xhci.h | 111 +- + drivers/usb/image/microtek.c | 37 - + drivers/usb/misc/idmouse.c | 21 + + drivers/usb/misc/ldusb.c | 6 + + drivers/usb/misc/legousbtower.c | 6 + + drivers/usb/misc/sisusbvga/sisusb.c | 53 +- + drivers/usb/misc/sisusbvga/sisusb.h | 2 - + drivers/usb/misc/usbsevseg.c | 69 +- + drivers/usb/mon/Kconfig | 4 +- + drivers/usb/mon/Makefile | 2 +- + drivers/usb/mon/mon_bin.c | 12 +- + drivers/usb/mon/mon_dma.c | 95 - + drivers/usb/mon/mon_main.c | 1 - + drivers/usb/mon/mon_text.c | 14 - + drivers/usb/mon/usb_mon.h | 14 - + drivers/usb/musb/musb_core.c | 8 +- + drivers/usb/otg/isp1301_omap.c | 23 +- + drivers/usb/serial/ark3116.c | 24 +- + drivers/usb/serial/ch341.c | 52 + + drivers/usb/serial/ftdi_sio.c | 7 + + drivers/usb/serial/ftdi_sio.h | 10 + + drivers/usb/serial/generic.c | 206 +- + drivers/usb/serial/iuu_phoenix.c | 115 +- + drivers/usb/serial/moto_modem.c | 2 +- + drivers/usb/serial/option.c | 138 +- + drivers/usb/serial/pl2303.c | 71 +- + drivers/usb/serial/pl2303.h | 4 + + drivers/usb/serial/sierra.c | 157 +- + drivers/usb/serial/usb-serial.c | 23 +- + drivers/usb/storage/datafab.c | 4 +- + drivers/usb/storage/initializers.c | 2 +- + drivers/usb/storage/jumpshot.c | 2 +- + drivers/usb/storage/onetouch.c | 2 +- + drivers/usb/storage/unusual_devs.h | 22 +- + drivers/usb/usb-skeleton.c | 252 +- + drivers/video/Kconfig | 50 +- + drivers/video/Makefile | 3 + + drivers/video/aty/atyfb_base.c | 829 +++-- + drivers/video/au1100fb.c | 7 +- + drivers/video/backlight/corgi_lcd.c | 1 + + drivers/video/backlight/ltv350qv.c | 1 + + drivers/video/backlight/tdo24m.c | 1 + + drivers/video/backlight/tosa_lcd.c | 2 +- + drivers/video/backlight/vgg2432a4.c | 3 +- + drivers/video/console/bitblit.c | 8 +- + drivers/video/console/fbcon.c | 58 +- + drivers/video/console/newport_con.c | 2 +- + drivers/video/console/vgacon.c | 8 +- + drivers/video/da8xx-fb.c | 890 ++++ + drivers/video/ep93xx-fb.c | 646 +++ + drivers/video/fbmem.c | 19 +- + drivers/video/matrox/g450_pll.c | 209 +- + drivers/video/matrox/g450_pll.h | 8 +- + drivers/video/matrox/i2c-matroxfb.c | 18 +- + drivers/video/matrox/matroxfb_DAC1064.c | 614 ++-- + drivers/video/matrox/matroxfb_DAC1064.h | 4 +- + drivers/video/matrox/matroxfb_Ti3026.c | 258 +- + drivers/video/matrox/matroxfb_accel.c | 129 +- + drivers/video/matrox/matroxfb_accel.h | 2 +- + drivers/video/matrox/matroxfb_base.c | 772 ++-- + drivers/video/matrox/matroxfb_base.h | 80 +- + drivers/video/matrox/matroxfb_crtc2.c | 160 +- + drivers/video/matrox/matroxfb_g450.c | 185 +- + drivers/video/matrox/matroxfb_g450.h | 8 +- + drivers/video/matrox/matroxfb_maven.c | 50 +- + drivers/video/matrox/matroxfb_misc.c | 288 +- + drivers/video/matrox/matroxfb_misc.h | 15 +- + drivers/video/msm/Makefile | 19 + + drivers/video/msm/mddi.c | 828 ++++ + drivers/video/msm/mddi_client_dummy.c | 97 + + drivers/video/msm/mddi_client_nt35399.c | 255 ++ + drivers/video/msm/mddi_client_toshiba.c | 283 ++ + drivers/video/msm/mddi_hw.h | 305 ++ + drivers/video/msm/mdp.c | 538 +++ + drivers/video/msm/mdp_csc_table.h | 582 +++ + drivers/video/msm/mdp_hw.h | 621 +++ + drivers/video/msm/mdp_ppp.c | 750 ++++ + drivers/video/msm/mdp_scale_tables.c | 766 ++++ + drivers/video/msm/mdp_scale_tables.h | 38 + + drivers/video/msm/msm_fb.c | 636 +++ + drivers/video/omap/Kconfig | 82 +- + drivers/video/omap/Makefile | 12 + + drivers/video/omap/blizzard.c | 91 +- + drivers/video/omap/dispc.c | 130 +- + drivers/video/omap/dispc.h | 7 +- + drivers/video/omap/hwa742.c | 2 +- + drivers/video/omap/lcd_2430sdp.c | 202 + + drivers/video/omap/lcd_ams_delta.c | 137 + + drivers/video/omap/lcd_apollon.c | 138 + + drivers/video/omap/lcd_ldp.c | 200 + + drivers/video/omap/lcd_mipid.c | 625 +++ + drivers/video/omap/lcd_omap2evm.c | 191 + + drivers/video/omap/lcd_omap3beagle.c | 130 + + drivers/video/omap/lcd_omap3evm.c | 192 + + drivers/video/omap/lcd_overo.c | 179 + + drivers/video/omap/omapfb_main.c | 64 +- + drivers/video/omap/rfbi.c | 7 +- + drivers/video/platinumfb.c | 12 +- + drivers/video/s3c-fb.c | 2 +- + drivers/video/s3c2410fb.c | 4 +- + drivers/video/sis/sis_main.c | 4 +- + drivers/video/sis/vstruct.h | 2 +- + drivers/video/tmiofb.c | 2 +- + drivers/video/via/accel.c | 589 ++- + drivers/video/via/accel.h | 13 +- + drivers/video/via/chip.h | 4 +- + drivers/video/via/dvi.c | 6 +- + drivers/video/via/global.c | 3 - + drivers/video/via/global.h | 2 - + drivers/video/via/hw.c | 474 +-- + drivers/video/via/hw.h | 57 +- + drivers/video/via/ioctl.h | 6 +- + drivers/video/via/lcd.c | 16 +- + drivers/video/via/share.h | 98 + + drivers/video/via/via_i2c.c | 64 +- + drivers/video/via/viafbdev.c | 1049 ++--- + drivers/video/via/viafbdev.h | 61 +- + drivers/video/via/viamode.c | 100 +- + drivers/video/via/viamode.h | 141 +- + drivers/video/via/vt1636.c | 4 +- + drivers/virtio/virtio_balloon.c | 3 +- + drivers/virtio/virtio_pci.c | 125 +- + drivers/virtio/virtio_ring.c | 6 +- + drivers/vlynq/vlynq.c | 1 - + firmware/ihex2fw.c | 2 +- + fs/9p/Kconfig | 9 + + fs/9p/Makefile | 3 +- + fs/9p/cache.c | 474 +++ + fs/9p/cache.h | 176 + + fs/9p/v9fs.c | 196 +- + fs/9p/v9fs.h | 13 +- + fs/9p/v9fs_vfs.h | 6 + + fs/9p/vfs_addr.c | 88 +- + fs/9p/vfs_file.c | 25 +- + fs/9p/vfs_inode.c | 61 +- + fs/9p/vfs_super.c | 16 +- + fs/afs/proc.c | 8 +- + fs/aio.c | 10 +- + fs/anon_inodes.c | 68 +- + fs/buffer.c | 57 +- + fs/compat.c | 7 - + fs/devpts/inode.c | 3 +- + fs/dlm/debug_fs.c | 12 +- + fs/eventfd.c | 67 +- + fs/exec.c | 5 + + fs/ext2/namei.c | 2 +- + fs/hugetlbfs/inode.c | 4 +- + fs/inode.c | 19 +- + fs/jbd2/journal.c | 4 +- + fs/jffs2/background.c | 20 +- + fs/jffs2/malloc.c | 4 +- + fs/minix/dir.c | 22 +- + fs/ncpfs/dir.c | 2 +- + fs/ncpfs/ioctl.c | 2 +- + fs/nfs/client.c | 17 +- + fs/nfs/fscache.c | 25 +- + fs/nfs/fscache.h | 6 +- + fs/nfs/super.c | 76 +- + fs/nfsd/export.c | 2 +- + fs/ntfs/file.c | 42 +- + fs/ocfs2/Makefile | 1 + + fs/ocfs2/alloc.c | 1342 ++++--- + fs/ocfs2/alloc.h | 101 +- + fs/ocfs2/aops.c | 37 +- + fs/ocfs2/aops.h | 2 + + fs/ocfs2/buffer_head_io.c | 47 +- + fs/ocfs2/buffer_head_io.h | 8 +- + fs/ocfs2/cluster/masklog.c | 1 + + fs/ocfs2/cluster/masklog.h | 1 + + fs/ocfs2/cluster/netdebug.c | 4 +- + fs/ocfs2/dir.c | 107 +- + fs/ocfs2/dlm/dlmdebug.c | 2 +- + fs/ocfs2/dlm/dlmthread.c | 6 +- + fs/ocfs2/dlmglue.c | 105 +- + fs/ocfs2/dlmglue.h | 6 + + fs/ocfs2/extent_map.c | 33 +- + fs/ocfs2/extent_map.h | 8 +- + fs/ocfs2/file.c | 151 +- + fs/ocfs2/file.h | 2 + + fs/ocfs2/inode.c | 86 +- + fs/ocfs2/inode.h | 20 +- + fs/ocfs2/ioctl.c | 14 + + fs/ocfs2/journal.c | 82 +- + fs/ocfs2/journal.h | 94 +- + fs/ocfs2/localalloc.c | 12 +- + fs/ocfs2/namei.c | 341 ++- + fs/ocfs2/namei.h | 6 + + fs/ocfs2/ocfs2.h | 52 +- + fs/ocfs2/ocfs2_fs.h | 107 +- + fs/ocfs2/ocfs2_lockid.h | 5 + + fs/ocfs2/quota_global.c | 5 +- + fs/ocfs2/quota_local.c | 26 +- + fs/ocfs2/refcounttree.c | 4313 ++++++++++++++++++++ + fs/ocfs2/refcounttree.h | 106 + + fs/ocfs2/resize.c | 16 +- + fs/ocfs2/slot_map.c | 10 +- + fs/ocfs2/suballoc.c | 35 +- + fs/ocfs2/super.c | 13 +- + fs/ocfs2/uptodate.c | 265 +- + fs/ocfs2/uptodate.h | 51 +- + fs/ocfs2/xattr.c | 2056 +++++++++- + fs/ocfs2/xattr.h | 15 +- + fs/open.c | 5 +- + fs/proc/array.c | 85 +- + fs/proc/base.c | 23 +- + fs/proc/kcore.c | 300 ++- + fs/proc/nommu.c | 2 +- + fs/proc/task_mmu.c | 33 +- + fs/qnx4/Kconfig | 11 - + fs/qnx4/Makefile | 2 +- + fs/qnx4/bitmap.c | 81 - + fs/qnx4/dir.c | 5 - + fs/qnx4/file.c | 40 - + fs/qnx4/inode.c | 84 +- + fs/qnx4/namei.c | 105 - + fs/qnx4/qnx4.h | 8 - + fs/qnx4/truncate.c | 34 - + fs/ramfs/inode.c | 4 +- + fs/select.c | 14 +- + fs/smbfs/proc.c | 2 +- + fs/sync.c | 1 + + include/acpi/acpi_bus.h | 16 +- + include/acpi/acpiosxf.h | 3 + + include/acpi/acpixf.h | 10 +- + include/acpi/actbl.h | 78 +- + include/acpi/actbl1.h | 872 +--- + include/acpi/actbl2.h | 868 ++++ + include/acpi/actypes.h | 92 +- + include/acpi/platform/aclinux.h | 4 +- + include/asm-generic/cputime.h | 1 + + include/asm-generic/gpio.h | 8 + + include/asm-generic/kmap_types.h | 47 +- + include/asm-generic/sections.h | 16 + + include/asm-generic/syscall.h | 8 +- + include/linux/acpi.h | 15 +- + include/linux/anon_inodes.h | 3 + + include/linux/cn_proc.h | 10 + + include/linux/cpumask.h | 12 + + include/linux/cred.h | 18 +- + include/linux/eventfd.h | 6 + + include/linux/firewire.h | 14 - + include/linux/gfp.h | 2 +- + include/linux/gpio.h | 11 + + include/linux/i2c-id.h | 11 - + include/linux/i2c.h | 2 - + include/linux/i2c/adp5588.h | 92 + + include/linux/i2c/mcs5000_ts.h | 24 + + include/linux/i8042.h | 30 + + include/linux/input.h | 2 +- + include/linux/intel-iommu.h | 2 + + include/linux/ioport.h | 4 + + include/linux/iova.h | 1 - + include/linux/jbd.h | 2 +- + include/linux/kernel.h | 16 +- + include/linux/kmemcheck.h | 6 +- + include/linux/libps2.h | 2 + + include/linux/linkage.h | 2 + + include/linux/magic.h | 6 + + include/linux/memory_hotplug.h | 8 - + include/linux/mfd/da903x.h | 4 +- + include/linux/mfd/wm831x/pmu.h | 189 + + include/linux/mm.h | 8 + + include/linux/mmc/card.h | 12 +- + include/linux/mmc/core.h | 1 + + include/linux/mmc/host.h | 58 + + include/linux/mmc/mmc.h | 3 + + include/linux/mmc/sdio_func.h | 3 + + include/linux/mod_devicetable.h | 11 + + include/linux/mtd/nand.h | 5 +- + include/linux/mtd/nand_ecc.h | 6 + + include/linux/mtd/onenand.h | 8 + + include/linux/mtd/onenand_regs.h | 3 + + include/linux/nfsd/nfsd.h | 2 +- + include/linux/pci_ids.h | 1 + + include/linux/power_supply.h | 21 + + include/linux/proc_fs.h | 16 +- + include/linux/regulator/consumer.h | 4 + + include/linux/regulator/driver.h | 5 +- + include/linux/regulator/fixed.h | 24 + + include/linux/regulator/machine.h | 26 +- + include/linux/regulator/max1586.h | 4 +- + include/linux/sched.h | 27 +- + include/linux/serial_core.h | 4 +- + include/linux/sfi.h | 206 + + include/linux/sfi_acpi.h | 93 + + include/linux/spi/mc33880.h | 10 + + include/linux/spi/spi.h | 51 +- + include/linux/sunrpc/xdr.h | 5 +- + include/linux/syscalls.h | 3 +- + include/linux/ucb1400.h | 19 + + include/linux/usb.h | 25 +- + include/linux/usb/audio.h | 287 +- + include/linux/usb/ch9.h | 8 + + include/linux/usb/ehci_def.h | 35 + + include/linux/usb/isp1362.h | 46 + + include/linux/usb/isp1760.h | 18 + + include/linux/usb/serial.h | 2 + + include/linux/usbdevice_fs.h | 3 + + include/linux/vgaarb.h | 11 +- + include/linux/virtio.h | 2 +- + include/linux/virtio_9p.h | 2 - + include/linux/virtio_balloon.h | 3 - + include/linux/virtio_blk.h | 18 +- + include/linux/virtio_config.h | 3 +- + include/linux/virtio_console.h | 3 - + include/linux/virtio_ids.h | 17 + + include/linux/virtio_net.h | 3 - + include/linux/virtio_rng.h | 3 - + include/linux/wm97xx.h | 18 + + include/linux/wm97xx_batt.h | 18 +- + include/net/9p/9p.h | 3 + + include/trace/events/timer.h | 342 ++ + include/video/da8xx-fb.h | 103 + + init/Kconfig | 8 - + init/main.c | 2 + + ipc/util.c | 2 +- + kernel/cgroup.c | 2 +- + kernel/cred.c | 19 + + kernel/exit.c | 10 +- + kernel/fork.c | 12 +- + kernel/hrtimer.c | 40 +- + kernel/itimer.c | 169 +- + kernel/kallsyms.c | 3 +- + kernel/kmod.c | 13 +- + kernel/kprobes.c | 2 +- + kernel/lockdep.c | 3 + + kernel/lockdep_proc.c | 2 +- + kernel/posix-cpu-timers.c | 155 +- + kernel/printk.c | 27 +- + kernel/resource.c | 23 +- + kernel/sched.c | 9 +- + kernel/smp.c | 29 +- + kernel/sys.c | 14 + + kernel/sysctl.c | 14 + + kernel/timer.c | 32 +- + kernel/trace/ftrace.c | 4 +- + kernel/trace/trace.c | 4 +- + lib/Kconfig.debug | 8 + + mm/Makefile | 4 +- + mm/memory_hotplug.c | 6 +- + mm/nommu.c | 3 +- + mm/vmalloc.c | 2 +- + net/9p/trans_virtio.c | 5 +- + net/ipv6/ip6mr.c | 2 +- + net/socket.c | 3 +- + net/sunrpc/rpc_pipe.c | 3 +- + net/sunrpc/xprtsock.c | 9 + + scripts/Kbuild.include | 16 +- + scripts/Makefile.build | 6 +- + scripts/basic/docproc.c | 34 +- + scripts/basic/fixdep.c | 26 +- + scripts/basic/hash.c | 4 +- + scripts/checkincludes.pl | 71 +- + scripts/conmakehash.c | 6 +- + scripts/genksyms/genksyms.c | 6 +- + scripts/kallsyms.c | 2 +- + scripts/kconfig/conf.c | 24 +- + scripts/kconfig/confdata.c | 2 +- + scripts/kconfig/expr.c | 6 +- + scripts/kconfig/gconf.c | 21 +- + scripts/kconfig/gconf.glade | 4 +- + scripts/kconfig/kxgettext.c | 4 +- + scripts/kconfig/lkc_proto.h | 2 + + scripts/kconfig/mconf.c | 78 +- + scripts/kconfig/menu.c | 84 +- + scripts/kconfig/qconf.cc | 10 +- + scripts/kconfig/symbol.c | 6 +- + scripts/markup_oops.pl | 5 +- + scripts/mod/file2alias.c | 13 + + scripts/mod/modpost.c | 4 +- + scripts/selinux/mdp/mdp.c | 4 +- + scripts/tags.sh | 3 +- + security/integrity/ima/ima_fs.c | 4 +- + security/keys/gc.c | 4 +- + security/selinux/avc.c | 19 +- + security/smack/smack_lsm.c | 8 +- + security/smack/smackfs.c | 6 +- + sound/core/pcm_native.c | 73 +- + sound/pci/lx6464es/lx6464es.h | 2 - + sound/pci/lx6464es/lx_core.c | 98 +- + sound/soc/blackfin/bf5xx-ac97.c | 8 + + sound/soc/blackfin/bf5xx-ac97.h | 2 +- + sound/soc/blackfin/bf5xx-i2s.c | 22 +- + sound/soc/blackfin/bf5xx-i2s.h | 2 +- + sound/soc/blackfin/bf5xx-sport.c | 2 +- + sound/soc/codecs/ad1836.c | 3 +- + sound/soc/codecs/ad1938.c | 2 +- + sound/soc/codecs/wm8753.c | 1 + + sound/soc/davinci/davinci-mcasp.c | 24 +- + usr/.gitignore | 2 + + usr/Makefile | 2 +- + usr/gen_init_cpio.c | 2 +- + 1043 files changed, 62626 insertions(+), 18117 deletions(-) + create mode 100644 Documentation/ABI/stable/sysfs-class-backlight + create mode 100644 Documentation/ABI/testing/sysfs-class-lcd + create mode 100644 Documentation/ABI/testing/sysfs-class-led + create mode 100644 Documentation/ABI/testing/sysfs-platform-asus-laptop + create mode 100644 Documentation/ABI/testing/sysfs-platform-eeepc-laptop + create mode 100644 Documentation/fb/ep93xx-fb.txt + create mode 100644 Documentation/hwmon/acpi_power_meter + delete mode 100644 Documentation/hwmon/fscher + delete mode 100644 Documentation/i2c/chips/pca9539 + delete mode 100644 Documentation/i2c/chips/pcf8574 + delete mode 100644 Documentation/i2c/chips/pcf8575 + create mode 100644 Documentation/laptops/asus-laptop.txt + create mode 100644 Documentation/power/regulator/design.txt + create mode 100644 arch/arm/mach-at91/board-sam9g20ek-2slot-mmc.c + create mode 100644 arch/arm/mach-ep93xx/include/mach/fb.h + create mode 100644 arch/arm/mach-nomadik/include/mach/fsmc.h + create mode 100644 arch/arm/mach-nomadik/include/mach/nand.h + create mode 100644 arch/arm/plat-mxc/include/mach/spi.h + create mode 100644 arch/x86/kernel/sfi.c + create mode 100644 drivers/acpi/acpica/nsrepair.c + create mode 100644 drivers/acpi/acpica/utids.c + create mode 100644 drivers/acpi/power_meter.c + create mode 100644 drivers/gpio/adp5520-gpio.c + create mode 100644 drivers/gpio/langwell_gpio.c + create mode 100644 drivers/gpio/mc33880.c + create mode 100644 drivers/gpio/ucb1400_gpio.c + create mode 100644 drivers/gpu/drm/radeon/radeon_family.h + delete mode 100644 drivers/hwmon/fscher.c + delete mode 100644 drivers/hwmon/fscpos.c + create mode 100644 drivers/i2c/busses/i2c-scmi.c + delete mode 100644 drivers/i2c/chips/pca9539.c + delete mode 100644 drivers/i2c/chips/pcf8574.c + delete mode 100644 drivers/i2c/chips/pcf8575.c + create mode 100644 drivers/input/keyboard/adp5588-keys.c + create mode 100644 drivers/input/keyboard/max7359_keypad.c + create mode 100644 drivers/input/keyboard/opencores-kbd.c + create mode 100644 drivers/input/keyboard/qt2160.c + create mode 100644 drivers/input/touchscreen/mcs5000_ts.c + create mode 100644 drivers/mmc/host/msm_sdcc.c + create mode 100644 drivers/mmc/host/msm_sdcc.h + mode change 100644 => 100755 drivers/mtd/chips/cfi_util.c + create mode 100644 drivers/mtd/devices/sst25l.c + mode change 100644 => 100755 drivers/mtd/inftlcore.c + create mode 100644 drivers/mtd/maps/gpio-addr-flash.c + create mode 100644 drivers/mtd/nand/nomadik_nand.c + create mode 100644 drivers/mtd/nand/w90p910_nand.c + create mode 100644 drivers/platform/x86/topstar-laptop.c + create mode 100644 drivers/power/wm831x_power.c + create mode 100644 drivers/regulator/tps65023-regulator.c + create mode 100644 drivers/regulator/tps6507x-regulator.c + create mode 100644 drivers/rtc/rtc-coh901331.c + create mode 100644 drivers/rtc/rtc-mxc.c + create mode 100644 drivers/rtc/rtc-pcap.c + create mode 100644 drivers/rtc/rtc-pcf2123.c + create mode 100644 drivers/rtc/rtc-stmp3xxx.c + create mode 100644 drivers/sfi/Kconfig + create mode 100644 drivers/sfi/Makefile + create mode 100644 drivers/sfi/sfi_acpi.c + create mode 100644 drivers/sfi/sfi_core.c + create mode 100644 drivers/sfi/sfi_core.h + create mode 100644 drivers/spi/mxc_spi.c + delete mode 100644 drivers/spi/spi_imx.c + create mode 100644 drivers/spi/spi_ppc4xx.c + create mode 100644 drivers/spi/spi_stmp.c + create mode 100644 drivers/usb/early/Makefile + create mode 100644 drivers/usb/early/ehci-dbgp.c + create mode 100644 drivers/usb/gadget/f_eem.c + create mode 100644 drivers/usb/host/ehci-atmel.c + create mode 100644 drivers/usb/host/ehci-w90x900.c + create mode 100644 drivers/usb/host/isp1362-hcd.c + create mode 100644 drivers/usb/host/isp1362.h + delete mode 100644 drivers/usb/mon/mon_dma.c + create mode 100644 drivers/video/da8xx-fb.c + create mode 100644 drivers/video/ep93xx-fb.c + create mode 100644 drivers/video/msm/Makefile + create mode 100644 drivers/video/msm/mddi.c + create mode 100644 drivers/video/msm/mddi_client_dummy.c + create mode 100644 drivers/video/msm/mddi_client_nt35399.c + create mode 100644 drivers/video/msm/mddi_client_toshiba.c + create mode 100644 drivers/video/msm/mddi_hw.h + create mode 100644 drivers/video/msm/mdp.c + create mode 100644 drivers/video/msm/mdp_csc_table.h + create mode 100644 drivers/video/msm/mdp_hw.h + create mode 100644 drivers/video/msm/mdp_ppp.c + create mode 100644 drivers/video/msm/mdp_scale_tables.c + create mode 100644 drivers/video/msm/mdp_scale_tables.h + create mode 100644 drivers/video/msm/msm_fb.c + create mode 100644 drivers/video/omap/lcd_2430sdp.c + create mode 100644 drivers/video/omap/lcd_ams_delta.c + create mode 100644 drivers/video/omap/lcd_apollon.c + create mode 100644 drivers/video/omap/lcd_ldp.c + create mode 100644 drivers/video/omap/lcd_mipid.c + create mode 100644 drivers/video/omap/lcd_omap2evm.c + create mode 100644 drivers/video/omap/lcd_omap3beagle.c + create mode 100644 drivers/video/omap/lcd_omap3evm.c + create mode 100644 drivers/video/omap/lcd_overo.c + create mode 100644 fs/9p/cache.c + create mode 100644 fs/9p/cache.h + create mode 100644 fs/ocfs2/refcounttree.c + create mode 100644 fs/ocfs2/refcounttree.h + delete mode 100644 fs/qnx4/file.c + delete mode 100644 fs/qnx4/truncate.c + create mode 100644 include/acpi/actbl2.h + create mode 100644 include/linux/i2c/adp5588.h + create mode 100644 include/linux/i2c/mcs5000_ts.h + create mode 100644 include/linux/mfd/wm831x/pmu.h + create mode 100644 include/linux/sfi.h + create mode 100644 include/linux/sfi_acpi.h + create mode 100644 include/linux/spi/mc33880.h + create mode 100644 include/linux/usb/isp1362.h + create mode 100644 include/linux/usb/isp1760.h + create mode 100644 include/linux/virtio_ids.h + create mode 100644 include/trace/events/timer.h + create mode 100644 include/video/da8xx-fb.h +Merging fixes/fixes +$ git merge fixes/fixes +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Resolved 'MAINTAINERS' using previous resolution. +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging arch/arm/mach-at91/board-neocore926.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6213a22] Merge remote branch 'arm-current/master' +$ git diff -M --stat --summary HEAD^.. + arch/arm/common/vic.c | 1 + + arch/arm/include/asm/atomic.h | 26 ++---- + arch/arm/include/asm/cache.h | 2 +- + arch/arm/include/asm/unified.h | 4 + + arch/arm/kernel/entry-armv.S | 19 +++-- + arch/arm/kernel/entry-header.S | 14 +++ + arch/arm/kernel/kprobes.c | 19 ++++- + arch/arm/lib/copy_page.S | 16 ++-- + arch/arm/mach-at91/at91cap9_devices.c | 10 +- + arch/arm/mach-at91/board-cap9adk.c | 2 +- + arch/arm/mach-at91/board-neocore926.c | 2 +- + arch/arm/mach-pxa/spitz.c | 1 + + arch/arm/mach-s3c2410/Kconfig | 5 + + arch/arm/mach-s3c2412/Kconfig | 3 + + arch/arm/mach-s3c2440/Kconfig | 6 ++ + arch/arm/mach-s3c6400/Kconfig | 1 + + arch/arm/mach-s3c6410/Kconfig | 1 + + arch/arm/mach-sa1100/dma.c | 2 +- + arch/arm/mm/Kconfig | 5 + + arch/arm/mm/fault.c | 110 ++++++++++++++----------- + arch/arm/plat-s3c/gpio.c | 2 +- + arch/arm/plat-s3c64xx/dma.c | 6 +- + arch/arm/plat-s3c64xx/include/plat/dma-plat.h | 2 +- + arch/arm/plat-s3c64xx/include/plat/irqs.h | 10 ++- + arch/arm/plat-s3c64xx/s3c6400-clock.c | 8 +- + arch/arm/plat-stmp3xxx/dma.c | 2 +- + arch/arm/tools/mach-types | 20 ++++- + 27 files changed, 191 insertions(+), 108 deletions(-) +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 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 +Resolved 'drivers/staging/Kconfig' using previous resolution. +Resolved 'drivers/staging/Makefile' using previous resolution. +Auto-merging drivers/staging/Kconfig +CONFLICT (content): Merge conflict in drivers/staging/Kconfig +Auto-merging drivers/staging/Makefile +CONFLICT (content): Merge conflict in drivers/staging/Makefile +Removing drivers/staging/cpc-usb/Kconfig +Removing drivers/staging/cpc-usb/Makefile +CONFLICT (delete/modify): drivers/staging/cpc-usb/TODO deleted in net-current/master and modified in HEAD. Version HEAD of drivers/staging/cpc-usb/TODO left in tree. +CONFLICT (delete/modify): drivers/staging/cpc-usb/cpc-usb_drv.c deleted in net-current/master and modified in HEAD. Version HEAD of drivers/staging/cpc-usb/cpc-usb_drv.c left in tree. +CONFLICT (delete/modify): drivers/staging/cpc-usb/cpc.h deleted in net-current/master and modified in HEAD. Version HEAD of drivers/staging/cpc-usb/cpc.h left in tree. +CONFLICT (delete/modify): drivers/staging/cpc-usb/cpc_int.h deleted in net-current/master and modified in HEAD. Version HEAD of drivers/staging/cpc-usb/cpc_int.h left in tree. +CONFLICT (delete/modify): drivers/staging/cpc-usb/cpcusb.h deleted in net-current/master and modified in HEAD. Version HEAD of drivers/staging/cpc-usb/cpcusb.h left in tree. +Removing drivers/staging/cpc-usb/sja2m16c.h +Removing drivers/staging/cpc-usb/sja2m16c_2.c +Auto-merging kernel/sys_ni.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/cpc-usb/TODO drivers/staging/cpc-usb/cpc-usb_drv.c drivers/staging/cpc-usb/cpc.h drivers/staging/cpc-usb/cpc_int.h drivers/staging/cpc-usb/cpcusb.h +drivers/staging/Kconfig: needs merge +drivers/staging/Makefile: needs merge +drivers/staging/cpc-usb/TODO: needs merge +drivers/staging/cpc-usb/cpc-usb_drv.c: needs merge +drivers/staging/cpc-usb/cpc.h: needs merge +drivers/staging/cpc-usb/cpc_int.h: needs merge +drivers/staging/cpc-usb/cpcusb.h: needs merge +rm 'drivers/staging/cpc-usb/TODO' +rm 'drivers/staging/cpc-usb/cpc-usb_drv.c' +rm 'drivers/staging/cpc-usb/cpc.h' +rm 'drivers/staging/cpc-usb/cpc_int.h' +rm 'drivers/staging/cpc-usb/cpcusb.h' +$ git commit -v -a +[master 3a6f9f6] Merge remote branch 'net-current/master' +$ git diff -M --stat --summary HEAD^.. + drivers/net/can/Kconfig | 7 + + drivers/net/can/Makefile | 2 + + drivers/net/can/usb/Makefile | 5 + + drivers/net/can/usb/ems_usb.c | 1155 ++++++++++++++++++++++++++++++++ + drivers/net/cpmac.c | 8 +- + drivers/net/igb/e1000_mac.c | 72 +- + drivers/net/igb/e1000_mac.h | 1 - + drivers/net/ixgbe/ixgbe.h | 6 +- + drivers/net/ixgbe/ixgbe_ethtool.c | 75 ++- + drivers/net/ixgbe/ixgbe_main.c | 111 ++-- + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/cpc-usb/Kconfig | 4 - + drivers/staging/cpc-usb/Makefile | 3 - + drivers/staging/cpc-usb/TODO | 10 - + drivers/staging/cpc-usb/cpc-usb_drv.c | 1184 --------------------------------- + drivers/staging/cpc-usb/cpc.h | 417 ------------ + drivers/staging/cpc-usb/cpc_int.h | 83 --- + drivers/staging/cpc-usb/cpcusb.h | 86 --- + drivers/staging/cpc-usb/sja2m16c.h | 41 -- + drivers/staging/cpc-usb/sja2m16c_2.c | 452 ------------- + kernel/sys_ni.c | 1 + + 22 files changed, 1342 insertions(+), 2384 deletions(-) + create mode 100644 drivers/net/can/usb/Makefile + create mode 100644 drivers/net/can/usb/ems_usb.c + delete mode 100644 drivers/staging/cpc-usb/Kconfig + delete mode 100644 drivers/staging/cpc-usb/Makefile + delete mode 100644 drivers/staging/cpc-usb/TODO + delete mode 100644 drivers/staging/cpc-usb/cpc-usb_drv.c + delete mode 100644 drivers/staging/cpc-usb/cpc.h + delete mode 100644 drivers/staging/cpc-usb/cpc_int.h + delete mode 100644 drivers/staging/cpc-usb/cpcusb.h + delete mode 100644 drivers/staging/cpc-usb/sja2m16c.h + delete mode 100644 drivers/staging/cpc-usb/sja2m16c_2.c +Merging sound-current/for-linus +$ git merge sound-current/for-linus +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 +Already up-to-date. +Merging quilt/tty.current +$ git merge quilt/tty.current +Already up-to-date. +Merging quilt/usb.current +$ git merge quilt/usb.current +Recorded preimage for 'drivers/usb/host/xhci-hcd.c' +Recorded preimage for 'drivers/usb/host/xhci-mem.c' +Recorded preimage for 'drivers/usb/host/xhci-ring.c' +Recorded preimage for 'drivers/usb/host/xhci.h' +Auto-merging drivers/usb/host/xhci-hcd.c +CONFLICT (content): Merge conflict in drivers/usb/host/xhci-hcd.c +Auto-merging drivers/usb/host/xhci-mem.c +CONFLICT (content): Merge conflict in drivers/usb/host/xhci-mem.c +Auto-merging drivers/usb/host/xhci-pci.c +Auto-merging drivers/usb/host/xhci-ring.c +CONFLICT (content): Merge conflict in drivers/usb/host/xhci-ring.c +Auto-merging drivers/usb/host/xhci.h +CONFLICT (content): Merge conflict in drivers/usb/host/xhci.h +Auto-merging drivers/usb/serial/option.c +Auto-merging drivers/usb/serial/pl2303.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/usb/host/xhci-hcd.c'. +Recorded resolution for 'drivers/usb/host/xhci-mem.c'. +Recorded resolution for 'drivers/usb/host/xhci-ring.c'. +Recorded resolution for 'drivers/usb/host/xhci.h'. +[master 3a6e758] Merge branch 'quilt/usb.current' +$ git diff -M --stat --summary HEAD^.. +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-linus +$ git merge md-current/for-linus +Removing drivers/dma/ioat.c +Removing drivers/dma/ioat_dma.c +Removing drivers/dma/ioatdma.h +Removing drivers/dma/ioatdma_hw.h +Auto-merging drivers/mmc/host/atmel-mci.c +Auto-merging include/linux/pci_ids.h +Merge made by recursive. + Documentation/crypto/async-tx-api.txt | 75 +- + arch/arm/include/asm/hardware/iop3xx-adma.h | 81 +- + arch/arm/include/asm/hardware/iop_adma.h | 3 + + arch/arm/mach-iop13xx/include/mach/adma.h | 119 ++- + arch/arm/mach-iop13xx/setup.c | 17 +- + arch/arm/plat-iop/adma.c | 4 +- + arch/powerpc/include/asm/fsldma.h | 136 ++ + arch/sh/drivers/dma/Kconfig | 12 +- + arch/sh/drivers/dma/Makefile | 3 +- + arch/sh/include/asm/dma-sh.h | 13 + + crypto/async_tx/Kconfig | 9 + + crypto/async_tx/Makefile | 3 + + crypto/async_tx/async_memcpy.c | 44 +- + crypto/async_tx/async_memset.c | 43 +- + crypto/async_tx/async_pq.c | 395 +++++ + crypto/async_tx/async_raid6_recov.c | 468 ++++++ + crypto/async_tx/async_tx.c | 87 +- + crypto/async_tx/async_xor.c | 207 ++-- + crypto/async_tx/raid6test.c | 240 +++ + drivers/dca/dca-core.c | 124 ++- + drivers/dma/Kconfig | 14 +- + drivers/dma/Makefile | 4 +- + drivers/dma/at_hdmac.c | 60 +- + drivers/dma/at_hdmac_regs.h | 1 + + drivers/dma/dmaengine.c | 94 +- + drivers/dma/dmatest.c | 40 + + drivers/dma/dw_dmac.c | 50 +- + drivers/dma/dw_dmac_regs.h | 1 + + drivers/dma/fsldma.c | 288 +++- + drivers/dma/fsldma.h | 4 +- + drivers/dma/ioat.c | 202 --- + drivers/dma/ioat/Makefile | 2 + + drivers/dma/{ioat_dca.c => ioat/dca.c} | 13 +- + drivers/dma/ioat/dma.c | 1238 ++++++++++++++ + drivers/dma/ioat/dma.h | 337 ++++ + drivers/dma/ioat/dma_v2.c | 871 ++++++++++ + drivers/dma/ioat/dma_v2.h | 190 +++ + drivers/dma/ioat/dma_v3.c | 1223 ++++++++++++++ + drivers/dma/ioat/hw.h | 215 +++ + drivers/dma/ioat/pci.c | 210 +++ + .../dma/{ioatdma_registers.h => ioat/registers.h} | 54 +- + drivers/dma/ioat_dma.c | 1741 -------------------- + drivers/dma/ioatdma.h | 165 -- + drivers/dma/ioatdma_hw.h | 70 - + drivers/dma/iop-adma.c | 491 +++++- + drivers/dma/iovlock.c | 10 + + drivers/dma/mv_xor.c | 7 +- + drivers/dma/mv_xor.h | 4 +- + drivers/dma/shdma.c | 786 +++++++++ + drivers/dma/shdma.h | 64 + + drivers/dma/txx9dmac.c | 24 +- + drivers/dma/txx9dmac.h | 1 + + drivers/idle/i7300_idle.c | 20 +- + drivers/md/Kconfig | 26 + + drivers/md/bitmap.c | 5 +- + drivers/md/linear.c | 3 + + drivers/md/md.c | 25 +- + drivers/md/md.h | 1 + + drivers/md/multipath.c | 6 +- + drivers/md/raid0.c | 8 +- + drivers/md/raid1.c | 15 +- + drivers/md/raid10.c | 12 +- + drivers/md/raid5.c | 1493 +++++++++++------- + drivers/md/raid5.h | 28 +- + drivers/mmc/host/atmel-mci.c | 9 +- + include/linux/async_tx.h | 129 ++- + include/linux/dca.h | 11 +- + include/linux/dmaengine.h | 179 ++- + include/linux/pci_ids.h | 10 + + 69 files changed, 9199 insertions(+), 3338 deletions(-) + create mode 100644 arch/powerpc/include/asm/fsldma.h + create mode 100644 crypto/async_tx/async_pq.c + create mode 100644 crypto/async_tx/async_raid6_recov.c + create mode 100644 crypto/async_tx/raid6test.c + delete mode 100644 drivers/dma/ioat.c + create mode 100644 drivers/dma/ioat/Makefile + rename drivers/dma/{ioat_dca.c => ioat/dca.c} (98%) + create mode 100644 drivers/dma/ioat/dma.c + create mode 100644 drivers/dma/ioat/dma.h + create mode 100644 drivers/dma/ioat/dma_v2.c + create mode 100644 drivers/dma/ioat/dma_v2.h + create mode 100644 drivers/dma/ioat/dma_v3.c + create mode 100644 drivers/dma/ioat/hw.h + create mode 100644 drivers/dma/ioat/pci.c + rename drivers/dma/{ioatdma_registers.h => ioat/registers.h} (84%) + delete mode 100644 drivers/dma/ioat_dma.c + delete mode 100644 drivers/dma/ioatdma.h + delete mode 100644 drivers/dma/ioatdma_hw.h + create mode 100644 drivers/dma/shdma.c + create mode 100644 drivers/dma/shdma.h +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. + drivers/crypto/padlock-sha.c | 14 ++++++++++++-- + 1 files changed, 12 insertions(+), 2 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 arm/devel +$ git merge arm/devel +Auto-merging MAINTAINERS +Removing arch/arm/configs/littleton_defconfig +Removing arch/arm/configs/zylonite_defconfig +Auto-merging arch/arm/kernel/Makefile +Auto-merging arch/arm/kernel/vmlinux.lds.S +Auto-merging arch/arm/mach-at91/board-sam9rlek.c +Auto-merging arch/arm/mach-pxa/spitz.c +Auto-merging arch/arm/mm/init.c +Auto-merging drivers/i2c/busses/Kconfig +Auto-merging drivers/rtc/rtc-sa1100.c +Auto-merging drivers/serial/pxa.c +Auto-merging drivers/spi/pxa2xx_spi.c +Auto-merging drivers/usb/host/ohci-pxa27x.c +Merge made by recursive. + Documentation/arm/tcm.txt | 145 +++ + MAINTAINERS | 8 +- + arch/arm/Kconfig | 5 + + arch/arm/common/locomo.c | 17 +- + arch/arm/configs/littleton_defconfig | 783 ------------ + arch/arm/configs/pxa3xx_defconfig | 1332 ++++++++++++++++++++ + arch/arm/configs/xcep_defconfig | 1129 +++++++++++++++++ + arch/arm/configs/zylonite_defconfig | 736 ----------- + arch/arm/include/asm/cputype.h | 10 +- + arch/arm/include/asm/tcm.h | 31 + + arch/arm/kernel/Makefile | 1 + + arch/arm/kernel/setup.c | 2 + + arch/arm/kernel/tcm.c | 246 ++++ + arch/arm/kernel/tcm.h | 17 + + arch/arm/kernel/vmlinux.lds.S | 57 + + arch/arm/mach-at91/at91sam9g45_devices.c | 104 ++ + arch/arm/mach-at91/at91sam9rl_devices.c | 102 ++ + arch/arm/mach-at91/board-sam9m10g45ek.c | 10 + + arch/arm/mach-at91/board-sam9rlek.c | 10 + + arch/arm/mach-integrator/integrator_cp.c | 4 +- + arch/arm/mach-pxa/Kconfig | 36 + + arch/arm/mach-pxa/Makefile | 4 + + arch/arm/mach-pxa/balloon3.c | 361 ++++++ + arch/arm/mach-pxa/clock.h | 1 - + arch/arm/mach-pxa/cm-x270.c | 146 ++- + arch/arm/mach-pxa/cm-x300.c | 71 +- + arch/arm/mach-pxa/colibri-pxa300.c | 1 + + arch/arm/mach-pxa/colibri-pxa320.c | 33 + + arch/arm/mach-pxa/colibri-pxa3xx.c | 52 +- + arch/arm/mach-pxa/corgi.c | 233 ++-- + arch/arm/mach-pxa/csb726.c | 54 +- + arch/arm/mach-pxa/devices.c | 27 + + arch/arm/mach-pxa/devices.h | 2 + + arch/arm/mach-pxa/e740.c | 1 - + arch/arm/mach-pxa/e750.c | 1 - + arch/arm/mach-pxa/em-x270.c | 45 +- + arch/arm/mach-pxa/eseries.c | 39 +- + arch/arm/mach-pxa/gumstix.c | 5 +- + arch/arm/mach-pxa/hx4700.c | 65 +- + arch/arm/mach-pxa/idp.c | 5 +- + arch/arm/mach-pxa/imote2.c | 3 + + arch/arm/mach-pxa/include/mach/balloon3.h | 134 ++ + arch/arm/mach-pxa/include/mach/colibri.h | 6 + + arch/arm/mach-pxa/include/mach/entry-macro.S | 25 +- + arch/arm/mach-pxa/include/mach/hardware.h | 17 + + arch/arm/mach-pxa/include/mach/irda.h | 2 + + arch/arm/mach-pxa/include/mach/irqs.h | 42 +- + arch/arm/mach-pxa/include/mach/mfp.h | 301 +----- + arch/arm/mach-pxa/include/mach/mmc.h | 5 + + arch/arm/mach-pxa/include/mach/palmtc.h | 86 ++ + arch/arm/mach-pxa/include/mach/palmtx.h | 5 + + arch/arm/mach-pxa/include/mach/pxa3xx-regs.h | 4 +- + arch/arm/mach-pxa/include/mach/pxafb.h | 3 +- + arch/arm/mach-pxa/include/mach/regs-intc.h | 11 + + arch/arm/mach-pxa/include/mach/uncompress.h | 2 +- + arch/arm/mach-pxa/irq.c | 8 +- + arch/arm/mach-pxa/littleton.c | 43 +- + arch/arm/mach-pxa/lubbock.c | 18 +- + arch/arm/mach-pxa/magician.c | 59 +- + arch/arm/mach-pxa/mainstone.c | 16 +- + arch/arm/mach-pxa/mioa701.c | 84 +- + arch/arm/mach-pxa/palmld.c | 143 +-- + arch/arm/mach-pxa/palmt5.c | 111 +-- + arch/arm/mach-pxa/palmtc.c | 436 +++++++ + arch/arm/mach-pxa/palmte2.c | 110 +-- + arch/arm/mach-pxa/palmtx.c | 225 ++-- + arch/arm/mach-pxa/palmz72.c | 116 +-- + arch/arm/mach-pxa/pcm990-baseboard.c | 67 +- + arch/arm/mach-pxa/poodle.c | 80 +- + arch/arm/mach-pxa/pxa2xx.c | 1 + + arch/arm/mach-pxa/pxa300.c | 2 + + arch/arm/mach-pxa/pxa320.c | 2 + + arch/arm/mach-pxa/pxa930.c | 19 +- + arch/arm/mach-pxa/spitz.c | 237 ++-- + arch/arm/mach-pxa/tosa.c | 91 +-- + arch/arm/mach-pxa/treo680.c | 159 +-- + arch/arm/mach-pxa/trizeps4.c | 4 + + arch/arm/mach-pxa/xcep.c | 187 +++ + arch/arm/mach-pxa/zylonite.c | 3 + + arch/arm/mach-realview/core.c | 24 +- + arch/arm/mach-realview/core.h | 4 +- + arch/arm/mach-realview/realview_eb.c | 40 +- + arch/arm/mach-realview/realview_pb1176.c | 40 +- + arch/arm/mach-realview/realview_pb11mp.c | 40 +- + arch/arm/mach-realview/realview_pba8.c | 40 +- + arch/arm/mach-realview/realview_pbx.c | 40 +- + arch/arm/mach-u300/Kconfig | 12 + + arch/arm/mach-u300/Makefile | 3 + + arch/arm/mach-u300/core.c | 14 +- + arch/arm/mach-u300/dummyspichip.c | 290 +++++ + arch/arm/mach-u300/gpio.c | 13 - + arch/arm/mach-u300/i2c.c | 43 + + arch/arm/mach-u300/i2c.h | 23 + + arch/arm/mach-u300/include/mach/memory.h | 8 + + arch/arm/mach-u300/include/mach/syscon.h | 120 ++- + arch/arm/mach-u300/mmc.c | 22 +- + arch/arm/mach-u300/padmux.c | 395 ++++++- + arch/arm/mach-u300/padmux.h | 28 +- + arch/arm/mach-u300/spi.c | 124 ++ + arch/arm/mach-u300/spi.h | 26 + + arch/arm/mach-u300/timer.c | 15 + + arch/arm/mach-versatile/core.c | 4 +- + arch/arm/mach-versatile/versatile_pb.c | 4 +- + arch/arm/mm/init.c | 8 + + arch/arm/plat-pxa/dma.c | 281 ++++- + arch/arm/plat-pxa/include/plat/mfp.h | 73 +- + arch/arm/plat-pxa/mfp.c | 3 + + drivers/i2c/busses/Kconfig | 4 +- + drivers/mmc/host/mmci.c | 109 ++- + drivers/mmc/host/mmci.h | 3 +- + drivers/mmc/host/pxamci.c | 104 ++- + drivers/net/irda/pxaficp_ir.c | 47 +- + drivers/pcmcia/Makefile | 1 + + drivers/pcmcia/pxa2xx_base.c | 18 +- + drivers/pcmcia/pxa2xx_palmtc.c | 230 ++++ + drivers/rtc/rtc-pxa.c | 27 +- + drivers/rtc/rtc-sa1100.c | 23 +- + drivers/serial/pxa.c | 20 +- + drivers/spi/amba-pl022.c | 8 +- + drivers/spi/pxa2xx_spi.c | 30 +- + drivers/usb/host/ohci-pxa27x.c | 30 +- + drivers/video/backlight/da903x_bl.c | 20 +- + drivers/video/pxafb.c | 32 +- + .../asm/mach/mmc.h => include/linux/amba/mmci.h | 9 +- + include/linux/amba/pl022.h | 8 +- + include/linux/fb.h | 1 + + sound/arm/pxa2xx-ac97.c | 20 +- + 127 files changed, 7642 insertions(+), 3637 deletions(-) + create mode 100644 Documentation/arm/tcm.txt + delete mode 100644 arch/arm/configs/littleton_defconfig + create mode 100644 arch/arm/configs/pxa3xx_defconfig + create mode 100644 arch/arm/configs/xcep_defconfig + delete mode 100644 arch/arm/configs/zylonite_defconfig + create mode 100644 arch/arm/include/asm/tcm.h + create mode 100644 arch/arm/kernel/tcm.c + create mode 100644 arch/arm/kernel/tcm.h + create mode 100644 arch/arm/mach-pxa/balloon3.c + create mode 100644 arch/arm/mach-pxa/include/mach/balloon3.h + create mode 100644 arch/arm/mach-pxa/include/mach/palmtc.h + create mode 100644 arch/arm/mach-pxa/palmtc.c + create mode 100644 arch/arm/mach-pxa/xcep.c + create mode 100644 arch/arm/mach-u300/dummyspichip.c + create mode 100644 arch/arm/mach-u300/i2c.c + create mode 100644 arch/arm/mach-u300/i2c.h + create mode 100644 arch/arm/mach-u300/spi.c + create mode 100644 arch/arm/mach-u300/spi.h + create mode 100644 drivers/pcmcia/pxa2xx_palmtc.c + rename arch/arm/include/asm/mach/mmc.h => include/linux/amba/mmci.h (63%) +Merging davinci/for-next +$ git merge davinci/for-next +Already up-to-date. +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging thumb-2/thumb-2 +$ git merge thumb-2/thumb-2 +Merge made by recursive. +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Merge made by recursive. + arch/avr32/boards/atngw100/mrmt.c | 1 + + arch/avr32/boards/atngw100/setup.c | 5 ---- + arch/avr32/mach-at32ap/at32ap700x.c | 35 ++++++++++++++------------ + arch/avr32/mach-at32ap/include/mach/board.h | 1 + + arch/avr32/mach-at32ap/include/mach/cpu.h | 2 + + 5 files changed, 23 insertions(+), 21 deletions(-) +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Merge made by recursive. + arch/blackfin/Kconfig | 10 ++++--- + arch/blackfin/kernel/time.c | 63 +----------------------------------------- + 2 files changed, 8 insertions(+), 65 deletions(-) +Merging cris/for-next +$ git merge cris/for-next +Auto-merging arch/cris/kernel/vmlinux.lds.S +Auto-merging drivers/net/cris/eth_v10.c +Merge made by recursive. + arch/cris/arch-v10/kernel/time.c | 1 - + arch/cris/arch-v32/kernel/smp.c | 2 - + arch/cris/arch-v32/kernel/time.c | 1 - + arch/cris/arch-v32/mach-a3/io.c | 2 +- + arch/cris/arch-v32/mach-fs/io.c | 2 +- + arch/cris/include/arch-v10/arch/mmu.h | 9 ++++--- + arch/cris/include/arch-v32/arch/mmu.h | 10 +++++--- + arch/cris/include/asm/hardirq.h | 12 +--------- + arch/cris/include/asm/pgtable.h | 2 + + arch/cris/kernel/irq.c | 5 ---- + arch/cris/kernel/vmlinux.lds.S | 37 +++++++------------------------- + drivers/net/cris/eth_v10.c | 20 +++++++++++++++-- + drivers/serial/crisv10.c | 1 + + 13 files changed, 43 insertions(+), 61 deletions(-) +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging m68k/for-next +$ git merge m68k/for-next +Recorded preimage for 'drivers/rtc/Kconfig' +Auto-merging drivers/rtc/Kconfig +CONFLICT (content): Merge conflict in drivers/rtc/Kconfig +Auto-merging drivers/rtc/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/rtc/Kconfig'. +[master ed66948] Merge remote branch 'm68k/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/rtc/Kconfig | 19 +++ + drivers/rtc/Makefile | 2 + + drivers/rtc/rtc-msm6242.c | 268 +++++++++++++++++++++++++++++++++++++++++++++ + drivers/rtc/rtc-rp5c01.c | 222 +++++++++++++++++++++++++++++++++++++ + 4 files changed, 511 insertions(+), 0 deletions(-) + create mode 100644 drivers/rtc/rtc-msm6242.c + create mode 100644 drivers/rtc/rtc-rp5c01.c +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Merge made by recursive. + arch/m68k/include/asm/processor.h | 2 ++ + arch/m68k/include/asm/ptrace.h | 12 ++++++++++++ + arch/m68knommu/kernel/ptrace.c | 18 +++++++++++++++--- + 3 files changed, 29 insertions(+), 3 deletions(-) +Merging microblaze/next +$ git merge microblaze/next +Removing arch/microblaze/include/asm/ipc.h +Auto-merging arch/microblaze/mm/init.c +Auto-merging drivers/mtd/Kconfig +Auto-merging drivers/mtd/maps/Kconfig +Auto-merging drivers/usb/Kconfig +Merge made by recursive. + arch/microblaze/Kconfig | 1 + + arch/microblaze/Makefile | 31 ++++++-- + arch/microblaze/boot/Makefile | 41 ++++++++++- + arch/microblaze/boot/dts/system.dts | 1 + + arch/microblaze/boot/linked_dtb.S | 3 + + arch/microblaze/configs/mmu_defconfig | 2 +- + arch/microblaze/configs/nommu_defconfig | 2 +- + arch/microblaze/include/asm/asm-compat.h | 17 ++++ + arch/microblaze/include/asm/io.h | 3 + + arch/microblaze/include/asm/ipc.h | 1 - + arch/microblaze/include/asm/page.h | 3 + + arch/microblaze/include/asm/setup.h | 2 +- + arch/microblaze/include/asm/syscall.h | 99 +++++++++++++++++++++++++ + arch/microblaze/kernel/cpu/cpuinfo.c | 3 + + arch/microblaze/kernel/entry.S | 72 +++++++++++++++--- + arch/microblaze/kernel/exceptions.c | 33 +++++--- + arch/microblaze/kernel/head.S | 14 +++- + arch/microblaze/kernel/hw_exception_handler.S | 10 ++- + arch/microblaze/kernel/process.c | 1 + + arch/microblaze/kernel/ptrace.c | 62 +++++++++++++++ + arch/microblaze/kernel/setup.c | 12 +++- + arch/microblaze/kernel/vmlinux.lds.S | 72 +++++++----------- + arch/microblaze/mm/init.c | 3 +- + drivers/mtd/Kconfig | 2 +- + drivers/mtd/maps/Kconfig | 2 +- + drivers/usb/Kconfig | 1 - + kernel/gcov/Kconfig | 2 +- + 27 files changed, 404 insertions(+), 91 deletions(-) + create mode 120000 arch/microblaze/boot/dts/system.dts + create mode 100644 arch/microblaze/boot/linked_dtb.S + create mode 100644 arch/microblaze/include/asm/asm-compat.h + delete mode 100644 arch/microblaze/include/asm/ipc.h + create mode 100644 arch/microblaze/include/asm/syscall.h +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Resolved 'arch/mips/Kconfig' using previous resolution. +Resolved 'arch/mips/bcm63xx/Makefile' using previous resolution. +Resolved 'arch/mips/bcm63xx/boards/board_bcm963xx.c' using previous resolution. +Renaming arch/mips/configs/fulong_defconfig->arch/mips/configs/fuloong2e_defconfig +Auto-merging arch/mips/configs/fuloong2e_defconfig +Auto-merging arch/mips/Kconfig +CONFLICT (content): Merge conflict in arch/mips/Kconfig +Auto-merging arch/mips/Makefile +Auto-merging arch/mips/bcm63xx/Makefile +CONFLICT (add/add): Merge conflict in arch/mips/bcm63xx/Makefile +Auto-merging arch/mips/bcm63xx/boards/board_bcm963xx.c +CONFLICT (add/add): Merge conflict in arch/mips/bcm63xx/boards/board_bcm963xx.c +Auto-merging arch/mips/kernel/scall32-o32.S +Auto-merging arch/mips/kernel/scall64-64.S +Auto-merging arch/mips/kernel/vmlinux.lds.S +CONFLICT (delete/modify): arch/mips/lemote/lm2e/Makefile deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/Makefile left in tree. +CONFLICT (delete/modify): arch/mips/lemote/lm2e/pci.c deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/pci.c left in tree. +CONFLICT (delete/modify): arch/mips/lemote/lm2e/prom.c deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/prom.c left in tree. +Auto-merging arch/mips/mm/init.c +Auto-merging arch/mips/pci/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/mips/lemote/lm2e/Makefile arch/mips/lemote/lm2e/pci.c arch/mips/lemote/lm2e/prom.c +arch/mips/Kconfig: needs merge +arch/mips/bcm63xx/Makefile: needs merge +arch/mips/bcm63xx/boards/board_bcm963xx.c: needs merge +arch/mips/lemote/lm2e/Makefile: needs merge +arch/mips/lemote/lm2e/pci.c: needs merge +arch/mips/lemote/lm2e/prom.c: needs merge +rm 'arch/mips/lemote/lm2e/Makefile' +rm 'arch/mips/lemote/lm2e/pci.c' +rm 'arch/mips/lemote/lm2e/prom.c' +$ git commit -v -a +[master e416680] Merge remote branch 'mips/mips-for-linux-next' +$ git diff -M --stat --summary HEAD^.. + arch/mips/lemote/lm2e/early_printk.c | 41 ++++++++++++++++++++++++++++++++++ + 1 files changed, 41 insertions(+), 0 deletions(-) + create mode 100644 arch/mips/lemote/lm2e/early_printk.c +Merging parisc/next +$ git merge parisc/next +Resolved 'arch/parisc/include/asm/thread_info.h' using previous resolution. +Resolved 'arch/parisc/kernel/entry.S' using previous resolution. +Resolved 'arch/parisc/kernel/signal.c' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/parisc/Kconfig +Auto-merging arch/parisc/include/asm/thread_info.h +CONFLICT (content): Merge conflict in arch/parisc/include/asm/thread_info.h +Auto-merging arch/parisc/kernel/entry.S +CONFLICT (content): Merge conflict in arch/parisc/kernel/entry.S +Auto-merging arch/parisc/kernel/module.c +Auto-merging arch/parisc/kernel/signal.c +CONFLICT (content): Merge conflict in arch/parisc/kernel/signal.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8538de0] Merge remote branch 'parisc/next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 1 + + arch/parisc/Kconfig | 1 + + arch/parisc/include/asm/elf.h | 1 + + arch/parisc/include/asm/hardirq.h | 20 +-- + arch/parisc/include/asm/ptrace.h | 38 +++- + arch/parisc/include/asm/syscall.h | 40 +++ + arch/parisc/include/asm/thread_info.h | 10 +- + arch/parisc/kernel/asm-offsets.c | 4 +- + arch/parisc/kernel/entry.S | 29 +- + arch/parisc/kernel/irq.c | 5 - + arch/parisc/kernel/module.c | 2 +- + arch/parisc/kernel/ptrace.c | 457 +++++++++++++++++++++++++++++++-- + arch/parisc/kernel/signal.c | 4 + + arch/parisc/kernel/syscall.S | 22 +- + 14 files changed, 560 insertions(+), 74 deletions(-) + create mode 100644 arch/parisc/include/asm/syscall.h +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging galak/next +$ git merge galak/next +Already up-to-date. +Merging s390/features +$ git merge s390/features +Already up-to-date. +Merging sh/master +$ git merge sh/master +Already up-to-date. +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging xtensa/master +$ git merge xtensa/master +Auto-merging arch/xtensa/Kconfig +Merge made by recursive. +Merging cifs/master +$ git merge cifs/master +Merge made by recursive. + fs/cifs/cifsglob.h | 9 +++++---- + fs/cifs/cifsproto.h | 2 +- + fs/cifs/dir.c | 11 +++++------ + fs/cifs/file.c | 16 ++++++++++------ + fs/cifs/misc.c | 7 +++---- + 5 files changed, 24 insertions(+), 21 deletions(-) +Merging configfs/linux-next +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/mmap.c +Merge made by recursive. + fs/ecryptfs/Kconfig | 4 +++- + fs/ecryptfs/crypto.c | 39 ++++++++++++++++++++++----------------- + fs/ecryptfs/inode.c | 2 ++ + fs/ecryptfs/keystore.c | 39 ++++++++++++++++++++++++++------------- + fs/ecryptfs/kthread.c | 24 ++++++++---------------- + fs/ecryptfs/main.c | 3 +-- + fs/ecryptfs/mmap.c | 4 +++- + fs/ecryptfs/read_write.c | 32 ++++++++++++-------------------- + fs/ecryptfs/super.c | 2 -- + 9 files changed, 77 insertions(+), 72 deletions(-) +Merging ext3/for_next +$ git merge ext3/for_next +Auto-merging fs/ext3/super.c +Merge made by recursive. + Documentation/filesystems/ext3.txt | 16 ++++++++++++---- + fs/ext3/super.c | 13 ++++++++++++- + 2 files changed, 24 insertions(+), 5 deletions(-) +Merging ext4/next +$ git merge ext4/next +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/super.c +Merge made by recursive. +Merging fatfs/master +$ git merge fatfs/master +Auto-merging fs/fat/misc.c +Merge made by recursive. + Documentation/filesystems/vfat.txt | 2 +- + fs/fat/fat.h | 2 +- + fs/fat/inode.c | 18 +++++++++++------- + fs/fat/misc.c | 8 +++++--- + fs/fat/namei_vfat.c | 15 ++++----------- + fs/nls/nls_base.c | 8 ++++---- + 6 files changed, 26 insertions(+), 27 deletions(-) +Merging fuse/for-next +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Merge made by recursive. + fs/gfs2/glock.c | 10 ++++++++-- + fs/gfs2/incore.h | 4 ---- + fs/gfs2/ops_fstype.c | 3 +-- + fs/gfs2/recovery.c | 4 +--- + fs/gfs2/sys.c | 24 ------------------------ + 5 files changed, 10 insertions(+), 35 deletions(-) +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging nfs/linux-next +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Already up-to-date. +Merging ocfs2/linux-next +$ git merge ocfs2/linux-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 +Merge made by recursive. +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Already up-to-date. +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging pci/linux-next +$ git merge pci/linux-next +Resolved 'MAINTAINERS' using previous resolution. +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging include/linux/vgaarb.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 281b080] Merge remote branch 'pci/linux-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 18 +---- + arch/x86/include/asm/pci.h | 6 ++- + arch/x86/pci/common.c | 2 +- + drivers/pci/hotplug/pciehp.h | 107 ++++++++--------------------- + drivers/pci/hotplug/pciehp_acpi.c | 17 +++-- + drivers/pci/hotplug/pciehp_core.c | 136 +++++++++++++++++-------------------- + drivers/pci/hotplug/pciehp_ctrl.c | 109 ++++++++++++------------------ + drivers/pci/hotplug/pciehp_hpc.c | 109 +++++++++--------------------- + drivers/pci/hotplug/pciehp_pci.c | 23 +++--- + drivers/pci/pcie/aer/aerdrv.c | 2 + + drivers/pci/pcie/aspm.c | 3 - + include/linux/vgaarb.h | 3 +- + 12 files changed, 203 insertions(+), 332 deletions(-) +Merging hid/for-next +$ git merge hid/for-next +Already up-to-date. +Merging quilt/i2c +$ git merge quilt/i2c +Auto-merging Documentation/feature-removal-schedule.txt +Removing Documentation/i2c/busses/i2c-voodoo3 +Auto-merging MAINTAINERS +Auto-merging drivers/gpio/pcf857x.c +Auto-merging drivers/hwmon/ltc4215.c +Auto-merging drivers/hwmon/ltc4245.c +Auto-merging drivers/i2c/busses/Kconfig +Auto-merging drivers/i2c/busses/Makefile +Removing drivers/i2c/busses/i2c-voodoo3.c +Auto-merging drivers/i2c/i2c-core.c +Auto-merging include/linux/i2c.h +Auto-merging include/linux/pci_ids.h +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 9 - + Documentation/hwmon/ltc4215 | 7 +- + Documentation/hwmon/ltc4245 | 7 +- + Documentation/i2c/busses/i2c-voodoo3 | 62 ----- + Documentation/{i2c/chips => misc-devices}/eeprom | 0 + Documentation/{i2c/chips => misc-devices}/max6875 | 6 +- + Documentation/w1/masters/ds2482 | 6 +- + drivers/hwmon/ltc4215.c | 47 +---- + drivers/hwmon/ltc4245.c | 131 +----------- + drivers/i2c/busses/Kconfig | 16 -- + drivers/i2c/busses/Makefile | 3 - + drivers/i2c/busses/i2c-voodoo3.c | 248 --------------------- + drivers/i2c/i2c-core.c | 12 +- + drivers/misc/eeprom/max6875.c | 29 +-- + drivers/net/sfc/sfe4001.c | 4 +- + drivers/w1/masters/ds2482.c | 35 +--- + include/linux/i2c.h | 3 +- + 17 files changed, 44 insertions(+), 581 deletions(-) + delete mode 100644 Documentation/i2c/busses/i2c-voodoo3 + rename Documentation/{i2c/chips => misc-devices}/eeprom (100%) + rename Documentation/{i2c/chips => misc-devices}/max6875 (94%) + delete mode 100644 drivers/i2c/busses/i2c-voodoo3.c +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging drivers/hwmon/ltc4215.c +Auto-merging drivers/hwmon/ltc4245.c +Merge made by recursive. +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Already up-to-date. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Merge made by recursive. + drivers/media/common/tuners/tuner-xc2028.c | 20 +- + drivers/media/common/tuners/tuner-xc2028.h | 2 + + drivers/staging/tm6000/Kconfig | 32 + + drivers/staging/tm6000/Makefile | 15 + + drivers/staging/tm6000/README | 11 + + drivers/staging/tm6000/hack.c | 252 +++++ + drivers/staging/tm6000/hack.h | 45 + + drivers/staging/tm6000/tm6000-alsa.c | 413 ++++++++ + drivers/staging/tm6000/tm6000-cards.c | 630 +++++++++++ + drivers/staging/tm6000/tm6000-core.c | 511 +++++++++ + drivers/staging/tm6000/tm6000-dvb.c | 322 ++++++ + drivers/staging/tm6000/tm6000-i2c.c | 245 +++++ + drivers/staging/tm6000/tm6000-regs.h | 86 ++ + drivers/staging/tm6000/tm6000-stds.c | 873 +++++++++++++++ + drivers/staging/tm6000/tm6000-usb-isoc.h | 53 + + drivers/staging/tm6000/tm6000-video.c | 1573 ++++++++++++++++++++++++++++ + drivers/staging/tm6000/tm6000.h | 279 +++++ + include/linux/videodev2.h | 1 + + 18 files changed, 5360 insertions(+), 3 deletions(-) + create mode 100644 drivers/staging/tm6000/Kconfig + create mode 100644 drivers/staging/tm6000/Makefile + create mode 100644 drivers/staging/tm6000/README + create mode 100644 drivers/staging/tm6000/hack.c + create mode 100644 drivers/staging/tm6000/hack.h + create mode 100644 drivers/staging/tm6000/tm6000-alsa.c + create mode 100644 drivers/staging/tm6000/tm6000-cards.c + create mode 100644 drivers/staging/tm6000/tm6000-core.c + create mode 100644 drivers/staging/tm6000/tm6000-dvb.c + create mode 100644 drivers/staging/tm6000/tm6000-i2c.c + create mode 100644 drivers/staging/tm6000/tm6000-regs.h + create mode 100644 drivers/staging/tm6000/tm6000-stds.c + create mode 100644 drivers/staging/tm6000/tm6000-usb-isoc.h + create mode 100644 drivers/staging/tm6000/tm6000-video.c + create mode 100644 drivers/staging/tm6000/tm6000.h +Merging quota/for_next +$ git merge quota/for_next +Already up-to-date. +Merging kbuild/master +$ git merge kbuild/master +Already up-to-date. +Merging kconfig/for-next +$ git merge kconfig/for-next +Already up-to-date. +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 +Auto-merging include/linux/Kbuild +Merge made by recursive. + Documentation/Makefile | 3 +- + Documentation/ummunotify/Makefile | 7 + + Documentation/ummunotify/ummunotify.txt | 150 ++++++++ + Documentation/ummunotify/umn-test.c | 200 +++++++++++ + drivers/char/Kconfig | 12 + + drivers/char/Makefile | 1 + + drivers/char/ummunotify.c | 566 +++++++++++++++++++++++++++++++ + drivers/infiniband/core/mad_rmpp.c | 17 +- + include/linux/Kbuild | 1 + + include/linux/ummunotify.h | 121 +++++++ + 10 files changed, 1073 insertions(+), 5 deletions(-) + create mode 100644 Documentation/ummunotify/Makefile + create mode 100644 Documentation/ummunotify/ummunotify.txt + create mode 100644 Documentation/ummunotify/umn-test.c + create mode 100644 drivers/char/ummunotify.c + create mode 100644 include/linux/ummunotify.h +Merging acpi/test +$ git merge acpi/test +Already up-to-date. +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Already up-to-date. +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/linux-next +$ git merge kvm/linux-next +Auto-merging arch/x86/kvm/x86.c +Auto-merging include/linux/kvm_host.h +Merge made by recursive. + arch/ia64/include/asm/kvm.h | 1 + + arch/ia64/include/asm/kvm_host.h | 1 - + arch/ia64/kvm/Makefile | 2 +- + arch/ia64/kvm/kvm-ia64.c | 11 +- + arch/powerpc/kvm/powerpc.c | 2 +- + arch/s390/kvm/kvm-s390.c | 2 +- + arch/x86/include/asm/kvm.h | 1 + + arch/x86/include/asm/kvm_host.h | 12 +- + arch/x86/kvm/Makefile | 3 +- + arch/x86/kvm/emulate.c | 154 +++++++- + arch/x86/kvm/i8254.c | 2 - + arch/x86/kvm/i8259.c | 44 ++- + arch/x86/kvm/irq.h | 1 + + arch/x86/kvm/lapic.c | 7 +- + arch/x86/kvm/mmu.c | 2 +- + arch/x86/kvm/svm.c | 105 +++--- + arch/x86/kvm/vmx.c | 153 ++++---- + arch/x86/kvm/x86.c | 64 ++-- + include/linux/kvm_host.h | 50 +++- + virt/kvm/assigned-dev.c | 818 ++++++++++++++++++++++++++++++++++++++ + virt/kvm/eventfd.c | 2 - + virt/kvm/ioapic.c | 80 +++- + virt/kvm/ioapic.h | 5 + + virt/kvm/irq_comm.c | 214 ++++++---- + virt/kvm/kvm_main.c | 804 +------------------------------------- + 25 files changed, 1395 insertions(+), 1145 deletions(-) + create mode 100644 virt/kvm/assigned-dev.c +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Auto-merging drivers/scsi/bnx2i/bnx2i_hwi.c +Merge made by recursive. + Documentation/scsi/hptiop.txt | 21 ++++++++++- + drivers/scsi/bnx2i/bnx2i.h | 2 + + drivers/scsi/bnx2i/bnx2i_hwi.c | 2 +- + drivers/scsi/device_handler/scsi_dh_rdac.c | 2 - + drivers/scsi/hptiop.c | 37 ++++++++++++----- + drivers/scsi/hptiop.h | 3 +- + drivers/scsi/mvsas/mv_defs.h | 4 ++ + drivers/scsi/mvsas/mv_init.c | 4 ++ + drivers/scsi/pmcraid.c | 58 +++++++++++++++------------- + 9 files changed, 90 insertions(+), 43 deletions(-) +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 +Recorded preimage for 'drivers/net/wireless/iwlwifi/iwl-rx.c' +Auto-merging drivers/net/wireless/b43/main.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-4965.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-rx.c +CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-rx.c +Auto-merging drivers/net/wireless/iwlwifi/iwl3945-base.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/net/wireless/iwlwifi/iwl-rx.c'. +[master 2de9b6c] Merge remote branch 'wireless/master' +$ git diff -M --stat --summary HEAD^.. + drivers/net/wireless/ath/ar9170/usb.c | 2 + + drivers/net/wireless/ath/ath9k/calib.c | 23 ++- + drivers/net/wireless/ath/ath9k/calib.h | 1 + + drivers/net/wireless/ath/ath9k/eeprom_def.c | 4 +- + drivers/net/wireless/ath/ath9k/hw.c | 202 ++++++++++++-------- + drivers/net/wireless/ath/ath9k/hw.h | 4 +- + drivers/net/wireless/ath/ath9k/main.c | 16 +- + drivers/net/wireless/ath/ath9k/reg.h | 3 +- + drivers/net/wireless/b43/Kconfig | 21 ++- + drivers/net/wireless/b43/Makefile | 1 + + drivers/net/wireless/b43/b43.h | 23 +-- + drivers/net/wireless/b43/debugfs.c | 1 + + drivers/net/wireless/b43/debugfs.h | 1 + + drivers/net/wireless/b43/dma.c | 4 +- + drivers/net/wireless/b43/leds.c | 266 +++++++++++++++++++-------- + drivers/net/wireless/b43/leds.h | 33 +++- + drivers/net/wireless/b43/main.c | 224 +++++++++++++---------- + drivers/net/wireless/b43/phy_lp.c | 12 +- + drivers/net/wireless/b43/pio.c | 2 +- + drivers/net/wireless/b43/rfkill.c | 2 +- + drivers/net/wireless/b43/sdio.c | 202 ++++++++++++++++++++ + drivers/net/wireless/b43/sdio.h | 45 +++++ + drivers/net/wireless/b43/xmit.c | 5 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 6 + + drivers/net/wireless/iwlwifi/iwl-5000.c | 6 + + drivers/net/wireless/iwlwifi/iwl-rx.c | 10 +- + drivers/net/wireless/iwlwifi/iwl-sta.c | 2 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 9 +- + drivers/net/wireless/rt2x00/rt2x00lib.h | 2 +- + drivers/net/wireless/wl12xx/Kconfig | 2 +- + drivers/net/wireless/zd1211rw/zd_usb.c | 2 +- + net/mac80211/scan.c | 4 +- + net/wireless/wext-sme.c | 2 +- + 33 files changed, 835 insertions(+), 307 deletions(-) + create mode 100644 drivers/net/wireless/b43/sdio.c + create mode 100644 drivers/net/wireless/b43/sdio.h +Merging mtd/master +$ git merge mtd/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Already up-to-date. +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 quilt/rr +$ git merge quilt/rr +Auto-merging virt/kvm/kvm_main.c +Merge made by recursive. + arch/alpha/include/asm/smp.h | 2 +- + arch/alpha/include/asm/topology.h | 18 - + arch/alpha/kernel/smp.c | 14 +- + arch/arm/include/asm/cacheflush.h | 8 +- + arch/arm/include/asm/mmu_context.h | 7 +- + arch/arm/include/asm/smp.h | 1 - + arch/arm/include/asm/tlbflush.h | 4 +- + arch/arm/kernel/smp.c | 10 +- + arch/arm/mm/context.c | 2 +- + arch/arm/mm/flush.c | 10 +- + arch/ia64/include/asm/smp.h | 1 - + arch/ia64/include/asm/topology.h | 3 - + arch/ia64/kernel/smp.c | 2 +- + arch/m32r/include/asm/mmu_context.h | 4 +- + arch/m32r/include/asm/smp.h | 2 +- + arch/m32r/kernel/smp.c | 30 +- + arch/m32r/kernel/smpboot.c | 2 +- + arch/mips/alchemy/common/time.c | 2 +- + arch/mips/include/asm/mach-ip27/topology.h | 2 - + arch/mips/include/asm/mmu_context.h | 10 +- + arch/mips/include/asm/smp-ops.h | 2 +- + arch/mips/include/asm/smp.h | 2 +- + arch/mips/kernel/smp-cmp.c | 6 +- + arch/mips/kernel/smp-mt.c | 6 +- + arch/mips/kernel/smp-up.c | 3 +- + arch/mips/kernel/smp.c | 8 +- + arch/mips/kernel/smtc.c | 6 +- + arch/mips/mipssim/sim_smtc.c | 5 +- + arch/mips/mm/c-octeon.c | 2 +- + arch/mips/mti-malta/malta-smtc.c | 4 +- + arch/mips/pmc-sierra/yosemite/smp.c | 4 +- + arch/mips/sgi-ip27/ip27-memory.c | 2 +- + arch/mips/sgi-ip27/ip27-smp.c | 4 +- + arch/mips/sibyte/bcm1480/smp.c | 5 +- + arch/mips/sibyte/sb1250/smp.c | 5 +- + arch/mn10300/include/asm/mmu_context.h | 12 +- + arch/parisc/include/asm/smp.h | 1 - + arch/powerpc/include/asm/smp.h | 2 +- + arch/powerpc/include/asm/topology.h | 12 - + arch/powerpc/kernel/setup-common.c | 6 +- + arch/powerpc/kernel/smp.c | 12 +- + arch/powerpc/platforms/powermac/smp.c | 6 +- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 6 +- + arch/s390/include/asm/smp.h | 2 +- + arch/s390/include/asm/topology.h | 1 - + arch/s390/kernel/smp.c | 4 +- + arch/sh/include/asm/smp.h | 1 - + arch/sh/include/asm/topology.h | 1 - + arch/sparc/include/asm/smp_64.h | 1 - + arch/sparc/include/asm/topology_64.h | 16 - + arch/um/include/asm/mmu_context.h | 4 +- + arch/um/kernel/smp.c | 2 +- + arch/x86/include/asm/mmu_context.h | 6 +- + arch/x86/include/asm/smp.h | 1 - + arch/x86/kernel/apic/io_apic.c | 7 +- + arch/x86/kernel/ldt.c | 4 +- + arch/x86/kernel/process.c | 6 +- + arch/x86/kernel/smpboot.c | 9 +- + arch/x86/kernel/time.c | 1 - + arch/x86/mm/tlb.c | 15 +- + arch/x86/xen/mmu.c | 4 +- + drivers/acpi/osl.c | 2 +- + drivers/acpi/processor_perflib.c | 3 +- + drivers/acpi/processor_throttling.c | 3 +- + drivers/net/sfc/efx.c | 3 +- + drivers/net/virtio_net.c | 229 ++++----- + drivers/oprofile/buffer_sync.c | 3 +- + include/asm-generic/topology.h | 17 - + include/linux/cpumask.h | 709 +++++++++----------------- + include/linux/interrupt.h | 2 - + include/linux/module.h | 17 +- + include/linux/sched.h | 3 + + include/linux/smp.h | 11 - + include/linux/topology.h | 6 - + init/main.c | 5 - + kernel/module.c | 159 ++++++- + kernel/params.c | 7 +- + kernel/smp.c | 7 - + kernel/trace/trace.c | 7 +- + mm/quicklist.c | 3 +- + virt/kvm/kvm_main.c | 3 +- + 81 files changed, 656 insertions(+), 883 deletions(-) +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging input/next +$ git merge input/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/DAC960.c +Auto-merging drivers/block/cciss.c +Auto-merging fs/buffer.c +Merge made by recursive. + .../ABI/testing/sysfs-bus-pci-devices-cciss | 28 + + block/blk-core.c | 1 + + block/blk-settings.c | 4 +- + drivers/block/DAC960.c | 156 ++--- + drivers/block/cciss.c | 748 ++++++++++++++------ + drivers/block/cciss.h | 12 +- + drivers/block/cpqarray.c | 63 +- + fs/buffer.c | 10 +- + fs/fs-writeback.c | 87 ++- + include/trace/events/block.h | 33 + + kernel/trace/blktrace.c | 34 + + mm/page-writeback.c | 30 +- + mm/shmem.c | 5 +- + mm/vmscan.c | 8 +- + 14 files changed, 839 insertions(+), 380 deletions(-) +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Merge made by recursive. + drivers/md/dm-exception-store.c | 16 ----------- + drivers/md/dm-exception-store.h | 2 +- + drivers/md/dm-ioctl.c | 4 +- + drivers/md/dm-log-userspace-base.c | 2 +- + drivers/md/dm-log-userspace-transfer.c | 3 +- + drivers/md/dm-snap-persistent.c | 46 ++++++++++++++----------------- + drivers/md/dm-snap.c | 10 ++++++- + drivers/md/dm.c | 11 ++++++- + 8 files changed, 44 insertions(+), 50 deletions(-) +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 +Auto-merging drivers/leds/leds-clevo-mail.c +Merge made by recursive. + drivers/leds/Kconfig | 13 +- + drivers/leds/Makefile | 1 + + drivers/leds/leds-clevo-mail.c | 2 +- + drivers/leds/leds-cobalt-qube.c | 2 +- + drivers/leds/leds-cobalt-raq.c | 4 +- + drivers/leds/leds-gpio.c | 2 +- + drivers/leds/leds-pca9532.c | 12 +- + drivers/leds/leds-wm831x-status.c | 341 +++++++++++++++++++++++++++++++++++++ + drivers/leds/ledtrig-gpio.c | 28 ++-- + drivers/macintosh/via-pmu-led.c | 2 +- + include/linux/mfd/wm831x/status.h | 34 ++++ + 11 files changed, 412 insertions(+), 29 deletions(-) + create mode 100644 drivers/leds/leds-wm831x-status.c + create mode 100644 include/linux/mfd/wm831x/status.h +Merging backlight/for-mm +$ git merge backlight/for-mm +Auto-merging drivers/video/backlight/Kconfig +Merge made by recursive. + drivers/video/backlight/Kconfig | 22 +++ + drivers/video/backlight/Makefile | 4 +- + drivers/video/backlight/adx_bl.c | 178 ++++++++++++++++++++++ + drivers/video/backlight/hp680_bl.c | 2 +- + drivers/video/backlight/lms283gf05.c | 242 ++++++++++++++++++++++++++++++ + drivers/video/backlight/mbp_nvidia_bl.c | 36 +++++ + drivers/video/backlight/wm831x_bl.c | 250 +++++++++++++++++++++++++++++++ + include/linux/spi/lms283gf05.h | 28 ++++ + 8 files changed, 760 insertions(+), 2 deletions(-) + create mode 100644 drivers/video/backlight/adx_bl.c + create mode 100644 drivers/video/backlight/lms283gf05.c + create mode 100644 drivers/video/backlight/wm831x_bl.c + create mode 100644 include/linux/spi/lms283gf05.h +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Auto-merging include/linux/sched.h +Merge made by recursive. + arch/x86/kernel/kgdb.c | 12 ++++++++---- + include/linux/sched.h | 4 ++++ + kernel/kgdb.c | 31 +++++++++++++++++++++++-------- + kernel/softlockup.c | 16 ++++++++++++++++ + 4 files changed, 51 insertions(+), 12 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Auto-merging include/linux/rcupdate.h +Auto-merging init/Kconfig +Auto-merging lib/Kconfig.debug +Auto-merging mm/Makefile +Merge made by recursive. + Documentation/vm/slqbinfo.c | 1047 ++++++++++++ + include/linux/rcu_types.h | 18 + + include/linux/rcupdate.h | 11 +- + include/linux/slab.h | 10 +- + include/linux/slqb_def.h | 301 ++++ + init/Kconfig | 8 +- + lib/Kconfig.debug | 20 + + mm/Makefile | 1 + + mm/slqb.c | 3775 +++++++++++++++++++++++++++++++++++++++++++ + 9 files changed, 5178 insertions(+), 13 deletions(-) + create mode 100644 Documentation/vm/slqbinfo.c + create mode 100644 include/linux/rcu_types.h + create mode 100644 include/linux/slqb_def.h + create mode 100644 mm/slqb.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 mfd/for-next +$ git merge mfd/for-next +Already up-to-date. +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 voltage/for-next +$ git merge voltage/for-next +Already up-to-date. +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 agp/agp-next +$ git merge agp/agp-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. +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 cputime/cputime +$ git merge cputime/cputime +Merge made by recursive. + fs/proc/uptime.c | 7 ++++++- + 1 files changed, 6 insertions(+), 1 deletions(-) +Merging osd/linux-next +$ git merge osd/linux-next +Merge made by recursive. + Documentation/filesystems/00-INDEX | 2 + + Documentation/filesystems/exofs.txt | 23 ++++++++------- + drivers/scsi/osd/osd_initiator.c | 22 ++++++++++---- + drivers/scsi/osd/osd_uld.c | 53 ++++++++++++++++++++++++++++++++++- + fs/exofs/inode.c | 13 ++++++-- + fs/exofs/super.c | 17 +++++++---- + include/scsi/osd_initiator.h | 53 ++++++++++++++++++++++++++++------ + include/scsi/osd_sense.h | 3 ++ + 8 files changed, 148 insertions(+), 38 deletions(-) +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Already up-to-date. +Merging nommu/master +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next +$ git merge trivial/for-next +Merge made by recursive. + Documentation/timers/hpet.txt | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging omap/for-next +$ git merge omap/for-next +Already up-to-date. +Merging quilt/aoe +$ git merge quilt/aoe +Merge made by recursive. + drivers/block/aoe/aoecmd.c | 8 ++++++-- + 1 files changed, 6 insertions(+), 2 deletions(-) +Merging suspend/linux-next +$ git merge suspend/linux-next +Already up-to-date. +Merging bluetooth/master +$ git merge bluetooth/master +Already up-to-date. +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging fs/compat.c +Auto-merging fs/exec.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/open.c +Auto-merging init/Kconfig +Auto-merging kernel/Makefile +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 7 + + fs/compat.c | 5 +- + fs/exec.c | 4 +- + fs/nfsd/vfs.c | 4 +- + fs/notify/dnotify/dnotify.c | 8 +- + fs/notify/fsnotify.c | 16 ++- + fs/notify/group.c | 50 +----- + fs/notify/inode_mark.c | 24 ++- + fs/notify/inotify/inotify_fsnotify.c | 59 ++++++- + fs/notify/inotify/inotify_user.c | 219 ++++++++++++++------- + fs/notify/notification.c | 161 +++++++++------- + fs/open.c | 2 +- + fs/read_write.c | 8 +- + include/linux/fsnotify.h | 44 +++-- + include/linux/fsnotify_backend.h | 30 ++-- + init/Kconfig | 10 +- + kernel/Makefile | 5 +- + kernel/audit.c | 1 - + kernel/audit.h | 26 ++- + kernel/audit_tree.c | 223 ++++++++++++--------- + kernel/audit_watch.c | 296 ++++++++++++++++------------ + kernel/auditfilter.c | 39 ++--- + kernel/auditsc.c | 15 +- + 23 files changed, 730 insertions(+), 526 deletions(-) +Merging irda/for-next +$ git merge irda/for-next +Auto-merging drivers/net/irda/irda-usb.c +Merge made by recursive. + drivers/net/irda/irda-usb.c | 9 +++++---- + 1 files changed, 5 insertions(+), 4 deletions(-) +Merging hwlat/for-linus +$ git merge hwlat/for-linus +Auto-merging MAINTAINERS +Auto-merging drivers/misc/Kconfig +Auto-merging drivers/misc/Makefile +Merge made by recursive. + Documentation/hwlat_detector.txt | 64 ++ + MAINTAINERS | 9 + + drivers/misc/Kconfig | 29 + + drivers/misc/Makefile | 1 + + drivers/misc/hwlat_detector.c | 1208 ++++++++++++++++++++++++++++++++++++++ + 5 files changed, 1311 insertions(+), 0 deletions(-) + create mode 100644 Documentation/hwlat_detector.txt + create mode 100644 drivers/misc/hwlat_detector.c +Merging drbd/drbd +$ git merge drbd/drbd +Auto-merging MAINTAINERS +Merge made by recursive. + .../blockdev/drbd/DRBD-8.3-data-packets.svg | 588 +++ + Documentation/blockdev/drbd/DRBD-data-packets.svg | 459 ++ + Documentation/blockdev/drbd/README.txt | 16 + + Documentation/blockdev/drbd/conn-states-8.dot | 18 + + Documentation/blockdev/drbd/disk-states-8.dot | 16 + + .../drbd/drbd-connection-state-overview.dot | 85 + + Documentation/blockdev/drbd/node-states-8.dot | 14 + + MAINTAINERS | 13 + + drivers/block/Kconfig | 2 + + drivers/block/Makefile | 1 + + drivers/block/drbd/Kconfig | 82 + + drivers/block/drbd/Makefile | 8 + + drivers/block/drbd/drbd_actlog.c | 1484 +++++++ + drivers/block/drbd/drbd_bitmap.c | 1327 ++++++ + drivers/block/drbd/drbd_int.h | 2258 ++++++++++ + drivers/block/drbd/drbd_main.c | 3735 ++++++++++++++++ + drivers/block/drbd/drbd_nl.c | 2365 +++++++++++ + drivers/block/drbd/drbd_proc.c | 266 ++ + drivers/block/drbd/drbd_receiver.c | 4456 ++++++++++++++++++++ + drivers/block/drbd/drbd_req.c | 1132 +++++ + drivers/block/drbd/drbd_req.h | 327 ++ + drivers/block/drbd/drbd_strings.c | 113 + + drivers/block/drbd/drbd_tracing.c | 752 ++++ + drivers/block/drbd/drbd_tracing.h | 87 + + drivers/block/drbd/drbd_vli.h | 351 ++ + drivers/block/drbd/drbd_worker.c | 1529 +++++++ + drivers/block/drbd/drbd_wrappers.h | 91 + + include/linux/drbd.h | 349 ++ + include/linux/drbd_limits.h | 137 + + include/linux/drbd_nl.h | 137 + + include/linux/drbd_tag_magic.h | 83 + + include/linux/lru_cache.h | 294 ++ + lib/Kconfig | 3 + + lib/Makefile | 2 + + lib/lru_cache.c | 560 +++ + 35 files changed, 23140 insertions(+), 0 deletions(-) + create mode 100644 Documentation/blockdev/drbd/DRBD-8.3-data-packets.svg + create mode 100644 Documentation/blockdev/drbd/DRBD-data-packets.svg + create mode 100644 Documentation/blockdev/drbd/README.txt + create mode 100644 Documentation/blockdev/drbd/conn-states-8.dot + create mode 100644 Documentation/blockdev/drbd/disk-states-8.dot + create mode 100644 Documentation/blockdev/drbd/drbd-connection-state-overview.dot + create mode 100644 Documentation/blockdev/drbd/node-states-8.dot + create mode 100644 drivers/block/drbd/Kconfig + create mode 100644 drivers/block/drbd/Makefile + create mode 100644 drivers/block/drbd/drbd_actlog.c + create mode 100644 drivers/block/drbd/drbd_bitmap.c + create mode 100644 drivers/block/drbd/drbd_int.h + create mode 100644 drivers/block/drbd/drbd_main.c + create mode 100644 drivers/block/drbd/drbd_nl.c + create mode 100644 drivers/block/drbd/drbd_proc.c + create mode 100644 drivers/block/drbd/drbd_receiver.c + create mode 100644 drivers/block/drbd/drbd_req.c + create mode 100644 drivers/block/drbd/drbd_req.h + create mode 100644 drivers/block/drbd/drbd_strings.c + create mode 100644 drivers/block/drbd/drbd_tracing.c + create mode 100644 drivers/block/drbd/drbd_tracing.h + create mode 100644 drivers/block/drbd/drbd_vli.h + create mode 100644 drivers/block/drbd/drbd_worker.c + create mode 100644 drivers/block/drbd/drbd_wrappers.h + create mode 100644 include/linux/drbd.h + create mode 100644 include/linux/drbd_limits.h + create mode 100644 include/linux/drbd_nl.h + create mode 100644 include/linux/drbd_tag_magic.h + create mode 100644 include/linux/lru_cache.h + create mode 100644 lib/lru_cache.c +Merging kmemleak/kmemleak +$ git merge kmemleak/kmemleak +Already up-to-date. +Merging tip/auto-latest +$ git merge tip/auto-latest +Recorded preimage for 'fs/proc/array.c' +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/apic/io_apic.c +Auto-merging arch/x86/kernel/head_32.S +Auto-merging arch/x86/kernel/head_64.S +Auto-merging drivers/pci/intr_remapping.c +Auto-merging fs/proc/array.c +CONFLICT (content): Merge conflict in fs/proc/array.c +Auto-merging include/linux/poison.h +Auto-merging kernel/fork.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/proc/array.c'. +[master 576aeed] Merge remote branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + arch/x86/Kconfig | 5 ++ + arch/x86/boot/compressed/head_32.S | 3 +- + arch/x86/boot/compressed/head_64.S | 3 +- + arch/x86/boot/compressed/vmlinux.lds.S | 6 ++- + arch/x86/include/asm/hpet.h | 7 ++- + arch/x86/include/asm/msr.h | 4 +- + arch/x86/kernel/acpi/boot.c | 1 + + arch/x86/kernel/apic/io_apic.c | 49 +++++++++++++++--- + arch/x86/kernel/head_32.S | 2 +- + arch/x86/kernel/head_64.S | 2 +- + arch/x86/kernel/hpet.c | 60 ++++++++++++--------- + arch/x86/kernel/traps.c | 6 +-- + arch/x86/kernel/tsc.c | 8 +-- + arch/x86/kernel/vmlinux.lds.S | 79 +++++----------------------- + arch/x86/lib/msr.c | 46 +++++++---------- + drivers/pci/intr_remapping.c | 89 ++++++++++++++++++++++++++++++-- + drivers/pci/intr_remapping.h | 7 +++ + fs/proc/array.c | 11 ++++ + include/linux/clocksource.h | 1 - + include/linux/dmar.h | 10 ++++ + include/linux/hpet.h | 2 + + include/linux/poison.h | 16 +++++- + include/linux/timex.h | 5 ++- + kernel/cpuset.c | 8 +--- + kernel/hrtimer.c | 53 ++++++++++++------ + kernel/irq/manage.c | 2 +- + 26 files changed, 305 insertions(+), 180 deletions(-) +Merging oprofile/for-next +$ git merge oprofile/for-next +Auto-merging kernel/trace/ring_buffer.c +Merge made by recursive. +Merging percpu/for-next +$ git merge percpu/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 +Merge made by recursive. + lib/checksum.c | 14 ++++++++------ + 1 files changed, 8 insertions(+), 6 deletions(-) +Merging hwpoison/hwpoison +$ git merge hwpoison/hwpoison +Auto-merging Documentation/sysctl/vm.txt +Auto-merging arch/x86/mm/fault.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/ext3/inode.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ocfs2/aops.c +Auto-merging fs/proc/meminfo.c +Auto-merging fs/xfs/linux-2.6/xfs_aops.c +Auto-merging include/asm-generic/mman-common.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/page-flags.h +Auto-merging include/linux/prctl.h +Auto-merging include/linux/rmap.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/swap.h +Auto-merging kernel/sys.c +Auto-merging kernel/sysctl.c +Auto-merging mm/Kconfig +Auto-merging mm/Makefile +Auto-merging mm/filemap.c +Auto-merging mm/madvise.c +Auto-merging mm/memory.c +Auto-merging mm/migrate.c +Auto-merging mm/page-writeback.c +Auto-merging mm/page_alloc.c +Auto-merging mm/rmap.c +Auto-merging mm/shmem.c +Auto-merging mm/swapfile.c +Auto-merging mm/vmscan.c +Merge made by recursive. + Documentation/filesystems/vfs.txt | 7 + + Documentation/sysctl/vm.txt | 41 ++- + arch/x86/mm/fault.c | 19 +- + fs/btrfs/inode.c | 1 + + fs/ext2/inode.c | 2 + + fs/ext3/inode.c | 3 + + fs/ext4/inode.c | 4 + + fs/gfs2/aops.c | 3 + + fs/nfs/file.c | 1 + + fs/ntfs/aops.c | 2 + + fs/ocfs2/aops.c | 1 + + fs/proc/meminfo.c | 9 +- + fs/xfs/linux-2.6/xfs_aops.c | 1 + + include/asm-generic/mman-common.h | 1 + + include/asm-generic/siginfo.h | 8 +- + include/linux/fs.h | 1 + + include/linux/mm.h | 15 +- + include/linux/page-flags.h | 17 +- + include/linux/prctl.h | 2 + + include/linux/rmap.h | 21 +- + include/linux/sched.h | 2 + + include/linux/swap.h | 34 ++- + include/linux/swapops.h | 38 ++ + kernel/sys.c | 22 + + kernel/sysctl.c | 25 ++ + mm/Kconfig | 14 + + mm/Makefile | 2 + + mm/filemap.c | 4 + + mm/hwpoison-inject.c | 41 ++ + mm/madvise.c | 30 ++ + mm/memory-failure.c | 832 +++++++++++++++++++++++++++++++++++++ + mm/memory.c | 24 +- + mm/migrate.c | 2 +- + mm/page-writeback.c | 7 + + mm/page_alloc.c | 20 +- + mm/rmap.c | 60 ++- + mm/shmem.c | 5 +- + mm/swapfile.c | 4 +- + mm/truncate.c | 72 +++- + mm/vmscan.c | 2 +- + 40 files changed, 1331 insertions(+), 68 deletions(-) + create mode 100644 mm/hwpoison-inject.c + create mode 100644 mm/memory-failure.c +Merging quilt/driver-core +$ git merge quilt/driver-core +Already up-to-date. +Merging quilt/tty +$ git merge quilt/tty +Already up-to-date. +Merging quilt/usb +$ git merge quilt/usb +Auto-merging MAINTAINERS +Auto-merging drivers/usb/Kconfig +Auto-merging drivers/usb/host/ohci-pxa27x.c +Merge made by recursive. +Merging quilt/staging +$ git merge quilt/staging +Auto-merging drivers/staging/Kconfig +Auto-merging drivers/staging/Makefile +Removing drivers/staging/agnx/Kconfig +Removing drivers/staging/agnx/Makefile +Removing drivers/staging/agnx/TODO +Removing drivers/staging/agnx/agnx.h +Removing drivers/staging/agnx/debug.h +Removing drivers/staging/agnx/pci.c +Removing drivers/staging/agnx/phy.c +Removing drivers/staging/agnx/phy.h +Removing drivers/staging/agnx/rf.c +Removing drivers/staging/agnx/sta.c +Removing drivers/staging/agnx/sta.h +Removing drivers/staging/agnx/table.c +Removing drivers/staging/agnx/table.h +Removing drivers/staging/agnx/xmit.c +Removing drivers/staging/agnx/xmit.h +Merge made by recursive. + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/agnx/Kconfig | 5 - + drivers/staging/agnx/Makefile | 8 - + drivers/staging/agnx/TODO | 22 - + drivers/staging/agnx/agnx.h | 156 ------- + drivers/staging/agnx/debug.h | 416 ----------------- + drivers/staging/agnx/pci.c | 635 -------------------------- + drivers/staging/agnx/phy.c | 960 --------------------------------------- + drivers/staging/agnx/phy.h | 409 ----------------- + drivers/staging/agnx/rf.c | 893 ------------------------------------ + drivers/staging/agnx/sta.c | 218 --------- + drivers/staging/agnx/sta.h | 222 --------- + drivers/staging/agnx/table.c | 168 ------- + drivers/staging/agnx/table.h | 10 - + drivers/staging/agnx/xmit.c | 836 ---------------------------------- + drivers/staging/agnx/xmit.h | 250 ---------- + drivers/staging/winbond/wbusb.c | 33 +- + 18 files changed, 17 insertions(+), 5227 deletions(-) + delete mode 100644 drivers/staging/agnx/Kconfig + delete mode 100644 drivers/staging/agnx/Makefile + delete mode 100644 drivers/staging/agnx/TODO + delete mode 100644 drivers/staging/agnx/agnx.h + delete mode 100644 drivers/staging/agnx/debug.h + delete mode 100644 drivers/staging/agnx/pci.c + delete mode 100644 drivers/staging/agnx/phy.c + delete mode 100644 drivers/staging/agnx/phy.h + delete mode 100644 drivers/staging/agnx/rf.c + delete mode 100644 drivers/staging/agnx/sta.c + delete mode 100644 drivers/staging/agnx/sta.h + delete mode 100644 drivers/staging/agnx/table.c + delete mode 100644 drivers/staging/agnx/table.h + delete mode 100644 drivers/staging/agnx/xmit.c + delete mode 100644 drivers/staging/agnx/xmit.h +Merging scsi-post-merge/master +$ git merge scsi-post-merge/master +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'drivers/scsi/Makefile' using previous resolution. +Resolved 'drivers/scsi/pmcraid.c' using previous resolution. +Resolved 'kernel/sysctl.c' using previous resolution. +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/ata/ahci.c +Auto-merging drivers/message/fusion/mptbase.c +Auto-merging drivers/message/fusion/mptbase.h +Auto-merging drivers/scsi/Kconfig +Auto-merging drivers/scsi/Makefile +CONFLICT (content): Merge conflict in drivers/scsi/Makefile +Auto-merging drivers/scsi/device_handler/scsi_dh_rdac.c +Auto-merging drivers/scsi/fcoe/libfcoe.c +Auto-merging drivers/scsi/pmcraid.c +CONFLICT (add/add): Merge conflict in drivers/scsi/pmcraid.c +Auto-merging drivers/scsi/qla2xxx/qla_def.h +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/scsi/sg.c +Auto-merging include/linux/interrupt.h +Auto-merging include/linux/libata.h +Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2859854] Merge remote branch 'scsi-post-merge/master' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 8 + + drivers/ata/ahci.c | 54 +- + drivers/message/fusion/mptbase.c | 99 +- + drivers/message/fusion/mptbase.h | 3 + + drivers/scsi/Kconfig | 1 + + drivers/scsi/Makefile | 1 + + drivers/scsi/be2iscsi/Kconfig | 8 + + drivers/scsi/be2iscsi/Makefile | 8 + + drivers/scsi/be2iscsi/be.h | 183 ++ + drivers/scsi/be2iscsi/be_cmds.c | 523 ++++++ + drivers/scsi/be2iscsi/be_cmds.h | 877 ++++++++++ + drivers/scsi/be2iscsi/be_iscsi.c | 646 ++++++++ + drivers/scsi/be2iscsi/be_iscsi.h | 75 + + drivers/scsi/be2iscsi/be_main.c | 3393 ++++++++++++++++++++++++++++++++++++++ + drivers/scsi/be2iscsi/be_main.h | 833 ++++++++++ + drivers/scsi/be2iscsi/be_mgmt.c | 321 ++++ + drivers/scsi/be2iscsi/be_mgmt.h | 249 +++ + drivers/scsi/qla2xxx/qla_dbg.c | 78 +- + drivers/scsi/qla2xxx/qla_def.h | 5 + + drivers/scsi/qla2xxx/qla_gbl.h | 1 + + drivers/scsi/qla2xxx/qla_os.c | 36 + + include/linux/libata.h | 2 + + include/scsi/Kbuild | 1 + + include/scsi/fc/Kbuild | 4 + + 24 files changed, 7337 insertions(+), 72 deletions(-) + create mode 100644 drivers/scsi/be2iscsi/Kconfig + create mode 100644 drivers/scsi/be2iscsi/Makefile + create mode 100644 drivers/scsi/be2iscsi/be.h + create mode 100644 drivers/scsi/be2iscsi/be_cmds.c + create mode 100644 drivers/scsi/be2iscsi/be_cmds.h + create mode 100644 drivers/scsi/be2iscsi/be_iscsi.c + create mode 100644 drivers/scsi/be2iscsi/be_iscsi.h + create mode 100644 drivers/scsi/be2iscsi/be_main.c + create mode 100644 drivers/scsi/be2iscsi/be_main.h + create mode 100644 drivers/scsi/be2iscsi/be_mgmt.c + create mode 100644 drivers/scsi/be2iscsi/be_mgmt.h + create mode 100644 include/scsi/fc/Kbuild +$ git am -3 ../patches/0001-powerpc-kvm-build-fix-for-new-BUILD_BUG_ON.patch +Applying: powerpc/kvm: build fix for new BUILD_BUG_ON |