$ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at bca14dd Merge branch 'core-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 bca14dd..a3d3203 Fast-forward Documentation/feature-removal-schedule.txt | 7 + Documentation/kernel-parameters.txt | 4 - arch/ia64/kernel/acpi.c | 3 + arch/mips/txx9/generic/setup.c | 1 + arch/x86/kernel/acpi/boot.c | 100 +--- drivers/acpi/Makefile | 4 +- drivers/acpi/acpica/exmutex.c | 3 +- drivers/acpi/battery.c | 86 ++- drivers/acpi/bus.c | 10 +- drivers/acpi/ec.c | 33 +- drivers/acpi/internal.h | 2 + drivers/acpi/processor_core.c | 1118 ++++------------------------ drivers/acpi/processor_driver.c | 978 ++++++++++++++++++++++++ drivers/acpi/processor_pdc.c | 209 ------ drivers/acpi/processor_throttling.c | 3 - drivers/acpi/sbs.c | 5 + drivers/acpi/sleep.c | 19 +- drivers/acpi/thermal.c | 36 +- drivers/acpi/utils.c | 45 -- drivers/acpi/video.c | 28 +- drivers/misc/eeprom/at25.c | 1 + drivers/pci/hotplug/acpiphp_glue.c | 19 + drivers/platform/x86/sony-laptop.c | 91 ++-- drivers/pnp/base.h | 3 + drivers/pnp/interface.c | 7 +- drivers/pnp/pnpacpi/rsparser.c | 49 +- drivers/pnp/resource.c | 27 +- drivers/pnp/support.c | 4 +- drivers/power/power_supply_sysfs.c | 1 + drivers/rtc/rtc-ds1742.c | 1 + include/acpi/processor.h | 10 +- include/linux/ioport.h | 18 +- include/linux/power_supply.h | 1 + lib/vsprintf.c | 13 +- security/tomoyo/common.c | 1 + 35 files changed, 1506 insertions(+), 1434 deletions(-) create mode 100644 drivers/acpi/processor_driver.c delete mode 100644 drivers/acpi/processor_pdc.c Merging fixes/fixes $ git merge fixes/fixes Merge made by recursive. drivers/block/pktcdvd.c | 17 ++++++++++++++--- fs/compat_ioctl.c | 3 --- 2 files changed, 14 insertions(+), 6 deletions(-) Merging arm-current/master $ git merge arm-current/master Merge made by recursive. arch/arm/Kconfig | 81 +++++++++------- arch/arm/boot/compressed/decompress.c | 1 + arch/arm/boot/compressed/head.S | 2 +- arch/arm/boot/compressed/misc.c | 1 + arch/arm/include/asm/elf.h | 1 + arch/arm/include/asm/pgtable-nommu.h | 1 + arch/arm/kernel/entry-header.S | 2 + arch/arm/kernel/kgdb.c | 13 +++ arch/arm/kernel/perf_event.c | 5 +- arch/arm/kernel/smp.c | 4 +- arch/arm/mach-at91/board-sam9g20ek.c | 10 +- arch/arm/mach-rpc/include/mach/uncompress.h | 2 - arch/arm/mach-shmobile/board-ap4evb.c | 32 ++++++ arch/arm/mach-shmobile/board-g3evm.c | 122 +++++++++++++++++++++++ arch/arm/mach-shmobile/board-g4evm.c | 57 +++++++++++ arch/arm/mach-shmobile/clock-sh7367.c | 7 ++ arch/arm/mach-shmobile/intc-sh7367.c | 46 +++++----- arch/arm/mach-shmobile/intc-sh7372.c | 46 +++++----- arch/arm/mach-shmobile/intc-sh7377.c | 36 ++++--- arch/arm/plat-samsung/include/plat/uncompress.h | 2 - drivers/mtd/nand/Kconfig | 2 +- drivers/video/Kconfig | 2 +- drivers/video/amba-clcd.c | 31 +++++-- include/linux/amba/clcd.h | 33 +++--- 24 files changed, 403 insertions(+), 136 deletions(-) Merging m68k-current/for-linus $ git merge m68k-current/for-linus Merge made by recursive. arch/m68k/include/asm/sigcontext.h | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) 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 Already up-to-date. $ git am -3 ../patches/0001-ar9170-fix-for-driver-core-ABI-change.patch Applying: ar9170: fix for driver-core ABI change $ git reset HEAD^ Unstaged changes after reset: M drivers/net/wireless/ath/ar9170/usb.c $ git add . $ git commit -v -a --amend [master 4a14ff6] Merge remote branch 'm68k-current/for-linus' 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/for-linus $ git merge kbuild-current/for-linus 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 Already up-to-date. Merging quilt/staging.current $ git merge quilt/staging.current Already up-to-date. Merging cpufreq-current/fixes $ git merge cpufreq-current/fixes Already up-to-date. Merging input-current/for-linus $ git merge input-current/for-linus Already up-to-date. Merging md-current/for-linus $ git merge md-current/for-linus Merge made by recursive. drivers/md/bitmap.c | 37 ++++++++++++++++++++++++++++++++----- drivers/md/bitmap.h | 1 + drivers/md/faulty.c | 6 +++--- drivers/md/md.h | 3 --- drivers/md/multipath.c | 2 +- drivers/md/raid1.c | 8 ++++---- drivers/md/raid10.c | 8 ++++---- drivers/md/raid5.c | 10 +++++----- 8 files changed, 50 insertions(+), 25 deletions(-) Merging audit-current/for-linus $ git merge audit-current/for-linus Already up-to-date. Merging crypto-current/master $ git merge crypto-current/master Already up-to-date. 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 arch/arm/Kconfig Removing arch/arm/common/icst307.c Removing arch/arm/common/icst525.c Removing arch/arm/include/asm/hardware/icst307.h Removing arch/arm/include/asm/hardware/icst525.h Removing arch/arm/mach-integrator/common.h Removing arch/arm/mach-realview/clock.c Removing arch/arm/mach-realview/clock.h Removing arch/arm/mach-versatile/clock.c Removing arch/arm/mach-versatile/clock.h Merge made by recursive. arch/arm/Kconfig | 40 ++- arch/arm/Makefile | 2 + arch/arm/common/Kconfig | 5 +- arch/arm/common/Makefile | 3 +- arch/arm/common/icst.c | 100 ++++++ arch/arm/common/icst307.c | 161 --------- arch/arm/common/icst525.c | 160 --------- arch/arm/include/asm/hardware/arm_timer.h | 39 ++- arch/arm/include/asm/hardware/icst.h | 59 ++++ arch/arm/include/asm/hardware/icst307.h | 38 -- arch/arm/include/asm/hardware/icst525.h | 36 -- arch/arm/mach-integrator/Kconfig | 1 + arch/arm/mach-integrator/Makefile | 2 +- arch/arm/mach-integrator/common.h | 2 - arch/arm/mach-integrator/core.c | 127 +------- arch/arm/mach-integrator/cpu.c | 53 ++-- arch/arm/mach-integrator/impd1.c | 43 ++-- arch/arm/mach-integrator/include/mach/clkdev.h | 7 +- .../arm/mach-integrator/include/mach/entry-macro.S | 1 + arch/arm/mach-integrator/include/mach/hardware.h | 17 +- arch/arm/mach-integrator/include/mach/platform.h | 54 +--- arch/arm/mach-integrator/integrator_ap.c | 166 +++++++++- arch/arm/mach-integrator/integrator_cp.c | 88 +++-- arch/arm/mach-integrator/leds.c | 1 + arch/arm/mach-integrator/pci_v3.c | 7 +- arch/arm/mach-realview/Makefile | 2 +- arch/arm/mach-realview/clock.c | 64 ---- arch/arm/mach-realview/clock.h | 19 - arch/arm/mach-realview/core.c | 194 ++--------- arch/arm/mach-realview/include/mach/clkdev.h | 9 + arch/arm/mach-realview/include/mach/irqs-pb1176.h | 1 + arch/arm/mach-realview/include/mach/irqs-pba8.h | 8 +- arch/arm/mach-realview/include/mach/irqs-pbx.h | 14 +- arch/arm/mach-realview/include/mach/platform.h | 20 -- arch/arm/mach-realview/realview_eb.c | 2 - arch/arm/mach-realview/realview_pb1176.c | 2 - arch/arm/mach-realview/realview_pb11mp.c | 2 - arch/arm/mach-realview/realview_pba8.c | 2 - arch/arm/mach-versatile/Makefile | 2 +- arch/arm/mach-versatile/clock.c | 65 ---- arch/arm/mach-versatile/clock.h | 20 -- arch/arm/mach-versatile/core.c | 194 ++--------- arch/arm/mach-versatile/include/mach/clkdev.h | 9 + arch/arm/mach-versatile/include/mach/entry-macro.S | 1 + arch/arm/mach-versatile/include/mach/hardware.h | 3 +- arch/arm/mach-versatile/include/mach/platform.h | 26 +-- arch/arm/mach-vexpress/Kconfig | 9 + arch/arm/mach-vexpress/Makefile | 8 + arch/arm/mach-vexpress/Makefile.boot | 3 + arch/arm/mach-vexpress/core.h | 26 ++ arch/arm/mach-vexpress/ct-ca9x4.c | 215 ++++++++++++ arch/arm/mach-vexpress/headsmp.S | 39 +++ arch/arm/mach-vexpress/include/mach/clkdev.h | 15 + arch/arm/mach-vexpress/include/mach/ct-ca9x4.h | 43 +++ arch/arm/mach-vexpress/include/mach/debug-macro.S | 23 ++ arch/arm/mach-vexpress/include/mach/entry-macro.S | 67 ++++ arch/arm/mach-vexpress/include/mach/hardware.h | 1 + arch/arm/mach-vexpress/include/mach/io.h | 28 ++ arch/arm/mach-vexpress/include/mach/irqs.h | 4 + arch/arm/mach-vexpress/include/mach/memory.h | 25 ++ arch/arm/mach-vexpress/include/mach/motherboard.h | 121 +++++++ arch/arm/mach-vexpress/include/mach/smp.h | 21 ++ arch/arm/mach-vexpress/include/mach/system.h | 37 ++ arch/arm/mach-vexpress/include/mach/timex.h | 23 ++ arch/arm/mach-vexpress/include/mach/uncompress.h | 52 +++ arch/arm/mach-vexpress/include/mach/vmalloc.h | 21 ++ arch/arm/mach-vexpress/localtimer.c | 26 ++ arch/arm/mach-vexpress/platsmp.c | 190 ++++++++++ arch/arm/mach-vexpress/v2m.c | 361 ++++++++++++++++++++ arch/arm/mm/Kconfig | 3 +- arch/arm/plat-versatile/Makefile | 4 + .../{mach-integrator => plat-versatile}/clock.c | 43 ++- arch/arm/plat-versatile/include/plat/clock.h | 15 + arch/arm/plat-versatile/include/plat/timer-sp.h | 2 + arch/arm/plat-versatile/sched-clock.c | 53 +++ arch/arm/plat-versatile/timer-sp.c | 156 +++++++++ drivers/i2c/busses/Kconfig | 2 +- 77 files changed, 2224 insertions(+), 1283 deletions(-) create mode 100644 arch/arm/common/icst.c delete mode 100644 arch/arm/common/icst307.c delete mode 100644 arch/arm/common/icst525.c create mode 100644 arch/arm/include/asm/hardware/icst.h delete mode 100644 arch/arm/include/asm/hardware/icst307.h delete mode 100644 arch/arm/include/asm/hardware/icst525.h delete mode 100644 arch/arm/mach-integrator/common.h delete mode 100644 arch/arm/mach-realview/clock.c delete mode 100644 arch/arm/mach-realview/clock.h delete mode 100644 arch/arm/mach-versatile/clock.c delete mode 100644 arch/arm/mach-versatile/clock.h create mode 100644 arch/arm/mach-vexpress/Kconfig create mode 100644 arch/arm/mach-vexpress/Makefile create mode 100644 arch/arm/mach-vexpress/Makefile.boot create mode 100644 arch/arm/mach-vexpress/core.h create mode 100644 arch/arm/mach-vexpress/ct-ca9x4.c create mode 100644 arch/arm/mach-vexpress/headsmp.S create mode 100644 arch/arm/mach-vexpress/include/mach/clkdev.h create mode 100644 arch/arm/mach-vexpress/include/mach/ct-ca9x4.h create mode 100644 arch/arm/mach-vexpress/include/mach/debug-macro.S create mode 100644 arch/arm/mach-vexpress/include/mach/entry-macro.S create mode 100644 arch/arm/mach-vexpress/include/mach/hardware.h create mode 100644 arch/arm/mach-vexpress/include/mach/io.h create mode 100644 arch/arm/mach-vexpress/include/mach/irqs.h create mode 100644 arch/arm/mach-vexpress/include/mach/memory.h create mode 100644 arch/arm/mach-vexpress/include/mach/motherboard.h create mode 100644 arch/arm/mach-vexpress/include/mach/smp.h create mode 100644 arch/arm/mach-vexpress/include/mach/system.h create mode 100644 arch/arm/mach-vexpress/include/mach/timex.h create mode 100644 arch/arm/mach-vexpress/include/mach/uncompress.h create mode 100644 arch/arm/mach-vexpress/include/mach/vmalloc.h create mode 100644 arch/arm/mach-vexpress/localtimer.c create mode 100644 arch/arm/mach-vexpress/platsmp.c create mode 100644 arch/arm/mach-vexpress/v2m.c create mode 100644 arch/arm/plat-versatile/Makefile rename arch/arm/{mach-integrator => plat-versatile}/clock.c (59%) create mode 100644 arch/arm/plat-versatile/include/plat/clock.h create mode 100644 arch/arm/plat-versatile/include/plat/timer-sp.h create mode 100644 arch/arm/plat-versatile/sched-clock.c create mode 100644 arch/arm/plat-versatile/timer-sp.c Merging davinci/davinci-next $ git merge davinci/davinci-next Already up-to-date. Merging i.MX/for-next $ git merge i.MX/for-next Already up-to-date. Merging msm/for-next $ git merge msm/for-next Auto-merging MAINTAINERS Merge made by recursive. MAINTAINERS | 1 + arch/arm/mach-msm/Makefile | 3 +- arch/arm/mach-msm/acpuclock-arm11.c | 526 ++++++++++++++++++++ arch/arm/mach-msm/acpuclock.h | 32 ++ arch/arm/mach-msm/board-halibut.c | 15 + arch/arm/mach-msm/board-mahimahi.c | 87 ++++ arch/arm/mach-msm/board-msm7x27.c | 179 +++++++ arch/arm/mach-msm/board-msm7x30.c | 196 ++++++++ arch/arm/mach-msm/board-qsd8x50.c | 176 +++++++ arch/arm/mach-msm/board-sapphire.c | 118 +++++ arch/arm/mach-msm/{board-dream.c => board-trout.c} | 4 +- arch/arm/mach-msm/{board-dream.h => board-trout.h} | 0 arch/arm/mach-msm/dma.c | 23 +- arch/arm/mach-msm/include/mach/board.h | 11 + arch/arm/mach-msm/include/mach/vreg.h | 2 +- arch/arm/mach-msm/irq.c | 4 +- arch/arm/mach-msm/proc_comm.h | 102 ++++- arch/arm/mach-msm/vreg.c | 154 +++++-- 18 files changed, 1580 insertions(+), 53 deletions(-) create mode 100644 arch/arm/mach-msm/acpuclock-arm11.c create mode 100644 arch/arm/mach-msm/acpuclock.h create mode 100644 arch/arm/mach-msm/board-mahimahi.c create mode 100644 arch/arm/mach-msm/board-msm7x27.c create mode 100644 arch/arm/mach-msm/board-msm7x30.c create mode 100644 arch/arm/mach-msm/board-qsd8x50.c create mode 100644 arch/arm/mach-msm/board-sapphire.c rename arch/arm/mach-msm/{board-dream.c => board-trout.c} (97%) rename arch/arm/mach-msm/{board-dream.h => board-trout.h} (100%) Merging omap/for-next $ git merge omap/for-next Auto-merging arch/arm/mach-omap2/board-3630sdp.c Merge made by recursive. arch/arm/configs/cm_t35_defconfig | 2 +- arch/arm/configs/n770_defconfig | 1 + arch/arm/configs/n8x0_defconfig | 160 ++++++++++++++++++++++++--- arch/arm/configs/omap3_beagle_defconfig | 1 + arch/arm/configs/omap3_defconfig | 2 +- arch/arm/configs/omap3_evm_defconfig | 1 + arch/arm/configs/omap3_touchbook_defconfig | 2 +- arch/arm/configs/omap_3430sdp_defconfig | 1 + arch/arm/configs/omap_3630sdp_defconfig | 2 +- arch/arm/configs/omap_h2_1610_defconfig | 1 + arch/arm/configs/omap_zoom2_defconfig | 1 + arch/arm/configs/omap_zoom3_defconfig | 2 +- arch/arm/configs/rx51_defconfig | 1 + arch/arm/mach-omap2/Makefile | 3 + arch/arm/mach-omap2/board-3430sdp.c | 2 +- arch/arm/mach-omap2/board-3630sdp.c | 2 +- arch/arm/mach-omap2/board-4430sdp.c | 26 +----- arch/arm/mach-omap2/board-am3517evm.c | 2 +- arch/arm/mach-omap2/board-cm-t35.c | 2 +- arch/arm/mach-omap2/board-devkit8000.c | 2 +- arch/arm/mach-omap2/board-igep0020.c | 56 +++++++---- arch/arm/mach-omap2/board-n8x0.c | 98 +++++++++++++++++ arch/arm/mach-omap2/board-omap3beagle.c | 2 +- arch/arm/mach-omap2/board-omap3evm.c | 2 +- arch/arm/mach-omap2/board-omap3pandora.c | 12 ++- arch/arm/mach-omap2/board-omap3touchbook.c | 12 +- arch/arm/mach-omap2/board-overo.c | 2 +- arch/arm/mach-omap2/board-zoom3.c | 2 +- arch/arm/mach-omap2/clock2420_data.c | 1 + arch/arm/mach-omap2/io.c | 21 ++-- arch/arm/mach-omap2/mailbox.c | 12 +- arch/arm/mach-omap2/omap44xx-smc.S | 32 ++++++ arch/arm/mach-omap2/prcm.c | 4 +- arch/arm/mach-omap2/serial.c | 15 ++- arch/arm/mach-omap2/usb-ehci.c | 6 +- arch/arm/plat-omap/gpio.c | 10 +- arch/arm/plat-omap/include/plat/blizzard.h | 2 +- arch/arm/plat-omap/include/plat/cpu.h | 8 +- arch/arm/plat-omap/include/plat/prcm.h | 2 +- arch/arm/plat-omap/include/plat/system.h | 6 +- arch/arm/plat-omap/include/plat/usb.h | 2 +- arch/arm/plat-omap/mcbsp.c | 12 +-- 42 files changed, 403 insertions(+), 132 deletions(-) create mode 100644 arch/arm/mach-omap2/omap44xx-smc.S Merging pxa/for-next $ git merge pxa/for-next Already up-to-date. Merging samsung/next-samsung $ git merge samsung/next-samsung Already up-to-date. Merging avr32/avr32-arch $ git merge avr32/avr32-arch Already up-to-date. Merging blackfin/for-linus $ git merge blackfin/for-linus Auto-merging arch/blackfin/include/asm/dma-mapping.h Merge made by recursive. arch/blackfin/Kconfig | 81 +- arch/blackfin/Kconfig.debug | 12 +- arch/blackfin/Makefile | 7 +- arch/blackfin/boot/Makefile | 23 +- arch/blackfin/configs/BF518F-EZBRD_defconfig | 270 +++-- arch/blackfin/configs/BF526-EZBRD_defconfig | 336 +++-- arch/blackfin/configs/BF527-EZKIT-V2_defconfig | 1811 +++++++++++++++++++++++ arch/blackfin/configs/BF527-EZKIT_defconfig | 344 +++-- arch/blackfin/configs/BF533-EZKIT_defconfig | 250 ++-- arch/blackfin/configs/BF533-STAMP_defconfig | 295 +++-- arch/blackfin/configs/BF537-STAMP_defconfig | 332 +++-- arch/blackfin/configs/BF538-EZKIT_defconfig | 291 +++-- arch/blackfin/configs/BF548-EZKIT_defconfig | 108 +- arch/blackfin/configs/BF561-ACVILON_defconfig | 15 +- arch/blackfin/configs/BF561-EZKIT_defconfig | 82 +- arch/blackfin/configs/H8606_defconfig | 7 - arch/blackfin/configs/PNAV-10_defconfig | 295 +++-- arch/blackfin/configs/TCM-BF518_defconfig | 1375 +++++++++++++++++ arch/blackfin/include/asm/bfin-lq035q1.h | 12 + arch/blackfin/include/asm/bfin_can.h | 725 +++++++++ arch/blackfin/include/asm/bfin_sport.h | 227 ++-- arch/blackfin/include/asm/bfin_watchdog.h | 30 + arch/blackfin/include/asm/bitops.h | 74 +- arch/blackfin/include/asm/context.S | 22 + arch/blackfin/include/asm/cpu.h | 2 - arch/blackfin/include/asm/def_LPBlackfin.h | 58 +- arch/blackfin/include/asm/delay.h | 16 +- arch/blackfin/include/asm/dma-mapping.h | 15 +- arch/blackfin/include/asm/dma.h | 4 + arch/blackfin/include/asm/dpmc.h | 4 +- arch/blackfin/include/asm/elf.h | 8 +- arch/blackfin/include/asm/ftrace.h | 53 + arch/blackfin/include/asm/gpio.h | 17 +- arch/blackfin/include/asm/irq.h | 7 + arch/blackfin/include/asm/mmu_context.h | 14 +- arch/blackfin/include/asm/nmi.h | 12 + arch/blackfin/include/asm/page.h | 3 + arch/blackfin/include/asm/ptrace.h | 25 + arch/blackfin/include/asm/sections.h | 3 + arch/blackfin/include/asm/smp.h | 15 + arch/blackfin/include/asm/syscall.h | 96 ++ arch/blackfin/include/asm/thread_info.h | 25 +- arch/blackfin/include/asm/time.h | 13 +- arch/blackfin/kernel/Makefile | 1 + arch/blackfin/kernel/bfin_dma_5xx.c | 10 +- arch/blackfin/kernel/bfin_gpio.c | 20 +- arch/blackfin/kernel/cplb-mpu/cplbinit.c | 9 + arch/blackfin/kernel/cplb-mpu/cplbmgr.c | 54 +- arch/blackfin/kernel/cplb-nompu/cplbinit.c | 9 + arch/blackfin/kernel/dma-mapping.c | 2 +- arch/blackfin/kernel/entry.S | 8 +- arch/blackfin/kernel/ftrace-entry.S | 23 +- arch/blackfin/kernel/ftrace.c | 6 +- arch/blackfin/kernel/init_task.c | 2 +- arch/blackfin/kernel/kgdb.c | 10 +- arch/blackfin/kernel/nmi.c | 299 ++++ arch/blackfin/kernel/process.c | 7 - arch/blackfin/kernel/ptrace.c | 360 ++--- arch/blackfin/kernel/setup.c | 34 +- arch/blackfin/kernel/signal.c | 24 +- arch/blackfin/kernel/time-ts.c | 205 ++-- arch/blackfin/kernel/traps.c | 32 +- arch/blackfin/kernel/vmlinux.lds.S | 70 +- arch/blackfin/mach-bf518/boards/Kconfig | 5 + arch/blackfin/mach-bf518/boards/Makefile | 1 + arch/blackfin/mach-bf518/boards/ezbrd.c | 178 +++- arch/blackfin/mach-bf518/boards/tcm-bf518.c | 753 ++++++++++ arch/blackfin/mach-bf518/include/mach/irq.h | 12 +- arch/blackfin/mach-bf518/include/mach/mem_map.h | 2 +- arch/blackfin/mach-bf527/boards/Kconfig | 5 + arch/blackfin/mach-bf527/boards/Makefile | 1 + arch/blackfin/mach-bf527/boards/cm_bf527.c | 245 +++- arch/blackfin/mach-bf527/boards/ezbrd.c | 199 +++- arch/blackfin/mach-bf527/boards/ezkit.c | 431 +++++-- arch/blackfin/mach-bf527/include/mach/irq.h | 12 +- arch/blackfin/mach-bf533/boards/H8606.c | 66 +- arch/blackfin/mach-bf533/boards/blackstamp.c | 134 ++- arch/blackfin/mach-bf533/boards/cm_bf533.c | 138 ++- arch/blackfin/mach-bf533/boards/ezkit.c | 102 ++- arch/blackfin/mach-bf533/boards/ip0x.c | 63 +- arch/blackfin/mach-bf533/boards/stamp.c | 174 ++- arch/blackfin/mach-bf533/include/mach/irq.h | 3 +- arch/blackfin/mach-bf537/boards/cm_bf537e.c | 116 ++- arch/blackfin/mach-bf537/boards/cm_bf537u.c | 187 +++- arch/blackfin/mach-bf537/boards/minotaur.c | 183 +++- arch/blackfin/mach-bf537/boards/pnav10.c | 169 ++- arch/blackfin/mach-bf537/boards/stamp.c | 684 ++++++++- arch/blackfin/mach-bf537/boards/tcm_bf537.c | 187 +++- arch/blackfin/mach-bf537/include/mach/irq.h | 12 +- arch/blackfin/mach-bf538/boards/ezkit.c | 346 ++++- arch/blackfin/mach-bf538/include/mach/irq.h | 3 +- arch/blackfin/mach-bf548/boards/cm_bf548.c | 399 +++++- arch/blackfin/mach-bf548/boards/ezkit.c | 443 ++++++- arch/blackfin/mach-bf548/include/mach/irq.h | 3 +- arch/blackfin/mach-bf561/Makefile | 1 + arch/blackfin/mach-bf561/boards/acvilon.c | 2 +- arch/blackfin/mach-bf561/boards/cm_bf561.c | 66 +- arch/blackfin/mach-bf561/boards/ezkit.c | 70 +- arch/blackfin/mach-bf561/boards/tepla.c | 68 + arch/blackfin/mach-bf561/hotplug.c | 32 + arch/blackfin/mach-bf561/include/mach/irq.h | 3 +- arch/blackfin/mach-bf561/include/mach/smp.h | 2 + arch/blackfin/mach-bf561/secondary.S | 50 +- arch/blackfin/mach-bf561/smp.c | 44 +- arch/blackfin/mach-common/cpufreq.c | 168 ++- arch/blackfin/mach-common/entry.S | 81 +- arch/blackfin/mach-common/head.S | 16 +- arch/blackfin/mach-common/interrupt.S | 35 +- arch/blackfin/mach-common/ints-priority.c | 208 +++- arch/blackfin/mach-common/smp.c | 87 +- arch/blackfin/mm/isram-driver.c | 6 +- arch/blackfin/mm/sram-alloc.c | 27 +- 112 files changed, 12548 insertions(+), 2273 deletions(-) create mode 100644 arch/blackfin/configs/BF527-EZKIT-V2_defconfig create mode 100644 arch/blackfin/configs/TCM-BF518_defconfig create mode 100644 arch/blackfin/include/asm/bfin_can.h create mode 100644 arch/blackfin/include/asm/bfin_watchdog.h create mode 100644 arch/blackfin/include/asm/nmi.h create mode 100644 arch/blackfin/include/asm/syscall.h create mode 100644 arch/blackfin/kernel/nmi.c create mode 100644 arch/blackfin/mach-bf518/boards/tcm-bf518.c create mode 100644 arch/blackfin/mach-bf561/hotplug.c Merging cris/for-next $ git merge cris/for-next Already up-to-date. Merging ia64/test $ git merge ia64/test Already uptodate! Merge made by recursive. Merging m68k/for-next $ git merge m68k/for-next Already up-to-date. Merging m68knommu/for-next $ git merge m68knommu/for-next Auto-merging arch/m68knommu/kernel/ptrace.c Auto-merging arch/m68knommu/kernel/sys_m68k.c Auto-merging arch/m68knommu/kernel/syscalltable.S Auto-merging fs/binfmt_flat.c Merge made by recursive. arch/m68k/include/asm/m520xsim.h | 4 + arch/m68k/include/asm/m523xsim.h | 8 + arch/m68k/include/asm/m5249sim.h | 6 +- arch/m68k/include/asm/m527xsim.h | 10 ++ arch/m68k/include/asm/m528xsim.h | 67 +--------- arch/m68k/include/asm/m532xsim.h | 1 + arch/m68k/include/asm/mcfqspi.h | 64 +++++++++ arch/m68knommu/Kconfig | 4 + arch/m68knommu/Makefile | 2 +- arch/m68knommu/kernel/entry.S | 2 +- arch/m68knommu/platform/520x/config.c | 149 +++++++++++++++++++++ arch/m68knommu/platform/523x/config.c | 170 ++++++++++++++++++++++++ arch/m68knommu/platform/5249/config.c | 167 +++++++++++++++++++++++ arch/m68knommu/platform/5272/intc.c | 39 +++++- arch/m68knommu/platform/527x/config.c | 182 ++++++++++++++++++++++++++ arch/m68knommu/platform/528x/config.c | 137 +++++++++++++++++++ arch/m68knommu/platform/532x/config.c | 124 +++++++++++++++++ arch/m68knommu/platform/68328/ints.c | 8 +- arch/m68knommu/platform/68360/ints.c | 8 +- arch/m68knommu/platform/coldfire/intc-2.c | 76 ++++++++++- arch/m68knommu/platform/coldfire/intc-simr.c | 68 +++++++++- arch/m68knommu/platform/coldfire/intc.c | 59 ++++++++- fs/binfmt_flat.c | 2 +- 23 files changed, 1252 insertions(+), 105 deletions(-) create mode 100644 arch/m68k/include/asm/mcfqspi.h Merging microblaze/next $ git merge microblaze/next Merge made by recursive. arch/microblaze/Kconfig | 64 +- arch/microblaze/Makefile | 3 +- arch/microblaze/include/asm/device.h | 4 + arch/microblaze/include/asm/dma-mapping.h | 154 +++- arch/microblaze/include/asm/io.h | 31 +- arch/microblaze/include/asm/irq.h | 37 +- arch/microblaze/include/asm/page.h | 12 +- arch/microblaze/include/asm/pci-bridge.h | 195 ++++ arch/microblaze/include/asm/pci.h | 178 ++++- arch/microblaze/include/asm/pgalloc.h | 2 +- arch/microblaze/include/asm/pgtable.h | 40 +- arch/microblaze/include/asm/prom.h | 15 + arch/microblaze/include/asm/system.h | 3 + arch/microblaze/include/asm/tlbflush.h | 2 +- arch/microblaze/kernel/Makefile | 2 +- arch/microblaze/kernel/asm-offsets.c | 1 + arch/microblaze/kernel/cpu/cache.c | 211 +++- arch/microblaze/kernel/dma.c | 156 +++ arch/microblaze/kernel/entry.S | 116 +- arch/microblaze/kernel/head.S | 13 +- arch/microblaze/kernel/irq.c | 15 + arch/microblaze/kernel/setup.c | 45 +- arch/microblaze/kernel/traps.c | 10 +- arch/microblaze/mm/Makefile | 2 +- arch/microblaze/mm/consistent.c | 246 +++++ arch/microblaze/mm/init.c | 39 +- arch/microblaze/mm/pgtable.c | 2 +- arch/microblaze/pci/Makefile | 6 + arch/microblaze/pci/indirect_pci.c | 163 +++ arch/microblaze/pci/iomap.c | 39 + arch/microblaze/pci/pci-common.c | 1642 +++++++++++++++++++++++++++++ arch/microblaze/pci/pci_32.c | 430 ++++++++ arch/microblaze/pci/xilinx_pci.c | 168 +++ arch/powerpc/sysdev/xilinx_pci.c | 4 +- drivers/pci/Makefile | 1 + 35 files changed, 3848 insertions(+), 203 deletions(-) create mode 100644 arch/microblaze/kernel/dma.c create mode 100644 arch/microblaze/mm/consistent.c create mode 100644 arch/microblaze/pci/Makefile create mode 100644 arch/microblaze/pci/indirect_pci.c create mode 100644 arch/microblaze/pci/iomap.c create mode 100644 arch/microblaze/pci/pci-common.c create mode 100644 arch/microblaze/pci/pci_32.c create mode 100644 arch/microblaze/pci/xilinx_pci.c Merging mips/mips-for-linux-next $ git merge mips/mips-for-linux-next Merge made by recursive. drivers/video/tdfxfb.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Merging parisc/next $ git merge parisc/next Already up-to-date. Merging powerpc/next $ git merge powerpc/next Already up-to-date. Merging 4xx/next $ git merge 4xx/next Already up-to-date. Merging 52xx-and-virtex/next $ git merge 52xx-and-virtex/next Already up-to-date. Merging galak/next $ git merge galak/next Already up-to-date. Merging s390/features $ git merge s390/features Merge made by recursive. arch/s390/include/asm/lowcore.h | 48 ++++++++++++++++++-------------------- arch/s390/include/asm/system.h | 1 + arch/s390/kernel/asm-offsets.c | 1 - arch/s390/kernel/entry.S | 33 ++++---------------------- arch/s390/kernel/entry64.S | 28 ++++------------------ arch/s390/kernel/head.S | 4 +- arch/s390/kernel/processor.c | 37 +++++++++++++++++++---------- arch/s390/kernel/setup.c | 25 ++++---------------- arch/s390/kernel/smp.c | 6 ++-- arch/s390/kernel/traps.c | 40 +++++++++----------------------- arch/s390/mm/fault.c | 14 +++++------ arch/s390/mm/maccess.c | 26 +++++++++++++++++++++ drivers/s390/char/Kconfig | 3 +- drivers/s390/char/vmcp.c | 38 ++++++------------------------ drivers/s390/char/zcore.c | 31 +----------------------- drivers/s390/cio/css.c | 7 ++++- 16 files changed, 127 insertions(+), 215 deletions(-) Merging sh/master $ git merge sh/master Auto-merging drivers/sh/intc.c Merge made by recursive. arch/sh/include/asm/mmu.h | 7 +++++++ arch/sh/mm/uncached.c | 9 +++++++++ drivers/serial/sh-sci.c | 1 - drivers/sh/intc.c | 31 ++++++++++++++++++++++++++++++- include/linux/serial_sci.h | 4 ++++ 5 files changed, 50 insertions(+), 2 deletions(-) Merging genesis/master $ git merge genesis/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 ceph/for-next $ git merge ceph/for-next Resolved 'fs/gfs2/super.c' using previous resolution. Resolved 'fs/nfs/inode.c' using previous resolution. Resolved 'fs/ufs/inode.c' using previous resolution. Resolved 'fs/xfs/linux-2.6/xfs_super.c' using previous resolution. Auto-merging Documentation/ioctl/ioctl-number.txt Auto-merging MAINTAINERS Auto-merging fs/Kconfig Auto-merging fs/Makefile Auto-merging fs/affs/affs.h Auto-merging fs/bfs/inode.c Auto-merging fs/btrfs/ctree.h Auto-merging fs/btrfs/inode.c Auto-merging fs/exofs/exofs.h Auto-merging fs/exofs/inode.c Auto-merging fs/ext2/inode.c Auto-merging fs/ext3/inode.c Auto-merging fs/ext4/ext4.h Auto-merging fs/ext4/inode.c Auto-merging fs/fat/inode.c Auto-merging fs/gfs2/super.c CONFLICT (content): Merge conflict in fs/gfs2/super.c Auto-merging fs/jfs/inode.c Auto-merging fs/jfs/jfs_inode.h Auto-merging fs/nfs/inode.c CONFLICT (content): Merge conflict in fs/nfs/inode.c Auto-merging fs/reiserfs/inode.c Auto-merging fs/udf/inode.c Auto-merging fs/ufs/inode.c CONFLICT (content): Merge conflict in fs/ufs/inode.c Auto-merging fs/ufs/ufs.h Auto-merging fs/xfs/linux-2.6/xfs_super.c CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_super.c Auto-merging include/linux/ext3_fs.h Auto-merging include/linux/fs.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 23f701c] Merge remote branch 'ceph/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/filesystems/ceph.txt | 139 ++ Documentation/ioctl/ioctl-number.txt | 1 + MAINTAINERS | 9 + fs/Kconfig | 1 + fs/Makefile | 1 + fs/ceph/Kconfig | 27 + fs/ceph/Makefile | 39 + fs/ceph/README | 20 + fs/ceph/addr.c | 1188 +++++++++++++ fs/ceph/armor.c | 99 ++ fs/ceph/auth.c | 257 +++ fs/ceph/auth.h | 84 + fs/ceph/auth_none.c | 121 ++ fs/ceph/auth_none.h | 28 + fs/ceph/auth_x.c | 656 ++++++++ fs/ceph/auth_x.h | 49 + fs/ceph/auth_x_protocol.h | 90 + fs/ceph/buffer.c | 78 + fs/ceph/buffer.h | 39 + fs/ceph/caps.c | 2927 ++++++++++++++++++++++++++++++++ fs/ceph/ceph_debug.h | 37 + fs/ceph/ceph_frag.c | 21 + fs/ceph/ceph_frag.h | 109 ++ fs/ceph/ceph_fs.c | 74 + fs/ceph/ceph_fs.h | 650 ++++++++ fs/ceph/ceph_hash.c | 118 ++ fs/ceph/ceph_hash.h | 13 + fs/ceph/ceph_strings.c | 176 ++ fs/ceph/crush/crush.c | 151 ++ fs/ceph/crush/crush.h | 180 ++ fs/ceph/crush/hash.c | 149 ++ fs/ceph/crush/hash.h | 17 + fs/ceph/crush/mapper.c | 596 +++++++ fs/ceph/crush/mapper.h | 20 + fs/ceph/crypto.c | 408 +++++ fs/ceph/crypto.h | 48 + fs/ceph/debugfs.c | 483 ++++++ fs/ceph/decode.h | 194 +++ fs/ceph/dir.c | 1220 ++++++++++++++ fs/ceph/export.c | 223 +++ fs/ceph/file.c | 937 +++++++++++ fs/ceph/inode.c | 1750 ++++++++++++++++++++ fs/ceph/ioctl.c | 160 ++ fs/ceph/ioctl.h | 40 + fs/ceph/mds_client.c | 3021 ++++++++++++++++++++++++++++++++++ fs/ceph/mds_client.h | 335 ++++ fs/ceph/mdsmap.c | 174 ++ fs/ceph/mdsmap.h | 54 + fs/ceph/messenger.c | 2240 +++++++++++++++++++++++++ fs/ceph/messenger.h | 254 +++ fs/ceph/mon_client.c | 834 ++++++++++ fs/ceph/mon_client.h | 119 ++ fs/ceph/msgpool.c | 186 +++ fs/ceph/msgpool.h | 27 + fs/ceph/msgr.h | 158 ++ fs/ceph/osd_client.c | 1537 +++++++++++++++++ fs/ceph/osd_client.h | 166 ++ fs/ceph/osdmap.c | 1019 ++++++++++++ fs/ceph/osdmap.h | 125 ++ fs/ceph/pagelist.c | 54 + fs/ceph/pagelist.h | 54 + fs/ceph/rados.h | 374 +++++ fs/ceph/snap.c | 904 ++++++++++ fs/ceph/super.c | 1030 ++++++++++++ fs/ceph/super.h | 901 ++++++++++ fs/ceph/types.h | 29 + fs/ceph/xattr.c | 844 ++++++++++ 67 files changed, 28066 insertions(+), 0 deletions(-) create mode 100644 Documentation/filesystems/ceph.txt create mode 100644 fs/ceph/Kconfig create mode 100644 fs/ceph/Makefile create mode 100644 fs/ceph/README create mode 100644 fs/ceph/addr.c create mode 100644 fs/ceph/armor.c create mode 100644 fs/ceph/auth.c create mode 100644 fs/ceph/auth.h create mode 100644 fs/ceph/auth_none.c create mode 100644 fs/ceph/auth_none.h create mode 100644 fs/ceph/auth_x.c create mode 100644 fs/ceph/auth_x.h create mode 100644 fs/ceph/auth_x_protocol.h create mode 100644 fs/ceph/buffer.c create mode 100644 fs/ceph/buffer.h create mode 100644 fs/ceph/caps.c create mode 100644 fs/ceph/ceph_debug.h create mode 100644 fs/ceph/ceph_frag.c create mode 100644 fs/ceph/ceph_frag.h create mode 100644 fs/ceph/ceph_fs.c create mode 100644 fs/ceph/ceph_fs.h create mode 100644 fs/ceph/ceph_hash.c create mode 100644 fs/ceph/ceph_hash.h create mode 100644 fs/ceph/ceph_strings.c create mode 100644 fs/ceph/crush/crush.c create mode 100644 fs/ceph/crush/crush.h create mode 100644 fs/ceph/crush/hash.c create mode 100644 fs/ceph/crush/hash.h create mode 100644 fs/ceph/crush/mapper.c create mode 100644 fs/ceph/crush/mapper.h create mode 100644 fs/ceph/crypto.c create mode 100644 fs/ceph/crypto.h create mode 100644 fs/ceph/debugfs.c create mode 100644 fs/ceph/decode.h create mode 100644 fs/ceph/dir.c create mode 100644 fs/ceph/export.c create mode 100644 fs/ceph/file.c create mode 100644 fs/ceph/inode.c create mode 100644 fs/ceph/ioctl.c create mode 100644 fs/ceph/ioctl.h create mode 100644 fs/ceph/mds_client.c create mode 100644 fs/ceph/mds_client.h create mode 100644 fs/ceph/mdsmap.c create mode 100644 fs/ceph/mdsmap.h create mode 100644 fs/ceph/messenger.c create mode 100644 fs/ceph/messenger.h create mode 100644 fs/ceph/mon_client.c create mode 100644 fs/ceph/mon_client.h create mode 100644 fs/ceph/msgpool.c create mode 100644 fs/ceph/msgpool.h create mode 100644 fs/ceph/msgr.h create mode 100644 fs/ceph/osd_client.c create mode 100644 fs/ceph/osd_client.h create mode 100644 fs/ceph/osdmap.c create mode 100644 fs/ceph/osdmap.h create mode 100644 fs/ceph/pagelist.c create mode 100644 fs/ceph/pagelist.h create mode 100644 fs/ceph/rados.h create mode 100644 fs/ceph/snap.c create mode 100644 fs/ceph/super.c create mode 100644 fs/ceph/super.h create mode 100644 fs/ceph/types.h create mode 100644 fs/ceph/xattr.c Merging cifs/master $ git merge cifs/master Auto-merging fs/cifs/cifssmb.c Merge made by recursive. fs/cifs/cifsfs.c | 3 +- fs/cifs/cifsfs.h | 3 +- fs/cifs/cifsglob.h | 1 + fs/cifs/cifsproto.h | 6 + fs/cifs/cifssmb.c | 135 +++++++++++++++++++++++- fs/cifs/dir.c | 2 +- fs/cifs/file.c | 7 +- fs/cifs/inode.c | 297 +++++++++++++++++++++++++++++++------------------- 8 files changed, 333 insertions(+), 121 deletions(-) Merging configfs/linux-next $ git merge configfs/linux-next Already up-to-date. Merging ecryptfs/next $ git merge ecryptfs/next Already up-to-date. Merging ext3/for_next $ git merge ext3/for_next Already up-to-date. Merging ext4/next $ git merge ext4/next Already up-to-date. Merging fatfs/master $ git merge fatfs/master Merge made by recursive. fs/fat/dir.c | 17 ++++++----------- fs/fat/inode.c | 6 ++---- 2 files changed, 8 insertions(+), 15 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. Merging jfs/next $ git merge jfs/next Merge made by recursive. fs/jfs/jfs_dmap.c | 16 ++++++++-------- fs/jfs/jfs_dmap.h | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) Merging logfs/master $ git merge logfs/master Already up-to-date. Merging nfs/linux-next $ git merge nfs/linux-next Merge made by recursive. fs/nfs/callback_xdr.c | 1 + fs/nfs/delegation.h | 6 ++++++ fs/nfs/dir.c | 2 +- fs/nfs/inode.c | 2 +- fs/nfs/nfs4proc.c | 1 + fs/nfs/pagelist.c | 23 +++++++++++++---------- fs/nfs/super.c | 25 ++++++++++++++++++++----- net/sunrpc/xprtsock.c | 8 ++------ 8 files changed, 45 insertions(+), 23 deletions(-) Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Auto-merging fs/nfsd/nfs4state.c Auto-merging fs/nfsd/nfs4xdr.c Merge made by recursive. fs/nfsd/nfs4callback.c | 2 +- fs/nfsd/nfs4state.c | 58 +++++++++++-------------------------------- fs/nfsd/nfs4xdr.c | 2 +- fs/nfsd/nfsctl.c | 64 +++++++++++++++++++++++++++++++++++------------ fs/nfsd/nfsd.h | 6 ++-- 5 files changed, 67 insertions(+), 65 deletions(-) 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 Already up-to-date. 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 reiserfs-bkl/reiserfs/kill-bkl $ git merge reiserfs-bkl/reiserfs/kill-bkl Already up-to-date. Merging vfs/for-next $ git merge vfs/for-next Resolved 'fs/namei.c' using previous resolution. Resolved 'fs/nfsd/nfs4xdr.c' using previous resolution. Resolved 'security/tomoyo/realpath.c' using previous resolution. Auto-merging drivers/infiniband/core/uverbs.h Auto-merging drivers/infiniband/core/uverbs_main.c Auto-merging drivers/usb/gadget/f_mass_storage.c Auto-merging drivers/usb/gadget/file_storage.c Auto-merging fs/autofs4/inode.c Auto-merging fs/cifs/file.c Auto-merging fs/dcache.c Auto-merging fs/ext4/file.c Auto-merging fs/gfs2/super.c Auto-merging fs/locks.c Auto-merging fs/namei.c CONFLICT (content): Merge conflict in fs/namei.c Auto-merging fs/namespace.c Auto-merging fs/nfs/inode.c Auto-merging fs/nfs/nfs4proc.c Auto-merging fs/nfsd/nfs4xdr.c CONFLICT (content): Merge conflict in fs/nfsd/nfs4xdr.c Auto-merging fs/nfsd/vfs.c Auto-merging fs/nilfs2/dir.c Auto-merging fs/open.c Auto-merging fs/proc/base.c Auto-merging fs/proc/generic.c Auto-merging fs/udf/balloc.c Auto-merging fs/udf/inode.c Auto-merging fs/udf/namei.c Auto-merging include/linux/fs.h Auto-merging include/linux/mount.h Auto-merging mm/filemap.c Auto-merging net/sunrpc/rpc_pipe.c Auto-merging security/smack/smack_lsm.c Auto-merging security/tomoyo/realpath.c CONFLICT (content): Merge conflict in security/tomoyo/realpath.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 530ff08] Merge remote branch 'vfs/for-next' $ git diff -M --stat --summary HEAD^.. drivers/infiniband/core/uverbs_main.c | 1 + fs/namei.c | 63 +++++++++++++++++---------------- 2 files changed, 33 insertions(+), 31 deletions(-) Merging pci/linux-next $ git merge pci/linux-next Already up-to-date. Merging hid/for-next $ git merge hid/for-next Merge made by recursive. drivers/hid/hid-core.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) Merging quilt/i2c $ git merge quilt/i2c Merge made by recursive. Documentation/i2c/busses/i2c-i801 | 8 ++++- drivers/acpi/scan.c | 38 +++++++++++++++++++++++ drivers/i2c/busses/i2c-i801.c | 39 ++++++++++++++++-------- drivers/i2c/busses/i2c-parport.c | 2 +- drivers/i2c/busses/i2c-scmi.c | 32 +++++++++++++++----- drivers/i2c/busses/i2c-stub.c | 9 +++-- drivers/i2c/busses/scx200_acb.c | 2 +- drivers/i2c/i2c-dev.c | 6 ++-- drivers/misc/eeprom/at24.c | 59 ++++++++++++++++++++++++++++++------- include/acpi/acpi_drivers.h | 2 + 10 files changed, 155 insertions(+), 42 deletions(-) Merging bjdooks-i2c/next-i2c $ git merge bjdooks-i2c/next-i2c Already up-to-date. Merging quilt/jdelvare-hwmon $ git merge quilt/jdelvare-hwmon Merge made by recursive. drivers/acpi/osl.c | 9 +++++++++ drivers/hwmon/asus_atk0110.c | 7 +++++++ drivers/hwmon/coretemp.c | 2 +- drivers/hwmon/w83793.c | 2 +- include/linux/acpi.h | 2 ++ 5 files changed, 20 insertions(+), 2 deletions(-) Merging quilt/kernel-doc $ git merge quilt/kernel-doc Already up-to-date. Merging v4l-dvb/master $ git merge v4l-dvb/master Auto-merging drivers/media/IR/ir-keytable.c Merge made by recursive. Documentation/DocBook/v4l/vidioc-reqbufs.xml | 2 +- Documentation/video4linux/CARDLIST.saa7134 | 1 + drivers/media/IR/ir-keymaps.c | 455 ++----- drivers/media/IR/ir-keytable.c | 18 +- drivers/media/IR/ir-sysfs.c | 99 +- drivers/media/common/tuners/tuner-xc2028.c | 25 +- drivers/media/common/tuners/tuner-xc2028.h | 2 + drivers/media/dvb/bt8xx/dst.c | 2 - drivers/media/dvb/dm1105/dm1105.c | 4 +- drivers/media/dvb/dvb-core/dvb_demux.c | 11 +- drivers/media/dvb/dvb-usb/af9015.c | 13 +- drivers/media/dvb/dvb-usb/az6027.c | 53 +- drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 8 +- drivers/media/dvb/dvb-usb/dvb-usb-urb.c | 2 + drivers/media/dvb/dvb-usb/dvb-usb.h | 7 + drivers/media/dvb/firewire/firedtv-avc.c | 2 +- drivers/media/dvb/frontends/atbm8830_priv.h | 2 +- drivers/media/dvb/frontends/au8522_decoder.c | 7 + drivers/media/dvb/frontends/au8522_dig.c | 26 + drivers/media/dvb/frontends/au8522_priv.h | 5 + drivers/media/dvb/frontends/stv0900_core.c | 16 +- drivers/media/dvb/frontends/stv090x.c | 94 +- drivers/media/dvb/frontends/stv090x.h | 1 + drivers/media/dvb/frontends/stv6110x.c | 24 +- drivers/media/dvb/frontends/stv6110x.h | 1 + drivers/media/dvb/mantis/mantis_input.c | 4 +- drivers/media/dvb/mantis/mantis_vp1041.c | 10 +- drivers/media/dvb/ngene/ngene-core.c | 52 +- drivers/media/dvb/ttpci/budget-ci.c | 4 +- drivers/media/dvb/ttpci/budget.c | 8 + drivers/media/video/bt8xx/bttv-input.c | 4 +- drivers/media/video/cx18/cx18-av-core.c | 33 +- drivers/media/video/cx18/cx18-av-core.h | 19 + drivers/media/video/cx18/cx18-cards.c | 4 +- drivers/media/video/cx18/cx18-cards.h | 4 +- drivers/media/video/cx231xx/cx231xx-input.c | 5 +- drivers/media/video/cx2341x.c | 14 - drivers/media/video/cx23885/cimax2.c | 12 +- drivers/media/video/cx23885/cx23885-input.c | 4 +- drivers/media/video/cx88/cx88-input.c | 4 +- drivers/media/video/cx88/cx88.h | 2 +- drivers/media/video/davinci/isif_regs.h | 2 +- drivers/media/video/davinci/vpif_display.c | 2 +- drivers/media/video/em28xx/em28xx-cards.c | 7 +- drivers/media/video/em28xx/em28xx-dvb.c | 1 + drivers/media/video/em28xx/em28xx-input.c | 4 +- drivers/media/video/gspca/cpia1.c | 34 +- drivers/media/video/gspca/gspca.c | 7 +- drivers/media/video/gspca/ov534.c | 563 ++++---- drivers/media/video/gspca/pac207.c | 4 +- drivers/media/video/gspca/sn9c2028.c | 2 +- drivers/media/video/gspca/sn9c20x.c | 6 +- drivers/media/video/gspca/t613.c | 13 +- drivers/media/video/ir-kbd-i2c.c | 8 +- drivers/media/video/ivtv/ivtv-driver.c | 5 +- drivers/media/video/ivtv/ivtv-driver.h | 3 + drivers/media/video/ivtv/ivtv-ioctl.c | 21 + drivers/media/video/ivtv/ivtv-irq.c | 8 +- drivers/media/video/ivtv/ivtv-streams.c | 7 +- drivers/media/video/ivtv/ivtvfb.c | 2 +- drivers/media/video/mt9t031.c | 66 +- drivers/media/video/mt9v022.c | 2 +- drivers/media/video/mx3_camera.c | 4 +- drivers/media/video/ov9640.c | 6 +- drivers/media/video/rj54n1cb0c.c | 18 +- drivers/media/video/s2255drv.c | 555 ++++++--- drivers/media/video/saa7134/saa7134-alsa.c | 2 - drivers/media/video/saa7134/saa7134-cards.c | 22 + drivers/media/video/saa7134/saa7134-input.c | 6 +- drivers/media/video/saa7134/saa7134.h | 1 + drivers/media/video/sh_mobile_ceu_camera.c | 8 +- drivers/media/video/soc_camera.c | 18 +- drivers/media/video/tlg2300/pd-dvb.c | 6 +- drivers/media/video/tlg2300/pd-main.c | 7 +- drivers/media/video/tlg2300/pd-radio.c | 21 +- drivers/media/video/tlg2300/pd-video.c | 18 +- drivers/media/video/usbvideo/quickcam_messenger.c | 3 +- drivers/media/video/v4l2-common.c | 4 +- drivers/media/video/videobuf-core.c | 2 +- drivers/staging/Kconfig | 2 + drivers/staging/Makefile | 1 + drivers/staging/cx25821/cx25821-alsa.c | 102 +- drivers/staging/tm6000/Kconfig | 32 + drivers/staging/tm6000/Makefile | 17 + drivers/staging/tm6000/README | 11 + drivers/staging/tm6000/tm6000-alsa.c | 414 ++++++ drivers/staging/tm6000/tm6000-cards.c | 826 +++++++++++ drivers/staging/tm6000/tm6000-core.c | 494 +++++++ drivers/staging/tm6000/tm6000-dvb.c | 346 +++++ drivers/staging/tm6000/tm6000-i2c.c | 297 ++++ drivers/staging/tm6000/tm6000-regs.h | 541 +++++++ drivers/staging/tm6000/tm6000-stds.c | 873 ++++++++++++ drivers/staging/tm6000/tm6000-usb-isoc.h | 53 + drivers/staging/tm6000/tm6000-video.c | 1550 +++++++++++++++++++++ drivers/staging/tm6000/tm6000.h | 283 ++++ include/linux/videodev2.h | 1 + include/media/ir-core.h | 11 +- include/media/soc_camera.h | 12 +- include/media/v4l2-chip-ident.h | 120 +- 99 files changed, 7315 insertions(+), 1202 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/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 kbuild/for-next $ git merge kbuild/for-next Auto-merging MAINTAINERS Auto-merging Makefile Auto-merging arch/ia64/include/asm/percpu.h Auto-merging arch/ia64/kernel/ivt.S Auto-merging arch/parisc/include/asm/system.h Auto-merging arch/s390/kernel/swsusp_asm64.S Auto-merging arch/x86/kernel/setup_percpu.c Auto-merging arch/x86/kernel/vmlinux.lds.S Auto-merging include/asm-generic/percpu.h Auto-merging include/linux/init_task.h Auto-merging include/linux/percpu-defs.h Auto-merging include/linux/spinlock.h Auto-merging init/Kconfig Auto-merging kernel/module.c Auto-merging scripts/kconfig/Makefile Auto-merging scripts/markup_oops.pl Merge made by recursive. Documentation/kbuild/kbuild.txt | 6 +- Documentation/kbuild/makefiles.txt | 2 +- Documentation/mutex-design.txt | 4 +- MAINTAINERS | 5 +- Makefile | 65 +- arch/frv/kernel/break.S | 4 +- arch/frv/kernel/entry.S | 2 +- arch/frv/kernel/head.S | 2 +- arch/frv/kernel/vmlinux.lds.S | 10 +- arch/frv/mm/tlb-miss.S | 2 +- arch/h8300/boot/compressed/head.S | 2 +- arch/h8300/boot/compressed/vmlinux.lds | 2 +- arch/ia64/include/asm/asmmacro.h | 12 +- arch/ia64/include/asm/cache.h | 2 +- arch/ia64/include/asm/percpu.h | 2 +- arch/ia64/kernel/Makefile.gate | 2 +- arch/ia64/kernel/gate-data.S | 2 +- arch/ia64/kernel/gate.S | 8 +- arch/ia64/kernel/gate.lds.S | 10 +- arch/ia64/kernel/init_task.c | 2 +- arch/ia64/kernel/ivt.S | 2 +- arch/ia64/kernel/minstate.h | 4 +- arch/ia64/kernel/paravirtentry.S | 2 +- arch/ia64/kernel/vmlinux.lds.S | 28 +- arch/ia64/kvm/vmm_ivt.S | 2 +- arch/ia64/scripts/unwcheck.py | 2 +- arch/ia64/xen/gate-data.S | 2 +- arch/ia64/xen/xensetup.S | 2 +- arch/m68knommu/kernel/vmlinux.lds.S | 4 +- arch/m68knommu/platform/68360/head-ram.S | 2 +- arch/m68knommu/platform/68360/head-rom.S | 2 +- arch/mips/lasat/image/head.S | 2 +- arch/mips/lasat/image/romscript.normal | 2 +- arch/parisc/include/asm/cache.h | 2 +- arch/parisc/include/asm/system.h | 2 +- arch/parisc/kernel/head.S | 2 +- arch/parisc/kernel/init_task.c | 6 +- arch/parisc/kernel/vmlinux.lds.S | 12 +- arch/powerpc/Makefile | 5 + arch/powerpc/include/asm/cache.h | 2 +- arch/powerpc/include/asm/page_64.h | 8 - arch/powerpc/kernel/vmlinux.lds.S | 10 +- arch/s390/include/asm/cache.h | 2 +- arch/s390/kernel/swsusp_asm64.S | 2 +- arch/sh/boot/compressed/vmlinux.scr | 2 +- arch/sh/include/asm/cache.h | 2 +- arch/sparc/boot/btfixupprep.c | 2 +- arch/sparc/include/asm/cache.h | 2 +- arch/um/kernel/dyn.lds.S | 2 +- arch/um/kernel/init_task.c | 2 +- arch/um/kernel/uml.lds.S | 2 +- arch/x86/boot/compressed/mkpiggy.c | 2 +- arch/x86/boot/compressed/vmlinux.lds.S | 4 +- arch/x86/include/asm/cache.h | 2 +- arch/x86/kernel/acpi/wakeup_32.S | 2 +- arch/x86/kernel/init_task.c | 2 +- arch/x86/kernel/setup_percpu.c | 2 +- arch/x86/kernel/vmlinux.lds.S | 4 +- include/asm-generic/percpu.h | 10 +- include/asm-generic/vmlinux.lds.h | 38 +- include/linux/cache.h | 2 +- include/linux/init.h | 2 +- include/linux/init_task.h | 2 +- include/linux/linkage.h | 8 +- include/linux/percpu-defs.h | 4 +- include/linux/spinlock.h | 2 +- init/Kconfig | 8 + kernel/module.c | 2 +- scripts/Makefile.build | 2 +- scripts/Makefile.lib | 2 +- scripts/checkincludes.pl | 24 +- scripts/checkstack.pl | 16 +- scripts/checkversion.pl | 23 +- scripts/decodecode | 48 +- scripts/export_report.pl | 37 +- scripts/genksyms/genksyms.c | 4 +- scripts/headers_check.pl | 11 +- scripts/headers_install.pl | 19 +- scripts/kallsyms.c | 6 +- scripts/kconfig/Makefile | 16 +- scripts/kconfig/expr.c | 27 +- scripts/kconfig/expr.h | 5 +- scripts/kconfig/lkc.h | 7 +- scripts/kconfig/lkc_proto.h | 3 +- scripts/kconfig/mconf.c | 14 +- scripts/kconfig/menu.c | 16 +- scripts/kconfig/nconf.c | 1568 ++++++++++++++++++++++++++++++ scripts/kconfig/nconf.gui.c | 617 ++++++++++++ scripts/kconfig/nconf.h | 95 ++ scripts/kconfig/symbol.c | 29 +- scripts/kconfig/util.c | 2 + scripts/kconfig/zconf.tab.c_shipped | 4 +- scripts/kconfig/zconf.y | 4 +- scripts/markup_oops.pl | 54 +- scripts/mkcompile_h | 5 +- scripts/mod/modpost.c | 152 ++-- scripts/namespace.pl | 65 +- scripts/package/builddeb | 2 + scripts/package/mkspec | 2 +- scripts/profile2linkerlist.pl | 8 +- scripts/rt-tester/rt-tester.py | 2 +- scripts/show_delta | 2 +- scripts/tags.sh | 45 +- 103 files changed, 2874 insertions(+), 427 deletions(-) create mode 100644 scripts/kconfig/nconf.c create mode 100644 scripts/kconfig/nconf.gui.c create mode 100644 scripts/kconfig/nconf.h Merging kconfig/for-next $ git merge kconfig/for-next Already uptodate! Merge made by recursive. Merging ide/master $ git merge ide/master Already up-to-date. Merging libata/NEXT $ git merge libata/NEXT Merge made by recursive. drivers/ata/ahci.c | 265 +++++++++++++++++++++++++++++++--------------------- 1 files changed, 159 insertions(+), 106 deletions(-) Merging infiniband/for-next $ git merge infiniband/for-next Already up-to-date. Merging acpi/test $ git merge acpi/test Merge made by recursive. Documentation/acpi/apei/einj.txt | 49 +++ Documentation/kernel-parameters.txt | 8 +- arch/ia64/include/asm/acpi.h | 1 - arch/x86/include/asm/acpi.h | 2 - arch/x86/include/asm/emergency-restart.h | 1 + arch/x86/kernel/acpi/boot.c | 19 +- arch/x86/kernel/reboot.c | 71 +++- arch/x86/lguest/boot.c | 1 - drivers/acpi/Kconfig | 2 + drivers/acpi/Makefile | 3 + drivers/acpi/acpica/Makefile | 2 +- drivers/acpi/acpica/acglobal.h | 5 + drivers/acpi/acpica/acinterp.h | 7 + drivers/acpi/acpica/dsfield.c | 2 +- drivers/acpi/acpica/dsmethod.c | 2 +- drivers/acpi/acpica/dsmthdat.c | 10 +- drivers/acpi/acpica/dsobject.c | 14 +- drivers/acpi/acpica/dsopcode.c | 13 +- drivers/acpi/acpica/dswexec.c | 6 +- drivers/acpi/acpica/dswstate.c | 10 +- drivers/acpi/acpica/evevent.c | 2 +- drivers/acpi/acpica/evgpe.c | 12 +- drivers/acpi/acpica/evgpeblk.c | 4 +- drivers/acpi/acpica/evmisc.c | 2 +- drivers/acpi/acpica/evxface.c | 4 +- drivers/acpi/acpica/exconvrt.c | 4 +- drivers/acpi/acpica/excreate.c | 4 +- drivers/acpi/acpica/exdebug.c | 261 +++++++++++++ drivers/acpi/acpica/exfield.c | 2 +- drivers/acpi/acpica/exfldio.c | 16 +- drivers/acpi/acpica/exmisc.c | 8 +- drivers/acpi/acpica/exmutex.c | 25 +- drivers/acpi/acpica/exnames.c | 4 +- drivers/acpi/acpica/exoparg1.c | 16 +- drivers/acpi/acpica/exoparg2.c | 10 +- drivers/acpi/acpica/exoparg3.c | 4 +- drivers/acpi/acpica/exoparg6.c | 4 +- drivers/acpi/acpica/exprep.c | 15 +- drivers/acpi/acpica/exregion.c | 4 +- drivers/acpi/acpica/exresnte.c | 4 +- drivers/acpi/acpica/exresolv.c | 11 +- drivers/acpi/acpica/exresop.c | 8 +- drivers/acpi/acpica/exstore.c | 218 +----------- drivers/acpi/acpica/exsystem.c | 2 +- drivers/acpi/acpica/hwregs.c | 6 +- drivers/acpi/acpica/hwsleep.c | 2 +- drivers/acpi/acpica/hwvalid.c | 2 +- drivers/acpi/acpica/nsaccess.c | 2 +- drivers/acpi/acpica/nsdump.c | 4 +- drivers/acpi/acpica/nsnames.c | 2 +- drivers/acpi/acpica/nssearch.c | 2 +- drivers/acpi/acpica/nsutils.c | 4 +- drivers/acpi/acpica/psargs.c | 4 +- drivers/acpi/acpica/psloop.c | 3 +- drivers/acpi/acpica/rscreate.c | 14 +- drivers/acpi/acpica/rslist.c | 6 +- drivers/acpi/acpica/rsmisc.c | 4 +- drivers/acpi/acpica/tbfadt.c | 16 +- drivers/acpi/acpica/tbutils.c | 4 +- drivers/acpi/acpica/tbxfroot.c | 6 +- drivers/acpi/acpica/utalloc.c | 2 +- drivers/acpi/acpica/utdelete.c | 6 +- drivers/acpi/acpica/uteval.c | 2 +- drivers/acpi/acpica/utmisc.c | 6 +- drivers/acpi/acpica/utmutex.c | 4 +- drivers/acpi/acpica/utobject.c | 8 +- drivers/acpi/apei/Kconfig | 16 + drivers/acpi/apei/Makefile | 4 + drivers/acpi/apei/apei-base.c | 589 ++++++++++++++++++++++++++++++ drivers/acpi/apei/apei-internal.h | 97 +++++ drivers/acpi/apei/einj.c | 471 ++++++++++++++++++++++++ drivers/acpi/apei/hest.c | 147 ++++++++ drivers/acpi/atomicio.c | 360 ++++++++++++++++++ drivers/acpi/ec.c | 35 +-- drivers/acpi/tables.c | 4 +- include/acpi/acoutput.h | 2 + include/acpi/acpixf.h | 3 +- include/acpi/actbl2.h | 27 ++ include/acpi/apei.h | 13 + include/acpi/atomicio.h | 10 + 80 files changed, 2318 insertions(+), 441 deletions(-) create mode 100644 Documentation/acpi/apei/einj.txt create mode 100644 drivers/acpi/acpica/exdebug.c create mode 100644 drivers/acpi/apei/Kconfig create mode 100644 drivers/acpi/apei/Makefile create mode 100644 drivers/acpi/apei/apei-base.c create mode 100644 drivers/acpi/apei/apei-internal.h create mode 100644 drivers/acpi/apei/einj.c create mode 100644 drivers/acpi/apei/hest.c create mode 100644 drivers/acpi/atomicio.c create mode 100644 include/acpi/apei.h create mode 100644 include/acpi/atomicio.h Merging ieee1394/for-next $ git merge ieee1394/for-next Merge made by recursive. drivers/firewire/core-iso.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) Merging ubi/linux-next $ git merge ubi/linux-next Already up-to-date. Merging kvm/linux-next $ git merge kvm/linux-next Already up-to-date. Merging dlm/next $ git merge dlm/next Already up-to-date. Merging ibft/master $ git merge ibft/master Already up-to-date. Merging scsi/master $ git merge scsi/master Auto-merging drivers/infiniband/ulp/iser/iscsi_iser.c Removing drivers/scsi/bfa/include/defs/bfa_defs_im_common.h Removing drivers/scsi/bfa/include/defs/bfa_defs_im_team.h Removing drivers/scsi/bfa/include/protocol/pcifw.h Auto-merging drivers/scsi/lpfc/lpfc_els.c Auto-merging drivers/scsi/lpfc/lpfc_scsi.c Auto-merging drivers/scsi/sd.c Merge made by recursive. drivers/infiniband/ulp/iser/iscsi_iser.c | 2 +- drivers/scsi/Kconfig | 6 + drivers/scsi/be2iscsi/be_cmds.c | 7 - drivers/scsi/be2iscsi/be_iscsi.c | 4 +- drivers/scsi/be2iscsi/be_main.c | 201 ++- drivers/scsi/be2iscsi/be_main.h | 11 +- drivers/scsi/be2iscsi/be_mgmt.c | 14 +- drivers/scsi/be2iscsi/be_mgmt.h | 8 +- drivers/scsi/bfa/Makefile | 8 +- drivers/scsi/bfa/bfa_core.c | 19 + drivers/scsi/bfa/bfa_fcport.c | 1709 +++++++++++--------- drivers/scsi/bfa/bfa_fcs.c | 63 +- drivers/scsi/bfa/bfa_fcs_lport.c | 75 +- drivers/scsi/bfa/bfa_fcs_port.c | 11 +- drivers/scsi/bfa/bfa_fcs_uf.c | 8 +- drivers/scsi/bfa/bfa_hw_cb.c | 13 + drivers/scsi/bfa/bfa_hw_ct.c | 9 + drivers/scsi/bfa/bfa_intr.c | 111 +- drivers/scsi/bfa/bfa_ioc.c | 762 +++------ drivers/scsi/bfa/bfa_ioc.h | 57 +- drivers/scsi/bfa/bfa_ioc_cb.c | 274 +++ drivers/scsi/bfa/bfa_ioc_ct.c | 423 +++++ drivers/scsi/bfa/bfa_iocfc.c | 24 +- drivers/scsi/bfa/bfa_iocfc.h | 3 + drivers/scsi/bfa/bfa_ioim.c | 22 +- drivers/scsi/bfa/bfa_itnim.c | 30 +- drivers/scsi/bfa/bfa_lps.c | 134 ++- drivers/scsi/bfa/bfa_module.c | 4 +- drivers/scsi/bfa/bfa_modules_priv.h | 2 +- drivers/scsi/bfa/bfa_port_priv.h | 57 +- drivers/scsi/bfa/bfa_priv.h | 2 +- drivers/scsi/bfa/bfa_rport.c | 26 +- drivers/scsi/bfa/bfa_trcmod_priv.h | 62 +- drivers/scsi/bfa/bfa_tskim.c | 14 +- drivers/scsi/bfa/bfad.c | 208 ++- drivers/scsi/bfa/bfad_attr.c | 76 +- drivers/scsi/bfa/bfad_attr.h | 9 - drivers/scsi/bfa/bfad_drv.h | 35 +- drivers/scsi/bfa/bfad_im.c | 53 +- drivers/scsi/bfa/bfad_im.h | 5 - drivers/scsi/bfa/bfad_intr.c | 11 +- drivers/scsi/bfa/fabric.c | 59 +- drivers/scsi/bfa/fcbuild.h | 6 + drivers/scsi/bfa/fcpim.c | 51 +- drivers/scsi/bfa/fcs_fabric.h | 2 + drivers/scsi/bfa/fcs_fcpim.h | 5 - drivers/scsi/bfa/fcs_lport.h | 7 +- drivers/scsi/bfa/fcs_port.h | 3 +- drivers/scsi/bfa/fcs_rport.h | 3 - drivers/scsi/bfa/fcs_uf.h | 3 +- drivers/scsi/bfa/fcs_vport.h | 8 - drivers/scsi/bfa/fdmi.c | 79 +- drivers/scsi/bfa/include/aen/bfa_aen.h | 50 +- drivers/scsi/bfa/include/bfa.h | 22 + drivers/scsi/bfa/include/bfa_svc.h | 101 +- drivers/scsi/bfa/include/bfa_timer.h | 2 +- drivers/scsi/bfa/include/bfi/bfi.h | 4 +- drivers/scsi/bfa/include/bfi/bfi_cbreg.h | 16 +- drivers/scsi/bfa/include/bfi/bfi_ctreg.h | 26 + drivers/scsi/bfa/include/bfi/bfi_ioc.h | 2 +- drivers/scsi/bfa/include/bfi/bfi_lps.h | 8 + drivers/scsi/bfa/include/bfi/bfi_pport.h | 172 +-- drivers/scsi/bfa/include/cna/bfa_cna_trcmod.h | 4 + drivers/scsi/bfa/include/cs/bfa_log.h | 2 +- drivers/scsi/bfa/include/cs/bfa_plog.h | 9 +- drivers/scsi/bfa/include/cs/bfa_sm.h | 8 + drivers/scsi/bfa/include/defs/bfa_defs_aen.h | 10 + drivers/scsi/bfa/include/defs/bfa_defs_auth.h | 22 + drivers/scsi/bfa/include/defs/bfa_defs_cee.h | 14 +- drivers/scsi/bfa/include/defs/bfa_defs_driver.h | 3 +- drivers/scsi/bfa/include/defs/bfa_defs_ethport.h | 1 + drivers/scsi/bfa/include/defs/bfa_defs_fcport.h | 94 ++ drivers/scsi/bfa/include/defs/bfa_defs_im_common.h | 32 - drivers/scsi/bfa/include/defs/bfa_defs_im_team.h | 72 - drivers/scsi/bfa/include/defs/bfa_defs_ioc.h | 3 +- drivers/scsi/bfa/include/defs/bfa_defs_iocfc.h | 12 +- drivers/scsi/bfa/include/defs/bfa_defs_lport.h | 4 +- drivers/scsi/bfa/include/defs/bfa_defs_mfg.h | 111 ++- drivers/scsi/bfa/include/defs/bfa_defs_port.h | 19 +- drivers/scsi/bfa/include/defs/bfa_defs_pport.h | 151 +- drivers/scsi/bfa/include/defs/bfa_defs_status.h | 17 +- drivers/scsi/bfa/include/fcb/bfa_fcb_fcpim.h | 1 - drivers/scsi/bfa/include/fcs/bfa_fcs.h | 5 +- drivers/scsi/bfa/include/fcs/bfa_fcs_lport.h | 8 - drivers/scsi/bfa/include/log/bfa_log_hal.h | 6 + drivers/scsi/bfa/include/log/bfa_log_linux.h | 16 + drivers/scsi/bfa/include/protocol/fc.h | 5 + drivers/scsi/bfa/include/protocol/pcifw.h | 75 - drivers/scsi/bfa/loop.c | 2 +- drivers/scsi/bfa/lport_api.c | 5 +- drivers/scsi/bfa/ms.c | 29 +- drivers/scsi/bfa/ns.c | 36 +- drivers/scsi/bfa/rport.c | 91 +- drivers/scsi/bfa/rport_api.c | 2 +- drivers/scsi/bfa/rport_ftrs.c | 12 +- drivers/scsi/bfa/scn.c | 10 +- drivers/scsi/bfa/vport.c | 86 +- drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 +- drivers/scsi/cxgb3i/cxgb3i_iscsi.c | 2 +- drivers/scsi/device_handler/scsi_dh_emc.c | 6 +- drivers/scsi/hpsa.c | 330 ++-- drivers/scsi/hpsa.h | 7 +- drivers/scsi/hpsa_cmd.h | 20 +- drivers/scsi/ibmvscsi/ibmvfc.c | 27 + drivers/scsi/ibmvscsi/ibmvscsi.c | 19 + drivers/scsi/ibmvscsi/ibmvscsi.h | 1 + drivers/scsi/ibmvscsi/iseries_vscsi.c | 6 + drivers/scsi/ibmvscsi/rpa_vscsi.c | 13 + drivers/scsi/ipr.c | 1756 +++++++++++++++----- drivers/scsi/ipr.h | 467 ++++-- drivers/scsi/iscsi_tcp.c | 2 +- drivers/scsi/libiscsi.c | 23 +- drivers/scsi/lpfc/lpfc.h | 10 +- drivers/scsi/lpfc/lpfc_attr.c | 7 +- drivers/scsi/lpfc/lpfc_bsg.c | 332 ++++ drivers/scsi/lpfc/lpfc_bsg.h | 12 + drivers/scsi/lpfc/lpfc_crtn.h | 7 +- drivers/scsi/lpfc/lpfc_els.c | 142 ++- drivers/scsi/lpfc/lpfc_hbadisc.c | 527 +++++-- drivers/scsi/lpfc/lpfc_init.c | 277 +++- drivers/scsi/lpfc/lpfc_logmsg.h | 1 + drivers/scsi/lpfc/lpfc_mbox.c | 8 +- drivers/scsi/lpfc/lpfc_scsi.c | 49 +- drivers/scsi/lpfc/lpfc_sli.c | 413 ++++- drivers/scsi/lpfc/lpfc_sli.h | 1 + drivers/scsi/lpfc/lpfc_sli4.h | 38 +- drivers/scsi/lpfc/lpfc_version.h | 2 +- drivers/scsi/lpfc/lpfc_vport.c | 7 +- drivers/scsi/osd/osd_initiator.c | 4 + drivers/scsi/raid_class.c | 2 + drivers/scsi/scsi_transport_fc.c | 24 +- drivers/scsi/sd.c | 4 +- include/scsi/libiscsi.h | 3 +- 133 files changed, 7204 insertions(+), 3525 deletions(-) create mode 100644 drivers/scsi/bfa/bfa_ioc_cb.c create mode 100644 drivers/scsi/bfa/bfa_ioc_ct.c create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_fcport.h delete mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_im_common.h delete mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_im_team.h delete mode 100644 drivers/scsi/bfa/include/protocol/pcifw.h 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 Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution. Resolved 'drivers/net/wireless/ath/ath5k/phy.c' using previous resolution. Auto-merging Documentation/feature-removal-schedule.txt CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt Auto-merging drivers/net/wireless/ath/ath5k/eeprom.c Auto-merging drivers/net/wireless/ath/ath5k/phy.c CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath5k/phy.c Auto-merging drivers/net/wireless/ath/ath5k/reg.h Auto-merging drivers/net/wireless/ath/ath5k/reset.c Auto-merging drivers/net/wireless/ipw2x00/ipw2200.c Auto-merging drivers/net/wireless/ipw2x00/libipw.h Auto-merging drivers/net/wireless/ipw2x00/libipw_module.c Auto-merging drivers/net/wireless/iwlwifi/iwl-3945.c Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c Auto-merging drivers/net/wireless/iwlwifi/iwl-scan.c Auto-merging drivers/net/wireless/iwmc3200wifi/debugfs.c Auto-merging drivers/net/wireless/iwmc3200wifi/rx.c Auto-merging drivers/net/wireless/rndis_wlan.c Removing drivers/net/wireless/wl12xx/wl1271_spi.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 61065c4] Merge remote branch 'wireless/master' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/obsolete/sysfs-class-rfkill | 29 ++ Documentation/ABI/stable/sysfs-class-rfkill | 67 ++++ Documentation/feature-removal-schedule.txt | 18 + Documentation/rfkill.txt | 44 +-- drivers/net/wireless/airo.c | 37 ++- drivers/net/wireless/ath/ath5k/ath5k.h | 257 +++++--------- drivers/net/wireless/ath/ath5k/attach.c | 5 +- drivers/net/wireless/ath/ath5k/base.c | 150 +++++++-- drivers/net/wireless/ath/ath5k/base.h | 20 + drivers/net/wireless/ath/ath5k/caps.c | 3 - drivers/net/wireless/ath/ath5k/debug.c | 212 +++++++++++ drivers/net/wireless/ath/ath5k/debug.h | 2 + drivers/net/wireless/ath/ath5k/desc.c | 18 +- drivers/net/wireless/ath/ath5k/eeprom.c | 4 +- drivers/net/wireless/ath/ath5k/eeprom.h | 88 ++++-- drivers/net/wireless/ath/ath5k/pcu.c | 306 +---------------- drivers/net/wireless/ath/ath5k/phy.c | 43 +-- drivers/net/wireless/ath/ath5k/qcu.c | 17 - drivers/net/wireless/ath/ath5k/reg.h | 2 +- drivers/net/wireless/ath/ath5k/reset.c | 38 ++- drivers/net/wireless/ath/ath9k/hw.c | 16 +- drivers/net/wireless/ath/ath9k/hw.h | 1 + drivers/net/wireless/ath/ath9k/mac.c | 6 +- drivers/net/wireless/ath/ath9k/rc.c | 8 +- drivers/net/wireless/ath/ath9k/rc.h | 1 - drivers/net/wireless/ath/ath9k/xmit.c | 4 +- drivers/net/wireless/b43/b43.h | 1 + drivers/net/wireless/b43/phy_n.c | 463 +++++++++++++++++++------ drivers/net/wireless/b43/phy_n.h | 21 +- drivers/net/wireless/b43/tables_nphy.h | 9 + drivers/net/wireless/ipw2x00/ipw2100.c | 10 +- drivers/net/wireless/ipw2x00/ipw2200.c | 18 +- drivers/net/wireless/ipw2x00/libipw.h | 14 +- drivers/net/wireless/ipw2x00/libipw_module.c | 13 +- drivers/net/wireless/iwlwifi/Makefile | 2 +- drivers/net/wireless/iwlwifi/iwl-1000.c | 1 + drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 2 + drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 6 +- drivers/net/wireless/iwlwifi/iwl-3945.c | 42 ++- drivers/net/wireless/iwlwifi/iwl-4965.c | 20 +- drivers/net/wireless/iwlwifi/iwl-5000.c | 40 +- drivers/net/wireless/iwlwifi/iwl-6000.c | 1 + drivers/net/wireless/iwlwifi/iwl-agn-ict.c | 305 ++++++++++++++++ drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 13 +- drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 1 - drivers/net/wireless/iwlwifi/iwl-agn.c | 110 +------ drivers/net/wireless/iwlwifi/iwl-agn.h | 74 ++++ drivers/net/wireless/iwlwifi/iwl-core.c | 418 ++-------------------- drivers/net/wireless/iwlwifi/iwl-core.h | 8 - drivers/net/wireless/iwlwifi/iwl-debugfs.c | 82 ++--- drivers/net/wireless/iwlwifi/iwl-dev.h | 90 +++--- drivers/net/wireless/iwlwifi/iwl-helpers.h | 3 + drivers/net/wireless/iwlwifi/iwl-prph.h | 14 +- drivers/net/wireless/iwlwifi/iwl-rx.c | 24 -- drivers/net/wireless/iwlwifi/iwl-scan.c | 9 +- drivers/net/wireless/iwlwifi/iwl-sta.c | 18 +- drivers/net/wireless/iwlwifi/iwl-tx.c | 115 ++++--- drivers/net/wireless/iwlwifi/iwl3945-base.c | 78 ++--- drivers/net/wireless/iwmc3200wifi/Kconfig | 9 +- drivers/net/wireless/iwmc3200wifi/Makefile | 3 + drivers/net/wireless/iwmc3200wifi/cfg80211.c | 17 +- drivers/net/wireless/iwmc3200wifi/commands.c | 14 +- drivers/net/wireless/iwmc3200wifi/commands.h | 1 + drivers/net/wireless/iwmc3200wifi/debugfs.c | 13 +- drivers/net/wireless/iwmc3200wifi/hal.c | 15 +- drivers/net/wireless/iwmc3200wifi/hal.h | 5 +- drivers/net/wireless/iwmc3200wifi/iwm.h | 3 + drivers/net/wireless/iwmc3200wifi/main.c | 9 +- drivers/net/wireless/iwmc3200wifi/rx.c | 76 +++-- drivers/net/wireless/iwmc3200wifi/trace.c | 3 + drivers/net/wireless/iwmc3200wifi/trace.h | 283 +++++++++++++++ drivers/net/wireless/iwmc3200wifi/tx.c | 8 +- drivers/net/wireless/iwmc3200wifi/umac.h | 2 +- drivers/net/wireless/libertas/rx.c | 50 ++-- drivers/net/wireless/orinoco/Kconfig | 13 +- drivers/net/wireless/orinoco/hw.c | 7 + drivers/net/wireless/orinoco/orinoco_cs.c | 79 +++-- drivers/net/wireless/p54/main.c | 1 + drivers/net/wireless/rndis_wlan.c | 364 ++++++++++++++++++- drivers/net/wireless/rt2x00/rt2800pci.c | 2 + drivers/net/wireless/wl12xx/Kconfig | 24 ++ drivers/net/wireless/wl12xx/Makefile | 6 +- drivers/net/wireless/wl12xx/wl1251.h | 2 + drivers/net/wireless/wl12xx/wl1251_boot.c | 3 +- drivers/net/wireless/wl12xx/wl1251_io.h | 20 + drivers/net/wireless/wl12xx/wl1251_main.c | 4 +- drivers/net/wireless/wl12xx/wl1251_ps.c | 8 +- drivers/net/wireless/wl12xx/wl1251_sdio.c | 52 ++- drivers/net/wireless/wl12xx/wl1271.h | 33 ++- drivers/net/wireless/wl12xx/wl1271_acx.c | 8 +- drivers/net/wireless/wl12xx/wl1271_boot.c | 3 +- drivers/net/wireless/wl12xx/wl1271_cmd.c | 8 +- drivers/net/wireless/wl12xx/wl1271_cmd.h | 2 +- drivers/net/wireless/wl12xx/wl1271_event.c | 1 - drivers/net/wireless/wl12xx/wl1271_io.c | 87 ++---- drivers/net/wireless/wl12xx/wl1271_io.h | 122 ++++++- drivers/net/wireless/wl12xx/wl1271_main.c | 336 +++++-------------- drivers/net/wireless/wl12xx/wl1271_ps.c | 1 - drivers/net/wireless/wl12xx/wl1271_rx.c | 11 +- drivers/net/wireless/wl12xx/wl1271_sdio.c | 307 ++++++++++++++++ drivers/net/wireless/wl12xx/wl1271_spi.c | 267 ++++++++++++++- drivers/net/wireless/wl12xx/wl1271_spi.h | 96 ----- drivers/net/wireless/wl12xx/wl1271_testmode.c | 1 - drivers/net/wireless/wl12xx/wl1271_tx.c | 94 +++--- drivers/net/wireless/wl12xx/wl1271_tx.h | 4 +- drivers/ssb/driver_chipcommon.c | 1 + include/net/mac80211.h | 4 +- net/mac80211/Kconfig | 9 + net/mac80211/debugfs_sta.c | 2 - net/mac80211/ibss.c | 3 + net/mac80211/ieee80211_i.h | 1 + net/mac80211/iface.c | 116 ++++++- net/mac80211/rc80211_minstrel.c | 2 +- net/mac80211/rc80211_minstrel.h | 11 + net/mac80211/rc80211_minstrel_debugfs.c | 41 +-- net/mac80211/rx.c | 9 - net/mac80211/scan.c | 71 ++++- net/mac80211/sta_info.h | 2 - net/mac80211/status.c | 14 +- net/rfkill/core.c | 58 +++ 120 files changed, 3924 insertions(+), 2318 deletions(-) create mode 100644 Documentation/ABI/obsolete/sysfs-class-rfkill create mode 100644 Documentation/ABI/stable/sysfs-class-rfkill create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-ict.c create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn.h create mode 100644 drivers/net/wireless/iwmc3200wifi/trace.c create mode 100644 drivers/net/wireless/iwmc3200wifi/trace.h create mode 100644 drivers/net/wireless/wl12xx/wl1271_sdio.c delete mode 100644 drivers/net/wireless/wl12xx/wl1271_spi.h Merging mtd/master $ git merge mtd/master Resolved 'drivers/mtd/nand/sh_flctl.c' using previous resolution. Auto-merging MAINTAINERS Auto-merging arch/arm/mach-ep93xx/include/mach/ts72xx.h Auto-merging arch/arm/mach-ep93xx/ts72xx.c Auto-merging drivers/mtd/inftlcore.c Auto-merging drivers/mtd/nand/Kconfig Auto-merging drivers/mtd/nand/au1550nd.c Auto-merging drivers/mtd/nand/bcm_umi_nand.c Auto-merging drivers/mtd/nand/mxc_nand.c Auto-merging drivers/mtd/nand/omap2.c Auto-merging drivers/mtd/nand/sh_flctl.c CONFLICT (content): Merge conflict in drivers/mtd/nand/sh_flctl.c Removing drivers/mtd/nand/ts7250.c Auto-merging lib/idr.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 4157bdb] Merge remote branch 'mtd/master' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 6 + arch/arm/mach-ep93xx/include/mach/ts72xx.h | 19 - arch/arm/mach-ep93xx/ts72xx.c | 190 ++- drivers/mtd/Kconfig | 21 + drivers/mtd/Makefile | 1 + drivers/mtd/chips/cfi_cmdset_0001.c | 6 +- drivers/mtd/chips/cfi_cmdset_0002.c | 20 +- drivers/mtd/devices/pmc551.c | 4 +- drivers/mtd/ftl.c | 1 - drivers/mtd/inftlcore.c | 1 - drivers/mtd/inftlmount.c | 7 +- drivers/mtd/maps/bfin-async-flash.c | 16 +- drivers/mtd/maps/ceiva.c | 2 +- drivers/mtd/maps/ixp4xx.c | 4 +- drivers/mtd/maps/physmap_of.c | 2 +- drivers/mtd/mtd_blkdevs.c | 335 ++++-- drivers/mtd/mtdblock.c | 72 +- drivers/mtd/mtdblock_ro.c | 4 +- drivers/mtd/mtdchar.c | 12 +- drivers/mtd/mtdcore.c | 284 +++-- drivers/mtd/mtdcore.h | 7 +- drivers/mtd/mtdoops.c | 5 - drivers/mtd/mtdsuper.c | 18 +- drivers/mtd/nand/Kconfig | 35 +- drivers/mtd/nand/Makefile | 6 +- drivers/mtd/nand/alauda.c | 2 +- drivers/mtd/nand/atmel_nand.c | 2 +- drivers/mtd/nand/au1550nd.c | 12 +- drivers/mtd/nand/bcm_umi_nand.c | 2 +- drivers/mtd/nand/cafe_nand.c | 4 +- drivers/mtd/nand/davinci_nand.c | 6 +- drivers/mtd/nand/fsl_elbc_nand.c | 4 +- drivers/mtd/nand/fsl_upm.c | 4 +- drivers/mtd/nand/gpio.c | 12 +- drivers/mtd/nand/mpc5121_nfc.c | 916 ++++++++++++++ drivers/mtd/nand/mxc_nand.c | 22 +- drivers/mtd/nand/nand_base.c | 312 ++++- drivers/mtd/nand/nand_bbt.c | 26 +- drivers/mtd/nand/nand_bcm_umi.h | 71 +- drivers/mtd/nand/nandsim.c | 11 +- drivers/mtd/nand/nomadik_nand.c | 6 +- drivers/mtd/nand/{w90p910_nand.c => nuc900_nand.c} | 144 ++-- drivers/mtd/nand/omap2.c | 16 +- drivers/mtd/nand/orion_nand.c | 10 +- drivers/mtd/nand/pasemi_nand.c | 2 +- drivers/mtd/nand/r852.c | 1139 +++++++++++++++++ drivers/mtd/nand/r852.h | 163 +++ drivers/mtd/nand/s3c2410.c | 5 +- drivers/mtd/nand/sh_flctl.c | 2 +- drivers/mtd/nand/sm_common.c | 143 +++ drivers/mtd/nand/sm_common.h | 61 + drivers/mtd/nand/socrates_nand.c | 4 +- drivers/mtd/nand/tmio_nand.c | 14 +- drivers/mtd/nand/ts7250.c | 207 ---- drivers/mtd/nand/txx9ndfmc.c | 2 +- drivers/mtd/nftlcore.c | 1 - drivers/mtd/onenand/omap2.c | 4 +- drivers/mtd/rfd_ftl.c | 1 - drivers/mtd/sm_ftl.c | 1287 ++++++++++++++++++++ drivers/mtd/sm_ftl.h | 94 ++ drivers/mtd/ssfdc.c | 1 - fs/jffs2/fs.c | 10 +- fs/jffs2/nodelist.h | 8 +- include/linux/jffs2.h | 4 +- include/linux/mtd/blktrans.h | 15 +- include/linux/mtd/cfi.h | 14 +- include/linux/mtd/mtd.h | 8 +- include/linux/mtd/nand.h | 21 +- lib/idr.c | 2 +- 69 files changed, 4943 insertions(+), 929 deletions(-) create mode 100644 drivers/mtd/nand/mpc5121_nfc.c rename drivers/mtd/nand/{w90p910_nand.c => nuc900_nand.c} (63%) create mode 100644 drivers/mtd/nand/r852.c create mode 100644 drivers/mtd/nand/r852.h create mode 100644 drivers/mtd/nand/sm_common.c create mode 100644 drivers/mtd/nand/sm_common.h delete mode 100644 drivers/mtd/nand/ts7250.c create mode 100644 drivers/mtd/sm_ftl.c create mode 100644 drivers/mtd/sm_ftl.h Merging crypto/master $ git merge crypto/master Merge made by recursive. arch/x86/crypto/aesni-intel_asm.S | 115 +++++++++++++++++++++++++++++++ arch/x86/crypto/aesni-intel_glue.c | 130 ++++++++++++++++++++++++++++++++++-- arch/x86/include/asm/inst.h | 96 +++++++++++++++++++++++++- crypto/internal.h | 2 +- crypto/tcrypt.c | 7 ++ crypto/tcrypt.h | 29 ++++++++ 6 files changed, 368 insertions(+), 11 deletions(-) Merging sound/for-next $ git merge sound/for-next Merge made by recursive. sound/core/pcm_native.c | 30 ++++++++++++++++++++++-------- sound/pci/hda/hda_codec.c | 4 +++- sound/pci/hda/hda_intel.c | 8 ++++++++ sound/pci/hda/patch_realtek.c | 4 +++- 4 files changed, 36 insertions(+), 10 deletions(-) Merging cpufreq/next $ git merge cpufreq/next Already up-to-date. Merging quilt/rr $ git merge quilt/rr Resolved 'MAINTAINERS' using previous resolution. Resolved 'drivers/char/hvc_console.c' using previous resolution. Resolved 'drivers/char/hvc_console.h' using previous resolution. Resolved 'drivers/char/virtio_console.c' using previous resolution. Auto-merging MAINTAINERS CONFLICT (content): Merge conflict in MAINTAINERS Auto-merging drivers/block/virtio_blk.c Auto-merging drivers/char/hvc_beat.c Auto-merging drivers/char/hvc_console.c CONFLICT (content): Merge conflict in drivers/char/hvc_console.c Auto-merging drivers/char/hvc_console.h CONFLICT (content): Merge conflict in drivers/char/hvc_console.h Auto-merging drivers/char/hvc_iseries.c Auto-merging drivers/char/hvc_iucv.c Auto-merging drivers/char/virtio_console.c CONFLICT (content): Merge conflict in drivers/char/virtio_console.c Auto-merging drivers/virtio/virtio_pci.c Auto-merging include/linux/gfp.h Auto-merging include/linux/kernel.h Auto-merging include/linux/virtio.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 9f41a0d] Merge branch 'quilt/rr' $ git diff -M --stat --summary HEAD^.. Documentation/cpu-hotplug.txt | 2 +- include/linux/gfp.h | 2 +- include/linux/kernel.h | 82 +++++++++++++++++++++++++---------------- include/linux/kmemcheck.h | 2 +- include/linux/virtio_config.h | 5 ++- 5 files changed, 57 insertions(+), 36 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 block/blk-sysfs.c Auto-merging drivers/block/drbd/drbd_int.h Auto-merging fs/bio.c Merge made by recursive. Documentation/DocBook/tracepoint.tmpl | 13 +++ Documentation/block/biodoc.txt | 4 +- block/blk-settings.c | 11 +-- block/blk-sysfs.c | 25 +++++ drivers/block/DAC960.c | 1 - drivers/block/drbd/drbd_actlog.c | 17 +++- drivers/block/drbd/drbd_bitmap.c | 10 +- drivers/block/drbd/drbd_int.h | 12 ++- drivers/block/drbd/drbd_main.c | 20 ++++- drivers/block/drbd/drbd_nl.c | 44 +++++----- drivers/block/drbd/drbd_receiver.c | 34 ++++++- drivers/block/drbd/drbd_worker.c | 18 +++- drivers/block/paride/pcd.c | 4 +- drivers/block/paride/pf.c | 4 +- drivers/block/paride/pt.c | 4 +- drivers/block/virtio_blk.c | 5 +- fs/bio.c | 4 +- fs/fs-writeback.c | 133 +++++++++++++++------------ include/linux/blkdev.h | 24 ----- include/linux/drbd.h | 2 +- include/linux/drbd_nl.h | 3 +- include/linux/lcm.h | 8 ++ include/linux/writeback.h | 3 + include/trace/events/block.h | 164 +++++++++++++++++++++++++++++++++ lib/Makefile | 2 +- lib/lcm.c | 15 +++ 26 files changed, 427 insertions(+), 157 deletions(-) create mode 100644 include/linux/lcm.h create mode 100644 lib/lcm.c Merging quilt/device-mapper $ git merge quilt/device-mapper Merge made by recursive. Documentation/device-mapper/dm-flakey.txt | 18 +++ drivers/md/Kconfig | 6 + drivers/md/Makefile | 1 + drivers/md/dm-flakey.c | 214 +++++++++++++++++++++++++++++ 4 files changed, 239 insertions(+), 0 deletions(-) create mode 100644 Documentation/device-mapper/dm-flakey.txt create mode 100644 drivers/md/dm-flakey.c 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 Merge made by recursive. drivers/pcmcia/i82092.c | 1 + drivers/pcmcia/i82365.h | 1 + drivers/pcmcia/pcmcia_resource.c | 8 ------ drivers/pcmcia/pd6729.c | 1 + drivers/pcmcia/ti113x.h | 37 ++++++++++++++++++++++++++++- drivers/pcmcia/vrc4171_card.c | 5 ++- drivers/pcmcia/yenta_socket.c | 46 +++++++++++++++++++++++-------------- drivers/scsi/pcmcia/nsp_cs.c | 1 + 8 files changed, 70 insertions(+), 30 deletions(-) Merging battery/master $ git merge battery/master Already up-to-date. Merging leds/for-mm $ git merge leds/for-mm Merge made by recursive. drivers/leds/Kconfig | 80 ++++++++++-------- drivers/leds/Makefile | 1 + drivers/leds/dell-led.c | 200 ++++++++++++++++++++++++++++++++++++++++++++ drivers/leds/led-class.c | 2 +- drivers/leds/leds-ss4200.c | 2 +- 5 files changed, 248 insertions(+), 37 deletions(-) create mode 100644 drivers/leds/dell-led.c Merging backlight/for-mm $ git merge backlight/for-mm Auto-merging drivers/acpi/video.c Auto-merging drivers/platform/x86/panasonic-laptop.c Auto-merging drivers/platform/x86/sony-laptop.c Auto-merging drivers/platform/x86/thinkpad_acpi.c Auto-merging drivers/platform/x86/toshiba_acpi.c Auto-merging drivers/video/bf54x-lq043fb.c Auto-merging drivers/video/bfin-t350mcqb-fb.c Merge made by recursive. drivers/acpi/video.c | 9 +- drivers/gpu/drm/nouveau/nouveau_backlight.c | 12 +- drivers/macintosh/via-pmu-backlight.c | 7 +- drivers/platform/x86/acer-wmi.c | 7 +- drivers/platform/x86/asus-laptop.c | 7 +- drivers/platform/x86/asus_acpi.c | 7 +- drivers/platform/x86/classmate-laptop.c | 8 +- drivers/platform/x86/compal-laptop.c | 11 +- drivers/platform/x86/dell-laptop.c | 13 +- drivers/platform/x86/eeepc-laptop.c | 8 +- drivers/platform/x86/fujitsu-laptop.c | 14 +- drivers/platform/x86/msi-laptop.c | 7 +- drivers/platform/x86/msi-wmi.c | 9 +- drivers/platform/x86/panasonic-laptop.c | 24 +- drivers/platform/x86/sony-laptop.c | 8 +- drivers/platform/x86/thinkpad_acpi.c | 12 +- drivers/platform/x86/toshiba_acpi.c | 10 +- drivers/staging/samsung-laptop/samsung-laptop.c | 7 +- drivers/usb/misc/appledisplay.c | 7 +- drivers/video/atmel_lcdfb.c | 8 +- drivers/video/aty/aty128fb.c | 7 +- drivers/video/aty/atyfb_base.c | 7 +- drivers/video/aty/radeon_backlight.c | 7 +- drivers/video/backlight/88pm860x_bl.c | 6 +- drivers/video/backlight/Kconfig | 7 + drivers/video/backlight/Makefile | 1 + drivers/video/backlight/adp5520_bl.c | 11 +- drivers/video/backlight/adx_bl.c | 10 +- drivers/video/backlight/atmel-pwm-bl.c | 8 +- drivers/video/backlight/backlight.c | 10 +- drivers/video/backlight/corgi_lcd.c | 8 +- drivers/video/backlight/cr_bllcd.c | 8 +- drivers/video/backlight/da903x_bl.c | 7 +- drivers/video/backlight/generic_bl.c | 8 +- drivers/video/backlight/hp680_bl.c | 8 +- drivers/video/backlight/jornada720_bl.c | 7 +- drivers/video/backlight/kb3886_bl.c | 8 +- drivers/video/backlight/l4f00242t03.c | 257 +++++++++++++++++++++++ drivers/video/backlight/locomolcd.c | 8 +- drivers/video/backlight/max8925_bl.c | 6 +- drivers/video/backlight/mbp_nvidia_bl.c | 10 +- drivers/video/backlight/omap1_bl.c | 7 +- drivers/video/backlight/progear_bl.c | 23 ++- drivers/video/backlight/pwm_bl.c | 8 +- drivers/video/backlight/tosa_bl.c | 8 +- drivers/video/backlight/wm831x_bl.c | 7 +- drivers/video/bf54x-lq043fb.c | 9 +- drivers/video/bfin-t350mcqb-fb.c | 9 +- drivers/video/nvidia/nv_backlight.c | 7 +- drivers/video/omap2/displays/panel-taal.c | 15 +- drivers/video/riva/fbdev.c | 7 +- include/linux/backlight.h | 11 +- include/linux/spi/l4f00242t03.h | 31 +++ 53 files changed, 585 insertions(+), 161 deletions(-) create mode 100644 drivers/video/backlight/l4f00242t03.c create mode 100644 include/linux/spi/l4f00242t03.h Merging kgdb/kgdb-next $ git merge kgdb/kgdb-next Auto-merging Documentation/kernel-parameters.txt Auto-merging MAINTAINERS Auto-merging arch/arm/kernel/kgdb.c Auto-merging arch/blackfin/kernel/kgdb.c Auto-merging drivers/gpu/drm/drm_fb_helper.c Auto-merging drivers/gpu/drm/i915/intel_display.c Auto-merging drivers/serial/8250.c Auto-merging drivers/serial/sh-sci.c Auto-merging drivers/video/console/fbcon.c Auto-merging include/linux/serial_core.h Auto-merging init/main.c Auto-merging kernel/Makefile Removing kernel/kgdb.c Auto-merging kernel/module.c Auto-merging kernel/printk.c Auto-merging kernel/sched.c Auto-merging kernel/signal.c Merge made by recursive. Documentation/DocBook/kgdb.tmpl | 773 +++++++--- Documentation/kernel-parameters.txt | 34 +- MAINTAINERS | 6 +- arch/arm/include/asm/kmap_types.h | 1 + arch/arm/kernel/kgdb.c | 5 + arch/blackfin/kernel/kgdb.c | 5 + arch/mips/include/asm/kgdb.h | 2 + arch/mips/kernel/kgdb.c | 27 +- arch/mips/kernel/traps.c | 13 + arch/powerpc/include/asm/kmap_types.h | 1 + arch/powerpc/kernel/kgdb.c | 11 +- arch/powerpc/kernel/traps.c | 7 +- arch/sh/kernel/kgdb.c | 14 +- arch/sparc/kernel/kgdb_32.c | 6 + arch/sparc/kernel/kgdb_64.c | 6 + arch/x86/include/asm/kgdb.h | 3 + arch/x86/include/asm/processor.h | 2 + arch/x86/kernel/cpu/common.c | 29 +- arch/x86/kernel/early_printk.c | 8 + arch/x86/kernel/kgdb.c | 103 +- arch/x86/kernel/setup.c | 1 + arch/x86/kernel/traps.c | 20 +- drivers/char/keyboard.c | 68 +- drivers/gpu/drm/drm_fb_helper.c | 79 + drivers/gpu/drm/i915/intel_display.c | 97 ++ drivers/misc/kgdbts.c | 6 + drivers/serial/8250.c | 4 +- drivers/serial/amba-pl011.c | 6 +- drivers/serial/kgdboc.c | 134 ++- drivers/serial/sh-sci.c | 6 +- drivers/serial/sunzilog.c | 50 + drivers/usb/early/ehci-dbgp.c | 120 ++- drivers/video/console/fbcon.c | 7 + include/asm-generic/kmap_types.h | 3 +- include/drm/drm_crtc_helper.h | 2 + include/drm/drm_fb_helper.h | 4 + include/linux/kbd_kern.h | 1 + include/linux/kdb.h | 117 ++ include/linux/kgdb.h | 83 +- include/linux/serial_core.h | 1 + init/main.c | 2 + kernel/Makefile | 2 +- kernel/debug/Makefile | 8 + kernel/debug/debug_core.c | 1006 ++++++++++++ kernel/debug/debug_core.h | 81 + kernel/debug/gdbstub.c | 1022 ++++++++++++ kernel/debug/kdb/.gitignore | 1 + kernel/debug/kdb/Makefile | 25 + kernel/debug/kdb/kdb_bp.c | 564 +++++++ kernel/debug/kdb/kdb_bt.c | 210 +++ kernel/debug/kdb/kdb_cmds | 35 + kernel/debug/kdb/kdb_debugger.c | 169 ++ kernel/debug/kdb/kdb_io.c | 826 ++++++++++ kernel/debug/kdb/kdb_keyboard.c | 212 +++ kernel/debug/kdb/kdb_main.c | 2852 +++++++++++++++++++++++++++++++++ kernel/debug/kdb/kdb_private.h | 300 ++++ kernel/debug/kdb/kdb_support.c | 926 +++++++++++ kernel/debug/kms_hooks.c | 62 + kernel/kallsyms.c | 21 + kernel/kgdb.c | 1763 -------------------- kernel/module.c | 4 + kernel/printk.c | 25 + kernel/sched.c | 7 +- kernel/signal.c | 40 + lib/Kconfig.kgdb | 24 +- 65 files changed, 9993 insertions(+), 2059 deletions(-) create mode 100644 include/linux/kdb.h create mode 100644 kernel/debug/Makefile create mode 100644 kernel/debug/debug_core.c create mode 100644 kernel/debug/debug_core.h create mode 100644 kernel/debug/gdbstub.c create mode 100644 kernel/debug/kdb/.gitignore create mode 100644 kernel/debug/kdb/Makefile create mode 100644 kernel/debug/kdb/kdb_bp.c create mode 100644 kernel/debug/kdb/kdb_bt.c create mode 100644 kernel/debug/kdb/kdb_cmds create mode 100644 kernel/debug/kdb/kdb_debugger.c create mode 100644 kernel/debug/kdb/kdb_io.c create mode 100644 kernel/debug/kdb/kdb_keyboard.c create mode 100644 kernel/debug/kdb/kdb_main.c create mode 100644 kernel/debug/kdb/kdb_private.h create mode 100644 kernel/debug/kdb/kdb_support.c create mode 100644 kernel/debug/kms_hooks.c delete mode 100644 kernel/kgdb.c Merging slab/for-next $ git merge slab/for-next Merge made by recursive. mm/slab.c | 202 +++++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 170 insertions(+), 32 deletions(-) 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 Auto-merging drivers/mfd/sm501.c Merge made by recursive. 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 Merge made by recursive. drivers/regulator/lp3971.c | 5 +++++ drivers/regulator/max8925-regulator.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) Merging security-testing/next $ git merge security-testing/next Auto-merging security/tomoyo/common.c Merge made by recursive. scripts/selinux/genheaders/genheaders.c | 2 +- security/integrity/ima/ima_iint.c | 6 +++--- security/integrity/ima/ima_main.c | 2 +- security/keys/keyring.c | 13 +++++-------- security/security.c | 2 +- security/selinux/hooks.c | 2 +- security/selinux/include/initial_sid_to_string.h | 2 +- security/selinux/netlink.c | 1 - security/selinux/nlmsgtab.c | 1 - security/selinux/ss/avtab.h | 2 +- security/selinux/ss/policydb.c | 2 +- security/selinux/ss/symtab.c | 1 - security/tomoyo/common.c | 10 +++------- 13 files changed, 18 insertions(+), 28 deletions(-) Merging lblnet/master $ git merge lblnet/master Already up-to-date. Merging agp/agp-next $ git merge agp/agp-next Merge made by recursive. Merging uwb/for-upstream $ git merge uwb/for-upstream Merge made by recursive. drivers/uwb/hwa-rc.c | 2 +- drivers/uwb/i1480/dfu/usb.c | 12 +++-- drivers/uwb/wlp/messages.c | 106 +++++++++++++++++++++++++------------------ 3 files changed, 69 insertions(+), 51 deletions(-) Merging watchdog/master $ git merge watchdog/master Already up-to-date. Merging bdev/master $ git merge bdev/master Already up-to-date. Merging dwmw2-iommu/master $ git merge dwmw2-iommu/master Merge made by recursive. drivers/pci/dmar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Merging cputime/cputime $ git merge cputime/cputime Already up-to-date. Merging osd/linux-next $ git merge osd/linux-next Already up-to-date. Merging jc_docs/docs-next $ git merge jc_docs/docs-next Already up-to-date. Merging nommu/master $ git merge nommu/master Already up-to-date. Merging trivial/for-next $ git merge trivial/for-next Auto-merging scripts/kconfig/util.c Merge made by recursive. Documentation/filesystems/proc.txt | 2 +- drivers/char/bsr.c | 2 +- fs/omfs/inode.c | 1 - include/linux/kobj_map.h | 9 +++++++++ include/linux/kref.h | 2 +- mm/memcontrol.c | 2 +- scripts/kconfig/util.c | 2 +- 7 files changed, 14 insertions(+), 6 deletions(-) Merging audit/for-next $ git merge audit/for-next Already up-to-date. Merging quilt/aoe $ git merge quilt/aoe Auto-merging drivers/block/aoe/aoecmd.c 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 Merge made by recursive. include/linux/pm_wakeup.h | 38 ++++++++++++++++++++++++-------------- kernel/power/process.c | 3 +-- 2 files changed, 25 insertions(+), 16 deletions(-) Merging bluetooth/master $ git merge bluetooth/master Already up-to-date. Merging fsnotify/for-next $ git merge fsnotify/for-next Resolved 'fs/notify/inotify/inotify_user.c' using previous resolution. Resolved 'include/linux/fsnotify.h' using previous resolution. Resolved 'kernel/audit_tree.c' using previous resolution. Resolved 'kernel/sysctl.c' using previous resolution. Auto-merging Documentation/feature-removal-schedule.txt Auto-merging arch/x86/ia32/ia32entry.S Auto-merging arch/x86/ia32/sys_ia32.c Auto-merging arch/x86/include/asm/sys_ia32.h Auto-merging arch/x86/include/asm/unistd_32.h Auto-merging arch/x86/include/asm/unistd_64.h Auto-merging arch/x86/kernel/syscall_table_32.S Auto-merging fs/compat.c Auto-merging fs/exec.c Auto-merging fs/inode.c Auto-merging fs/namei.c Auto-merging fs/namespace.c Auto-merging fs/nfsd/vfs.c Removing fs/notify/inotify/inotify.c Auto-merging fs/notify/inotify/inotify_user.c CONFLICT (content): Merge conflict in fs/notify/inotify/inotify_user.c Auto-merging fs/open.c Auto-merging include/linux/fs.h Auto-merging include/linux/fsnotify.h CONFLICT (content): Merge conflict in include/linux/fsnotify.h Auto-merging include/linux/mount.h Auto-merging include/linux/security.h Auto-merging include/linux/syscalls.h Auto-merging init/Kconfig Auto-merging kernel/Makefile Auto-merging kernel/audit.c Auto-merging kernel/audit_tree.c CONFLICT (content): Merge conflict in kernel/audit_tree.c Auto-merging kernel/auditsc.c Auto-merging kernel/sys_ni.c Auto-merging kernel/sysctl.c CONFLICT (content): Merge conflict in kernel/sysctl.c Auto-merging security/security.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 9a82af9] Merge remote branch 'fsnotify/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/feature-removal-schedule.txt | 8 - arch/x86/ia32/ia32entry.S | 2 + arch/x86/ia32/sys_ia32.c | 9 + arch/x86/include/asm/sys_ia32.h | 3 + arch/x86/include/asm/unistd_32.h | 4 +- arch/x86/include/asm/unistd_64.h | 4 + arch/x86/kernel/syscall_table_32.S | 2 + fs/compat.c | 5 +- fs/exec.c | 4 +- fs/inode.c | 8 +- fs/namei.c | 2 +- fs/namespace.c | 5 + fs/nfsd/vfs.c | 4 +- fs/notify/Kconfig | 1 + fs/notify/Makefile | 4 +- fs/notify/dnotify/dnotify.c | 198 +++---- fs/notify/fanotify/Kconfig | 26 + fs/notify/fanotify/Makefile | 1 + fs/notify/fanotify/fanotify.c | 255 ++++++++ fs/notify/fanotify/fanotify_user.c | 776 +++++++++++++++++++++++ fs/notify/fsnotify.c | 141 ++++- fs/notify/fsnotify.h | 33 +- fs/notify/group.c | 178 +++--- fs/notify/inode_mark.c | 309 +++------- fs/notify/inotify/Kconfig | 15 - fs/notify/inotify/Makefile | 1 - fs/notify/inotify/inotify.c | 933 ---------------------------- fs/notify/inotify/inotify.h | 7 +- fs/notify/inotify/inotify_fsnotify.c | 114 +++- fs/notify/inotify/inotify_user.c | 305 ++++++---- fs/notify/mark.c | 325 ++++++++++ fs/notify/notification.c | 180 +++--- fs/notify/vfsmount_mark.c | 176 ++++++ fs/open.c | 3 +- fs/read_write.c | 8 +- include/asm-generic/fcntl.h | 8 + include/linux/Kbuild | 1 + include/linux/dnotify.h | 1 + include/linux/fanotify.h | 105 ++++ include/linux/fs.h | 16 +- include/linux/fsnotify.h | 164 +++--- include/linux/fsnotify_backend.h | 169 ++++-- include/linux/inotify.h | 175 +----- include/linux/mount.h | 6 +- include/linux/security.h | 1 + include/linux/syscalls.h | 5 + init/Kconfig | 10 +- kernel/Makefile | 5 +- kernel/audit.c | 1 - kernel/audit.h | 26 +- kernel/audit_tree.c | 232 ++++--- kernel/audit_watch.c | 295 +++++---- kernel/auditfilter.c | 39 +- kernel/auditsc.c | 10 +- kernel/sys_ni.c | 4 + kernel/sysctl.c | 8 +- security/security.c | 16 +- 57 files changed, 3097 insertions(+), 2249 deletions(-) create mode 100644 fs/notify/fanotify/Kconfig create mode 100644 fs/notify/fanotify/Makefile create mode 100644 fs/notify/fanotify/fanotify.c create mode 100644 fs/notify/fanotify/fanotify_user.c delete mode 100644 fs/notify/inotify/inotify.c create mode 100644 fs/notify/mark.c create mode 100644 fs/notify/vfsmount_mark.c create mode 100644 include/linux/fanotify.h Merging irda/for-next $ git merge irda/for-next Resolved 'drivers/net/irda/irda-usb.c' using previous resolution. Auto-merging drivers/net/irda/irda-usb.c CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 27be4eb] Merge remote branch 'irda/for-next' $ git diff -M --stat --summary HEAD^.. drivers/net/irda/irda-usb.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) Merging hwlat/for-linus $ git merge hwlat/for-linus Resolved 'MAINTAINERS' using previous resolution. Resolved 'drivers/misc/Makefile' using previous resolution. Auto-merging MAINTAINERS CONFLICT (content): Merge conflict in MAINTAINERS Auto-merging drivers/misc/Kconfig Auto-merging drivers/misc/Makefile CONFLICT (content): Merge conflict in drivers/misc/Makefile Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 216744f] Merge remote branch 'hwlat/for-linus' $ git diff -M --stat --summary HEAD^.. 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/for-jens $ git merge drbd/for-jens Already up-to-date. Merging catalin/for-next $ git merge catalin/for-next Already up-to-date. Merging alacrity/linux-next $ git merge alacrity/linux-next Recorded preimage for 'include/linux/Kbuild' Resolved 'lib/Kconfig' using previous resolution. Auto-merging MAINTAINERS Auto-merging arch/x86/Kconfig Auto-merging drivers/Makefile Auto-merging drivers/net/Kconfig Auto-merging drivers/net/Makefile Auto-merging include/linux/Kbuild CONFLICT (content): Merge conflict in include/linux/Kbuild Auto-merging lib/Kconfig CONFLICT (content): Merge conflict in lib/Kconfig Auto-merging lib/Makefile Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'include/linux/Kbuild'. [master 1672efc] Merge remote branch 'alacrity/linux-next' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 25 + arch/x86/Kconfig | 2 + drivers/Makefile | 1 + drivers/net/Kconfig | 14 + drivers/net/Makefile | 1 + drivers/net/vbus-enet.c | 1560 +++++++++++++++++++++++++++++++++++++++++++ drivers/vbus/Kconfig | 25 + drivers/vbus/Makefile | 6 + drivers/vbus/bus-proxy.c | 247 +++++++ drivers/vbus/pci-bridge.c | 1015 ++++++++++++++++++++++++++++ include/linux/Kbuild | 4 + include/linux/ioq.h | 414 ++++++++++++ include/linux/shm_signal.h | 189 ++++++ include/linux/vbus_driver.h | 83 +++ include/linux/vbus_pci.h | 145 ++++ include/linux/venet.h | 133 ++++ lib/Kconfig | 21 + lib/Makefile | 2 + lib/ioq.c | 304 +++++++++ lib/shm_signal.c | 196 ++++++ 20 files changed, 4387 insertions(+), 0 deletions(-) create mode 100644 drivers/net/vbus-enet.c create mode 100644 drivers/vbus/Kconfig create mode 100644 drivers/vbus/Makefile create mode 100644 drivers/vbus/bus-proxy.c create mode 100644 drivers/vbus/pci-bridge.c create mode 100644 include/linux/ioq.h create mode 100644 include/linux/shm_signal.h create mode 100644 include/linux/vbus_driver.h create mode 100644 include/linux/vbus_pci.h create mode 100644 include/linux/venet.h create mode 100644 lib/ioq.c create mode 100644 lib/shm_signal.c Merging i7core_edac/linux_next $ git merge i7core_edac/linux_next Auto-merging Documentation/edac.txt Auto-merging arch/x86/include/asm/pci_x86.h Auto-merging arch/x86/kernel/cpu/mcheck/mce.c Auto-merging arch/x86/pci/legacy.c Auto-merging drivers/edac/edac_core.h Auto-merging drivers/edac/edac_mc_sysfs.c Auto-merging include/linux/pci.h Auto-merging include/linux/pci_ids.h Merge made by recursive. Documentation/edac.txt | 153 +++ arch/x86/include/asm/pci_x86.h | 2 + arch/x86/kernel/cpu/mcheck/mce.c | 10 + arch/x86/pci/legacy.c | 42 +- drivers/edac/Kconfig | 13 + drivers/edac/Makefile | 2 + drivers/edac/edac_core.h | 23 +- drivers/edac/edac_mc_sysfs.c | 175 +++- drivers/edac/edac_mce.c | 61 ++ drivers/edac/i7core_edac.c | 1977 ++++++++++++++++++++++++++++++++++++++ include/linux/edac_mce.h | 31 + include/linux/pci.h | 1 + include/linux/pci_ids.h | 19 + 13 files changed, 2465 insertions(+), 44 deletions(-) create mode 100644 drivers/edac/edac_mce.c create mode 100644 drivers/edac/i7core_edac.c create mode 100644 include/linux/edac_mce.h Merging devicetree/next-devicetree $ git merge devicetree/next-devicetree Already up-to-date. Merging spi/next-spi $ git merge spi/next-spi Already up-to-date. Merging limits/writable_limits $ git merge limits/writable_limits Resolved 'arch/x86/ia32/ia32entry.S' using previous resolution. Resolved 'arch/x86/include/asm/unistd_32.h' using previous resolution. Resolved 'arch/x86/include/asm/unistd_64.h' using previous resolution. Resolved 'arch/x86/kernel/syscall_table_32.S' using previous resolution. Auto-merging Documentation/filesystems/proc.txt Auto-merging arch/x86/ia32/ia32entry.S CONFLICT (content): Merge conflict in arch/x86/ia32/ia32entry.S Auto-merging arch/x86/include/asm/unistd_32.h CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_32.h Auto-merging arch/x86/include/asm/unistd_64.h CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_64.h Auto-merging arch/x86/kernel/syscall_table_32.S CONFLICT (content): Merge conflict in arch/x86/kernel/syscall_table_32.S Auto-merging fs/proc/base.c Auto-merging include/linux/security.h Auto-merging include/linux/syscalls.h Auto-merging kernel/posix-cpu-timers.c Auto-merging kernel/sys.c Auto-merging security/capability.c Auto-merging security/security.c Auto-merging security/selinux/hooks.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 013e134] Merge remote branch 'limits/writable_limits' $ git diff -M --stat --summary HEAD^.. Documentation/filesystems/proc.txt | 11 +++ arch/x86/ia32/ia32entry.S | 2 + arch/x86/include/asm/unistd_32.h | 4 +- arch/x86/include/asm/unistd_64.h | 4 + arch/x86/kernel/syscall_table_32.S | 2 + fs/proc/base.c | 101 ++++++++++++++++++++++-- include/asm-generic/unistd.h | 6 +- include/linux/posix-timers.h | 2 +- include/linux/resource.h | 2 + include/linux/security.h | 9 ++- include/linux/syscalls.h | 4 + kernel/compat.c | 98 +++++++++++++++++------- kernel/posix-cpu-timers.c | 10 +- kernel/sys.c | 151 ++++++++++++++++++++++++++++++------ security/capability.c | 3 +- security/security.c | 5 +- security/selinux/hooks.c | 10 ++- 17 files changed, 346 insertions(+), 78 deletions(-) Merging omap_dss2/for-next $ git merge omap_dss2/for-next Merge made by recursive. drivers/video/omap2/displays/panel-generic.c | 22 ++++++++++++++++++++++ drivers/video/omap2/dss/dss.c | 3 +++ drivers/video/omap2/vram.c | 11 ++++++----- 3 files changed, 31 insertions(+), 5 deletions(-) Merging tip/auto-latest $ git merge tip/auto-latest Auto-merging include/linux/syscalls.h Auto-merging kernel/posix-cpu-timers.c Merge made by recursive. arch/powerpc/kernel/perf_event.c | 21 ++- arch/sh/kernel/perf_event.c | 20 ++- arch/x86/kernel/cpu/perf_event.c | 182 +++++++++++--------- arch/x86/kernel/cpu/perf_event_amd.c | 62 +++---- arch/x86/kernel/cpu/perf_event_intel.c | 57 +++--- arch/x86/kernel/cpu/perf_event_p6.c | 10 +- arch/x86/kernel/dumpstack.h | 15 ++ arch/x86/kernel/dumpstack_64.c | 4 +- include/linux/clockchips.h | 2 + include/linux/ftrace_event.h | 23 ++- include/linux/perf_event.h | 59 ++++++- include/linux/syscalls.h | 24 ++-- include/trace/ftrace.h | 44 +++-- include/trace/syscall.h | 8 +- kernel/irq/chip.c | 31 +++- kernel/irq/manage.c | 18 ++ kernel/kprobes.c | 3 +- kernel/lockdep.c | 9 +- kernel/perf_event.c | 82 ++++----- kernel/posix-cpu-timers.c | 10 +- kernel/time/tick-oneshot.c | 52 +++++-- kernel/time/timer_list.c | 3 +- kernel/timer.c | 1 + kernel/trace/Makefile | 2 +- .../{trace_event_profile.c => trace_event_perf.c} | 48 +++--- kernel/trace/trace_events.c | 2 +- kernel/trace/trace_kprobe.c | 29 ++-- kernel/trace/trace_syscalls.c | 72 ++++---- tools/perf/Documentation/Makefile | 4 +- tools/perf/Makefile | 6 +- tools/perf/builtin-annotate.c | 6 +- tools/perf/builtin-diff.c | 13 +- tools/perf/builtin-probe.c | 1 - tools/perf/builtin-record.c | 13 +- tools/perf/builtin-report.c | 112 +++++++++++-- tools/perf/builtin-stat.c | 10 +- tools/perf/builtin-top.c | 9 +- tools/perf/util/cpumap.c | 59 +++++++ tools/perf/util/cpumap.h | 7 + tools/perf/util/event.h | 9 + tools/perf/util/hist.c | 50 +++--- tools/perf/util/hist.h | 12 +- tools/perf/util/probe-event.c | 2 +- tools/perf/util/probe-finder.c | 5 +- tools/perf/util/session.c | 1 + tools/perf/util/session.h | 1 + tools/perf/util/thread.c | 41 ++++- tools/perf/util/thread.h | 3 + 48 files changed, 832 insertions(+), 425 deletions(-) rename kernel/trace/{trace_event_profile.c => trace_event_perf.c} (69%) create mode 100644 tools/perf/util/cpumap.c create mode 100644 tools/perf/util/cpumap.h $ git reset --hard HEAD^ HEAD is now at c269410 Merge remote branch 'omap_dss2/for-next' Merging refs/next/20100311/tip $ git merge refs/next/20100311/tip Auto-merging arch/x86/Kconfig Auto-merging arch/x86/kernel/traps.c Auto-merging include/linux/rbtree.h Auto-merging init/Kconfig Auto-merging kernel/Makefile Auto-merging kernel/sysctl.c Auto-merging lib/Kconfig.debug Merge made by recursive. Documentation/rbtree.txt | 58 ++++++++ arch/mips/include/asm/i8253.h | 2 +- arch/mips/kernel/i8253.c | 14 +- arch/x86/Kconfig | 1 + arch/x86/include/asm/i8253.h | 2 +- arch/x86/include/asm/nmi.h | 2 + arch/x86/kernel/apic/Makefile | 7 +- arch/x86/kernel/apic/hw_nmi.c | 127 +++++++++++++++++ arch/x86/kernel/apic/nmi.c | 7 - arch/x86/kernel/apm_32.c | 4 +- arch/x86/kernel/i8253.c | 14 +- arch/x86/kernel/traps.c | 7 + arch/x86/mm/Makefile | 1 + arch/x86/mm/pat.c | 231 +++---------------------------- arch/x86/mm/pat_internal.h | 46 ++++++ arch/x86/mm/pat_rbtree.c | 273 +++++++++++++++++++++++++++++++++++++ drivers/block/hd.c | 4 +- drivers/input/gameport/gameport.c | 4 +- drivers/input/joystick/analog.c | 4 +- drivers/input/misc/pcspkr.c | 6 +- include/linux/nmi.h | 13 ++ include/linux/rbtree.h | 5 +- init/Kconfig | 5 + kernel/Makefile | 1 + kernel/nmi_watchdog.c | 259 +++++++++++++++++++++++++++++++++++ kernel/sysctl.c | 15 ++- lib/Kconfig.debug | 12 ++ lib/rbtree.c | 48 ++++++- sound/drivers/pcsp/pcsp.h | 2 +- sound/drivers/pcsp/pcsp_input.c | 4 +- sound/drivers/pcsp/pcsp_lib.c | 12 +- 31 files changed, 928 insertions(+), 262 deletions(-) create mode 100644 arch/x86/kernel/apic/hw_nmi.c create mode 100644 arch/x86/mm/pat_internal.h create mode 100644 arch/x86/mm/pat_rbtree.c create mode 100644 kernel/nmi_watchdog.c Merging edac-amd/for-next $ git merge edac-amd/for-next Merge made by recursive. drivers/edac/edac_mce_amd.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) Merging oprofile/for-next $ git merge oprofile/for-next Already up-to-date. Merging percpu/for-next $ git merge percpu/for-next Already up-to-date. Merging workqueues/for-next $ git merge workqueues/for-next Merge made by recursive. kernel/workqueue.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) Merging sfi/sfi-test $ git merge sfi/sfi-test Already up-to-date. Merging asm-generic/next $ git merge asm-generic/next Already up-to-date. Merging hwpoison/hwpoison $ git merge hwpoison/hwpoison Already up-to-date. Merging sysctl/master $ git merge sysctl/master Already up-to-date. Merging quilt/driver-core $ git merge quilt/driver-core Merge made by recursive. drivers/base/core.c | 3 +-- drivers/net/mlx4/mlx4.h | 1 + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 1 + drivers/usb/core/usb.c | 2 +- include/linux/device.h | 9 ++++----- 5 files changed, 8 insertions(+), 8 deletions(-) Merging quilt/tty $ git merge quilt/tty Already up-to-date. Merging quilt/usb $ git merge quilt/usb Already up-to-date. Merging quilt/staging $ git merge quilt/staging Already up-to-date. Merging scsi-post-merge/master $ git merge scsi-post-merge/master Already up-to-date.