diff options
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 2516 |
1 files changed, 2516 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..8a072c5bf645 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2516 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 44148a6 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-2.6-block +Merging origin/master +$ git merge origin/master +Updating 44148a6..6221f222 +Fast-forward + Makefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging fixes/fixes +$ git merge fixes/fixes +Already up-to-date. +Merging kbuild-current/rc-fixes +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Already up-to-date. +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Updating 6221f222..f3b29cb +Fast-forward + arch/m68k/include/asm/unistd.h | 6 +++++- + arch/m68k/kernel/entry_mm.S | 4 ++++ + arch/m68k/kernel/syscalltable.S | 4 ++++ + 3 files changed, 13 insertions(+), 1 deletions(-) +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging 52xx-and-virtex-current/powerpc/merge +$ git merge 52xx-and-virtex-current/powerpc/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Merge made by recursive. + MAINTAINERS | 7 ++ + drivers/net/benet/be.h | 4 +- + drivers/net/benet/be_main.c | 19 ++-- + drivers/net/bna/bfa_ioc.c | 10 +-- + drivers/net/can/mcp251x.c | 3 +- + drivers/net/pppoe.c | 2 +- + drivers/net/smsc911x.c | 8 +- + drivers/net/wireless/ath/ath9k/hw.c | 1 + + drivers/net/wireless/b43/dma.c | 2 +- + drivers/net/wireless/b43/dma.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.h | 2 +- + drivers/net/wireless/p54/p54usb.c | 2 + + drivers/net/wireless/rt2x00/rt2x00dev.c | 6 +- + drivers/net/wireless/rtlwifi/efuse.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 2 +- + drivers/net/wireless/rtlwifi/usb.c | 2 +- + drivers/net/wireless/wl12xx/sdio.c | 2 +- + drivers/net/wireless/wl12xx/spi.c | 2 +- + drivers/net/wireless/wl12xx/testmode.c | 5 +- + drivers/net/wireless/zd1211rw/zd_usb.c | 20 ++++- + drivers/net/wireless/zd1211rw/zd_usb.h | 1 + + include/linux/can/platform/mcp251x.h | 2 + + include/linux/netfilter.h | 3 +- + include/linux/netfilter/ipset/ip_set.h | 2 +- + include/linux/netfilter/ipset/ip_set_ahash.h | 3 +- + include/net/ip_vs.h | 2 +- + include/net/mac80211.h | 15 +++- + net/dsa/mv88e6131.c | 23 ++++- + net/dsa/mv88e6xxx.h | 2 + + net/ipv4/netfilter.c | 5 +- + net/ipv6/netfilter.c | 13 ++- + net/ipv6/tcp_ipv6.c | 4 +- + net/ipv6/udp.c | 3 + + net/mac80211/rx.c | 2 +- + net/netfilter/Kconfig | 1 - + net/netfilter/ipset/ip_set_bitmap_ip.c | 3 +- + net/netfilter/ipset/ip_set_bitmap_ipmac.c | 3 +- + net/netfilter/ipset/ip_set_bitmap_port.c | 3 +- + net/netfilter/ipset/ip_set_core.c | 109 +++++++++++++-------- + net/netfilter/ipset/ip_set_list_set.c | 53 +++++------ + net/netfilter/ipvs/ip_vs_ctl.c | 2 +- + net/netfilter/nf_conntrack_h323_asn1.c | 2 +- + net/netfilter/nf_conntrack_h323_main.c | 16 ++-- + net/netfilter/xt_TCPMSS.c | 2 +- + net/netfilter/xt_addrtype.c | 42 ++++++--- + net/netfilter/xt_conntrack.c | 2 +- + 46 files changed, 263 insertions(+), 158 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 +Already up-to-date. +Merging wireless-current/master +$ git merge wireless-current/master +Already up-to-date. +Merging driver-core.current/driver-core-linus +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus +$ git merge usb.current/usb-linus +Already up-to-date. +Merging staging.current/staging-linus +$ git merge staging.current/staging-linus +Removing drivers/staging/memrar/Kconfig +Removing drivers/staging/memrar/Makefile +Removing drivers/staging/memrar/TODO +Removing drivers/staging/memrar/memrar-abi +Removing drivers/staging/memrar/memrar.h +Removing drivers/staging/memrar/memrar_allocator.c +Removing drivers/staging/memrar/memrar_allocator.h +Removing drivers/staging/memrar/memrar_handler.c +Merge made by recursive. + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/brcm80211/brcmsmac/wlc_main.c | 9 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c | 78 +- + drivers/staging/hv/channel.c | 8 +- + drivers/staging/hv/connection.c | 4 +- + drivers/staging/hv/hv_mouse.c | 5 +- + drivers/staging/hv/netvsc_drv.c | 24 + + drivers/staging/hv/tools/hv_kvp_daemon.c | 90 ++- + drivers/staging/hv/vmbus_drv.c | 2 +- + drivers/staging/hv/vmbus_private.h | 1 + + drivers/staging/iio/imu/adis16400.h | 3 +- + drivers/staging/iio/imu/adis16400_core.c | 20 +- + drivers/staging/iio/imu/adis16400_ring.c | 12 +- + drivers/staging/memrar/Kconfig | 15 - + drivers/staging/memrar/Makefile | 2 - + drivers/staging/memrar/TODO | 43 - + drivers/staging/memrar/memrar-abi | 89 -- + drivers/staging/memrar/memrar.h | 174 ---- + drivers/staging/memrar/memrar_allocator.c | 432 --------- + drivers/staging/memrar/memrar_allocator.h | 149 --- + drivers/staging/memrar/memrar_handler.c | 1007 -------------------- + drivers/staging/olpc_dcon/Kconfig | 2 +- + drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c | 1 + + drivers/staging/rtl8187se/Kconfig | 1 + + drivers/staging/rtl8192e/Kconfig | 1 + + drivers/staging/rtl8192u/Kconfig | 1 + + drivers/staging/rts_pstor/rtsx.c | 14 +- + drivers/staging/rts_pstor/rtsx_chip.c | 11 +- + drivers/staging/sep/sep_driver.c | 15 +- + drivers/staging/sm7xx/smtcfb.c | 6 +- + drivers/staging/usbip/stub_dev.c | 6 +- + drivers/staging/usbip/stub_rx.c | 40 +- + drivers/staging/usbip/stub_tx.c | 74 ++- + drivers/staging/usbip/usbip_common.c | 64 ++- + drivers/staging/usbip/usbip_common.h | 2 + + drivers/staging/usbip/vhci_rx.c | 3 + + drivers/staging/vt6655/Kconfig | 2 +- + drivers/staging/vt6656/Kconfig | 2 +- + .../staging/westbridge/astoria/gadget/cyasgadget.c | 1 + + 40 files changed, 324 insertions(+), 2092 deletions(-) + delete mode 100644 drivers/staging/memrar/Kconfig + delete mode 100644 drivers/staging/memrar/Makefile + delete mode 100644 drivers/staging/memrar/TODO + delete mode 100644 drivers/staging/memrar/memrar-abi + delete mode 100644 drivers/staging/memrar/memrar.h + delete mode 100644 drivers/staging/memrar/memrar_allocator.c + delete mode 100644 drivers/staging/memrar/memrar_allocator.h + delete mode 100644 drivers/staging/memrar/memrar_handler.c +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Merge made by recursive. + drivers/input/keyboard/twl4030_keypad.c | 2 +- + drivers/input/touchscreen/h3600_ts_input.c | 17 ++++++++++------- + 2 files changed, 11 insertions(+), 8 deletions(-) +Merging md-current/for-linus +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master +$ git merge crypto-current/master +Already up-to-date. +Merging ide-curent/master +$ git merge ide-curent/master +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging sh-current/sh-fixes-for-linus +$ git merge sh-current/sh-fixes-for-linus +Already up-to-date. +Merging rmobile-current/rmobile-fixes-for-linus +$ git merge rmobile-current/rmobile-fixes-for-linus +Merge made by recursive. + arch/arm/mach-shmobile/board-ap4evb.c | 19 +++++++------------ + arch/arm/mach-shmobile/board-mackerel.c | 10 ++++------ + arch/arm/mach-shmobile/include/mach/mmc.h | 2 +- + arch/arm/mach-shmobile/include/mach/zboot.h | 2 +- + 4 files changed, 13 insertions(+), 20 deletions(-) +Merging fbdev-current/fbdev-fixes-for-linus +$ git merge fbdev-current/fbdev-fixes-for-linus +Auto-merging arch/sh/boards/mach-ap325rxa/setup.c +Auto-merging arch/sh/boards/mach-ecovec24/setup.c +Merge made by recursive. + arch/sh/boards/mach-ap325rxa/setup.c | 32 +++++-- + arch/sh/boards/mach-ecovec24/setup.c | 18 ++++ + drivers/video/bfin-lq035q1-fb.c | 4 +- + drivers/video/console/fbcon.c | 2 - + drivers/video/efifb.c | 154 +++++++++++++++++++++------------- + drivers/video/fbmem.c | 2 +- + drivers/video/s3c-fb.c | 8 +- + drivers/video/s3fb.c | 48 ++++++++--- + drivers/video/savage/savagefb-i2c.c | 14 ++-- + drivers/video/sh_mobile_lcdcfb.c | 52 +++++++++++- + drivers/video/sh_mobile_lcdcfb.h | 1 + + drivers/video/via/chip.h | 1 - + drivers/video/via/hw.c | 17 ++-- + drivers/video/via/hw.h | 3 +- + drivers/video/via/viafbdev.c | 74 ++++++++-------- + 15 files changed, 280 insertions(+), 150 deletions(-) +Merging devicetree-current/devicetree/merge +$ git merge devicetree-current/devicetree/merge +Removing arch/powerpc/boot/dtc-src/.gitignore +Merge made by recursive. + arch/powerpc/boot/.gitignore | 1 - + arch/powerpc/boot/dtc-src/.gitignore | 3 --- + 2 files changed, 0 insertions(+), 4 deletions(-) + delete mode 100644 arch/powerpc/boot/dtc-src/.gitignore +Merging spi-current/spi/merge +$ git merge spi-current/spi/merge +Merge made by recursive. + drivers/gpio/ml_ioh_gpio.c | 1 + + drivers/gpio/pca953x.c | 5 +++-- + drivers/gpio/pch_gpio.c | 1 + + 3 files changed, 5 insertions(+), 2 deletions(-) +Merging arm/for-next +$ git merge arm/for-next +Already up-to-date. +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Already up-to-date. +Merging i.MX/for-next +$ git merge i.MX/for-next +Resolved 'arch/arm/mach-mxs/mach-mx28evk.c' using previous resolution. +Auto-merging arch/arm/mach-mxs/mach-mx28evk.c +CONFLICT (content): Merge conflict in arch/arm/mach-mxs/mach-mx28evk.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fcb453c] Merge remote-tracking branch 'i.MX/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging linux-spec/for-next +$ git merge linux-spec/for-next +Already up-to-date. +Merging msm/for-next +$ git merge msm/for-next +Already up-to-date. +Merging omap/for-next +$ git merge omap/for-next +Already up-to-date. +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging samsung/next-samsung +$ git merge samsung/next-samsung +Already up-to-date. +Merging s5p/for-next +$ git merge s5p/for-next +Merge made by recursive. + arch/arm/configs/exynos4_defconfig | 2 + + arch/arm/mach-exynos4/Kconfig | 2 + + arch/arm/mach-exynos4/Makefile | 1 + + arch/arm/mach-exynos4/cpuidle.c | 86 ++++++++++++++++++++++++++++++++++ + arch/arm/mach-exynos4/mach-nuri.c | 89 ++++++++++++++++++++++++++++++++++++ + 5 files changed, 180 insertions(+), 0 deletions(-) + create mode 100644 arch/arm/mach-exynos4/cpuidle.c +Merging tegra/for-next +$ git merge tegra/for-next +Already up-to-date. +Merging ux500-core/ux500-core +$ git merge ux500-core/ux500-core +Removing arch/arm/mach-ux500/cpufreq.c +Removing arch/arm/mach-ux500/include/mach/prcmu-defs.h +Removing arch/arm/mach-ux500/include/mach/prcmu.h +Removing arch/arm/mach-ux500/prcmu.c +Merge made by recursive. + arch/arm/configs/u8500_defconfig | 29 +- + arch/arm/mach-ux500/Kconfig | 16 +- + arch/arm/mach-ux500/Makefile | 11 +- + arch/arm/mach-ux500/board-mop500-regulators.c | 9 +- + arch/arm/mach-ux500/board-mop500-sdi.c | 41 +- + arch/arm/mach-ux500/board-mop500.c | 22 +- + arch/arm/mach-ux500/board-mop500.h | 5 + + arch/arm/mach-ux500/board-snowball-pins.c | 133 ++ + arch/arm/mach-ux500/board-snowball.c | 359 ++++ + arch/arm/mach-ux500/board-snowball.h | 12 + + arch/arm/mach-ux500/clock-db8500.c | 1291 +++++++++++++ + arch/arm/mach-ux500/clock.c | 904 +++------- + arch/arm/mach-ux500/clock.h | 225 +-- + arch/arm/mach-ux500/cpu-db5500.c | 2 + + arch/arm/mach-ux500/cpu-db8500.c | 190 ++ + arch/arm/mach-ux500/cpu.c | 7 +- + arch/arm/mach-ux500/cpufreq.c | 211 -- + arch/arm/mach-ux500/include/mach/db5500-regs.h | 20 +- + arch/arm/mach-ux500/include/mach/db8500-regs.h | 37 +- + arch/arm/mach-ux500/include/mach/hardware.h | 1 + + arch/arm/mach-ux500/include/mach/id.h | 20 + + .../mach-ux500/include/mach/irqs-board-mop500.h | 5 + + .../arm/mach-ux500/include/mach/irqs-board-u5500.h | 21 + + arch/arm/mach-ux500/include/mach/irqs-db5500.h | 27 + + arch/arm/mach-ux500/include/mach/irqs-db8500.h | 54 + + arch/arm/mach-ux500/include/mach/irqs.h | 46 +- + arch/arm/mach-ux500/include/mach/prcmu-db5500.h | 45 + + arch/arm/mach-ux500/include/mach/prcmu-defs.h | 30 - + arch/arm/mach-ux500/include/mach/prcmu-fw-api.h | 523 +++++ + .../arm/mach-ux500/include/mach/prcmu-fw-defs_v1.h | 467 +++++ + arch/arm/mach-ux500/include/mach/prcmu-regs.h | 27 +- + arch/arm/mach-ux500/include/mach/prcmu.h | 28 - + arch/arm/mach-ux500/include/mach/uncompress.h | 3 +- + arch/arm/mach-ux500/pins-db8500.h | 142 +- + arch/arm/mach-ux500/pm/Kconfig | 6 + + arch/arm/mach-ux500/pm/Makefile | 4 + + arch/arm/mach-ux500/pm/cpufreq.c | 171 ++ + arch/arm/mach-ux500/prcmu-db5500.c | 449 +++++ + arch/arm/mach-ux500/prcmu-db8500.c | 2018 ++++++++++++++++++++ + arch/arm/mach-ux500/prcmu-regs-db8500.h | 162 ++ + arch/arm/mach-ux500/prcmu.c | 394 ---- + arch/arm/mach-ux500/regulator-db8500.c | 562 ++++++ + arch/arm/mach-ux500/regulator-db8500.h | 45 + + arch/arm/plat-nomadik/include/plat/pincfg.h | 5 - + drivers/mfd/ab8500-i2c.c | 2 +- + 45 files changed, 7199 insertions(+), 1582 deletions(-) + create mode 100644 arch/arm/mach-ux500/board-snowball-pins.c + create mode 100644 arch/arm/mach-ux500/board-snowball.c + create mode 100644 arch/arm/mach-ux500/board-snowball.h + create mode 100644 arch/arm/mach-ux500/clock-db8500.c + delete mode 100644 arch/arm/mach-ux500/cpufreq.c + create mode 100644 arch/arm/mach-ux500/include/mach/irqs-board-u5500.h + create mode 100644 arch/arm/mach-ux500/include/mach/prcmu-db5500.h + delete mode 100644 arch/arm/mach-ux500/include/mach/prcmu-defs.h + create mode 100644 arch/arm/mach-ux500/include/mach/prcmu-fw-api.h + create mode 100644 arch/arm/mach-ux500/include/mach/prcmu-fw-defs_v1.h + delete mode 100644 arch/arm/mach-ux500/include/mach/prcmu.h + create mode 100644 arch/arm/mach-ux500/pm/Kconfig + create mode 100644 arch/arm/mach-ux500/pm/Makefile + create mode 100644 arch/arm/mach-ux500/pm/cpufreq.c + create mode 100644 arch/arm/mach-ux500/prcmu-db5500.c + create mode 100644 arch/arm/mach-ux500/prcmu-db8500.c + create mode 100644 arch/arm/mach-ux500/prcmu-regs-db8500.h + delete mode 100644 arch/arm/mach-ux500/prcmu.c + create mode 100644 arch/arm/mach-ux500/regulator-db8500.c + create mode 100644 arch/arm/mach-ux500/regulator-db8500.h +Merging xilinx/arm-next +$ git merge xilinx/arm-next +Merge made by recursive. + arch/arm/Kconfig | 14 ++ + arch/arm/Makefile | 1 + + arch/arm/mach-zynq/Kconfig | 14 ++ + arch/arm/mach-zynq/Makefile | 7 + + arch/arm/mach-zynq/Makefile.boot | 3 + + arch/arm/mach-zynq/board_ep107.c | 85 +++++++ + arch/arm/mach-zynq/common.c | 114 ++++++++++ + arch/arm/mach-zynq/common.h | 30 +++ + arch/arm/mach-zynq/include/mach/clkdev.h | 33 +++ + arch/arm/mach-zynq/include/mach/debug-macro.S | 36 +++ + arch/arm/mach-zynq/include/mach/entry-macro.S | 30 +++ + arch/arm/mach-zynq/include/mach/hardware.h | 18 ++ + arch/arm/mach-zynq/include/mach/io.h | 33 +++ + arch/arm/mach-zynq/include/mach/irqs.h | 29 +++ + arch/arm/mach-zynq/include/mach/memory.h | 23 ++ + arch/arm/mach-zynq/include/mach/system.h | 28 +++ + arch/arm/mach-zynq/include/mach/timex.h | 23 ++ + arch/arm/mach-zynq/include/mach/uart.h | 25 ++ + arch/arm/mach-zynq/include/mach/uncompress.h | 51 +++++ + arch/arm/mach-zynq/include/mach/vmalloc.h | 20 ++ + arch/arm/mach-zynq/include/mach/zynq_soc.h | 48 ++++ + arch/arm/mach-zynq/timer.c | 297 +++++++++++++++++++++++++ + arch/arm/mm/Kconfig | 2 +- + 23 files changed, 963 insertions(+), 1 deletions(-) + create mode 100644 arch/arm/mach-zynq/Kconfig + create mode 100644 arch/arm/mach-zynq/Makefile + create mode 100644 arch/arm/mach-zynq/Makefile.boot + create mode 100644 arch/arm/mach-zynq/board_ep107.c + create mode 100644 arch/arm/mach-zynq/common.c + create mode 100644 arch/arm/mach-zynq/common.h + create mode 100644 arch/arm/mach-zynq/include/mach/clkdev.h + create mode 100644 arch/arm/mach-zynq/include/mach/debug-macro.S + create mode 100644 arch/arm/mach-zynq/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-zynq/include/mach/hardware.h + create mode 100644 arch/arm/mach-zynq/include/mach/io.h + create mode 100644 arch/arm/mach-zynq/include/mach/irqs.h + create mode 100644 arch/arm/mach-zynq/include/mach/memory.h + create mode 100644 arch/arm/mach-zynq/include/mach/system.h + create mode 100644 arch/arm/mach-zynq/include/mach/timex.h + create mode 100644 arch/arm/mach-zynq/include/mach/uart.h + create mode 100644 arch/arm/mach-zynq/include/mach/uncompress.h + create mode 100644 arch/arm/mach-zynq/include/mach/vmalloc.h + create mode 100644 arch/arm/mach-zynq/include/mach/zynq_soc.h + create mode 100644 arch/arm/mach-zynq/timer.c +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-v32/arch/cache.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging ia64/test +$ git merge ia64/test +Merge made by recursive. + fs/pstore/Kconfig | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging m68k/for-next +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Removing arch/m68k/lib/Makefile_mm +Removing arch/m68k/lib/Makefile_no +Removing arch/m68k/lib/muldi3_mm.c +Removing arch/m68k/lib/muldi3_no.c +Removing arch/m68k/lib/string.c +Merge made by recursive. + arch/m68k/kernel/m68k_ksyms_no.c | 7 - + arch/m68k/lib/Makefile | 13 ++- + arch/m68k/lib/Makefile_mm | 6 - + arch/m68k/lib/Makefile_no | 7 - + arch/m68k/lib/memcpy.c | 128 +++++++++++--------- + arch/m68k/lib/memmove.c | 2 - + arch/m68k/lib/memset.c | 114 +++++++++++------- + arch/m68k/lib/muldi3.c | 99 +++++++++++++++- + arch/m68k/lib/muldi3_mm.c | 63 ---------- + arch/m68k/lib/muldi3_no.c | 86 ------------- + arch/m68k/lib/string.c | 245 -------------------------------------- + 11 files changed, 251 insertions(+), 519 deletions(-) + delete mode 100644 arch/m68k/lib/Makefile_mm + delete mode 100644 arch/m68k/lib/Makefile_no + delete mode 100644 arch/m68k/lib/muldi3_mm.c + delete mode 100644 arch/m68k/lib/muldi3_no.c + delete mode 100644 arch/m68k/lib/string.c +Merging microblaze/next +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Merge made by recursive. + arch/mips/Kbuild.platforms | 1 + + arch/mips/Kconfig | 19 + + arch/mips/include/asm/mach-lantiq/lantiq.h | 59 ++ + .../mips/include/asm/mach-lantiq/lantiq_platform.h | 46 ++ + arch/mips/include/asm/mach-lantiq/war.h | 24 + + arch/mips/include/asm/mach-lantiq/xway/irq.h | 18 + + .../mips/include/asm/mach-lantiq/xway/lantiq_irq.h | 62 ++ + .../mips/include/asm/mach-lantiq/xway/lantiq_soc.h | 139 ++++ + arch/mips/kernel/vmlinux.lds.S | 1 + + arch/mips/lantiq/Kconfig | 23 + + arch/mips/lantiq/Makefile | 11 + + arch/mips/lantiq/Platform | 8 + + arch/mips/lantiq/clk.c | 140 ++++ + arch/mips/lantiq/clk.h | 18 + + arch/mips/lantiq/devices.c | 125 ++++ + arch/mips/lantiq/devices.h | 20 + + arch/mips/lantiq/early_printk.c | 33 + + arch/mips/lantiq/irq.c | 326 +++++++++ + arch/mips/lantiq/machtypes.h | 20 + + arch/mips/lantiq/prom.c | 71 ++ + arch/mips/lantiq/prom.h | 24 + + arch/mips/lantiq/setup.c | 65 ++ + arch/mips/lantiq/xway/Kconfig | 23 + + arch/mips/lantiq/xway/Makefile | 7 + + arch/mips/lantiq/xway/clk-ase.c | 48 ++ + arch/mips/lantiq/xway/clk-xway.c | 223 ++++++ + arch/mips/lantiq/xway/devices.c | 77 ++ + arch/mips/lantiq/xway/devices.h | 17 + + arch/mips/lantiq/xway/ebu.c | 53 ++ + arch/mips/lantiq/xway/gpio.c | 195 +++++ + arch/mips/lantiq/xway/gpio_ebu.c | 126 ++++ + arch/mips/lantiq/xway/gpio_stp.c | 157 ++++ + arch/mips/lantiq/xway/mach-easy50601.c | 69 ++ + arch/mips/lantiq/xway/mach-easy50712.c | 74 ++ + arch/mips/lantiq/xway/pmu.c | 70 ++ + arch/mips/lantiq/xway/prom-ase.c | 39 + + arch/mips/lantiq/xway/prom-xway.c | 54 ++ + arch/mips/lantiq/xway/reset.c | 79 ++ + arch/mips/pci/Makefile | 1 + + arch/mips/pci/ops-lantiq.c | 116 +++ + arch/mips/pci/pci-lantiq.c | 297 ++++++++ + arch/mips/pci/pci-lantiq.h | 18 + + drivers/tty/serial/Kconfig | 8 + + drivers/tty/serial/Makefile | 1 + + drivers/tty/serial/lantiq.c | 756 ++++++++++++++++++++ + lib/Kconfig.debug | 2 +- + 46 files changed, 3762 insertions(+), 1 deletions(-) + create mode 100644 arch/mips/include/asm/mach-lantiq/lantiq.h + create mode 100644 arch/mips/include/asm/mach-lantiq/lantiq_platform.h + create mode 100644 arch/mips/include/asm/mach-lantiq/war.h + create mode 100644 arch/mips/include/asm/mach-lantiq/xway/irq.h + create mode 100644 arch/mips/include/asm/mach-lantiq/xway/lantiq_irq.h + create mode 100644 arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h + create mode 100644 arch/mips/lantiq/Kconfig + create mode 100644 arch/mips/lantiq/Makefile + create mode 100644 arch/mips/lantiq/Platform + create mode 100644 arch/mips/lantiq/clk.c + create mode 100644 arch/mips/lantiq/clk.h + create mode 100644 arch/mips/lantiq/devices.c + create mode 100644 arch/mips/lantiq/devices.h + create mode 100644 arch/mips/lantiq/early_printk.c + create mode 100644 arch/mips/lantiq/irq.c + create mode 100644 arch/mips/lantiq/machtypes.h + create mode 100644 arch/mips/lantiq/prom.c + create mode 100644 arch/mips/lantiq/prom.h + create mode 100644 arch/mips/lantiq/setup.c + create mode 100644 arch/mips/lantiq/xway/Kconfig + create mode 100644 arch/mips/lantiq/xway/Makefile + create mode 100644 arch/mips/lantiq/xway/clk-ase.c + create mode 100644 arch/mips/lantiq/xway/clk-xway.c + create mode 100644 arch/mips/lantiq/xway/devices.c + create mode 100644 arch/mips/lantiq/xway/devices.h + create mode 100644 arch/mips/lantiq/xway/ebu.c + create mode 100644 arch/mips/lantiq/xway/gpio.c + create mode 100644 arch/mips/lantiq/xway/gpio_ebu.c + create mode 100644 arch/mips/lantiq/xway/gpio_stp.c + create mode 100644 arch/mips/lantiq/xway/mach-easy50601.c + create mode 100644 arch/mips/lantiq/xway/mach-easy50712.c + create mode 100644 arch/mips/lantiq/xway/pmu.c + create mode 100644 arch/mips/lantiq/xway/prom-ase.c + create mode 100644 arch/mips/lantiq/xway/prom-xway.c + create mode 100644 arch/mips/lantiq/xway/reset.c + create mode 100644 arch/mips/pci/ops-lantiq.c + create mode 100644 arch/mips/pci/pci-lantiq.c + create mode 100644 arch/mips/pci/pci-lantiq.h + create mode 100644 drivers/tty/serial/lantiq.c +Merging parisc/for-next +$ git merge parisc/for-next +Already up-to-date. +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging 52xx-and-virtex/powerpc/next +$ git merge 52xx-and-virtex/powerpc/next +Already up-to-date. +Merging galak/next +$ git merge galak/next +Already up-to-date. +Merging s390/features +$ git merge s390/features +Removing drivers/s390/char/tape_block.c +Merge made by recursive. + arch/s390/Kconfig | 11 - + arch/s390/appldata/appldata_base.c | 2 - + arch/s390/include/asm/elf.h | 12 - + arch/s390/include/asm/hugetlb.h | 17 +- + arch/s390/include/asm/mmu.h | 3 - + arch/s390/include/asm/mmu_context.h | 3 - + arch/s390/include/asm/pgalloc.h | 28 +-- + arch/s390/include/asm/pgtable.h | 38 --- + arch/s390/include/asm/tlbflush.h | 11 +- + arch/s390/kernel/head.S | 2 +- + arch/s390/kernel/setup.c | 31 +--- + arch/s390/kernel/switch_cpu.S | 4 +- + arch/s390/kernel/switch_cpu64.S | 4 +- + arch/s390/kernel/vdso32/Makefile | 3 + + arch/s390/kernel/vdso64/Makefile | 3 + + arch/s390/mm/extmem.c | 6 +- + arch/s390/mm/fault.c | 39 --- + arch/s390/mm/hugetlbpage.c | 10 - + arch/s390/mm/pgtable.c | 64 +----- + arch/s390/oprofile/hwsampler.c | 6 +- + drivers/crypto/Kconfig | 2 + + drivers/s390/block/dasd_alias.c | 4 - + drivers/s390/block/dasd_eckd.c | 11 +- + drivers/s390/char/Kconfig | 12 - + drivers/s390/char/Makefile | 1 - + drivers/s390/char/monwriter.c | 4 +- + drivers/s390/char/raw3270.c | 2 - + drivers/s390/char/sclp_sdias.c | 3 - + drivers/s390/char/tape_3590.c | 11 +- + drivers/s390/char/tape_block.c | 445 ----------------------------------- + drivers/s390/char/tape_std.c | 3 +- + drivers/s390/cio/device.c | 24 ++- + drivers/s390/cio/device_fsm.c | 3 - + drivers/s390/cio/device_ops.c | 3 - + drivers/s390/cio/qdio_main.c | 16 +- + drivers/s390/crypto/ap_bus.c | 8 +- + 36 files changed, 76 insertions(+), 773 deletions(-) + delete mode 100644 drivers/s390/char/tape_block.c +Merging sh/sh-latest +$ git merge sh/sh-latest +Merge made by recursive. + arch/sh/Kconfig | 1 + + arch/sh/boards/board-sh7757lcr.c | 2 +- + arch/sh/boards/mach-landisk/setup.c | 5 ++--- + drivers/dma/shdma.c | 7 ++++++- + drivers/tty/serial/sh-sci.c | 25 ++++++++++++------------- + 5 files changed, 22 insertions(+), 18 deletions(-) +Merging rmobile/rmobile-latest +$ git merge rmobile/rmobile-latest +Already up-to-date. +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging tile/master +$ git merge tile/master +Already up-to-date. +Merging unicore32/unicore32 +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/master +$ git merge xtensa/master +Resolved 'arch/xtensa/configs/iss_defconfig' using previous resolution. +Auto-merging arch/xtensa/Kconfig +Auto-merging arch/xtensa/Makefile +Auto-merging arch/xtensa/boot/Makefile +Auto-merging arch/xtensa/configs/iss_defconfig +CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig +Auto-merging arch/xtensa/include/asm/coprocessor.h +Auto-merging arch/xtensa/kernel/Makefile +Auto-merging arch/xtensa/kernel/time.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b644525] Merge remote-tracking branch 'xtensa/master' +$ git diff -M --stat --summary HEAD^.. + arch/xtensa/Kconfig | 17 +- + arch/xtensa/Makefile | 5 +- + arch/xtensa/boot/Makefile | 1 + + arch/xtensa/include/asm/coprocessor.h | 9 +- + arch/xtensa/include/asm/io.h | 40 ++-- + arch/xtensa/include/asm/irq.h | 7 +- + arch/xtensa/include/asm/serial.h | 12 +- + arch/xtensa/kernel/Makefile | 4 +- + arch/xtensa/kernel/time.c | 2 +- + arch/xtensa/platforms/xtavnet/Makefile | 10 + + .../platforms/xtavnet/include/platform/hardware.h | 85 ++++++ + .../platforms/xtavnet/include/platform/lcd.h | 22 ++ + .../platforms/xtavnet/include/platform/serial.h | 1 + + arch/xtensa/platforms/xtavnet/lcd.c | 79 ++++++ + arch/xtensa/platforms/xtavnet/setup.c | 269 ++++++++++++++++++++ + 15 files changed, 526 insertions(+), 37 deletions(-) + create mode 100644 arch/xtensa/platforms/xtavnet/Makefile + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/hardware.h + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/lcd.h + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/serial.h + create mode 100644 arch/xtensa/platforms/xtavnet/lcd.c + create mode 100644 arch/xtensa/platforms/xtavnet/setup.c +Merging ceph/for-next +$ git merge ceph/for-next +Already up-to-date. +Merging cifs/master +$ git merge cifs/master +Auto-merging fs/cifs/file.c +Removing fs/cifs/smbdes.c +Auto-merging fs/super.c +Merge made by recursive. + fs/cifs/Kconfig | 35 +- + fs/cifs/Makefile | 4 +- + fs/cifs/README | 28 - + fs/cifs/TODO | 2 + + fs/cifs/cache.c | 8 +- + fs/cifs/cifs_debug.c | 388 ++++---- + fs/cifs/cifs_debug.h | 12 +- + fs/cifs/cifs_dfs_ref.c | 2 +- + fs/cifs/cifs_fs_sb.h | 4 +- + fs/cifs/cifs_spnego.c | 6 +- + fs/cifs/cifs_spnego.h | 2 +- + fs/cifs/cifs_unicode.c | 96 ++- + fs/cifs/cifs_unicode.h | 12 +- + fs/cifs/cifsacl.c | 6 +- + fs/cifs/cifsacl.h | 2 +- + fs/cifs/cifsencrypt.c | 47 +- + fs/cifs/cifsfs.c | 66 +- + fs/cifs/cifsfs.h | 14 +- + fs/cifs/cifsglob.h | 196 +++-- + fs/cifs/cifspdu.h | 37 +- + fs/cifs/cifsproto.h | 183 ++-- + fs/cifs/cifssmb.c | 598 ++++++------ + fs/cifs/connect.c | 220 +++-- + fs/cifs/dir.c | 8 +- + fs/cifs/export.c | 4 +- + fs/cifs/file.c | 203 +--- + fs/cifs/fscache.c | 6 +- + fs/cifs/fscache.h | 8 +- + fs/cifs/inode.c | 52 +- + fs/cifs/ioctl.c | 2 +- + fs/cifs/link.c | 16 +- + fs/cifs/maperror.c | 1830 ++++++++++++++++++++++++++++++++++ + fs/cifs/misc.c | 47 +- + fs/cifs/netmisc.c | 7 - + fs/cifs/ntlmssp.h | 10 + + fs/cifs/readdir.c | 8 +- + fs/cifs/sess.c | 80 +- + fs/cifs/smb2glob.h | 258 +++++ + fs/cifs/smb2misc.c | 336 +++++++ + fs/cifs/smb2pdu.c | 2506 +++++++++++++++++++++++++++++++++++++++++++++++ + fs/cifs/smb2pdu.h | 996 +++++++++++++++++++ + fs/cifs/smb2proto.h | 200 ++++ + fs/cifs/smb2sess.c | 80 ++ + fs/cifs/smb2status.h | 1782 +++++++++++++++++++++++++++++++++ + fs/cifs/smb2transport.c | 322 ++++++ + fs/cifs/smbdes.c | 418 -------- + fs/cifs/smbencrypt.c | 124 ++- + fs/cifs/transport.c | 154 ++-- + fs/cifs/xattr.c | 28 +- + fs/super.c | 3 +- + 50 files changed, 9796 insertions(+), 1660 deletions(-) + create mode 100644 fs/cifs/maperror.c + create mode 100644 fs/cifs/smb2glob.h + create mode 100644 fs/cifs/smb2misc.c + create mode 100644 fs/cifs/smb2pdu.c + create mode 100644 fs/cifs/smb2pdu.h + create mode 100644 fs/cifs/smb2proto.h + create mode 100644 fs/cifs/smb2sess.c + create mode 100644 fs/cifs/smb2status.h + create mode 100644 fs/cifs/smb2transport.c + delete mode 100644 fs/cifs/smbdes.c +Merging configfs/linux-next +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next +$ git merge ecryptfs/next +Resolved 'fs/ecryptfs/ecryptfs_kernel.h' using previous resolution. +Auto-merging fs/ecryptfs/crypto.c +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +CONFLICT (content): Merge conflict in fs/ecryptfs/ecryptfs_kernel.h +Auto-merging fs/ecryptfs/file.c +Auto-merging fs/ecryptfs/inode.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2d560f4] Merge remote-tracking branch 'ecryptfs/next' +$ git diff -M --stat --summary HEAD^.. + fs/ecryptfs/crypto.c | 21 +++++++++++++++++++++ + fs/ecryptfs/ecryptfs_kernel.h | 2 ++ + fs/ecryptfs/file.c | 3 ++- + fs/ecryptfs/inode.c | 18 +++--------------- + 4 files changed, 28 insertions(+), 16 deletions(-) +Merging ext3/for_next +$ git merge ext3/for_next +Auto-merging fs/ext3/inode.c +Auto-merging fs/quota/dquot.c +Merge made by recursive. + fs/ext3/inode.c | 2 +- + fs/quota/dquot.c | 13 ++++--------- + 2 files changed, 5 insertions(+), 10 deletions(-) +Merging ext4/next +$ git merge ext4/next +Merge made by recursive. + fs/ext4/ext4_jbd2.h | 4 ++-- + fs/ext4/inode.c | 11 +++++------ + fs/ext4/super.c | 30 +++++++++++++++++++++++++----- + fs/jbd2/commit.c | 4 +++- + fs/jbd2/journal.c | 3 ++- + 5 files changed, 37 insertions(+), 15 deletions(-) +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 +Resolved 'fs/gfs2/log.c' using previous resolution. +Auto-merging fs/gfs2/aops.c +Auto-merging fs/gfs2/log.c +CONFLICT (content): Merge conflict in fs/gfs2/log.c +Auto-merging fs/gfs2/lops.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ddfb060] Merge remote-tracking branch 'gfs2/master' +$ git diff -M --stat --summary HEAD^.. + fs/gfs2/aops.c | 2 +- + fs/gfs2/dir.c | 188 +++++++++++++++++++++---------------------------- + fs/gfs2/file.c | 58 +++++++++++++--- + fs/gfs2/glock.c | 33 ++++----- + fs/gfs2/glock.h | 3 +- + fs/gfs2/glops.c | 4 + + fs/gfs2/inode.c | 56 +++++++++++---- + fs/gfs2/inode.h | 3 +- + fs/gfs2/log.c | 15 ++--- + fs/gfs2/lops.c | 12 ++-- + fs/gfs2/ops_fstype.c | 2 +- + fs/gfs2/rgrp.c | 24 +++++-- + fs/gfs2/super.c | 34 +++++++--- + 13 files changed, 247 insertions(+), 187 deletions(-) +Merging hfsplus/for-next +$ git merge hfsplus/for-next +Merge made by recursive. + fs/hfsplus/extents.c | 9 ++++++--- + fs/hfsplus/super.c | 9 +++++++++ + fs/hfsplus/unicode.c | 35 +++++++++++++++++++++++++++-------- + fs/hfsplus/wrapper.c | 9 +++------ + 4 files changed, 45 insertions(+), 17 deletions(-) +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging logfs/master +$ git merge logfs/master +Resolved 'fs/logfs/logfs.h' using previous resolution. +Auto-merging fs/logfs/logfs.h +CONFLICT (content): Merge conflict in fs/logfs/logfs.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0d37e9a] Merge remote-tracking branch 'logfs/master' +$ git diff -M --stat --summary HEAD^.. +Merging nfs/linux-next +$ git merge nfs/linux-next +Merge made by recursive. + fs/nfs/namespace.c | 58 +++++++++++++++-------------------- + net/sunrpc/auth_gss/gss_krb5_mech.c | 2 +- + 2 files changed, 26 insertions(+), 34 deletions(-) +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Merge made by recursive. + fs/nfsd/lockd.c | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Merge made by recursive. + fs/nilfs2/file.c | 1 - + fs/nilfs2/inode.c | 3 +- + fs/nilfs2/page.c | 53 +----------------- + fs/nilfs2/page.h | 4 - + fs/nilfs2/segbuf.c | 12 ---- + fs/nilfs2/segment.c | 159 ++++++-------------------------------------------- + fs/nilfs2/segment.h | 2 - + 7 files changed, 21 insertions(+), 213 deletions(-) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Already up-to-date. +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 +Merge made by recursive. + fs/ubifs/Kconfig | 2 +- + fs/ubifs/commit.c | 2 +- + fs/ubifs/debug.c | 63 ++++++++++++++++++++++++++++++++++++++-------------- + fs/ubifs/lpt.c | 7 ++--- + fs/ubifs/super.c | 3 +- + 5 files changed, 53 insertions(+), 24 deletions(-) +Merging xfs/master +$ git merge xfs/master +Merge made by recursive. + fs/xfs/linux-2.6/xfs_buf.c | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging vfs-scale/vfs-scale-working +$ git merge vfs-scale/vfs-scale-working +Already up-to-date. +Merging pci/linux-next +$ git merge pci/linux-next +Already up-to-date. +Merging hid/for-next +$ git merge hid/for-next +Removing drivers/hid/hid-3m-pct.c +Removing drivers/hid/hid-cando.c +Removing drivers/hid/hid-stantum.c +Merge made by recursive. + Documentation/{usb => hid}/hiddev.txt | 0 + Documentation/hid/hidraw.txt | 119 +++++++++++++ + drivers/hid/Kconfig | 21 +-- + drivers/hid/Makefile | 3 - + drivers/hid/hid-3m-pct.c | 305 --------------------------------- + drivers/hid/hid-cando.c | 276 ----------------------------- + drivers/hid/hid-multitouch.c | 133 ++++++++++++--- + drivers/hid/hid-stantum.c | 286 ------------------------------- + drivers/hid/hidraw.c | 16 +- + drivers/hid/usbhid/hiddev.c | 2 +- + samples/Kconfig | 6 + + samples/Makefile | 2 +- + samples/hidraw/Makefile | 8 + + samples/hidraw/hid-example.c | 167 ++++++++++++++++++ + 14 files changed, 426 insertions(+), 918 deletions(-) + rename Documentation/{usb => hid}/hiddev.txt (100%) + create mode 100644 Documentation/hid/hidraw.txt + delete mode 100644 drivers/hid/hid-3m-pct.c + delete mode 100644 drivers/hid/hid-cando.c + delete mode 100644 drivers/hid/hid-stantum.c + create mode 100644 samples/hidraw/Makefile + create mode 100644 samples/hidraw/hid-example.c +$ git reset --hard HEAD^ +HEAD is now at 56efac5 Merge remote-tracking branch 'xfs/master' +Merging refs/next/20110406/hid +$ git merge refs/next/20110406/hid +Already up-to-date. +Merging quilt/i2c +$ git merge quilt/i2c +Merge made by recursive. + drivers/i2c/i2c-core.c | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) +Merging bjdooks-i2c/next-i2c +$ git merge bjdooks-i2c/next-i2c +Resolved 'arch/arm/mach-pxa/tosa.c' using previous resolution. +Resolved 'drivers/i2c/busses/i2c-pxa.c' using previous resolution. +Auto-merging arch/arm/mach-pxa/tosa.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/tosa.c +Auto-merging drivers/i2c/busses/Kconfig +Auto-merging drivers/i2c/busses/Makefile +Auto-merging drivers/i2c/busses/i2c-designware-core.c +Removing drivers/i2c/busses/i2c-intel-mid.c +Auto-merging drivers/i2c/busses/i2c-pxa.c +CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-pxa.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5ed6ef8] Merge remote-tracking branch 'bjdooks-i2c/next-i2c' +$ git diff -M --stat --summary HEAD^.. + drivers/i2c/busses/Kconfig | 25 +- + drivers/i2c/busses/Makefile | 6 +- + .../{i2c-designware.c => i2c-designware-core.c} | 383 ++----- + drivers/i2c/busses/i2c-designware-core.h | 106 ++ + drivers/i2c/busses/i2c-designware-pcidrv.c | 405 +++++++ + drivers/i2c/busses/i2c-designware-platdrv.c | 215 ++++ + drivers/i2c/busses/i2c-intel-mid.c | 1135 -------------------- + 7 files changed, 862 insertions(+), 1413 deletions(-) + rename drivers/i2c/busses/{i2c-designware.c => i2c-designware-core.c} (65%) + create mode 100644 drivers/i2c/busses/i2c-designware-core.h + create mode 100644 drivers/i2c/busses/i2c-designware-pcidrv.c + create mode 100644 drivers/i2c/busses/i2c-designware-platdrv.c + delete mode 100644 drivers/i2c/busses/i2c-intel-mid.c +$ git am -3 ../patches/0001-i2c-designware-mdelay-use-needs-linux-delay.h-inclus.patch +Applying: i2c-designware: mdelay use needs linux/delay.h inclusion +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/i2c/busses/i2c-designware-core.c +$ git add . +$ git commit -v -a --amend +[master fe19ae2] Merge remote-tracking branch 'bjdooks-i2c/next-i2c' +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Merge made by recursive. + Documentation/hwmon/k10temp | 3 ++- + drivers/hwmon/Kconfig | 4 ++-- + drivers/hwmon/adcxx.c | 16 ++++++++-------- + drivers/hwmon/ibmaem.c | 10 +++++----- + drivers/hwmon/k10temp.c | 11 ++++++----- + drivers/hwmon/k8temp.c | 8 ++++---- + drivers/hwmon/lm70.c | 10 +++++----- + drivers/hwmon/ultra45_env.c | 4 ++-- + 8 files changed, 34 insertions(+), 32 deletions(-) +Merging hwmon-staging/hwmon-next +$ git merge hwmon-staging/hwmon-next +Already up-to-date. +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Merge made by recursive. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Resolved 'arch/arm/mach-omap2/devices.c' using previous resolution. +Resolved 'drivers/staging/Kconfig' using previous resolution. +Resolved 'drivers/staging/easycap/easycap_ioctl.c' using previous resolution. +Auto-merging arch/arm/mach-omap2/devices.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/devices.c +Removing drivers/media/dvb/frontends/drx397xD.c +Removing drivers/media/dvb/frontends/drx397xD.h +Removing drivers/media/dvb/frontends/drx397xD_fw.h +Auto-merging drivers/staging/Kconfig +CONFLICT (content): Merge conflict in drivers/staging/Kconfig +Auto-merging drivers/staging/easycap/easycap_ioctl.c +CONFLICT (content): Merge conflict in drivers/staging/easycap/easycap_ioctl.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4b24eb8] Merge remote-tracking branch 'v4l-dvb/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/video4linux/CARDLIST.em28xx | 2 +- + drivers/media/common/saa7146_core.c | 7 +- + drivers/media/common/tuners/xc5000.c | 32 +- + drivers/media/dvb/b2c2/flexcop-pci.c | 4 +- + drivers/media/dvb/bt8xx/bt878.c | 2 +- + drivers/media/dvb/dvb-usb/lmedm04.c | 12 +- + drivers/media/dvb/frontends/Kconfig | 12 +- + drivers/media/dvb/frontends/Makefile | 3 +- + drivers/media/dvb/frontends/drx397xD.c | 1511 -------------- + drivers/media/dvb/frontends/drx397xD.h | 130 -- + drivers/media/dvb/frontends/drx397xD_fw.h | 40 - + drivers/media/dvb/frontends/drxd.h | 61 + + drivers/media/dvb/frontends/drxd_firm.c | 929 +++++++++ + drivers/media/dvb/frontends/drxd_firm.h | 115 + + drivers/media/dvb/frontends/drxd_hard.c | 3000 +++++++++++++++++++++++++++ + drivers/media/dvb/frontends/drxd_map_firm.h | 1013 +++++++++ + drivers/media/dvb/mantis/hopper_cards.c | 2 +- + drivers/media/dvb/mantis/mantis_cards.c | 2 +- + drivers/media/dvb/mantis/mantis_pci.c | 5 +- + drivers/media/video/bt8xx/bttv-driver.c | 2 +- + drivers/media/video/cx18/cx18-driver.c | 2 +- + drivers/media/video/cx23885/cx23885-core.c | 2 +- + drivers/media/video/cx88/cx88-mpeg.c | 2 +- + drivers/media/video/cx88/cx88-video.c | 2 +- + drivers/media/video/em28xx/Kconfig | 1 + + drivers/media/video/em28xx/em28xx-cards.c | 21 +- + drivers/media/video/em28xx/em28xx-dvb.c | 22 +- + drivers/media/video/em28xx/em28xx.h | 2 +- + drivers/media/video/ivtv/ivtv-driver.c | 4 +- + drivers/media/video/saa7134/saa7134-core.c | 2 +- + drivers/media/video/saa7164/saa7164-core.c | 2 +- + drivers/media/video/zoran/zoran_card.c | 2 +- + include/media/soc_camera_platform.h | 50 + + 33 files changed, 5253 insertions(+), 1745 deletions(-) + delete mode 100644 drivers/media/dvb/frontends/drx397xD.c + delete mode 100644 drivers/media/dvb/frontends/drx397xD.h + delete mode 100644 drivers/media/dvb/frontends/drx397xD_fw.h + create mode 100644 drivers/media/dvb/frontends/drxd.h + create mode 100644 drivers/media/dvb/frontends/drxd_firm.c + create mode 100644 drivers/media/dvb/frontends/drxd_firm.h + create mode 100644 drivers/media/dvb/frontends/drxd_hard.c + create mode 100644 drivers/media/dvb/frontends/drxd_map_firm.h +Merging kbuild/for-next +$ git merge kbuild/for-next +Merge made by recursive. + scripts/patch-kernel | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging kconfig/for-next +$ git merge kconfig/for-next +Already up-to-date! +Merge made by recursive. +Merging ide/master +$ git merge ide/master +Already up-to-date. +Merging libata/NEXT +$ git merge libata/NEXT +Already up-to-date. +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/hw/cxgb4/cm.c | 16 +++++++--------- + drivers/infiniband/hw/cxgb4/device.c | 6 +++--- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 4 ++-- + drivers/infiniband/hw/cxgb4/qp.c | 1 - + 4 files changed, 12 insertions(+), 15 deletions(-) +Merging acpi/test +$ git merge acpi/test +Merge made by recursive. + drivers/acpi/acpica/acglobal.h | 13 +++---- + drivers/acpi/acpica/evmisc.c | 74 +++++++++++++++++++++------------------ + drivers/acpi/acpica/utmutex.c | 12 +++++-- + drivers/acpi/osl.c | 33 +++++++++++++---- + include/acpi/acpiosxf.h | 3 ++ + 5 files changed, 83 insertions(+), 52 deletions(-) +Merging idle-test/idle-test +$ git merge idle-test/idle-test +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging Documentation/kernel-parameters.txt +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/include/asm/acpi.h +Auto-merging arch/x86/include/asm/processor.h +Auto-merging arch/x86/include/asm/system.h +Auto-merging arch/x86/kernel/apm_32.c +Auto-merging arch/x86/kernel/cpu/common.c +Auto-merging arch/x86/kernel/process.c +Auto-merging arch/x86/kernel/process_64.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/kernel/smpboot.c +Auto-merging arch/x86/xen/setup.c +Auto-merging drivers/block/floppy.c +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 2 +- + Documentation/kernel-parameters.txt | 14 +-- + arch/arm/kernel/process.c | 4 +- + arch/sh/kernel/idle.c | 6 +- + arch/x86/Kconfig | 11 -- + arch/x86/include/asm/acpi.h | 2 +- + arch/x86/include/asm/idle.h | 2 +- + arch/x86/include/asm/processor.h | 18 +-- + arch/x86/include/asm/system.h | 9 - + arch/x86/kernel/acpi/cstate.c | 24 +++ + arch/x86/kernel/apm_32.c | 232 ---------------------------- + arch/x86/kernel/cpu/bugs.c | 13 +-- + arch/x86/kernel/cpu/common.c | 2 +- + arch/x86/kernel/cpu/proc.c | 2 - + arch/x86/kernel/process.c | 167 +++++---------------- + arch/x86/kernel/process_32.c | 4 +- + arch/x86/kernel/process_64.c | 4 +- + arch/x86/kernel/setup.c | 4 +- + arch/x86/kernel/smpboot.c | 2 +- + arch/x86/xen/setup.c | 6 +- + drivers/acpi/processor_idle.c | 3 +- + drivers/block/floppy.c | 35 ---- + drivers/cpuidle/cpuidle.c | 50 ++++--- + drivers/cpuidle/cpuidle.h | 1 + + drivers/cpuidle/driver.c | 3 + + drivers/cpuidle/governor.c | 3 + + drivers/cpuidle/governors/menu.c | 4 +- + include/linux/cpuidle.h | 4 + + 28 files changed, 136 insertions(+), 495 deletions(-) +Merging powertools/tools-test +$ git merge powertools/tools-test +Already up-to-date. +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Already up-to-date! +Merge made by recursive. +Merging ubi/linux-next +$ git merge ubi/linux-next +Merge made by recursive. + drivers/mtd/ubi/Kconfig | 2 +- + drivers/mtd/ubi/io.c | 8 +++++++- + drivers/mtd/ubi/vmt.c | 5 ----- + 3 files changed, 8 insertions(+), 7 deletions(-) +Merging kvm/linux-next +$ git merge kvm/linux-next +Auto-merging virt/kvm/kvm_main.c +Merge made by recursive. + arch/x86/kvm/x86.c | 37 ++++++++++++++++++++++++++++--------- + virt/kvm/eventfd.c | 2 +- + virt/kvm/kvm_main.c | 23 +++++++++++++++++++++-- + 3 files changed, 50 insertions(+), 12 deletions(-) +Merging dlm/next +$ git merge dlm/next +Merge made by recursive. + fs/dlm/user.c | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) +Merging swiotlb/master +$ git merge swiotlb/master +Already up-to-date. +Merging ibft/master +$ git merge ibft/master +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Already up-to-date. +Merging async_tx/next +$ git merge async_tx/next +Already up-to-date. +Merging net/master +$ git merge net/master +Recorded preimage for 'drivers/net/benet/be_main.c' +Auto-merging Documentation/feature-removal-schedule.txt +Removing drivers/isdn/capi/capifs.c +Removing drivers/isdn/capi/capifs.h +Auto-merging drivers/net/benet/be.h +Auto-merging drivers/net/benet/be_main.c +CONFLICT (content): Merge conflict in drivers/net/benet/be_main.c +Auto-merging drivers/net/smsc911x.c +Removing firmware/bnx2x/bnx2x-e1-6.2.5.0.fw.ihex +Removing firmware/bnx2x/bnx2x-e1h-6.2.5.0.fw.ihex +Removing firmware/bnx2x/bnx2x-e2-6.2.5.0.fw.ihex +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/net/benet/be_main.c'. +[master ff47cec] Merge remote-tracking branch 'net/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 10 - + drivers/isdn/capi/Kconfig | 15 - + drivers/isdn/capi/Makefile | 1 - + drivers/isdn/capi/capi.c | 24 +- + drivers/isdn/capi/capifs.c | 239 - + drivers/isdn/capi/capifs.h | 28 - + drivers/isdn/gigaset/ev-layer.c | 26 +- + drivers/isdn/hysdn/hysdn_proclog.c | 11 +- + drivers/isdn/mISDN/layer2.c | 20 +- + drivers/net/atlx/atl1.c | 2 +- + drivers/net/bcm63xx_enet.c | 4 +- + drivers/net/benet/be.h | 9 +- + drivers/net/benet/be_cmds.c | 107 + + drivers/net/benet/be_cmds.h | 21 + + drivers/net/benet/be_ethtool.c | 59 +- + drivers/net/benet/be_hw.h | 4 + + drivers/net/benet/be_main.c | 112 +- + drivers/net/bnx2.c | 56 +- + drivers/net/bnx2.h | 1 + + drivers/net/bnx2x/bnx2x_cmn.h | 13 +- + drivers/net/bnx2x/bnx2x_dcb.c | 22 + + drivers/net/bnx2x/bnx2x_dcb.h | 8 +- + drivers/net/bnx2x/bnx2x_ethtool.c | 44 +- + drivers/net/bnx2x/bnx2x_hsi.h | 2 +- + drivers/net/bnx2x/bnx2x_main.c | 5 + + drivers/net/bonding/bond_main.c | 2 +- + drivers/net/cnic.c | 64 +- + drivers/net/cnic.h | 1 + + drivers/net/cnic_if.h | 6 +- + drivers/net/cris/eth_v10.c | 4 +- + drivers/net/cxgb3/cxgb3_main.c | 25 +- + drivers/net/enic/Makefile | 2 +- + drivers/net/enic/enic.h | 4 +- + drivers/net/enic/enic_dev.c | 62 +- + drivers/net/enic/enic_dev.h | 7 +- + drivers/net/enic/enic_main.c | 198 +- + drivers/net/enic/enic_pp.c | 264 + + drivers/net/enic/enic_pp.h | 27 + + drivers/net/enic/vnic_dev.c | 97 +- + drivers/net/enic/vnic_dev.h | 6 +- + drivers/net/enic/vnic_devcmd.h | 57 +- + drivers/net/enic/vnic_vic.c | 5 +- + drivers/net/enic/vnic_vic.h | 13 +- + drivers/net/ewrk3.c | 56 +- + drivers/net/ibmlana.c | 3 +- + drivers/net/jme.c | 77 +- + drivers/net/jme.h | 2 - + drivers/net/macb.c | 3 +- + drivers/net/netxen/netxen_nic.h | 2 +- + drivers/net/netxen/netxen_nic_ethtool.c | 102 - + drivers/net/netxen/netxen_nic_init.c | 3 +- + drivers/net/netxen/netxen_nic_main.c | 55 +- + drivers/net/niu.c | 32 +- + drivers/net/niu.h | 1 + + drivers/net/pcnet32.c | 74 +- + drivers/net/qla3xxx.c | 2 +- + drivers/net/qlcnic/qlcnic.h | 224 +- + drivers/net/qlcnic/qlcnic_ctx.c | 135 +- + drivers/net/qlcnic/qlcnic_ethtool.c | 149 +- + drivers/net/qlcnic/qlcnic_hw.c | 82 +- + drivers/net/qlcnic/qlcnic_init.c | 58 +- + drivers/net/qlcnic/qlcnic_main.c | 446 +- + drivers/net/r8169.c | 309 +- + drivers/net/s2io.c | 86 +- + drivers/net/s2io.h | 3 - + drivers/net/sfc/efx.c | 20 +- + drivers/net/sfc/ethtool.c | 106 +- + drivers/net/sfc/net_driver.h | 2 - + drivers/net/sfc/nic.c | 6 +- + drivers/net/sfc/rx.c | 3 + + drivers/net/skge.c | 33 +- + drivers/net/sky2.c | 25 +- + drivers/net/smsc911x.c | 292 +- + drivers/net/smsc911x.h | 22 +- + drivers/net/sungem.c | 3 +- + drivers/net/sunhme.c | 6 +- + drivers/net/tg3.c | 364 +- + drivers/net/tg3.h | 65 +- + drivers/net/usb/smsc75xx.c | 124 +- + drivers/net/usb/smsc95xx.c | 83 +- + drivers/net/veth.c | 45 +- + drivers/net/via-rhine.c | 2 +- + drivers/net/virtio_net.c | 46 +- + drivers/net/vxge/vxge-ethtool.c | 25 +- + drivers/net/xen-netback/xenbus.c | 2 +- + drivers/net/xen-netfront.c | 106 +- + firmware/Makefile | 6 +- + firmware/WHENCE | 9 +- + firmware/bnx2x/bnx2x-e1-6.2.5.0.fw.ihex | 9483 ----------------- + firmware/bnx2x/bnx2x-e1-6.2.9.0.fw.ihex | 9484 +++++++++++++++++ + firmware/bnx2x/bnx2x-e1h-6.2.5.0.fw.ihex |13181 ------------------------ + firmware/bnx2x/bnx2x-e1h-6.2.9.0.fw.ihex |13192 ++++++++++++++++++++++++ + firmware/bnx2x/bnx2x-e2-6.2.5.0.fw.ihex |15456 --------------------------- + firmware/bnx2x/bnx2x-e2-6.2.9.0.fw.ihex |15473 ++++++++++++++++++++++++++++ + include/linux/ethtool.h | 180 +- + include/linux/netdevice.h | 4 +- + include/linux/pkt_sched.h | 15 + + include/net/flow.h | 25 +- + include/net/route.h | 60 +- + include/net/sock.h | 53 + + net/8021q/vlan.c | 8 +- + net/8021q/vlan_dev.c | 50 +- + net/bridge/br.c | 1 + + net/bridge/br_device.c | 41 + + net/bridge/br_fdb.c | 311 +- + net/bridge/br_if.c | 83 +- + net/bridge/br_input.c | 5 +- + net/bridge/br_ioctl.c | 40 +- + net/bridge/br_netlink.c | 53 +- + net/bridge/br_notify.c | 6 + + net/bridge/br_private.h | 19 +- + net/bridge/br_private_stp.h | 13 + + net/bridge/br_stp.c | 48 + + net/bridge/br_stp_if.c | 21 +- + net/bridge/br_sysfs_br.c | 39 +- + net/bridge/br_sysfs_if.c | 26 +- + net/can/af_can.c | 52 +- + net/core/dev.c | 35 +- + net/core/ethtool.c | 63 +- + net/ipv4/fib_trie.c | 103 +- + net/ipv4/inet_connection_sock.c | 18 +- + net/ipv4/ip_output.c | 18 +- + net/ipv4/raw.c | 18 +- + net/ipv4/syncookies.c | 18 +- + net/ipv4/tcp.c | 7 +- + net/ipv4/udp.c | 18 +- + net/sched/Kconfig | 11 + + net/sched/Makefile | 1 + + net/sched/sch_qfq.c | 1137 ++ + 129 files changed, 42978 insertions(+), 40877 deletions(-) + delete mode 100644 drivers/isdn/capi/capifs.c + delete mode 100644 drivers/isdn/capi/capifs.h + create mode 100644 drivers/net/enic/enic_pp.c + create mode 100644 drivers/net/enic/enic_pp.h + delete mode 100644 firmware/bnx2x/bnx2x-e1-6.2.5.0.fw.ihex + create mode 100644 firmware/bnx2x/bnx2x-e1-6.2.9.0.fw.ihex + delete mode 100644 firmware/bnx2x/bnx2x-e1h-6.2.5.0.fw.ihex + create mode 100644 firmware/bnx2x/bnx2x-e1h-6.2.9.0.fw.ihex + delete mode 100644 firmware/bnx2x/bnx2x-e2-6.2.5.0.fw.ihex + create mode 100644 firmware/bnx2x/bnx2x-e2-6.2.9.0.fw.ihex + create mode 100644 net/sched/sch_qfq.c +Merging wireless/master +$ git merge wireless/master +Resolved 'drivers/net/wireless/rtlwifi/efuse.c' using previous resolution. +Resolved 'drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging drivers/net/wireless/ath/ath9k/hw.c +Auto-merging drivers/net/wireless/ath/ath9k/main.c +Auto-merging drivers/net/wireless/rt2x00/rt2800usb.c +Auto-merging drivers/net/wireless/rt2x00/rt2x00dev.c +Auto-merging drivers/net/wireless/rtlwifi/efuse.c +CONFLICT (content): Merge conflict in drivers/net/wireless/rtlwifi/efuse.c +Auto-merging drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c +CONFLICT (content): Merge conflict in drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c +Auto-merging net/mac80211/rx.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 219d317] Merge remote-tracking branch 'wireless/master' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 6 + + drivers/net/wireless/Kconfig | 1 + + drivers/net/wireless/Makefile | 2 + + drivers/net/wireless/ath/ath.h | 1 + + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 45 +- + drivers/net/wireless/ath/ath9k/ar9002_calib.c | 43 +- + drivers/net/wireless/ath/ath9k/ar9002_mac.c | 12 - + drivers/net/wireless/ath/ath9k/ar9003_hw.c | 98 +- + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 12 - + drivers/net/wireless/ath/ath9k/ar9485_initvals.h | 925 ------ + drivers/net/wireless/ath/ath9k/ath9k.h | 8 +- + drivers/net/wireless/ath/ath9k/beacon.c | 97 +- + drivers/net/wireless/ath/ath9k/common.c | 2 +- + drivers/net/wireless/ath/ath9k/debug.c | 94 +- + drivers/net/wireless/ath/ath9k/eeprom_9287.c | 6 + + drivers/net/wireless/ath/ath9k/eeprom_def.c | 7 + + drivers/net/wireless/ath/ath9k/gpio.c | 14 +- + drivers/net/wireless/ath/ath9k/htc.h | 2 +- + drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 9 +- + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 33 +- + drivers/net/wireless/ath/ath9k/hw-ops.h | 6 - + drivers/net/wireless/ath/ath9k/hw.c | 206 +- + drivers/net/wireless/ath/ath9k/hw.h | 66 +- + drivers/net/wireless/ath/ath9k/init.c | 53 +- + drivers/net/wireless/ath/ath9k/mac.c | 113 +- + drivers/net/wireless/ath/ath9k/main.c | 14 + + drivers/net/wireless/ath/ath9k/phy.h | 14 - + drivers/net/wireless/ath/ath9k/reg.h | 1 + + drivers/net/wireless/ath/ath9k/xmit.c | 29 +- + drivers/net/wireless/ath/key.c | 32 + + drivers/net/wireless/iwlwifi/iwl-1000.c | 2 - + drivers/net/wireless/iwlwifi/iwl-2000.c | 33 - + drivers/net/wireless/iwlwifi/iwl-5000.c | 4 - + drivers/net/wireless/iwlwifi/iwl-6000.c | 20 +- + drivers/net/wireless/iwlwifi/iwl-agn-ict.c | 2 - + drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 3 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 18 +- + drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 140 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 268 +-- + drivers/net/wireless/iwlwifi/iwl-agn.h | 9 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 10 - + drivers/net/wireless/iwlwifi/iwl-csr.h | 39 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 1 + + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 2 - + drivers/net/wireless/iwlwifi/iwl-sta.c | 6 - + drivers/net/wireless/libertas/if_spi.c | 65 + + drivers/net/wireless/mwifiex/11n.c | 809 ++++++ + drivers/net/wireless/mwifiex/11n.h | 176 ++ + drivers/net/wireless/mwifiex/11n_aggr.c | 423 +++ + drivers/net/wireless/mwifiex/11n_aggr.h | 32 + + drivers/net/wireless/mwifiex/11n_rxreorder.c | 637 +++++ + drivers/net/wireless/mwifiex/11n_rxreorder.h | 67 + + drivers/net/wireless/mwifiex/Kconfig | 21 + + drivers/net/wireless/mwifiex/Makefile | 41 + + drivers/net/wireless/mwifiex/README | 204 ++ + drivers/net/wireless/mwifiex/cfg80211.c | 1508 ++++++++++ + drivers/net/wireless/mwifiex/cfg80211.h | 31 + + drivers/net/wireless/mwifiex/cfp.c | 367 +++ + drivers/net/wireless/mwifiex/cmdevt.c | 1459 ++++++++++ + drivers/net/wireless/mwifiex/debugfs.c | 773 +++++ + drivers/net/wireless/mwifiex/decl.h | 153 + + drivers/net/wireless/mwifiex/fw.h | 1229 ++++++++ + drivers/net/wireless/mwifiex/init.c | 662 +++++ + drivers/net/wireless/mwifiex/ioctl.h | 419 +++ + drivers/net/wireless/mwifiex/join.c | 1462 ++++++++++ + drivers/net/wireless/mwifiex/main.c | 1102 ++++++++ + drivers/net/wireless/mwifiex/main.h | 1058 +++++++ + drivers/net/wireless/mwifiex/scan.c | 3097 +++++++++++++++++++++ + drivers/net/wireless/mwifiex/sdio.c | 1770 ++++++++++++ + drivers/net/wireless/mwifiex/sdio.h | 305 ++ + drivers/net/wireless/mwifiex/sta_cmd.c | 1226 ++++++++ + drivers/net/wireless/mwifiex/sta_cmdresp.c | 983 +++++++ + drivers/net/wireless/mwifiex/sta_event.c | 405 +++ + drivers/net/wireless/mwifiex/sta_ioctl.c | 2360 ++++++++++++++++ + drivers/net/wireless/mwifiex/sta_rx.c | 182 ++ + drivers/net/wireless/mwifiex/sta_tx.c | 202 ++ + drivers/net/wireless/mwifiex/txrx.c | 202 ++ + drivers/net/wireless/mwifiex/util.c | 252 ++ + drivers/net/wireless/mwifiex/util.h | 32 + + drivers/net/wireless/mwifiex/wmm.c | 1237 ++++++++ + drivers/net/wireless/mwifiex/wmm.h | 112 + + drivers/net/wireless/mwl8k.c | 740 +++++- + drivers/net/wireless/rt2x00/rt2400pci.c | 6 +- + drivers/net/wireless/rt2x00/rt2500pci.c | 6 +- + drivers/net/wireless/rt2x00/rt2500usb.c | 1 - + drivers/net/wireless/rt2x00/rt2800.h | 106 + + drivers/net/wireless/rt2x00/rt2800lib.c | 198 ++- + drivers/net/wireless/rt2x00/rt2800lib.h | 1 + + drivers/net/wireless/rt2x00/rt2800pci.c | 19 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 3 +- + drivers/net/wireless/rt2x00/rt2x00.h | 7 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 28 +- + drivers/net/wireless/rt2x00/rt2x00ht.c | 7 +- + drivers/net/wireless/rt2x00/rt2x00lib.h | 23 +- + drivers/net/wireless/rt2x00/rt2x00link.c | 49 +- + drivers/net/wireless/rt2x00/rt2x00pci.c | 7 +- + drivers/net/wireless/rt2x00/rt2x00pci.h | 5 +- + drivers/net/wireless/rt2x00/rt2x00queue.c | 18 +- + drivers/net/wireless/rt2x00/rt2x00queue.h | 1 + + drivers/net/wireless/rt2x00/rt61pci.c | 6 +- + drivers/net/wireless/rt2x00/rt73usb.c | 1 - + drivers/net/wireless/rtlwifi/base.c | 5 +- + drivers/net/wireless/rtlwifi/core.c | 8 +- + drivers/net/wireless/rtlwifi/efuse.c | 106 +- + drivers/net/wireless/rtlwifi/pci.c | 53 +- + drivers/net/wireless/rtlwifi/pci.h | 4 +- + drivers/net/wireless/rtlwifi/ps.c | 3 +- + drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 38 +- + drivers/net/wireless/rtlwifi/rtl8192ce/trx.h | 4 +- + drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 2 +- + drivers/net/wireless/rtlwifi/wifi.h | 18 +- + drivers/ssb/driver_pcicore.c | 104 +- + drivers/ssb/scan.c | 2 +- + include/linux/ath9k_platform.h | 5 + + include/linux/ieee80211.h | 9 + + include/linux/ssb/ssb.h | 2 +- + include/net/cfg80211.h | 9 + + net/mac80211/Kconfig | 1 - + net/mac80211/debugfs.c | 89 +- + net/mac80211/ibss.c | 3 +- + net/mac80211/ieee80211_i.h | 4 +- + net/mac80211/main.c | 5 - + net/mac80211/rx.c | 2 + + net/mac80211/sta_info.c | 15 +- + net/mac80211/sta_info.h | 1 - + net/mac80211/status.c | 11 +- + net/mac80211/tkip.c | 4 +- + net/mac80211/tkip.h | 4 +- + net/mac80211/util.c | 2 +- + net/mac80211/wep.c | 34 +- + net/mac80211/wep.h | 4 +- + net/wireless/mlme.c | 9 + + net/wireless/nl80211.c | 34 + + net/wireless/nl80211.h | 3 + + 135 files changed, 27103 insertions(+), 2301 deletions(-) + create mode 100644 drivers/net/wireless/mwifiex/11n.c + create mode 100644 drivers/net/wireless/mwifiex/11n.h + create mode 100644 drivers/net/wireless/mwifiex/11n_aggr.c + create mode 100644 drivers/net/wireless/mwifiex/11n_aggr.h + create mode 100644 drivers/net/wireless/mwifiex/11n_rxreorder.c + create mode 100644 drivers/net/wireless/mwifiex/11n_rxreorder.h + create mode 100644 drivers/net/wireless/mwifiex/Kconfig + create mode 100644 drivers/net/wireless/mwifiex/Makefile + create mode 100644 drivers/net/wireless/mwifiex/README + create mode 100644 drivers/net/wireless/mwifiex/cfg80211.c + create mode 100644 drivers/net/wireless/mwifiex/cfg80211.h + create mode 100644 drivers/net/wireless/mwifiex/cfp.c + create mode 100644 drivers/net/wireless/mwifiex/cmdevt.c + create mode 100644 drivers/net/wireless/mwifiex/debugfs.c + create mode 100644 drivers/net/wireless/mwifiex/decl.h + create mode 100644 drivers/net/wireless/mwifiex/fw.h + create mode 100644 drivers/net/wireless/mwifiex/init.c + create mode 100644 drivers/net/wireless/mwifiex/ioctl.h + create mode 100644 drivers/net/wireless/mwifiex/join.c + create mode 100644 drivers/net/wireless/mwifiex/main.c + create mode 100644 drivers/net/wireless/mwifiex/main.h + create mode 100644 drivers/net/wireless/mwifiex/scan.c + create mode 100644 drivers/net/wireless/mwifiex/sdio.c + create mode 100644 drivers/net/wireless/mwifiex/sdio.h + create mode 100644 drivers/net/wireless/mwifiex/sta_cmd.c + create mode 100644 drivers/net/wireless/mwifiex/sta_cmdresp.c + create mode 100644 drivers/net/wireless/mwifiex/sta_event.c + create mode 100644 drivers/net/wireless/mwifiex/sta_ioctl.c + create mode 100644 drivers/net/wireless/mwifiex/sta_rx.c + create mode 100644 drivers/net/wireless/mwifiex/sta_tx.c + create mode 100644 drivers/net/wireless/mwifiex/txrx.c + create mode 100644 drivers/net/wireless/mwifiex/util.c + create mode 100644 drivers/net/wireless/mwifiex/util.h + create mode 100644 drivers/net/wireless/mwifiex/wmm.c + create mode 100644 drivers/net/wireless/mwifiex/wmm.h +Merging bluetooth/master +$ git merge bluetooth/master +Resolved 'net/bluetooth/mgmt.c' using previous resolution. +Auto-merging include/net/bluetooth/hci.h +Auto-merging net/bluetooth/hci_core.c +Auto-merging net/bluetooth/hci_event.c +Auto-merging net/bluetooth/l2cap_core.c +Auto-merging net/bluetooth/mgmt.c +CONFLICT (content): Merge conflict in net/bluetooth/mgmt.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fb707c8] Merge remote-tracking branch 'bluetooth/master' +$ git diff -M --stat --summary HEAD^.. + include/net/bluetooth/hci.h | 40 +++- + include/net/bluetooth/hci_core.h | 25 ++- + include/net/bluetooth/l2cap.h | 2 - + include/net/bluetooth/mgmt.h | 47 ++++ + net/bluetooth/bnep/bnep.h | 148 ++++++------ + net/bluetooth/bnep/core.c | 71 +++--- + net/bluetooth/bnep/sock.c | 2 +- + net/bluetooth/cmtp/capi.c | 6 +- + net/bluetooth/cmtp/cmtp.h | 11 +- + net/bluetooth/cmtp/core.c | 25 ++- + net/bluetooth/cmtp/sock.c | 2 +- + net/bluetooth/hci_core.c | 79 ++++++- + net/bluetooth/hci_event.c | 95 ++++++- + net/bluetooth/hci_sysfs.c | 40 ++-- + net/bluetooth/hidp/core.c | 90 ++++---- + net/bluetooth/hidp/hidp.h | 6 +- + net/bluetooth/hidp/sock.c | 7 +- + net/bluetooth/l2cap_core.c | 27 ++- + net/bluetooth/mgmt.c | 518 ++++++++++++++++++++++++++++++++++---- + 19 files changed, 956 insertions(+), 285 deletions(-) +Merging mtd/master +$ git merge mtd/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Auto-merging drivers/crypto/Kconfig +Merge made by recursive. + .../devicetree/bindings/crypto/fsl-sec4.txt | 397 +++++ + arch/powerpc/boot/dts/p4080ds.dts | 86 +- + drivers/crypto/Kconfig | 2 + + drivers/crypto/Makefile | 1 + + drivers/crypto/caam/Kconfig | 72 + + drivers/crypto/caam/Makefile | 8 + + drivers/crypto/caam/caamalg.c | 1163 ++++++++++++++ + drivers/crypto/caam/compat.h | 35 + + drivers/crypto/caam/ctrl.c | 270 ++++ + drivers/crypto/caam/desc.h | 1605 ++++++++++++++++++++ + drivers/crypto/caam/desc_constr.h | 204 +++ + drivers/crypto/caam/error.c | 248 +++ + drivers/crypto/caam/error.h | 10 + + drivers/crypto/caam/intern.h | 113 ++ + drivers/crypto/caam/jr.c | 523 +++++++ + drivers/crypto/caam/jr.h | 21 + + drivers/crypto/caam/regs.h | 663 ++++++++ + drivers/crypto/padlock-sha.c | 269 ++++- + drivers/crypto/picoxcell_crypto.c | 64 +- + 19 files changed, 5719 insertions(+), 35 deletions(-) + create mode 100644 Documentation/devicetree/bindings/crypto/fsl-sec4.txt + create mode 100644 drivers/crypto/caam/Kconfig + create mode 100644 drivers/crypto/caam/Makefile + create mode 100644 drivers/crypto/caam/caamalg.c + create mode 100644 drivers/crypto/caam/compat.h + create mode 100644 drivers/crypto/caam/ctrl.c + create mode 100644 drivers/crypto/caam/desc.h + create mode 100644 drivers/crypto/caam/desc_constr.h + create mode 100644 drivers/crypto/caam/error.c + create mode 100644 drivers/crypto/caam/error.h + create mode 100644 drivers/crypto/caam/intern.h + create mode 100644 drivers/crypto/caam/jr.c + create mode 100644 drivers/crypto/caam/jr.h + create mode 100644 drivers/crypto/caam/regs.h +Merging sound/for-next +$ git merge sound/for-next +Removing drivers/media/radio/radio-maestro.c +Auto-merging sound/soc/codecs/sn95031.c +Auto-merging sound/soc/soc-jack.c +Merge made by recursive. + Documentation/sound/alsa/HD-Audio-Models.txt | 2 +- + drivers/media/radio/Kconfig | 15 - + drivers/media/radio/Makefile | 1 - + drivers/media/radio/radio-maestro.c | 452 ---------- + include/linux/mfd/wm8994/pdata.h | 49 + + include/sound/control.h | 1 + + include/sound/soc.h | 14 +- + include/sound/tea575x-tuner.h | 7 +- + sound/arm/pxa2xx-pcm-lib.c | 3 + + sound/core/control.c | 64 ++ + sound/core/init.c | 2 +- + sound/i2c/other/Makefile | 2 +- + sound/i2c/other/tea575x-tuner.c | 52 +- + sound/pci/Kconfig | 14 +- + sound/pci/asihpi/asihpi.c | 328 +++---- + sound/pci/asihpi/hpi6000.c | 39 +- + sound/pci/asihpi/hpi6205.c | 97 +- + sound/pci/asihpi/hpi_internal.h | 19 +- + sound/pci/asihpi/hpicmn.c | 10 +- + sound/pci/asihpi/hpicmn.h | 2 + + sound/pci/asihpi/hpifunc.c | 27 - + sound/pci/asihpi/hpimsgx.c | 31 +- + sound/pci/asihpi/hpioctl.c | 63 +- + sound/pci/emu10k1/emumixer.c | 6 + + sound/pci/es1968.c | 125 +++ + sound/pci/fm801.c | 1 - + sound/pci/hda/patch_conexant.c | 1 + + sound/pci/hda/patch_realtek.c | 37 +- + sound/pci/hda/patch_via.c | 1240 +++++++++++++++----------- + sound/soc/atmel/sam9g20_wm8731.c | 2 +- + sound/soc/au1x/db1200.c | 2 +- + sound/soc/blackfin/bf5xx-ac97-pcm.c | 13 +- + sound/soc/blackfin/bf5xx-ac97.c | 166 ++--- + sound/soc/blackfin/bf5xx-ad1836.c | 42 +- + sound/soc/blackfin/bf5xx-ad193x.c | 56 +- + sound/soc/blackfin/bf5xx-ad1980.c | 45 +- + sound/soc/blackfin/bf5xx-ad73311.c | 42 +- + sound/soc/blackfin/bf5xx-i2s-pcm.c | 23 +- + sound/soc/blackfin/bf5xx-i2s.c | 172 ++-- + sound/soc/blackfin/bf5xx-sport.c | 159 +++- + sound/soc/blackfin/bf5xx-sport.h | 16 +- + sound/soc/blackfin/bf5xx-ssm2602.c | 42 +- + sound/soc/blackfin/bf5xx-tdm-pcm.c | 23 +- + sound/soc/blackfin/bf5xx-tdm.c | 110 +-- + sound/soc/codecs/Kconfig | 2 +- + sound/soc/codecs/Makefile | 2 +- + sound/soc/codecs/ad193x.c | 23 +- + sound/soc/codecs/ad1980.c | 2 +- + sound/soc/codecs/ad73311.c | 2 +- + sound/soc/codecs/ak4535.c | 19 +- + sound/soc/codecs/ak4671.c | 18 +- + sound/soc/codecs/cx20442.c | 18 +- + sound/soc/codecs/max98088.c | 25 +- + sound/soc/codecs/sn95031.c | 17 +- + sound/soc/codecs/ssm2602.c | 140 +-- + sound/soc/codecs/tlv320aic23.c | 19 +- + sound/soc/codecs/wm8711.c | 18 +- + sound/soc/codecs/wm8728.c | 18 +- + sound/soc/codecs/wm8731.c | 22 +- + sound/soc/codecs/wm8903.c | 18 +- + sound/soc/codecs/wm8958-dsp2.c | 1028 +++++++++++++++++++++ + sound/soc/codecs/wm8994.c | 364 ++------- + sound/soc/codecs/wm8994.h | 97 ++ + sound/soc/codecs/wm9705.c | 18 +- + sound/soc/codecs/wm9712.c | 18 +- + sound/soc/codecs/wm9713.c | 19 +- + sound/soc/imx/imx-ssi.c | 6 - + sound/soc/pxa/corgi.c | 2 +- + sound/soc/pxa/poodle.c | 2 +- + sound/soc/pxa/pxa2xx-pcm.c | 1 + + sound/soc/pxa/spitz.c | 41 +- + sound/soc/pxa/zylonite.c | 6 +- + sound/soc/soc-cache.c | 572 ++++-------- + sound/soc/soc-core.c | 54 +- + sound/soc/soc-dapm.c | 48 + + sound/soc/soc-jack.c | 2 +- + sound/usb/6fire/control.c | 105 +++ + sound/usb/6fire/control.h | 17 + + sound/usb/6fire/firmware.c | 44 +- + sound/usb/6fire/pcm.c | 97 +-- + sound/usb/Kconfig | 9 +- + sound/usb/midi.c | 1 + + 82 files changed, 3587 insertions(+), 2944 deletions(-) + delete mode 100644 drivers/media/radio/radio-maestro.c + create mode 100644 sound/soc/codecs/wm8958-dsp2.c +Merging sound-asoc/for-next +$ git merge sound-asoc/for-next +Merge made by recursive. + .../staging/intel_sst/intel_sst_drv_interface.c | 1 - + drivers/staging/intel_sst/intelmid.c | 1 + + include/sound/max98095.h | 26 + + sound/soc/codecs/Kconfig | 4 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/max98095.c | 2009 ++++++++++++++++++++ + sound/soc/codecs/max98095.h | 284 +++ + sound/soc/mid-x86/sst_platform.c | 4 + + sound/soc/soc-core.c | 1 + + sound/soc/tegra/harmony.c | 1 + + 10 files changed, 2332 insertions(+), 1 deletions(-) + create mode 100644 include/sound/max98095.h + create mode 100644 sound/soc/codecs/max98095.c + create mode 100644 sound/soc/codecs/max98095.h +Merging cpufreq/next +$ git merge cpufreq/next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Merge made by recursive. + drivers/block/virtio_blk.c | 88 ++++++++++++++++++++++++++++++++++++----- + drivers/char/virtio_console.c | 16 ------- + drivers/virtio/virtio_pci.c | 15 ++++--- + drivers/virtio/virtio_ring.c | 1 + + include/linux/module.h | 28 +++++++------ + include/linux/moduleparam.h | 7 ++- + kernel/module.c | 4 +- + kernel/params.c | 9 +++- + 8 files changed, 114 insertions(+), 54 deletions(-) +Merging input/next +$ git merge input/next +Already up-to-date. +Merging input-mt/next +$ git merge input-mt/next +Already up-to-date. +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Resolved 'drivers/ide/ide-io.c' using previous resolution. +Auto-merging drivers/ide/ide-io.c +CONFLICT (content): Merge conflict in drivers/ide/ide-io.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1bbda8e] Merge remote-tracking branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Already up-to-date. +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master +$ git merge battery/master +Already up-to-date. +Merging leds/for-mm +$ git merge leds/for-mm +Resolved 'drivers/leds/Kconfig' using previous resolution. +Auto-merging drivers/leds/Kconfig +CONFLICT (content): Merge conflict in drivers/leds/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2560114] Merge remote-tracking branch 'leds/for-mm' +$ git diff -M --stat --summary HEAD^.. +Merging backlight/for-mm +$ git merge backlight/for-mm +Already up-to-date. +Merging mmc/mmc-next +$ git merge mmc/mmc-next +Merge made by recursive. + arch/arm/mach-tegra/include/mach/sdhci.h | 1 + + drivers/mmc/card/block.c | 81 ++++++++++++++++++++++++++++-- + drivers/mmc/card/queue.c | 8 --- + drivers/mmc/core/core.c | 4 +- + drivers/mmc/core/mmc.c | 15 ++++++ + drivers/mmc/core/quirks.c | 4 ++ + drivers/mmc/core/sdio.c | 18 ++++-- + drivers/mmc/host/Kconfig | 2 +- + drivers/mmc/host/sdhci-pci.c | 1 + + drivers/mmc/host/sdhci-tegra.c | 2 + + include/linux/mmc/card.h | 15 ++++++ + include/linux/mmc/host.h | 6 ++- + include/linux/mmc/mmc.h | 5 ++ + 13 files changed, 140 insertions(+), 22 deletions(-) +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Already up-to-date. +Merging slab/for-next +$ git merge slab/for-next +Already up-to-date. +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +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 fbdev/master +$ git merge fbdev/master +Merge made by recursive. + drivers/video/Kconfig | 8 ++ + drivers/video/s3fb.c | 201 +++++++++++++++++++++++++++++++++++++++++++++++-- + 2 files changed, 203 insertions(+), 6 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at d9c0d22 Merge remote-tracking branch 'mmc/mmc-next' +Merging refs/next/20110406/fbdev +$ git merge refs/next/20110406/fbdev +Already up-to-date. +Merging viafb/viafb-next +$ git merge viafb/viafb-next +Already up-to-date. +Merging omap_dss2/for-next +$ git merge omap_dss2/for-next +Merge made by recursive. + arch/arm/mach-omap2/board-4430sdp.c | 132 ++++++++++++++++-- + drivers/video/omap2/dss/dsi.c | 240 +++++++++++++++++++++----------- + drivers/video/omap2/dss/dss.c | 51 ++++++- + drivers/video/omap2/dss/dss_features.c | 9 +- + drivers/video/omap2/dss/dss_features.h | 30 +++-- + 5 files changed, 346 insertions(+), 116 deletions(-) +Merging voltage/for-next +$ git merge voltage/for-next +Merge made by recursive. + drivers/regulator/core.c | 24 +++-- + drivers/regulator/tps6105x-regulator.c | 1 + + drivers/regulator/twl-regulator.c | 209 ++++++++++++++++++++++++-------- + 3 files changed, 175 insertions(+), 59 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Merge made by recursive. + include/linux/capability.h | 7 +-- + include/linux/init_task.h | 7 --- + include/linux/key.h | 13 +++++ + include/linux/kmod.h | 3 + + kernel/capability.c | 4 -- + kernel/cred.c | 6 +- + kernel/kmod.c | 100 ++++++++++++++++++++++++++++++++++++++ + kernel/sysctl.c | 6 ++ + net/dns_resolver/dns_key.c | 10 ++-- + security/Kconfig | 1 + + security/commoncap.c | 13 ++--- + security/keys/internal.h | 4 +- + security/keys/keyctl.c | 6 ++ + security/keys/keyring.c | 37 +++++++++----- + security/keys/proc.c | 2 +- + security/keys/process_keys.c | 12 +++-- + security/keys/request_key.c | 3 +- + security/keys/request_key_auth.c | 3 +- + security/keys/user_defined.c | 4 +- + security/tomoyo/memory.c | 1 + + 20 files changed, 185 insertions(+), 57 deletions(-) +Merging selinux/master +$ git merge selinux/master +Auto-merging MAINTAINERS +Auto-merging security/selinux/ss/services.c +Merge made by recursive. + MAINTAINERS | 3 +- + security/selinux/include/security.h | 7 +++-- + security/selinux/selinuxfs.c | 16 +++++++++++++- + security/selinux/ss/policydb.c | 25 +++++++++++++++++++++- + security/selinux/ss/policydb.h | 3 +- + security/selinux/ss/services.c | 37 +++++++++++++++++------------------ + 6 files changed, 63 insertions(+), 28 deletions(-) +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging agp/agp-next +$ git merge agp/agp-next +Merge made by recursive. +Merging watchdog/master +$ git merge watchdog/master +Merge made by recursive. + drivers/watchdog/mpc8xxx_wdt.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Auto-merging drivers/pci/intel-iommu.c +Merge made by recursive. + drivers/pci/intel-iommu.c | 17 ++++++++++++++--- + 1 files changed, 14 insertions(+), 3 deletions(-) +Merging cputime/cputime +$ git merge cputime/cputime +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +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 MAINTAINERS +Auto-merging arch/mips/sgi-ip22/ip22-int.c +Auto-merging lib/vsprintf.c +Merge made by recursive. + CREDITS | 2 +- + Documentation/stable_api_nonsense.txt | 2 +- + Documentation/sysctl/vm.txt | 4 ++-- + MAINTAINERS | 3 ++- + arch/mips/fw/arc/cmdline.c | 2 +- + arch/mips/fw/arc/env.c | 2 +- + arch/mips/fw/arc/identify.c | 2 +- + arch/mips/fw/arc/init.c | 2 +- + arch/mips/fw/arc/misc.c | 2 +- + arch/mips/fw/arc/salone.c | 2 +- + arch/mips/fw/arc/time.c | 2 +- + arch/mips/fw/arc/tree.c | 2 +- + arch/mips/include/asm/asmmacro-32.h | 2 +- + arch/mips/include/asm/asmmacro-64.h | 2 +- + arch/mips/include/asm/cpu.h | 2 +- + arch/mips/include/asm/r4kcache.h | 2 +- + arch/mips/include/asm/sgialib.h | 2 +- + arch/mips/include/asm/sgiarcs.h | 2 +- + arch/mips/kernel/octeon_switch.S | 2 +- + arch/mips/kernel/r2300_fpu.S | 2 +- + arch/mips/kernel/r2300_switch.S | 2 +- + arch/mips/kernel/r4k_fpu.S | 2 +- + arch/mips/kernel/r4k_switch.S | 2 +- + arch/mips/kernel/r6000_fpu.S | 2 +- + arch/mips/mm/c-r3k.c | 2 +- + arch/mips/mm/c-r4k.c | 2 +- + arch/mips/mm/c-tx39.c | 2 +- + arch/mips/mm/sc-ip22.c | 2 +- + arch/mips/mm/sc-r5k.c | 2 +- + arch/mips/mm/tlb-r3k.c | 2 +- + arch/mips/mm/tlb-r4k.c | 2 +- + arch/mips/mm/tlb-r8k.c | 2 +- + arch/mips/sgi-ip22/ip22-hpc.c | 2 +- + arch/mips/sgi-ip22/ip22-int.c | 2 +- + arch/mips/sgi-ip22/ip22-mc.c | 2 +- + arch/mips/sgi-ip22/ip22-setup.c | 2 +- + drivers/net/sgiseeq.c | 2 +- + drivers/net/sgiseeq.h | 2 +- + drivers/scsi/sgiwd93.c | 2 +- + drivers/video/console/newport_con.c | 2 +- + include/video/newport.h | 2 +- + lib/vsprintf.c | 9 +++------ + 42 files changed, 46 insertions(+), 48 deletions(-) +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging suspend/linux-next +$ git merge suspend/linux-next +Already up-to-date. +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Auto-merging fs/cachefiles/namei.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/notify/fanotify/fanotify_user.c +Auto-merging fs/notify/mark.c +Auto-merging include/linux/fsnotify_backend.h +Merge made by recursive. + fs/cachefiles/namei.c | 1 - + fs/cachefiles/xattr.c | 1 - + fs/nfsd/vfs.c | 3 - + fs/notify/dnotify/dnotify.c | 15 +++--- + fs/notify/fanotify/fanotify.c | 24 +++++---- + fs/notify/fanotify/fanotify_user.c | 101 +++++++++++++++++++++++++----------- + fs/notify/group.c | 1 + + fs/notify/mark.c | 36 +++++-------- + include/linux/fanotify.h | 5 ++- + include/linux/fsnotify_backend.h | 14 ++++- + 10 files changed, 121 insertions(+), 80 deletions(-) +Merging irda/for-next +$ git merge irda/for-next +Already up-to-date. +Merging alacrity/linux-next +$ git merge alacrity/linux-next +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'arch/x86/Kconfig' using previous resolution. +Resolved 'drivers/Makefile' using previous resolution. +Resolved 'lib/Kconfig' using previous resolution. +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging arch/x86/Kconfig +CONFLICT (content): Merge conflict in arch/x86/Kconfig +Auto-merging drivers/Makefile +CONFLICT (content): Merge conflict in drivers/Makefile +Auto-merging drivers/net/Kconfig +Auto-merging drivers/net/Makefile +Auto-merging include/linux/Kbuild +CONFLICT (content): Merge conflict in include/linux/Kbuild +Auto-merging lib/Kconfig +CONFLICT (content): Merge conflict in lib/Kconfig +Auto-merging lib/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'include/linux/Kbuild'. +[master 75fcaca] Merge remote-tracking branch 'alacrity/linux-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 25 + + arch/x86/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/net/Kconfig | 14 + + drivers/net/Makefile | 1 + + drivers/net/vbus-enet.c | 1560 +++++++++++++++++++++++++++++++++++++++++++ + drivers/vbus/Kconfig | 25 + + drivers/vbus/Makefile | 6 + + drivers/vbus/bus-proxy.c | 248 +++++++ + drivers/vbus/pci-bridge.c | 1016 ++++++++++++++++++++++++++++ + include/linux/Kbuild | 4 + + include/linux/ioq.h | 414 ++++++++++++ + include/linux/shm_signal.h | 189 ++++++ + include/linux/vbus_driver.h | 83 +++ + include/linux/vbus_pci.h | 145 ++++ + include/linux/venet.h | 133 ++++ + lib/Kconfig | 21 + + lib/Makefile | 2 + + lib/ioq.c | 304 +++++++++ + lib/shm_signal.c | 196 ++++++ + 20 files changed, 4389 insertions(+), 0 deletions(-) + create mode 100644 drivers/net/vbus-enet.c + create mode 100644 drivers/vbus/Kconfig + create mode 100644 drivers/vbus/Makefile + create mode 100644 drivers/vbus/bus-proxy.c + create mode 100644 drivers/vbus/pci-bridge.c + create mode 100644 include/linux/ioq.h + create mode 100644 include/linux/shm_signal.h + create mode 100644 include/linux/vbus_driver.h + create mode 100644 include/linux/vbus_pci.h + create mode 100644 include/linux/venet.h + create mode 100644 lib/ioq.c + create mode 100644 lib/shm_signal.c +Merging i7core_edac/linux_next +$ git merge i7core_edac/linux_next +Auto-merging drivers/edac/i7core_edac.c +Merge made by recursive. + drivers/edac/i7core_edac.c | 23 ++++++++++++++++++++--- + 1 files changed, 20 insertions(+), 3 deletions(-) +Merging i7300_edac/linux_next +$ git merge i7300_edac/linux_next +Already up-to-date! +Merge made by recursive. +Merging devicetree/devicetree/next +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging spi/spi/next +$ git merge spi/spi/next +Merge made by recursive. + drivers/spi/dw_spi.c | 202 ++++++++++++++++--------------------------------- + drivers/spi/dw_spi.h | 2 - + 2 files changed, 66 insertions(+), 138 deletions(-) +Merging tip/auto-latest +$ git merge tip/auto-latest +Resolved 'arch/x86/kernel/process.c' using previous resolution. +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/probe_roms.c +Auto-merging arch/x86/kernel/process.c +CONFLICT (content): Merge conflict in arch/x86/kernel/process.c +Auto-merging arch/x86/kernel/smpboot.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 760ca21] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + arch/x86/Kconfig | 32 ++--- + arch/x86/include/asm/cpufeature.h | 13 +- + arch/x86/include/asm/mach_traps.h | 18 ++- + arch/x86/include/asm/mmzone_64.h | 23 --- + arch/x86/include/asm/olpc_ofw.h | 9 +- + arch/x86/include/asm/percpu.h | 27 ++++ + arch/x86/include/asm/probe_roms.h | 8 + + arch/x86/include/asm/setup.h | 2 +- + arch/x86/kernel/Makefile | 2 +- + arch/x86/kernel/apic/apic.c | 2 +- + arch/x86/kernel/cpu/mcheck/therm_throt.c | 7 +- + arch/x86/kernel/cpu/perf_event_p4.c | 2 +- + arch/x86/kernel/head32.c | 1 - + arch/x86/kernel/mpparse.c | 6 +- + arch/x86/kernel/{probe_roms_32.c => probe_roms.c} | 101 ++++++++++++ + arch/x86/kernel/smpboot.c | 4 +- + arch/x86/kernel/x86_init.c | 2 +- + arch/x86/mm/numa_64.c | 131 +--------------- + arch/x86/mm/srat_32.c | 4 +- + arch/x86/platform/olpc/Makefile | 4 +- + arch/x86/platform/olpc/olpc.c | 51 ++++--- + arch/x86/platform/olpc/olpc_dt.c | 19 +++ + arch/x86/platform/visws/visws_quirks.c | 20 +-- + drivers/acpi/processor_throttling.c | 32 ++--- + kernel/irq/manage.c | 1 + + tools/perf/Documentation/perf-script.txt | 52 ++++++- + tools/perf/builtin-script.c | 171 +++++++++++++++------ + tools/perf/util/probe-finder.c | 72 +++++++++ + tools/perf/util/probe-finder.h | 2 + + 29 files changed, 503 insertions(+), 315 deletions(-) + create mode 100644 arch/x86/include/asm/probe_roms.h + rename arch/x86/kernel/{probe_roms_32.c => probe_roms.c} (65%) +$ git am -3 ../patches/0001-x86-idle-merge-fix-for-mwait-move.patch +Applying: x86 idle: merge fix for mwait move +$ git reset HEAD^ +Unstaged changes after reset: +M arch/x86/kernel/acpi/cstate.c +$ git add . +$ git commit -v -a --amend +[master 22c412b] Merge remote-tracking branch 'tip/auto-latest' +Merging rcu/rcu/next +$ git merge rcu/rcu/next +Auto-merging lib/Kconfig.debug +Merge made by recursive. + Documentation/RCU/00-INDEX | 2 +- + Documentation/RCU/stallwarn.txt | 23 +++-- + Documentation/RCU/trace.txt | 77 ++++++++-------- + kernel/rcutree.c | 161 ++++++++++++---------------------- + kernel/rcutree.h | 42 ++++----- + kernel/rcutree_plugin.h | 182 +++++++++++++++++++++------------------ + kernel/rcutree_trace.c | 23 ++--- + lib/Kconfig.debug | 30 +------ + 8 files changed, 240 insertions(+), 300 deletions(-) +Merging oprofile/for-next +$ git merge oprofile/for-next +Auto-merging arch/s390/oprofile/init.c +Merge made by recursive. + arch/alpha/oprofile/common.c | 5 +---- + arch/avr32/oprofile/op_model_avr32.c | 5 +---- + arch/blackfin/oprofile/bfin_oprofile.c | 4 +--- + arch/ia64/oprofile/init.c | 2 +- + arch/m32r/oprofile/init.c | 4 +--- + arch/microblaze/oprofile/microblaze_oprofile.c | 4 +--- + arch/mips/oprofile/common.c | 2 +- + arch/mn10300/oprofile/op_model_null.c | 5 +---- + arch/parisc/oprofile/init.c | 4 +--- + arch/powerpc/oprofile/common.c | 4 +--- + arch/s390/oprofile/init.c | 2 +- + arch/sparc/oprofile/init.c | 4 +--- + arch/x86/oprofile/init.c | 2 +- + 13 files changed, 13 insertions(+), 34 deletions(-) +Merging ptrace/ptrace +$ git merge ptrace/ptrace +Auto-merging include/linux/sched.h +Auto-merging kernel/exit.c +Auto-merging kernel/ptrace.c +Auto-merging kernel/signal.c +Merge made by recursive. + fs/exec.c | 1 + + include/linux/sched.h | 17 ++- + include/linux/tracehook.h | 27 ---- + kernel/exit.c | 84 ++++++++-- + kernel/ptrace.c | 118 ++++++++++----- + kernel/signal.c | 375 +++++++++++++++++++++++++++++++++------------ + 6 files changed, 442 insertions(+), 180 deletions(-) +Merging xen-two/linux-next +$ git merge xen-two/linux-next +Merge made by recursive. + drivers/xen/events.c | 6 ++---- + 1 files changed, 2 insertions(+), 4 deletions(-) +Merging xen-pvhvm/linux-next +$ git merge xen-pvhvm/linux-next +Already up-to-date. +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Already up-to-date. +Merging percpu/for-next +$ git merge percpu/for-next +Auto-merging arch/mips/kernel/vmlinux.lds.S +Auto-merging arch/x86/include/asm/percpu.h +Auto-merging mm/percpu.c +Merge made by recursive. + arch/alpha/kernel/vmlinux.lds.S | 2 +- + arch/arm/kernel/vmlinux.lds.S | 2 +- + arch/blackfin/kernel/vmlinux.lds.S | 2 +- + arch/cris/kernel/vmlinux.lds.S | 2 +- + arch/frv/kernel/vmlinux.lds.S | 2 +- + arch/m32r/kernel/vmlinux.lds.S | 2 +- + arch/mips/kernel/vmlinux.lds.S | 2 +- + arch/mn10300/kernel/vmlinux.lds.S | 2 +- + arch/parisc/kernel/vmlinux.lds.S | 2 +- + arch/powerpc/kernel/vmlinux.lds.S | 2 +- + arch/s390/kernel/vmlinux.lds.S | 2 +- + arch/sh/kernel/vmlinux.lds.S | 2 +- + arch/sparc/kernel/vmlinux.lds.S | 2 +- + arch/tile/kernel/vmlinux.lds.S | 2 +- + arch/um/include/asm/common.lds.S | 2 +- + arch/x86/include/asm/percpu.h | 7 ++++++- + arch/x86/kernel/vmlinux.lds.S | 2 +- + arch/xtensa/kernel/vmlinux.lds.S | 2 +- + include/asm-generic/vmlinux.lds.h | 17 ++++++++--------- + kernel/workqueue.c | 4 +--- + mm/percpu.c | 6 ++++-- + 21 files changed, 36 insertions(+), 32 deletions(-) +Merging workqueues/for-next +$ git merge workqueues/for-next +Merge made by recursive. + Documentation/workqueue.txt | 40 ++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 40 insertions(+), 0 deletions(-) +Merging sfi/sfi-test +$ git merge sfi/sfi-test +Already up-to-date. +Merging asm-generic/next +$ git merge asm-generic/next +Already up-to-date. +Merging drivers-x86/linux-next +$ git merge drivers-x86/linux-next +Auto-merging Documentation/feature-removal-schedule.txt +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 20 - + drivers/platform/x86/Kconfig | 3 +- + drivers/platform/x86/acer-wmi.c | 32 +- + drivers/platform/x86/asus-laptop.c | 34 +- + drivers/platform/x86/asus-wmi.c | 26 +- + drivers/platform/x86/asus_acpi.c | 77 ++-- + drivers/platform/x86/compal-laptop.c | 22 +- + drivers/platform/x86/dell-laptop.c | 12 +- + drivers/platform/x86/dell-wmi-aio.c | 3 +- + drivers/platform/x86/dell-wmi.c | 17 +- + drivers/platform/x86/eeepc-laptop.c | 20 +- + drivers/platform/x86/eeepc-wmi.c | 16 +- + drivers/platform/x86/fujitsu-laptop.c | 39 +- + drivers/platform/x86/hdaps.c | 19 +- + drivers/platform/x86/hp-wmi.c | 43 +-- + drivers/platform/x86/ibm_rtl.c | 23 +- + drivers/platform/x86/ideapad-laptop.c | 2 + + drivers/platform/x86/intel_menlow.c | 5 +- + drivers/platform/x86/intel_mid_thermal.c | 606 ++++++++++++++-------------- + drivers/platform/x86/intel_pmic_gpio.c | 57 +++- + drivers/platform/x86/msi-laptop.c | 9 +- + drivers/platform/x86/msi-wmi.c | 45 +-- + drivers/platform/x86/sony-laptop.c | 109 +++--- + drivers/platform/x86/tc1100-wmi.c | 7 +- + drivers/platform/x86/topstar-laptop.c | 2 +- + drivers/platform/x86/toshiba_acpi.c | 59 ++-- + drivers/platform/x86/toshiba_bluetooth.c | 11 +- + drivers/platform/x86/wmi.c | 10 +- + drivers/platform/x86/xo15-ebook.c | 5 +- + 29 files changed, 658 insertions(+), 675 deletions(-) +Merging hwpoison/hwpoison +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master +$ git merge sysctl/master +Already up-to-date. +Merging driver-core/driver-core-next +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next +$ git merge usb/usb-next +Already up-to-date. +Merging staging/staging-next +$ git merge staging/staging-next +Resolved 'drivers/staging/hv/vmbus_drv.c' using previous resolution. +Removing drivers/staging/ath6kl/include/athendpack.h +Removing drivers/staging/ath6kl/include/athstartpack.h +Removing drivers/staging/ath6kl/os/linux/ar6000_android.c +Removing drivers/staging/ath6kl/os/linux/ar6k_pal.c +Removing drivers/staging/ath6kl/os/linux/ioctl.c +Removing drivers/staging/ath6kl/os/linux/wireless_ext.c +Auto-merging drivers/staging/brcm80211/brcmsmac/wlc_main.c +Removing drivers/staging/gma500/psb_buffer.c +Removing drivers/staging/gma500/psb_fence.c +Removing drivers/staging/gma500/psb_sgx.c +Removing drivers/staging/gma500/psb_sgx.h +Removing drivers/staging/gma500/psb_ttm_fence.c +Removing drivers/staging/gma500/psb_ttm_fence_api.h +Removing drivers/staging/gma500/psb_ttm_fence_driver.h +Removing drivers/staging/gma500/psb_ttm_fence_user.c +Removing drivers/staging/gma500/psb_ttm_fence_user.h +Removing drivers/staging/gma500/psb_ttm_glue.c +Removing drivers/staging/gma500/psb_ttm_placement_user.c +Removing drivers/staging/gma500/psb_ttm_placement_user.h +Removing drivers/staging/gma500/psb_ttm_userobj_api.h +Removing drivers/staging/hv/blkvsc.c +Auto-merging drivers/staging/hv/channel.c +Auto-merging drivers/staging/hv/connection.c +Auto-merging drivers/staging/hv/hv_mouse.c +Auto-merging drivers/staging/hv/netvsc_drv.c +Auto-merging drivers/staging/hv/vmbus_drv.c +CONFLICT (content): Merge conflict in drivers/staging/hv/vmbus_drv.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 977f364] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + drivers/staging/ath6kl/Kconfig | 6 - + drivers/staging/ath6kl/Makefile | 39 +- + drivers/staging/ath6kl/bmi/src/bmi.c | 8 +- + .../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c | 380 +- + .../ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c | 10 +- + drivers/staging/ath6kl/htc2/AR6000/ar6k.c | 2 +- + drivers/staging/ath6kl/htc2/AR6000/ar6k.h | 3 - + .../ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c | 2 +- + drivers/staging/ath6kl/htc2/htc.c | 10 +- + drivers/staging/ath6kl/htc2/htc_internal.h | 8 - + drivers/staging/ath6kl/htc2/htc_recv.c | 6 - + drivers/staging/ath6kl/htc2/htc_send.c | 5 - + drivers/staging/ath6kl/include/a_config.h | 22 - + drivers/staging/ath6kl/include/a_debug.h | 28 - + drivers/staging/ath6kl/include/a_drv.h | 22 - + drivers/staging/ath6kl/include/a_drv_api.h | 28 - + drivers/staging/ath6kl/include/a_osapi.h | 29 - + drivers/staging/ath6kl/include/a_types.h | 26 - + drivers/staging/ath6kl/include/ar6000_api.h | 22 - + drivers/staging/ath6kl/include/athendpack.h | 52 - + drivers/staging/ath6kl/include/athstartpack.h | 55 - + .../common/AR6002/hw4.0/hw/analog_intf_reg.h | 13 - + .../include/common/AR6002/hw4.0/hw/apb_map.h | 8 - + .../include/common/AR6002/hw4.0/hw/gpio_reg.h | 8 - + .../include/common/AR6002/hw4.0/hw/mbox_host_reg.h | 13 - + .../include/common/AR6002/hw4.0/hw/mbox_reg.h | 8 - + .../include/common/AR6002/hw4.0/hw/rtc_reg.h | 8 - + .../include/common/AR6002/hw4.0/hw/umbox_reg.h | 14 - + .../include/common/AR6002/hw4.0/hw/vmc_reg.h | 8 - + drivers/staging/ath6kl/include/common/bmi_msg.h | 8 - + drivers/staging/ath6kl/include/common/dbglog.h | 8 - + .../staging/ath6kl/include/common/dset_internal.h | 8 - + drivers/staging/ath6kl/include/common/dsetid.h | 8 - + .../staging/ath6kl/include/common/epping_test.h | 9 - + drivers/staging/ath6kl/include/common/gmboxif.h | 8 - + drivers/staging/ath6kl/include/common/htc.h | 9 - + drivers/staging/ath6kl/include/common/regdump.h | 8 - + drivers/staging/ath6kl/include/common/targaddrs.h | 8 - + drivers/staging/ath6kl/include/common/wmi.h | 10 +- + drivers/staging/ath6kl/include/common/wmix.h | 7 - + drivers/staging/ath6kl/include/common_drv.h | 4 - + drivers/staging/ath6kl/miscdrv/ar3kconfig.c | 22 +- + .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c | 22 +- + .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c | 28 +- + .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h | 5 - + drivers/staging/ath6kl/miscdrv/common_drv.c | 34 - + drivers/staging/ath6kl/os/linux/ar6000_android.c | 388 -- + drivers/staging/ath6kl/os/linux/ar6000_drv.c | 652 +-- + drivers/staging/ath6kl/os/linux/ar6000_pm.c | 77 - + drivers/staging/ath6kl/os/linux/ar6k_pal.c | 479 -- + drivers/staging/ath6kl/os/linux/cfg80211.c | 4 +- + drivers/staging/ath6kl/os/linux/eeprom.c | 213 - + drivers/staging/ath6kl/os/linux/hci_bridge.c | 4 +- + .../staging/ath6kl/os/linux/include/ar6000_drv.h | 83 +- + .../ath6kl/os/linux/include/ar6xapi_linux.h | 8 - + .../staging/ath6kl/os/linux/include/athdrv_linux.h | 4 +- + .../staging/ath6kl/os/linux/include/config_linux.h | 7 - + .../staging/ath6kl/os/linux/include/osapi_linux.h | 49 +- + .../staging/ath6kl/os/linux/include/wlan_config.h | 10 - + .../ath6kl/os/linux/include/wmi_filter_linux.h | 2 +- + drivers/staging/ath6kl/os/linux/ioctl.c | 4767 -------------------- + drivers/staging/ath6kl/os/linux/wireless_ext.c | 2723 ----------- + drivers/staging/ath6kl/reorder/rcv_aggr.c | 10 +- + drivers/staging/ath6kl/wlan/include/ieee80211.h | 4 - + drivers/staging/ath6kl/wlan/src/wlan_node.c | 6 +- + drivers/staging/ath6kl/wmi/wmi.c | 223 +- + drivers/staging/brcm80211/README | 102 +- + drivers/staging/brcm80211/TODO | 56 +- + drivers/staging/brcm80211/brcmfmac/README | 35 - + drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 3 +- + drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 6 +- + drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 9 +- + drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 3 +- + drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 4 + + .../staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c | 16 +- + drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c | 2 +- + drivers/staging/brcm80211/brcmsmac/wl_mac80211.c | 5 +- + drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c | 7 +- + drivers/staging/brcm80211/brcmsmac/wlc_bmac.c | 60 +- + drivers/staging/brcm80211/brcmsmac/wlc_main.c | 8 +- + drivers/staging/brcm80211/include/bcmdevs.h | 72 +- + drivers/staging/brcm80211/include/bcmsrom_fmt.h | 4 +- + drivers/staging/brcm80211/include/hndpmu.h | 1 - + drivers/staging/brcm80211/include/pcicfg.h | 345 +-- + drivers/staging/brcm80211/util/bcmsrom.c | 1336 ------ + drivers/staging/brcm80211/util/hnddma.c | 3 - + drivers/staging/brcm80211/util/hndpmu.c | 49 - + drivers/staging/brcm80211/util/siutils.c | 65 +- + drivers/staging/gma500/Kconfig | 2 +- + drivers/staging/gma500/Makefile | 13 +- + drivers/staging/gma500/mrst.h | 217 + + drivers/staging/gma500/mrst_crtc.c | 620 +++ + drivers/staging/gma500/mrst_lvds.c | 371 ++ + drivers/staging/gma500/psb_2d.c | 5 +- + drivers/staging/gma500/psb_bl.c | 117 +- + drivers/staging/gma500/psb_buffer.c | 450 -- + drivers/staging/gma500/psb_drm.h | 111 - + drivers/staging/gma500/psb_drv.c | 620 ++-- + drivers/staging/gma500/psb_drv.h | 427 +-- + drivers/staging/gma500/psb_fb.c | 49 +- + drivers/staging/gma500/psb_fence.c | 122 - + drivers/staging/gma500/psb_gtt.c | 57 +- + drivers/staging/gma500/psb_gtt.h | 4 - + drivers/staging/gma500/psb_intel_display.c | 45 +- + drivers/staging/gma500/psb_intel_lvds.c | 36 +- + drivers/staging/gma500/psb_intel_sdvo.c | 4 +- + drivers/staging/gma500/psb_irq.c | 178 +- + drivers/staging/gma500/{psb_reset.c => psb_lid.c} | 0 + drivers/staging/gma500/psb_mmu.c | 61 - + drivers/staging/gma500/psb_powermgmt.c | 750 +--- + drivers/staging/gma500/psb_powermgmt.h | 55 +- + drivers/staging/gma500/psb_sgx.c | 238 - + drivers/staging/gma500/psb_sgx.h | 32 - + drivers/staging/gma500/psb_ttm_fence.c | 605 --- + drivers/staging/gma500/psb_ttm_fence_api.h | 272 -- + drivers/staging/gma500/psb_ttm_fence_driver.h | 302 -- + drivers/staging/gma500/psb_ttm_fence_user.c | 237 - + drivers/staging/gma500/psb_ttm_fence_user.h | 140 - + drivers/staging/gma500/psb_ttm_glue.c | 349 -- + drivers/staging/gma500/psb_ttm_placement_user.c | 628 --- + drivers/staging/gma500/psb_ttm_placement_user.h | 252 -- + drivers/staging/gma500/psb_ttm_userobj_api.h | 85 - + drivers/staging/hv/Makefile | 2 +- + drivers/staging/hv/blkvsc.c | 102 - + drivers/staging/hv/blkvsc_drv.c | 219 +- + drivers/staging/hv/channel.c | 79 +- + drivers/staging/hv/channel_mgmt.c | 76 +- + drivers/staging/hv/connection.c | 21 +- + drivers/staging/hv/hv.c | 64 +- + drivers/staging/hv/hv_kvp.c | 9 +- + drivers/staging/hv/hv_mouse.c | 420 +- + drivers/staging/hv/hv_timesource.c | 3 +- + drivers/staging/hv/hv_util.c | 29 +- + drivers/staging/hv/netvsc.c | 215 +- + drivers/staging/hv/netvsc_drv.c | 46 +- + drivers/staging/hv/ring_buffer.c | 21 +- + drivers/staging/hv/rndis_filter.c | 64 +- + drivers/staging/hv/storvsc.c | 329 +-- + drivers/staging/hv/storvsc_api.h | 97 +- + drivers/staging/hv/storvsc_drv.c | 169 +- + drivers/staging/hv/vmbus_drv.c | 1039 ++--- + drivers/staging/hv/vstorage.h | 5 + + drivers/staging/iio/adc/Kconfig | 11 + + drivers/staging/iio/adc/Makefile | 1 + + drivers/staging/iio/adc/ad7780.c | 329 ++ + drivers/staging/iio/adc/ad7780.h | 30 + + drivers/staging/iio/dac/Kconfig | 10 + + drivers/staging/iio/dac/Makefile | 1 + + drivers/staging/iio/dac/ad5504.c | 426 ++ + drivers/staging/iio/dac/ad5504.h | 74 + + drivers/staging/iio/sysfs.h | 1 + + drivers/staging/winbond/mto.c | 10 - + drivers/staging/winbond/phy_calibration.c | 8 +- + 153 files changed, 4652 insertions(+), 19665 deletions(-) + delete mode 100644 drivers/staging/ath6kl/include/athendpack.h + delete mode 100644 drivers/staging/ath6kl/include/athstartpack.h + delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_android.c + delete mode 100644 drivers/staging/ath6kl/os/linux/ar6k_pal.c + delete mode 100644 drivers/staging/ath6kl/os/linux/ioctl.c + delete mode 100644 drivers/staging/ath6kl/os/linux/wireless_ext.c + create mode 100644 drivers/staging/gma500/mrst.h + create mode 100644 drivers/staging/gma500/mrst_crtc.c + create mode 100644 drivers/staging/gma500/mrst_lvds.c + delete mode 100644 drivers/staging/gma500/psb_buffer.c + delete mode 100644 drivers/staging/gma500/psb_fence.c + rename drivers/staging/gma500/{psb_reset.c => psb_lid.c} (100%) + delete mode 100644 drivers/staging/gma500/psb_sgx.c + delete mode 100644 drivers/staging/gma500/psb_sgx.h + delete mode 100644 drivers/staging/gma500/psb_ttm_fence.c + delete mode 100644 drivers/staging/gma500/psb_ttm_fence_api.h + delete mode 100644 drivers/staging/gma500/psb_ttm_fence_driver.h + delete mode 100644 drivers/staging/gma500/psb_ttm_fence_user.c + delete mode 100644 drivers/staging/gma500/psb_ttm_fence_user.h + delete mode 100644 drivers/staging/gma500/psb_ttm_glue.c + delete mode 100644 drivers/staging/gma500/psb_ttm_placement_user.c + delete mode 100644 drivers/staging/gma500/psb_ttm_placement_user.h + delete mode 100644 drivers/staging/gma500/psb_ttm_userobj_api.h + delete mode 100644 drivers/staging/hv/blkvsc.c + create mode 100644 drivers/staging/iio/adc/ad7780.c + create mode 100644 drivers/staging/iio/adc/ad7780.h + create mode 100644 drivers/staging/iio/dac/ad5504.c + create mode 100644 drivers/staging/iio/dac/ad5504.h +Merging slabh/slabh +$ git merge slabh/slabh +Already up-to-date. +Merging bkl-config/config +$ git merge bkl-config/config +Already up-to-date. +Merging cleancache/linux-next +$ git merge cleancache/linux-next +Resolved 'fs/ocfs2/super.c' using previous resolution. +Resolved 'fs/super.c' using previous resolution. +Resolved 'include/linux/fs.h' using previous resolution. +Resolved 'mm/Kconfig' using previous resolution. +Resolved 'mm/truncate.c' using previous resolution. +Auto-merging arch/x86/include/asm/xen/hypercall.h +Auto-merging drivers/xen/Makefile +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/buffer.c +Auto-merging fs/ext3/super.c +Auto-merging fs/ext4/super.c +Auto-merging fs/mpage.c +Auto-merging fs/ocfs2/super.c +CONFLICT (content): Merge conflict in fs/ocfs2/super.c +Auto-merging fs/super.c +CONFLICT (content): Merge conflict in fs/super.c +Auto-merging include/linux/fs.h +CONFLICT (content): Merge conflict in include/linux/fs.h +Auto-merging include/xen/interface/xen.h +Auto-merging mm/Kconfig +CONFLICT (content): Merge conflict in mm/Kconfig +Auto-merging mm/Makefile +Auto-merging mm/filemap.c +Auto-merging mm/truncate.c +CONFLICT (content): Merge conflict in mm/truncate.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8705bda] Merge remote-tracking branch 'cleancache/linux-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-kernel-mm-cleancache | 11 + + Documentation/vm/cleancache.txt | 267 ++++++++++++++++++++ + arch/x86/include/asm/xen/hypercall.h | 7 + + drivers/xen/Makefile | 1 + + drivers/xen/tmem.c | 264 +++++++++++++++++++ + fs/btrfs/extent_io.c | 9 + + fs/btrfs/super.c | 2 + + fs/buffer.c | 5 + + fs/ext3/super.c | 2 + + fs/ext4/super.c | 2 + + fs/mpage.c | 7 + + fs/ocfs2/super.c | 2 + + fs/super.c | 3 + + include/linux/cleancache.h | 118 +++++++++ + include/linux/fs.h | 5 + + include/xen/interface/xen.h | 22 ++ + mm/Kconfig | 22 ++ + mm/Makefile | 1 + + mm/cleancache.c | 245 ++++++++++++++++++ + mm/filemap.c | 11 + + mm/truncate.c | 10 + + 21 files changed, 1016 insertions(+), 0 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cleancache + create mode 100644 Documentation/vm/cleancache.txt + create mode 100644 drivers/xen/tmem.c + create mode 100644 include/linux/cleancache.h + create mode 100644 mm/cleancache.c +Merging scsi-post-merge/merge-base:master +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git fetch --no-tags ../next refs/remotes/scsi-post-merge/master:scsi-post-merge/master +From ../next + * [new branch] scsi-post-merge/master -> scsi-post-merge/master +$ git fetch --no-tags ../next refs/remotes/scsi-post-merge/merge-base:scsi-post-merge/merge-base +From ../next + * [new branch] scsi-post-merge/merge-base -> scsi-post-merge/merge-base +$ git checkout scsi-post-merge/master +Switched to branch 'scsi-post-merge/master' +$ git rebase --onto master scsi-post-merge/merge-base +First, rewinding head to replay your work on top of it... +Fast-forwarded scsi-post-merge/master to master. +$ cd ../next +$ git pull -f ../rebase-tmp scsi-post-merge/master +From ../rebase-tmp + * branch scsi-post-merge/master -> FETCH_HEAD +Already up-to-date. +$ rm -rf ../rebase-tmp |