--- /dev/null
+$ date
+Friday 20 December 10:26:23 EST 2013
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at a36c160cbbf3 Merge tag 'usb-3.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
+Merging origin/master (f7556698a369 Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
+$ git merge origin/master
+Updating a36c160cbbf3..f7556698a369
+Fast-forward
+ MAINTAINERS | 6 +++
+ Makefile | 20 ++++------
+ arch/sh/lib/Makefile | 2 +-
+ arch/sparc/include/asm/pgtable_64.h | 4 +-
+ arch/x86/include/asm/pgtable.h | 11 +++++-
+ arch/x86/mm/gup.c | 13 +++++++
+ include/asm-generic/pgtable.h | 2 +-
+ include/linux/migrate.h | 9 +++++
+ include/linux/mm_types.h | 49 +++++++++++++++++++++++++
+ include/linux/reboot.h | 1 +
+ include/uapi/linux/perf_event.h | 1 +
+ kernel/events/core.c | 21 +++++++++--
+ kernel/fork.c | 1 +
+ kernel/kexec.c | 1 +
+ kernel/reboot.c | 2 +-
+ kernel/sched/core.c | 5 ++-
+ kernel/sched/fair.c | 7 ++++
+ kernel/sched/rt.c | 14 +++++++
+ mm/Kconfig | 2 +-
+ mm/compaction.c | 4 ++
+ mm/huge_memory.c | 45 ++++++++++++++++++-----
+ mm/memory-failure.c | 14 +++++--
+ mm/mempolicy.c | 16 ++++----
+ mm/migrate.c | 69 +++++++++++++++++++++++++++++------
+ mm/mprotect.c | 13 ++++++-
+ mm/page_alloc.c | 3 +-
+ mm/pgtable-generic.c | 8 +++-
+ mm/rmap.c | 4 ++
+ sound/core/pcm_lib.c | 2 +
+ sound/pci/hda/hda_intel.c | 4 ++
+ sound/pci/hda/patch_realtek.c | 4 ++
+ sound/soc/atmel/atmel_ssc_dai.c | 30 ++++++++++++++-
+ sound/soc/atmel/sam9x5_wm8731.c | 2 +-
+ sound/soc/codecs/wm5110.c | 2 +-
+ sound/soc/codecs/wm8904.c | 2 +-
+ sound/soc/codecs/wm8962.c | 13 +++++++
+ sound/soc/codecs/wm_adsp.c | 10 +++--
+ sound/soc/fsl/imx-wm8962.c | 2 -
+ sound/soc/kirkwood/kirkwood-i2s.c | 24 ++++++------
+ sound/soc/soc-generic-dmaengine-pcm.c | 38 +++++++++++++------
+ sound/soc/soc-pcm.c | 5 ++-
+ sound/soc/tegra/tegra20_i2s.c | 6 +--
+ sound/soc/tegra/tegra20_spdif.c | 10 ++---
+ sound/soc/tegra/tegra30_i2s.c | 6 +--
+ 44 files changed, 400 insertions(+), 107 deletions(-)
+Merging fixes/master (b0031f227e47 Merge tag 's2mps11-build' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator)
+$ git merge fixes/master
+Already up-to-date.
+Merging kbuild-current/rc-fixes (19514fc665ff arm, kbuild: make "make install" not depend on vmlinux)
+$ git merge kbuild-current/rc-fixes
+Already up-to-date.
+Merging arc-current/for-curr (319e2e3f63c3 Linux 3.13-rc4)
+$ git merge arc-current/for-curr
+Already up-to-date.
+Merging arm-current/fixes (b713aa0b1501 ARM: fix asm/memory.h build error)
+$ git merge arm-current/fixes
+Already up-to-date.
+Merging m68k-current/for-linus (77a42796786c m68k: Remove deprecated IRQF_DISABLED)
+$ git merge m68k-current/for-linus
+Already up-to-date.
+Merging metag-fixes/fixes (3b2f64d00c46 Linux 3.11-rc2)
+$ git merge metag-fixes/fixes
+Already up-to-date.
+Merging powerpc-merge/merge (803c2d2f84da powerpc/powernv: Fix OPAL LPC access in Little Endian)
+$ git merge powerpc-merge/merge
+Already up-to-date.
+Merging sparc/master (1de425c7b271 sparc64: Fix build regression)
+$ git merge sparc/master
+Merge made by the 'recursive' strategy.
+ arch/sparc/kernel/kgdb_64.c | 1 +
+ 1 file changed, 1 insertion(+)
+Merging net/master (c047e0707307 bnx2x: downgrade "valid ME register value" message level)
+$ git merge net/master
+Merge made by the 'recursive' strategy.
+ drivers/net/bonding/bond_3ad.c | 45 +++++++++++++++++-------
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 2 +-
+ drivers/net/ethernet/ti/cpsw.c | 2 ++
+ drivers/net/hamradio/hdlcdrv.c | 2 ++
+ drivers/net/hamradio/yam.c | 1 +
+ drivers/net/usb/Kconfig | 6 ++--
+ drivers/net/usb/dm9601.c | 44 ++++++++++++++++-------
+ drivers/net/xen-netback/netback.c | 16 ++++++---
+ include/linux/skbuff.h | 5 +++
+ net/ipv4/inet_diag.c | 16 +++++++++
+ net/ipv4/ip_gre.c | 1 +
+ net/ipv6/ip6_output.c | 36 ++++++++++++++-----
+ net/ipv6/sit.c | 2 +-
+ 13 files changed, 136 insertions(+), 42 deletions(-)
+Merging ipsec/master (239c78db9c41 net: clear local_df when passing skb between namespaces)
+$ git merge ipsec/master
+Already up-to-date.
+Merging sound-current/for-linus (356f402da0f9 Merge tag 'asoc-v3.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
+$ git merge sound-current/for-linus
+Already up-to-date.
+Merging pci-current/for-linus (f0b75693cbb2 MAINTAINERS: Add DesignWare, i.MX6, Armada, R-Car PCI host maintainers)
+$ git merge pci-current/for-linus
+Already up-to-date.
+Merging wireless/master (b7e047358449 Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth)
+$ git merge wireless/master
+Merge made by the 'recursive' strategy.
+ drivers/bluetooth/ath3k.c | 2 ++
+ drivers/bluetooth/btusb.c | 1 +
+ drivers/net/wireless/ath/ath9k/ar9002_mac.c | 52 ++++++++++++++++++++++-----
+ drivers/net/wireless/ath/ath9k/htc_drv_main.c | 25 ++++++++-----
+ drivers/net/wireless/ath/ath9k/main.c | 5 +--
+ drivers/net/wireless/rtlwifi/pci.c | 4 ++-
+ net/bluetooth/hci_sock.c | 26 ++++++++------
+ net/wireless/radiotap.c | 4 +++
+ net/wireless/sme.c | 22 ++++++------
+ 9 files changed, 101 insertions(+), 40 deletions(-)
+Merging driver-core.current/driver-core-linus (a8b14744429f sysfs: give different locking key to regular and bin files)
+$ git merge driver-core.current/driver-core-linus
+Already up-to-date.
+Merging tty.current/tty-linus (c2db11eca089 tty: xuartps: Properly guard sysrq specific code)
+$ git merge tty.current/tty-linus
+Already up-to-date.
+Merging usb.current/usb-linus (fb5f1834c322 usb: ohci-at91: fix irq and iomem resource retrieval)
+$ git merge usb.current/usb-linus
+Already up-to-date.
+Merging staging.current/staging-linus (fd6040ed57d8 imx-drm: imx-drm-core: improve safety of imx_drm_add_crtc())
+$ git merge staging.current/staging-linus
+Already up-to-date.
+Merging char-misc.current/char-misc-linus (319e2e3f63c3 Linux 3.13-rc4)
+$ git merge char-misc.current/char-misc-linus
+Already up-to-date.
+Merging input-current/for-linus (2a4d81547b88 Input: define KEY_WWAN for Wireless WAN)
+$ git merge input-current/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/input/touchscreen/zforce_ts.c | 21 +++++++++++++++------
+ include/uapi/linux/input.h | 3 ++-
+ 2 files changed, 17 insertions(+), 7 deletions(-)
+Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe)
+$ git merge md-current/for-linus
+Already up-to-date.
+Merging crypto-current/master (389a5390583a crypto: scatterwalk - Use sg_chain_ptr on chain entries)
+$ git merge crypto-current/master
+Already up-to-date.
+Merging ide/master (c2f7d1e103ef ide: pmac: remove unnecessary pci_set_drvdata())
+$ git merge ide/master
+Already up-to-date.
+Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff)
+$ git merge dwmw2/master
+Already up-to-date.
+Merging sh-current/sh-fixes-for-linus (44033109e99c SH: Convert out[bwl] macros to inline functions)
+$ git merge sh-current/sh-fixes-for-linus
+Already up-to-date.
+Merging devicetree-current/devicetree/merge (1931ee143b0a Revert "drivers: of: add initialization code for dma reserved memory")
+$ git merge devicetree-current/devicetree/merge
+Already up-to-date.
+Merging rr-fixes/fixes (7122c3e9154b scripts/link-vmlinux.sh: only filter kernel symbols for arm)
+$ git merge rr-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/virtio/virtio_balloon.c | 2 +-
+ scripts/link-vmlinux.sh | 4 +++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+Merging mfd-fixes/master (73beb63d290f mfd: rtsx_pcr: Disable interrupts before cancelling delayed works)
+$ git merge mfd-fixes/master
+Merge made by the 'recursive' strategy.
+ drivers/mfd/rtsx_pcr.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+Merging vfio-fixes/for-linus (239a87020b26 Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-linus)
+$ git merge vfio-fixes/for-linus
+Already up-to-date.
+Merging drm-intel-fixes/for-linux-next-fixes (a885b3ccc74d drm/i915: Use the correct GMCH_CTRL register for Sandybridge+)
+$ git merge drm-intel-fixes/for-linux-next-fixes
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/i915/i915_gem.c | 34 +++++++++++++++++++++---------
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 28 +++++++++++++++++-------
+ drivers/gpu/drm/i915/intel_display.c | 7 +++---
+ drivers/gpu/drm/i915/intel_pm.c | 14 ++++++++++--
+ 4 files changed, 60 insertions(+), 23 deletions(-)
+Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu)
+$ git merge asm-generic/master
+Already up-to-date.
+Merging arc/for-next (e11cbe1fbd91 ARC: [SMP] optimize IPI send and receive)
+$ git merge arc/for-next
+Merge made by the 'recursive' strategy.
+ arch/arc/include/asm/smp.h | 8 +--
+ arch/arc/kernel/smp.c | 124 +++++++++++++++++++++++++-------------------
+ arch/arc/plat-arcfpga/smp.c | 12 ++---
+ 3 files changed, 78 insertions(+), 66 deletions(-)
+Merging arm/for-next (79f82a866ed4 Merge branches 'amba', 'fixes', 'kees', 'misc' and 'unstable/sa11x0' into for-next)
+$ git merge arm/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/Kconfig.debug | 23 ++
+ arch/arm/common/mcpm_entry.c | 7 +-
+ arch/arm/include/asm/cacheflush.h | 5 +
+ arch/arm/include/asm/checksum.h | 34 ++-
+ arch/arm/include/asm/io.h | 2 +-
+ arch/arm/include/asm/mach/map.h | 27 ++-
+ arch/arm/include/asm/pgtable-2level.h | 1 +
+ arch/arm/include/asm/pgtable-3level.h | 1 +
+ arch/arm/include/asm/pgtable.h | 2 +
+ arch/arm/include/asm/xen/page.h | 2 +-
+ arch/arm/kernel/entry-v7m.S | 2 -
+ arch/arm/kernel/etm.c | 6 -
+ arch/arm/kernel/setup.c | 41 ++--
+ arch/arm/kernel/smp.c | 3 +-
+ arch/arm/kernel/tcm.c | 4 +-
+ arch/arm/kernel/topology.c | 12 +-
+ arch/arm/kernel/traps.c | 2 +-
+ arch/arm/lib/backtrace.S | 20 +-
+ arch/arm/mach-at91/setup.c | 2 +-
+ arch/arm/mach-omap2/io.c | 4 +-
+ arch/arm/mach-omap2/omap4-common.c | 2 +-
+ arch/arm/mach-sa1100/assabet.c | 145 +++++++++++-
+ arch/arm/mach-sa1100/h3100.c | 54 ++++-
+ arch/arm/mach-sa1100/h3600.c | 74 +++---
+ arch/arm/mach-sa1100/include/mach/assabet.h | 6 +-
+ arch/arm/mach-ux500/setup.h | 2 +-
+ arch/arm/mm/Makefile | 1 +
+ arch/arm/mm/cache-v7.S | 14 +-
+ arch/arm/mm/dma-mapping.c | 6 +-
+ arch/arm/mm/dump.c | 345 ++++++++++++++++++++++++++++
+ arch/arm/mm/ioremap.c | 4 +-
+ arch/arm/mm/mmu.c | 126 ++++++++--
+ drivers/amba/bus.c | 213 ++---------------
+ drivers/input/serio/ambakmi.c | 2 -
+ drivers/mmc/host/mmci.c | 2 -
+ drivers/mtd/maps/pxa2xx-flash.c | 2 +-
+ 36 files changed, 820 insertions(+), 378 deletions(-)
+ create mode 100644 arch/arm/mm/dump.c
+Merging arm-perf/for-next/perf (6ce4eac1f600 Linux 3.13-rc1)
+$ git merge arm-perf/for-next/perf
+Already up-to-date.
+Merging arm-soc/for-next (58946e1037ce Merge branch 'next/soc' into for-next)
+$ git merge arm-soc/for-next
+Removing include/linux/platform_data/pinctrl-nomadik.h
+Removing include/linux/platform_data/clocksource-nomadik-mtu.h
+Auto-merging include/linux/clk/at91_pmc.h
+Auto-merging arch/arm/mach-ux500/setup.h
+Removing arch/arm/mach-ux500/devices.h
+Removing arch/arm/mach-ux500/devices.c
+Removing arch/arm/mach-ux500/devices-db8500.h
+Removing arch/arm/mach-ux500/devices-db8500.c
+Removing arch/arm/mach-ux500/board-mop500.c
+Removing arch/arm/mach-s3c64xx/dma.c
+Removing arch/arm/mach-omap2/mux2430.h
+Removing arch/arm/mach-omap2/mux2430.c
+Removing arch/arm/mach-omap2/mux2420.h
+Removing arch/arm/mach-omap2/mux2420.c
+Removing arch/arm/mach-omap2/board-h4.c
+Removing arch/arm/mach-omap2/board-2430sdp.c
+Auto-merging arch/arm/mach-at91/setup.c
+Auto-merging arch/arm/Kconfig.debug
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/arm/Marvell/README | 24 +
+ Documentation/devicetree/bindings/arm/arm-boards | 8 +
+ .../devicetree/bindings/arm/atmel-aic.txt | 1 +
+ .../devicetree/bindings/arm/atmel-at91.txt | 3 +-
+ .../bindings/arm/hisilicon/hisilicon.txt | 32 +
+ .../devicetree/bindings/arm/marvell,berlin.txt | 24 +
+ .../devicetree/bindings/clock/at91-clock.txt | 339 +++++++++
+ .../devicetree/bindings/clock/hi3620-clock.txt | 19 +
+ .../devicetree/bindings/dma/ste-dma40.txt | 3 +
+ .../interrupt-controller/snps,dw-apb-ictl.txt | 32 +
+ MAINTAINERS | 6 +
+ arch/arm/Kconfig | 5 +
+ arch/arm/Kconfig.debug | 10 +
+ arch/arm/Makefile | 2 +
+ arch/arm/arm-soc-for-next-contents.txt | 70 ++
+ arch/arm/boot/dts/Makefile | 14 +
+ arch/arm/boot/dts/am3517-evm.dts | 29 +
+ arch/arm/boot/dts/animeo_ip.dts | 31 +-
+ arch/arm/boot/dts/armada-370-mirabox.dts | 25 +-
+ arch/arm/boot/dts/armada-370-netgear-rn102.dts | 120 ++-
+ arch/arm/boot/dts/armada-370-netgear-rn104.dts | 126 +++-
+ arch/arm/boot/dts/armada-370-rd.dts | 21 +
+ arch/arm/boot/dts/armada-370-xp.dtsi | 9 +
+ arch/arm/boot/dts/armada-xp-gp.dts | 8 +
+ arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 322 +++++++++
+ arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 3 +-
+ arch/arm/boot/dts/at91-cosino.dtsi | 122 ++++
+ arch/arm/boot/dts/at91-cosino_mega2560.dts | 84 +++
+ arch/arm/boot/dts/at91rm9200.dtsi | 4 +-
+ arch/arm/boot/dts/at91rm9200ek.dts | 57 +-
+ arch/arm/boot/dts/at91sam9263.dtsi | 37 +
+ arch/arm/boot/dts/at91sam9263ek.dts | 30 +
+ arch/arm/boot/dts/at91sam9g45.dtsi | 67 ++
+ arch/arm/boot/dts/at91sam9m10g45ek.dts | 29 +
+ arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts | 29 +
+ arch/arm/boot/dts/berlin2.dtsi | 227 ++++++
+ arch/arm/boot/dts/berlin2cd-google-chromecast.dts | 29 +
+ arch/arm/boot/dts/berlin2cd.dtsi | 210 ++++++
+ arch/arm/boot/dts/dove-cubox.dts | 2 +-
+ arch/arm/boot/dts/dove.dtsi | 13 +-
+ arch/arm/boot/dts/hi3620.dtsi | 565 +++++++++++++++
+ arch/arm/boot/dts/hi4511.dts | 649 +++++++++++++++++
+ arch/arm/boot/dts/integrator.dtsi | 5 +
+ arch/arm/boot/dts/kirkwood-6281.dtsi | 2 +
+ arch/arm/boot/dts/kirkwood-6282.dtsi | 2 +
+ arch/arm/boot/dts/kirkwood-cloudbox.dts | 10 +-
+ arch/arm/boot/dts/kirkwood-db.dtsi | 4 +-
+ arch/arm/boot/dts/kirkwood-dns320.dts | 12 +-
+ arch/arm/boot/dts/kirkwood-dns325.dts | 12 +-
+ arch/arm/boot/dts/kirkwood-dnskw.dtsi | 18 +-
+ arch/arm/boot/dts/kirkwood-dockstar.dts | 6 +-
+ arch/arm/boot/dts/kirkwood-dreamplug.dts | 6 +-
+ arch/arm/boot/dts/kirkwood-goflexnet.dts | 24 +-
+ .../arm/boot/dts/kirkwood-guruplug-server-plus.dts | 12 +-
+ arch/arm/boot/dts/kirkwood-ib62x0.dts | 18 +-
+ arch/arm/boot/dts/kirkwood-iconnect.dts | 28 +-
+ arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 22 +-
+ arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 4 +-
+ arch/arm/boot/dts/kirkwood-lsxl.dtsi | 30 +-
+ arch/arm/boot/dts/kirkwood-mplcec4.dts | 14 +-
+ arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 14 +-
+ .../boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 111 ++-
+ .../boot/dts/kirkwood-netgear_readynas_nv+_v2.dts | 268 +++++++
+ arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 8 +-
+ arch/arm/boot/dts/kirkwood-ns2lite.dts | 4 +-
+ arch/arm/boot/dts/kirkwood-ns2max.dts | 10 +-
+ arch/arm/boot/dts/kirkwood-ns2mini.dts | 10 +-
+ arch/arm/boot/dts/kirkwood-nsa310-common.dtsi | 4 +-
+ arch/arm/boot/dts/kirkwood-nsa310.dts | 32 +-
+ arch/arm/boot/dts/kirkwood-nsa310a.dts | 30 +-
+ arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 10 +-
+ arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 10 +-
+ arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi | 2 +-
+ arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts | 8 +-
+ arch/arm/boot/dts/kirkwood-sheevaplug.dts | 8 +-
+ arch/arm/boot/dts/kirkwood-topkick.dts | 10 +-
+ arch/arm/boot/dts/kirkwood-ts219-6281.dts | 8 +-
+ arch/arm/boot/dts/kirkwood-ts219-6282.dts | 8 +-
+ arch/arm/boot/dts/kirkwood.dtsi | 2 +
+ arch/arm/boot/dts/omap2420-n800.dts | 8 +
+ arch/arm/boot/dts/omap2420-n810-wimax.dts | 8 +
+ arch/arm/boot/dts/omap2420-n810.dts | 8 +
+ arch/arm/boot/dts/omap2420-n8x0-common.dtsi | 99 +++
+ arch/arm/boot/dts/omap2430-sdp.dts | 49 ++
+ arch/arm/boot/dts/omap3-ldp.dts | 231 ++++++
+ .../dts/orion5x-lacie-ethernet-disk-mini-v2.dts | 2 +-
+ arch/arm/boot/dts/pxa27x.dtsi | 24 +
+ arch/arm/boot/dts/sama5d3.dtsi | 407 ++++++++++-
+ arch/arm/boot/dts/sama5d36.dtsi | 20 +
+ arch/arm/boot/dts/sama5d36ek.dts | 53 ++
+ arch/arm/boot/dts/sama5d3_can.dtsi | 20 +
+ arch/arm/boot/dts/sama5d3_emac.dtsi | 11 +
+ arch/arm/boot/dts/sama5d3_gmac.dtsi | 11 +
+ arch/arm/boot/dts/sama5d3_lcd.dtsi | 17 +
+ arch/arm/boot/dts/sama5d3_mci2.dtsi | 12 +
+ arch/arm/boot/dts/sama5d3_tcb1.dtsi | 12 +
+ arch/arm/boot/dts/sama5d3_uart.dtsi | 26 +
+ arch/arm/boot/dts/sama5d3xcm.dtsi | 17 +-
+ arch/arm/boot/dts/sama5d3xdm.dtsi | 1 +
+ arch/arm/boot/dts/st-pincfg.h | 2 +-
+ arch/arm/boot/dts/ste-dbx5x0.dtsi | 32 +
+ arch/arm/boot/dts/ste-href-family-pinctrl.dtsi | 745 +++++++++++++++++++
+ arch/arm/boot/dts/ste-href-stuib.dtsi | 41 ++
+ arch/arm/boot/dts/ste-href-tvk1281618.dtsi | 90 ++-
+ arch/arm/boot/dts/ste-href.dtsi | 78 +-
+ arch/arm/boot/dts/ste-hrefprev60.dtsi | 73 +-
+ arch/arm/boot/dts/ste-hrefv60plus.dtsi | 217 +++++-
+ arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi | 80 ++
+ arch/arm/boot/dts/ste-nomadik-s8815.dts | 4 -
+ arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 4 +-
+ arch/arm/boot/dts/ste-snowball.dts | 225 ++++++
+ arch/arm/boot/dts/stih415-pinctrl.dtsi | 36 +
+ arch/arm/boot/dts/stih415.dtsi | 53 ++
+ arch/arm/boot/dts/stih416-pinctrl.dtsi | 35 +
+ arch/arm/boot/dts/stih416.dtsi | 53 ++
+ arch/arm/boot/dts/stih41x-b2000.dtsi | 9 +
+ arch/arm/boot/dts/stih41x-b2020.dtsi | 22 +
+ arch/arm/common/timer-sp.c | 4 +-
+ arch/arm/configs/at91_dt_defconfig | 1 -
+ arch/arm/configs/at91rm9200_defconfig | 1 -
+ arch/arm/configs/at91sam9260_9g20_defconfig | 1 -
+ arch/arm/configs/at91sam9261_9g10_defconfig | 1 -
+ arch/arm/configs/at91sam9g45_defconfig | 1 -
+ arch/arm/configs/at91sam9rl_defconfig | 1 -
+ arch/arm/configs/bockw_defconfig | 10 +-
+ arch/arm/configs/genmai_defconfig | 116 +++
+ arch/arm/configs/hi3xxx_defconfig | 56 ++
+ arch/arm/configs/kirkwood_defconfig | 1 +
+ arch/arm/configs/kzm9d_defconfig | 1 +
+ arch/arm/configs/marzen_defconfig | 10 +-
+ arch/arm/configs/multi_v7_defconfig | 7 +
+ arch/arm/configs/mvebu_defconfig | 1 +
+ arch/arm/configs/sama5_defconfig | 1 -
+ arch/arm/mach-at91/Kconfig | 52 +-
+ arch/arm/mach-at91/Kconfig.non_dt | 6 +
+ arch/arm/mach-at91/Makefile | 2 +-
+ arch/arm/mach-at91/at91rm9200.c | 2 +-
+ arch/arm/mach-at91/at91sam9260.c | 2 +-
+ arch/arm/mach-at91/at91sam9261.c | 2 +-
+ arch/arm/mach-at91/at91sam9263.c | 2 +-
+ arch/arm/mach-at91/at91sam926x_time.c | 14 +-
+ arch/arm/mach-at91/at91sam9g45.c | 2 +-
+ arch/arm/mach-at91/at91sam9n12.c | 2 +-
+ arch/arm/mach-at91/at91sam9rl.c | 2 +-
+ arch/arm/mach-at91/at91sam9x5.c | 2 +-
+ arch/arm/mach-at91/board-dt-sama5.c | 10 +-
+ arch/arm/mach-at91/clock.c | 13 +-
+ arch/arm/mach-at91/generic.h | 3 +-
+ arch/arm/mach-at91/include/mach/cpu.h | 3 +-
+ arch/arm/mach-at91/pm.c | 5 +-
+ arch/arm/mach-at91/pm_slowclock.S | 2 +-
+ arch/arm/mach-at91/sama5d3.c | 344 +--------
+ arch/arm/mach-at91/setup.c | 12 +-
+ arch/arm/mach-berlin/Kconfig | 29 +
+ arch/arm/mach-berlin/Makefile | 1 +
+ arch/arm/mach-berlin/berlin.c | 39 +
+ arch/arm/mach-clps711x/common.c | 4 +-
+ arch/arm/mach-davinci/time.c | 4 +-
+ arch/arm/mach-dove/common.c | 15 +-
+ arch/arm/mach-ep93xx/Kconfig | 1 +
+ arch/arm/mach-ep93xx/core.c | 110 ++-
+ arch/arm/mach-ep93xx/include/mach/platform.h | 3 +-
+ arch/arm/mach-exynos/platsmp.c | 3 +-
+ arch/arm/mach-hi3xxx/Kconfig | 17 +
+ arch/arm/mach-hi3xxx/Makefile | 7 +
+ arch/arm/mach-hi3xxx/core.h | 15 +
+ arch/arm/mach-hi3xxx/hi3xxx.c | 97 +++
+ arch/arm/mach-hi3xxx/hotplug.c | 200 +++++
+ arch/arm/mach-hi3xxx/platsmp.c | 89 +++
+ arch/arm/mach-imx/platsmp.c | 3 +-
+ arch/arm/mach-imx/time.c | 4 +-
+ arch/arm/mach-integrator/integrator_ap.c | 64 +-
+ arch/arm/mach-integrator/integrator_cp.c | 14 -
+ arch/arm/mach-ixp4xx/common.c | 4 +-
+ arch/arm/mach-kirkwood/board-dt.c | 40 +-
+ arch/arm/mach-mmp/Kconfig | 3 +
+ arch/arm/mach-mmp/Makefile | 3 +-
+ arch/arm/mach-mmp/time.c | 4 +-
+ arch/arm/mach-msm/platsmp.c | 3 +-
+ arch/arm/mach-msm/timer.c | 4 +-
+ arch/arm/mach-mvebu/coherency.c | 1 +
+ arch/arm/mach-mvebu/coherency.h | 4 +-
+ arch/arm/mach-mvebu/common.h | 1 -
+ arch/arm/mach-mvebu/hotplug.c | 1 +
+ arch/arm/mach-mvebu/platsmp.c | 4 +-
+ arch/arm/mach-mvebu/pmsu.c | 3 +-
+ arch/arm/mach-mvebu/system-controller.c | 5 +-
+ arch/arm/mach-nomadik/cpu-8815.c | 32 -
+ arch/arm/mach-omap1/time.c | 4 +-
+ arch/arm/mach-omap2/Kconfig | 13 -
+ arch/arm/mach-omap2/Makefile | 4 -
+ arch/arm/mach-omap2/board-2430sdp.c | 273 -------
+ arch/arm/mach-omap2/board-h4.c | 365 ----------
+ arch/arm/mach-omap2/board-n8x0.c | 234 ++----
+ arch/arm/mach-omap2/common-board-devices.h | 1 +
+ arch/arm/mach-omap2/common.h | 1 +
+ arch/arm/mach-omap2/msdi.c | 69 --
+ arch/arm/mach-omap2/mux.h | 2 -
+ arch/arm/mach-omap2/mux2420.c | 690 ------------------
+ arch/arm/mach-omap2/mux2420.h | 282 --------
+ arch/arm/mach-omap2/mux2430.c | 793 --------------------
+ arch/arm/mach-omap2/mux2430.h | 370 ----------
+ arch/arm/mach-omap2/omap_device.c | 2 +
+ arch/arm/mach-omap2/omap_hwmod_2420_data.c | 137 ----
+ arch/arm/mach-omap2/omap_hwmod_2430_data.c | 266 -------
+ .../mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 165 +----
+ arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 72 +-
+ arch/arm/mach-omap2/omap_hwmod_common_data.h | 5 -
+ arch/arm/mach-omap2/pdata-quirks.c | 107 ++-
+ arch/arm/mach-omap2/timer.c | 4 +-
+ arch/arm/mach-orion5x/board-dt.c | 2 +-
+ arch/arm/mach-orion5x/common.c | 7 +-
+ arch/arm/mach-orion5x/db88f5281-setup.c | 2 +-
+ arch/arm/mach-orion5x/irq.c | 1 +
+ arch/arm/mach-orion5x/pci.c | 4 +-
+ arch/arm/mach-orion5x/rd88f5182-setup.c | 2 +-
+ arch/arm/mach-orion5x/terastation_pro2-setup.c | 2 +-
+ arch/arm/mach-orion5x/ts209-setup.c | 2 +-
+ arch/arm/mach-orion5x/ts78xx-setup.c | 2 +-
+ arch/arm/mach-prima2/platsmp.c | 3 +-
+ arch/arm/mach-pxa/am200epd.c | 3 +-
+ arch/arm/mach-pxa/am300epd.c | 3 +-
+ arch/arm/mach-pxa/em-x270.c | 3 +-
+ arch/arm/mach-pxa/irq.c | 4 -
+ arch/arm/mach-pxa/magician.c | 2 +-
+ arch/arm/mach-pxa/mainstone.c | 2 +-
+ arch/arm/mach-pxa/pcm990-baseboard.c | 2 +-
+ arch/arm/mach-pxa/sharpsl_pm.c | 8 +-
+ arch/arm/mach-pxa/time.c | 6 +-
+ arch/arm/mach-pxa/trizeps4.c | 3 +-
+ arch/arm/mach-s3c64xx/Kconfig | 7 +-
+ arch/arm/mach-s3c64xx/Makefile | 2 +-
+ arch/arm/mach-s3c64xx/common.h | 5 +
+ arch/arm/mach-s3c64xx/dma.c | 762 -------------------
+ arch/arm/mach-s3c64xx/include/mach/dma.h | 144 ++--
+ arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c | 11 +-
+ arch/arm/mach-s3c64xx/pl080.c | 244 +++++++
+ arch/arm/mach-sa1100/time.c | 4 +-
+ arch/arm/mach-shmobile/board-ape6evm.c | 6 +-
+ arch/arm/mach-shmobile/board-bockw-reference.c | 1 -
+ arch/arm/mach-shmobile/board-lager-reference.c | 5 +-
+ arch/arm/mach-shmobile/board-lager.c | 2 +-
+ arch/arm/mach-shmobile/board-marzen.c | 25 +-
+ arch/arm/mach-shmobile/clock-r7s72100.c | 3 +
+ arch/arm/mach-shmobile/clock-r8a7790.c | 2 +-
+ arch/arm/mach-shmobile/clock-sh7372.c | 9 +-
+ arch/arm/mach-shmobile/clock-sh73a0.c | 14 +-
+ arch/arm/mach-shmobile/include/mach/r8a7779.h | 5 -
+ arch/arm/mach-shmobile/setup-r8a7779.c | 57 --
+ arch/arm/mach-shmobile/setup-r8a7790.c | 7 +-
+ arch/arm/mach-shmobile/setup-sh73a0.c | 16 +-
+ arch/arm/mach-sti/platsmp.c | 3 +-
+ arch/arm/mach-u300/timer.c | 4 +-
+ arch/arm/mach-ux500/Makefile | 6 +-
+ arch/arm/mach-ux500/board-mop500-audio.c | 3 -
+ arch/arm/mach-ux500/board-mop500-pins.c | 804 ---------------------
+ arch/arm/mach-ux500/board-mop500-sdi.c | 2 -
+ arch/arm/mach-ux500/board-mop500.c | 78 --
+ arch/arm/mach-ux500/board-mop500.h | 1 -
+ arch/arm/mach-ux500/cpu-db8500.c | 22 +-
+ arch/arm/mach-ux500/cpu.c | 23 +-
+ arch/arm/mach-ux500/devices-db8500.c | 28 -
+ arch/arm/mach-ux500/devices-db8500.h | 19 -
+ arch/arm/mach-ux500/devices.c | 26 -
+ arch/arm/mach-ux500/devices.h | 15 -
+ arch/arm/mach-ux500/platsmp.c | 3 +-
+ arch/arm/mach-ux500/setup.h | 6 -
+ arch/arm/mach-ux500/timer.c | 76 +-
+ arch/arm/plat-iop/time.c | 4 +-
+ arch/arm/plat-omap/counter_32k.c | 4 +-
+ arch/arm/plat-orion/common.c | 9 +-
+ arch/arm/plat-orion/time.c | 7 +-
+ arch/arm/plat-pxa/dma.c | 2 +-
+ arch/arm/plat-samsung/devs.c | 10 +-
+ arch/arm/plat-samsung/dma-ops.c | 8 +-
+ arch/arm/plat-versatile/platsmp.c | 3 +-
+ arch/arm/plat-versatile/sched-clock.c | 4 +-
+ drivers/bus/mvebu-mbus.c | 10 +-
+ drivers/clk/Makefile | 2 +
+ drivers/clk/at91/Makefile | 11 +
+ drivers/clk/at91/clk-main.c | 187 +++++
+ drivers/clk/at91/clk-master.c | 270 +++++++
+ drivers/clk/at91/clk-peripheral.c | 410 +++++++++++
+ drivers/clk/at91/clk-pll.c | 531 ++++++++++++++
+ drivers/clk/at91/clk-plldiv.c | 135 ++++
+ drivers/clk/at91/clk-programmable.c | 366 ++++++++++
+ drivers/clk/at91/clk-smd.c | 171 +++++
+ drivers/clk/at91/clk-system.c | 135 ++++
+ drivers/clk/at91/clk-usb.c | 398 ++++++++++
+ drivers/clk/at91/clk-utmi.c | 159 ++++
+ drivers/clk/at91/pmc.c | 395 ++++++++++
+ drivers/clk/at91/pmc.h | 114 +++
+ drivers/clk/hisilicon/Makefile | 5 +
+ drivers/clk/hisilicon/clk-hi3620.c | 242 +++++++
+ drivers/clk/hisilicon/clk.c | 171 +++++
+ drivers/clk/hisilicon/clk.h | 103 +++
+ drivers/clk/hisilicon/clkgate-separated.c | 130 ++++
+ drivers/clk/samsung/clk-s3c64xx.c | 4 +-
+ drivers/clocksource/nomadik-mtu.c | 23 +-
+ drivers/dma/Kconfig | 2 +
+ drivers/dma/ste_dma40.c | 4 +
+ drivers/irqchip/Kconfig | 4 +
+ drivers/irqchip/Makefile | 1 +
+ drivers/irqchip/irq-dw-apb-ictl.c | 150 ++++
+ drivers/mfd/twl-core.c | 15 +-
+ drivers/pinctrl/pinctrl-nomadik.c | 296 ++++++--
+ drivers/pinctrl/pinctrl-nomadik.h | 14 +-
+ drivers/spi/Kconfig | 2 +-
+ drivers/usb/gadget/atmel_usba_udc.c | 2 +-
+ include/dt-bindings/clk/at91.h | 22 +
+ include/dt-bindings/clock/hi3620-clock.h | 152 ++++
+ .../include/mach => include/linux/clk}/at91_pmc.h | 4 +-
+ .../linux/platform_data/clocksource-nomadik-mtu.h | 9 -
+ include/linux/platform_data/pinctrl-nomadik.h | 242 -------
+ sound/soc/atmel/Kconfig | 2 +-
+ 315 files changed, 12800 insertions(+), 7103 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/marvell,berlin.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/at91-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/hi3620-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/snps,dw-apb-ictl.txt
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ create mode 100644 arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
+ create mode 100644 arch/arm/boot/dts/at91-cosino.dtsi
+ create mode 100644 arch/arm/boot/dts/at91-cosino_mega2560.dts
+ create mode 100644 arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts
+ create mode 100644 arch/arm/boot/dts/berlin2.dtsi
+ create mode 100644 arch/arm/boot/dts/berlin2cd-google-chromecast.dts
+ create mode 100644 arch/arm/boot/dts/berlin2cd.dtsi
+ create mode 100644 arch/arm/boot/dts/hi3620.dtsi
+ create mode 100644 arch/arm/boot/dts/hi4511.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
+ create mode 100644 arch/arm/boot/dts/omap2420-n800.dts
+ create mode 100644 arch/arm/boot/dts/omap2420-n810-wimax.dts
+ create mode 100644 arch/arm/boot/dts/omap2420-n810.dts
+ create mode 100644 arch/arm/boot/dts/omap2420-n8x0-common.dtsi
+ create mode 100644 arch/arm/boot/dts/omap2430-sdp.dts
+ create mode 100644 arch/arm/boot/dts/omap3-ldp.dts
+ create mode 100644 arch/arm/boot/dts/sama5d36.dtsi
+ create mode 100644 arch/arm/boot/dts/sama5d36ek.dts
+ create mode 100644 arch/arm/boot/dts/ste-href-family-pinctrl.dtsi
+ create mode 100644 arch/arm/configs/genmai_defconfig
+ create mode 100644 arch/arm/configs/hi3xxx_defconfig
+ create mode 100644 arch/arm/mach-berlin/Kconfig
+ create mode 100644 arch/arm/mach-berlin/Makefile
+ create mode 100644 arch/arm/mach-berlin/berlin.c
+ create mode 100644 arch/arm/mach-hi3xxx/Kconfig
+ create mode 100644 arch/arm/mach-hi3xxx/Makefile
+ create mode 100644 arch/arm/mach-hi3xxx/core.h
+ create mode 100644 arch/arm/mach-hi3xxx/hi3xxx.c
+ create mode 100644 arch/arm/mach-hi3xxx/hotplug.c
+ create mode 100644 arch/arm/mach-hi3xxx/platsmp.c
+ delete mode 100644 arch/arm/mach-omap2/board-2430sdp.c
+ delete mode 100644 arch/arm/mach-omap2/board-h4.c
+ delete mode 100644 arch/arm/mach-omap2/mux2420.c
+ delete mode 100644 arch/arm/mach-omap2/mux2420.h
+ delete mode 100644 arch/arm/mach-omap2/mux2430.c
+ delete mode 100644 arch/arm/mach-omap2/mux2430.h
+ delete mode 100644 arch/arm/mach-s3c64xx/dma.c
+ create mode 100644 arch/arm/mach-s3c64xx/pl080.c
+ delete mode 100644 arch/arm/mach-ux500/board-mop500.c
+ delete mode 100644 arch/arm/mach-ux500/devices-db8500.c
+ delete mode 100644 arch/arm/mach-ux500/devices-db8500.h
+ delete mode 100644 arch/arm/mach-ux500/devices.c
+ delete mode 100644 arch/arm/mach-ux500/devices.h
+ create mode 100644 drivers/clk/at91/Makefile
+ create mode 100644 drivers/clk/at91/clk-main.c
+ create mode 100644 drivers/clk/at91/clk-master.c
+ create mode 100644 drivers/clk/at91/clk-peripheral.c
+ create mode 100644 drivers/clk/at91/clk-pll.c
+ create mode 100644 drivers/clk/at91/clk-plldiv.c
+ create mode 100644 drivers/clk/at91/clk-programmable.c
+ create mode 100644 drivers/clk/at91/clk-smd.c
+ create mode 100644 drivers/clk/at91/clk-system.c
+ create mode 100644 drivers/clk/at91/clk-usb.c
+ create mode 100644 drivers/clk/at91/clk-utmi.c
+ create mode 100644 drivers/clk/at91/pmc.c
+ create mode 100644 drivers/clk/at91/pmc.h
+ create mode 100644 drivers/clk/hisilicon/Makefile
+ create mode 100644 drivers/clk/hisilicon/clk-hi3620.c
+ create mode 100644 drivers/clk/hisilicon/clk.c
+ create mode 100644 drivers/clk/hisilicon/clk.h
+ create mode 100644 drivers/clk/hisilicon/clkgate-separated.c
+ create mode 100644 drivers/irqchip/irq-dw-apb-ictl.c
+ create mode 100644 include/dt-bindings/clk/at91.h
+ create mode 100644 include/dt-bindings/clock/hi3620-clock.h
+ rename {arch/arm/mach-at91/include/mach => include/linux/clk}/at91_pmc.h (98%)
+ delete mode 100644 include/linux/platform_data/clocksource-nomadik-mtu.h
+ delete mode 100644 include/linux/platform_data/pinctrl-nomadik.h
+Merging bcm2835/for-next (5cc686267845 Merge branch 'for-3.14/defconfig' into for-next)
+$ git merge bcm2835/for-next
+Auto-merging arch/arm/boot/dts/bcm2835.dtsi
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/bcm2835-rpi-b.dts | 9 +++++++--
+ arch/arm/boot/dts/bcm2835.dtsi | 6 ++++++
+ arch/arm/configs/bcm2835_defconfig | 37 +++++++++++++++++++++++--------------
+ arch/arm/mach-bcm2835/Kconfig | 2 +-
+ 4 files changed, 37 insertions(+), 17 deletions(-)
+Merging cortex-m/for-next (9c031a483646 ARM: v7-M: drop using mach/entry-macro.S)
+$ git merge cortex-m/for-next
+Merge made by the 'recursive' strategy.
+Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next)
+$ git merge ep93xx/ep93xx-for-next
+Merge made by the 'recursive' strategy.
+Merging imx-mxs/for-next (1310160a701f Merge branch 'imx/dt' into for-next)
+$ git merge imx-mxs/for-next
+Auto-merging drivers/pinctrl/pinctrl-nomadik.c
+Auto-merging arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging arch/arm/Kconfig.debug
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/clock/imx5-clock.txt | 195 +----
+ .../bindings/pinctrl/fsl,imx27-pinctrl.txt | 22 +
+ .../devicetree/bindings/vendor-prefixes.txt | 3 +
+ arch/arm/Kconfig.debug | 9 +
+ arch/arm/boot/dts/Makefile | 23 +-
+ arch/arm/boot/dts/imx23-evk.dts | 8 +-
+ arch/arm/boot/dts/imx23-olinuxino.dts | 5 +-
+ arch/arm/boot/dts/imx23-stmp378x_devb.dts | 5 +-
+ arch/arm/boot/dts/imx23.dtsi | 7 +-
+ arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi | 60 ++
+ .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 128 +++
+ arch/arm/boot/dts/imx25-pinfunc.h | 494 +++++++++++
+ arch/arm/boot/dts/imx25-pingrp.h | 81 ++
+ arch/arm/boot/dts/imx25.dtsi | 18 +-
+ arch/arm/boot/dts/imx27-apf27.dts | 16 +
+ arch/arm/boot/dts/imx27-apf27dev.dts | 98 ++-
+ arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts | 50 +-
+ arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts | 20 +-
+ arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 56 +-
+ ...ycore-som.dts => imx27-phytec-phycore-som.dtsi} | 56 +-
+ arch/arm/boot/dts/imx27-pinfunc.h | 526 ++++++++++++
+ arch/arm/boot/dts/imx27-pingrp.h | 142 ++++
+ arch/arm/boot/dts/imx27.dtsi | 127 +--
+ arch/arm/boot/dts/imx28-apf28dev.dts | 18 +-
+ arch/arm/boot/dts/imx28-apx4devkit.dts | 5 +-
+ arch/arm/boot/dts/imx28-cfa10036.dts | 2 +
+ arch/arm/boot/dts/imx28-cfa10037.dts | 7 +-
+ arch/arm/boot/dts/imx28-cfa10049.dts | 31 +-
+ arch/arm/boot/dts/imx28-cfa10057.dts | 7 +-
+ arch/arm/boot/dts/imx28-cfa10058.dts | 7 +-
+ arch/arm/boot/dts/imx28-duckbill.dts | 121 +++
+ arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts | 71 ++
+ arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts | 50 ++
+ arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi | 326 ++++++++
+ arch/arm/boot/dts/imx28-evk.dts | 24 +-
+ arch/arm/boot/dts/imx28-m28cu3.dts | 16 +-
+ arch/arm/boot/dts/imx28-m28evk.dts | 18 +-
+ arch/arm/boot/dts/imx28-sps1.dts | 7 +-
+ arch/arm/boot/dts/imx28-tx28.dts | 23 +-
+ arch/arm/boot/dts/imx28.dtsi | 63 +-
+ arch/arm/boot/dts/imx50-evk.dts | 97 +++
+ arch/arm/boot/dts/imx50-pinfunc.h | 923 +++++++++++++++++++++
+ arch/arm/boot/dts/imx50-pingrp.h | 146 ++++
+ arch/arm/boot/dts/imx50.dtsi | 475 +++++++++++
+ arch/arm/boot/dts/imx51-apf51.dts | 18 +-
+ arch/arm/boot/dts/imx51-apf51dev.dts | 50 +-
+ arch/arm/boot/dts/imx51-babbage.dts | 100 ++-
+ arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi | 71 ++
+ .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 153 ++++
+ arch/arm/boot/dts/imx51-pingrp.h | 249 ++++++
+ arch/arm/boot/dts/imx51.dtsi | 456 ++--------
+ arch/arm/boot/dts/imx53-ard.dts | 19 +-
+ arch/arm/boot/dts/imx53-evk.dts | 38 +-
+ arch/arm/boot/dts/imx53-m53evk.dts | 133 ++-
+ arch/arm/boot/dts/imx53-mba53.dts | 40 +-
+ arch/arm/boot/dts/imx53-pingrp.h | 352 ++++++++
+ arch/arm/boot/dts/imx53-qsb.dts | 65 +-
+ arch/arm/boot/dts/imx53-smd.dts | 62 +-
+ arch/arm/boot/dts/imx53-tqma53.dtsi | 112 ++-
+ arch/arm/boot/dts/imx53-tx53.dtsi | 5 +-
+ arch/arm/boot/dts/imx53-voipac-bsb.dts | 144 ++++
+ arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi | 240 ++++++
+ arch/arm/boot/dts/imx53.dtsi | 649 +++------------
+ arch/arm/boot/dts/imx6dl-gw51xx.dts | 19 +
+ arch/arm/boot/dts/imx6dl-gw52xx.dts | 19 +
+ arch/arm/boot/dts/imx6dl-gw53xx.dts | 19 +
+ arch/arm/boot/dts/imx6dl-gw54xx.dts | 19 +
+ arch/arm/boot/dts/imx6dl-hummingboard.dts | 94 +++
+ arch/arm/boot/dts/imx6dl-nitrogen6x.dts | 21 +
+ arch/arm/boot/dts/imx6dl-pinfunc.h | 1 +
+ arch/arm/boot/dts/imx6dl-sabrelite.dts | 20 +
+ arch/arm/boot/dts/imx6dl.dtsi | 30 +-
+ arch/arm/boot/dts/imx6q-arm2.dts | 71 +-
+ arch/arm/boot/dts/imx6q-cm-fx6.dts | 69 ++
+ arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 178 ++++
+ arch/arm/boot/dts/imx6q-gw51xx.dts | 19 +
+ arch/arm/boot/dts/imx6q-gw52xx.dts | 23 +
+ arch/arm/boot/dts/imx6q-gw53xx.dts | 23 +
+ arch/arm/boot/dts/imx6q-gw5400-a.dts | 493 +++++++++++
+ arch/arm/boot/dts/imx6q-gw54xx.dts | 23 +
+ arch/arm/boot/dts/imx6q-nitrogen6x.dts | 25 +
+ arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi | 44 +-
+ arch/arm/boot/dts/imx6q-pinfunc.h | 1 +
+ arch/arm/boot/dts/imx6q-sabrelite.dts | 178 +---
+ arch/arm/boot/dts/imx6q-sbc6x.dts | 29 +-
+ arch/arm/boot/dts/imx6q-udoo.dts | 27 +-
+ arch/arm/boot/dts/imx6q.dtsi | 18 +-
+ arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 317 +++++++
+ arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 424 ++++++++++
+ arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 484 +++++++++++
+ arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 511 ++++++++++++
+ arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi | 58 ++
+ arch/arm/boot/dts/imx6qdl-microsom.dtsi | 89 ++
+ arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 393 +++++++++
+ arch/arm/boot/dts/imx6qdl-pingrp.h | 543 ++++++++++++
+ arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 78 +-
+ arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 394 +++++++++
+ arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 73 +-
+ arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 70 +-
+ arch/arm/boot/dts/imx6qdl.dtsi | 907 +++-----------------
+ arch/arm/boot/dts/imx6sl-evk.dts | 88 +-
+ arch/arm/boot/dts/imx6sl-pingrp.h | 148 ++++
+ arch/arm/boot/dts/imx6sl.dtsi | 339 ++------
+ arch/arm/boot/dts/vf610-cosmic.dts | 16 +-
+ arch/arm/boot/dts/vf610-pingrp.h | 127 +++
+ arch/arm/boot/dts/vf610-twr.dts | 34 +-
+ arch/arm/boot/dts/vf610.dtsi | 172 +---
+ arch/arm/configs/imx_v4_v5_defconfig | 2 +
+ arch/arm/configs/imx_v6_v7_defconfig | 8 +
+ arch/arm/include/debug/imx-uart.h | 10 +
+ arch/arm/mach-imx/Kconfig | 27 +-
+ arch/arm/mach-imx/Makefile | 1 +
+ arch/arm/mach-imx/avic.c | 25 -
+ arch/arm/mach-imx/clk-imx51-imx53.c | 804 +++++++++---------
+ arch/arm/mach-imx/clk-imx6q.c | 5 +-
+ arch/arm/mach-imx/clk-imx6sl.c | 11 +-
+ arch/arm/mach-imx/clk-pllv1.c | 23 +-
+ arch/arm/mach-imx/clk-vf610.c | 5 +
+ arch/arm/mach-imx/common.h | 1 +
+ arch/arm/mach-imx/imx31-dt.c | 2 +-
+ arch/arm/mach-imx/imx51-dt.c | 2 +-
+ arch/arm/mach-imx/irq-common.h | 1 -
+ arch/arm/mach-imx/mach-imx50.c | 38 +
+ arch/arm/mach-imx/mach-imx53.c | 2 +-
+ arch/arm/mach-imx/mach-imx6q.c | 67 +-
+ arch/arm/mach-imx/mach-imx6sl.c | 2 +-
+ arch/arm/mach-imx/mach-vf610.c | 2 +-
+ arch/arm/mach-imx/mm-imx5.c | 8 -
+ arch/arm/mach-mxs/mach-mxs.c | 33 +
+ drivers/pinctrl/Kconfig | 8 -
+ drivers/pinctrl/pinctrl-imx1-core.c | 7 +
+ drivers/pinctrl/pinctrl-nomadik.c | 6 +-
+ drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 36 +-
+ include/dt-bindings/clock/imx5-clock.h | 203 +++++
+ include/dt-bindings/clock/imx6sl-clock.h | 4 +-
+ include/dt-bindings/clock/vf610-clock.h | 6 +-
+ 136 files changed, 12229 insertions(+), 3390 deletions(-)
+ create mode 100644 arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi
+ create mode 100644 arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts
+ create mode 100644 arch/arm/boot/dts/imx25-pinfunc.h
+ create mode 100644 arch/arm/boot/dts/imx25-pingrp.h
+ rename arch/arm/boot/dts/{imx27-phytec-phycore-som.dts => imx27-phytec-phycore-som.dtsi} (77%)
+ create mode 100644 arch/arm/boot/dts/imx27-pinfunc.h
+ create mode 100644 arch/arm/boot/dts/imx27-pingrp.h
+ create mode 100644 arch/arm/boot/dts/imx28-duckbill.dts
+ create mode 100644 arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts
+ create mode 100644 arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts
+ create mode 100644 arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi
+ create mode 100644 arch/arm/boot/dts/imx50-evk.dts
+ create mode 100644 arch/arm/boot/dts/imx50-pinfunc.h
+ create mode 100644 arch/arm/boot/dts/imx50-pingrp.h
+ create mode 100644 arch/arm/boot/dts/imx50.dtsi
+ create mode 100644 arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi
+ create mode 100644 arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts
+ create mode 100644 arch/arm/boot/dts/imx51-pingrp.h
+ create mode 100644 arch/arm/boot/dts/imx53-pingrp.h
+ create mode 100644 arch/arm/boot/dts/imx53-voipac-bsb.dts
+ create mode 100644 arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6dl-gw51xx.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-gw52xx.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-gw53xx.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-gw54xx.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-hummingboard.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-nitrogen6x.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-sabrelite.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-cm-fx6.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-gw51xx.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-gw52xx.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-gw53xx.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-gw5400-a.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-gw54xx.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-nitrogen6x.dts
+ create mode 100644 arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qdl-microsom.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qdl-pingrp.h
+ create mode 100644 arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6sl-pingrp.h
+ create mode 100644 arch/arm/boot/dts/vf610-pingrp.h
+ create mode 100644 arch/arm/mach-imx/mach-imx50.c
+ create mode 100644 include/dt-bindings/clock/imx5-clock.h
+Merging ixp4xx/next (19f949f52599 Linux 3.8)
+$ git merge ixp4xx/next
+Already up-to-date.
+Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix)
+$ git merge msm/for-next
+Already up-to-date.
+Merging mvebu/for-next (7df09017fc41 Merge branch 'mvebu/dt' into for-next)
+$ git merge mvebu/for-next
+Auto-merging drivers/irqchip/Makefile
+Merge made by the 'recursive' strategy.
+ .../interrupt-controller/marvell,dove-pmu-intc.txt | 17 +
+ arch/arm/boot/dts/armada-370-xp.dtsi | 176 ++++----
+ arch/arm/boot/dts/armada-370.dtsi | 74 +--
+ arch/arm/boot/dts/armada-xp.dtsi | 100 ++---
+ arch/arm/boot/dts/dove.dtsi | 496 ++++++++++-----------
+ arch/arm/boot/dts/kirkwood.dtsi | 140 +++---
+ arch/arm/boot/dts/orion5x.dtsi | 106 ++---
+ arch/arm/configs/mvebu_defconfig | 2 +
+ drivers/clk/mvebu/Kconfig | 5 +
+ drivers/clk/mvebu/Makefile | 1 +
+ drivers/clk/mvebu/clk-corediv.c | 223 +++++++++
+ drivers/clk/mvebu/clk-cpu.c | 2 +-
+ drivers/irqchip/Makefile | 1 +
+ drivers/irqchip/irq-armada-370-xp.c | 4 +-
+ drivers/irqchip/irq-dove.c | 126 ++++++
+ 15 files changed, 924 insertions(+), 549 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/marvell,dove-pmu-intc.txt
+ create mode 100644 drivers/clk/mvebu/clk-corediv.c
+ create mode 100644 drivers/irqchip/irq-dove.c
+Merging renesas/next (833895910f5e Merge branch 'heads/sh-sci' into next)
+$ git merge renesas/next
+Resolved 'drivers/clk/Makefile' using previous resolution.
+Auto-merging drivers/clk/Makefile
+CONFLICT (content): Merge conflict in drivers/clk/Makefile
+Removing arch/arm/mach-shmobile/board-kzm9d.c
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging arch/arm/Makefile
+Auto-merging arch/arm/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master a2d7f21591e2] Merge remote-tracking branch 'renesas/next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/clock/emev2-clock.txt | 98 +++++++
+ .../bindings/clock/renesas,cpg-div6-clocks.txt | 28 ++
+ .../bindings/clock/renesas,cpg-mstp-clocks.txt | 51 ++++
+ .../clock/renesas,rcar-gen2-cpg-clocks.txt | 32 +++
+ arch/arm/Kconfig | 15 +-
+ arch/arm/Makefile | 1 -
+ arch/arm/boot/compressed/Makefile | 2 +-
+ arch/arm/boot/dts/Makefile | 8 +-
+ arch/arm/boot/dts/emev2-kzm9d.dts | 42 ++-
+ arch/arm/boot/dts/emev2.dtsi | 116 +++++++-
+ arch/arm/boot/dts/r7s72100-genmai-reference.dts | 31 +++
+ arch/arm/boot/dts/r7s72100-genmai.dts | 2 +-
+ arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 15 +-
+ arch/arm/boot/dts/r8a73a4-ape6evm.dts | 10 +-
+ arch/arm/boot/dts/r8a73a4.dtsi | 168 +++++++-----
+ .../boot/dts/r8a7740-armadillo800eva-reference.dts | 50 +++-
+ arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 +-
+ arch/arm/boot/dts/r8a7740.dtsi | 135 ++++++----
+ arch/arm/boot/dts/r8a7778-bockw-reference.dts | 57 +++-
+ arch/arm/boot/dts/r8a7778-bockw.dts | 2 +-
+ arch/arm/boot/dts/r8a7778.dtsi | 172 +++++++++++-
+ arch/arm/boot/dts/r8a7779-marzen-reference.dts | 36 ++-
+ arch/arm/boot/dts/r8a7779-marzen.dts | 2 +-
+ arch/arm/boot/dts/r8a7779.dtsi | 114 ++++++--
+ arch/arm/boot/dts/r8a7790-lager-reference.dts | 46 +++-
+ arch/arm/boot/dts/r8a7790-lager.dts | 7 +-
+ arch/arm/boot/dts/r8a7790.dtsi | 97 ++++---
+ arch/arm/boot/dts/r8a7791-koelsch-reference.dts | 115 ++++++++
+ arch/arm/boot/dts/r8a7791-koelsch.dts | 2 +-
+ arch/arm/boot/dts/r8a7791.dtsi | 144 ++++++++--
+ arch/arm/boot/dts/sh7372-mackerel.dts | 2 +-
+ arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 103 ++++++-
+ arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 +-
+ arch/arm/boot/dts/sh73a0.dtsi | 159 ++++++-----
+ arch/arm/configs/ape6evm_defconfig | 2 +-
+ arch/arm/configs/armadillo800eva_defconfig | 2 +-
+ arch/arm/configs/bockw_defconfig | 2 +-
+ arch/arm/configs/genmai_defconfig | 2 +-
+ arch/arm/configs/koelsch_defconfig | 24 +-
+ arch/arm/configs/kzm9d_defconfig | 2 +-
+ arch/arm/configs/kzm9g_defconfig | 2 +-
+ arch/arm/configs/lager_defconfig | 5 +-
+ arch/arm/configs/mackerel_defconfig | 2 +-
+ arch/arm/configs/marzen_defconfig | 2 +-
+ arch/arm/mach-shmobile/Kconfig | 70 +++--
+ arch/arm/mach-shmobile/Makefile | 5 +-
+ arch/arm/mach-shmobile/Makefile.boot | 5 +-
+ arch/arm/mach-shmobile/board-armadillo800eva.c | 2 +-
+ arch/arm/mach-shmobile/board-bockw-reference.c | 31 ++-
+ arch/arm/mach-shmobile/board-bockw.c | 17 +-
+ arch/arm/mach-shmobile/board-genmai-reference.c | 49 ++++
+ arch/arm/mach-shmobile/board-koelsch-reference.c | 53 ++++
+ arch/arm/mach-shmobile/board-koelsch.c | 73 ++++-
+ arch/arm/mach-shmobile/board-kzm9d.c | 92 -------
+ arch/arm/mach-shmobile/board-lager-reference.c | 2 +
+ arch/arm/mach-shmobile/board-lager.c | 155 ++++++++++-
+ arch/arm/mach-shmobile/board-mackerel.c | 21 +-
+ arch/arm/mach-shmobile/board-marzen.c | 2 -
+ arch/arm/mach-shmobile/clock-r7s72100.c | 1 +
+ arch/arm/mach-shmobile/clock-r8a73a4.c | 10 +-
+ arch/arm/mach-shmobile/clock-r8a7740.c | 9 +-
+ arch/arm/mach-shmobile/clock-r8a7778.c | 11 +
+ arch/arm/mach-shmobile/clock-r8a7779.c | 11 +
+ arch/arm/mach-shmobile/clock-r8a7790.c | 70 +++--
+ arch/arm/mach-shmobile/clock-r8a7791.c | 14 +-
+ arch/arm/mach-shmobile/clock-sh73a0.c | 8 +-
+ arch/arm/mach-shmobile/include/mach/emev2.h | 5 -
+ arch/arm/mach-shmobile/include/mach/r8a7778.h | 18 ++
+ arch/arm/mach-shmobile/include/mach/r8a7779.h | 2 -
+ arch/arm/mach-shmobile/include/mach/r8a7791.h | 1 +
+ arch/arm/mach-shmobile/setup-emev2.c | 163 +----------
+ arch/arm/mach-shmobile/setup-r7s72100.c | 22 ++
+ arch/arm/mach-shmobile/setup-r8a73a4.c | 2 +-
+ arch/arm/mach-shmobile/setup-r8a7778.c | 51 ++++
+ arch/arm/mach-shmobile/setup-r8a7791.c | 65 +++++
+ arch/arm/mach-shmobile/sh-gpio.h | 19 --
+ drivers/Makefile | 2 +-
+ drivers/clk/Makefile | 1 +
+ drivers/clk/shmobile/Makefile | 7 +
+ drivers/clk/shmobile/clk-div6.c | 185 +++++++++++++
+ drivers/clk/shmobile/clk-emev2.c | 104 +++++++
+ drivers/clk/shmobile/clk-mstp.c | 229 ++++++++++++++++
+ drivers/clk/shmobile/clk-rcar-gen2.c | 298 +++++++++++++++++++++
+ drivers/clocksource/sh_cmt.c | 20 +-
+ drivers/irqchip/irq-renesas-intc-irqpin.c | 8 +-
+ drivers/irqchip/irq-renesas-irqc.c | 4 +-
+ drivers/tty/serial/sh-sci.c | 39 +--
+ drivers/usb/host/r8a66597-hcd.c | 4 +-
+ include/linux/clk/shmobile.h | 19 ++
+ include/sound/rcar_snd.h | 1 -
+ 90 files changed, 3150 insertions(+), 741 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/emev2-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/renesas,rcar-gen2-cpg-clocks.txt
+ create mode 100644 arch/arm/boot/dts/r7s72100-genmai-reference.dts
+ create mode 100644 arch/arm/boot/dts/r8a7791-koelsch-reference.dts
+ create mode 100644 arch/arm/mach-shmobile/board-genmai-reference.c
+ create mode 100644 arch/arm/mach-shmobile/board-koelsch-reference.c
+ delete mode 100644 arch/arm/mach-shmobile/board-kzm9d.c
+ create mode 100644 drivers/clk/shmobile/Makefile
+ create mode 100644 drivers/clk/shmobile/clk-div6.c
+ create mode 100644 drivers/clk/shmobile/clk-emev2.c
+ create mode 100644 drivers/clk/shmobile/clk-mstp.c
+ create mode 100644 drivers/clk/shmobile/clk-rcar-gen2.c
+ create mode 100644 include/linux/clk/shmobile.h
+Merging samsung/for-next (0da8b319041a Merge branch 'v3.14-next/soc-exynos-2' into for-next)
+$ git merge samsung/for-next
+Auto-merging drivers/cpufreq/exynos5250-cpufreq.c
+Auto-merging drivers/cpufreq/exynos4x12-cpufreq.c
+Auto-merging drivers/cpufreq/exynos4210-cpufreq.c
+Auto-merging arch/arm/mach-exynos/regs-pmu.h
+Auto-merging arch/arm/mach-exynos/platsmp.c
+Removing arch/arm/mach-exynos/include/mach/regs-irq.h
+Removing arch/arm/mach-exynos/include/mach/regs-clock.h
+Auto-merging arch/arm/boot/dts/cros5250-common.dtsi
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/samsung/sysreg.txt | 7 +-
+ .../devicetree/bindings/clock/exynos5410-clock.txt | 54 +++
+ .../devicetree/bindings/mmc/exynos-dw-mshc.txt | 2 +
+ .../bindings/timer/samsung,exynos4210-mct.txt | 54 ++-
+ arch/arm/Kconfig | 3 +-
+ arch/arm/boot/dts/Makefile | 3 +
+ arch/arm/boot/dts/cros5250-common.dtsi | 13 +-
+ arch/arm/boot/dts/exynos4.dtsi | 6 +-
+ arch/arm/boot/dts/exynos4210-origen.dts | 2 +-
+ arch/arm/boot/dts/exynos4210.dtsi | 23 +-
+ arch/arm/boot/dts/exynos4212.dtsi | 24 +-
+ arch/arm/boot/dts/exynos4412-origen.dts | 2 +-
+ arch/arm/boot/dts/exynos4412-tiny4412.dts | 93 ++++++
+ arch/arm/boot/dts/exynos4412.dtsi | 28 +-
+ arch/arm/boot/dts/exynos4x12.dtsi | 20 ++
+ arch/arm/boot/dts/exynos5.dtsi | 25 +-
+ arch/arm/boot/dts/exynos5250-arndale.dts | 20 +-
+ arch/arm/boot/dts/exynos5250-smdk5250.dts | 22 +-
+ arch/arm/boot/dts/exynos5250-snow.dts | 11 +-
+ arch/arm/boot/dts/exynos5250.dtsi | 47 ++-
+ arch/arm/boot/dts/exynos5410-smdk5410.dts | 72 ++++
+ arch/arm/boot/dts/exynos5410.dtsi | 145 ++++++++
+ arch/arm/boot/dts/exynos5420-arndale-octa.dts | 66 ++++
+ arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 2 +-
+ arch/arm/boot/dts/exynos5420-smdk5420.dts | 33 ++
+ arch/arm/boot/dts/exynos5420.dtsi | 306 ++++++++++++++++-
+ arch/arm/boot/dts/exynos5440.dtsi | 2 +-
+ arch/arm/configs/exynos_defconfig | 2 +-
+ arch/arm/mach-exynos/Kconfig | 10 +
+ arch/arm/mach-exynos/common.c | 23 +-
+ arch/arm/mach-exynos/cpuidle.c | 25 +-
+ arch/arm/mach-exynos/hotplug.c | 2 +-
+ arch/arm/mach-exynos/include/mach/map.h | 1 +
+ arch/arm/mach-exynos/include/mach/pm-core.h | 5 +-
+ arch/arm/mach-exynos/include/mach/regs-clock.h | 372 ---------------------
+ arch/arm/mach-exynos/include/mach/regs-irq.h | 19 --
+ arch/arm/mach-exynos/mach-exynos5-dt.c | 3 +-
+ arch/arm/mach-exynos/platsmp.c | 5 +-
+ arch/arm/mach-exynos/pm.c | 33 +-
+ arch/arm/mach-exynos/pm_domains.c | 3 +-
+ arch/arm/mach-exynos/pmu.c | 17 +-
+ arch/arm/mach-exynos/{include/mach => }/regs-pmu.h | 53 ---
+ arch/arm/mach-s3c24xx/dma.c | 2 +-
+ arch/arm/mach-s3c24xx/simtec-usb.c | 3 +-
+ arch/arm/mach-s3c64xx/mach-mini6410.c | 10 +
+ arch/arm/mach-s3c64xx/mach-smartq.c | 2 +-
+ arch/arm/plat-samsung/Kconfig | 8 -
+ arch/arm/plat-samsung/include/plat/cpu.h | 8 +
+ arch/arm/plat-samsung/include/plat/map-s5p.h | 3 +
+ arch/arm/plat-samsung/include/plat/pm.h | 4 +-
+ arch/arm/plat-samsung/include/plat/uncompress.h | 2 +
+ arch/arm/plat-samsung/pm.c | 6 +-
+ arch/arm/plat-samsung/s5p-irq-eint.c | 4 +
+ arch/arm/plat-samsung/s5p-irq-pm.c | 3 +
+ drivers/clk/samsung/Makefile | 1 +
+ drivers/clk/samsung/clk-exynos5410.c | 239 +++++++++++++
+ drivers/clocksource/exynos_mct.c | 4 +
+ drivers/cpufreq/exynos-cpufreq.h | 22 ++
+ drivers/cpufreq/exynos4210-cpufreq.c | 2 -
+ drivers/cpufreq/exynos4x12-cpufreq.c | 2 -
+ drivers/cpufreq/exynos5250-cpufreq.c | 1 -
+ drivers/devfreq/exynos/exynos4_bus.c | 4 +-
+ drivers/devfreq/exynos/exynos4_bus.h | 110 ++++++
+ drivers/irqchip/exynos-combiner.c | 15 +-
+ include/dt-bindings/clock/exynos5410.h | 32 ++
+ 65 files changed, 1479 insertions(+), 666 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/exynos5410-clock.txt
+ create mode 100644 arch/arm/boot/dts/exynos4412-tiny4412.dts
+ create mode 100644 arch/arm/boot/dts/exynos5410-smdk5410.dts
+ create mode 100644 arch/arm/boot/dts/exynos5410.dtsi
+ create mode 100644 arch/arm/boot/dts/exynos5420-arndale-octa.dts
+ delete mode 100644 arch/arm/mach-exynos/include/mach/regs-clock.h
+ delete mode 100644 arch/arm/mach-exynos/include/mach/regs-irq.h
+ rename arch/arm/mach-exynos/{include/mach => }/regs-pmu.h (88%)
+ create mode 100644 drivers/clk/samsung/clk-exynos5410.c
+ create mode 100644 drivers/devfreq/exynos/exynos4_bus.h
+ create mode 100644 include/dt-bindings/clock/exynos5410.h
+Merging tegra/for-next (171b8da397a7 Merge branch for-3.14/defconfig into for-next)
+$ git merge tegra/for-next
+Auto-merging sound/soc/tegra/tegra30_i2s.c
+Auto-merging sound/soc/tegra/tegra20_i2s.c
+Auto-merging drivers/spi/Kconfig
+Auto-merging drivers/gpu/drm/tegra/drm.h
+Auto-merging drivers/dma/mmp_pdma.c
+Auto-merging arch/arm/mach-tegra/fuse.c
+Auto-merging arch/arm/Makefile
+Auto-merging arch/arm/Kconfig
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Merge made by the 'recursive' strategy.
+ .../arm/firmware/tlm,trusted-foundations.txt | 20 +
+ Documentation/devicetree/bindings/arm/tegra.txt | 5 +
+ .../bindings/arm/tegra/nvidia,tegra20-pmc.txt | 1 +
+ .../bindings/clock/nvidia,tegra114-car.txt | 4 +
+ .../bindings/clock/nvidia,tegra124-car.txt | 63 +
+ .../bindings/clock/nvidia,tegra20-car.txt | 4 +
+ .../bindings/clock/nvidia,tegra30-car.txt | 4 +
+ .../devicetree/bindings/dma/tegra20-apbdma.txt | 14 +
+ .../bindings/gpu/nvidia,tegra20-host1x.txt | 122 ++
+ .../devicetree/bindings/i2c/nvidia,tegra20-i2c.txt | 27 +-
+ .../bindings/input/nvidia,tegra20-kbc.txt | 9 +
+ .../bindings/mmc/nvidia,tegra20-sdhci.txt | 9 +
+ .../devicetree/bindings/nvec/nvidia,nvec.txt | 12 +
+ .../bindings/pci/nvidia,tegra20-pcie.txt | 26 +-
+ .../devicetree/bindings/pwm/nvidia,tegra20-pwm.txt | 9 +
+ .../devicetree/bindings/rtc/nvidia,tegra20-rtc.txt | 3 +
+ .../bindings/serial/nvidia,tegra20-hsuart.txt | 19 +-
+ .../bindings/sound/nvidia,tegra-audio-alc5632.txt | 7 +-
+ .../bindings/sound/nvidia,tegra-audio-rt5640.txt | 7 +-
+ .../bindings/sound/nvidia,tegra-audio-wm8753.txt | 7 +-
+ .../bindings/sound/nvidia,tegra-audio-wm8903.txt | 7 +-
+ .../bindings/sound/nvidia,tegra-audio-wm9712.txt | 7 +-
+ .../bindings/sound/nvidia,tegra20-ac97.txt | 20 +-
+ .../bindings/sound/nvidia,tegra20-i2s.txt | 19 +-
+ .../bindings/sound/nvidia,tegra30-ahub.txt | 63 +-
+ .../bindings/sound/nvidia,tegra30-i2s.txt | 11 +-
+ .../bindings/spi/nvidia,tegra114-spi.txt | 24 +-
+ .../bindings/spi/nvidia,tegra20-sflash.txt | 20 +-
+ .../bindings/spi/nvidia,tegra20-slink.txt | 20 +-
+ .../bindings/timer/nvidia,tegra20-timer.txt | 3 +
+ .../bindings/timer/nvidia,tegra30-timer.txt | 3 +
+ .../bindings/usb/nvidia,tegra20-ehci.txt | 7 +-
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ arch/arm/Kconfig | 2 +
+ arch/arm/Makefile | 1 +
+ arch/arm/boot/dts/tegra114-dalmore.dts | 630 ++++----
+ arch/arm/boot/dts/tegra114.dtsi | 295 +++-
+ arch/arm/boot/dts/tegra124-venice2.dts | 945 +++++++++++
+ arch/arm/boot/dts/tegra124.dtsi | 418 +++++
+ arch/arm/boot/dts/tegra20-colibri-512.dtsi | 205 +--
+ arch/arm/boot/dts/tegra20-harmony.dts | 316 ++--
+ arch/arm/boot/dts/tegra20-iris-512.dts | 30 +-
+ arch/arm/boot/dts/tegra20-medcom-wide.dts | 2 +-
+ arch/arm/boot/dts/tegra20-paz00.dts | 52 +-
+ arch/arm/boot/dts/tegra20-plutux.dts | 4 +-
+ arch/arm/boot/dts/tegra20-seaboard.dts | 353 ++--
+ arch/arm/boot/dts/tegra20-tamonten.dtsi | 47 +-
+ arch/arm/boot/dts/tegra20-tec.dts | 6 +-
+ arch/arm/boot/dts/tegra20-trimslice.dts | 54 +-
+ arch/arm/boot/dts/tegra20-ventana.dts | 62 +-
+ arch/arm/boot/dts/tegra20-whistler.dts | 84 +-
+ arch/arm/boot/dts/tegra20.dtsi | 191 ++-
+ arch/arm/boot/dts/tegra30-beaver.dts | 117 +-
+ arch/arm/boot/dts/tegra30-cardhu-a02.dts | 14 +-
+ arch/arm/boot/dts/tegra30-cardhu-a04.dts | 14 +-
+ arch/arm/boot/dts/tegra30-cardhu.dtsi | 104 +-
+ arch/arm/boot/dts/tegra30.dtsi | 226 ++-
+ arch/arm/configs/tegra_defconfig | 23 +-
+ arch/arm/firmware/Kconfig | 28 +
+ arch/arm/firmware/Makefile | 1 +
+ arch/arm/firmware/trusted_foundations.c | 81 +
+ arch/arm/include/asm/trusted_foundations.h | 67 +
+ arch/arm/include/debug/tegra.S | 34 +-
+ arch/arm/mach-tegra/Kconfig | 4 +
+ arch/arm/mach-tegra/fuse.c | 41 +-
+ arch/arm/mach-tegra/iomap.h | 14 +-
+ arch/arm/mach-tegra/powergate.c | 203 ++-
+ arch/arm/mach-tegra/reset.c | 40 +-
+ arch/arm/mach-tegra/tegra.c | 6 +-
+ drivers/clk/tegra/Makefile | 7 +-
+ drivers/clk/tegra/clk-id.h | 235 +++
+ drivers/clk/tegra/clk-periph-gate.c | 30 +-
+ drivers/clk/tegra/clk-periph.c | 72 +-
+ drivers/clk/tegra/clk-pll.c | 407 +++--
+ drivers/clk/tegra/clk-tegra-audio.c | 215 +++
+ drivers/clk/tegra/clk-tegra-fixed.c | 111 ++
+ drivers/clk/tegra/clk-tegra-periph.c | 674 ++++++++
+ drivers/clk/tegra/clk-tegra-pmc.c | 132 ++
+ drivers/clk/tegra/clk-tegra-super-gen4.c | 149 ++
+ drivers/clk/tegra/clk-tegra114.c | 1688 +++++---------------
+ drivers/clk/tegra/clk-tegra124.c | 1424 +++++++++++++++++
+ drivers/clk/tegra/clk-tegra20.c | 817 ++++------
+ drivers/clk/tegra/clk-tegra30.c | 1504 ++++++-----------
+ drivers/clk/tegra/clk.c | 214 +++
+ drivers/clk/tegra/clk.h | 116 +-
+ drivers/dma/dmaengine.c | 63 +-
+ drivers/dma/mmp_pdma.c | 30 +-
+ drivers/dma/of-dma.c | 15 +-
+ drivers/dma/tegra20-apb-dma.c | 52 +-
+ drivers/gpu/drm/tegra/Kconfig | 1 +
+ drivers/gpu/drm/tegra/dc.c | 10 +-
+ drivers/gpu/drm/tegra/drm.h | 3 +
+ drivers/gpu/drm/tegra/gr3d.c | 22 +-
+ drivers/gpu/drm/tegra/hdmi.c | 15 +-
+ drivers/i2c/busses/i2c-tegra.c | 13 +-
+ drivers/input/keyboard/tegra-kbc.c | 13 +-
+ drivers/pci/host/pci-tegra.c | 53 +-
+ drivers/spi/Kconfig | 3 +
+ drivers/spi/spi-tegra114.c | 66 +-
+ drivers/spi/spi-tegra20-sflash.c | 18 +-
+ drivers/spi/spi-tegra20-slink.c | 66 +-
+ drivers/staging/nvec/nvec.c | 11 +-
+ drivers/staging/nvec/nvec.h | 5 +-
+ drivers/tty/serial/serial-tegra.c | 38 +-
+ drivers/usb/host/ehci-tegra.c | 14 +-
+ include/dt-bindings/clock/tegra114-car.h | 8 +-
+ include/dt-bindings/clock/tegra124-car.h | 341 ++++
+ include/dt-bindings/clock/tegra20-car.h | 2 +-
+ include/dt-bindings/clock/tegra30-car.h | 12 +-
+ include/dt-bindings/gpio/tegra-gpio.h | 1 +
+ include/dt-bindings/pinctrl/pinctrl-tegra.h | 45 +
+ include/linux/clk/tegra.h | 7 -
+ include/linux/dmaengine.h | 9 +
+ include/linux/tegra-powergate.h | 55 +-
+ include/sound/dmaengine_pcm.h | 10 +
+ sound/soc/soc-devres.c | 41 +
+ sound/soc/soc-generic-dmaengine-pcm.c | 56 +-
+ sound/soc/tegra/Kconfig | 2 +
+ sound/soc/tegra/tegra20_ac97.c | 11 -
+ sound/soc/tegra/tegra20_i2s.c | 20 +-
+ sound/soc/tegra/tegra30_ahub.c | 138 +-
+ sound/soc/tegra/tegra30_ahub.h | 11 +-
+ sound/soc/tegra/tegra30_i2s.c | 97 +-
+ sound/soc/tegra/tegra30_i2s.h | 3 +
+ sound/soc/tegra/tegra_pcm.c | 17 +-
+ sound/soc/tegra/tegra_pcm.h | 5 +
+ 126 files changed, 9840 insertions(+), 4648 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/firmware/tlm,trusted-foundations.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra124-car.txt
+ create mode 100644 arch/arm/firmware/Kconfig
+ create mode 100644 arch/arm/firmware/Makefile
+ create mode 100644 arch/arm/firmware/trusted_foundations.c
+ create mode 100644 arch/arm/include/asm/trusted_foundations.h
+ create mode 100644 drivers/clk/tegra/clk-id.h
+ create mode 100644 drivers/clk/tegra/clk-tegra-audio.c
+ create mode 100644 drivers/clk/tegra/clk-tegra-fixed.c
+ create mode 100644 drivers/clk/tegra/clk-tegra-periph.c
+ create mode 100644 drivers/clk/tegra/clk-tegra-pmc.c
+ create mode 100644 drivers/clk/tegra/clk-tegra-super-gen4.c
+ create mode 100644 drivers/clk/tegra/clk-tegra124.c
+ create mode 100644 include/dt-bindings/clock/tegra124-car.h
+ create mode 100644 include/dt-bindings/pinctrl/pinctrl-tegra.h
+Merging arm64/for-next/core (0a5be743e8c3 Merge tag 'arm64-suspend' of git://linux-arm.org/linux-2.6-lp into upstream)
+$ git merge arm64/for-next/core
+Removing arch/arm64/lib/strnlen_user.S
+Removing arch/arm64/lib/strncpy_from_user.S
+Merge made by the 'recursive' strategy.
+ arch/arm/kvm/arm.c | 30 ++++
+ arch/arm64/Kconfig | 26 ++++
+ arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi | 6 +
+ arch/arm64/include/asm/Kbuild | 1 -
+ arch/arm64/include/asm/cmpxchg.h | 28 ++--
+ arch/arm64/include/asm/cpu_ops.h | 6 +
+ arch/arm64/include/asm/cputype.h | 28 ++--
+ arch/arm64/include/asm/debug-monitors.h | 21 +++
+ arch/arm64/include/asm/dma-contiguous.h | 29 ++++
+ arch/arm64/include/asm/futex.h | 1 +
+ arch/arm64/include/asm/hardirq.h | 2 +-
+ arch/arm64/include/asm/memory.h | 3 +-
+ arch/arm64/include/asm/percpu.h | 41 +++++
+ arch/arm64/include/asm/proc-fns.h | 3 +
+ arch/arm64/include/asm/smp_plat.h | 13 ++
+ arch/arm64/include/asm/suspend.h | 27 ++++
+ arch/arm64/include/asm/uaccess.h | 25 +--
+ arch/arm64/include/asm/word-at-a-time.h | 94 ++++++++++++
+ arch/arm64/include/uapi/asm/hwcap.h | 6 +-
+ arch/arm64/kernel/Makefile | 1 +
+ arch/arm64/kernel/arm64ksyms.c | 5 +-
+ arch/arm64/kernel/asm-offsets.c | 11 ++
+ arch/arm64/kernel/debug-monitors.c | 88 ++++++++++-
+ arch/arm64/kernel/entry.S | 2 +
+ arch/arm64/kernel/fpsimd.c | 36 +++++
+ arch/arm64/kernel/hw_breakpoint.c | 221 +++++++++++++++++++--------
+ arch/arm64/kernel/perf_event.c | 108 +++++++++----
+ arch/arm64/kernel/process.c | 14 +-
+ arch/arm64/kernel/setup.c | 122 ++++++++++++++-
+ arch/arm64/kernel/sleep.S | 184 ++++++++++++++++++++++
+ arch/arm64/kernel/smp.c | 23 ++-
+ arch/arm64/kernel/stacktrace.c | 2 +-
+ arch/arm64/kernel/suspend.c | 109 +++++++++++++
+ arch/arm64/kernel/vmlinux.lds.S | 1 -
+ arch/arm64/lib/Makefile | 8 +-
+ arch/arm64/lib/strncpy_from_user.S | 50 ------
+ arch/arm64/lib/strnlen_user.S | 47 ------
+ arch/arm64/mm/dma-mapping.c | 35 ++++-
+ arch/arm64/mm/init.c | 3 +
+ arch/arm64/mm/proc.S | 69 +++++++++
+ include/linux/irqdesc.h | 8 +
+ 41 files changed, 1267 insertions(+), 270 deletions(-)
+ create mode 100644 arch/arm64/include/asm/dma-contiguous.h
+ create mode 100644 arch/arm64/include/asm/percpu.h
+ create mode 100644 arch/arm64/include/asm/suspend.h
+ create mode 100644 arch/arm64/include/asm/word-at-a-time.h
+ create mode 100644 arch/arm64/kernel/sleep.S
+ create mode 100644 arch/arm64/kernel/suspend.c
+ delete mode 100644 arch/arm64/lib/strncpy_from_user.S
+ delete mode 100644 arch/arm64/lib/strnlen_user.S
+Merging blackfin/for-linus (36855dcfc980 blackfin: fix build warning for unused variable)
+$ git merge blackfin/for-linus
+Already up-to-date.
+Merging c6x/for-linux-next (546153d75a48 c6x: fix build failure caused by cache.h)
+$ git merge c6x/for-linux-next
+Merge made by the 'recursive' strategy.
+ arch/c6x/include/asm/cache.h | 1 +
+ 1 file changed, 1 insertion(+)
+Merging cris/for-next (be8cb7f42ab9 CRIS: drop unused Kconfig symbols)
+$ git merge cris/for-next
+Already up-to-date.
+Merging hexagon/linux-next (de44443a45e3 HEXAGON: Remove non existent reference to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD)
+$ git merge hexagon/linux-next
+Already up-to-date.
+Merging ia64/next (d52eefb47d4e ia64/xen: Remove Xen support for ia64)
+$ git merge ia64/next
+Removing arch/ia64/xen/xensetup.S
+Removing arch/ia64/xen/xenivt.S
+Removing arch/ia64/xen/xencomm.c
+Removing arch/ia64/xen/xen_pv_ops.c
+Removing arch/ia64/xen/xcom_hcall.c
+Removing arch/ia64/xen/time.h
+Removing arch/ia64/xen/time.c
+Removing arch/ia64/xen/suspend.c
+Removing arch/ia64/xen/machvec.c
+Removing arch/ia64/xen/irq_xen.h
+Removing arch/ia64/xen/irq_xen.c
+Removing arch/ia64/xen/hypervisor.c
+Removing arch/ia64/xen/hypercall.S
+Removing arch/ia64/xen/grant-table.c
+Removing arch/ia64/xen/gate-data.S
+Removing arch/ia64/xen/Makefile
+Removing arch/ia64/xen/Kconfig
+Removing arch/ia64/include/asm/xen/xencomm.h
+Removing arch/ia64/include/asm/xen/xcom_hcall.h
+Removing arch/ia64/include/asm/xen/privop.h
+Removing arch/ia64/include/asm/xen/patchlist.h
+Removing arch/ia64/include/asm/xen/page.h
+Removing arch/ia64/include/asm/xen/page-coherent.h
+Removing arch/ia64/include/asm/xen/minstate.h
+Removing arch/ia64/include/asm/xen/irq.h
+Removing arch/ia64/include/asm/xen/interface.h
+Removing arch/ia64/include/asm/xen/inst.h
+Removing arch/ia64/include/asm/xen/hypervisor.h
+Removing arch/ia64/include/asm/xen/hypercall.h
+Removing arch/ia64/include/asm/xen/events.h
+Removing arch/ia64/include/asm/sync_bitops.h
+Removing arch/ia64/include/asm/machvec_xen.h
+Removing arch/ia64/configs/xen_domu_defconfig
+Merge made by the 'recursive' strategy.
+ arch/ia64/Kconfig | 12 -
+ arch/ia64/Makefile | 2 -
+ arch/ia64/configs/xen_domu_defconfig | 199 -----
+ arch/ia64/include/asm/acpi.h | 2 -
+ arch/ia64/include/asm/machvec.h | 2 -
+ arch/ia64/include/asm/machvec_xen.h | 22 -
+ arch/ia64/include/asm/meminit.h | 1 -
+ arch/ia64/include/asm/paravirt.h | 1 -
+ arch/ia64/include/asm/pvclock-abi.h | 2 +-
+ arch/ia64/include/asm/sync_bitops.h | 51 --
+ arch/ia64/include/asm/xen/events.h | 41 --
+ arch/ia64/include/asm/xen/hypercall.h | 265 -------
+ arch/ia64/include/asm/xen/hypervisor.h | 61 --
+ arch/ia64/include/asm/xen/inst.h | 486 ------------
+ arch/ia64/include/asm/xen/interface.h | 363 ---------
+ arch/ia64/include/asm/xen/irq.h | 44 --
+ arch/ia64/include/asm/xen/minstate.h | 143 ----
+ arch/ia64/include/asm/xen/page-coherent.h | 38 -
+ arch/ia64/include/asm/xen/page.h | 65 --
+ arch/ia64/include/asm/xen/patchlist.h | 38 -
+ arch/ia64/include/asm/xen/privop.h | 135 ----
+ arch/ia64/include/asm/xen/xcom_hcall.h | 51 --
+ arch/ia64/include/asm/xen/xencomm.h | 42 --
+ arch/ia64/include/uapi/asm/break.h | 9 -
+ arch/ia64/kernel/acpi.c | 3 -
+ arch/ia64/kernel/asm-offsets.c | 32 -
+ arch/ia64/kernel/head.S | 3 -
+ arch/ia64/kernel/nr-irqs.c | 4 -
+ arch/ia64/kernel/paravirt_inst.h | 3 -
+ arch/ia64/kernel/paravirt_patchlist.h | 4 -
+ arch/ia64/kernel/vmlinux.lds.S | 6 -
+ arch/ia64/xen/Kconfig | 25 -
+ arch/ia64/xen/Makefile | 37 -
+ arch/ia64/xen/gate-data.S | 3 -
+ arch/ia64/xen/grant-table.c | 94 ---
+ arch/ia64/xen/hypercall.S | 88 ---
+ arch/ia64/xen/hypervisor.c | 97 ---
+ arch/ia64/xen/irq_xen.c | 443 -----------
+ arch/ia64/xen/irq_xen.h | 34 -
+ arch/ia64/xen/machvec.c | 4 -
+ arch/ia64/xen/suspend.c | 59 --
+ arch/ia64/xen/time.c | 257 -------
+ arch/ia64/xen/time.h | 24 -
+ arch/ia64/xen/xcom_hcall.c | 441 -----------
+ arch/ia64/xen/xen_pv_ops.c | 1141 -----------------------------
+ arch/ia64/xen/xencomm.c | 106 ---
+ arch/ia64/xen/xenivt.S | 52 --
+ arch/ia64/xen/xensetup.S | 80 --
+ include/xen/interface/callback.h | 2 +-
+ include/xen/interface/io/protocols.h | 3 -
+ 50 files changed, 2 insertions(+), 5118 deletions(-)
+ delete mode 100644 arch/ia64/configs/xen_domu_defconfig
+ delete mode 100644 arch/ia64/include/asm/machvec_xen.h
+ delete mode 100644 arch/ia64/include/asm/sync_bitops.h
+ delete mode 100644 arch/ia64/include/asm/xen/events.h
+ delete mode 100644 arch/ia64/include/asm/xen/hypercall.h
+ delete mode 100644 arch/ia64/include/asm/xen/hypervisor.h
+ delete mode 100644 arch/ia64/include/asm/xen/inst.h
+ delete mode 100644 arch/ia64/include/asm/xen/interface.h
+ delete mode 100644 arch/ia64/include/asm/xen/irq.h
+ delete mode 100644 arch/ia64/include/asm/xen/minstate.h
+ delete mode 100644 arch/ia64/include/asm/xen/page-coherent.h
+ delete mode 100644 arch/ia64/include/asm/xen/page.h
+ delete mode 100644 arch/ia64/include/asm/xen/patchlist.h
+ delete mode 100644 arch/ia64/include/asm/xen/privop.h
+ delete mode 100644 arch/ia64/include/asm/xen/xcom_hcall.h
+ delete mode 100644 arch/ia64/include/asm/xen/xencomm.h
+ delete mode 100644 arch/ia64/xen/Kconfig
+ delete mode 100644 arch/ia64/xen/Makefile
+ delete mode 100644 arch/ia64/xen/gate-data.S
+ delete mode 100644 arch/ia64/xen/grant-table.c
+ delete mode 100644 arch/ia64/xen/hypercall.S
+ delete mode 100644 arch/ia64/xen/hypervisor.c
+ delete mode 100644 arch/ia64/xen/irq_xen.c
+ delete mode 100644 arch/ia64/xen/irq_xen.h
+ delete mode 100644 arch/ia64/xen/machvec.c
+ delete mode 100644 arch/ia64/xen/suspend.c
+ delete mode 100644 arch/ia64/xen/time.c
+ delete mode 100644 arch/ia64/xen/time.h
+ delete mode 100644 arch/ia64/xen/xcom_hcall.c
+ delete mode 100644 arch/ia64/xen/xen_pv_ops.c
+ delete mode 100644 arch/ia64/xen/xencomm.c
+ delete mode 100644 arch/ia64/xen/xenivt.S
+ delete mode 100644 arch/ia64/xen/xensetup.S
+Merging m68k/for-next (27d632d27c4f m68k/atari: Hide RTC_PORT() macro from rtc-cmos)
+$ git merge m68k/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/zorro.txt | 5 +-
+ arch/m68k/Kconfig | 24 ++
+ arch/m68k/amiga/chipram.c | 2 +-
+ arch/m68k/amiga/config.c | 63 +++--
+ arch/m68k/amiga/platform.c | 9 +-
+ arch/m68k/apollo/config.c | 26 +-
+ arch/m68k/atari/config.c | 10 +-
+ arch/m68k/atari/debug.c | 5 +-
+ arch/m68k/bvme6000/config.c | 6 +-
+ arch/m68k/configs/amiga_defconfig | 6 +-
+ arch/m68k/configs/apollo_defconfig | 6 +-
+ arch/m68k/configs/atari_defconfig | 6 +-
+ arch/m68k/configs/bvme6000_defconfig | 6 +-
+ arch/m68k/configs/hp300_defconfig | 6 +-
+ arch/m68k/configs/mac_defconfig | 6 +-
+ arch/m68k/configs/multi_defconfig | 6 +-
+ arch/m68k/configs/mvme147_defconfig | 6 +-
+ arch/m68k/configs/mvme16x_defconfig | 6 +-
+ arch/m68k/configs/q40_defconfig | 6 +-
+ arch/m68k/configs/sun3_defconfig | 6 +-
+ arch/m68k/configs/sun3x_defconfig | 6 +-
+ arch/m68k/emu/natfeat.c | 3 +-
+ arch/m68k/hp300/config.c | 10 +-
+ arch/m68k/include/asm/amigahw.h | 28 +--
+ arch/m68k/include/asm/apollohw.h | 11 +-
+ arch/m68k/include/asm/atarihw.h | 2 +-
+ arch/m68k/include/asm/bootinfo.h | 360 +--------------------------
+ arch/m68k/include/asm/hp300hw.h | 20 +-
+ arch/m68k/include/asm/kexec.h | 29 +++
+ arch/m68k/include/asm/macintosh.h | 83 ++----
+ arch/m68k/include/asm/mc146818rtc.h | 10 +-
+ arch/m68k/include/asm/mvme16xhw.h | 17 --
+ arch/m68k/include/asm/setup.h | 5 +-
+ arch/m68k/include/asm/timex.h | 10 +
+ arch/m68k/include/uapi/asm/Kbuild | 8 +
+ arch/m68k/include/uapi/asm/bootinfo-amiga.h | 63 +++++
+ arch/m68k/include/uapi/asm/bootinfo-apollo.h | 28 +++
+ arch/m68k/include/uapi/asm/bootinfo-atari.h | 44 ++++
+ arch/m68k/include/uapi/asm/bootinfo-hp300.h | 50 ++++
+ arch/m68k/include/uapi/asm/bootinfo-mac.h | 119 +++++++++
+ arch/m68k/include/uapi/asm/bootinfo-q40.h | 16 ++
+ arch/m68k/include/uapi/asm/bootinfo-vme.h | 70 ++++++
+ arch/m68k/include/uapi/asm/bootinfo.h | 174 +++++++++++++
+ arch/m68k/include/uapi/asm/setup.h | 87 -------
+ arch/m68k/kernel/Makefile | 3 +
+ arch/m68k/kernel/asm-offsets.c | 3 +
+ arch/m68k/kernel/bootinfo_proc.c | 80 ++++++
+ arch/m68k/kernel/head.S | 12 +-
+ arch/m68k/kernel/machine_kexec.c | 58 +++++
+ arch/m68k/kernel/relocate_kernel.S | 159 ++++++++++++
+ arch/m68k/kernel/setup_mm.c | 62 +++--
+ arch/m68k/kernel/time.c | 4 +
+ arch/m68k/mac/config.c | 34 +--
+ arch/m68k/mac/iop.c | 5 +-
+ arch/m68k/mac/misc.c | 2 -
+ arch/m68k/mac/oss.c | 1 -
+ arch/m68k/mac/psc.c | 3 +-
+ arch/m68k/mac/via.c | 1 -
+ arch/m68k/mm/init.c | 2 +-
+ arch/m68k/mm/motorola.c | 2 +-
+ arch/m68k/mvme147/config.c | 7 +-
+ arch/m68k/mvme16x/config.c | 30 ++-
+ arch/m68k/q40/config.c | 4 +-
+ arch/m68k/sun3/dvma.c | 6 +-
+ arch/m68k/sun3/mmu_emu.c | 3 +-
+ arch/m68k/sun3/sun3dvma.c | 8 +-
+ arch/m68k/sun3x/prom.c | 1 -
+ drivers/block/z2ram.c | 7 +-
+ drivers/ide/buddha.c | 2 +-
+ drivers/macintosh/Kconfig | 2 +-
+ drivers/net/ethernet/8390/hydra.c | 2 +-
+ drivers/net/ethernet/8390/zorro8390.c | 4 +-
+ drivers/net/ethernet/amd/a2065.c | 13 +-
+ drivers/net/ethernet/amd/ariadne.c | 13 +-
+ drivers/net/ethernet/natsemi/macsonic.c | 1 -
+ drivers/parport/parport_mfc3.c | 2 +-
+ drivers/scsi/a2091.c | 2 +-
+ drivers/scsi/a3000.c | 2 +-
+ drivers/scsi/a4000t.c | 2 +-
+ drivers/scsi/gvp11.c | 2 +-
+ drivers/scsi/zorro7xx.c | 2 +-
+ drivers/video/amifb.c | 2 +-
+ drivers/video/cirrusfb.c | 4 +-
+ drivers/video/macfb.c | 1 -
+ drivers/video/valkyriefb.c | 1 -
+ drivers/zorro/Makefile | 3 +-
+ drivers/zorro/names.c | 11 -
+ drivers/zorro/proc.c | 10 +-
+ drivers/zorro/zorro-driver.c | 11 +-
+ drivers/zorro/zorro-sysfs.c | 22 +-
+ drivers/zorro/zorro.c | 27 +-
+ drivers/zorro/zorro.h | 5 +
+ include/linux/zorro.h | 121 ++-------
+ include/uapi/linux/Kbuild | 2 +
+ include/uapi/linux/kexec.h | 1 +
+ include/uapi/linux/zorro.h | 113 +++++++++
+ include/{ => uapi}/linux/zorro_ids.h | 0
+ 97 files changed, 1412 insertions(+), 937 deletions(-)
+ create mode 100644 arch/m68k/include/asm/kexec.h
+ create mode 100644 arch/m68k/include/uapi/asm/bootinfo-amiga.h
+ create mode 100644 arch/m68k/include/uapi/asm/bootinfo-apollo.h
+ create mode 100644 arch/m68k/include/uapi/asm/bootinfo-atari.h
+ create mode 100644 arch/m68k/include/uapi/asm/bootinfo-hp300.h
+ create mode 100644 arch/m68k/include/uapi/asm/bootinfo-mac.h
+ create mode 100644 arch/m68k/include/uapi/asm/bootinfo-q40.h
+ create mode 100644 arch/m68k/include/uapi/asm/bootinfo-vme.h
+ create mode 100644 arch/m68k/include/uapi/asm/bootinfo.h
+ create mode 100644 arch/m68k/kernel/bootinfo_proc.c
+ create mode 100644 arch/m68k/kernel/machine_kexec.c
+ create mode 100644 arch/m68k/kernel/relocate_kernel.S
+ create mode 100644 include/uapi/linux/zorro.h
+ rename include/{ => uapi}/linux/zorro_ids.h (100%)
+Merging m68knommu/for-next (a695b9c8911e m68k : Kill CONFIG_MTD_PARTITIONS)
+$ git merge m68knommu/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/configs/m5208evb_defconfig | 1 -
+ arch/m68k/configs/m5249evb_defconfig | 1 -
+ arch/m68k/configs/m5272c3_defconfig | 1 -
+ arch/m68k/configs/m5275evb_defconfig | 1 -
+ arch/m68k/configs/m5307c3_defconfig | 1 -
+ arch/m68k/configs/m5407c3_defconfig | 1 -
+ 6 files changed, 6 deletions(-)
+Merging metag/for-next (40979d327c99 metag: topology: export 'cpu_core_map')
+$ git merge metag/for-next
+Merge made by the 'recursive' strategy.
+ arch/metag/include/asm/smp.h | 2 --
+ arch/metag/kernel/dma.c | 5 -----
+ arch/metag/kernel/smp.c | 13 +++----------
+ arch/metag/kernel/topology.c | 1 +
+ 4 files changed, 4 insertions(+), 17 deletions(-)
+Merging microblaze/next (a1dd107fcafa microblaze: Remove duplicate declarations of _stext[] and _etext[])
+$ git merge microblaze/next
+Merge made by the 'recursive' strategy.
+ arch/microblaze/Makefile | 2 ++
+ arch/microblaze/include/asm/sections.h | 1 -
+ arch/microblaze/kernel/setup.c | 5 ++---
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+Merging mips/mips-for-linux-next (6ca0bf323c14 Merge branch '3.13-fixes' into mips-for-linux-next)
+$ git merge mips/mips-for-linux-next
+Merge made by the 'recursive' strategy.
+ arch/mips/lasat/picvue_proc.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging openrisc/for-upstream (60a9dd5a10a1 openrisc: Use get_signal() signal_setup_done())
+$ git merge openrisc/for-upstream
+Merge made by the 'recursive' strategy.
+ arch/openrisc/kernel/entry.S | 59 ++++++-----
+ arch/openrisc/kernel/signal.c | 233 +++++++++++++++++++++---------------------
+ 2 files changed, 149 insertions(+), 143 deletions(-)
+Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
+$ git merge parisc/for-next
+Already up-to-date.
+Merging parisc-hd/for-next (dc1ccc48159d Linux 3.13-rc2)
+$ git merge parisc-hd/for-next
+Already up-to-date.
+Merging powerpc/next (75eb3d9b60c2 powerpc/powernv: Get FSP memory errors and plumb into memory poison infrastructure.)
+$ git merge powerpc/next
+Auto-merging mm/mempolicy.c
+Auto-merging arch/powerpc/platforms/powernv/pci-ioda.c
+Auto-merging arch/powerpc/kernel/smp.c
+Auto-merging arch/powerpc/kernel/misc_64.S
+Auto-merging arch/powerpc/include/asm/opal.h
+Merge made by the 'recursive' strategy.
+ arch/powerpc/Kconfig | 6 +
+ arch/powerpc/boot/.gitignore | 1 +
+ arch/powerpc/boot/dts/kilauea.dts | 2 +-
+ arch/powerpc/boot/dts/virtex440-ml507.dts | 2 +
+ arch/powerpc/include/asm/bitops.h | 5 +
+ arch/powerpc/include/asm/cache.h | 14 +-
+ arch/powerpc/include/asm/code-patching.h | 7 +
+ arch/powerpc/include/asm/cputable.h | 12 +
+ arch/powerpc/include/asm/exception-64s.h | 21 +-
+ arch/powerpc/include/asm/hardirq.h | 3 +-
+ arch/powerpc/include/asm/io.h | 16 +
+ arch/powerpc/include/asm/iommu.h | 26 ++
+ arch/powerpc/include/asm/lppaca.h | 2 -
+ arch/powerpc/include/asm/mce.h | 198 ++++++++++++
+ arch/powerpc/include/asm/opal.h | 98 +++++-
+ arch/powerpc/include/asm/paca.h | 9 +
+ arch/powerpc/include/asm/pgtable.h | 66 +++-
+ arch/powerpc/include/asm/pte-hash64.h | 8 +-
+ arch/powerpc/kernel/Makefile | 1 +
+ arch/powerpc/kernel/asm-offsets.c | 4 +
+ arch/powerpc/kernel/cpu_setup_power.S | 38 ++-
+ arch/powerpc/kernel/cputable.c | 16 +
+ arch/powerpc/kernel/eeh.c | 2 +-
+ arch/powerpc/kernel/eeh_driver.c | 2 +-
+ arch/powerpc/kernel/entry_64.S | 5 +
+ arch/powerpc/kernel/exceptions-64s.S | 196 ++++++++++++
+ arch/powerpc/kernel/idle_power7.S | 1 +
+ arch/powerpc/kernel/iommu.c | 48 +--
+ arch/powerpc/kernel/irq.c | 12 +-
+ arch/powerpc/kernel/mce.c | 345 +++++++++++++++++++++
+ arch/powerpc/kernel/mce_power.c | 284 +++++++++++++++++
+ arch/powerpc/kernel/misc_32.S | 4 +-
+ arch/powerpc/kernel/misc_64.S | 6 +
+ arch/powerpc/kernel/paca.c | 32 +-
+ arch/powerpc/kernel/setup_64.c | 16 +-
+ arch/powerpc/kernel/smp.c | 9 +-
+ arch/powerpc/kernel/sysfs.c | 72 +++--
+ arch/powerpc/kernel/time.c | 3 +-
+ arch/powerpc/kernel/traps.c | 15 +
+ arch/powerpc/kvm/book3s_hv_ras.c | 50 ++-
+ arch/powerpc/lib/code-patching.c | 15 +
+ arch/powerpc/mm/hash_low_64.S | 15 +-
+ arch/powerpc/mm/hash_utils_64.c | 7 +-
+ arch/powerpc/mm/hugepage-hash64.c | 6 +-
+ arch/powerpc/mm/hugetlbpage-hash64.c | 4 +
+ arch/powerpc/mm/pgtable.c | 2 +-
+ arch/powerpc/mm/pgtable_64.c | 2 +-
+ arch/powerpc/mm/tlb_nohash.c | 19 --
+ arch/powerpc/platforms/Kconfig.cputype | 1 +
+ arch/powerpc/platforms/cell/beat_htab.c | 4 +-
+ arch/powerpc/platforms/powernv/Kconfig | 5 -
+ arch/powerpc/platforms/powernv/Makefile | 1 +
+ arch/powerpc/platforms/powernv/eeh-ioda.c | 157 +---------
+ arch/powerpc/platforms/powernv/opal-flash.c | 31 +-
+ .../powerpc/platforms/powernv/opal-memory-errors.c | 146 +++++++++
+ arch/powerpc/platforms/powernv/opal-rtc.c | 6 +-
+ arch/powerpc/platforms/powernv/opal-wrappers.S | 2 +
+ arch/powerpc/platforms/powernv/opal.c | 251 ++++++++-------
+ arch/powerpc/platforms/powernv/pci-ioda.c | 8 +-
+ arch/powerpc/platforms/powernv/pci-p5ioc2.c | 2 +-
+ arch/powerpc/platforms/powernv/pci.c | 229 ++++++++++----
+ arch/powerpc/platforms/powernv/pci.h | 3 +
+ arch/powerpc/platforms/ps3/spu.c | 2 +-
+ arch/powerpc/platforms/pseries/Kconfig | 2 +-
+ arch/powerpc/platforms/pseries/iommu.c | 8 +-
+ arch/powerpc/platforms/pseries/lpar.c | 5 +-
+ arch/powerpc/sysdev/Kconfig | 2 +-
+ arch/powerpc/sysdev/fsl_pci.c | 2 +-
+ arch/powerpc/xmon/xmon.c | 4 +
+ drivers/macintosh/windfarm_lm75_sensor.c | 2 +-
+ drivers/macintosh/windfarm_max6690_sensor.c | 2 +-
+ include/linux/mm.h | 2 +-
+ mm/mempolicy.c | 5 +-
+ 73 files changed, 2050 insertions(+), 559 deletions(-)
+ create mode 100644 arch/powerpc/include/asm/mce.h
+ create mode 100644 arch/powerpc/kernel/mce.c
+ create mode 100644 arch/powerpc/kernel/mce_power.c
+ create mode 100644 arch/powerpc/platforms/powernv/opal-memory-errors.c
+$ git am -3 ../patches/powerpc__Fix__attempt_to_move_.org_backwards__error.patch
+Applying: powerpc: Fix "attempt to move .org backwards" error
+$ git reset HEAD^
+Unstaged changes after reset:
+M arch/powerpc/kernel/exceptions-64s.S
+$ git add -A .
+$ git commit -v -a --amend
+[master b0481d22d337] Merge remote-tracking branch 'powerpc/next'
+Merging mpc5xxx/next (0cb5486a2035 powerpc/512x: dts: add MPC5125 clock specs)
+$ git merge mpc5xxx/next
+Auto-merging drivers/spi/spi-mpc512x-psc.c
+Removing arch/powerpc/platforms/512x/clock.c
+Removing arch/powerpc/kernel/clock.c
+Removing arch/powerpc/include/asm/clk_interface.h
+Auto-merging arch/powerpc/boot/dts/mpc5121.dtsi
+Auto-merging arch/powerpc/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/powerpc/Kconfig | 5 -
+ arch/powerpc/boot/dts/ac14xx.dts | 7 +
+ arch/powerpc/boot/dts/mpc5121.dtsi | 113 ++-
+ arch/powerpc/boot/dts/mpc5125twr.dts | 54 +-
+ arch/powerpc/include/asm/clk_interface.h | 20 -
+ arch/powerpc/include/asm/mpc5121.h | 7 +-
+ arch/powerpc/kernel/Makefile | 1 -
+ arch/powerpc/kernel/clock.c | 82 --
+ arch/powerpc/platforms/512x/Kconfig | 2 +-
+ arch/powerpc/platforms/512x/Makefile | 3 +-
+ arch/powerpc/platforms/512x/clock-commonclk.c | 1221 +++++++++++++++++++++++++
+ arch/powerpc/platforms/512x/clock.c | 754 ---------------
+ arch/powerpc/platforms/512x/mpc512x_shared.c | 169 ++--
+ arch/powerpc/platforms/52xx/Kconfig | 2 +-
+ drivers/media/platform/fsl-viu.c | 2 +-
+ drivers/mtd/nand/mpc5121_nfc.c | 2 +-
+ drivers/net/can/mscan/mpc5xxx_can.c | 270 +++---
+ drivers/spi/spi-mpc512x-psc.c | 26 +-
+ drivers/tty/serial/mpc52xx_uart.c | 90 +-
+ drivers/usb/host/fsl-mph-dr-of.c | 13 +-
+ include/dt-bindings/clock/mpc512x-clock.h | 76 ++
+ include/linux/clk-provider.h | 16 +
+ 22 files changed, 1840 insertions(+), 1095 deletions(-)
+ delete mode 100644 arch/powerpc/include/asm/clk_interface.h
+ delete mode 100644 arch/powerpc/kernel/clock.c
+ create mode 100644 arch/powerpc/platforms/512x/clock-commonclk.c
+ delete mode 100644 arch/powerpc/platforms/512x/clock.c
+ create mode 100644 include/dt-bindings/clock/mpc512x-clock.h
+Merging galak/next (9e2ecdbba3b0 powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4)
+$ git merge galak/next
+Already up-to-date.
+Merging s390/features (91f3e3eaba44 s390/zcrypt: add support for EP11 coprocessor cards)
+$ git merge s390/features
+Merge made by the 'recursive' strategy.
+ Documentation/kmsg/s390/zcrypt | 20 +
+ arch/s390/include/asm/cpu_mf.h | 181 ++++
+ arch/s390/include/asm/pci.h | 1 +
+ arch/s390/include/asm/perf_event.h | 80 +-
+ arch/s390/include/asm/sclp.h | 4 +-
+ arch/s390/include/uapi/asm/zcrypt.h | 65 ++
+ arch/s390/kernel/Makefile | 3 +-
+ arch/s390/kernel/compat_signal.c | 5 +-
+ arch/s390/kernel/entry64.S | 6 +-
+ arch/s390/kernel/perf_cpum_cf.c | 1 +
+ arch/s390/kernel/perf_cpum_cf_events.c | 322 +++++++
+ arch/s390/kernel/perf_cpum_sf.c | 1641 ++++++++++++++++++++++++++++++++
+ arch/s390/kernel/perf_event.c | 174 +++-
+ arch/s390/kernel/process.c | 14 +-
+ arch/s390/kernel/ptrace.c | 27 +-
+ arch/s390/kernel/s390_ksyms.c | 2 +-
+ arch/s390/kernel/smp.c | 19 +-
+ arch/s390/oprofile/hwsampler.c | 78 +-
+ arch/s390/oprofile/hwsampler.h | 52 +-
+ arch/s390/oprofile/init.c | 23 +-
+ arch/s390/pci/pci.c | 16 +-
+ arch/s390/pci/pci_dma.c | 13 +-
+ arch/s390/pci/pci_event.c | 26 +-
+ drivers/s390/char/sclp.h | 1 -
+ drivers/s390/char/sclp_cmd.c | 2 -
+ drivers/s390/char/sclp_early.c | 125 +--
+ drivers/s390/char/tty3270.c | 7 +-
+ drivers/s390/cio/blacklist.c | 6 +-
+ drivers/s390/cio/ccwgroup.c | 12 +-
+ drivers/s390/cio/chsc.c | 40 +-
+ drivers/s390/cio/css.c | 26 +-
+ drivers/s390/cio/css.h | 1 +
+ drivers/s390/cio/device.c | 29 +-
+ drivers/s390/crypto/ap_bus.c | 31 +-
+ drivers/s390/crypto/ap_bus.h | 4 +-
+ drivers/s390/crypto/zcrypt_api.c | 109 ++-
+ drivers/s390/crypto/zcrypt_api.h | 2 +
+ drivers/s390/crypto/zcrypt_cex4.c | 20 +-
+ drivers/s390/crypto/zcrypt_error.h | 18 +-
+ drivers/s390/crypto/zcrypt_msgtype50.c | 12 +
+ drivers/s390/crypto/zcrypt_msgtype6.c | 260 +++++
+ drivers/s390/crypto/zcrypt_msgtype6.h | 2 +
+ drivers/s390/crypto/zcrypt_pcica.c | 11 +
+ drivers/s390/crypto/zcrypt_pcicc.c | 12 +
+ 44 files changed, 3163 insertions(+), 340 deletions(-)
+ create mode 100644 Documentation/kmsg/s390/zcrypt
+ create mode 100644 arch/s390/kernel/perf_cpum_cf_events.c
+ create mode 100644 arch/s390/kernel/perf_cpum_sf.c
+Merging sh/sh-latest (37284bd93103 Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest)
+$ git merge sh/sh-latest
+Resolved 'arch/sh/kernel/cpu/sh2a/Makefile' using previous resolution.
+Resolved 'drivers/tty/serial/sh-sci.c' using previous resolution.
+Resolved 'include/linux/serial_sci.h' using previous resolution.
+Auto-merging include/linux/serial_sci.h
+CONFLICT (content): Merge conflict in include/linux/serial_sci.h
+Auto-merging drivers/tty/serial/sh-sci.c
+CONFLICT (content): Merge conflict in drivers/tty/serial/sh-sci.c
+Auto-merging arch/sh/kernel/cpu/sh2a/Makefile
+CONFLICT (content): Merge conflict in arch/sh/kernel/cpu/sh2a/Makefile
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 6cd9b07c1b70] Merge remote-tracking branch 'sh/sh-latest'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/tty/serial/renesas,sci-serial.txt | 53 +++++++
+ arch/sh/include/asm/hw_breakpoint.h | 12 +-
+ arch/sh/include/cpu-common/cpu/ubc.h | 17 +++
+ arch/sh/include/cpu-sh2a/cpu/ubc.h | 14 ++
+ arch/sh/kernel/cpu/sh2a/Makefile | 1 +
+ arch/sh/kernel/cpu/sh2a/ubc.c | 154 +++++++++++++++++++++
+ arch/sh/kernel/hw_breakpoint.c | 8 ++
+ drivers/tty/serial/sh-sci.c | 127 ++++++++++++++++-
+ include/linux/serial_sci.h | 4 +
+ 9 files changed, 375 insertions(+), 15 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/tty/serial/renesas,sci-serial.txt
+ create mode 100644 arch/sh/include/cpu-common/cpu/ubc.h
+ create mode 100644 arch/sh/include/cpu-sh2a/cpu/ubc.h
+ create mode 100644 arch/sh/kernel/cpu/sh2a/ubc.c
+Merging sparc-next/master (049ffa8ab33a Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux)
+$ git merge sparc-next/master
+Already up-to-date.
+Merging tile/master (5e01dc7b26d9 Linux 3.12)
+$ git merge tile/master
+Already up-to-date.
+Merging unicore32/unicore32 (c284464658ac arch/unicore32: remove CONFIG_EXPERIMENTAL)
+$ git merge unicore32/unicore32
+Already up-to-date.
+Merging xtensa/for_next (d30841d27218 xtensa: ISS: avoid simple_strtoul usage)
+$ git merge xtensa/for_next
+Auto-merging drivers/irqchip/Makefile
+Auto-merging drivers/irqchip/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/xtensa/Kconfig | 47 +-
+ arch/xtensa/boot/dts/xtfpga.dtsi | 2 +-
+ arch/xtensa/include/asm/Kbuild | 1 -
+ arch/xtensa/include/asm/barrier.h | 4 +-
+ arch/xtensa/include/asm/bitops.h | 8 +-
+ arch/xtensa/include/asm/cacheflush.h | 40 +-
+ arch/xtensa/include/asm/delay.h | 9 +-
+ arch/xtensa/include/asm/ftrace.h | 2 +-
+ arch/xtensa/include/asm/futex.h | 147 +++++
+ arch/xtensa/include/asm/irq.h | 9 +
+ arch/xtensa/include/asm/mmu.h | 10 +-
+ arch/xtensa/include/asm/mmu_context.h | 106 ++--
+ arch/xtensa/include/asm/mxregs.h | 46 ++
+ arch/xtensa/include/asm/processor.h | 20 +
+ arch/xtensa/include/asm/ptrace.h | 8 +
+ arch/xtensa/include/asm/smp.h | 38 +-
+ arch/xtensa/include/asm/spinlock.h | 31 +-
+ arch/xtensa/include/asm/spinlock_types.h | 20 +
+ arch/xtensa/include/asm/timex.h | 14 +-
+ arch/xtensa/include/asm/tlbflush.h | 42 +-
+ arch/xtensa/include/asm/traps.h | 1 +
+ arch/xtensa/include/asm/vectors.h | 12 +-
+ arch/xtensa/kernel/Makefile | 1 +
+ arch/xtensa/kernel/head.S | 181 +++++--
+ arch/xtensa/kernel/irq.c | 207 ++++----
+ arch/xtensa/kernel/mxhead.S | 85 +++
+ arch/xtensa/kernel/setup.c | 92 ++--
+ arch/xtensa/kernel/smp.c | 591 +++++++++++++++++++++
+ arch/xtensa/kernel/time.c | 60 ++-
+ arch/xtensa/kernel/traps.c | 56 +-
+ arch/xtensa/kernel/vmlinux.lds.S | 26 +
+ arch/xtensa/mm/cache.c | 7 +-
+ arch/xtensa/mm/fault.c | 2 +-
+ arch/xtensa/mm/misc.S | 4 +-
+ arch/xtensa/mm/mmu.c | 4 +-
+ arch/xtensa/mm/tlb.c | 37 +-
+ arch/xtensa/platforms/iss/network.c | 310 ++++-------
+ .../platforms/xtfpga/include/platform/hardware.h | 6 +-
+ arch/xtensa/variants/s6000/include/variant/irq.h | 1 -
+ drivers/irqchip/Kconfig | 4 +
+ drivers/irqchip/Makefile | 2 +
+ drivers/irqchip/irq-xtensa-mx.c | 164 ++++++
+ drivers/irqchip/irq-xtensa-pic.c | 108 ++++
+ include/linux/irqchip/xtensa-mx.h | 17 +
+ include/linux/irqchip/xtensa-pic.h | 18 +
+ 45 files changed, 1999 insertions(+), 601 deletions(-)
+ create mode 100644 arch/xtensa/include/asm/futex.h
+ create mode 100644 arch/xtensa/include/asm/mxregs.h
+ create mode 100644 arch/xtensa/include/asm/spinlock_types.h
+ create mode 100644 arch/xtensa/kernel/mxhead.S
+ create mode 100644 arch/xtensa/kernel/smp.c
+ create mode 100644 drivers/irqchip/irq-xtensa-mx.c
+ create mode 100644 drivers/irqchip/irq-xtensa-pic.c
+ create mode 100644 include/linux/irqchip/xtensa-mx.h
+ create mode 100644 include/linux/irqchip/xtensa-pic.h
+Merging btrfs/next (91aef86f3b8a Btrfs: rename btrfs_start_all_delalloc_inodes)
+$ git merge btrfs/next
+Already up-to-date.
+Merging ceph/master (8eb4efb091c8 ceph: implement readv/preadv for sync operation)
+$ git merge ceph/master
+Merge made by the 'recursive' strategy.
+ fs/ceph/file.c | 435 ++++++++++++++++++++++++++++++++++++++++----------------
+ fs/ceph/inode.c | 10 ++
+ fs/ceph/super.c | 1 +
+ fs/ceph/super.h | 1 +
+ 4 files changed, 321 insertions(+), 126 deletions(-)
+Merging cifs/for-next (cfae639783f0 cifs: set FILE_CREATED)
+$ git merge cifs/for-next
+Merge made by the 'recursive' strategy.
+ fs/cifs/cifsproto.h | 7 ++++---
+ fs/cifs/cifssmb.c | 6 +++---
+ fs/cifs/dir.c | 11 ++++++-----
+ fs/cifs/inode.c | 6 ++++--
+ fs/cifs/link.c | 26 +++++++++++---------------
+ 5 files changed, 28 insertions(+), 28 deletions(-)
+Merging configfs/linux-next (b930c26416c4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
+$ git merge configfs/linux-next
+Already up-to-date.
+Merging ecryptfs/next (9e78d14a9f64 Use %pd in eCryptFS)
+$ git merge ecryptfs/next
+Merge made by the 'recursive' strategy.
+ fs/ecryptfs/file.c | 4 ++--
+ fs/ecryptfs/inode.c | 12 ++++++------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+Merging ext3/for_next (df4e7ac0bb70 ext2: Fix oops in ext2_get_block() called from ext2_quota_write())
+$ git merge ext3/for_next
+Merge made by the 'recursive' strategy.
+ fs/ext2/super.c | 1 +
+ 1 file changed, 1 insertion(+)
+Merging ext4/dev (c25625a1b6a5 ext4: enable punch hole for bigalloc)
+$ git merge ext4/dev
+Merge made by the 'recursive' strategy.
+ fs/ext4/ext4_jbd2.c | 9 +++++++++
+ fs/ext4/extents.c | 19 ++++++++++++++++++-
+ fs/ext4/inode.c | 5 -----
+ fs/ext4/mballoc.c | 11 ++++++++---
+ fs/ext4/super.c | 21 +++++++++++++++------
+ fs/jbd2/journal.c | 18 ++++++++----------
+ fs/jbd2/recovery.c | 2 +-
+ fs/jbd2/transaction.c | 16 +++++++++-------
+ 8 files changed, 68 insertions(+), 33 deletions(-)
+Merging f2fs/dev (737b77f0d0a3 f2fs: add description about small_discards in document)
+$ git merge f2fs/dev
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/f2fs.txt | 17 ++
+ fs/f2fs/checkpoint.c | 123 ++++----
+ fs/f2fs/data.c | 523 +++++++++++++++++++++++---------
+ fs/f2fs/debug.c | 32 +-
+ fs/f2fs/dir.c | 4 +-
+ fs/f2fs/f2fs.h | 133 ++++++---
+ fs/f2fs/file.c | 57 +---
+ fs/f2fs/gc.c | 15 +-
+ fs/f2fs/node.c | 170 +++++++----
+ fs/f2fs/recovery.c | 17 +-
+ fs/f2fs/segment.c | 590 ++++++++++++++++++++++++-------------
+ fs/f2fs/segment.h | 68 +++--
+ fs/f2fs/super.c | 58 +++-
+ fs/f2fs/xattr.c | 2 +-
+ include/linux/f2fs_fs.h | 8 +
+ include/trace/events/f2fs.h | 107 +++++--
+ 16 files changed, 1282 insertions(+), 642 deletions(-)
+Merging fscache/fscache (7c604e5d6e56 FS-Cache: Fix handling of an attempt to store a page that is now beyond EOF)
+$ git merge fscache/fscache
+Merge made by the 'recursive' strategy.
+ fs/fscache/page.c | 37 ++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 36 insertions(+), 1 deletion(-)
+Merging fuse/for-next (ce128de6260f fuse: writepages: protect secondary requests from fuse file release)
+$ git merge fuse/for-next
+Already up-to-date.
+Merging gfs2/master (8953e11bb191 GFS2: Fix slab memory leak in gfs2_bufdata)
+$ git merge gfs2/master
+Merge made by the 'recursive' strategy.
+ fs/gfs2/aops.c | 18 +++------
+ fs/gfs2/glops.c | 20 +++++-----
+ fs/gfs2/incore.h | 13 ++++++-
+ fs/gfs2/log.c | 4 +-
+ fs/gfs2/lops.c | 5 +++
+ fs/gfs2/meta_io.c | 8 ++++
+ fs/gfs2/ops_fstype.c | 24 +++++++++++-
+ fs/gfs2/quota.c | 37 ++++++------------
+ fs/gfs2/rgrp.c | 106 +++++++++++++++++++++++++++++++++++++++------------
+ 9 files changed, 160 insertions(+), 75 deletions(-)
+Merging jfs/jfs-next (8660998608cf jfs: fix error path in ialloc)
+$ git merge jfs/jfs-next
+Already up-to-date.
+Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found)
+$ git merge logfs/master
+Auto-merging fs/logfs/super.c
+Merge made by the 'recursive' strategy.
+ fs/logfs/dev_mtd.c | 2 +-
+ fs/logfs/super.c | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+Merging nfs/linux-next (23e66ba97127 rpc_pipe: fix cleanup of dummy gssd directory when notification fails)
+$ git merge nfs/linux-next
+Merge made by the 'recursive' strategy.
+ fs/nfs/nfs4client.c | 7 +-
+ fs/nfs/nfs4xdr.c | 47 +++++++----
+ include/linux/sunrpc/rpc_pipe_fs.h | 5 +-
+ net/sunrpc/auth_gss/auth_gss.c | 17 ++--
+ net/sunrpc/netns.h | 3 +-
+ net/sunrpc/rpc_pipe.c | 169 +++++++++++++++++++++++++++++++++++--
+ net/sunrpc/sunrpc_syms.c | 8 +-
+ 7 files changed, 218 insertions(+), 38 deletions(-)
+Merging nfsd/nfsd-next (a0ef5e19684f nfsd: don't try to reuse an expired DRC entry off the list)
+$ git merge nfsd/nfsd-next
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/nfs/nfs41-server.txt | 42 +++++++++-----------------
+ fs/nfsd/nfs3xdr.c | 2 +-
+ fs/nfsd/nfs4xdr.c | 19 ++++++++++++
+ fs/nfsd/nfscache.c | 36 +++-------------------
+ fs/nfsd/nfsxdr.c | 2 +-
+ include/linux/sunrpc/svc.h | 2 +-
+ net/sunrpc/xprtsock.c | 7 ++---
+ 7 files changed, 43 insertions(+), 67 deletions(-)
+Merging omfs/for-next (976d167615b6 Linux 3.1-rc9)
+$ git merge omfs/for-next
+Already up-to-date.
+Merging squashfs/master (6d565409503f Squashfs: fix failure to unlock pages on decompress error)
+$ git merge squashfs/master
+Already up-to-date.
+Merging v9fs/for-next (f94741fd2832 net/9p: remove virtio default hack and set appropriate bits instead)
+$ git merge v9fs/for-next
+Merge made by the 'recursive' strategy.
+ fs/9p/cache.c | 3 +--
+ fs/9p/vfs_file.c | 2 --
+ fs/9p/vfs_inode.c | 4 +---
+ fs/9p/vfs_inode_dotl.c | 8 --------
+ fs/9p/xattr.c | 10 ++++++----
+ net/9p/client.c | 3 ---
+ net/9p/trans_fd.c | 2 +-
+ net/9p/trans_virtio.c | 2 +-
+ 8 files changed, 10 insertions(+), 24 deletions(-)
+Merging ubifs/linux-next (58a4e23703b2 UBIFS: correct data corruption range)
+$ git merge ubifs/linux-next
+Already up-to-date.
+Merging xfs/for-next (324bb26144e9 Merge branch 'xfs-for-linus-v3.13-rc5' into for-next)
+$ git merge xfs/for-next
+Removing fs/xfs/xfs_quota_priv.h
+Auto-merging fs/ext4/inode.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 2 +-
+ fs/attr.c | 5 -
+ fs/btrfs/inode.c | 8 +-
+ fs/ext4/inode.c | 4 +
+ fs/xfs/xfs_bmap.c | 32 +++-
+ fs/xfs/xfs_bmap_util.c | 14 +-
+ fs/xfs/xfs_buf.c | 63 +++-----
+ fs/xfs/xfs_buf.h | 11 +-
+ fs/xfs/xfs_buf_item.c | 124 +++++++-------
+ fs/xfs/xfs_dir2_node.c | 26 +--
+ fs/xfs/xfs_dir2_sf.c | 58 ++++---
+ fs/xfs/xfs_dquot_item.c | 67 +++-----
+ fs/xfs/xfs_dquot_item.h | 3 +-
+ fs/xfs/xfs_extfree_item.c | 21 +--
+ fs/xfs/xfs_ialloc.c | 53 +++---
+ fs/xfs/xfs_ialloc.h | 21 +--
+ fs/xfs/xfs_icreate_item.c | 10 +-
+ fs/xfs/xfs_inode.c | 23 +--
+ fs/xfs/xfs_inode_fork.c | 15 +-
+ fs/xfs/xfs_inode_item.c | 400 +++++++++++++++++++---------------------------
+ fs/xfs/xfs_inode_item.h | 5 -
+ fs/xfs/xfs_iops.c | 79 +++++----
+ fs/xfs/xfs_itable.c | 22 ++-
+ fs/xfs/xfs_log.h | 46 ++++++
+ fs/xfs/xfs_log_cil.c | 74 +++------
+ fs/xfs/xfs_log_recover.c | 46 ++++--
+ fs/xfs/xfs_qm.c | 80 ++++++----
+ fs/xfs/xfs_qm.h | 18 ++-
+ fs/xfs/xfs_qm_syscalls.c | 18 ++-
+ fs/xfs/xfs_quota_priv.h | 42 -----
+ fs/xfs/xfs_trans.h | 2 +-
+ fs/xfs/xfs_trans_buf.c | 13 +-
+ fs/xfs/xfs_trans_dquot.c | 4 +-
+ fs/xfs/xfs_trans_resv.c | 10 +-
+ fs/xfs/xfs_trans_space.h | 2 +-
+ fs/xfs/xfs_vnode.h | 9 --
+ 36 files changed, 698 insertions(+), 732 deletions(-)
+ delete mode 100644 fs/xfs/xfs_quota_priv.h
+Merging vfs/for-next (27ac0ffeac80 locks: break delegations on any attribute modification)
+$ git merge vfs/for-next
+Already up-to-date.
+Merging pci/next (608235a30706 Merge branch 'pci/vc' into next)
+$ git merge pci/next
+Auto-merging include/linux/pci.h
+Auto-merging drivers/pci/pci.c
+Auto-merging drivers/pci/host/pci-tegra.c
+Merge made by the 'recursive' strategy.
+ arch/alpha/kernel/pci_iommu.c | 2 +-
+ arch/arm/common/it8152.c | 4 +-
+ arch/arm/mach-ixp4xx/common-pci.c | 6 +-
+ arch/ia64/hp/common/sba_iommu.c | 2 +-
+ arch/ia64/sn/pci/pci_dma.c | 24 +-
+ arch/parisc/kernel/drivers.c | 22 +-
+ arch/sparc/kernel/iommu.c | 2 +-
+ arch/sparc/kernel/ioport.c | 5 +-
+ arch/x86/include/asm/pci.h | 2 +-
+ arch/x86/include/asm/x86_init.h | 2 +-
+ arch/x86/kernel/acpi/boot.c | 4 +-
+ arch/x86/kernel/x86_init.c | 4 +-
+ arch/x86/pci/xen.c | 2 +-
+ drivers/eisa/eisa-bus.c | 4 +-
+ drivers/pci/Makefile | 2 +-
+ drivers/pci/bus.c | 1 +
+ drivers/pci/host/pci-imx6.c | 39 +--
+ drivers/pci/host/pci-mvebu.c | 86 ++++---
+ drivers/pci/host/pci-rcar-gen2.c | 12 +-
+ drivers/pci/host/pci-tegra.c | 2 +-
+ drivers/pci/host/pcie-designware.c | 59 +++--
+ drivers/pci/hotplug/pciehp.h | 14 +-
+ drivers/pci/hotplug/pciehp_core.c | 15 +-
+ drivers/pci/hotplug/pciehp_ctrl.c | 90 +++----
+ drivers/pci/hotplug/pciehp_hpc.c | 380 ++++++++++-------------------
+ drivers/pci/hotplug/pciehp_pci.c | 6 +-
+ drivers/pci/iov.c | 1 +
+ drivers/pci/msi.c | 19 +-
+ drivers/pci/pci-acpi.c | 2 +-
+ drivers/pci/pci.c | 102 +++++---
+ drivers/pci/pcie/aer/aerdrv_acpi.c | 48 ++--
+ drivers/pci/pcie/aer/aerdrv_errprint.c | 95 ++++----
+ drivers/pci/pcie/portdrv_core.c | 2 +-
+ drivers/pci/probe.c | 23 +-
+ drivers/pci/remove.c | 23 +-
+ drivers/pci/setup-bus.c | 16 +-
+ drivers/pci/vc.c | 434 +++++++++++++++++++++++++++++++++
+ drivers/vfio/pci/vfio_pci_config.c | 12 +-
+ include/linux/msi.h | 4 +-
+ include/linux/pci.h | 15 +-
+ include/uapi/linux/pci_regs.h | 37 ++-
+ 41 files changed, 1014 insertions(+), 610 deletions(-)
+ create mode 100644 drivers/pci/vc.c
+Merging hid/for-next (460d9a348628 Merge branch 'for-3.14/upstream' into for-next)
+$ git merge hid/for-next
+Auto-merging drivers/hid/i2c-hid/i2c-hid.c
+Auto-merging drivers/hid/hid-multitouch.c
+Auto-merging drivers/hid/hid-ids.h
+Auto-merging drivers/hid/hid-core.c
+Auto-merging drivers/hid/Kconfig
+Merge made by the 'recursive' strategy.
+ drivers/hid/Kconfig | 1 +
+ drivers/hid/hid-core.c | 2 -
+ drivers/hid/hid-debug.c | 5 +-
+ drivers/hid/hid-ids.h | 9 +-
+ drivers/hid/hid-lg.c | 2 +
+ drivers/hid/hid-multitouch.c | 7 +-
+ drivers/hid/hid-sony.c | 194 ++++++++++++++++++++--------------------
+ drivers/hid/i2c-hid/i2c-hid.c | 2 +
+ drivers/hid/usbhid/hid-quirks.c | 9 +-
+ drivers/hid/usbhid/usbkbd.c | 2 +-
+ 10 files changed, 124 insertions(+), 109 deletions(-)
+Merging i2c/i2c/for-next (e5bf216a945e i2c: imx: Check the return value from clk_prepare_enable())
+$ git merge i2c/i2c/for-next
+Already up-to-date.
+Merging jdelvare-hwmon/master (68d5516b35c7 hwmon: (it87) Print proper names for the IT8771E and IT8772E)
+$ git merge jdelvare-hwmon/master
+Merge made by the 'recursive' strategy.
+ Documentation/hwmon/it87 | 27 ++++++++----
+ drivers/hwmon/Kconfig | 4 +-
+ drivers/hwmon/it87.c | 104 +++++++++++++++++++++++++++++++++++++++--------
+ 3 files changed, 107 insertions(+), 28 deletions(-)
+Merging hwmon-staging/hwmon-next (e0425401acaa hwmon: (coretemp) Refine TjMax detection)
+$ git merge hwmon-staging/hwmon-next
+Auto-merging drivers/hwmon/vt8231.c
+Auto-merging drivers/hwmon/sis5595.c
+Merge made by the 'recursive' strategy.
+ drivers/hwmon/coretemp.c | 41 +++++++++++++++++++++++++++++++++--------
+ drivers/hwmon/fam15h_power.c | 2 +-
+ drivers/hwmon/k10temp.c | 2 +-
+ drivers/hwmon/k8temp.c | 2 +-
+ drivers/hwmon/sis5595.c | 2 +-
+ drivers/hwmon/via686a.c | 2 +-
+ drivers/hwmon/vt8231.c | 2 +-
+ 7 files changed, 39 insertions(+), 14 deletions(-)
+Merging v4l-dvb/master (c4f181f1efc5 Merge branch 'v4l_for_linus' into temp)
+$ git merge v4l-dvb/master
+Merge made by the 'recursive' strategy.
+ .../DocBook/media/v4l/media-ioc-enum-links.xml | 9 +
+ Documentation/video4linux/omap4_camera.txt | 60 +
+ drivers/media/dvb-frontends/cx24117.c | 121 +-
+ drivers/media/i2c/lm3560.c | 14 +-
+ drivers/media/i2c/smiapp/smiapp-core.c | 1 -
+ drivers/media/media-entity.c | 41 +-
+ drivers/media/platform/exynos4-is/fimc-capture.c | 2 +-
+ drivers/media/platform/exynos4-is/fimc-core.h | 2 -
+ drivers/media/platform/exynos4-is/fimc-is-regs.c | 36 +-
+ drivers/media/platform/exynos4-is/fimc-is-regs.h | 1 -
+ drivers/media/platform/exynos4-is/fimc-lite-reg.c | 4 +-
+ drivers/media/platform/exynos4-is/fimc-lite.c | 2 +-
+ drivers/media/platform/exynos4-is/fimc-m2m.c | 148 +-
+ drivers/media/platform/exynos4-is/mipi-csis.c | 2 +-
+ drivers/media/platform/mem2mem_testdev.c | 152 +-
+ drivers/media/platform/omap3isp/ispccdc.c | 3 +-
+ drivers/media/platform/omap3isp/ispccp2.c | 3 +-
+ drivers/media/platform/omap3isp/ispcsi2.c | 3 +-
+ drivers/media/platform/omap3isp/isppreview.c | 3 +-
+ drivers/media/platform/omap3isp/ispresizer.c | 18 +-
+ drivers/media/platform/omap3isp/ispstat.c | 2 +-
+ drivers/media/platform/omap3isp/ispvideo.c | 60 +-
+ drivers/media/platform/s5p-g2d/g2d.c | 124 +-
+ drivers/media/platform/s5p-g2d/g2d.h | 1 -
+ drivers/media/platform/s5p-jpeg/jpeg-core.c | 134 +-
+ drivers/media/platform/s5p-jpeg/jpeg-core.h | 2 -
+ drivers/media/platform/s5p-tv/mixer_drv.c | 34 +-
+ drivers/media/platform/s5p-tv/sdo_drv.c | 39 +-
+ drivers/media/v4l2-core/v4l2-mem2mem.c | 126 +
+ drivers/media/v4l2-core/videobuf2-core.c | 25 +-
+ drivers/media/v4l2-core/videobuf2-dma-sg.c | 53 +-
+ drivers/staging/media/Kconfig | 4 +
+ drivers/staging/media/Makefile | 2 +
+ drivers/staging/media/bcm2048/Kconfig | 13 +
+ drivers/staging/media/bcm2048/Makefile | 1 +
+ drivers/staging/media/bcm2048/TODO | 24 +
+ drivers/staging/media/bcm2048/radio-bcm2048.c | 2745 ++++++++++++++++++++
+ drivers/staging/media/bcm2048/radio-bcm2048.h | 30 +
+ drivers/staging/media/omap4iss/Kconfig | 12 +
+ drivers/staging/media/omap4iss/Makefile | 6 +
+ drivers/staging/media/omap4iss/TODO | 4 +
+ drivers/staging/media/omap4iss/iss.c | 1462 +++++++++++
+ drivers/staging/media/omap4iss/iss.h | 153 ++
+ drivers/staging/media/omap4iss/iss_csi2.c | 1368 ++++++++++
+ drivers/staging/media/omap4iss/iss_csi2.h | 156 ++
+ drivers/staging/media/omap4iss/iss_csiphy.c | 278 ++
+ drivers/staging/media/omap4iss/iss_csiphy.h | 51 +
+ drivers/staging/media/omap4iss/iss_ipipe.c | 581 +++++
+ drivers/staging/media/omap4iss/iss_ipipe.h | 67 +
+ drivers/staging/media/omap4iss/iss_ipipeif.c | 847 ++++++
+ drivers/staging/media/omap4iss/iss_ipipeif.h | 92 +
+ drivers/staging/media/omap4iss/iss_regs.h | 883 +++++++
+ drivers/staging/media/omap4iss/iss_resizer.c | 905 +++++++
+ drivers/staging/media/omap4iss/iss_resizer.h | 75 +
+ drivers/staging/media/omap4iss/iss_video.c | 1128 ++++++++
+ drivers/staging/media/omap4iss/iss_video.h | 198 ++
+ include/media/omap4iss.h | 65 +
+ include/media/v4l2-fh.h | 4 +
+ include/media/v4l2-mem2mem.h | 24 +
+ include/media/videobuf2-core.h | 1 +
+ include/uapi/linux/media.h | 1 +
+ 61 files changed, 11754 insertions(+), 651 deletions(-)
+ create mode 100644 Documentation/video4linux/omap4_camera.txt
+ create mode 100644 drivers/staging/media/bcm2048/Kconfig
+ create mode 100644 drivers/staging/media/bcm2048/Makefile
+ create mode 100644 drivers/staging/media/bcm2048/TODO
+ create mode 100644 drivers/staging/media/bcm2048/radio-bcm2048.c
+ create mode 100644 drivers/staging/media/bcm2048/radio-bcm2048.h
+ create mode 100644 drivers/staging/media/omap4iss/Kconfig
+ create mode 100644 drivers/staging/media/omap4iss/Makefile
+ create mode 100644 drivers/staging/media/omap4iss/TODO
+ create mode 100644 drivers/staging/media/omap4iss/iss.c
+ create mode 100644 drivers/staging/media/omap4iss/iss.h
+ create mode 100644 drivers/staging/media/omap4iss/iss_csi2.c
+ create mode 100644 drivers/staging/media/omap4iss/iss_csi2.h
+ create mode 100644 drivers/staging/media/omap4iss/iss_csiphy.c
+ create mode 100644 drivers/staging/media/omap4iss/iss_csiphy.h
+ create mode 100644 drivers/staging/media/omap4iss/iss_ipipe.c
+ create mode 100644 drivers/staging/media/omap4iss/iss_ipipe.h
+ create mode 100644 drivers/staging/media/omap4iss/iss_ipipeif.c
+ create mode 100644 drivers/staging/media/omap4iss/iss_ipipeif.h
+ create mode 100644 drivers/staging/media/omap4iss/iss_regs.h
+ create mode 100644 drivers/staging/media/omap4iss/iss_resizer.c
+ create mode 100644 drivers/staging/media/omap4iss/iss_resizer.h
+ create mode 100644 drivers/staging/media/omap4iss/iss_video.c
+ create mode 100644 drivers/staging/media/omap4iss/iss_video.h
+ create mode 100644 include/media/omap4iss.h
+Merging kbuild/for-next (e6483a58eca6 Merge branch 'kbuild/misc' into kbuild/for-next)
+$ git merge kbuild/for-next
+Merge made by the 'recursive' strategy.
+ scripts/package/builddeb | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+Merging kconfig/for-next (4eae518d4b01 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
+$ git merge kconfig/for-next
+Already up-to-date.
+Merging libata/for-next (23f5e334cbd9 Merge branch 'for-3.13-fixes' into for-next)
+$ git merge libata/for-next
+Auto-merging drivers/ata/libata-scsi.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/ata/sata_rcar.txt | 18 ++
+ Documentation/kernel-parameters.txt | 2 +
+ drivers/ata/ahci.c | 80 +++++--
+ drivers/ata/ahci_imx.c | 241 ++++++++++++++-------
+ drivers/ata/ata_generic.c | 7 -
+ drivers/ata/libahci.c | 4 +-
+ drivers/ata/libata-core.c | 19 +-
+ drivers/ata/libata-eh.c | 5 +-
+ drivers/ata/libata-scsi.c | 21 ++
+ drivers/ata/sata_rcar.c | 118 ++++++++--
+ include/linux/libata.h | 1 +
+ kernel/freezer.c | 6 +
+ 12 files changed, 389 insertions(+), 133 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/ata/sata_rcar.txt
+Merging pstore/master (bd08ec33b5c2 pstore/ram: Restore ecc information block)
+$ git merge pstore/master
+Already up-to-date.
+Merging pm/linux-next (dd61525a92dd Merge branch 'acpi-hotplug-next' into linux-next)
+$ git merge pm/linux-next
+Auto-merging include/acpi/acpi_io.h
+Auto-merging drivers/pci/pci-acpi.c
+Auto-merging drivers/pci/hotplug/pciehp.h
+Auto-merging drivers/gpu/drm/i915/i915_drv.h
+Merge made by the 'recursive' strategy.
+ Documentation/acpi/namespace.txt | 9 +-
+ arch/ia64/hp/common/aml_nfw.c | 3 +-
+ arch/x86/kernel/apic/apic_flat_64.c | 4 +-
+ arch/x86/kernel/apic/io_apic.c | 3 -
+ arch/x86/pci/mmconfig-shared.c | 1 -
+ arch/x86/pci/mmconfig_32.c | 1 -
+ arch/x86/platform/olpc/olpc-xo15-sci.c | 3 +-
+ drivers/acpi/ac.c | 3 +-
+ drivers/acpi/acpi_extlog.c | 1 -
+ drivers/acpi/acpi_lpss.c | 1 +
+ drivers/acpi/acpi_memhotplug.c | 15 +-
+ drivers/acpi/acpi_pad.c | 3 +-
+ drivers/acpi/acpi_processor.c | 2 +-
+ drivers/acpi/apei/apei-base.c | 1 -
+ drivers/acpi/apei/apei-internal.h | 1 -
+ drivers/acpi/apei/einj.c | 1 -
+ drivers/acpi/apei/ghes.c | 1 -
+ drivers/acpi/battery.c | 3 +-
+ drivers/acpi/blacklist.c | 1 -
+ drivers/acpi/bus.c | 77 +---
+ drivers/acpi/button.c | 3 +-
+ drivers/acpi/container.c | 11 +-
+ drivers/acpi/custom_method.c | 2 +-
+ drivers/acpi/debugfs.c | 2 +-
+ drivers/acpi/device_pm.c | 22 +-
+ drivers/acpi/dock.c | 14 +-
+ drivers/acpi/ec.c | 5 +-
+ drivers/acpi/event.c | 2 +-
+ drivers/acpi/fan.c | 3 +-
+ drivers/acpi/glue.c | 165 +++----
+ drivers/acpi/hed.c | 2 -
+ drivers/acpi/internal.h | 9 +-
+ drivers/acpi/numa.c | 1 -
+ drivers/acpi/nvs.c | 1 -
+ drivers/acpi/osl.c | 12 +-
+ drivers/acpi/pci_irq.c | 2 -
+ drivers/acpi/pci_link.c | 4 +-
+ drivers/acpi/pci_root.c | 126 +-----
+ drivers/acpi/power.c | 3 +-
+ drivers/acpi/proc.c | 4 +-
+ drivers/acpi/processor_core.c | 3 +-
+ drivers/acpi/processor_driver.c | 8 +-
+ drivers/acpi/processor_idle.c | 6 +-
+ drivers/acpi/processor_perflib.c | 7 +-
+ drivers/acpi/processor_thermal.c | 11 +-
+ drivers/acpi/processor_throttling.c | 7 +-
+ drivers/acpi/sbshc.c | 3 +-
+ drivers/acpi/scan.c | 482 +++++++++++----------
+ drivers/acpi/sleep.c | 7 -
+ drivers/acpi/sysfs.c | 2 +-
+ drivers/acpi/tables.c | 4 +-
+ drivers/acpi/thermal.c | 5 +-
+ drivers/acpi/utils.c | 2 -
+ drivers/acpi/video.c | 5 +-
+ drivers/acpi/wakeup.c | 1 -
+ drivers/ata/libata-acpi.c | 28 +-
+ drivers/ata/pata_acpi.c | 5 +-
+ drivers/char/hpet.c | 7 +-
+ drivers/char/tpm/tpm_acpi.c | 2 +-
+ drivers/char/tpm/tpm_ppi.c | 1 -
+ drivers/cpufreq/cpufreq-cpu0.c | 2 +-
+ drivers/cpufreq/spear-cpufreq.c | 2 +-
+ drivers/firmware/Kconfig | 2 +-
+ drivers/gpu/drm/gma500/opregion.c | 1 -
+ drivers/gpu/drm/i915/Makefile | 3 +-
+ drivers/gpu/drm/i915/i915_drv.h | 3 +-
+ drivers/gpu/drm/i915/intel_acpi.c | 2 -
+ drivers/gpu/drm/i915/intel_opregion.c | 1 -
+ drivers/gpu/drm/nouveau/nouveau_acpi.c | 7 +-
+ drivers/gpu/drm/radeon/radeon_acpi.c | 6 +-
+ drivers/hv/vmbus_drv.c | 2 -
+ drivers/hwmon/acpi_power_meter.c | 3 +-
+ drivers/hwmon/asus_atk0110.c | 6 +-
+ drivers/ide/ide-acpi.c | 12 +-
+ drivers/input/misc/atlas_btns.c | 2 +-
+ drivers/iommu/amd_iommu_init.c | 1 -
+ drivers/iommu/intel_irq_remapping.c | 4 +-
+ drivers/mmc/core/sdio_bus.c | 2 +-
+ drivers/pci/hotplug/acpiphp_glue.c | 6 +-
+ drivers/pci/hotplug/acpiphp_ibm.c | 3 +-
+ drivers/pci/hotplug/pciehp.h | 2 -
+ drivers/pci/ioapic.c | 1 -
+ drivers/pci/pci-acpi.c | 17 +-
+ drivers/pci/pci-label.c | 1 -
+ drivers/pinctrl/pinctrl-baytrail.c | 1 +
+ drivers/platform/x86/acer-wmi.c | 2 -
+ drivers/platform/x86/asus-laptop.c | 3 +-
+ drivers/platform/x86/asus-wmi.c | 3 +-
+ drivers/platform/x86/classmate-laptop.c | 3 +-
+ drivers/platform/x86/dell-wmi-aio.c | 1 -
+ drivers/platform/x86/dell-wmi.c | 1 -
+ drivers/platform/x86/eeepc-laptop.c | 3 +-
+ drivers/platform/x86/eeepc-wmi.c | 2 +-
+ drivers/platform/x86/hp_accel.c | 2 +-
+ drivers/platform/x86/ideapad-laptop.c | 3 +-
+ drivers/platform/x86/intel-rst.c | 2 +-
+ drivers/platform/x86/intel-smartconnect.c | 2 +-
+ drivers/platform/x86/intel_menlow.c | 4 +-
+ drivers/platform/x86/intel_oaktrail.c | 3 -
+ drivers/platform/x86/mxm-wmi.c | 3 +-
+ drivers/platform/x86/panasonic-laptop.c | 4 +-
+ drivers/platform/x86/pvpanic.c | 3 +-
+ drivers/platform/x86/samsung-q10.c | 2 +-
+ drivers/platform/x86/sony-laptop.c | 4 +-
+ drivers/platform/x86/tc1100-wmi.c | 4 +-
+ drivers/platform/x86/thinkpad_acpi.c | 14 +-
+ drivers/platform/x86/toshiba_acpi.c | 4 +-
+ drivers/platform/x86/toshiba_bluetooth.c | 4 +-
+ drivers/platform/x86/wmi.c | 2 -
+ drivers/platform/x86/xo15-ebook.c | 3 +-
+ drivers/pnp/pnpacpi/core.c | 22 +-
+ drivers/pnp/pnpacpi/pnpacpi.h | 1 -
+ drivers/sfi/sfi_acpi.c | 4 +-
+ drivers/staging/quickstart/quickstart.c | 2 +-
+ drivers/usb/core/usb-acpi.c | 41 +-
+ drivers/xen/xen-acpi-cpuhotplug.c | 11 +-
+ drivers/xen/xen-acpi-memhotplug.c | 8 +-
+ drivers/xen/xen-acpi-pad.c | 5 +-
+ drivers/xen/xen-acpi-processor.c | 4 +-
+ include/acpi/acpi_bus.h | 37 +-
+ include/acpi/acpi_drivers.h | 3 -
+ include/{linux => acpi}/acpi_io.h | 1 -
+ include/linux/acpi.h | 7 +
+ include/linux/ide.h | 8 +-
+ include/linux/iscsi_ibft.h | 2 +-
+ include/linux/pci_hotplug.h | 3 +-
+ include/linux/sfi_acpi.h | 5 +-
+ include/linux/tboot.h | 2 +-
+ kernel/power/hibernate.c | 1 +
+ .../power/cpupower/debug/kernel/cpufreq-test_tsc.c | 5 +-
+ 130 files changed, 581 insertions(+), 887 deletions(-)
+ rename include/{linux => acpi}/acpi_io.h (94%)
+Merging idle/next (1ae2a8af4228 tools/power turbostat: run on HSX)
+$ git merge idle/next
+Merge made by the 'recursive' strategy.
+ tools/power/x86/turbostat/turbostat.c | 42 ++++++++++++++++++++++++++---------
+ 1 file changed, 31 insertions(+), 11 deletions(-)
+Merging apm/for-next (fb9d78aca709 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
+$ git merge apm/for-next
+Already up-to-date.
+Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles)
+$ git merge cpupowerutils/master
+Already up-to-date.
+Merging thermal/next (86e0a0bdf81c Merge branches 'intel_powerclamp', 'tmon' and 'misc' of .git into next)
+$ git merge thermal/next
+Already up-to-date.
+Merging ieee1394/for-next (ce027ed98fd1 firewire: sbp2: bring back WRITE SAME support)
+$ git merge ieee1394/for-next
+Merge made by the 'recursive' strategy.
+ drivers/firewire/sbp2.c | 1 -
+ 1 file changed, 1 deletion(-)
+Merging ubi/linux-next (ae0d14695566 UBI: Add some asserts to ubi_attach_fastmap())
+$ git merge ubi/linux-next
+Already up-to-date.
+Merging dlm/next (ece35848c184 dlm: set zero linger time on sctp socket)
+$ git merge dlm/next
+Merge made by the 'recursive' strategy.
+ fs/dlm/lowcomms.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+Merging swiotlb/linux-next (af51a9f1848f swiotlb: Do not export swiotlb_bounce since there are no external consumers)
+$ git merge swiotlb/linux-next
+Already up-to-date.
+Merging slave-dma/next (087a45b74e02 Merge branch 'for-linus' into next)
+$ git merge slave-dma/next
+Resolved 'arch/arm/boot/dts/imx51.dtsi' using previous resolution.
+Resolved 'arch/arm/boot/dts/imx53.dtsi' using previous resolution.
+Auto-merging arch/arm/boot/dts/imx6sl.dtsi
+Auto-merging arch/arm/boot/dts/imx6qdl.dtsi
+Auto-merging arch/arm/boot/dts/imx53.dtsi
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx53.dtsi
+Auto-merging arch/arm/boot/dts/imx51.dtsi
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx51.dtsi
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 9b55394ea638] Merge remote-tracking branch 'slave-dma/next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/dma/fsl-imx-sdma.txt | 1 +
+ arch/arm/boot/dts/imx51.dtsi | 4 +-
+ arch/arm/boot/dts/imx53.dtsi | 4 +-
+ arch/arm/boot/dts/imx6qdl.dtsi | 12 +-
+ arch/arm/boot/dts/imx6sl.dtsi | 12 +-
+ drivers/dma/amba-pl08x.c | 2 +-
+ drivers/dma/edma.c | 6 +-
+ drivers/dma/imx-sdma.c | 19 +-
+ drivers/dma/mmp_pdma.c | 203 +++++++++++----------
+ drivers/dma/mmp_tdma.c | 6 +-
+ drivers/dma/pl330.c | 6 +
+ include/linux/dmaengine.h | 5 +-
+ include/linux/platform_data/dma-imx-sdma.h | 5 +
+ include/linux/platform_data/dma-imx.h | 1 +
+ sound/soc/fsl/fsl_ssi.c | 27 ++-
+ 15 files changed, 190 insertions(+), 123 deletions(-)
+Merging dmaengine/next (77873803363c net_dma: mark broken)
+$ git merge dmaengine/next
+Auto-merging drivers/dma/pl330.c
+Auto-merging drivers/dma/dmaengine.c
+Auto-merging drivers/dma/Kconfig
+Merge made by the 'recursive' strategy.
+ drivers/dma/Kconfig | 7 +++
+ drivers/dma/at_hdmac_regs.h | 4 --
+ drivers/dma/dmaengine.c | 4 +-
+ drivers/dma/dmatest.c | 8 ++--
+ drivers/dma/fsldma.c | 31 +-------------
+ drivers/dma/mv_xor.c | 101 +++++++++++++++++++++++++++-----------------
+ drivers/dma/pl330.c | 5 +--
+ drivers/dma/ppc4xx/adma.c | 27 +-----------
+ drivers/dma/txx9dmac.c | 1 -
+ 9 files changed, 79 insertions(+), 109 deletions(-)
+Merging net-next/master (de47c4ab25d4 Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next)
+$ git merge net-next/master
+Auto-merging net/ipv6/ip6_output.c
+Auto-merging include/linux/skbuff.h
+Auto-merging drivers/net/xen-netback/netback.c
+Auto-merging drivers/net/wireless/rtlwifi/pci.c
+Removing drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h
+Removing drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
+Auto-merging drivers/net/wireless/ath/ath9k/main.c
+Auto-merging drivers/net/ethernet/ti/cpsw.c
+Auto-merging drivers/net/ethernet/8390/zorro8390.c
+Auto-merging drivers/net/ethernet/8390/hydra.c
+Auto-merging drivers/net/can/mscan/mpc5xxx_can.c
+Auto-merging drivers/net/bonding/bond_3ad.c
+Auto-merging drivers/bluetooth/btusb.c
+Auto-merging drivers/bluetooth/ath3k.c
+Auto-merging arch/xtensa/include/asm/Kbuild
+Auto-merging arch/arm64/include/asm/Kbuild
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/net/phy.txt | 1 +
+ Documentation/networking/can.txt | 94 +-
+ Documentation/networking/filter.txt | 608 ++++++-
+ Documentation/networking/ip-sysctl.txt | 20 +-
+ Documentation/networking/packet_mmap.txt | 21 +
+ Documentation/networking/phy.txt | 3 +-
+ Documentation/networking/regulatory.txt | 4 +-
+ Documentation/networking/timestamping.txt | 9 +-
+ Documentation/networking/timestamping/.gitignore | 1 +
+ Documentation/networking/timestamping/Makefile | 5 +-
+ .../networking/timestamping/hwtstamp_config.c | 134 ++
+ Documentation/unaligned-memory-access.txt | 28 +-
+ MAINTAINERS | 23 +-
+ arch/alpha/include/asm/Kbuild | 1 +
+ arch/arc/include/asm/Kbuild | 1 +
+ arch/arm/include/asm/Kbuild | 1 +
+ arch/arm64/include/asm/Kbuild | 1 +
+ arch/avr32/include/asm/Kbuild | 1 +
+ arch/blackfin/include/asm/Kbuild | 1 +
+ arch/c6x/include/asm/Kbuild | 1 +
+ arch/cris/include/asm/Kbuild | 1 +
+ arch/frv/include/asm/Kbuild | 1 +
+ arch/hexagon/include/asm/Kbuild | 1 +
+ arch/ia64/include/asm/Kbuild | 3 +-
+ arch/m32r/include/asm/Kbuild | 1 +
+ arch/m68k/include/asm/Kbuild | 1 +
+ arch/metag/include/asm/Kbuild | 1 +
+ arch/microblaze/include/asm/Kbuild | 1 +
+ arch/mips/include/asm/Kbuild | 1 +
+ arch/mn10300/include/asm/Kbuild | 1 +
+ arch/openrisc/include/asm/Kbuild | 1 +
+ arch/parisc/include/asm/Kbuild | 1 +
+ arch/powerpc/include/asm/Kbuild | 3 +-
+ arch/s390/include/asm/Kbuild | 1 +
+ arch/score/include/asm/Kbuild | 2 +
+ arch/sh/include/asm/Kbuild | 1 +
+ arch/sparc/include/asm/Kbuild | 1 +
+ arch/tile/include/asm/Kbuild | 1 +
+ arch/um/include/asm/Kbuild | 1 +
+ arch/unicore32/include/asm/Kbuild | 1 +
+ arch/x86/include/asm/hash.h | 7 +
+ arch/x86/lib/Makefile | 2 +-
+ arch/x86/lib/hash.c | 88 +
+ arch/xtensa/include/asm/Kbuild | 1 +
+ drivers/atm/he.c | 1 -
+ drivers/atm/solos-pci.c | 2 -
+ drivers/bcma/host_pci.c | 3 +-
+ drivers/bluetooth/ath3k.c | 4 +
+ drivers/bluetooth/btmrvl_drv.h | 25 +-
+ drivers/bluetooth/btmrvl_main.c | 130 +-
+ drivers/bluetooth/btmrvl_sdio.c | 9 +-
+ drivers/bluetooth/btmrvl_sdio.h | 2 -
+ drivers/bluetooth/btusb.c | 7 +-
+ drivers/isdn/sc/event.c | 2 +-
+ drivers/net/bonding/bond_3ad.c | 54 +-
+ drivers/net/bonding/bond_alb.c | 37 +-
+ drivers/net/bonding/bond_alb.h | 3 +-
+ drivers/net/bonding/bond_main.c | 157 +-
+ drivers/net/bonding/bond_netlink.c | 233 ++-
+ drivers/net/bonding/bond_options.c | 435 ++++-
+ drivers/net/bonding/bond_sysfs.c | 497 ++----
+ drivers/net/bonding/bonding.h | 26 +-
+ drivers/net/can/c_can/c_can.c | 22 +-
+ drivers/net/can/dev.c | 3 +-
+ drivers/net/can/mcp251x.c | 22 +-
+ drivers/net/can/mscan/mpc5xxx_can.c | 3 +-
+ drivers/net/can/mscan/mscan.c | 3 +-
+ drivers/net/can/mscan/mscan.h | 3 +-
+ drivers/net/can/pch_can.c | 3 +-
+ drivers/net/can/sja1000/ems_pci.c | 3 +-
+ drivers/net/can/sja1000/kvaser_pci.c | 3 +-
+ drivers/net/can/sja1000/plx_pci.c | 3 +-
+ drivers/net/can/sja1000/sja1000_isa.c | 3 +-
+ drivers/net/can/sja1000/sja1000_of_platform.c | 3 +-
+ drivers/net/can/sja1000/sja1000_platform.c | 3 +-
+ drivers/net/can/slcan.c | 4 +-
+ drivers/net/can/softing/softing_cs.c | 3 +-
+ drivers/net/can/softing/softing_fw.c | 3 +-
+ drivers/net/can/softing/softing_main.c | 3 +-
+ drivers/net/ethernet/3com/3c59x.c | 6 +-
+ drivers/net/ethernet/8390/8390.h | 7 +-
+ drivers/net/ethernet/8390/apne.c | 62 +-
+ drivers/net/ethernet/8390/ax88796.c | 22 +-
+ drivers/net/ethernet/8390/axnet_cs.c | 119 +-
+ drivers/net/ethernet/8390/etherh.c | 53 +-
+ drivers/net/ethernet/8390/hydra.c | 11 +-
+ drivers/net/ethernet/8390/lib8390.c | 77 +-
+ drivers/net/ethernet/8390/mac8390.c | 19 +-
+ drivers/net/ethernet/8390/mcf8390.c | 8 +-
+ drivers/net/ethernet/8390/ne.c | 96 +-
+ drivers/net/ethernet/8390/ne2k-pci.c | 54 +-
+ drivers/net/ethernet/8390/pcnet_cs.c | 62 +-
+ drivers/net/ethernet/8390/smc-ultra.c | 48 +-
+ drivers/net/ethernet/8390/stnic.c | 28 +-
+ drivers/net/ethernet/8390/wd.c | 42 +-
+ drivers/net/ethernet/8390/zorro8390.c | 22 +-
+ drivers/net/ethernet/adi/bfin_mac.c | 22 +-
+ drivers/net/ethernet/aeroflex/greth.c | 2 +-
+ drivers/net/ethernet/amd/amd8111e.c | 4 +-
+ drivers/net/ethernet/amd/amd8111e.h | 4 +-
+ drivers/net/ethernet/amd/au1000_eth.c | 3 +-
+ drivers/net/ethernet/amd/au1000_eth.h | 3 +-
+ drivers/net/ethernet/arc/emac.h | 2 -
+ drivers/net/ethernet/arc/emac_main.c | 20 +-
+ drivers/net/ethernet/broadcom/bgmac.c | 217 +--
+ drivers/net/ethernet/broadcom/bgmac.h | 18 +-
+ drivers/net/ethernet/broadcom/bnx2.c | 3 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 11 +-
+ drivers/net/ethernet/broadcom/sb1250-mac.c | 3 +-
+ drivers/net/ethernet/broadcom/tg3.c | 108 +-
+ drivers/net/ethernet/broadcom/tg3.h | 6 +-
+ drivers/net/ethernet/brocade/bna/bfa_ioc.c | 650 +++++++-
+ drivers/net/ethernet/brocade/bna/bfa_ioc.h | 8 +
+ drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c | 40 +
+ drivers/net/ethernet/brocade/bna/bfi.h | 33 +-
+ drivers/net/ethernet/brocade/bna/bfi_enet.h | 3 +-
+ drivers/net/ethernet/brocade/bna/bna.h | 24 +-
+ drivers/net/ethernet/brocade/bna/bna_enet.c | 58 +-
+ drivers/net/ethernet/brocade/bna/bna_hw_defs.h | 4 +
+ drivers/net/ethernet/brocade/bna/bna_tx_rx.c | 251 ++-
+ drivers/net/ethernet/brocade/bna/bna_types.h | 57 +-
+ drivers/net/ethernet/brocade/bna/bnad.c | 557 +++++--
+ drivers/net/ethernet/brocade/bna/bnad.h | 26 +-
+ drivers/net/ethernet/brocade/bna/bnad_ethtool.c | 1 +
+ drivers/net/ethernet/brocade/bna/cna.h | 4 +-
+ drivers/net/ethernet/cadence/macb.c | 126 +-
+ drivers/net/ethernet/cadence/macb.h | 1 +
+ drivers/net/ethernet/chelsio/cxgb/common.h | 3 +-
+ drivers/net/ethernet/chelsio/cxgb/cphy.h | 3 +-
+ drivers/net/ethernet/chelsio/cxgb/cpl5_cmd.h | 3 +-
+ drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 3 +-
+ drivers/net/ethernet/chelsio/cxgb/elmer0.h | 3 +-
+ drivers/net/ethernet/chelsio/cxgb/espi.c | 3 +-
+ drivers/net/ethernet/chelsio/cxgb/espi.h | 3 +-
+ drivers/net/ethernet/chelsio/cxgb/gmac.h | 3 +-
+ drivers/net/ethernet/chelsio/cxgb/mv88x201x.c | 3 +-
+ drivers/net/ethernet/chelsio/cxgb/pm3393.c | 3 +-
+ drivers/net/ethernet/chelsio/cxgb/regs.h | 3 +-
+ drivers/net/ethernet/chelsio/cxgb/sge.c | 3 +-
+ drivers/net/ethernet/chelsio/cxgb/sge.h | 3 +-
+ drivers/net/ethernet/chelsio/cxgb/subr.c | 3 +-
+ .../net/ethernet/chelsio/cxgb/suni1x10gexp_regs.h | 3 +-
+ drivers/net/ethernet/chelsio/cxgb4/sge.c | 6 +-
+ drivers/net/ethernet/cisco/enic/enic_main.c | 11 +-
+ drivers/net/ethernet/emulex/benet/be_main.c | 4 +-
+ drivers/net/ethernet/freescale/fec.h | 3 +-
+ drivers/net/ethernet/freescale/fec_main.c | 8 +-
+ drivers/net/ethernet/freescale/fec_ptp.c | 16 +-
+ drivers/net/ethernet/freescale/gianfar.c | 22 +-
+ drivers/net/ethernet/ibm/ibmveth.c | 3 +-
+ drivers/net/ethernet/ibm/ibmveth.h | 3 +-
+ drivers/net/ethernet/intel/Kconfig | 8 +-
+ drivers/net/ethernet/intel/e1000e/netdev.c | 14 +-
+ drivers/net/ethernet/intel/i40e/i40e.h | 26 +-
+ drivers/net/ethernet/intel/i40e/i40e_adminq.c | 72 +-
+ drivers/net/ethernet/intel/i40e/i40e_adminq.h | 1 +
+ drivers/net/ethernet/intel/i40e/i40e_common.c | 164 +-
+ drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 142 +-
+ drivers/net/ethernet/intel/i40e/i40e_diag.c | 10 +-
+ drivers/net/ethernet/intel/i40e/i40e_diag.h | 8 +-
+ drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 237 ++-
+ drivers/net/ethernet/intel/i40e/i40e_hmc.c | 2 +-
+ drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h | 4 +-
+ drivers/net/ethernet/intel/i40e/i40e_main.c | 615 +++++--
+ drivers/net/ethernet/intel/i40e/i40e_prototype.h | 11 +-
+ drivers/net/ethernet/intel/i40e/i40e_register.h | 141 +-
+ drivers/net/ethernet/intel/i40e/i40e_txrx.c | 16 +-
+ drivers/net/ethernet/intel/i40e/i40e_txrx.h | 21 +-
+ drivers/net/ethernet/intel/i40e/i40e_type.h | 26 +-
+ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 37 +-
+ drivers/net/ethernet/intel/igb/e1000_82575.c | 89 ++
+ drivers/net/ethernet/intel/igb/e1000_defines.h | 16 +
+ drivers/net/ethernet/intel/igb/e1000_hw.h | 3 +
+ drivers/net/ethernet/intel/igb/igb.h | 28 +-
+ drivers/net/ethernet/intel/igb/igb_ethtool.c | 10 +-
+ drivers/net/ethernet/intel/igb/igb_hwmon.c | 108 +-
+ drivers/net/ethernet/intel/igb/igb_main.c | 303 +++-
+ drivers/net/ethernet/intel/ixgbe/ixgbe.h | 8 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c | 84 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 5 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 283 ++--
+ drivers/net/ethernet/lantiq_etop.c | 3 +-
+ drivers/net/ethernet/marvell/mv643xx_eth.c | 28 +-
+ drivers/net/ethernet/marvell/pxa168_eth.c | 23 +-
+ drivers/net/ethernet/marvell/sky2.c | 6 +-
+ drivers/net/ethernet/mellanox/mlx4/alloc.c | 12 +-
+ drivers/net/ethernet/mellanox/mlx4/cq.c | 4 +-
+ drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 14 +-
+ drivers/net/ethernet/mellanox/mlx4/en_rx.c | 8 +-
+ drivers/net/ethernet/mellanox/mlx4/eq.c | 4 +-
+ drivers/net/ethernet/mellanox/mlx4/main.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/mcg.c | 6 +-
+ drivers/net/ethernet/mellanox/mlx4/mlx4.h | 10 +-
+ drivers/net/ethernet/mellanox/mlx4/mr.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/pd.c | 6 +-
+ drivers/net/ethernet/mellanox/mlx4/qp.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/srq.c | 4 +-
+ drivers/net/ethernet/natsemi/ns83820.c | 5 +-
+ drivers/net/ethernet/neterion/vxge/vxge-main.c | 30 +-
+ drivers/net/ethernet/netx-eth.c | 3 +-
+ drivers/net/ethernet/nvidia/forcedeth.c | 5 +-
+ drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h | 3 +-
+ .../net/ethernet/oki-semi/pch_gbe/pch_gbe_api.c | 3 +-
+ .../net/ethernet/oki-semi/pch_gbe/pch_gbe_api.h | 3 +-
+ .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c | 3 +-
+ .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 3 +-
+ .../net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c | 3 +-
+ .../net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.c | 3 +-
+ .../net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.h | 3 +-
+ drivers/net/ethernet/pasemi/pasemi_mac.c | 3 +-
+ drivers/net/ethernet/pasemi/pasemi_mac.h | 3 +-
+ drivers/net/ethernet/pasemi/pasemi_mac_ethtool.c | 3 +-
+ drivers/net/ethernet/qlogic/netxen/Makefile | 4 +-
+ drivers/net/ethernet/qlogic/netxen/netxen_nic.h | 4 +-
+ .../net/ethernet/qlogic/netxen/netxen_nic_ctx.c | 4 +-
+ .../ethernet/qlogic/netxen/netxen_nic_ethtool.c | 4 +-
+ .../net/ethernet/qlogic/netxen/netxen_nic_hdr.h | 4 +-
+ drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | 4 +-
+ drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.h | 4 +-
+ .../net/ethernet/qlogic/netxen/netxen_nic_init.c | 4 +-
+ .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 4 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 45 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 78 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 12 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 14 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c | 4 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 49 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c | 31 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.h | 14 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 5 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h | 1 -
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 48 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 6 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 60 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h | 12 +-
+ .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 248 ++-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c | 192 ++-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 118 +-
+ drivers/net/ethernet/renesas/Kconfig | 2 +-
+ drivers/net/ethernet/renesas/sh_eth.c | 12 +-
+ drivers/net/ethernet/sfc/ef10.c | 518 ++++--
+ drivers/net/ethernet/sfc/efx.c | 201 ++-
+ drivers/net/ethernet/sfc/efx.h | 13 +-
+ drivers/net/ethernet/sfc/enum.h | 1 +
+ drivers/net/ethernet/sfc/ethtool.c | 12 +-
+ drivers/net/ethernet/sfc/falcon.c | 38 +-
+ drivers/net/ethernet/sfc/farch.c | 48 +-
+ drivers/net/ethernet/sfc/filter.h | 17 +-
+ drivers/net/ethernet/sfc/mcdi.c | 434 +++--
+ drivers/net/ethernet/sfc/mcdi.h | 21 +
+ drivers/net/ethernet/sfc/mcdi_mon.c | 76 +-
+ drivers/net/ethernet/sfc/mcdi_pcol.h | 733 ++++++++-
+ drivers/net/ethernet/sfc/mcdi_port.c | 89 +-
+ drivers/net/ethernet/sfc/net_driver.h | 75 +-
+ drivers/net/ethernet/sfc/nic.c | 12 +
+ drivers/net/ethernet/sfc/nic.h | 34 +-
+ drivers/net/ethernet/sfc/ptp.c | 854 +++++++---
+ drivers/net/ethernet/sfc/rx.c | 24 +-
+ drivers/net/ethernet/sfc/selftest.c | 2 +-
+ drivers/net/ethernet/sfc/selftest.h | 1 +
+ drivers/net/ethernet/sfc/siena.c | 119 +-
+ drivers/net/ethernet/sis/sis900.c | 2 -
+ drivers/net/ethernet/smsc/smc911x.c | 3 +-
+ drivers/net/ethernet/smsc/smc911x.h | 3 +-
+ drivers/net/ethernet/smsc/smc91x.c | 3 +-
+ drivers/net/ethernet/smsc/smc91x.h | 3 +-
+ drivers/net/ethernet/smsc/smsc911x.c | 3 +-
+ drivers/net/ethernet/smsc/smsc911x.h | 3 +-
+ drivers/net/ethernet/smsc/smsc9420.c | 3 +-
+ drivers/net/ethernet/smsc/smsc9420.h | 3 +-
+ drivers/net/ethernet/sun/cassini.c | 4 +-
+ drivers/net/ethernet/sun/cassini.h | 4 +-
+ drivers/net/ethernet/sun/niu.c | 10 +-
+ drivers/net/ethernet/ti/cpsw.c | 32 +-
+ drivers/net/ethernet/ti/davinci_cpdma.c | 7 +-
+ drivers/net/ethernet/tile/tilegx.c | 22 +-
+ drivers/net/ethernet/toshiba/tc35815.c | 15 +-
+ drivers/net/ethernet/tundra/tsi108_eth.h | 4 +-
+ drivers/net/ethernet/xircom/xirc2ps_cs.c | 3 +-
+ drivers/net/ethernet/xscale/ixp4xx_eth.c | 36 +-
+ drivers/net/fddi/defxx.c | 20 +-
+ drivers/net/fddi/skfp/fplustm.c | 24 +-
+ drivers/net/fddi/skfp/h/supern_2.h | 96 +-
+ drivers/net/fddi/skfp/skfddi.c | 1 -
+ drivers/net/fddi/skfp/smt.c | 2 +-
+ drivers/net/fddi/skfp/srf.c | 24 +-
+ drivers/net/hamradio/mkiss.c | 3 +-
+ drivers/net/hippi/rrunner.c | 5 +-
+ drivers/net/hyperv/hyperv_net.h | 3 +-
+ drivers/net/hyperv/netvsc.c | 3 +-
+ drivers/net/hyperv/netvsc_drv.c | 3 +-
+ drivers/net/hyperv/rndis_filter.c | 3 +-
+ drivers/net/ieee802154/at86rf230.c | 2 -
+ drivers/net/ieee802154/mrf24j40.c | 1 -
+ drivers/net/irda/au1k_ir.c | 3 +-
+ drivers/net/irda/esi-sir.c | 4 +-
+ drivers/net/irda/litelink-sir.c | 4 +-
+ drivers/net/irda/ma600-sir.c | 4 +-
+ drivers/net/irda/old_belkin-sir.c | 4 +-
+ drivers/net/irda/smsc-ircc2.c | 4 +-
+ drivers/net/irda/smsc-ircc2.h | 4 +-
+ drivers/net/irda/via-ircc.c | 5 +-
+ drivers/net/irda/via-ircc.h | 3 +-
+ drivers/net/irda/vlsi_ir.c | 7 +-
+ drivers/net/irda/vlsi_ir.h | 4 +-
+ drivers/net/macvlan.c | 25 +-
+ drivers/net/macvtap.c | 76 +-
+ drivers/net/phy/cicada.c | 4 +-
+ drivers/net/phy/davicom.c | 2 +-
+ drivers/net/phy/dp83640.c | 4 +-
+ drivers/net/phy/icplus.c | 2 +-
+ drivers/net/phy/lxt.c | 4 +-
+ drivers/net/phy/marvell.c | 22 +
+ drivers/net/phy/mdio_bus.c | 4 +-
+ drivers/net/phy/micrel.c | 4 +-
+ drivers/net/phy/phy.c | 279 ++--
+ drivers/net/phy/phy_device.c | 103 +-
+ drivers/net/phy/spi_ks8995.c | 6 +-
+ drivers/net/ppp/ppp_mppe.c | 3 +-
+ drivers/net/tun.c | 23 +-
+ drivers/net/usb/asix.h | 3 +-
+ drivers/net/usb/asix_common.c | 3 +-
+ drivers/net/usb/asix_devices.c | 3 +-
+ drivers/net/usb/ax88172a.c | 3 +-
+ drivers/net/usb/ax88179_178a.c | 3 +-
+ drivers/net/usb/catc.c | 3 +-
+ drivers/net/usb/cdc_eem.c | 3 +-
+ drivers/net/usb/cdc_ether.c | 3 +-
+ drivers/net/usb/cdc_subset.c | 3 +-
+ drivers/net/usb/cx82310_eth.c | 3 +-
+ drivers/net/usb/gl620a.c | 3 +-
+ drivers/net/usb/int51x1.c | 3 +-
+ drivers/net/usb/kaweth.c | 3 +-
+ drivers/net/usb/lg-vl600.c | 3 +-
+ drivers/net/usb/mcs7830.c | 3 +-
+ drivers/net/usb/net1080.c | 3 +-
+ drivers/net/usb/plusb.c | 3 +-
+ drivers/net/usb/rndis_host.c | 3 +-
+ drivers/net/usb/sierra_net.c | 3 +-
+ drivers/net/usb/smsc75xx.c | 3 +-
+ drivers/net/usb/smsc75xx.h | 3 +-
+ drivers/net/usb/smsc95xx.c | 3 +-
+ drivers/net/usb/smsc95xx.h | 3 +-
+ drivers/net/usb/usbnet.c | 3 +-
+ drivers/net/usb/zaurus.c | 3 +-
+ drivers/net/virtio_net.c | 41 +-
+ drivers/net/vmxnet3/vmxnet3_drv.c | 4 +-
+ drivers/net/vxlan.c | 33 +-
+ drivers/net/wan/dscc4.c | 2 -
+ drivers/net/wan/lmc/lmc_main.c | 2 -
+ drivers/net/wan/pc300too.c | 1 -
+ drivers/net/wan/pci200syn.c | 1 -
+ drivers/net/wan/wanxl.c | 1 -
+ drivers/net/wireless/ath/ath10k/ce.c | 53 +-
+ drivers/net/wireless/ath/ath10k/ce.h | 2 +-
+ drivers/net/wireless/ath/ath10k/core.c | 43 +-
+ drivers/net/wireless/ath/ath10k/core.h | 23 +-
+ drivers/net/wireless/ath/ath10k/debug.c | 94 ++
+ drivers/net/wireless/ath/ath10k/debug.h | 6 +
+ drivers/net/wireless/ath/ath10k/htc.c | 31 +-
+ drivers/net/wireless/ath/ath10k/htt.c | 4 +-
+ drivers/net/wireless/ath/ath10k/htt.h | 1 +
+ drivers/net/wireless/ath/ath10k/htt_rx.c | 25 +-
+ drivers/net/wireless/ath/ath10k/htt_tx.c | 11 +-
+ drivers/net/wireless/ath/ath10k/hw.h | 1 +
+ drivers/net/wireless/ath/ath10k/mac.c | 320 +++-
+ drivers/net/wireless/ath/ath10k/pci.c | 791 +++++----
+ drivers/net/wireless/ath/ath10k/pci.h | 14 +-
+ drivers/net/wireless/ath/ath10k/txrx.c | 6 +-
+ drivers/net/wireless/ath/ath10k/wmi.c | 302 +++-
+ drivers/net/wireless/ath/ath10k/wmi.h | 96 +-
+ drivers/net/wireless/ath/ath5k/dma.c | 11 +-
+ drivers/net/wireless/ath/ath6kl/cfg80211.c | 11 +-
+ drivers/net/wireless/ath/ath9k/Kconfig | 10 +-
+ drivers/net/wireless/ath/ath9k/Makefile | 8 +-
+ .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 222 +--
+ .../wireless/ath/ath9k/ar9003_buffalo_initvals.h | 126 ++
+ drivers/net/wireless/ath/ath9k/ar9003_calib.c | 143 +-
+ drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 4 +-
+ drivers/net/wireless/ath/ath9k/ar9003_hw.c | 140 +-
+ drivers/net/wireless/ath/ath9k/ar9003_phy.c | 15 +-
+ drivers/net/wireless/ath/ath9k/ar9003_phy.h | 5 +-
+ drivers/net/wireless/ath/ath9k/ar9003_wow.c | 422 +++++
+ .../net/wireless/ath/ath9k/ar9330_1p1_initvals.h | 128 +-
+ .../net/wireless/ath/ath9k/ar9330_1p2_initvals.h | 401 ++++-
+ drivers/net/wireless/ath/ath9k/ar9340_initvals.h | 392 ++---
+ .../net/wireless/ath/ath9k/ar9462_2p0_initvals.h | 723 ++-------
+ .../net/wireless/ath/ath9k/ar9462_2p1_initvals.h | 1559 +-----------------
+ drivers/net/wireless/ath/ath9k/ar9485_initvals.h | 117 +-
+ .../net/wireless/ath/ath9k/ar955x_1p0_initvals.h | 540 +------
+ .../net/wireless/ath/ath9k/ar9565_1p0_initvals.h | 85 +-
+ .../net/wireless/ath/ath9k/ar9565_1p1_initvals.h | 64 +
+ .../net/wireless/ath/ath9k/ar9580_1p0_initvals.h | 572 +++++--
+ drivers/net/wireless/ath/ath9k/ath9k.h | 56 +-
+ drivers/net/wireless/ath/ath9k/debug.c | 115 +-
+ drivers/net/wireless/ath/ath9k/hw.c | 30 +-
+ drivers/net/wireless/ath/ath9k/hw.h | 7 +-
+ drivers/net/wireless/ath/ath9k/init.c | 65 +-
+ drivers/net/wireless/ath/ath9k/main.c | 541 +------
+ drivers/net/wireless/ath/ath9k/pci.c | 45 +
+ drivers/net/wireless/ath/ath9k/reg.h | 15 +-
+ drivers/net/wireless/ath/ath9k/tx99.c | 272 ++++
+ drivers/net/wireless/ath/ath9k/wow.c | 589 +++----
+ drivers/net/wireless/ath/ath9k/xmit.c | 7 +
+ drivers/net/wireless/ath/regd.c | 378 ++---
+ drivers/net/wireless/ath/wcn36xx/hal.h | 2 +-
+ drivers/net/wireless/ath/wcn36xx/main.c | 3 +-
+ drivers/net/wireless/ath/wcn36xx/smd.c | 33 +-
+ drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 2 +-
+ drivers/net/wireless/atmel.c | 7 +-
+ drivers/net/wireless/atmel.h | 4 +-
+ drivers/net/wireless/atmel_cs.c | 4 +-
+ drivers/net/wireless/atmel_pci.c | 4 +-
+ drivers/net/wireless/brcm80211/Kconfig | 5 +-
+ drivers/net/wireless/brcm80211/brcmfmac/Makefile | 3 +-
+ drivers/net/wireless/brcm80211/brcmfmac/bcdc.c | 384 +++++
+ drivers/net/wireless/brcm80211/brcmfmac/bcdc.h | 24 +
+ drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 3 -
+ .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 51 +-
+ drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 482 +-----
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 15 +-
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c | 392 -----
+ .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 22 +-
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c | 36 +-
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h | 2 +-
+ .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 194 +--
+ .../net/wireless/brcm80211/brcmfmac/dhd_proto.h | 42 -
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 462 ++++--
+ drivers/net/wireless/brcm80211/brcmfmac/fweh.h | 54 +
+ drivers/net/wireless/brcm80211/brcmfmac/fwil.c | 7 +-
+ drivers/net/wireless/brcm80211/brcmfmac/fwil.h | 61 +
+ .../net/wireless/brcm80211/brcmfmac/fwil_types.h | 304 ++++
+ drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 173 +-
+ drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 2 +-
+ drivers/net/wireless/brcm80211/brcmfmac/proto.c | 62 +
+ drivers/net/wireless/brcm80211/brcmfmac/proto.h | 57 +
+ .../net/wireless/brcm80211/brcmfmac/tracepoint.h | 33 +-
+ drivers/net/wireless/brcm80211/brcmfmac/usb.c | 4 +-
+ .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 29 +-
+ drivers/net/wireless/brcm80211/brcmsmac/channel.c | 38 +-
+ .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 66 +-
+ drivers/net/wireless/cw1200/cw1200_sdio.c | 4 +-
+ drivers/net/wireless/cw1200/scan.c | 15 +-
+ drivers/net/wireless/ipw2x00/ipw2100.c | 5 +-
+ drivers/net/wireless/ipw2x00/ipw2200.c | 8 +-
+ drivers/net/wireless/iwlegacy/3945-mac.c | 11 +-
+ drivers/net/wireless/iwlegacy/4965-mac.c | 8 +-
+ drivers/net/wireless/iwlegacy/common.c | 4 +-
+ drivers/net/wireless/iwlegacy/debug.c | 8 +-
+ drivers/net/wireless/iwlwifi/dvm/debugfs.c | 8 +-
+ drivers/net/wireless/iwlwifi/dvm/mac80211.c | 6 +-
+ drivers/net/wireless/iwlwifi/dvm/rs.h | 7 -
+ drivers/net/wireless/iwlwifi/dvm/scan.c | 2 +-
+ drivers/net/wireless/iwlwifi/dvm/tx.c | 1 +
+ drivers/net/wireless/iwlwifi/iwl-config.h | 6 +
+ drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c | 4 +-
+ drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 7 +-
+ drivers/net/wireless/iwlwifi/iwl-prph.h | 3 +
+ drivers/net/wireless/iwlwifi/mvm/Makefile | 1 +
+ drivers/net/wireless/iwlwifi/mvm/bt-coex.c | 13 +-
+ drivers/net/wireless/iwlwifi/mvm/d3.c | 38 +-
+ drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c | 190 +++
+ drivers/net/wireless/iwlwifi/mvm/debugfs.c | 636 +-------
+ drivers/net/wireless/iwlwifi/mvm/debugfs.h | 101 ++
+ drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h | 1 +
+ drivers/net/wireless/iwlwifi/mvm/fw-api-rs.h | 27 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 5 +-
+ drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 51 +-
+ drivers/net/wireless/iwlwifi/mvm/mac80211.c | 25 +-
+ drivers/net/wireless/iwlwifi/mvm/mvm.h | 11 +-
+ drivers/net/wireless/iwlwifi/mvm/nvm.c | 23 +
+ drivers/net/wireless/iwlwifi/mvm/quota.c | 3 +-
+ drivers/net/wireless/iwlwifi/mvm/rs.c | 1681 ++++++++++----------
+ drivers/net/wireless/iwlwifi/mvm/rs.h | 150 +-
+ drivers/net/wireless/iwlwifi/mvm/scan.c | 59 +-
+ drivers/net/wireless/iwlwifi/mvm/sta.c | 14 +-
+ drivers/net/wireless/iwlwifi/mvm/sta.h | 6 +
+ drivers/net/wireless/iwlwifi/mvm/tt.c | 2 +-
+ drivers/net/wireless/iwlwifi/mvm/tx.c | 11 +-
+ drivers/net/wireless/iwlwifi/mvm/utils.c | 8 +-
+ drivers/net/wireless/iwlwifi/pcie/drv.c | 5 +
+ drivers/net/wireless/iwlwifi/pcie/rx.c | 26 +-
+ drivers/net/wireless/iwlwifi/pcie/tx.c | 33 +-
+ drivers/net/wireless/libertas/README | 5 +-
+ drivers/net/wireless/libertas/if_sdio.c | 6 +-
+ drivers/net/wireless/libertas/if_spi.c | 1 -
+ drivers/net/wireless/mac80211_hwsim.c | 101 +-
+ drivers/net/wireless/mwifiex/11n_aggr.c | 6 +-
+ drivers/net/wireless/mwifiex/cfg80211.c | 26 +-
+ drivers/net/wireless/mwifiex/cmdevt.c | 4 +-
+ drivers/net/wireless/mwifiex/decl.h | 1 +
+ drivers/net/wireless/mwifiex/fw.h | 30 +-
+ drivers/net/wireless/mwifiex/init.c | 3 +-
+ drivers/net/wireless/mwifiex/main.c | 9 +-
+ drivers/net/wireless/mwifiex/main.h | 2 +-
+ drivers/net/wireless/mwifiex/scan.c | 4 +-
+ drivers/net/wireless/mwifiex/sta_cmd.c | 2 +-
+ drivers/net/wireless/mwifiex/sta_cmdresp.c | 35 +-
+ drivers/net/wireless/mwifiex/sta_rx.c | 44 +-
+ drivers/net/wireless/mwifiex/sta_tx.c | 1 +
+ drivers/net/wireless/mwifiex/txrx.c | 15 +-
+ drivers/net/wireless/mwifiex/uap_txrx.c | 39 +-
+ drivers/net/wireless/mwifiex/usb.c | 4 +-
+ drivers/net/wireless/mwifiex/util.c | 5 +-
+ drivers/net/wireless/p54/net2280.h | 3 +-
+ drivers/net/wireless/prism54/isl_38xx.c | 3 +-
+ drivers/net/wireless/prism54/isl_38xx.h | 3 +-
+ drivers/net/wireless/prism54/isl_ioctl.c | 3 +-
+ drivers/net/wireless/prism54/isl_ioctl.h | 3 +-
+ drivers/net/wireless/prism54/isl_oid.h | 3 +-
+ drivers/net/wireless/prism54/islpci_dev.c | 4 +-
+ drivers/net/wireless/prism54/islpci_dev.h | 3 +-
+ drivers/net/wireless/prism54/islpci_eth.c | 3 +-
+ drivers/net/wireless/prism54/islpci_eth.h | 3 +-
+ drivers/net/wireless/prism54/islpci_hotplug.c | 5 +-
+ drivers/net/wireless/prism54/islpci_mgt.c | 3 +-
+ drivers/net/wireless/prism54/islpci_mgt.h | 3 +-
+ drivers/net/wireless/prism54/oid_mgt.c | 3 +-
+ drivers/net/wireless/prism54/oid_mgt.h | 3 +-
+ drivers/net/wireless/prism54/prismcompat.h | 3 +-
+ drivers/net/wireless/ray_cs.c | 3 +-
+ drivers/net/wireless/rndis_wlan.c | 3 +-
+ drivers/net/wireless/rt2x00/rt2400pci.c | 4 +-
+ drivers/net/wireless/rt2x00/rt2400pci.h | 4 +-
+ drivers/net/wireless/rt2x00/rt2500pci.c | 4 +-
+ drivers/net/wireless/rt2x00/rt2500pci.h | 4 +-
+ drivers/net/wireless/rt2x00/rt2500usb.c | 4 +-
+ drivers/net/wireless/rt2x00/rt2500usb.h | 4 +-
+ drivers/net/wireless/rt2x00/rt2800.h | 4 +-
+ drivers/net/wireless/rt2x00/rt2800lib.c | 41 +-
+ drivers/net/wireless/rt2x00/rt2800lib.h | 4 +-
+ drivers/net/wireless/rt2x00/rt2800mmio.c | 4 +-
+ drivers/net/wireless/rt2x00/rt2800mmio.h | 4 +-
+ drivers/net/wireless/rt2x00/rt2800pci.c | 4 +-
+ drivers/net/wireless/rt2x00/rt2800pci.h | 4 +-
+ drivers/net/wireless/rt2x00/rt2800soc.c | 4 +-
+ drivers/net/wireless/rt2x00/rt2800usb.c | 4 +-
+ drivers/net/wireless/rt2x00/rt2800usb.h | 4 +-
+ drivers/net/wireless/rt2x00/rt2x00.h | 4 +-
+ drivers/net/wireless/rt2x00/rt2x00config.c | 4 +-
+ drivers/net/wireless/rt2x00/rt2x00crypto.c | 4 +-
+ drivers/net/wireless/rt2x00/rt2x00debug.c | 4 +-
+ drivers/net/wireless/rt2x00/rt2x00debug.h | 4 +-
+ drivers/net/wireless/rt2x00/rt2x00dev.c | 4 +-
+ drivers/net/wireless/rt2x00/rt2x00dump.h | 4 +-
+ drivers/net/wireless/rt2x00/rt2x00firmware.c | 4 +-
+ drivers/net/wireless/rt2x00/rt2x00leds.c | 4 +-
+ drivers/net/wireless/rt2x00/rt2x00leds.h | 4 +-
+ drivers/net/wireless/rt2x00/rt2x00lib.h | 4 +-
+ drivers/net/wireless/rt2x00/rt2x00link.c | 4 +-
+ drivers/net/wireless/rt2x00/rt2x00mac.c | 4 +-
+ drivers/net/wireless/rt2x00/rt2x00mmio.c | 4 +-
+ drivers/net/wireless/rt2x00/rt2x00mmio.h | 4 +-
+ drivers/net/wireless/rt2x00/rt2x00pci.c | 7 +-
+ drivers/net/wireless/rt2x00/rt2x00pci.h | 4 +-
+ drivers/net/wireless/rt2x00/rt2x00queue.c | 4 +-
+ drivers/net/wireless/rt2x00/rt2x00queue.h | 4 +-
+ drivers/net/wireless/rt2x00/rt2x00reg.h | 4 +-
+ drivers/net/wireless/rt2x00/rt2x00soc.c | 4 +-
+ drivers/net/wireless/rt2x00/rt2x00soc.h | 4 +-
+ drivers/net/wireless/rt2x00/rt2x00usb.c | 4 +-
+ drivers/net/wireless/rt2x00/rt2x00usb.h | 4 +-
+ drivers/net/wireless/rt2x00/rt61pci.c | 4 +-
+ drivers/net/wireless/rt2x00/rt61pci.h | 4 +-
+ drivers/net/wireless/rt2x00/rt73usb.c | 4 +-
+ drivers/net/wireless/rt2x00/rt73usb.h | 4 +-
+ drivers/net/wireless/rtl818x/rtl8187/dev.c | 2 +-
+ drivers/net/wireless/rtlwifi/base.c | 3 +-
+ drivers/net/wireless/rtlwifi/core.c | 11 +
+ drivers/net/wireless/rtlwifi/pci.c | 2 -
+ drivers/net/wireless/rtlwifi/regd.c | 61 +-
+ drivers/net/wireless/rtlwifi/rtl8188ee/dm.c | 2 +-
+ drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 327 ++--
+ drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h | 14 +
+ drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c | 39 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/dm.c | 9 +
+ drivers/net/wireless/rtlwifi/rtl8192cu/dm.h | 3 +
+ drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 2 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/phy.c | 6 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/rf.c | 29 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 16 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/table.c | 40 +-
+ drivers/net/wireless/rtlwifi/stats.c | 14 +
+ drivers/net/wireless/rtlwifi/usb.c | 8 +-
+ drivers/net/wireless/rtlwifi/wifi.h | 33 +-
+ drivers/net/wireless/ti/wl1251/acx.c | 209 +--
+ drivers/net/wireless/ti/wl12xx/scan.c | 2 +-
+ drivers/net/wireless/ti/wlcore/cmd.c | 2 +-
+ drivers/net/wireless/ti/wlcore/main.c | 3 +-
+ drivers/net/wireless/ti/wlcore/scan.c | 12 +-
+ drivers/net/wireless/zd1211rw/zd_chip.c | 3 +-
+ drivers/net/wireless/zd1211rw/zd_chip.h | 3 +-
+ drivers/net/wireless/zd1211rw/zd_def.h | 3 +-
+ drivers/net/wireless/zd1211rw/zd_mac.c | 3 +-
+ drivers/net/wireless/zd1211rw/zd_mac.h | 3 +-
+ drivers/net/wireless/zd1211rw/zd_rf.c | 3 +-
+ drivers/net/wireless/zd1211rw/zd_rf.h | 3 +-
+ drivers/net/wireless/zd1211rw/zd_rf_al2230.c | 3 +-
+ drivers/net/wireless/zd1211rw/zd_rf_al7230b.c | 3 +-
+ drivers/net/wireless/zd1211rw/zd_rf_rf2959.c | 3 +-
+ drivers/net/wireless/zd1211rw/zd_rf_uw2453.c | 3 +-
+ drivers/net/wireless/zd1211rw/zd_usb.c | 3 +-
+ drivers/net/wireless/zd1211rw/zd_usb.h | 3 +-
+ drivers/net/xen-netback/common.h | 27 +-
+ drivers/net/xen-netback/interface.c | 47 +-
+ drivers/net/xen-netback/netback.c | 236 +--
+ drivers/net/xen-netback/xenbus.c | 3 +-
+ drivers/nfc/mei_phy.c | 4 +-
+ drivers/nfc/microread/i2c.c | 4 +-
+ drivers/nfc/microread/mei.c | 4 +-
+ drivers/nfc/microread/microread.c | 4 +-
+ drivers/nfc/microread/microread.h | 4 +-
+ drivers/nfc/nfcwilink.c | 3 +-
+ drivers/nfc/pn533.c | 4 +-
+ drivers/nfc/pn544/i2c.c | 4 +-
+ drivers/nfc/pn544/mei.c | 4 +-
+ drivers/nfc/pn544/pn544.c | 4 +-
+ drivers/nfc/pn544/pn544.h | 4 +-
+ drivers/of/of_mdio.c | 135 +-
+ drivers/s390/net/netiucv.c | 8 +-
+ drivers/s390/net/qeth_core.h | 8 +
+ drivers/s390/net/qeth_core_main.c | 198 ++-
+ drivers/s390/net/qeth_core_mpc.h | 28 +-
+ drivers/vhost/net.c | 9 +-
+ drivers/vhost/scsi.c | 7 +-
+ drivers/vhost/test.c | 8 +-
+ drivers/vhost/vhost.c | 4 +-
+ drivers/vhost/vhost.h | 2 +-
+ include/asm-generic/hash.h | 9 +
+ include/linux/ath9k_platform.h | 2 +
+ include/linux/etherdevice.h | 94 +-
+ include/linux/hash.h | 36 +
+ include/linux/ieee80211.h | 8 +-
+ include/linux/if_macvlan.h | 7 +-
+ include/linux/inetdevice.h | 14 +-
+ include/linux/ipv6.h | 4 +-
+ include/linux/netdevice.h | 70 +-
+ include/linux/phy.h | 30 +-
+ include/linux/platform_data/pn544.h | 3 +-
+ include/linux/sctp.h | 5 +-
+ include/linux/skbuff.h | 213 ++-
+ include/net/act_api.h | 43 +-
+ include/net/addrconf.h | 11 +-
+ include/net/bluetooth/bluetooth.h | 3 +
+ include/net/bluetooth/hci.h | 6 +
+ include/net/bluetooth/hci_core.h | 6 +
+ include/net/bluetooth/l2cap.h | 45 +
+ include/net/cfg80211.h | 76 +-
+ include/net/cipso_ipv4.h | 5 +-
+ include/net/dcbevent.h | 3 +-
+ include/net/dcbnl.h | 3 +-
+ include/net/dn_dev.h | 2 +-
+ include/net/dst.h | 5 +-
+ include/net/if_inet6.h | 2 +-
+ include/net/ip.h | 6 -
+ include/net/ip6_route.h | 7 +-
+ include/net/ipv6.h | 6 +
+ include/net/irda/discovery.h | 4 +-
+ include/net/irda/ircomm_core.h | 4 +-
+ include/net/irda/ircomm_event.h | 4 +-
+ include/net/irda/ircomm_lmp.h | 4 +-
+ include/net/irda/ircomm_param.h | 4 +-
+ include/net/irda/ircomm_ttp.h | 4 +-
+ include/net/irda/ircomm_tty.h | 4 +-
+ include/net/irda/ircomm_tty_attach.h | 4 +-
+ include/net/irda/irda_device.h | 4 +-
+ include/net/irda/irlap_event.h | 4 +-
+ include/net/irda/irlap_frame.h | 4 +-
+ include/net/irda/parameters.h | 4 +-
+ include/net/irda/qos.h | 4 +-
+ include/net/mac80211.h | 40 +
+ include/net/mip6.h | 3 +-
+ include/net/neighbour.h | 78 +-
+ include/net/netlabel.h | 3 +-
+ include/net/netns/ipv4.h | 1 +
+ include/net/nfc/hci.h | 4 +-
+ include/net/nfc/llc.h | 4 +-
+ include/net/nfc/nci.h | 3 +-
+ include/net/nfc/nci_core.h | 3 +-
+ include/net/nfc/nfc.h | 4 +-
+ include/net/pkt_cls.h | 37 +-
+ include/net/pkt_sched.h | 1 +
+ include/net/regulatory.h | 80 +-
+ include/net/sch_generic.h | 2 +-
+ include/net/sctp/auth.h | 5 +-
+ include/net/sctp/checksum.h | 5 +-
+ include/net/sctp/command.h | 5 +-
+ include/net/sctp/constants.h | 5 +-
+ include/net/sctp/sctp.h | 5 +-
+ include/net/sctp/sm.h | 5 +-
+ include/net/sctp/structs.h | 64 +-
+ include/net/sctp/tsnmap.h | 5 +-
+ include/net/sctp/ulpevent.h | 5 +-
+ include/net/sctp/ulpqueue.h | 5 +-
+ include/net/tc_act/tc_skbedit.h | 3 +-
+ include/net/tcp.h | 8 +-
+ include/uapi/linux/if_addr.h | 5 +
+ include/uapi/linux/if_link.h | 13 +
+ include/uapi/linux/if_packet.h | 24 +-
+ include/uapi/linux/in6.h | 4 +
+ include/uapi/linux/net_tstamp.h | 16 +-
+ include/uapi/linux/netconf.h | 1 +
+ include/uapi/linux/netfilter/xt_osf.h | 3 +-
+ include/uapi/linux/nl80211.h | 47 +-
+ include/uapi/linux/pkt_sched.h | 25 +
+ include/uapi/linux/sctp.h | 5 +-
+ include/uapi/linux/snmp.h | 1 +
+ include/uapi/linux/sockios.h | 3 +-
+ lib/Makefile | 2 +-
+ lib/hash.c | 39 +
+ net/802/hippi.c | 4 +-
+ net/batman-adv/main.h | 2 +-
+ net/bluetooth/af_bluetooth.c | 2 +-
+ net/bluetooth/bnep/bnep.h | 3 +-
+ net/bluetooth/hci_core.c | 26 +-
+ net/bluetooth/hci_event.c | 72 +-
+ net/bluetooth/l2cap_core.c | 744 ++++++++-
+ net/bluetooth/l2cap_sock.c | 181 ++-
+ net/bluetooth/mgmt.c | 17 +-
+ net/bluetooth/smp.c | 56 +-
+ net/bluetooth/smp.h | 1 +
+ net/bridge/br_forward.c | 2 +-
+ net/bridge/br_if.c | 2 +-
+ net/bridge/br_netlink.c | 4 +-
+ net/bridge/br_vlan.c | 2 +-
+ net/bridge/netfilter/ebt_vlan.c | 3 +-
+ net/core/dev.c | 164 +-
+ net/core/dev_addr_lists.c | 97 +-
+ net/core/dev_ioctl.c | 2 +
+ net/core/flow_dissector.c | 6 +-
+ net/core/neighbour.c | 466 +++---
+ net/core/net-sysfs.c | 4 +-
+ net/core/netprio_cgroup.c | 2 +-
+ net/core/skbuff.c | 3 +-
+ net/dcb/dcbevent.c | 3 +-
+ net/dcb/dcbnl.c | 3 +-
+ net/dccp/ipv6.c | 3 +
+ net/decnet/dn_dev.c | 13 +-
+ net/decnet/dn_neigh.c | 28 +-
+ net/dns_resolver/dns_key.c | 3 +-
+ net/dns_resolver/dns_query.c | 3 +-
+ net/dns_resolver/internal.h | 3 +-
+ net/hsr/hsr_framereg.c | 13 +-
+ net/ipv4/af_inet.c | 30 +-
+ net/ipv4/arp.c | 39 +-
+ net/ipv4/cipso_ipv4.c | 3 +-
+ net/ipv4/devinet.c | 62 +-
+ net/ipv4/icmp.c | 4 +-
+ net/ipv4/ip_fragment.c | 2 +-
+ net/ipv4/ip_sockglue.c | 2 +-
+ net/ipv4/ip_tunnel_core.c | 5 +-
+ net/ipv4/ipmr.c | 2 +
+ net/ipv4/netfilter/nf_nat_snmp_basic.c | 3 +-
+ net/ipv4/proc.c | 1 +
+ net/ipv4/sysctl_net_ipv4.c | 23 +-
+ net/ipv4/tcp.c | 63 +-
+ net/ipv4/tcp_offload.c | 9 +-
+ net/ipv4/tcp_output.c | 139 +-
+ net/ipv4/xfrm4_state.c | 2 +-
+ net/ipv6/addrconf.c | 217 +--
+ net/ipv6/af_inet6.c | 5 +-
+ net/ipv6/ah6.c | 3 +-
+ net/ipv6/esp6.c | 3 +-
+ net/ipv6/ip6_gre.c | 3 +-
+ net/ipv6/ip6_offload.c | 51 +-
+ net/ipv6/ip6_output.c | 31 +-
+ net/ipv6/ip6_tunnel.c | 3 +-
+ net/ipv6/ipcomp6.c | 3 +-
+ net/ipv6/ipv6_sockglue.c | 9 +-
+ net/ipv6/mip6.c | 3 +-
+ net/ipv6/ndisc.c | 55 +-
+ net/ipv6/route.c | 16 +-
+ net/ipv6/tcp_ipv6.c | 11 +-
+ net/ipv6/tcpv6_offload.c | 6 +-
+ net/ipv6/tunnel6.c | 3 +-
+ net/ipv6/udp.c | 5 +-
+ net/ipv6/xfrm6_mode_ro.c | 3 +-
+ net/ipv6/xfrm6_tunnel.c | 3 +-
+ net/irda/af_irda.c | 4 +-
+ net/irda/discovery.c | 4 +-
+ net/irda/ircomm/ircomm_core.c | 4 +-
+ net/irda/ircomm/ircomm_event.c | 4 +-
+ net/irda/ircomm/ircomm_lmp.c | 4 +-
+ net/irda/ircomm/ircomm_param.c | 4 +-
+ net/irda/ircomm/ircomm_ttp.c | 4 +-
+ net/irda/ircomm/ircomm_tty.c | 4 +-
+ net/irda/ircomm/ircomm_tty_attach.c | 4 +-
+ net/irda/ircomm/ircomm_tty_ioctl.c | 4 +-
+ net/irda/irda_device.c | 4 +-
+ net/irda/irlap.c | 4 +-
+ net/irda/parameters.c | 4 +-
+ net/irda/qos.c | 4 +-
+ net/mac80211/cfg.c | 123 +-
+ net/mac80211/chan.c | 141 +-
+ net/mac80211/debugfs.c | 168 ++
+ net/mac80211/debugfs_sta.c | 134 ++
+ net/mac80211/ibss.c | 6 +-
+ net/mac80211/ieee80211_i.h | 43 +-
+ net/mac80211/iface.c | 14 +-
+ net/mac80211/key.c | 62 +-
+ net/mac80211/key.h | 13 +-
+ net/mac80211/main.c | 147 +-
+ net/mac80211/mesh.c | 7 +-
+ net/mac80211/mesh.h | 6 +-
+ net/mac80211/mesh_hwmp.c | 91 +-
+ net/mac80211/mesh_pathtbl.c | 7 +-
+ net/mac80211/mesh_plink.c | 708 +++++----
+ net/mac80211/mesh_ps.c | 3 +-
+ net/mac80211/mesh_sync.c | 28 +-
+ net/mac80211/mlme.c | 43 +-
+ net/mac80211/rate.h | 4 +-
+ net/mac80211/rc80211_minstrel.c | 3 +-
+ net/mac80211/rc80211_minstrel_ht.c | 22 +-
+ net/mac80211/rc80211_minstrel_ht_debugfs.c | 3 +-
+ net/mac80211/rx.c | 88 +-
+ net/mac80211/scan.c | 10 +-
+ net/mac80211/sta_info.c | 40 +-
+ net/mac80211/sta_info.h | 38 +-
+ net/mac80211/status.c | 78 +
+ net/mac80211/trace.h | 21 +-
+ net/mac80211/tx.c | 41 +-
+ net/mac80211/util.c | 95 +-
+ net/mac80211/vht.c | 7 +-
+ net/mac80211/wpa.c | 116 ++
+ net/mac80211/wpa.h | 2 +
+ net/netfilter/ipvs/ip_vs_nfct.c | 3 +-
+ net/netfilter/xt_connmark.c | 3 +-
+ net/netfilter/xt_osf.c | 3 +-
+ net/netlabel/netlabel_addrlist.c | 3 +-
+ net/netlabel/netlabel_addrlist.h | 3 +-
+ net/netlabel/netlabel_cipso_v4.c | 3 +-
+ net/netlabel/netlabel_cipso_v4.h | 3 +-
+ net/netlabel/netlabel_domainhash.c | 3 +-
+ net/netlabel/netlabel_domainhash.h | 3 +-
+ net/netlabel/netlabel_kapi.c | 3 +-
+ net/netlabel/netlabel_mgmt.c | 3 +-
+ net/netlabel/netlabel_mgmt.h | 3 +-
+ net/netlabel/netlabel_unlabeled.c | 3 +-
+ net/netlabel/netlabel_unlabeled.h | 3 +-
+ net/netlabel/netlabel_user.c | 3 +-
+ net/netlabel/netlabel_user.h | 3 +-
+ net/nfc/af_nfc.c | 4 +-
+ net/nfc/core.c | 4 +-
+ net/nfc/hci/command.c | 4 +-
+ net/nfc/hci/core.c | 4 +-
+ net/nfc/hci/hci.h | 4 +-
+ net/nfc/hci/hcp.c | 4 +-
+ net/nfc/hci/llc.c | 4 +-
+ net/nfc/hci/llc.h | 4 +-
+ net/nfc/hci/llc_nop.c | 4 +-
+ net/nfc/hci/llc_shdlc.c | 4 +-
+ net/nfc/llcp.h | 4 +-
+ net/nfc/llcp_commands.c | 4 +-
+ net/nfc/llcp_core.c | 4 +-
+ net/nfc/llcp_sock.c | 4 +-
+ net/nfc/nci/core.c | 3 +-
+ net/nfc/nci/data.c | 3 +-
+ net/nfc/nci/lib.c | 3 +-
+ net/nfc/nci/ntf.c | 3 +-
+ net/nfc/nci/rsp.c | 3 +-
+ net/nfc/netlink.c | 4 +-
+ net/nfc/nfc.h | 4 +-
+ net/nfc/rawsock.c | 4 +-
+ net/openvswitch/actions.c | 10 +-
+ net/openvswitch/flow_table.c | 4 +-
+ net/packet/af_packet.c | 129 +-
+ net/packet/internal.h | 1 +
+ net/rfkill/core.c | 4 +-
+ net/sched/Kconfig | 9 +
+ net/sched/Makefile | 1 +
+ net/sched/act_api.c | 201 +--
+ net/sched/act_csum.c | 13 +-
+ net/sched/act_gact.c | 13 +-
+ net/sched/act_ipt.c | 21 +-
+ net/sched/act_mirred.c | 16 +-
+ net/sched/act_nat.c | 12 +-
+ net/sched/act_pedit.c | 12 +-
+ net/sched/act_police.c | 69 +-
+ net/sched/act_simple.c | 20 +-
+ net/sched/act_skbedit.c | 16 +-
+ net/sched/cls_api.c | 99 +-
+ net/sched/cls_basic.c | 13 +-
+ net/sched/cls_bpf.c | 15 +-
+ net/sched/cls_cgroup.c | 14 +-
+ net/sched/cls_flow.c | 15 +-
+ net/sched/cls_fw.c | 13 +-
+ net/sched/cls_route.c | 13 +-
+ net/sched/cls_rsvp.h | 13 +-
+ net/sched/cls_tcindex.c | 17 +-
+ net/sched/cls_u32.c | 15 +-
+ net/sched/em_meta.c | 159 +-
+ net/sched/sch_api.c | 8 +-
+ net/sched/sch_cbq.c | 6 +-
+ net/sched/sch_dsmark.c | 2 +-
+ net/sched/sch_fq.c | 36 +-
+ net/sched/sch_generic.c | 6 +-
+ net/sched/sch_hhf.c | 746 +++++++++
+ net/sched/sch_htb.c | 16 +-
+ net/sched/sch_mq.c | 13 +-
+ net/sched/sch_mqprio.c | 10 +-
+ net/sched/sch_multiq.c | 3 +-
+ net/sched/sch_netem.c | 2 +-
+ net/sched/sch_sfq.c | 10 +-
+ net/sctp/associola.c | 70 +-
+ net/sctp/auth.c | 5 +-
+ net/sctp/bind_addr.c | 5 +-
+ net/sctp/chunk.c | 5 +-
+ net/sctp/command.c | 5 +-
+ net/sctp/debug.c | 5 +-
+ net/sctp/endpointola.c | 5 +-
+ net/sctp/input.c | 14 +-
+ net/sctp/inqueue.c | 5 +-
+ net/sctp/ipv6.c | 5 +-
+ net/sctp/objcnt.c | 5 +-
+ net/sctp/output.c | 5 +-
+ net/sctp/outqueue.c | 5 +-
+ net/sctp/primitive.c | 5 +-
+ net/sctp/proc.c | 5 +-
+ net/sctp/protocol.c | 5 +-
+ net/sctp/sm_make_chunk.c | 5 +-
+ net/sctp/sm_sideeffect.c | 5 +-
+ net/sctp/sm_statefuns.c | 5 +-
+ net/sctp/sm_statetable.c | 5 +-
+ net/sctp/socket.c | 5 +-
+ net/sctp/ssnmap.c | 5 +-
+ net/sctp/sysctl.c | 5 +-
+ net/sctp/transport.c | 5 +-
+ net/sctp/tsnmap.c | 5 +-
+ net/sctp/ulpevent.c | 5 +-
+ net/sctp/ulpqueue.c | 5 +-
+ net/socket.c | 106 +-
+ net/tipc/bcast.c | 6 -
+ net/tipc/bearer.c | 323 +++-
+ net/tipc/bearer.h | 52 +-
+ net/tipc/core.c | 8 +-
+ net/tipc/core.h | 2 +-
+ net/tipc/discover.c | 17 +-
+ net/tipc/eth_media.c | 326 +---
+ net/tipc/ib_media.c | 319 +---
+ net/tipc/link.c | 124 +-
+ net/tipc/link.h | 7 -
+ net/tipc/name_table.c | 3 +-
+ net/tipc/node.c | 6 +-
+ net/tipc/port.c | 9 +-
+ net/tipc/socket.c | 33 +-
+ net/unix/af_unix.c | 9 +-
+ net/wireless/chan.c | 203 ++-
+ net/wireless/core.c | 6 +-
+ net/wireless/core.h | 18 +-
+ net/wireless/genregdb.awk | 45 +-
+ net/wireless/ibss.c | 4 +-
+ net/wireless/mesh.c | 3 +-
+ net/wireless/mlme.c | 20 +-
+ net/wireless/nl80211.c | 107 +-
+ net/wireless/nl80211.h | 2 +-
+ net/wireless/rdev-ops.h | 12 +-
+ net/wireless/reg.c | 802 ++++++----
+ net/wireless/reg.h | 3 +-
+ net/wireless/trace.h | 15 +-
+ net/x25/af_x25.c | 4 +-
+ net/x25/x25_dev.c | 10 +-
+ net/x25/x25_facilities.c | 14 +-
+ net/x25/x25_forward.c | 5 +-
+ net/x25/x25_in.c | 4 +-
+ net/x25/x25_link.c | 6 +-
+ net/x25/x25_subr.c | 6 +-
+ tools/net/Makefile | 23 +-
+ tools/net/bpf_asm.c | 52 +
+ tools/net/bpf_dbg.c | 1404 ++++++++++++++++
+ tools/net/bpf_exp.l | 143 ++
+ tools/net/bpf_exp.y | 762 +++++++++
+ 971 files changed, 27982 insertions(+), 17906 deletions(-)
+ create mode 100644 Documentation/networking/timestamping/hwtstamp_config.c
+ create mode 100644 arch/x86/include/asm/hash.h
+ create mode 100644 arch/x86/lib/hash.c
+ create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_buffalo_initvals.h
+ create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_wow.c
+ create mode 100644 drivers/net/wireless/ath/ath9k/ar9565_1p1_initvals.h
+ create mode 100644 drivers/net/wireless/ath/ath9k/tx99.c
+ create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/bcdc.c
+ create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/bcdc.h
+ delete mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
+ delete mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h
+ create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/proto.c
+ create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/proto.h
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/debugfs.h
+ create mode 100644 include/asm-generic/hash.h
+ create mode 100644 lib/hash.c
+ create mode 100644 net/sched/sch_hhf.c
+ create mode 100644 tools/net/bpf_asm.c
+ create mode 100644 tools/net/bpf_dbg.c
+ create mode 100644 tools/net/bpf_exp.l
+ create mode 100644 tools/net/bpf_exp.y
+Merging ipsec-next/master (b3c6efbc36e2 xfrm: Add file to document IPsec corner case)
+$ git merge ipsec-next/master
+Auto-merging net/sctp/ipv6.c
+Auto-merging net/l2tp/l2tp_ip6.c
+Auto-merging net/ipv6/udp.c
+Auto-merging net/ipv6/tcp_ipv6.c
+Auto-merging net/ipv6/raw.c
+Auto-merging net/ipv6/ip6_output.c
+Auto-merging net/ipv6/datagram.c
+Auto-merging net/ipv6/af_inet6.c
+Auto-merging net/ipv4/udp.c
+Auto-merging net/ipv4/af_inet.c
+Auto-merging net/dccp/ipv6.c
+Auto-merging include/net/ipv6.h
+Merge made by the 'recursive' strategy.
+ Documentation/networking/ipsec.txt | 38 ++++++++++
+ include/net/flow.h | 3 +-
+ include/net/ipv6.h | 6 +-
+ include/net/netns/xfrm.h | 6 +-
+ include/net/route.h | 8 +-
+ include/net/xfrm.h | 14 ++--
+ net/dccp/ipv4.c | 2 +-
+ net/dccp/ipv6.c | 8 +-
+ net/decnet/dn_route.c | 2 -
+ net/ipv4/af_inet.c | 2 +-
+ net/ipv4/datagram.c | 2 +-
+ net/ipv4/raw.c | 2 +-
+ net/ipv4/tcp_ipv4.c | 2 +-
+ net/ipv4/udp.c | 2 +-
+ net/ipv6/af_inet6.c | 2 +-
+ net/ipv6/datagram.c | 2 +-
+ net/ipv6/inet6_connection_sock.c | 4 +-
+ net/ipv6/ip6_output.c | 12 +--
+ net/ipv6/ping.c | 2 +-
+ net/ipv6/raw.c | 2 +-
+ net/ipv6/syncookies.c | 2 +-
+ net/ipv6/tcp_ipv6.c | 4 +-
+ net/ipv6/udp.c | 2 +-
+ net/key/af_key.c | 29 ++++---
+ net/l2tp/l2tp_ip6.c | 2 +-
+ net/sctp/ipv6.c | 4 +-
+ net/xfrm/xfrm_policy.c | 151 ++++++++++++++++++-------------------
+ net/xfrm/xfrm_state.c | 149 +++++++++++++++++++-----------------
+ net/xfrm/xfrm_user.c | 56 ++++++--------
+ 29 files changed, 277 insertions(+), 243 deletions(-)
+ create mode 100644 Documentation/networking/ipsec.txt
+Merging wireless-next/master (39731b78b4af ath9k: simplify/fix tx packet TID handling)
+$ git merge wireless-next/master
+Removing drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
+Auto-merging drivers/net/wireless/ath/ath9k/xmit.c
+Auto-merging drivers/net/wireless/ath/ath9k/main.c
+Auto-merging drivers/net/wireless/ath/ath9k/ar9002_mac.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 4 +-
+ drivers/bcma/main.c | 1 +
+ drivers/net/wireless/ath/ath6kl/wmi.c | 6 +-
+ drivers/net/wireless/ath/ath9k/Makefile | 4 +-
+ drivers/net/wireless/ath/ath9k/antenna.c | 8 +-
+ drivers/net/wireless/ath/ath9k/ar9002_hw.c | 8 +-
+ drivers/net/wireless/ath/ath9k/ar9002_mac.c | 6 +-
+ drivers/net/wireless/ath/ath9k/ar9002_phy.c | 1 -
+ drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 52 +-
+ drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 14 +-
+ drivers/net/wireless/ath/ath9k/ar9003_mac.c | 18 +-
+ drivers/net/wireless/ath/ath9k/ar9003_phy.h | 4 +-
+ drivers/net/wireless/ath/ath9k/ath9k.h | 367 +++-------
+ drivers/net/wireless/ath/ath9k/beacon.c | 137 ++--
+ drivers/net/wireless/ath/ath9k/btcoex.c | 6 -
+ drivers/net/wireless/ath/ath9k/common.c | 4 +-
+ drivers/net/wireless/ath/ath9k/debug.c | 352 ++--------
+ drivers/net/wireless/ath/ath9k/debug.h | 9 +-
+ drivers/net/wireless/ath/ath9k/dfs.c | 4 +-
+ drivers/net/wireless/ath/ath9k/eeprom_4k.c | 26 +-
+ drivers/net/wireless/ath/ath9k/eeprom_9287.c | 26 +-
+ drivers/net/wireless/ath/ath9k/eeprom_def.c | 26 +-
+ drivers/net/wireless/ath/ath9k/gpio.c | 89 +--
+ drivers/net/wireless/ath/ath9k/htc.h | 5 +
+ drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 39 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_gpio.c | 17 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_init.c | 2 +
+ drivers/net/wireless/ath/ath9k/hw-ops.h | 5 +-
+ drivers/net/wireless/ath/ath9k/hw.c | 249 +++----
+ drivers/net/wireless/ath/ath9k/hw.h | 38 +-
+ drivers/net/wireless/ath/ath9k/init.c | 4 +-
+ drivers/net/wireless/ath/ath9k/mac.c | 27 +-
+ drivers/net/wireless/ath/ath9k/mac.h | 8 +-
+ drivers/net/wireless/ath/ath9k/main.c | 18 +-
+ drivers/net/wireless/ath/ath9k/mci.c | 2 +-
+ drivers/net/wireless/ath/ath9k/recv.c | 196 +-----
+ drivers/net/wireless/ath/ath9k/spectral.c | 543 +++++++++++++++
+ drivers/net/wireless/ath/ath9k/spectral.h | 212 ++++++
+ drivers/net/wireless/ath/ath9k/xmit.c | 9 +-
+ drivers/net/wireless/ath/wcn36xx/smd.c | 32 +-
+ drivers/net/wireless/brcm80211/brcmfmac/Makefile | 1 -
+ drivers/net/wireless/brcm80211/brcmfmac/bcdc.c | 79 +--
+ drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 628 ++++++++++++++---
+ .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 552 ---------------
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 8 +
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 740 ++++++++++-----------
+ drivers/net/wireless/brcm80211/brcmfmac/fwil.c | 12 +-
+ drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 41 +-
+ drivers/net/wireless/brcm80211/brcmfmac/proto.c | 2 +-
+ drivers/net/wireless/brcm80211/brcmfmac/proto.h | 14 +-
+ .../net/wireless/brcm80211/brcmfmac/sdio_chip.c | 296 ++++-----
+ .../net/wireless/brcm80211/brcmfmac/sdio_chip.h | 2 +-
+ .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 82 +--
+ drivers/net/wireless/brcm80211/brcmfmac/usb.c | 1 +
+ drivers/net/wireless/iwlegacy/3945-debug.c | 6 +-
+ drivers/net/wireless/iwlegacy/4965-debug.c | 6 +-
+ drivers/net/wireless/iwlegacy/debug.c | 2 +-
+ drivers/net/wireless/iwlwifi/dvm/mac80211.c | 6 -
+ drivers/net/wireless/iwlwifi/dvm/main.c | 4 +-
+ drivers/net/wireless/iwlwifi/iwl-7000.c | 2 +-
+ drivers/net/wireless/iwlwifi/iwl-config.h | 2 +
+ drivers/net/wireless/iwlwifi/iwl-drv.c | 39 ++
+ drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c | 7 +
+ drivers/net/wireless/iwlwifi/iwl-fw-file.h | 1 +
+ drivers/net/wireless/iwlwifi/iwl-fw.h | 46 ++
+ drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 15 +-
+ drivers/net/wireless/iwlwifi/iwl-op-mode.h | 4 +-
+ drivers/net/wireless/iwlwifi/iwl-trans.h | 66 +-
+ drivers/net/wireless/iwlwifi/mvm/Makefile | 3 +-
+ drivers/net/wireless/iwlwifi/mvm/binding.c | 16 +-
+ drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c | 366 +++++++++-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 16 +
+ drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h | 10 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h | 1 +
+ drivers/net/wireless/iwlwifi/mvm/fw-api.h | 65 ++
+ drivers/net/wireless/iwlwifi/mvm/fw.c | 28 +-
+ drivers/net/wireless/iwlwifi/mvm/mac80211.c | 275 +++++---
+ drivers/net/wireless/iwlwifi/mvm/mvm.h | 45 +-
+ drivers/net/wireless/iwlwifi/mvm/ops.c | 20 +-
+ drivers/net/wireless/iwlwifi/mvm/power.c | 395 ++++++-----
+ drivers/net/wireless/iwlwifi/mvm/rs.c | 686 +++++++++----------
+ drivers/net/wireless/iwlwifi/mvm/rs.h | 2 -
+ drivers/net/wireless/iwlwifi/mvm/rx.c | 6 +
+ drivers/net/wireless/iwlwifi/mvm/sf.c | 291 ++++++++
+ drivers/net/wireless/iwlwifi/mvm/sta.c | 32 +-
+ drivers/net/wireless/iwlwifi/mvm/tt.c | 2 +-
+ drivers/net/wireless/iwlwifi/mvm/tx.c | 3 +-
+ drivers/net/wireless/iwlwifi/mvm/utils.c | 5 +
+ drivers/net/wireless/iwlwifi/pcie/internal.h | 33 +-
+ drivers/net/wireless/iwlwifi/pcie/rx.c | 35 +-
+ drivers/net/wireless/iwlwifi/pcie/trans.c | 86 ++-
+ drivers/net/wireless/iwlwifi/pcie/tx.c | 37 +-
+ drivers/net/wireless/mwifiex/cfg80211.c | 35 +-
+ drivers/net/wireless/mwifiex/fw.h | 9 -
+ drivers/net/wireless/mwifiex/main.h | 4 +
+ drivers/net/wireless/mwifiex/sta_cmd.c | 77 ++-
+ drivers/net/wireless/mwifiex/sta_ioctl.c | 15 +
+ include/net/cfg80211.h | 123 +++-
+ include/net/mac80211.h | 45 +-
+ include/uapi/linux/nl80211.h | 65 +-
+ net/mac80211/cfg.c | 30 +-
+ net/mac80211/driver-ops.h | 32 +-
+ net/mac80211/ibss.c | 74 +--
+ net/mac80211/ieee80211_i.h | 21 +-
+ net/mac80211/iface.c | 49 +-
+ net/mac80211/key.c | 60 +-
+ net/mac80211/key.h | 3 +-
+ net/mac80211/main.c | 8 +-
+ net/mac80211/mesh.c | 5 +
+ net/mac80211/mesh_sync.c | 9 +-
+ net/mac80211/mlme.c | 2 +-
+ net/mac80211/pm.c | 3 +-
+ net/mac80211/rx.c | 33 +-
+ net/mac80211/scan.c | 80 ++-
+ net/mac80211/sta_info.c | 118 ++--
+ net/mac80211/sta_info.h | 30 +-
+ net/mac80211/trace.h | 58 +-
+ net/mac80211/tx.c | 12 +-
+ net/mac80211/util.c | 34 +
+ net/wireless/core.c | 25 +-
+ net/wireless/core.h | 6 +-
+ net/wireless/mesh.c | 13 +-
+ net/wireless/nl80211.c | 380 ++++++++---
+ net/wireless/reg.c | 27 +
+ net/wireless/reg.h | 1 +
+ net/wireless/scan.c | 16 +-
+ 126 files changed, 5213 insertions(+), 3989 deletions(-)
+ create mode 100644 drivers/net/wireless/ath/ath9k/spectral.c
+ create mode 100644 drivers/net/wireless/ath/ath9k/spectral.h
+ delete mode 100644 drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/sf.c
+Merging bluetooth/master (c567c77101f0 6lowpan: cleanup udp compress function)
+$ git merge bluetooth/master
+Auto-merging net/ipv6/addrconf.c
+Merge made by the 'recursive' strategy.
+ include/net/bluetooth/hci.h | 1 +
+ include/net/bluetooth/hci_core.h | 1 +
+ include/net/bluetooth/l2cap.h | 1 +
+ include/uapi/linux/if_arp.h | 1 +
+ net/bluetooth/6lowpan.c | 860 +++++++++++++++++++++++++++++++++++++++
+ net/bluetooth/6lowpan.h | 26 ++
+ net/bluetooth/Makefile | 6 +-
+ net/bluetooth/hci_core.c | 45 ++
+ net/bluetooth/hci_event.c | 3 +
+ net/bluetooth/l2cap_core.c | 12 +
+ net/ieee802154/6lowpan.c | 796 ++----------------------------------
+ net/ieee802154/6lowpan.h | 72 ++++
+ net/ieee802154/6lowpan_iphc.c | 799 ++++++++++++++++++++++++++++++++++++
+ net/ieee802154/Makefile | 2 +-
+ net/ipv6/addrconf.c | 4 +-
+ 15 files changed, 1870 insertions(+), 759 deletions(-)
+ create mode 100644 net/bluetooth/6lowpan.c
+ create mode 100644 net/bluetooth/6lowpan.h
+ create mode 100644 net/ieee802154/6lowpan_iphc.c
+Merging infiniband/for-next (771b0f3fc474 Merge branches 'cxgb4', 'flowsteer', 'misc', 'ocrdma' and 'usnic' into for-next)
+$ git merge infiniband/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 5 +
+ drivers/infiniband/Kconfig | 1 +
+ drivers/infiniband/Makefile | 1 +
+ drivers/infiniband/core/iwcm.c | 11 +-
+ drivers/infiniband/core/uverbs.h | 12 +-
+ drivers/infiniband/core/uverbs_cmd.c | 17 +
+ drivers/infiniband/core/uverbs_main.c | 19 +-
+ drivers/infiniband/hw/cxgb4/mem.c | 2 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 1 +
+ drivers/infiniband/hw/ocrdma/ocrdma_sli.h | 4 +-
+ drivers/infiniband/hw/usnic/Kconfig | 11 +
+ drivers/infiniband/hw/usnic/Makefile | 15 +
+ drivers/infiniband/hw/usnic/usnic.h | 29 +
+ drivers/infiniband/hw/usnic/usnic_abi.h | 56 ++
+ drivers/infiniband/hw/usnic/usnic_common_pkt_hdr.h | 27 +
+ drivers/infiniband/hw/usnic/usnic_common_util.h | 51 ++
+ drivers/infiniband/hw/usnic/usnic_debugfs.c | 71 ++
+ drivers/infiniband/hw/usnic/usnic_debugfs.h | 25 +
+ drivers/infiniband/hw/usnic/usnic_fwd.c | 243 +++++++
+ drivers/infiniband/hw/usnic/usnic_fwd.h | 58 ++
+ drivers/infiniband/hw/usnic/usnic_ib.h | 115 ++++
+ drivers/infiniband/hw/usnic/usnic_ib_main.c | 598 +++++++++++++++++
+ drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c | 541 +++++++++++++++
+ drivers/infiniband/hw/usnic/usnic_ib_qp_grp.h | 97 +++
+ drivers/infiniband/hw/usnic/usnic_ib_sysfs.c | 351 ++++++++++
+ drivers/infiniband/hw/usnic/usnic_ib_sysfs.h | 29 +
+ drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 734 +++++++++++++++++++++
+ drivers/infiniband/hw/usnic/usnic_ib_verbs.h | 72 ++
+ drivers/infiniband/hw/usnic/usnic_log.h | 58 ++
+ drivers/infiniband/hw/usnic/usnic_transport.c | 125 ++++
+ drivers/infiniband/hw/usnic/usnic_transport.h | 27 +
+ drivers/infiniband/hw/usnic/usnic_uiom.c | 599 +++++++++++++++++
+ drivers/infiniband/hw/usnic/usnic_uiom.h | 80 +++
+ .../infiniband/hw/usnic/usnic_uiom_interval_tree.c | 237 +++++++
+ .../infiniband/hw/usnic/usnic_uiom_interval_tree.h | 74 +++
+ drivers/infiniband/hw/usnic/usnic_vnic.c | 473 +++++++++++++
+ drivers/infiniband/hw/usnic/usnic_vnic.h | 105 +++
+ include/rdma/ib_verbs.h | 2 +-
+ 38 files changed, 4957 insertions(+), 19 deletions(-)
+ create mode 100644 drivers/infiniband/hw/usnic/Kconfig
+ create mode 100644 drivers/infiniband/hw/usnic/Makefile
+ create mode 100644 drivers/infiniband/hw/usnic/usnic.h
+ create mode 100644 drivers/infiniband/hw/usnic/usnic_abi.h
+ create mode 100644 drivers/infiniband/hw/usnic/usnic_common_pkt_hdr.h
+ create mode 100644 drivers/infiniband/hw/usnic/usnic_common_util.h
+ create mode 100644 drivers/infiniband/hw/usnic/usnic_debugfs.c
+ create mode 100644 drivers/infiniband/hw/usnic/usnic_debugfs.h
+ create mode 100644 drivers/infiniband/hw/usnic/usnic_fwd.c
+ create mode 100644 drivers/infiniband/hw/usnic/usnic_fwd.h
+ create mode 100644 drivers/infiniband/hw/usnic/usnic_ib.h
+ create mode 100644 drivers/infiniband/hw/usnic/usnic_ib_main.c
+ create mode 100644 drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c
+ create mode 100644 drivers/infiniband/hw/usnic/usnic_ib_qp_grp.h
+ create mode 100644 drivers/infiniband/hw/usnic/usnic_ib_sysfs.c
+ create mode 100644 drivers/infiniband/hw/usnic/usnic_ib_sysfs.h
+ create mode 100644 drivers/infiniband/hw/usnic/usnic_ib_verbs.c
+ create mode 100644 drivers/infiniband/hw/usnic/usnic_ib_verbs.h
+ create mode 100644 drivers/infiniband/hw/usnic/usnic_log.h
+ create mode 100644 drivers/infiniband/hw/usnic/usnic_transport.c
+ create mode 100644 drivers/infiniband/hw/usnic/usnic_transport.h
+ create mode 100644 drivers/infiniband/hw/usnic/usnic_uiom.c
+ create mode 100644 drivers/infiniband/hw/usnic/usnic_uiom.h
+ create mode 100644 drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.c
+ create mode 100644 drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.h
+ create mode 100644 drivers/infiniband/hw/usnic/usnic_vnic.c
+ create mode 100644 drivers/infiniband/hw/usnic/usnic_vnic.h
+Merging mtd/master (15b540c71cac mtd: nand: pxa3xx: Use info->use_dma to release DMA resources)
+$ git merge mtd/master
+Already up-to-date.
+Merging l2-mtd/master (dd0a577efe72 mtd: nand: pxa3xx: Consolidate ECC initialization)
+$ git merge l2-mtd/master
+Auto-merging drivers/mtd/nand/mpc5121_nfc.c
+Auto-merging drivers/mtd/maps/pxa2xx-flash.c
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/arm/davinci/nand.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/davinci/nand.txt | 46 --
+ .../devicetree/bindings/mtd/davinci-nand.txt | 94 +++
+ .../devicetree/bindings/mtd/gpmi-nand.txt | 8 +
+ .../devicetree/bindings/mtd/pxa3xx-nand.txt | 6 +-
+ Documentation/mtd/nand/pxa3xx-nand.txt | 113 ++++
+ MAINTAINERS | 9 +-
+ drivers/mtd/afs.c | 3 +-
+ drivers/mtd/ar7part.c | 3 +-
+ drivers/mtd/bcm47xxpart.c | 3 +-
+ drivers/mtd/bcm63xxpart.c | 3 +-
+ drivers/mtd/cmdlinepart.c | 3 +-
+ drivers/mtd/devices/m25p80.c | 211 ++++++-
+ drivers/mtd/devices/ms02-nv.c | 2 +-
+ drivers/mtd/devices/mtd_dataflash.c | 5 +-
+ drivers/mtd/lpddr/lpddr_cmds.c | 32 +-
+ drivers/mtd/maps/pxa2xx-flash.c | 2 +-
+ drivers/mtd/maps/sun_uflash.c | 2 +-
+ drivers/mtd/mtdcore.c | 10 +-
+ drivers/mtd/mtdpart.c | 9 +-
+ drivers/mtd/nand/Kconfig | 14 +-
+ drivers/mtd/nand/au1550nd.c | 2 +
+ drivers/mtd/nand/davinci_nand.c | 89 +--
+ drivers/mtd/nand/denali.c | 2 +-
+ drivers/mtd/nand/denali_pci.c | 2 +-
+ drivers/mtd/nand/diskonchip.c | 10 +-
+ drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 127 ++--
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 165 ++---
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 2 -
+ drivers/mtd/nand/lpc32xx_mlc.c | 16 +-
+ drivers/mtd/nand/mpc5121_nfc.c | 6 -
+ drivers/mtd/nand/mxc_nand.c | 7 +-
+ drivers/mtd/nand/nand_base.c | 26 +-
+ drivers/mtd/nand/pasemi_nand.c | 2 +-
+ drivers/mtd/nand/pxa3xx_nand.c | 688 ++++++++++++++++-----
+ drivers/mtd/nand/sh_flctl.c | 47 +-
+ drivers/mtd/ofpart.c | 19 +-
+ drivers/mtd/redboot.c | 3 +-
+ drivers/mtd/tests/mtd_nandecctest.c | 2 +-
+ fs/jffs2/malloc.c | 4 +
+ include/linux/mtd/nand.h | 2 +-
+ include/linux/mtd/partitions.h | 8 +-
+ include/linux/of_mtd.h | 2 +-
+ include/linux/platform_data/mtd-nand-pxa3xx.h | 3 +
+ 43 files changed, 1227 insertions(+), 585 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/arm/davinci/nand.txt
+ create mode 100644 Documentation/devicetree/bindings/mtd/davinci-nand.txt
+ create mode 100644 Documentation/mtd/nand/pxa3xx-nand.txt
+Merging crypto/master (e37b94ebffdd crypto: memneq - fix for archs without efficient unaligned access)
+$ git merge crypto/master
+Auto-merging include/linux/compiler-intel.h
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 7 +
+ crypto/Makefile | 5 -
+ crypto/memneq.c | 80 +-
+ crypto/pcrypt.c | 2 +-
+ drivers/crypto/Kconfig | 12 +
+ drivers/crypto/Makefile | 1 +
+ drivers/crypto/ccp/Kconfig | 23 +
+ drivers/crypto/ccp/Makefile | 10 +
+ drivers/crypto/ccp/ccp-crypto-aes-cmac.c | 355 ++++++
+ drivers/crypto/ccp/ccp-crypto-aes-xts.c | 285 +++++
+ drivers/crypto/ccp/ccp-crypto-aes.c | 375 ++++++
+ drivers/crypto/ccp/ccp-crypto-main.c | 432 +++++++
+ drivers/crypto/ccp/ccp-crypto-sha.c | 497 ++++++++
+ drivers/crypto/ccp/ccp-crypto.h | 191 +++
+ drivers/crypto/ccp/ccp-dev.c | 582 +++++++++
+ drivers/crypto/ccp/ccp-dev.h | 272 ++++
+ drivers/crypto/ccp/ccp-ops.c | 2020 ++++++++++++++++++++++++++++++
+ drivers/crypto/ccp/ccp-pci.c | 360 ++++++
+ drivers/crypto/omap-aes.c | 16 +-
+ drivers/crypto/omap-sham.c | 7 +-
+ drivers/crypto/talitos.c | 21 +-
+ include/linux/ccp.h | 525 ++++++++
+ include/linux/compiler-gcc.h | 3 +
+ include/linux/compiler-intel.h | 7 +
+ include/linux/compiler.h | 4 +
+ kernel/padata.c | 2 +-
+ 26 files changed, 6052 insertions(+), 42 deletions(-)
+ create mode 100644 drivers/crypto/ccp/Kconfig
+ create mode 100644 drivers/crypto/ccp/Makefile
+ create mode 100644 drivers/crypto/ccp/ccp-crypto-aes-cmac.c
+ create mode 100644 drivers/crypto/ccp/ccp-crypto-aes-xts.c
+ create mode 100644 drivers/crypto/ccp/ccp-crypto-aes.c
+ create mode 100644 drivers/crypto/ccp/ccp-crypto-main.c
+ create mode 100644 drivers/crypto/ccp/ccp-crypto-sha.c
+ create mode 100644 drivers/crypto/ccp/ccp-crypto.h
+ create mode 100644 drivers/crypto/ccp/ccp-dev.c
+ create mode 100644 drivers/crypto/ccp/ccp-dev.h
+ create mode 100644 drivers/crypto/ccp/ccp-ops.c
+ create mode 100644 drivers/crypto/ccp/ccp-pci.c
+ create mode 100644 include/linux/ccp.h
+Merging drm/drm-next (fe3c703c3d80 drm/dp: Clarify automated test constant and add constant for FAUX test pattern)
+$ git merge drm/drm-next
+Resolved 'drivers/gpu/drm/drm_stub.c' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/intel_pm.c' using previous resolution.
+Resolved 'drivers/staging/imx-drm/imx-drm-core.c' using previous resolution.
+Auto-merging drivers/staging/imx-drm/imx-drm-core.c
+CONFLICT (content): Merge conflict in drivers/staging/imx-drm/imx-drm-core.c
+Auto-merging drivers/gpu/drm/radeon/radeon_drv.c
+Auto-merging drivers/gpu/drm/i915/intel_pm.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c
+Auto-merging drivers/gpu/drm/i915/intel_opregion.c
+Auto-merging drivers/gpu/drm/i915/intel_drv.h
+Auto-merging drivers/gpu/drm/i915/intel_display.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_context.c
+Auto-merging drivers/gpu/drm/i915/i915_gem.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.h
+Auto-merging drivers/gpu/drm/i915/i915_drv.c
+Auto-merging drivers/gpu/drm/i915/i915_dma.c
+Auto-merging drivers/gpu/drm/drm_stub.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_stub.c
+Auto-merging drivers/gpu/drm/armada/armada_drv.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master f56f43acaa07] Merge remote-tracking branch 'drm/drm-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/char/Makefile | 2 +-
+ drivers/char/agp/Kconfig | 5 +
+ drivers/char/agp/Makefile | 2 +-
+ drivers/char/agp/intel-agp.c | 5 -
+ drivers/char/agp/intel-gtt.c | 18 +
+ drivers/gpu/drm/armada/armada_drv.c | 3 +-
+ drivers/gpu/drm/cirrus/cirrus_drv.h | 2 +-
+ drivers/gpu/drm/drm_agpsupport.c | 35 +-
+ drivers/gpu/drm/drm_buffer.c | 2 +-
+ drivers/gpu/drm/drm_bufs.c | 10 +-
+ drivers/gpu/drm/drm_crtc.c | 2 -
+ drivers/gpu/drm/drm_drv.c | 4 -
+ drivers/gpu/drm/drm_edid_load.c | 4 +-
+ drivers/gpu/drm/drm_fb_helper.c | 6 +
+ drivers/gpu/drm/drm_fops.c | 11 +-
+ drivers/gpu/drm/drm_gem.c | 15 -
+ drivers/gpu/drm/drm_info.c | 16 +-
+ drivers/gpu/drm/drm_irq.c | 10 +-
+ drivers/gpu/drm/drm_memory.c | 15 +-
+ drivers/gpu/drm/drm_pci.c | 38 +-
+ drivers/gpu/drm/drm_platform.c | 12 -
+ drivers/gpu/drm/drm_stub.c | 31 +-
+ drivers/gpu/drm/drm_usb.c | 1 -
+ drivers/gpu/drm/drm_vm.c | 10 +-
+ drivers/gpu/drm/exynos/exynos_drm_drv.c | 4 +-
+ drivers/gpu/drm/exynos/exynos_drm_fimd.c | 2 +-
+ drivers/gpu/drm/exynos/exynos_mixer.c | 6 +-
+ drivers/gpu/drm/gma500/accel_2d.c | 2 +-
+ drivers/gpu/drm/gma500/cdv_intel_dp.c | 37 +-
+ drivers/gpu/drm/gma500/psb_drv.h | 8 +-
+ drivers/gpu/drm/gma500/psb_irq.c | 19 +-
+ drivers/gpu/drm/gma500/psb_irq.h | 2 +-
+ drivers/gpu/drm/i810/i810_dma.c | 4 +
+ drivers/gpu/drm/i810/i810_drv.c | 2 +-
+ drivers/gpu/drm/i915/Kconfig | 32 +-
+ drivers/gpu/drm/i915/dvo_ns2501.c | 73 +--
+ drivers/gpu/drm/i915/i915_debugfs.c | 163 ++++--
+ drivers/gpu/drm/i915/i915_dma.c | 34 +-
+ drivers/gpu/drm/i915/i915_drv.c | 44 +-
+ drivers/gpu/drm/i915/i915_drv.h | 136 +++--
+ drivers/gpu/drm/i915/i915_gem.c | 8 +-
+ drivers/gpu/drm/i915/i915_gem_context.c | 45 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 11 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 17 +-
+ drivers/gpu/drm/i915/i915_irq.c | 17 +-
+ drivers/gpu/drm/i915/i915_reg.h | 217 +++----
+ drivers/gpu/drm/i915/i915_suspend.c | 45 --
+ drivers/gpu/drm/i915/i915_sysfs.c | 35 +-
+ drivers/gpu/drm/i915/i915_ums.c | 27 +
+ drivers/gpu/drm/i915/intel_crt.c | 5 +-
+ drivers/gpu/drm/i915/intel_ddi.c | 37 +-
+ drivers/gpu/drm/i915/intel_display.c | 319 ++++++++--
+ drivers/gpu/drm/i915/intel_dp.c | 81 +--
+ drivers/gpu/drm/i915/intel_drv.h | 25 +-
+ drivers/gpu/drm/i915/intel_dsi.c | 5 +-
+ drivers/gpu/drm/i915/intel_dvo.c | 5 +-
+ drivers/gpu/drm/i915/intel_fbdev.c | 63 +-
+ drivers/gpu/drm/i915/intel_hdmi.c | 67 +--
+ drivers/gpu/drm/i915/intel_i2c.c | 15 +-
+ drivers/gpu/drm/i915/intel_lvds.c | 5 +-
+ drivers/gpu/drm/i915/intel_opregion.c | 43 +-
+ drivers/gpu/drm/i915/intel_panel.c | 894 +++++++++++++++++++----------
+ drivers/gpu/drm/i915/intel_pm.c | 378 ++++++------
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 21 +-
+ drivers/gpu/drm/i915/intel_sdvo.c | 60 +-
+ drivers/gpu/drm/i915/intel_sideband.c | 29 +-
+ drivers/gpu/drm/i915/intel_sprite.c | 18 +
+ drivers/gpu/drm/i915/intel_uncore.c | 274 +++++++--
+ drivers/gpu/drm/mga/mga_dma.c | 4 +-
+ drivers/gpu/drm/mga/mga_drv.h | 4 +-
+ drivers/gpu/drm/mga/mga_irq.c | 8 +-
+ drivers/gpu/drm/mga/mga_state.c | 2 +-
+ drivers/gpu/drm/msm/msm_drv.c | 4 +-
+ drivers/gpu/drm/nouveau/nouveau_dma.c | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_dma.h | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_fence.c | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_gem.c | 4 +-
+ drivers/gpu/drm/omapdrm/omap_drv.c | 4 +-
+ drivers/gpu/drm/omapdrm/omap_drv.h | 2 +-
+ drivers/gpu/drm/omapdrm/omap_fb.c | 4 +
+ drivers/gpu/drm/omapdrm/omap_irq.c | 4 +-
+ drivers/gpu/drm/qxl/qxl_display.c | 9 +-
+ drivers/gpu/drm/qxl/qxl_drv.h | 2 +-
+ drivers/gpu/drm/qxl/qxl_ioctl.c | 4 +-
+ drivers/gpu/drm/qxl/qxl_irq.c | 2 +-
+ drivers/gpu/drm/r128/r128_cce.c | 4 +-
+ drivers/gpu/drm/r128/r128_drv.h | 4 +-
+ drivers/gpu/drm/r128/r128_irq.c | 2 +-
+ drivers/gpu/drm/r128/r128_state.c | 66 +--
+ drivers/gpu/drm/radeon/atombios_dp.c | 36 +-
+ drivers/gpu/drm/radeon/r300_cmdbuf.c | 8 +-
+ drivers/gpu/drm/radeon/r600_cp.c | 4 +-
+ drivers/gpu/drm/radeon/r600_cs.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_cp.c | 6 +-
+ drivers/gpu/drm/radeon/radeon_cs.c | 10 +-
+ drivers/gpu/drm/radeon/radeon_drv.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_drv.h | 2 +-
+ drivers/gpu/drm/radeon/radeon_irq.c | 10 +-
+ drivers/gpu/drm/radeon/radeon_irq_kms.c | 4 +-
+ drivers/gpu/drm/radeon/radeon_kms.c | 10 +-
+ drivers/gpu/drm/radeon/radeon_mem.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_ring.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_state.c | 18 +-
+ drivers/gpu/drm/radeon/radeon_ttm.c | 2 +-
+ drivers/gpu/drm/rcar-du/rcar_du_drv.c | 4 +-
+ drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c | 13 +-
+ drivers/gpu/drm/savage/savage_bci.c | 10 +-
+ drivers/gpu/drm/savage/savage_state.c | 8 +-
+ drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 18 +-
+ drivers/gpu/drm/shmobile/shmob_drm_drv.c | 4 +-
+ drivers/gpu/drm/sis/sis_mm.c | 2 +-
+ drivers/gpu/drm/tegra/bus.c | 1 -
+ drivers/gpu/drm/tilcdc/tilcdc_drv.c | 4 +-
+ drivers/gpu/drm/ttm/ttm_bo_util.c | 2 +-
+ drivers/gpu/drm/udl/udl_fb.c | 12 +-
+ drivers/gpu/drm/via/via_dma.c | 12 +-
+ drivers/gpu/drm/via/via_dmablit.c | 20 +-
+ drivers/gpu/drm/via/via_drv.h | 2 +-
+ drivers/gpu/drm/via/via_irq.c | 10 +-
+ drivers/gpu/drm/via/via_video.c | 8 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 18 +-
+ drivers/staging/imx-drm/imx-drm-core.c | 4 +-
+ drivers/video/fbmem.c | 31 +-
+ include/drm/drmP.h | 64 ++-
+ include/drm/drm_agpsupport.h | 33 +-
+ include/drm/drm_dp_helper.h | 35 +-
+ include/drm/drm_os_linux.h | 37 --
+ include/linux/fb.h | 4 +-
+ include/uapi/drm/drm.h | 1 -
+ include/uapi/drm/i915_drm.h | 19 +
+ 132 files changed, 2513 insertions(+), 1717 deletions(-)
+Merging drm-intel/for-linux-next (d8ccba866356 drm/i915: grab a pages pin count for preallocate stolen)
+$ git merge drm-intel/for-linux-next
+Resolved 'drivers/gpu/drm/i915/intel_ddi.c' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/intel_pm.c' using previous resolution.
+Auto-merging drivers/gpu/drm/i915/intel_pm.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c
+Auto-merging drivers/gpu/drm/i915/intel_opregion.c
+Auto-merging drivers/gpu/drm/i915/intel_drv.h
+Auto-merging drivers/gpu/drm/i915/intel_dp.c
+Auto-merging drivers/gpu/drm/i915/intel_display.c
+Auto-merging drivers/gpu/drm/i915/intel_ddi.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ddi.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c
+Auto-merging drivers/gpu/drm/i915/i915_gem.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.h
+Auto-merging drivers/gpu/drm/i915/i915_drv.c
+Auto-merging drivers/gpu/drm/i915/i915_dma.c
+Auto-merging drivers/gpu/drm/i915/Makefile
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master c021f99a8538] Merge remote-tracking branch 'drm-intel/for-linux-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/gpu/drm/i915/Makefile | 3 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 61 +-
+ drivers/gpu/drm/i915/i915_dma.c | 18 +-
+ drivers/gpu/drm/i915/i915_drv.c | 50 +-
+ drivers/gpu/drm/i915/i915_drv.h | 25 +-
+ drivers/gpu/drm/i915/i915_gem.c | 73 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 44 +-
+ drivers/gpu/drm/i915/i915_gem_stolen.c | 1 +
+ drivers/gpu/drm/i915/i915_gpu_error.c | 12 +-
+ drivers/gpu/drm/i915/i915_irq.c | 40 +-
+ drivers/gpu/drm/i915/i915_reg.h | 103 +--
+ drivers/gpu/drm/i915/i915_sysfs.c | 14 +-
+ drivers/gpu/drm/i915/intel_bios.c | 37 +-
+ drivers/gpu/drm/i915/intel_bios.h | 64 +-
+ drivers/gpu/drm/i915/intel_ddi.c | 114 ++-
+ drivers/gpu/drm/i915/intel_display.c | 87 +-
+ drivers/gpu/drm/i915/intel_dp.c | 40 +-
+ drivers/gpu/drm/i915/intel_drv.h | 16 +-
+ drivers/gpu/drm/i915/intel_dsi.c | 188 +++--
+ drivers/gpu/drm/i915/intel_dsi.h | 21 +
+ drivers/gpu/drm/i915/intel_dsi_pll.c | 119 ++-
+ drivers/gpu/drm/i915/intel_hdmi.c | 20 +-
+ drivers/gpu/drm/i915/intel_lvds.c | 85 +-
+ drivers/gpu/drm/i915/intel_opregion.c | 8 +-
+ drivers/gpu/drm/i915/intel_panel.c | 60 ++
+ drivers/gpu/drm/i915/intel_pm.c | 1179 +++++++++-------------------
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 11 +-
+ drivers/gpu/drm/i915/intel_sdvo.c | 2 +-
+ drivers/gpu/drm/i915/intel_sdvo_regs.h | 40 +-
+ drivers/gpu/drm/i915/intel_sideband.c | 14 +
+ drivers/gpu/drm/i915/intel_sprite.c | 50 +-
+ drivers/gpu/drm/i915/intel_uncore.c | 43 +-
+ 32 files changed, 1300 insertions(+), 1342 deletions(-)
+Merging drm-tegra/drm/for-next (f3873c15d43a drm/tegra: fix compile w/ CONFIG_DYNAMIC_DEBUG)
+$ git merge drm-tegra/drm/for-next
+Merge made by the 'recursive' strategy.
+ .../bindings/gpu/nvidia,tegra20-host1x.txt | 15 +-
+ .../devicetree/bindings/mipi/dsi/mipi-dsi-bus.txt | 98 +++
+ .../bindings/mipi/nvidia,tegra114-mipi.txt | 41 +
+ .../devicetree/bindings/panel/auo,b101aw03.txt | 7 +
+ .../bindings/panel/chunghwa,claa101wb03.txt | 7 +
+ .../bindings/panel/panasonic,vvx10f004b00.txt | 7 +
+ .../devicetree/bindings/panel/simple-panel.txt | 21 +
+ drivers/gpu/drm/Kconfig | 6 +
+ drivers/gpu/drm/Makefile | 3 +
+ drivers/gpu/drm/drm_mipi_dsi.c | 315 +++++++
+ drivers/gpu/drm/drm_panel.c | 100 +++
+ drivers/gpu/drm/panel/Kconfig | 19 +
+ drivers/gpu/drm/panel/Makefile | 1 +
+ drivers/gpu/drm/panel/panel-simple.c | 497 +++++++++++
+ drivers/gpu/drm/tegra/Kconfig | 24 +-
+ drivers/gpu/drm/tegra/Makefile | 2 +
+ drivers/gpu/drm/tegra/dc.c | 66 +-
+ drivers/gpu/drm/tegra/dc.h | 9 +
+ drivers/gpu/drm/tegra/drm.c | 21 +-
+ drivers/gpu/drm/tegra/drm.h | 12 +
+ drivers/gpu/drm/tegra/dsi.c | 971 +++++++++++++++++++++
+ drivers/gpu/drm/tegra/dsi.h | 134 +++
+ drivers/gpu/drm/tegra/fb.c | 45 +-
+ drivers/gpu/drm/tegra/gem.c | 183 +++-
+ drivers/gpu/drm/tegra/gem.h | 9 +-
+ drivers/gpu/drm/tegra/hdmi.c | 60 +-
+ drivers/gpu/drm/tegra/mipi-phy.c | 138 +++
+ drivers/gpu/drm/tegra/mipi-phy.h | 65 ++
+ drivers/gpu/drm/tegra/output.c | 44 +-
+ drivers/gpu/drm/tegra/rgb.c | 45 +
+ drivers/gpu/host1x/Kconfig | 2 +-
+ drivers/gpu/host1x/Makefile | 4 +-
+ drivers/gpu/host1x/bus.c | 2 +
+ drivers/gpu/host1x/channel.c | 5 +
+ drivers/gpu/host1x/debug.c | 13 +-
+ drivers/gpu/host1x/dev.c | 28 +-
+ drivers/gpu/host1x/dev.h | 2 +
+ drivers/gpu/host1x/hw/host1x02.c | 4 +-
+ drivers/gpu/host1x/hw/host1x02_hardware.h | 142 +++
+ drivers/gpu/host1x/hw/host1x04.c | 42 +
+ drivers/gpu/host1x/hw/host1x04.h | 26 +
+ drivers/gpu/host1x/hw/host1x04_hardware.h | 142 +++
+ drivers/gpu/host1x/hw/hw_host1x02_uclass.h | 6 +
+ drivers/gpu/host1x/hw/hw_host1x04_channel.h | 121 +++
+ drivers/gpu/host1x/hw/hw_host1x04_sync.h | 243 ++++++
+ drivers/gpu/host1x/hw/hw_host1x04_uclass.h | 181 ++++
+ drivers/gpu/host1x/job.c | 6 +
+ drivers/gpu/host1x/mipi.c | 275 ++++++
+ drivers/gpu/host1x/syncpt.c | 9 +
+ include/drm/drm_mipi_dsi.h | 158 ++++
+ include/drm/drm_panel.h | 82 ++
+ include/linux/host1x.h | 6 +
+ 52 files changed, 4379 insertions(+), 85 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mipi/dsi/mipi-dsi-bus.txt
+ create mode 100644 Documentation/devicetree/bindings/mipi/nvidia,tegra114-mipi.txt
+ create mode 100644 Documentation/devicetree/bindings/panel/auo,b101aw03.txt
+ create mode 100644 Documentation/devicetree/bindings/panel/chunghwa,claa101wb03.txt
+ create mode 100644 Documentation/devicetree/bindings/panel/panasonic,vvx10f004b00.txt
+ create mode 100644 Documentation/devicetree/bindings/panel/simple-panel.txt
+ create mode 100644 drivers/gpu/drm/drm_mipi_dsi.c
+ create mode 100644 drivers/gpu/drm/drm_panel.c
+ create mode 100644 drivers/gpu/drm/panel/Kconfig
+ create mode 100644 drivers/gpu/drm/panel/Makefile
+ create mode 100644 drivers/gpu/drm/panel/panel-simple.c
+ create mode 100644 drivers/gpu/drm/tegra/dsi.c
+ create mode 100644 drivers/gpu/drm/tegra/dsi.h
+ create mode 100644 drivers/gpu/drm/tegra/mipi-phy.c
+ create mode 100644 drivers/gpu/drm/tegra/mipi-phy.h
+ create mode 100644 drivers/gpu/host1x/hw/host1x02_hardware.h
+ create mode 100644 drivers/gpu/host1x/hw/host1x04.c
+ create mode 100644 drivers/gpu/host1x/hw/host1x04.h
+ create mode 100644 drivers/gpu/host1x/hw/host1x04_hardware.h
+ create mode 100644 drivers/gpu/host1x/hw/hw_host1x04_channel.h
+ create mode 100644 drivers/gpu/host1x/hw/hw_host1x04_sync.h
+ create mode 100644 drivers/gpu/host1x/hw/hw_host1x04_uclass.h
+ create mode 100644 drivers/gpu/host1x/mipi.c
+ create mode 100644 include/drm/drm_mipi_dsi.h
+ create mode 100644 include/drm/drm_panel.h
+Merging sound/for-next (d8f66c71d547 ALSA: hda - Add warning texts when codec driver Kconfig doesn't match)
+$ git merge sound/for-next
+Auto-merging sound/pci/hda/patch_realtek.c
+Removing sound/pci/cs46xx/imgs/cwcsnoop.h
+Removing sound/pci/cs46xx/imgs/cwcdma.h
+Removing sound/pci/cs46xx/imgs/cwcdma.asp
+Removing sound/pci/cs46xx/imgs/cwcbinhack.h
+Removing sound/pci/cs46xx/imgs/cwcasync.h
+Removing sound/pci/cs46xx/imgs/cwc4630.h
+Removing sound/pci/cs46xx/cs46xx_image.h
+Merge made by the 'recursive' strategy.
+ include/sound/hda_verbs.h | 554 ++++++
+ include/uapi/sound/compress_params.h | 2 +-
+ sound/arm/aaci.c | 23 +-
+ sound/atmel/abdac.c | 2 +-
+ sound/pci/Kconfig | 1 +
+ sound/pci/cs46xx/cs46xx.h | 5 +
+ sound/pci/cs46xx/cs46xx_image.h | 3468 ----------------------------------
+ sound/pci/cs46xx/cs46xx_lib.c | 265 ++-
+ sound/pci/cs46xx/imgs/cwc4630.h | 320 ----
+ sound/pci/cs46xx/imgs/cwcasync.h | 176 --
+ sound/pci/cs46xx/imgs/cwcbinhack.h | 48 -
+ sound/pci/cs46xx/imgs/cwcdma.asp | 170 --
+ sound/pci/cs46xx/imgs/cwcdma.h | 68 -
+ sound/pci/cs46xx/imgs/cwcsnoop.h | 46 -
+ sound/pci/hda/Kconfig | 129 +-
+ sound/pci/hda/Makefile | 49 +-
+ sound/pci/hda/hda_auto_parser.c | 18 +-
+ sound/pci/hda/hda_beep.c | 10 +-
+ sound/pci/hda/hda_codec.c | 399 ++--
+ sound/pci/hda/hda_codec.h | 566 +-----
+ sound/pci/hda/hda_generic.c | 88 +-
+ sound/pci/hda/hda_hwdep.c | 8 +-
+ sound/pci/hda/hda_intel.c | 49 +-
+ sound/pci/hda/hda_jack.c | 30 +-
+ sound/pci/hda/hda_local.h | 8 +-
+ sound/pci/hda/patch_analog.c | 1 +
+ sound/pci/hda/patch_hdmi.c | 34 +-
+ sound/pci/hda/patch_realtek.c | 63 +-
+ sound/pci/hda/patch_via.c | 1 +
+ sound/spi/at73c213.c | 2 +-
+ 30 files changed, 1308 insertions(+), 5295 deletions(-)
+ create mode 100644 include/sound/hda_verbs.h
+ delete mode 100644 sound/pci/cs46xx/cs46xx_image.h
+ delete mode 100644 sound/pci/cs46xx/imgs/cwc4630.h
+ delete mode 100644 sound/pci/cs46xx/imgs/cwcasync.h
+ delete mode 100644 sound/pci/cs46xx/imgs/cwcbinhack.h
+ delete mode 100644 sound/pci/cs46xx/imgs/cwcdma.asp
+ delete mode 100644 sound/pci/cs46xx/imgs/cwcdma.h
+ delete mode 100644 sound/pci/cs46xx/imgs/cwcsnoop.h
+Merging sound-asoc/for-next (4af673891afe Merge remote-tracking branches 'asoc/topic/ad193x', 'asoc/topic/adav80x', 'asoc/topic/adsp', 'asoc/topic/ak4641', 'asoc/topic/ak4642', 'asoc/topic/arizona', 'asoc/topic/axi', 'asoc/topic/bcm2835', 'asoc/topic/cs4271', 'asoc/topic/cs42l52', 'asoc/topic/da7210', 'asoc/topic/davinci', 'asoc/topic/ep93xx', 'asoc/topic/fsl', 'asoc/topic/fsl-mxs', 'asoc/topic/generic', 'asoc/topic/hdmi', 'asoc/topic/jack', 'asoc/topic/jz4740', 'asoc/topic/max98090', 'asoc/topic/mxs', 'asoc/topic/omap', 'asoc/topic/pxa', 'asoc/topic/rcar', 'asoc/topic/sai', 'asoc/topic/samsung', 'asoc/topic/sgtl5000', 'asoc/topic/spear', 'asoc/topic/ssm2602', 'asoc/topic/tegra', 'asoc/topic/tlv320aic3x', 'asoc/topic/twl6040', 'asoc/topic/uda1380', 'asoc/topic/wm8510', 'asoc/topic/wm8523', 'asoc/topic/wm8580', 'asoc/topic/wm8711', 'asoc/topic/wm8728', 'asoc/topic/wm8731', 'asoc/topic/wm8741', 'asoc/topic/wm8750', 'asoc/topic/wm8753', 'asoc/topic/wm8776', 'asoc/topic/wm8804', 'asoc/topic/wm8900', 'asoc/topic/wm8901', 'asoc/topic/wm8940', 'asoc/topic/wm8962', 'asoc/topic/wm8974', 'asoc/topic/wm8985', 'asoc/topic/wm8988', 'asoc/topic/wm8990', 'asoc/topic/wm8991', 'asoc/topic/wm8994', 'asoc/topic/wm8995', 'asoc/topic/wm9081' and 'asoc/topic/x86' into asoc-next)
+$ git merge sound-asoc/for-next
+Recorded preimage for 'sound/soc/fsl/fsl_ssi.c'
+Auto-merging sound/soc/tegra/tegra20_ac97.c
+Auto-merging sound/soc/tegra/Kconfig
+Removing sound/soc/jz4740/jz4740-pcm.h
+Removing sound/soc/jz4740/jz4740-pcm.c
+Auto-merging sound/soc/fsl/fsl_ssi.c
+CONFLICT (content): Merge conflict in sound/soc/fsl/fsl_ssi.c
+Auto-merging include/sound/rcar_snd.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'sound/soc/fsl/fsl_ssi.c'.
+[master 0d9b4f64fd22] Merge remote-tracking branch 'sound-asoc/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/sound/adi,axi-i2s.txt | 31 +
+ .../devicetree/bindings/sound/adi,axi-spdif-tx.txt | 30 +
+ .../devicetree/bindings/sound/bcm2835-i2s.txt | 25 +
+ .../devicetree/bindings/sound/cs42l52.txt | 46 +
+ .../bindings/sound/davinci-mcasp-audio.txt | 6 +-
+ .../devicetree/bindings/sound/fsl-sai.txt | 40 +
+ .../devicetree/bindings/sound/max98090.txt | 43 +
+ .../bindings/sound/nvidia,tegra-audio-max98090.txt | 51 +
+ .../devicetree/bindings/sound/simple-card.txt | 68 ++
+ drivers/mfd/twl6040.c | 92 +-
+ drivers/mfd/wm5110-tables.c | 139 ++-
+ include/linux/mfd/arizona/registers.h | 162 ++++
+ include/linux/platform_data/davinci_asp.h | 1 +
+ include/sound/cs42l52.h | 14 +-
+ include/sound/rcar_snd.h | 2 +-
+ include/sound/soc-dai.h | 6 +
+ include/sound/soc.h | 17 +-
+ include/sound/spear_dma.h | 1 -
+ sound/soc/Kconfig | 4 +-
+ sound/soc/Makefile | 4 +-
+ sound/soc/adi/Kconfig | 21 +
+ sound/soc/adi/Makefile | 5 +
+ sound/soc/adi/axi-i2s.c | 277 ++++++
+ sound/soc/adi/axi-spdif.c | 272 ++++++
+ sound/soc/bcm/Kconfig | 10 +
+ sound/soc/bcm/Makefile | 5 +
+ sound/soc/bcm/bcm2835-i2s.c | 879 +++++++++++++++++
+ sound/soc/cirrus/edb93xx.c | 2 +-
+ sound/soc/cirrus/ep93xx-ac97.c | 20 +-
+ sound/soc/cirrus/ep93xx-i2s.c | 22 +-
+ sound/soc/cirrus/ep93xx-pcm.c | 39 +-
+ sound/soc/cirrus/ep93xx-pcm.h | 22 +
+ sound/soc/cirrus/simone.c | 2 +-
+ sound/soc/cirrus/snappercl15.c | 2 +-
+ sound/soc/codecs/Kconfig | 2 +
+ sound/soc/codecs/ad193x.c | 6 +-
+ sound/soc/codecs/adav80x.c | 6 +-
+ sound/soc/codecs/ak4641.c | 38 +-
+ sound/soc/codecs/ak4642.c | 138 ++-
+ sound/soc/codecs/arizona.c | 204 ++--
+ sound/soc/codecs/arizona.h | 5 +-
+ sound/soc/codecs/cs4271.c | 8 +-
+ sound/soc/codecs/cs42l52.c | 105 +-
+ sound/soc/codecs/da7210.c | 6 +-
+ sound/soc/codecs/hdmi.c | 2 +-
+ sound/soc/codecs/sgtl5000.c | 76 +-
+ sound/soc/codecs/ssm2602.c | 56 +-
+ sound/soc/codecs/tlv320aic3x.c | 126 ++-
+ sound/soc/codecs/twl6040.c | 227 ++---
+ sound/soc/codecs/uda1380.c | 6 +-
+ sound/soc/codecs/wm5102.c | 4 +-
+ sound/soc/codecs/wm5110.c | 379 +++++++-
+ sound/soc/codecs/wm8510.c | 6 +-
+ sound/soc/codecs/wm8523.c | 6 +-
+ sound/soc/codecs/wm8580.c | 6 +-
+ sound/soc/codecs/wm8711.c | 6 +-
+ sound/soc/codecs/wm8728.c | 6 +-
+ sound/soc/codecs/wm8731.c | 6 +-
+ sound/soc/codecs/wm8741.c | 6 +-
+ sound/soc/codecs/wm8750.c | 6 +-
+ sound/soc/codecs/wm8753.c | 6 +-
+ sound/soc/codecs/wm8776.c | 6 +-
+ sound/soc/codecs/wm8804.c | 6 +-
+ sound/soc/codecs/wm8900.c | 6 +-
+ sound/soc/codecs/wm8940.c | 221 +++--
+ sound/soc/codecs/wm8962.c | 4 +-
+ sound/soc/codecs/wm8974.c | 54 +-
+ sound/soc/codecs/wm8985.c | 6 +-
+ sound/soc/codecs/wm8988.c | 6 +-
+ sound/soc/codecs/wm8990.c | 258 ++---
+ sound/soc/codecs/wm8990.h | 9 -
+ sound/soc/codecs/wm8991.c | 293 +++---
+ sound/soc/codecs/wm8991.h | 9 -
+ sound/soc/codecs/wm8994.c | 11 +-
+ sound/soc/codecs/wm8995.c | 6 +-
+ sound/soc/codecs/wm8997.c | 4 +-
+ sound/soc/codecs/wm9081.c | 2 +-
+ sound/soc/codecs/wm_adsp.c | 20 +-
+ sound/soc/davinci/Kconfig | 29 +-
+ sound/soc/davinci/Makefile | 8 +-
+ sound/soc/davinci/davinci-evm.c | 48 +-
+ sound/soc/davinci/davinci-mcasp.c | 1016 +++++++++-----------
+ sound/soc/davinci/davinci-mcasp.h | 304 +++++-
+ sound/soc/fsl/Kconfig | 4 +
+ sound/soc/fsl/Makefile | 4 +-
+ sound/soc/fsl/fsl_dma.c | 2 +-
+ sound/soc/fsl/fsl_sai.c | 492 ++++++++++
+ sound/soc/fsl/fsl_sai.h | 114 +++
+ sound/soc/fsl/fsl_spdif.c | 8 -
+ sound/soc/fsl/fsl_ssi.c | 435 ++++++---
+ sound/soc/fsl/fsl_ssi.h | 2 +
+ sound/soc/fsl/imx-pcm-dma.c | 9 +-
+ sound/soc/fsl/imx-pcm.h | 5 -
+ sound/soc/fsl/imx-spdif.c | 1 -
+ sound/soc/fsl/imx-ssi.c | 12 +-
+ sound/soc/fsl/imx-ssi.h | 1 -
+ sound/soc/generic/simple-card.c | 164 +++-
+ sound/soc/{mid-x86 => intel}/Kconfig | 0
+ sound/soc/{mid-x86 => intel}/Makefile | 0
+ sound/soc/{mid-x86 => intel}/mfld_machine.c | 0
+ sound/soc/{mid-x86 => intel}/sst_dsp.h | 0
+ sound/soc/{mid-x86 => intel}/sst_platform.c | 0
+ sound/soc/{mid-x86 => intel}/sst_platform.h | 0
+ sound/soc/jz4740/Kconfig | 1 +
+ sound/soc/jz4740/jz4740-i2s.c | 135 +--
+ sound/soc/jz4740/jz4740-pcm.c | 358 -------
+ sound/soc/jz4740/jz4740-pcm.h | 20 -
+ sound/soc/jz4740/qi_lb60.c | 2 +-
+ sound/soc/mxs/mxs-pcm.c | 8 +-
+ sound/soc/mxs/mxs-pcm.h | 1 -
+ sound/soc/mxs/mxs-saif.c | 18 +-
+ sound/soc/omap/mcbsp.c | 12 +-
+ sound/soc/omap/omap-dmic.c | 4 +-
+ sound/soc/omap/omap-mcpdm.c | 4 +-
+ sound/soc/pxa/Kconfig | 2 +-
+ sound/soc/pxa/mmp-pcm.c | 18 +-
+ sound/soc/samsung/Kconfig | 13 +-
+ sound/soc/samsung/Makefile | 6 +-
+ sound/soc/samsung/ac97.c | 51 +-
+ sound/soc/samsung/dma.c | 8 +
+ sound/soc/samsung/dma.h | 6 +
+ sound/soc/samsung/dmaengine.c | 84 ++
+ sound/soc/samsung/i2s.c | 9 +-
+ sound/soc/samsung/pcm.c | 18 +-
+ sound/soc/sh/fsi.c | 36 +-
+ sound/soc/sh/rcar/gen.c | 248 +++--
+ sound/soc/sh/rcar/rsnd.h | 16 +-
+ sound/soc/sh/rcar/ssi.c | 6 +-
+ sound/soc/soc-dapm.c | 28 +-
+ sound/soc/soc-generic-dmaengine-pcm.c | 4 +-
+ sound/soc/soc-io.c | 4 +-
+ sound/soc/soc-pcm.c | 156 ++-
+ sound/soc/spear/spdif_in.c | 17 +-
+ sound/soc/spear/spdif_out.c | 18 +-
+ sound/soc/spear/spear_pcm.c | 42 +-
+ sound/soc/spear/spear_pcm.h | 24 +
+ sound/soc/tegra/Kconfig | 10 +
+ sound/soc/tegra/Makefile | 2 +
+ sound/soc/tegra/tegra20_ac97.c | 6 +-
+ sound/soc/tegra/tegra_max98090.c | 275 ++++++
+ sound/soc/tegra/tegra_wm9712.c | 1 -
+ 141 files changed, 6380 insertions(+), 2678 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/adi,axi-i2s.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/adi,axi-spdif-tx.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/bcm2835-i2s.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/cs42l52.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/fsl-sai.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/max98090.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/simple-card.txt
+ create mode 100644 sound/soc/adi/Kconfig
+ create mode 100644 sound/soc/adi/Makefile
+ create mode 100644 sound/soc/adi/axi-i2s.c
+ create mode 100644 sound/soc/adi/axi-spdif.c
+ create mode 100644 sound/soc/bcm/Kconfig
+ create mode 100644 sound/soc/bcm/Makefile
+ create mode 100644 sound/soc/bcm/bcm2835-i2s.c
+ create mode 100644 sound/soc/cirrus/ep93xx-pcm.h
+ create mode 100644 sound/soc/fsl/fsl_sai.c
+ create mode 100644 sound/soc/fsl/fsl_sai.h
+ rename sound/soc/{mid-x86 => intel}/Kconfig (100%)
+ rename sound/soc/{mid-x86 => intel}/Makefile (100%)
+ rename sound/soc/{mid-x86 => intel}/mfld_machine.c (100%)
+ rename sound/soc/{mid-x86 => intel}/sst_dsp.h (100%)
+ rename sound/soc/{mid-x86 => intel}/sst_platform.c (100%)
+ rename sound/soc/{mid-x86 => intel}/sst_platform.h (100%)
+ delete mode 100644 sound/soc/jz4740/jz4740-pcm.c
+ delete mode 100644 sound/soc/jz4740/jz4740-pcm.h
+ create mode 100644 sound/soc/samsung/dmaengine.c
+ create mode 100644 sound/soc/spear/spear_pcm.h
+ create mode 100644 sound/soc/tegra/tegra_max98090.c
+Merging modules/modules-next (74e22fac8858 module.h: Remove unnecessary semicolon)
+$ git merge modules/modules-next
+Resolved 'Documentation/module-signing.txt' using previous resolution.
+Auto-merging Documentation/module-signing.txt
+CONFLICT (add/add): Merge conflict in Documentation/module-signing.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 908a15c197e5] Merge remote-tracking branch 'modules/modules-next'
+$ git diff -M --stat --summary HEAD^..
+ include/linux/module.h | 2 +-
+ kernel/params.c | 25 +++++++++----------------
+ 2 files changed, 10 insertions(+), 17 deletions(-)
+Merging virtio/virtio-next (7d2dddda5c92 virtio: pci: remove unnecessary pci_set_drvdata())
+$ git merge virtio/virtio-next
+Merge made by the 'recursive' strategy.
+ drivers/virtio/virtio_pci.c | 2 --
+ 1 file changed, 2 deletions(-)
+Merging input/next (01d08185850c Input: fix typos in Documentation/input/gamepad.txt)
+$ git merge input/next
+Auto-merging drivers/input/touchscreen/zforce_ts.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/input/gpio-beeper.txt | 13 ++
+ .../bindings/input/touchscreen/tsc2007.txt | 41 ++++
+ .../bindings/input/twl4030-pwrbutton.txt | 21 ++
+ Documentation/input/gamepad.txt | 6 +-
+ Documentation/input/joystick-api.txt | 38 ++--
+ Documentation/input/joystick.txt | 8 +-
+ arch/arm/mach-imx/mach-cpuimx35.c | 2 +-
+ arch/arm/mach-imx/mach-cpuimx51sd.c | 2 +-
+ arch/sh/boards/mach-ecovec24/setup.c | 2 +-
+ drivers/input/input.c | 76 +++++--
+ drivers/input/keyboard/Kconfig | 2 +-
+ drivers/input/keyboard/adp5520-keys.c | 2 +-
+ drivers/input/keyboard/adp5588-keys.c | 10 +-
+ drivers/input/keyboard/adp5589-keys.c | 8 +-
+ drivers/input/keyboard/bf54x-keys.c | 4 +-
+ drivers/input/keyboard/davinci_keyscan.c | 2 +-
+ drivers/input/keyboard/ep93xx_keypad.c | 2 +-
+ drivers/input/keyboard/imx_keypad.c | 3 +-
+ drivers/input/keyboard/lm8323.c | 2 +-
+ drivers/input/keyboard/lm8333.c | 3 +-
+ drivers/input/keyboard/max7359_keypad.c | 3 +-
+ drivers/input/keyboard/mcs_touchkey.c | 2 +-
+ drivers/input/keyboard/mpr121_touchkey.c | 3 +-
+ drivers/input/keyboard/nomadik-ske-keypad.c | 3 +-
+ drivers/input/keyboard/omap-keypad.c | 2 +-
+ drivers/input/keyboard/pxa930_rotary.c | 3 +-
+ drivers/input/keyboard/samsung-keypad.c | 36 ++--
+ drivers/input/keyboard/sh_keysc.c | 4 +-
+ drivers/input/keyboard/tca6416-keypad.c | 2 +-
+ drivers/input/keyboard/tnetv107x-keypad.c | 2 +-
+ drivers/input/keyboard/twl4030_keypad.c | 2 +-
+ drivers/input/keyboard/w90p910_keypad.c | 2 +-
+ drivers/input/misc/Kconfig | 9 +
+ drivers/input/misc/Makefile | 1 +
+ drivers/input/misc/ad714x.c | 4 +-
+ drivers/input/misc/adxl34x.c | 2 +-
+ drivers/input/misc/bfin_rotary.c | 2 +-
+ drivers/input/misc/bma150.c | 3 +-
+ drivers/input/misc/cma3000_d0x.c | 2 +-
+ drivers/input/misc/gp2ap002a00f.c | 2 +-
+ drivers/input/misc/gpio-beeper.c | 127 ++++++++++++
+ drivers/input/misc/gpio_tilt_polled.c | 3 +-
+ drivers/input/misc/kxtj9.c | 3 +-
+ drivers/input/misc/pm8xxx-vibrator.c | 106 +++-------
+ drivers/input/misc/pmic8xxx-pwrkey.c | 39 ++--
+ drivers/input/misc/pwm-beeper.c | 2 +-
+ drivers/input/misc/twl4030-pwrbutton.c | 46 ++---
+ drivers/input/misc/twl4030-vibra.c | 2 +-
+ drivers/input/mouse/elantech.c | 45 +++-
+ drivers/input/mouse/gpio_mouse.c | 2 +-
+ drivers/input/mouse/pxa930_trkball.c | 2 +-
+ drivers/input/serio/pcips2.c | 1 -
+ drivers/input/tablet/wacom_sys.c | 23 ++-
+ drivers/input/tablet/wacom_wac.c | 93 +++++++--
+ drivers/input/tablet/wacom_wac.h | 7 +
+ drivers/input/touchscreen/88pm860x-ts.c | 2 +-
+ drivers/input/touchscreen/ad7877.c | 2 +-
+ drivers/input/touchscreen/ad7879.c | 4 +-
+ drivers/input/touchscreen/ads7846.c | 85 +++-----
+ drivers/input/touchscreen/atmel_mxt_ts.c | 2 +-
+ drivers/input/touchscreen/atmel_tsadcc.c | 2 +-
+ drivers/input/touchscreen/cy8ctmg110_ts.c | 2 +-
+ drivers/input/touchscreen/cyttsp_core.c | 4 +-
+ drivers/input/touchscreen/cyttsp_i2c_common.c | 2 +
+ drivers/input/touchscreen/da9034-ts.c | 2 +-
+ drivers/input/touchscreen/edt-ft5x06.c | 2 +-
+ drivers/input/touchscreen/eeti_ts.c | 2 +-
+ drivers/input/touchscreen/ili210x.c | 2 +-
+ drivers/input/touchscreen/mcs5000_ts.c | 4 +-
+ drivers/input/touchscreen/pixcir_i2c_ts.c | 3 +-
+ drivers/input/touchscreen/s3c2410_ts.c | 4 +-
+ drivers/input/touchscreen/st1232.c | 2 +-
+ drivers/input/touchscreen/tsc2005.c | 2 +-
+ drivers/input/touchscreen/tsc2007.c | 230 ++++++++++++++-------
+ drivers/input/touchscreen/ucb1400_ts.c | 8 +-
+ drivers/input/touchscreen/wm97xx-core.c | 2 +-
+ drivers/input/touchscreen/zforce_ts.c | 3 +-
+ include/linux/i2c/tsc2007.h | 8 +-
+ 78 files changed, 803 insertions(+), 413 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/input/gpio-beeper.txt
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/tsc2007.txt
+ create mode 100644 Documentation/devicetree/bindings/input/twl4030-pwrbutton.txt
+ create mode 100644 drivers/input/misc/gpio-beeper.c
+Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12)
+$ git merge input-mt/for-next
+Already up-to-date.
+Merging cgroup/for-next (824960aa4e6c Merge branch 'for-3.13-fixes' into for-next)
+$ git merge cgroup/for-next
+Auto-merging net/core/netprio_cgroup.c
+Auto-merging mm/memcontrol.c
+Auto-merging kernel/sched/core.c
+Auto-merging init/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/cgroups/cgroups.txt | 20 -
+ block/blk-throttle.c | 35 +-
+ block/cfq-iosched.c | 131 ++--
+ include/linux/cgroup.h | 109 ++--
+ include/linux/vmpressure.h | 8 +-
+ init/Kconfig | 3 +-
+ kernel/cgroup.c | 1205 +++++++++++++++----------------------
+ kernel/cgroup_freezer.c | 7 +-
+ kernel/cpuset.c | 71 +--
+ kernel/sched/core.c | 13 +-
+ kernel/sched/cpuacct.c | 18 +-
+ mm/hugetlb_cgroup.c | 22 +-
+ mm/memcontrol.c | 426 ++++++++++---
+ mm/vmpressure.c | 26 +-
+ net/core/netprio_cgroup.c | 8 +-
+ security/device_cgroup.c | 7 +-
+ 16 files changed, 1025 insertions(+), 1084 deletions(-)
+Merging block/for-next (391b7a7bfb52 Merge branch 'for-3.14/drivers' into for-next)
+$ git merge block/for-next
+Recorded preimage for 'fs/f2fs/data.c'
+Resolved 'block/blk-flush.c' using previous resolution.
+Resolved 'fs/btrfs/check-integrity.c' using previous resolution.
+Resolved 'fs/btrfs/extent_io.c' using previous resolution.
+Resolved 'fs/btrfs/scrub.c' using previous resolution.
+Resolved 'fs/f2fs/segment.c' using previous resolution.
+Resolved 'fs/logfs/dev_bdev.c' using previous resolution.
+Resolved 'include/trace/events/f2fs.h' using previous resolution.
+Auto-merging include/trace/events/f2fs.h
+CONFLICT (content): Merge conflict in include/trace/events/f2fs.h
+Auto-merging fs/xfs/xfs_buf.c
+Auto-merging fs/logfs/dev_bdev.c
+CONFLICT (content): Merge conflict in fs/logfs/dev_bdev.c
+Auto-merging fs/hfsplus/wrapper.c
+Auto-merging fs/gfs2/ops_fstype.c
+Auto-merging fs/gfs2/lops.c
+Auto-merging fs/f2fs/segment.c
+CONFLICT (content): Merge conflict in fs/f2fs/segment.c
+Auto-merging fs/f2fs/data.c
+CONFLICT (content): Merge conflict in fs/f2fs/data.c
+Auto-merging fs/btrfs/scrub.c
+CONFLICT (content): Merge conflict in fs/btrfs/scrub.c
+Auto-merging fs/btrfs/inode.c
+Auto-merging fs/btrfs/extent_io.c
+CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
+Auto-merging fs/btrfs/check-integrity.c
+CONFLICT (content): Merge conflict in fs/btrfs/check-integrity.c
+Auto-merging drivers/staging/zram/zram_drv.c
+Auto-merging drivers/scsi/sd.c
+Auto-merging drivers/s390/block/dasd_eckd.c
+Auto-merging drivers/md/raid5.c
+Auto-merging drivers/md/md.c
+Auto-merging drivers/md/dm-thin.c
+Auto-merging drivers/md/dm-snap.c
+Auto-merging drivers/md/dm-delay.c
+Auto-merging drivers/md/dm-cache-target.c
+Auto-merging drivers/md/dm-cache-policy-mq.c
+Auto-merging drivers/md/dm-bufio.c
+Auto-merging drivers/block/xen-blkfront.c
+Auto-merging block/blk-throttle.c
+Auto-merging block/blk-mq.c
+Auto-merging block/blk-flush.c
+CONFLICT (content): Merge conflict in block/blk-flush.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'fs/f2fs/data.c'.
+[master c4452914c1ba] Merge remote-tracking branch 'block/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/block/biodoc.txt | 7 +-
+ Documentation/block/biovecs.txt | 111 ++++++
+ arch/m68k/emu/nfblock.c | 13 +-
+ arch/powerpc/sysdev/axonram.c | 21 +-
+ block/blk-core.c | 40 +--
+ block/blk-flush.c | 2 +-
+ block/blk-integrity.c | 40 ++-
+ block/blk-lib.c | 12 +-
+ block/blk-map.c | 6 +-
+ block/blk-merge.c | 66 ++--
+ block/blk-mq.c | 2 +-
+ block/blk-throttle.c | 14 +-
+ block/elevator.c | 2 +-
+ drivers/block/aoe/aoe.h | 10 +-
+ drivers/block/aoe/aoecmd.c | 153 ++++-----
+ drivers/block/brd.c | 16 +-
+ drivers/block/drbd/drbd_actlog.c | 2 +-
+ drivers/block/drbd/drbd_bitmap.c | 2 +-
+ drivers/block/drbd/drbd_main.c | 27 +-
+ drivers/block/drbd/drbd_receiver.c | 19 +-
+ drivers/block/drbd/drbd_req.c | 6 +-
+ drivers/block/drbd/drbd_req.h | 2 +-
+ drivers/block/drbd/drbd_worker.c | 8 +-
+ drivers/block/floppy.c | 16 +-
+ drivers/block/loop.c | 27 +-
+ drivers/block/mtip32xx/mtip32xx.c | 20 +-
+ drivers/block/nbd.c | 14 +-
+ drivers/block/nvme-core.c | 142 ++------
+ drivers/block/pktcdvd.c | 182 +++++-----
+ drivers/block/ps3disk.c | 17 +-
+ drivers/block/ps3vram.c | 12 +-
+ drivers/block/rbd.c | 91 +----
+ drivers/block/rsxx/dev.c | 6 +-
+ drivers/block/rsxx/dma.c | 15 +-
+ drivers/block/umem.c | 53 ++-
+ drivers/block/xen-blkback/blkback.c | 2 +-
+ drivers/block/xen-blkfront.c | 2 +-
+ drivers/cdrom/gdrom.c | 4 +-
+ drivers/md/bcache/bcache.h | 2 -
+ drivers/md/bcache/btree.c | 8 +-
+ drivers/md/bcache/debug.c | 21 +-
+ drivers/md/bcache/io.c | 196 ++---------
+ drivers/md/bcache/journal.c | 12 +-
+ drivers/md/bcache/movinggc.c | 4 +-
+ drivers/md/bcache/request.c | 131 +++-----
+ drivers/md/bcache/super.c | 20 +-
+ drivers/md/bcache/util.c | 4 +-
+ drivers/md/bcache/writeback.c | 6 +-
+ drivers/md/bcache/writeback.h | 2 +-
+ drivers/md/dm-bio-record.h | 37 +-
+ drivers/md/dm-bufio.c | 2 +-
+ drivers/md/dm-cache-policy-mq.c | 4 +-
+ drivers/md/dm-cache-target.c | 28 +-
+ drivers/md/dm-crypt.c | 64 ++--
+ drivers/md/dm-delay.c | 7 +-
+ drivers/md/dm-flakey.c | 7 +-
+ drivers/md/dm-io.c | 37 +-
+ drivers/md/dm-linear.c | 3 +-
+ drivers/md/dm-raid1.c | 20 +-
+ drivers/md/dm-region-hash.c | 3 +-
+ drivers/md/dm-snap.c | 19 +-
+ drivers/md/dm-stripe.c | 13 +-
+ drivers/md/dm-switch.c | 4 +-
+ drivers/md/dm-thin.c | 30 +-
+ drivers/md/dm-verity.c | 62 ++--
+ drivers/md/dm.c | 189 ++---------
+ drivers/md/faulty.c | 19 +-
+ drivers/md/linear.c | 96 +++---
+ drivers/md/md.c | 12 +-
+ drivers/md/multipath.c | 13 +-
+ drivers/md/raid0.c | 79 ++---
+ drivers/md/raid1.c | 75 +++--
+ drivers/md/raid10.c | 194 +++++------
+ drivers/md/raid5.c | 84 ++---
+ drivers/message/fusion/mptsas.c | 8 +-
+ drivers/s390/block/dasd_diag.c | 10 +-
+ drivers/s390/block/dasd_eckd.c | 48 +--
+ drivers/s390/block/dasd_fba.c | 26 +-
+ drivers/s390/block/dcssblk.c | 21 +-
+ drivers/s390/block/scm_blk.c | 8 +-
+ drivers/s390/block/scm_blk_cluster.c | 4 +-
+ drivers/s390/block/xpram.c | 19 +-
+ drivers/scsi/libsas/sas_expander.c | 8 +-
+ drivers/scsi/mpt2sas/mpt2sas_transport.c | 41 +--
+ drivers/scsi/mpt3sas/mpt3sas_transport.c | 39 +--
+ drivers/scsi/osd/osd_initiator.c | 2 +-
+ drivers/scsi/sd.c | 2 +-
+ drivers/scsi/sd_dif.c | 30 +-
+ drivers/staging/lustre/lustre/llite/lloop.c | 26 +-
+ drivers/staging/zram/zram_drv.c | 33 +-
+ drivers/target/target_core_iblock.c | 2 +-
+ fs/bio-integrity.c | 179 +++-------
+ fs/bio.c | 502 +++++++++++++---------------
+ fs/btrfs/check-integrity.c | 8 +-
+ fs/btrfs/compression.c | 27 +-
+ fs/btrfs/disk-io.c | 13 +-
+ fs/btrfs/extent_io.c | 49 ++-
+ fs/btrfs/file-item.c | 19 +-
+ fs/btrfs/inode.c | 37 +-
+ fs/btrfs/raid56.c | 22 +-
+ fs/btrfs/scrub.c | 12 +-
+ fs/btrfs/volumes.c | 14 +-
+ fs/buffer.c | 14 +-
+ fs/direct-io.c | 4 +-
+ fs/ext4/page-io.c | 8 +-
+ fs/f2fs/data.c | 33 +-
+ fs/gfs2/lops.c | 2 +-
+ fs/gfs2/ops_fstype.c | 2 +-
+ fs/hfsplus/wrapper.c | 2 +-
+ fs/jfs/jfs_logmgr.c | 12 +-
+ fs/jfs/jfs_metapage.c | 9 +-
+ fs/logfs/dev_bdev.c | 38 +--
+ fs/mpage.c | 19 +-
+ fs/nfs/blocklayout/blocklayout.c | 43 +--
+ fs/nilfs2/segbuf.c | 3 +-
+ fs/ocfs2/cluster/heartbeat.c | 2 +-
+ fs/xfs/xfs_aops.c | 2 +-
+ fs/xfs/xfs_buf.c | 4 +-
+ include/linux/bio.h | 283 ++++++++++------
+ include/linux/blk_types.h | 24 +-
+ include/linux/blkdev.h | 9 +-
+ include/linux/ceph/messenger.h | 4 +-
+ include/linux/dm-io.h | 4 +-
+ include/trace/events/bcache.h | 26 +-
+ include/trace/events/block.h | 26 +-
+ include/trace/events/f2fs.h | 4 +-
+ kernel/power/block_io.c | 2 +-
+ kernel/trace/blktrace.c | 15 +-
+ mm/bounce.c | 44 ++-
+ mm/page_io.c | 10 +-
+ net/ceph/messenger.c | 43 +--
+ 131 files changed, 2047 insertions(+), 2544 deletions(-)
+ create mode 100644 Documentation/block/biovecs.txt
+Merging device-mapper/for-next (1584dbbde46a dm cache policy mq: introduce three promotion threshold tunables)
+$ git merge device-mapper/for-next
+Resolved 'drivers/md/dm-thin.c' using previous resolution.
+Auto-merging drivers/md/dm-thin.c
+CONFLICT (content): Merge conflict in drivers/md/dm-thin.c
+Auto-merging drivers/md/dm-delay.c
+Auto-merging drivers/md/dm-cache-policy-mq.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master a78f85a2b613] Merge remote-tracking branch 'device-mapper/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/device-mapper/cache-policies.txt | 16 +-
+ Documentation/device-mapper/thin-provisioning.txt | 7 +
+ drivers/md/Kconfig | 6 +-
+ drivers/md/dm-cache-policy-mq.c | 67 +++--
+ drivers/md/dm-delay.c | 35 +--
+ drivers/md/dm-table.c | 22 +-
+ drivers/md/dm-thin-metadata.c | 20 ++
+ drivers/md/dm-thin-metadata.h | 4 +-
+ drivers/md/dm-thin.c | 278 +++++++++++++--------
+ drivers/md/persistent-data/dm-block-manager.c | 2 +-
+ drivers/md/persistent-data/dm-space-map-metadata.c | 4 +-
+ 11 files changed, 279 insertions(+), 182 deletions(-)
+Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence)
+$ git merge embedded/master
+Already up-to-date.
+Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3)
+$ git merge firmware/master
+Already up-to-date.
+Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage)
+$ git merge pcmcia/master
+Already up-to-date.
+Merging mmc/mmc-next (82793a517714 mmc: sh_mmcif: Fix compilation warning on 64-bit platforms)
+$ git merge mmc/mmc-next
+Auto-merging arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 1 -
+ arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 9 +++
+ drivers/mmc/card/block.c | 7 ++-
+ drivers/mmc/core/core.c | 3 +-
+ drivers/mmc/core/mmc.c | 8 +--
+ drivers/mmc/host/atmel-mci.c | 13 ++++-
+ drivers/mmc/host/mxs-mmc.c | 60 ++++++-------------
+ drivers/mmc/host/sdhci-acpi.c | 2 +
+ drivers/mmc/host/sdhci-esdhc-imx.c | 104 ++++++++++++++++++++++++++++-----
+ drivers/mmc/host/sdhci-pltfm.c | 6 +-
+ drivers/mmc/host/sdhci-pltfm.h | 2 +
+ drivers/mmc/host/sdhci.c | 14 ++++-
+ drivers/mmc/host/sh_mmcif.c | 100 +++++++++++++++----------------
+ drivers/mmc/host/sh_mobile_sdhi.c | 23 +++++++-
+ drivers/mmc/host/tmio_mmc.c | 9 +++
+ drivers/mmc/host/tmio_mmc.h | 17 +++---
+ drivers/mmc/host/tmio_mmc_dma.c | 2 +-
+ drivers/mmc/host/tmio_mmc_pio.c | 38 ++++++------
+ include/linux/mfd/tmio.h | 8 +++
+ include/linux/mmc/tmio.h | 1 +
+ 20 files changed, 276 insertions(+), 151 deletions(-)
+$ git reset --hard HEAD^
+HEAD is now at a78f85a2b613 Merge remote-tracking branch 'device-mapper/for-next'
+Merging next-20131212 version of mmc
+$ git merge -m next-20131212/mmc e395c4387c746b4cc7aace4c44baecd7e69a3249
+Already up-to-date.
+Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command)
+$ git merge kgdb/kgdb-next
+Resolved 'kernel/debug/debug_core.h' using previous resolution.
+Auto-merging kernel/debug/debug_core.h
+CONFLICT (content): Merge conflict in kernel/debug/debug_core.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master f5ca44b9aee7] Merge remote-tracking branch 'kgdb/kgdb-next'
+$ git diff -M --stat --summary HEAD^..
+Merging slab/for-next (e1168c2cc4a5 slab.h: remove duplicate kmalloc declaration and fix kernel-doc warnings)
+$ git merge slab/for-next
+Merge made by the 'recursive' strategy.
+Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1)
+$ git merge uclinux/for-next
+Already up-to-date.
+Merging md/for-next (6d183de40771 md/raid5: fix newly-broken locking in get_active_stripe.)
+$ git merge md/for-next
+Already up-to-date.
+Merging mfd/master (90b128ed1557 Merge tag 'mfd-lee-3.13-3' of git://git.linaro.org/people/ljones/mfd)
+$ git merge mfd/master
+Already up-to-date.
+Merging mfd-lj/for-mfd-next (6a48ec837ea1 mfd: rtsx: Add support for card reader rtl8402)
+$ git merge mfd-lj/for-mfd-next
+Auto-merging sound/soc/fsl/Kconfig
+Removing include/linux/mfd/abx500/ab8500-gpio.h
+Auto-merging drivers/staging/nvec/nvec.c
+Auto-merging drivers/mfd/wm5110-tables.c
+Auto-merging drivers/mfd/twl-core.c
+Auto-merging drivers/mfd/rtsx_pcr.c
+Auto-merging drivers/input/misc/Kconfig
+Auto-merging arch/arm/boot/dts/tegra20-colibri-512.dtsi
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/gpio/gpio-lp3943.txt | 37 +++
+ Documentation/devicetree/bindings/mfd/cros-ec.txt | 9 +
+ Documentation/devicetree/bindings/mfd/lp3943.txt | 33 +++
+ .../devicetree/bindings/pwm/pwm-lp3943.txt | 58 ++++
+ arch/arm/boot/dts/tegra20-colibri-512.dtsi | 4 +-
+ drivers/gpio/Kconfig | 8 +
+ drivers/gpio/Makefile | 1 +
+ drivers/gpio/gpio-lp3943.c | 242 +++++++++++++++
+ drivers/input/misc/Kconfig | 2 +-
+ drivers/input/touchscreen/Kconfig | 2 +-
+ drivers/mfd/88pm800.c | 4 +-
+ drivers/mfd/88pm805.c | 2 +-
+ drivers/mfd/Kconfig | 30 +-
+ drivers/mfd/Makefile | 2 +
+ drivers/mfd/ab8500-core.c | 16 +-
+ drivers/mfd/ab8500-debugfs.c | 5 +-
+ drivers/mfd/arizona-core.c | 8 +-
+ drivers/mfd/as3722.c | 5 +-
+ drivers/mfd/asic3.c | 4 +-
+ drivers/mfd/cros_ec.c | 2 +-
+ drivers/mfd/cros_ec_i2c.c | 8 +-
+ drivers/mfd/cros_ec_spi.c | 56 +++-
+ drivers/mfd/cs5535-mfd.c | 2 +-
+ drivers/mfd/da9052-core.c | 2 +-
+ drivers/mfd/da9055-core.c | 2 +-
+ drivers/mfd/da9063-core.c | 2 +-
+ drivers/mfd/db8500-prcmu.c | 4 +-
+ drivers/mfd/htc-pasic3.c | 2 +-
+ drivers/mfd/intel_msic.c | 2 +-
+ drivers/mfd/janz-cmodio.c | 2 +-
+ drivers/mfd/jz4740-adc.c | 2 +-
+ drivers/mfd/lp3943.c | 167 +++++++++++
+ drivers/mfd/lp8788.c | 2 +-
+ drivers/mfd/lpc_ich.c | 2 +-
+ drivers/mfd/lpc_sch.c | 2 +-
+ drivers/mfd/max14577.c | 245 +++++++++++++++
+ drivers/mfd/max77686.c | 2 +-
+ drivers/mfd/max77693.c | 2 +-
+ drivers/mfd/max8907.c | 2 +-
+ drivers/mfd/max8925-core.c | 8 +-
+ drivers/mfd/max8997.c | 11 +-
+ drivers/mfd/max8998.c | 4 +-
+ drivers/mfd/mc13xxx-core.c | 41 ++-
+ drivers/mfd/mc13xxx-i2c.c | 18 +-
+ drivers/mfd/mc13xxx-spi.c | 20 +-
+ drivers/mfd/mc13xxx.h | 6 +-
+ drivers/mfd/mfd-core.c | 2 +
+ drivers/mfd/omap-usb-host.c | 8 +-
+ drivers/mfd/omap-usb-tll.c | 8 +-
+ drivers/mfd/rc5t583.c | 2 +-
+ drivers/mfd/rdc321x-southbridge.c | 4 +-
+ drivers/mfd/retu-mfd.c | 6 +-
+ drivers/mfd/rtl8411.c | 101 ++++---
+ drivers/mfd/rtsx_pcr.c | 7 +-
+ drivers/mfd/rtsx_pcr.h | 9 +
+ drivers/mfd/sec-core.c | 58 +++-
+ drivers/mfd/sec-irq.c | 12 +-
+ drivers/mfd/sm501.c | 2 +-
+ drivers/mfd/ssbi.c | 16 +-
+ drivers/mfd/sta2x11-mfd.c | 4 +-
+ drivers/mfd/stmpe.c | 10 +-
+ drivers/mfd/stmpe.h | 2 +-
+ drivers/mfd/tc3589x.c | 4 +-
+ drivers/mfd/tc6387xb.c | 2 +-
+ drivers/mfd/timberdale.c | 14 +-
+ drivers/mfd/tps6507x.c | 2 +-
+ drivers/mfd/tps65090.c | 2 +-
+ drivers/mfd/tps65217.c | 2 +-
+ drivers/mfd/tps6586x.c | 52 +++-
+ drivers/mfd/tps65910.c | 2 +-
+ drivers/mfd/tps65912-core.c | 2 +-
+ drivers/mfd/tps80031.c | 2 +-
+ drivers/mfd/twl-core.c | 198 -------------
+ drivers/mfd/viperboard.c | 2 +-
+ drivers/mfd/vx855.c | 4 +-
+ drivers/mfd/wm5110-tables.c | 2 +-
+ drivers/mfd/wm831x-core.c | 14 +-
+ drivers/mfd/wm831x-i2c.c | 8 +-
+ drivers/mfd/wm831x-spi.c | 8 +-
+ drivers/mfd/wm8994-core.c | 4 +-
+ drivers/pinctrl/pinctrl-abx500.c | 37 +--
+ drivers/pinctrl/pinctrl-abx500.h | 12 +
+ drivers/pwm/Kconfig | 10 +
+ drivers/pwm/Makefile | 1 +
+ drivers/pwm/pwm-lp3943.c | 314 ++++++++++++++++++++
+ drivers/regulator/Kconfig | 2 +-
+ drivers/regulator/tps6586x-regulator.c | 93 ++++--
+ drivers/staging/nvec/nvec.c | 2 +-
+ include/linux/mfd/abx500/ab8500-gpio.h | 33 ---
+ include/linux/mfd/abx500/ab8500.h | 2 -
+ include/linux/mfd/lp3943.h | 114 +++++++
+ include/linux/mfd/max14577-private.h | 330 +++++++++++++++++++++
+ include/linux/mfd/max14577.h | 69 +++++
+ include/linux/mfd/mc13xxx.h | 2 -
+ include/linux/mfd/tps6586x.h | 7 +
+ include/linux/ssbi.h | 19 +-
+ sound/soc/fsl/Kconfig | 2 +-
+ 97 files changed, 2150 insertions(+), 564 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/gpio/gpio-lp3943.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/lp3943.txt
+ create mode 100644 Documentation/devicetree/bindings/pwm/pwm-lp3943.txt
+ create mode 100644 drivers/gpio/gpio-lp3943.c
+ create mode 100644 drivers/mfd/lp3943.c
+ create mode 100644 drivers/mfd/max14577.c
+ create mode 100644 drivers/pwm/pwm-lp3943.c
+ delete mode 100644 include/linux/mfd/abx500/ab8500-gpio.h
+ create mode 100644 include/linux/mfd/lp3943.h
+ create mode 100644 include/linux/mfd/max14577-private.h
+ create mode 100644 include/linux/mfd/max14577.h
+Merging battery/master (d36240d26025 power_supply: Add power_supply notifier)
+$ git merge battery/master
+Merge made by the 'recursive' strategy.
+ drivers/power/Kconfig | 1 +
+ drivers/power/power_supply_core.c | 30 ++++++++++++++++++++++++------
+ include/linux/power_supply.h | 8 ++++++++
+ 3 files changed, 33 insertions(+), 6 deletions(-)
+Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path)
+$ git merge fbdev/for-next
+Already up-to-date.
+Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par)
+$ git merge viafb/viafb-next
+Already up-to-date.
+Merging omap_dss2/for-next (46ac29568e63 video: vt8500: fix error handling in probe())
+$ git merge omap_dss2/for-next
+Already up-to-date.
+Merging regulator/for-next (8b9b9fd2e354 Merge remote-tracking branches 'regulator/topic/ab8500', 'regulator/topic/arizona', 'regulator/topic/db8500', 'regulator/topic/gpio', 'regulator/topic/lp3971', 'regulator/topic/lp3972', 'regulator/topic/pcf50633', 'regulator/topic/pfuze100', 'regulator/topic/s5m8767', 'regulator/topic/stw481x-vmmc' and 'regulator/topic/tps51632' into regulator-next)
+$ git merge regulator/for-next
+Merge made by the 'recursive' strategy.
+ drivers/mfd/pcf50633-core.c | 2 +-
+ drivers/regulator/ab8500.c | 126 ++++-----------------------------
+ drivers/regulator/arizona-micsupp.c | 52 +++-----------
+ drivers/regulator/core.c | 3 +-
+ drivers/regulator/db8500-prcmu.c | 20 +-----
+ drivers/regulator/gpio-regulator.c | 17 ++---
+ drivers/regulator/lp3971.c | 43 ++---------
+ drivers/regulator/lp3972.c | 41 ++---------
+ drivers/regulator/pcf50633-regulator.c | 2 +-
+ drivers/regulator/pfuze100-regulator.c | 20 +-----
+ drivers/regulator/s5m8767.c | 18 +++--
+ drivers/regulator/stw481x-vmmc.c | 12 +---
+ drivers/regulator/tps51632-regulator.c | 2 +-
+ include/linux/mfd/samsung/s5m8767.h | 3 +-
+ 14 files changed, 68 insertions(+), 293 deletions(-)
+Merging security/next (217091dd7a7a ima: define '_ima' as a builtin 'trusted' keyring)
+$ git merge security/next
+Already up-to-date.
+Merging selinux/master (465954cd649a selinux: selinux_setprocattr()->ptrace_parent() needs rcu_read_lock())
+$ git merge selinux/master
+Resolved 'security/selinux/hooks.c' using previous resolution.
+Auto-merging security/selinux/ss/services.c
+Auto-merging security/selinux/hooks.c
+CONFLICT (content): Merge conflict in security/selinux/hooks.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 45ffb5e10372] Merge remote-tracking branch 'selinux/master'
+$ git diff -M --stat --summary HEAD^..
+ security/selinux/hooks.c | 15 +++---
+ security/selinux/include/security.h | 3 +-
+ security/selinux/netlabel.c | 31 +++++++++++-
+ security/selinux/ss/constraint.h | 1 +
+ security/selinux/ss/policydb.c | 96 +++++++++++++++++++++++++++++++++----
+ security/selinux/ss/policydb.h | 11 +++++
+ security/selinux/ss/services.c | 54 ++++++++++++---------
+ 7 files changed, 169 insertions(+), 42 deletions(-)
+Merging lblnet/master (07bc9dc1b01b Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc)
+$ git merge lblnet/master
+Already up-to-date.
+Merging watchdog/master (28748defa512 watchdog: remove DEFINE_PCI_DEVICE_TABLE macro)
+$ git merge watchdog/master
+Merge made by the 'recursive' strategy.
+ drivers/watchdog/alim1535_wdt.c | 2 +-
+ drivers/watchdog/alim7101_wdt.c | 2 +-
+ drivers/watchdog/hpwdt.c | 2 +-
+ drivers/watchdog/i6300esb.c | 2 +-
+ drivers/watchdog/nv_tco.c | 2 +-
+ drivers/watchdog/pcwd_pci.c | 2 +-
+ drivers/watchdog/sp5100_tco.c | 2 +-
+ drivers/watchdog/via_wdt.c | 2 +-
+ drivers/watchdog/wdt_pci.c | 2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
+Merging dwmw2-iommu/master (e5d0c874391a Merge tag 'iommu-updates-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu)
+$ git merge dwmw2-iommu/master
+Already up-to-date.
+Merging iommu/next (e6ca48d995e4 Merge branches 'iommu/fixes', 'tracing', 'core', 'arm/tegra' and 'x86/vt-d' into next)
+$ git merge iommu/next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging vfio/next (d10999016f41 vfio: Convert control interface to misc driver)
+$ git merge vfio/next
+Merge made by the 'recursive' strategy.
+ Documentation/devices.txt | 1 +
+ drivers/vfio/vfio.c | 70 ++++++++++++++++++++++------------------------
+ include/linux/miscdevice.h | 1 +
+ 3 files changed, 35 insertions(+), 37 deletions(-)
+Merging osd/linux-next (861d66601acd exofs: don't leak io_state and pages on read error)
+$ git merge osd/linux-next
+Already up-to-date.
+Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document)
+$ git merge jc_docs/docs-next
+Already up-to-date.
+Merging trivial/for-next (5e4fcf9d5e4c doc: driver-model/platform.txt: fix a typo)
+$ git merge trivial/for-next
+Auto-merging net/core/dev.c
+Auto-merging init/Kconfig
+Auto-merging drivers/devfreq/exynos/exynos4_bus.c
+Auto-merging drivers/char/Makefile
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/arm/mach-at91/Kconfig.non_dt
+Auto-merging Documentation/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/.gitignore | 1 +
+ Documentation/DocBook/Makefile | 5 +++--
+ Documentation/DocBook/kernel-api.tmpl | 1 +
+ Documentation/IRQ-domain.txt | 2 +-
+ Documentation/driver-model/platform.txt | 2 +-
+ Documentation/efi-stub.txt | 2 +-
+ Documentation/email-clients.txt | 2 +-
+ Documentation/filesystems/Locking | 2 +-
+ Documentation/io-mapping.txt | 2 +-
+ Documentation/kernel-parameters.txt | 9 ++++++++-
+ Documentation/md.txt | 2 +-
+ Documentation/rfkill.txt | 2 +-
+ Documentation/rt-mutex-design.txt | 2 +-
+ Documentation/static-keys.txt | 4 ++--
+ Documentation/x86/x86_64/boot-options.txt | 23 -----------------------
+ arch/arm/mach-at91/Kconfig.non_dt | 2 +-
+ arch/arm/mach-imx/mach-pca100.c | 2 +-
+ arch/arm64/kvm/handle_exit.c | 2 +-
+ arch/mips/ralink/cevt-rt3352.c | 2 +-
+ arch/mips/ralink/timer.c | 2 +-
+ arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 2 +-
+ arch/x86/Kconfig | 2 +-
+ drivers/base/Kconfig | 2 +-
+ drivers/block/Makefile | 1 -
+ drivers/cdrom/Makefile | 1 -
+ drivers/char/Makefile | 1 -
+ drivers/char/msm_smd_pkt.c | 2 +-
+ drivers/devfreq/exynos/exynos4_bus.c | 2 +-
+ drivers/devfreq/exynos/exynos5_bus.c | 2 +-
+ drivers/gpu/drm/exynos/exynos_drm_crtc.c | 4 ++--
+ drivers/gpu/drm/exynos/exynos_drm_fimc.c | 2 +-
+ drivers/gpu/drm/exynos/exynos_drm_g2d.c | 2 +-
+ drivers/gpu/drm/exynos/exynos_drm_gem.c | 2 +-
+ drivers/gpu/drm/exynos/exynos_drm_gem.h | 2 +-
+ drivers/gpu/drm/exynos/exynos_drm_gsc.c | 4 ++--
+ drivers/gpu/drm/exynos/exynos_drm_ipp.c | 2 +-
+ drivers/gpu/drm/exynos/exynos_drm_ipp.h | 4 ++--
+ drivers/gpu/drm/qxl/Kconfig | 8 +++++---
+ drivers/i2c/busses/i2c-exynos5.c | 2 +-
+ drivers/iio/adc/twl6030-gpadc.c | 2 +-
+ drivers/isdn/hisax/hfc4s8s_l1.c | 2 +-
+ drivers/isdn/mISDN/Kconfig | 2 +-
+ drivers/media/platform/ti-vpe/vpdma.c | 4 ++--
+ drivers/net/wireless/libertas/cmdresp.c | 2 +-
+ drivers/scsi/Kconfig | 4 ++--
+ drivers/staging/usbip/usbip_common.c | 1 -
+ drivers/video/udlfb.c | 2 +-
+ drivers/xen/Kconfig | 2 +-
+ fs/btrfs/tests/free-space-tests.c | 2 +-
+ include/linux/tracepoint.h | 2 +-
+ init/Kconfig | 2 +-
+ net/core/dev.c | 2 +-
+ net/netfilter/ipset/Kconfig | 2 +-
+ net/nfc/digital_dep.c | 2 +-
+ 54 files changed, 68 insertions(+), 83 deletions(-)
+Merging audit/master (fc582aef7dcc Merge tag 'v3.12')
+$ git merge audit/master
+Merge made by the 'recursive' strategy.
+Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls)
+$ git merge fsnotify/for-next
+Already up-to-date.
+Merging devicetree/devicetree/next (355e62f5ad12 of/irq: Fix potential buffer overflow)
+$ git merge devicetree/devicetree/next
+Already up-to-date.
+Merging dt-rh/for-next (1b50b0c3330e Merge branch 'for-3.14' into for-next)
+$ git merge dt-rh/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/gic.txt | 1 +
+ MAINTAINERS | 4 +-
+ drivers/of/base.c | 53 +++++++++++++++++++--------
+ drivers/of/irq.c | 6 ++-
+ 4 files changed, 45 insertions(+), 19 deletions(-)
+Merging spi/for-next (4aaaa679ca1e Merge remote-tracking branches 'spi/topic/ath79', 'spi/topic/atmel', 'spi/topic/bcm2835', 'spi/topic/bcm63xx', 'spi/topic/bcm63xx-hsspi', 'spi/topic/coldfire', 'spi/topic/davinci', 'spi/topic/designware', 'spi/topic/falcon', 'spi/topic/fsl-espi', 'spi/topic/gpio', 'spi/topic/mpc512x', 'spi/topic/msiof', 'spi/topic/nuc900', 'spi/topic/omap', 'spi/topic/orion', 'spi/topic/pci', 'spi/topic/qspi', 'spi/topic/rcar', 'spi/topic/s3c24xx', 'spi/topic/s3c64xx', 'spi/topic/sc18is602', 'spi/topic/tegra114', 'spi/topic/tegra20-sflash', 'spi/topic/tegra20-slink', 'spi/topic/txx9' and 'spi/topic/xcomm' into spi-next)
+$ git merge spi/for-next
+Recorded preimage for 'drivers/spi/spi-mpc512x-psc.c'
+Auto-merging drivers/spi/spi-tegra20-slink.c
+Auto-merging drivers/spi/spi-tegra20-sflash.c
+Auto-merging drivers/spi/spi-tegra114.c
+Auto-merging drivers/spi/spi-mpc512x-psc.c
+CONFLICT (content): Merge conflict in drivers/spi/spi-mpc512x-psc.c
+Auto-merging drivers/spi/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/spi/spi-mpc512x-psc.c'.
+[master 37edb7f06fc1] Merge remote-tracking branch 'spi/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/spi/spi-bus.txt | 2 +-
+ Documentation/devicetree/bindings/spi/ti_qspi.txt | 8 +-
+ Documentation/spi/spi-summary | 8 +-
+ drivers/spi/Kconfig | 11 +-
+ drivers/spi/Makefile | 1 +
+ drivers/spi/spi-ath79.c | 14 +-
+ drivers/spi/spi-atmel.c | 18 +-
+ drivers/spi/spi-bcm2835.c | 10 +-
+ drivers/spi/spi-bcm63xx-hsspi.c | 475 ++++++++++++++++++++++
+ drivers/spi/spi-bcm63xx.c | 48 +--
+ drivers/spi/spi-coldfire-qspi.c | 53 +--
+ drivers/spi/spi-davinci.c | 45 +-
+ drivers/spi/spi-dw-mmio.c | 57 +--
+ drivers/spi/spi-dw-pci.c | 2 +-
+ drivers/spi/spi-falcon.c | 12 +-
+ drivers/spi/spi-fsl-espi.c | 63 ++-
+ drivers/spi/spi-gpio.c | 8 +-
+ drivers/spi/spi-mpc512x-psc.c | 18 +-
+ drivers/spi/spi-nuc900.c | 50 +--
+ drivers/spi/spi-omap-100k.c | 20 -
+ drivers/spi/spi-omap2-mcspi.c | 38 +-
+ drivers/spi/spi-orion.c | 4 +-
+ drivers/spi/spi-pxa2xx-pci.c | 2 +-
+ drivers/spi/spi-rspi.c | 43 +-
+ drivers/spi/spi-s3c24xx.c | 67 +--
+ drivers/spi/spi-sc18is602.c | 13 +-
+ drivers/spi/spi-sh-msiof.c | 62 +--
+ drivers/spi/spi-tegra114.c | 98 ++---
+ drivers/spi/spi-tegra20-sflash.c | 22 +-
+ drivers/spi/spi-tegra20-slink.c | 97 ++---
+ drivers/spi/spi-ti-qspi.c | 53 ++-
+ drivers/spi/spi-topcliff-pch.c | 2 +-
+ drivers/spi/spi-txx9.c | 7 +-
+ drivers/spi/spi-xcomm.c | 12 +-
+ drivers/spi/spi.c | 26 +-
+ include/linux/spi/spi.h | 2 +-
+ 36 files changed, 897 insertions(+), 574 deletions(-)
+ create mode 100644 drivers/spi/spi-bcm63xx-hsspi.c
+Merging tip/auto-latest (66fa28e2bb4a Merge branch 'x86/ras')
+$ git merge tip/auto-latest
+Auto-merging tools/perf/perf-completion.sh
+Removing tools/perf/config/feature-checks/test-stackprotector.c
+Auto-merging tools/lib/api/fs/debugfs.h
+Auto-merging tools/lib/api/Makefile
+Auto-merging kernel/sched/fair.c
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/fork.c
+Auto-merging drivers/net/bonding/bond_main.c
+Auto-merging drivers/acpi/apei/einj.c
+Auto-merging drivers/acpi/acpi_extlog.c
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/powerpc/kernel/setup_64.c
+Auto-merging arch/powerpc/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/RCU/trace.txt | 22 +-
+ Documentation/acpi/apei/einj.txt | 19 +-
+ Documentation/circular-buffers.txt | 45 +-
+ Documentation/kernel-parameters.txt | 27 +-
+ Documentation/memory-barriers.txt | 775 +++++++++++++++++----
+ Documentation/robust-futex-ABI.txt | 4 +-
+ Documentation/sysctl/kernel.txt | 5 -
+ Documentation/x86/x86_64/mm.txt | 7 +
+ MAINTAINERS | 11 +
+ arch/arm/kernel/perf_event.c | 4 -
+ arch/mips/ar7/setup.c | 1 -
+ arch/mips/emma/markeins/setup.c | 3 -
+ arch/mips/netlogic/xlp/setup.c | 1 -
+ arch/mips/netlogic/xlr/setup.c | 1 -
+ arch/mips/sibyte/swarm/setup.c | 2 -
+ arch/powerpc/Kconfig | 4 +
+ arch/powerpc/include/asm/setup.h | 1 +
+ arch/powerpc/include/asm/spinlock.h | 2 +
+ arch/powerpc/include/asm/uprobes.h | 5 +-
+ arch/powerpc/kernel/setup_32.c | 3 -
+ arch/powerpc/kernel/setup_64.c | 3 -
+ arch/powerpc/kernel/uprobes.c | 2 +-
+ arch/powerpc/platforms/pseries/setup.c | 2 +-
+ arch/x86/Kconfig | 52 +-
+ arch/x86/boot/Makefile | 2 +-
+ arch/x86/boot/boot.h | 10 +-
+ arch/x86/boot/compressed/Makefile | 2 +-
+ arch/x86/boot/compressed/aslr.c | 317 +++++++++
+ arch/x86/boot/compressed/cmdline.c | 2 +-
+ arch/x86/boot/compressed/cpuflags.c | 12 +
+ arch/x86/boot/compressed/head_32.S | 10 +-
+ arch/x86/boot/compressed/head_64.S | 16 +-
+ arch/x86/boot/compressed/misc.c | 18 +-
+ arch/x86/boot/compressed/misc.h | 37 +-
+ arch/x86/boot/cpucheck.c | 100 +--
+ arch/x86/boot/cpuflags.c | 104 +++
+ arch/x86/boot/cpuflags.h | 19 +
+ arch/x86/include/asm/archrandom.h | 21 +
+ arch/x86/include/asm/cpufeature.h | 1 +
+ arch/x86/include/asm/efi.h | 64 +-
+ arch/x86/include/asm/futex.h | 21 +-
+ arch/x86/include/asm/page.h | 1 +
+ arch/x86/include/asm/page_32.h | 4 -
+ arch/x86/include/asm/page_64_types.h | 15 +-
+ arch/x86/include/asm/pgtable-2level.h | 100 +--
+ arch/x86/include/asm/pgtable_64_types.h | 2 +-
+ arch/x86/include/asm/pgtable_types.h | 3 +-
+ arch/x86/include/asm/processor.h | 23 +
+ arch/x86/include/asm/uaccess.h | 92 +++
+ arch/x86/include/asm/xsave.h | 14 +-
+ arch/x86/kernel/cpu/Makefile | 2 +-
+ arch/x86/kernel/cpu/mcheck/mce.c | 4 +-
+ arch/x86/kernel/cpu/perf_event_intel_rapl.c | 662 ++++++++++++++++++
+ arch/x86/kernel/cpu/rdrand.c | 14 -
+ arch/x86/kernel/setup.c | 26 +
+ arch/x86/kernel/traps.c | 22 +-
+ arch/x86/kernel/xsave.c | 10 +
+ arch/x86/lib/copy_user_64.S | 12 +-
+ arch/x86/mm/hugetlbpage.c | 9 +-
+ arch/x86/mm/init_32.c | 3 +
+ arch/x86/mm/pageattr.c | 461 +++++++++++-
+ arch/x86/platform/efi/efi.c | 111 ++-
+ arch/x86/platform/efi/efi_32.c | 9 +-
+ arch/x86/platform/efi/efi_64.c | 109 +++
+ arch/x86/platform/efi/efi_stub_64.S | 54 ++
+ arch/x86/tools/relocs.c | 20 +-
+ drivers/acpi/acpi_extlog.c | 18 +-
+ drivers/acpi/apei/einj.c | 39 +-
+ drivers/edac/edac_stub.c | 19 +
+ drivers/edac/sb_edac.c | 6 +-
+ drivers/net/bonding/bond_main.c | 2 +-
+ include/linux/context_tracking.h | 10 +-
+ include/linux/context_tracking_state.h | 11 +-
+ include/linux/edac.h | 28 +
+ include/linux/efi.h | 1 +
+ include/linux/kernel.h | 9 +
+ include/linux/perf_event.h | 5 +-
+ include/linux/rculist.h | 4 +-
+ include/linux/rcupdate.h | 153 ++--
+ include/linux/rcutiny.h | 2 +-
+ include/linux/rcutree.h | 36 +-
+ include/linux/sched.h | 1 -
+ include/linux/sched/sysctl.h | 1 -
+ include/linux/spinlock.h | 10 +
+ include/linux/tick.h | 8 +-
+ include/linux/uprobes.h | 52 +-
+ include/linux/vtime.h | 4 +-
+ include/trace/events/ras.h | 10 +-
+ kernel/context_tracking.c | 8 +-
+ kernel/events/core.c | 17 +-
+ kernel/events/ring_buffer.c | 42 +-
+ kernel/events/uprobes.c | 60 +-
+ kernel/fork.c | 4 +-
+ kernel/locking/lockdep.c | 4 +
+ kernel/locking/mutex-debug.c | 7 +-
+ kernel/panic.c | 2 +-
+ kernel/posix-cpu-timers.c | 327 ++++-----
+ kernel/rcu/rcu.h | 5 +-
+ kernel/rcu/srcu.c | 57 +-
+ kernel/rcu/torture.c | 75 +-
+ kernel/rcu/tree.c | 97 ++-
+ kernel/rcu/tree.h | 12 +-
+ kernel/rcu/tree_plugin.h | 102 ++-
+ kernel/rcu/tree_trace.c | 3 +-
+ kernel/rcu/update.c | 5 +
+ kernel/sched/core.c | 11 +-
+ kernel/sched/debug.c | 2 +-
+ kernel/sched/fair.c | 36 +-
+ kernel/sched/sched.h | 1 +
+ kernel/softirq.c | 53 +-
+ kernel/sysctl.c | 7 -
+ kernel/time/tick-broadcast.c | 6 +-
+ kernel/time/tick-internal.h | 4 +-
+ kernel/time/tick-sched.c | 39 +-
+ lib/Kconfig.debug | 9 +
+ tools/Makefile | 12 +-
+ tools/lib/{lk => api}/Makefile | 18 +-
+ tools/lib/{lk => api/fs}/debugfs.c | 0
+ tools/lib/{lk => api/fs}/debugfs.h | 6 +-
+ tools/lib/lockdep/Makefile | 251 +++++++
+ tools/lib/lockdep/common.c | 33 +
+ tools/lib/lockdep/include/liblockdep/common.h | 50 ++
+ tools/lib/lockdep/include/liblockdep/mutex.h | 70 ++
+ tools/lib/lockdep/include/liblockdep/rwlock.h | 86 +++
+ tools/lib/lockdep/lockdep | 3 +
+ tools/lib/lockdep/lockdep.c | 2 +
+ tools/lib/lockdep/lockdep_internals.h | 1 +
+ tools/lib/lockdep/lockdep_states.h | 1 +
+ tools/lib/lockdep/preload.c | 447 ++++++++++++
+ tools/lib/lockdep/rbtree.c | 1 +
+ tools/lib/lockdep/run_tests.sh | 27 +
+ tools/lib/lockdep/tests/AA.c | 13 +
+ tools/lib/lockdep/tests/ABBA.c | 13 +
+ tools/lib/lockdep/tests/ABBCCA.c | 15 +
+ tools/lib/lockdep/tests/ABBCCDDA.c | 17 +
+ tools/lib/lockdep/tests/ABCABC.c | 15 +
+ tools/lib/lockdep/tests/ABCDBCDA.c | 17 +
+ tools/lib/lockdep/tests/ABCDBDDA.c | 17 +
+ tools/lib/lockdep/tests/WW.c | 13 +
+ tools/lib/lockdep/tests/common.h | 12 +
+ tools/lib/lockdep/tests/unlock_balance.c | 12 +
+ tools/lib/lockdep/uinclude/asm/hweight.h | 3 +
+ tools/lib/lockdep/uinclude/asm/sections.h | 3 +
+ tools/lib/lockdep/uinclude/linux/bitops.h | 3 +
+ tools/lib/lockdep/uinclude/linux/compiler.h | 7 +
+ tools/lib/lockdep/uinclude/linux/debug_locks.h | 12 +
+ tools/lib/lockdep/uinclude/linux/delay.h | 3 +
+ tools/lib/lockdep/uinclude/linux/export.h | 7 +
+ tools/lib/lockdep/uinclude/linux/ftrace.h | 3 +
+ tools/lib/lockdep/uinclude/linux/gfp.h | 3 +
+ tools/lib/lockdep/uinclude/linux/hardirq.h | 11 +
+ tools/lib/lockdep/uinclude/linux/hash.h | 1 +
+ tools/lib/lockdep/uinclude/linux/interrupt.h | 3 +
+ tools/lib/lockdep/uinclude/linux/irqflags.h | 38 +
+ tools/lib/lockdep/uinclude/linux/kallsyms.h | 32 +
+ tools/lib/lockdep/uinclude/linux/kern_levels.h | 25 +
+ tools/lib/lockdep/uinclude/linux/kernel.h | 44 ++
+ tools/lib/lockdep/uinclude/linux/kmemcheck.h | 8 +
+ tools/lib/lockdep/uinclude/linux/linkage.h | 3 +
+ tools/lib/lockdep/uinclude/linux/list.h | 1 +
+ tools/lib/lockdep/uinclude/linux/lockdep.h | 55 ++
+ tools/lib/lockdep/uinclude/linux/module.h | 6 +
+ tools/lib/lockdep/uinclude/linux/mutex.h | 3 +
+ tools/lib/lockdep/uinclude/linux/poison.h | 1 +
+ tools/lib/lockdep/uinclude/linux/prefetch.h | 6 +
+ tools/lib/lockdep/uinclude/linux/proc_fs.h | 3 +
+ tools/lib/lockdep/uinclude/linux/rbtree.h | 1 +
+ .../lib/lockdep/uinclude/linux/rbtree_augmented.h | 2 +
+ tools/lib/lockdep/uinclude/linux/rcu.h | 16 +
+ tools/lib/lockdep/uinclude/linux/seq_file.h | 3 +
+ tools/lib/lockdep/uinclude/linux/spinlock.h | 25 +
+ tools/lib/lockdep/uinclude/linux/stacktrace.h | 32 +
+ tools/lib/lockdep/uinclude/linux/stringify.h | 7 +
+ tools/lib/lockdep/uinclude/linux/types.h | 58 ++
+ tools/lib/lockdep/uinclude/trace/events/lock.h | 3 +
+ tools/lib/symbol/kallsyms.c | 58 ++
+ tools/lib/symbol/kallsyms.h | 24 +
+ tools/lib/traceevent/Makefile | 71 +-
+ tools/lib/traceevent/event-parse.c | 91 ++-
+ tools/lib/traceevent/event-parse.h | 64 +-
+ tools/lib/traceevent/event-plugin.c | 215 ++++++
+ tools/lib/traceevent/parse-filter.c | 623 ++++++++++-------
+ tools/lib/traceevent/plugin_cfg80211.c | 24 +
+ tools/lib/traceevent/plugin_function.c | 160 +++++
+ tools/lib/traceevent/plugin_hrtimer.c | 78 +++
+ tools/lib/traceevent/plugin_jbd2.c | 68 ++
+ tools/lib/traceevent/plugin_kmem.c | 72 ++
+ tools/lib/traceevent/plugin_kvm.c | 436 ++++++++++++
+ tools/lib/traceevent/plugin_mac80211.c | 95 +++
+ tools/lib/traceevent/plugin_sched_switch.c | 148 ++++
+ tools/lib/traceevent/plugin_scsi.c | 423 +++++++++++
+ tools/lib/traceevent/plugin_xen.c | 130 ++++
+ tools/perf/Documentation/perf-archive.txt | 6 +-
+ tools/perf/Documentation/perf-kvm.txt | 34 +-
+ tools/perf/Documentation/perf-record.txt | 12 +-
+ tools/perf/Documentation/perf-report.txt | 9 +
+ tools/perf/Documentation/perf-script.txt | 14 +-
+ tools/perf/Documentation/perf-timechart.txt | 42 +-
+ tools/perf/Documentation/perf-top.txt | 5 +-
+ tools/perf/MANIFEST | 2 +
+ tools/perf/Makefile | 7 +-
+ tools/perf/Makefile.perf | 60 +-
+ tools/perf/builtin-annotate.c | 2 +-
+ tools/perf/builtin-diff.c | 3 +-
+ tools/perf/builtin-kvm.c | 13 +-
+ tools/perf/builtin-probe.c | 2 +-
+ tools/perf/builtin-record.c | 35 +-
+ tools/perf/builtin-report.c | 22 +-
+ tools/perf/builtin-script.c | 245 ++++++-
+ tools/perf/builtin-stat.c | 114 ++-
+ tools/perf/builtin-timechart.c | 755 +++++++++++++-------
+ tools/perf/builtin-top.c | 29 +-
+ tools/perf/builtin-trace.c | 52 +-
+ tools/perf/config/Makefile | 67 +-
+ tools/perf/config/feature-checks/Makefile | 12 +-
+ tools/perf/config/feature-checks/test-all.c | 5 +
+ .../config/feature-checks/test-stackprotector.c | 6 -
+ tools/perf/{bash_completion => perf-completion.sh} | 104 ++-
+ tools/perf/perf.c | 2 +-
+ tools/perf/perf.h | 1 +
+ tools/perf/tests/attr/test-record-no-inherit | 2 +-
+ tools/perf/tests/parse-events.c | 2 +-
+ tools/perf/util/annotate.c | 2 +-
+ tools/perf/util/build-id.c | 2 +-
+ tools/perf/util/build-id.h | 2 +-
+ tools/perf/util/data.c | 6 +
+ tools/perf/util/data.h | 14 +-
+ tools/perf/util/debug.c | 30 +-
+ tools/perf/util/debug.h | 2 +
+ tools/perf/util/dso.c | 135 ++--
+ tools/perf/util/dso.h | 31 +-
+ tools/perf/util/event.c | 4 +-
+ tools/perf/util/evlist.c | 38 +-
+ tools/perf/util/evlist.h | 5 +
+ tools/perf/util/evsel.c | 53 +-
+ tools/perf/util/evsel.h | 3 +
+ tools/perf/util/header.c | 35 +-
+ tools/perf/util/machine.c | 21 +-
+ tools/perf/util/map.c | 17 +
+ tools/perf/util/map.h | 2 +
+ tools/perf/util/parse-events.c | 30 +-
+ tools/perf/util/parse-options.c | 21 +
+ tools/perf/util/parse-options.h | 8 +
+ tools/perf/util/pmu.c | 138 +++-
+ tools/perf/util/pmu.h | 3 +-
+ tools/perf/util/probe-event.c | 4 +-
+ tools/perf/util/python-ext-sources | 1 +
+ tools/perf/util/record.c | 37 +
+ tools/perf/util/session.c | 75 +-
+ tools/perf/util/session.h | 10 +-
+ tools/perf/util/setup.py | 4 +-
+ tools/perf/util/srcline.c | 66 +-
+ tools/perf/util/svghelper.c | 234 ++++++-
+ tools/perf/util/svghelper.h | 17 +-
+ tools/perf/util/symbol-elf.c | 1 +
+ tools/perf/util/symbol-minimal.c | 1 +
+ tools/perf/util/symbol.c | 154 ++--
+ tools/perf/util/symbol.h | 10 +-
+ tools/perf/util/target.c | 11 +-
+ tools/perf/util/target.h | 17 +-
+ tools/perf/util/thread.c | 2 +-
+ tools/perf/util/thread.h | 12 +
+ tools/perf/util/trace-event-info.c | 2 +-
+ tools/perf/util/trace-event-parse.c | 13 -
+ tools/perf/util/trace-event-read.c | 20 +-
+ tools/perf/util/trace-event.c | 82 +++
+ tools/perf/util/trace-event.h | 15 +-
+ tools/perf/util/util.c | 136 +++-
+ tools/perf/util/util.h | 24 +-
+ tools/perf/util/vdso.c | 2 +-
+ tools/testing/selftests/rcutorture/.gitignore | 6 +
+ .../selftests/rcutorture/bin/config2frag.sh | 25 +
+ .../selftests/rcutorture/bin/configNR_CPUS.sh | 45 ++
+ .../selftests/rcutorture/bin/configcheck.sh | 54 ++
+ .../testing/selftests/rcutorture/bin/configinit.sh | 74 ++
+ tools/testing/selftests/rcutorture/bin/cpus2use.sh | 41 ++
+ .../testing/selftests/rcutorture/bin/functions.sh | 198 ++++++
+ .../testing/selftests/rcutorture/bin/kvm-build.sh | 71 ++
+ .../selftests/rcutorture/bin/kvm-recheck.sh | 44 ++
+ .../selftests/rcutorture/bin/kvm-test-1-rcu.sh | 192 +++++
+ tools/testing/selftests/rcutorture/bin/kvm.sh | 210 ++++++
+ .../selftests/rcutorture/bin/parse-build.sh | 57 ++
+ .../selftests/rcutorture/bin/parse-console.sh | 41 ++
+ .../selftests/rcutorture/bin/parse-rcutorture.sh | 106 +++
+ tools/testing/selftests/rcutorture/configs/CFLIST | 13 +
+ tools/testing/selftests/rcutorture/configs/SRCU-N | 8 +
+ .../selftests/rcutorture/configs/SRCU-N.boot | 1 +
+ tools/testing/selftests/rcutorture/configs/SRCU-P | 8 +
+ .../selftests/rcutorture/configs/SRCU-P.boot | 1 +
+ tools/testing/selftests/rcutorture/configs/TINY01 | 13 +
+ tools/testing/selftests/rcutorture/configs/TINY02 | 13 +
+ tools/testing/selftests/rcutorture/configs/TREE01 | 23 +
+ .../selftests/rcutorture/configs/TREE01.boot | 1 +
+ tools/testing/selftests/rcutorture/configs/TREE02 | 26 +
+ tools/testing/selftests/rcutorture/configs/TREE03 | 23 +
+ tools/testing/selftests/rcutorture/configs/TREE04 | 25 +
+ .../selftests/rcutorture/configs/TREE04.boot | 1 +
+ tools/testing/selftests/rcutorture/configs/TREE05 | 25 +
+ .../selftests/rcutorture/configs/TREE05.boot | 1 +
+ tools/testing/selftests/rcutorture/configs/TREE06 | 26 +
+ tools/testing/selftests/rcutorture/configs/TREE07 | 24 +
+ tools/testing/selftests/rcutorture/configs/TREE08 | 26 +
+ .../testing/selftests/rcutorture/configs/TREE08-T | 26 +
+ tools/testing/selftests/rcutorture/configs/TREE09 | 21 +
+ .../selftests/rcutorture/configs/v0.0/CFLIST | 14 +
+ .../rcutorture/configs/v0.0/N1-S-T-NH-SD-SMP-HP | 18 +
+ .../rcutorture/configs/v0.0/N2-2-t-nh-sd-SMP-hp | 20 +
+ .../rcutorture/configs/v0.0/N3-3-T-nh-SD-SMP-hp | 22 +
+ .../rcutorture/configs/v0.0/N4-A-t-NH-sd-SMP-HP | 18 +
+ .../rcutorture/configs/v0.0/N5-U-T-NH-sd-SMP-hp | 22 +
+ .../selftests/rcutorture/configs/v0.0/NT1-nh | 23 +
+ .../selftests/rcutorture/configs/v0.0/NT3-NH | 20 +
+ .../rcutorture/configs/v0.0/P1-S-T-NH-SD-SMP-HP | 19 +
+ .../rcutorture/configs/v0.0/P2-2-t-nh-sd-SMP-hp | 20 +
+ .../rcutorture/configs/v0.0/P3-3-T-nh-SD-SMP-hp | 20 +
+ .../rcutorture/configs/v0.0/P4-A-t-NH-sd-SMP-HP | 22 +
+ .../rcutorture/configs/v0.0/P5-U-T-NH-sd-SMP-hp | 28 +
+ .../selftests/rcutorture/configs/v0.0/PT1-nh | 23 +
+ .../selftests/rcutorture/configs/v0.0/PT2-NH | 22 +
+ .../rcutorture/configs/v0.0/ver_functions.sh | 35 +
+ .../selftests/rcutorture/configs/v3.12/CFLIST | 17 +
+ .../rcutorture/configs/v3.12/N1-S-T-NH-SD-SMP-HP | 19 +
+ .../rcutorture/configs/v3.12/N2-2-t-nh-sd-SMP-hp | 20 +
+ .../rcutorture/configs/v3.12/N3-3-T-nh-SD-SMP-hp | 22 +
+ .../rcutorture/configs/v3.12/N4-A-t-NH-sd-SMP-HP | 18 +
+ .../rcutorture/configs/v3.12/N5-U-T-NH-sd-SMP-hp | 22 +
+ .../rcutorture/configs/v3.12/N6---t-nh-SD-smp-hp | 19 +
+ .../rcutorture/configs/v3.12/N7-4-T-NH-SD-SMP-HP | 26 +
+ .../rcutorture/configs/v3.12/N8-2-T-NH-SD-SMP-HP | 22 +
+ .../selftests/rcutorture/configs/v3.12/NT1-nh | 23 +
+ .../selftests/rcutorture/configs/v3.12/NT3-NH | 20 +
+ .../rcutorture/configs/v3.12/P1-S-T-NH-SD-SMP-HP | 20 +
+ .../rcutorture/configs/v3.12/P2-2-t-nh-sd-SMP-hp | 20 +
+ .../rcutorture/configs/v3.12/P3-3-T-nh-SD-SMP-hp | 20 +
+ .../rcutorture/configs/v3.12/P4-A-t-NH-sd-SMP-HP | 22 +
+ .../rcutorture/configs/v3.12/P5-U-T-NH-sd-SMP-hp | 28 +
+ .../rcutorture/configs/v3.12/P6---t-nh-SD-smp-hp | 18 +
+ .../rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP | 30 +
+ .../configs/v3.12/P7-4-T-NH-SD-SMP-HP-all | 30 +
+ .../configs/v3.12/P7-4-T-NH-SD-SMP-HP-none | 30 +
+ .../rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-hp | 30 +
+ .../selftests/rcutorture/configs/v3.12/PT1-nh | 23 +
+ .../selftests/rcutorture/configs/v3.12/PT2-NH | 22 +
+ .../selftests/rcutorture/configs/v3.3/CFLIST | 14 +
+ .../rcutorture/configs/v3.3/N1-S-T-NH-SD-SMP-HP | 19 +
+ .../rcutorture/configs/v3.3/N2-2-t-nh-sd-SMP-hp | 20 +
+ .../rcutorture/configs/v3.3/N3-3-T-nh-SD-SMP-hp | 22 +
+ .../rcutorture/configs/v3.3/N4-A-t-NH-sd-SMP-HP | 18 +
+ .../rcutorture/configs/v3.3/N5-U-T-NH-sd-SMP-hp | 22 +
+ .../selftests/rcutorture/configs/v3.3/NT1-nh | 23 +
+ .../selftests/rcutorture/configs/v3.3/NT3-NH | 20 +
+ .../rcutorture/configs/v3.3/P1-S-T-NH-SD-SMP-HP | 20 +
+ .../rcutorture/configs/v3.3/P2-2-t-nh-sd-SMP-hp | 20 +
+ .../rcutorture/configs/v3.3/P3-3-T-nh-SD-SMP-hp | 20 +
+ .../rcutorture/configs/v3.3/P4-A-t-NH-sd-SMP-HP | 22 +
+ .../rcutorture/configs/v3.3/P5-U-T-NH-sd-SMP-hp | 28 +
+ .../selftests/rcutorture/configs/v3.3/PT1-nh | 23 +
+ .../selftests/rcutorture/configs/v3.3/PT2-NH | 22 +
+ .../rcutorture/configs/v3.3/ver_functions.sh | 41 ++
+ .../selftests/rcutorture/configs/v3.5/CFLIST | 14 +
+ .../rcutorture/configs/v3.5/N1-S-T-NH-SD-SMP-HP | 19 +
+ .../rcutorture/configs/v3.5/N2-2-t-nh-sd-SMP-hp | 20 +
+ .../rcutorture/configs/v3.5/N3-3-T-nh-SD-SMP-hp | 22 +
+ .../rcutorture/configs/v3.5/N4-A-t-NH-sd-SMP-HP | 18 +
+ .../rcutorture/configs/v3.5/N5-U-T-NH-sd-SMP-hp | 22 +
+ .../selftests/rcutorture/configs/v3.5/NT1-nh | 23 +
+ .../selftests/rcutorture/configs/v3.5/NT3-NH | 20 +
+ .../rcutorture/configs/v3.5/P1-S-T-NH-SD-SMP-HP | 20 +
+ .../rcutorture/configs/v3.5/P2-2-t-nh-sd-SMP-hp | 20 +
+ .../rcutorture/configs/v3.5/P3-3-T-nh-SD-SMP-hp | 20 +
+ .../rcutorture/configs/v3.5/P4-A-t-NH-sd-SMP-HP | 22 +
+ .../rcutorture/configs/v3.5/P5-U-T-NH-sd-SMP-hp | 28 +
+ .../selftests/rcutorture/configs/v3.5/PT1-nh | 23 +
+ .../selftests/rcutorture/configs/v3.5/PT2-NH | 22 +
+ .../rcutorture/configs/v3.5/ver_functions.sh | 46 ++
+ .../selftests/rcutorture/configs/ver_functions.sh | 46 ++
+ .../testing/selftests/rcutorture/doc/TINY_RCU.txt | 40 ++
+ .../selftests/rcutorture/doc/TREE_RCU-Kconfig.txt | 95 +++
+ tools/testing/selftests/rcutorture/doc/initrd.txt | 90 +++
+ .../selftests/rcutorture/doc/rcu-test-image.txt | 42 ++
+ tools/vm/Makefile | 14 +-
+ tools/vm/page-types.c | 2 +-
+ 382 files changed, 13639 insertions(+), 2281 deletions(-)
+ create mode 100644 arch/x86/boot/compressed/aslr.c
+ create mode 100644 arch/x86/boot/compressed/cpuflags.c
+ create mode 100644 arch/x86/boot/cpuflags.c
+ create mode 100644 arch/x86/boot/cpuflags.h
+ create mode 100644 arch/x86/kernel/cpu/perf_event_intel_rapl.c
+ rename tools/lib/{lk => api}/Makefile (66%)
+ rename tools/lib/{lk => api/fs}/debugfs.c (100%)
+ rename tools/lib/{lk => api/fs}/debugfs.h (86%)
+ create mode 100644 tools/lib/lockdep/Makefile
+ create mode 100644 tools/lib/lockdep/common.c
+ create mode 100644 tools/lib/lockdep/include/liblockdep/common.h
+ create mode 100644 tools/lib/lockdep/include/liblockdep/mutex.h
+ create mode 100644 tools/lib/lockdep/include/liblockdep/rwlock.h
+ create mode 100755 tools/lib/lockdep/lockdep
+ create mode 100644 tools/lib/lockdep/lockdep.c
+ create mode 100644 tools/lib/lockdep/lockdep_internals.h
+ create mode 100644 tools/lib/lockdep/lockdep_states.h
+ create mode 100644 tools/lib/lockdep/preload.c
+ create mode 100644 tools/lib/lockdep/rbtree.c
+ create mode 100644 tools/lib/lockdep/run_tests.sh
+ create mode 100644 tools/lib/lockdep/tests/AA.c
+ create mode 100644 tools/lib/lockdep/tests/ABBA.c
+ create mode 100644 tools/lib/lockdep/tests/ABBCCA.c
+ create mode 100644 tools/lib/lockdep/tests/ABBCCDDA.c
+ create mode 100644 tools/lib/lockdep/tests/ABCABC.c
+ create mode 100644 tools/lib/lockdep/tests/ABCDBCDA.c
+ create mode 100644 tools/lib/lockdep/tests/ABCDBDDA.c
+ create mode 100644 tools/lib/lockdep/tests/WW.c
+ create mode 100644 tools/lib/lockdep/tests/common.h
+ create mode 100644 tools/lib/lockdep/tests/unlock_balance.c
+ create mode 100644 tools/lib/lockdep/uinclude/asm/hweight.h
+ create mode 100644 tools/lib/lockdep/uinclude/asm/sections.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/bitops.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/compiler.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/debug_locks.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/delay.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/export.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/ftrace.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/gfp.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/hardirq.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/hash.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/interrupt.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/irqflags.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/kallsyms.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/kern_levels.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/kernel.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/kmemcheck.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/linkage.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/list.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/lockdep.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/module.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/mutex.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/poison.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/prefetch.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/proc_fs.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/rbtree.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/rbtree_augmented.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/rcu.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/seq_file.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/spinlock.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/stacktrace.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/stringify.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/types.h
+ create mode 100644 tools/lib/lockdep/uinclude/trace/events/lock.h
+ create mode 100644 tools/lib/symbol/kallsyms.c
+ create mode 100644 tools/lib/symbol/kallsyms.h
+ create mode 100644 tools/lib/traceevent/event-plugin.c
+ create mode 100644 tools/lib/traceevent/plugin_cfg80211.c
+ create mode 100644 tools/lib/traceevent/plugin_function.c
+ create mode 100644 tools/lib/traceevent/plugin_hrtimer.c
+ create mode 100644 tools/lib/traceevent/plugin_jbd2.c
+ create mode 100644 tools/lib/traceevent/plugin_kmem.c
+ create mode 100644 tools/lib/traceevent/plugin_kvm.c
+ create mode 100644 tools/lib/traceevent/plugin_mac80211.c
+ create mode 100644 tools/lib/traceevent/plugin_sched_switch.c
+ create mode 100644 tools/lib/traceevent/plugin_scsi.c
+ create mode 100644 tools/lib/traceevent/plugin_xen.c
+ delete mode 100644 tools/perf/config/feature-checks/test-stackprotector.c
+ rename tools/perf/{bash_completion => perf-completion.sh} (63%)
+ create mode 100644 tools/perf/util/trace-event.c
+ create mode 100644 tools/testing/selftests/rcutorture/.gitignore
+ create mode 100644 tools/testing/selftests/rcutorture/bin/config2frag.sh
+ create mode 100755 tools/testing/selftests/rcutorture/bin/configNR_CPUS.sh
+ create mode 100755 tools/testing/selftests/rcutorture/bin/configcheck.sh
+ create mode 100755 tools/testing/selftests/rcutorture/bin/configinit.sh
+ create mode 100755 tools/testing/selftests/rcutorture/bin/cpus2use.sh
+ create mode 100644 tools/testing/selftests/rcutorture/bin/functions.sh
+ create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-build.sh
+ create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck.sh
+ create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh
+ create mode 100644 tools/testing/selftests/rcutorture/bin/kvm.sh
+ create mode 100755 tools/testing/selftests/rcutorture/bin/parse-build.sh
+ create mode 100755 tools/testing/selftests/rcutorture/bin/parse-console.sh
+ create mode 100755 tools/testing/selftests/rcutorture/bin/parse-rcutorture.sh
+ create mode 100644 tools/testing/selftests/rcutorture/configs/CFLIST
+ create mode 100644 tools/testing/selftests/rcutorture/configs/SRCU-N
+ create mode 100644 tools/testing/selftests/rcutorture/configs/SRCU-N.boot
+ create mode 100644 tools/testing/selftests/rcutorture/configs/SRCU-P
+ create mode 100644 tools/testing/selftests/rcutorture/configs/SRCU-P.boot
+ create mode 100644 tools/testing/selftests/rcutorture/configs/TINY01
+ create mode 100644 tools/testing/selftests/rcutorture/configs/TINY02
+ create mode 100644 tools/testing/selftests/rcutorture/configs/TREE01
+ create mode 100644 tools/testing/selftests/rcutorture/configs/TREE01.boot
+ create mode 100644 tools/testing/selftests/rcutorture/configs/TREE02
+ create mode 100644 tools/testing/selftests/rcutorture/configs/TREE03
+ create mode 100644 tools/testing/selftests/rcutorture/configs/TREE04
+ create mode 100644 tools/testing/selftests/rcutorture/configs/TREE04.boot
+ create mode 100644 tools/testing/selftests/rcutorture/configs/TREE05
+ create mode 100644 tools/testing/selftests/rcutorture/configs/TREE05.boot
+ create mode 100644 tools/testing/selftests/rcutorture/configs/TREE06
+ create mode 100644 tools/testing/selftests/rcutorture/configs/TREE07
+ create mode 100644 tools/testing/selftests/rcutorture/configs/TREE08
+ create mode 100644 tools/testing/selftests/rcutorture/configs/TREE08-T
+ create mode 100644 tools/testing/selftests/rcutorture/configs/TREE09
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/CFLIST
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/N1-S-T-NH-SD-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/N2-2-t-nh-sd-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/N3-3-T-nh-SD-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/N4-A-t-NH-sd-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/N5-U-T-NH-sd-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/NT1-nh
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/NT3-NH
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/P1-S-T-NH-SD-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/P2-2-t-nh-sd-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/P3-3-T-nh-SD-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/P4-A-t-NH-sd-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/P5-U-T-NH-sd-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/PT1-nh
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/PT2-NH
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/ver_functions.sh
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/CFLIST
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N1-S-T-NH-SD-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N2-2-t-nh-sd-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N3-3-T-nh-SD-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N4-A-t-NH-sd-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N5-U-T-NH-sd-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N6---t-nh-SD-smp-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N7-4-T-NH-SD-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N8-2-T-NH-SD-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/NT1-nh
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/NT3-NH
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P1-S-T-NH-SD-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P2-2-t-nh-sd-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P3-3-T-nh-SD-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P4-A-t-NH-sd-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P5-U-T-NH-sd-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P6---t-nh-SD-smp-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP-all
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP-none
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/PT1-nh
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/PT2-NH
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/CFLIST
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/N1-S-T-NH-SD-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/N2-2-t-nh-sd-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/N3-3-T-nh-SD-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/N4-A-t-NH-sd-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/N5-U-T-NH-sd-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/NT1-nh
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/NT3-NH
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/P1-S-T-NH-SD-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/P2-2-t-nh-sd-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/P3-3-T-nh-SD-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/P4-A-t-NH-sd-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/P5-U-T-NH-sd-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/PT1-nh
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/PT2-NH
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/ver_functions.sh
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/CFLIST
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/N1-S-T-NH-SD-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/N2-2-t-nh-sd-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/N3-3-T-nh-SD-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/N4-A-t-NH-sd-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/N5-U-T-NH-sd-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/NT1-nh
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/NT3-NH
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/P1-S-T-NH-SD-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/P2-2-t-nh-sd-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/P3-3-T-nh-SD-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/P4-A-t-NH-sd-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/P5-U-T-NH-sd-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/PT1-nh
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/PT2-NH
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/ver_functions.sh
+ create mode 100644 tools/testing/selftests/rcutorture/configs/ver_functions.sh
+ create mode 100644 tools/testing/selftests/rcutorture/doc/TINY_RCU.txt
+ create mode 100644 tools/testing/selftests/rcutorture/doc/TREE_RCU-Kconfig.txt
+ create mode 100644 tools/testing/selftests/rcutorture/doc/initrd.txt
+ create mode 100644 tools/testing/selftests/rcutorture/doc/rcu-test-image.txt
+Merging clockevents/clockevents/next (98aefbe72ec6 Merge branch 'clockevents/for-Simon-3.13-rc2' into clockevents/3.14)
+$ git merge clockevents/clockevents/next
+Recorded preimage for 'drivers/clocksource/clksrc-of.c'
+Auto-merging drivers/clocksource/time-armada-370-xp.c
+Auto-merging drivers/clocksource/sun4i_timer.c
+Auto-merging drivers/clocksource/sh_tmu.c
+Auto-merging drivers/clocksource/sh_mtu2.c
+Auto-merging drivers/clocksource/sh_cmt.c
+Auto-merging drivers/clocksource/nomadik-mtu.c
+Auto-merging drivers/clocksource/clksrc-of.c
+CONFLICT (content): Merge conflict in drivers/clocksource/clksrc-of.c
+Auto-merging drivers/clocksource/Kconfig
+Auto-merging arch/arm/boot/dts/sun7i-a20.dtsi
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/clocksource/clksrc-of.c'.
+[master 2769da859b0c] Merge remote-tracking branch 'clockevents/clockevents/next'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/timer/allwinner,sun5i-a13-hstimer.txt | 22 +++
+ arch/arm/boot/dts/sun5i-a10s.dtsi | 7 +
+ arch/arm/boot/dts/sun5i-a13.dtsi | 7 +
+ arch/arm/boot/dts/sun7i-a20.dtsi | 10 ++
+ arch/arm/mach-sunxi/Kconfig | 1 +
+ drivers/clocksource/Kconfig | 4 +
+ drivers/clocksource/Makefile | 1 +
+ drivers/clocksource/arm_global_timer.c | 4 +-
+ drivers/clocksource/bcm_kona_timer.c | 6 -
+ drivers/clocksource/cadence_ttc_timer.c | 7 +-
+ drivers/clocksource/clksrc-of.c | 4 +
+ drivers/clocksource/cs5535-clockevt.c | 2 +-
+ drivers/clocksource/dw_apb_timer.c | 3 +-
+ drivers/clocksource/nomadik-mtu.c | 2 +-
+ drivers/clocksource/samsung_pwm_timer.c | 2 +-
+ drivers/clocksource/sh_cmt.c | 3 +-
+ drivers/clocksource/sh_mtu2.c | 4 +-
+ drivers/clocksource/sh_tmu.c | 4 +-
+ drivers/clocksource/sun4i_timer.c | 11 +-
+ drivers/clocksource/tegra20_timer.c | 2 +-
+ drivers/clocksource/time-armada-370-xp.c | 18 +-
+ drivers/clocksource/time-orion.c | 4 +-
+ drivers/clocksource/timer-sun5i.c | 192 +++++++++++++++++++++
+ drivers/clocksource/vt8500_timer.c | 2 +-
+ 24 files changed, 279 insertions(+), 43 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.txt
+ create mode 100644 drivers/clocksource/timer-sun5i.c
+Merging edac/linux_next (3e45588825c1 cell_edac: fix missing of_node_put)
+$ git merge edac/linux_next
+Already up-to-date.
+Merging edac-amd/for-next (0facccc00c7c Merge branch 'ras-for-3.14' into for-next)
+$ git merge edac-amd/for-next
+Auto-merging drivers/edac/sb_edac.c
+Merge made by the 'recursive' strategy.
+ drivers/edac/amd64_edac.c | 135 +++++++++++++++++++----------------------
+ drivers/edac/amd76x_edac.c | 2 +-
+ drivers/edac/e752x_edac.c | 2 +-
+ drivers/edac/e7xxx_edac.c | 2 +-
+ drivers/edac/edac_mc_sysfs.c | 2 +-
+ drivers/edac/i3000_edac.c | 2 +-
+ drivers/edac/i3200_edac.c | 2 +-
+ drivers/edac/i5000_edac.c | 2 +-
+ drivers/edac/i5100_edac.c | 2 +-
+ drivers/edac/i5400_edac.c | 2 +-
+ drivers/edac/i7300_edac.c | 2 +-
+ drivers/edac/i7core_edac.c | 2 +-
+ drivers/edac/i82443bxgx_edac.c | 2 +-
+ drivers/edac/i82860_edac.c | 2 +-
+ drivers/edac/i82875p_edac.c | 2 +-
+ drivers/edac/i82975x_edac.c | 2 +-
+ drivers/edac/mpc85xx_edac.c | 98 ++++++++++++++++++++++++++----
+ drivers/edac/mpc85xx_edac.h | 7 +++
+ drivers/edac/r82600_edac.c | 2 +-
+ drivers/edac/sb_edac.c | 4 +-
+ drivers/edac/x38_edac.c | 2 +-
+ 21 files changed, 175 insertions(+), 103 deletions(-)
+Merging ftrace/for-next (3ccb01239201 tracing: Only run synchronize_sched() at instance deletion time)
+$ git merge ftrace/for-next
+Already up-to-date.
+Merging rcu/rcu/next (0d3c55bc9fd5 Merge branches 'doc.2013.12.03a', 'fixes.2013.12.12a', 'rcutorture.2013.12.03a' and 'sparse.2013.12.12a' into HEAD)
+$ git merge rcu/rcu/next
+Already up-to-date.
+Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions)
+$ git merge uprobes/for-next
+Already up-to-date.
+Merging kvm/linux-next (6bb05ef78553 Merge tag 'kvm-s390-20131211' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-next)
+$ git merge kvm/linux-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/virtual/kvm/hypercalls.txt | 3 +
+ Documentation/virtual/kvm/s390-diag.txt | 80 +++++++++++++++++++++
+ MAINTAINERS | 2 +-
+ arch/s390/include/asm/sigp.h | 2 +
+ arch/s390/kvm/diag.c | 4 +-
+ arch/s390/kvm/kvm-s390.c | 53 +++++++-------
+ arch/s390/kvm/kvm-s390.h | 10 +--
+ arch/s390/kvm/priv.c | 4 +-
+ arch/s390/kvm/sigp.c | 120 ++++++++++++++++++++++++++-----
+ arch/s390/kvm/trace.h | 1 +
+ arch/x86/include/asm/vmx.h | 1 +
+ arch/x86/kvm/vmx.c | 119 ++++++++++++++++++++++--------
+ 12 files changed, 310 insertions(+), 89 deletions(-)
+ create mode 100644 Documentation/virtual/kvm/s390-diag.txt
+Merging kvm-arm/kvm-arm-next (4fda342cc7f5 arm/arm64: kvm: Use virt_to_idmap instead of virt_to_phys for idmap mappings)
+$ git merge kvm-arm/kvm-arm-next
+Merge made by the 'recursive' strategy.
+ arch/arm/include/asm/kvm_mmu.h | 1 +
+ arch/arm/kvm/mmu.c | 8 ++++----
+ arch/arm64/include/asm/kvm_mmu.h | 1 +
+ 3 files changed, 6 insertions(+), 4 deletions(-)
+Merging kvm-ppc/kvm-ppc-next (27025a602cb9 powerpc: kvm: optimize "sc 1" as fast return)
+$ git merge kvm-ppc/kvm-ppc-next
+Merge made by the 'recursive' strategy.
+ arch/powerpc/kvm/book3s_hv.c | 10 ++++------
+ arch/powerpc/kvm/book3s_hv_rmhandlers.S | 19 ++++++++++++++++++-
+ 2 files changed, 22 insertions(+), 7 deletions(-)
+Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1)
+$ git merge oprofile/for-next
+Already up-to-date.
+Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work)
+$ git merge fw-nohz/nohz/next
+Already up-to-date.
+Merging xen-tip/linux-next (85be9741104f Merge branch 'stable/for-linus-3.13' into linux-next)
+$ git merge xen-tip/linux-next
+Merge made by the 'recursive' strategy.
+ arch/arm/xen/enlighten.c | 6 +--
+ arch/arm64/include/asm/xen/page-coherent.h | 4 --
+ drivers/xen/balloon.c | 63 ++++++++++++++++--------------
+ drivers/xen/grant-table.c | 3 +-
+ drivers/xen/privcmd.c | 9 ++++-
+ include/xen/interface/io/blkif.h | 10 ++---
+ 6 files changed, 51 insertions(+), 44 deletions(-)
+Merging percpu/for-next (b1a0fbfdde65 percpu: fix spurious sparse warnings from DEFINE_PER_CPU())
+$ git merge percpu/for-next
+Merge made by the 'recursive' strategy.
+ include/linux/percpu-defs.h | 1 +
+ 1 file changed, 1 insertion(+)
+Merging workqueues/for-next (4e8b22bd1a37 workqueue: fix pool ID allocation leakage and remove BUILD_BUG_ON() in init_workqueues)
+$ git merge workqueues/for-next
+Already up-to-date.
+Merging drivers-x86/linux-next (a80e1053aaa3 x86, wmi fix modalias_show return values)
+$ git merge drivers-x86/linux-next
+Already up-to-date.
+Merging chrome-platform/for-next (2b8454a75b90 platform/chrome: unregister platform driver/device when module exit)
+$ git merge chrome-platform/for-next
+Merge made by the 'recursive' strategy.
+ drivers/platform/chrome/Kconfig | 14 ++
+ drivers/platform/chrome/Makefile | 1 +
+ drivers/platform/chrome/chromeos_laptop.c | 298 +++++++++++++++++++++---------
+ drivers/platform/chrome/chromeos_pstore.c | 101 ++++++++++
+ 4 files changed, 323 insertions(+), 91 deletions(-)
+ create mode 100644 drivers/platform/chrome/chromeos_pstore.c
+Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away)
+$ git merge sysctl/master
+Already up-to-date.
+Merging regmap/for-next (057c2d5071eb Merge remote-tracking branch 'regmap/topic/ack' into regmap-next)
+$ git merge regmap/for-next
+Merge made by the 'recursive' strategy.
+ drivers/base/regmap/regmap-irq.c | 6 +++---
+ drivers/base/regmap/regmap.c | 10 +++++-----
+ include/linux/regmap.h | 5 ++++-
+ 3 files changed, 12 insertions(+), 9 deletions(-)
+Merging hsi/for-next (43139a61fc68 HSI: hsi_char: Update ioctl-number.txt)
+$ git merge hsi/for-next
+Already up-to-date.
+Merging leds/for-next (da2cbb0f96cb leds: pwm: Remove a warning on non-DT platforms)
+$ git merge leds/for-next
+Auto-merging include/linux/mfd/mc13xxx.h
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/leds/tca6507.txt | 16 ++
+ Documentation/leds/leds-lp55xx.txt | 10 +-
+ arch/arm/mach-imx/mach-mx31moboard.c | 16 +-
+ drivers/leds/leds-lp5521.c | 30 ++-
+ drivers/leds/leds-lp5523.c | 32 ++--
+ drivers/leds/leds-lp55xx-common.c | 2 +
+ drivers/leds/leds-mc13783.c | 89 +--------
+ drivers/leds/leds-pwm.c | 9 +-
+ drivers/leds/leds-tca6507.c | 207 ++++++++++++---------
+ include/linux/mfd/mc13xxx.h | 37 +++-
+ 10 files changed, 224 insertions(+), 224 deletions(-)
+Merging driver-core/driver-core-next (880ae359173c Documentation: fix spelling in design-patterns)
+$ git merge driver-core/driver-core-next
+Removing fs/sysfs/inode.c
+Merge made by the 'recursive' strategy.
+ Documentation/driver-model/design-patterns.txt | 116 +++
+ Documentation/kobject.txt | 5 +-
+ arch/x86/kernel/microcode_amd.c | 2 +-
+ arch/x86/kernel/microcode_intel.c | 2 +-
+ drivers/base/core.c | 7 +-
+ drivers/base/devtmpfs.c | 2 +-
+ drivers/base/firmware_class.c | 86 +-
+ drivers/firmware/dmi-sysfs.c | 3 +-
+ drivers/gpio/gpiolib.c | 4 +-
+ drivers/md/bitmap.c | 2 +-
+ drivers/md/bitmap.h | 2 +-
+ drivers/md/md.h | 10 +-
+ drivers/misc/mic/host/mic_device.h | 2 +-
+ fs/Makefile | 2 +-
+ fs/kernfs/Makefile | 5 +
+ fs/kernfs/dir.c | 1061 +++++++++++++++++++++++
+ fs/kernfs/file.c | 831 ++++++++++++++++++
+ fs/kernfs/inode.c | 377 +++++++++
+ fs/kernfs/kernfs-internal.h | 122 +++
+ fs/kernfs/mount.c | 165 ++++
+ fs/kernfs/symlink.c | 152 ++++
+ fs/namespace.c | 2 +
+ fs/sysfs/Makefile | 2 +-
+ fs/sysfs/dir.c | 1075 +-----------------------
+ fs/sysfs/file.c | 961 ++++-----------------
+ fs/sysfs/group.c | 102 +--
+ fs/sysfs/inode.c | 331 --------
+ fs/sysfs/mount.c | 184 +---
+ fs/sysfs/symlink.c | 219 +----
+ fs/sysfs/sysfs.h | 236 +-----
+ include/linux/firmware.h | 7 +
+ include/linux/kernfs.h | 375 +++++++++
+ include/linux/kobject.h | 2 +-
+ include/linux/sysfs.h | 47 +-
+ lib/kobject.c | 43 +-
+ samples/kobject/kset-example.c | 1 +
+ 36 files changed, 3706 insertions(+), 2839 deletions(-)
+ create mode 100644 Documentation/driver-model/design-patterns.txt
+ create mode 100644 fs/kernfs/Makefile
+ create mode 100644 fs/kernfs/dir.c
+ create mode 100644 fs/kernfs/file.c
+ create mode 100644 fs/kernfs/inode.c
+ create mode 100644 fs/kernfs/kernfs-internal.h
+ create mode 100644 fs/kernfs/mount.c
+ create mode 100644 fs/kernfs/symlink.c
+ delete mode 100644 fs/sysfs/inode.c
+ create mode 100644 include/linux/kernfs.h
+Merging tty/tty-next (4903713cac8b serial: Remove old SC26XX driver)
+$ git merge tty/tty-next
+Removing drivers/tty/serial/sc26xx.c
+Auto-merging drivers/tty/serial/8250/8250_dw.c
+Auto-merging drivers/tty/n_tty.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/serial/atmel-usart.txt | 7 +
+ .../bindings/serial/cirrus,clps711x-uart.txt | 29 +
+ arch/arm/mach-clps711x/devices.c | 21 +
+ drivers/input/serio/serport.c | 28 +-
+ drivers/parport/parport_serial.c | 5 -
+ drivers/staging/fwserial/Kconfig | 20 +
+ drivers/staging/fwserial/fwserial.c | 151 ++---
+ drivers/staging/fwserial/fwserial.h | 24 +-
+ drivers/tty/hvc/hvc_console.c | 2 +-
+ drivers/tty/n_gsm.c | 63 +-
+ drivers/tty/n_r3964.c | 2 +-
+ drivers/tty/n_tty.c | 113 ++--
+ drivers/tty/rocket.c | 2 +-
+ drivers/tty/serial/8250/8250_dw.c | 8 -
+ drivers/tty/serial/8250/8250_pci.c | 8 +-
+ drivers/tty/serial/Kconfig | 18 -
+ drivers/tty/serial/Makefile | 1 -
+ drivers/tty/serial/amba-pl010.c | 15 +-
+ drivers/tty/serial/amba-pl011.c | 84 +--
+ drivers/tty/serial/clps711x.c | 448 ++++++------
+ drivers/tty/serial/imx.c | 8 +
+ drivers/tty/serial/mxs-auart.c | 9 +-
+ drivers/tty/serial/pch_uart.c | 3 +-
+ drivers/tty/serial/rp2.c | 2 +-
+ drivers/tty/serial/sc26xx.c | 749 ---------------------
+ drivers/tty/serial/serial_core.c | 8 +-
+ drivers/tty/tty_buffer.c | 110 +--
+ include/linux/init.h | 2 +
+ include/linux/tty.h | 8 +-
+ include/linux/tty_flip.h | 11 +-
+ include/linux/tty_ldisc.h | 6 +-
+ 31 files changed, 657 insertions(+), 1308 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/serial/cirrus,clps711x-uart.txt
+ delete mode 100644 drivers/tty/serial/sc26xx.c
+Merging usb/usb-next (1ce0fd15be28 uwb: umc-dev: add missing put_device call)
+$ git merge usb/usb-next
+Resolved 'drivers/usb/host/ohci-at91.c' using previous resolution.
+Auto-merging drivers/usb/serial/option.c
+Auto-merging drivers/usb/host/xhci-pci.c
+Auto-merging drivers/usb/host/r8a66597-hcd.c
+Auto-merging drivers/usb/host/ohci-at91.c
+CONFLICT (content): Merge conflict in drivers/usb/host/ohci-at91.c
+Auto-merging drivers/usb/host/ehci-tegra.c
+Auto-merging drivers/usb/chipidea/core.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master d2c3f4df9d30] Merge remote-tracking branch 'usb/usb-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/staging/dwc2/hcd.c | 2 +
+ drivers/staging/octeon-usb/octeon-hcd.c | 1 +
+ drivers/staging/ozwpan/ozhcd.c | 2 +
+ drivers/usb/atm/usbatm.c | 8 +-
+ drivers/usb/c67x00/c67x00-hcd.c | 2 +
+ drivers/usb/chipidea/Makefile | 2 +-
+ drivers/usb/chipidea/ci_hdrc_pci.c | 2 +-
+ drivers/usb/chipidea/core.c | 3 +-
+ drivers/usb/chipidea/usbmisc_imx.c | 46 +
+ drivers/usb/class/cdc-acm.c | 116 +-
+ drivers/usb/class/cdc-acm.h | 3 +
+ drivers/usb/core/config.c | 7 -
+ drivers/usb/core/driver.c | 4 +-
+ drivers/usb/core/hcd-pci.c | 1 +
+ drivers/usb/core/hcd.c | 38 +-
+ drivers/usb/core/hub.c | 85 +-
+ drivers/usb/core/quirks.c | 3 -
+ drivers/usb/core/urb.c | 4 +-
+ drivers/usb/dwc3/dwc3-pci.c | 2 +-
+ drivers/usb/gadget/amd5536udc.c | 2 +-
+ drivers/usb/gadget/fsl_qe_udc.c | 2 +-
+ drivers/usb/gadget/fsl_udc_core.c | 2 +-
+ drivers/usb/gadget/pch_udc.c | 2 +-
+ drivers/usb/host/Makefile | 2 -
+ drivers/usb/host/ehci-atmel.c | 1 +
+ drivers/usb/host/ehci-dbg.c | 10 +-
+ drivers/usb/host/ehci-exynos.c | 1 +
+ drivers/usb/host/ehci-fsl.c | 33 +-
+ drivers/usb/host/ehci-grlib.c | 4 +-
+ drivers/usb/host/ehci-hcd.c | 14 +-
+ drivers/usb/host/ehci-hub.c | 6 +-
+ drivers/usb/host/ehci-mv.c | 3 +-
+ drivers/usb/host/ehci-mxc.c | 1 +
+ drivers/usb/host/ehci-octeon.c | 24 +-
+ drivers/usb/host/ehci-omap.c | 1 +
+ drivers/usb/host/ehci-orion.c | 46 +-
+ drivers/usb/host/ehci-platform.c | 1 +
+ drivers/usb/host/ehci-pmcmsp.c | 4 +-
+ drivers/usb/host/ehci-ppc-of.c | 4 +-
+ drivers/usb/host/ehci-ps3.c | 1 +
+ drivers/usb/host/ehci-q.c | 4 +-
+ drivers/usb/host/ehci-sead3.c | 1 +
+ drivers/usb/host/ehci-sh.c | 1 +
+ drivers/usb/host/ehci-spear.c | 1 +
+ drivers/usb/host/ehci-tegra.c | 1 +
+ drivers/usb/host/ehci-tilegx.c | 1 +
+ drivers/usb/host/ehci-w90x900.c | 22 +-
+ drivers/usb/host/ehci-xilinx-of.c | 7 +-
+ drivers/usb/host/ehci.h | 8 +-
+ drivers/usb/host/fhci-hcd.c | 2 +
+ drivers/usb/host/fotg210-hcd.c | 96 +-
+ drivers/usb/host/fotg210.h | 8 -
+ drivers/usb/host/fusbh200-hcd.c | 98 +-
+ drivers/usb/host/fusbh200.h | 12 -
+ drivers/usb/host/hwa-hc.c | 23 +-
+ drivers/usb/host/imx21-dbg.c | 4 +
+ drivers/usb/host/imx21-hcd.c | 7 +-
+ drivers/usb/host/imx21-hcd.h | 4 +
+ drivers/usb/host/isp116x-hcd.c | 4 +-
+ drivers/usb/host/isp1362-hcd.c | 4 +-
+ drivers/usb/host/isp1760-hcd.c | 1 +
+ drivers/usb/host/ohci-at91.c | 82 +-
+ drivers/usb/host/ohci-da8xx.c | 73 +-
+ drivers/usb/host/ohci-dbg.c | 69 -
+ drivers/usb/host/ohci-exynos.c | 23 +-
+ drivers/usb/host/ohci-hcd.c | 29 +-
+ drivers/usb/host/ohci-hub.c | 6 +-
+ drivers/usb/host/ohci-jz4740.c | 40 +-
+ drivers/usb/host/ohci-nxp.c | 30 +-
+ drivers/usb/host/ohci-octeon.c | 25 +-
+ drivers/usb/host/ohci-omap.c | 5 +-
+ drivers/usb/host/ohci-omap3.c | 1 +
+ drivers/usb/host/ohci-platform.c | 2 +
+ drivers/usb/host/ohci-ppc-of.c | 28 +-
+ drivers/usb/host/ohci-ps3.c | 1 +
+ drivers/usb/host/ohci-pxa27x.c | 42 +-
+ drivers/usb/host/ohci-q.c | 12 +-
+ drivers/usb/host/ohci-s3c2410.c | 22 +-
+ drivers/usb/host/ohci-sa1111.c | 4 +-
+ drivers/usb/host/ohci-sm501.c | 1 +
+ drivers/usb/host/ohci-spear.c | 29 +-
+ drivers/usb/host/ohci-tilegx.c | 1 +
+ drivers/usb/host/ohci-tmio.c | 1 +
+ drivers/usb/host/ohci.h | 13 +-
+ drivers/usb/host/oxu210hp-hcd.c | 5 +
+ drivers/usb/host/r8a66597-hcd.c | 3 +-
+ drivers/usb/host/sl811-hcd.c | 2 +
+ drivers/usb/host/u132-hcd.c | 3 +-
+ drivers/usb/host/uhci-debug.c | 4 +-
+ drivers/usb/host/uhci-grlib.c | 1 +
+ drivers/usb/host/uhci-hcd.c | 44 +-
+ drivers/usb/host/uhci-pci.c | 2 +-
+ drivers/usb/host/uhci-platform.c | 1 +
+ drivers/usb/host/whci/hcd.c | 1 +
+ drivers/usb/host/xhci-dbg.c | 42 +-
+ drivers/usb/host/xhci-hub.c | 106 +-
+ drivers/usb/host/xhci-mem.c | 68 +-
+ drivers/usb/host/xhci-pci.c | 1 +
+ drivers/usb/host/xhci-plat.c | 2 +
+ drivers/usb/host/xhci-ring.c | 42 +-
+ drivers/usb/host/xhci-trace.h | 6 +-
+ drivers/usb/host/xhci.c | 214 +-
+ drivers/usb/host/xhci.h | 65 +-
+ drivers/usb/misc/usbsevseg.c | 2 +-
+ drivers/usb/misc/usbtest.c | 42 +-
+ drivers/usb/musb/musb_host.c | 1 +
+ drivers/usb/phy/phy-msm-usb.c | 1 +
+ drivers/usb/phy/phy-mv-usb.c | 6 +-
+ drivers/usb/renesas_usbhs/mod_host.c | 1 +
+ drivers/usb/serial/metro-usb.c | 2 +-
+ drivers/usb/serial/option.c | 11 +
+ drivers/usb/storage/protocol.c | 81 +-
+ drivers/usb/wusbcore/cbaf.c | 8 +-
+ drivers/usb/wusbcore/security.c | 22 +-
+ drivers/usb/wusbcore/wa-hc.h | 7 +-
+ drivers/usb/wusbcore/wa-rpipe.c | 10 +-
+ drivers/usb/wusbcore/wa-xfer.c | 512 +-
+ drivers/uwb/umc-bus.c | 2 +-
+ drivers/uwb/umc-dev.c | 1 +
+ firmware/emi62/bitstream.HEX | 10325 +++++++++++++++++-------------
+ include/linux/scatterlist.h | 1 +
+ include/linux/usb/hcd.h | 3 +
+ include/linux/uwb/umc.h | 2 +-
+ lib/scatterlist.c | 3 +-
+ 124 files changed, 7350 insertions(+), 5648 deletions(-)
+Merging usb-gadget/next (8ed1fb790ea2 usb: musb: finish suspend/reset work independently from musb_hub_control())
+$ git merge usb-gadget/next
+Resolved 'drivers/usb/phy/Kconfig' using previous resolution.
+Auto-merging include/linux/usb/otg-fsm.h
+Auto-merging drivers/usb/phy/Kconfig
+CONFLICT (content): Merge conflict in drivers/usb/phy/Kconfig
+Auto-merging drivers/usb/musb/musb_host.c
+Auto-merging drivers/usb/gadget/pch_udc.c
+Auto-merging drivers/usb/gadget/fsl_udc_core.c
+Auto-merging drivers/usb/gadget/fsl_qe_udc.c
+Auto-merging drivers/usb/gadget/atmel_usba_udc.c
+Auto-merging drivers/usb/gadget/amd5536udc.c
+Auto-merging drivers/usb/dwc3/dwc3-pci.c
+Auto-merging drivers/usb/chipidea/udc.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 0e883e03e108] Merge remote-tracking branch 'usb-gadget/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/configfs-usb-gadget-ffs | 9 +
+ .../ABI/testing/configfs-usb-gadget-loopback | 8 +
+ .../ABI/testing/configfs-usb-gadget-sourcesink | 12 +
+ Documentation/ABI/testing/sysfs-platform-tahvo-usb | 16 +
+ Documentation/devicetree/bindings/usb/omap-usb.txt | 2 +
+ arch/arm/mach-omap1/include/mach/usb.h | 38 +-
+ drivers/usb/chipidea/udc.c | 4 +-
+ drivers/usb/dwc3/Kconfig | 7 +
+ drivers/usb/dwc3/Makefile | 1 +
+ drivers/usb/dwc3/dwc3-exynos.c | 1 +
+ drivers/usb/dwc3/dwc3-keystone.c | 202 ++++
+ drivers/usb/dwc3/dwc3-omap.c | 12 +-
+ drivers/usb/dwc3/dwc3-pci.c | 1 +
+ drivers/usb/dwc3/gadget.c | 10 +-
+ drivers/usb/gadget/Kconfig | 39 +-
+ drivers/usb/gadget/Makefile | 8 +-
+ drivers/usb/gadget/amd5536udc.c | 15 +-
+ drivers/usb/gadget/at91_udc.c | 16 +-
+ drivers/usb/gadget/atmel_usba_udc.c | 71 +-
+ drivers/usb/gadget/bcm63xx_udc.c | 4 +-
+ drivers/usb/gadget/composite.c | 18 +-
+ drivers/usb/gadget/configfs.c | 8 +
+ drivers/usb/gadget/dummy_hcd.c | 2 +-
+ drivers/usb/gadget/epautoconf.c | 8 +-
+ drivers/usb/gadget/f_ecm.c | 73 +-
+ drivers/usb/gadget/f_fs.c | 1012 ++++++++++++--------
+ drivers/usb/gadget/f_hid.c | 18 +-
+ drivers/usb/gadget/f_loopback.c | 144 ++-
+ drivers/usb/gadget/f_midi.c | 22 +-
+ drivers/usb/gadget/f_ncm.c | 2 +-
+ drivers/usb/gadget/f_obex.c | 2 +-
+ drivers/usb/gadget/f_phonet.c | 2 +-
+ drivers/usb/gadget/f_rndis.c | 94 +-
+ drivers/usb/gadget/f_serial.c | 2 +-
+ drivers/usb/gadget/f_sourcesink.c | 349 ++++++-
+ drivers/usb/gadget/f_subset.c | 60 +-
+ drivers/usb/gadget/fotg210-udc.c | 3 +-
+ drivers/usb/gadget/fsl_qe_udc.c | 2 +-
+ drivers/usb/gadget/fsl_udc_core.c | 5 +-
+ drivers/usb/gadget/fusb300_udc.c | 4 +-
+ drivers/usb/gadget/g_ffs.c | 466 +++++----
+ drivers/usb/gadget/g_zero.h | 24 +-
+ drivers/usb/gadget/goku_udc.c | 16 +-
+ drivers/usb/gadget/lpc32xx_udc.c | 2 +-
+ drivers/usb/gadget/m66592-udc.c | 4 +-
+ drivers/usb/gadget/mv_u3d_core.c | 4 +-
+ drivers/usb/gadget/mv_udc_core.c | 4 +-
+ drivers/usb/gadget/net2272.c | 4 +-
+ drivers/usb/gadget/net2280.c | 8 +-
+ drivers/usb/gadget/nokia.c | 6 +-
+ drivers/usb/gadget/omap_udc.c | 3 +-
+ drivers/usb/gadget/pch_udc.c | 6 +-
+ drivers/usb/gadget/pxa25x_udc.c | 1 +
+ drivers/usb/gadget/pxa27x_udc.c | 5 +-
+ drivers/usb/gadget/r8a66597-udc.c | 10 +-
+ drivers/usb/gadget/rndis.c | 7 +-
+ drivers/usb/gadget/s3c-hsotg.c | 9 +-
+ drivers/usb/gadget/s3c-hsudc.c | 2 +-
+ drivers/usb/gadget/s3c2410_udc.c | 1 +
+ drivers/usb/gadget/u_ether.c | 2 +-
+ drivers/usb/gadget/u_ether.h | 43 +-
+ drivers/usb/gadget/u_f.c | 32 +
+ drivers/usb/gadget/u_f.h | 26 +
+ drivers/usb/gadget/u_fs.h | 267 ++++++
+ drivers/usb/gadget/u_rndis.h | 2 +
+ drivers/usb/gadget/zero.c | 8 +-
+ drivers/usb/musb/musb_core.c | 50 +-
+ drivers/usb/musb/musb_core.h | 3 +
+ drivers/usb/musb/musb_dsps.c | 117 ++-
+ drivers/usb/musb/musb_gadget.c | 6 +-
+ drivers/usb/musb/musb_host.c | 9 +-
+ drivers/usb/musb/musb_host.h | 6 +
+ drivers/usb/musb/musb_virthub.c | 69 +-
+ drivers/usb/musb/ux500_dma.c | 4 +-
+ drivers/usb/phy/Kconfig | 45 +-
+ drivers/usb/phy/Makefile | 7 +-
+ drivers/usb/phy/phy-ab8500-usb.c | 2 -
+ drivers/usb/phy/phy-am335x-control.c | 6 +-
+ drivers/usb/phy/phy-am335x.c | 46 +-
+ drivers/usb/phy/phy-fsl-usb.c | 7 +-
+ drivers/usb/phy/phy-fsl-usb.h | 2 +-
+ drivers/usb/phy/phy-fsm-usb.c | 10 +-
+ drivers/usb/phy/phy-generic.c | 1 -
+ drivers/usb/phy/phy-gpio-vbus-usb.c | 2 -
+ drivers/usb/phy/phy-keystone.c | 141 +++
+ drivers/usb/phy/phy-mxs-usb.c | 13 +-
+ drivers/usb/phy/phy-omap-control.c | 19 +
+ drivers/usb/phy/phy-omap-otg.c | 169 ++++
+ drivers/usb/phy/phy-rcar-gen2-usb.c | 2 +-
+ drivers/usb/phy/phy-tahvo.c | 463 +++++++++
+ drivers/usb/phy/phy.c | 4 +
+ drivers/usb/renesas_usbhs/fifo.c | 18 +-
+ drivers/usb/renesas_usbhs/mod_gadget.c | 4 +-
+ include/linux/platform_data/usb-omap1.h | 53 +
+ include/linux/usb/composite.h | 2 +
+ include/linux/usb/functionfs.h | 30 -
+ include/linux/usb/gadget.h | 58 +-
+ include/linux/usb/musb.h | 3 +
+ include/linux/usb/omap_control_usb.h | 6 +
+ .../phy-fsm-usb.h => include/linux/usb/otg-fsm.h | 10 +-
+ 100 files changed, 3439 insertions(+), 1216 deletions(-)
+ create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-ffs
+ create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-loopback
+ create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-sourcesink
+ create mode 100644 Documentation/ABI/testing/sysfs-platform-tahvo-usb
+ create mode 100644 drivers/usb/dwc3/dwc3-keystone.c
+ create mode 100644 drivers/usb/gadget/u_f.c
+ create mode 100644 drivers/usb/gadget/u_f.h
+ create mode 100644 drivers/usb/gadget/u_fs.h
+ create mode 100644 drivers/usb/phy/phy-keystone.c
+ create mode 100644 drivers/usb/phy/phy-omap-otg.c
+ create mode 100644 drivers/usb/phy/phy-tahvo.c
+ create mode 100644 include/linux/platform_data/usb-omap1.h
+ rename drivers/usb/phy/phy-fsm-usb.h => include/linux/usb/otg-fsm.h (96%)
+Merging staging/staging-next (364014fda831 staging: dgap: Fix trailing whitespace in dgap_trace.c)
+$ git merge staging/staging-next
+Removing drivers/staging/vt6656/mib.h
+Removing drivers/staging/vt6656/mib.c
+Auto-merging drivers/staging/usbip/usbip_common.c
+Removing drivers/staging/tidspbridge/gen/uuidutil.c
+Removing drivers/staging/lustre/lustre/ptlrpc/wirehdr.c
+Removing drivers/staging/lustre/lustre/ptlrpc/llog_server.c
+Removing drivers/staging/lustre/lustre/lvfs/fsfilt_ext3.c
+Auto-merging drivers/staging/lustre/lustre/llite/lloop.c
+Removing drivers/staging/lustre/lustre/libcfs/lwt.c
+Removing drivers/staging/lustre/lustre/include/lustre/lustreapi.h
+Removing drivers/staging/lustre/lustre/include/lustre/liblustreapi.h
+Removing drivers/staging/lustre/lustre/include/lu_target.h
+Removing drivers/staging/lustre/include/linux/libcfs/linux/linux-fs.h
+Auto-merging drivers/staging/imx-drm/ipu-v3/ipu-common.c
+Auto-merging drivers/staging/imx-drm/imx-drm-core.c
+CONFLICT (content): Merge conflict in drivers/staging/imx-drm/imx-drm-core.c
+Auto-merging drivers/staging/iio/magnetometer/hmc5843.c
+Auto-merging drivers/staging/dwc2/hcd.c
+Auto-merging drivers/staging/comedi/drivers/8255_pci.c
+Auto-merging drivers/staging/comedi/drivers.c
+Removing drivers/staging/btmtk_usb/btmtk_usb.h
+Removing drivers/staging/btmtk_usb/btmtk_usb.c
+Removing drivers/staging/btmtk_usb/TODO
+Removing drivers/staging/btmtk_usb/README
+Removing drivers/staging/btmtk_usb/Makefile
+Removing drivers/staging/btmtk_usb/Kconfig
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Resolved 'drivers/staging/imx-drm/imx-drm-core.c' using previous resolution.
+[master 7fb917337b69] Merge remote-tracking branch 'staging/staging-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/iio/light/tsl2563.txt | 19 +
+ .../bindings/iio/magnetometer/hmc5843.txt | 17 +
+ Documentation/devicetree/bindings/staging/dwc2.txt | 4 +-
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ Documentation/driver-model/devres.txt | 2 +
+ Documentation/vme_api.txt | 12 +-
+ drivers/iio/accel/hid-sensor-accel-3d.c | 12 +
+ drivers/iio/adc/mcp3422.c | 9 +-
+ drivers/iio/adc/viperboard_adc.c | 20 +-
+ drivers/iio/dac/ad5421.c | 12 +-
+ drivers/iio/dac/ad5755.c | 12 +-
+ drivers/iio/gyro/adis16130.c | 9 +-
+ drivers/iio/gyro/adxrs450.c | 14 +-
+ drivers/iio/gyro/hid-sensor-gyro-3d.c | 11 +
+ drivers/iio/industrialio-core.c | 101 +
+ drivers/iio/industrialio-event.c | 6 +
+ drivers/iio/industrialio-trigger.c | 28 +-
+ drivers/iio/light/hid-sensor-als.c | 11 +
+ drivers/iio/light/tsl2563.c | 4 +
+ drivers/iio/light/vcnl4000.c | 9 +-
+ drivers/iio/magnetometer/hid-sensor-magn-3d.c | 12 +
+ drivers/iio/pressure/Kconfig | 12 +
+ drivers/iio/pressure/Makefile | 1 +
+ drivers/iio/pressure/mpl3115.c | 329 ++
+ drivers/staging/Kconfig | 4 +-
+ drivers/staging/Makefile | 2 +-
+ drivers/staging/android/Kconfig | 2 +
+ drivers/staging/android/Makefile | 2 +
+ drivers/staging/android/alarm-dev.c | 8 +-
+ drivers/staging/android/ion/Kconfig | 25 +
+ drivers/staging/android/ion/Makefile | 7 +
+ drivers/staging/android/ion/compat_ion.c | 177 +
+ drivers/staging/android/ion/compat_ion.h | 30 +
+ drivers/staging/android/ion/ion.c | 1549 +++++++
+ drivers/staging/android/ion/ion.h | 204 +
+ drivers/staging/android/ion/ion_carveout_heap.c | 194 +
+ drivers/staging/android/ion/ion_chunk_heap.c | 195 +
+ drivers/staging/android/ion/ion_cma_heap.c | 218 +
+ drivers/staging/android/ion/ion_heap.c | 318 ++
+ drivers/staging/android/ion/ion_page_pool.c | 195 +
+ drivers/staging/android/ion/ion_priv.h | 360 ++
+ drivers/staging/android/ion/ion_system_heap.c | 488 +++
+ drivers/staging/android/ion/ion_test.c | 281 ++
+ drivers/staging/android/ion/tegra/Makefile | 1 +
+ drivers/staging/android/ion/tegra/tegra_ion.c | 84 +
+ drivers/staging/android/sync.h | 50 +-
+ drivers/staging/android/uapi/ion.h | 196 +
+ drivers/staging/android/uapi/ion_test.h | 69 +
+ drivers/staging/bcm/Bcmchar.c | 136 +-
+ drivers/staging/bcm/DDRInit.c | 1993 +++++----
+ drivers/staging/bcm/InterfaceDld.c | 140 +-
+ drivers/staging/btmtk_usb/Kconfig | 11 -
+ drivers/staging/btmtk_usb/Makefile | 1 -
+ drivers/staging/btmtk_usb/README | 14 -
+ drivers/staging/btmtk_usb/TODO | 10 -
+ drivers/staging/btmtk_usb/btmtk_usb.c | 1810 --------
+ drivers/staging/btmtk_usb/btmtk_usb.h | 138 -
+ drivers/staging/ced1401/ced_ioc.c | 3 +-
+ drivers/staging/ced1401/usb1401.c | 1 -
+ drivers/staging/comedi/Makefile | 2 +
+ drivers/staging/comedi/comedi_buf.c | 99 +-
+ drivers/staging/comedi/comedi_fops.c | 525 ++-
+ drivers/staging/comedi/comedi_internal.h | 4 +
+ drivers/staging/comedi/comedidev.h | 39 +-
+ drivers/staging/comedi/drivers.c | 14 +-
+ drivers/staging/comedi/drivers/8255_pci.c | 2 +-
+ drivers/staging/comedi/drivers/Makefile | 1 +
+ .../comedi/drivers/addi-data/hwdrv_apci3120.c | 6 +-
+ .../comedi/drivers/addi-data/hwdrv_apci3200.c | 2 +-
+ drivers/staging/comedi/drivers/addi_apci_035.c | 2 +-
+ drivers/staging/comedi/drivers/addi_apci_1032.c | 6 +-
+ drivers/staging/comedi/drivers/addi_apci_1500.c | 2 +-
+ drivers/staging/comedi/drivers/addi_apci_1516.c | 2 +-
+ drivers/staging/comedi/drivers/addi_apci_1564.c | 2 +-
+ drivers/staging/comedi/drivers/addi_apci_16xx.c | 2 +-
+ drivers/staging/comedi/drivers/addi_apci_2032.c | 2 +-
+ drivers/staging/comedi/drivers/addi_apci_2200.c | 2 +-
+ drivers/staging/comedi/drivers/addi_apci_3120.c | 2 +-
+ drivers/staging/comedi/drivers/addi_apci_3200.c | 2 +-
+ drivers/staging/comedi/drivers/addi_apci_3501.c | 2 +-
+ drivers/staging/comedi/drivers/addi_apci_3xxx.c | 2 +-
+ drivers/staging/comedi/drivers/adl_pci6208.c | 2 +-
+ drivers/staging/comedi/drivers/adl_pci7x3x.c | 2 +-
+ drivers/staging/comedi/drivers/adl_pci8164.c | 2 +-
+ drivers/staging/comedi/drivers/adl_pci9111.c | 36 +-
+ drivers/staging/comedi/drivers/adl_pci9118.c | 89 +-
+ drivers/staging/comedi/drivers/adq12b.c | 29 +-
+ drivers/staging/comedi/drivers/adv_pci1710.c | 128 +-
+ drivers/staging/comedi/drivers/adv_pci1723.c | 2 +-
+ drivers/staging/comedi/drivers/adv_pci1724.c | 6 +-
+ drivers/staging/comedi/drivers/adv_pci_dio.c | 2 +-
+ drivers/staging/comedi/drivers/aio_aio12_8.c | 13 +-
+ .../staging/comedi/drivers/amplc_dio200_common.c | 2 +-
+ drivers/staging/comedi/drivers/amplc_dio200_pci.c | 2 +-
+ drivers/staging/comedi/drivers/amplc_pc236.c | 4 +-
+ drivers/staging/comedi/drivers/amplc_pci224.c | 62 +-
+ drivers/staging/comedi/drivers/amplc_pci230.c | 109 +-
+ drivers/staging/comedi/drivers/amplc_pci263.c | 2 +-
+ drivers/staging/comedi/drivers/c6xdigio.c | 54 -
+ drivers/staging/comedi/drivers/cb_pcidas.c | 57 +-
+ drivers/staging/comedi/drivers/cb_pcidas64.c | 270 +-
+ drivers/staging/comedi/drivers/cb_pcidda.c | 2 +-
+ drivers/staging/comedi/drivers/cb_pcimdas.c | 19 +-
+ drivers/staging/comedi/drivers/cb_pcimdda.c | 2 +-
+ drivers/staging/comedi/drivers/comedi_test.c | 9 +-
+ drivers/staging/comedi/drivers/contec_pci_dio.c | 2 +-
+ drivers/staging/comedi/drivers/daqboard2000.c | 2 +-
+ drivers/staging/comedi/drivers/das08.c | 75 +-
+ drivers/staging/comedi/drivers/das08_pci.c | 2 +-
+ drivers/staging/comedi/drivers/das16m1.c | 107 +-
+ drivers/staging/comedi/drivers/das1800.c | 137 +-
+ drivers/staging/comedi/drivers/das6402.c | 9 -
+ drivers/staging/comedi/drivers/dmm32at.c | 94 +-
+ drivers/staging/comedi/drivers/dt2801.c | 109 +-
+ drivers/staging/comedi/drivers/dt2811.c | 149 +-
+ drivers/staging/comedi/drivers/dt2814.c | 70 +-
+ drivers/staging/comedi/drivers/dt2815.c | 19 +-
+ drivers/staging/comedi/drivers/dt282x.c | 188 +-
+ drivers/staging/comedi/drivers/dt3000.c | 54 +-
+ drivers/staging/comedi/drivers/dt9812.c | 1 -
+ drivers/staging/comedi/drivers/dyna_pci10xx.c | 16 +-
+ drivers/staging/comedi/drivers/fl512.c | 21 +-
+ drivers/staging/comedi/drivers/gsc_hpdi.c | 80 +-
+ drivers/staging/comedi/drivers/icp_multi.c | 15 +-
+ drivers/staging/comedi/drivers/jr3_pci.c | 2 +-
+ drivers/staging/comedi/drivers/ke_counter.c | 2 +-
+ drivers/staging/comedi/drivers/me4000.c | 52 +-
+ drivers/staging/comedi/drivers/me_daq.c | 2 +-
+ drivers/staging/comedi/drivers/mite.c | 145 +-
+ drivers/staging/comedi/drivers/mite.h | 12 -
+ drivers/staging/comedi/drivers/mpc624.c | 19 +-
+ drivers/staging/comedi/drivers/ni_6527.c | 2 +-
+ drivers/staging/comedi/drivers/ni_65xx.c | 7 +-
+ drivers/staging/comedi/drivers/ni_660x.c | 2 +-
+ drivers/staging/comedi/drivers/ni_670x.c | 2 +-
+ drivers/staging/comedi/drivers/ni_at_a2150.c | 111 +-
+ drivers/staging/comedi/drivers/ni_atmio.c | 15 -
+ drivers/staging/comedi/drivers/ni_atmio16d.c | 95 +-
+ drivers/staging/comedi/drivers/ni_labpc_pci.c | 2 +-
+ drivers/staging/comedi/drivers/ni_mio_common.c | 337 +-
+ drivers/staging/comedi/drivers/ni_mio_cs.c | 2 -
+ drivers/staging/comedi/drivers/ni_pcidio.c | 179 +-
+ drivers/staging/comedi/drivers/ni_pcimio.c | 63 +-
+ drivers/staging/comedi/drivers/ni_tio.c | 1 -
+ drivers/staging/comedi/drivers/pcl812.c | 330 +-
+ drivers/staging/comedi/drivers/pcl816.c | 195 +-
+ drivers/staging/comedi/drivers/pcl818.c | 249 +-
+ drivers/staging/comedi/drivers/pcm3724.c | 6 -
+ drivers/staging/comedi/drivers/pcmmio.c | 1476 +++----
+ drivers/staging/comedi/drivers/pcmuio.c | 428 +-
+ drivers/staging/comedi/drivers/plx9080.h | 13 +-
+ drivers/staging/comedi/drivers/rtd520.c | 7 +-
+ drivers/staging/comedi/drivers/s626.c | 21 +-
+ drivers/staging/comedi/drivers/skel.c | 2 +-
+ drivers/staging/comedi/drivers/unioxx5.c | 68 +-
+ drivers/staging/comedi/drivers/usbdux.c | 1 -
+ drivers/staging/comedi/drivers/usbduxfast.c | 6 +-
+ drivers/staging/comedi/drivers/usbduxsigma.c | 1 -
+ drivers/staging/comedi/kcomedilib/Makefile | 2 +
+ .../staging/comedi/kcomedilib/kcomedilib_main.c | 74 +-
+ drivers/staging/comedi/proc.c | 6 +-
+ drivers/staging/comedi/range.c | 9 +-
+ drivers/staging/crystalhd/bc_dts_glob_lnx.h | 2 +-
+ drivers/staging/crystalhd/crystalhd_cmds.c | 4 +-
+ drivers/staging/crystalhd/crystalhd_cmds.h | 2 +-
+ drivers/staging/crystalhd/crystalhd_fw_if.h | 2 +-
+ drivers/staging/crystalhd/crystalhd_hw.c | 2 +-
+ drivers/staging/crystalhd/crystalhd_hw.h | 6 +-
+ drivers/staging/crystalhd/crystalhd_lnx.c | 2 +-
+ drivers/staging/crystalhd/crystalhd_lnx.h | 3 +-
+ drivers/staging/crystalhd/crystalhd_misc.c | 4 +-
+ drivers/staging/crystalhd/crystalhd_misc.h | 2 +-
+ drivers/staging/cxt1e1/comet.c | 60 +-
+ drivers/staging/cxt1e1/comet.h | 601 +--
+ drivers/staging/cxt1e1/functions.c | 2 +-
+ drivers/staging/cxt1e1/musycc.c | 4 +-
+ drivers/staging/cxt1e1/pmcc4_drv.c | 10 +-
+ drivers/staging/cxt1e1/pmcc4_private.h | 2 +-
+ drivers/staging/cxt1e1/sbeid.c | 323 +-
+ drivers/staging/dgap/dgap_conf.h | 6 +-
+ drivers/staging/dgap/dgap_trace.c | 16 +-
+ drivers/staging/dgap/dgap_tty.c | 174 +-
+ drivers/staging/dgap/downld.c | 168 +-
+ drivers/staging/dgnc/dgnc_trace.c | 18 +-
+ drivers/staging/dgrp/dgrp_driver.c | 1 -
+ drivers/staging/dgrp/dgrp_net_ops.c | 330 +-
+ drivers/staging/dgrp/dgrp_tty.c | 4 +-
+ drivers/staging/dwc2/core.c | 378 +-
+ drivers/staging/dwc2/core.h | 62 +-
+ drivers/staging/dwc2/core_intr.c | 10 +-
+ drivers/staging/dwc2/hcd.c | 22 +-
+ drivers/staging/dwc2/hcd.h | 4 +-
+ drivers/staging/dwc2/hcd_ddma.c | 8 +-
+ drivers/staging/dwc2/hcd_intr.c | 6 +-
+ drivers/staging/dwc2/hcd_queue.c | 195 +-
+ drivers/staging/dwc2/pci.c | 2 +-
+ drivers/staging/dwc2/platform.c | 60 +-
+ drivers/staging/et131x/README | 4 -
+ drivers/staging/et131x/et131x.c | 841 ++--
+ drivers/staging/et131x/et131x.h | 40 -
+ drivers/staging/frontier/alphatrack.c | 1 -
+ drivers/staging/frontier/tranzport.c | 1 -
+ drivers/staging/ft1000/ft1000-pcmcia/boot.h | 304 +-
+ drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 766 ++--
+ drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 2 +
+ .../staging/ft1000/ft1000-usb/ft1000_download.c | 133 +-
+ drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 1309 +++---
+ drivers/staging/ft1000/ft1000-usb/ft1000_proc.c | 14 +-
+ drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 5 +-
+ drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 5 -
+ drivers/staging/gdm724x/gdm_lte.c | 44 +-
+ drivers/staging/gdm724x/gdm_mux.c | 8 +-
+ drivers/staging/gdm724x/gdm_tty.c | 1 -
+ drivers/staging/gdm724x/gdm_usb.c | 40 +-
+ drivers/staging/gdm72xx/gdm_qos.c | 2 +-
+ drivers/staging/gdm72xx/sdio_boot.c | 1 -
+ drivers/staging/goldfish/goldfish_nand.c | 1 -
+ drivers/staging/iio/accel/adis16220_core.c | 7 +-
+ drivers/staging/iio/adc/ad7816.c | 12 +-
+ drivers/staging/iio/adc/lpc32xx_adc.c | 12 +-
+ drivers/staging/iio/addac/adt7316-i2c.c | 6 -
+ drivers/staging/iio/addac/adt7316-spi.c | 6 -
+ drivers/staging/iio/addac/adt7316.c | 12 +-
+ drivers/staging/iio/addac/adt7316.h | 1 -
+ drivers/staging/iio/gyro/adis16060_core.c | 10 +-
+ drivers/staging/iio/light/isl29018.c | 13 +-
+ drivers/staging/iio/magnetometer/hmc5843.c | 7 +
+ drivers/staging/iio/resolver/ad2s1200.c | 10 +-
+ drivers/staging/imx-drm/Kconfig | 6 +
+ drivers/staging/imx-drm/Makefile | 1 +
+ drivers/staging/imx-drm/imx-hdmi.c | 1916 +++++++++
+ drivers/staging/imx-drm/imx-hdmi.h | 1032 +++++
+ drivers/staging/imx-drm/imx-ldb.c | 5 +-
+ drivers/staging/imx-drm/ipu-v3/ipu-common.c | 1 -
+ drivers/staging/keucr/smcommon.h | 2 +-
+ drivers/staging/keucr/smil.h | 8 +-
+ drivers/staging/keucr/smilecc.c | 2 +-
+ drivers/staging/keucr/smilmain.c | 101 +-
+ drivers/staging/keucr/smilsub.c | 37 +-
+ drivers/staging/keucr/smscsi.c | 28 +-
+ drivers/staging/keucr/usb.c | 1 -
+ .../staging/lustre/include/linux/libcfs/curproc.h | 1 -
+ .../staging/lustre/include/linux/libcfs/libcfs.h | 2 -
+ .../lustre/include/linux/libcfs/libcfs_ioctl.h | 64 +-
+ .../lustre/include/linux/libcfs/linux/kp30.h | 150 +-
+ .../lustre/include/linux/libcfs/linux/libcfs.h | 1 -
+ .../lustre/include/linux/libcfs/linux/linux-fs.h | 92 -
+ .../lustre/include/linux/libcfs/linux/linux-prim.h | 1 -
+ .../staging/lustre/include/linux/lnet/lib-lnet.h | 5 +-
+ .../staging/lustre/include/linux/lnet/lib-types.h | 2 +-
+ drivers/staging/lustre/include/linux/lnet/types.h | 11 -
+ .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 1 -
+ .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 4 -
+ .../lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c | 358 +-
+ .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 1 -
+ .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 6 -
+ .../lustre/lnet/klnds/socklnd/socklnd_lib-linux.c | 307 --
+ .../lustre/lnet/klnds/socklnd/socklnd_lib-linux.h | 1 -
+ .../lustre/lnet/klnds/socklnd/socklnd_modparams.c | 124 +-
+ drivers/staging/lustre/lnet/lnet/acceptor.c | 16 +-
+ drivers/staging/lustre/lnet/lnet/api-ni.c | 21 +-
+ drivers/staging/lustre/lnet/lnet/config.c | 39 +-
+ drivers/staging/lustre/lnet/lnet/lib-move.c | 10 +-
+ drivers/staging/lustre/lnet/lnet/lib-msg.c | 8 +-
+ drivers/staging/lustre/lnet/lnet/lib-ptl.c | 4 +-
+ drivers/staging/lustre/lnet/lnet/module.c | 4 +-
+ drivers/staging/lustre/lnet/lnet/router.c | 63 +-
+ drivers/staging/lustre/lnet/lnet/router_proc.c | 30 +-
+ drivers/staging/lustre/lnet/selftest/brw_test.c | 7 +-
+ drivers/staging/lustre/lnet/selftest/conctl.c | 64 +-
+ drivers/staging/lustre/lnet/selftest/conrpc.c | 2 +-
+ drivers/staging/lustre/lnet/selftest/console.c | 105 +-
+ drivers/staging/lustre/lnet/selftest/console.h | 8 +-
+ drivers/staging/lustre/lnet/selftest/framework.c | 8 +-
+ drivers/staging/lustre/lnet/selftest/ping_test.c | 5 +-
+ drivers/staging/lustre/lnet/selftest/rpc.c | 4 +-
+ drivers/staging/lustre/lnet/selftest/selftest.h | 5 +-
+ drivers/staging/lustre/lnet/selftest/timer.c | 11 +-
+ drivers/staging/lustre/lustre/fid/Makefile | 3 +-
+ drivers/staging/lustre/lustre/fid/lproc_fid.c | 2 -
+ drivers/staging/lustre/lustre/fld/Makefile | 3 +-
+ drivers/staging/lustre/lustre/fld/fld_cache.c | 2 +-
+ drivers/staging/lustre/lustre/fld/fld_internal.h | 1 -
+ drivers/staging/lustre/lustre/fld/fld_request.c | 7 +-
+ drivers/staging/lustre/lustre/fld/lproc_fld.c | 3 -
+ drivers/staging/lustre/lustre/include/cl_object.h | 6 +-
+ drivers/staging/lustre/lustre/include/dt_object.h | 2 +-
+ .../lustre/lustre/include/linux/lustre_acl.h | 18 +-
+ .../lustre/lustre/include/linux/lustre_intent.h | 2 +-
+ .../lustre/lustre/include/linux/lustre_lite.h | 1 +
+ .../staging/lustre/lustre/include/lprocfs_status.h | 8 +-
+ drivers/staging/lustre/lustre/include/lu_object.h | 19 -
+ drivers/staging/lustre/lustre/include/lu_target.h | 91 -
+ .../lustre/lustre/include/lustre/liblustreapi.h | 43 -
+ .../lustre/lustre/include/lustre/lustre_idl.h | 72 +-
+ .../lustre/lustre/include/lustre/lustre_user.h | 42 +-
+ .../lustre/lustre/include/lustre/lustreapi.h | 310 --
+ .../staging/lustre/lustre/include/lustre_disk.h | 1 +
+ drivers/staging/lustre/lustre/include/lustre_dlm.h | 3 +-
+ .../lustre/lustre/include/lustre_dlm_flags.h | 90 +-
+ drivers/staging/lustre/lustre/include/lustre_fid.h | 6 -
+ drivers/staging/lustre/lustre/include/lustre_ha.h | 3 -
+ drivers/staging/lustre/lustre/include/lustre_lib.h | 11 +-
+ drivers/staging/lustre/lustre/include/lustre_log.h | 13 +-
+ drivers/staging/lustre/lustre/include/lustre_mdc.h | 9 +-
+ drivers/staging/lustre/lustre/include/lustre_net.h | 245 --
+ .../lustre/lustre/include/lustre_req_layout.h | 7 +
+ drivers/staging/lustre/lustre/include/lustre_sec.h | 17 +-
+ drivers/staging/lustre/lustre/include/md_object.h | 4 +-
+ drivers/staging/lustre/lustre/include/obd.h | 15 +-
+ .../staging/lustre/lustre/include/obd_support.h | 12 +-
+ drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 6 +
+ .../staging/lustre/lustre/lclient/lcommon_misc.c | 4 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 45 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 15 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 57 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 9 +
+ drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 49 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 23 +-
+ drivers/staging/lustre/lustre/libcfs/debug.c | 42 +-
+ drivers/staging/lustre/lustre/libcfs/hash.c | 12 +-
+ .../lustre/lustre/libcfs/kernel_user_comm.c | 4 +-
+ .../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 6 +-
+ .../lustre/lustre/libcfs/linux/linux-curproc.c | 13 -
+ .../lustre/lustre/libcfs/linux/linux-prim.c | 11 +-
+ .../lustre/lustre/libcfs/linux/linux-proc.c | 36 +-
+ drivers/staging/lustre/lustre/libcfs/lwt.c | 266 --
+ drivers/staging/lustre/lustre/libcfs/module.c | 55 +-
+ drivers/staging/lustre/lustre/libcfs/nidstrings.c | 34 +-
+ drivers/staging/lustre/lustre/libcfs/tracefile.c | 22 +-
+ drivers/staging/lustre/lustre/llite/Makefile | 5 +-
+ drivers/staging/lustre/lustre/llite/dcache.c | 34 +-
+ drivers/staging/lustre/lustre/llite/dir.c | 24 +-
+ drivers/staging/lustre/lustre/llite/file.c | 657 ++-
+ .../staging/lustre/lustre/llite/llite_internal.h | 76 +-
+ drivers/staging/lustre/lustre/llite/llite_lib.c | 76 +-
+ drivers/staging/lustre/lustre/llite/lloop.c | 3 +-
+ drivers/staging/lustre/lustre/llite/lproc_llite.c | 41 +-
+ drivers/staging/lustre/lustre/llite/namei.c | 14 +-
+ drivers/staging/lustre/lustre/llite/super25.c | 4 +
+ drivers/staging/lustre/lustre/llite/vvp_io.c | 54 +-
+ drivers/staging/lustre/lustre/llite/vvp_object.c | 2 +-
+ drivers/staging/lustre/lustre/llite/xattr.c | 104 +-
+ drivers/staging/lustre/lustre/llite/xattr_cache.c | 617 +++
+ drivers/staging/lustre/lustre/lmv/Makefile | 4 +-
+ drivers/staging/lustre/lustre/lmv/lmv_fld.c | 1 -
+ drivers/staging/lustre/lustre/lmv/lmv_intent.c | 1 -
+ drivers/staging/lustre/lustre/lmv/lmv_obd.c | 6 +-
+ drivers/staging/lustre/lustre/lmv/lproc_lmv.c | 5 -
+ drivers/staging/lustre/lustre/lov/Makefile | 3 +-
+ .../staging/lustre/lustre/lov/lov_cl_internal.h | 16 +
+ drivers/staging/lustre/lustre/lov/lov_internal.h | 2 +-
+ drivers/staging/lustre/lustre/lov/lov_io.c | 15 +-
+ drivers/staging/lustre/lustre/lov/lov_lock.c | 2 +-
+ drivers/staging/lustre/lustre/lov/lov_merge.c | 2 +-
+ drivers/staging/lustre/lustre/lov/lov_obd.c | 2 +-
+ drivers/staging/lustre/lustre/lov/lov_object.c | 35 +-
+ drivers/staging/lustre/lustre/lov/lov_pack.c | 20 +-
+ drivers/staging/lustre/lustre/lov/lov_pool.c | 2 +-
+ drivers/staging/lustre/lustre/lov/lov_request.c | 14 +-
+ drivers/staging/lustre/lustre/lov/lproc_lov.c | 40 +-
+ drivers/staging/lustre/lustre/lvfs/Makefile | 3 +-
+ drivers/staging/lustre/lustre/lvfs/fsfilt_ext3.c | 760 ----
+ drivers/staging/lustre/lustre/lvfs/lvfs_lib.c | 2 -
+ drivers/staging/lustre/lustre/lvfs/lvfs_linux.c | 1 -
+ drivers/staging/lustre/lustre/mdc/Makefile | 3 +-
+ drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 3 -
+ drivers/staging/lustre/lustre/mdc/mdc_internal.h | 3 +-
+ drivers/staging/lustre/lustre/mdc/mdc_lib.c | 31 +-
+ drivers/staging/lustre/lustre/mdc/mdc_locks.c | 113 +-
+ drivers/staging/lustre/lustre/mdc/mdc_request.c | 86 +-
+ drivers/staging/lustre/lustre/mgc/Makefile | 3 +-
+ drivers/staging/lustre/lustre/mgc/libmgc.c | 3 -
+ drivers/staging/lustre/lustre/mgc/lproc_mgc.c | 3 -
+ drivers/staging/lustre/lustre/mgc/mgc_internal.h | 2 +-
+ drivers/staging/lustre/lustre/mgc/mgc_request.c | 400 +-
+ drivers/staging/lustre/lustre/obdclass/capa.c | 1 -
+ drivers/staging/lustre/lustre/obdclass/class_obd.c | 20 +-
+ drivers/staging/lustre/lustre/obdclass/genops.c | 3 +-
+ .../lustre/lustre/obdclass/linux/linux-module.c | 6 +-
+ .../lustre/lustre/obdclass/linux/linux-sysctl.c | 21 +-
+ drivers/staging/lustre/lustre/obdclass/llog.c | 214 +-
+ drivers/staging/lustre/lustre/obdclass/llog_test.c | 6 +-
+ .../staging/lustre/lustre/obdclass/local_storage.c | 11 +-
+ .../staging/lustre/lustre/obdclass/local_storage.h | 3 +
+ .../lustre/lustre/obdclass/lprocfs_status.c | 356 +-
+ drivers/staging/lustre/lustre/obdclass/lu_object.c | 30 +-
+ drivers/staging/lustre/lustre/obdclass/obd_mount.c | 3 +
+ .../staging/lustre/lustre/obdecho/echo_client.c | 2 +-
+ drivers/staging/lustre/lustre/osc/Makefile | 3 +-
+ drivers/staging/lustre/lustre/osc/lproc_osc.c | 2 -
+ drivers/staging/lustre/lustre/osc/osc_cache.c | 6 +-
+ .../staging/lustre/lustre/osc/osc_cl_internal.h | 2 +-
+ drivers/staging/lustre/lustre/osc/osc_lock.c | 2 +-
+ drivers/staging/lustre/lustre/osc/osc_page.c | 4 +-
+ drivers/staging/lustre/lustre/osc/osc_request.c | 6 +-
+ drivers/staging/lustre/lustre/ptlrpc/Makefile | 5 +-
+ drivers/staging/lustre/lustre/ptlrpc/client.c | 25 +-
+ drivers/staging/lustre/lustre/ptlrpc/events.c | 75 +-
+ .../staging/lustre/lustre/ptlrpc/gss/gss_asn1.h | 6 +-
+ .../staging/lustre/lustre/ptlrpc/gss/gss_bulk.c | 1 -
+ drivers/staging/lustre/lustre/ptlrpc/gss/gss_err.h | 10 +-
+ .../lustre/lustre/ptlrpc/gss/gss_generic_token.c | 1 -
+ .../staging/lustre/lustre/ptlrpc/gss/gss_keyring.c | 2 +-
+ .../lustre/lustre/ptlrpc/gss/gss_krb5_mech.c | 2 +-
+ .../lustre/lustre/ptlrpc/gss/gss_mech_switch.c | 1 -
+ .../staging/lustre/lustre/ptlrpc/gss/lproc_gss.c | 1 -
+ drivers/staging/lustre/lustre/ptlrpc/gss/sec_gss.c | 14 +-
+ drivers/staging/lustre/lustre/ptlrpc/import.c | 40 +-
+ drivers/staging/lustre/lustre/ptlrpc/layout.c | 73 +-
+ drivers/staging/lustre/lustre/ptlrpc/llog_client.c | 6 +-
+ drivers/staging/lustre/lustre/ptlrpc/llog_server.c | 450 --
+ .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 14 +-
+ drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 81 +-
+ .../staging/lustre/lustre/ptlrpc/pack_generic.c | 375 +-
+ drivers/staging/lustre/lustre/ptlrpc/pinger.c | 70 +-
+ .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 16 +-
+ .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c | 2 +-
+ drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 50 +-
+ drivers/staging/lustre/lustre/ptlrpc/service.c | 77 +-
+ drivers/staging/lustre/lustre/ptlrpc/wirehdr.c | 47 -
+ drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 86 +-
+ drivers/staging/media/as102/as102_drv.c | 1 -
+ drivers/staging/media/cxd2099/cxd2099.c | 1 -
+ drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 2 +-
+ .../staging/media/davinci_vpfe/dm365_ipipe_hw.c | 4 +-
+ drivers/staging/media/dt3155v4l/dt3155v4l.c | 2 +-
+ drivers/staging/media/go7007/go7007-driver.c | 1 -
+ drivers/staging/media/go7007/go7007-fw.c | 4 +-
+ drivers/staging/media/go7007/go7007-i2c.c | 1 -
+ drivers/staging/media/go7007/go7007-loader.c | 1 -
+ drivers/staging/media/go7007/go7007-usb.c | 1 -
+ drivers/staging/media/go7007/go7007-v4l2.c | 1 -
+ drivers/staging/media/go7007/s2250-board.c | 1 -
+ drivers/staging/media/go7007/saa7134-go7007.c | 2 +-
+ drivers/staging/media/go7007/snd-go7007.c | 1 -
+ drivers/staging/media/lirc/lirc_igorplugusb.c | 4 +-
+ drivers/staging/media/lirc/lirc_imon.c | 12 +-
+ drivers/staging/media/lirc/lirc_sasem.c | 1 -
+ drivers/staging/media/lirc/lirc_serial.c | 6 +-
+ drivers/staging/media/lirc/lirc_zilog.c | 4 +-
+ drivers/staging/media/solo6x10/solo6x10-core.c | 2 +-
+ drivers/staging/octeon/ethernet-mdio.h | 1 -
+ drivers/staging/octeon/ethernet-rx.c | 1 -
+ drivers/staging/octeon/ethernet-tx.c | 1 -
+ drivers/staging/octeon/ethernet.c | 1 -
+ drivers/staging/olpc_dcon/olpc_dcon.c | 6 +-
+ drivers/staging/ozwpan/ozeltbuf.c | 3 +-
+ drivers/staging/ozwpan/ozpd.c | 1 -
+ drivers/staging/ozwpan/ozproto.c | 3 +-
+ drivers/staging/ozwpan/ozusbsvc.c | 1 -
+ drivers/staging/ozwpan/ozusbsvc1.c | 1 -
+ drivers/staging/phison/phison.c | 3 +-
+ drivers/staging/rtl8187se/ieee80211/dot11d.c | 132 +-
+ drivers/staging/rtl8187se/ieee80211/dot11d.h | 66 +-
+ drivers/staging/rtl8187se/ieee80211/ieee80211.h | 125 +-
+ .../staging/rtl8187se/ieee80211/ieee80211_crypt.c | 4 +-
+ .../rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | 13 +-
+ .../rtl8187se/ieee80211/ieee80211_crypt_tkip.c | 53 +-
+ .../rtl8187se/ieee80211/ieee80211_crypt_wep.c | 1 -
+ drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 39 +-
+ .../rtl8187se/ieee80211/ieee80211_softmac.c | 134 +-
+ .../rtl8187se/ieee80211/ieee80211_softmac_wx.c | 64 +-
+ drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 13 +-
+ drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 8 +-
+ drivers/staging/rtl8187se/r8180.h | 33 +-
+ drivers/staging/rtl8187se/r8180_core.c | 29 +-
+ drivers/staging/rtl8187se/r8180_dm.h | 2 +-
+ drivers/staging/rtl8187se/r8180_rtl8225.h | 3 +-
+ drivers/staging/rtl8187se/r8180_wx.c | 202 +-
+ drivers/staging/rtl8187se/r8185b_init.c | 17 +-
+ drivers/staging/rtl8188eu/core/rtw_io.c | 2 +-
+ drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 2 +-
+ drivers/staging/rtl8188eu/core/rtw_xmit.c | 2 +-
+ drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 2 +-
+ drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c | 2 +-
+ drivers/staging/rtl8188eu/include/osdep_service.h | 72 +-
+ drivers/staging/rtl8188eu/include/rtw_cmd.h | 103 +-
+ drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 34 +-
+ drivers/staging/rtl8188eu/os_dep/osdep_service.c | 2 +-
+ drivers/staging/rtl8188eu/os_dep/usb_intf.c | 2 +-
+ drivers/staging/rtl8192e/dot11d.c | 2 +-
+ drivers/staging/rtl8192e/dot11d.h | 5 +-
+ drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 13 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 1 -
+ drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 24 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 3 +-
+ drivers/staging/rtl8192e/rtl819x_BAProc.c | 10 +-
+ drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 4 +-
+ drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 6 +-
+ drivers/staging/rtl8192e/rtllib_crypt_wep.c | 4 +-
+ drivers/staging/rtl8192e/rtllib_module.c | 4 +-
+ drivers/staging/rtl8192e/rtllib_rx.c | 74 +-
+ drivers/staging/rtl8192e/rtllib_softmac.c | 28 +-
+ drivers/staging/rtl8192e/rtllib_tx.c | 16 +-
+ drivers/staging/rtl8192u/r8192U.h | 1 -
+ drivers/staging/rtl8712/os_intfs.c | 1 -
+ drivers/staging/rtl8712/rtl8712_cmd.c | 1 -
+ drivers/staging/rtl8712/rtl871x_cmd.c | 1 -
+ drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 1 -
+ drivers/staging/rtl8712/rtl871x_mlme.c | 3 -
+ drivers/staging/rtl8712/rtl871x_security.c | 1 -
+ drivers/staging/rts5139/ms.c | 2 +-
+ drivers/staging/rts5139/rts51x.c | 1 -
+ drivers/staging/rts5208/Kconfig | 15 +
+ drivers/staging/rts5208/Makefile | 6 +
+ drivers/staging/rts5208/TODO | 7 +
+ drivers/staging/rts5208/debug.h | 43 +
+ drivers/staging/rts5208/general.c | 35 +
+ drivers/staging/rts5208/general.h | 31 +
+ drivers/staging/rts5208/ms.c | 4208 ++++++++++++++++++
+ drivers/staging/rts5208/ms.h | 227 +
+ drivers/staging/rts5208/rtsx.c | 1071 +++++
+ drivers/staging/rts5208/rtsx.h | 185 +
+ drivers/staging/rts5208/rtsx_card.c | 1126 +++++
+ drivers/staging/rts5208/rtsx_card.h | 1098 +++++
+ drivers/staging/rts5208/rtsx_chip.c | 1979 +++++++++
+ drivers/staging/rts5208/rtsx_chip.h | 1002 +++++
+ drivers/staging/rts5208/rtsx_scsi.c | 3370 +++++++++++++++
+ drivers/staging/rts5208/rtsx_scsi.h | 143 +
+ drivers/staging/rts5208/rtsx_sys.h | 50 +
+ drivers/staging/rts5208/rtsx_transport.c | 769 ++++
+ drivers/staging/rts5208/rtsx_transport.h | 66 +
+ drivers/staging/rts5208/sd.c | 4525 ++++++++++++++++++++
+ drivers/staging/rts5208/sd.h | 301 ++
+ drivers/staging/rts5208/spi.c | 877 ++++
+ drivers/staging/rts5208/spi.h | 65 +
+ drivers/staging/rts5208/trace.h | 93 +
+ drivers/staging/rts5208/xd.c | 2088 +++++++++
+ drivers/staging/rts5208/xd.h | 188 +
+ drivers/staging/sb105x/sb_mp_register.h | 8 +-
+ drivers/staging/sb105x/sb_pci_mp.c | 4 +-
+ drivers/staging/sb105x/sb_pci_mp.h | 1 -
+ drivers/staging/sep/sep_crypto.c | 1 -
+ drivers/staging/sep/sep_main.c | 3 +-
+ drivers/staging/serqt_usb2/serqt_usb2.c | 1 -
+ drivers/staging/silicom/bpctl_mod.c | 2 -
+ drivers/staging/silicom/bypasslib/bypass.c | 14 +-
+ drivers/staging/slicoss/README | 1 -
+ drivers/staging/slicoss/slicoss.c | 23 +-
+ drivers/staging/sm7xxfb/sm7xxfb.c | 2 +-
+ drivers/staging/speakup/main.c | 2 -
+ drivers/staging/speakup/serialio.c | 4 +
+ drivers/staging/speakup/serialio.h | 26 -
+ drivers/staging/tidspbridge/Makefile | 2 +-
+ drivers/staging/tidspbridge/gen/uuidutil.c | 85 -
+ .../tidspbridge/include/dspbridge/uuidutil.h | 18 -
+ drivers/staging/tidspbridge/pmgr/cmm.c | 7 +-
+ drivers/staging/tidspbridge/pmgr/dbll.c | 21 +-
+ drivers/staging/tidspbridge/pmgr/dev.c | 6 +-
+ drivers/staging/tidspbridge/pmgr/dmm.c | 20 +-
+ drivers/staging/tidspbridge/pmgr/dspapi.c | 12 +-
+ drivers/staging/tidspbridge/rmgr/dbdcd.c | 108 +-
+ drivers/staging/tidspbridge/rmgr/drv_interface.c | 31 +-
+ drivers/staging/usbip/stub_rx.c | 20 +-
+ drivers/staging/usbip/usbip_common.c | 5 +-
+ .../staging/usbip/userspace/libsrc/usbip_common.c | 2 +-
+ .../staging/usbip/userspace/libsrc/vhci_driver.c | 2 +-
+ drivers/staging/usbip/vhci_hcd.c | 15 +-
+ drivers/staging/vme/devices/vme_user.c | 14 +-
+ drivers/staging/vme/devices/vme_user.h | 26 +-
+ drivers/staging/vt6655/baseband.c | 4 +-
+ drivers/staging/vt6655/bssdb.c | 354 +-
+ drivers/staging/vt6655/card.c | 10 +-
+ drivers/staging/vt6655/channel.c | 16 +-
+ drivers/staging/vt6655/datarate.c | 8 +-
+ drivers/staging/vt6655/device.h | 1 -
+ drivers/staging/vt6655/device_main.c | 62 +-
+ drivers/staging/vt6655/dpc.c | 40 +-
+ drivers/staging/vt6655/hostap.c | 12 +-
+ drivers/staging/vt6655/iwctl.c | 2 +-
+ drivers/staging/vt6655/key.c | 44 +-
+ drivers/staging/vt6655/mac.c | 4 +-
+ drivers/staging/vt6655/power.c | 9 +-
+ drivers/staging/vt6655/rf.c | 2 +-
+ drivers/staging/vt6655/rxtx.c | 12 +-
+ drivers/staging/vt6655/vntwifi.c | 6 +-
+ drivers/staging/vt6655/wcmd.c | 22 +-
+ drivers/staging/vt6655/wctl.c | 6 +-
+ drivers/staging/vt6655/wmgr.c | 125 +-
+ drivers/staging/vt6655/wpa.c | 2 +-
+ drivers/staging/vt6655/wpa2.c | 18 +-
+ drivers/staging/vt6655/wpactl.c | 12 +-
+ drivers/staging/vt6656/Makefile | 1 -
+ drivers/staging/vt6656/aes_ccmp.c | 16 +-
+ drivers/staging/vt6656/baseband.c | 335 +-
+ drivers/staging/vt6656/bssdb.c | 74 +-
+ drivers/staging/vt6656/bssdb.h | 4 +-
+ drivers/staging/vt6656/card.c | 78 +-
+ drivers/staging/vt6656/channel.c | 3 +-
+ drivers/staging/vt6656/datarate.c | 2 +-
+ drivers/staging/vt6656/datarate.h | 1 -
+ drivers/staging/vt6656/desc.h | 8 -
+ drivers/staging/vt6656/device.h | 30 +-
+ drivers/staging/vt6656/device_cfg.h | 2 +
+ drivers/staging/vt6656/dpc.c | 48 +-
+ drivers/staging/vt6656/int.c | 60 +-
+ drivers/staging/vt6656/iwctl.c | 4 -
+ drivers/staging/vt6656/main_usb.c | 543 ++-
+ drivers/staging/vt6656/mib.c | 489 ---
+ drivers/staging/vt6656/mib.h | 378 --
+ drivers/staging/vt6656/rf.c | 7 +-
+ drivers/staging/vt6656/rndis.h | 30 +-
+ drivers/staging/vt6656/rxtx.c | 243 +-
+ drivers/staging/vt6656/rxtx.h | 12 +-
+ drivers/staging/vt6656/tkip.c | 4 +-
+ drivers/staging/vt6656/usbpipe.c | 10 -
+ drivers/staging/vt6656/wcmd.c | 1712 ++++----
+ drivers/staging/vt6656/wmgr.c | 10 +-
+ drivers/staging/vt6656/wpa.c | 12 +-
+ drivers/staging/vt6656/wpa2.c | 16 +-
+ drivers/staging/winbond/mds.c | 101 +-
+ drivers/staging/wlags49_h2/sta_h25.c | 6 +-
+ drivers/staging/wlags49_h2/wl_pci.c | 1 -
+ drivers/staging/wlan-ng/cfg80211.c | 18 +-
+ drivers/staging/wlan-ng/hfa384x.h | 4 +-
+ drivers/staging/wlan-ng/prism2mgmt.c | 4 +-
+ drivers/staging/wlan-ng/prism2mgmt.h | 6 +-
+ drivers/staging/wlan-ng/prism2mib.c | 6 +-
+ drivers/staging/wlan-ng/prism2sta.c | 7 +-
+ drivers/staging/xgifb/XGI_main.h | 2 +-
+ drivers/staging/xillybus/Kconfig | 2 +-
+ drivers/staging/xillybus/xillybus_of.c | 2 +-
+ drivers/staging/xillybus/xillybus_pcie.c | 4 +-
+ drivers/staging/zsmalloc/Kconfig | 13 +
+ drivers/staging/zsmalloc/zsmalloc-main.c | 86 +-
+ drivers/staging/zsmalloc/zsmalloc.h | 9 +-
+ drivers/vme/Kconfig | 2 +-
+ drivers/vme/boards/vme_vmivme7805.c | 2 +-
+ drivers/vme/bridges/vme_ca91cx42.c | 2 +-
+ drivers/vme/bridges/vme_tsi148.c | 2 +-
+ drivers/vme/vme.c | 25 +-
+ include/linux/hid-sensor-ids.h | 8 +
+ include/linux/iio/iio.h | 81 +-
+ include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 1 +
+ include/linux/vme.h | 3 +-
+ 636 files changed, 45018 insertions(+), 20189 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/iio/light/tsl2563.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/hmc5843.txt
+ create mode 100644 drivers/iio/pressure/mpl3115.c
+ create mode 100644 drivers/staging/android/ion/Kconfig
+ create mode 100644 drivers/staging/android/ion/Makefile
+ create mode 100644 drivers/staging/android/ion/compat_ion.c
+ create mode 100644 drivers/staging/android/ion/compat_ion.h
+ create mode 100644 drivers/staging/android/ion/ion.c
+ create mode 100644 drivers/staging/android/ion/ion.h
+ create mode 100644 drivers/staging/android/ion/ion_carveout_heap.c
+ create mode 100644 drivers/staging/android/ion/ion_chunk_heap.c
+ create mode 100644 drivers/staging/android/ion/ion_cma_heap.c
+ create mode 100644 drivers/staging/android/ion/ion_heap.c
+ create mode 100644 drivers/staging/android/ion/ion_page_pool.c
+ create mode 100644 drivers/staging/android/ion/ion_priv.h
+ create mode 100644 drivers/staging/android/ion/ion_system_heap.c
+ create mode 100644 drivers/staging/android/ion/ion_test.c
+ create mode 100644 drivers/staging/android/ion/tegra/Makefile
+ create mode 100644 drivers/staging/android/ion/tegra/tegra_ion.c
+ create mode 100644 drivers/staging/android/uapi/ion.h
+ create mode 100644 drivers/staging/android/uapi/ion_test.h
+ delete mode 100644 drivers/staging/btmtk_usb/Kconfig
+ delete mode 100644 drivers/staging/btmtk_usb/Makefile
+ delete mode 100644 drivers/staging/btmtk_usb/README
+ delete mode 100644 drivers/staging/btmtk_usb/TODO
+ delete mode 100644 drivers/staging/btmtk_usb/btmtk_usb.c
+ delete mode 100644 drivers/staging/btmtk_usb/btmtk_usb.h
+ create mode 100644 drivers/staging/imx-drm/imx-hdmi.c
+ create mode 100644 drivers/staging/imx-drm/imx-hdmi.h
+ delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-fs.h
+ delete mode 100644 drivers/staging/lustre/lustre/include/lu_target.h
+ delete mode 100644 drivers/staging/lustre/lustre/include/lustre/liblustreapi.h
+ delete mode 100644 drivers/staging/lustre/lustre/include/lustre/lustreapi.h
+ delete mode 100644 drivers/staging/lustre/lustre/libcfs/lwt.c
+ create mode 100644 drivers/staging/lustre/lustre/llite/xattr_cache.c
+ delete mode 100644 drivers/staging/lustre/lustre/lvfs/fsfilt_ext3.c
+ delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/llog_server.c
+ delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/wirehdr.c
+ create mode 100644 drivers/staging/rts5208/Kconfig
+ create mode 100644 drivers/staging/rts5208/Makefile
+ create mode 100644 drivers/staging/rts5208/TODO
+ create mode 100644 drivers/staging/rts5208/debug.h
+ create mode 100644 drivers/staging/rts5208/general.c
+ create mode 100644 drivers/staging/rts5208/general.h
+ create mode 100644 drivers/staging/rts5208/ms.c
+ create mode 100644 drivers/staging/rts5208/ms.h
+ create mode 100644 drivers/staging/rts5208/rtsx.c
+ create mode 100644 drivers/staging/rts5208/rtsx.h
+ create mode 100644 drivers/staging/rts5208/rtsx_card.c
+ create mode 100644 drivers/staging/rts5208/rtsx_card.h
+ create mode 100644 drivers/staging/rts5208/rtsx_chip.c
+ create mode 100644 drivers/staging/rts5208/rtsx_chip.h
+ create mode 100644 drivers/staging/rts5208/rtsx_scsi.c
+ create mode 100644 drivers/staging/rts5208/rtsx_scsi.h
+ create mode 100644 drivers/staging/rts5208/rtsx_sys.h
+ create mode 100644 drivers/staging/rts5208/rtsx_transport.c
+ create mode 100644 drivers/staging/rts5208/rtsx_transport.h
+ create mode 100644 drivers/staging/rts5208/sd.c
+ create mode 100644 drivers/staging/rts5208/sd.h
+ create mode 100644 drivers/staging/rts5208/spi.c
+ create mode 100644 drivers/staging/rts5208/spi.h
+ create mode 100644 drivers/staging/rts5208/trace.h
+ create mode 100644 drivers/staging/rts5208/xd.c
+ create mode 100644 drivers/staging/rts5208/xd.h
+ delete mode 100644 drivers/staging/tidspbridge/gen/uuidutil.c
+ delete mode 100644 drivers/staging/vt6656/mib.c
+ delete mode 100644 drivers/staging/vt6656/mib.h
+Merging char-misc/char-misc-next (76f5adbcb371 GenWQE Enable driver)
+$ git merge char-misc/char-misc-next
+Auto-merging drivers/misc/mic/host/mic_device.h
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/arm/atmel-at91.txt
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/debugfs-driver-genwqe | 91 ++
+ Documentation/ABI/testing/sysfs-driver-genwqe | 62 +
+ Documentation/HOWTO | 4 +-
+ .../devicetree/bindings/arm/atmel-at91.txt | 8 +
+ .../devicetree/bindings/misc/atmel-ssc.txt | 5 +
+ Documentation/devicetree/bindings/misc/bmp085.txt | 4 +
+ Documentation/ja_JP/HOWTO | 4 +-
+ Documentation/ko_KR/HOWTO | 4 +-
+ Documentation/zh_CN/HOWTO | 4 +-
+ MAINTAINERS | 2 +-
+ drivers/char/agp/amd64-agp.c | 2 +-
+ drivers/char/i8k.c | 358 ++---
+ drivers/char/lp.c | 2 +
+ drivers/hv/hv.c | 2 +-
+ drivers/misc/Kconfig | 1 +
+ drivers/misc/Makefile | 1 +
+ drivers/misc/ad525x_dpot.c | 4 +-
+ drivers/misc/bmp085-i2c.c | 2 +-
+ drivers/misc/bmp085-spi.c | 2 +-
+ drivers/misc/bmp085.c | 39 +-
+ drivers/misc/bmp085.h | 2 +-
+ drivers/misc/eeprom/eeprom_93xx46.c | 1 -
+ drivers/misc/genwqe/Kconfig | 13 +
+ drivers/misc/genwqe/Makefile | 7 +
+ drivers/misc/genwqe/card_base.c | 1205 ++++++++++++++++
+ drivers/misc/genwqe/card_base.h | 556 ++++++++
+ drivers/misc/genwqe/card_ddcb.c | 1373 ++++++++++++++++++
+ drivers/misc/genwqe/card_ddcb.h | 188 +++
+ drivers/misc/genwqe/card_debugfs.c | 500 +++++++
+ drivers/misc/genwqe/card_dev.c | 1486 ++++++++++++++++++++
+ drivers/misc/genwqe/card_sysfs.c | 288 ++++
+ drivers/misc/genwqe/card_utils.c | 947 +++++++++++++
+ drivers/misc/genwqe/genwqe_driver.h | 74 +
+ drivers/misc/lkdtm.c | 7 +-
+ drivers/misc/mei/amthif.c | 2 +
+ drivers/misc/mei/client.c | 4 +-
+ drivers/misc/mei/hw.h | 3 +-
+ drivers/misc/mei/init.c | 17 +-
+ drivers/misc/mei/interrupt.c | 79 +-
+ drivers/misc/mei/mei_dev.h | 18 +-
+ drivers/misc/mei/nfc.c | 6 +-
+ drivers/misc/mei/pci-me.c | 17 +-
+ drivers/misc/mei/wd.c | 1 +
+ drivers/misc/mic/host/mic_device.h | 3 +
+ drivers/misc/mic/host/mic_main.c | 2 +-
+ drivers/misc/mic/host/mic_virtio.c | 2 +-
+ drivers/misc/mic/host/mic_x100.c | 36 +-
+ drivers/misc/ti-st/st_core.c | 2 +-
+ drivers/misc/ti-st/st_kim.c | 1 -
+ drivers/parport/parport_pc.c | 20 +-
+ drivers/pcmcia/bfin_cf_pcmcia.c | 2 +-
+ drivers/pcmcia/electra_cf.c | 2 +-
+ drivers/uio/uio_mf624.c | 2 +-
+ drivers/w1/masters/mxc_w1.c | 31 +-
+ include/uapi/linux/genwqe/genwqe_card.h | 500 +++++++
+ tools/hv/hv_kvp_daemon.c | 1 -
+ tools/hv/hv_vss_daemon.c | 1 -
+ 57 files changed, 7716 insertions(+), 284 deletions(-)
+ create mode 100644 Documentation/ABI/testing/debugfs-driver-genwqe
+ create mode 100644 Documentation/ABI/testing/sysfs-driver-genwqe
+ create mode 100644 drivers/misc/genwqe/Kconfig
+ create mode 100644 drivers/misc/genwqe/Makefile
+ create mode 100644 drivers/misc/genwqe/card_base.c
+ create mode 100644 drivers/misc/genwqe/card_base.h
+ create mode 100644 drivers/misc/genwqe/card_ddcb.c
+ create mode 100644 drivers/misc/genwqe/card_ddcb.h
+ create mode 100644 drivers/misc/genwqe/card_debugfs.c
+ create mode 100644 drivers/misc/genwqe/card_dev.c
+ create mode 100644 drivers/misc/genwqe/card_sysfs.c
+ create mode 100644 drivers/misc/genwqe/card_utils.c
+ create mode 100644 drivers/misc/genwqe/genwqe_driver.h
+ create mode 100644 include/uapi/linux/genwqe/genwqe_card.h
+Merging scsi/for-next (81286dea29d1 Merge branch 'fixes' into for-next)
+$ git merge scsi/for-next
+Auto-merging drivers/scsi/sd.c
+Removing drivers/scsi/aic7xxx_old/sequencer.h
+Removing drivers/scsi/aic7xxx_old/scsi_message.h
+Removing drivers/scsi/aic7xxx_old/aic7xxx_seq.c
+Removing drivers/scsi/aic7xxx_old/aic7xxx_reg.h
+Removing drivers/scsi/aic7xxx_old/aic7xxx_proc.c
+Removing drivers/scsi/aic7xxx_old/aic7xxx.seq
+Removing drivers/scsi/aic7xxx_old/aic7xxx.reg
+Removing drivers/scsi/aic7xxx_old/aic7xxx.h
+Removing drivers/scsi/aic7xxx_old.c
+Auto-merging drivers/scsi/Kconfig
+Auto-merging MAINTAINERS
+Removing Documentation/scsi/aic7xxx_old.txt
+Merge made by the 'recursive' strategy.
+ Documentation/scsi/00-INDEX | 2 -
+ Documentation/scsi/aic7xxx_old.txt | 511 --
+ Documentation/scsi/scsi_eh.txt | 69 +-
+ Documentation/scsi/scsi_mid_low_api.txt | 9 +-
+ MAINTAINERS | 7 +-
+ drivers/scsi/Kconfig | 41 -
+ drivers/scsi/Makefile | 1 -
+ drivers/scsi/aic7xxx_old.c | 11149 ----------------------------
+ drivers/scsi/aic7xxx_old/aic7xxx.h | 28 -
+ drivers/scsi/aic7xxx_old/aic7xxx.reg | 1401 ----
+ drivers/scsi/aic7xxx_old/aic7xxx.seq | 1539 ----
+ drivers/scsi/aic7xxx_old/aic7xxx_proc.c | 270 -
+ drivers/scsi/aic7xxx_old/aic7xxx_reg.h | 629 --
+ drivers/scsi/aic7xxx_old/aic7xxx_seq.c | 817 --
+ drivers/scsi/aic7xxx_old/scsi_message.h | 49 -
+ drivers/scsi/aic7xxx_old/sequencer.h | 135 -
+ drivers/scsi/be2iscsi/be_iscsi.c | 8 +-
+ drivers/scsi/bfa/bfa_core.c | 8 +-
+ drivers/scsi/bfa/bfa_defs.h | 1 +
+ drivers/scsi/bfa/bfa_fc.h | 2 +-
+ drivers/scsi/bfa/bfa_fcs_lport.c | 15 +-
+ drivers/scsi/bfa/bfa_ioc.c | 727 +-
+ drivers/scsi/bfa/bfa_ioc.h | 7 +-
+ drivers/scsi/bfa/bfa_ioc_cb.c | 23 +
+ drivers/scsi/bfa/bfa_svc.c | 2 +-
+ drivers/scsi/bfa/bfad.c | 97 +-
+ drivers/scsi/bfa/bfad_bsg.c | 15 +
+ drivers/scsi/bfa/bfad_bsg.h | 1 +
+ drivers/scsi/bfa/bfad_drv.h | 6 +-
+ drivers/scsi/bfa/bfi.h | 42 +-
+ drivers/scsi/hosts.c | 31 +-
+ drivers/scsi/hpsa.c | 308 +-
+ drivers/scsi/hpsa.h | 20 +
+ drivers/scsi/ipr.c | 2 +-
+ drivers/scsi/ipr.h | 2 +-
+ drivers/scsi/libiscsi.c | 6 +
+ drivers/scsi/lpfc/lpfc_debugfs.c | 2 +-
+ drivers/scsi/mac_scsi.c | 2 +
+ drivers/scsi/megaraid/megaraid_sas.h | 1 -
+ drivers/scsi/megaraid/megaraid_sas_base.c | 5 +-
+ drivers/scsi/pm8001/pm8001_ctl.c | 26 +-
+ drivers/scsi/pm8001/pm8001_hwi.c | 15 +-
+ drivers/scsi/qla1280.c | 2 +-
+ drivers/scsi/qla2xxx/qla_attr.c | 116 +-
+ drivers/scsi/qla2xxx/qla_bsg.c | 44 +
+ drivers/scsi/qla2xxx/qla_bsg.h | 13 +
+ drivers/scsi/qla2xxx/qla_dbg.c | 7 +-
+ drivers/scsi/qla2xxx/qla_def.h | 22 +-
+ drivers/scsi/qla2xxx/qla_gbl.h | 15 +-
+ drivers/scsi/qla2xxx/qla_init.c | 2 +
+ drivers/scsi/qla2xxx/qla_inline.h | 19 -
+ drivers/scsi/qla2xxx/qla_isr.c | 82 +-
+ drivers/scsi/qla2xxx/qla_mbx.c | 73 +-
+ drivers/scsi/qla2xxx/qla_mr.c | 39 +-
+ drivers/scsi/qla2xxx/qla_mr.h | 12 +-
+ drivers/scsi/qla2xxx/qla_nx.c | 22 +-
+ drivers/scsi/qla2xxx/qla_nx2.c | 33 +-
+ drivers/scsi/qla2xxx/qla_os.c | 368 +-
+ drivers/scsi/qla2xxx/qla_version.h | 2 +-
+ drivers/scsi/qla4xxx/ql4_bsg.c | 360 +
+ drivers/scsi/qla4xxx/ql4_bsg.h | 13 +
+ drivers/scsi/qla4xxx/ql4_def.h | 40 +
+ drivers/scsi/qla4xxx/ql4_fw.h | 140 +-
+ drivers/scsi/qla4xxx/ql4_glbl.h | 3 +
+ drivers/scsi/qla4xxx/ql4_isr.c | 51 +-
+ drivers/scsi/qla4xxx/ql4_mbx.c | 154 +-
+ drivers/scsi/qla4xxx/ql4_os.c | 2330 ++++--
+ drivers/scsi/qla4xxx/ql4_version.h | 2 +-
+ drivers/scsi/scsi.c | 9 +-
+ drivers/scsi/scsi_debug.c | 266 +-
+ drivers/scsi/scsi_error.c | 229 +-
+ drivers/scsi/scsi_pm.c | 62 +-
+ drivers/scsi/scsi_priv.h | 2 +
+ drivers/scsi/scsi_sysfs.c | 36 +-
+ drivers/scsi/scsi_transport_iscsi.c | 414 +-
+ drivers/scsi/sd.c | 28 +-
+ drivers/scsi/sr.c | 37 +-
+ drivers/scsi/st.c | 5 +-
+ include/scsi/iscsi_if.h | 230 +-
+ include/scsi/libiscsi.h | 1 +
+ include/scsi/scsi_cmnd.h | 1 +
+ include/scsi/scsi_driver.h | 2 +-
+ include/scsi/scsi_host.h | 10 +
+ include/scsi/scsi_transport_iscsi.h | 4 +
+ 84 files changed, 5245 insertions(+), 18086 deletions(-)
+ delete mode 100644 Documentation/scsi/aic7xxx_old.txt
+ delete mode 100644 drivers/scsi/aic7xxx_old.c
+ delete mode 100644 drivers/scsi/aic7xxx_old/aic7xxx.h
+ delete mode 100644 drivers/scsi/aic7xxx_old/aic7xxx.reg
+ delete mode 100644 drivers/scsi/aic7xxx_old/aic7xxx.seq
+ delete mode 100644 drivers/scsi/aic7xxx_old/aic7xxx_proc.c
+ delete mode 100644 drivers/scsi/aic7xxx_old/aic7xxx_reg.h
+ delete mode 100644 drivers/scsi/aic7xxx_old/aic7xxx_seq.c
+ delete mode 100644 drivers/scsi/aic7xxx_old/scsi_message.h
+ delete mode 100644 drivers/scsi/aic7xxx_old/sequencer.h
+Merging target-updates/for-next (d79dc4525ad5 target: Convert inquiry temporary buffer to heap memory)
+$ git merge target-updates/for-next
+Auto-merging drivers/target/target_core_iblock.c
+Merge made by the 'recursive' strategy.
+ drivers/target/loopback/tcm_loop.c | 8 +-
+ drivers/target/target_core_alua.c | 560 ++++++++++++++++++++++-----
+ drivers/target/target_core_alua.h | 15 +-
+ drivers/target/target_core_configfs.c | 182 ++++++++-
+ drivers/target/target_core_device.c | 19 +-
+ drivers/target/target_core_fabric_configfs.c | 2 +-
+ drivers/target/target_core_iblock.c | 2 +-
+ drivers/target/target_core_internal.h | 6 +-
+ drivers/target/target_core_pr.h | 5 +
+ drivers/target/target_core_sbc.c | 5 +-
+ drivers/target/target_core_spc.c | 87 ++++-
+ drivers/target/target_core_tpg.c | 10 +-
+ drivers/target/target_core_transport.c | 28 +-
+ drivers/target/target_core_ua.c | 1 -
+ drivers/target/target_core_xcopy.c | 4 -
+ drivers/target/tcm_fc/tfc_conf.c | 6 +-
+ include/scsi/scsi.h | 1 +
+ include/target/target_core_base.h | 30 +-
+ 18 files changed, 824 insertions(+), 147 deletions(-)
+Merging target-merge/for-next-merge (374b105797c3 Linux 3.13-rc3)
+$ git merge target-merge/for-next-merge
+Already up-to-date.
+Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corruption on NFS)
+$ git merge writeback/writeback-for-next
+Merge made by the 'recursive' strategy.
+ fs/fs-writeback.c | 15 +++++++++------
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries)
+$ git merge hwspinlock/linux-next
+Already up-to-date.
+Merging pinctrl/for-next (37ef1d924375 pinctrl: at91: replace clk_prepare + clk_enable by clk_prepare_enable)
+$ git merge pinctrl/for-next
+Resolved 'drivers/pinctrl/sh-pfc/pfc-r8a7740.c' using previous resolution.
+Resolved 'drivers/pinctrl/sh-pfc/pfc-sh7372.c' using previous resolution.
+Auto-merging drivers/pinctrl/sh-pfc/sh_pfc.h
+Auto-merging drivers/pinctrl/sh-pfc/pfc-sh7372.c
+CONFLICT (content): Merge conflict in drivers/pinctrl/sh-pfc/pfc-sh7372.c
+Auto-merging drivers/pinctrl/sh-pfc/pfc-r8a7740.c
+CONFLICT (content): Merge conflict in drivers/pinctrl/sh-pfc/pfc-r8a7740.c
+Auto-merging drivers/pinctrl/pinctrl-baytrail.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 5afc74682831] Merge remote-tracking branch 'pinctrl/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/pinctrl/fsl,imx25-pinctrl.txt | 23 +
+ .../bindings/pinctrl/nvidia,tegra124-pinmux.txt | 144 +
+ .../bindings/pinctrl/pinctrl-bindings.txt | 3 +
+ .../bindings/pinctrl/qcom,msm8974-pinctrl.txt | 92 +
+ .../bindings/pinctrl/renesas,pfc-pinctrl.txt | 14 +
+ drivers/pinctrl/Kconfig | 27 +
+ drivers/pinctrl/Makefile | 4 +
+ drivers/pinctrl/pinconf-generic.c | 4 +
+ drivers/pinctrl/pinconf.c | 22 +-
+ drivers/pinctrl/pinctrl-at91.c | 48 +-
+ drivers/pinctrl/pinctrl-baytrail.c | 30 +-
+ drivers/pinctrl/pinctrl-imx25.c | 351 +++
+ drivers/pinctrl/pinctrl-msm.c | 982 ++++++
+ drivers/pinctrl/pinctrl-msm.h | 122 +
+ drivers/pinctrl/pinctrl-msm8x74.c | 636 ++++
+ drivers/pinctrl/pinctrl-tegra124.c | 3137 ++++++++++++++++++++
+ drivers/pinctrl/sh-pfc/core.c | 76 +-
+ drivers/pinctrl/sh-pfc/core.h | 4 +-
+ drivers/pinctrl/sh-pfc/gpio.c | 24 +-
+ drivers/pinctrl/sh-pfc/pfc-r8a73a4.c | 15 +-
+ drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 13 +-
+ drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 748 ++++-
+ drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 21 +-
+ drivers/pinctrl/sh-pfc/pfc-sh7372.c | 13 +-
+ drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 64 +-
+ drivers/pinctrl/sh-pfc/sh_pfc.h | 7 +-
+ include/linux/pinctrl/pinconf-generic.h | 10 +-
+ 27 files changed, 6431 insertions(+), 203 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx25-pinctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/nvidia,tegra124-pinmux.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.txt
+ create mode 100644 drivers/pinctrl/pinctrl-imx25.c
+ create mode 100644 drivers/pinctrl/pinctrl-msm.c
+ create mode 100644 drivers/pinctrl/pinctrl-msm.h
+ create mode 100644 drivers/pinctrl/pinctrl-msm8x74.c
+ create mode 100644 drivers/pinctrl/pinctrl-tegra124.c
+Merging vhost/linux-next (d3d665a654a3 vhost-scsi: whitespace tweak)
+$ git merge vhost/linux-next
+Already up-to-date.
+Merging remoteproc/for-next (b9777859ec01 remoteproc: fix kconfig dependencies for VIRTIO)
+$ git merge remoteproc/for-next
+Already up-to-date.
+Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO)
+$ git merge rpmsg/for-next
+Already up-to-date.
+Merging gpio/for-next (e0f0edc67d07 Merge branch 'devel' into for-next)
+$ git merge gpio/for-next
+Removing include/linux/spi/74x164.h
+Auto-merging drivers/pinctrl/pinctrl-nomadik.c
+Auto-merging drivers/pinctrl/pinctrl-baytrail.c
+Auto-merging drivers/pinctrl/pinctrl-at91.c
+Auto-merging drivers/gpio/gpiolib.c
+Auto-merging drivers/gpio/Makefile
+Auto-merging drivers/gpio/Kconfig
+Removing arch/arm/mach-mv78xx0/include/mach/gpio.h
+Removing arch/arm/mach-lpc32xx/include/mach/gpio.h
+Removing arch/arm/mach-ks8695/include/mach/gpio.h
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/gpio/moxa,moxart-gpio.txt | 19 ++
+ .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 3 +-
+ Documentation/gpio/board.txt | 28 ++-
+ Documentation/gpio/consumer.txt | 6 +-
+ arch/arm/mach-ks8695/include/mach/gpio.h | 19 --
+ arch/arm/mach-lpc32xx/include/mach/gpio.h | 6 -
+ arch/arm/mach-lpc32xx/phy3250.c | 2 +-
+ arch/arm/mach-mv78xx0/include/mach/gpio.h | 9 -
+ arch/arm/mach-tegra/board-paz00.c | 11 +
+ drivers/gpio/Kconfig | 23 +-
+ drivers/gpio/Makefile | 2 +
+ drivers/gpio/gpio-74x164.c | 59 ++---
+ drivers/gpio/gpio-adnp.c | 25 ++-
+ drivers/gpio/gpio-adp5520.c | 2 +-
+ drivers/gpio/gpio-adp5588.c | 2 +-
+ drivers/gpio/gpio-amd8111.c | 2 +-
+ drivers/gpio/gpio-arizona.c | 2 +-
+ drivers/gpio/gpio-bcm-kona.c | 22 ++
+ drivers/gpio/gpio-bt8xx.c | 4 +-
+ drivers/gpio/gpio-da9052.c | 2 +-
+ drivers/gpio/gpio-da9055.c | 2 +-
+ drivers/gpio/gpio-em.c | 28 ++-
+ drivers/gpio/gpio-ich.c | 2 +-
+ drivers/gpio/gpio-intel-mid.c | 30 ++-
+ drivers/gpio/gpio-kempld.c | 2 +-
+ drivers/gpio/gpio-ks8695.c | 2 +-
+ drivers/gpio/gpio-lpc32xx.c | 14 +-
+ drivers/gpio/gpio-lynxpoint.c | 39 +++-
+ drivers/gpio/gpio-max730x.c | 2 +-
+ drivers/gpio/gpio-max732x.c | 2 +-
+ drivers/gpio/gpio-mc33880.c | 2 +-
+ drivers/gpio/gpio-mc9s08dz60.c | 2 +-
+ drivers/gpio/gpio-mcp23s08.c | 2 +-
+ drivers/gpio/gpio-ml-ioh.c | 4 +-
+ drivers/gpio/gpio-moxart.c | 158 +++++++++++++
+ drivers/gpio/gpio-msic.c | 9 +-
+ drivers/gpio/gpio-msm-v2.c | 3 +-
+ drivers/gpio/gpio-mvebu.c | 2 +-
+ drivers/gpio/gpio-octeon.c | 2 +-
+ drivers/gpio/gpio-omap.c | 188 ++++++++--------
+ drivers/gpio/gpio-palmas.c | 2 +-
+ drivers/gpio/gpio-pca953x.c | 2 +-
+ drivers/gpio/gpio-pcf857x.c | 2 +-
+ drivers/gpio/gpio-pch.c | 4 +-
+ drivers/gpio/gpio-rc5t583.c | 2 +-
+ drivers/gpio/gpio-rcar.c | 61 +++--
+ drivers/gpio/gpio-sodaville.c | 2 +-
+ drivers/gpio/gpio-sta2x11.c | 2 +-
+ drivers/gpio/gpio-stmpe.c | 2 +-
+ drivers/gpio/gpio-sx150x.c | 2 +-
+ drivers/gpio/gpio-tb10x.c | 2 +-
+ drivers/gpio/gpio-tc3589x.c | 2 +-
+ drivers/gpio/gpio-tegra.c | 7 +-
+ drivers/gpio/gpio-timberdale.c | 6 +-
+ drivers/gpio/gpio-tnetv107x.c | 2 +-
+ drivers/gpio/gpio-tps6586x.c | 2 +-
+ drivers/gpio/gpio-tps65910.c | 2 +-
+ drivers/gpio/gpio-tps65912.c | 2 +-
+ drivers/gpio/gpio-twl4030.c | 2 +-
+ drivers/gpio/gpio-twl6040.c | 2 +-
+ drivers/gpio/gpio-ucb1400.c | 2 +-
+ drivers/gpio/gpio-viperboard.c | 4 +-
+ drivers/gpio/gpio-vx855.c | 2 +-
+ drivers/gpio/gpio-wm831x.c | 2 +-
+ drivers/gpio/gpio-wm8350.c | 2 +-
+ drivers/gpio/gpio-wm8994.c | 2 +-
+ drivers/gpio/gpio-xtensa.c | 163 ++++++++++++++
+ drivers/gpio/gpiolib-acpi.c | 2 +-
+ drivers/gpio/gpiolib.c | 246 +++++++++++----------
+ drivers/pinctrl/pinctrl-as3722.c | 2 +-
+ drivers/pinctrl/pinctrl-at91.c | 2 +-
+ drivers/pinctrl/pinctrl-baytrail.c | 2 +-
+ drivers/pinctrl/pinctrl-bcm2835.c | 2 +-
+ drivers/pinctrl/pinctrl-nomadik.c | 2 +-
+ drivers/pinctrl/pinctrl-sunxi.c | 2 +-
+ drivers/pinctrl/vt8500/pinctrl-wmt.c | 2 +-
+ include/linux/gpio.h | 1 -
+ include/linux/gpio/driver.h | 56 ++---
+ .../linux/platform_data}/gpio-lpc32xx.h | 0
+ include/linux/spi/74x164.h | 9 -
+ 80 files changed, 919 insertions(+), 439 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/gpio/moxa,moxart-gpio.txt
+ delete mode 100644 arch/arm/mach-ks8695/include/mach/gpio.h
+ delete mode 100644 arch/arm/mach-lpc32xx/include/mach/gpio.h
+ delete mode 100644 arch/arm/mach-mv78xx0/include/mach/gpio.h
+ create mode 100644 drivers/gpio/gpio-moxart.c
+ create mode 100644 drivers/gpio/gpio-xtensa.c
+ rename {arch/arm/mach-lpc32xx/include/mach => include/linux/platform_data}/gpio-lpc32xx.h (100%)
+ delete mode 100644 include/linux/spi/74x164.h
+Merging dma-mapping/dma-mapping-next (5e01dc7b26d9 Linux 3.12)
+$ git merge dma-mapping/dma-mapping-next
+Already up-to-date.
+Merging pwm/for-next (3f958fe7d3e3 of: Add Atmel PWM controller device tree binding)
+$ git merge pwm/for-next
+Auto-merging drivers/pwm/Makefile
+Auto-merging drivers/pwm/Kconfig
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/pwm/atmel-pwm.txt | 33 ++
+ Documentation/devicetree/bindings/pwm/pxa-pwm.txt | 30 ++
+ drivers/pwm/Kconfig | 14 +-
+ drivers/pwm/Makefile | 1 +
+ drivers/pwm/pwm-atmel.c | 393 +++++++++++++++++++++
+ drivers/pwm/pwm-jz4740.c | 20 +-
+ drivers/pwm/pwm-pxa.c | 53 +++
+ drivers/pwm/sysfs.c | 12 +-
+ drivers/video/backlight/pwm_bl.c | 1 -
+ 9 files changed, 527 insertions(+), 30 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pwm/atmel-pwm.txt
+ create mode 100644 Documentation/devicetree/bindings/pwm/pxa-pwm.txt
+ create mode 100644 drivers/pwm/pwm-atmel.c
+Merging dma-buf/for-next (17b2112f332d Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc)
+$ git merge dma-buf/for-next
+Already up-to-date.
+Merging userns/for-next (41301ae78a99 vfs: Fix a regression in mounting proc)
+$ git merge userns/for-next
+Auto-merging kernel/fork.c
+Auto-merging fs/namespace.c
+Auto-merging fs/dcache.c
+Merge made by the 'recursive' strategy.
+ fs/dcache.c | 7 ++++++-
+ fs/namespace.c | 2 +-
+ kernel/fork.c | 2 +-
+ 3 files changed, 8 insertions(+), 3 deletions(-)
+Merging ktest/for-next (298a0d1d5750 ktest: Add documentation of CLOSE_CONSOLE_SIGNAL)
+$ git merge ktest/for-next
+Auto-merging tools/testing/ktest/ktest.pl
+Merge made by the 'recursive' strategy.
+ tools/testing/ktest/ktest.pl | 5 ++++-
+ tools/testing/ktest/sample.conf | 7 +++++++
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
+$ git merge signal/for-next
+Already up-to-date.
+Merging clk/clk-next (1459c837036a clk: si570: Add a driver for SI570 oscillators)
+$ git merge clk/clk-next
+Auto-merging drivers/clk/Makefile
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../bindings/clock/fixed-factor-clock.txt | 4 +-
+ .../devicetree/bindings/clock/silabs,si570.txt | 39 ++
+ MAINTAINERS | 8 +
+ drivers/clk/Kconfig | 10 +
+ drivers/clk/Makefile | 1 +
+ drivers/clk/clk-composite.c | 28 ++
+ drivers/clk/clk-si570.c | 531 +++++++++++++++++++++
+ drivers/clk/clk.c | 6 +-
+ drivers/clk/samsung/clk-exynos5420.c | 4 +-
+ drivers/clk/socfpga/clk.c | 4 +-
+ drivers/clk/sunxi/clk-factors.c | 4 +-
+ drivers/clk/sunxi/clk-sunxi.c | 58 ++-
+ 12 files changed, 673 insertions(+), 24 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/silabs,si570.txt
+ create mode 100644 drivers/clk/clk-si570.c
+Merging random/dev (a9f069e38cc3 random: use the architectural HWRNG for the SHA's IV in extract_buf())
+$ git merge random/dev
+Merge made by the 'recursive' strategy.
+ drivers/char/random.c | 192 ++++++++++++++++++++++----------------------------
+ 1 file changed, 84 insertions(+), 108 deletions(-)
+Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access)
+$ git merge lzo-update/lzo-update
+Merge made by the 'recursive' strategy.
+ lib/lzo/lzo1x_decompress_safe.c | 4 ++++
+ lib/lzo/lzodefs.h | 6 ++++++
+ 2 files changed, 10 insertions(+)
+Merging arm64-hugepages/for-next/hugepages (af07484863e0 ARM64: mm: THP support.)
+$ git merge arm64-hugepages/for-next/hugepages
+Already up-to-date.
+Merging aio/master (374b105797c3 Linux 3.13-rc3)
+$ git merge aio/master
+Already up-to-date.
+Merging akpm-current/current (3d655d441006 ipc,sem: correct header comment for perform_atomic_semop)
+$ git merge --no-ff akpm-current/current
+Auto-merging mm/rmap.c
+Auto-merging mm/page_alloc.c
+Auto-merging mm/mprotect.c
+Auto-merging mm/migrate.c
+Auto-merging mm/memory-failure.c
+Auto-merging mm/memcontrol.c
+Auto-merging mm/compaction.c
+Auto-merging lib/Makefile
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/sched/fair.c
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/fork.c
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/migrate.h
+Auto-merging include/linux/blkdev.h
+Removing include/asm-generic/int-l64.h
+Removing fs/ocfs2/ver.h
+Removing fs/ocfs2/ver.c
+Removing fs/ocfs2/dlmfs/dlmfsver.h
+Removing fs/ocfs2/dlmfs/dlmfsver.c
+Removing fs/ocfs2/dlm/dlmver.h
+Removing fs/ocfs2/dlm/dlmver.c
+Removing fs/ocfs2/cluster/ver.h
+Removing fs/ocfs2/cluster/ver.c
+Removing fs/coredump.h
+Auto-merging drivers/misc/ti-st/st_core.c
+Auto-merging drivers/input/input.c
+Auto-merging drivers/gpu/drm/nouveau/nouveau_acpi.c
+Auto-merging drivers/gpu/drm/drm_fb_helper.c
+Auto-merging drivers/firmware/Kconfig
+Auto-merging drivers/block/loop.c
+Auto-merging block/blk-mq.c
+Auto-merging arch/x86/mm/init_32.c
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/ia64/Kconfig
+Auto-merging MAINTAINERS
+Removing Documentation/vm/locking
+Auto-merging Documentation/kernel-parameters.txt
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Merge made by the 'recursive' strategy.
+ Documentation/blockdev/ramdisk.txt | 21 +-
+ Documentation/cgroups/resource_counter.txt | 2 +-
+ .../devicetree/bindings/rtc/haoyu,hym8563.txt | 27 +
+ .../devicetree/bindings/rtc/maxim,ds1742.txt | 12 +
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ Documentation/dynamic-debug-howto.txt | 9 +
+ Documentation/filesystems/proc.txt | 9 +
+ Documentation/filesystems/sysfs.txt | 6 +-
+ Documentation/kernel-parameters.txt | 4 +-
+ Documentation/leds/leds-class.txt | 3 -
+ Documentation/printk-formats.txt | 11 +-
+ Documentation/sysctl/vm.txt | 12 +
+ Documentation/video4linux/si476x.txt | 2 +-
+ Documentation/vm/locking | 130 -----
+ Documentation/vm/overcommit-accounting | 7 +-
+ MAINTAINERS | 6 +
+ arch/arm/include/asm/fixmap.h | 29 +-
+ arch/arm/mm/init.c | 11 +-
+ arch/arm/mm/mm.h | 2 -
+ arch/hexagon/include/asm/fixmap.h | 40 +-
+ arch/ia64/Kconfig | 1 +
+ arch/ia64/include/asm/dmi.h | 8 +-
+ arch/ia64/include/asm/processor.h | 1 +
+ arch/ia64/mm/contig.c | 68 ---
+ arch/ia64/mm/discontig.c | 63 ---
+ arch/ia64/mm/init.c | 48 ++
+ arch/metag/include/asm/fixmap.h | 32 +-
+ arch/metag/mm/init.c | 3 +-
+ arch/metag/mm/numa.c | 3 +-
+ arch/microblaze/include/asm/fixmap.h | 44 +-
+ arch/microblaze/mm/init.c | 3 +-
+ arch/mips/include/asm/fixmap.h | 33 +-
+ arch/parisc/mm/init.c | 62 +--
+ arch/powerpc/include/asm/fixmap.h | 44 +-
+ arch/powerpc/mm/mem.c | 2 +-
+ arch/powerpc/mm/numa.c | 8 +-
+ arch/score/lib/checksum.S | 2 +-
+ arch/sh/include/asm/fixmap.h | 39 +-
+ arch/sh/kernel/dwarf.c | 18 +-
+ arch/sh/kernel/setup.c | 4 +-
+ arch/sh/kernel/sh_ksyms_32.c | 5 +
+ arch/sparc/mm/init_64.c | 5 +-
+ arch/tile/include/asm/fixmap.h | 33 +-
+ arch/um/include/asm/fixmap.h | 40 +-
+ arch/unicore32/mm/init.c | 3 -
+ arch/x86/Kconfig | 1 +
+ arch/x86/include/asm/dmi.h | 6 +-
+ arch/x86/include/asm/fixmap.h | 59 +-
+ arch/x86/mm/init_32.c | 2 +-
+ arch/x86/mm/init_64.c | 2 +-
+ arch/x86/mm/numa.c | 63 ++-
+ arch/x86/mm/srat.c | 21 +-
+ block/blk-mq-cpu.c | 37 +-
+ block/blk-mq.c | 68 +--
+ block/blk-mq.h | 1 -
+ block/cmdline-parser.c | 18 +-
+ block/genhd.c | 2 +-
+ drivers/block/Kconfig | 3 +-
+ drivers/block/cciss.c | 4 +-
+ drivers/block/loop.c | 2 +-
+ drivers/block/paride/pg.c | 2 +-
+ drivers/block/sx8.c | 16 +-
+ drivers/firmware/Kconfig | 3 +
+ drivers/firmware/dmi_scan.c | 20 +-
+ drivers/gpu/drm/cirrus/cirrus_mode.c | 4 +-
+ drivers/gpu/drm/drm_fb_helper.c | 8 +
+ drivers/gpu/drm/nouveau/nouveau_acpi.c | 6 +
+ drivers/input/Kconfig | 9 +
+ drivers/input/Makefile | 3 +
+ drivers/input/input.c | 6 +
+ drivers/input/leds.c | 249 +++++++++
+ drivers/leds/Kconfig | 3 -
+ drivers/mailbox/omap-mbox.h | 2 +-
+ drivers/memstick/host/rtsx_pci_ms.c | 30 +-
+ drivers/misc/ti-st/st_core.c | 2 +-
+ drivers/net/irda/donauboe.c | 15 +-
+ drivers/pps/pps.c | 57 +-
+ drivers/rtc/Kconfig | 13 +-
+ drivers/rtc/Makefile | 1 +
+ drivers/rtc/rtc-as3722.c | 19 +-
+ drivers/rtc/rtc-cmos.c | 2 +-
+ drivers/rtc/rtc-ds1305.c | 1 -
+ drivers/rtc/rtc-ds1742.c | 10 +-
+ drivers/rtc/rtc-hym8563.c | 601 +++++++++++++++++++++
+ drivers/rtc/rtc-mxc.c | 10 +-
+ drivers/rtc/rtc-pcf2127.c | 5 +-
+ drivers/rtc/rtc-twl.c | 38 +-
+ drivers/rtc/rtc-vr41xx.c | 50 +-
+ drivers/scsi/megaraid/megaraid_mm.c | 2 +
+ drivers/tty/Kconfig | 4 +
+ drivers/tty/vt/keyboard.c | 110 +++-
+ drivers/video/backlight/backlight.c | 2 -
+ drivers/video/backlight/hp680_bl.c | 6 +-
+ drivers/video/backlight/jornada720_bl.c | 15 +-
+ drivers/video/backlight/jornada720_lcd.c | 13 +-
+ drivers/video/backlight/l4f00242t03.c | 6 +-
+ drivers/video/backlight/omap1_bl.c | 14 +-
+ drivers/video/backlight/ot200_bl.c | 9 +-
+ drivers/video/backlight/tosa_bl.c | 7 +-
+ drivers/video/backlight/tosa_lcd.c | 6 +-
+ drivers/video/mmp/core.c | 9 +-
+ drivers/w1/masters/w1-gpio.c | 22 +
+ drivers/w1/w1_int.c | 12 -
+ fs/afs/proc.c | 4 +-
+ fs/autofs4/autofs_i.h | 4 +-
+ fs/autofs4/dev-ioctl.c | 16 +-
+ fs/autofs4/inode.c | 49 +-
+ fs/autofs4/root.c | 6 +-
+ fs/autofs4/waitq.c | 16 +-
+ fs/binfmt_elf.c | 21 +-
+ fs/compat_ioctl.c | 3 +-
+ fs/coredump.c | 1 -
+ fs/coredump.h | 6 -
+ fs/exec.c | 117 +---
+ fs/ext3/dir.c | 44 +-
+ fs/ext4/block_validity.c | 33 +-
+ fs/ext4/dir.c | 35 +-
+ fs/fat/cache.c | 25 +-
+ fs/fat/fat.h | 3 +-
+ fs/fat/file.c | 91 +++-
+ fs/fat/inode.c | 35 +-
+ fs/jffs2/nodelist.c | 28 +-
+ fs/jffs2/readinode.c | 26 +-
+ fs/logfs/segment.c | 3 +-
+ fs/notify/dnotify/dnotify.c | 34 +-
+ fs/notify/fanotify/fanotify.c | 219 ++++----
+ fs/notify/fanotify/fanotify.h | 23 +
+ fs/notify/fanotify/fanotify_user.c | 41 +-
+ fs/notify/fsnotify.c | 42 +-
+ fs/notify/group.c | 1 +
+ fs/notify/inotify/inotify.h | 21 +-
+ fs/notify/inotify/inotify_fsnotify.c | 149 ++---
+ fs/notify/inotify/inotify_user.c | 119 ++--
+ fs/notify/notification.c | 334 +-----------
+ fs/ocfs2/Makefile | 1 -
+ fs/ocfs2/alloc.c | 50 +-
+ fs/ocfs2/cluster/Makefile | 2 +-
+ fs/ocfs2/cluster/nodemanager.c | 4 +-
+ fs/ocfs2/cluster/tcp.c | 13 +-
+ fs/ocfs2/cluster/ver.c | 42 --
+ fs/ocfs2/cluster/ver.h | 31 --
+ fs/ocfs2/dlm/Makefile | 2 +-
+ fs/ocfs2/dlm/dlmdomain.c | 5 +-
+ fs/ocfs2/dlm/dlmver.c | 42 --
+ fs/ocfs2/dlm/dlmver.h | 31 --
+ fs/ocfs2/dlmfs/Makefile | 2 +-
+ fs/ocfs2/dlmfs/dlmfs.c | 4 +-
+ fs/ocfs2/dlmfs/dlmfsver.c | 42 --
+ fs/ocfs2/dlmfs/dlmfsver.h | 31 --
+ fs/ocfs2/dlmglue.c | 4 +-
+ fs/ocfs2/file.c | 63 ++-
+ fs/ocfs2/ioctl.c | 7 +
+ fs/ocfs2/localalloc.c | 40 ++
+ fs/ocfs2/localalloc.h | 6 +
+ fs/ocfs2/move_extents.c | 77 ---
+ fs/ocfs2/namei.c | 109 +++-
+ fs/ocfs2/ocfs2.h | 1 +
+ fs/ocfs2/stack_o2cb.c | 3 +-
+ fs/ocfs2/stack_user.c | 312 +++++++++--
+ fs/ocfs2/stackglue.c | 16 +-
+ fs/ocfs2/stackglue.h | 15 +-
+ fs/ocfs2/suballoc.c | 12 +-
+ fs/ocfs2/suballoc.h | 12 +
+ fs/ocfs2/super.c | 12 +-
+ fs/ocfs2/ver.c | 43 --
+ fs/ocfs2/ver.h | 31 --
+ fs/pipe.c | 3 +-
+ fs/posix_acl.c | 84 ++-
+ fs/proc/array.c | 18 +-
+ fs/proc/base.c | 69 +--
+ fs/proc/generic.c | 3 +-
+ fs/proc/meminfo.c | 37 ++
+ fs/proc/proc_devtree.c | 4 +-
+ fs/ramfs/file-mmu.c | 7 -
+ fs/ramfs/file-nommu.c | 17 +-
+ fs/ramfs/inode.c | 7 +
+ fs/ramfs/internal.h | 1 -
+ fs/romfs/super.c | 6 +-
+ fs/ubifs/debug.c | 22 +-
+ fs/ubifs/log.c | 21 +-
+ fs/ubifs/orphan.c | 21 +-
+ fs/ubifs/recovery.c | 21 +-
+ fs/ubifs/super.c | 24 +-
+ fs/ubifs/tnc.c | 22 +-
+ include/asm-generic/fixmap.h | 97 ++++
+ include/asm-generic/int-l64.h | 49 --
+ include/linux/blkdev.h | 5 +-
+ include/linux/cache.h | 4 +-
+ include/linux/cmdline-parser.h | 8 +-
+ include/linux/compaction.h | 16 +
+ include/linux/crc64_ecma.h | 56 ++
+ include/linux/fsnotify_backend.h | 118 +---
+ include/linux/huge_mm.h | 23 +
+ include/linux/hugetlb.h | 7 +-
+ include/linux/init_task.h | 2 +
+ include/linux/input.h | 21 +
+ include/linux/ksm.h | 15 +-
+ include/linux/kthread.h | 1 +
+ include/linux/memblock.h | 45 +-
+ include/linux/mempolicy.h | 32 --
+ include/linux/migrate.h | 6 -
+ include/linux/mm.h | 51 +-
+ include/linux/mman.h | 1 +
+ include/linux/mmzone.h | 11 +-
+ include/linux/page-flags.h | 4 +-
+ include/linux/parser.h | 1 +
+ include/linux/posix_acl.h | 78 +--
+ include/linux/printk.h | 19 +-
+ include/linux/ramfs.h | 7 -
+ include/linux/rmap.h | 27 +-
+ include/linux/sched.h | 42 +-
+ include/linux/smp.h | 6 +-
+ include/linux/w1-gpio.h | 1 +
+ include/trace/events/compaction.h | 42 ++
+ include/trace/events/migrate.h | 26 +
+ include/trace/events/sched.h | 87 +++
+ include/uapi/asm-generic/types.h | 3 +-
+ init/main.c | 6 +-
+ ipc/sem.c | 24 +-
+ kernel/audit_tree.c | 20 +-
+ kernel/audit_watch.c | 24 +-
+ kernel/exit.c | 1 +
+ kernel/fork.c | 17 +-
+ kernel/futex.c | 5 +
+ kernel/kmod.c | 11 +-
+ kernel/kthread.c | 9 +
+ kernel/sched/core.c | 2 +
+ kernel/sched/fair.c | 6 +-
+ kernel/signal.c | 7 +-
+ kernel/smp.c | 51 +-
+ kernel/sys.c | 8 +-
+ kernel/sysctl.c | 11 +-
+ kernel/time/sched_clock.c | 4 +
+ kernel/time/timekeeping.c | 3 +-
+ kernel/watchdog.c | 10 +-
+ lib/Kconfig | 7 +
+ lib/Kconfig.debug | 27 +
+ lib/Makefile | 3 +
+ lib/cmdline.c | 14 +-
+ lib/crc64_ecma.c | 341 ++++++++++++
+ lib/decompress_unlz4.c | 1 +
+ lib/dma-debug.c | 7 +
+ lib/dynamic_debug.c | 15 +-
+ lib/kstrtox.c | 1 -
+ lib/parser.c | 62 ++-
+ lib/rbtree_test.c | 13 +-
+ lib/show_mem.c | 6 +-
+ lib/test_module.c | 33 ++
+ lib/test_user_copy.c | 110 ++++
+ lib/vsprintf.c | 33 +-
+ mm/compaction.c | 61 ++-
+ mm/hugetlb.c | 36 +-
+ mm/hwpoison-inject.c | 2 +-
+ mm/internal.h | 3 +-
+ mm/ksm.c | 116 +---
+ mm/memblock.c | 128 ++++-
+ mm/memcontrol.c | 37 +-
+ mm/memory-failure.c | 10 +-
+ mm/memory.c | 11 +-
+ mm/memory_hotplug.c | 1 +
+ mm/migrate.c | 89 +--
+ mm/mlock.c | 18 +-
+ mm/mmap.c | 70 ++-
+ mm/mprotect.c | 3 +-
+ mm/nommu.c | 1 +
+ mm/oom_kill.c | 51 +-
+ mm/page_alloc.c | 67 ++-
+ mm/rmap.c | 570 +++++++++----------
+ mm/swap.c | 278 +++++-----
+ mm/swap_state.c | 63 ++-
+ mm/swapfile.c | 20 +-
+ mm/util.c | 12 +-
+ mm/vmalloc.c | 20 +-
+ mm/zswap.c | 4 +-
+ net/netfilter/ipset/ip_set_hash_netiface.c | 27 +-
+ scripts/checkpatch.pl | 54 +-
+ scripts/get_maintainer.pl | 91 +++-
+ tools/testing/selftests/Makefile | 1 +
+ tools/testing/selftests/user/Makefile | 13 +
+ 279 files changed, 5247 insertions(+), 4041 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/rtc/haoyu,hym8563.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/maxim,ds1742.txt
+ delete mode 100644 Documentation/vm/locking
+ create mode 100644 drivers/input/leds.c
+ create mode 100644 drivers/rtc/rtc-hym8563.c
+ delete mode 100644 fs/coredump.h
+ create mode 100644 fs/notify/fanotify/fanotify.h
+ delete mode 100644 fs/ocfs2/cluster/ver.c
+ delete mode 100644 fs/ocfs2/cluster/ver.h
+ delete mode 100644 fs/ocfs2/dlm/dlmver.c
+ delete mode 100644 fs/ocfs2/dlm/dlmver.h
+ delete mode 100644 fs/ocfs2/dlmfs/dlmfsver.c
+ delete mode 100644 fs/ocfs2/dlmfs/dlmfsver.h
+ delete mode 100644 fs/ocfs2/ver.c
+ delete mode 100644 fs/ocfs2/ver.h
+ create mode 100644 include/asm-generic/fixmap.h
+ delete mode 100644 include/asm-generic/int-l64.h
+ create mode 100644 include/linux/crc64_ecma.h
+ create mode 100644 lib/crc64_ecma.c
+ create mode 100644 lib/test_module.c
+ create mode 100644 lib/test_user_copy.c
+ create mode 100644 tools/testing/selftests/user/Makefile
+$ git am -3 ../patches/0001-memblock-make-memblock_set_node-support-different-me.patch
+Applying: memblock-make-memblock_set_node-support-different-memblock_type-fix
+$ git reset HEAD^
+Unstaged changes after reset:
+M arch/powerpc/mm/mem.c
+$ git add -A .
+$ git commit -v -a --amend
+[master d78d0444d3c0] Merge branch 'akpm-current/current'
+$ git am -3 ../patches/rtc__hym8563__include_clkout_code_only_if_COMMON_CLK_active.patch
+Applying: rtc: hym8563: include clkout code only if COMMON_CLK active
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/rtc/rtc-hym8563.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 92a0858bf38f] Merge branch 'akpm-current/current'
+$ git clone -s -l -n -q . ../rebase-tmp
+$ cd ../rebase-tmp
+$ git checkout -b akpm remotes/origin/akpm/master
+Switched to a new branch 'akpm'
+$ git rebase --onto master remotes/origin/akpm/master-base
+First, rewinding head to replay your work on top of it...
+Applying: kernel/kexec.c: use vscnprintf() instead of vsnprintf() in vmcoreinfo_append_str()
+Applying: softirq: use ffs() in __do_softirq()
+Applying: softirq: convert printks to pr_<level>
+Applying: softirq: use const char * const for softirq_to_name, whitespace neatening
+Applying: mm/migrate.c: fix set cpupid on page migration twice against thp
+Applying: mm/migrate.c: fix setting of cpupid on page migration twice against normal page
+Applying: zsmalloc: move it under mm
+Applying: zram: promote zram from staging
+Applying: mm: add strictlimit knob
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + 1848a435fe1c...f803d17b263f akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (f803d17b263f mm: add strictlimit knob)
+$ git merge --no-ff akpm/master
+Auto-merging mm/zsmalloc.c
+Removing drivers/staging/zsmalloc/Makefile
+Removing drivers/staging/zsmalloc/Kconfig
+Auto-merging drivers/block/zram/zram_drv.h
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-class-bdi | 8 +++
+ .../zram => Documentation/blockdev}/zram.txt | 0
+ drivers/block/Kconfig | 2 +
+ drivers/block/Makefile | 1 +
+ drivers/{staging => block}/zram/Kconfig | 0
+ drivers/{staging => block}/zram/Makefile | 0
+ drivers/{staging => block}/zram/zram_drv.c | 0
+ drivers/{staging => block}/zram/zram_drv.h | 3 +-
+ drivers/staging/Kconfig | 4 --
+ drivers/staging/Makefile | 2 -
+ drivers/staging/zsmalloc/Kconfig | 24 -------
+ drivers/staging/zsmalloc/Makefile | 3 -
+ include/linux/interrupt.h | 2 +-
+ .../staging/zsmalloc => include/linux}/zsmalloc.h | 0
+ kernel/kexec.c | 2 +-
+ kernel/softirq.c | 73 ++++++++++------------
+ mm/Kconfig | 25 ++++++++
+ mm/Makefile | 1 +
+ mm/backing-dev.c | 35 +++++++++++
+ mm/migrate.c | 4 --
+ .../zsmalloc/zsmalloc-main.c => mm/zsmalloc.c | 3 +-
+ 21 files changed, 110 insertions(+), 82 deletions(-)
+ rename {drivers/staging/zram => Documentation/blockdev}/zram.txt (100%)
+ rename drivers/{staging => block}/zram/Kconfig (100%)
+ rename drivers/{staging => block}/zram/Makefile (100%)
+ rename drivers/{staging => block}/zram/zram_drv.c (100%)
+ rename drivers/{staging => block}/zram/zram_drv.h (98%)
+ delete mode 100644 drivers/staging/zsmalloc/Kconfig
+ delete mode 100644 drivers/staging/zsmalloc/Makefile
+ rename {drivers/staging/zsmalloc => include/linux}/zsmalloc.h (100%)
+ rename drivers/staging/zsmalloc/zsmalloc-main.c => mm/zsmalloc.c (99%)
projects / karo-tx-linux.git / commitdiff