diff options
Diffstat (limited to 'Next/merge.log')
-rw-r--r-- | Next/merge.log | 2120 |
1 files changed, 2120 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..57a1a63f094c --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2120 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at da5cabf Linux 2.6.36-rc1 +Merging origin/master +$ git merge origin/master +Already up-to-date. +Merging fixes/fixes +$ git merge fixes/fixes +Updating da5cabf..95a2e73 +Fast-forward + drivers/ata/sata_dwc_460ex.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) +Merging arm-current/master +$ git merge arm-current/master +Merge made by recursive. + arch/arm/Makefile | 3 +++ + arch/arm/include/asm/ptrace.h | 17 +++++++++++++---- + arch/arm/include/asm/unistd.h | 1 + + arch/arm/kernel/calls.S | 1 + + arch/arm/kernel/kgdb.c | 2 +- + drivers/video/amba-clcd.c | 10 ++++++++-- + include/linux/amba/clcd.h | 1 + + 7 files changed, 28 insertions(+), 7 deletions(-) +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Merge made by recursive. + arch/sparc/include/asm/fb.h | 4 ++++ + arch/sparc/include/asm/unistd.h | 5 ++++- + arch/sparc/kernel/sys32.S | 9 +++++++++ + arch/sparc/kernel/systbls_32.S | 3 ++- + arch/sparc/kernel/systbls_64.S | 6 ++++-- + drivers/serial/suncore.c | 15 +++++++++------ + 6 files changed, 32 insertions(+), 10 deletions(-) +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/net/wireless/ath/ath5k/base.c | 21 +++++++++++++++++++++ + drivers/net/wireless/ath/ath9k/eeprom.h | 1 + + drivers/net/wireless/ath/ath9k/eeprom_9287.c | 7 ++++++- + drivers/net/wireless/ath/ath9k/hif_usb.c | 8 ++------ + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 1 + + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 3 ++- + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 15 ++++++++++----- + drivers/net/wireless/ath/ath9k/reg.h | 1 + + drivers/net/wireless/ipw2x00/ipw2100.c | 5 +++-- + drivers/net/wireless/wl12xx/wl1251_cmd.c | 2 +- + net/ipv4/netfilter/arp_tables.c | 2 ++ + net/ipv4/netfilter/ip_tables.c | 2 ++ + net/ipv6/netfilter/ip6_tables.c | 2 ++ + net/ipv6/route.c | 4 ++-- + net/netlink/af_netlink.c | 22 ++++++---------------- + net/sched/act_gact.c | 21 ++++++++++++--------- + net/sched/act_mirred.c | 15 ++++++++------- + net/sched/act_nat.c | 22 +++++++++++----------- + net/sched/act_simple.c | 11 ++++++----- + net/sched/act_skbedit.c | 11 ++++++----- + net/xfrm/xfrm_user.c | 2 +- + 21 files changed, 106 insertions(+), 72 deletions(-) +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 +Merge made by recursive. + arch/x86/include/asm/pci.h | 6 ++++-- + include/linux/pci.h | 3 +++ + 2 files changed, 7 insertions(+), 2 deletions(-) +Merging wireless-current/master +$ git merge wireless-current/master +Merge made by recursive. + drivers/net/wireless/ipw2x00/ipw2100.c | 8 ---- + drivers/net/wireless/iwlwifi/iwl-1000.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 14 ++++---- + drivers/net/wireless/iwlwifi/iwl-6000.c | 32 ++++++++-------- + drivers/net/wireless/iwlwifi/iwl-agn.c | 45 +++++++++++++++++++++++- + drivers/net/wireless/iwlwifi/iwl-core.c | 45 ----------------------- + drivers/net/wireless/iwlwifi/iwl-core.h | 3 -- + drivers/net/wireless/iwlwifi/iwl-dev.h | 3 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 51 ++++++++++++++++++++++++++- + 11 files changed, 124 insertions(+), 87 deletions(-) +Merging kbuild-current/rc-fixes +$ git merge kbuild-current/rc-fixes +Auto-merging firmware/Makefile +Merge made by recursive. + firmware/Makefile | 2 +- + scripts/kconfig/confdata.c | 6 ++++-- + scripts/kconfig/symbol.c | 2 ++ + scripts/mkmakefile | 4 +++- + 4 files changed, 10 insertions(+), 4 deletions(-) +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Merge made by recursive. + include/linux/kobject.h | 35 +-------------------------- + include/linux/kobject_ns.h | 56 ++++++++++++++++++++++++++++++++++++++++++++ + include/linux/sysfs.h | 1 + + 3 files changed, 58 insertions(+), 34 deletions(-) + create mode 100644 include/linux/kobject_ns.h +Merging quilt/tty.current +$ git merge quilt/tty.current +Merge made by recursive. + drivers/serial/8250_early.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) +Merging quilt/usb.current +$ git merge quilt/usb.current +Merge made by recursive. + drivers/usb/gadget/uvc_v4l2.c | 2 +- + drivers/usb/host/isp1760-hcd.c | 2 ++ + drivers/usb/serial/navman.c | 1 + + drivers/usb/serial/option.c | 7 +++++-- + drivers/usb/serial/pl2303.c | 1 + + drivers/usb/serial/pl2303.h | 4 ++++ + drivers/usb/serial/usb-serial.c | 23 +++++++---------------- + 7 files changed, 21 insertions(+), 19 deletions(-) +Merging quilt/staging.current +$ git merge quilt/staging.current +Merge made by recursive. + drivers/staging/spectra/ffsport.c | 29 ++-- + drivers/staging/spectra/flash.c | 420 +------------------------------------ + 2 files changed, 18 insertions(+), 431 deletions(-) +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 +Already up-to-date. +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master +$ git merge crypto-current/master +Auto-merging drivers/char/hw_random/n2-drv.c +Merge made by recursive. + crypto/Kconfig | 8 ++++---- + crypto/ahash.c | 7 +++++-- + crypto/algboss.c | 8 ++++---- + crypto/testmgr.c | 4 ++-- + drivers/char/hw_random/n2-drv.c | 2 +- + 5 files changed, 16 insertions(+), 13 deletions(-) +Merging ide-curent/master +$ git merge ide-curent/master +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging gcl-current/merge +$ git merge gcl-current/merge +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Already up-to-date. +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Auto-merging arch/arm/mach-davinci/board-da830-evm.c +Auto-merging arch/arm/mach-davinci/board-da850-evm.c +Auto-merging arch/arm/mach-davinci/board-dm646x-evm.c +Merge made by recursive. +Merging i.MX/for-next +$ git merge i.MX/for-next +Merge made by recursive. + arch/arm/mach-imx/Kconfig | 9 + + arch/arm/mach-imx/Makefile | 1 + + arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 263 ++++++++++++++++++++ + arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c | 2 +- + arch/arm/mach-mx25/mach-cpuimx25.c | 4 +- + arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c | 2 +- + arch/arm/mach-mx3/mach-cpuimx35.c | 4 +- + arch/arm/plat-mxc/include/mach/eukrea-baseboards.h | 4 +- + 8 files changed, 281 insertions(+), 8 deletions(-) + create mode 100644 arch/arm/mach-imx/mach-imx27_visstrim_m10.c +Merging msm/for-next +$ git merge msm/for-next +Already uptodate! +Merge made by recursive. +Merging omap/for-next +$ git merge omap/for-next +Merge made by recursive. + arch/arm/configs/omap_4430sdp_defconfig | 3 + + arch/arm/mach-omap2/Makefile | 1 + + arch/arm/mach-omap2/board-n8x0.c | 49 ++++++++++++++++-------- + arch/arm/mach-omap2/board-omap4panda.c | 2 - + arch/arm/mach-omap2/clock3xxx_data.c | 14 +++--- + arch/arm/mach-omap2/id.c | 2 +- + arch/arm/mach-omap2/include/mach/entry-macro.S | 6 ++- + arch/arm/mach-omap2/mux.c | 2 +- + arch/arm/mach-omap2/omap-iommu.c | 2 - + arch/arm/mach-omap2/omap-smp.c | 3 +- + arch/arm/mach-omap2/pm34xx.c | 4 +- + arch/arm/plat-omap/gpio.c | 4 +- + arch/arm/plat-omap/include/plat/smp.h | 7 --- + 13 files changed, 56 insertions(+), 43 deletions(-) +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging samsung/next-samsung +$ git merge samsung/next-samsung +Resolved 'arch/arm/mach-s3c64xx/Makefile' using previous resolution. +Resolved 'arch/arm/mach-s3c64xx/mach-smdk6410.c' using previous resolution. +Resolved 'arch/arm/plat-samsung/Kconfig' using previous resolution. +Resolved 'drivers/input/touchscreen/s3c2410_ts.c' using previous resolution. +Renaming arch/arm/mach-s3c2410/include/mach/ts.h->arch/arm/plat-samsung/include/plat/ts.h +Auto-merging arch/arm/plat-samsung/include/plat/ts.h +Auto-merging arch/arm/mach-s3c2410/mach-h1940.c +Auto-merging arch/arm/mach-s3c64xx/Makefile +CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/Makefile +Auto-merging arch/arm/mach-s3c64xx/mach-smdk6410.c +CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-smdk6410.c +Auto-merging arch/arm/plat-s3c24xx/devs.c +Auto-merging arch/arm/plat-samsung/Kconfig +CONFLICT (content): Merge conflict in arch/arm/plat-samsung/Kconfig +Auto-merging drivers/input/touchscreen/s3c2410_ts.c +CONFLICT (content): Merge conflict in drivers/input/touchscreen/s3c2410_ts.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c9d542b] Merge remote branch 'samsung/next-samsung' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-s3c64xx/dev-ts.c | 61 +++++++++++++++++++++++++++++++++ + arch/arm/mach-s3c64xx/mach-smdk6410.c | 5 +++ + 2 files changed, 66 insertions(+), 0 deletions(-) + create mode 100644 arch/arm/mach-s3c64xx/dev-ts.c +Merging s5p/for-next +$ git merge s5p/for-next +Already up-to-date. +Merging tegra/for-next +$ git merge tegra/for-next +Resolved 'arch/arm/Kconfig' using previous resolution. +Resolved 'arch/arm/mm/Kconfig' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Auto-merging arch/arm/Makefile +Auto-merging arch/arm/mm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mm/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b3c1bfa] Merge remote branch 'tegra/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/configs/tegra_defconfig | 1095 ++++++++++++++++++++++++++++++++++++++ + 1 files changed, 1095 insertions(+), 0 deletions(-) + create mode 100644 arch/arm/configs/tegra_defconfig +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Already up-to-date. +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 11 +++++++++++ + arch/blackfin/include/asm/bitops.h | 17 ++++++++++------- + 2 files changed, 21 insertions(+), 7 deletions(-) +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 +Merge made by recursive. +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Auto-merging arch/m68knommu/kernel/process.c +Auto-merging drivers/serial/68328serial.c +Merge made by recursive. + arch/m68k/include/asm/ide.h | 13 +++++++++++-- + arch/m68knommu/kernel/process.c | 10 +++++----- + drivers/spi/coldfire_qspi.c | 1 + + 3 files changed, 17 insertions(+), 7 deletions(-) +Merging microblaze/next +$ git merge microblaze/next +Auto-merging arch/microblaze/include/asm/page.h +Auto-merging drivers/serial/uartlite.c +Merge made by recursive. + arch/microblaze/Kconfig | 17 +++++++++++++++++ + arch/microblaze/include/asm/page.h | 3 --- + arch/microblaze/include/asm/prom.h | 1 + + arch/microblaze/include/asm/seccomp.h | 16 ++++++++++++++++ + arch/microblaze/include/asm/setup.h | 6 ++++++ + arch/microblaze/include/asm/thread_info.h | 20 ++++++++------------ + arch/microblaze/kernel/entry.S | 23 +++++++---------------- + arch/microblaze/kernel/exceptions.c | 8 +------- + arch/microblaze/kernel/kgdb.c | 3 +-- + arch/microblaze/kernel/setup.c | 6 ------ + arch/microblaze/kernel/timer.c | 2 +- + arch/microblaze/platform/generic/system.dts | 1 + + drivers/serial/uartlite.c | 26 +++++++++++++++++++++++++- + kernel/debug/kdb/kdb_private.h | 7 +++++++ + kernel/debug/kdb/kdb_support.c | 4 ++-- + 15 files changed, 93 insertions(+), 50 deletions(-) + create mode 100644 arch/microblaze/include/asm/seccomp.h +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Already up-to-date. +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 +Already up-to-date. +Merging sh/master +$ git merge sh/master +Merge made by recursive. + arch/sh/Kconfig | 5 +- + arch/sh/boards/Kconfig | 16 + + arch/sh/boards/Makefile | 2 + + arch/sh/boards/board-sh2007.c | 133 +++ + arch/sh/boards/board-sh7757lcr.c | 374 +++++++ + arch/sh/configs/sh2007_defconfig | 1357 +++++++++++++++++++++++++ + arch/sh/configs/sh7757lcr_defconfig | 1126 ++++++++++++++++++++ + arch/sh/drivers/dma/dma-api.c | 4 +- + arch/sh/drivers/pci/pci-sh7751.c | 2 +- + arch/sh/drivers/pci/pci-sh7780.c | 2 +- + arch/sh/drivers/pci/pcie-sh7786.c | 2 +- + arch/sh/include/asm/Kbuild | 2 + + arch/sh/include/asm/elf.h | 27 +- + arch/sh/include/asm/fixmap.h | 4 +- + arch/sh/include/asm/irq.h | 2 +- + arch/sh/include/asm/kprobes.h | 1 - + arch/sh/include/asm/processor_32.h | 3 - + arch/sh/include/asm/processor_64.h | 3 - + arch/sh/include/asm/ptrace.h | 169 ++-- + arch/sh/include/asm/ptrace_32.h | 83 ++ + arch/sh/include/asm/ptrace_64.h | 20 + + arch/sh/include/asm/system_32.h | 13 +- + arch/sh/include/asm/tlbflush.h | 2 + + arch/sh/include/asm/unistd_32.h | 5 +- + arch/sh/include/asm/unistd_64.h | 5 +- + arch/sh/include/cpu-sh4/cpu/sh7757.h | 301 +++--- + arch/sh/include/mach-common/mach/sh2007.h | 117 +++ + arch/sh/kernel/Makefile | 2 +- + arch/sh/kernel/cpu/sh4/probe.c | 2 +- + arch/sh/kernel/cpu/sh4a/clock-sh7757.c | 199 ++-- + arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c | 1582 +++++++++++++++++------------ + arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 66 ++ + arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 222 +++-- + arch/sh/kernel/kprobes.c | 100 +- + arch/sh/kernel/process_32.c | 3 +- + arch/sh/kernel/ptrace.c | 33 + + arch/sh/kernel/ptrace_32.c | 27 + + arch/sh/kernel/ptrace_64.c | 79 ++ + arch/sh/kernel/reboot.c | 4 + + arch/sh/kernel/syscalls_32.S | 3 + + arch/sh/kernel/syscalls_64.S | 3 + + arch/sh/mm/consistent.c | 3 +- + arch/sh/mm/init.c | 52 +- + arch/sh/mm/nommu.c | 4 + + arch/sh/mm/tlbflush_32.c | 16 + + arch/sh/mm/tlbflush_64.c | 5 + + arch/sh/tools/mach-types | 2 + + drivers/Makefile | 2 +- + drivers/clocksource/sh_cmt.c | 12 +- + drivers/i2c/busses/i2c-sh_mobile.c | 23 +- + drivers/serial/sh-sci.h | 17 +- + drivers/sh/clk.c | 17 +- + sound/soc/sh/siu_pcm.c | 2 + + 53 files changed, 5063 insertions(+), 1197 deletions(-) + create mode 100644 arch/sh/boards/board-sh2007.c + create mode 100644 arch/sh/boards/board-sh7757lcr.c + create mode 100644 arch/sh/configs/sh2007_defconfig + create mode 100644 arch/sh/configs/sh7757lcr_defconfig + create mode 100644 arch/sh/include/asm/ptrace_32.h + create mode 100644 arch/sh/include/asm/ptrace_64.h + create mode 100644 arch/sh/include/mach-common/mach/sh2007.h + create mode 100644 arch/sh/kernel/ptrace.c +Merging genesis/master +$ git merge genesis/master +Merge made by recursive. + arch/arm/mach-shmobile/Makefile | 2 +- + arch/arm/mach-shmobile/board-ap4evb.c | 52 ++++++++--- + arch/arm/mach-shmobile/clock-sh7372.c | 8 +- + arch/arm/mach-shmobile/pm_runtime.c | 169 +++++++++++++++++++++++++++++++++ + 4 files changed, 214 insertions(+), 17 deletions(-) + create mode 100644 arch/arm/mach-shmobile/pm_runtime.c +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging tile/master +$ git merge tile/master +Already up-to-date. +Merging xtensa/master +$ git merge xtensa/master +Resolved 'arch/xtensa/configs/iss_defconfig' using previous resolution. +Auto-merging arch/xtensa/Kconfig +Auto-merging arch/xtensa/Makefile +Auto-merging arch/xtensa/configs/iss_defconfig +CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig +Auto-merging arch/xtensa/include/asm/coprocessor.h +Auto-merging arch/xtensa/kernel/Makefile +Auto-merging arch/xtensa/kernel/time.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 072ff31] Merge remote branch 'xtensa/master' +$ git diff -M --stat --summary HEAD^.. + arch/xtensa/Kconfig | 17 +- + arch/xtensa/Makefile | 5 +- + arch/xtensa/boot/Makefile | 1 + + arch/xtensa/include/asm/coprocessor.h | 9 +- + arch/xtensa/include/asm/io.h | 40 ++-- + arch/xtensa/include/asm/irq.h | 7 +- + arch/xtensa/include/asm/serial.h | 12 +- + arch/xtensa/kernel/Makefile | 4 +- + arch/xtensa/kernel/time.c | 2 +- + arch/xtensa/platforms/xtavnet/Makefile | 10 + + .../platforms/xtavnet/include/platform/hardware.h | 85 ++++++ + .../platforms/xtavnet/include/platform/lcd.h | 22 ++ + .../platforms/xtavnet/include/platform/serial.h | 1 + + arch/xtensa/platforms/xtavnet/lcd.c | 79 ++++++ + arch/xtensa/platforms/xtavnet/setup.c | 269 ++++++++++++++++++++ + 15 files changed, 526 insertions(+), 37 deletions(-) + create mode 100644 arch/xtensa/platforms/xtavnet/Makefile + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/hardware.h + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/lcd.h + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/serial.h + create mode 100644 arch/xtensa/platforms/xtavnet/lcd.c + create mode 100644 arch/xtensa/platforms/xtavnet/setup.c +Merging ceph/for-next +$ git merge ceph/for-next +Resolved 'net/Makefile' using previous resolution. +Auto-merging MAINTAINERS +Removing fs/ceph/README +Removing fs/ceph/ceph_strings.c +Auto-merging net/Kconfig +Auto-merging net/Makefile +CONFLICT (content): Merge conflict in net/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5641238] Merge remote branch 'ceph/for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 11 + + drivers/block/Kconfig | 16 + + drivers/block/Makefile | 1 + + drivers/block/rbd.c | 1844 +++++++++++++++++++++++++++++ + drivers/block/rbd_types.h | 73 ++ + fs/ceph/Kconfig | 14 +- + fs/ceph/Makefile | 11 +- + fs/ceph/README | 20 - + fs/ceph/addr.c | 65 +- + fs/ceph/caps.c | 35 +- + fs/ceph/ceph_frag.c | 3 +- + fs/ceph/ceph_strings.c | 193 --- + fs/ceph/debugfs.c | 407 ++----- + fs/ceph/dir.c | 55 +- + fs/ceph/export.c | 5 +- + fs/ceph/file.c | 207 +--- + fs/ceph/inode.c | 19 +- + fs/ceph/ioctl.c | 11 +- + fs/ceph/locks.c | 6 +- + fs/ceph/mds_client.c | 85 +- + fs/ceph/mds_client.h | 20 +- + fs/ceph/mdsmap.c | 11 +- + fs/ceph/snap.c | 10 +- + fs/ceph/strings.c | 117 ++ + fs/ceph/super.c | 1154 ++++++++----------- + fs/ceph/super.h | 397 +++---- + fs/ceph/xattr.c | 15 +- + {fs => include/linux}/ceph/auth.h | 4 +- + {fs => include/linux}/ceph/buffer.h | 0 + {fs => include/linux}/ceph/ceph_debug.h | 2 +- + {fs => include/linux}/ceph/ceph_frag.h | 0 + {fs => include/linux}/ceph/ceph_fs.h | 0 + {fs => include/linux}/ceph/ceph_hash.h | 0 + {fs => include/linux}/ceph/crush/crush.h | 0 + {fs => include/linux}/ceph/crush/hash.h | 0 + {fs => include/linux}/ceph/crush/mapper.h | 0 + include/linux/ceph/debugfs.h | 33 + + {fs => include/linux}/ceph/decode.h | 5 + + include/linux/ceph/libceph.h | 249 ++++ + {fs => include/linux}/ceph/mdsmap.h | 0 + {fs => include/linux}/ceph/messenger.h | 12 +- + {fs => include/linux}/ceph/mon_client.h | 1 + + {fs => include/linux}/ceph/msgpool.h | 0 + {fs => include/linux}/ceph/msgr.h | 0 + {fs => include/linux}/ceph/osd_client.h | 67 ++ + {fs => include/linux}/ceph/osdmap.h | 2 + + {fs => include/linux}/ceph/pagelist.h | 2 +- + {fs => include/linux}/ceph/rados.h | 0 + {fs => include/linux}/ceph/types.h | 0 + net/Kconfig | 1 + + net/Makefile | 1 + + net/ceph/Kconfig | 27 + + net/ceph/Makefile | 37 + + {fs => net}/ceph/armor.c | 0 + {fs => net}/ceph/auth.c | 10 +- + {fs => net}/ceph/auth_none.c | 7 +- + {fs => net}/ceph/auth_none.h | 3 +- + {fs => net}/ceph/auth_x.c | 9 +- + {fs => net}/ceph/auth_x.h | 3 +- + {fs => net}/ceph/auth_x_protocol.h | 0 + {fs => net}/ceph/buffer.c | 9 +- + net/ceph/ceph_common.c | 529 +++++++++ + {fs => net}/ceph/ceph_fs.c | 5 +- + {fs => net}/ceph/ceph_hash.c | 2 +- + net/ceph/ceph_strings.c | 84 ++ + {fs => net}/ceph/crush/crush.c | 2 +- + {fs => net}/ceph/crush/hash.c | 2 +- + {fs => net}/ceph/crush/mapper.c | 4 +- + {fs => net}/ceph/crypto.c | 4 +- + {fs => net}/ceph/crypto.h | 4 +- + net/ceph/debugfs.c | 268 +++++ + {fs => net}/ceph/messenger.c | 296 ++++- + {fs => net}/ceph/mon_client.c | 73 +- + {fs => net}/ceph/msgpool.c | 4 +- + {fs => net}/ceph/osd_client.c | 400 +++++-- + {fs => net}/ceph/osdmap.c | 30 +- + {fs => net}/ceph/pagelist.c | 8 +- + net/ceph/pagevec.c | 223 ++++ + 78 files changed, 5187 insertions(+), 2040 deletions(-) + create mode 100644 drivers/block/rbd.c + create mode 100644 drivers/block/rbd_types.h + delete mode 100644 fs/ceph/README + delete mode 100644 fs/ceph/ceph_strings.c + create mode 100644 fs/ceph/strings.c + rename {fs => include/linux}/ceph/auth.h (97%) + rename {fs => include/linux}/ceph/buffer.h (100%) + rename {fs => include/linux}/ceph/ceph_debug.h (96%) + rename {fs => include/linux}/ceph/ceph_frag.h (100%) + rename {fs => include/linux}/ceph/ceph_fs.h (100%) + rename {fs => include/linux}/ceph/ceph_hash.h (100%) + rename {fs => include/linux}/ceph/crush/crush.h (100%) + rename {fs => include/linux}/ceph/crush/hash.h (100%) + rename {fs => include/linux}/ceph/crush/mapper.h (100%) + create mode 100644 include/linux/ceph/debugfs.h + rename {fs => include/linux}/ceph/decode.h (96%) + create mode 100644 include/linux/ceph/libceph.h + rename {fs => include/linux}/ceph/mdsmap.h (100%) + rename {fs => include/linux}/ceph/messenger.h (95%) + rename {fs => include/linux}/ceph/mon_client.h (99%) + rename {fs => include/linux}/ceph/msgpool.h (100%) + rename {fs => include/linux}/ceph/msgr.h (100%) + rename {fs => include/linux}/ceph/osd_client.h (76%) + rename {fs => include/linux}/ceph/osdmap.h (97%) + rename {fs => include/linux}/ceph/pagelist.h (93%) + rename {fs => include/linux}/ceph/rados.h (100%) + rename {fs => include/linux}/ceph/types.h (100%) + create mode 100644 net/ceph/Kconfig + create mode 100644 net/ceph/Makefile + rename {fs => net}/ceph/armor.c (100%) + rename {fs => net}/ceph/auth.c (97%) + rename {fs => net}/ceph/auth_none.c (96%) + rename {fs => net}/ceph/auth_none.h (94%) + rename {fs => net}/ceph/auth_x.c (99%) + rename {fs => net}/ceph/auth_x.h (96%) + rename {fs => net}/ceph/auth_x_protocol.h (100%) + rename {fs => net}/ceph/buffer.c (86%) + create mode 100644 net/ceph/ceph_common.c + rename {fs => net}/ceph/ceph_fs.c (92%) + rename {fs => net}/ceph/ceph_hash.c (98%) + create mode 100644 net/ceph/ceph_strings.c + rename {fs => net}/ceph/crush/crush.c (98%) + rename {fs => net}/ceph/crush/hash.c (98%) + rename {fs => net}/ceph/crush/mapper.c (99%) + rename {fs => net}/ceph/crypto.c (99%) + rename {fs => net}/ceph/crypto.h (95%) + create mode 100644 net/ceph/debugfs.c + rename {fs => net}/ceph/messenger.c (89%) + rename {fs => net}/ceph/mon_client.c (94%) + rename {fs => net}/ceph/msgpool.c (95%) + rename {fs => net}/ceph/osd_client.c (84%) + rename {fs => net}/ceph/osdmap.c (97%) + rename {fs => net}/ceph/pagelist.c (83%) + create mode 100644 net/ceph/pagevec.c +Merging cifs/master +$ git merge cifs/master +Merge made by recursive. + fs/cifs/dir.c | 161 +++++++++++++++++++++++++++---------------------------- + fs/cifs/file.c | 3 +- + 2 files changed, 80 insertions(+), 84 deletions(-) +Merging configfs/linux-next +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next +$ git merge ecryptfs/next +Merge made by recursive. + fs/ecryptfs/keystore.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) +Merging ext3/for_next +$ git merge ext3/for_next +Merge made by recursive. + fs/quota/Kconfig | 4 ++-- + fs/xfs/Kconfig | 1 + + 2 files changed, 3 insertions(+), 2 deletions(-) +Merging ext4/next +$ git merge ext4/next +Already up-to-date. +Merging fatfs/master +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Merge made by recursive. + fs/gfs2/Kconfig | 2 +- + fs/gfs2/aops.c | 16 +-- + fs/gfs2/bmap.c | 255 ++++++++++++++++++++++++-------------------------- + fs/gfs2/bmap.h | 20 ++-- + fs/gfs2/dir.c | 28 +++--- + fs/gfs2/file.c | 2 +- + fs/gfs2/glops.c | 5 +- + fs/gfs2/incore.h | 1 - + fs/gfs2/inode.c | 9 +- + fs/gfs2/inode.h | 13 +++ + fs/gfs2/ops_fstype.c | 2 +- + fs/gfs2/ops_inode.c | 36 +------ + fs/gfs2/quota.c | 13 +-- + fs/gfs2/rgrp.c | 6 +- + fs/gfs2/super.c | 11 +- + 15 files changed, 194 insertions(+), 225 deletions(-) +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging logfs/master +$ git merge logfs/master +Resolved 'fs/logfs/logfs.h' using previous resolution. +Auto-merging fs/logfs/dir.c +Auto-merging fs/logfs/file.c +Auto-merging fs/logfs/logfs.h +CONFLICT (content): Merge conflict in fs/logfs/logfs.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8b76651] Merge remote branch 'logfs/master' +$ git diff -M --stat --summary HEAD^.. +Merging nfs/linux-next +$ git merge nfs/linux-next +Auto-merging fs/nfs/Kconfig +Auto-merging fs/nfs/super.c +Auto-merging net/sunrpc/xprtsock.c +Merge made by recursive. + fs/nfs/Kconfig | 1 - + fs/nfs/dir.c | 9 ++++++++- + fs/nfs/file.c | 2 +- + fs/nfs/nfs4proc.c | 3 +-- + fs/nfs/super.c | 7 +++++++ + fs/nfsd/Kconfig | 1 - + net/sunrpc/Kconfig | 9 +++++---- + net/sunrpc/xprtrdma/rpc_rdma.c | 2 ++ + net/sunrpc/xprtrdma/verbs.c | 22 +++++++++++++++++----- + net/sunrpc/xprtsock.c | 28 ++++++++++++++++++++++------ + 10 files changed, 63 insertions(+), 21 deletions(-) +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Merge made by recursive. + fs/nilfs2/super.c | 4 +++- + fs/nilfs2/the_nilfs.c | 8 ++++---- + include/linux/nilfs2_fs.h | 1 + + 3 files changed, 8 insertions(+), 5 deletions(-) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Auto-merging fs/ocfs2/refcounttree.c +Auto-merging include/linux/fs.h +Merge made by recursive. + fs/ext3/super.c | 4 +- + fs/ext4/super.c | 8 +- + fs/jbd2/journal.c | 4 + + fs/libfs.c | 29 ++++ + fs/ocfs2/aops.c | 9 +- + fs/ocfs2/aops.h | 3 +- + fs/ocfs2/blockcheck.c | 4 +- + fs/ocfs2/file.c | 49 +++---- + fs/ocfs2/inode.c | 6 +- + fs/ocfs2/inode.h | 11 +- + fs/ocfs2/ioctl.c | 356 +++++++++++++++++++++++++++++++++++++++++++++++ + fs/ocfs2/journal.c | 9 +- + fs/ocfs2/journal.h | 3 +- + fs/ocfs2/mmap.c | 7 +- + fs/ocfs2/ocfs2.h | 23 ++- + fs/ocfs2/ocfs2_ioctl.h | 95 +++++++++++++ + fs/ocfs2/refcounttree.c | 43 ++++++- + fs/ocfs2/refcounttree.h | 7 +- + fs/ocfs2/super.c | 51 ++++++- + include/linux/fs.h | 2 + + 20 files changed, 645 insertions(+), 78 deletions(-) +Merging omfs/for-next +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master +$ git merge squashfs/master +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Already up-to-date. +Merging vfs/for-next +$ git merge vfs/for-next +Merge made by recursive. + fs/reiserfs/inode.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) +Merging pci/linux-next +$ git merge pci/linux-next +Merge made by recursive. + drivers/pci/pci.c | 2 +- + drivers/pci/proc.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) +Merging hid/for-next +$ git merge hid/for-next +Merge made by recursive. + drivers/hid/Kconfig | 6 + + drivers/hid/Makefile | 1 + + drivers/hid/hid-apple.c | 7 +- + drivers/hid/hid-cherry.c | 7 +- + drivers/hid/hid-core.c | 6 +- + drivers/hid/hid-cypress.c | 9 +- + drivers/hid/hid-egalax.c | 9 + + drivers/hid/hid-elecom.c | 7 +- + drivers/hid/hid-ids.h | 3 + + drivers/hid/hid-input.c | 4 + + drivers/hid/hid-kye.c | 7 +- + drivers/hid/hid-lg.c | 9 +- + drivers/hid/hid-microsoft.c | 7 +- + drivers/hid/hid-monterey.c | 7 +- + drivers/hid/hid-ortek.c | 7 +- + drivers/hid/hid-petalynx.c | 7 +- + drivers/hid/hid-picolcd.c | 4 +- + drivers/hid/hid-prodikeys.c | 7 +- + drivers/hid/hid-samsung.c | 20 +- + drivers/hid/hid-sony.c | 7 +- + drivers/hid/hid-sunplus.c | 7 +- + drivers/hid/hid-uclogic.c | 404 +++++++++++++++++++++++++++++++++++++++ + drivers/hid/hid-zydacron.c | 7 +- + drivers/hid/usbhid/hid-quirks.c | 3 +- + drivers/hid/usbhid/hiddev.c | 11 +- + include/linux/hid.h | 4 +- + 26 files changed, 514 insertions(+), 63 deletions(-) + create mode 100644 drivers/hid/hid-uclogic.c +Merging quilt/i2c +$ git merge quilt/i2c +Already up-to-date. +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/hwmon/ads7871.c | 12 ++++++------ + drivers/hwmon/coretemp.c | 1 - + 2 files changed, 6 insertions(+), 7 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 MAINTAINERS +Auto-merging drivers/media/video/cx23885/cx23885-i2c.c +Auto-merging drivers/media/video/ivtv/ivtv-driver.c +Auto-merging drivers/media/video/ivtv/ivtv-driver.h +Auto-merging drivers/media/video/ivtv/ivtv-i2c.c +Auto-merging drivers/media/video/v4l2-common.c +Auto-merging drivers/media/video/v4l2-dev.c +Merge made by recursive. +Merging kbuild/for-next +$ git merge kbuild/for-next +Merge made by recursive. + scripts/kconfig/Makefile | 5 +- + scripts/kconfig/confdata.c | 1 + + scripts/kconfig/nconf.c | 365 +++++++++++++++++++++++-------------------- + scripts/kconfig/nconf.gui.c | 22 ++-- + scripts/kconfig/nconf.h | 3 +- + 5 files changed, 213 insertions(+), 183 deletions(-) +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 +Removing drivers/ata/pata_winbond.c +Merge made by recursive. + Documentation/ABI/testing/sysfs-ata | 99 +++++ + drivers/ata/Kconfig | 1 + + drivers/ata/Makefile | 3 +- + drivers/ata/ahci.c | 11 + + drivers/ata/ahci.h | 1 + + drivers/ata/libahci.c | 16 +- + drivers/ata/libata-core.c | 62 +++- + drivers/ata/libata-eh.c | 35 +- + drivers/ata/libata-pmp.c | 18 +- + drivers/ata/libata-scsi.c | 117 +++--- + drivers/ata/libata-transport.c | 773 +++++++++++++++++++++++++++++++++++ + drivers/ata/libata-transport.h | 18 + + drivers/ata/libata.h | 7 + + drivers/ata/pata_cmd64x.c | 6 - + drivers/ata/pata_legacy.c | 15 +- + drivers/ata/pata_winbond.c | 282 ------------- + drivers/ata/sata_fsl.c | 8 +- + drivers/ata/sata_mv.c | 25 +- + drivers/ata/sata_nv.c | 57 +-- + include/linux/ata.h | 46 ++- + include/linux/libata.h | 5 + + 21 files changed, 1170 insertions(+), 435 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-ata + create mode 100644 drivers/ata/libata-transport.c + create mode 100644 drivers/ata/libata-transport.h + delete mode 100644 drivers/ata/pata_winbond.c +$ git reset --hard HEAD^ +HEAD is now at b96ab5a Merge remote branch 'kconfig/for-next' +Merging refs/next/20100817/libata +$ git merge refs/next/20100817/libata +Already up-to-date. +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/hw/cxgb4/cm.c | 2 +- + drivers/infiniband/hw/cxgb4/cq.c | 4 ++-- + drivers/infiniband/hw/cxgb4/mem.c | 2 +- + drivers/infiniband/hw/cxgb4/qp.c | 6 +++--- + drivers/infiniband/hw/nes/nes_verbs.c | 12 ++++++------ + 5 files changed, 13 insertions(+), 13 deletions(-) +Merging acpi/test +$ git merge acpi/test +Already up-to-date. +Merging idle-test/idle-test +$ git merge idle-test/idle-test +Already up-to-date. +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Merge made by recursive. + drivers/ieee1394/ohci1394.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/linux-next +$ git merge kvm/linux-next +Auto-merging arch/x86/kernel/i387.c +Auto-merging arch/x86/kvm/x86.c +Merge made by recursive. + arch/x86/kernel/i387.c | 1 + + arch/x86/kvm/i8254.c | 2 +- + arch/x86/kvm/x86.c | 4 ++-- + 3 files changed, 4 insertions(+), 3 deletions(-) +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/master +$ git merge swiotlb/master +Already up-to-date. +Merging swiotlb-xen/master +$ git merge swiotlb-xen/master +Already up-to-date. +Merging ibft/master +$ git merge ibft/master +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Already up-to-date. +Merging async_tx/next +$ git merge async_tx/next +Auto-merging drivers/dma/Kconfig +Auto-merging drivers/dma/shdma.c +Merge made by recursive. + drivers/dma/Kconfig | 8 + + drivers/dma/Makefile | 1 + + drivers/dma/amba-pl08x.c | 2025 ++++++++++++++++++++++++++++++++++++++++++++ + drivers/dma/shdma.c | 3 +- + include/linux/amba/pl08x.h | 184 ++++ + include/linux/dmaengine.h | 2 +- + 6 files changed, 2221 insertions(+), 2 deletions(-) + create mode 100644 drivers/dma/amba-pl08x.c + create mode 100644 include/linux/amba/pl08x.h +Merging net/master +$ git merge net/master +Merge made by recursive. + drivers/atm/iphase.c | 2 +- + drivers/firewire/net.c | 13 -- + drivers/ieee1394/eth1394.c | 16 --- + drivers/isdn/hisax/hfc_sx.c | 13 +- + drivers/isdn/mISDN/dsp_cmx.c | 1 + + drivers/isdn/mISDN/l1oip_core.c | 2 +- + drivers/net/amd8111e.c | 4 +- + drivers/net/arm/am79c961a.c | 35 +++--- + drivers/net/arm/am79c961a.h | 1 - + drivers/net/bmac.c | 7 - + drivers/net/bnx2x/bnx2x_cmn.c | 20 +++ + drivers/net/bnx2x/bnx2x_cmn.h | 9 ++ + drivers/net/bnx2x/bnx2x_link.c | 10 +- + drivers/net/bnx2x/bnx2x_main.c | 26 +--- + drivers/net/cpmac.c | 35 ++++-- + drivers/net/eepro.c | 8 +- + drivers/net/enic/enic.h | 2 +- + drivers/net/enic/enic_main.c | 19 +--- + drivers/net/enic/vnic_dev.c | 25 +++- + drivers/net/enic/vnic_devcmd.h | 12 ++ + drivers/net/enic/vnic_enet.h | 2 +- + drivers/net/enic/vnic_resource.h | 13 ++ + drivers/net/enic/vnic_rq.c | 6 +- + drivers/net/enic/vnic_vic.c | 7 +- + drivers/net/enic/vnic_wq.c | 6 +- + drivers/net/fec_mpc52xx.c | 6 - + drivers/net/gianfar.c | 2 +- + drivers/net/hamradio/scc.c | 3 +- + drivers/net/irda/mcs7780.c | 2 +- + drivers/net/macvtap.c | 99 +++++++++++++--- + drivers/net/pasemi_mac_ethtool.c | 16 --- + drivers/net/pcmcia/3c574_cs.c | 13 -- + drivers/net/pcmcia/axnet_cs.c | 13 -- + drivers/net/pcmcia/ibmtr_cs.c | 13 -- + drivers/net/pcmcia/pcnet_cs.c | 100 ++++++---------- + drivers/net/qlcnic/qlcnic.h | 32 +++++ + drivers/net/qlcnic/qlcnic_ctx.c | 125 +++++++++++++++++++ + drivers/net/qlcnic/qlcnic_ethtool.c | 40 +++++-- + drivers/net/qlcnic/qlcnic_hdr.h | 5 +- + drivers/net/qlcnic/qlcnic_hw.c | 1 + + drivers/net/qlcnic/qlcnic_main.c | 223 ++++++++++++++++++++++++++++------ + drivers/net/r6040.c | 34 +++-- + drivers/net/sc92031.c | 11 -- + drivers/net/tulip/xircom_cb.c | 15 --- + drivers/net/usb/hso.c | 9 -- + drivers/net/usb/kaweth.c | 9 -- + drivers/net/virtio_net.c | 14 -- + drivers/net/wan/c101.c | 2 +- + drivers/net/wan/n2.c | 2 +- + drivers/net/wan/pci200syn.c | 2 +- + drivers/net/wireless/ray_cs.c | 16 --- + drivers/net/wireless/wl3501_cs.c | 11 -- + include/linux/if_macvlan.h | 9 ++- + include/linux/skbuff.h | 9 ++ + net/atm/common.c | 2 +- + net/core/dev.c | 106 ++++++++++------- + net/core/ethtool.c | 33 ++++-- + net/decnet/dn_nsp_out.c | 8 +- + 58 files changed, 785 insertions(+), 494 deletions(-) +Merging wireless/master +$ git merge wireless/master +Resolved 'drivers/net/wireless/libertas/if_sdio.c' using previous resolution. +Auto-merging Documentation/DocBook/Makefile +Removing Documentation/DocBook/mac80211.tmpl +Auto-merging drivers/net/ehea/ehea_main.c +Auto-merging drivers/net/myri10ge/myri10ge.c +Auto-merging drivers/net/niu.c +Auto-merging drivers/net/wireless/libertas/cfg.c +Auto-merging drivers/net/wireless/libertas/if_cs.c +Auto-merging drivers/net/wireless/libertas/if_sdio.c +CONFLICT (content): Merge conflict in drivers/net/wireless/libertas/if_sdio.c +Auto-merging drivers/net/wireless/libertas/if_usb.c +Auto-merging drivers/net/wireless/libertas_tf/if_usb.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 883ead8] Merge remote branch 'wireless/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/80211.tmpl | 371 +++++++++++++ + Documentation/DocBook/Makefile | 2 +- + Documentation/DocBook/mac80211.tmpl | 337 ------------ + drivers/net/cnic.c | 2 +- + drivers/net/ehea/ehea_main.c | 4 +- + drivers/net/mlx4/alloc.c | 2 +- + drivers/net/mlx4/en_rx.c | 2 +- + drivers/net/mlx4/profile.c | 2 +- + drivers/net/myri10ge/myri10ge.c | 4 +- + drivers/net/niu.c | 4 +- + drivers/net/vxge/vxge-main.c | 10 +- + drivers/net/wireless/airo.c | 5 +- + drivers/net/wireless/at76c50x-usb.c | 7 +- + drivers/net/wireless/ath/ar9170/main.c | 31 +- + drivers/net/wireless/ath/ath5k/ani.c | 6 +- + drivers/net/wireless/ath/ath5k/ath5k.h | 7 +- + drivers/net/wireless/ath/ath5k/attach.c | 8 +- + drivers/net/wireless/ath/ath5k/base.c | 90 ++-- + drivers/net/wireless/ath/ath5k/dma.c | 4 +- + drivers/net/wireless/ath/ath5k/eeprom.c | 4 +- + drivers/net/wireless/ath/ath5k/pcu.c | 32 +- + drivers/net/wireless/ath/ath5k/phy.c | 15 +- + drivers/net/wireless/ath/ath5k/reg.h | 2 +- + drivers/net/wireless/ath/ath5k/reset.c | 24 +- + drivers/net/wireless/ath/ath5k/rfbuffer.h | 4 +- + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 2 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 1 + + drivers/net/wireless/ath/ath9k/beacon.c | 7 +- + drivers/net/wireless/ath/ath9k/calib.c | 109 ++++- + drivers/net/wireless/ath/ath9k/calib.h | 1 + + drivers/net/wireless/ath/ath9k/common.c | 36 +- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 5 +- + drivers/net/wireless/ath/ath9k/hw.h | 1 + + drivers/net/wireless/ath/ath9k/main.c | 19 +- + drivers/net/wireless/ath/ath9k/xmit.c | 18 +- + drivers/net/wireless/ath/debug.h | 2 + + drivers/net/wireless/b43/main.c | 30 +- + drivers/net/wireless/b43/phy_n.c | 62 ++- + drivers/net/wireless/b43legacy/main.c | 5 + + drivers/net/wireless/hostap/hostap_ioctl.c | 2 +- + drivers/net/wireless/ipw2x00/ipw2100.c | 10 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 12 +- + drivers/net/wireless/iwlwifi/Makefile | 1 + + drivers/net/wireless/iwlwifi/iwl-1000.c | 5 + + drivers/net/wireless/iwlwifi/iwl-5000.c | 10 + + drivers/net/wireless/iwlwifi/iwl-6000.c | 5 + + drivers/net/wireless/iwlwifi/iwl-agn-tt.c | 696 +++++++++++++++++++++++++ + drivers/net/wireless/iwlwifi/iwl-agn-tt.h | 129 +++++ + drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 16 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 85 +++- + drivers/net/wireless/iwlwifi/iwl-commands.h | 5 + + drivers/net/wireless/iwlwifi/iwl-core.c | 83 +--- + drivers/net/wireless/iwlwifi/iwl-core.h | 17 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 6 +- + drivers/net/wireless/iwlwifi/iwl-power.c | 638 +---------------------- + drivers/net/wireless/iwlwifi/iwl-power.h | 93 ---- + drivers/net/wireless/iwlwifi/iwl-scan.c | 12 +- + drivers/net/wireless/iwlwifi/iwl-sta.c | 24 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 9 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 58 ++- + drivers/net/wireless/iwmc3200wifi/rx.c | 7 +- + drivers/net/wireless/libertas/cfg.c | 62 ++- + drivers/net/wireless/libertas/decl.h | 13 + + drivers/net/wireless/libertas/if_cs.c | 130 +++-- + drivers/net/wireless/libertas/if_sdio.c | 171 +++---- + drivers/net/wireless/libertas/if_sdio.h | 4 - + drivers/net/wireless/libertas/if_spi.c | 150 +++--- + drivers/net/wireless/libertas/if_spi.h | 5 - + drivers/net/wireless/libertas/if_usb.c | 60 ++- + drivers/net/wireless/libertas/if_usb.h | 1 + + drivers/net/wireless/libertas/main.c | 105 ++++ + drivers/net/wireless/libertas_tf/if_usb.c | 57 ++- + drivers/net/wireless/mac80211_hwsim.c | 7 +- + drivers/net/wireless/p54/Kconfig | 1 + + drivers/net/wireless/p54/eeprom.c | 21 +- + drivers/net/wireless/p54/fwio.c | 6 +- + drivers/net/wireless/p54/main.c | 9 +- + drivers/net/wireless/p54/p54spi_eeprom.h | 2 +- + drivers/net/wireless/p54/txrx.c | 17 +- + drivers/net/wireless/prism54/isl_ioctl.c | 2 +- + drivers/net/wireless/rt2x00/rt2400pci.c | 2 +- + drivers/net/wireless/rt2x00/rt2500pci.c | 2 +- + drivers/net/wireless/rt2x00/rt2500usb.c | 6 +- + drivers/net/wireless/rt2x00/rt2800.h | 27 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 132 +++++- + drivers/net/wireless/rt2x00/rt2800lib.h | 15 +- + drivers/net/wireless/rt2x00/rt2800pci.c | 119 +---- + drivers/net/wireless/rt2x00/rt2800usb.c | 54 ++- + drivers/net/wireless/rt2x00/rt2x00.h | 16 +- + drivers/net/wireless/rt2x00/rt2x00config.c | 12 +- + drivers/net/wireless/rt2x00/rt2x00crypto.c | 17 +- + drivers/net/wireless/rt2x00/rt2x00debug.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 63 ++-- + drivers/net/wireless/rt2x00/rt2x00firmware.c | 3 + + drivers/net/wireless/rt2x00/rt2x00ht.c | 10 + + drivers/net/wireless/rt2x00/rt2x00queue.c | 11 +- + drivers/net/wireless/rt2x00/rt2x00queue.h | 8 +- + drivers/net/wireless/rt2x00/rt2x00usb.c | 135 ++++-- + drivers/net/wireless/rt2x00/rt61pci.c | 12 +- + drivers/net/wireless/rt2x00/rt73usb.c | 6 +- + drivers/net/wireless/rtl818x/rtl8180_dev.c | 143 +++--- + drivers/net/wireless/rtl818x/rtl8187_dev.c | 9 +- + drivers/net/wireless/wl12xx/wl1251_acx.c | 2 +- + drivers/net/wireless/wl12xx/wl1251_cmd.c | 2 +- + drivers/net/wireless/wl12xx/wl1251_main.c | 13 +- + drivers/net/wireless/wl12xx/wl1251_tx.c | 4 +- + drivers/net/wireless/wl12xx/wl1271_acx.c | 2 +- + drivers/net/wireless/wl12xx/wl1271_main.c | 13 +- + drivers/net/wireless/wl12xx/wl1271_scan.c | 2 +- + drivers/net/wireless/wl12xx/wl1271_tx.c | 4 +- + drivers/net/wireless/zd1211rw/zd_chip.c | 5 + + include/linux/netdevice.h | 2 + + include/linux/nl80211.h | 93 +++- + include/linux/ssb/ssb_regs.h | 1 + + include/net/cfg80211.h | 58 ++- + include/net/mac80211.h | 60 ++- + net/core/net-sysfs.c | 3 +- + net/mac80211/aes_ccm.c | 6 +- + net/mac80211/aes_cmac.c | 6 +- + net/mac80211/agg-rx.c | 22 + + net/mac80211/cfg.c | 62 +-- + net/mac80211/debugfs_key.c | 55 +-- + net/mac80211/driver-trace.h | 4 +- + net/mac80211/ht.c | 28 + + net/mac80211/ibss.c | 8 +- + net/mac80211/ieee80211_i.h | 20 +- + net/mac80211/iface.c | 63 ++- + net/mac80211/key.c | 59 +-- + net/mac80211/key.h | 4 +- + net/mac80211/main.c | 81 +++- + net/mac80211/mlme.c | 28 +- + net/mac80211/rc80211_pid_debugfs.c | 2 +- + net/mac80211/rx.c | 503 ++++++++++++------ + net/mac80211/scan.c | 32 +- + net/mac80211/sta_info.h | 16 +- + net/mac80211/status.c | 2 +- + net/mac80211/tx.c | 22 +- + net/mac80211/util.c | 6 +- + net/mac80211/wep.c | 2 +- + net/mac80211/work.c | 39 +- + net/mac80211/wpa.c | 32 +- + net/wireless/core.c | 15 +- + net/wireless/core.h | 21 +- + net/wireless/mlme.c | 149 ++++-- + net/wireless/nl80211.c | 123 ++++- + net/wireless/nl80211.h | 14 +- + net/wireless/reg.c | 16 +- + net/wireless/sysfs.c | 9 + + net/wireless/util.c | 4 +- + 149 files changed, 3884 insertions(+), 2660 deletions(-) + create mode 100644 Documentation/DocBook/80211.tmpl + delete mode 100644 Documentation/DocBook/mac80211.tmpl + create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-tt.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-tt.h +Merging mtd/master +$ git merge mtd/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 16 ++++++++++++++++ + 1 files changed, 16 insertions(+), 0 deletions(-) +Merging sound-asoc/for-next +$ git merge sound-asoc/for-next +Resolved 'arch/arm/mach-s3c64xx/mach-smdk6410.c' using previous resolution. +Auto-merging arch/arm/mach-s3c64xx/mach-smdk6410.c +CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-smdk6410.c +Removing include/sound/soc-of-simple.h +Removing sound/soc/blackfin/bf5xx-i2s.h +Removing sound/soc/codecs/ac97.h +Removing sound/soc/codecs/ak4104.h +Removing sound/soc/codecs/ak4642.h +Removing sound/soc/codecs/cq93vc.h +Removing sound/soc/codecs/cs4270.h +Removing sound/soc/codecs/da7210.h +Removing sound/soc/codecs/jz4740.h +Removing sound/soc/codecs/spdif_transciever.h +Removing sound/soc/codecs/twl4030.h +Removing sound/soc/codecs/wm8727.h +Removing sound/soc/davinci/davinci-vcif.h +Removing sound/soc/ep93xx/ep93xx-i2s.h +Removing sound/soc/fsl/soc-of-simple.c +Removing sound/soc/kirkwood/kirkwood-dma.h +Removing sound/soc/kirkwood/kirkwood-i2s.h +Removing sound/soc/omap/omap-mcpdm.h +Removing sound/soc/pxa/pxa2xx-pcm.h +Auto-merging sound/soc/sh/siu_pcm.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fbe32e9] Merge remote branch 'sound-asoc/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-davinci/devices.c | 13 + + arch/arm/mach-ep93xx/core.c | 6 + + arch/arm/mach-kirkwood/common.c | 6 + + arch/arm/mach-mx3/clock-imx31.c | 4 +- + arch/arm/mach-mx3/clock-imx35.c | 4 +- + arch/arm/mach-mx3/devices.c | 4 +- + arch/arm/mach-omap1/devices.c | 26 + + arch/arm/mach-omap2/board-rx51-peripherals.c | 13 +- + arch/arm/mach-omap2/board-zoom2.c | 28 +- + arch/arm/mach-omap2/devices.c | 39 + + arch/arm/mach-omap2/include/mach/board-zoom.h | 2 + + arch/arm/mach-pxa/devices.c | 25 + + arch/arm/mach-pxa/devices.h | 6 + + arch/arm/mach-pxa/pxa27x.c | 4 + + arch/arm/mach-pxa/pxa3xx.c | 5 + + arch/arm/mach-pxa/zylonite.c | 11 + + arch/arm/mach-s3c64xx/dev-audio.c | 13 + + arch/arm/mach-s3c64xx/mach-smdk6410.c | 1 + + arch/arm/plat-mxc/audmux-v2.c | 4 +- + arch/arm/plat-omap/include/plat/mcbsp.h | 7 + + arch/arm/plat-s3c24xx/devs.c | 30 +- + arch/arm/plat-samsung/include/plat/devs.h | 2 + + arch/powerpc/boot/dts/mpc8610_hpcd.dts | 1 + + .../include/asm/{immap_86xx.h => fsl_guts.h} | 111 +- + drivers/input/misc/twl4030-vibra.c | 4 +- + drivers/mfd/twl-core.c | 6 +- + drivers/mfd/twl4030-codec.c | 8 +- + include/linux/i2c/twl.h | 6 +- + include/sound/sh_fsi.h | 4 +- + include/sound/soc-dai.h | 98 +- + include/sound/soc-dapm.h | 8 +- + include/sound/soc-of-simple.h | 25 - + include/sound/soc.h | 236 +- + include/sound/tlv320aic3x.h | 43 +- + include/sound/wm8962.h | 23 + + sound/soc/atmel/atmel-pcm.c | 59 +- + sound/soc/atmel/atmel-pcm.h | 3 - + sound/soc/atmel/atmel_ssc_dai.c | 97 +- + sound/soc/atmel/atmel_ssc_dai.h | 1 - + sound/soc/atmel/playpaq_wm8510.c | 65 +- + sound/soc/atmel/sam9g20_wm8731.c | 51 +- + sound/soc/atmel/snd-soc-afeb9260.c | 35 +- + sound/soc/au1x/db1200.c | 35 +- + sound/soc/au1x/dbdma2.c | 19 +- + sound/soc/au1x/psc-ac97.c | 20 +- + sound/soc/au1x/psc-i2s.c | 21 +- + sound/soc/au1x/psc.h | 3 - + sound/soc/blackfin/bf5xx-ac97-pcm.c | 43 +- + sound/soc/blackfin/bf5xx-ac97-pcm.h | 3 - + sound/soc/blackfin/bf5xx-ac97.c | 41 +- + sound/soc/blackfin/bf5xx-ac97.h | 2 - + sound/soc/blackfin/bf5xx-ad1836.c | 23 +- + sound/soc/blackfin/bf5xx-ad193x.c | 23 +- + sound/soc/blackfin/bf5xx-ad1980.c | 19 +- + sound/soc/blackfin/bf5xx-ad73311.c | 22 +- + sound/soc/blackfin/bf5xx-i2s-pcm.c | 44 +- + sound/soc/blackfin/bf5xx-i2s-pcm.h | 3 - + sound/soc/blackfin/bf5xx-i2s.c | 45 +- + sound/soc/blackfin/bf5xx-i2s.h | 14 - + sound/soc/blackfin/bf5xx-ssm2602.c | 38 +- + sound/soc/blackfin/bf5xx-tdm-pcm.c | 43 +- + sound/soc/blackfin/bf5xx-tdm-pcm.h | 3 - + sound/soc/blackfin/bf5xx-tdm.c | 15 +- + sound/soc/blackfin/bf5xx-tdm.h | 2 - + sound/soc/codecs/Kconfig | 4 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/ac97.c | 124 +- + sound/soc/codecs/ac97.h | 19 - + sound/soc/codecs/ad1836.c | 191 +- + sound/soc/codecs/ad1836.h | 2 - + sound/soc/codecs/ad193x.c | 217 +- + sound/soc/codecs/ad193x.h | 3 - + sound/soc/codecs/ad1980.c | 107 +- + sound/soc/codecs/ad1980.h | 3 - + sound/soc/codecs/ad73311.c | 66 +- + sound/soc/codecs/ad73311.h | 2 - + sound/soc/codecs/ads117x.c | 72 +- + sound/soc/codecs/ads117x.h | 4 +- + sound/soc/codecs/ak4104.c | 149 +- + sound/soc/codecs/ak4104.h | 7 - + sound/soc/codecs/ak4535.c | 236 +- + sound/soc/codecs/ak4535.h | 8 - + sound/soc/codecs/ak4642.c | 175 +- + sound/soc/codecs/ak4642.h | 20 - + sound/soc/codecs/ak4671.c | 141 +- + sound/soc/codecs/ak4671.h | 3 - + sound/soc/codecs/cq93vc.c | 132 +- + sound/soc/codecs/cq93vc.h | 29 - + sound/soc/codecs/cs4270.c | 393 +- + sound/soc/codecs/cs4270.h | 28 - + sound/soc/codecs/cs42l51.c | 293 +- + sound/soc/codecs/cs42l51.h | 2 - + sound/soc/codecs/cx20442.c | 173 +- + sound/soc/codecs/cx20442.h | 2 - + sound/soc/codecs/da7210.c | 157 +- + sound/soc/codecs/da7210.h | 24 - + sound/soc/codecs/jz4740.c | 116 +- + sound/soc/codecs/jz4740.h | 20 - + sound/soc/codecs/pcm3008.c | 92 +- + sound/soc/codecs/pcm3008.h | 3 - + sound/soc/codecs/spdif_transciever.c | 102 +- + sound/soc/codecs/spdif_transciever.h | 18 - + sound/soc/codecs/ssm2602.c | 219 +- + sound/soc/codecs/ssm2602.h | 3 - + sound/soc/codecs/stac9766.c | 118 +- + sound/soc/codecs/stac9766.h | 4 - + sound/soc/codecs/tlv320aic23.c | 182 +- + sound/soc/codecs/tlv320aic23.h | 3 - + sound/soc/codecs/tlv320aic26.c | 180 +- + sound/soc/codecs/tlv320aic26.h | 3 - + sound/soc/codecs/tlv320aic3x.c | 223 +- + sound/soc/codecs/tlv320aic3x.h | 43 - + sound/soc/codecs/tlv320dac33.c | 249 +- + sound/soc/codecs/tlv320dac33.h | 3 - + sound/soc/codecs/twl4030.c | 229 +- + sound/soc/codecs/twl4030.h | 55 - + sound/soc/codecs/twl6040.c | 170 +- + sound/soc/codecs/twl6040.h | 3 - + sound/soc/codecs/uda134x.c | 154 +- + sound/soc/codecs/uda134x.h | 3 - + sound/soc/codecs/uda1380.c | 211 +- + sound/soc/codecs/uda1380.h | 3 - + sound/soc/codecs/wm2000.h | 3 - + sound/soc/codecs/wm8350.c | 231 +- + sound/soc/codecs/wm8350.h | 3 - + sound/soc/codecs/wm8400.c | 181 +- + sound/soc/codecs/wm8400.h | 3 - + sound/soc/codecs/wm8510.c | 288 +- + sound/soc/codecs/wm8510.h | 3 - + sound/soc/codecs/wm8523.c | 177 +- + sound/soc/codecs/wm8523.h | 3 - + sound/soc/codecs/wm8580.c | 325 +- + sound/soc/codecs/wm8580.h | 17 +- + sound/soc/codecs/wm8711.c | 202 +- + sound/soc/codecs/wm8711.h | 3 - + sound/soc/codecs/wm8727.c | 106 +- + sound/soc/codecs/wm8727.h | 21 - + sound/soc/codecs/wm8728.c | 290 +- + sound/soc/codecs/wm8728.h | 9 - + sound/soc/codecs/wm8731.c | 213 +- + sound/soc/codecs/wm8731.h | 3 - + sound/soc/codecs/wm8741.c | 201 +- + sound/soc/codecs/wm8741.h | 3 - + sound/soc/codecs/wm8750.c | 265 +- + sound/soc/codecs/wm8750.h | 9 - + sound/soc/codecs/wm8753.c | 403 +- + sound/soc/codecs/wm8753.h | 3 - + sound/soc/codecs/wm8776.c | 254 +- + sound/soc/codecs/wm8776.h | 3 - + sound/soc/codecs/wm8900.c | 247 +- + sound/soc/codecs/wm8900.h | 3 - + sound/soc/codecs/wm8903.c | 265 +- + sound/soc/codecs/wm8903.h | 3 - + sound/soc/codecs/wm8904.c | 208 +- + sound/soc/codecs/wm8904.h | 3 - + sound/soc/codecs/wm8940.c | 199 +- + sound/soc/codecs/wm8940.h | 2 - + sound/soc/codecs/wm8955.c | 181 +- + sound/soc/codecs/wm8955.h | 3 - + sound/soc/codecs/wm8960.c | 209 +- + sound/soc/codecs/wm8960.h | 3 - + sound/soc/codecs/wm8961.c | 237 +- + sound/soc/codecs/wm8961.h | 3 - + sound/soc/codecs/wm8962-tables.c |42299 ++++++++++++++++++++ + sound/soc/codecs/wm8962.c | 1859 + + sound/soc/codecs/wm8962.h | 3787 ++ + sound/soc/codecs/wm8971.c | 247 +- + sound/soc/codecs/wm8971.h | 8 - + sound/soc/codecs/wm8974.c | 167 +- + sound/soc/codecs/wm8974.h | 3 - + sound/soc/codecs/wm8978.c | 190 +- + sound/soc/codecs/wm8978.h | 3 - + sound/soc/codecs/wm8988.c | 262 +- + sound/soc/codecs/wm8988.h | 3 - + sound/soc/codecs/wm8990.c | 222 +- + sound/soc/codecs/wm8990.h | 8 - + sound/soc/codecs/wm8993.c | 304 +- + sound/soc/codecs/wm8993.h | 3 - + sound/soc/codecs/wm8994.c | 229 +- + sound/soc/codecs/wm8994.h | 3 - + sound/soc/codecs/wm9081.c | 208 +- + sound/soc/codecs/wm9081.h | 3 - + sound/soc/codecs/wm9090.c | 183 +- + sound/soc/codecs/wm9090.h | 2 - + sound/soc/codecs/wm9705.c | 116 +- + sound/soc/codecs/wm9705.h | 3 - + sound/soc/codecs/wm9712.c | 124 +- + sound/soc/codecs/wm9712.h | 3 - + sound/soc/codecs/wm9713.c | 131 +- + sound/soc/codecs/wm9713.h | 3 - + sound/soc/davinci/davinci-evm.c | 109 +- + sound/soc/davinci/davinci-i2s.c | 44 +- + sound/soc/davinci/davinci-i2s.h | 2 - + sound/soc/davinci/davinci-mcasp.c | 32 +- + sound/soc/davinci/davinci-mcasp.h | 2 - + sound/soc/davinci/davinci-pcm.c | 45 +- + sound/soc/davinci/davinci-pcm.h | 3 - + sound/soc/davinci/davinci-sffsdr.c | 27 +- + sound/soc/davinci/davinci-vcif.c | 25 +- + sound/soc/davinci/davinci-vcif.h | 28 - + sound/soc/ep93xx/ep93xx-i2s.c | 34 +- + sound/soc/ep93xx/ep93xx-i2s.h | 18 - + sound/soc/ep93xx/ep93xx-pcm.c | 37 +- + sound/soc/ep93xx/ep93xx-pcm.h | 2 - + sound/soc/ep93xx/snappercl15.c | 24 +- + sound/soc/fsl/Kconfig | 3 - + sound/soc/fsl/Makefile | 3 - + sound/soc/fsl/efika-audio-fabric.c | 20 +- + sound/soc/fsl/fsl_dma.c | 370 +- + sound/soc/fsl/fsl_dma.h | 20 - + sound/soc/fsl/fsl_ssi.c | 273 +- + sound/soc/fsl/fsl_ssi.h | 26 - + sound/soc/fsl/mpc5200_dma.c | 66 +- + sound/soc/fsl/mpc5200_dma.h | 5 - + sound/soc/fsl/mpc5200_psc_ac97.c | 34 +- + sound/soc/fsl/mpc5200_psc_ac97.h | 2 - + sound/soc/fsl/mpc5200_psc_i2s.c | 19 +- + sound/soc/fsl/mpc8610_hpcd.c | 658 +- + sound/soc/fsl/pcm030-audio-fabric.c | 21 +- + sound/soc/fsl/soc-of-simple.c | 172 - + sound/soc/imx/Kconfig | 16 + + sound/soc/imx/Makefile | 10 +- + sound/soc/imx/eukrea-tlv320.c | 16 +- + sound/soc/imx/imx-pcm-dma-mx2.c | 43 +- + sound/soc/imx/imx-pcm-fiq.c | 68 +- + sound/soc/imx/imx-ssi.c | 148 +- + sound/soc/imx/imx-ssi.h | 7 +- + sound/soc/imx/phycore-ac97.c | 19 +- + sound/soc/imx/wm1133-ev1.c | 27 +- + sound/soc/jz4740/jz4740-i2s.c | 104 +- + sound/soc/jz4740/jz4740-i2s.h | 2 - + sound/soc/jz4740/jz4740-pcm.c | 18 +- + sound/soc/jz4740/jz4740-pcm.h | 2 - + sound/soc/jz4740/qi_lb60.c | 25 +- + sound/soc/kirkwood/kirkwood-dma.c | 64 +- + sound/soc/kirkwood/kirkwood-dma.h | 17 - + sound/soc/kirkwood/kirkwood-i2s.c | 52 +- + sound/soc/kirkwood/kirkwood-i2s.h | 17 - + sound/soc/kirkwood/kirkwood-openrd.c | 21 +- + sound/soc/nuc900/nuc900-ac97.c | 12 +- + sound/soc/nuc900/nuc900-audio.c | 16 +- + sound/soc/nuc900/nuc900-audio.h | 4 - + sound/soc/nuc900/nuc900-pcm.c | 38 +- + sound/soc/omap/am3517evm.c | 25 +- + sound/soc/omap/ams-delta.c | 98 +- + sound/soc/omap/igep0020.c | 22 +- + sound/soc/omap/mcpdm.c | 19 +- + sound/soc/omap/mcpdm.h | 2 + + sound/soc/omap/n810.c | 42 +- + sound/soc/omap/omap-mcbsp.c | 123 +- + sound/soc/omap/omap-mcbsp.h | 2 - + sound/soc/omap/omap-mcpdm.c | 71 +- + sound/soc/omap/omap-mcpdm.h | 29 - + sound/soc/omap/omap-pcm.c | 47 +- + sound/soc/omap/omap-pcm.h | 2 - + sound/soc/omap/omap2evm.c | 25 +- + sound/soc/omap/omap3beagle.c | 23 +- + sound/soc/omap/omap3evm.c | 30 +- + sound/soc/omap/omap3pandora.c | 36 +- + sound/soc/omap/osk5912.c | 24 +- + sound/soc/omap/overo.c | 22 +- + sound/soc/omap/rx51.c | 37 +- + sound/soc/omap/sdp3430.c | 56 +- + sound/soc/omap/sdp4430.c | 23 +- + sound/soc/omap/zoom2.c | 64 +- + sound/soc/pxa/corgi.c | 26 +- + sound/soc/pxa/e740_wm9705.c | 26 +- + sound/soc/pxa/e750_wm9705.c | 26 +- + sound/soc/pxa/e800_wm9712.c | 26 +- + sound/soc/pxa/em-x270.c | 22 +- + sound/soc/pxa/imote2.c | 20 +- + sound/soc/pxa/magician.c | 35 +- + sound/soc/pxa/mioa701_wm9713.c | 33 +- + sound/soc/pxa/palm27x.c | 27 +- + sound/soc/pxa/poodle.c | 27 +- + sound/soc/pxa/pxa-ssp.c | 173 +- + sound/soc/pxa/pxa-ssp.h | 2 - + sound/soc/pxa/pxa2xx-ac97.c | 45 +- + sound/soc/pxa/pxa2xx-ac97.h | 2 - + sound/soc/pxa/pxa2xx-i2s.c | 90 +- + sound/soc/pxa/pxa2xx-i2s.h | 2 - + sound/soc/pxa/pxa2xx-pcm.c | 46 +- + sound/soc/pxa/pxa2xx-pcm.h | 19 - + sound/soc/pxa/raumfeld.c | 114 +- + sound/soc/pxa/spitz.c | 26 +- + sound/soc/pxa/tosa.c | 27 +- + sound/soc/pxa/z2.c | 26 +- + sound/soc/pxa/zylonite.c | 40 +- + sound/soc/s3c24xx/Kconfig | 18 + + sound/soc/s3c24xx/Makefile | 4 + + sound/soc/s3c24xx/aquila_wm8994.c | 295 + + sound/soc/s3c24xx/goni_wm8994.c | 298 + + sound/soc/s3c24xx/jive_wm8750.c | 23 +- + sound/soc/s3c24xx/ln2440sbc_alc650.c | 17 +- + sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 58 +- + sound/soc/s3c24xx/neo1973_wm8753.c | 37 +- + sound/soc/s3c24xx/s3c-ac97.c | 22 +- + sound/soc/s3c24xx/s3c-ac97.h | 2 - + sound/soc/s3c24xx/s3c-dma.c | 46 +- + sound/soc/s3c24xx/s3c-dma.h | 1 - + sound/soc/s3c24xx/s3c-i2s-v2.c | 50 +- + sound/soc/s3c24xx/s3c-i2s-v2.h | 13 +- + sound/soc/s3c24xx/s3c-pcm.c | 42 +- + sound/soc/s3c24xx/s3c2412-i2s.c | 54 +- + sound/soc/s3c24xx/s3c2412-i2s.h | 2 - + sound/soc/s3c24xx/s3c24xx-i2s.c | 40 +- + sound/soc/s3c24xx/s3c24xx-i2s.h | 2 - + sound/soc/s3c24xx/s3c24xx_simtec.c | 15 +- + sound/soc/s3c24xx/s3c24xx_simtec.h | 4 +- + sound/soc/s3c24xx/s3c24xx_simtec_hermes.c | 25 +- + sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c | 21 +- + sound/soc/s3c24xx/s3c24xx_uda134x.c | 21 +- + sound/soc/s3c24xx/s3c64xx-i2s-v4.c | 135 +- + sound/soc/s3c24xx/s3c64xx-i2s.c | 206 +- + sound/soc/s3c24xx/s3c64xx-i2s.h | 2 - + sound/soc/s3c24xx/smartq_wm8987.c | 15 +- + sound/soc/s3c24xx/smdk2443_wm9710.c | 17 +- + sound/soc/s3c24xx/smdk64xx_wm8580.c | 66 +- + sound/soc/s3c24xx/smdk_wm9713.c | 38 +- + sound/soc/s6000/s6000-i2s.c | 56 +- + sound/soc/s6000/s6000-i2s.h | 2 - + sound/soc/s6000/s6000-pcm.c | 100 +- + sound/soc/s6000/s6000-pcm.h | 2 - + sound/soc/s6000/s6105-ipcam.c | 31 +- + sound/soc/sh/dma-sh7760.c | 53 +- + sound/soc/sh/fsi-ak4642.c | 24 +- + sound/soc/sh/fsi-da7210.c | 22 +- + sound/soc/sh/fsi.c | 47 +- + sound/soc/sh/hac.c | 46 +- + sound/soc/sh/migor.c | 29 +- + sound/soc/sh/sh7760-ac97.c | 25 +- + sound/soc/sh/siu.h | 5 +- + sound/soc/sh/siu_dai.c | 66 +- + sound/soc/sh/siu_pcm.c | 32 +- + sound/soc/sh/ssi.c | 55 +- + sound/soc/soc-cache.c | 42 +- + sound/soc/soc-core.c | 1677 +- + sound/soc/soc-dapm.c | 88 +- + sound/soc/soc-jack.c | 10 +- + sound/soc/txx9/txx9aclc-ac97.c | 55 +- + sound/soc/txx9/txx9aclc-generic.c | 24 +- + sound/soc/txx9/txx9aclc.c | 141 +- + sound/soc/txx9/txx9aclc.h | 13 +- + 343 files changed, 57346 insertions(+), 13436 deletions(-) + rename arch/powerpc/include/asm/{immap_86xx.h => fsl_guts.h} (66%) + delete mode 100644 include/sound/soc-of-simple.h + create mode 100644 include/sound/wm8962.h + delete mode 100644 sound/soc/blackfin/bf5xx-i2s.h + delete mode 100644 sound/soc/codecs/ac97.h + delete mode 100644 sound/soc/codecs/ak4104.h + delete mode 100644 sound/soc/codecs/ak4642.h + delete mode 100644 sound/soc/codecs/cq93vc.h + delete mode 100644 sound/soc/codecs/cs4270.h + delete mode 100644 sound/soc/codecs/da7210.h + delete mode 100644 sound/soc/codecs/jz4740.h + delete mode 100644 sound/soc/codecs/spdif_transciever.h + delete mode 100644 sound/soc/codecs/twl4030.h + delete mode 100644 sound/soc/codecs/wm8727.h + create mode 100644 sound/soc/codecs/wm8962-tables.c + create mode 100644 sound/soc/codecs/wm8962.c + create mode 100644 sound/soc/codecs/wm8962.h + delete mode 100644 sound/soc/davinci/davinci-vcif.h + delete mode 100644 sound/soc/ep93xx/ep93xx-i2s.h + delete mode 100644 sound/soc/fsl/soc-of-simple.c + delete mode 100644 sound/soc/kirkwood/kirkwood-dma.h + delete mode 100644 sound/soc/kirkwood/kirkwood-i2s.h + delete mode 100644 sound/soc/omap/omap-mcpdm.h + delete mode 100644 sound/soc/pxa/pxa2xx-pcm.h + create mode 100644 sound/soc/s3c24xx/aquila_wm8994.c + create mode 100644 sound/soc/s3c24xx/goni_wm8994.c +Merging sound/for-next +$ git merge sound/for-next +Merge made by recursive. + sound/pci/hda/patch_conexant.c | 1 + + sound/pci/hda/patch_realtek.c | 176 ++++++++++++++++++++++++++++++++------- + sound/pci/riptide/riptide.c | 11 +-- + 3 files changed, 150 insertions(+), 38 deletions(-) +Merging cpufreq/next +$ git merge cpufreq/next +Merge made by recursive. + drivers/cpufreq/cpufreq.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) +Merging quilt/rr +$ git merge quilt/rr +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 +Already up-to-date. +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Already up-to-date. +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master +$ git merge pcmcia/master +Merge made by recursive. +Merging battery/master +$ git merge battery/master +Already up-to-date. +Merging leds/for-mm +$ git merge leds/for-mm +Auto-merging drivers/leds/Kconfig +Auto-merging drivers/leds/leds-gpio.c +Merge made by recursive. +Merging backlight/for-mm +$ git merge backlight/for-mm +Already up-to-date. +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Merge made by recursive. + arch/x86/kernel/kgdb.c | 2 +- + drivers/char/keyboard.c | 37 +++++++++++++++++++++++++++++++++++++ + drivers/char/vt.c | 11 +++++++---- + drivers/serial/kgdboc.c | 13 +++++++++++++ + include/linux/kbd_kern.h | 1 + + 5 files changed, 59 insertions(+), 5 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Auto-merging include/linux/slub_def.h +Auto-merging mm/slab.c +Merge made by recursive. + include/linux/slub_def.h | 2 +- + mm/slab.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 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 +Already up-to-date. +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Already up-to-date. +Merging viafb/viafb-next +$ git merge viafb/viafb-next +Removing drivers/video/via/lcdtbl.h +Merge made by recursive. + drivers/video/via/dvi.c | 172 +++++++++---- + drivers/video/via/dvi.h | 4 +- + drivers/video/via/hw.c | 456 ++++++++++++-------------------- + drivers/video/via/hw.h | 16 +- + drivers/video/via/ioctl.c | 2 + + drivers/video/via/lcd.c | 49 +++- + drivers/video/via/lcd.h | 6 +- + drivers/video/via/lcdtbl.h | 591 ------------------------------------------ + drivers/video/via/viafbdev.c | 8 +- + drivers/video/via/viafbdev.h | 3 + + 10 files changed, 360 insertions(+), 947 deletions(-) + delete mode 100644 drivers/video/via/lcdtbl.h +Merging voltage/for-next +$ git merge voltage/for-next +Resolved 'drivers/regulator/ab8500.c' using previous resolution. +Auto-merging drivers/mfd/Kconfig +Auto-merging drivers/mfd/Makefile +Auto-merging drivers/regulator/ab8500.c +CONFLICT (add/add): Merge conflict in drivers/regulator/ab8500.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3fe1626] Merge remote branch 'voltage/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/regulator/ab8500.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Merge made by recursive. + security/apparmor/lsm.c | 2 +- + security/selinux/ss/policydb.c | 4 ++-- + security/tomoyo/common.c | 6 ++++-- + 3 files changed, 7 insertions(+), 5 deletions(-) +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging agp/agp-next +$ git merge agp/agp-next +Auto-merging drivers/char/agp/backend.c +Auto-merging drivers/char/agp/hp-agp.c +Merge made by recursive. +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Auto-merging include/linux/wlp.h +Merge made by recursive. + drivers/uwb/i1480/i1480u-wlp/lc.c | 16 ++++++------ + drivers/uwb/wlp/messages.c | 40 ++++++++++++++++---------------- + drivers/uwb/wlp/sysfs.c | 46 ++++++++++++++++++------------------ + drivers/uwb/wlp/wlp-lc.c | 12 +++++----- + include/linux/wlp.h | 2 +- + 5 files changed, 58 insertions(+), 58 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 +Already up-to-date. +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 Documentation/kernel-parameters.txt +Auto-merging arch/blackfin/mach-bf537/boards/stamp.c +Auto-merging block/blk-core.c +Auto-merging drivers/gpu/drm/radeon/radeon_cs.c +Auto-merging drivers/rtc/rtc-nuc900.c +Auto-merging drivers/scsi/lpfc/lpfc_hbadisc.c +Auto-merging fs/exofs/inode.c +Auto-merging fs/exofs/ios.c +Merge made by recursive. + Documentation/arm/SA1100/FreeBird | 4 ++-- + Documentation/kernel-parameters.txt | 2 +- + arch/blackfin/mach-bf527/boards/ezkit.c | 2 +- + arch/blackfin/mach-bf537/boards/stamp.c | 2 +- + arch/xtensa/include/asm/uaccess.h | 2 +- + block/blk-core.c | 2 +- + drivers/ata/pata_bf54x.c | 2 +- + drivers/base/core.c | 2 +- + drivers/gpu/drm/radeon/radeon_cs.c | 2 +- + drivers/media/video/zoran/videocodec.h | 2 +- + drivers/net/depca.c | 2 +- + drivers/net/igb/igb_main.c | 2 +- + drivers/net/ps3_gelic_net.c | 4 ++-- + drivers/net/skfp/hwt.c | 2 +- + drivers/net/skfp/skfddi.c | 2 +- + drivers/net/tulip/pnic2.c | 2 +- + drivers/rtc/rtc-nuc900.c | 2 +- + drivers/s390/block/dasd_3990_erp.c | 2 +- + drivers/s390/char/tape_3590.c | 6 +++--- + drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +- + drivers/usb/gadget/at91_udc.c | 1 - + drivers/usb/gadget/f_audio.c | 2 -- + drivers/usb/gadget/f_hid.c | 4 ---- + drivers/usb/gadget/fsl_udc_core.c | 6 ------ + drivers/usb/gadget/langwell_udc.c | 3 --- + drivers/usb/gadget/pxa27x_udc.c | 2 -- + drivers/usb/gadget/rndis.c | 2 -- + drivers/usb/host/ehci-hcd.c | 1 - + drivers/usb/host/imx21-hcd.c | 4 ++-- + drivers/usb/host/ohci-hcd.c | 1 - + drivers/usb/host/oxu210hp-hcd.c | 9 --------- + drivers/usb/host/pci-quirks.c | 2 -- + drivers/usb/host/u132-hcd.c | 8 ++------ + drivers/usb/image/microtek.c | 9 --------- + drivers/usb/misc/ftdi-elan.c | 2 -- + drivers/usb/mon/mon_main.c | 2 -- + drivers/usb/musb/musb_gadget.c | 1 - + drivers/usb/serial/cypress_m8.c | 2 -- + drivers/usb/serial/ftdi_sio.c | 1 - + drivers/usb/serial/garmin_gps.c | 1 - + drivers/usb/serial/io_edgeport.c | 11 ----------- + drivers/usb/serial/io_ti.c | 4 ---- + drivers/usb/serial/iuu_phoenix.c | 1 - + drivers/usb/serial/keyspan_pda.c | 1 - + drivers/usb/serial/mos7720.c | 6 ------ + drivers/usb/serial/mos7840.c | 7 ------- + drivers/usb/serial/omninet.c | 2 -- + drivers/usb/serial/sierra.c | 2 -- + drivers/usb/serial/spcp8x5.c | 1 - + drivers/usb/serial/usb_wwan.c | 1 - + drivers/usb/serial/whiteheat.c | 6 ------ + drivers/video/bf54x-lq043fb.c | 6 +++--- + drivers/video/bfin-t350mcqb-fb.c | 2 +- + drivers/video/vesafb.c | 2 +- + fs/exofs/inode.c | 14 +++++++------- + fs/exofs/ios.c | 10 +++++----- + fs/jfs/jfs_mount.c | 4 ++-- + include/video/vga.h | 2 +- + kernel/trace/trace_kprobe.c | 2 +- + mm/percpu.c | 2 +- + net/mac80211/mesh.h | 2 +- + net/wanrouter/wanmain.c | 4 ++-- + 62 files changed, 53 insertions(+), 150 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 +Already up-to-date. +Merging bluetooth/master +$ git merge bluetooth/master +Merge made by recursive. +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Already up-to-date. +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 864e636] 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 catalin/for-next +$ git merge catalin/for-next +Auto-merging arch/arm/include/asm/tlbflush.h +Auto-merging arch/arm/mm/Kconfig +Auto-merging mm/kmemleak.c +Merge made by recursive. + Documentation/arm/00-INDEX | 2 + + Documentation/arm/swp_emulation | 27 ++++ + arch/arm/include/asm/assembler.h | 13 +- + arch/arm/include/asm/cacheflush.h | 9 +- + arch/arm/include/asm/domain.h | 31 ++++- + arch/arm/include/asm/futex.h | 9 +- + arch/arm/include/asm/pgtable.h | 29 ++++- + arch/arm/include/asm/smp_plat.h | 4 + + arch/arm/include/asm/tlbflush.h | 12 ++- + arch/arm/include/asm/traps.h | 2 + + arch/arm/include/asm/uaccess.h | 16 +- + arch/arm/kernel/Makefile | 1 + + arch/arm/kernel/entry-armv.S | 4 +- + arch/arm/kernel/fiq.c | 5 + + arch/arm/kernel/swp_emulate.c | 260 +++++++++++++++++++++++++++++++++++++ + arch/arm/kernel/traps.c | 14 ++- + arch/arm/lib/getuser.S | 13 +- + arch/arm/lib/putuser.S | 29 ++-- + arch/arm/lib/uaccess.S | 83 ++++++------ + arch/arm/mm/Kconfig | 43 ++++++ + arch/arm/mm/cache-l2x0.c | 15 ++- + arch/arm/mm/copypage-v4mc.c | 2 +- + arch/arm/mm/copypage-v6.c | 2 +- + arch/arm/mm/copypage-xscale.c | 2 +- + arch/arm/mm/dma-mapping.c | 6 + + arch/arm/mm/fault-armv.c | 8 +- + arch/arm/mm/flush.c | 46 +++++-- + arch/arm/mm/mmu.c | 20 +++- + arch/arm/mm/proc-macros.S | 7 + + arch/arm/mm/proc-v7.S | 9 +- + 30 files changed, 600 insertions(+), 123 deletions(-) + create mode 100644 Documentation/arm/swp_emulation + create mode 100644 arch/arm/kernel/swp_emulate.c +Merging alacrity/linux-next +$ git merge alacrity/linux-next +Resolved 'include/linux/Kbuild' 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 +Auto-merging lib/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 398232c] 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 | 248 +++++++ + drivers/vbus/pci-bridge.c | 1016 ++++++++++++++++++++++++++++ + include/linux/Kbuild | 4 + + include/linux/ioq.h | 414 ++++++++++++ + include/linux/shm_signal.h | 189 ++++++ + include/linux/vbus_driver.h | 83 +++ + include/linux/vbus_pci.h | 145 ++++ + include/linux/venet.h | 133 ++++ + lib/Kconfig | 21 + + lib/Makefile | 2 + + lib/ioq.c | 304 +++++++++ + lib/shm_signal.c | 196 ++++++ + 20 files changed, 4389 insertions(+), 0 deletions(-) + create mode 100644 drivers/net/vbus-enet.c + create mode 100644 drivers/vbus/Kconfig + create mode 100644 drivers/vbus/Makefile + create mode 100644 drivers/vbus/bus-proxy.c + create mode 100644 drivers/vbus/pci-bridge.c + create mode 100644 include/linux/ioq.h + create mode 100644 include/linux/shm_signal.h + create mode 100644 include/linux/vbus_driver.h + create mode 100644 include/linux/vbus_pci.h + create mode 100644 include/linux/venet.h + create mode 100644 lib/ioq.c + create mode 100644 lib/shm_signal.c +Merging i7core_edac/linux_next +$ git merge i7core_edac/linux_next +Resolved 'MAINTAINERS' using previous resolution. +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/edac/i7core_edac.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 12533e8] Merge remote branch 'i7core_edac/linux_next' +$ git diff -M --stat --summary HEAD^.. +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 +Already up-to-date. +Merging omap_dss2/for-next +$ git merge omap_dss2/for-next +Already up-to-date. +Merging xen/upstream/xen +$ git merge xen/upstream/xen +Already up-to-date. +Merging tip/auto-latest +$ git merge tip/auto-latest +Auto-merging arch/x86/kernel/i387.c +Merge made by recursive. + Documentation/x86/x86_64/kernel-stacks | 6 +- + arch/x86/Kconfig.debug | 10 -- + arch/x86/include/asm/apb_timer.h | 1 - + arch/x86/include/asm/cpu.h | 1 - + arch/x86/include/asm/irq.h | 12 +- + arch/x86/include/asm/module.h | 7 +- + arch/x86/include/asm/page_32_types.h | 4 - + arch/x86/kernel/apb_timer.c | 2 +- + arch/x86/kernel/apic/io_apic.c | 12 +- + arch/x86/kernel/cpu/amd.c | 2 +- + arch/x86/kernel/cpu/common.c | 2 +- + arch/x86/kernel/cpu/intel.c | 2 +- + arch/x86/kernel/i387.c | 6 + + arch/x86/kernel/irq_32.c | 8 +- + arch/x86/kernel/process.c | 1 - + arch/x86/kernel/reboot.c | 2 +- + arch/x86/kernel/setup.c | 1 - + arch/x86/kernel/setup_percpu.c | 2 +- + arch/x86/mm/k8topology_64.c | 6 +- + include/linux/irq.h | 2 +- + kernel/trace/ring_buffer.c | 3 + + kernel/trace/trace.c | 11 ++- + kernel/trace/trace_events.c | 207 ++++++++++++++++++++++---------- + kernel/trace/trace_functions_graph.c | 10 ++- + scripts/recordmcount.pl | 7 +- + tools/perf/util/ui/browsers/annotate.c | 3 +- + 26 files changed, 203 insertions(+), 127 deletions(-) +Merging lost-spurious-irq/lost-spurious-irq +$ git merge lost-spurious-irq/lost-spurious-irq +Resolved 'drivers/ata/sata_fsl.c' using previous resolution. +Resolved 'drivers/ata/sata_mv.c' using previous resolution. +Resolved 'drivers/ata/sata_nv.c' using previous resolution. +Resolved 'include/linux/libata.h' using previous resolution. +Auto-merging arch/arm/mach-bcmring/core.c +Auto-merging arch/arm/mach-ep93xx/core.c +Auto-merging arch/arm/mach-integrator/integrator_ap.c +Auto-merging arch/arm/mach-mmp/time.c +Auto-merging arch/arm/mach-u300/timer.c +Auto-merging arch/arm/plat-iop/time.c +Auto-merging arch/ia64/kernel/time.c +Auto-merging drivers/ata/libata-core.c +Auto-merging drivers/ata/libata-eh.c +Auto-merging drivers/ata/libata-sff.c +Auto-merging drivers/ata/sata_fsl.c +CONFLICT (content): Merge conflict in drivers/ata/sata_fsl.c +Auto-merging drivers/ata/sata_mv.c +CONFLICT (content): Merge conflict in drivers/ata/sata_mv.c +Auto-merging drivers/ata/sata_nv.c +CONFLICT (content): Merge conflict in drivers/ata/sata_nv.c +Auto-merging drivers/clocksource/sh_cmt.c +Auto-merging drivers/usb/core/hcd.c +Auto-merging include/linux/interrupt.h +Auto-merging include/linux/irq.h +Auto-merging include/linux/libata.h +CONFLICT (content): Merge conflict in include/linux/libata.h +Auto-merging kernel/irq/manage.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3f84e34] Merge remote branch 'lost-spurious-irq/lost-spurious-irq' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-aaec2000/core.c | 2 +- + arch/arm/mach-at91/at91rm9200_time.c | 2 +- + arch/arm/mach-at91/at91sam926x_time.c | 2 +- + arch/arm/mach-bcmring/core.c | 2 +- + arch/arm/mach-clps711x/time.c | 2 +- + arch/arm/mach-cns3xxx/core.c | 2 +- + arch/arm/mach-ebsa110/core.c | 2 +- + arch/arm/mach-ep93xx/core.c | 2 +- + arch/arm/mach-footbridge/dc21285-timer.c | 2 +- + arch/arm/mach-footbridge/isa-timer.c | 2 +- + arch/arm/mach-h720x/cpu-h7201.c | 2 +- + arch/arm/mach-h720x/cpu-h7202.c | 2 +- + arch/arm/mach-integrator/integrator_ap.c | 2 +- + arch/arm/mach-ixp2000/core.c | 2 +- + arch/arm/mach-ixp23xx/core.c | 2 +- + arch/arm/mach-ixp4xx/common.c | 2 +- + arch/arm/mach-lh7a40x/time.c | 2 +- + arch/arm/mach-mmp/time.c | 2 +- + arch/arm/mach-netx/time.c | 2 +- + arch/arm/mach-ns9xxx/irq.c | 3 - + arch/arm/mach-ns9xxx/time-ns9360.c | 2 +- + arch/arm/mach-nuc93x/time.c | 2 +- + arch/arm/mach-omap1/time.c | 2 +- + arch/arm/mach-omap1/timer32k.c | 2 +- + arch/arm/mach-omap2/timer-gp.c | 2 +- + arch/arm/mach-pnx4008/time.c | 2 +- + arch/arm/mach-pxa/time.c | 2 +- + arch/arm/mach-sa1100/time.c | 2 +- + arch/arm/mach-shark/core.c | 2 +- + arch/arm/mach-u300/timer.c | 2 +- + arch/arm/mach-w90x900/time.c | 2 +- + arch/arm/plat-iop/time.c | 2 +- + arch/arm/plat-mxc/time.c | 2 +- + arch/arm/plat-samsung/time.c | 2 +- + arch/arm/plat-versatile/timer-sp.c | 2 +- + arch/blackfin/kernel/time-ts.c | 6 +- + arch/ia64/kernel/time.c | 2 +- + arch/parisc/kernel/irq.c | 2 +- + arch/powerpc/platforms/cell/interrupt.c | 5 +- + arch/x86/kernel/time.c | 2 +- + drivers/ata/libata-core.c | 54 ++- + drivers/ata/libata-eh.c | 4 +- + drivers/ata/libata-sff.c | 37 +- + drivers/ata/sata_fsl.c | 8 +- + drivers/ata/sata_mv.c | 25 +- + drivers/ata/sata_nv.c | 57 +-- + drivers/clocksource/sh_cmt.c | 3 +- + drivers/clocksource/sh_mtu2.c | 3 +- + drivers/clocksource/sh_tmu.c | 3 +- + drivers/usb/core/hcd.c | 1 + + include/linux/interrupt.h | 43 +- + include/linux/irq.h | 40 +- + include/linux/libata.h | 2 + + kernel/irq/chip.c | 20 +- + kernel/irq/handle.c | 7 +- + kernel/irq/internals.h | 10 +- + kernel/irq/manage.c | 18 +- + kernel/irq/proc.c | 5 +- + kernel/irq/spurious.c | 978 +++++++++++++++++++++++++----- + 59 files changed, 1062 insertions(+), 344 deletions(-) +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Already up-to-date. +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 +Already up-to-date. +Merging sfi/sfi-test +$ git merge sfi/sfi-test +Already up-to-date. +Merging asm-generic/next +$ git merge asm-generic/next +Already up-to-date. +Merging drivers-x86/linux-next +$ git merge drivers-x86/linux-next +Merge made by recursive. + Documentation/laptops/thinkpad-acpi.txt | 4 + + drivers/platform/x86/Kconfig | 6 +- + drivers/platform/x86/asus_acpi.c | 6 +- + drivers/platform/x86/compal-laptop.c | 9 + + drivers/platform/x86/dell-laptop.c | 7 + + drivers/platform/x86/dell-wmi.c | 256 ++++++++++++------------------- + drivers/platform/x86/hp-wmi.c | 172 ++++++--------------- + drivers/platform/x86/intel_ips.c | 15 +- + drivers/platform/x86/panasonic-laptop.c | 172 ++++++++------------- + drivers/platform/x86/thinkpad_acpi.c | 171 +++++++++++---------- + drivers/platform/x86/topstar-laptop.c | 161 +++++++------------- + drivers/platform/x86/toshiba_acpi.c | 191 ++++++++--------------- + 12 files changed, 452 insertions(+), 718 deletions(-) +Merging hwpoison/hwpoison +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master +$ git merge sysctl/master +Already up-to-date. +Merging bkl-core/bkl/core +$ git merge bkl-core/bkl/core +Already up-to-date. +Merging bkl-procfs/bkl/procfs +$ git merge bkl-procfs/bkl/procfs +Already up-to-date. +Merging bkl-ioctl/bkl/ioctl +$ git merge bkl-ioctl/bkl/ioctl +Already up-to-date. +Merging quilt/driver-core +$ git merge quilt/driver-core +Already up-to-date. +Merging quilt/tty +$ git merge quilt/tty +Already up-to-date. +Merging quilt/usb +$ git merge quilt/usb +Already up-to-date. +Merging staging-next/staging-next +$ git merge staging-next/staging-next +Already up-to-date. +Merging slabh/slabh +$ git merge slabh/slabh +Already up-to-date. +Merging scsi-post-merge/merge-base:master +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git fetch --no-tags ../next refs/remotes/scsi-post-merge/master:scsi-post-merge/master +From ../next + * [new branch] scsi-post-merge/master -> scsi-post-merge/master +$ git fetch --no-tags ../next refs/remotes/scsi-post-merge/merge-base:scsi-post-merge/merge-base +From ../next + * [new branch] scsi-post-merge/merge-base -> scsi-post-merge/merge-base +$ git checkout scsi-post-merge/master +Switched to branch 'scsi-post-merge/master' +$ git rebase --onto master scsi-post-merge/merge-base +First, rewinding head to replay your work on top of it... +Fast-forwarded scsi-post-merge/master to master. +$ cd ../next +$ git pull -f ../rebase-tmp scsi-post-merge/master +From ../rebase-tmp + * branch scsi-post-merge/master -> FETCH_HEAD +Already up-to-date. +$ rm -r ../rebase-tmp |