$ git checkout master Already on "master" $ git reset --hard stable HEAD is now at c597650 Linux 2.6.29-rc1 Merging origin/master $ git merge origin/master Updating c597650..ae04d14 Fast forward arch/powerpc/platforms/cell/cbe_cpufreq.c | 2 +- arch/powerpc/platforms/cell/cpufreq_spudemand.c | 4 ++-- arch/powerpc/platforms/pasemi/cpufreq.c | 2 +- arch/powerpc/platforms/powermac/cpufreq_64.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) $ git cherry-pick 9d0793370987b98708d2f75ee3bba7c1008d8512 Finished one cherry-pick. Created commit 69c55d3: sparc64: Fix cpumask related build failure 1 files changed, 4 insertions(+), 0 deletions(-) Merging arm-current/master $ git merge arm-current/master Merge made by recursive. drivers/mfd/twl4030-core.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) Merging m68k-current/for-linus $ git merge m68k-current/for-linus Removed drivers/video/c2p.c Merge made by recursive. arch/m68k/amiga/amiints.c | 12 ++- arch/m68k/amiga/cia.c | 4 +- arch/m68k/amiga/config.c | 3 +- arch/m68k/apollo/config.c | 7 +- arch/m68k/atari/atakeyb.c | 10 +- arch/m68k/atari/stdma.c | 5 +- arch/m68k/atari/time.c | 5 +- arch/m68k/bvme6000/config.c | 1 - arch/m68k/hp300/time.c | 3 +- arch/m68k/kernel/.gitignore | 1 + arch/m68k/kernel/entry.S | 2 +- arch/m68k/kernel/setup.c | 11 +- arch/m68k/kernel/signal.c | 15 +++ arch/m68k/kernel/vmlinux-sun3.lds | 1 + arch/m68k/mac/baboon.c | 3 +- arch/m68k/mac/config.c | 12 -- arch/m68k/mac/debug.c | 1 - arch/m68k/mac/iop.c | 10 +- arch/m68k/mac/macints.c | 15 +-- arch/m68k/mac/misc.c | 1 - arch/m68k/mac/oss.c | 25 +++-- arch/m68k/mac/psc.c | 12 ++- arch/m68k/mac/via.c | 35 +++-- arch/m68k/math-emu/fp_log.c | 1 - arch/m68k/mm/init.c | 4 +- arch/m68k/mm/motorola.c | 7 +- arch/m68k/mvme147/config.c | 6 +- arch/m68k/mvme16x/config.c | 1 - arch/m68k/q40/config.c | 3 - arch/m68k/sun3/config.c | 8 +- arch/m68k/sun3/mmu_emu.c | 1 - arch/m68k/sun3/sun3ints.c | 9 +- arch/m68k/sun3x/config.c | 1 - drivers/block/amiflop.c | 40 +++---- drivers/char/amiserial.c | 36 +++++- drivers/char/ser_a2232.c | 12 ++- drivers/char/vme_scc.c | 166 ++++++++++++++++++++----- drivers/dio/dio-sysfs.c | 19 ++- drivers/dio/dio.c | 18 +++- drivers/video/Makefile | 4 +- drivers/video/amifb.c | 6 +- drivers/video/atafb.c | 112 +++++++---------- drivers/video/c2p.c | 232 ----------------------------------- drivers/video/c2p.h | 11 +- drivers/video/c2p_core.h | 153 +++++++++++++++++++++++ drivers/video/c2p_iplan2.c | 153 +++++++++++++++++++++++ drivers/video/c2p_planar.c | 156 +++++++++++++++++++++++ drivers/video/console/fbcon.c | 38 ------ drivers/zorro/.gitignore | 2 + drivers/zorro/zorro-sysfs.c | 20 ++-- drivers/zorro/zorro.c | 23 +++- drivers/zorro/zorro.h | 2 +- include/asm-m68k/unistd.h | 4 +- include/linux/dio.h | 2 +- sound/oss/dmasound/dmasound_atari.c | 5 +- sound/oss/dmasound/dmasound_q40.c | 16 ++- 56 files changed, 912 insertions(+), 553 deletions(-) create mode 100644 arch/m68k/kernel/.gitignore delete mode 100644 drivers/video/c2p.c create mode 100644 drivers/video/c2p_core.h create mode 100644 drivers/video/c2p_iplan2.c create mode 100644 drivers/video/c2p_planar.c create mode 100644 drivers/zorro/.gitignore Merging powerpc-merge/merge $ git merge powerpc-merge/merge Already up-to-date. Merging sparc-current/master $ git merge sparc-current/master Merge made by recursive. arch/sparc/configs/sparc32_defconfig | 290 +++++++++++++++++++++++++--------- arch/sparc/include/asm/oplib_32.h | 11 -- arch/sparc/include/asm/oplib_64.h | 10 -- arch/sparc/include/asm/signal.h | 4 + arch/sparc/kernel/auxio_32.c | 3 +- arch/sparc/kernel/auxio_64.c | 2 + arch/sparc/kernel/cpu.c | 2 + arch/sparc/kernel/idprom.c | 3 + arch/sparc/kernel/ioport.c | 15 ++ arch/sparc/kernel/irq_32.c | 1 + arch/sparc/kernel/pci.c | 1 + arch/sparc/kernel/pcic.c | 6 + arch/sparc/kernel/process_32.c | 2 + arch/sparc/kernel/process_64.c | 2 + arch/sparc/kernel/psycho_common.c | 60 ++++---- arch/sparc/kernel/sbus.c | 1 + arch/sparc/kernel/setup_32.c | 3 + arch/sparc/kernel/setup_64.c | 3 + arch/sparc/kernel/sparc_ksyms_32.c | 225 +------------------------- arch/sparc/kernel/sparc_ksyms_64.c | 243 ++--------------------------- arch/sparc/kernel/sun4d_smp.c | 4 +- arch/sparc/kernel/sys_sparc_64.c | 2 + arch/sparc/kernel/time_32.c | 2 + arch/sparc/kernel/time_64.c | 2 + arch/sparc/kernel/traps_32.c | 1 + arch/sparc/kernel/traps_64.c | 2 + arch/sparc/kernel/unaligned_64.c | 8 +- arch/sparc/lib/Makefile | 1 + arch/sparc/lib/PeeCeeI.c | 8 + arch/sparc/lib/ksyms.c | 196 +++++++++++++++++++++++ arch/sparc/lib/user_fixup.c | 5 + arch/sparc/mm/generic_32.c | 1 + arch/sparc/mm/generic_64.c | 1 + arch/sparc/mm/highmem.c | 2 + arch/sparc/mm/init_32.c | 6 + arch/sparc/mm/init_64.c | 4 + arch/sparc/prom/init_32.c | 4 + arch/sparc/prom/misc_32.c | 3 + arch/sparc/prom/misc_64.c | 3 + arch/sparc/prom/ranges.c | 3 + arch/sparc/prom/tree_32.c | 17 ++- arch/sparc/prom/tree_64.c | 18 ++- 42 files changed, 595 insertions(+), 585 deletions(-) create mode 100644 arch/sparc/lib/ksyms.c Merging scsi-rc-fixes/master $ git merge scsi-rc-fixes/master Already up-to-date. Merging net-current/master $ git merge net-current/master Merge made by recursive. drivers/isdn/hardware/mISDN/hfcmulti.c | 3 +- drivers/net/3c503.c | 1 + drivers/net/3c59x.c | 2 + drivers/net/8139cp.c | 2 + drivers/net/8139too.c | 2 +- drivers/net/8390.c | 1 + drivers/net/8390p.c | 1 + drivers/net/Kconfig | 2 +- drivers/net/acenic.c | 1 + drivers/net/arm/etherh.c | 1 + drivers/net/arm/ks8695net.c | 1 + drivers/net/b44.c | 13 ++-- drivers/net/cxgb3/adapter.h | 7 ++- drivers/net/cxgb3/cxgb3_main.c | 22 ++++-- drivers/net/cxgb3/sge.c | 2 +- drivers/net/e1000e/ich8lan.c | 19 +++-- drivers/net/e2100.c | 1 + drivers/net/enic/enic_main.c | 1 + drivers/net/forcedeth.c | 22 +++--- drivers/net/gianfar.c | 15 ++++ drivers/net/hamachi.c | 1 + drivers/net/hamradio/6pack.c | 3 +- drivers/net/hp-plus.c | 1 + drivers/net/hydra.c | 1 + drivers/net/irda/au1k_ir.c | 2 +- drivers/net/irda/donauboe.c | 8 +- drivers/net/mac8390.c | 1 + drivers/net/mlx4/en_netdev.c | 1 + drivers/net/ne-h8300.c | 1 + drivers/net/ne2k-pci.c | 1 + drivers/net/ns83820.c | 1 + drivers/net/qlge/qlge.h | 61 +++++++++------ drivers/net/qlge/qlge_dbg.c | 62 ++++++---------- drivers/net/qlge/qlge_main.c | 80 +++++--------------- drivers/net/r6040.c | 43 +++++++---- drivers/net/sc92031.c | 1 + drivers/net/sfc/tenxpress.c | 5 +- drivers/net/sis900.c | 1 + drivers/net/smc-mca.c | 1 + drivers/net/smc-ultra.c | 1 + drivers/net/smsc911x.c | 4 +- drivers/net/smsc9420.c | 1 + drivers/net/ucc_geth.c | 128 +++++++++++--------------------- drivers/net/ucc_geth.h | 114 ++++++---------------------- drivers/net/via-rhine.c | 1 + drivers/net/via-velocity.c | 1 + drivers/net/wd.c | 1 + drivers/net/wireless/libertas/main.c | 7 +- drivers/net/yellowfin.c | 1 + drivers/net/zorro8390.c | 1 + drivers/s390/net/qeth_l2_main.c | 2 +- drivers/s390/net/qeth_l3_main.c | 24 +++++- include/linux/dmaengine.h | 10 +++ include/net/wimax.h | 4 +- net/bridge/netfilter/ebtables.c | 3 +- net/core/dev.c | 13 +++- net/dccp/ccids/Kconfig | 2 +- net/dccp/ccids/lib/tfrc.c | 2 +- net/tipc/bcast.h | 2 +- net/xfrm/xfrm_ipcomp.c | 1 - 60 files changed, 344 insertions(+), 373 deletions(-) Merging sound-current/for-linus $ git merge sound-current/for-linus Merge made by recursive. include/sound/soc-dapm.h | 2 +- include/sound/soc.h | 15 +------- sound/pci/hda/hda_beep.c | 1 - sound/pci/hda/hda_codec.c | 48 +++++++++++++++--------- sound/pci/hda/hda_codec.h | 2 + sound/pci/hda/hda_intel.c | 6 +- sound/pci/hda/patch_analog.c | 5 +- sound/pci/hda/patch_nvhdmi.c | 2 + sound/pci/hda/patch_realtek.c | 18 ++++++--- sound/soc/codecs/twl4030.c | 12 +++-- sound/soc/soc-core.c | 37 +----------------- sound/soc/soc-dapm.c | 80 ++------------------------------------- sound/usb/caiaq/caiaq-device.c | 2 +- sound/usb/caiaq/caiaq-device.h | 1 + sound/usb/caiaq/caiaq-midi.c | 32 +++++++++------- 15 files changed, 88 insertions(+), 175 deletions(-) Merging pci-current/for-linus $ git merge pci-current/for-linus Already up-to-date. Merging wireless-current/master $ git merge wireless-current/master Removed arch/arm/mach-integrator/clock.h Merge made by recursive. drivers/net/wireless/Kconfig | 2 +- drivers/net/wireless/ath5k/base.c | 8 ++-- drivers/net/wireless/ath5k/pcu.c | 4 +- drivers/net/wireless/ath5k/reg.h | 2 +- drivers/net/wireless/ath9k/Kconfig | 1 + drivers/net/wireless/ath9k/main.c | 4 +- drivers/net/wireless/ath9k/xmit.c | 48 ++++++++++----------------- drivers/net/wireless/b43/main.c | 2 +- drivers/net/wireless/b43legacy/main.c | 2 +- drivers/net/wireless/iwlwifi/iwl-3945.c | 2 +- drivers/net/wireless/iwlwifi/iwl-commands.h | 2 +- drivers/net/wireless/iwlwifi/iwl-hcmd.c | 1 + drivers/net/wireless/libertas_tf/main.c | 2 +- drivers/net/wireless/orinoco/orinoco.c | 28 ++++++++++++++-- drivers/net/wireless/orinoco/orinoco_cs.c | 1 + drivers/net/wireless/p54/p54common.c | 34 +++++++++++++++++-- drivers/net/wireless/p54/p54usb.c | 2 + drivers/net/wireless/rt2x00/rt2500usb.c | 23 ++++-------- drivers/net/wireless/rt2x00/rt2x00dev.c | 8 ++--- drivers/net/wireless/rt2x00/rt2x00leds.c | 2 +- drivers/net/wireless/rt2x00/rt2x00lib.h | 11 ------ drivers/net/wireless/rt2x00/rt2x00queue.c | 2 +- drivers/net/wireless/rt2x00/rt2x00usb.c | 6 ++-- drivers/net/wireless/rt2x00/rt73usb.c | 1 + drivers/net/wireless/rtl818x/rtl8180_dev.c | 1 + drivers/net/wireless/rtl818x/rtl8187_dev.c | 5 ++- net/mac80211/ht.c | 2 +- net/mac80211/iface.c | 3 +- net/mac80211/mesh_plink.c | 1 + net/mac80211/rc80211_minstrel.c | 10 +++-- 30 files changed, 124 insertions(+), 96 deletions(-) delete mode 100644 arch/arm/mach-integrator/clock.h Merging kbuild-current/master $ git merge kbuild-current/master Merge made by recursive. scripts/config | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) Merging quilt/driver-core.current $ git merge quilt/driver-core.current Already up-to-date. Merging quilt/usb.current $ git merge quilt/usb.current 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 Auto-merged drivers/input/keyboard/atkbd.c Merge made by recursive. drivers/input/keyboard/atkbd.c | 4 ++-- drivers/input/mouse/Kconfig | 2 +- drivers/input/touchscreen/usbtouchscreen.c | 19 +++++++++++++++++-- drivers/media/video/uvc/uvc_status.c | 10 ++++++---- 4 files changed, 26 insertions(+), 9 deletions(-) Merging md-current/for-linus $ git merge md-current/for-linus Already up-to-date. Merging audit-current/for-linus $ git merge audit-current/for-linus Auto-merged drivers/char/tty_audit.c CONFLICT (content): Merge conflict in drivers/char/tty_audit.c Auto-merged drivers/char/tty_io.c Auto-merged include/linux/audit.h Auto-merged include/linux/tty.h Auto-merged kernel/auditsc.c CONFLICT (content): Merge conflict in kernel/auditsc.c Auto-merged kernel/fork.c Resolved 'drivers/char/tty_audit.c' using previous resolution. Resolved 'kernel/auditsc.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 9c5092f: Merge commit 'audit-current/for-linus' $ git diff -M --stat --summary HEAD^.. Merging dwmw2/master $ git merge dwmw2/master Already up-to-date. Merging arm/devel $ git merge arm/devel 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 Already up-to-date. Merging cris/for-next $ git merge cris/for-next Merge made by recursive. arch/cris/include/arch-v10/arch/byteorder.h | 10 ++++++---- arch/cris/include/arch-v32/arch/byteorder.h | 6 ++++-- arch/cris/include/asm/byteorder.h | 20 ++++---------------- 3 files changed, 14 insertions(+), 22 deletions(-) Merging ia64/test $ git merge ia64/test Already up-to-date. Merging m68k/for-next $ git merge m68k/for-next Already up-to-date. Merging m68knommu/for-next $ git merge m68knommu/for-next Merge made by recursive. arch/m68knommu/platform/coldfire/entry.S | 15 ++------------- 1 files changed, 2 insertions(+), 13 deletions(-) Merging mips/mips-for-linux-next $ git merge mips/mips-for-linux-next Already up-to-date. Merging parisc/master $ git merge parisc/master Already up-to-date. Merging powerpc/next $ git merge powerpc/next Already up-to-date. Merging 4xx/next $ git merge 4xx/next Already up-to-date. Merging galak/next $ git merge galak/next Auto-merged arch/powerpc/kernel/asm-offsets.c Auto-merged arch/powerpc/mm/mmu_decl.h Merge made by recursive. arch/powerpc/boot/dts/mpc8544ds.dts | 4 +- arch/powerpc/boot/dts/mpc8572ds.dts | 4 +- arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts | 2 +- arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts | 2 +- arch/powerpc/include/asm/qe.h | 19 ++++- arch/powerpc/kernel/asm-offsets.c | 7 ++ arch/powerpc/kernel/head_fsl_booke.S | 6 +- arch/powerpc/mm/fsl_booke_mmu.c | 9 +-- arch/powerpc/mm/mmu_decl.h | 11 ++- arch/powerpc/platforms/fsl_uli1575.c | 1 + arch/powerpc/sysdev/fsl_pci.c | 107 ++++++++++++++++------- 11 files changed, 117 insertions(+), 55 deletions(-) Merging pxa/for-next $ git merge pxa/for-next Merge made by recursive. Merging s390/features $ git merge s390/features Already up-to-date. Merging sh/master $ git merge sh/master Merge made by recursive. arch/sh/Kconfig | 63 +----- arch/sh/boards/Kconfig | 6 +- arch/sh/boards/board-ap325rxa.c | 53 ++++- arch/sh/boards/board-magicpanelr2.c | 23 ++- arch/sh/boards/board-sh7785lcr.c | 1 + arch/sh/boards/mach-highlander/Kconfig | 2 +- arch/sh/boards/mach-highlander/setup.c | 1 + arch/sh/boards/mach-hp6xx/setup.c | 2 +- arch/sh/boards/mach-migor/setup.c | 171 +++++++-------- arch/sh/boards/mach-rsk/Kconfig | 2 +- arch/sh/boards/mach-rsk/devices-rsk7203.c | 24 +- arch/sh/boards/mach-x3proto/setup.c | 1 + arch/sh/configs/ap325rxa_defconfig | 21 ++- arch/sh/configs/magicpanelr2_defconfig | 21 ++- arch/sh/configs/rsk7203_defconfig | 21 ++- arch/sh/include/asm/gpio.h | 70 ++++--- arch/sh/include/asm/posix_types_32.h | 8 +- arch/sh/include/asm/posix_types_64.h | 8 +- arch/sh/kernel/gpio.c | 338 ++++++++++++++++++----------- arch/sh/kernel/process_64.c | 2 - arch/sh/kernel/traps_32.c | 1 + arch/sh/mm/ioremap_64.c | 2 +- drivers/serial/sh-sci.h | 5 +- 23 files changed, 486 insertions(+), 360 deletions(-) Merging sparc/master $ git merge sparc/master Already up-to-date. Merging x86/auto-x86-next $ git merge x86/auto-x86-next Already uptodate! Merge made by recursive. Merging xtensa/master $ git merge xtensa/master Already up-to-date. Merging quilt/driver-core $ git merge quilt/driver-core Merge made by recursive. include/linux/init.h | 1 + init/main.c | 9 +++++++++ lib/kobject.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 0 deletions(-) Merging quilt/usb $ git merge quilt/usb Already up-to-date. Merging tip-core/auto-core-next $ git merge tip-core/auto-core-next Already up-to-date. Merging cpus4096/auto-cpus4096-next $ git merge cpus4096/auto-cpus4096-next Auto-merged arch/x86/include/asm/es7000/apic.h Auto-merged arch/x86/include/asm/summit/apic.h Auto-merged arch/x86/kernel/acpi/boot.c Auto-merged arch/x86/kernel/apic.c Auto-merged arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c Auto-merged arch/x86/kernel/cpu/cpufreq/powernow-k8.c Auto-merged arch/x86/kernel/cpu/mcheck/mce_amd_64.c Auto-merged arch/x86/kernel/cpuid.c Auto-merged arch/x86/kernel/io_apic.c Auto-merged arch/x86/kernel/reboot.c Auto-merged arch/x86/kernel/setup_percpu.c Auto-merged arch/x86/kernel/smp.c Auto-merged arch/x86/kernel/smpboot.c CONFLICT (content): Merge conflict in arch/x86/kernel/smpboot.c Auto-merged kernel/rcuclassic.c CONFLICT (content): Merge conflict in kernel/rcuclassic.c Auto-merged kernel/sched.c Auto-merged kernel/time/tick-sched.c Recorded preimage for 'arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c' Recorded preimage for 'arch/x86/kernel/smpboot.c' Resolved 'kernel/rcuclassic.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c'. Recorded resolution for 'arch/x86/kernel/smpboot.c'. Created commit e102fc3: Merge commit 'cpus4096/auto-cpus4096-next' $ git diff -M --stat --summary HEAD^.. arch/x86/kernel/cpu/mcheck/mce_amd_64.c | 23 ++++++--- arch/x86/kernel/microcode_core.c | 83 ++++++++++++++++--------------- 2 files changed, 58 insertions(+), 48 deletions(-) Merging ftrace/auto-ftrace-next $ git merge ftrace/auto-ftrace-next Auto-merged Documentation/kernel-parameters.txt Auto-merged MAINTAINERS Auto-merged init/main.c Auto-merged mm/slub.c Merge made by recursive. Documentation/ABI/testing/debugfs-kmemtrace | 71 +++ Documentation/kernel-parameters.txt | 10 + Documentation/sysrq.txt | 2 + Documentation/vm/kmemtrace.txt | 126 ++++ MAINTAINERS | 6 + arch/x86/kvm/Kconfig | 3 +- drivers/char/sysrq.c | 2 +- include/linux/slab_def.h | 68 ++- include/linux/slob_def.h | 9 +- include/linux/slub_def.h | 53 ++- include/trace/kmemtrace.h | 75 +++ init/main.c | 2 + kernel/relay.c | 4 +- kernel/trace/Kconfig | 21 + kernel/trace/Makefile | 3 + kernel/trace/ftrace.c | 4 +- kernel/trace/kmemtrace.c | 350 +++++++++++ kernel/trace/trace.c | 741 ++---------------------- kernel/trace/trace.h | 61 ++- kernel/trace/trace_boot.c | 1 + kernel/trace/trace_branch.c | 295 ++++++---- kernel/trace/trace_functions_graph.c | 8 +- kernel/trace/trace_hw_branches.c | 1 + kernel/trace/trace_mmiotrace.c | 4 +- kernel/trace/trace_output.c | 832 +++++++++++++++++++++++++++ kernel/trace/trace_output.h | 59 ++ kernel/trace/trace_power.c | 1 + kernel/trace/trace_selftest.c | 1 - kernel/trace/trace_stat.c | 243 ++++++++ mm/slab.c | 71 ++- mm/slob.c | 37 +- mm/slub.c | 83 +++- 32 files changed, 2368 insertions(+), 879 deletions(-) create mode 100644 Documentation/ABI/testing/debugfs-kmemtrace create mode 100644 Documentation/vm/kmemtrace.txt create mode 100644 include/trace/kmemtrace.h create mode 100644 kernel/trace/kmemtrace.c create mode 100644 kernel/trace/trace_output.c create mode 100644 kernel/trace/trace_output.h create mode 100644 kernel/trace/trace_stat.c Merging genirq/auto-genirq-next $ git merge genirq/auto-genirq-next Auto-merged kernel/irq/chip.c Merge made by recursive. kernel/irq/chip.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) Merging safe-poison-pointers/auto-safe-poison-pointers-next $ git merge safe-poison-pointers/auto-safe-poison-pointers-next Auto-merged arch/x86/Kconfig Merge made by recursive. arch/x86/Kconfig | 5 +++++ include/linux/poison.h | 16 ++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) Merging sched/auto-sched-next $ git merge sched/auto-sched-next Already up-to-date. Merging stackprotector/auto-stackprotector-next $ git merge stackprotector/auto-stackprotector-next Auto-merged arch/x86/Kconfig Auto-merged arch/x86/mm/fault.c Auto-merged include/linux/magic.h Auto-merged include/linux/sched.h Auto-merged init/main.c Auto-merged kernel/exit.c Auto-merged kernel/fork.c Auto-merged kernel/panic.c Auto-merged kernel/sched.c Merge made by recursive. arch/x86/Kconfig | 23 ++++++++++------------- arch/x86/Kconfig.debug | 1 + arch/x86/Makefile | 2 +- arch/x86/include/asm/pda.h | 4 ++-- arch/x86/include/asm/system.h | 6 +++++- arch/x86/kernel/Makefile | 1 + arch/x86/kernel/process_64.c | 13 ++++++++++++- arch/x86/mm/fault.c | 7 +++++++ include/asm-x86/stackprotector.h | 38 ++++++++++++++++++++++++++++++++++++++ include/linux/magic.h | 1 + include/linux/sched.h | 16 ++++++++++++++-- include/linux/stackprotector.h | 16 ++++++++++++++++ init/main.c | 7 +++++++ kernel/exit.c | 5 +---- kernel/fork.c | 5 +++++ kernel/panic.c | 12 +++++++++++- kernel/sched.c | 7 +------ 17 files changed, 133 insertions(+), 31 deletions(-) create mode 100644 include/asm-x86/stackprotector.h create mode 100644 include/linux/stackprotector.h Merging timers/auto-timers-next $ git merge timers/auto-timers-next Auto-merged include/linux/clockchips.h Auto-merged kernel/hrtimer.c Auto-merged kernel/time/tick-common.c CONFLICT (content): Merge conflict in kernel/time/tick-common.c Resolved 'kernel/time/tick-common.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 30dfaba: Merge commit 'timers/auto-timers-next' $ git diff -M --stat --summary HEAD^.. include/linux/clockchips.h | 1 + kernel/hrtimer.c | 34 +++++++++++++++++++++++++++++++++- kernel/time/tick-common.c | 26 +++++++++++++++++++------- 3 files changed, 53 insertions(+), 8 deletions(-) Merging pci/linux-next $ git merge pci/linux-next Already up-to-date. Merging quilt/device-mapper $ git merge quilt/device-mapper Merge made by recursive. drivers/md/dm-exception-store.h | 13 ++++- drivers/md/dm-ioctl.c | 7 ++- drivers/md/dm-snap-persistent.c | 13 +++-- drivers/md/dm-snap-transient.c | 14 +++--- drivers/md/dm-snap.c | 18 +++--- drivers/md/dm-target.c | 104 +++++++++++--------------------------- drivers/md/dm.h | 2 +- include/linux/device-mapper.h | 3 + 8 files changed, 72 insertions(+), 102 deletions(-) Merging hid/for-next $ git merge hid/for-next Merge made by recursive. drivers/hid/Kconfig | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Merging quilt/i2c $ git merge quilt/i2c Already up-to-date. Merging quilt/jdelvare-hwmon $ git merge quilt/jdelvare-hwmon Auto-merged drivers/hwmon/Makefile Merge made by recursive. Documentation/hwmon/adt7475 | 87 +++ drivers/hwmon/Kconfig | 10 + drivers/hwmon/Makefile | 2 + drivers/hwmon/adt7475.c | 1221 +++++++++++++++++++++++++++++++++++++++++++ drivers/hwmon/k8temp.c | 55 ++- 5 files changed, 1366 insertions(+), 9 deletions(-) create mode 100644 Documentation/hwmon/adt7475 create mode 100644 drivers/hwmon/adt7475.c Merging quilt/kernel-doc $ git merge quilt/kernel-doc Already up-to-date. Merging v4l-dvb/master $ git merge v4l-dvb/master Auto-merged drivers/media/video/uvc/uvc_status.c Merge made by recursive. Documentation/video4linux/v4lgrab.c | 25 ++- drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 24 +++- drivers/media/dvb/dvb-core/dvb_ca_en50221.h | 6 +- drivers/media/dvb/dvb-usb/dib0700_devices.c | 10 +- drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 1 + drivers/media/video/cs5345.c | 1 - drivers/media/video/cx88/cx88.h | 2 +- drivers/media/video/em28xx/em28xx-video.c | 41 +++-- drivers/media/video/pwc/pwc-if.c | 1 - drivers/media/video/saa717x.c | 1 - drivers/media/video/tveeprom.c | 3 + drivers/media/video/tvp514x.c | 2 +- drivers/media/video/upd64031a.c | 1 - drivers/media/video/upd64083.c | 1 - drivers/media/video/uvc/uvc_ctrl.c | 7 +- drivers/media/video/uvc/uvc_driver.c | 55 +++---- drivers/media/video/uvc/uvc_isight.c | 2 + drivers/media/video/uvc/uvc_queue.c | 31 ++-- drivers/media/video/uvc/uvc_status.c | 3 +- drivers/media/video/uvc/uvc_v4l2.c | 10 +- drivers/media/video/uvc/uvc_video.c | 31 +++-- drivers/media/video/uvc/uvcvideo.h | 232 +++++++++++++------------- drivers/media/video/zoran/zoran_card.c | 8 + 23 files changed, 273 insertions(+), 225 deletions(-) Merging jfs/next $ git merge jfs/next Merge made by recursive. fs/jfs/jfs_extent.c | 63 +++++-------- fs/jfs/jfs_imap.c | 10 +-- fs/jfs/jfs_types.h | 29 ------ fs/jfs/jfs_xtree.c | 263 +-------------------------------------------------- fs/jfs/jfs_xtree.h | 2 - 5 files changed, 28 insertions(+), 339 deletions(-) Merging kbuild/master $ git merge kbuild/master Already up-to-date. Merging quilt/ide $ git merge quilt/ide Merge made by recursive. Documentation/mips/AU1xxx_IDE.README | 6 +- drivers/ide/Kconfig | 15 +- drivers/ide/Makefile | 1 + drivers/ide/cs5536.c | 309 ++++++++++++++++++++++++++++++++++ drivers/ide/ide-atapi.c | 21 +++- drivers/ide/ide-disk.c | 2 +- drivers/ide/ide-io.c | 20 --- drivers/ide/ide-iops.c | 2 +- drivers/ide/ide-probe.c | 45 ++---- drivers/ide/it821x.c | 15 ++- drivers/ide/sl82c105.c | 4 - drivers/ide/tx4938ide.c | 1 - drivers/ide/via82cxxx.c | 7 +- include/linux/ide.h | 2 - include/linux/pci_ids.h | 1 + 15 files changed, 377 insertions(+), 74 deletions(-) create mode 100644 drivers/ide/cs5536.c Merging libata/NEXT $ git merge libata/NEXT Already up-to-date. Merging nfs/linux-next $ git merge nfs/linux-next Merge made by recursive. Documentation/filesystems/caching/backend-api.txt | 658 ++++++++++++++++ Documentation/filesystems/caching/cachefiles.txt | 501 ++++++++++++ Documentation/filesystems/caching/fscache.txt | 333 ++++++++ Documentation/filesystems/caching/netfs-api.txt | 800 +++++++++++++++++++ Documentation/filesystems/caching/object.txt | 313 ++++++++ Documentation/filesystems/caching/operations.txt | 213 +++++ Documentation/slow-work.txt | 174 +++++ arch/ia64/kernel/ia64_ksyms.c | 1 + fs/Kconfig | 24 + fs/Makefile | 2 + fs/afs/Makefile | 3 + fs/afs/cache.c | 503 ++++++++----- fs/afs/cache.h | 15 +- fs/afs/cell.c | 16 +- fs/afs/file.c | 212 ++++-- fs/afs/inode.c | 25 +- fs/afs/internal.h | 53 +- fs/afs/main.c | 27 +- fs/afs/mntpt.c | 4 +- fs/afs/vlocation.c | 23 +- fs/afs/volume.c | 14 +- fs/afs/write.c | 19 + fs/cachefiles/Kconfig | 39 + fs/cachefiles/Makefile | 18 + fs/cachefiles/cf-bind.c | 286 +++++++ fs/cachefiles/cf-daemon.c | 754 ++++++++++++++++++ fs/cachefiles/cf-interface.c | 449 +++++++++++ fs/cachefiles/cf-internal.h | 360 +++++++++ fs/cachefiles/cf-key.c | 159 ++++ fs/cachefiles/cf-main.c | 106 +++ fs/cachefiles/cf-namei.c | 772 +++++++++++++++++++ fs/cachefiles/cf-proc.c | 134 ++++ fs/cachefiles/cf-rdwr.c | 853 +++++++++++++++++++++ fs/cachefiles/cf-security.c | 116 +++ fs/cachefiles/cf-xattr.c | 291 +++++++ fs/ext2/inode.c | 2 + fs/ext3/inode.c | 9 +- fs/fscache/Kconfig | 56 ++ fs/fscache/Makefile | 19 + fs/fscache/fsc-cache.c | 415 ++++++++++ fs/fscache/fsc-cookie.c | 498 ++++++++++++ fs/fscache/fsc-fsdef.c | 144 ++++ fs/fscache/fsc-histogram.c | 109 +++ fs/fscache/fsc-internal.h | 380 +++++++++ fs/fscache/fsc-main.c | 124 +++ fs/fscache/fsc-netfs.c | 103 +++ fs/fscache/fsc-object.c | 810 +++++++++++++++++++ fs/fscache/fsc-operation.c | 459 +++++++++++ fs/fscache/fsc-page.c | 771 +++++++++++++++++++ fs/fscache/fsc-proc.c | 68 ++ fs/fscache/fsc-stats.c | 212 +++++ fs/nfs/Makefile | 1 + fs/nfs/client.c | 14 +- fs/nfs/file.c | 37 +- fs/nfs/fscache-index.c | 337 ++++++++ fs/nfs/fscache.c | 521 +++++++++++++ fs/nfs/fscache.h | 208 +++++ fs/nfs/inode.c | 17 +- fs/nfs/internal.h | 4 + fs/nfs/iostat.h | 18 + fs/nfs/read.c | 27 +- fs/nfs/super.c | 45 +- fs/splice.c | 3 +- fs/super.c | 1 + include/linux/fs.h | 7 + include/linux/fscache-cache.h | 504 ++++++++++++ include/linux/fscache.h | 592 ++++++++++++++ include/linux/nfs_fs.h | 13 + include/linux/nfs_fs_sb.h | 11 + include/linux/nfs_iostat.h | 12 + include/linux/page-flags.h | 43 +- include/linux/pagemap.h | 21 + include/linux/slow-work.h | 95 +++ init/Kconfig | 12 + kernel/Makefile | 1 + kernel/slow-work.c | 640 ++++++++++++++++ kernel/sysctl.c | 9 + mm/filemap.c | 99 +++ mm/migrate.c | 10 +- mm/readahead.c | 40 +- mm/swap.c | 4 +- mm/truncate.c | 10 +- mm/vmscan.c | 6 +- security/security.c | 2 + 84 files changed, 15404 insertions(+), 409 deletions(-) create mode 100644 Documentation/filesystems/caching/backend-api.txt create mode 100644 Documentation/filesystems/caching/cachefiles.txt create mode 100644 Documentation/filesystems/caching/fscache.txt create mode 100644 Documentation/filesystems/caching/netfs-api.txt create mode 100644 Documentation/filesystems/caching/object.txt create mode 100644 Documentation/filesystems/caching/operations.txt create mode 100644 Documentation/slow-work.txt create mode 100644 fs/cachefiles/Kconfig create mode 100644 fs/cachefiles/Makefile create mode 100644 fs/cachefiles/cf-bind.c create mode 100644 fs/cachefiles/cf-daemon.c create mode 100644 fs/cachefiles/cf-interface.c create mode 100644 fs/cachefiles/cf-internal.h create mode 100644 fs/cachefiles/cf-key.c create mode 100644 fs/cachefiles/cf-main.c create mode 100644 fs/cachefiles/cf-namei.c create mode 100644 fs/cachefiles/cf-proc.c create mode 100644 fs/cachefiles/cf-rdwr.c create mode 100644 fs/cachefiles/cf-security.c create mode 100644 fs/cachefiles/cf-xattr.c create mode 100644 fs/fscache/Kconfig create mode 100644 fs/fscache/Makefile create mode 100644 fs/fscache/fsc-cache.c create mode 100644 fs/fscache/fsc-cookie.c create mode 100644 fs/fscache/fsc-fsdef.c create mode 100644 fs/fscache/fsc-histogram.c create mode 100644 fs/fscache/fsc-internal.h create mode 100644 fs/fscache/fsc-main.c create mode 100644 fs/fscache/fsc-netfs.c create mode 100644 fs/fscache/fsc-object.c create mode 100644 fs/fscache/fsc-operation.c create mode 100644 fs/fscache/fsc-page.c create mode 100644 fs/fscache/fsc-proc.c create mode 100644 fs/fscache/fsc-stats.c create mode 100644 fs/nfs/fscache-index.c create mode 100644 fs/nfs/fscache.c create mode 100644 fs/nfs/fscache.h create mode 100644 include/linux/fscache-cache.h create mode 100644 include/linux/fscache.h create mode 100644 include/linux/slow-work.h create mode 100644 kernel/slow-work.c Merging xfs/master $ git merge xfs/master Auto-merged MAINTAINERS Merge made by recursive. MAINTAINERS | 4 +- fs/xfs/linux-2.6/xfs_aops.h | 2 - fs/xfs/linux-2.6/xfs_buf.c | 79 +------------------------------------- fs/xfs/linux-2.6/xfs_export.c | 23 +++++++++-- fs/xfs/xfs_acl.h | 1 - fs/xfs/xfs_ag.h | 2 +- fs/xfs/xfs_attr_leaf.c | 72 +++++++++++++++++----------------- fs/xfs/xfs_attr_leaf.h | 12 ------ fs/xfs/xfs_bit.h | 10 +---- fs/xfs/xfs_bmap_btree.c | 84 ++++++++++++++++++++-------------------- fs/xfs/xfs_btree.c | 4 +- fs/xfs/xfs_dir2_block.c | 7 ++- fs/xfs/xfs_dir2_leaf.c | 6 +- fs/xfs/xfs_dir2_sf.c | 15 ++++--- fs/xfs/xfs_types.h | 4 +- 15 files changed, 122 insertions(+), 203 deletions(-) Merging infiniband/for-next $ git merge infiniband/for-next Auto-merged drivers/infiniband/hw/nes/nes_cm.c Merge made by recursive. drivers/infiniband/hw/ehca/ehca_main.c | 2 +- drivers/infiniband/hw/mlx4/main.c | 13 +++++++--- drivers/infiniband/hw/nes/nes_cm.c | 12 +++++++-- drivers/infiniband/hw/nes/nes_utils.c | 4 ++- drivers/infiniband/ulp/ipoib/ipoib_main.c | 38 ++++++++++++++-------------- drivers/net/mlx4/main.c | 4 +- 6 files changed, 43 insertions(+), 30 deletions(-) Merging acpi/test $ git merge acpi/test Auto-merged MAINTAINERS Merge made by recursive. MAINTAINERS | 5 + arch/ia64/kernel/kprobes.c | 2 +- arch/x86/kernel/kprobes.c | 2 +- drivers/acpi/pci_link.c | 39 +- drivers/misc/Makefile | 1 - drivers/platform/x86/Kconfig | 25 + drivers/platform/x86/Makefile | 2 + drivers/{misc => platform/x86}/dell-laptop.c | 2 +- drivers/platform/x86/eeepc-laptop.c | 4 +- drivers/platform/x86/oqo-wmi.c | 941 ++++++++++++++++++++++++++ include/acpi/actbl.h | 2 +- kernel/kprobes.c | 2 +- kernel/power/Makefile | 3 +- 13 files changed, 1000 insertions(+), 30 deletions(-) rename drivers/{misc => platform/x86}/dell-laptop.c (99%) create mode 100644 drivers/platform/x86/oqo-wmi.c Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Auto-merged fs/Kconfig Merge made by recursive. Documentation/filesystems/nfs-rdma.txt | 4 +- fs/Kconfig | 5 +- fs/nfsd/nfs3proc.c | 5 +- fs/nfsd/nfs4state.c | 163 ++++++++++++++++++-------------- 4 files changed, 98 insertions(+), 79 deletions(-) Merging ieee1394/for-next $ git merge ieee1394/for-next Auto-merged drivers/firewire/fw-card.c Auto-merged drivers/firewire/fw-device.c Auto-merged drivers/media/dvb/Kconfig Merge made by recursive. drivers/firewire/fw-card.c | 68 +-- drivers/firewire/fw-cdev.c | 1012 ++++++++++++++++++++--------- drivers/firewire/fw-device.c | 43 +- drivers/firewire/fw-device.h | 7 +- drivers/firewire/fw-iso.c | 225 ++++++- drivers/firewire/fw-ohci.c | 240 ++++---- drivers/firewire/fw-sbp2.c | 57 +- drivers/firewire/fw-topology.c | 28 +- drivers/firewire/fw-topology.h | 19 +- drivers/firewire/fw-transaction.c | 151 ++--- drivers/firewire/fw-transaction.h | 127 ++--- drivers/ieee1394/dma.h | 1 + drivers/ieee1394/ieee1394_core.c | 1 + drivers/ieee1394/ieee1394_transactions.c | 29 + drivers/ieee1394/ieee1394_transactions.h | 2 + drivers/ieee1394/iso.h | 1 + drivers/ieee1394/nodemgr.c | 10 +- drivers/ieee1394/nodemgr.h | 18 + drivers/media/dvb/Kconfig | 2 + drivers/media/dvb/Makefile | 2 + drivers/media/dvb/firesat/Kconfig | 12 + drivers/media/dvb/firesat/Makefile | 13 + drivers/media/dvb/firesat/avc_api.c | 1051 ++++++++++++++++++++++++++++++ drivers/media/dvb/firesat/avc_api.h | 432 ++++++++++++ drivers/media/dvb/firesat/cmp.c | 171 +++++ drivers/media/dvb/firesat/cmp.h | 9 + drivers/media/dvb/firesat/firesat-ci.c | 261 ++++++++ drivers/media/dvb/firesat/firesat-ci.h | 9 + drivers/media/dvb/firesat/firesat-rc.c | 191 ++++++ drivers/media/dvb/firesat/firesat-rc.h | 11 + drivers/media/dvb/firesat/firesat.h | 227 +++++++ drivers/media/dvb/firesat/firesat_1394.c | 291 +++++++++ drivers/media/dvb/firesat/firesat_dvb.c | 276 ++++++++ drivers/media/dvb/firesat/firesat_fe.c | 245 +++++++ drivers/media/dvb/firesat/firesat_iso.c | 111 ++++ include/linux/firewire-cdev.h | 170 +++++- 36 files changed, 4737 insertions(+), 786 deletions(-) create mode 100644 drivers/media/dvb/firesat/Kconfig create mode 100644 drivers/media/dvb/firesat/Makefile create mode 100644 drivers/media/dvb/firesat/avc_api.c create mode 100644 drivers/media/dvb/firesat/avc_api.h create mode 100644 drivers/media/dvb/firesat/cmp.c create mode 100644 drivers/media/dvb/firesat/cmp.h create mode 100644 drivers/media/dvb/firesat/firesat-ci.c create mode 100644 drivers/media/dvb/firesat/firesat-ci.h create mode 100644 drivers/media/dvb/firesat/firesat-rc.c create mode 100644 drivers/media/dvb/firesat/firesat-rc.h create mode 100644 drivers/media/dvb/firesat/firesat.h create mode 100644 drivers/media/dvb/firesat/firesat_1394.c create mode 100644 drivers/media/dvb/firesat/firesat_dvb.c create mode 100644 drivers/media/dvb/firesat/firesat_fe.c create mode 100644 drivers/media/dvb/firesat/firesat_iso.c Merging ubi/linux-next $ git merge ubi/linux-next Already up-to-date. Merging kvm/master $ git merge kvm/master Auto-merged arch/powerpc/kernel/asm-offsets.c Auto-merged arch/x86/kvm/Kconfig Merge made by recursive. arch/ia64/include/asm/kvm.h | 49 ++- arch/ia64/include/asm/kvm_host.h | 8 +- arch/ia64/kvm/Kconfig | 4 + arch/ia64/kvm/kvm-ia64.c | 100 ++++- arch/ia64/kvm/process.c | 15 - arch/ia64/kvm/vcpu.c | 39 +-- arch/ia64/kvm/vtlb.c | 5 - arch/powerpc/include/asm/kvm.h | 7 + arch/powerpc/include/asm/kvm_44x.h | 7 + arch/powerpc/include/asm/kvm_asm.h | 7 +- arch/powerpc/include/asm/kvm_e500.h | 67 +++ arch/powerpc/include/asm/kvm_host.h | 21 +- arch/powerpc/include/asm/kvm_ppc.h | 15 +- arch/powerpc/kernel/asm-offsets.c | 4 +- arch/powerpc/kvm/44x.c | 72 +--- arch/powerpc/kvm/44x_emulate.c | 217 +-------- arch/powerpc/kvm/44x_tlb.c | 39 ++- arch/powerpc/kvm/44x_tlb.h | 9 - arch/powerpc/kvm/Kconfig | 16 + arch/powerpc/kvm/Makefile | 10 + arch/powerpc/kvm/booke.c | 50 ++- arch/powerpc/kvm/booke.h | 35 +- arch/powerpc/kvm/booke_emulate.c | 266 +++++++++++ arch/powerpc/kvm/booke_interrupts.S | 5 + arch/powerpc/kvm/e500.c | 169 +++++++ arch/powerpc/kvm/e500_emulate.c | 196 ++++++++ arch/powerpc/kvm/e500_tlb.c | 737 +++++++++++++++++++++++++++++ arch/powerpc/kvm/e500_tlb.h | 184 ++++++++ arch/powerpc/kvm/emulate.c | 93 +++-- arch/powerpc/kvm/powerpc.c | 35 +-- arch/s390/include/asm/kvm.h | 7 + arch/s390/include/asm/kvm_host.h | 3 - arch/s390/kvm/Kconfig | 3 + arch/s390/kvm/kvm-s390.c | 8 +- arch/x86/include/asm/kvm.h | 23 + arch/x86/include/asm/kvm_host.h | 59 ++- arch/x86/include/asm/msr-index.h | 7 + arch/x86/include/asm/svm.h | 4 - arch/x86/include/asm/virtext.h | 2 +- arch/x86/include/asm/vmx.h | 5 +- arch/x86/kvm/Kconfig | 4 + arch/x86/kvm/i8254.c | 23 +- arch/x86/kvm/i8254.h | 2 + arch/x86/kvm/kvm_svm.h | 16 +- arch/x86/kvm/mmu.c | 217 +++++----- arch/x86/kvm/paging_tmpl.h | 213 ++++----- arch/x86/kvm/svm.c | 868 +++++++++++++++++++++++++++++++---- arch/x86/kvm/vmx.c | 303 ++++++++----- arch/x86/kvm/x86.c | 273 ++++++++---- arch/x86/kvm/x86_emulate.c | 56 ++- include/linux/kvm.h | 61 ++- include/linux/kvm_host.h | 25 +- include/linux/kvm_types.h | 13 - virt/kvm/ioapic.c | 6 + virt/kvm/irq_comm.c | 24 + virt/kvm/kvm_main.c | 67 +++- 56 files changed, 3683 insertions(+), 1090 deletions(-) create mode 100644 arch/powerpc/include/asm/kvm_e500.h create mode 100644 arch/powerpc/kvm/booke_emulate.c create mode 100644 arch/powerpc/kvm/e500.c create mode 100644 arch/powerpc/kvm/e500_emulate.c create mode 100644 arch/powerpc/kvm/e500_tlb.c create mode 100644 arch/powerpc/kvm/e500_tlb.h Merging dlm/next $ git merge dlm/next Merge made by recursive. fs/dlm/debug_fs.c | 696 ++++++++++++++++++++++++------------------------- fs/dlm/dlm_internal.h | 2 +- fs/dlm/lock.c | 26 +- fs/dlm/lockspace.c | 2 +- fs/dlm/recover.c | 10 +- 5 files changed, 357 insertions(+), 379 deletions(-) Merging scsi/master $ git merge scsi/master Merge made by recursive. drivers/message/fusion/lsi/mpi.h | 7 +- drivers/message/fusion/lsi/mpi_cnfg.h | 47 +++- drivers/message/fusion/lsi/mpi_fc.h | 2 +- drivers/message/fusion/lsi/mpi_history.txt | 86 ++++-- drivers/message/fusion/lsi/mpi_init.h | 2 +- drivers/message/fusion/lsi/mpi_ioc.h | 22 ++- drivers/message/fusion/lsi/mpi_lan.h | 2 +- drivers/message/fusion/lsi/mpi_log_fc.h | 2 +- drivers/message/fusion/lsi/mpi_log_sas.h | 37 ++- drivers/message/fusion/lsi/mpi_raid.h | 11 +- drivers/message/fusion/lsi/mpi_sas.h | 18 +- drivers/message/fusion/lsi/mpi_targ.h | 2 +- drivers/message/fusion/lsi/mpi_tool.h | 2 +- drivers/message/fusion/lsi/mpi_type.h | 4 +- drivers/message/fusion/mptbase.c | 87 +++++- drivers/message/fusion/mptbase.h | 3 + drivers/message/fusion/mptscsih.c | 3 + drivers/scsi/qla2xxx/qla_init.c | 58 +++-- drivers/scsi/qla2xxx/qla_mid.c | 1 + drivers/scsi/qla2xxx/qla_os.c | 7 +- drivers/scsi/scsi.c | 104 +++++++ drivers/scsi/scsi_debug.c | 443 +++++++++++++++++++++++++++- drivers/scsi/scsi_sysfs.c | 1 - drivers/scsi/ses.c | 31 +-- include/scsi/scsi_device.h | 1 + 25 files changed, 856 insertions(+), 127 deletions(-) Merging ocfs2/linux-next $ git merge ocfs2/linux-next Merge made by recursive. fs/configfs/dir.c | 59 +++++++++++++ fs/ocfs2/cluster/heartbeat.c | 96 +++++++++++++++++++++- fs/ocfs2/cluster/heartbeat.h | 3 +- fs/ocfs2/cluster/nodemanager.c | 9 ++- fs/ocfs2/journal.c | 12 --- fs/ocfs2/journal.h | 11 +++ fs/ocfs2/localalloc.c | 86 ------------------- fs/ocfs2/ocfs2.h | 6 +- fs/ocfs2/super.c | 176 ++++++++++++++++++++++++++++++++++++++++ fs/ocfs2/xattr.c | 17 ++-- 10 files changed, 359 insertions(+), 116 deletions(-) Merging ext4/next $ git merge ext4/next Already up-to-date. Merging async_tx/next $ git merge async_tx/next Already up-to-date. Merging udf/for_next $ git merge udf/for_next Merge made by recursive. Documentation/filesystems/udf.txt | 2 + fs/udf/balloc.c | 113 +++++----- fs/udf/dir.c | 14 +- fs/udf/directory.c | 38 ++-- fs/udf/ecma_167.h | 416 ++++++++++++++++++------------------ fs/udf/ialloc.c | 4 +- fs/udf/inode.c | 213 ++++++++++--------- fs/udf/misc.c | 29 ++-- fs/udf/namei.c | 86 ++++---- fs/udf/osta_udf.h | 22 +- fs/udf/partition.c | 2 +- fs/udf/super.c | 139 ++++++++----- fs/udf/truncate.c | 44 ++-- fs/udf/udf_i.h | 6 +- fs/udf/udf_sb.h | 4 + fs/udf/udfdecl.h | 46 +++-- fs/udf/udfend.h | 28 ++-- fs/udf/udftime.c | 6 +- fs/udf/unicode.c | 41 +++-- 19 files changed, 663 insertions(+), 590 deletions(-) Merging net/master $ git merge net/master Already up-to-date. Merging mtd/master $ git merge mtd/master Merge made by recursive. drivers/mtd/chips/map_rom.c | 8 ++++++++ drivers/mtd/lpddr/Kconfig | 1 + 2 files changed, 9 insertions(+), 0 deletions(-) Merging wireless/master $ git merge wireless/master Already up-to-date. Merging crypto/master $ git merge crypto/master Already up-to-date. Merging vfs/for-next $ git merge vfs/for-next Already up-to-date. Merging sound/for-next $ git merge sound/for-next Already uptodate! Merge made by recursive. Merging cpufreq/next $ git merge cpufreq/next Already up-to-date. Merging v9fs/for-next $ git merge v9fs/for-next Already up-to-date. Merging quilt/rr $ git merge quilt/rr Merge made by recursive. include/linux/module.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Merging cifs/master $ git merge cifs/master Merge made by recursive. fs/cifs/cifsencrypt.c | 18 ++++---- fs/cifs/cifsproto.h | 4 +- fs/cifs/connect.c | 4 +- fs/cifs/md5.c | 38 +++++++++--------- fs/cifs/md5.h | 6 +- fs/cifs/transport.c | 107 +++++++++---------------------------------------- 6 files changed, 53 insertions(+), 124 deletions(-) Merging mmc/next $ git merge mmc/next Already up-to-date. Merging gfs2/master $ git merge gfs2/master Removed fs/gfs2/locking.c Removed fs/gfs2/locking/dlm/Makefile Removed fs/gfs2/locking/dlm/lock.c Removed fs/gfs2/locking/dlm/lock_dlm.h Removed fs/gfs2/locking/dlm/main.c Removed fs/gfs2/locking/dlm/mount.c Removed fs/gfs2/locking/dlm/sysfs.c Removed fs/gfs2/locking/dlm/thread.c Removed fs/gfs2/mount.h Removed include/linux/lm_interface.h Merge made by recursive. fs/gfs2/Kconfig | 17 +- fs/gfs2/Makefile | 4 +- fs/gfs2/acl.c | 1 - fs/gfs2/bmap.c | 1 - fs/gfs2/dir.c | 1 - fs/gfs2/eaops.c | 1 - fs/gfs2/eattr.c | 1 - fs/gfs2/glock.c | 249 +++++---------- fs/gfs2/glock.h | 127 +++++++- fs/gfs2/glops.c | 14 - fs/gfs2/incore.h | 66 ++++- fs/gfs2/inode.c | 13 +- fs/gfs2/inode.h | 22 +- fs/gfs2/lock_dlm.c | 240 ++++++++++++++ fs/gfs2/locking.c | 232 ------------- fs/gfs2/locking/dlm/Makefile | 3 - fs/gfs2/locking/dlm/lock.c | 708 ---------------------------------------- fs/gfs2/locking/dlm/lock_dlm.h | 166 ---------- fs/gfs2/locking/dlm/main.c | 48 --- fs/gfs2/locking/dlm/mount.c | 276 ---------------- fs/gfs2/locking/dlm/sysfs.c | 226 ------------- fs/gfs2/locking/dlm/thread.c | 68 ---- fs/gfs2/log.c | 1 - fs/gfs2/lops.c | 1 - fs/gfs2/main.c | 13 +- fs/gfs2/meta_io.c | 1 - fs/gfs2/mount.c | 112 +------ fs/gfs2/mount.h | 17 - fs/gfs2/ops_address.c | 2 +- fs/gfs2/ops_dentry.c | 1 - fs/gfs2/ops_export.c | 1 - fs/gfs2/ops_file.c | 74 ++--- fs/gfs2/ops_fstype.c | 147 ++++++--- fs/gfs2/ops_inode.c | 1 - fs/gfs2/ops_super.c | 42 ++- fs/gfs2/quota.c | 203 ++++++------ fs/gfs2/quota.h | 2 + fs/gfs2/recovery.c | 28 +- fs/gfs2/rgrp.c | 1 - fs/gfs2/super.c | 1 - fs/gfs2/super.h | 26 +- fs/gfs2/sys.c | 156 +++++++++- fs/gfs2/trans.c | 3 +- fs/gfs2/util.c | 11 +- include/linux/lm_interface.h | 277 ---------------- 45 files changed, 1013 insertions(+), 2592 deletions(-) create mode 100644 fs/gfs2/lock_dlm.c delete mode 100644 fs/gfs2/locking.c delete mode 100644 fs/gfs2/locking/dlm/Makefile delete mode 100644 fs/gfs2/locking/dlm/lock.c delete mode 100644 fs/gfs2/locking/dlm/lock_dlm.h delete mode 100644 fs/gfs2/locking/dlm/main.c delete mode 100644 fs/gfs2/locking/dlm/mount.c delete mode 100644 fs/gfs2/locking/dlm/sysfs.c delete mode 100644 fs/gfs2/locking/dlm/thread.c delete mode 100644 fs/gfs2/mount.h delete mode 100644 include/linux/lm_interface.h Merging input/next $ git merge input/next Already up-to-date. Merging bkl-removal/bkl-removal $ git merge bkl-removal/bkl-removal Already up-to-date. Merging ubifs/linux-next $ git merge ubifs/linux-next 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 Already up-to-date. Merging embedded/master $ git merge embedded/master Already up-to-date. Merging firmware/master $ git merge firmware/master Removed drivers/media/dvb/ttpci/fdump.c Removed drivers/scsi/ql1040_fw.h Removed drivers/scsi/ql12160_fw.h Removed drivers/scsi/ql1280_fw.h Removed drivers/scsi/qlogicpti_asm.c Removed sound/isa/wavefront/yss225.c Merge made by recursive. drivers/media/dvb/ttpci/Kconfig | 23 +- drivers/media/dvb/ttpci/Makefile | 9 - drivers/media/dvb/ttpci/av7110.c | 16 - drivers/media/dvb/ttpci/av7110_hw.c | 35 +- drivers/media/dvb/ttpci/av7110_hw.h | 3 +- drivers/media/dvb/ttpci/fdump.c | 44 - drivers/scsi/advansys.c | 1731 ++----------------- drivers/scsi/ql1040_fw.h | 2130 ---------------------- drivers/scsi/ql12160_fw.h | 1811 ------------------- drivers/scsi/ql1280_fw.h | 2048 --------------------- drivers/scsi/qla1280.c | 114 +- drivers/scsi/qla1280.h | 6 + drivers/scsi/qlogicpti.c | 63 +- drivers/scsi/qlogicpti_asm.c | 1160 ------------ firmware/.gitignore | 1 + firmware/Makefile | 29 +- firmware/WHENCE | 59 + firmware/advansys/3550.bin.ihex | 317 ++++ firmware/advansys/38C0800.bin.ihex | 336 ++++ firmware/advansys/38C1600.bin.ihex | 398 +++++ firmware/advansys/mcode.bin.ihex | 147 ++ firmware/av7110/Boot.S | 109 ++ firmware/av7110/bootcode.bin.ihex | 15 + {scripts => firmware}/ihex2fw.c | 0 firmware/qlogic/1040.bin.ihex | 2111 ++++++++++++++++++++++ firmware/qlogic/12160.bin.ihex | 1771 +++++++++++++++++++ firmware/qlogic/1280.bin.ihex | 2008 +++++++++++++++++++++ firmware/qlogic/isp1000.bin.ihex | 1158 ++++++++++++ firmware/yamaha/yss225_registers.bin.ihex | 998 +++++++++++ scripts/.gitignore | 1 - scripts/Makefile | 3 +- sound/isa/Kconfig | 10 - sound/isa/wavefront/wavefront_fx.c | 16 - sound/isa/wavefront/yss225.c | 2739 ----------------------------- 34 files changed, 9695 insertions(+), 11724 deletions(-) delete mode 100644 drivers/media/dvb/ttpci/fdump.c delete mode 100644 drivers/scsi/ql1040_fw.h delete mode 100644 drivers/scsi/ql12160_fw.h delete mode 100644 drivers/scsi/ql1280_fw.h delete mode 100644 drivers/scsi/qlogicpti_asm.c create mode 100644 firmware/advansys/3550.bin.ihex create mode 100644 firmware/advansys/38C0800.bin.ihex create mode 100644 firmware/advansys/38C1600.bin.ihex create mode 100644 firmware/advansys/mcode.bin.ihex create mode 100644 firmware/av7110/Boot.S create mode 100644 firmware/av7110/bootcode.bin.ihex rename {scripts => firmware}/ihex2fw.c (100%) create mode 100644 firmware/qlogic/1040.bin.ihex create mode 100644 firmware/qlogic/12160.bin.ihex create mode 100644 firmware/qlogic/1280.bin.ihex create mode 100644 firmware/qlogic/isp1000.bin.ihex create mode 100644 firmware/yamaha/yss225_registers.bin.ihex delete mode 100644 sound/isa/wavefront/yss225.c Merging pcmcia/master $ git merge pcmcia/master Already up-to-date. Merging battery/master $ git merge battery/master Already up-to-date. Merging leds/for-mm $ git merge leds/for-mm Merge made by recursive. Documentation/powerpc/dts-bindings/gpio/led.txt | 46 ++++- drivers/leds/Kconfig | 28 +++- drivers/leds/Makefile | 3 + drivers/leds/led-class.c | 21 +++- drivers/leds/leds-dac124s085.c | 150 +++++++++++++++++ drivers/leds/leds-gpio.c | 205 ++++++++++++++++++----- drivers/leds/leds.h | 4 +- drivers/leds/ledtrig-default-on.c | 2 +- drivers/leds/ledtrig-heartbeat.c | 4 +- drivers/leds/ledtrig-ide-disk.c | 3 +- drivers/leds/ledtrig-timer.c | 2 +- include/linux/leds.h | 1 + 12 files changed, 408 insertions(+), 61 deletions(-) create mode 100644 drivers/leds/leds-dac124s085.c Merging backlight/for-mm $ git merge backlight/for-mm Merge made by recursive. drivers/video/backlight/mbp_nvidia_bl.c | 191 +++++++++++++++++++++++++------ 1 files changed, 155 insertions(+), 36 deletions(-) Merging kgdb/kgdb-next $ git merge kgdb/kgdb-next Merge made by recursive. include/linux/kgdb.h | 42 ++++++++++++++++++++++++++++++++++++++++-- kernel/kgdb.c | 6 +++--- 2 files changed, 43 insertions(+), 5 deletions(-) Merging slab/for-next $ git merge slab/for-next Already up-to-date. Merging uclinux/for-next $ git merge uclinux/for-next Already up-to-date. Merging md/for-next $ git merge md/for-next Already up-to-date. Merging kmemcheck/auto-kmemcheck-next $ git merge kmemcheck/auto-kmemcheck-next Auto-merged MAINTAINERS CONFLICT (content): Merge conflict in MAINTAINERS Auto-merged arch/x86/Kconfig.debug Auto-merged arch/x86/Makefile Auto-merged arch/x86/kernel/traps.c Auto-merged arch/x86/mm/fault.c Auto-merged arch/x86/mm/init_32.c Auto-merged arch/x86/mm/init_64.c Auto-merged include/linux/gfp.h Auto-merged include/linux/interrupt.h Auto-merged include/linux/mm_types.h Auto-merged include/linux/slab_def.h Auto-merged init/main.c Auto-merged kernel/fork.c CONFLICT (content): Merge conflict in kernel/fork.c Auto-merged kernel/softirq.c Auto-merged kernel/sysctl.c Auto-merged mm/Makefile Auto-merged mm/slab.c Auto-merged mm/slub.c Resolved 'MAINTAINERS' using previous resolution. Resolved 'kernel/fork.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 0c75f6f: Merge commit 'kmemcheck/auto-kmemcheck-next' $ git diff -M --stat --summary HEAD^.. Documentation/kmemcheck.txt | 129 ++++++ MAINTAINERS | 8 + arch/x86/Kconfig.debug | 88 +++++ arch/x86/Makefile | 5 + arch/x86/include/asm/dma-mapping.h | 2 + arch/x86/include/asm/pgtable.h | 4 +- arch/x86/include/asm/pgtable_32.h | 6 + arch/x86/include/asm/pgtable_64.h | 6 + arch/x86/include/asm/string_32.h | 8 + arch/x86/include/asm/string_64.h | 8 + arch/x86/kernel/head_32.S | 2 +- arch/x86/kernel/process.c | 2 +- arch/x86/kernel/stacktrace.c | 7 + arch/x86/kernel/traps.c | 5 + arch/x86/mm/Makefile | 2 + arch/x86/mm/fault.c | 18 +- arch/x86/mm/init_32.c | 4 +- arch/x86/mm/init_64.c | 2 +- arch/x86/mm/kmemcheck/Makefile | 1 + arch/x86/mm/kmemcheck/error.c | 229 +++++++++++ arch/x86/mm/kmemcheck/error.h | 15 + arch/x86/mm/kmemcheck/kmemcheck.c | 752 ++++++++++++++++++++++++++++++++++++ arch/x86/mm/kmemcheck/opcode.c | 90 +++++ arch/x86/mm/kmemcheck/opcode.h | 10 + arch/x86/mm/kmemcheck/pte.c | 22 + arch/x86/mm/kmemcheck/pte.h | 10 + arch/x86/mm/kmemcheck/shadow.c | 124 ++++++ arch/x86/mm/kmemcheck/shadow.h | 16 + include/asm-x86/kmemcheck.h | 42 ++ include/linux/gfp.h | 3 +- include/linux/interrupt.h | 14 + include/linux/kmemcheck.h | 86 ++++ include/linux/mm_types.h | 8 + include/linux/slab.h | 7 + include/linux/slab_def.h | 81 ++++ include/linux/stacktrace.h | 3 + init/main.c | 4 + kernel/fork.c | 14 +- kernel/softirq.c | 11 + kernel/sysctl.c | 11 + mm/Makefile | 1 + mm/kmemcheck.c | 103 +++++ mm/slab.c | 101 +---- mm/slub.c | 20 +- 44 files changed, 1981 insertions(+), 103 deletions(-) create mode 100644 Documentation/kmemcheck.txt create mode 100644 arch/x86/mm/kmemcheck/Makefile create mode 100644 arch/x86/mm/kmemcheck/error.c create mode 100644 arch/x86/mm/kmemcheck/error.h create mode 100644 arch/x86/mm/kmemcheck/kmemcheck.c create mode 100644 arch/x86/mm/kmemcheck/opcode.c create mode 100644 arch/x86/mm/kmemcheck/opcode.h create mode 100644 arch/x86/mm/kmemcheck/pte.c create mode 100644 arch/x86/mm/kmemcheck/pte.h create mode 100644 arch/x86/mm/kmemcheck/shadow.c create mode 100644 arch/x86/mm/kmemcheck/shadow.h create mode 100644 include/asm-x86/kmemcheck.h create mode 100644 include/linux/kmemcheck.h create mode 100644 mm/kmemcheck.c Merging generic-ipi/auto-generic-ipi-next $ git merge generic-ipi/auto-generic-ipi-next Already up-to-date. Merging mfd/for-next $ git merge mfd/for-next Auto-merged drivers/mfd/twl4030-core.c Merge made by recursive. drivers/input/misc/Kconfig | 7 + drivers/input/misc/Makefile | 1 + drivers/input/misc/pcf50633-input.c | 132 ++++++ drivers/mfd/Kconfig | 23 + drivers/mfd/Makefile | 4 + drivers/mfd/dm355evm_msp.c | 10 + drivers/mfd/pcf50633-adc.c | 277 +++++++++++++ drivers/mfd/pcf50633-core.c | 710 ++++++++++++++++++++++++++++++++ drivers/mfd/pcf50633-gpio.c | 118 ++++++ drivers/mfd/sm501.c | 30 ++- drivers/mfd/twl4030-core.c | 3 + drivers/power/Kconfig | 6 + drivers/power/Makefile | 1 + drivers/power/pcf50633-charger.c | 358 ++++++++++++++++ drivers/regulator/Kconfig | 7 + drivers/regulator/Makefile | 1 + drivers/regulator/pcf50633-regulator.c | 329 +++++++++++++++ drivers/rtc/Kconfig | 7 + drivers/rtc/Makefile | 1 + drivers/rtc/rtc-pcf50633.c | 344 +++++++++++++++ include/linux/mfd/pcf50633/adc.h | 72 ++++ include/linux/mfd/pcf50633/core.h | 218 ++++++++++ include/linux/mfd/pcf50633/gpio.h | 52 +++ include/linux/mfd/pcf50633/mbc.h | 134 ++++++ include/linux/mfd/pcf50633/pmic.h | 67 +++ 25 files changed, 2910 insertions(+), 2 deletions(-) create mode 100644 drivers/input/misc/pcf50633-input.c create mode 100644 drivers/mfd/pcf50633-adc.c create mode 100644 drivers/mfd/pcf50633-core.c create mode 100644 drivers/mfd/pcf50633-gpio.c create mode 100644 drivers/power/pcf50633-charger.c create mode 100644 drivers/regulator/pcf50633-regulator.c create mode 100644 drivers/rtc/rtc-pcf50633.c create mode 100644 include/linux/mfd/pcf50633/adc.h create mode 100644 include/linux/mfd/pcf50633/core.h create mode 100644 include/linux/mfd/pcf50633/gpio.h create mode 100644 include/linux/mfd/pcf50633/mbc.h create mode 100644 include/linux/mfd/pcf50633/pmic.h $ git reset --hard HEAD^ HEAD is now at 0c75f6f Merge commit 'kmemcheck/auto-kmemcheck-next' Merging hdlc/hdlc-next $ git merge hdlc/hdlc-next Already up-to-date. Merging drm/drm-next $ git merge drm/drm-next Merge made by recursive. drivers/gpu/drm/drm_irq.c | 18 +++++++++++++++--- drivers/gpu/drm/i915/i915_dma.c | 8 ++++++++ drivers/gpu/drm/i915/i915_irq.c | 6 ++++++ 3 files changed, 29 insertions(+), 3 deletions(-) Merging voltage/for-next $ git merge voltage/for-next Auto-merged drivers/Makefile Merge made by recursive. Merging security-testing/next $ git merge security-testing/next Auto-merged MAINTAINERS Merge made by recursive. MAINTAINERS | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) Merging lblnet/master $ git merge lblnet/master Already up-to-date. Merging quilt/ttydev $ git merge quilt/ttydev Auto-merged drivers/char/pty.c Merge made by recursive. drivers/char/pty.c | 4 +--- drivers/serial/jsm/jsm_neo.c | 3 --- drivers/usb/serial/usb-serial.c | 3 --- 3 files changed, 1 insertions(+), 9 deletions(-) Merging agp/agp-next $ git merge agp/agp-next Already up-to-date. Merging oprofile/auto-oprofile-next $ git merge oprofile/auto-oprofile-next Already uptodate! Merge made by recursive. Merging fastboot/auto-fastboot-next $ git merge fastboot/auto-fastboot-next Already up-to-date. Merging sparseirq/auto-sparseirq-next $ git merge sparseirq/auto-sparseirq-next Already uptodate! Merge made by recursive. Merging iommu/auto-iommu-next $ git merge iommu/auto-iommu-next Auto-merged lib/swiotlb.c Merge made by recursive. Merging uwb/for-upstream $ git merge uwb/for-upstream Auto-merged drivers/usb/wusbcore/rh.c Merge made by recursive. drivers/usb/host/whci/asl.c | 9 +++++++-- drivers/usb/host/whci/hw.c | 15 +++++++++++++++ drivers/usb/host/whci/pzl.c | 9 +++++++-- drivers/usb/host/whci/whcd.h | 1 + drivers/usb/wusbcore/devconnect.c | 1 + drivers/usb/wusbcore/rh.c | 3 +++ drivers/uwb/allocator.c | 1 - drivers/uwb/rsv.c | 17 +++++++++++++---- 8 files changed, 47 insertions(+), 9 deletions(-) Merging watchdog/master $ git merge watchdog/master Merge made by recursive. arch/powerpc/boot/dts/gef_sbc610.dts | 15 + arch/powerpc/configs/86xx/gef_sbc610_defconfig | 1 + drivers/watchdog/Kconfig | 14 + drivers/watchdog/Makefile | 2 + drivers/watchdog/gef_wdt.c | 330 ++++++++++++++++++++++++ drivers/watchdog/pika_wdt.c | 301 +++++++++++++++++++++ drivers/watchdog/wm8350_wdt.c | 6 +- 7 files changed, 666 insertions(+), 3 deletions(-) create mode 100644 drivers/watchdog/gef_wdt.c create mode 100644 drivers/watchdog/pika_wdt.c Merging proc/proc $ git merge proc/proc Already up-to-date. Merging bdev/master $ git merge bdev/master Already up-to-date. Merging dwmw2-iommu/master $ git merge dwmw2-iommu/master Auto-merged drivers/pci/intel-iommu.c CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c Auto-merged include/linux/dma_remapping.h CONFLICT (content): Merge conflict in include/linux/dma_remapping.h Auto-merged include/linux/intel-iommu.h Resolved 'drivers/pci/intel-iommu.c' using previous resolution. Resolved 'include/linux/dma_remapping.h' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit f2b67ea: Merge commit 'dwmw2-iommu/master' $ git diff -M --stat --summary HEAD^.. Merging cputime/cputime $ git merge cputime/cputime Already up-to-date. Merging osd/linux-next $ git merge osd/linux-next Auto-merged MAINTAINERS Merge made by recursive. Documentation/devices.txt | 6 + Documentation/scsi/osd.txt | 198 +++++ MAINTAINERS | 10 + drivers/scsi/Kconfig | 2 + drivers/scsi/Makefile | 2 + drivers/scsi/osd/Kbuild | 45 + drivers/scsi/osd/Kconfig | 53 ++ drivers/scsi/osd/Makefile | 37 + drivers/scsi/osd/osd_debug.h | 30 + drivers/scsi/osd/osd_initiator.c | 1646 ++++++++++++++++++++++++++++++++++++++ drivers/scsi/osd/osd_uld.c | 452 +++++++++++ drivers/scsi/scsi_scan.c | 1 + include/linux/major.h | 1 + include/scsi/osd_attributes.h | 327 ++++++++ include/scsi/osd_initiator.h | 428 ++++++++++ include/scsi/osd_protocol.h | 579 ++++++++++++++ include/scsi/osd_sec.h | 45 + include/scsi/osd_sense.h | 260 ++++++ include/scsi/osd_types.h | 40 + include/scsi/scsi.h | 1 + 20 files changed, 4163 insertions(+), 0 deletions(-) create mode 100644 Documentation/scsi/osd.txt create mode 100644 drivers/scsi/osd/Kbuild create mode 100644 drivers/scsi/osd/Kconfig create mode 100755 drivers/scsi/osd/Makefile create mode 100644 drivers/scsi/osd/osd_debug.h create mode 100644 drivers/scsi/osd/osd_initiator.c create mode 100644 drivers/scsi/osd/osd_uld.c create mode 100644 include/scsi/osd_attributes.h create mode 100644 include/scsi/osd_initiator.h create mode 100644 include/scsi/osd_protocol.h create mode 100644 include/scsi/osd_sec.h create mode 100644 include/scsi/osd_sense.h create mode 100644 include/scsi/osd_types.h Merging fatfs/master $ git merge fatfs/master Already up-to-date. Merging fuse/for-next $ git merge fuse/for-next Already up-to-date. Merging jc_docs/docs-next $ git merge jc_docs/docs-next Already up-to-date. Merging nommu/master $ git merge nommu/master Already up-to-date. Merging trivial/for-next $ git merge trivial/for-next Merge made by recursive. Documentation/filesystems/ext3.txt | 14 ++++++++++++-- drivers/isdn/mISDN/l1oip_codec.c | 2 +- drivers/net/wireless/ath9k/rc.c | 2 +- drivers/usb/wusbcore/security.c | 2 +- mm/page_alloc.c | 2 +- 5 files changed, 16 insertions(+), 6 deletions(-) Merging squashfs/master $ git merge squashfs/master 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. Merging master_tmp $ git merge master_tmp Removed arch/mips/alchemy/common/au1xxx_irqmap.c Removed arch/mips/alchemy/common/cputable.c Removed arch/mips/alchemy/db1x00/init.c Removed arch/mips/alchemy/pb1000/init.c Removed arch/mips/alchemy/pb1000/irqmap.c Removed arch/mips/alchemy/pb1100/init.c Removed arch/mips/alchemy/pb1100/irqmap.c Removed arch/mips/alchemy/pb1200/init.c Removed arch/mips/alchemy/pb1500/init.c Removed arch/mips/alchemy/pb1500/irqmap.c Removed arch/mips/alchemy/pb1550/irqmap.c Auto-merged arch/x86/mm/fault.c Auto-merged drivers/mfd/twl4030-core.c Auto-merged firmware/Makefile Auto-merged firmware/WHENCE Auto-merged kernel/Makefile Auto-merged kernel/sched.c Merge made by recursive. arch/mips/Kconfig | 71 +- arch/mips/Makefile | 40 +- arch/mips/alchemy/Kconfig | 5 +- arch/mips/alchemy/common/Makefile | 4 +- arch/mips/alchemy/common/au1xxx_irqmap.c | 205 -- arch/mips/alchemy/common/clocks.c | 65 +- arch/mips/alchemy/common/cputable.c | 52 - arch/mips/alchemy/common/dbdma.c | 65 + arch/mips/alchemy/common/irq.c | 745 ++++---- arch/mips/alchemy/common/power.c | 406 +---- arch/mips/alchemy/common/reset.c | 2 - arch/mips/alchemy/common/setup.c | 71 +- arch/mips/alchemy/common/sleeper.S | 118 +- arch/mips/alchemy/common/time.c | 311 +-- arch/mips/alchemy/db1x00/init.c | 62 - arch/mips/alchemy/devboards/Makefile | 18 + arch/mips/alchemy/{ => devboards}/db1x00/Makefile | 2 +- .../alchemy/{ => devboards}/db1x00/board_setup.c | 37 + arch/mips/alchemy/{ => devboards}/db1x00/irqmap.c | 24 +- arch/mips/alchemy/{ => devboards}/pb1000/Makefile | 2 +- .../alchemy/{ => devboards}/pb1000/board_setup.c | 30 +- arch/mips/alchemy/{ => devboards}/pb1100/Makefile | 2 +- .../alchemy/{ => devboards}/pb1100/board_setup.c | 47 + arch/mips/alchemy/{ => devboards}/pb1200/Makefile | 3 +- .../alchemy/{ => devboards}/pb1200/board_setup.c | 34 +- arch/mips/alchemy/{ => devboards}/pb1200/irqmap.c | 94 +- .../mips/alchemy/{ => devboards}/pb1200/platform.c | 0 arch/mips/alchemy/{ => devboards}/pb1500/Makefile | 2 +- .../alchemy/{ => devboards}/pb1500/board_setup.c | 44 + arch/mips/alchemy/{ => devboards}/pb1550/Makefile | 2 +- .../alchemy/{ => devboards}/pb1550/board_setup.c | 34 + arch/mips/alchemy/devboards/pm.c | 229 +++ .../alchemy/{pb1550/init.c => devboards/prom.c} | 26 +- arch/mips/alchemy/mtx-1/board_setup.c | 12 + arch/mips/alchemy/mtx-1/init.c | 2 +- arch/mips/alchemy/mtx-1/irqmap.c | 18 +- arch/mips/alchemy/pb1000/init.c | 57 - arch/mips/alchemy/pb1000/irqmap.c | 38 - arch/mips/alchemy/pb1100/init.c | 60 - arch/mips/alchemy/pb1100/irqmap.c | 40 - arch/mips/alchemy/pb1200/init.c | 58 - arch/mips/alchemy/pb1500/init.c | 58 - arch/mips/alchemy/pb1500/irqmap.c | 46 - arch/mips/alchemy/pb1550/irqmap.c | 43 - arch/mips/alchemy/xxs1500/board_setup.c | 12 + arch/mips/alchemy/xxs1500/init.c | 2 +- arch/mips/alchemy/xxs1500/irqmap.c | 31 +- arch/mips/cavium-octeon/Kconfig | 85 + arch/mips/cavium-octeon/Makefile | 16 + arch/mips/cavium-octeon/csrc-octeon.c | 58 + arch/mips/cavium-octeon/dma-octeon.c | 32 + arch/mips/cavium-octeon/executive/Makefile | 13 + arch/mips/cavium-octeon/executive/cvmx-bootmem.c | 586 ++++++ arch/mips/cavium-octeon/executive/cvmx-l2c.c | 734 +++++++ arch/mips/cavium-octeon/executive/cvmx-sysinfo.c | 116 ++ arch/mips/cavium-octeon/executive/octeon-model.c | 358 ++++ arch/mips/cavium-octeon/flash_setup.c | 84 + arch/mips/cavium-octeon/octeon-irq.c | 497 +++++ arch/mips/cavium-octeon/octeon-memcpy.S | 521 +++++ arch/mips/cavium-octeon/serial.c | 136 ++ arch/mips/cavium-octeon/setup.c | 929 +++++++++ arch/mips/cavium-octeon/smp.c | 211 ++ arch/mips/configs/cavium-octeon_defconfig | 943 +++++++++ arch/mips/include/asm/cpu-features.h | 3 + arch/mips/include/asm/cpu.h | 14 + arch/mips/include/asm/hazards.h | 4 +- arch/mips/include/asm/io.h | 14 + arch/mips/include/asm/mach-au1x00/au1000.h | 89 +- arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h | 5 + .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 78 + .../include/asm/mach-cavium-octeon/dma-coherence.h | 64 + arch/mips/include/asm/mach-cavium-octeon/irq.h | 244 +++ .../asm/mach-cavium-octeon/kernel-entry-init.h | 131 ++ arch/mips/include/asm/mach-cavium-octeon/war.h | 26 + arch/mips/include/asm/mach-generic/dma-coherence.h | 26 +- arch/mips/include/asm/mach-ip27/dma-coherence.h | 26 +- arch/mips/include/asm/mach-ip32/dma-coherence.h | 26 +- arch/mips/include/asm/mach-jazz/dma-coherence.h | 26 +- arch/mips/include/asm/mach-lemote/dma-coherence.h | 26 +- arch/mips/include/asm/mipsregs.h | 22 + arch/mips/include/asm/module.h | 2 + arch/mips/include/asm/octeon/cvmx-asm.h | 128 ++ arch/mips/include/asm/octeon/cvmx-bootinfo.h | 262 +++ arch/mips/include/asm/octeon/cvmx-bootmem.h | 288 +++ arch/mips/include/asm/octeon/cvmx-ciu-defs.h | 1616 ++++++++++++++++ arch/mips/include/asm/octeon/cvmx-gpio-defs.h | 219 +++ arch/mips/include/asm/octeon/cvmx-iob-defs.h | 530 ++++++ arch/mips/include/asm/octeon/cvmx-ipd-defs.h | 877 +++++++++ arch/mips/include/asm/octeon/cvmx-l2c-defs.h | 963 ++++++++++ arch/mips/include/asm/octeon/cvmx-l2c.h | 325 ++++ arch/mips/include/asm/octeon/cvmx-l2d-defs.h | 369 ++++ arch/mips/include/asm/octeon/cvmx-l2t-defs.h | 141 ++ arch/mips/include/asm/octeon/cvmx-led-defs.h | 240 +++ arch/mips/include/asm/octeon/cvmx-mio-defs.h | 2004 ++++++++++++++++++++ arch/mips/include/asm/octeon/cvmx-packet.h | 61 + arch/mips/include/asm/octeon/cvmx-pow-defs.h | 698 +++++++ arch/mips/include/asm/octeon/cvmx-spinlock.h | 232 +++ arch/mips/include/asm/octeon/cvmx-sysinfo.h | 152 ++ arch/mips/include/asm/octeon/cvmx.h | 505 +++++ arch/mips/include/asm/octeon/octeon-feature.h | 119 ++ arch/mips/include/asm/octeon/octeon-model.h | 321 ++++ arch/mips/include/asm/octeon/octeon.h | 248 +++ arch/mips/include/asm/processor.h | 69 + arch/mips/include/asm/ptrace.h | 4 + arch/mips/include/asm/smp.h | 3 + arch/mips/include/asm/stackframe.h | 17 + arch/mips/include/asm/time.h | 24 +- arch/mips/kernel/Makefile | 5 +- arch/mips/kernel/asm-offsets.c | 31 + arch/mips/kernel/branch.c | 33 + arch/mips/kernel/cevt-r4k.c | 2 +- arch/mips/kernel/cpu-probe.c | 31 +- arch/mips/kernel/csrc-r4k.c | 2 +- arch/mips/kernel/genex.S | 4 + arch/mips/kernel/irq.c | 1 + arch/mips/kernel/octeon_switch.S | 506 +++++ arch/mips/kernel/ptrace32.c | 64 +- arch/mips/kernel/traps.c | 21 + arch/mips/lib/Makefile | 1 + arch/mips/mm/Makefile | 1 + arch/mips/mm/c-octeon.c | 307 +++ arch/mips/mm/cache.c | 6 + arch/mips/mm/cex-oct.S | 70 + arch/mips/mm/dma-default.c | 25 +- arch/mips/mm/tlb-r4k.c | 5 +- arch/mips/mm/tlbex.c | 1 + arch/x86/include/asm/mach-default/mach_wakecpu.h | 6 + arch/x86/include/asm/mtrr.h | 10 +- arch/x86/kernel/apic.c | 1 + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 25 +- arch/x86/kernel/mpparse.c | 1 + arch/x86/mm/fault.c | 2 +- drivers/input/misc/Kconfig | 7 + drivers/input/misc/Makefile | 1 + drivers/input/misc/pcf50633-input.c | 132 ++ drivers/isdn/hardware/mISDN/hfcpci.c | 2 +- drivers/isdn/mISDN/dsp_cmx.c | 5 +- drivers/isdn/mISDN/dsp_pipeline.c | 4 +- drivers/mfd/Kconfig | 23 + drivers/mfd/Makefile | 4 + drivers/mfd/dm355evm_msp.c | 10 + drivers/mfd/pcf50633-adc.c | 277 +++ drivers/mfd/pcf50633-core.c | 710 +++++++ drivers/mfd/pcf50633-gpio.c | 118 ++ drivers/mfd/sm501.c | 30 +- drivers/mfd/twl4030-core.c | 3 + drivers/power/Kconfig | 6 + drivers/power/Makefile | 1 + drivers/power/pcf50633-charger.c | 358 ++++ drivers/regulator/Kconfig | 7 + drivers/regulator/Makefile | 1 + drivers/regulator/pcf50633-regulator.c | 329 ++++ drivers/rtc/Kconfig | 7 + drivers/rtc/Makefile | 1 + drivers/rtc/rtc-pcf50633.c | 344 ++++ drivers/usb/serial/ti_usb_3410_5052.c | 73 +- drivers/usb/serial/ti_usb_3410_5052.h | 8 + firmware/Makefile | 3 +- firmware/WHENCE | 16 +- firmware/mts_cdma.fw.ihex | 867 +++++++++ firmware/mts_edge.fw.ihex | 881 +++++++++ firmware/mts_gsm.fw.ihex | 867 +++++++++ include/linux/mISDNif.h | 5 +- include/linux/mfd/pcf50633/adc.h | 72 + include/linux/mfd/pcf50633/core.h | 218 +++ include/linux/mfd/pcf50633/gpio.h | 52 + include/linux/mfd/pcf50633/mbc.h | 134 ++ include/linux/mfd/pcf50633/pmic.h | 67 + include/linux/smp.h | 13 +- kernel/Makefile | 6 +- kernel/async.c | 21 +- kernel/rcutorture.c | 113 +- kernel/sched.c | 13 +- kernel/sched_debug.c | 21 +- kernel/up.c | 20 + scripts/markup_oops.pl | 59 +- 176 files changed, 24805 insertions(+), 2154 deletions(-) delete mode 100644 arch/mips/alchemy/common/au1xxx_irqmap.c delete mode 100644 arch/mips/alchemy/common/cputable.c delete mode 100644 arch/mips/alchemy/db1x00/init.c create mode 100644 arch/mips/alchemy/devboards/Makefile rename arch/mips/alchemy/{ => devboards}/db1x00/Makefile (81%) rename arch/mips/alchemy/{ => devboards}/db1x00/board_setup.c (80%) rename arch/mips/alchemy/{ => devboards}/db1x00/irqmap.c (77%) rename arch/mips/alchemy/{ => devboards}/pb1000/Makefile (81%) rename arch/mips/alchemy/{ => devboards}/pb1000/board_setup.c (90%) rename arch/mips/alchemy/{ => devboards}/pb1100/Makefile (81%) rename arch/mips/alchemy/{ => devboards}/pb1100/board_setup.c (76%) rename arch/mips/alchemy/{ => devboards}/pb1200/Makefile (61%) rename arch/mips/alchemy/{ => devboards}/pb1200/board_setup.c (93%) rename arch/mips/alchemy/{ => devboards}/pb1200/irqmap.c (64%) rename arch/mips/alchemy/{ => devboards}/pb1200/platform.c (100%) rename arch/mips/alchemy/{ => devboards}/pb1500/Makefile (81%) rename arch/mips/alchemy/{ => devboards}/pb1500/board_setup.c (79%) rename arch/mips/alchemy/{ => devboards}/pb1550/Makefile (81%) rename arch/mips/alchemy/{ => devboards}/pb1550/board_setup.c (72%) create mode 100644 arch/mips/alchemy/devboards/pm.c rename arch/mips/alchemy/{pb1550/init.c => devboards/prom.c} (71%) delete mode 100644 arch/mips/alchemy/pb1000/init.c delete mode 100644 arch/mips/alchemy/pb1000/irqmap.c delete mode 100644 arch/mips/alchemy/pb1100/init.c delete mode 100644 arch/mips/alchemy/pb1100/irqmap.c delete mode 100644 arch/mips/alchemy/pb1200/init.c delete mode 100644 arch/mips/alchemy/pb1500/init.c delete mode 100644 arch/mips/alchemy/pb1500/irqmap.c delete mode 100644 arch/mips/alchemy/pb1550/irqmap.c create mode 100644 arch/mips/cavium-octeon/Kconfig create mode 100644 arch/mips/cavium-octeon/Makefile create mode 100644 arch/mips/cavium-octeon/csrc-octeon.c create mode 100644 arch/mips/cavium-octeon/dma-octeon.c create mode 100644 arch/mips/cavium-octeon/executive/Makefile create mode 100644 arch/mips/cavium-octeon/executive/cvmx-bootmem.c create mode 100644 arch/mips/cavium-octeon/executive/cvmx-l2c.c create mode 100644 arch/mips/cavium-octeon/executive/cvmx-sysinfo.c create mode 100644 arch/mips/cavium-octeon/executive/octeon-model.c create mode 100644 arch/mips/cavium-octeon/flash_setup.c create mode 100644 arch/mips/cavium-octeon/octeon-irq.c create mode 100644 arch/mips/cavium-octeon/octeon-memcpy.S create mode 100644 arch/mips/cavium-octeon/serial.c create mode 100644 arch/mips/cavium-octeon/setup.c create mode 100644 arch/mips/cavium-octeon/smp.c create mode 100644 arch/mips/configs/cavium-octeon_defconfig create mode 100644 arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h create mode 100644 arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h create mode 100644 arch/mips/include/asm/mach-cavium-octeon/irq.h create mode 100644 arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h create mode 100644 arch/mips/include/asm/mach-cavium-octeon/war.h create mode 100644 arch/mips/include/asm/octeon/cvmx-asm.h create mode 100644 arch/mips/include/asm/octeon/cvmx-bootinfo.h create mode 100644 arch/mips/include/asm/octeon/cvmx-bootmem.h create mode 100644 arch/mips/include/asm/octeon/cvmx-ciu-defs.h create mode 100644 arch/mips/include/asm/octeon/cvmx-gpio-defs.h create mode 100644 arch/mips/include/asm/octeon/cvmx-iob-defs.h create mode 100644 arch/mips/include/asm/octeon/cvmx-ipd-defs.h create mode 100644 arch/mips/include/asm/octeon/cvmx-l2c-defs.h create mode 100644 arch/mips/include/asm/octeon/cvmx-l2c.h create mode 100644 arch/mips/include/asm/octeon/cvmx-l2d-defs.h create mode 100644 arch/mips/include/asm/octeon/cvmx-l2t-defs.h create mode 100644 arch/mips/include/asm/octeon/cvmx-led-defs.h create mode 100644 arch/mips/include/asm/octeon/cvmx-mio-defs.h create mode 100644 arch/mips/include/asm/octeon/cvmx-packet.h create mode 100644 arch/mips/include/asm/octeon/cvmx-pow-defs.h create mode 100644 arch/mips/include/asm/octeon/cvmx-spinlock.h create mode 100644 arch/mips/include/asm/octeon/cvmx-sysinfo.h create mode 100644 arch/mips/include/asm/octeon/cvmx.h create mode 100644 arch/mips/include/asm/octeon/octeon-feature.h create mode 100644 arch/mips/include/asm/octeon/octeon-model.h create mode 100644 arch/mips/include/asm/octeon/octeon.h create mode 100644 arch/mips/kernel/octeon_switch.S create mode 100644 arch/mips/mm/c-octeon.c create mode 100644 arch/mips/mm/cex-oct.S create mode 100644 drivers/input/misc/pcf50633-input.c create mode 100644 drivers/mfd/pcf50633-adc.c create mode 100644 drivers/mfd/pcf50633-core.c create mode 100644 drivers/mfd/pcf50633-gpio.c create mode 100644 drivers/power/pcf50633-charger.c create mode 100644 drivers/regulator/pcf50633-regulator.c create mode 100644 drivers/rtc/rtc-pcf50633.c create mode 100644 firmware/mts_cdma.fw.ihex create mode 100644 firmware/mts_edge.fw.ihex create mode 100644 firmware/mts_gsm.fw.ihex create mode 100644 include/linux/mfd/pcf50633/adc.h create mode 100644 include/linux/mfd/pcf50633/core.h create mode 100644 include/linux/mfd/pcf50633/gpio.h create mode 100644 include/linux/mfd/pcf50633/mbc.h create mode 100644 include/linux/mfd/pcf50633/pmic.h create mode 100644 kernel/up.c $ git am -3 ../patches/linux-next__mfd_tree_build_failure Applying: linux-next: mfd tree build failure $ git cherry-pick 6e96281412f2f757abe623e08a9577e2bbd3402f Finished one cherry-pick. Created commit a0e1122: smp_call_function_single(): be slightly less stupid, fix #2 1 files changed, 1 insertions(+), 0 deletions(-) Merging powerpc_next $ git merge powerpc_next Merge made by recursive. arch/powerpc/configs/ppc64_defconfig | 26 +++++- arch/powerpc/include/asm/rtas.h | 2 +- arch/powerpc/include/asm/types.h | 7 +- arch/powerpc/kernel/cacheinfo.c | 10 +- arch/powerpc/kernel/dma-iommu.c | 4 +- arch/powerpc/kernel/head_64.S | 9 ++ arch/powerpc/kernel/iommu.c | 12 +- arch/powerpc/kernel/lparcfg.c | 10 +- arch/powerpc/kernel/machine_kexec.c | 25 +++++ arch/powerpc/kernel/pci_64.c | 6 +- arch/powerpc/kernel/setup_64.c | 6 +- arch/powerpc/kernel/vmlinux.lds.S | 4 +- arch/powerpc/mm/stab.c | 4 +- arch/powerpc/oprofile/op_model_pa6t.c | 6 +- arch/powerpc/platforms/512x/clock.c | 4 +- arch/powerpc/platforms/52xx/mpc52xx_gpio.c | 3 - arch/powerpc/platforms/52xx/mpc52xx_pic.c | 8 ++- arch/powerpc/platforms/cell/beat_interrupt.c | 2 +- arch/powerpc/platforms/cell/celleb_scc_epci.c | 4 +- arch/powerpc/platforms/cell/iommu.c | 4 +- arch/powerpc/platforms/cell/ras.c | 8 +- arch/powerpc/platforms/cell/spu_base.c | 4 +- arch/powerpc/platforms/cell/spu_callbacks.c | 2 +- arch/powerpc/platforms/cell/spufs/coredump.c | 2 +- arch/powerpc/platforms/cell/spufs/fault.c | 2 +- arch/powerpc/platforms/cell/spufs/file.c | 6 +- arch/powerpc/platforms/iseries/iommu.c | 4 +- arch/powerpc/platforms/powermac/smp.c | 2 +- arch/powerpc/platforms/pseries/iommu.c | 35 +++---- arch/powerpc/sysdev/mpic.c | 2 +- drivers/block/xsysace.c | 1 + drivers/char/bsr.c | 2 +- drivers/char/hvc_console.c | 14 ++- drivers/char/hvc_irq.c | 2 +- drivers/net/ehea/ehea_main.c | 8 +- drivers/net/ehea/ehea_qmr.c | 18 ++-- drivers/net/ibmveth.c | 16 ++-- drivers/net/iseries_veth.c | 2 +- drivers/net/pasemi_mac.c | 6 +- drivers/of/of_i2c.c | 19 ++++ drivers/pcmcia/electra_cf.c | 2 +- drivers/scsi/ibmvscsi/ibmvscsi.c | 12 +- drivers/spi/xilinx_spi.c | 137 +++++++++++++++---------- include/linux/of_i2c.h | 3 + 44 files changed, 291 insertions(+), 174 deletions(-)