$ date Friday 1 August 08:40:53 EST 2014 $ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at 26bcd8b72563 Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux Merging origin/master (7c909b09372d Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mike.turquette/linux) $ git merge origin/master Updating 26bcd8b72563..7c909b09372d Fast-forward .mailmap | 5 +++++ CREDITS | 7 ++++--- MAINTAINERS | 2 +- crypto/af_alg.c | 2 ++ drivers/clk/ti/clk-7xx.c | 7 ++++++- drivers/rapidio/devices/tsi721_dma.c | 8 +++++++- drivers/scsi/scsi_lib.c | 8 ++++++++ include/linux/hugetlb.h | 1 + kernel/kexec.c | 4 ++++ kernel/rcu/rcutorture.c | 4 ++-- mm/filemap.c | 13 ++++++++----- mm/hugetlb.c | 2 +- mm/memcontrol.c | 4 ++++ mm/memory-failure.c | 14 +++++++++++--- mm/memory.c | 21 ++++++++++++--------- mm/page-writeback.c | 6 +++--- mm/page_alloc.c | 16 ++++++++-------- 17 files changed, 87 insertions(+), 37 deletions(-) Merging fixes/master (1795cd9b3a91 Linux 3.16-rc5) $ git merge fixes/master Already up-to-date. Merging kbuild-current/rc-fixes (dd5a6752ae7d firmware: Create directories for external firmware) $ git merge kbuild-current/rc-fixes Already up-to-date. Merging arc-current/for-curr (89ca3b881987 Linux 3.15-rc4) $ git merge arc-current/for-curr Already up-to-date. Merging arm-current/fixes (a5ab9a0e748f ARM: idmap: add identity mapping usage node) $ git merge arm-current/fixes Auto-merging arch/arm/Kconfig Merge made by the 'recursive' strategy. arch/arm/Kconfig | 4 ++-- arch/arm/kernel/iwmmxt.S | 23 ++++++++++++----------- arch/arm/mm/dma-mapping.c | 11 ++++++++++- arch/arm/mm/idmap.c | 12 ++++++++++++ arch/arm/mm/mmu.c | 6 +++--- 5 files changed, 39 insertions(+), 17 deletions(-) Merging m68k-current/for-linus (5bc8c7cdeb6e m68k: Export mach_random_get_entropy to modules) $ git merge m68k-current/for-linus Already up-to-date. Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX) $ git merge metag-fixes/fixes Already up-to-date. Merging mips-fixes/mips-fixes (08a9c3c9afcf MIPS: OCTEON: make get_system_type() thread-safe) $ git merge mips-fixes/mips-fixes Merge made by the 'recursive' strategy. arch/mips/cavium-octeon/setup.c | 18 ++++++--- arch/mips/include/asm/eva.h | 43 ++++++++++++++++++++++ .../include/asm/mach-malta/kernel-entry-init.h | 22 ++++++++--- arch/mips/include/asm/syscall.h | 8 ++-- arch/mips/kernel/cps-vec.S | 4 ++ arch/mips/kernel/ptrace.c | 3 +- arch/mips/kernel/scall64-o32.S | 12 ++++-- arch/mips/math-emu/cp1emu.c | 2 +- 8 files changed, 92 insertions(+), 20 deletions(-) create mode 100644 arch/mips/include/asm/eva.h Merging powerpc-merge/merge (396a34340cdf powerpc: Fix endianness of flash_block_list in rtas_flash) $ git merge powerpc-merge/merge Already up-to-date. Merging sparc/master (31dab719fa50 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) $ git merge sparc/master Already up-to-date. Merging net/master (47fab41ab51a bridge: Don't include NDA_VLAN for FDB entries with vid 0) $ git merge net/master Merge made by the 'recursive' strategy. drivers/net/bonding/bond_sysfs_slave.c | 4 ++-- drivers/net/ethernet/brocade/bna/bnad.c | 2 +- drivers/net/ethernet/brocade/bna/bnad_ethtool.c | 6 ++--- include/net/ip_tunnels.h | 1 + net/bridge/br_fdb.c | 2 +- net/ipv4/ip_tunnel.c | 29 +++++++++++++++---------- net/ipv4/tcp_vegas.c | 3 ++- net/ipv4/tcp_veno.c | 2 +- 8 files changed, 28 insertions(+), 21 deletions(-) Merging ipsec/master (a0e5ef53aac8 xfrm: Fix installation of AH IPsec SAs) $ git merge ipsec/master Already up-to-date. Merging sound-current/for-linus (7440850c20b6 ALSA: hda - fix an external mic jack problem on a HP machine) $ git merge sound-current/for-linus Merge made by the 'recursive' strategy. sound/pci/hda/patch_sigmatel.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) Merging pci-current/for-linus (bf177a1eb6d1 MAINTAINERS: Update mx6 PCI driver maintainer's email) $ git merge pci-current/for-linus Already up-to-date. Merging wireless/master (c01fac1c77a0 ath9k: fix aggregation session lockup) $ git merge wireless/master Already up-to-date. Merging driver-core.current/driver-core-linus (9a3c4145af32 Linux 3.16-rc6) $ git merge driver-core.current/driver-core-linus Already up-to-date. Merging tty.current/tty-linus (1795cd9b3a91 Linux 3.16-rc5) $ git merge tty.current/tty-linus Already up-to-date. Merging usb.current/usb-linus (9a3c4145af32 Linux 3.16-rc6) $ git merge usb.current/usb-linus Already up-to-date. Merging usb-gadget-fixes/fixes (a8a85b01d185 usb: musb/cppi41: call musb_ep_select() before accessing an endpoint's CSR) $ git merge usb-gadget-fixes/fixes Merge made by the 'recursive' strategy. drivers/usb/musb/musb_core.c | 16 +++++++--------- drivers/usb/musb/musb_cppi41.c | 11 +++++++++-- drivers/usb/musb/musb_dma.h | 1 + drivers/usb/musb/musb_host.c | 5 +++-- 4 files changed, 20 insertions(+), 13 deletions(-) Merging usb-serial-fixes/usb-linus (1795cd9b3a91 Linux 3.16-rc5) $ git merge usb-serial-fixes/usb-linus Already up-to-date. Merging staging.current/staging-linus (4aa0abed3a2a staging: vt6655: Fix disassociated messages every 10 seconds) $ git merge staging.current/staging-linus Merge made by the 'recursive' strategy. drivers/iio/accel/bma180.c | 8 +++++--- drivers/iio/industrialio-buffer.c | 2 +- drivers/staging/rtl8723au/os_dep/usb_intf.c | 4 +++- drivers/staging/vt6655/bssdb.c | 2 +- drivers/staging/vt6655/device_main.c | 7 +++++-- 5 files changed, 15 insertions(+), 8 deletions(-) Merging char-misc.current/char-misc-linus (9a3c4145af32 Linux 3.16-rc6) $ git merge char-misc.current/char-misc-linus Already up-to-date. Merging input-current/for-linus (f62d14a8072b Input: document INPUT_PROP_TOPBUTTONPAD) $ git merge input-current/for-linus Already up-to-date. 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 (4c63f83c2c2e crypto: af_alg - properly label AF_ALG socket) $ git merge crypto-current/master Already up-to-date. Merging ide/master (15ba2236f355 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) $ 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 devicetree-current/devicetree/merge (5a12a597a862 arm: Add devicetree fixup machine function) $ git merge devicetree-current/devicetree/merge Already up-to-date. Merging rr-fixes/fixes (79465d2fd48e module: remove warning about waiting module removal.) $ git merge rr-fixes/fixes Already up-to-date. 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 (f4be89cecea4 drm/i915: Fix crash when failing to parse MIPI VBT) $ git merge drm-intel-fixes/for-linux-next-fixes Merge made by the 'recursive' strategy. drivers/gpu/drm/i915/intel_bios.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 (3a5d0df211dd mm, arc: remove obsolete pagefault oom killer comment) $ git merge arc/for-next Removing arch/arc/plat-arcfpga/irq.c Merge made by the 'recursive' strategy. arch/arc/include/asm/arcregs.h | 2 +- arch/arc/include/asm/irq.h | 4 + arch/arc/include/asm/irqflags.h | 18 ---- arch/arc/kernel/irq.c | 53 +++++++--- arch/arc/kernel/signal.c | 47 ++++----- arch/arc/kernel/smp.c | 23 +---- arch/arc/kernel/time.c | 28 ++---- arch/arc/mm/cache_arc700.c | 168 ++++++++++++++++++------------- arch/arc/mm/fault.c | 1 - arch/arc/mm/tlbex.S | 4 +- arch/arc/plat-arcfpga/Makefile | 2 +- arch/arc/plat-arcfpga/include/plat/irq.h | 2 - arch/arc/plat-arcfpga/irq.c | 25 ----- arch/arc/plat-arcfpga/platform.c | 3 - 14 files changed, 176 insertions(+), 204 deletions(-) delete mode 100644 arch/arc/plat-arcfpga/irq.c Merging arm/for-next (740c54c889b6 Merge branch 'devel-stable' into for-next) $ git merge arm/for-next Resolved 'arch/arm/mach-mvebu/headsmp-a9.S' using previous resolution. Auto-merging arch/arm/mach-mvebu/headsmp-a9.S CONFLICT (content): Merge conflict in arch/arm/mach-mvebu/headsmp-a9.S Auto-merging arch/arm/mach-exynos/platsmp.c Removing arch/arm/mach-ep93xx/include/mach/memory.h Auto-merging arch/arm/boot/compressed/vmlinux.lds.S Auto-merging arch/arm/Kconfig Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master b770967cc081] Merge remote-tracking branch 'arm/for-next' $ git diff -M --stat --summary HEAD^.. arch/arm/Kconfig | 17 +- arch/arm/Makefile | 3 + arch/arm/boot/compressed/Makefile | 5 +- arch/arm/boot/compressed/head.S | 8 +- .../compressed/{vmlinux.lds.in => vmlinux.lds.S} | 17 +- arch/arm/common/mcpm_entry.c | 52 ++ arch/arm/crypto/aes-armv4.S | 3 +- arch/arm/include/asm/assembler.h | 29 +- arch/arm/include/asm/cputype.h | 37 +- arch/arm/include/asm/entry-macro-multi.S | 2 +- arch/arm/include/asm/glue-proc.h | 18 +- arch/arm/include/asm/mcpm.h | 16 + arch/arm/include/asm/mcs_spinlock.h | 23 + arch/arm/include/asm/memory.h | 6 +- arch/arm/include/asm/perf_event.h | 9 - arch/arm/include/asm/pgtable-3level-hwdef.h | 3 +- arch/arm/include/asm/pgtable-3level.h | 49 +- arch/arm/include/asm/pgtable.h | 18 +- arch/arm/include/asm/pmu.h | 19 + arch/arm/include/asm/ptrace.h | 6 + arch/arm/include/asm/smp_scu.h | 2 +- arch/arm/include/asm/stacktrace.h | 15 + arch/arm/include/asm/thread_info.h | 3 +- arch/arm/include/asm/uaccess.h | 20 +- arch/arm/include/asm/unistd.h | 10 + arch/arm/include/uapi/asm/unistd.h | 11 - arch/arm/kernel/debug.S | 10 +- arch/arm/kernel/entry-armv.S | 42 +- arch/arm/kernel/entry-common.S | 13 +- arch/arm/kernel/entry-header.S | 14 - arch/arm/kernel/fiqasm.S | 4 +- arch/arm/kernel/head-common.S | 7 +- arch/arm/kernel/head-nommu.S | 8 +- arch/arm/kernel/head.S | 18 +- arch/arm/kernel/hyp-stub.S | 6 +- arch/arm/kernel/iwmmxt.S | 16 +- arch/arm/kernel/perf_event.c | 18 +- arch/arm/kernel/perf_event_cpu.c | 66 +- arch/arm/kernel/perf_event_v6.c | 307 ++----- arch/arm/kernel/perf_event_v7.c | 967 +++++---------------- arch/arm/kernel/perf_event_xscale.c | 121 +-- arch/arm/kernel/relocate_kernel.S | 3 +- arch/arm/kernel/setup.c | 29 +- arch/arm/kernel/sleep.S | 2 +- arch/arm/kernel/smp_tlb.c | 20 +- arch/arm/kernel/swp_emulate.c | 4 + arch/arm/kernel/time.c | 5 +- arch/arm/kernel/traps.c | 6 +- arch/arm/kernel/unwind.c | 8 +- arch/arm/kernel/vmlinux.lds.S | 1 - arch/arm/kvm/guest.c | 8 +- arch/arm/kvm/init.S | 3 +- arch/arm/lib/ashldi3.S | 3 +- arch/arm/lib/ashrdi3.S | 3 +- arch/arm/lib/backtrace.S | 2 +- arch/arm/lib/bitops.h | 5 +- arch/arm/lib/bswapsdi2.S | 5 +- arch/arm/lib/call_with_stack.S | 4 +- arch/arm/lib/csumpartial.S | 2 +- arch/arm/lib/csumpartialcopygeneric.S | 5 +- arch/arm/lib/delay-loop.S | 18 +- arch/arm/lib/div64.S | 13 +- arch/arm/lib/findbit.S | 10 +- arch/arm/lib/getuser.S | 45 +- arch/arm/lib/io-readsb.S | 2 +- arch/arm/lib/io-readsl.S | 6 +- arch/arm/lib/io-readsw-armv3.S | 4 +- arch/arm/lib/io-readsw-armv4.S | 2 +- arch/arm/lib/io-writesb.S | 2 +- arch/arm/lib/io-writesl.S | 10 +- arch/arm/lib/io-writesw-armv3.S | 4 +- arch/arm/lib/io-writesw-armv4.S | 4 +- arch/arm/lib/lib1funcs.S | 26 +- arch/arm/lib/lshrdi3.S | 3 +- arch/arm/lib/memchr.S | 2 +- arch/arm/lib/memset.S | 2 +- arch/arm/lib/memzero.S | 2 +- arch/arm/lib/muldi3.S | 3 +- arch/arm/lib/putuser.S | 10 +- arch/arm/lib/strchr.S | 2 +- arch/arm/lib/strrchr.S | 2 +- arch/arm/lib/ucmpdi2.S | 5 +- arch/arm/mach-davinci/sleep.S | 2 +- arch/arm/mach-ebsa110/include/mach/memory.h | 5 - arch/arm/mach-ep93xx/crunch-bits.S | 6 +- arch/arm/mach-ep93xx/include/mach/memory.h | 22 - arch/arm/mach-exynos/Kconfig | 1 + arch/arm/mach-exynos/mcpm-exynos.c | 17 +- arch/arm/mach-exynos/platsmp.c | 4 +- arch/arm/mach-exynos/pm.c | 11 +- arch/arm/mach-footbridge/include/mach/memory.h | 5 - arch/arm/mach-imx/suspend-imx6.S | 5 +- arch/arm/mach-integrator/include/mach/memory.h | 5 - arch/arm/mach-iop13xx/include/mach/iop13xx.h | 2 +- arch/arm/mach-iop13xx/include/mach/memory.h | 5 - arch/arm/mach-iop13xx/setup.c | 1 + arch/arm/mach-ks8695/include/mach/memory.h | 5 - arch/arm/mach-mvebu/coherency_ll.S | 10 +- arch/arm/mach-mvebu/headsmp-a9.S | 3 +- arch/arm/mach-omap1/include/mach/memory.h | 5 - arch/arm/mach-omap2/sleep44xx.S | 3 +- arch/arm/mach-omap2/sram242x.S | 6 +- arch/arm/mach-omap2/sram243x.S | 6 +- arch/arm/mach-pxa/mioa701_bootresume.S | 2 +- arch/arm/mach-pxa/standby.S | 4 +- arch/arm/mach-realview/include/mach/memory.h | 9 - arch/arm/mach-rpc/include/mach/memory.h | 5 - arch/arm/mach-s3c24xx/sleep-s3c2410.S | 2 +- arch/arm/mach-s3c24xx/sleep-s3c2412.S | 2 +- arch/arm/mach-s5pv210/include/mach/memory.h | 2 - arch/arm/mach-sa1100/include/mach/memory.h | 5 - arch/arm/mach-shmobile/headsmp.S | 3 +- arch/arm/mach-tegra/sleep-tegra20.S | 24 +- arch/arm/mach-tegra/sleep-tegra30.S | 14 +- arch/arm/mach-tegra/sleep.S | 8 +- arch/arm/mach-vexpress/tc2_pm.c | 19 +- arch/arm/mm/Kconfig | 9 +- arch/arm/mm/alignment.c | 4 +- arch/arm/mm/cache-fa.S | 19 +- arch/arm/mm/cache-l2x0.c | 2 +- arch/arm/mm/cache-nop.S | 5 +- arch/arm/mm/cache-v4.S | 13 +- arch/arm/mm/cache-v4wb.S | 15 +- arch/arm/mm/cache-v4wt.S | 13 +- arch/arm/mm/cache-v6.S | 20 +- arch/arm/mm/cache-v7.S | 30 +- arch/arm/mm/dump.c | 4 +- arch/arm/mm/l2c-l2x0-resume.S | 7 +- arch/arm/mm/proc-arm1020.S | 34 +- arch/arm/mm/proc-arm1020e.S | 34 +- arch/arm/mm/proc-arm1022.S | 34 +- arch/arm/mm/proc-arm1026.S | 34 +- arch/arm/mm/proc-arm720.S | 16 +- arch/arm/mm/proc-arm740.S | 8 +- arch/arm/mm/proc-arm7tdmi.S | 8 +- arch/arm/mm/proc-arm920.S | 34 +- arch/arm/mm/proc-arm922.S | 34 +- arch/arm/mm/proc-arm925.S | 34 +- arch/arm/mm/proc-arm926.S | 34 +- arch/arm/mm/proc-arm940.S | 24 +- arch/arm/mm/proc-arm946.S | 30 +- arch/arm/mm/proc-arm9tdmi.S | 8 +- arch/arm/mm/proc-fa526.S | 16 +- arch/arm/mm/proc-feroceon.S | 44 +- arch/arm/mm/proc-mohawk.S | 34 +- arch/arm/mm/proc-sa110.S | 16 +- arch/arm/mm/proc-sa1100.S | 16 +- arch/arm/mm/proc-v6.S | 16 +- arch/arm/mm/proc-v7-2level.S | 4 +- arch/arm/mm/proc-v7-3level.S | 14 +- arch/arm/mm/proc-v7.S | 74 +- arch/arm/mm/proc-v7m.S | 18 +- arch/arm/mm/proc-xsc3.S | 32 +- arch/arm/mm/proc-xscale.S | 34 +- arch/arm/mm/tlb-fa.S | 7 +- arch/arm/mm/tlb-v4.S | 5 +- arch/arm/mm/tlb-v4wb.S | 7 +- arch/arm/mm/tlb-v4wbi.S | 7 +- arch/arm/mm/tlb-v6.S | 5 +- arch/arm/mm/tlb-v7.S | 4 +- arch/arm/nwfpe/entry.S | 8 +- arch/arm/oprofile/common.c | 19 +- arch/arm/plat-omap/dma.c | 2 + arch/arm/vfp/entry.S | 4 +- arch/arm/vfp/vfphw.S | 26 +- arch/arm/xen/hypercall.S | 6 +- drivers/clocksource/arm_global_timer.c | 2 +- 167 files changed, 1501 insertions(+), 1967 deletions(-) rename arch/arm/boot/compressed/{vmlinux.lds.in => vmlinux.lds.S} (81%) create mode 100644 arch/arm/include/asm/mcs_spinlock.h delete mode 100644 arch/arm/mach-ep93xx/include/mach/memory.h Merging arm-perf/for-next/perf (4c834452aad0 Linux 3.16-rc3) $ git merge arm-perf/for-next/perf Already up-to-date. Merging arm-soc/for-next (716519f1f349 Merge branch 'next/defconfig' into for-next) $ git merge arm-soc/for-next Auto-merging include/soc/tegra/pmc.h Auto-merging include/soc/tegra/cpuidle.h Auto-merging include/soc/tegra/common.h Auto-merging include/soc/tegra/ahb.h Removing include/linux/tegra-soc.h Removing include/linux/platform_data/usb-imx_udc.h Removing include/linux/platform_data/camera-mx1.h Removing include/linux/atmel_pwm.h Removing include/linux/atmel-pwm-bl.h Auto-merging include/dt-bindings/clock/rk3066a-cru.h Auto-merging drivers/video/fbdev/amba-clcd-versatile.c Removing drivers/video/backlight/atmel-pwm-bl.c Auto-merging drivers/soc/tegra/fuse/speedo-tegra30.c Auto-merging drivers/soc/tegra/fuse/speedo-tegra20.c Auto-merging drivers/soc/tegra/fuse/speedo-tegra114.c Removing drivers/misc/atmel_pwm.c Removing drivers/mailbox/omap-mbox.h Removing drivers/mailbox/mailbox-omap2.c Removing drivers/mailbox/mailbox-omap1.c Removing drivers/leds/leds-atmel-pwm.c Removing drivers/cpuidle/cpuidle-armada-370-xp.c Auto-merging drivers/clk/versatile/clk-versatile.c Removing arch/arm/plat-versatile/include/plat/clcd.h Removing arch/arm/plat-samsung/s5p-pm.c Removing arch/arm/plat-samsung/s5p-irq.c Removing arch/arm/plat-samsung/s5p-irq-pm.c Removing arch/arm/plat-samsung/s5p-irq-gpioint.c Removing arch/arm/plat-samsung/s5p-irq-eint.c Removing arch/arm/plat-samsung/s5p-dev-uart.c Removing arch/arm/plat-samsung/s5p-clock.c Removing arch/arm/plat-samsung/include/plat/tv-core.h Removing arch/arm/plat-samsung/include/plat/s5p-clock.h Removing arch/arm/plat-samsung/include/plat/pll.h Removing arch/arm/plat-samsung/include/plat/mfc.h Removing arch/arm/plat-samsung/include/plat/irqs.h Removing arch/arm/plat-samsung/include/plat/hdmi.h Removing arch/arm/plat-samsung/include/plat/fimc-core.h Removing arch/arm/plat-samsung/include/plat/clock.h Removing arch/arm/plat-samsung/include/plat/clock-clksrc.h Removing arch/arm/plat-samsung/include/plat/camport.h Removing arch/arm/plat-samsung/clock.c Removing arch/arm/plat-samsung/clock-clksrc.c Auto-merging arch/arm/plat-omap/dma.c Auto-merging arch/arm/mm/Kconfig Auto-merging arch/arm/mach-tegra/sleep-tegra30.S Removing arch/arm/mach-tegra/powergate.c Removing arch/arm/mach-tegra/pmc.h Removing arch/arm/mach-tegra/pmc.c Removing arch/arm/mach-tegra/fuse.h Removing arch/arm/mach-tegra/fuse.c Removing arch/arm/mach-tegra/apbio.h Removing arch/arm/mach-tegra/apbio.c Auto-merging arch/arm/mach-shmobile/sh7372.h Auto-merging arch/arm/mach-shmobile/rcar-gen2.h Auto-merging arch/arm/mach-shmobile/r8a7791.h Auto-merging arch/arm/mach-shmobile/r8a7790.h Auto-merging arch/arm/mach-shmobile/r8a7779.h Auto-merging arch/arm/mach-shmobile/r8a7740.h Auto-merging arch/arm/mach-shmobile/r7s72100.h Auto-merging arch/arm/mach-shmobile/headsmp.S CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/headsmp.S Auto-merging arch/arm/mach-shmobile/common.h Auto-merging arch/arm/mach-s5pv210/sleep.S Removing arch/arm/mach-s5pv210/setup-usb-phy.c Removing arch/arm/mach-s5pv210/setup-spi.c Removing arch/arm/mach-s5pv210/setup-sdhci-gpio.c Removing arch/arm/mach-s5pv210/setup-keypad.c Removing arch/arm/mach-s5pv210/setup-ide.c Removing arch/arm/mach-s5pv210/setup-i2c2.c Removing arch/arm/mach-s5pv210/setup-i2c1.c Removing arch/arm/mach-s5pv210/setup-i2c0.c Removing arch/arm/mach-s5pv210/setup-fimc.c Removing arch/arm/mach-s5pv210/setup-fb-24bpp.c Removing arch/arm/mach-s5pv210/mach-torbreck.c Removing arch/arm/mach-s5pv210/mach-smdkv210.c Removing arch/arm/mach-s5pv210/mach-smdkc110.c Removing arch/arm/mach-s5pv210/mach-goni.c Removing arch/arm/mach-s5pv210/mach-aquila.c Removing arch/arm/mach-s5pv210/include/mach/regs-irq.h Removing arch/arm/mach-s5pv210/include/mach/regs-gpio.h Removing arch/arm/mach-s5pv210/include/mach/pm-core.h CONFLICT (modify/delete): arch/arm/mach-s5pv210/include/mach/memory.h deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-s5pv210/include/mach/memory.h left in tree. Removing arch/arm/mach-s5pv210/include/mach/map.h Removing arch/arm/mach-s5pv210/include/mach/irqs.h Removing arch/arm/mach-s5pv210/include/mach/hardware.h Removing arch/arm/mach-s5pv210/include/mach/gpio.h Removing arch/arm/mach-s5pv210/dma.c Removing arch/arm/mach-s5pv210/dev-audio.c Removing arch/arm/mach-s5pv210/common.c Removing arch/arm/mach-s5pv210/clock.c Removing arch/arm/mach-s5pv210/Makefile.boot Removing arch/arm/mach-s5pc100/setup-spi.c Removing arch/arm/mach-s5pc100/setup-sdhci-gpio.c Removing arch/arm/mach-s5pc100/setup-keypad.c Removing arch/arm/mach-s5pc100/setup-ide.c Removing arch/arm/mach-s5pc100/setup-i2c1.c Removing arch/arm/mach-s5pc100/setup-i2c0.c Removing arch/arm/mach-s5pc100/setup-fb-24bpp.c Removing arch/arm/mach-s5pc100/mach-smdkc100.c Removing arch/arm/mach-s5pc100/include/mach/regs-irq.h Removing arch/arm/mach-s5pc100/include/mach/regs-gpio.h Removing arch/arm/mach-s5pc100/include/mach/regs-clock.h Removing arch/arm/mach-s5pc100/include/mach/map.h Removing arch/arm/mach-s5pc100/include/mach/irqs.h Removing arch/arm/mach-s5pc100/include/mach/hardware.h Removing arch/arm/mach-s5pc100/include/mach/gpio.h Removing arch/arm/mach-s5pc100/include/mach/entry-macro.S Removing arch/arm/mach-s5pc100/include/mach/debug-macro.S Removing arch/arm/mach-s5pc100/dma.c Removing arch/arm/mach-s5pc100/dev-audio.c Removing arch/arm/mach-s5pc100/common.h Removing arch/arm/mach-s5pc100/common.c Removing arch/arm/mach-s5pc100/clock.c Removing arch/arm/mach-s5pc100/Makefile.boot Removing arch/arm/mach-s5pc100/Makefile Removing arch/arm/mach-s5pc100/Kconfig Removing arch/arm/mach-s5p64x0/setup-spi.c Removing arch/arm/mach-s5p64x0/setup-sdhci-gpio.c Removing arch/arm/mach-s5p64x0/setup-i2c1.c Removing arch/arm/mach-s5p64x0/setup-i2c0.c Removing arch/arm/mach-s5p64x0/setup-fb-24bpp.c Removing arch/arm/mach-s5p64x0/pm.c Removing arch/arm/mach-s5p64x0/mach-smdk6450.c Removing arch/arm/mach-s5p64x0/mach-smdk6440.c Removing arch/arm/mach-s5p64x0/irq-pm.c Removing arch/arm/mach-s5p64x0/include/mach/regs-irq.h Removing arch/arm/mach-s5p64x0/include/mach/regs-gpio.h Removing arch/arm/mach-s5p64x0/include/mach/regs-clock.h Removing arch/arm/mach-s5p64x0/include/mach/pm-core.h Removing arch/arm/mach-s5p64x0/include/mach/map.h Removing arch/arm/mach-s5p64x0/include/mach/irqs.h Removing arch/arm/mach-s5p64x0/include/mach/hardware.h Removing arch/arm/mach-s5p64x0/include/mach/gpio.h Removing arch/arm/mach-s5p64x0/include/mach/debug-macro.S Removing arch/arm/mach-s5p64x0/i2c.h Removing arch/arm/mach-s5p64x0/dma.c Removing arch/arm/mach-s5p64x0/dev-audio.c Removing arch/arm/mach-s5p64x0/common.h Removing arch/arm/mach-s5p64x0/common.c Removing arch/arm/mach-s5p64x0/clock.h Removing arch/arm/mach-s5p64x0/clock.c Removing arch/arm/mach-s5p64x0/clock-s5p6450.c Removing arch/arm/mach-s5p64x0/clock-s5p6440.c Removing arch/arm/mach-s5p64x0/Makefile.boot Removing arch/arm/mach-s5p64x0/Makefile Removing arch/arm/mach-s5p64x0/Kconfig Removing arch/arm/mach-omap2/ctrl_module_pad_wkup_44xx.h Removing arch/arm/mach-omap2/ctrl_module_pad_core_44xx.h Removing arch/arm/mach-omap2/ctrl_module_core_44xx.h Removing arch/arm/mach-omap2/clkt2xxx_sys.c Removing arch/arm/mach-omap2/clkt2xxx_osc.c Removing arch/arm/mach-omap2/cclock2430_data.c Removing arch/arm/mach-omap2/cclock2420_data.c Removing arch/arm/mach-mvebu/hotplug.c Auto-merging arch/arm/mach-mvebu/headsmp-a9.S CONFLICT (content): Merge conflict in arch/arm/mach-mvebu/headsmp-a9.S Auto-merging arch/arm/mach-mediatek/mediatek.c Removing arch/arm/mach-kirkwood/tsx1x-common.h Removing arch/arm/mach-kirkwood/tsx1x-common.c Removing arch/arm/mach-kirkwood/ts41x-setup.c Removing arch/arm/mach-kirkwood/ts219-setup.c Removing arch/arm/mach-kirkwood/t5325-setup.c Removing arch/arm/mach-kirkwood/rd88f6281-setup.c Removing arch/arm/mach-kirkwood/rd88f6192-nas-setup.c Removing arch/arm/mach-kirkwood/pm.h Removing arch/arm/mach-kirkwood/pm.c Removing arch/arm/mach-kirkwood/pcie.c Removing arch/arm/mach-kirkwood/openrd-setup.c Removing arch/arm/mach-kirkwood/netxbig_v2-setup.c Removing arch/arm/mach-kirkwood/mpp.h Removing arch/arm/mach-kirkwood/mpp.c Removing arch/arm/mach-kirkwood/lacie_v2-common.h Removing arch/arm/mach-kirkwood/lacie_v2-common.c Removing arch/arm/mach-kirkwood/irq.c Removing arResolved 'arch/arm/mach-mvebu/headsmp-a9.S' using previous resolution. Resolved 'arch/arm/mach-shmobile/headsmp.S' using previous resolution. ch/arm/mach-kirkwood/include/mach/uncompress.h Removing arch/arm/mach-kirkwood/include/mach/kirkwood.h Removing arch/arm/mach-kirkwood/include/mach/irqs.h Removing arch/arm/mach-kirkwood/include/mach/entry-macro.S Removing arch/arm/mach-kirkwood/include/mach/bridge-regs.h Removing arch/arm/mach-kirkwood/d2net_v2-setup.c Removing arch/arm/mach-kirkwood/common.h Removing arch/arm/mach-kirkwood/common.c Removing arch/arm/mach-kirkwood/board-dt.c Removing arch/arm/mach-kirkwood/Makefile.boot Removing arch/arm/mach-kirkwood/Makefile Removing arch/arm/mach-kirkwood/Kconfig CONFLICT (modify/delete): arch/arm/mach-integrator/include/mach/memory.h deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-integrator/include/mach/memory.h left in tree. Removing arch/arm/mach-imx/mx53.h Removing arch/arm/mach-imx/mx51.h Removing arch/arm/mach-imx/mx1-camera-fiq.S Removing arch/arm/mach-imx/mx1-camera-fiq-ksym.c Removing arch/arm/mach-imx/mm-imx5.c Auto-merging arch/arm/mach-imx/mach-imx51.c Removing arch/arm/mach-imx/mach-imx27lite.c Removing arch/arm/mach-imx/mach-imx27ipcam.c Removing arch/arm/mach-imx/iomux-mx51.h Removing arch/arm/mach-imx/ehci-imx5.c Removing arch/arm/mach-imx/devices/platform-mx1-camera.c Removing arch/arm/mach-imx/devices/platform-imx_udc.c Removing arch/arm/mach-imx/devices-imx51.h Removing arch/arm/mach-imx/crm-regs-imx5.h Auto-merging arch/arm/mach-exynos/pm.c Auto-merging arch/arm/mach-exynos/platsmp.c Auto-merging arch/arm/mach-exynos/mcpm-exynos.c Auto-merging arch/arm/mach-exynos/exynos.c Removing arch/arm/mach-clps711x/include/mach/debug-macro.S Auto-merging arch/arm/include/debug/s5pv210.S Removing arch/arm/configs/s5pc100_defconfig Removing arch/arm/configs/s5p64x0_defconfig Removing arch/arm/configs/kirkwood_defconfig Removing arch/arm/configs/genmai_defconfig Removing arch/arm/boot/dts/rk3188-clocks.dtsi Removing arch/arm/boot/dts/rk3066a-clocks.dtsi Removing arch/arm/boot/dts/r8a7779-marzen-reference.dts Auto-merging arch/arm/boot/dts/mt6589-aquaris5.dts Auto-merging arch/arm/Makefile Auto-merging arch/arm/Kconfig Auto-merging MAINTAINERS Automatic merge failed; fix conflicts and then commit the result. $ git rm -f arch/arm/mach-integrator/include/mach/memory.h arch/arm/mach-s5pv210/include/mach/memory.h arch/arm/mach-integrator/include/mach/memory.h: needs merge arch/arm/mach-s5pv210/include/mach/memory.h: needs merge rm 'arch/arm/mach-integrator/include/mach/memory.h' rm 'arch/arm/mach-s5pv210/include/mach/memory.h' $ git commit -v -a [master b1653781b29d] Merge remote-tracking branch 'arm-soc/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/sysfs-driver-tegra-fuse | 11 + Documentation/arm/CCN.txt | 52 + Documentation/arm/Marvell/README | 23 +- Documentation/arm/Samsung/Overview.txt | 11 - .../arm/Samsung/clksrc-change-registers.awk | 1 - Documentation/devicetree/bindings/arm/adapteva.txt | 7 + Documentation/devicetree/bindings/arm/arm-boards | 6 + .../bindings/arm/armada-380-mpcore-soc-ctrl.txt | 14 + .../devicetree/bindings/arm/atmel-pmc.txt | 5 +- .../bindings/arm/bcm/brcm,bcm11351-cpu-method | 36 + .../devicetree/bindings/arm/brcm-brcmstb.txt | 95 + Documentation/devicetree/bindings/arm/ccn.txt | 21 + .../arm/cpu-enable-method/marvell,berlin-smp | 41 + Documentation/devicetree/bindings/arm/cpus.txt | 4 + Documentation/devicetree/bindings/arm/gic.txt | 1 + .../bindings/arm/hisilicon/hisilicon.txt | 11 + .../devicetree/bindings/arm/marvell,berlin.txt | 16 + Documentation/devicetree/bindings/arm/mediatek.txt | 8 + .../devicetree/bindings/arm/omap/crossbar.txt | 36 + .../devicetree/bindings/arm/omap/omap.txt | 3 + .../devicetree/bindings/arm/omap/prcm.txt | 65 + .../devicetree/bindings/arm/spear-misc.txt | 9 + Documentation/devicetree/bindings/arm/tegra.txt | 2 + Documentation/devicetree/bindings/arm/xilinx.txt | 8 +- .../devicetree/bindings/clock/arm-integrator.txt | 4 +- .../bindings/clock/clk-s5pv210-audss.txt | 53 + .../devicetree/bindings/clock/imx1-clock.txt | 26 + .../devicetree/bindings/clock/imx21-clock.txt | 28 + .../devicetree/bindings/clock/imx27-clock.txt | 127 +- .../devicetree/bindings/clock/imx6q-clock.txt | 220 +-- .../devicetree/bindings/clock/mvebu-cpu-clock.txt | 5 +- .../bindings/clock/rockchip,rk3188-cru.txt | 61 + .../bindings/clock/rockchip,rk3288-cru.txt | 61 + .../devicetree/bindings/clock/rockchip.txt | 3 + .../bindings/clock/samsung,s5pv210-clock.txt | 78 + .../bindings/fuse/nvidia,tegra20-fuse.txt | 40 + .../devicetree/bindings/gpu/nvidia,gk20a.txt | 43 + .../bindings/misc/nvidia,tegra20-apbmisc.txt | 13 + .../bindings/pci/nvidia,tegra20-pcie.txt | 30 +- .../devicetree/bindings/pci/spear13xx-pcie.txt | 14 + .../devicetree/bindings/phy/samsung-phy.txt | 1 + .../devicetree/bindings/phy/st-spear-miphy.txt | 15 + .../pinctrl/nvidia,tegra124-xusb-padctl.txt | 127 ++ .../devicetree/bindings/serial/cdns,uart.txt | 20 + .../devicetree/bindings/spi/spi-samsung.txt | 1 - .../devicetree/bindings/vendor-prefixes.txt | 3 + .../devicetree/bindings/video/samsung-fimd.txt | 2 - MAINTAINERS | 28 +- arch/arm/Kconfig | 95 +- arch/arm/Kconfig.debug | 80 +- arch/arm/Makefile | 10 +- arch/arm/arm-soc-for-next-contents.txt | 261 +++ arch/arm/boot/dts/Makefile | 66 +- arch/arm/boot/dts/aks-cdu.dts | 6 + arch/arm/boot/dts/am335x-evmsk.dts | 105 + arch/arm/boot/dts/am335x-pepper.dts | 653 +++++++ arch/arm/boot/dts/am33xx.dtsi | 9 + arch/arm/boot/dts/am4372.dtsi | 11 +- arch/arm/boot/dts/am437x-gp-evm.dts | 71 +- arch/arm/boot/dts/am437x-sk-evm.dts | 613 ++++++ arch/arm/boot/dts/am43x-epos-evm.dts | 59 + arch/arm/boot/dts/animeo_ip.dts | 8 + arch/arm/boot/dts/armada-375-db.dts | 26 + arch/arm/boot/dts/armada-375.dtsi | 34 + arch/arm/boot/dts/armada-38x.dtsi | 5 + arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 284 +++ arch/arm/boot/dts/armada-xp-mv78230.dtsi | 2 + arch/arm/boot/dts/armada-xp-mv78260.dtsi | 2 + arch/arm/boot/dts/armada-xp-mv78460.dtsi | 4 + arch/arm/boot/dts/armada-xp.dtsi | 2 +- arch/arm/boot/dts/at91-ariag25.dts | 8 + arch/arm/boot/dts/at91-cosino.dtsi | 8 + arch/arm/boot/dts/at91-foxg20.dts | 8 + arch/arm/boot/dts/at91-qil_a9260.dts | 8 + arch/arm/boot/dts/at91-sama5d3_xplained.dts | 12 +- arch/arm/boot/dts/at91rm9200.dtsi | 304 +++ arch/arm/boot/dts/at91rm9200ek.dts | 8 + arch/arm/boot/dts/at91sam9260.dtsi | 314 ++- arch/arm/boot/dts/at91sam9261.dtsi | 20 +- arch/arm/boot/dts/at91sam9261ek.dts | 16 +- arch/arm/boot/dts/at91sam9263.dtsi | 311 +++ arch/arm/boot/dts/at91sam9263ek.dts | 8 + arch/arm/boot/dts/at91sam9g20.dtsi | 24 + arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 8 + arch/arm/boot/dts/at91sam9g45.dtsi | 342 +++- arch/arm/boot/dts/at91sam9m10g45ek.dts | 8 + arch/arm/boot/dts/at91sam9n12.dtsi | 20 +- arch/arm/boot/dts/at91sam9n12ek.dts | 18 +- arch/arm/boot/dts/at91sam9rl.dtsi | 32 +- arch/arm/boot/dts/at91sam9rlek.dts | 17 +- arch/arm/boot/dts/at91sam9x5.dtsi | 30 +- arch/arm/boot/dts/at91sam9x5cm.dtsi | 12 +- arch/arm/boot/dts/bcm11351.dtsi | 19 + arch/arm/boot/dts/bcm21664.dtsi | 19 + arch/arm/boot/dts/bcm7445-bcm97445svmb.dts | 14 + arch/arm/boot/dts/bcm7445.dtsi | 111 ++ arch/arm/boot/dts/berlin2.dtsi | 6 + arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 8 + arch/arm/boot/dts/berlin2q.dtsi | 80 + arch/arm/boot/dts/cros-ec-keyboard.dtsi | 105 + arch/arm/boot/dts/dove-cubox-es.dts | 12 + arch/arm/boot/dts/dove-cubox.dts | 3 - arch/arm/boot/dts/dove.dtsi | 14 + arch/arm/boot/dts/dra7-evm.dts | 8 + arch/arm/boot/dts/dra7.dtsi | 382 +++- arch/arm/boot/dts/dra7xx-clocks.dtsi | 39 +- arch/arm/boot/dts/emev2.dtsi | 2 + arch/arm/boot/dts/ethernut5.dts | 10 + arch/arm/boot/dts/evk-pro3.dts | 6 + arch/arm/boot/dts/exynos3250.dtsi | 13 + arch/arm/boot/dts/exynos4.dtsi | 30 + arch/arm/boot/dts/exynos4210.dtsi | 6 - arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 371 ++++ arch/arm/boot/dts/exynos4412-odroidu3.dts | 61 + arch/arm/boot/dts/exynos4412-odroidx.dts | 279 +-- arch/arm/boot/dts/exynos4412-odroidx2.dts | 32 + arch/arm/boot/dts/exynos4412.dtsi | 4 + arch/arm/boot/dts/exynos4x12.dtsi | 6 - arch/arm/boot/dts/exynos5250-snow.dts | 94 +- arch/arm/boot/dts/exynos5410.dtsi | 4 + arch/arm/boot/dts/exynos5420-peach-pit.dts | 392 ++-- arch/arm/boot/dts/exynos5420.dtsi | 6 - arch/arm/boot/dts/exynos5800-peach-pi.dts | 374 +++- arch/arm/boot/dts/ge863-pro3.dtsi | 4 + arch/arm/boot/dts/hi3620.dtsi | 1 + arch/arm/boot/dts/hisi-x5hd2-dkb.dts | 53 + arch/arm/boot/dts/hisi-x5hd2.dtsi | 170 ++ .../imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts | 73 + .../imx25-eukrea-mbimxsd25-baseboard-dvi-svga.dts | 45 + .../imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dts | 45 + .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 1 - arch/arm/boot/dts/imx25-pdk.dts | 8 +- arch/arm/boot/dts/imx25.dtsi | 8 +- arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi | 296 +++ .../boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts | 273 +++ arch/arm/boot/dts/imx27-pdk.dts | 2 +- arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 2 +- arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi | 3 +- arch/arm/boot/dts/imx27.dtsi | 115 +- arch/arm/boot/dts/imx28-cfa10036.dts | 22 + arch/arm/boot/dts/imx28-m28.dtsi | 87 + arch/arm/boot/dts/imx28-m28evk.dts | 62 +- .../boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts | 1 - arch/arm/boot/dts/imx35.dtsi | 8 + arch/arm/boot/dts/imx50.dtsi | 8 +- arch/arm/boot/dts/imx51-babbage.dts | 2 +- .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 1 - arch/arm/boot/dts/imx51.dtsi | 3 - arch/arm/boot/dts/imx53-m53.dtsi | 140 ++ arch/arm/boot/dts/imx53-m53evk.dts | 113 +- arch/arm/boot/dts/imx53-mba53.dts | 1 - arch/arm/boot/dts/imx53-qsb-common.dtsi | 1 - arch/arm/boot/dts/imx53-tx53.dtsi | 1 - arch/arm/boot/dts/imx53-voipac-bsb.dts | 1 - arch/arm/boot/dts/imx53.dtsi | 15 +- arch/arm/boot/dts/imx6dl-aristainetos_4.dts | 85 + arch/arm/boot/dts/imx6dl-aristainetos_7.dts | 74 + arch/arm/boot/dts/imx6dl-gw51xx.dts | 2 +- arch/arm/boot/dts/imx6dl-gw52xx.dts | 2 +- arch/arm/boot/dts/imx6dl-gw53xx.dts | 2 +- arch/arm/boot/dts/imx6dl-gw54xx.dts | 2 +- arch/arm/boot/dts/imx6dl-rex-basic.dts | 30 + arch/arm/boot/dts/imx6dl-riotboard.dts | 33 +- arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts | 103 + arch/arm/boot/dts/imx6dl-tx6u-801x.dts | 177 ++ arch/arm/boot/dts/imx6dl-tx6u-811x.dts | 150 ++ arch/arm/boot/dts/imx6dl-wandboard-revb1.dts | 22 + arch/arm/boot/dts/imx6dl-wandboard.dts | 2 +- arch/arm/boot/dts/imx6dl.dtsi | 17 +- arch/arm/boot/dts/imx6q-cubox-i.dts | 4 + arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 54 + arch/arm/boot/dts/imx6q-gw51xx.dts | 2 +- arch/arm/boot/dts/imx6q-gw52xx.dts | 2 +- arch/arm/boot/dts/imx6q-gw53xx.dts | 2 +- arch/arm/boot/dts/imx6q-gw5400-a.dts | 5 +- arch/arm/boot/dts/imx6q-gw54xx.dts | 2 +- arch/arm/boot/dts/imx6q-rex-pro.dts | 34 + arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts | 103 + arch/arm/boot/dts/imx6q-tx6q-1010.dts | 177 ++ arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts | 136 ++ arch/arm/boot/dts/imx6q-tx6q-1020.dts | 210 ++ arch/arm/boot/dts/imx6q-tx6q-1110.dts | 154 ++ arch/arm/boot/dts/imx6q-udoo.dts | 32 + arch/arm/boot/dts/imx6q-wandboard-revb1.dts | 26 + arch/arm/boot/dts/imx6q-wandboard.dts | 2 +- arch/arm/boot/dts/imx6q.dtsi | 35 +- arch/arm/boot/dts/imx6qdl-aristainetos.dtsi | 418 ++++ arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 5 +- arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 5 +- arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 6 +- arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 1 - arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 1 + arch/arm/boot/dts/imx6qdl-rex.dtsi | 357 ++++ arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 1 - arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 2 +- arch/arm/boot/dts/imx6qdl-tx6.dtsi | 696 +++++++ arch/arm/boot/dts/imx6qdl-wandboard-revb1.dtsi | 42 + arch/arm/boot/dts/imx6qdl-wandboard-revc1.dtsi | 41 + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 22 - arch/arm/boot/dts/imx6qdl.dtsi | 161 +- arch/arm/boot/dts/imx6sl-evk.dts | 17 +- arch/arm/boot/dts/imx6sl.dtsi | 12 +- arch/arm/boot/dts/imx6sx-pinfunc.h | 1544 +++++++++++++++ arch/arm/boot/dts/imx6sx-sdb.dts | 479 +++++ arch/arm/boot/dts/imx6sx.dtsi | 1208 ++++++++++++ arch/arm/boot/dts/integratorap.dts | 1 + arch/arm/boot/dts/k2e-clocks.dtsi | 2 +- arch/arm/boot/dts/k2hk-clocks.dtsi | 2 +- arch/arm/boot/dts/k2hk-evm.dts | 12 + arch/arm/boot/dts/k2l-clocks.dtsi | 2 +- arch/arm/boot/dts/keystone-clocks.dtsi | 2 +- arch/arm/boot/dts/keystone.dtsi | 11 + arch/arm/boot/dts/kirkwood-d2net.dts | 42 + arch/arm/boot/dts/kirkwood-net2big.dts | 60 + arch/arm/boot/dts/kirkwood-net5big.dts | 111 ++ arch/arm/boot/dts/kirkwood-netxbig.dtsi | 154 ++ arch/arm/boot/dts/kizbox.dts | 4 + arch/arm/boot/dts/mpa1600.dts | 8 + .../mach/dma.h => boot/dts/mt6589-aquaris5.dts} | 21 +- arch/arm/boot/dts/mt6589.dtsi | 94 + arch/arm/boot/dts/omap2420.dtsi | 5 + arch/arm/boot/dts/omap2430.dtsi | 5 + arch/arm/boot/dts/omap3.dtsi | 2 + arch/arm/boot/dts/omap4.dtsi | 9 + arch/arm/boot/dts/omap5-uevm.dts | 68 +- arch/arm/boot/dts/omap5.dtsi | 62 + arch/arm/boot/dts/pm9g45.dts | 8 + arch/arm/boot/dts/r7s72100-genmai.dts | 10 + arch/arm/boot/dts/r7s72100.dtsi | 1 + arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 14 +- arch/arm/boot/dts/r8a73a4.dtsi | 42 + .../boot/dts/r8a7740-armadillo800eva-reference.dts | 28 +- arch/arm/boot/dts/r8a7740.dtsi | 63 + arch/arm/boot/dts/r8a7778-bockw-reference.dts | 14 +- arch/arm/boot/dts/r8a7778.dtsi | 42 + arch/arm/boot/dts/r8a7779-marzen-reference.dts | 121 -- arch/arm/boot/dts/r8a7779-marzen.dts | 116 +- arch/arm/boot/dts/r8a7779.dtsi | 234 ++- arch/arm/boot/dts/r8a7790-lager.dts | 88 +- arch/arm/boot/dts/r8a7790.dtsi | 207 +- arch/arm/boot/dts/r8a7791-henninger.dts | 45 +- arch/arm/boot/dts/r8a7791-koelsch.dts | 89 +- arch/arm/boot/dts/r8a7791.dtsi | 218 ++- arch/arm/boot/dts/rk3066a-bqcurie2.dts | 214 +- arch/arm/boot/dts/rk3066a-clocks.dtsi | 299 --- arch/arm/boot/dts/rk3066a.dtsi | 519 +++-- arch/arm/boot/dts/rk3188-clocks.dtsi | 289 --- arch/arm/boot/dts/rk3188-radxarock.dts | 218 ++- arch/arm/boot/dts/rk3188.dtsi | 446 +++-- arch/arm/boot/dts/rk3288-evb-act8846.dts | 134 ++ arch/arm/boot/dts/rk3288-evb-rk808.dts | 18 + arch/arm/boot/dts/rk3288-evb.dtsi | 96 + arch/arm/boot/dts/rk3288.dtsi | 595 ++++++ arch/arm/boot/dts/rk3xxx.dtsi | 356 ++-- arch/arm/boot/dts/s5pv210-aquila.dts | 392 ++++ arch/arm/boot/dts/s5pv210-goni.dts | 449 +++++ arch/arm/boot/dts/s5pv210-pinctrl.dtsi | 839 ++++++++ arch/arm/boot/dts/s5pv210-smdkc110.dts | 78 + arch/arm/boot/dts/s5pv210-smdkv210.dts | 238 +++ arch/arm/boot/dts/s5pv210-torbreck.dts | 92 + arch/arm/boot/dts/s5pv210.dtsi | 633 ++++++ arch/arm/boot/dts/sama5d3.dtsi | 22 +- arch/arm/boot/dts/sama5d3xcm.dtsi | 12 +- arch/arm/boot/dts/sama5d3xmb.dtsi | 2 + arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 16 +- arch/arm/boot/dts/sh73a0.dtsi | 72 + arch/arm/boot/dts/socfpga.dtsi | 1 + arch/arm/boot/dts/spear1310-evb.dts | 4 + arch/arm/boot/dts/spear1310.dtsi | 93 +- arch/arm/boot/dts/spear1340-evb.dts | 4 + arch/arm/boot/dts/spear1340.dtsi | 30 +- arch/arm/boot/dts/spear13xx.dtsi | 9 +- arch/arm/boot/dts/ste-dbx5x0.dtsi | 10 + arch/arm/boot/dts/ste-href-stuib.dtsi | 2 + arch/arm/boot/dts/ste-href-tvk1281618.dtsi | 59 + arch/arm/boot/dts/ste-hrefv60plus.dtsi | 24 - arch/arm/boot/dts/ste-nomadik-s8815.dts | 2 +- arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 7 +- arch/arm/boot/dts/ste-snowball.dts | 38 +- arch/arm/boot/dts/sun4i-a10-a1000.dts | 15 + arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 110 ++ arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 15 + arch/arm/boot/dts/sun4i-a10-hackberry.dts | 21 + arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 21 +- arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 28 + arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 15 + arch/arm/boot/dts/sun4i-a10-pcduino.dts | 9 + arch/arm/boot/dts/sun4i-a10.dtsi | 34 +- arch/arm/boot/dts/sun5i-a10s.dtsi | 2 +- arch/arm/boot/dts/sun5i-a13.dtsi | 2 +- arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 119 ++ arch/arm/boot/dts/sun6i-a31.dtsi | 92 +- arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 16 + arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 16 + arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 22 + arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 10 + arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 173 ++ arch/arm/boot/dts/sun7i-a20.dtsi | 34 +- arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts | 30 + arch/arm/boot/dts/sun8i-a23.dtsi | 343 ++++ arch/arm/boot/dts/tegra114-roth.dts | 32 +- arch/arm/boot/dts/tegra114.dtsi | 15 + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 33 +- arch/arm/boot/dts/tegra124-venice2.dts | 128 +- arch/arm/boot/dts/tegra124.dtsi | 55 + arch/arm/boot/dts/tegra20-harmony.dts | 8 +- arch/arm/boot/dts/tegra20-medcom-wide.dts | 61 +- arch/arm/boot/dts/tegra20-paz00.dts | 6 +- arch/arm/boot/dts/tegra20-plutux.dts | 41 + arch/arm/boot/dts/tegra20-tamonten.dtsi | 17 +- arch/arm/boot/dts/tegra20-tec.dts | 41 + arch/arm/boot/dts/tegra20-trimslice.dts | 8 +- arch/arm/boot/dts/tegra20.dtsi | 15 + arch/arm/boot/dts/tegra30-apalis-eval.dts | 260 +++ arch/arm/boot/dts/tegra30-apalis.dtsi | 678 +++++++ arch/arm/boot/dts/tegra30-beaver.dts | 12 +- arch/arm/boot/dts/tegra30-cardhu.dtsi | 11 +- arch/arm/boot/dts/tegra30.dtsi | 15 + arch/arm/boot/dts/tny_a9260_common.dtsi | 8 + arch/arm/boot/dts/tny_a9263.dts | 8 + arch/arm/boot/dts/usb_a9260_common.dtsi | 8 + arch/arm/boot/dts/usb_a9263.dts | 8 + arch/arm/boot/dts/versatile-ab.dts | 81 +- arch/arm/boot/dts/versatile-pb.dts | 12 +- arch/arm/boot/dts/vf610.dtsi | 25 +- arch/arm/boot/dts/zynq-7000.dtsi | 90 +- arch/arm/boot/dts/zynq-parallella.dts | 64 + arch/arm/boot/dts/zynq-zc702.dts | 4 + arch/arm/common/timer-sp.c | 4 +- arch/arm/configs/armadillo800eva_defconfig | 4 + arch/arm/configs/bcm_defconfig | 1 + arch/arm/configs/exynos_defconfig | 56 +- arch/arm/configs/genmai_defconfig | 122 -- arch/arm/configs/hi3xxx_defconfig | 2 + arch/arm/configs/imx_v4_v5_defconfig | 5 +- arch/arm/configs/imx_v6_v7_defconfig | 9 +- arch/arm/configs/kirkwood_defconfig | 181 -- arch/arm/configs/multi_v5_defconfig | 2 + arch/arm/configs/multi_v7_defconfig | 22 +- arch/arm/configs/mvebu_v5_defconfig | 6 + arch/arm/configs/mvebu_v7_defconfig | 5 + arch/arm/configs/mxs_defconfig | 1 + arch/arm/configs/omap1_defconfig | 2 - arch/arm/configs/omap2plus_defconfig | 2 + arch/arm/configs/s5p64x0_defconfig | 68 - arch/arm/configs/s5pc100_defconfig | 49 - arch/arm/configs/shmobile_defconfig | 23 +- arch/arm/configs/socfpga_defconfig | 35 + arch/arm/configs/spear13xx_defconfig | 16 + arch/arm/configs/tegra_defconfig | 16 +- arch/arm/include/asm/gpio.h | 7 - arch/arm/include/debug/clps711x.S | 38 + .../mach/debug-macro.S => include/debug/s5pv210.S} | 23 +- arch/arm/lib/delay.c | 26 +- arch/arm/mach-at91/Kconfig | 4 - arch/arm/mach-at91/at91rm9200.c | 6 +- arch/arm/mach-at91/at91sam9260.c | 6 +- arch/arm/mach-at91/at91sam9263.c | 7 +- arch/arm/mach-at91/at91sam9263_devices.c | 11 +- arch/arm/mach-at91/at91sam9g45.c | 7 +- arch/arm/mach-at91/at91sam9g45_devices.c | 11 +- arch/arm/mach-at91/at91sam9rl.c | 1 + arch/arm/mach-at91/at91sam9rl_devices.c | 11 +- arch/arm/mach-at91/board-sam9263ek.c | 55 +- arch/arm/mach-at91/board-sam9m10g45ek.c | 42 +- arch/arm/mach-at91/board.h | 1 - arch/arm/mach-at91/leds.c | 37 - arch/arm/mach-bcm/Kconfig | 34 +- arch/arm/mach-bcm/Makefile | 8 + arch/arm/mach-bcm/brcmstb.c | 28 + arch/arm/mach-bcm/brcmstb.h | 19 + arch/arm/mach-bcm/headsmp-brcmstb.S | 33 + arch/arm/mach-bcm/kona_smp.c | 202 ++ arch/arm/mach-bcm/platsmp-brcmstb.c | 363 ++++ arch/arm/mach-berlin/Kconfig | 3 + arch/arm/mach-berlin/Makefile | 3 +- arch/arm/mach-berlin/headsmp.S | 30 + arch/arm/mach-berlin/platsmp.c | 99 + arch/arm/mach-clps711x/board-autcpu12.c | 1 - arch/arm/mach-clps711x/board-cdb89712.c | 1 - arch/arm/mach-clps711x/board-clep7312.c | 3 +- arch/arm/mach-clps711x/board-edb7211.c | 8 +- arch/arm/mach-clps711x/board-p720t.c | 1 - arch/arm/mach-clps711x/common.c | 12 - arch/arm/mach-clps711x/common.h | 1 - arch/arm/mach-clps711x/devices.c | 10 + arch/arm/mach-clps711x/include/mach/debug-macro.S | 38 - arch/arm/mach-clps711x/include/mach/hardware.h | 5 +- arch/arm/mach-exynos/common.h | 27 +- arch/arm/mach-exynos/exynos.c | 74 +- arch/arm/mach-exynos/headsmp.S | 1 - arch/arm/mach-exynos/hotplug.c | 3 +- arch/arm/mach-exynos/include/mach/map.h | 6 +- arch/arm/mach-exynos/include/mach/memory.h | 3 +- arch/arm/mach-exynos/mcpm-exynos.c | 106 +- arch/arm/mach-exynos/platsmp.c | 73 +- arch/arm/mach-exynos/pm.c | 128 +- arch/arm/mach-exynos/pm_domains.c | 9 +- arch/arm/mach-exynos/pmu.c | 41 +- arch/arm/mach-exynos/regs-pmu.h | 525 ++--- arch/arm/mach-exynos/regs-sys.h | 22 + arch/arm/mach-hisi/Kconfig | 30 +- arch/arm/mach-hisi/Makefile | 2 +- arch/arm/mach-hisi/core.h | 5 + arch/arm/mach-hisi/headsmp.S | 16 + arch/arm/mach-hisi/hisilicon.c | 43 +- arch/arm/mach-hisi/hotplug.c | 58 + arch/arm/mach-hisi/platsmp.c | 53 +- arch/arm/mach-imx/Kconfig | 59 +- arch/arm/mach-imx/Makefile | 11 +- arch/arm/mach-imx/clk-imx1.c | 151 +- arch/arm/mach-imx/clk-imx21.c | 299 ++- arch/arm/mach-imx/clk-imx25.c | 47 +- arch/arm/mach-imx/clk-imx27.c | 452 ++--- arch/arm/mach-imx/clk-imx31.c | 6 +- arch/arm/mach-imx/clk-imx35.c | 6 +- arch/arm/mach-imx/clk-imx51-imx53.c | 256 ++- arch/arm/mach-imx/clk-imx6q.c | 540 +++--- arch/arm/mach-imx/clk-imx6sl.c | 11 +- arch/arm/mach-imx/clk-imx6sx.c | 25 +- arch/arm/mach-imx/clk-vf610.c | 8 +- arch/arm/mach-imx/clk.c | 10 + arch/arm/mach-imx/clk.h | 9 + arch/arm/mach-imx/common.h | 32 +- arch/arm/mach-imx/cpu-imx5.c | 25 +- arch/arm/mach-imx/cpu.c | 13 + arch/arm/mach-imx/cpuidle-imx6q.c | 6 +- arch/arm/mach-imx/crm-regs-imx5.h | 600 ------ arch/arm/mach-imx/devices-imx51.h | 66 - arch/arm/mach-imx/devices/Kconfig | 9 +- arch/arm/mach-imx/devices/Makefile | 2 - arch/arm/mach-imx/devices/devices-common.h | 26 - arch/arm/mach-imx/devices/platform-fec.c | 12 - arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c | 5 - arch/arm/mach-imx/devices/platform-imx-i2c.c | 26 - arch/arm/mach-imx/devices/platform-imx-keypad.c | 10 - arch/arm/mach-imx/devices/platform-imx-ssi.c | 20 - arch/arm/mach-imx/devices/platform-imx-uart.c | 22 - arch/arm/mach-imx/devices/platform-imx2-wdt.c | 18 - arch/arm/mach-imx/devices/platform-imx_udc.c | 75 - arch/arm/mach-imx/devices/platform-mx1-camera.c | 42 - arch/arm/mach-imx/devices/platform-mxc-ehci.c | 9 - arch/arm/mach-imx/devices/platform-mxc_nand.c | 5 - arch/arm/mach-imx/devices/platform-mxc_rnga.c | 5 +- arch/arm/mach-imx/devices/platform-pata_imx.c | 10 - .../mach-imx/devices/platform-sdhci-esdhc-imx.c | 24 - arch/arm/mach-imx/devices/platform-spi_imx.c | 27 - arch/arm/mach-imx/ehci-imx25.c | 1 + arch/arm/mach-imx/ehci-imx27.c | 1 + arch/arm/mach-imx/ehci-imx31.c | 1 + arch/arm/mach-imx/ehci-imx35.c | 1 + arch/arm/mach-imx/ehci-imx5.c | 171 -- arch/arm/mach-imx/ehci.h | 43 + arch/arm/mach-imx/gpc.c | 5 +- arch/arm/mach-imx/hardware.h | 2 - arch/arm/mach-imx/imx25-dt.c | 6 - arch/arm/mach-imx/imx27-dt.c | 6 - arch/arm/mach-imx/imx31-dt.c | 2 +- arch/arm/mach-imx/imx35-dt.c | 2 +- arch/arm/mach-imx/iomux-mx51.h | 827 -------- arch/arm/mach-imx/mach-armadillo5x0.c | 1 + arch/arm/mach-imx/mach-cpuimx27.c | 1 + arch/arm/mach-imx/mach-cpuimx35.c | 1 + arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 1 + arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 1 + arch/arm/mach-imx/mach-imx27ipcam.c | 77 - arch/arm/mach-imx/mach-imx27lite.c | 83 - arch/arm/mach-imx/mach-imx50.c | 5 +- arch/arm/mach-imx/{imx51-dt.c => mach-imx51.c} | 45 +- arch/arm/mach-imx/mach-imx53.c | 19 +- arch/arm/mach-imx/mach-imx6q.c | 4 +- arch/arm/mach-imx/mach-imx6sl.c | 2 +- arch/arm/mach-imx/mach-imx6sx.c | 10 +- arch/arm/mach-imx/mach-mx25_3ds.c | 1 + arch/arm/mach-imx/mach-mx27_3ds.c | 1 + arch/arm/mach-imx/mach-mx31_3ds.c | 1 + arch/arm/mach-imx/mach-mx31lilly.c | 1 + arch/arm/mach-imx/mach-mx31lite.c | 1 + arch/arm/mach-imx/mach-mx31moboard.c | 5 +- arch/arm/mach-imx/mach-mx35_3ds.c | 1 + arch/arm/mach-imx/mach-pca100.c | 1 + arch/arm/mach-imx/mach-pcm037.c | 1 + arch/arm/mach-imx/mach-pcm038.c | 1 + arch/arm/mach-imx/mach-pcm043.c | 1 + arch/arm/mach-imx/mach-vf610.c | 2 +- arch/arm/mach-imx/mach-vpr200.c | 1 + arch/arm/mach-imx/mm-imx5.c | 155 -- arch/arm/mach-imx/mx1-camera-fiq-ksym.c | 18 - arch/arm/mach-imx/mx1-camera-fiq.S | 35 - arch/arm/mach-imx/mx31moboard-devboard.c | 5 +- arch/arm/mach-imx/mx31moboard-marxbot.c | 5 +- arch/arm/mach-imx/mx31moboard-smartbot.c | 5 +- arch/arm/mach-imx/mx51.h | 346 ---- arch/arm/mach-imx/mx53.h | 342 ---- arch/arm/mach-imx/mxc.h | 7 + arch/arm/mach-imx/pm-imx5.c | 98 +- arch/arm/mach-imx/pm-imx6.c | 67 +- arch/arm/mach-imx/system.c | 24 +- arch/arm/mach-imx/time.c | 55 +- arch/arm/mach-imx/tzic.c | 9 +- arch/arm/mach-integrator/Kconfig | 1 - arch/arm/mach-integrator/include/mach/memory.h | 29 - arch/arm/mach-integrator/integrator_ap.c | 10 +- arch/arm/mach-integrator/integrator_cp.c | 13 +- arch/arm/mach-kirkwood/Kconfig | 111 -- arch/arm/mach-kirkwood/Makefile | 14 - arch/arm/mach-kirkwood/Makefile.boot | 3 - arch/arm/mach-kirkwood/board-dt.c | 223 --- arch/arm/mach-kirkwood/common.c | 746 ------- arch/arm/mach-kirkwood/common.h | 74 - arch/arm/mach-kirkwood/d2net_v2-setup.c | 231 --- arch/arm/mach-kirkwood/include/mach/bridge-regs.h | 86 - arch/arm/mach-kirkwood/include/mach/entry-macro.S | 34 - arch/arm/mach-kirkwood/include/mach/irqs.h | 65 - arch/arm/mach-kirkwood/include/mach/kirkwood.h | 142 -- arch/arm/mach-kirkwood/include/mach/uncompress.h | 46 - arch/arm/mach-kirkwood/irq.c | 82 - arch/arm/mach-kirkwood/lacie_v2-common.c | 114 -- arch/arm/mach-kirkwood/lacie_v2-common.h | 16 - arch/arm/mach-kirkwood/mpp.c | 43 - arch/arm/mach-kirkwood/mpp.h | 348 ---- arch/arm/mach-kirkwood/netxbig_v2-setup.c | 422 ---- arch/arm/mach-kirkwood/openrd-setup.c | 255 --- arch/arm/mach-kirkwood/pcie.c | 296 --- arch/arm/mach-kirkwood/pm.c | 76 - arch/arm/mach-kirkwood/pm.h | 26 - arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 89 - arch/arm/mach-kirkwood/rd88f6281-setup.c | 128 -- arch/arm/mach-kirkwood/t5325-setup.c | 216 --- arch/arm/mach-kirkwood/ts219-setup.c | 142 -- arch/arm/mach-kirkwood/ts41x-setup.c | 186 -- arch/arm/mach-kirkwood/tsx1x-common.c | 113 -- arch/arm/mach-kirkwood/tsx1x-common.h | 7 - arch/arm/mach-mediatek/Kconfig | 6 + arch/arm/mach-mediatek/Makefile | 1 + .../mach/dma.h => mach-mediatek/mediatek.c} | 25 +- arch/arm/mach-mmp/include/mach/mfp-pxa910.h | 1 - arch/arm/mach-mvebu/Kconfig | 13 + arch/arm/mach-mvebu/Makefile | 4 +- arch/arm/mach-mvebu/armada-370-xp.h | 2 + arch/arm/mach-mvebu/board-v7.c | 22 +- arch/arm/mach-mvebu/board.h | 5 + arch/arm/mach-mvebu/common.h | 3 +- arch/arm/mach-mvebu/cpu-reset.c | 2 +- arch/arm/mach-mvebu/headsmp-a9.S | 15 - arch/arm/mach-mvebu/hotplug.c | 31 - arch/arm/mach-mvebu/kirkwood.c | 3 + arch/arm/mach-mvebu/mvebu-soc-id.c | 21 +- arch/arm/mach-mvebu/netxbig.c | 191 ++ arch/arm/mach-mvebu/platsmp-a9.c | 45 +- arch/arm/mach-mvebu/platsmp.c | 49 + arch/arm/mach-mvebu/pmsu.c | 438 ++++- arch/arm/mach-mvebu/pmsu.h | 5 + arch/arm/mach-mvebu/pmsu_ll.S | 36 + arch/arm/mach-mvebu/system-controller.c | 50 + arch/arm/mach-omap1/ocpi.c | 1 - arch/arm/mach-omap2/Makefile | 7 +- arch/arm/mach-omap2/cclock2420_data.c | 1931 ------------------ arch/arm/mach-omap2/cclock2430_data.c | 2048 -------------------- arch/arm/mach-omap2/clkt2xxx_osc.c | 69 - arch/arm/mach-omap2/clkt2xxx_sys.c | 47 - arch/arm/mach-omap2/clkt_dpll.c | 98 +- arch/arm/mach-omap2/clkt_iclk.c | 8 +- arch/arm/mach-omap2/clock.c | 97 +- arch/arm/mach-omap2/clock.h | 47 +- arch/arm/mach-omap2/clock2xxx.h | 2 - arch/arm/mach-omap2/cm-regbits-24xx.h | 1 + arch/arm/mach-omap2/cm2_7xx.h | 4 + arch/arm/mach-omap2/control.c | 60 +- arch/arm/mach-omap2/control.h | 40 +- arch/arm/mach-omap2/ctrl_module_core_44xx.h | 392 ---- arch/arm/mach-omap2/ctrl_module_pad_core_44xx.h | 1409 -------------- arch/arm/mach-omap2/ctrl_module_pad_wkup_44xx.h | 236 --- arch/arm/mach-omap2/devices.c | 2 +- arch/arm/mach-omap2/dma.c | 3 + arch/arm/mach-omap2/dpll3xxx.c | 7 +- arch/arm/mach-omap2/dpll44xx.c | 19 +- arch/arm/mach-omap2/gpmc-nand.c | 79 +- arch/arm/mach-omap2/io.c | 9 +- arch/arm/mach-omap2/omap_hwmod_2420_data.c | 14 - arch/arm/mach-omap2/omap_hwmod_2430_data.c | 13 - .../omap_hwmod_2xxx_3xxx_interconnect_data.c | 9 - .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 40 - .../omap_hwmod_33xx_43xx_interconnect_data.c | 10 - arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 100 + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 10 - arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 574 +++++- arch/arm/mach-omap2/omap_hwmod_common_data.h | 1 - .../mach-omap2/omap_hwmod_common_ipblock_data.c | 55 + arch/arm/mach-omap2/pm24xx.c | 35 +- arch/arm/mach-omap2/pm34xx.c | 218 +-- arch/arm/mach-omap2/prcm43xx.h | 1 + arch/arm/mach-omap2/prm2xxx.c | 18 + arch/arm/mach-omap2/prm2xxx.h | 1 + arch/arm/mach-omap2/prm3xxx.c | 233 +++ arch/arm/mach-omap2/prm3xxx.h | 6 + arch/arm/mach-omap2/prm7xx.h | 4 + arch/arm/mach-omap2/prm_common.c | 2 + arch/arm/mach-omap2/usb-tusb6010.c | 1 - arch/arm/mach-pxa/corgi.c | 2 +- arch/arm/mach-pxa/generic.c | 12 +- arch/arm/mach-pxa/include/mach/hardware.h | 4 +- arch/arm/mach-pxa/pxa25x.c | 7 +- arch/arm/mach-pxa/pxa27x.c | 10 +- arch/arm/mach-pxa/pxa3xx.c | 2 +- arch/arm/mach-pxa/sleep.S | 2 +- arch/arm/mach-realview/core.c | 2 +- arch/arm/mach-rockchip/Kconfig | 2 + arch/arm/mach-rockchip/Makefile | 2 + arch/arm/mach-rockchip/platsmp.c | 20 + arch/arm/mach-rockchip/rockchip.c | 1 + arch/arm/mach-s3c24xx/common.c | 2 - arch/arm/mach-s3c24xx/iotiming-s3c2412.c | 1 - arch/arm/mach-s3c24xx/mach-h1940.c | 5 +- arch/arm/mach-s3c24xx/mach-jive.c | 1 - arch/arm/mach-s3c24xx/mach-smdk2413.c | 1 - arch/arm/mach-s3c24xx/mach-smdk2416.c | 1 - arch/arm/mach-s3c24xx/mach-smdk2443.c | 1 - arch/arm/mach-s3c24xx/mach-vstms.c | 1 - arch/arm/mach-s3c24xx/s3c2410.c | 6 - arch/arm/mach-s3c24xx/s3c2412.c | 6 - arch/arm/mach-s3c24xx/s3c2442.c | 1 - arch/arm/mach-s3c24xx/s3c244x.c | 6 - arch/arm/mach-s3c64xx/mach-anw6410.c | 1 - arch/arm/mach-s3c64xx/mach-crag6410.c | 1 - arch/arm/mach-s3c64xx/mach-hmt.c | 1 - arch/arm/mach-s3c64xx/mach-ncp.c | 1 - arch/arm/mach-s3c64xx/mach-smartq.c | 1 - arch/arm/mach-s3c64xx/mach-smdk6400.c | 1 - arch/arm/mach-s3c64xx/mach-smdk6410.c | 1 - arch/arm/mach-s3c64xx/s3c6400.c | 1 - arch/arm/mach-s3c64xx/s3c6410.c | 1 - arch/arm/mach-s5p64x0/Kconfig | 102 - arch/arm/mach-s5p64x0/Makefile | 36 - arch/arm/mach-s5p64x0/Makefile.boot | 2 - arch/arm/mach-s5p64x0/clock-s5p6440.c | 632 ------ arch/arm/mach-s5p64x0/clock-s5p6450.c | 701 ------- arch/arm/mach-s5p64x0/clock.c | 236 --- arch/arm/mach-s5p64x0/clock.h | 38 - arch/arm/mach-s5p64x0/common.c | 490 ----- arch/arm/mach-s5p64x0/common.h | 56 - arch/arm/mach-s5p64x0/dev-audio.c | 176 -- arch/arm/mach-s5p64x0/dma.c | 128 -- arch/arm/mach-s5p64x0/i2c.h | 16 - arch/arm/mach-s5p64x0/include/mach/debug-macro.S | 32 - arch/arm/mach-s5p64x0/include/mach/gpio.h | 132 -- arch/arm/mach-s5p64x0/include/mach/hardware.h | 18 - arch/arm/mach-s5p64x0/include/mach/irqs.h | 148 -- arch/arm/mach-s5p64x0/include/mach/map.h | 96 - arch/arm/mach-s5p64x0/include/mach/pm-core.h | 119 -- arch/arm/mach-s5p64x0/include/mach/regs-clock.h | 98 - arch/arm/mach-s5p64x0/include/mach/regs-gpio.h | 68 - arch/arm/mach-s5p64x0/include/mach/regs-irq.h | 18 - arch/arm/mach-s5p64x0/irq-pm.c | 98 - arch/arm/mach-s5p64x0/mach-smdk6440.c | 280 --- arch/arm/mach-s5p64x0/mach-smdk6450.c | 299 --- arch/arm/mach-s5p64x0/pm.c | 202 -- arch/arm/mach-s5p64x0/setup-fb-24bpp.c | 29 - arch/arm/mach-s5p64x0/setup-i2c0.c | 38 - arch/arm/mach-s5p64x0/setup-i2c1.c | 38 - arch/arm/mach-s5p64x0/setup-sdhci-gpio.c | 104 - arch/arm/mach-s5p64x0/setup-spi.c | 38 - arch/arm/mach-s5pc100/Kconfig | 81 - arch/arm/mach-s5pc100/Makefile | 32 - arch/arm/mach-s5pc100/Makefile.boot | 2 - arch/arm/mach-s5pc100/clock.c | 1361 ------------- arch/arm/mach-s5pc100/common.c | 255 --- arch/arm/mach-s5pc100/common.h | 30 - arch/arm/mach-s5pc100/dev-audio.c | 239 --- arch/arm/mach-s5pc100/dma.c | 130 -- arch/arm/mach-s5pc100/include/mach/debug-macro.S | 39 - arch/arm/mach-s5pc100/include/mach/entry-macro.S | 19 - arch/arm/mach-s5pc100/include/mach/gpio.h | 144 -- arch/arm/mach-s5pc100/include/mach/hardware.h | 14 - arch/arm/mach-s5pc100/include/mach/irqs.h | 115 -- arch/arm/mach-s5pc100/include/mach/map.h | 137 -- arch/arm/mach-s5pc100/include/mach/regs-clock.h | 80 - arch/arm/mach-s5pc100/include/mach/regs-gpio.h | 38 - arch/arm/mach-s5pc100/include/mach/regs-irq.h | 18 - arch/arm/mach-s5pc100/mach-smdkc100.c | 264 --- arch/arm/mach-s5pc100/setup-fb-24bpp.c | 35 - arch/arm/mach-s5pc100/setup-i2c0.c | 28 - arch/arm/mach-s5pc100/setup-i2c1.c | 28 - arch/arm/mach-s5pc100/setup-ide.c | 57 - arch/arm/mach-s5pc100/setup-keypad.c | 23 - arch/arm/mach-s5pc100/setup-sdhci-gpio.c | 70 - arch/arm/mach-s5pc100/setup-spi.c | 41 - arch/arm/mach-s5pv210/Kconfig | 197 +- arch/arm/mach-s5pv210/Makefile | 29 +- arch/arm/mach-s5pv210/Makefile.boot | 2 - arch/arm/mach-s5pv210/clock.c | 1365 ------------- arch/arm/mach-s5pv210/common.c | 279 --- arch/arm/mach-s5pv210/common.h | 21 +- arch/arm/mach-s5pv210/dev-audio.c | 246 --- arch/arm/mach-s5pv210/dma.c | 130 -- arch/arm/mach-s5pv210/include/mach/gpio.h | 140 -- arch/arm/mach-s5pv210/include/mach/hardware.h | 18 - arch/arm/mach-s5pv210/include/mach/irqs.h | 137 -- arch/arm/mach-s5pv210/include/mach/map.h | 158 -- arch/arm/mach-s5pv210/include/mach/memory.h | 25 - arch/arm/mach-s5pv210/include/mach/pm-core.h | 46 - arch/arm/mach-s5pv210/include/mach/regs-clock.h | 2 +- arch/arm/mach-s5pv210/include/mach/regs-gpio.h | 41 - arch/arm/mach-s5pv210/include/mach/regs-irq.h | 18 - arch/arm/mach-s5pv210/mach-aquila.c | 687 ------- arch/arm/mach-s5pv210/mach-goni.c | 916 --------- arch/arm/mach-s5pv210/mach-smdkc110.c | 159 -- arch/arm/mach-s5pv210/mach-smdkv210.c | 337 ---- arch/arm/mach-s5pv210/mach-torbreck.c | 135 -- arch/arm/mach-s5pv210/pm.c | 147 +- arch/arm/mach-s5pv210/s5pv210.c | 77 + arch/arm/mach-s5pv210/setup-fb-24bpp.c | 49 - arch/arm/mach-s5pv210/setup-fimc.c | 43 - arch/arm/mach-s5pv210/setup-i2c0.c | 28 - arch/arm/mach-s5pv210/setup-i2c1.c | 28 - arch/arm/mach-s5pv210/setup-i2c2.c | 28 - arch/arm/mach-s5pv210/setup-ide.c | 39 - arch/arm/mach-s5pv210/setup-keypad.c | 24 - arch/arm/mach-s5pv210/setup-sdhci-gpio.c | 103 - arch/arm/mach-s5pv210/setup-spi.c | 34 - arch/arm/mach-s5pv210/setup-usb-phy.c | 95 - .../s5p-sleep.S => mach-s5pv210/sleep.S} | 19 +- arch/arm/mach-shmobile/Kconfig | 24 +- arch/arm/mach-shmobile/Makefile | 23 +- arch/arm/mach-shmobile/Makefile.boot | 1 - arch/arm/mach-shmobile/board-ape6evm-reference.c | 6 +- arch/arm/mach-shmobile/board-ape6evm.c | 8 +- .../board-armadillo800eva-reference.c | 14 +- arch/arm/mach-shmobile/board-armadillo800eva.c | 43 +- arch/arm/mach-shmobile/board-bockw-reference.c | 6 +- arch/arm/mach-shmobile/board-bockw.c | 8 +- arch/arm/mach-shmobile/board-genmai-reference.c | 10 +- arch/arm/mach-shmobile/board-genmai.c | 10 +- arch/arm/mach-shmobile/board-koelsch-reference.c | 28 +- arch/arm/mach-shmobile/board-koelsch.c | 11 +- arch/arm/mach-shmobile/board-kzm9g-reference.c | 6 +- arch/arm/mach-shmobile/board-kzm9g.c | 8 +- arch/arm/mach-shmobile/board-lager-reference.c | 29 +- arch/arm/mach-shmobile/board-lager.c | 22 +- arch/arm/mach-shmobile/board-mackerel.c | 12 +- arch/arm/mach-shmobile/board-marzen-reference.c | 32 +- arch/arm/mach-shmobile/board-marzen.c | 8 +- arch/arm/mach-shmobile/clock-r7s72100.c | 5 +- arch/arm/mach-shmobile/clock-r8a73a4.c | 11 +- arch/arm/mach-shmobile/clock-r8a7740.c | 28 +- arch/arm/mach-shmobile/clock-r8a7778.c | 12 +- arch/arm/mach-shmobile/clock-r8a7779.c | 27 +- arch/arm/mach-shmobile/clock-r8a7790.c | 8 +- arch/arm/mach-shmobile/clock-r8a7791.c | 6 +- arch/arm/mach-shmobile/clock-sh7372.c | 4 +- arch/arm/mach-shmobile/clock-sh73a0.c | 14 +- arch/arm/mach-shmobile/clock.c | 6 +- arch/arm/mach-shmobile/{include/mach => }/clock.h | 0 arch/arm/mach-shmobile/{include/mach => }/common.h | 9 + arch/arm/mach-shmobile/console.c | 2 +- arch/arm/mach-shmobile/cpufreq.c | 17 + .../{include/mach => }/dma-register.h | 0 arch/arm/mach-shmobile/headsmp.S | 13 +- arch/arm/mach-shmobile/include/mach/irqs.h | 16 +- arch/arm/mach-shmobile/intc-sh7372.c | 5 +- arch/arm/mach-shmobile/intc-sh73a0.c | 9 +- arch/arm/mach-shmobile/{include/mach => }/intc.h | 0 arch/arm/mach-shmobile/irqs.h | 21 + arch/arm/mach-shmobile/platsmp-apmu.c | 71 +- arch/arm/mach-shmobile/platsmp-scu.c | 2 +- arch/arm/mach-shmobile/platsmp.c | 2 +- arch/arm/mach-shmobile/pm-r8a7740.c | 4 +- arch/arm/mach-shmobile/pm-r8a7779.c | 19 +- arch/arm/mach-shmobile/pm-r8a7790.c | 45 +- arch/arm/mach-shmobile/pm-r8a7791.c | 73 + arch/arm/mach-shmobile/pm-rcar.c | 2 +- .../arm/mach-shmobile/{include/mach => }/pm-rcar.h | 0 arch/arm/mach-shmobile/pm-rmobile.c | 2 +- .../mach-shmobile/{include/mach => }/pm-rmobile.h | 0 arch/arm/mach-shmobile/pm-sh7372.c | 8 +- arch/arm/mach-shmobile/pm-sh73a0.c | 2 +- .../mach-shmobile/{include/mach => }/r7s72100.h | 1 - .../arm/mach-shmobile/{include/mach => }/r8a73a4.h | 0 .../arm/mach-shmobile/{include/mach => }/r8a7740.h | 2 - .../arm/mach-shmobile/{include/mach => }/r8a7778.h | 0 .../arm/mach-shmobile/{include/mach => }/r8a7779.h | 14 +- .../arm/mach-shmobile/{include/mach => }/r8a7790.h | 3 - .../arm/mach-shmobile/{include/mach => }/r8a7791.h | 1 + .../mach-shmobile/{include/mach => }/rcar-gen2.h | 1 + arch/arm/mach-shmobile/setup-emev2.c | 19 +- arch/arm/mach-shmobile/setup-r7s72100.c | 15 +- arch/arm/mach-shmobile/setup-r8a73a4.c | 22 +- arch/arm/mach-shmobile/setup-r8a7740.c | 20 +- arch/arm/mach-shmobile/setup-r8a7778.c | 20 +- arch/arm/mach-shmobile/setup-r8a7779.c | 53 +- arch/arm/mach-shmobile/setup-r8a7790.c | 22 +- arch/arm/mach-shmobile/setup-r8a7791.c | 12 +- arch/arm/mach-shmobile/setup-rcar-gen2.c | 76 +- arch/arm/mach-shmobile/setup-sh7372.c | 12 +- arch/arm/mach-shmobile/setup-sh73a0.c | 19 +- arch/arm/mach-shmobile/{include/mach => }/sh7372.h | 4 - arch/arm/mach-shmobile/{include/mach => }/sh73a0.h | 0 arch/arm/mach-shmobile/smp-emev2.c | 2 +- arch/arm/mach-shmobile/smp-r8a7779.c | 8 +- arch/arm/mach-shmobile/smp-r8a7790.c | 36 +- arch/arm/mach-shmobile/smp-r8a7791.c | 30 +- arch/arm/mach-shmobile/smp-sh73a0.c | 6 +- arch/arm/mach-shmobile/timer.c | 50 +- arch/arm/mach-spear/Kconfig | 4 + arch/arm/mach-spear/include/mach/spear.h | 4 +- arch/arm/mach-spear/spear1310.c | 2 +- arch/arm/mach-spear/spear1340.c | 125 +- arch/arm/mach-spear/spear13xx.c | 4 +- arch/arm/mach-sti/platsmp.c | 6 +- arch/arm/mach-sunxi/Kconfig | 8 + arch/arm/mach-sunxi/sunxi.c | 9 + arch/arm/mach-tegra/Makefile | 7 - arch/arm/mach-tegra/apbio.c | 206 -- arch/arm/mach-tegra/apbio.h | 22 - arch/arm/mach-tegra/board-paz00.c | 3 +- arch/arm/mach-tegra/board.h | 7 - arch/arm/mach-tegra/cpuidle-tegra114.c | 10 +- arch/arm/mach-tegra/cpuidle-tegra20.c | 16 +- arch/arm/mach-tegra/cpuidle-tegra30.c | 10 +- arch/arm/mach-tegra/cpuidle.c | 7 +- arch/arm/mach-tegra/flowctrl.c | 11 +- arch/arm/mach-tegra/fuse.c | 252 --- arch/arm/mach-tegra/fuse.h | 79 - arch/arm/mach-tegra/hotplug.c | 30 +- arch/arm/mach-tegra/io.c | 8 +- arch/arm/mach-tegra/irq.c | 8 +- arch/arm/mach-tegra/platsmp.c | 29 +- arch/arm/mach-tegra/pm-tegra20.c | 1 + arch/arm/mach-tegra/pm-tegra30.c | 1 + arch/arm/mach-tegra/pm.c | 63 +- arch/arm/mach-tegra/pm.h | 10 +- arch/arm/mach-tegra/pmc.c | 413 ---- arch/arm/mach-tegra/pmc.h | 49 - arch/arm/mach-tegra/powergate.c | 515 ----- arch/arm/mach-tegra/reset-handler.S | 7 +- arch/arm/mach-tegra/reset.c | 19 +- arch/arm/mach-tegra/sleep-tegra30.S | 7 +- arch/arm/mach-tegra/sleep.h | 3 - arch/arm/mach-tegra/tegra.c | 37 +- arch/arm/mach-ux500/board-mop500-regulators.c | 2 +- arch/arm/mach-ux500/cache-l2x0.c | 18 +- arch/arm/mach-ux500/cpu-db8500.c | 8 +- arch/arm/mach-ux500/cpu.c | 2 +- arch/arm/mach-ux500/timer.c | 2 +- arch/arm/mach-versatile/core.c | 2 +- arch/arm/mach-versatile/versatile_dt.c | 1 - arch/arm/mach-vexpress/Kconfig | 1 - arch/arm/mach-vexpress/ct-ca9x4.c | 3 +- arch/arm/mach-vt8500/vt8500.c | 6 +- arch/arm/mm/Kconfig | 2 +- arch/arm/plat-omap/dma.c | 5 +- arch/arm/plat-samsung/Kconfig | 163 +- arch/arm/plat-samsung/Makefile | 15 - arch/arm/plat-samsung/adc.c | 2 +- arch/arm/plat-samsung/clock-clksrc.c | 212 -- arch/arm/plat-samsung/clock.c | 539 ------ arch/arm/plat-samsung/cpu.c | 3 +- arch/arm/plat-samsung/devs.c | 330 ---- arch/arm/plat-samsung/include/plat/camport.h | 28 - arch/arm/plat-samsung/include/plat/clock-clksrc.h | 83 - arch/arm/plat-samsung/include/plat/clock.h | 152 -- arch/arm/plat-samsung/include/plat/cpu-freq-core.h | 3 - arch/arm/plat-samsung/include/plat/cpu.h | 42 - arch/arm/plat-samsung/include/plat/devs.h | 59 - arch/arm/plat-samsung/include/plat/fb-core.h | 15 - arch/arm/plat-samsung/include/plat/fb.h | 36 - arch/arm/plat-samsung/include/plat/fimc-core.h | 51 - arch/arm/plat-samsung/include/plat/gpio-cfg.h | 64 - arch/arm/plat-samsung/include/plat/gpio-core.h | 3 + arch/arm/plat-samsung/include/plat/hdmi.h | 16 - arch/arm/plat-samsung/include/plat/irqs.h | 72 - arch/arm/plat-samsung/include/plat/map-s5p.h | 1 - arch/arm/plat-samsung/include/plat/mfc.h | 35 - arch/arm/plat-samsung/include/plat/pll.h | 323 --- arch/arm/plat-samsung/include/plat/s5p-clock.h | 65 - arch/arm/plat-samsung/include/plat/sdhci.h | 124 -- arch/arm/plat-samsung/include/plat/tv-core.h | 44 - arch/arm/plat-samsung/init.c | 1 - arch/arm/plat-samsung/pm-gpio.c | 6 +- arch/arm/plat-samsung/s5p-clock.c | 294 --- arch/arm/plat-samsung/s5p-dev-mfc.c | 81 +- arch/arm/plat-samsung/s5p-dev-uart.c | 88 - arch/arm/plat-samsung/s5p-irq-eint.c | 221 --- arch/arm/plat-samsung/s5p-irq-gpioint.c | 218 --- arch/arm/plat-samsung/s5p-irq-pm.c | 92 - arch/arm/plat-samsung/s5p-irq.c | 31 - arch/arm/plat-samsung/s5p-pm.c | 40 - arch/arm/plat-versatile/Kconfig | 3 - arch/arm/plat-versatile/Makefile | 1 - arch/arm/plat-versatile/include/plat/clcd.h | 9 - arch/avr32/boards/atngw100/mrmt.c | 34 +- arch/avr32/boards/favr-32/setup.c | 48 +- arch/avr32/boards/merisc/setup.c | 34 +- arch/avr32/configs/atngw100_mrmt_defconfig | 5 +- arch/avr32/configs/atstk1002_defconfig | 5 +- arch/avr32/configs/atstk1003_defconfig | 5 +- arch/avr32/configs/atstk1004_defconfig | 5 +- arch/avr32/configs/atstk1006_defconfig | 5 +- arch/avr32/configs/favr-32_defconfig | 6 +- arch/avr32/configs/merisc_defconfig | 5 +- arch/avr32/mach-at32ap/at32ap700x.c | 7 +- drivers/amba/tegra-ahb.c | 3 +- drivers/bus/Kconfig | 8 + drivers/bus/Makefile | 4 +- drivers/bus/arm-cci.c | 3 +- drivers/bus/arm-ccn.c | 1390 +++++++++++++ drivers/bus/imx-weim.c | 4 +- drivers/clk/clk-composite.c | 79 +- drivers/clk/mvebu/clk-cpu.c | 80 +- drivers/clk/rockchip/Makefile | 6 + drivers/clk/rockchip/clk-pll.c | 431 ++++ drivers/clk/rockchip/clk-rk3188.c | 672 +++++++ drivers/clk/rockchip/clk-rk3288.c | 717 +++++++ drivers/clk/rockchip/clk.c | 244 +++ drivers/clk/rockchip/clk.h | 347 ++++ drivers/clk/rockchip/softrst.c | 118 ++ drivers/clk/samsung/Makefile | 1 + drivers/clk/samsung/clk-s5pv210-audss.c | 241 +++ drivers/clk/samsung/clk-s5pv210.c | 856 ++++++++ drivers/clk/tegra/clk-periph-gate.c | 3 +- drivers/clk/tegra/clk-tegra30.c | 5 +- drivers/clk/tegra/clk.c | 3 +- drivers/clk/versatile/Makefile | 3 +- .../{clk-integrator.c => clk-versatile.c} | 38 +- drivers/clocksource/tegra20_timer.c | 13 + drivers/cpufreq/s3c2410-cpufreq.c | 2 - drivers/cpufreq/s3c2412-cpufreq.c | 3 - drivers/cpufreq/s3c2440-cpufreq.c | 3 - drivers/cpufreq/s3c24xx-cpufreq.c | 1 - drivers/cpufreq/s5pv210-cpufreq.c | 131 +- drivers/cpuidle/Kconfig.arm | 14 +- drivers/cpuidle/Makefile | 2 +- drivers/cpuidle/cpuidle-armada-370-xp.c | 93 - drivers/cpuidle/cpuidle-big_little.c | 12 +- drivers/cpuidle/cpuidle-mvebu-v7.c | 150 ++ drivers/gpio/gpio-samsung.c | 965 --------- drivers/gpu/drm/tegra/gr3d.c | 3 +- drivers/gpu/drm/tegra/sor.c | 3 +- drivers/iommu/tegra-smmu.c | 3 +- drivers/irqchip/Kconfig | 1 - drivers/irqchip/irq-crossbar.c | 168 +- drivers/irqchip/irq-versatile-fpga.c | 18 +- drivers/leds/Kconfig | 8 - drivers/leds/Makefile | 1 - drivers/leds/leds-atmel-pwm.c | 149 -- drivers/mailbox/Kconfig | 19 +- drivers/mailbox/Makefile | 6 +- drivers/mailbox/mailbox-omap1.c | 203 -- drivers/mailbox/mailbox-omap2.c | 357 ---- drivers/mailbox/omap-mailbox.c | 444 ++++- drivers/mailbox/omap-mbox.h | 67 - drivers/misc/Kconfig | 10 - drivers/misc/Makefile | 1 - drivers/misc/atmel_pwm.c | 402 ---- drivers/misc/fuse/Makefile | 1 + drivers/mtd/onenand/Kconfig | 4 +- drivers/mtd/onenand/samsung.c | 25 +- drivers/pci/host/Kconfig | 8 + drivers/pci/host/Makefile | 1 + drivers/pci/host/pci-tegra.c | 227 ++- drivers/pci/host/pcie-spear13xx.c | 393 ++++ drivers/phy/Kconfig | 22 + drivers/phy/Makefile | 3 + drivers/phy/phy-s5pv210-usb2.c | 187 ++ drivers/phy/phy-samsung-usb2.c | 6 + drivers/phy/phy-samsung-usb2.h | 1 + drivers/phy/phy-spear1310-miphy.c | 274 +++ drivers/phy/phy-spear1340-miphy.c | 307 +++ drivers/pinctrl/Kconfig | 6 + drivers/pinctrl/Makefile | 1 + drivers/pinctrl/pinctrl-tegra-xusb.c | 973 ++++++++++ drivers/power/reset/Kconfig | 6 + drivers/power/reset/Makefile | 1 + drivers/power/reset/hisi-reboot.c | 67 + drivers/pwm/Kconfig | 2 +- drivers/soc/Makefile | 1 + drivers/soc/tegra/Makefile | 4 + drivers/soc/tegra/common.c | 30 + drivers/soc/tegra/fuse/Makefile | 8 + drivers/soc/tegra/fuse/fuse-tegra.c | 163 ++ drivers/soc/tegra/fuse/fuse-tegra20.c | 215 ++ drivers/soc/tegra/fuse/fuse-tegra30.c | 224 +++ drivers/soc/tegra/fuse/fuse.h | 71 + .../soc/tegra/fuse/speedo-tegra114.c | 56 +- drivers/soc/tegra/fuse/speedo-tegra124.c | 168 ++ .../soc/tegra/fuse/speedo-tegra20.c | 45 +- .../soc/tegra/fuse/speedo-tegra30.c | 176 +- drivers/soc/tegra/fuse/tegra-apbmisc.c | 115 ++ drivers/soc/tegra/pmc.c | 957 +++++++++ drivers/spi/spi-s3c64xx.c | 22 - drivers/tty/serial/samsung.c | 4 - drivers/video/backlight/Kconfig | 11 - drivers/video/backlight/Makefile | 1 - drivers/video/backlight/atmel-pwm-bl.c | 223 --- drivers/video/fbdev/Kconfig | 10 +- drivers/video/fbdev/Makefile | 1 + .../video/fbdev/amba-clcd-versatile.c | 2 +- drivers/video/fbdev/s3c-fb.c | 65 - include/dt-bindings/clock/imx1-clock.h | 40 + include/dt-bindings/clock/imx21-clock.h | 80 + include/dt-bindings/clock/imx27-clock.h | 108 ++ include/dt-bindings/clock/imx6qdl-clock.h | 224 +++ include/dt-bindings/clock/r8a7790-clock.h | 27 + include/dt-bindings/clock/r8a7791-clock.h | 27 + .../dt-bindings/clock/rk3066a-cru.h | 31 +- include/dt-bindings/clock/rk3188-cru-common.h | 249 +++ include/dt-bindings/clock/rk3188-cru.h | 51 + include/dt-bindings/clock/rk3288-cru.h | 278 +++ include/dt-bindings/clock/s5pv210-audss.h | 34 + include/dt-bindings/clock/s5pv210.h | 239 +++ include/dt-bindings/clock/vf610-clock.h | 4 +- include/dt-bindings/pinctrl/pinctrl-tegra-xusb.h | 7 + include/linux/atmel-pwm-bl.h | 43 - include/linux/atmel_pwm.h | 70 - include/linux/mvebu-pmsu.h | 20 + include/linux/omap-dma.h | 1 + include/linux/platform_data/camera-mx1.h | 35 - include/linux/platform_data/usb-ehci-mxc.h | 46 - include/linux/platform_data/usb-imx_udc.h | 23 - include/linux/platform_data/video-clcd-versatile.h | 27 + include/linux/tegra-soc.h | 22 - include/{linux/tegra-ahb.h => soc/tegra/ahb.h} | 6 +- .../mach/hardware.h => include/soc/tegra/common.h | 10 +- .../{linux/tegra-cpuidle.h => soc/tegra/cpuidle.h} | 6 +- include/soc/tegra/fuse.h | 65 + include/soc/tegra/pm.h | 38 + .../{linux/tegra-powergate.h => soc/tegra/pmc.h} | 31 +- include/video/samsung_fimd.h | 2 +- init/calibrate.c | 11 + sound/soc/samsung/goni_wm8994.c | 2 +- 1030 files changed, 43033 insertions(+), 42302 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-driver-tegra-fuse create mode 100644 Documentation/arm/CCN.txt create mode 100644 Documentation/devicetree/bindings/arm/adapteva.txt create mode 100644 Documentation/devicetree/bindings/arm/armada-380-mpcore-soc-ctrl.txt create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351-cpu-method create mode 100644 Documentation/devicetree/bindings/arm/brcm-brcmstb.txt create mode 100644 Documentation/devicetree/bindings/arm/ccn.txt create mode 100644 Documentation/devicetree/bindings/arm/cpu-enable-method/marvell,berlin-smp create mode 100644 Documentation/devicetree/bindings/arm/mediatek.txt create mode 100644 Documentation/devicetree/bindings/arm/omap/prcm.txt create mode 100644 Documentation/devicetree/bindings/arm/spear-misc.txt create mode 100644 Documentation/devicetree/bindings/clock/clk-s5pv210-audss.txt create mode 100644 Documentation/devicetree/bindings/clock/imx1-clock.txt create mode 100644 Documentation/devicetree/bindings/clock/imx21-clock.txt create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3188-cru.txt create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3288-cru.txt create mode 100644 Documentation/devicetree/bindings/clock/samsung,s5pv210-clock.txt create mode 100644 Documentation/devicetree/bindings/fuse/nvidia,tegra20-fuse.txt create mode 100644 Documentation/devicetree/bindings/gpu/nvidia,gk20a.txt create mode 100644 Documentation/devicetree/bindings/misc/nvidia,tegra20-apbmisc.txt create mode 100644 Documentation/devicetree/bindings/pci/spear13xx-pcie.txt create mode 100644 Documentation/devicetree/bindings/phy/st-spear-miphy.txt create mode 100644 Documentation/devicetree/bindings/pinctrl/nvidia,tegra124-xusb-padctl.txt create mode 100644 Documentation/devicetree/bindings/serial/cdns,uart.txt create mode 100644 arch/arm/arm-soc-for-next-contents.txt create mode 100644 arch/arm/boot/dts/am335x-pepper.dts create mode 100644 arch/arm/boot/dts/am437x-sk-evm.dts create mode 100644 arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts create mode 100644 arch/arm/boot/dts/bcm7445-bcm97445svmb.dts create mode 100644 arch/arm/boot/dts/bcm7445.dtsi create mode 100644 arch/arm/boot/dts/cros-ec-keyboard.dtsi create mode 100644 arch/arm/boot/dts/dove-cubox-es.dts create mode 100644 arch/arm/boot/dts/exynos4412-odroid-common.dtsi create mode 100644 arch/arm/boot/dts/exynos4412-odroidu3.dts create mode 100644 arch/arm/boot/dts/exynos4412-odroidx2.dts create mode 100644 arch/arm/boot/dts/hisi-x5hd2-dkb.dts create mode 100644 arch/arm/boot/dts/hisi-x5hd2.dtsi create mode 100644 arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts create mode 100644 arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-dvi-svga.dts create mode 100644 arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dts create mode 100644 arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi create mode 100644 arch/arm/boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts create mode 100644 arch/arm/boot/dts/imx28-m28.dtsi create mode 100644 arch/arm/boot/dts/imx53-m53.dtsi create mode 100644 arch/arm/boot/dts/imx6dl-aristainetos_4.dts create mode 100644 arch/arm/boot/dts/imx6dl-aristainetos_7.dts create mode 100644 arch/arm/boot/dts/imx6dl-rex-basic.dts create mode 100644 arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts create mode 100644 arch/arm/boot/dts/imx6dl-tx6u-801x.dts create mode 100644 arch/arm/boot/dts/imx6dl-tx6u-811x.dts create mode 100644 arch/arm/boot/dts/imx6dl-wandboard-revb1.dts create mode 100644 arch/arm/boot/dts/imx6q-rex-pro.dts create mode 100644 arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts create mode 100644 arch/arm/boot/dts/imx6q-tx6q-1010.dts create mode 100644 arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts create mode 100644 arch/arm/boot/dts/imx6q-tx6q-1020.dts create mode 100644 arch/arm/boot/dts/imx6q-tx6q-1110.dts create mode 100644 arch/arm/boot/dts/imx6q-wandboard-revb1.dts create mode 100644 arch/arm/boot/dts/imx6qdl-aristainetos.dtsi create mode 100644 arch/arm/boot/dts/imx6qdl-rex.dtsi create mode 100644 arch/arm/boot/dts/imx6qdl-tx6.dtsi create mode 100644 arch/arm/boot/dts/imx6qdl-wandboard-revb1.dtsi create mode 100644 arch/arm/boot/dts/imx6qdl-wandboard-revc1.dtsi create mode 100644 arch/arm/boot/dts/imx6sx-pinfunc.h create mode 100644 arch/arm/boot/dts/imx6sx-sdb.dts create mode 100644 arch/arm/boot/dts/imx6sx.dtsi create mode 100644 arch/arm/boot/dts/kirkwood-d2net.dts create mode 100644 arch/arm/boot/dts/kirkwood-net2big.dts create mode 100644 arch/arm/boot/dts/kirkwood-net5big.dts create mode 100644 arch/arm/boot/dts/kirkwood-netxbig.dtsi rename arch/arm/{mach-s5pc100/include/mach/dma.h => boot/dts/mt6589-aquaris5.dts} (53%) create mode 100644 arch/arm/boot/dts/mt6589.dtsi delete mode 100644 arch/arm/boot/dts/r8a7779-marzen-reference.dts delete mode 100644 arch/arm/boot/dts/rk3066a-clocks.dtsi delete mode 100644 arch/arm/boot/dts/rk3188-clocks.dtsi create mode 100644 arch/arm/boot/dts/rk3288-evb-act8846.dts create mode 100644 arch/arm/boot/dts/rk3288-evb-rk808.dts create mode 100644 arch/arm/boot/dts/rk3288-evb.dtsi create mode 100644 arch/arm/boot/dts/rk3288.dtsi create mode 100644 arch/arm/boot/dts/s5pv210-aquila.dts create mode 100644 arch/arm/boot/dts/s5pv210-goni.dts create mode 100644 arch/arm/boot/dts/s5pv210-pinctrl.dtsi create mode 100644 arch/arm/boot/dts/s5pv210-smdkc110.dts create mode 100644 arch/arm/boot/dts/s5pv210-smdkv210.dts create mode 100644 arch/arm/boot/dts/s5pv210-torbreck.dts create mode 100644 arch/arm/boot/dts/s5pv210.dtsi create mode 100644 arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts create mode 100644 arch/arm/boot/dts/sun6i-a31-hummingbird.dts create mode 100644 arch/arm/boot/dts/sun7i-a20-pcduino3.dts create mode 100644 arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts create mode 100644 arch/arm/boot/dts/sun8i-a23.dtsi create mode 100644 arch/arm/boot/dts/tegra30-apalis-eval.dts create mode 100644 arch/arm/boot/dts/tegra30-apalis.dtsi create mode 100644 arch/arm/boot/dts/zynq-parallella.dts delete mode 100644 arch/arm/configs/genmai_defconfig delete mode 100644 arch/arm/configs/kirkwood_defconfig delete mode 100644 arch/arm/configs/s5p64x0_defconfig delete mode 100644 arch/arm/configs/s5pc100_defconfig create mode 100644 arch/arm/include/debug/clps711x.S rename arch/arm/{mach-s5pv210/include/mach/debug-macro.S => include/debug/s5pv210.S} (62%) create mode 100644 arch/arm/mach-bcm/brcmstb.c create mode 100644 arch/arm/mach-bcm/brcmstb.h create mode 100644 arch/arm/mach-bcm/headsmp-brcmstb.S create mode 100644 arch/arm/mach-bcm/kona_smp.c create mode 100644 arch/arm/mach-bcm/platsmp-brcmstb.c create mode 100644 arch/arm/mach-berlin/headsmp.S create mode 100644 arch/arm/mach-berlin/platsmp.c delete mode 100644 arch/arm/mach-clps711x/include/mach/debug-macro.S create mode 100644 arch/arm/mach-exynos/regs-sys.h create mode 100644 arch/arm/mach-hisi/headsmp.S delete mode 100644 arch/arm/mach-imx/crm-regs-imx5.h delete mode 100644 arch/arm/mach-imx/devices-imx51.h delete mode 100644 arch/arm/mach-imx/devices/platform-imx_udc.c delete mode 100644 arch/arm/mach-imx/devices/platform-mx1-camera.c delete mode 100644 arch/arm/mach-imx/ehci-imx5.c create mode 100644 arch/arm/mach-imx/ehci.h delete mode 100644 arch/arm/mach-imx/iomux-mx51.h delete mode 100644 arch/arm/mach-imx/mach-imx27ipcam.c delete mode 100644 arch/arm/mach-imx/mach-imx27lite.c rename arch/arm/mach-imx/{imx51-dt.c => mach-imx51.c} (51%) delete mode 100644 arch/arm/mach-imx/mm-imx5.c delete mode 100644 arch/arm/mach-imx/mx1-camera-fiq-ksym.c delete mode 100644 arch/arm/mach-imx/mx1-camera-fiq.S delete mode 100644 arch/arm/mach-imx/mx51.h delete mode 100644 arch/arm/mach-imx/mx53.h delete mode 100644 arch/arm/mach-integrator/include/mach/memory.h delete mode 100644 arch/arm/mach-kirkwood/Kconfig delete mode 100644 arch/arm/mach-kirkwood/Makefile delete mode 100644 arch/arm/mach-kirkwood/Makefile.boot delete mode 100644 arch/arm/mach-kirkwood/board-dt.c delete mode 100644 arch/arm/mach-kirkwood/common.c delete mode 100644 arch/arm/mach-kirkwood/common.h delete mode 100644 arch/arm/mach-kirkwood/d2net_v2-setup.c delete mode 100644 arch/arm/mach-kirkwood/include/mach/bridge-regs.h delete mode 100644 arch/arm/mach-kirkwood/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-kirkwood/include/mach/irqs.h delete mode 100644 arch/arm/mach-kirkwood/include/mach/kirkwood.h delete mode 100644 arch/arm/mach-kirkwood/include/mach/uncompress.h delete mode 100644 arch/arm/mach-kirkwood/irq.c delete mode 100644 arch/arm/mach-kirkwood/lacie_v2-common.c delete mode 100644 arch/arm/mach-kirkwood/lacie_v2-common.h delete mode 100644 arch/arm/mach-kirkwood/mpp.c delete mode 100644 arch/arm/mach-kirkwood/mpp.h delete mode 100644 arch/arm/mach-kirkwood/netxbig_v2-setup.c delete mode 100644 arch/arm/mach-kirkwood/openrd-setup.c delete mode 100644 arch/arm/mach-kirkwood/pcie.c delete mode 100644 arch/arm/mach-kirkwood/pm.c delete mode 100644 arch/arm/mach-kirkwood/pm.h delete mode 100644 arch/arm/mach-kirkwood/rd88f6192-nas-setup.c delete mode 100644 arch/arm/mach-kirkwood/rd88f6281-setup.c delete mode 100644 arch/arm/mach-kirkwood/t5325-setup.c delete mode 100644 arch/arm/mach-kirkwood/ts219-setup.c delete mode 100644 arch/arm/mach-kirkwood/ts41x-setup.c delete mode 100644 arch/arm/mach-kirkwood/tsx1x-common.c delete mode 100644 arch/arm/mach-kirkwood/tsx1x-common.h create mode 100644 arch/arm/mach-mediatek/Kconfig create mode 100644 arch/arm/mach-mediatek/Makefile rename arch/arm/{mach-s5pv210/include/mach/dma.h => mach-mediatek/mediatek.c} (53%) delete mode 100644 arch/arm/mach-mvebu/hotplug.c create mode 100644 arch/arm/mach-mvebu/netxbig.c delete mode 100644 arch/arm/mach-omap2/cclock2420_data.c delete mode 100644 arch/arm/mach-omap2/cclock2430_data.c delete mode 100644 arch/arm/mach-omap2/clkt2xxx_osc.c delete mode 100644 arch/arm/mach-omap2/clkt2xxx_sys.c delete mode 100644 arch/arm/mach-omap2/ctrl_module_core_44xx.h delete mode 100644 arch/arm/mach-omap2/ctrl_module_pad_core_44xx.h delete mode 100644 arch/arm/mach-omap2/ctrl_module_pad_wkup_44xx.h create mode 100644 arch/arm/mach-omap2/omap_hwmod_common_ipblock_data.c delete mode 100644 arch/arm/mach-s5p64x0/Kconfig delete mode 100644 arch/arm/mach-s5p64x0/Makefile delete mode 100644 arch/arm/mach-s5p64x0/Makefile.boot delete mode 100644 arch/arm/mach-s5p64x0/clock-s5p6440.c delete mode 100644 arch/arm/mach-s5p64x0/clock-s5p6450.c delete mode 100644 arch/arm/mach-s5p64x0/clock.c delete mode 100644 arch/arm/mach-s5p64x0/clock.h delete mode 100644 arch/arm/mach-s5p64x0/common.c delete mode 100644 arch/arm/mach-s5p64x0/common.h delete mode 100644 arch/arm/mach-s5p64x0/dev-audio.c delete mode 100644 arch/arm/mach-s5p64x0/dma.c delete mode 100644 arch/arm/mach-s5p64x0/i2c.h delete mode 100644 arch/arm/mach-s5p64x0/include/mach/debug-macro.S delete mode 100644 arch/arm/mach-s5p64x0/include/mach/gpio.h delete mode 100644 arch/arm/mach-s5p64x0/include/mach/hardware.h delete mode 100644 arch/arm/mach-s5p64x0/include/mach/irqs.h delete mode 100644 arch/arm/mach-s5p64x0/include/mach/map.h delete mode 100644 arch/arm/mach-s5p64x0/include/mach/pm-core.h delete mode 100644 arch/arm/mach-s5p64x0/include/mach/regs-clock.h delete mode 100644 arch/arm/mach-s5p64x0/include/mach/regs-gpio.h delete mode 100644 arch/arm/mach-s5p64x0/include/mach/regs-irq.h delete mode 100644 arch/arm/mach-s5p64x0/irq-pm.c delete mode 100644 arch/arm/mach-s5p64x0/mach-smdk6440.c delete mode 100644 arch/arm/mach-s5p64x0/mach-smdk6450.c delete mode 100644 arch/arm/mach-s5p64x0/pm.c delete mode 100644 arch/arm/mach-s5p64x0/setup-fb-24bpp.c delete mode 100644 arch/arm/mach-s5p64x0/setup-i2c0.c delete mode 100644 arch/arm/mach-s5p64x0/setup-i2c1.c delete mode 100644 arch/arm/mach-s5p64x0/setup-sdhci-gpio.c delete mode 100644 arch/arm/mach-s5p64x0/setup-spi.c delete mode 100644 arch/arm/mach-s5pc100/Kconfig delete mode 100644 arch/arm/mach-s5pc100/Makefile delete mode 100644 arch/arm/mach-s5pc100/Makefile.boot delete mode 100644 arch/arm/mach-s5pc100/clock.c delete mode 100644 arch/arm/mach-s5pc100/common.c delete mode 100644 arch/arm/mach-s5pc100/common.h delete mode 100644 arch/arm/mach-s5pc100/dev-audio.c delete mode 100644 arch/arm/mach-s5pc100/dma.c delete mode 100644 arch/arm/mach-s5pc100/include/mach/debug-macro.S delete mode 100644 arch/arm/mach-s5pc100/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-s5pc100/include/mach/gpio.h delete mode 100644 arch/arm/mach-s5pc100/include/mach/hardware.h delete mode 100644 arch/arm/mach-s5pc100/include/mach/irqs.h delete mode 100644 arch/arm/mach-s5pc100/include/mach/map.h delete mode 100644 arch/arm/mach-s5pc100/include/mach/regs-clock.h delete mode 100644 arch/arm/mach-s5pc100/include/mach/regs-gpio.h delete mode 100644 arch/arm/mach-s5pc100/include/mach/regs-irq.h delete mode 100644 arch/arm/mach-s5pc100/mach-smdkc100.c delete mode 100644 arch/arm/mach-s5pc100/setup-fb-24bpp.c delete mode 100644 arch/arm/mach-s5pc100/setup-i2c0.c delete mode 100644 arch/arm/mach-s5pc100/setup-i2c1.c delete mode 100644 arch/arm/mach-s5pc100/setup-ide.c delete mode 100644 arch/arm/mach-s5pc100/setup-keypad.c delete mode 100644 arch/arm/mach-s5pc100/setup-sdhci-gpio.c delete mode 100644 arch/arm/mach-s5pc100/setup-spi.c delete mode 100644 arch/arm/mach-s5pv210/Makefile.boot delete mode 100644 arch/arm/mach-s5pv210/clock.c delete mode 100644 arch/arm/mach-s5pv210/common.c delete mode 100644 arch/arm/mach-s5pv210/dev-audio.c delete mode 100644 arch/arm/mach-s5pv210/dma.c delete mode 100644 arch/arm/mach-s5pv210/include/mach/gpio.h delete mode 100644 arch/arm/mach-s5pv210/include/mach/hardware.h delete mode 100644 arch/arm/mach-s5pv210/include/mach/irqs.h delete mode 100644 arch/arm/mach-s5pv210/include/mach/map.h delete mode 100644 arch/arm/mach-s5pv210/include/mach/memory.h delete mode 100644 arch/arm/mach-s5pv210/include/mach/pm-core.h delete mode 100644 arch/arm/mach-s5pv210/include/mach/regs-gpio.h delete mode 100644 arch/arm/mach-s5pv210/include/mach/regs-irq.h delete mode 100644 arch/arm/mach-s5pv210/mach-aquila.c delete mode 100644 arch/arm/mach-s5pv210/mach-goni.c delete mode 100644 arch/arm/mach-s5pv210/mach-smdkc110.c delete mode 100644 arch/arm/mach-s5pv210/mach-smdkv210.c delete mode 100644 arch/arm/mach-s5pv210/mach-torbreck.c create mode 100644 arch/arm/mach-s5pv210/s5pv210.c delete mode 100644 arch/arm/mach-s5pv210/setup-fb-24bpp.c delete mode 100644 arch/arm/mach-s5pv210/setup-fimc.c delete mode 100644 arch/arm/mach-s5pv210/setup-i2c0.c delete mode 100644 arch/arm/mach-s5pv210/setup-i2c1.c delete mode 100644 arch/arm/mach-s5pv210/setup-i2c2.c delete mode 100644 arch/arm/mach-s5pv210/setup-ide.c delete mode 100644 arch/arm/mach-s5pv210/setup-keypad.c delete mode 100644 arch/arm/mach-s5pv210/setup-sdhci-gpio.c delete mode 100644 arch/arm/mach-s5pv210/setup-spi.c delete mode 100644 arch/arm/mach-s5pv210/setup-usb-phy.c rename arch/arm/{plat-samsung/s5p-sleep.S => mach-s5pv210/sleep.S} (53%) rename arch/arm/mach-shmobile/{include/mach => }/clock.h (100%) rename arch/arm/mach-shmobile/{include/mach => }/common.h (88%) create mode 100644 arch/arm/mach-shmobile/cpufreq.c rename arch/arm/mach-shmobile/{include/mach => }/dma-register.h (100%) rename arch/arm/mach-shmobile/{include/mach => }/intc.h (100%) create mode 100644 arch/arm/mach-shmobile/irqs.h create mode 100644 arch/arm/mach-shmobile/pm-r8a7791.c rename arch/arm/mach-shmobile/{include/mach => }/pm-rcar.h (100%) rename arch/arm/mach-shmobile/{include/mach => }/pm-rmobile.h (100%) rename arch/arm/mach-shmobile/{include/mach => }/r7s72100.h (82%) rename arch/arm/mach-shmobile/{include/mach => }/r8a73a4.h (100%) rename arch/arm/mach-shmobile/{include/mach => }/r8a7740.h (98%) rename arch/arm/mach-shmobile/{include/mach => }/r8a7778.h (100%) rename arch/arm/mach-shmobile/{include/mach => }/r8a7779.h (74%) rename arch/arm/mach-shmobile/{include/mach => }/r8a7790.h (93%) rename arch/arm/mach-shmobile/{include/mach => }/r8a7791.h (90%) rename arch/arm/mach-shmobile/{include/mach => }/rcar-gen2.h (85%) rename arch/arm/mach-shmobile/{include/mach => }/sh7372.h (96%) rename arch/arm/mach-shmobile/{include/mach => }/sh73a0.h (100%) delete mode 100644 arch/arm/mach-tegra/apbio.c delete mode 100644 arch/arm/mach-tegra/apbio.h delete mode 100644 arch/arm/mach-tegra/fuse.c delete mode 100644 arch/arm/mach-tegra/fuse.h delete mode 100644 arch/arm/mach-tegra/pmc.c delete mode 100644 arch/arm/mach-tegra/pmc.h delete mode 100644 arch/arm/mach-tegra/powergate.c delete mode 100644 arch/arm/plat-samsung/clock-clksrc.c delete mode 100644 arch/arm/plat-samsung/clock.c delete mode 100644 arch/arm/plat-samsung/include/plat/camport.h delete mode 100644 arch/arm/plat-samsung/include/plat/clock-clksrc.h delete mode 100644 arch/arm/plat-samsung/include/plat/clock.h delete mode 100644 arch/arm/plat-samsung/include/plat/fimc-core.h delete mode 100644 arch/arm/plat-samsung/include/plat/hdmi.h delete mode 100644 arch/arm/plat-samsung/include/plat/irqs.h delete mode 100644 arch/arm/plat-samsung/include/plat/mfc.h delete mode 100644 arch/arm/plat-samsung/include/plat/pll.h delete mode 100644 arch/arm/plat-samsung/include/plat/s5p-clock.h delete mode 100644 arch/arm/plat-samsung/include/plat/tv-core.h delete mode 100644 arch/arm/plat-samsung/s5p-clock.c delete mode 100644 arch/arm/plat-samsung/s5p-dev-uart.c delete mode 100644 arch/arm/plat-samsung/s5p-irq-eint.c delete mode 100644 arch/arm/plat-samsung/s5p-irq-gpioint.c delete mode 100644 arch/arm/plat-samsung/s5p-irq-pm.c delete mode 100644 arch/arm/plat-samsung/s5p-irq.c delete mode 100644 arch/arm/plat-samsung/s5p-pm.c delete mode 100644 arch/arm/plat-versatile/include/plat/clcd.h create mode 100644 drivers/bus/arm-ccn.c create mode 100644 drivers/clk/rockchip/clk-pll.c create mode 100644 drivers/clk/rockchip/clk-rk3188.c create mode 100644 drivers/clk/rockchip/clk-rk3288.c create mode 100644 drivers/clk/rockchip/clk.c create mode 100644 drivers/clk/rockchip/clk.h create mode 100644 drivers/clk/rockchip/softrst.c create mode 100644 drivers/clk/samsung/clk-s5pv210-audss.c create mode 100644 drivers/clk/samsung/clk-s5pv210.c rename drivers/clk/versatile/{clk-integrator.c => clk-versatile.c} (63%) delete mode 100644 drivers/cpuidle/cpuidle-armada-370-xp.c create mode 100644 drivers/cpuidle/cpuidle-mvebu-v7.c delete mode 100644 drivers/leds/leds-atmel-pwm.c delete mode 100644 drivers/mailbox/mailbox-omap1.c delete mode 100644 drivers/mailbox/mailbox-omap2.c delete mode 100644 drivers/mailbox/omap-mbox.h delete mode 100644 drivers/misc/atmel_pwm.c create mode 100644 drivers/misc/fuse/Makefile create mode 100644 drivers/pci/host/pcie-spear13xx.c create mode 100644 drivers/phy/phy-s5pv210-usb2.c create mode 100644 drivers/phy/phy-spear1310-miphy.c create mode 100644 drivers/phy/phy-spear1340-miphy.c create mode 100644 drivers/pinctrl/pinctrl-tegra-xusb.c create mode 100644 drivers/power/reset/hisi-reboot.c create mode 100644 drivers/soc/tegra/Makefile create mode 100644 drivers/soc/tegra/common.c create mode 100644 drivers/soc/tegra/fuse/Makefile create mode 100644 drivers/soc/tegra/fuse/fuse-tegra.c create mode 100644 drivers/soc/tegra/fuse/fuse-tegra20.c create mode 100644 drivers/soc/tegra/fuse/fuse-tegra30.c create mode 100644 drivers/soc/tegra/fuse/fuse.h rename arch/arm/mach-tegra/tegra114_speedo.c => drivers/soc/tegra/fuse/speedo-tegra114.c (55%) create mode 100644 drivers/soc/tegra/fuse/speedo-tegra124.c rename arch/arm/mach-tegra/tegra20_speedo.c => drivers/soc/tegra/fuse/speedo-tegra20.c (67%) rename arch/arm/mach-tegra/tegra30_speedo.c => drivers/soc/tegra/fuse/speedo-tegra30.c (52%) create mode 100644 drivers/soc/tegra/fuse/tegra-apbmisc.c create mode 100644 drivers/soc/tegra/pmc.c delete mode 100644 drivers/video/backlight/atmel-pwm-bl.c rename arch/arm/plat-versatile/clcd.c => drivers/video/fbdev/amba-clcd-versatile.c (98%) create mode 100644 include/dt-bindings/clock/imx1-clock.h create mode 100644 include/dt-bindings/clock/imx21-clock.h create mode 100644 include/dt-bindings/clock/imx27-clock.h create mode 100644 include/dt-bindings/clock/imx6qdl-clock.h rename arch/arm/mach-s5p64x0/include/mach/dma.h => include/dt-bindings/clock/rk3066a-cru.h (52%) create mode 100644 include/dt-bindings/clock/rk3188-cru-common.h create mode 100644 include/dt-bindings/clock/rk3188-cru.h create mode 100644 include/dt-bindings/clock/rk3288-cru.h create mode 100644 include/dt-bindings/clock/s5pv210-audss.h create mode 100644 include/dt-bindings/clock/s5pv210.h create mode 100644 include/dt-bindings/pinctrl/pinctrl-tegra-xusb.h delete mode 100644 include/linux/atmel-pwm-bl.h delete mode 100644 include/linux/atmel_pwm.h create mode 100644 include/linux/mvebu-pmsu.h delete mode 100644 include/linux/platform_data/camera-mx1.h delete mode 100644 include/linux/platform_data/usb-imx_udc.h create mode 100644 include/linux/platform_data/video-clcd-versatile.h delete mode 100644 include/linux/tegra-soc.h rename include/{linux/tegra-ahb.h => soc/tegra/ahb.h} (86%) rename arch/arm/mach-kirkwood/include/mach/hardware.h => include/soc/tegra/common.h (54%) rename include/{linux/tegra-cpuidle.h => soc/tegra/cpuidle.h} (86%) create mode 100644 include/soc/tegra/fuse.h create mode 100644 include/soc/tegra/pm.h rename include/{linux/tegra-powergate.h => soc/tegra/pmc.h} (82%) Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6) $ git merge bcm2835/for-next Already up-to-date. Merging berlin/berlin/for-next (251f72d06c59 Merge branch 'berlin/soc' into berlin/for-next) $ git merge berlin/berlin/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging cortex-m/for-next (f0d7515372ff ARM: v7m: add trivial suspend support) $ git merge cortex-m/for-next Already up-to-date. 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 (5424d6fd48e6 Merge branch 'imx/cleanup' into for-next) $ git merge imx-mxs/for-next Auto-merging arch/arm/mach-imx/suspend-imx6.S Removing arch/arm/mach-imx/mach-cpuimx27.c Removing arch/arm/mach-imx/eukrea_mbimx27-baseboard.c Auto-merging arch/arm/boot/dts/vf610-colibri.dtsi Auto-merging arch/arm/boot/dts/Makefile Merge made by the 'recursive' strategy. arch/arm/boot/dts/Makefile | 2 +- arch/arm/boot/dts/imx1-pinfunc.h | 302 ++++++++++++++++++ arch/arm/boot/dts/imx1.dtsi | 266 ++++++++++++++++ arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 33 ++ arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 19 ++ arch/arm/boot/dts/vf610-colibri-eval-v3.dts | 46 +++ .../dts/{vf610-colibri.dts => vf610-colibri.dtsi} | 14 +- arch/arm/configs/imx_v4_v5_defconfig | 3 - arch/arm/mach-imx/Kconfig | 60 +--- arch/arm/mach-imx/Makefile | 5 +- arch/arm/mach-imx/anatop.c | 13 + arch/arm/mach-imx/eukrea-baseboards.h | 10 +- arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 351 --------------------- arch/arm/mach-imx/imx1-dt.c | 34 ++ arch/arm/mach-imx/iomux-imx31.c | 7 - arch/arm/mach-imx/iomux-v1.c | 2 - arch/arm/mach-imx/iomux-v3.c | 2 - arch/arm/mach-imx/mach-cpuimx27.c | 321 ------------------- arch/arm/mach-imx/mxc.h | 2 + arch/arm/mach-imx/suspend-imx6.S | 2 + 20 files changed, 732 insertions(+), 762 deletions(-) create mode 100644 arch/arm/boot/dts/imx1-pinfunc.h create mode 100644 arch/arm/boot/dts/imx1.dtsi create mode 100644 arch/arm/boot/dts/vf610-colibri-eval-v3.dts rename arch/arm/boot/dts/{vf610-colibri.dts => vf610-colibri.dtsi} (90%) delete mode 100644 arch/arm/mach-imx/eukrea_mbimx27-baseboard.c create mode 100644 arch/arm/mach-imx/imx1-dt.c delete mode 100644 arch/arm/mach-imx/mach-cpuimx27.c Merging ixp4xx/next (19f949f52599 Linux 3.8) $ git merge ixp4xx/next Already up-to-date. Merging keystone/next (c9eaa447e77e Linux 3.15-rc1) $ git merge keystone/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 (2e11b0361fb0 Merge branch 'mvebu/dt' into mvebu/for-next) $ git merge mvebu/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging renesas/next (b869bc06bc67 Merge branch 'heads/shdma-for-v3.17' into next) $ git merge renesas/next Merge made by the 'recursive' strategy. .../devicetree/bindings/dma/rcar-audmapp.txt | 29 + .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 98 ++ .../devicetree/bindings/timer/renesas,cmt.txt | 47 + .../devicetree/bindings/timer/renesas,mtu2.txt | 39 + .../devicetree/bindings/timer/renesas,tmu.txt | 39 + arch/arm/boot/dts/r7s72100-genmai.dts | 4 + arch/arm/boot/dts/r7s72100.dtsi | 10 + arch/arm/boot/dts/r8a7779-marzen.dts | 4 + arch/arm/boot/dts/r8a7779.dtsi | 42 + arch/arm/boot/dts/r8a7790-lager.dts | 4 + arch/arm/boot/dts/r8a7790.dtsi | 32 + arch/arm/boot/dts/r8a7791-koelsch.dts | 4 + arch/arm/boot/dts/r8a7791.dtsi | 32 + arch/arm/mach-shmobile/board-genmai-reference.c | 20 - arch/arm/mach-shmobile/board-genmai.c | 14 +- arch/arm/mach-shmobile/board-koelsch-reference.c | 2 - arch/arm/mach-shmobile/board-lager-reference.c | 2 - arch/arm/mach-shmobile/board-marzen-reference.c | 10 - arch/arm/mach-shmobile/r7s72100.h | 1 - arch/arm/mach-shmobile/r8a7779.h | 1 - arch/arm/mach-shmobile/r8a7790.h | 1 - arch/arm/mach-shmobile/r8a7791.h | 1 - arch/arm/mach-shmobile/setup-r7s72100.c | 21 - arch/arm/mach-shmobile/setup-r8a7779.c | 17 +- arch/arm/mach-shmobile/setup-r8a7790.c | 7 +- arch/arm/mach-shmobile/setup-r8a7791.c | 7 +- arch/sh/drivers/dma/dma-sh.c | 2 +- arch/sh/include/asm/dma-register.h | 36 +- arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 24 +- arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 48 +- arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 64 +- drivers/clocksource/sh_cmt.c | 233 ++- drivers/clocksource/sh_mtu2.c | 146 +- drivers/clocksource/sh_tmu.c | 127 +- drivers/dma/sh/Kconfig | 30 +- drivers/dma/sh/Makefile | 17 +- drivers/dma/sh/rcar-audmapp.c | 114 +- drivers/dma/sh/rcar-dmac.c | 1525 ++++++++++++++++++++ drivers/dma/sh/shdma-arm.h | 4 +- drivers/dma/sh/shdma-base.c | 101 +- drivers/dma/sh/shdma.h | 2 +- drivers/dma/sh/shdmac.c | 15 +- include/linux/sh_dma.h | 24 +- include/linux/sh_timer.h | 5 - 44 files changed, 2407 insertions(+), 598 deletions(-) create mode 100644 Documentation/devicetree/bindings/dma/rcar-audmapp.txt create mode 100644 Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt create mode 100644 Documentation/devicetree/bindings/timer/renesas,cmt.txt create mode 100644 Documentation/devicetree/bindings/timer/renesas,mtu2.txt create mode 100644 Documentation/devicetree/bindings/timer/renesas,tmu.txt create mode 100644 drivers/dma/sh/rcar-dmac.c Merging samsung/for-next (d5e49aabb545 Merge branch 'v3.17-next/dt-samsung-2' into for-next) $ git merge samsung/for-next Auto-merging arch/arm/mach-s5pv210/regs-clock.h Removing arch/arm/mach-exynos/include/mach/memory.h Auto-merging arch/arm/mach-exynos/exynos.c Merge made by the 'recursive' strategy. .../devicetree/bindings/arm/samsung/pmu.txt | 2 + arch/arm/boot/dts/exynos3250.dtsi | 15 +- arch/arm/boot/dts/exynos5250-cros-common.dtsi | 159 -------------------- arch/arm/boot/dts/exynos5250-smdk5250.dts | 2 + arch/arm/boot/dts/exynos5250-snow.dts | 165 +++++++++++++++++++++ arch/arm/boot/dts/exynos5260.dtsi | 5 + arch/arm/boot/dts/exynos5410.dtsi | 5 + arch/arm/mach-exynos/exynos.c | 2 + arch/arm/mach-exynos/include/mach/memory.h | 26 ---- arch/arm/mach-s5pv210/pm.c | 3 +- .../mach-s5pv210/{include/mach => }/regs-clock.h | 3 +- arch/arm/mach-s5pv210/s5pv210.c | 2 +- 12 files changed, 197 insertions(+), 192 deletions(-) delete mode 100644 arch/arm/mach-exynos/include/mach/memory.h rename arch/arm/mach-s5pv210/{include/mach => }/regs-clock.h (99%) Merging sunxi/sunxi/for-next (44b61dc11c6d Merge branch 'sunxi/dt-for-3.17' into sunxi/for-next) $ git merge sunxi/sunxi/for-next Auto-merging drivers/clk/sunxi/clk-sun6i-apb0-gates.c Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/clock/sunxi.txt | 7 ++ drivers/clk/sunxi/Makefile | 4 +- drivers/clk/sunxi/clk-factors.c | 2 +- drivers/clk/sunxi/clk-factors.h | 1 + drivers/clk/sunxi/clk-sun6i-apb0-gates.c | 76 ++++++++------ drivers/clk/sunxi/clk-sun8i-apb0.c | 68 +++++++++++++ drivers/clk/sunxi/clk-sunxi.c | 119 ++++++++++++++++++++-- 7 files changed, 234 insertions(+), 43 deletions(-) create mode 100644 drivers/clk/sunxi/clk-sun8i-apb0.c Merging tegra/for-next (9a3c4145af32 Linux 3.16-rc6) $ git merge tegra/for-next Already up-to-date. Merging arm64/for-next/core (94156675847c Revert "arm64: dmi: Add SMBIOS/DMI support") $ git merge arm64/for-next/core Auto-merging drivers/irqchip/irq-gic.c Auto-merging drivers/irqchip/Kconfig Auto-merging arch/arm64/mm/init.c Auto-merging arch/arm64/include/asm/pgtable-types.h Removing arch/arm64/include/asm/pgtable-3level-hwdef.h Removing arch/arm64/include/asm/pgtable-2level-types.h Removing arch/arm64/include/asm/pgtable-2level-hwdef.h Auto-merging arch/arm64/include/asm/memory.h Auto-merging arch/arm64/Kconfig Merge made by the 'recursive' strategy. Documentation/arm64/booting.txt | 43 +- Documentation/arm64/memory.txt | 69 +- arch/arm64/Kconfig | 57 +- arch/arm64/Kconfig.debug | 15 + arch/arm64/Makefile | 4 + arch/arm64/configs/defconfig | 7 + arch/arm64/crypto/Makefile | 2 +- arch/arm64/include/asm/cacheflush.h | 11 +- arch/arm64/include/asm/cachetype.h | 16 +- arch/arm64/include/asm/cpu.h | 59 + arch/arm64/include/asm/cputype.h | 35 +- arch/arm64/include/asm/fpsimdmacros.h | 17 +- arch/arm64/include/asm/memory.h | 6 +- arch/arm64/include/asm/page.h | 20 +- arch/arm64/include/asm/pgalloc.h | 24 +- arch/arm64/include/asm/pgtable-2level-hwdef.h | 43 - arch/arm64/include/asm/pgtable-2level-types.h | 62 -- arch/arm64/include/asm/pgtable-3level-hwdef.h | 50 - arch/arm64/include/asm/pgtable-hwdef.h | 42 +- .../{pgtable-3level-types.h => pgtable-types.h} | 73 +- arch/arm64/include/asm/pgtable.h | 100 +- arch/arm64/include/asm/processor.h | 4 +- arch/arm64/include/asm/stackprotector.h | 38 + arch/arm64/include/asm/syscall.h | 14 + arch/arm64/include/asm/sysreg.h | 60 + arch/arm64/include/asm/thread_info.h | 5 +- arch/arm64/include/asm/tlb.h | 11 +- arch/arm64/include/asm/tlbflush.h | 34 +- arch/arm64/include/asm/unistd.h | 17 + arch/arm64/include/asm/unistd32.h | 1166 +++++++++++++------- arch/arm64/kernel/Makefile | 3 +- arch/arm64/kernel/cpu_ops.c | 2 +- arch/arm64/kernel/cpuinfo.c | 192 ++++ arch/arm64/kernel/debug-monitors.c | 22 +- arch/arm64/kernel/entry-fpsimd.S | 2 +- arch/arm64/kernel/entry.S | 56 +- arch/arm64/kernel/head.S | 121 +- arch/arm64/kernel/hyp-stub.S | 1 + arch/arm64/kernel/image.h | 62 ++ arch/arm64/kernel/kuser32.S | 2 +- arch/arm64/kernel/process.c | 6 + arch/arm64/kernel/psci.c | 8 +- arch/arm64/kernel/ptrace.c | 11 + arch/arm64/kernel/setup.c | 47 +- arch/arm64/kernel/signal32.c | 2 +- arch/arm64/kernel/smp.c | 6 + arch/arm64/kernel/suspend.c | 2 +- arch/arm64/kernel/sys_compat.c | 2 +- arch/arm64/kernel/topology.c | 47 +- arch/arm64/kernel/traps.c | 13 +- arch/arm64/kernel/vdso.c | 94 +- arch/arm64/kernel/vdso/Makefile | 6 +- arch/arm64/kernel/vdso/vdso.lds.S | 4 +- arch/arm64/kernel/vmlinux.lds.S | 16 + arch/arm64/mm/fault.c | 1 + arch/arm64/mm/init.c | 34 +- arch/arm64/mm/ioremap.c | 30 +- arch/arm64/mm/mmu.c | 14 +- drivers/irqchip/Kconfig | 5 + drivers/irqchip/Makefile | 3 +- drivers/irqchip/irq-gic-common.c | 115 ++ drivers/irqchip/irq-gic-common.h | 29 + drivers/irqchip/irq-gic-v3.c | 692 ++++++++++++ drivers/irqchip/irq-gic.c | 59 +- include/linux/irqchip/arm-gic-v3.h | 200 ++++ include/uapi/linux/audit.h | 1 + 66 files changed, 3061 insertions(+), 953 deletions(-) create mode 100644 arch/arm64/include/asm/cpu.h delete mode 100644 arch/arm64/include/asm/pgtable-2level-hwdef.h delete mode 100644 arch/arm64/include/asm/pgtable-2level-types.h delete mode 100644 arch/arm64/include/asm/pgtable-3level-hwdef.h rename arch/arm64/include/asm/{pgtable-3level-types.h => pgtable-types.h} (56%) create mode 100644 arch/arm64/include/asm/stackprotector.h create mode 100644 arch/arm64/include/asm/sysreg.h create mode 100644 arch/arm64/kernel/cpuinfo.c create mode 100644 arch/arm64/kernel/image.h create mode 100644 drivers/irqchip/irq-gic-common.c create mode 100644 drivers/irqchip/irq-gic-common.h create mode 100644 drivers/irqchip/irq-gic-v3.c create mode 100644 include/linux/irqchip/arm-gic-v3.h Merging blackfin/for-linus (b76f98236a23 blackfin: vmlinux.lds.S: reserve 32 bytes space at the end of data section for XIP kernel) $ git merge blackfin/for-linus Already up-to-date. Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by cache.h) $ git merge c6x/for-linux-next Already up-to-date. Merging cris/for-next (cd065a010a97 CRISv10: Readd missing header) $ git merge cris/for-next Already up-to-date. Merging hexagon/linux-next (a9a44fdf3296 Hexagon: update CR year for elf.h) $ git merge hexagon/linux-next Already up-to-date. Merging ia64/next (6b15075c2c36 [IA64] sn: Do not needlessly convert between pointers and integers) $ git merge ia64/next Merge made by the 'recursive' strategy. arch/ia64/sn/kernel/bte.c | 4 ++-- arch/ia64/sn/kernel/setup.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) Merging m68k/for-next (9117710a5997 m68k/sun3: Remove define statement no longer needed) $ git merge m68k/for-next Merge made by the 'recursive' strategy. arch/m68k/include/asm/sun3_pgalloc.h | 4 ---- drivers/zorro/names.c | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) Merging m68knommu/for-next (9a1a1aea7572 m68knommu: Remove unnecessary prototype for kobjsize()) $ git merge m68knommu/for-next Merge made by the 'recursive' strategy. arch/m68k/include/asm/pgtable_no.h | 5 ----- arch/m68k/include/asm/virtconvert.h | 6 +----- 2 files changed, 1 insertion(+), 10 deletions(-) Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check) $ git merge metag/for-next Merge made by the 'recursive' strategy. arch/metag/kernel/cachepart.c | 4 ++-- arch/metag/mm/hugetlbpage.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) Merging microblaze/next (ef264cf0c490 microblaze: Change libgcc-style functions from lib-y to obj-y) $ git merge microblaze/next Merge made by the 'recursive' strategy. arch/microblaze/include/asm/delay.h | 28 ++++++++++++++++++++++------ arch/microblaze/include/uapi/asm/unistd.h | 1 + arch/microblaze/kernel/syscall_table.S | 3 ++- arch/microblaze/lib/Makefile | 14 +++----------- 4 files changed, 28 insertions(+), 18 deletions(-) Merging mips/mips-for-linux-next (815fa52f5ddd Merge branch '3.16-fixes' into mips-for-linux-next) $ git merge mips/mips-for-linux-next Auto-merging arch/mips/kernel/scall64-o32.S Auto-merging arch/mips/kernel/ptrace.c Removing arch/mips/include/asm/user.h Removing arch/mips/alchemy/common/clocks.c Merge made by the 'recursive' strategy. arch/mips/Kconfig | 5 + arch/mips/Makefile | 4 +- arch/mips/alchemy/board-mtx1.c | 4 +- arch/mips/alchemy/board-xxs1500.c | 4 +- arch/mips/alchemy/common/Makefile | 4 +- arch/mips/alchemy/common/clock.c | 1094 +++++++++ arch/mips/alchemy/common/clocks.c | 105 - arch/mips/alchemy/common/dbdma.c | 22 +- arch/mips/alchemy/common/dma.c | 15 +- arch/mips/alchemy/common/irq.c | 5 +- arch/mips/alchemy/common/platform.c | 15 +- arch/mips/alchemy/common/power.c | 74 +- arch/mips/alchemy/common/setup.c | 15 - arch/mips/alchemy/common/time.c | 23 +- arch/mips/alchemy/common/usb.c | 47 +- arch/mips/alchemy/devboards/db1000.c | 19 +- arch/mips/alchemy/devboards/db1200.c | 61 +- arch/mips/alchemy/devboards/db1300.c | 9 +- arch/mips/alchemy/devboards/db1550.c | 27 +- arch/mips/alchemy/devboards/pm.c | 39 +- arch/mips/bcm47xx/Kconfig | 5 +- arch/mips/bcm47xx/bcm47xx_private.h | 3 + arch/mips/bcm47xx/board.c | 26 +- arch/mips/bcm47xx/buttons.c | 38 +- arch/mips/bcm47xx/leds.c | 92 +- arch/mips/bcm47xx/prom.c | 68 +- arch/mips/bcm47xx/setup.c | 7 +- arch/mips/bcm47xx/sprom.c | 48 + arch/mips/bcm63xx/cpu.c | 11 +- arch/mips/bcm63xx/dev-enet.c | 4 - arch/mips/bcm63xx/dev-spi.c | 4 - arch/mips/bcm63xx/gpio.c | 14 - arch/mips/bcm63xx/irq.c | 558 +++-- arch/mips/bcm63xx/reset.c | 60 - arch/mips/configs/loongson3_defconfig | 2 +- arch/mips/include/asm/Kbuild | 1 + arch/mips/include/asm/addrspace.h | 2 +- arch/mips/include/asm/bitops.h | 8 +- arch/mips/include/asm/cop2.h | 8 + arch/mips/include/asm/cpu-features.h | 3 + arch/mips/include/asm/cpu-info.h | 5 +- arch/mips/include/asm/cpu.h | 59 +- arch/mips/include/asm/elf.h | 17 - arch/mips/include/asm/mach-au1x00/au1000.h | 2515 +++++++++----------- arch/mips/include/asm/mach-au1x00/au1000_dma.h | 50 +- arch/mips/include/asm/mach-au1x00/gpio-au1000.h | 56 +- arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h | 7 +- arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 198 +- .../include/asm/mach-bcm63xx/bcm63xx_dev_enet.h | 46 - .../include/asm/mach-bcm63xx/bcm63xx_dev_spi.h | 31 - arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 16 +- .../asm/mach-bcm63xx/cpu-feature-overrides.h | 2 +- arch/mips/include/asm/mach-loongson/boot_param.h | 4 + .../include/asm/mach-loongson/kernel-entry-init.h | 52 + arch/mips/include/asm/mach-loongson/loongson.h | 11 +- arch/mips/include/asm/mach-loongson/machine.h | 4 +- arch/mips/include/asm/mach-loongson/mmzone.h | 53 + arch/mips/include/asm/mach-loongson/topology.h | 23 + arch/mips/include/asm/mipsregs.h | 44 + arch/mips/include/asm/mmu_context.h | 10 + arch/mips/include/asm/pgtable-32.h | 12 + arch/mips/include/asm/pgtable.h | 27 + arch/mips/include/asm/ptrace.h | 8 +- arch/mips/include/asm/reg.h | 129 +- arch/mips/include/asm/smp-cps.h | 12 +- arch/mips/include/asm/smp.h | 6 + arch/mips/include/asm/sparsemem.h | 2 +- arch/mips/include/asm/user.h | 58 - arch/mips/include/uapi/asm/ptrace.h | 25 +- arch/mips/include/uapi/asm/reg.h | 206 ++ arch/mips/kernel/binfmt_elfo32.c | 38 - arch/mips/kernel/cpu-probe.c | 29 + arch/mips/kernel/ftrace.c | 56 +- arch/mips/kernel/mcount.S | 13 + arch/mips/kernel/perf_event_mipsxx.c | 42 +- arch/mips/kernel/pm-cps.c | 10 +- arch/mips/kernel/proc.c | 2 + arch/mips/kernel/process.c | 57 +- arch/mips/kernel/ptrace.c | 293 ++- arch/mips/kernel/ptrace32.c | 10 +- arch/mips/kernel/scall32-o32.S | 6 +- arch/mips/kernel/scall64-64.S | 4 +- arch/mips/kernel/scall64-n32.S | 10 +- arch/mips/kernel/scall64-o32.S | 8 +- arch/mips/kernel/setup.c | 22 +- arch/mips/kernel/smp-cps.c | 12 +- arch/mips/kernel/smp.c | 26 +- arch/mips/kernel/unaligned.c | 1 - arch/mips/loongson/Kconfig | 9 +- arch/mips/loongson/Platform | 2 +- arch/mips/loongson/common/env.c | 49 +- arch/mips/loongson/common/init.c | 4 + arch/mips/loongson/common/pm.c | 8 +- arch/mips/loongson/lemote-2f/clock.c | 4 +- arch/mips/loongson/lemote-2f/reset.c | 2 +- arch/mips/loongson/loongson-3/Makefile | 4 +- arch/mips/loongson/loongson-3/cop2-ex.c | 63 + arch/mips/loongson/loongson-3/irq.c | 26 +- arch/mips/loongson/loongson-3/numa.c | 291 +++ arch/mips/loongson/loongson-3/smp.c | 387 ++- arch/mips/loongson/loongson-3/smp.h | 37 +- arch/mips/mm/c-r4k.c | 8 +- arch/mips/mm/tlb-r3k.c | 2 +- arch/mips/mm/tlb-r4k.c | 59 + arch/mips/mm/tlbex.c | 92 + arch/mips/pci/Makefile | 2 +- arch/mips/pci/ops-tx4927.c | 2 - arch/mips/pci/pci-alchemy.c | 24 +- arch/mips/ralink/of.c | 2 +- arch/mips/rb532/devices.c | 28 +- arch/mips/sgi-ip22/ip22-gio.c | 10 +- arch/mips/txx9/generic/7segled.c | 14 +- arch/mips/txx9/generic/pci.c | 4 +- arch/mips/txx9/generic/setup.c | 29 +- drivers/cpufreq/loongson2_cpufreq.c | 6 +- drivers/mmc/host/au1xmmc.c | 198 +- drivers/mtd/nand/au1550nd.c | 29 +- drivers/net/ethernet/amd/au1000_eth.c | 149 +- drivers/net/irda/au1k_ir.c | 48 +- drivers/rtc/rtc-au1xxx.c | 18 +- drivers/spi/spi-au1550.c | 66 +- drivers/video/fbdev/au1100fb.c | 39 +- drivers/video/fbdev/au1100fb.h | 1 + drivers/video/fbdev/au1200fb.c | 81 +- sound/soc/au1x/psc-ac97.c | 140 +- sound/soc/au1x/psc-i2s.c | 100 +- sound/soc/au1x/psc.h | 22 +- 127 files changed, 5516 insertions(+), 3423 deletions(-) create mode 100644 arch/mips/alchemy/common/clock.c delete mode 100644 arch/mips/alchemy/common/clocks.c create mode 100644 arch/mips/include/asm/mach-loongson/kernel-entry-init.h create mode 100644 arch/mips/include/asm/mach-loongson/mmzone.h create mode 100644 arch/mips/include/asm/mach-loongson/topology.h delete mode 100644 arch/mips/include/asm/user.h create mode 100644 arch/mips/include/uapi/asm/reg.h create mode 100644 arch/mips/loongson/loongson-3/cop2-ex.c create mode 100644 arch/mips/loongson/loongson-3/numa.c Merging openrisc/for-upstream (548dafe880ad openrisc: Use get_signal() signal_setup_done()) $ git merge openrisc/for-upstream Already up-to-date. 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 (64aa90f26c06 Linux 3.16-rc7) $ git merge parisc-hd/for-next Already up-to-date. Merging powerpc/next (ea668936b708 Add Michael Ellerman as powerpc co-maintainer) $ git merge powerpc/next Removing drivers/pcmcia/m8xx_pcmcia.c Removing arch/powerpc/oprofile/op_model_rs64.c Removing arch/powerpc/mm/stab.c Removing arch/powerpc/include/asm/mpc8xx.h Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 4 +- arch/powerpc/boot/dts/fsl/p2041si-post.dtsi | 1 + arch/powerpc/boot/dts/fsl/t2080si-post.dtsi | 69 ++ arch/powerpc/boot/dts/fsl/t2081si-post.dtsi | 435 ++++++++ arch/powerpc/boot/dts/fsl/t208xsi-pre.dtsi | 99 ++ arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 1 + arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi | 1 + arch/powerpc/boot/dts/t2080qds.dts | 57 + arch/powerpc/boot/dts/t2081qds.dts | 46 + arch/powerpc/boot/dts/t208xqds.dtsi | 239 ++++ arch/powerpc/boot/dts/t4240rdb.dts | 186 ++++ arch/powerpc/configs/corenet32_smp_defconfig | 3 +- arch/powerpc/configs/corenet64_smp_defconfig | 4 + arch/powerpc/configs/mpc85xx_defconfig | 3 + arch/powerpc/configs/mpc85xx_smp_defconfig | 3 + arch/powerpc/include/asm/cputable.h | 29 +- arch/powerpc/include/asm/exception-64s.h | 12 +- arch/powerpc/include/asm/fs_pd.h | 1 - arch/powerpc/include/asm/irqflags.h | 8 +- arch/powerpc/include/asm/jump_label.h | 9 + arch/powerpc/include/asm/machdep.h | 1 + arch/powerpc/include/asm/mmu-hash64.h | 22 - arch/powerpc/include/asm/mmu.h | 8 +- arch/powerpc/include/asm/mmu_context.h | 6 +- arch/powerpc/include/asm/mpc85xx.h | 2 + arch/powerpc/include/asm/mpc8xx.h | 12 - arch/powerpc/include/asm/oprofile_impl.h | 1 - arch/powerpc/include/asm/paca.h | 4 - arch/powerpc/include/asm/perf_event_server.h | 5 +- arch/powerpc/include/asm/pte-fsl-booke.h | 2 + arch/powerpc/include/asm/reg.h | 2 +- arch/powerpc/include/asm/reg_booke.h | 2 +- arch/powerpc/include/asm/systbl.h | 4 +- arch/powerpc/include/asm/trace.h | 45 + arch/powerpc/kernel/asm-offsets.c | 2 - arch/powerpc/kernel/cputable.c | 94 +- arch/powerpc/kernel/entry_64.S | 8 +- arch/powerpc/kernel/exceptions-64s.S | 295 ++--- arch/powerpc/kernel/head_64.S | 8 +- arch/powerpc/kernel/process.c | 32 +- arch/powerpc/kernel/prom.c | 1 - arch/powerpc/kernel/setup_64.c | 9 +- arch/powerpc/kernel/systbl.S | 3 - arch/powerpc/kernel/traps.c | 2 +- arch/powerpc/lib/copyuser_64.S | 3 +- arch/powerpc/mm/Makefile | 4 +- arch/powerpc/mm/hash_utils_64.c | 24 +- arch/powerpc/mm/mmu_context_hash32.c | 2 +- arch/powerpc/mm/pgtable_32.c | 2 +- arch/powerpc/mm/ppc_mmu_32.c | 2 +- arch/powerpc/mm/stab.c | 286 ----- arch/powerpc/mm/tlb_low_64e.S | 19 +- arch/powerpc/oprofile/Makefile | 2 +- arch/powerpc/oprofile/common.c | 3 - arch/powerpc/oprofile/op_model_rs64.c | 222 ---- arch/powerpc/perf/core-book3s.c | 73 +- arch/powerpc/perf/mpc7450-pmu.c | 5 +- arch/powerpc/perf/power4-pmu.c | 2 +- arch/powerpc/perf/power5+-pmu.c | 2 +- arch/powerpc/perf/power5-pmu.c | 2 +- arch/powerpc/perf/power6-pmu.c | 2 +- arch/powerpc/perf/power7-pmu.c | 2 +- arch/powerpc/perf/power8-pmu.c | 27 +- arch/powerpc/perf/ppc970-pmu.c | 2 +- arch/powerpc/platforms/85xx/Kconfig | 2 +- arch/powerpc/platforms/85xx/corenet_generic.c | 52 +- arch/powerpc/platforms/8xx/m8xx_setup.c | 3 - arch/powerpc/platforms/8xx/mpc885ads_setup.c | 62 -- arch/powerpc/platforms/8xx/tqm8xx_setup.c | 1 - arch/powerpc/platforms/Kconfig.cputype | 18 +- arch/powerpc/platforms/powermac/Kconfig | 2 +- arch/powerpc/platforms/powermac/feature.c | 42 +- arch/powerpc/platforms/powernv/Makefile | 1 + arch/powerpc/platforms/powernv/eeh-powernv.c | 6 +- arch/powerpc/platforms/powernv/opal-async.c | 3 +- arch/powerpc/platforms/powernv/opal-lpc.c | 2 +- .../powerpc/platforms/powernv/opal-memory-errors.c | 3 +- arch/powerpc/platforms/powernv/opal-tracepoints.c | 84 ++ arch/powerpc/platforms/powernv/opal-wrappers.S | 115 +- arch/powerpc/platforms/powernv/opal-xscom.c | 2 +- arch/powerpc/platforms/powernv/opal.c | 9 +- arch/powerpc/platforms/powernv/pci-ioda.c | 21 +- arch/powerpc/platforms/powernv/pci-p5ioc2.c | 3 +- arch/powerpc/platforms/powernv/pci.c | 14 +- arch/powerpc/platforms/powernv/pci.h | 2 +- arch/powerpc/platforms/powernv/rng.c | 2 +- arch/powerpc/platforms/pseries/dtl.c | 3 +- arch/powerpc/platforms/pseries/eeh_pseries.c | 8 +- arch/powerpc/platforms/pseries/hvCall.S | 172 ++- arch/powerpc/platforms/pseries/hvCall_inst.c | 3 +- arch/powerpc/platforms/pseries/lpar.c | 30 +- arch/powerpc/platforms/pseries/mobility.c | 3 +- arch/powerpc/platforms/pseries/msi.c | 4 +- arch/powerpc/platforms/pseries/power.c | 5 +- arch/powerpc/platforms/pseries/ras.c | 2 +- arch/powerpc/platforms/pseries/reconfig.c | 5 +- arch/powerpc/platforms/pseries/rng.c | 2 +- arch/powerpc/platforms/pseries/setup.c | 2 +- arch/powerpc/platforms/pseries/suspend.c | 5 +- arch/powerpc/sysdev/micropatch.c | 1 - arch/powerpc/xmon/xmon.c | 34 +- drivers/net/ethernet/freescale/fs_enet/mac-fec.c | 1 - drivers/net/ethernet/freescale/fs_enet/mac-scc.c | 1 - drivers/pcmcia/Kconfig | 10 - drivers/pcmcia/Makefile | 1 - drivers/pcmcia/m8xx_pcmcia.c | 1168 -------------------- tools/testing/selftests/powerpc/Makefile | 10 +- tools/testing/selftests/powerpc/pmu/Makefile | 19 +- .../selftests/powerpc/pmu/count_instructions.c | 30 +- tools/testing/selftests/powerpc/pmu/ebb/Makefile | 5 +- .../testing/selftests/powerpc/pmu/ebb/busy_loop.S | 271 +++++ .../powerpc/pmu/ebb/cycles_with_mmcr2_test.c | 91 ++ tools/testing/selftests/powerpc/pmu/ebb/ebb.c | 261 +---- tools/testing/selftests/powerpc/pmu/ebb/ebb.h | 1 - tools/testing/selftests/powerpc/pmu/l3_bank_test.c | 48 + tools/testing/selftests/powerpc/pmu/lib.c | 50 +- tools/testing/selftests/powerpc/pmu/lib.h | 1 + .../selftests/powerpc/pmu/per_event_excludes.c | 114 ++ 118 files changed, 2507 insertions(+), 2769 deletions(-) create mode 100644 arch/powerpc/boot/dts/fsl/t2080si-post.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/t2081si-post.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/t208xsi-pre.dtsi create mode 100644 arch/powerpc/boot/dts/t2080qds.dts create mode 100644 arch/powerpc/boot/dts/t2081qds.dts create mode 100644 arch/powerpc/boot/dts/t208xqds.dtsi create mode 100644 arch/powerpc/boot/dts/t4240rdb.dts delete mode 100644 arch/powerpc/include/asm/mpc8xx.h delete mode 100644 arch/powerpc/mm/stab.c delete mode 100644 arch/powerpc/oprofile/op_model_rs64.c create mode 100644 arch/powerpc/platforms/powernv/opal-tracepoints.c delete mode 100644 drivers/pcmcia/m8xx_pcmcia.c create mode 100644 tools/testing/selftests/powerpc/pmu/ebb/busy_loop.S create mode 100644 tools/testing/selftests/powerpc/pmu/ebb/cycles_with_mmcr2_test.c create mode 100644 tools/testing/selftests/powerpc/pmu/l3_bank_test.c create mode 100644 tools/testing/selftests/powerpc/pmu/per_event_excludes.c Merging fsl/next (78eb9094ca08 powerpc/t2080rdb: Add T2080RDB board support) $ git merge fsl/next Auto-merging arch/powerpc/kernel/setup_64.c Auto-merging arch/powerpc/kernel/setup-common.c Auto-merging arch/powerpc/kernel/prom.c Auto-merging arch/powerpc/kernel/head_64.S Auto-merging arch/powerpc/include/asm/cputable.h Merge made by the 'recursive' strategy. .../devicetree/bindings/powerpc/fsl/board.txt | 16 ++ arch/powerpc/boot/dts/t2080rdb.dts | 57 +++++ arch/powerpc/boot/dts/t208xrdb.dtsi | 184 +++++++++++++++ arch/powerpc/configs/corenet32_smp_defconfig | 1 + arch/powerpc/configs/corenet64_smp_defconfig | 1 + arch/powerpc/include/asm/cputable.h | 2 +- arch/powerpc/include/asm/ppc-opcode.h | 9 + arch/powerpc/include/asm/reg_booke.h | 55 ++++- arch/powerpc/kernel/head_64.S | 22 ++ arch/powerpc/kernel/prom.c | 10 +- arch/powerpc/kernel/setup-common.c | 6 +- arch/powerpc/kernel/setup_64.c | 6 +- arch/powerpc/mm/tlb_low_64e.S | 68 +++++- arch/powerpc/platforms/85xx/Kconfig | 2 +- arch/powerpc/platforms/85xx/corenet_generic.c | 1 + arch/powerpc/platforms/85xx/smp.c | 44 ++++ arch/powerpc/sysdev/fsl_pci.c | 4 +- arch/powerpc/sysdev/mpic_msgr.c | 2 +- drivers/memory/Kconfig | 10 + drivers/memory/Makefile | 1 + drivers/memory/fsl-corenet-cf.c | 251 +++++++++++++++++++++ 21 files changed, 717 insertions(+), 35 deletions(-) create mode 100644 arch/powerpc/boot/dts/t2080rdb.dts create mode 100644 arch/powerpc/boot/dts/t208xrdb.dtsi create mode 100644 drivers/memory/fsl-corenet-cf.c Merging mpc5xxx/next (bc7505942233 powerpc/512x: dts: add MPC5125 clock specs) $ git merge mpc5xxx/next Already up-to-date. Merging s390/features (26d766c60f4e s390/3215: fix hanging console issue) $ git merge s390/features Merge made by the 'recursive' strategy. Documentation/kernel-parameters.txt | 7 ++ arch/s390/include/asm/qdio.h | 4 + arch/s390/include/asm/syscall.h | 2 +- arch/s390/kernel/irq.c | 95 ++++++++--------- arch/s390/kernel/setup.c | 2 + arch/s390/pci/pci.c | 4 +- arch/s390/pci/pci_clp.c | 4 +- arch/s390/pci/pci_debug.c | 4 +- arch/s390/pci/pci_dma.c | 50 ++++++--- arch/s390/pci/pci_event.c | 4 +- arch/s390/pci/pci_sysfs.c | 4 +- drivers/pci/hotplug/s390_pci_hpc.c | 4 +- drivers/s390/block/dasd.c | 196 +++++++++++++++++++----------------- drivers/s390/block/dasd_eckd.c | 30 ++++-- drivers/s390/block/dasd_int.h | 5 +- drivers/s390/block/dasd_ioctl.c | 33 ++++-- drivers/s390/char/con3215.c | 32 +++--- drivers/s390/cio/qdio_setup.c | 53 ++++++++++ drivers/s390/net/qeth_core.h | 8 +- drivers/s390/net/qeth_core_main.c | 161 +++++++++++++++++------------ drivers/s390/scsi/zfcp_qdio.c | 49 ++++----- drivers/watchdog/Kconfig | 2 +- 22 files changed, 456 insertions(+), 297 deletions(-) Merging sparc-next/master (cfcfe22256d5 Merge branch 'sparc64_io') $ git merge sparc-next/master Merge made by the 'recursive' strategy. arch/sparc/include/asm/io_64.h | 381 +++++++++++++++------------------------ arch/sparc/kernel/mdesc.c | 82 +++++++-- arch/sparc/kernel/unaligned_32.c | 2 +- arch/sparc/lib/PeeCeeI.c | 36 ++-- arch/sparc/mm/init_64.c | 65 +++++++ drivers/input/misc/sparcspkr.c | 22 +-- drivers/sbus/char/display7seg.c | 10 +- 7 files changed, 312 insertions(+), 286 deletions(-) Merging tile/master (ed93567c6fbc tile: Remove tile-specific _sinitdata and _einitdata) $ git merge tile/master Merge made by the 'recursive' strategy. arch/tile/include/asm/sections.h | 3 --- arch/tile/kernel/traps.c | 2 +- arch/tile/kernel/vmlinux.lds.S | 2 -- arch/tile/mm/init.c | 12 ++++++------ 4 files changed, 7 insertions(+), 12 deletions(-) Merging uml/next (989e59fa41c5 um: Include generic barrier.h) $ git merge uml/next Resolved 'arch/um/include/asm/Kbuild' using previous resolution. Removing arch/x86/um/shared/sysdep/skas_ptrace.h Removing arch/um/sys-ppc/shared/sysdep/skas_ptrace.h Removing arch/um/sys-ia64/sysdep/skas_ptrace.h Auto-merging arch/um/os-Linux/skas/process.c Auto-merging arch/um/kernel/trap.c Removing arch/um/include/shared/skas_ptrace.h Removing arch/um/include/shared/skas/proc_mm.h Auto-merging arch/um/include/shared/os.h Auto-merging arch/um/include/asm/Kbuild CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 82616d65d5c1] Merge remote-tracking branch 'uml/next' $ git diff -M --stat --summary HEAD^.. arch/um/include/shared/os.h | 2 - arch/um/include/shared/skas/proc_mm.h | 44 ------ arch/um/include/shared/skas/skas.h | 3 - arch/um/include/shared/skas_ptrace.h | 14 -- arch/um/kernel/ptrace.c | 32 ---- arch/um/kernel/reboot.c | 35 ++--- arch/um/kernel/skas/mmu.c | 68 +++------ arch/um/kernel/skas/process.c | 27 ---- arch/um/kernel/trap.c | 2 +- arch/um/kernel/um_arch.c | 10 -- arch/um/os-Linux/process.c | 16 -- arch/um/os-Linux/skas/mem.c | 100 ++---------- arch/um/os-Linux/skas/process.c | 200 ++++++------------------ arch/um/os-Linux/start_up.c | 154 ------------------- arch/um/sys-ia64/sysdep/skas_ptrace.h | 22 --- arch/um/sys-ppc/shared/sysdep/skas_ptrace.h | 22 --- arch/x86/um/ldt.c | 227 ++++++---------------------- arch/x86/um/shared/sysdep/faultinfo_32.h | 3 - arch/x86/um/shared/sysdep/faultinfo_64.h | 3 - arch/x86/um/shared/sysdep/skas_ptrace.h | 22 --- 20 files changed, 148 insertions(+), 858 deletions(-) delete mode 100644 arch/um/include/shared/skas/proc_mm.h delete mode 100644 arch/um/include/shared/skas_ptrace.h delete mode 100644 arch/um/sys-ia64/sysdep/skas_ptrace.h delete mode 100644 arch/um/sys-ppc/shared/sysdep/skas_ptrace.h delete mode 100644 arch/x86/um/shared/sysdep/skas_ptrace.h Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) $ git merge unicore32/unicore32 Already up-to-date. Merging xtensa/for_next (4ed2ad38b3b4 Merge tag 'xtensa-for-next-20140715' of git://github.com/jcmvbkbc/linux-xtensa into for_next) $ git merge xtensa/for_next Already up-to-date. Merging btrfs/next (c7548af69d9e Btrfs: convert smp_mb__{before,after}_clear_bit) $ git merge btrfs/next Already up-to-date. Merging ceph/master (d1a5fb9fecd4 rbd: remove extra newlines from rbd_warn() messages) $ git merge ceph/master Merge made by the 'recursive' strategy. Documentation/ABI/testing/sysfs-bus-rbd | 4 +- drivers/block/rbd.c | 497 ++++++++++++++++---------------- fs/ceph/acl.c | 14 +- fs/ceph/caps.c | 2 +- fs/ceph/file.c | 24 +- fs/ceph/mds_client.c | 11 +- fs/ceph/xattr.c | 4 +- include/linux/ceph/messenger.h | 14 +- include/linux/ceph/osd_client.h | 18 +- net/ceph/messenger.c | 45 ++- net/ceph/osd_client.c | 129 ++++++--- 11 files changed, 417 insertions(+), 345 deletions(-) Merging cifs/for-next (bb7cd8d76356 [CIFS] Update cifs version) $ git merge cifs/for-next Merge made by the 'recursive' strategy. fs/cifs/cifsfs.h | 2 +- fs/cifs/cifsglob.h | 19 + fs/cifs/cifsproto.h | 4 + fs/cifs/cifssmb.c | 119 +++-- fs/cifs/connect.c | 8 +- fs/cifs/file.c | 901 +++++++++++++++++++++-------------- fs/cifs/misc.c | 9 + fs/cifs/sess.c | 1192 +++++++++++++++++++++++++++++++++-------------- fs/cifs/smb1ops.c | 8 + fs/cifs/smb2ops.c | 64 ++- fs/cifs/smb2pdu.c | 83 +++- fs/cifs/smb2transport.c | 5 + fs/cifs/transport.c | 25 +- 13 files changed, 1655 insertions(+), 784 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 (04ec5f5c0022 ecryptfs: remove unnecessary break after goto) $ git merge ecryptfs/next Auto-merging fs/ecryptfs/inode.c Auto-merging fs/ecryptfs/file.c Merge made by the 'recursive' strategy. fs/ecryptfs/file.c | 4 ++-- fs/ecryptfs/inode.c | 16 +++++++--------- fs/ecryptfs/keystore.c | 2 -- fs/ecryptfs/messaging.c | 3 +-- 4 files changed, 10 insertions(+), 15 deletions(-) Merging ext3/for_next (3f1be4f9c9dc udf: avoid redundant memcpy when writing data in ICB) $ git merge ext3/for_next Merge made by the 'recursive' strategy. fs/ext2/super.c | 2 +- fs/quota/dquot.c | 180 +++++++++++++++++++++++--------------------------- fs/quota/kqid.c | 2 +- fs/quota/netlink.c | 3 +- fs/quota/quota.c | 6 +- fs/super.c | 1 - fs/udf/file.c | 22 +----- fs/udf/lowlevel.c | 2 +- fs/udf/super.c | 2 +- fs/udf/symlink.c | 2 +- fs/udf/unicode.c | 9 ++- include/linux/quota.h | 1 - 12 files changed, 97 insertions(+), 135 deletions(-) Merging ext4/dev (e7c22a2e7d23 ext4: fix ext4_discard_allocated_blocks() if we can't allocate the pa struct) $ git merge ext4/dev Merge made by the 'recursive' strategy. fs/ext4/balloc.c | 1 - fs/ext4/dir.c | 25 +++++ fs/ext4/ext4.h | 14 ++- fs/ext4/extents.c | 14 ++- fs/ext4/file.c | 4 - fs/ext4/indirect.c | 281 ++++++++++++++++++++++++++++++++++++-------------- fs/ext4/inline.c | 18 ++-- fs/ext4/inode.c | 130 ++--------------------- fs/ext4/mballoc.c | 41 +++++--- fs/ext4/migrate.c | 7 ++ fs/ext4/move_extent.c | 3 +- fs/ext4/super.c | 88 +++++++--------- 12 files changed, 333 insertions(+), 293 deletions(-) Merging f2fs/dev (33be828ada72 f2fs: remove redundant lines in allocate_data_block) $ git merge f2fs/dev Merge made by the 'recursive' strategy. Documentation/filesystems/f2fs.txt | 5 + fs/f2fs/acl.c | 6 - fs/f2fs/checkpoint.c | 172 ++++++++++++++++-------- fs/f2fs/data.c | 54 ++++++-- fs/f2fs/debug.c | 19 +-- fs/f2fs/dir.c | 87 ++++++++---- fs/f2fs/f2fs.h | 45 +++++-- fs/f2fs/file.c | 38 +++++- fs/f2fs/hash.c | 4 +- fs/f2fs/inline.c | 1 + fs/f2fs/inode.c | 9 +- fs/f2fs/namei.c | 246 +++++++++++++++++++++++++++++++--- fs/f2fs/node.c | 265 +++++++++++++++++++++++++------------ fs/f2fs/node.h | 7 + fs/f2fs/recovery.c | 20 ++- fs/f2fs/segment.c | 25 ++-- fs/f2fs/segment.h | 8 +- fs/f2fs/super.c | 19 ++- include/trace/events/f2fs.h | 24 ++++ 19 files changed, 789 insertions(+), 265 deletions(-) Merging fscache/fscache (fe02fb3ec109 FS-Cache: Handle removal of unadded object to the fscache_object_list rb tree) $ git merge fscache/fscache Merge made by the 'recursive' strategy. Merging fuse/for-next (d7afaec0b564 fuse: add FUSE_NO_OPEN_SUPPORT flag to INIT) $ git merge fuse/for-next Already up-to-date. Merging gfs2/master (dec5ac00c840 GFS2: fs/gfs2/super.c: replace seq_printf by seq_puts) $ git merge gfs2/master Merge made by the 'recursive' strategy. fs/gfs2/super.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) Merging jfs/jfs-next (bb5e50aaa805 fs/jfs/super.c: convert simple_str to kstr) $ 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 (e655f945cd7b Merge branch 'bugfixes' into linux-next) $ git merge nfs/linux-next Merge made by the 'recursive' strategy. fs/nfs/blocklayout/blocklayout.c | 101 ++++++++------- fs/nfs/callback.c | 12 ++ fs/nfs/client.c | 10 +- fs/nfs/delegation.c | 34 +++-- fs/nfs/delegation.h | 1 + fs/nfs/direct.c | 33 ++--- fs/nfs/filelayout/filelayout.c | 262 +++++++++++++++++++------------------- fs/nfs/filelayout/filelayoutdev.c | 2 +- fs/nfs/internal.h | 11 +- fs/nfs/nfs3proc.c | 21 +-- fs/nfs/nfs4_fs.h | 32 ++--- fs/nfs/nfs4client.c | 5 + fs/nfs/nfs4proc.c | 231 +++++++++++++++++++++++---------- fs/nfs/nfs4state.c | 69 ++++------ fs/nfs/nfs4trace.h | 28 ++-- fs/nfs/nfs4xdr.c | 2 +- fs/nfs/objlayout/objio_osd.c | 24 ++-- fs/nfs/objlayout/objlayout.c | 81 ++++++------ fs/nfs/objlayout/objlayout.h | 8 +- fs/nfs/pagelist.c | 247 ++++++++++++++++------------------- fs/nfs/pnfs.c | 161 +++++++---------------- fs/nfs/pnfs.h | 18 +-- fs/nfs/proc.c | 27 ++-- fs/nfs/read.c | 54 ++++---- fs/nfs/super.c | 3 +- fs/nfs/write.c | 78 +++++------- fs/nfs_common/nfsacl.c | 5 +- include/linux/nfs_fs_sb.h | 1 + include/linux/nfs_page.h | 15 ++- include/linux/nfs_xdr.h | 34 ++--- include/linux/sunrpc/auth.h | 2 + include/linux/sunrpc/auth_gss.h | 1 + net/sunrpc/addr.c | 16 +-- net/sunrpc/auth.c | 11 +- net/sunrpc/auth_gss/auth_gss.c | 82 ++++++++---- net/sunrpc/clnt.c | 5 + net/sunrpc/rpc_pipe.c | 2 +- net/sunrpc/xprt.c | 1 + net/sunrpc/xprtsock.c | 9 +- 39 files changed, 890 insertions(+), 849 deletions(-) Merging nfsd/nfsd-next (03adc840085e nfsd: add some comments to the nfsd4 object definitions) $ git merge nfsd/nfsd-next Resolved 'fs/nfsd/nfs4xdr.c' using previous resolution. Auto-merging net/sunrpc/xprt.c Auto-merging fs/nfsd/nfs4xdr.c CONFLICT (content): Merge conflict in fs/nfsd/nfs4xdr.c Auto-merging fs/nfsd/nfs4proc.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master f82368d8512a] Merge remote-tracking branch 'nfsd/nfsd-next' $ git diff -M --stat --summary HEAD^.. fs/nfsd/acl.h | 2 +- fs/nfsd/auth.c | 2 +- fs/nfsd/export.c | 6 +- fs/nfsd/export.h | 3 +- fs/nfsd/fault_inject.c | 138 +- fs/nfsd/netns.h | 23 +- fs/nfsd/nfs2acl.c | 8 +- fs/nfsd/nfs3acl.c | 8 +- fs/nfsd/nfs3proc.c | 9 +- fs/nfsd/nfs3xdr.c | 30 +- fs/nfsd/nfs4acl.c | 39 +- fs/nfsd/nfs4callback.c | 32 +- fs/nfsd/nfs4proc.c | 53 +- fs/nfsd/nfs4state.c | 3094 ++++++++++++++++++++---------- fs/nfsd/nfs4xdr.c | 128 +- fs/nfsd/nfscache.c | 13 +- fs/nfsd/nfsctl.c | 51 +- fs/nfsd/nfsfh.c | 12 +- fs/nfsd/nfsfh.h | 15 +- fs/nfsd/nfsproc.c | 13 +- fs/nfsd/nfssvc.c | 21 +- fs/nfsd/nfsxdr.c | 14 +- fs/nfsd/state.h | 209 +- fs/nfsd/vfs.c | 48 +- fs/nfsd/vfs.h | 8 +- fs/nfsd/xdr4.h | 30 +- include/linux/cred.h | 9 + include/linux/sunrpc/svc.h | 4 +- include/linux/sunrpc/svc_rdma.h | 3 +- include/linux/sunrpc/svc_xprt.h | 2 + net/sunrpc/auth_gss/svcauth_gss.c | 2 +- net/sunrpc/svc.c | 4 +- net/sunrpc/svc_xprt.c | 27 +- net/sunrpc/svcsock.c | 50 +- net/sunrpc/xdr.c | 3 +- net/sunrpc/xprt.c | 2 +- net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 28 + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 39 +- net/sunrpc/xprtrdma/svc_rdma_transport.c | 1 + 39 files changed, 2735 insertions(+), 1448 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 (f15844e0777f 9P: fix return value in v9fs_fid_xattr_set) $ git merge v9fs/for-next Already up-to-date. Merging ubifs/linux-next (25601a3c9737 UBIFS: Add log overlap assertions) $ git merge ubifs/linux-next Merge made by the 'recursive' strategy. drivers/mtd/ubi/block.c | 18 ++++++++++++------ drivers/mtd/ubi/vtbl.c | 2 +- drivers/mtd/ubi/wl.c | 4 ++-- fs/ubifs/commit.c | 2 -- fs/ubifs/io.c | 2 +- fs/ubifs/log.c | 12 ++++++------ fs/ubifs/lpt.c | 5 ++--- fs/ubifs/lpt_commit.c | 7 +++++-- fs/ubifs/master.c | 7 +++---- fs/ubifs/orphan.c | 1 - fs/ubifs/recovery.c | 5 ++--- fs/ubifs/sb.c | 4 +++- fs/ubifs/scan.c | 14 +++++++------- fs/ubifs/super.c | 19 +++++++++---------- fs/ubifs/tnc.c | 1 - fs/ubifs/tnc_commit.c | 1 - fs/ubifs/ubifs.h | 4 ---- 17 files changed, 53 insertions(+), 55 deletions(-) Merging xfs/for-next (c3dd0d14e34a Merge branch 'xfs-misc-fixes-3.17-1' into for-next) $ git merge xfs/for-next Auto-merging fs/xfs/libxfs/xfs_symlink_remote.c Auto-merging fs/xfs/libxfs/xfs_sb.h Auto-merging fs/xfs/libxfs/xfs_sb.c Auto-merging fs/xfs/libxfs/xfs_quota_defs.h Auto-merging fs/xfs/libxfs/xfs_log_format.h Auto-merging fs/xfs/libxfs/xfs_inum.h Auto-merging fs/xfs/libxfs/xfs_inode_fork.c Auto-merging fs/xfs/libxfs/xfs_inode_buf.c Auto-merging fs/xfs/libxfs/xfs_ialloc_btree.c Auto-merging fs/xfs/libxfs/xfs_ialloc.c Auto-merging fs/xfs/libxfs/xfs_format.h Auto-merging fs/xfs/libxfs/xfs_dquot_buf.c Auto-merging fs/xfs/libxfs/xfs_dir2_sf.c Auto-merging fs/xfs/libxfs/xfs_dir2_node.c Auto-merging fs/xfs/libxfs/xfs_dir2_leaf.c Auto-merging fs/xfs/libxfs/xfs_dir2_data.c Auto-merging fs/xfs/libxfs/xfs_dir2_block.c Auto-merging fs/xfs/libxfs/xfs_dir2.c Auto-merging fs/xfs/libxfs/xfs_da_btree.c Auto-merging fs/xfs/libxfs/xfs_btree.h Auto-merging fs/xfs/libxfs/xfs_btree.c Auto-merging fs/xfs/libxfs/xfs_bmap_btree.c Auto-merging fs/xfs/libxfs/xfs_bmap.c Auto-merging fs/xfs/libxfs/xfs_attr_remote.c Auto-merging fs/xfs/libxfs/xfs_attr_leaf.c Auto-merging fs/xfs/libxfs/xfs_attr.c Auto-merging fs/xfs/libxfs/xfs_alloc_btree.c Auto-merging fs/xfs/libxfs/xfs_alloc.c Merge made by the 'recursive' strategy. Documentation/ABI/testing/sysfs-fs-xfs | 39 +++++ fs/xfs/Kconfig | 1 + fs/xfs/Makefile | 71 +++++---- fs/xfs/{ => libxfs}/xfs_ag.h | 0 fs/xfs/{ => libxfs}/xfs_alloc.c | 20 +-- fs/xfs/{ => libxfs}/xfs_alloc.h | 0 fs/xfs/{ => libxfs}/xfs_alloc_btree.c | 6 +- fs/xfs/{ => libxfs}/xfs_alloc_btree.h | 0 fs/xfs/{ => libxfs}/xfs_attr.c | 92 +++++------ fs/xfs/{ => libxfs}/xfs_attr_leaf.c | 78 +++++----- fs/xfs/{ => libxfs}/xfs_attr_leaf.h | 0 fs/xfs/{ => libxfs}/xfs_attr_remote.c | 22 +-- fs/xfs/{ => libxfs}/xfs_attr_remote.h | 0 fs/xfs/{ => libxfs}/xfs_attr_sf.h | 0 fs/xfs/{ => libxfs}/xfs_bit.h | 0 fs/xfs/{ => libxfs}/xfs_bmap.c | 60 ++++---- fs/xfs/{ => libxfs}/xfs_bmap.h | 0 fs/xfs/{ => libxfs}/xfs_bmap_btree.c | 99 ++---------- fs/xfs/{ => libxfs}/xfs_bmap_btree.h | 0 fs/xfs/{ => libxfs}/xfs_btree.c | 46 +++--- fs/xfs/{ => libxfs}/xfs_btree.h | 2 +- fs/xfs/{ => libxfs}/xfs_cksum.h | 0 fs/xfs/{ => libxfs}/xfs_da_btree.c | 112 +++++++------- fs/xfs/{ => libxfs}/xfs_da_btree.h | 0 fs/xfs/{ => libxfs}/xfs_da_format.c | 0 fs/xfs/{ => libxfs}/xfs_da_format.h | 0 fs/xfs/{ => libxfs}/xfs_dinode.h | 0 fs/xfs/{ => libxfs}/xfs_dir2.c | 24 +-- fs/xfs/{ => libxfs}/xfs_dir2.h | 0 fs/xfs/{ => libxfs}/xfs_dir2_block.c | 18 +-- fs/xfs/{ => libxfs}/xfs_dir2_data.c | 10 +- fs/xfs/{ => libxfs}/xfs_dir2_leaf.c | 24 +-- fs/xfs/{ => libxfs}/xfs_dir2_node.c | 40 ++--- fs/xfs/{ => libxfs}/xfs_dir2_priv.h | 0 fs/xfs/{ => libxfs}/xfs_dir2_sf.c | 75 +++------ fs/xfs/{ => libxfs}/xfs_dquot_buf.c | 6 +- fs/xfs/{ => libxfs}/xfs_format.h | 14 +- fs/xfs/{ => libxfs}/xfs_ialloc.c | 34 ++-- fs/xfs/{ => libxfs}/xfs_ialloc.h | 0 fs/xfs/{ => libxfs}/xfs_ialloc_btree.c | 6 +- fs/xfs/{ => libxfs}/xfs_ialloc_btree.h | 0 fs/xfs/{ => libxfs}/xfs_inode_buf.c | 10 +- fs/xfs/{ => libxfs}/xfs_inode_buf.h | 0 fs/xfs/{ => libxfs}/xfs_inode_fork.c | 36 ++--- fs/xfs/{ => libxfs}/xfs_inode_fork.h | 0 fs/xfs/{ => libxfs}/xfs_inum.h | 4 - fs/xfs/{ => libxfs}/xfs_log_format.h | 4 +- fs/xfs/{ => libxfs}/xfs_log_recover.h | 0 fs/xfs/{ => libxfs}/xfs_log_rlimit.c | 0 fs/xfs/{ => libxfs}/xfs_quota_defs.h | 2 - fs/xfs/{ => libxfs}/xfs_rtbitmap.c | 0 fs/xfs/{ => libxfs}/xfs_sb.c | 32 ++-- fs/xfs/{ => libxfs}/xfs_sb.h | 8 +- fs/xfs/{ => libxfs}/xfs_shared.h | 0 fs/xfs/{ => libxfs}/xfs_symlink_remote.c | 6 +- fs/xfs/{ => libxfs}/xfs_trans_resv.c | 0 fs/xfs/{ => libxfs}/xfs_trans_resv.h | 0 fs/xfs/{ => libxfs}/xfs_trans_space.h | 0 fs/xfs/xfs_acl.c | 8 +- fs/xfs/xfs_aops.c | 18 +-- fs/xfs/xfs_attr_inactive.c | 22 +-- fs/xfs/xfs_attr_list.c | 38 ++--- fs/xfs/xfs_bmap_util.c | 80 +++++----- fs/xfs/xfs_buf.c | 26 ++-- fs/xfs/xfs_buf.h | 2 +- fs/xfs/xfs_buf_item.c | 4 +- fs/xfs/xfs_dir2_readdir.c | 4 +- fs/xfs/xfs_discard.c | 18 +-- fs/xfs/xfs_dquot.c | 38 ++--- fs/xfs/xfs_dquot.h | 15 ++ fs/xfs/xfs_error.c | 25 +-- fs/xfs/xfs_error.h | 13 +- fs/xfs/xfs_export.c | 10 +- fs/xfs/xfs_extfree_item.c | 2 +- fs/xfs/xfs_file.c | 65 +++++--- fs/xfs/xfs_filestream.c | 4 +- fs/xfs/xfs_fs.h | 7 +- fs/xfs/xfs_fsops.c | 42 ++--- fs/xfs/xfs_icache.c | 148 ++++++++++++++---- fs/xfs/xfs_icache.h | 13 +- fs/xfs/xfs_inode.c | 66 ++++---- fs/xfs/xfs_inode_item.c | 2 +- fs/xfs/xfs_ioctl.c | 256 +++++++++++++++---------------- fs/xfs/xfs_ioctl32.c | 106 ++++++------- fs/xfs/xfs_iomap.c | 54 ++++--- fs/xfs/xfs_iops.c | 68 ++++---- fs/xfs/xfs_itable.c | 24 +-- fs/xfs/xfs_linux.h | 25 ++- fs/xfs/xfs_log.c | 61 ++++---- fs/xfs/xfs_log_cil.c | 8 +- fs/xfs/xfs_log_priv.h | 2 + fs/xfs/xfs_log_recover.c | 191 +++++++++++------------ fs/xfs/xfs_mount.c | 96 ++++++------ fs/xfs/xfs_mount.h | 1 + fs/xfs/xfs_mru_cache.c | 14 +- fs/xfs/xfs_qm.c | 221 +++++++++++++------------- fs/xfs/xfs_qm.h | 1 - fs/xfs/xfs_qm_bhv.c | 2 +- fs/xfs/xfs_qm_syscalls.c | 46 +++--- fs/xfs/xfs_quotaops.c | 20 +-- fs/xfs/xfs_rtalloc.c | 24 +-- fs/xfs/xfs_rtalloc.h | 2 +- fs/xfs/xfs_super.c | 132 ++++++++-------- fs/xfs/xfs_super.h | 15 +- fs/xfs/xfs_symlink.c | 30 ++-- fs/xfs/xfs_sysfs.c | 165 ++++++++++++++++++++ fs/xfs/xfs_sysfs.h | 59 +++++++ fs/xfs/xfs_trans.c | 10 +- fs/xfs/xfs_trans_ail.c | 4 +- fs/xfs/xfs_trans_buf.c | 37 +++-- fs/xfs/xfs_trans_dquot.c | 4 +- fs/xfs/xfs_types.h | 29 +--- fs/xfs/xfs_xattr.c | 6 +- 113 files changed, 1805 insertions(+), 1579 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-fs-xfs rename fs/xfs/{ => libxfs}/xfs_ag.h (100%) rename fs/xfs/{ => libxfs}/xfs_alloc.c (99%) rename fs/xfs/{ => libxfs}/xfs_alloc.h (100%) rename fs/xfs/{ => libxfs}/xfs_alloc_btree.c (99%) rename fs/xfs/{ => libxfs}/xfs_alloc_btree.h (100%) rename fs/xfs/{ => libxfs}/xfs_attr.c (97%) rename fs/xfs/{ => libxfs}/xfs_attr_leaf.c (98%) rename fs/xfs/{ => libxfs}/xfs_attr_leaf.h (100%) rename fs/xfs/{ => libxfs}/xfs_attr_remote.c (98%) rename fs/xfs/{ => libxfs}/xfs_attr_remote.h (100%) rename fs/xfs/{ => libxfs}/xfs_attr_sf.h (100%) rename fs/xfs/{ => libxfs}/xfs_bit.h (100%) rename fs/xfs/{ => libxfs}/xfs_bmap.c (99%) rename fs/xfs/{ => libxfs}/xfs_bmap.h (100%) rename fs/xfs/{ => libxfs}/xfs_bmap_btree.c (88%) rename fs/xfs/{ => libxfs}/xfs_bmap_btree.h (100%) rename fs/xfs/{ => libxfs}/xfs_btree.c (99%) rename fs/xfs/{ => libxfs}/xfs_btree.h (99%) rename fs/xfs/{ => libxfs}/xfs_cksum.h (100%) rename fs/xfs/{ => libxfs}/xfs_da_btree.c (97%) rename fs/xfs/{ => libxfs}/xfs_da_btree.h (100%) rename fs/xfs/{ => libxfs}/xfs_da_format.c (100%) rename fs/xfs/{ => libxfs}/xfs_da_format.h (100%) rename fs/xfs/{ => libxfs}/xfs_dinode.h (100%) rename fs/xfs/{ => libxfs}/xfs_dir2.c (98%) rename fs/xfs/{ => libxfs}/xfs_dir2.h (100%) rename fs/xfs/{ => libxfs}/xfs_dir2_block.c (99%) rename fs/xfs/{ => libxfs}/xfs_dir2_data.c (99%) rename fs/xfs/{ => libxfs}/xfs_dir2_leaf.c (99%) rename fs/xfs/{ => libxfs}/xfs_dir2_node.c (98%) rename fs/xfs/{ => libxfs}/xfs_dir2_priv.h (100%) rename fs/xfs/{ => libxfs}/xfs_dir2_sf.c (97%) rename fs/xfs/{ => libxfs}/xfs_dquot_buf.c (98%) rename fs/xfs/{ => libxfs}/xfs_format.h (97%) rename fs/xfs/{ => libxfs}/xfs_ialloc.c (99%) rename fs/xfs/{ => libxfs}/xfs_ialloc.h (100%) rename fs/xfs/{ => libxfs}/xfs_ialloc_btree.c (98%) rename fs/xfs/{ => libxfs}/xfs_ialloc_btree.h (100%) rename fs/xfs/{ => libxfs}/xfs_inode_buf.c (98%) rename fs/xfs/{ => libxfs}/xfs_inode_buf.h (100%) rename fs/xfs/{ => libxfs}/xfs_inode_fork.c (98%) rename fs/xfs/{ => libxfs}/xfs_inode_fork.h (100%) rename fs/xfs/{ => libxfs}/xfs_inum.h (96%) rename fs/xfs/{ => libxfs}/xfs_log_format.h (99%) rename fs/xfs/{ => libxfs}/xfs_log_recover.h (100%) rename fs/xfs/{ => libxfs}/xfs_log_rlimit.c (100%) rename fs/xfs/{ => libxfs}/xfs_quota_defs.h (98%) rename fs/xfs/{ => libxfs}/xfs_rtbitmap.c (100%) rename fs/xfs/{ => libxfs}/xfs_sb.c (98%) rename fs/xfs/{ => libxfs}/xfs_sb.h (98%) rename fs/xfs/{ => libxfs}/xfs_shared.h (100%) rename fs/xfs/{ => libxfs}/xfs_symlink_remote.c (97%) rename fs/xfs/{ => libxfs}/xfs_trans_resv.c (100%) rename fs/xfs/{ => libxfs}/xfs_trans_resv.h (100%) rename fs/xfs/{ => libxfs}/xfs_trans_space.h (100%) create mode 100644 fs/xfs/xfs_sysfs.c create mode 100644 fs/xfs/xfs_sysfs.h Merging file-private-locks/linux-next (73a8f5f7e635 locks: purge fl_owner_t from fs/locks.c) $ git merge file-private-locks/linux-next Merge made by the 'recursive' strategy. fs/locks.c | 26 +++++++++++++------------- include/linux/fs.h | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) Merging vfs/for-next (cd67b9ac44ea switch iov_iter_get_pages() to passing maximal number of pages) $ git merge vfs/for-next Auto-merging include/linux/uio.h Auto-merging fs/fuse/file.c Auto-merging fs/direct-io.c Merge made by the 'recursive' strategy. fs/direct-io.c | 2 +- fs/fuse/file.c | 4 ++-- include/linux/uio.h | 2 +- mm/iov_iter.c | 17 ++++++++--------- 4 files changed, 12 insertions(+), 13 deletions(-) Merging hch-vfs/vfs-for-3.17 (f68cbb8bd2c3 dcache: d_splice_alias should detect loops) $ git merge hch-vfs/vfs-for-3.17 Auto-merging fs/direct-io.c Auto-merging fs/cifs/cifsfs.h Merge made by the 'recursive' strategy. Documentation/filesystems/nfs/Exporting | 38 ++++--- Documentation/filesystems/vfs.txt | 3 +- fs/bad_inode.c | 7 +- fs/btrfs/inode.c | 12 +- fs/btrfs/super.c | 9 +- fs/ceph/super.c | 2 +- fs/cifs/cifsfs.c | 2 +- fs/cifs/cifsfs.h | 4 +- fs/cifs/inode.c | 14 ++- fs/dcache.c | 196 +++++++++++++++++++------------- fs/direct-io.c | 9 +- fs/ext4/namei.c | 1 - fs/fuse/dir.c | 7 -- fs/hostfs/hostfs.h | 1 + fs/hostfs/hostfs_kern.c | 30 +++-- fs/hostfs/hostfs_user.c | 28 +++++ fs/namei.c | 32 +++--- fs/nfs/getroot.c | 2 +- fs/nilfs2/super.c | 2 +- include/linux/dcache.h | 1 + mm/shmem.c | 32 +++++- 21 files changed, 279 insertions(+), 153 deletions(-) Merging pci/next (981c191778a4 Merge branches 'pci/host-designware', 'pci/host-mvebu' and 'pci/host-tegra' into next) $ git merge pci/next Auto-merging drivers/pci/pci.c Auto-merging drivers/pci/host/pci-tegra.c Auto-merging drivers/pci/host/Makefile Auto-merging drivers/pci/host/Kconfig Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. .../devicetree/bindings/pci/designware-pcie.txt | 4 + Documentation/devicetree/bindings/pci/ti-pci.txt | 59 +++ MAINTAINERS | 8 + arch/ia64/pci/fixup.c | 22 + arch/powerpc/kernel/pci-common.c | 11 +- arch/x86/include/asm/vga.h | 6 - arch/x86/kernel/resource.c | 8 +- arch/x86/pci/fixup.c | 21 + arch/x86/pci/i386.c | 4 + drivers/pci/host/Kconfig | 11 +- drivers/pci/host/Makefile | 1 + drivers/pci/host/pci-dra7xx.c | 458 +++++++++++++++++++++ drivers/pci/host/pci-host-generic.c | 2 +- drivers/pci/host/pci-mvebu.c | 2 +- drivers/pci/host/pci-tegra.c | 120 +++++- drivers/pci/host/pcie-designware.c | 134 ++++-- drivers/pci/host/pcie-designware.h | 11 + drivers/pci/host/pcie-rcar.c | 158 ++++--- drivers/pci/hotplug/cpqphp_sysfs.c | 3 +- drivers/pci/hotplug/pciehp.h | 3 +- drivers/pci/hotplug/pciehp_core.c | 7 + drivers/pci/hotplug/pciehp_hpc.c | 101 ++--- drivers/pci/msi.c | 141 +++---- drivers/pci/pci-label.c | 18 +- drivers/pci/pci.c | 19 +- drivers/pci/pcie/portdrv_pci.c | 4 - drivers/pci/quirks.c | 2 + drivers/pci/setup-bus.c | 2 +- drivers/pci/setup-res.c | 75 ++-- drivers/video/fbdev/efifb.c | 39 -- include/linux/msi.h | 3 +- include/linux/pci.h | 4 +- include/linux/pci_ids.h | 4 + 33 files changed, 1084 insertions(+), 381 deletions(-) create mode 100644 Documentation/devicetree/bindings/pci/ti-pci.txt create mode 100644 drivers/pci/host/pci-dra7xx.c Merging hid/for-next (914b9e7fdb8d Merge branch 'for-3.17/sony' into for-next) $ git merge hid/for-next Removing drivers/hid/hid-lenovo-tpkbd.c Auto-merging Documentation/ABI/testing/sysfs-driver-hid-lenovo Merge made by the 'recursive' strategy. .../ABI/testing/sysfs-class-hid-driver-gt683r | 14 + ...er-hid-lenovo-tpkbd => sysfs-driver-hid-lenovo} | 12 + drivers/hid/Kconfig | 32 +- drivers/hid/Makefile | 3 +- drivers/hid/hid-core.c | 12 +- drivers/hid/hid-cp2112.c | 111 +++- drivers/hid/hid-gt683r.c | 309 +++++++++ drivers/hid/hid-huion.c | 265 +++++--- drivers/hid/hid-ids.h | 8 +- drivers/hid/hid-lenovo-tpkbd.c | 462 -------------- drivers/hid/hid-lenovo.c | 708 +++++++++++++++++++++ drivers/hid/hid-picolcd_debugfs.c | 9 +- drivers/hid/hid-rmi.c | 67 +- drivers/hid/hid-roccat-lua.c | 2 +- drivers/hid/hid-sony.c | 132 ++-- drivers/hid/i2c-hid/i2c-hid.c | 15 +- drivers/hid/usbhid/hid-core.c | 8 +- drivers/hid/usbhid/hid-quirks.c | 3 +- include/linux/hid.h | 1 + 19 files changed, 1529 insertions(+), 644 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-class-hid-driver-gt683r rename Documentation/ABI/testing/{sysfs-driver-hid-lenovo-tpkbd => sysfs-driver-hid-lenovo} (75%) create mode 100644 drivers/hid/hid-gt683r.c delete mode 100644 drivers/hid/hid-lenovo-tpkbd.c create mode 100644 drivers/hid/hid-lenovo.c Merging i2c/i2c/for-next (80e2f6405074 Merge branch 'i2c/for-current' into i2c/for-next) $ git merge i2c/i2c/for-next Removing include/linux/i2c/s6000.h Removing drivers/i2c/busses/scx200_i2c.c Removing drivers/i2c/busses/i2c-s6000.h Removing drivers/i2c/busses/i2c-s6000.c Merge made by the 'recursive' strategy. .../devicetree/bindings/i2c/i2c-efm32.txt | 4 +- Documentation/i2c/busses/i2c-i801 | 1 + Documentation/i2c/i2c-stub | 23 +- drivers/i2c/Kconfig | 18 +- drivers/i2c/Makefile | 5 +- drivers/i2c/busses/Kconfig | 42 +-- drivers/i2c/busses/Makefile | 2 - drivers/i2c/busses/i2c-at91.c | 6 +- drivers/i2c/busses/i2c-bcm2835.c | 2 +- drivers/i2c/busses/i2c-bfin-twi.c | 2 +- drivers/i2c/busses/i2c-davinci.c | 2 +- drivers/i2c/busses/i2c-designware-platdrv.c | 2 +- drivers/i2c/busses/i2c-efm32.c | 8 +- drivers/i2c/busses/i2c-exynos5.c | 16 +- drivers/i2c/busses/i2c-i801.c | 139 +++---- drivers/i2c/busses/i2c-mv64xxx.c | 2 +- drivers/i2c/busses/i2c-nomadik.c | 8 +- drivers/i2c/busses/i2c-ocores.c | 12 +- drivers/i2c/busses/i2c-omap.c | 2 +- drivers/i2c/busses/i2c-rcar.c | 14 +- drivers/i2c/busses/i2c-s3c2410.c | 16 +- drivers/i2c/busses/i2c-s6000.c | 404 --------------------- drivers/i2c/busses/i2c-s6000.h | 79 ---- drivers/i2c/busses/i2c-sirf.c | 2 +- drivers/i2c/busses/i2c-st.c | 2 +- drivers/i2c/busses/i2c-stu300.c | 2 +- drivers/i2c/busses/i2c-taos-evm.c | 13 +- drivers/i2c/busses/i2c-tegra.c | 2 +- drivers/i2c/busses/i2c-xiic.c | 12 +- drivers/i2c/busses/scx200_i2c.c | 129 ------- drivers/i2c/i2c-acpi.c | 362 ++++++++++++++++++ drivers/i2c/i2c-core.c | 107 +----- drivers/i2c/i2c-stub.c | 237 +++++++++++- include/linux/acpi.h | 11 + include/linux/i2c.h | 12 + include/linux/i2c/s6000.h | 10 - 36 files changed, 796 insertions(+), 914 deletions(-) delete mode 100644 drivers/i2c/busses/i2c-s6000.c delete mode 100644 drivers/i2c/busses/i2c-s6000.h delete mode 100644 drivers/i2c/busses/scx200_i2c.c create mode 100644 drivers/i2c/i2c-acpi.c delete mode 100644 include/linux/i2c/s6000.h Merging jdelvare-hwmon/master (c7208164e66f Linux 3.15-rc7) $ git merge jdelvare-hwmon/master Already up-to-date. Merging hwmon-staging/hwmon-next (f69b017bef03 hwmon: (pwm-fan) Make SENSORS_PWM_FAN depend on OF) $ git merge hwmon-staging/hwmon-next Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt Merge made by the 'recursive' strategy. .../devicetree/bindings/hwmon/ibmpowernv.txt | 23 + .../devicetree/bindings/hwmon/ntc_thermistor.txt | 1 + .../devicetree/bindings/hwmon/pwm-fan.txt | 12 + .../devicetree/bindings/i2c/trivial-devices.txt | 1 + .../devicetree/bindings/vendor-prefixes.txt | 1 + Documentation/hwmon/ibmpowernv | 41 ++ Documentation/hwmon/lm75 | 5 +- Documentation/hwmon/ntc_thermistor | 5 + Documentation/hwmon/pmbus | 5 +- Documentation/hwmon/powr1220 | 45 ++ Documentation/hwmon/pwm-fan | 17 + Documentation/hwmon/tmp103 | 28 + Documentation/hwmon/tmp421 | 26 +- Documentation/hwmon/tps40422 | 64 +++ drivers/hwmon/Kconfig | 57 +- drivers/hwmon/Makefile | 4 + drivers/hwmon/ad7414.c | 57 +- drivers/hwmon/ad7418.c | 133 ++--- drivers/hwmon/adm1021.c | 175 +++--- drivers/hwmon/adm1025.c | 231 ++++---- drivers/hwmon/adm1026.c | 588 ++++++++++----------- drivers/hwmon/adm1029.c | 208 +++----- drivers/hwmon/adm1031.c | 349 ++++++------ drivers/hwmon/adm9240.c | 339 ++++++------ drivers/hwmon/ads7828.c | 52 +- drivers/hwmon/adt7411.c | 59 +-- drivers/hwmon/adt7462.c | 142 ++--- drivers/hwmon/adt7470.c | 163 +++--- drivers/hwmon/amc6821.c | 380 ++++++------- drivers/hwmon/asc7621.c | 14 +- drivers/hwmon/atxp1.c | 76 +-- drivers/hwmon/ds620.c | 60 +-- drivers/hwmon/emc1403.c | 2 +- drivers/hwmon/emc2103.c | 89 +--- drivers/hwmon/emc6w201.c | 64 +-- drivers/hwmon/fam15h_power.c | 54 +- drivers/hwmon/g760a.c | 84 +-- drivers/hwmon/g762.c | 71 +-- drivers/hwmon/gl518sm.c | 319 +++++------ drivers/hwmon/gl520sm.c | 353 ++++++------- drivers/hwmon/gpio-fan.c | 17 +- drivers/hwmon/hih6130.c | 88 +-- drivers/hwmon/htu21.c | 69 +-- drivers/hwmon/ibmpowernv.c | 364 +++++++++++++ drivers/hwmon/lineage-pem.c | 66 +-- drivers/hwmon/lm63.c | 27 +- drivers/hwmon/lm75.c | 8 + drivers/hwmon/lm93.c | 154 +++--- drivers/hwmon/ltc2945.c | 2 +- drivers/hwmon/ltc4222.c | 2 +- drivers/hwmon/ltc4260.c | 2 +- drivers/hwmon/max16065.c | 5 +- drivers/hwmon/max1668.c | 2 +- drivers/hwmon/max6639.c | 2 +- drivers/hwmon/nct6775.c | 14 +- drivers/hwmon/ntc_thermistor.c | 50 +- drivers/hwmon/pmbus/Kconfig | 13 +- drivers/hwmon/pmbus/Makefile | 1 + drivers/hwmon/pmbus/pmbus.c | 1 - drivers/hwmon/pmbus/tps40422.c | 64 +++ drivers/hwmon/powr1220.c | 391 ++++++++++++++ drivers/hwmon/pwm-fan.c | 193 +++++++ drivers/hwmon/sht21.c | 82 +-- drivers/hwmon/smm665.c | 44 +- drivers/hwmon/smsc47m1.c | 115 ++-- drivers/hwmon/smsc47m192.c | 232 ++++---- drivers/hwmon/thmc50.c | 212 +++----- drivers/hwmon/tmp103.c | 206 ++++++++ drivers/hwmon/tmp421.c | 39 +- drivers/hwmon/twl4030-madc-hwmon.c | 38 +- drivers/hwmon/w83791d.c | 15 +- drivers/hwmon/w83l786ng.c | 289 +++++----- drivers/hwmon/wm831x-hwmon.c | 72 +-- drivers/hwmon/wm8350-hwmon.c | 50 +- include/linux/platform_data/ntc_thermistor.h | 1 + 75 files changed, 3910 insertions(+), 3417 deletions(-) create mode 100644 Documentation/devicetree/bindings/hwmon/ibmpowernv.txt create mode 100644 Documentation/devicetree/bindings/hwmon/pwm-fan.txt create mode 100644 Documentation/hwmon/ibmpowernv create mode 100644 Documentation/hwmon/powr1220 create mode 100644 Documentation/hwmon/pwm-fan create mode 100644 Documentation/hwmon/tmp103 create mode 100644 Documentation/hwmon/tps40422 create mode 100644 drivers/hwmon/ibmpowernv.c create mode 100644 drivers/hwmon/pmbus/tps40422.c create mode 100644 drivers/hwmon/powr1220.c create mode 100644 drivers/hwmon/pwm-fan.c create mode 100644 drivers/hwmon/tmp103.c Merging v4l-dvb/master (50b8879ed699 Merge branch 'patchwork' into to_next) $ git merge v4l-dvb/master Removing drivers/staging/media/solo6x10/TODO Removing drivers/staging/media/sn9c102/sn9c102_tas5130d1b.c Removing drivers/staging/media/sn9c102/sn9c102_tas5110d.c Removing drivers/staging/media/sn9c102/sn9c102_tas5110c1b.c Removing drivers/staging/media/sn9c102/sn9c102_sensor.h Removing drivers/staging/media/sn9c102/sn9c102_pas202bcb.c Removing drivers/staging/media/sn9c102/sn9c102_pas106b.c Removing drivers/staging/media/sn9c102/sn9c102_ov7660.c Removing drivers/staging/media/sn9c102/sn9c102_ov7630.c Removing drivers/staging/media/sn9c102/sn9c102_mt9v111.c Removing drivers/staging/media/sn9c102/sn9c102_mi0360.c Removing drivers/staging/media/sn9c102/sn9c102_mi0343.c Removing drivers/staging/media/sn9c102/sn9c102_hv7131r.c Removing drivers/staging/media/sn9c102/sn9c102_hv7131d.c Removing drivers/staging/media/sn9c102/sn9c102_devtable.h Removing drivers/staging/media/sn9c102/sn9c102_core.c Removing drivers/staging/media/sn9c102/sn9c102_config.h Removing drivers/staging/media/sn9c102/sn9c102.txt Removing drivers/staging/media/sn9c102/sn9c102.h Removing drivers/staging/media/sn9c102/Makefile Removing drivers/staging/media/sn9c102/Kconfig Removing drivers/staging/media/rtl2832u_sdr/Makefile Removing drivers/staging/media/rtl2832u_sdr/Kconfig Removing drivers/staging/media/msi3101/Makefile Removing drivers/staging/media/msi3101/Kconfig Removing drivers/staging/media/go7007/saa7134-go7007.c Removing drivers/staging/media/go7007/go7007.txt Removing drivers/staging/media/go7007/go7007.h Removing drivers/staging/media/go7007/README Auto-merging drivers/media/usb/msi2500/msi2500.c Auto-merging drivers/media/usb/go7007/snd-go7007.c Auto-merging drivers/media/usb/go7007/s2250-board.c Auto-merging drivers/media/usb/go7007/go7007-v4l2.c Auto-merging drivers/media/usb/go7007/go7007-usb.c Auto-merging drivers/media/usb/go7007/go7007-priv.h Auto-merging drivers/media/usb/go7007/go7007-loader.c Auto-merging drivers/media/usb/go7007/go7007-i2c.c Auto-merging drivers/media/usb/go7007/go7007-fw.c Auto-merging drivers/media/usb/go7007/go7007-driver.c Auto-merging drivers/media/usb/go7007/Makefile Auto-merging drivers/media/tuners/msi001.c Auto-merging drivers/media/rc/rc-ir-raw.c Removing drivers/media/rc/ir-rc5-sz-decoder.c Removing drivers/media/platform/soc_camera/mx1_camera.c Auto-merging drivers/media/pci/solo6x10/solo6x10.h Auto-merging drivers/media/pci/solo6x10/solo6x10-v4l2.c Auto-merging drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c Auto-merging drivers/media/pci/solo6x10/solo6x10-tw28.h Auto-merging drivers/media/pci/solo6x10/solo6x10-tw28.c Auto-merging drivers/media/pci/solo6x10/solo6x10-regs.h Auto-merging drivers/media/pci/solo6x10/solo6x10-p2m.c Auto-merging drivers/media/pci/solo6x10/solo6x10-offsets.h Auto-merging drivers/media/pci/solo6x10/solo6x10-jpeg.h Auto-merging drivers/media/pci/solo6x10/solo6x10-i2c.c Auto-merging drivers/media/pci/solo6x10/solo6x10-gpio.c Auto-merging drivers/media/pci/solo6x10/solo6x10-g723.c Auto-merging drivers/media/pci/solo6x10/solo6x10-enc.c Auto-merging drivers/media/pci/solo6x10/solo6x10-eeprom.c Auto-merging drivers/media/pci/solo6x10/solo6x10-disp.c Auto-merging drivers/media/pci/solo6x10/solo6x10-core.c Auto-merging drivers/media/pci/solo6x10/Makefile Auto-merging drivers/media/pci/solo6x10/Kconfig Auto-merging drivers/media/dvb-frontends/rtl2832_sdr.c Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. Documentation/DocBook/media/Makefile | 2 +- Documentation/DocBook/media/dvb/dvbproperty.xml | 44 +- Documentation/DocBook/media/v4l/controls.xml | 408 ++- Documentation/DocBook/media/v4l/dev-raw-vbi.xml | 12 +- Documentation/DocBook/media/v4l/dev-sdr.xml | 18 +- Documentation/DocBook/media/v4l/dev-sliced-vbi.xml | 9 +- Documentation/DocBook/media/v4l/io.xml | 9 +- .../DocBook/media/v4l/pixfmt-packed-rgb.xml | 418 ++- .../DocBook/media/v4l/pixfmt-sdr-cs08.xml | 44 + .../DocBook/media/v4l/pixfmt-sdr-cs14le.xml | 47 + .../DocBook/media/v4l/pixfmt-sdr-ru12le.xml | 40 + Documentation/DocBook/media/v4l/pixfmt-srggb12.xml | 2 +- Documentation/DocBook/media/v4l/pixfmt.xml | 61 +- Documentation/DocBook/media/v4l/selection-api.xml | 95 +- Documentation/DocBook/media/v4l/v4l2.xml | 8 + Documentation/DocBook/media/v4l/vidioc-dqevent.xml | 50 + .../DocBook/media/v4l/vidioc-g-ext-ctrls.xml | 51 +- Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml | 12 +- .../DocBook/media/v4l/vidioc-g-selection.xml | 40 +- .../DocBook/media/v4l/vidioc-querycap.xml | 6 + .../DocBook/media/v4l/vidioc-queryctrl.xml | 234 +- .../DocBook/media/v4l/vidioc-subscribe-event.xml | 8 + .../devicetree/bindings/media/atmel-isi.txt | 51 + .../bindings/media/exynos-jpeg-codec.txt | 12 +- .../devicetree/bindings/media/i2c/mt9m111.txt | 28 + .../devicetree/bindings/media/pxa-camera.txt | 43 + .../devicetree/bindings/media/rcar_vin.txt | 86 + .../devicetree/bindings/media/sunxi-ir.txt | 23 + Documentation/dvb/get_dvb_firmware | 33 +- Documentation/video4linux/CARDLIST.cx23885 | 2 + Documentation/video4linux/CARDLIST.em28xx | 2 +- Documentation/video4linux/v4l2-controls.txt | 63 +- Documentation/video4linux/v4l2-framework.txt | 8 +- Documentation/video4linux/v4l2-pci-skeleton.c | 5 - Documentation/zh_CN/video4linux/v4l2-framework.txt | 7 +- MAINTAINERS | 52 +- drivers/hid/hid-picolcd_cir.c | 2 +- drivers/media/Kconfig | 12 +- drivers/media/common/saa7146/saa7146_fops.c | 14 +- drivers/media/common/siano/Kconfig | 3 +- drivers/media/common/siano/smsir.c | 2 +- drivers/media/dvb-core/dvb-usb-ids.h | 2 + drivers/media/dvb-core/dvb_frontend.c | 36 +- drivers/media/dvb-core/dvb_frontend.h | 6 + drivers/media/dvb-core/dvbdev.h | 4 + drivers/media/dvb-frontends/Kconfig | 18 + drivers/media/dvb-frontends/Makefile | 7 + drivers/media/dvb-frontends/af9013.c | 1 - drivers/media/dvb-frontends/au8522_decoder.c | 180 +- drivers/media/dvb-frontends/au8522_priv.h | 2 + drivers/media/dvb-frontends/cxd2820r.h | 6 + drivers/media/dvb-frontends/cxd2820r_c.c | 1 + drivers/media/dvb-frontends/cxd2820r_t.c | 1 + drivers/media/dvb-frontends/cxd2820r_t2.c | 1 + drivers/media/dvb-frontends/dib0090.c | 15 +- drivers/media/dvb-frontends/dib7000m.c | 5 +- drivers/media/dvb-frontends/dib7000p.c | 433 ++- drivers/media/dvb-frontends/dib7000p.h | 131 +- drivers/media/dvb-frontends/dib8000.c | 732 +++-- drivers/media/dvb-frontends/dib8000.h | 150 +- drivers/media/dvb-frontends/dib9000.c | 13 +- drivers/media/dvb-frontends/drx39xyj/drxj.c | 228 +- drivers/media/dvb-frontends/drxd.h | 1 - drivers/media/dvb-frontends/drxd_hard.c | 3 +- drivers/media/dvb-frontends/m88ds3103.c | 85 +- drivers/media/dvb-frontends/m88ds3103_priv.h | 2 + drivers/media/dvb-frontends/mb86a20s.c | 35 +- .../dvb-frontends}/rtl2832_sdr.c | 100 +- .../dvb-frontends}/rtl2832_sdr.h | 0 drivers/media/dvb-frontends/si2165.c | 1040 ++++++ drivers/media/dvb-frontends/si2165.h | 62 + drivers/media/dvb-frontends/si2165_priv.h | 23 + drivers/media/dvb-frontends/si2168.c | 268 +- drivers/media/dvb-frontends/si2168_priv.h | 9 +- drivers/media/dvb-frontends/stb6100_cfg.h | 42 +- drivers/media/dvb-frontends/stb6100_proc.h | 34 +- drivers/media/dvb-frontends/stv0367.c | 9 +- drivers/media/dvb-frontends/tda18271c2dd.c | 2 +- drivers/media/dvb-frontends/tda18271c2dd_maps.h | 8 +- drivers/media/dvb-frontends/tda8261_cfg.h | 30 +- drivers/media/i2c/Kconfig | 1 + drivers/media/i2c/adv7180.c | 1 - drivers/media/i2c/adv7604.c | 5 +- drivers/media/i2c/ir-kbd-i2c.c | 95 +- drivers/media/i2c/mt9v032.c | 170 +- drivers/media/i2c/noon010pc30.c | 1 + drivers/media/i2c/s5k4ecgx.c | 1 + drivers/media/i2c/s5k5baf.c | 2 + drivers/media/i2c/s5k6a3.c | 1 + drivers/media/i2c/smiapp/smiapp-core.c | 17 +- drivers/media/i2c/soc_camera/mt9m001.c | 6 +- drivers/media/i2c/soc_camera/mt9m111.c | 12 + drivers/media/i2c/soc_camera/mt9t031.c | 6 +- drivers/media/i2c/soc_camera/mt9v022.c | 4 +- drivers/media/i2c/tvp5150.c | 35 +- drivers/media/media-device.c | 2 - drivers/media/parport/bw-qcam.c | 3 - drivers/media/parport/c-qcam.c | 1 - drivers/media/parport/pms.c | 1 - drivers/media/parport/w9966.c | 1 - drivers/media/pci/Kconfig | 1 + drivers/media/pci/Makefile | 1 + drivers/media/pci/bt8xx/bttv-driver.c | 1 - drivers/media/pci/bt8xx/bttv-input.c | 78 +- drivers/media/pci/bt8xx/bttvp.h | 2 - drivers/media/pci/cx18/cx18-alsa.h | 1 - drivers/media/pci/cx18/cx18-ioctl.c | 1 - drivers/media/pci/cx18/cx18-streams.c | 1 - drivers/media/pci/cx23885/Kconfig | 2 + drivers/media/pci/cx23885/cx23885-cards.c | 61 +- drivers/media/pci/cx23885/cx23885-dvb.c | 175 +- drivers/media/pci/cx23885/cx23885-input.c | 2 +- drivers/media/pci/cx23885/cx23885-video.c | 1 + drivers/media/pci/cx23885/cx23885.h | 2 + drivers/media/pci/cx25821/cx25821-video.c | 4 - drivers/media/pci/cx88/cx88-core.c | 1 - drivers/media/pci/cx88/cx88-input.c | 38 +- drivers/media/pci/ddbridge/ddbridge-core.c | 35 +- drivers/media/pci/dm1105/dm1105.c | 3 +- drivers/media/pci/ivtv/ivtv-controls.c | 4 +- drivers/media/pci/ivtv/ivtv-i2c.c | 9 +- drivers/media/pci/ivtv/ivtv-ioctl.c | 3 - drivers/media/pci/ivtv/ivtv-streams.c | 1 - drivers/media/pci/meye/meye.c | 3 - drivers/media/pci/ngene/ngene-core.c | 7 +- drivers/media/pci/saa7134/saa7134-core.c | 1 - drivers/media/pci/saa7134/saa7134-empress.c | 4 - drivers/media/pci/saa7134/saa7134-input.c | 86 +- drivers/media/pci/saa7134/saa7134-video.c | 2 - drivers/media/pci/saa7164/saa7164-dvb.c | 32 +- .../{staging/media => media/pci}/solo6x10/Kconfig | 3 +- .../{staging/media => media/pci}/solo6x10/Makefile | 2 +- .../media => media/pci}/solo6x10/solo6x10-core.c | 6 +- .../media => media/pci}/solo6x10/solo6x10-disp.c | 20 +- .../media => media/pci}/solo6x10/solo6x10-eeprom.c | 4 - .../media => media/pci}/solo6x10/solo6x10-enc.c | 4 - .../media => media/pci}/solo6x10/solo6x10-g723.c | 4 - .../media => media/pci}/solo6x10/solo6x10-gpio.c | 4 - .../media => media/pci}/solo6x10/solo6x10-i2c.c | 4 - .../media => media/pci}/solo6x10/solo6x10-jpeg.h | 6 +- .../pci}/solo6x10/solo6x10-offsets.h | 4 - .../media => media/pci}/solo6x10/solo6x10-p2m.c | 4 - .../media => media/pci}/solo6x10/solo6x10-regs.h | 4 - .../media => media/pci}/solo6x10/solo6x10-tw28.c | 5 +- .../media => media/pci}/solo6x10/solo6x10-tw28.h | 4 - .../pci}/solo6x10/solo6x10-v4l2-enc.c | 207 +- .../media => media/pci}/solo6x10/solo6x10-v4l2.c | 9 +- .../media => media/pci}/solo6x10/solo6x10.h | 30 +- drivers/media/pci/sta2x11/sta2x11_vip.c | 2 - drivers/media/pci/ttpci/budget-ci.c | 10 +- drivers/media/pci/zoran/zr36050.h | 1 - drivers/media/platform/Kconfig | 7 +- drivers/media/platform/arv.c | 1 - drivers/media/platform/blackfin/bfin_capture.c | 9 +- drivers/media/platform/blackfin/ppi.c | 25 +- drivers/media/platform/coda.c | 1518 ++++++--- drivers/media/platform/coda.h | 115 +- drivers/media/platform/davinci/dm644x_ccdc.c | 5 - drivers/media/platform/davinci/vpbe_display.c | 1 - drivers/media/platform/davinci/vpfe_capture.c | 1 - drivers/media/platform/davinci/vpif_capture.c | 248 +- drivers/media/platform/davinci/vpif_capture.h | 11 - drivers/media/platform/davinci/vpif_display.c | 4 +- drivers/media/platform/m2m-deinterlace.c | 7 +- drivers/media/platform/mem2mem_testdev.c | 1 - drivers/media/platform/omap/omap_vout.c | 2 - drivers/media/platform/s3c-camif/camif-capture.c | 3 +- drivers/media/platform/s5p-jpeg/Makefile | 2 +- drivers/media/platform/s5p-jpeg/jpeg-core.c | 660 +++- drivers/media/platform/s5p-jpeg/jpeg-core.h | 32 +- .../media/platform/s5p-jpeg/jpeg-hw-exynos3250.c | 487 +++ .../media/platform/s5p-jpeg/jpeg-hw-exynos3250.h | 60 + drivers/media/platform/s5p-jpeg/jpeg-regs.h | 247 +- drivers/media/platform/s5p-mfc/s5p_mfc.c | 17 +- drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 11 +- drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 49 +- drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 9 +- drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 6 +- drivers/media/platform/s5p-mfc/s5p_mfc_pm.c | 24 + drivers/media/platform/s5p-tv/mixer_video.c | 2 - drivers/media/platform/sh_veu.c | 2 - drivers/media/platform/soc_camera/Kconfig | 18 +- drivers/media/platform/soc_camera/Makefile | 1 - drivers/media/platform/soc_camera/atmel-isi.c | 90 +- drivers/media/platform/soc_camera/mx1_camera.c | 866 ----- drivers/media/platform/soc_camera/pxa_camera.c | 81 +- drivers/media/platform/soc_camera/rcar_vin.c | 82 +- drivers/media/platform/soc_camera/soc_camera.c | 141 +- drivers/media/platform/vino.c | 5 - drivers/media/platform/vivi.c | 11 +- drivers/media/platform/vsp1/vsp1.h | 14 +- drivers/media/platform/vsp1/vsp1_bru.c | 85 +- drivers/media/platform/vsp1/vsp1_bru.h | 9 +- drivers/media/platform/vsp1/vsp1_drv.c | 22 +- drivers/media/platform/vsp1/vsp1_entity.c | 42 + drivers/media/platform/vsp1/vsp1_entity.h | 10 + drivers/media/platform/vsp1/vsp1_regs.h | 2 + drivers/media/platform/vsp1/vsp1_rpf.c | 72 +- drivers/media/platform/vsp1/vsp1_rwpf.h | 2 + drivers/media/platform/vsp1/vsp1_sru.c | 107 +- drivers/media/platform/vsp1/vsp1_sru.h | 1 - drivers/media/platform/vsp1/vsp1_uds.c | 63 +- drivers/media/platform/vsp1/vsp1_uds.h | 6 +- drivers/media/platform/vsp1/vsp1_video.c | 219 +- drivers/media/platform/vsp1/vsp1_video.h | 11 +- drivers/media/platform/vsp1/vsp1_wpf.c | 72 +- drivers/media/radio/dsbr100.c | 1 - drivers/media/radio/radio-cadet.c | 1 - drivers/media/radio/radio-isa.c | 1 - drivers/media/radio/radio-keene.c | 3 +- drivers/media/radio/radio-ma901.c | 1 - drivers/media/radio/radio-miropcm20.c | 304 +- drivers/media/radio/radio-mr800.c | 3 +- drivers/media/radio/radio-raremono.c | 1 - drivers/media/radio/radio-sf16fmi.c | 1 - drivers/media/radio/radio-si476x.c | 1 - drivers/media/radio/radio-tea5764.c | 1 - drivers/media/radio/radio-tea5777.c | 1 - drivers/media/radio/radio-timb.c | 1 - drivers/media/radio/si470x/radio-si470x-usb.c | 1 - drivers/media/radio/si4713/radio-platform-si4713.c | 1 - drivers/media/radio/si4713/radio-usb-si4713.c | 1 - drivers/media/radio/si4713/si4713.c | 80 +- drivers/media/radio/si4713/si4713.h | 9 + drivers/media/radio/tea575x.c | 1 - drivers/media/rc/Kconfig | 32 +- drivers/media/rc/Makefile | 5 +- drivers/media/rc/ati_remote.c | 159 +- drivers/media/rc/ene_ir.c | 2 +- drivers/media/rc/fintek-cir.c | 6 +- drivers/media/rc/gpio-ir-recv.c | 4 +- drivers/media/rc/iguanair.c | 2 +- drivers/media/rc/img-ir/img-ir-core.c | 5 + drivers/media/rc/img-ir/img-ir-hw.c | 31 +- drivers/media/rc/img-ir/img-ir-hw.h | 8 +- drivers/media/rc/img-ir/img-ir-jvc.c | 9 +- drivers/media/rc/img-ir/img-ir-nec.c | 9 +- drivers/media/rc/img-ir/img-ir-raw.c | 5 + drivers/media/rc/img-ir/img-ir-raw.h | 5 + drivers/media/rc/img-ir/img-ir-sanyo.c | 9 +- drivers/media/rc/img-ir/img-ir-sharp.c | 9 +- drivers/media/rc/img-ir/img-ir-sony.c | 17 +- drivers/media/rc/img-ir/img-ir.h | 5 + drivers/media/rc/imon.c | 20 +- drivers/media/rc/ir-jvc-decoder.c | 4 +- drivers/media/rc/ir-lirc-codec.c | 2 +- drivers/media/rc/ir-mce_kbd-decoder.c | 2 +- drivers/media/rc/ir-nec-decoder.c | 4 +- drivers/media/rc/ir-rc5-decoder.c | 85 +- drivers/media/rc/ir-rc5-sz-decoder.c | 154 - drivers/media/rc/ir-rc6-decoder.c | 43 +- drivers/media/rc/ir-sanyo-decoder.c | 4 +- drivers/media/rc/ir-sharp-decoder.c | 4 +- drivers/media/rc/ir-sony-decoder.c | 16 +- drivers/media/rc/ir-xmp-decoder.c | 225 ++ drivers/media/rc/ite-cir.c | 6 +- drivers/media/rc/keymaps/rc-ati-x10.c | 92 +- drivers/media/rc/keymaps/rc-behold.c | 68 +- drivers/media/rc/keymaps/rc-nebula.c | 112 +- drivers/media/rc/keymaps/rc-streamzap.c | 4 +- drivers/media/rc/mceusb.c | 33 +- drivers/media/rc/nuvoton-cir.c | 6 +- drivers/media/rc/rc-core-priv.h | 20 +- drivers/media/rc/{ir-raw.c => rc-ir-raw.c} | 12 +- drivers/media/rc/rc-loopback.c | 2 +- drivers/media/rc/rc-main.c | 301 +- drivers/media/rc/redrat3.c | 2 +- drivers/media/rc/st_rc.c | 2 +- drivers/media/rc/streamzap.c | 12 +- drivers/media/rc/sunxi-cir.c | 318 ++ drivers/media/rc/ttusbir.c | 2 +- drivers/media/rc/winbond-cir.c | 2 +- drivers/media/tuners/Kconfig | 11 +- drivers/media/tuners/Makefile | 1 + .../media/msi3101 => media/tuners}/msi001.c | 2 +- drivers/media/tuners/r820t.c | 3 +- drivers/media/tuners/si2157.c | 257 +- drivers/media/tuners/si2157.h | 7 +- drivers/media/tuners/si2157_priv.h | 9 +- drivers/media/tuners/tuner-xc2028.c | 1 - drivers/media/tuners/xc4000.c | 48 +- drivers/media/tuners/xc5000.c | 164 +- drivers/media/usb/Kconfig | 7 + drivers/media/usb/Makefile | 3 + drivers/media/usb/airspy/Kconfig | 10 + drivers/media/usb/airspy/Makefile | 1 + drivers/media/usb/airspy/airspy.c | 1132 +++++++ drivers/media/usb/au0828/Kconfig | 8 + drivers/media/usb/au0828/Makefile | 4 + drivers/media/usb/au0828/au0828-cards.c | 7 +- drivers/media/usb/au0828/au0828-core.c | 25 +- drivers/media/usb/au0828/au0828-i2c.c | 37 +- drivers/media/usb/au0828/au0828-input.c | 386 +++ drivers/media/usb/au0828/au0828-video.c | 62 +- drivers/media/usb/au0828/au0828.h | 11 + drivers/media/usb/cpia2/cpia2_v4l.c | 1 - drivers/media/usb/cx231xx/Kconfig | 2 + drivers/media/usb/cx231xx/cx231xx-417.c | 3 - drivers/media/usb/cx231xx/cx231xx-avcore.c | 1 + drivers/media/usb/cx231xx/cx231xx-cards.c | 403 ++- drivers/media/usb/cx231xx/cx231xx-core.c | 3 + drivers/media/usb/cx231xx/cx231xx-dvb.c | 105 + drivers/media/usb/cx231xx/cx231xx-input.c | 22 +- drivers/media/usb/cx231xx/cx231xx-pcb-cfg.c | 10 +- drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h | 2 +- drivers/media/usb/cx231xx/cx231xx-video.c | 14 +- drivers/media/usb/cx231xx/cx231xx.h | 2 + drivers/media/usb/dvb-usb-v2/Kconfig | 1 + drivers/media/usb/dvb-usb-v2/af9015.c | 18 +- drivers/media/usb/dvb-usb-v2/af9035.c | 28 +- drivers/media/usb/dvb-usb-v2/anysee.c | 3 +- drivers/media/usb/dvb-usb-v2/az6007.c | 25 +- drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 2 +- drivers/media/usb/dvb-usb-v2/lmedm04.c | 34 +- drivers/media/usb/dvb-usb-v2/mxl111sf.c | 2 +- drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 14 +- drivers/media/usb/dvb-usb/Kconfig | 3 + drivers/media/usb/dvb-usb/cxusb.c | 233 +- drivers/media/usb/dvb-usb/cxusb.h | 2 + drivers/media/usb/dvb-usb/dib0700_core.c | 45 +- drivers/media/usb/dvb-usb/dib0700_devices.c | 636 ++-- drivers/media/usb/dvb-usb/dibusb.h | 2 +- drivers/media/usb/dvb-usb/dvb-usb-remote.c | 2 +- drivers/media/usb/dvb-usb/dw2102.c | 21 +- drivers/media/usb/dvb-usb/m920x.c | 2 +- drivers/media/usb/dvb-usb/pctv452e.c | 8 +- drivers/media/usb/dvb-usb/technisat-usb2.c | 2 +- drivers/media/usb/dvb-usb/ttusb2.c | 6 +- drivers/media/usb/em28xx/em28xx-camera.c | 4 +- drivers/media/usb/em28xx/em28xx-cards.c | 3 +- drivers/media/usb/em28xx/em28xx-dvb.c | 40 +- drivers/media/usb/em28xx/em28xx-i2c.c | 6 + drivers/media/usb/em28xx/em28xx-input.c | 106 +- drivers/media/usb/em28xx/em28xx-video.c | 116 +- drivers/media/usb/em28xx/em28xx.h | 8 - .../{staging/media => media/usb}/go7007/Kconfig | 0 .../{staging/media => media/usb}/go7007/Makefile | 4 - .../media => media/usb}/go7007/go7007-driver.c | 133 +- .../media => media/usb}/go7007/go7007-fw.c | 32 +- .../media => media/usb}/go7007/go7007-i2c.c | 4 - .../media => media/usb}/go7007/go7007-loader.c | 4 - .../media => media/usb}/go7007/go7007-priv.h | 20 +- .../media => media/usb}/go7007/go7007-usb.c | 4 - .../media => media/usb}/go7007/go7007-v4l2.c | 322 +- .../media => media/usb}/go7007/s2250-board.c | 9 +- .../media => media/usb}/go7007/snd-go7007.c | 4 - drivers/media/usb/gspca/autogain_functions.c | 4 +- drivers/media/usb/gspca/gspca.c | 29 +- drivers/media/usb/gspca/gspca.h | 1 + drivers/media/usb/gspca/kinect.c | 98 +- drivers/media/usb/gspca/pac7302.c | 8 +- drivers/media/usb/gspca/sonixb.c | 2 +- drivers/media/usb/hdpvr/hdpvr-video.c | 4 +- drivers/media/usb/msi2500/Kconfig | 5 + drivers/media/usb/msi2500/Makefile | 1 + .../sdr-msi3101.c => media/usb/msi2500/msi2500.c} | 818 ++--- drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 12 +- drivers/media/usb/pwc/pwc-if.c | 1 - drivers/media/usb/s2255/s2255drv.c | 1 - drivers/media/usb/stk1160/stk1160-v4l.c | 1 - drivers/media/usb/stkwebcam/stk-webcam.c | 3 - drivers/media/usb/tlg2300/pd-main.c | 2 + drivers/media/usb/tlg2300/pd-radio.c | 1 - drivers/media/usb/tlg2300/pd-video.c | 1 - drivers/media/usb/tm6000/tm6000-input.c | 55 +- drivers/media/usb/tm6000/tm6000-video.c | 3 - drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 3 +- drivers/media/usb/usbtv/usbtv-core.c | 2 + drivers/media/usb/usbtv/usbtv-video.c | 1 - drivers/media/usb/usbvision/usbvision-core.c | 16 +- drivers/media/usb/uvc/uvc_driver.c | 1 - drivers/media/usb/zr364xx/zr364xx.c | 4 - drivers/media/v4l2-core/v4l2-common.c | 6 +- drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 19 +- drivers/media/v4l2-core/v4l2-ctrls.c | 971 ++++-- drivers/media/v4l2-core/v4l2-dev.c | 14 +- drivers/media/v4l2-core/v4l2-fh.c | 13 +- drivers/media/v4l2-core/v4l2-ioctl.c | 239 +- drivers/media/v4l2-core/v4l2-mem2mem.c | 11 +- drivers/media/v4l2-core/v4l2-subdev.c | 125 +- drivers/media/v4l2-core/videobuf-dma-sg.c | 62 +- drivers/media/v4l2-core/videobuf2-core.c | 129 +- drivers/media/v4l2-core/videobuf2-dma-contig.c | 8 + drivers/staging/media/Kconfig | 10 - drivers/staging/media/Makefile | 5 - drivers/staging/media/bcm2048/radio-bcm2048.c | 22 +- drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 2 + .../staging/media/davinci_vpfe/dm365_ipipe_hw.h | 1 - drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 5 +- drivers/staging/media/davinci_vpfe/dm365_resizer.c | 4 +- drivers/staging/media/davinci_vpfe/vpfe_video.c | 1 - drivers/staging/media/go7007/README | 137 - drivers/staging/media/go7007/go7007.h | 40 - drivers/staging/media/go7007/go7007.txt | 478 --- drivers/staging/media/go7007/saa7134-go7007.c | 567 ---- drivers/staging/media/lirc/lirc_igorplugusb.c | 6 - drivers/staging/media/lirc/lirc_imon.c | 9 +- drivers/staging/media/lirc/lirc_parallel.c | 32 +- drivers/staging/media/lirc/lirc_serial.c | 37 +- drivers/staging/media/lirc/lirc_sir.c | 301 +- drivers/staging/media/msi3101/Kconfig | 10 - drivers/staging/media/msi3101/Makefile | 2 - drivers/staging/media/omap4iss/iss.c | 86 +- drivers/staging/media/omap4iss/iss.h | 2 +- drivers/staging/media/omap4iss/iss_csi2.c | 2 +- drivers/staging/media/omap4iss/iss_video.c | 22 +- drivers/staging/media/rtl2832u_sdr/Kconfig | 7 - drivers/staging/media/rtl2832u_sdr/Makefile | 6 - drivers/staging/media/sn9c102/Kconfig | 17 - drivers/staging/media/sn9c102/Makefile | 15 - drivers/staging/media/sn9c102/sn9c102.h | 214 -- drivers/staging/media/sn9c102/sn9c102.txt | 592 ---- drivers/staging/media/sn9c102/sn9c102_config.h | 86 - drivers/staging/media/sn9c102/sn9c102_core.c | 3465 -------------------- drivers/staging/media/sn9c102/sn9c102_devtable.h | 145 - drivers/staging/media/sn9c102/sn9c102_hv7131d.c | 269 -- drivers/staging/media/sn9c102/sn9c102_hv7131r.c | 369 --- drivers/staging/media/sn9c102/sn9c102_mi0343.c | 352 -- drivers/staging/media/sn9c102/sn9c102_mi0360.c | 453 --- drivers/staging/media/sn9c102/sn9c102_mt9v111.c | 260 -- drivers/staging/media/sn9c102/sn9c102_ov7630.c | 634 ---- drivers/staging/media/sn9c102/sn9c102_ov7660.c | 546 --- drivers/staging/media/sn9c102/sn9c102_pas106b.c | 308 -- drivers/staging/media/sn9c102/sn9c102_pas202bcb.c | 340 -- drivers/staging/media/sn9c102/sn9c102_sensor.h | 307 -- drivers/staging/media/sn9c102/sn9c102_tas5110c1b.c | 154 - drivers/staging/media/sn9c102/sn9c102_tas5110d.c | 119 - drivers/staging/media/sn9c102/sn9c102_tas5130d1b.c | 165 - drivers/staging/media/solo6x10/TODO | 15 - include/media/atmel-isi.h | 4 + include/media/blackfin/ppi.h | 4 +- include/media/ir-kbd-i2c.h | 6 +- include/media/rc-core.h | 71 +- include/media/rc-map.h | 16 +- include/media/v4l2-ctrls.h | 222 +- include/media/v4l2-dev.h | 2 - include/media/v4l2-ioctl.h | 2 + include/media/v4l2-mem2mem.h | 2 + include/media/videobuf-dma-sg.h | 3 + include/media/videobuf2-core.h | 19 +- include/uapi/linux/v4l2-controls.h | 32 + include/uapi/linux/videodev2.h | 101 +- 442 files changed, 16099 insertions(+), 17295 deletions(-) create mode 100644 Documentation/DocBook/media/v4l/pixfmt-sdr-cs08.xml create mode 100644 Documentation/DocBook/media/v4l/pixfmt-sdr-cs14le.xml create mode 100644 Documentation/DocBook/media/v4l/pixfmt-sdr-ru12le.xml create mode 100644 Documentation/devicetree/bindings/media/atmel-isi.txt create mode 100644 Documentation/devicetree/bindings/media/i2c/mt9m111.txt create mode 100644 Documentation/devicetree/bindings/media/pxa-camera.txt create mode 100644 Documentation/devicetree/bindings/media/rcar_vin.txt create mode 100644 Documentation/devicetree/bindings/media/sunxi-ir.txt rename drivers/{staging/media/rtl2832u_sdr => media/dvb-frontends}/rtl2832_sdr.c (94%) rename drivers/{staging/media/rtl2832u_sdr => media/dvb-frontends}/rtl2832_sdr.h (100%) create mode 100644 drivers/media/dvb-frontends/si2165.c create mode 100644 drivers/media/dvb-frontends/si2165.h create mode 100644 drivers/media/dvb-frontends/si2165_priv.h rename drivers/{staging/media => media/pci}/solo6x10/Kconfig (93%) rename drivers/{staging/media => media/pci}/solo6x10/Makefile (82%) rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-core.c (98%) rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-disp.c (95%) rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-eeprom.c (94%) rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-enc.c (97%) rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-g723.c (98%) rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-gpio.c (92%) rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-i2c.c (97%) rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-jpeg.h (96%) rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-offsets.h (93%) rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-p2m.c (97%) rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-regs.h (99%) rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-tw28.c (99%) rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-tw28.h (91%) rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-v4l2-enc.c (90%) rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-v4l2.c (98%) rename drivers/{staging/media => media/pci}/solo6x10/solo6x10.h (89%) create mode 100644 drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.c create mode 100644 drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.h delete mode 100644 drivers/media/platform/soc_camera/mx1_camera.c delete mode 100644 drivers/media/rc/ir-rc5-sz-decoder.c create mode 100644 drivers/media/rc/ir-xmp-decoder.c rename drivers/media/rc/{ir-raw.c => rc-ir-raw.c} (97%) create mode 100644 drivers/media/rc/sunxi-cir.c rename drivers/{staging/media/msi3101 => media/tuners}/msi001.c (99%) create mode 100644 drivers/media/usb/airspy/Kconfig create mode 100644 drivers/media/usb/airspy/Makefile create mode 100644 drivers/media/usb/airspy/airspy.c create mode 100644 drivers/media/usb/au0828/au0828-input.c rename drivers/{staging/media => media/usb}/go7007/Kconfig (100%) rename drivers/{staging/media => media/usb}/go7007/Makefile (68%) rename drivers/{staging/media => media/usb}/go7007/go7007-driver.c (86%) rename drivers/{staging/media => media/usb}/go7007/go7007-fw.c (97%) rename drivers/{staging/media => media/usb}/go7007/go7007-i2c.c (96%) rename drivers/{staging/media => media/usb}/go7007/go7007-loader.c (94%) rename drivers/{staging/media => media/usb}/go7007/go7007-priv.h (90%) rename drivers/{staging/media => media/usb}/go7007/go7007-usb.c (99%) rename drivers/{staging/media => media/usb}/go7007/go7007-v4l2.c (80%) rename drivers/{staging/media => media/usb}/go7007/s2250-board.c (98%) rename drivers/{staging/media => media/usb}/go7007/snd-go7007.c (97%) create mode 100644 drivers/media/usb/msi2500/Kconfig create mode 100644 drivers/media/usb/msi2500/Makefile rename drivers/{staging/media/msi3101/sdr-msi3101.c => media/usb/msi2500/msi2500.c} (60%) delete mode 100644 drivers/staging/media/go7007/README delete mode 100644 drivers/staging/media/go7007/go7007.h delete mode 100644 drivers/staging/media/go7007/go7007.txt delete mode 100644 drivers/staging/media/go7007/saa7134-go7007.c delete mode 100644 drivers/staging/media/msi3101/Kconfig delete mode 100644 drivers/staging/media/msi3101/Makefile delete mode 100644 drivers/staging/media/rtl2832u_sdr/Kconfig delete mode 100644 drivers/staging/media/rtl2832u_sdr/Makefile delete mode 100644 drivers/staging/media/sn9c102/Kconfig delete mode 100644 drivers/staging/media/sn9c102/Makefile delete mode 100644 drivers/staging/media/sn9c102/sn9c102.h delete mode 100644 drivers/staging/media/sn9c102/sn9c102.txt delete mode 100644 drivers/staging/media/sn9c102/sn9c102_config.h delete mode 100644 drivers/staging/media/sn9c102/sn9c102_core.c delete mode 100644 drivers/staging/media/sn9c102/sn9c102_devtable.h delete mode 100644 drivers/staging/media/sn9c102/sn9c102_hv7131d.c delete mode 100644 drivers/staging/media/sn9c102/sn9c102_hv7131r.c delete mode 100644 drivers/staging/media/sn9c102/sn9c102_mi0343.c delete mode 100644 drivers/staging/media/sn9c102/sn9c102_mi0360.c delete mode 100644 drivers/staging/media/sn9c102/sn9c102_mt9v111.c delete mode 100644 drivers/staging/media/sn9c102/sn9c102_ov7630.c delete mode 100644 drivers/staging/media/sn9c102/sn9c102_ov7660.c delete mode 100644 drivers/staging/media/sn9c102/sn9c102_pas106b.c delete mode 100644 drivers/staging/media/sn9c102/sn9c102_pas202bcb.c delete mode 100644 drivers/staging/media/sn9c102/sn9c102_sensor.h delete mode 100644 drivers/staging/media/sn9c102/sn9c102_tas5110c1b.c delete mode 100644 drivers/staging/media/sn9c102/sn9c102_tas5110d.c delete mode 100644 drivers/staging/media/sn9c102/sn9c102_tas5130d1b.c delete mode 100644 drivers/staging/media/solo6x10/TODO Merging kbuild/for-next (9586848e26c7 Merge branch 'kbuild/kbuild' into kbuild/for-next) $ git merge kbuild/for-next Auto-merging lib/Kconfig.debug Auto-merging arch/x86/Kconfig Auto-merging Makefile Merge made by the 'recursive' strategy. .gitignore | 1 + Documentation/kbuild/makefiles.txt | 39 ++------- Documentation/lto-build | 173 +++++++++++++++++++++++++++++++++++++ Makefile | 36 ++++++-- arch/ia64/Makefile | 2 +- arch/x86/Kconfig | 2 +- init/Kconfig | 73 ++++++++++++++++ kernel/gcov/Kconfig | 2 +- lib/Kconfig.debug | 26 +++++- scripts/Makefile.clean | 4 +- scripts/Makefile.host | 61 ++----------- scripts/Makefile.lto | 84 ++++++++++++++++++ scripts/Makefile.modpost | 7 +- scripts/link-vmlinux.sh | 2 +- 14 files changed, 414 insertions(+), 98 deletions(-) create mode 100644 Documentation/lto-build create mode 100644 scripts/Makefile.lto Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings) $ git merge kconfig/for-next Already up-to-date. Merging libata/for-next (1eecf0052607 Merge branch 'for-3.17' into for-next) $ git merge libata/for-next Merge made by the 'recursive' strategy. .../devicetree/bindings/ata/ahci-platform.txt | 45 ++- Documentation/devicetree/bindings/ata/ahci-st.txt | 31 ++ Documentation/devicetree/bindings/ata/imx-sata.txt | 36 ++ .../devicetree/bindings/ata/tegra-sata.txt | 30 ++ drivers/ata/Kconfig | 9 + drivers/ata/Makefile | 1 + drivers/ata/acard-ahci.c | 2 +- drivers/ata/ahci.c | 3 +- drivers/ata/ahci.h | 19 +- drivers/ata/ahci_da850.c | 3 +- drivers/ata/ahci_imx.c | 187 +++++++++- drivers/ata/ahci_mvebu.c | 3 +- drivers/ata/ahci_platform.c | 8 +- drivers/ata/ahci_st.c | 4 +- drivers/ata/ahci_sunxi.c | 8 +- drivers/ata/ahci_tegra.c | 376 +++++++++++++++++++++ drivers/ata/ahci_xgene.c | 29 +- drivers/ata/libahci.c | 19 +- drivers/ata/libahci_platform.c | 215 +++++++++--- drivers/ata/pata_samsung_cf.c | 13 - drivers/ata/sata_fsl.c | 5 +- drivers/ata/sata_highbank.c | 2 +- drivers/ata/sata_sil24.c | 4 +- include/linux/ahci_platform.h | 5 +- include/linux/platform_data/ata-samsung_cf.h | 1 - 25 files changed, 917 insertions(+), 141 deletions(-) create mode 100644 Documentation/devicetree/bindings/ata/ahci-st.txt create mode 100644 Documentation/devicetree/bindings/ata/imx-sata.txt create mode 100644 Documentation/devicetree/bindings/ata/tegra-sata.txt create mode 100644 drivers/ata/ahci_tegra.c Merging pm/linux-next (dad3624f47de Merge branch 'acpica') $ git merge pm/linux-next Resolved 'drivers/cpuidle/Kconfig.arm' using previous resolution. Auto-merging include/linux/acpi.h Auto-merging drivers/cpuidle/Kconfig.arm CONFLICT (content): Merge conflict in drivers/cpuidle/Kconfig.arm Auto-merging arch/x86/Kconfig Auto-merging arch/arm/mach-vexpress/Kconfig Auto-merging arch/arm/mach-shmobile/Kconfig Auto-merging arch/arm/mach-imx/Kconfig Auto-merging arch/arm/mach-exynos/Kconfig Auto-merging MAINTAINERS Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 24b85811214a] Merge remote-tracking branch 'pm/linux-next' $ git diff -M --stat --summary HEAD^.. Documentation/power/opp.txt | 3 - MAINTAINERS | 4 +- arch/arm/mach-exynos/Kconfig | 1 - arch/arm/mach-highbank/Kconfig | 1 - arch/arm/mach-imx/Kconfig | 1 - arch/arm/mach-omap2/Kconfig | 1 - arch/arm/mach-shmobile/Kconfig | 2 - arch/arm/mach-vexpress/Kconfig | 1 - arch/arm/mach-zynq/Kconfig | 1 - arch/ia64/Kconfig | 1 + arch/ia64/include/asm/acenv.h | 4 - arch/ia64/include/asm/acpi.h | 5 + arch/x86/Kconfig | 2 + arch/x86/include/asm/acenv.h | 4 - arch/x86/include/asm/acpi.h | 5 + drivers/acpi/Kconfig | 6 + drivers/acpi/Makefile | 1 + drivers/acpi/acpi_extlog.c | 14 +- drivers/acpi/acpi_processor.c | 2 +- drivers/acpi/acpica/Makefile | 10 +- drivers/acpi/acpica/acapps.h | 9 +- drivers/acpi/acpica/acdebug.h | 3 - drivers/acpi/acpica/acglobal.h | 8 +- drivers/acpi/acpica/aclocal.h | 18 +- drivers/acpi/acpica/acpredef.h | 16 +- drivers/acpi/acpica/acutils.h | 48 +- drivers/acpi/acpica/evgpe.c | 32 +- drivers/acpi/acpica/evxfgpe.c | 61 +- drivers/acpi/acpica/exdebug.c | 11 +- drivers/acpi/acpica/exdump.c | 6 +- drivers/acpi/acpica/exfield.c | 26 +- drivers/acpi/acpica/hwregs.c | 3 +- drivers/acpi/acpica/nsobject.c | 10 + drivers/acpi/acpica/utbuffer.c | 128 ++ drivers/acpi/acpica/utcopy.c | 6 + drivers/acpi/acpica/utdebug.c | 26 + drivers/acpi/acpica/utdecode.c | 32 +- drivers/acpi/acpica/utfileio.c | 331 +++++ drivers/acpi/acpica/utglobal.c | 146 --- drivers/acpi/acpica/uthex.c | 100 ++ drivers/acpi/acpica/utinit.c | 145 +++ drivers/acpi/acpica/utprint.c | 664 ++++++++++ drivers/acpi/acpica/utuuid.c | 96 ++ drivers/acpi/apei/apei-internal.h | 10 +- drivers/acpi/apei/ghes.c | 32 +- drivers/acpi/battery.c | 1 - drivers/acpi/blacklist.c | 68 +- drivers/acpi/bus.c | 3 - drivers/acpi/button.c | 25 +- drivers/acpi/device_pm.c | 148 ++- drivers/acpi/internal.h | 7 +- drivers/acpi/osl.c | 4 +- drivers/acpi/pci_root.c | 2 +- drivers/acpi/processor_core.c | 200 +-- drivers/acpi/processor_pdc.c | 206 +++ drivers/acpi/scan.c | 33 +- drivers/acpi/sleep.c | 5 + drivers/acpi/video.c | 121 +- drivers/base/power/main.c | 5 + drivers/cpufreq/cpufreq.c | 74 +- drivers/cpufreq/cpufreq_ondemand.c | 11 +- drivers/cpufreq/freq_table.c | 12 +- drivers/cpufreq/imx6q-cpufreq.c | 35 +- drivers/cpufreq/intel_pstate.c | 131 +- drivers/cpufreq/powernow-k6.c | 1 + drivers/cpuidle/Kconfig | 7 +- drivers/cpuidle/Kconfig.arm | 1 + drivers/cpuidle/cpuidle.c | 2 + drivers/cpuidle/driver.c | 11 - drivers/cpuidle/governors/ladder.c | 4 +- drivers/cpuidle/governors/menu.c | 1 - drivers/cpuidle/sysfs.c | 2 +- drivers/devfreq/Kconfig | 1 - drivers/firmware/efi/cper.c | 20 +- drivers/iommu/dmar.c | 28 +- drivers/pci/hotplug/acpiphp_glue.c | 33 +- drivers/pci/pci-acpi.c | 76 +- drivers/pnp/pnpacpi/core.c | 92 +- include/acpi/acconfig.h | 18 + include/acpi/acnames.h | 1 + include/acpi/acpi_bus.h | 42 +- include/acpi/acpiosxf.h | 31 + include/acpi/acpixf.h | 54 +- include/acpi/actbl.h | 12 +- include/acpi/actbl1.h | 58 +- include/acpi/actbl2.h | 14 +- include/acpi/actbl3.h | 118 +- include/acpi/actypes.h | 19 +- include/acpi/ghes.h | 2 +- include/acpi/platform/acenv.h | 53 +- include/acpi/platform/aclinux.h | 12 + include/acpi/platform/aclinuxex.h | 22 + include/linux/acpi.h | 6 +- include/linux/cpufreq.h | 1 + include/linux/pci-acpi.h | 13 +- include/linux/pm_runtime.h | 11 +- include/linux/sfi_acpi.h | 3 - kernel/power/Kconfig | 3 - kernel/power/main.c | 25 +- kernel/power/power.h | 7 +- kernel/power/snapshot.c | 494 ++++++-- kernel/power/suspend.c | 152 ++- kernel/power/suspend_test.c | 12 +- kernel/sched/idle.c | 4 - tools/power/acpi/Makefile | 5 + tools/power/acpi/common/cmfsize.c | 20 +- tools/power/acpi/common/getopt.c | 14 +- .../acpi/os_specific/service_layers/oslibcfs.c | 214 ++++ .../acpi/os_specific/service_layers/oslinuxtbl.c | 48 +- .../acpi/os_specific/service_layers/osunixxf.c | 1311 ++++++++++++++++++++ tools/power/acpi/tools/acpidump/acpidump.h | 3 +- tools/power/acpi/tools/acpidump/apdump.c | 108 +- tools/power/acpi/tools/acpidump/apfiles.c | 92 +- tools/power/acpi/tools/acpidump/apmain.c | 96 +- tools/power/cpupower/bench/parse.c | 39 +- tools/power/cpupower/utils/cpufreq-set.c | 11 +- tools/power/cpupower/utils/helpers/sysfs.c | 2 +- .../cpupower/utils/idle_monitor/mperf_monitor.c | 2 +- 118 files changed, 5070 insertions(+), 1488 deletions(-) create mode 100644 drivers/acpi/acpica/utfileio.c create mode 100644 drivers/acpi/acpica/uthex.c create mode 100644 drivers/acpi/acpica/utprint.c create mode 100644 drivers/acpi/acpica/utuuid.c create mode 100644 drivers/acpi/processor_pdc.c create mode 100644 tools/power/acpi/os_specific/service_layers/oslibcfs.c create mode 100644 tools/power/acpi/os_specific/service_layers/osunixxf.c Merging idle/next (24153da3e88d intel_idle: Disable BYT Core and Module C6 auto-demotion) $ git merge idle/next Merge made by the 'recursive' strategy. arch/x86/include/uapi/asm/msr-index.h | 3 +++ drivers/idle/intel_idle.c | 7 +++++++ 2 files changed, 10 insertions(+) Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) $ 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 (47d104ba5879 Merge branches 'exynos-fix', 'for-rc', 'int3403-fix', 'misc', 'rcar-thermal' and 'sti-thermal' of .git into next) $ git merge thermal/next Merge made by the 'recursive' strategy. .../devicetree/bindings/thermal/exynos-thermal.txt | 1 + .../devicetree/bindings/thermal/rcar-thermal.txt | 18 +- .../devicetree/bindings/thermal/st-thermal.txt | 42 +++ drivers/thermal/Kconfig | 7 +- drivers/thermal/Makefile | 1 + drivers/thermal/cpu_cooling.c | 2 +- drivers/thermal/int3403_thermal.c | 67 ++++- drivers/thermal/samsung/exynos_tmu.c | 11 +- drivers/thermal/samsung/exynos_tmu.h | 3 +- drivers/thermal/samsung/exynos_tmu_data.c | 89 ++++++ drivers/thermal/samsung/exynos_tmu_data.h | 7 + drivers/thermal/st/Kconfig | 12 + drivers/thermal/st/Makefile | 3 + drivers/thermal/st/st_thermal.c | 313 +++++++++++++++++++++ drivers/thermal/st/st_thermal.h | 104 +++++++ drivers/thermal/st/st_thermal_memmap.c | 209 ++++++++++++++ drivers/thermal/st/st_thermal_syscfg.c | 179 ++++++++++++ include/linux/thermal.h | 46 ++- 18 files changed, 1093 insertions(+), 21 deletions(-) create mode 100644 Documentation/devicetree/bindings/thermal/st-thermal.txt create mode 100644 drivers/thermal/st/Kconfig create mode 100644 drivers/thermal/st/Makefile create mode 100644 drivers/thermal/st/st_thermal.c create mode 100644 drivers/thermal/st/st_thermal.h create mode 100644 drivers/thermal/st/st_thermal_memmap.c create mode 100644 drivers/thermal/st/st_thermal_syscfg.c Merging ieee1394/for-next (d584a6627994 firewire: ohci: disable MSI for VIA VT6315 again) $ git merge ieee1394/for-next Already up-to-date. Merging dlm/next (883854c5457a dlm: keep listening connection alive with sctp mode) $ git merge dlm/next Already up-to-date. Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid) $ git merge swiotlb/linux-next Already up-to-date. Merging slave-dma/next (4fbd804e009a dmaengine: sun6i: Fix memory leaks) $ git merge slave-dma/next Merge made by the 'recursive' strategy. .../devicetree/bindings/dma/fsl-imx-sdma.txt | 1 + .../devicetree/bindings/dma/mpc512x-dma.txt | 29 + .../devicetree/bindings/dma/ste-dma40.txt | 74 +- .../devicetree/bindings/dma/sun6i-dma.txt | 45 + Documentation/dmaengine.txt | 17 +- arch/arm/common/edma.c | 31 +- arch/powerpc/boot/dts/mpc5121.dtsi | 1 + drivers/dma/Kconfig | 9 + drivers/dma/Makefile | 5 +- drivers/dma/TODO | 1 - drivers/dma/dma-jz4740.c | 2 +- drivers/dma/dw/core.c | 42 +- drivers/dma/edma.c | 16 +- drivers/dma/fsl-edma.c | 6 +- drivers/dma/fsldma.c | 297 ++++-- drivers/dma/fsldma.h | 32 +- drivers/dma/imx-sdma.c | 15 +- drivers/dma/ipu/ipu_idmac.c | 14 +- drivers/dma/mpc512x_dma.c | 13 +- drivers/dma/mxs-dma.c | 8 +- drivers/dma/of-dma.c | 35 + drivers/dma/pl330.c | 962 ++++++------------ drivers/dma/qcom_bam_dma.c | 20 +- drivers/dma/sun6i-dma.c | 1053 ++++++++++++++++++++ include/linux/dmaengine.h | 1 - include/linux/of_dma.h | 4 + include/linux/platform_data/dma-imx.h | 1 + include/linux/platform_data/edma.h | 2 + 28 files changed, 1977 insertions(+), 759 deletions(-) create mode 100644 Documentation/devicetree/bindings/dma/mpc512x-dma.txt create mode 100644 Documentation/devicetree/bindings/dma/sun6i-dma.txt create mode 100644 drivers/dma/sun6i-dma.c Merging dmaengine/next (fbeec99ad5c0 dma: mv_xor: Rename __mv_xor_slot_cleanup() to mv_xor_slot_cleanup()) $ git merge dmaengine/next Auto-merging drivers/dma/mv_xor.c Merge made by the 'recursive' strategy. drivers/dma/ioat/dca.c | 13 ++++---- drivers/dma/ioat/dma.c | 2 +- drivers/dma/ioat/dma_v3.c | 6 ++-- drivers/dma/mv_xor.c | 80 +++++++++++++++++++++++++++++++++++++---------- 4 files changed, 74 insertions(+), 27 deletions(-) Merging net-next/master (8e97b85a8f1b Merge branch 'stmmac-next') $ git merge net-next/master Removing net/wireless/ethtool.h Removing net/sctp/command.c Removing net/mac80211/rc80211_pid_debugfs.c Removing net/mac80211/rc80211_pid_algo.c Removing net/mac80211/rc80211_pid.h Removing net/ipv4/netfilter/ipt_ULOG.c Auto-merging net/ipv4/ip_tunnel.c Removing net/bridge/netfilter/ebt_ulog.c Auto-merging net/bridge/br_fdb.c Removing net/bluetooth/6lowpan.h Auto-merging net/6lowpan/iphc.c Removing include/uapi/linux/netfilter_ipv4/ipt_ULOG.h Removing include/uapi/linux/netfilter_bridge/ebt_ulog.h Removing include/net/netfilter/xt_log.h Auto-merging drivers/s390/net/qeth_core_main.c Auto-merging drivers/s390/net/qeth_core.h Auto-merging arch/arm/boot/dts/socfpga.dtsi Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. Documentation/ABI/testing/sysfs-class-net | 11 + .../devicetree/bindings/net/amd-xgbe-phy.txt | 6 + Documentation/devicetree/bindings/net/amd-xgbe.txt | 17 +- .../bindings/net/broadcom-systemport.txt | 3 +- .../devicetree/bindings/net/davinci-mdio.txt | 8 +- .../devicetree/bindings/net/ieee802154/cc2520.txt | 29 + .../devicetree/bindings/net/marvell-pp2.txt | 61 + Documentation/devicetree/bindings/net/stmmac.txt | 6 + Documentation/networking/bonding.txt | 31 +- Documentation/networking/ip-sysctl.txt | 38 +- Documentation/networking/packet_mmap.txt | 18 +- Documentation/networking/phy.txt | 18 +- Documentation/networking/pktgen.txt | 28 + Documentation/networking/timestamping.txt | 16 +- .../networking/timestamping/timestamping.c | 7 +- MAINTAINERS | 29 +- arch/arm/boot/dts/sama5d3_gmac.dtsi | 2 +- arch/arm/boot/dts/socfpga.dtsi | 4 + arch/x86/net/bpf_jit_comp.c | 2 +- drivers/bcma/Makefile | 1 + drivers/bcma/driver_chipcommon_pmu.c | 1 + drivers/bcma/driver_gpio.c | 1 + drivers/bcma/driver_pcie2.c | 175 + drivers/bcma/host_pci.c | 1 + drivers/bcma/main.c | 8 + drivers/bcma/sprom.c | 42 +- drivers/bluetooth/Kconfig | 12 +- drivers/bluetooth/ath3k.c | 35 +- drivers/bluetooth/btmrvl_drv.h | 4 + drivers/bluetooth/btmrvl_main.c | 68 +- drivers/bluetooth/btmrvl_sdio.c | 21 +- drivers/bluetooth/btmrvl_sdio.h | 2 + drivers/bluetooth/btusb.c | 221 +- drivers/bluetooth/hci_h5.c | 4 - drivers/bluetooth/hci_ldisc.c | 25 +- drivers/bluetooth/hci_uart.h | 1 + drivers/bluetooth/hci_vhci.c | 34 +- drivers/firewire/net.c | 3 +- drivers/hsi/clients/ssi_protocol.c | 2 +- drivers/infiniband/hw/amso1100/c2_provider.c | 2 +- drivers/infiniband/hw/cxgb4/cm.c | 112 +- drivers/infiniband/hw/cxgb4/cq.c | 14 +- drivers/infiniband/hw/cxgb4/device.c | 192 +- drivers/infiniband/hw/cxgb4/ev.c | 55 +- drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 40 +- drivers/infiniband/hw/cxgb4/provider.c | 14 +- drivers/infiniband/hw/cxgb4/qp.c | 113 +- drivers/infiniband/hw/cxgb4/t4.h | 19 +- drivers/infiniband/hw/cxgb4/t4fw_ri_api.h | 1 - drivers/infiniband/hw/mlx5/cq.c | 48 +- drivers/infiniband/hw/mlx5/mad.c | 6 +- drivers/infiniband/hw/mlx5/main.c | 295 +- drivers/infiniband/hw/mlx5/mem.c | 2 +- drivers/infiniband/hw/mlx5/mlx5_ib.h | 14 +- drivers/infiniband/hw/mlx5/mr.c | 48 +- drivers/infiniband/hw/mlx5/qp.c | 88 +- drivers/infiniband/hw/mlx5/srq.c | 26 +- drivers/infiniband/ulp/ipoib/ipoib_main.c | 4 +- drivers/isdn/capi/capi.c | 2 +- drivers/isdn/i4l/isdn_net.c | 7 +- drivers/media/dvb-core/dvb_net.c | 3 +- drivers/misc/sgi-xp/xpnet.c | 3 +- drivers/net/Kconfig | 1 + drivers/net/arcnet/arcnet.c | 3 +- drivers/net/bonding/bond_3ad.c | 185 +- drivers/net/bonding/bond_alb.c | 146 +- drivers/net/bonding/bond_alb.h | 8 + drivers/net/bonding/bond_debugfs.c | 6 +- drivers/net/bonding/bond_main.c | 535 +- drivers/net/bonding/bond_netlink.c | 32 +- drivers/net/bonding/bond_options.c | 228 +- drivers/net/bonding/bond_procfs.c | 4 +- drivers/net/bonding/bond_sysfs.c | 3 +- drivers/net/bonding/bonding.h | 22 +- drivers/net/caif/caif_serial.c | 3 +- drivers/net/caif/caif_spi.c | 4 +- drivers/net/caif/caif_virtio.c | 2 +- drivers/net/can/c_can/c_can_platform.c | 43 +- drivers/net/can/dev.c | 2 +- drivers/net/can/sja1000/sja1000.c | 27 +- drivers/net/can/slcan.c | 2 +- drivers/net/cris/eth_v10.c | 1 - drivers/net/dummy.c | 2 +- drivers/net/eql.c | 3 +- drivers/net/ethernet/8390/lib8390.c | 2 +- drivers/net/ethernet/8390/mac8390.c | 8 - drivers/net/ethernet/adi/Kconfig | 3 +- drivers/net/ethernet/adi/bfin_mac.c | 79 +- drivers/net/ethernet/adi/bfin_mac.h | 3 + drivers/net/ethernet/amd/Kconfig | 13 + drivers/net/ethernet/amd/amd8111e.c | 363 +- drivers/net/ethernet/amd/declance.c | 12 +- drivers/net/ethernet/amd/xgbe/Makefile | 4 +- drivers/net/ethernet/amd/xgbe/xgbe-common.h | 121 +- drivers/net/ethernet/amd/xgbe/xgbe-dcb.c | 270 + drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c | 7 +- drivers/net/ethernet/amd/xgbe/xgbe-desc.c | 32 +- drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 780 ++- drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 606 +- drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 58 +- drivers/net/ethernet/amd/xgbe/xgbe-main.c | 59 +- drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 4 - drivers/net/ethernet/amd/xgbe/xgbe-ptp.c | 285 + drivers/net/ethernet/amd/xgbe/xgbe.h | 151 +- drivers/net/ethernet/arc/emac.h | 4 - drivers/net/ethernet/arc/emac_main.c | 11 +- drivers/net/ethernet/atheros/atl1c/atl1c_hw.c | 2 - drivers/net/ethernet/atheros/atl1e/atl1e_hw.c | 1 - drivers/net/ethernet/atheros/atlx/atl1.c | 1 - drivers/net/ethernet/atheros/atlx/atl2.c | 3 - drivers/net/ethernet/broadcom/Kconfig | 8 +- drivers/net/ethernet/broadcom/bcmsysport.c | 489 +- drivers/net/ethernet/broadcom/bcmsysport.h | 14 +- drivers/net/ethernet/broadcom/bnx2.c | 9 +- drivers/net/ethernet/broadcom/bnx2.h | 5 +- drivers/net/ethernet/broadcom/bnx2_fw.h | 3 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 9 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 55 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 4 +- .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 44 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 9 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 264 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 35 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 78 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h | 23 +- drivers/net/ethernet/broadcom/cnic.c | 10 +- drivers/net/ethernet/broadcom/cnic.h | 3 +- drivers/net/ethernet/broadcom/cnic_defs.h | 3 +- drivers/net/ethernet/broadcom/cnic_if.h | 3 +- drivers/net/ethernet/broadcom/genet/Makefile | 2 +- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 573 +- drivers/net/ethernet/broadcom/genet/bcmgenet.h | 30 +- drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 206 + drivers/net/ethernet/broadcom/genet/bcmmii.c | 44 +- drivers/net/ethernet/brocade/bna/cna_fwimg.c | 4 - drivers/net/ethernet/cadence/macb.c | 419 +- drivers/net/ethernet/cadence/macb.h | 53 +- drivers/net/ethernet/chelsio/Kconfig | 11 + drivers/net/ethernet/chelsio/cxgb4/Makefile | 1 + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 36 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c | 971 +++ drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h | 141 + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 482 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 14 +- drivers/net/ethernet/chelsio/cxgb4/l2t.c | 2 +- drivers/net/ethernet/chelsio/cxgb4/l2t.h | 2 +- drivers/net/ethernet/chelsio/cxgb4/sge.c | 2 +- drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 364 +- drivers/net/ethernet/chelsio/cxgb4/t4_hw.h | 2 +- drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 5 +- drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 17 +- drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 99 +- .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 9 + drivers/net/ethernet/cisco/enic/Makefile | 2 +- drivers/net/ethernet/cisco/enic/enic.h | 40 +- drivers/net/ethernet/cisco/enic/enic_api.c | 4 +- drivers/net/ethernet/cisco/enic/enic_clsf.c | 284 + drivers/net/ethernet/cisco/enic/enic_clsf.h | 37 + drivers/net/ethernet/cisco/enic/enic_dev.c | 80 +- drivers/net/ethernet/cisco/enic/enic_dev.h | 4 +- drivers/net/ethernet/cisco/enic/enic_ethtool.c | 125 +- drivers/net/ethernet/cisco/enic/enic_main.c | 245 +- drivers/net/ethernet/cisco/enic/enic_res.c | 1 + drivers/net/ethernet/cisco/enic/vnic_dev.c | 65 +- drivers/net/ethernet/cisco/enic/vnic_dev.h | 2 + drivers/net/ethernet/cisco/enic/vnic_devcmd.h | 5 + drivers/net/ethernet/cisco/enic/vnic_enet.h | 2 + drivers/net/ethernet/cisco/enic/vnic_rq.h | 122 + drivers/net/ethernet/dec/tulip/de4x5.c | 1 - drivers/net/ethernet/emulex/benet/be.h | 15 +- drivers/net/ethernet/emulex/benet/be_cmds.c | 249 +- drivers/net/ethernet/emulex/benet/be_cmds.h | 44 +- drivers/net/ethernet/emulex/benet/be_ethtool.c | 12 +- drivers/net/ethernet/emulex/benet/be_main.c | 257 +- drivers/net/ethernet/freescale/fec.h | 10 +- drivers/net/ethernet/freescale/fec_main.c | 381 +- drivers/net/ethernet/freescale/ucc_geth.c | 2 - drivers/net/ethernet/freescale/xgmac_mdio.c | 4 +- drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 3 - drivers/net/ethernet/intel/e1000/e1000_hw.c | 2 - drivers/net/ethernet/intel/e1000e/82571.c | 4 - drivers/net/ethernet/intel/e1000e/defines.h | 1 + drivers/net/ethernet/intel/e1000e/ethtool.c | 2 - drivers/net/ethernet/intel/e1000e/ich8lan.c | 21 +- drivers/net/ethernet/intel/e1000e/ich8lan.h | 4 + drivers/net/ethernet/intel/e1000e/mac.c | 1 - drivers/net/ethernet/intel/e1000e/manage.c | 5 +- drivers/net/ethernet/intel/e1000e/netdev.c | 55 +- drivers/net/ethernet/intel/e1000e/nvm.c | 4 +- drivers/net/ethernet/intel/i40e/i40e.h | 10 +- drivers/net/ethernet/intel/i40e/i40e_adminq.c | 132 +- drivers/net/ethernet/intel/i40e/i40e_adminq.h | 39 + drivers/net/ethernet/intel/i40e/i40e_common.c | 426 +- drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 10 +- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 514 +- drivers/net/ethernet/intel/i40e/i40e_hmc.h | 4 +- drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 249 +- drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h | 28 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 484 +- drivers/net/ethernet/intel/i40e/i40e_nvm.c | 520 +- drivers/net/ethernet/intel/i40e/i40e_prototype.h | 25 +- drivers/net/ethernet/intel/i40e/i40e_ptp.c | 135 +- drivers/net/ethernet/intel/i40e/i40e_register.h | 5011 ++++++--------- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 153 +- drivers/net/ethernet/intel/i40e/i40e_txrx.h | 7 +- drivers/net/ethernet/intel/i40e/i40e_type.h | 75 +- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 6 +- drivers/net/ethernet/intel/i40evf/i40e_adminq.c | 119 +- drivers/net/ethernet/intel/i40evf/i40e_adminq.h | 39 + drivers/net/ethernet/intel/i40evf/i40e_common.c | 2 +- drivers/net/ethernet/intel/i40evf/i40e_hmc.h | 4 +- drivers/net/ethernet/intel/i40evf/i40e_lan_hmc.h | 28 +- drivers/net/ethernet/intel/i40evf/i40e_register.h | 5011 ++++++--------- drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 9 +- drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 7 +- drivers/net/ethernet/intel/i40evf/i40e_type.h | 74 +- drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 4 +- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 27 +- .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 44 +- drivers/net/ethernet/intel/igb/e1000_82575.c | 2 - drivers/net/ethernet/intel/igb/e1000_regs.h | 1 + drivers/net/ethernet/intel/igb/igb_main.c | 31 +- drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 213 +- drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 315 +- drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 580 +- drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c | 39 +- drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c | 46 +- drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 2 - drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 24 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 74 +- drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c | 117 +- drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 582 +- drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 16 +- drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 31 +- drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 20 - drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 216 +- drivers/net/ethernet/intel/ixgbevf/vf.h | 1 - drivers/net/ethernet/marvell/Kconfig | 8 + drivers/net/ethernet/marvell/Makefile | 1 + drivers/net/ethernet/marvell/mvpp2.c | 6426 ++++++++++++++++++++ drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 57 + drivers/net/ethernet/mellanox/mlx4/en_main.c | 6 +- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 35 +- drivers/net/ethernet/mellanox/mlx4/en_rx.c | 7 +- drivers/net/ethernet/mellanox/mlx4/en_selftest.c | 3 +- drivers/net/ethernet/mellanox/mlx4/en_tx.c | 13 +- drivers/net/ethernet/mellanox/mlx4/main.c | 28 +- drivers/net/ethernet/mellanox/mlx4/mcg.c | 279 +- drivers/net/ethernet/mellanox/mlx4/mlx4.h | 5 - drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 10 +- drivers/net/ethernet/mellanox/mlx4/port.c | 32 +- drivers/net/ethernet/mellanox/mlx5/core/alloc.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/eq.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/mad.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 292 +- .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/port.c | 2 +- drivers/net/ethernet/neterion/vxge/vxge-main.c | 1 - drivers/net/ethernet/octeon/octeon_mgmt.c | 25 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 4 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c | 4 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 48 +- drivers/net/ethernet/realtek/8139cp.c | 36 +- drivers/net/ethernet/realtek/r8169.c | 220 +- drivers/net/ethernet/renesas/sh_eth.c | 18 +- drivers/net/ethernet/sfc/ef10.c | 14 +- drivers/net/ethernet/sfc/efx.c | 67 +- drivers/net/ethernet/sfc/efx.h | 5 + drivers/net/ethernet/sfc/ethtool.c | 59 +- drivers/net/ethernet/sfc/falcon.c | 9 +- drivers/net/ethernet/sfc/mcdi_port.c | 11 + drivers/net/ethernet/sfc/net_driver.h | 154 + drivers/net/ethernet/sfc/nic.h | 13 +- drivers/net/ethernet/sfc/rx.c | 12 +- drivers/net/ethernet/sfc/selftest.c | 5 +- drivers/net/ethernet/sfc/siena.c | 9 +- drivers/net/ethernet/sfc/tx.c | 28 +- drivers/net/ethernet/sis/sis900.c | 1 - drivers/net/ethernet/stmicro/stmmac/common.h | 47 +- .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 69 + drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 3 +- .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 131 +- .../net/ethernet/stmicro/stmmac/dwmac100_core.c | 27 +- .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 6 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 42 +- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 67 + drivers/net/ethernet/sun/niu.c | 1 - drivers/net/ethernet/ti/Kconfig | 4 +- drivers/net/ethernet/ti/cpmac.c | 279 +- drivers/net/ethernet/ti/cpsw.c | 45 +- drivers/net/ethernet/ti/cpsw_ale.c | 12 +- drivers/net/ethernet/ti/cpsw_ale.h | 4 + drivers/net/ethernet/ti/cpts.c | 24 +- drivers/net/ethernet/ti/davinci_mdio.c | 21 +- drivers/net/ethernet/ti/tlan.c | 224 +- drivers/net/ethernet/ti/tlan.h | 5 +- drivers/net/ethernet/tile/tilegx.c | 4 +- drivers/net/ethernet/tile/tilepro.c | 3 +- drivers/net/ethernet/toshiba/ps3_gelic_wireless.c | 10 - drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +- drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 2 +- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- drivers/net/fddi/defxx.c | 142 +- drivers/net/fddi/defxx.h | 2 +- drivers/net/hamradio/6pack.c | 3 +- drivers/net/hamradio/baycom_epp.c | 2 +- drivers/net/hamradio/bpqether.c | 4 +- drivers/net/hamradio/dmascc.c | 4 +- drivers/net/hamradio/hdlcdrv.c | 2 +- drivers/net/hamradio/mkiss.c | 3 +- drivers/net/hamradio/scc.c | 2 +- drivers/net/hamradio/yam.c | 2 +- drivers/net/hyperv/hyperv_net.h | 3 +- drivers/net/hyperv/netvsc.c | 4 +- drivers/net/hyperv/netvsc_drv.c | 41 +- drivers/net/hyperv/rndis_filter.c | 21 +- drivers/net/ieee802154/Kconfig | 12 + drivers/net/ieee802154/Makefile | 1 + drivers/net/ieee802154/at86rf230.c | 1464 +++-- drivers/net/ieee802154/cc2520.c | 1039 ++++ drivers/net/ieee802154/fakehard.c | 3 +- drivers/net/ieee802154/mrf24j40.c | 115 +- drivers/net/ifb.c | 4 +- drivers/net/irda/kingsun-sir.c | 4 +- drivers/net/loopback.c | 2 +- drivers/net/phy/amd-xgbe-phy.c | 134 +- drivers/net/phy/dp83640.c | 239 +- drivers/net/phy/micrel.c | 22 + drivers/net/phy/phy.c | 83 +- drivers/net/phy/phy_device.c | 2 + drivers/net/ppp/ppp_generic.c | 7 +- drivers/net/slip/slhc.c | 1 - drivers/net/slip/slip.c | 2 +- drivers/net/team/team_mode_loadbalance.c | 8 +- drivers/net/tun.c | 3 +- drivers/net/usb/cdc-phonet.c | 2 +- drivers/net/usb/hso.c | 3 +- drivers/net/usb/r8152.c | 38 +- drivers/net/veth.c | 29 +- drivers/net/virtio_net.c | 67 +- drivers/net/vxlan.c | 144 +- drivers/net/wan/dlci.c | 5 +- drivers/net/wan/hdlc.c | 3 +- drivers/net/wan/hdlc_fr.c | 5 +- drivers/net/wan/lapbether.c | 4 +- drivers/net/wan/sbni.c | 7 +- drivers/net/wan/sdla.c | 3 +- drivers/net/wan/x25_asy.c | 4 +- drivers/net/wimax/i2400m/usb.c | 2 +- drivers/net/wireless/airo.c | 6 +- drivers/net/wireless/at76c50x-usb.c | 3 +- drivers/net/wireless/ath/ath.h | 1 + drivers/net/wireless/ath/ath10k/ce.c | 11 +- drivers/net/wireless/ath/ath10k/core.c | 12 +- drivers/net/wireless/ath/ath10k/core.h | 3 + drivers/net/wireless/ath/ath10k/debug.c | 73 + drivers/net/wireless/ath/ath10k/htt.h | 13 +- drivers/net/wireless/ath/ath10k/htt_tx.c | 46 + drivers/net/wireless/ath/ath10k/mac.c | 3 +- drivers/net/wireless/ath/ath10k/pci.c | 11 +- drivers/net/wireless/ath/ath10k/pci.h | 3 +- drivers/net/wireless/ath/ath10k/wmi.c | 6 - drivers/net/wireless/ath/ath5k/ath5k.h | 1 + drivers/net/wireless/ath/ath5k/base.c | 31 +- drivers/net/wireless/ath/ath5k/mac80211-ops.c | 2 + drivers/net/wireless/ath/ath6kl/bmi.h | 3 +- drivers/net/wireless/ath/ath6kl/cfg80211.c | 8 +- drivers/net/wireless/ath/ath6kl/core.c | 16 + drivers/net/wireless/ath/ath6kl/core.h | 36 +- drivers/net/wireless/ath/ath6kl/htc_pipe.c | 32 +- drivers/net/wireless/ath/ath6kl/init.c | 91 +- drivers/net/wireless/ath/ath6kl/main.c | 17 +- drivers/net/wireless/ath/ath6kl/usb.c | 7 +- drivers/net/wireless/ath/ath6kl/wmi.c | 72 +- drivers/net/wireless/ath/ath6kl/wmi.h | 2 +- drivers/net/wireless/ath/ath9k/Makefile | 3 +- drivers/net/wireless/ath/ath9k/ar9002_mac.c | 6 +- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 3 +- drivers/net/wireless/ath/ath9k/ar9003_hw.c | 15 +- drivers/net/wireless/ath/ath9k/ar9003_mac.c | 6 +- drivers/net/wireless/ath/ath9k/ar9003_phy.c | 6 +- drivers/net/wireless/ath/ath9k/ar953x_initvals.h | 201 +- drivers/net/wireless/ath/ath9k/ath9k.h | 162 +- drivers/net/wireless/ath/ath9k/beacon.c | 97 +- drivers/net/wireless/ath/ath9k/channel.c | 685 +++ drivers/net/wireless/ath/ath9k/common-beacon.c | 5 +- drivers/net/wireless/ath/ath9k/debug.c | 30 +- drivers/net/wireless/ath/ath9k/hw.c | 26 +- drivers/net/wireless/ath/ath9k/hw.h | 1 + drivers/net/wireless/ath/ath9k/init.c | 57 +- drivers/net/wireless/ath/ath9k/link.c | 6 +- drivers/net/wireless/ath/ath9k/mac.h | 10 +- drivers/net/wireless/ath/ath9k/main.c | 892 ++- drivers/net/wireless/ath/ath9k/mci.c | 4 +- drivers/net/wireless/ath/ath9k/pci.c | 1 + drivers/net/wireless/ath/ath9k/recv.c | 16 +- drivers/net/wireless/ath/ath9k/reg.h | 4 + drivers/net/wireless/ath/ath9k/spectral.c | 8 +- drivers/net/wireless/ath/ath9k/tx99.c | 2 +- drivers/net/wireless/ath/ath9k/wow.c | 1 + drivers/net/wireless/ath/ath9k/xmit.c | 135 +- drivers/net/wireless/ath/carl9170/phy.c | 1 - drivers/net/wireless/ath/wcn36xx/main.c | 1 - drivers/net/wireless/ath/wil6210/cfg80211.c | 68 +- drivers/net/wireless/ath/wil6210/debugfs.c | 361 +- drivers/net/wireless/ath/wil6210/interrupt.c | 3 + drivers/net/wireless/ath/wil6210/main.c | 64 +- drivers/net/wireless/ath/wil6210/netdev.c | 2 +- drivers/net/wireless/ath/wil6210/pcie_bus.c | 53 +- drivers/net/wireless/ath/wil6210/rx_reorder.c | 1 + drivers/net/wireless/ath/wil6210/txrx.c | 39 +- drivers/net/wireless/ath/wil6210/wil6210.h | 36 +- drivers/net/wireless/ath/wil6210/wmi.c | 59 +- drivers/net/wireless/b43/Kconfig | 9 + drivers/net/wireless/b43/Makefile | 6 +- drivers/net/wireless/b43/main.c | 458 +- drivers/net/wireless/b43/main.h | 1 + drivers/net/wireless/b43/phy_a.c | 2 +- drivers/net/wireless/b43/phy_a.h | 4 - drivers/net/wireless/b43/phy_common.c | 26 +- drivers/net/wireless/b43/phy_common.h | 12 +- drivers/net/wireless/b43/phy_ht.c | 2 +- drivers/net/wireless/b43/phy_lcn.c | 35 +- drivers/net/wireless/b43/phy_n.c | 1457 ++++- drivers/net/wireless/b43/phy_n.h | 15 + drivers/net/wireless/b43/radio_2057.c | 540 +- drivers/net/wireless/b43/radio_2057.h | 76 + drivers/net/wireless/b43/tables_nphy.c | 626 +- drivers/net/wireless/b43/tables_nphy.h | 4 + drivers/net/wireless/b43/xmit.c | 7 +- drivers/net/wireless/brcm80211/brcmfmac/Makefile | 4 +- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 23 +- drivers/net/wireless/brcm80211/brcmfmac/btcoex.c | 38 +- drivers/net/wireless/brcm80211/brcmfmac/chip.c | 28 +- drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 15 +- .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 7 + drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c | 196 +- drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h | 74 +- .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 16 +- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 274 +- drivers/net/wireless/brcm80211/brcmfmac/feature.c | 136 + drivers/net/wireless/brcm80211/brcmfmac/feature.h | 86 + drivers/net/wireless/brcm80211/brcmfmac/firmware.c | 5 + drivers/net/wireless/brcm80211/brcmfmac/firmware.h | 5 + drivers/net/wireless/brcm80211/brcmfmac/fwil.c | 2 +- drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 100 +- drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 3 +- .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 4 + drivers/net/wireless/brcm80211/brcmfmac/usb.c | 251 +- drivers/net/wireless/brcm80211/brcmfmac/vendor.c | 115 + drivers/net/wireless/brcm80211/brcmfmac/vendor.h | 64 + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 1093 ++-- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 2 +- drivers/net/wireless/brcm80211/brcmsmac/main.c | 37 - .../net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c | 6 +- .../net/wireless/brcm80211/brcmsmac/phy/phy_n.c | 1 - .../net/wireless/brcm80211/include/brcm_hw_ids.h | 60 +- drivers/net/wireless/cw1200/fwio.c | 1 - drivers/net/wireless/cw1200/scan.c | 3 +- drivers/net/wireless/cw1200/scan.h | 2 +- drivers/net/wireless/cw1200/sta.c | 3 +- drivers/net/wireless/ipw2x00/libipw_module.c | 3 +- drivers/net/wireless/iwlegacy/common.c | 3 +- drivers/net/wireless/iwlegacy/common.h | 2 +- drivers/net/wireless/iwlwifi/Kconfig | 25 +- drivers/net/wireless/iwlwifi/dvm/mac80211.c | 3 +- drivers/net/wireless/iwlwifi/dvm/power.c | 9 + drivers/net/wireless/iwlwifi/iwl-8000.c | 9 +- drivers/net/wireless/iwlwifi/iwl-config.h | 4 +- drivers/net/wireless/iwlwifi/iwl-drv.c | 15 + drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c | 1 - drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h | 67 +- drivers/net/wireless/iwlwifi/iwl-fw-file.h | 6 +- drivers/net/wireless/iwlwifi/iwl-fw.h | 12 + drivers/net/wireless/iwlwifi/iwl-modparams.h | 4 +- drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 99 +- drivers/net/wireless/iwlwifi/iwl-prph.h | 6 + drivers/net/wireless/iwlwifi/iwl-trans.h | 21 +- drivers/net/wireless/iwlwifi/mvm/Makefile | 2 +- drivers/net/wireless/iwlwifi/mvm/coex.c | 513 +- drivers/net/wireless/iwlwifi/mvm/coex_legacy.c | 1257 ++++ drivers/net/wireless/iwlwifi/mvm/constants.h | 2 + drivers/net/wireless/iwlwifi/mvm/debugfs.c | 324 +- drivers/net/wireless/iwlwifi/mvm/fw-api-coex.h | 222 +- drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 2 +- drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 256 +- drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h | 7 +- drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h | 30 +- drivers/net/wireless/iwlwifi/mvm/fw-api.h | 78 +- drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 111 +- drivers/net/wireless/iwlwifi/mvm/mac80211.c | 792 ++- drivers/net/wireless/iwlwifi/mvm/mvm.h | 150 +- drivers/net/wireless/iwlwifi/mvm/nvm.c | 35 +- drivers/net/wireless/iwlwifi/mvm/ops.c | 128 +- drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c | 26 + drivers/net/wireless/iwlwifi/mvm/power.c | 39 +- drivers/net/wireless/iwlwifi/mvm/quota.c | 38 +- drivers/net/wireless/iwlwifi/mvm/rs.c | 96 +- drivers/net/wireless/iwlwifi/mvm/rs.h | 19 +- drivers/net/wireless/iwlwifi/mvm/rx.c | 17 + drivers/net/wireless/iwlwifi/mvm/scan.c | 540 +- drivers/net/wireless/iwlwifi/mvm/sta.c | 98 +- drivers/net/wireless/iwlwifi/mvm/sta.h | 12 + drivers/net/wireless/iwlwifi/mvm/time-event.c | 162 +- drivers/net/wireless/iwlwifi/mvm/time-event.h | 29 + drivers/net/wireless/iwlwifi/mvm/tt.c | 12 +- drivers/net/wireless/iwlwifi/mvm/tx.c | 35 +- drivers/net/wireless/iwlwifi/mvm/utils.c | 65 - drivers/net/wireless/iwlwifi/pcie/internal.h | 7 + drivers/net/wireless/iwlwifi/pcie/trans.c | 339 +- drivers/net/wireless/iwlwifi/pcie/tx.c | 1 + drivers/net/wireless/libertas/Kconfig | 2 +- drivers/net/wireless/libertas/cmd.c | 1 + drivers/net/wireless/libertas/main.c | 2 +- drivers/net/wireless/libertas/mesh.c | 2 +- drivers/net/wireless/mac80211_hwsim.c | 83 +- drivers/net/wireless/mwifiex/11ac.c | 2 +- drivers/net/wireless/mwifiex/11ac.h | 2 +- drivers/net/wireless/mwifiex/11h.c | 2 +- drivers/net/wireless/mwifiex/11n.c | 5 +- drivers/net/wireless/mwifiex/11n.h | 2 +- drivers/net/wireless/mwifiex/11n_aggr.c | 2 +- drivers/net/wireless/mwifiex/11n_aggr.h | 2 +- drivers/net/wireless/mwifiex/11n_rxreorder.c | 29 +- drivers/net/wireless/mwifiex/11n_rxreorder.h | 2 +- drivers/net/wireless/mwifiex/Makefile | 2 +- drivers/net/wireless/mwifiex/README | 32 +- drivers/net/wireless/mwifiex/cfg80211.c | 66 +- drivers/net/wireless/mwifiex/cfg80211.h | 2 +- drivers/net/wireless/mwifiex/cfp.c | 2 +- drivers/net/wireless/mwifiex/cmdevt.c | 46 +- drivers/net/wireless/mwifiex/debugfs.c | 95 +- drivers/net/wireless/mwifiex/decl.h | 2 +- drivers/net/wireless/mwifiex/ethtool.c | 85 +- drivers/net/wireless/mwifiex/fw.h | 4 +- drivers/net/wireless/mwifiex/ie.c | 2 +- drivers/net/wireless/mwifiex/init.c | 15 +- drivers/net/wireless/mwifiex/ioctl.h | 2 +- drivers/net/wireless/mwifiex/join.c | 10 +- drivers/net/wireless/mwifiex/main.c | 24 +- drivers/net/wireless/mwifiex/main.h | 34 +- drivers/net/wireless/mwifiex/pcie.c | 189 +- drivers/net/wireless/mwifiex/pcie.h | 12 +- drivers/net/wireless/mwifiex/scan.c | 2 +- drivers/net/wireless/mwifiex/sdio.c | 235 +- drivers/net/wireless/mwifiex/sdio.h | 14 +- drivers/net/wireless/mwifiex/sta_cmd.c | 4 +- drivers/net/wireless/mwifiex/sta_cmdresp.c | 4 +- drivers/net/wireless/mwifiex/sta_event.c | 2 +- drivers/net/wireless/mwifiex/sta_ioctl.c | 18 +- drivers/net/wireless/mwifiex/sta_rx.c | 2 +- drivers/net/wireless/mwifiex/sta_tx.c | 2 +- drivers/net/wireless/mwifiex/tdls.c | 30 +- drivers/net/wireless/mwifiex/txrx.c | 2 +- drivers/net/wireless/mwifiex/uap_cmd.c | 2 +- drivers/net/wireless/mwifiex/uap_event.c | 2 +- drivers/net/wireless/mwifiex/uap_txrx.c | 6 +- drivers/net/wireless/mwifiex/usb.c | 2 +- drivers/net/wireless/mwifiex/usb.h | 2 +- drivers/net/wireless/mwifiex/util.c | 2 +- drivers/net/wireless/mwifiex/util.h | 2 +- drivers/net/wireless/mwifiex/wmm.c | 11 +- drivers/net/wireless/mwifiex/wmm.h | 2 +- drivers/net/wireless/mwl8k.c | 5 - drivers/net/wireless/orinoco/Kconfig | 4 +- drivers/net/wireless/orinoco/orinoco_usb.c | 1 - drivers/net/wireless/p54/p54spi.c | 2 +- drivers/net/wireless/prism54/oid_mgt.c | 1 - drivers/net/wireless/rsi/rsi_91x_core.c | 85 +- drivers/net/wireless/rsi/rsi_91x_debugfs.c | 10 +- drivers/net/wireless/rsi/rsi_91x_mac80211.c | 143 +- drivers/net/wireless/rsi/rsi_91x_mgmt.c | 239 +- drivers/net/wireless/rsi/rsi_91x_pkt.c | 17 + drivers/net/wireless/rsi/rsi_91x_sdio.c | 6 +- drivers/net/wireless/rsi/rsi_91x_sdio_ops.c | 8 +- drivers/net/wireless/rsi/rsi_91x_usb.c | 88 +- drivers/net/wireless/rsi/rsi_main.h | 12 + drivers/net/wireless/rsi/rsi_mgmt.h | 25 +- drivers/net/wireless/rsi/rsi_sdio.h | 8 +- drivers/net/wireless/rt2x00/rt2800lib.c | 69 +- drivers/net/wireless/rt2x00/rt2800usb.c | 4 + drivers/net/wireless/rt2x00/rt2x00dev.c | 10 +- drivers/net/wireless/rt2x00/rt2x00mac.c | 20 +- drivers/net/wireless/rt2x00/rt2x00mmio.c | 8 +- drivers/net/wireless/rt2x00/rt2x00queue.c | 21 +- drivers/net/wireless/rt2x00/rt2x00queue.h | 1 + drivers/net/wireless/rtl818x/rtl8180/dev.c | 78 +- drivers/net/wireless/rtl818x/rtl8180/rtl8180.h | 1 + .../net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h | 2 +- drivers/net/wireless/rtlwifi/core.c | 1 - drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | 2 +- drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.c | 1 - drivers/net/wireless/rtlwifi/rtl8188ee/reg.h | 1 + drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 3 +- drivers/net/wireless/rtlwifi/rtl8192ce/reg.h | 1 + drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 2 +- drivers/net/wireless/rtlwifi/rtl8192de/hw.c | 2 +- drivers/net/wireless/rtlwifi/rtl8192de/phy.c | 3 +- drivers/net/wireless/rtlwifi/rtl8192de/reg.h | 1 + drivers/net/wireless/rtlwifi/rtl8192se/fw.c | 4 - drivers/net/wireless/rtlwifi/rtl8192se/hw.c | 1 - drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | 3 +- drivers/net/wireless/rtlwifi/rtl8723ae/reg.h | 1 + drivers/net/wireless/rtlwifi/rtl8723be/hw.c | 2 +- drivers/net/wireless/rtlwifi/rtl8723be/pwrseqcmd.c | 1 - drivers/net/wireless/rtlwifi/rtl8723be/reg.h | 1 + drivers/net/wireless/ti/wl1251/main.c | 3 +- drivers/net/wireless/ti/wl12xx/main.c | 2 +- drivers/net/wireless/ti/wl12xx/scan.c | 20 +- drivers/net/wireless/ti/wl12xx/scan.h | 2 +- drivers/net/wireless/ti/wl18xx/cmd.c | 89 + drivers/net/wireless/ti/wl18xx/cmd.h | 19 +- drivers/net/wireless/ti/wl18xx/event.c | 65 + drivers/net/wireless/ti/wl18xx/event.h | 2 + drivers/net/wireless/ti/wl18xx/main.c | 34 +- drivers/net/wireless/ti/wl18xx/scan.c | 16 +- drivers/net/wireless/ti/wl18xx/scan.h | 2 +- drivers/net/wireless/ti/wl18xx/tx.c | 7 +- drivers/net/wireless/ti/wl18xx/wl18xx.h | 2 +- drivers/net/wireless/ti/wlcore/Makefile | 2 +- drivers/net/wireless/ti/wlcore/cmd.c | 23 +- drivers/net/wireless/ti/wlcore/cmd.h | 6 +- drivers/net/wireless/ti/wlcore/debugfs.c | 2 +- drivers/net/wireless/ti/wlcore/hw_ops.h | 27 + drivers/net/wireless/ti/wlcore/main.c | 108 +- drivers/net/wireless/ti/wlcore/scan.h | 2 +- drivers/net/wireless/ti/wlcore/tx.c | 2 +- drivers/net/wireless/ti/wlcore/vendor_cmd.c | 197 + drivers/net/wireless/ti/wlcore/vendor_cmd.h | 45 + drivers/net/wireless/ti/wlcore/wlcore.h | 10 +- drivers/net/wireless/ti/wlcore/wlcore_i.h | 20 +- drivers/net/wireless/zd1211rw/Kconfig | 4 +- drivers/net/xen-netback/common.h | 11 + drivers/net/xen-netback/interface.c | 6 +- drivers/net/xen-netback/netback.c | 11 + drivers/net/xen-netback/xenbus.c | 178 +- drivers/ptp/ptp_chardev.c | 9 +- drivers/s390/net/claw.c | 2 +- drivers/s390/net/ctcm_main.c | 6 +- drivers/s390/net/netiucv.c | 2 +- drivers/s390/net/qeth_core.h | 7 + drivers/s390/net/qeth_core_main.c | 39 + drivers/s390/net/qeth_core_mpc.h | 17 + drivers/s390/net/qeth_core_sys.c | 38 +- drivers/s390/net/qeth_l2_main.c | 6 +- drivers/s390/net/qeth_l3_main.c | 3 +- drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 365 +- drivers/scsi/cxgbi/libcxgbi.c | 241 +- drivers/scsi/cxgbi/libcxgbi.h | 21 +- drivers/ssb/pci.c | 113 +- drivers/staging/cxt1e1/linux.c | 3 +- drivers/staging/gdm724x/gdm_lte.c | 2 +- drivers/staging/gdm72xx/gdm_wimax.c | 3 +- drivers/staging/vt6655/wpactl.c | 3 +- drivers/staging/wlan-ng/p80211netdev.c | 2 +- drivers/tty/n_gsm.c | 5 +- drivers/usb/gadget/f_phonet.c | 3 +- fs/compat_ioctl.c | 2 +- include/linux/arcdevice.h | 10 +- include/linux/bcma/bcma.h | 4 + include/linux/bcma/bcma_driver_pcie2.h | 158 + include/linux/crc32.h | 20 +- include/linux/filter.h | 65 +- include/linux/ieee80211.h | 23 + include/linux/if_bridge.h | 20 + include/linux/ipv6.h | 24 +- include/linux/kernel.h | 2 +- include/linux/mlx4/device.h | 18 + include/linux/mlx5/device.h | 4 - include/linux/mlx5/driver.h | 27 +- include/linux/netdev_features.h | 8 + include/linux/netdevice.h | 40 +- include/linux/phy.h | 18 + include/linux/ptp_classify.h | 5 +- include/linux/rndis.h | 1 + include/linux/rtnetlink.h | 1 + include/linux/skbuff.h | 26 +- include/linux/spi/cc2520.h | 26 + include/linux/ssb/ssb_regs.h | 37 + include/linux/stmmac.h | 2 + include/linux/tcp.h | 3 - include/net/bluetooth/bluetooth.h | 18 +- include/net/bluetooth/hci.h | 291 +- include/net/bluetooth/hci_core.h | 184 +- include/net/bluetooth/hci_sock.h | 175 + include/net/bluetooth/l2cap.h | 46 +- include/net/bluetooth/mgmt.h | 99 + include/net/bluetooth/sco.h | 30 - include/net/cfg80211.h | 38 +- include/net/dcbnl.h | 4 +- include/net/flow_keys.h | 15 + include/net/if_inet6.h | 1 + include/net/inet_frag.h | 70 +- include/net/inet_sock.h | 6 +- include/net/inet_timewait_sock.h | 3 +- include/net/ip.h | 21 +- include/net/ipv6.h | 71 +- include/net/mac80211.h | 105 +- include/net/mac802154.h | 19 + include/net/netfilter/nf_conntrack_ecache.h | 26 +- include/net/netfilter/nf_log.h | 42 +- include/net/netfilter/xt_log.h | 54 - include/net/netlink.h | 6 +- include/net/netns/conntrack.h | 6 +- include/net/netns/ipv6.h | 1 + include/net/netns/x_tables.h | 6 - include/net/rtnetlink.h | 1 + include/net/sch_generic.h | 2 +- include/net/sctp/command.h | 39 +- include/net/sctp/constants.h | 2 +- include/net/sctp/sctp.h | 22 +- include/net/sctp/structs.h | 7 +- include/net/sctp/ulpevent.h | 14 +- include/net/sock.h | 45 +- include/net/tcp.h | 61 +- include/net/udp.h | 29 + include/net/udp_tunnel.h | 32 + include/net/vxlan.h | 2 - include/uapi/linux/can/netlink.h | 3 +- include/uapi/linux/dcbnl.h | 3 +- include/uapi/linux/if_link.h | 6 + include/uapi/linux/if_packet.h | 2 +- include/uapi/linux/in6.h | 1 + include/uapi/linux/ipv6.h | 1 + include/uapi/linux/netdevice.h | 6 + include/uapi/linux/netfilter/nf_tables.h | 4 + include/uapi/linux/netfilter/xt_bpf.h | 2 + include/uapi/linux/netfilter_bridge/Kbuild | 1 - include/uapi/linux/netfilter_bridge/ebt_ulog.h | 38 - include/uapi/linux/netfilter_ipv4/Kbuild | 1 - include/uapi/linux/netfilter_ipv4/ipt_ULOG.h | 49 - include/uapi/linux/nl80211.h | 5 + include/uapi/linux/openvswitch.h | 13 +- include/uapi/linux/sctp.h | 102 +- include/uapi/linux/sysctl.h | 1 + include/uapi/linux/tipc_config.h | 2 +- kernel/Makefile | 1 + kernel/bpf/Makefile | 1 + kernel/bpf/core.c | 536 ++ kernel/seccomp.c | 2 +- kernel/sysctl_binary.c | 1 + lib/crc32.c | 153 +- lib/dynamic_debug.c | 8 +- lib/net_utils.c | 10 +- lib/random32.c | 49 +- lib/test_bpf.c | 4 +- net/6lowpan/Kconfig | 6 + net/6lowpan/Makefile | 3 + net/{ieee802154/6lowpan_iphc.c => 6lowpan/iphc.c} | 114 +- net/802/fc.c | 2 +- net/802/fddi.c | 3 +- net/802/hippi.c | 3 +- net/8021q/vlan.c | 24 +- net/8021q/vlan_dev.c | 2 + net/8021q/vlanproc.c | 2 + net/9p/client.c | 1 - net/Kconfig | 1 + net/Makefile | 3 +- net/appletalk/ddp.c | 2 +- net/appletalk/dev.c | 3 +- net/atm/br2684.c | 4 +- net/atm/clip.c | 3 +- net/batman-adv/soft-interface.c | 2 +- net/batman-adv/sysfs.c | 24 +- net/bluetooth/6lowpan.c | 857 ++- net/bluetooth/6lowpan.h | 47 - net/bluetooth/Kconfig | 7 +- net/bluetooth/Makefile | 4 +- net/bluetooth/a2mp.c | 8 +- net/bluetooth/af_bluetooth.c | 2 +- net/bluetooth/amp.c | 6 +- net/bluetooth/bnep/core.c | 5 +- net/bluetooth/cmtp/capi.c | 6 - net/bluetooth/hci_conn.c | 191 +- net/bluetooth/hci_core.c | 1029 ++-- net/bluetooth/hci_event.c | 787 ++- net/bluetooth/hci_sock.c | 33 +- net/bluetooth/l2cap_core.c | 174 +- net/bluetooth/l2cap_sock.c | 53 +- net/bluetooth/mgmt.c | 1348 +++- net/bluetooth/rfcomm/core.c | 3 +- net/bluetooth/rfcomm/sock.c | 3 +- net/bluetooth/sco.c | 125 +- net/bluetooth/smp.c | 223 +- net/bluetooth/smp.h | 7 + net/bridge/br_fdb.c | 24 +- net/bridge/br_if.c | 2 +- net/bridge/br_multicast.c | 37 + net/bridge/br_private.h | 2 +- net/bridge/netfilter/Kconfig | 25 +- net/bridge/netfilter/Makefile | 5 +- net/bridge/netfilter/ebt_log.c | 47 +- net/bridge/netfilter/ebt_ulog.c | 393 -- net/bridge/netfilter/nf_log_bridge.c | 96 + net/bridge/netfilter/nft_reject_bridge.c | 67 + net/caif/caif_socket.c | 3 +- net/caif/cfctrl.c | 1 - net/core/dev.c | 49 +- net/core/drop_monitor.c | 2 - net/core/filter.c | 555 +- net/core/flow_dissector.c | 85 +- net/core/net-sysfs.c | 154 +- net/core/netpoll.c | 3 +- net/core/pktgen.c | 111 +- net/core/ptp_classifier.c | 64 +- net/core/request_sock.c | 43 +- net/core/rtnetlink.c | 107 +- net/core/sock.c | 6 +- net/core/timestamping.c | 57 +- net/dcb/dcbnl.c | 13 +- net/dccp/ipv6.c | 2 +- net/dccp/minisocks.c | 4 +- net/dsa/dsa.c | 3 +- net/dsa/slave.c | 4 +- net/ethernet/eth.c | 3 +- net/hsr/Makefile | 3 +- net/hsr/hsr_device.c | 580 +- net/hsr/hsr_device.h | 12 +- net/hsr/hsr_forward.c | 368 ++ net/hsr/hsr_forward.h | 20 + net/hsr/hsr_framereg.c | 477 +- net/hsr/hsr_framereg.h | 45 +- net/hsr/hsr_main.c | 425 +- net/hsr/hsr_main.h | 61 +- net/hsr/hsr_netlink.c | 102 +- net/hsr/hsr_netlink.h | 11 +- net/hsr/hsr_slave.c | 196 + net/hsr/hsr_slave.h | 38 + net/ieee802154/6lowpan_rtnl.c | 16 +- net/ieee802154/Kconfig | 9 +- net/ieee802154/Makefile | 5 +- net/ieee802154/af_ieee802154.c | 26 +- net/ieee802154/dgram.c | 28 +- net/ieee802154/ieee802154.h | 2 +- net/ieee802154/netlink.c | 4 +- net/ieee802154/nl-mac.c | 48 +- net/ieee802154/nl-phy.c | 23 +- net/ieee802154/raw.c | 14 +- net/ieee802154/reassembly.c | 48 +- net/ieee802154/wpan-class.c | 10 +- net/ipv4/Kconfig | 4 + net/ipv4/Makefile | 1 + net/ipv4/datagram.c | 1 + net/ipv4/devinet.c | 36 +- net/ipv4/gre_offload.c | 2 +- net/ipv4/igmp.c | 2 +- net/ipv4/inet_fragment.c | 283 +- net/ipv4/ip_fragment.c | 56 +- net/ipv4/ip_output.c | 7 +- net/ipv4/ip_sockglue.c | 2 +- net/ipv4/ip_tunnel.c | 2 +- net/ipv4/ip_vti.c | 54 +- net/ipv4/ipconfig.c | 5 +- net/ipv4/ipmr.c | 2 +- net/ipv4/netfilter/Kconfig | 29 +- net/ipv4/netfilter/Makefile | 5 +- net/ipv4/netfilter/ipt_ULOG.c | 498 -- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 6 +- net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 4 +- net/ipv4/netfilter/nf_defrag_ipv4.c | 8 +- net/ipv4/netfilter/nf_log_arp.c | 149 + net/ipv4/netfilter/nf_log_ipv4.c | 385 ++ net/ipv4/netfilter/nf_nat_l3proto_ipv4.c | 4 + net/ipv4/netfilter/nf_nat_proto_gre.c | 2 +- net/ipv4/netfilter/nf_nat_proto_icmp.c | 2 +- net/ipv4/proc.c | 5 +- net/ipv4/raw.c | 9 +- net/ipv4/syncookies.c | 3 +- net/ipv4/tcp_input.c | 165 +- net/ipv4/tcp_ipv4.c | 194 +- net/ipv4/tcp_metrics.c | 1 - net/ipv4/tcp_minisocks.c | 2 +- net/ipv4/tcp_output.c | 18 +- net/ipv4/udp.c | 156 +- net/ipv4/udp_offload.c | 76 + net/ipv4/udp_tunnel.c | 100 + net/ipv4/xfrm4_protocol.c | 2 +- net/ipv6/addrconf.c | 148 +- net/ipv6/af_inet6.c | 7 +- net/ipv6/datagram.c | 1 + net/ipv6/ip6_gre.c | 13 +- net/ipv6/ip6_output.c | 25 +- net/ipv6/ip6_tunnel.c | 8 +- net/ipv6/ip6_vti.c | 55 +- net/ipv6/ip6mr.c | 2 +- net/ipv6/ipv6_sockglue.c | 13 +- net/ipv6/ndisc.c | 58 +- net/ipv6/netfilter/Kconfig | 5 + net/ipv6/netfilter/Makefile | 3 + net/ipv6/netfilter/ip6t_ipv6header.c | 1 - net/ipv6/netfilter/nf_conntrack_reasm.c | 29 +- net/ipv6/netfilter/nf_log_ipv6.c | 417 ++ net/ipv6/netfilter/nf_nat_l3proto_ipv6.c | 4 + net/ipv6/proc.c | 4 +- net/ipv6/raw.c | 6 +- net/ipv6/reassembly.c | 51 +- net/ipv6/sit.c | 4 +- net/ipv6/syncookies.c | 2 +- net/ipv6/sysctl_net_ipv6.c | 8 + net/ipv6/tcp_ipv6.c | 209 +- net/ipv6/udp.c | 121 +- net/irda/af_irda.c | 1 - net/irda/irda_device.c | 3 +- net/irda/irlan/irlan_common.c | 1 - net/irda/irlan/irlan_eth.c | 2 +- net/irda/irlmp.c | 3 +- net/iucv/af_iucv.c | 4 +- net/key/af_key.c | 3 - net/l2tp/Kconfig | 1 + net/l2tp/l2tp_core.c | 86 +- net/l2tp/l2tp_eth.c | 3 +- net/mac80211/Kconfig | 17 - net/mac80211/Makefile | 6 +- net/mac80211/agg-rx.c | 110 +- net/mac80211/agg-tx.c | 8 +- net/mac80211/cfg.c | 558 +- net/mac80211/chan.c | 861 ++- net/mac80211/debugfs_sta.c | 3 +- net/mac80211/driver-ops.h | 20 +- net/mac80211/ethtool.c | 244 + net/mac80211/ht.c | 10 +- net/mac80211/ibss.c | 15 +- net/mac80211/ieee80211_i.h | 116 +- net/mac80211/iface.c | 46 +- net/mac80211/key.c | 3 - net/mac80211/main.c | 10 +- net/mac80211/mesh.c | 4 +- net/mac80211/mesh_hwmp.c | 1 - net/mac80211/mesh_plink.c | 30 +- net/mac80211/mlme.c | 156 +- net/mac80211/offchannel.c | 6 +- net/mac80211/pm.c | 6 +- net/mac80211/rate.h | 13 - net/mac80211/rc80211_pid.h | 278 - net/mac80211/rc80211_pid_algo.c | 478 -- net/mac80211/rc80211_pid_debugfs.c | 228 - net/mac80211/rx.c | 67 +- net/mac80211/scan.c | 118 +- net/mac80211/sta_info.c | 204 +- net/mac80211/sta_info.h | 21 +- net/mac80211/status.c | 7 +- net/mac80211/tdls.c | 674 +- net/mac80211/trace.h | 7 + net/mac80211/tx.c | 170 +- net/mac80211/util.c | 285 +- net/mac80211/vht.c | 4 + net/mac80211/wep.c | 20 - net/mac80211/wpa.c | 2 +- net/mac802154/ieee802154_dev.c | 70 +- net/mac802154/llsec.c | 1 + net/mac802154/mib.c | 7 +- net/mac802154/tx.c | 1 + net/netfilter/Kconfig | 4 + net/netfilter/Makefile | 3 + net/netfilter/ipvs/ip_vs_ctl.c | 86 - net/netfilter/ipvs/ip_vs_sync.c | 3 +- net/netfilter/nf_conntrack_core.c | 68 +- net/netfilter/nf_conntrack_ecache.c | 96 +- net/netfilter/nf_conntrack_netlink.c | 3 +- net/netfilter/nf_log.c | 155 +- net/netfilter/nf_log_common.c | 187 + net/netfilter/nf_nat_core.c | 2 +- net/netfilter/nf_nat_proto_common.c | 2 +- net/netfilter/nf_nat_proto_dccp.c | 2 +- net/netfilter/nf_nat_proto_sctp.c | 2 +- net/netfilter/nf_nat_proto_tcp.c | 2 +- net/netfilter/nf_nat_proto_udp.c | 2 +- net/netfilter/nf_nat_proto_udplite.c | 2 +- net/netfilter/nf_tables_api.c | 137 +- net/netfilter/nfnetlink_acct.c | 12 +- net/netfilter/nfnetlink_log.c | 4 + net/netfilter/nft_log.c | 98 +- net/netfilter/x_tables.c | 23 +- net/netfilter/xt_LED.c | 4 +- net/netfilter/xt_LOG.c | 884 +-- net/netfilter/xt_hashlimit.c | 31 +- net/netlabel/netlabel_kapi.c | 1 - net/netlink/af_netlink.c | 21 +- net/netrom/af_netrom.c | 2 +- net/nfc/digital_dep.c | 2 - net/openvswitch/actions.c | 50 +- net/openvswitch/datapath.c | 55 +- net/openvswitch/datapath.h | 2 +- net/openvswitch/vport-internal_dev.c | 24 +- net/openvswitch/vport-internal_dev.h | 2 + net/openvswitch/vport-vxlan.c | 5 +- net/openvswitch/vport.c | 101 +- net/openvswitch/vport.h | 27 +- net/packet/af_packet.c | 14 +- net/phonet/pep-gprs.c | 2 +- net/rose/af_rose.c | 2 +- net/rxrpc/ar-key.c | 2 +- net/sched/act_mirred.c | 2 + net/sched/cls_api.c | 11 +- net/sched/cls_tcindex.c | 2 +- net/sched/em_canid.c | 7 - net/sched/sch_generic.c | 4 +- net/sched/sch_teql.c | 4 +- net/sctp/Makefile | 2 +- net/sctp/command.c | 68 - net/sctp/output.c | 71 +- net/sctp/outqueue.c | 5 +- net/sctp/sm_statefuns.c | 4 - net/sctp/socket.c | 294 +- net/sctp/sysctl.c | 5 +- net/sctp/transport.c | 17 +- net/sctp/ulpevent.c | 63 + net/socket.c | 12 +- net/tipc/bcast.c | 87 +- net/tipc/bcast.h | 5 +- net/tipc/link.c | 794 +-- net/tipc/link.h | 7 +- net/tipc/msg.c | 381 +- net/tipc/msg.h | 35 +- net/tipc/name_distr.c | 76 +- net/tipc/name_distr.h | 2 +- net/tipc/net.c | 63 +- net/tipc/net.h | 2 - net/tipc/node.c | 38 +- net/tipc/node.h | 17 + net/tipc/node_subscr.c | 6 +- net/tipc/port.c | 440 +- net/tipc/port.h | 50 - net/tipc/socket.c | 551 +- net/tipc/socket.h | 16 + net/wireless/Kconfig | 6 + net/wireless/core.c | 3 - net/wireless/ethtool.c | 86 +- net/wireless/ethtool.h | 6 - net/wireless/genregdb.awk | 35 +- net/wireless/nl80211.c | 18 +- net/wireless/rdev-ops.h | 54 +- net/wireless/trace.h | 59 +- 1034 files changed, 58037 insertions(+), 28914 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/ieee802154/cc2520.txt create mode 100644 Documentation/devicetree/bindings/net/marvell-pp2.txt create mode 100644 drivers/bcma/driver_pcie2.c create mode 100644 drivers/net/ethernet/amd/xgbe/xgbe-dcb.c create mode 100644 drivers/net/ethernet/amd/xgbe/xgbe-ptp.c create mode 100644 drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h create mode 100644 drivers/net/ethernet/cisco/enic/enic_clsf.c create mode 100644 drivers/net/ethernet/cisco/enic/enic_clsf.h create mode 100644 drivers/net/ethernet/marvell/mvpp2.c create mode 100644 drivers/net/ieee802154/cc2520.c create mode 100644 drivers/net/wireless/ath/ath9k/channel.c create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/feature.c create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/feature.h create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/vendor.c create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/vendor.h create mode 100644 drivers/net/wireless/iwlwifi/mvm/coex_legacy.c create mode 100644 drivers/net/wireless/ti/wlcore/vendor_cmd.c create mode 100644 drivers/net/wireless/ti/wlcore/vendor_cmd.h create mode 100644 include/linux/bcma/bcma_driver_pcie2.h create mode 100644 include/linux/spi/cc2520.h create mode 100644 include/net/bluetooth/hci_sock.h delete mode 100644 include/net/netfilter/xt_log.h create mode 100644 include/net/udp_tunnel.h delete mode 100644 include/uapi/linux/netfilter_bridge/ebt_ulog.h delete mode 100644 include/uapi/linux/netfilter_ipv4/ipt_ULOG.h create mode 100644 kernel/bpf/Makefile create mode 100644 kernel/bpf/core.c create mode 100644 net/6lowpan/Kconfig create mode 100644 net/6lowpan/Makefile rename net/{ieee802154/6lowpan_iphc.c => 6lowpan/iphc.c} (91%) delete mode 100644 net/bluetooth/6lowpan.h delete mode 100644 net/bridge/netfilter/ebt_ulog.c create mode 100644 net/bridge/netfilter/nf_log_bridge.c create mode 100644 net/bridge/netfilter/nft_reject_bridge.c create mode 100644 net/hsr/hsr_forward.c create mode 100644 net/hsr/hsr_forward.h create mode 100644 net/hsr/hsr_slave.c create mode 100644 net/hsr/hsr_slave.h delete mode 100644 net/ipv4/netfilter/ipt_ULOG.c create mode 100644 net/ipv4/netfilter/nf_log_arp.c create mode 100644 net/ipv4/netfilter/nf_log_ipv4.c create mode 100644 net/ipv4/udp_tunnel.c create mode 100644 net/ipv6/netfilter/nf_log_ipv6.c create mode 100644 net/mac80211/ethtool.c delete mode 100644 net/mac80211/rc80211_pid.h delete mode 100644 net/mac80211/rc80211_pid_algo.c delete mode 100644 net/mac80211/rc80211_pid_debugfs.c create mode 100644 net/netfilter/nf_log_common.c delete mode 100644 net/sctp/command.c delete mode 100644 net/wireless/ethtool.h Merging ipsec-next/master (1759389e8af4 xfrm4: Remove duplicate semicolon) $ git merge ipsec-next/master Already up-to-date. Merging wireless-next/master (dc6be9f54a4e bcma: use NS prefix for names of Northstar specific cores) $ git merge wireless-next/master Resolved 'net/6lowpan/iphc.c' using previous resolution. Auto-merging net/nfc/digital_dep.c Auto-merging net/6lowpan/iphc.c CONFLICT (content): Merge conflict in net/6lowpan/iphc.c Auto-merging drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c Auto-merging MAINTAINERS Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 18ab58e18892] Merge remote-tracking branch 'wireless-next/master' $ git diff -M --stat --summary HEAD^.. .../devicetree/bindings/net/nfc/st21nfcb.txt | 33 + .../bindings/net/wireless/brcm,bcm43xx-fmac.txt | 41 + MAINTAINERS | 4 +- drivers/bcma/driver_chipcommon_pmu.c | 1 + drivers/bcma/host_pci.c | 1 + drivers/bcma/scan.c | 22 +- drivers/bcma/sprom.c | 1 + drivers/bluetooth/btmrvl_main.c | 5 + drivers/net/wireless/ath/ath10k/htc.c | 20 +- drivers/net/wireless/ath/ath10k/htt_rx.c | 122 +- drivers/net/wireless/ath/ath10k/htt_tx.c | 6 + drivers/net/wireless/ath/ath10k/mac.c | 96 +- drivers/net/wireless/ath/ath10k/mac.h | 4 +- drivers/net/wireless/ath/ath10k/pci.c | 17 +- drivers/net/wireless/ath/ath10k/txrx.c | 3 +- drivers/net/wireless/ath/ath10k/txrx.h | 1 + drivers/net/wireless/ath/ath10k/wmi.c | 2 +- drivers/net/wireless/ath/ath9k/ahb.c | 1 + drivers/net/wireless/b43/Kconfig | 22 +- drivers/net/wireless/b43/main.c | 3 +- drivers/net/wireless/b43/phy_n.c | 6 +- drivers/net/wireless/brcm80211/Kconfig | 10 + drivers/net/wireless/brcm80211/brcmfmac/Makefile | 7 + drivers/net/wireless/brcm80211/brcmfmac/bcdc.c | 20 + drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 20 + drivers/net/wireless/brcm80211/brcmfmac/chip.c | 8 + .../net/wireless/brcm80211/brcmfmac/commonring.c | 273 +++ .../net/wireless/brcm80211/brcmfmac/commonring.h | 69 + drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 7 +- drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 33 + drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h | 36 +- .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 9 +- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 25 +- drivers/net/wireless/brcm80211/brcmfmac/flowring.c | 501 ++++++ drivers/net/wireless/brcm80211/brcmfmac/flowring.h | 84 + drivers/net/wireless/brcm80211/brcmfmac/fweh.c | 6 +- drivers/net/wireless/brcm80211/brcmfmac/fweh.h | 5 + drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c | 1397 +++++++++++++++ drivers/net/wireless/brcm80211/brcmfmac/msgbuf.h | 40 + drivers/net/wireless/brcm80211/brcmfmac/of.c | 56 + drivers/net/wireless/brcm80211/brcmfmac/of.h | 22 + drivers/net/wireless/brcm80211/brcmfmac/pcie.c | 1846 ++++++++++++++++++++ drivers/net/wireless/brcm80211/brcmfmac/pcie.h | 29 + drivers/net/wireless/brcm80211/brcmfmac/proto.c | 29 +- drivers/net/wireless/brcm80211/brcmfmac/proto.h | 31 +- .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 12 +- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 57 +- .../net/wireless/brcm80211/include/brcm_hw_ids.h | 11 + drivers/net/wireless/iwlegacy/common.c | 3 +- drivers/nfc/Kconfig | 2 +- drivers/nfc/Makefile | 3 +- drivers/nfc/st21nfca/Makefile | 2 +- drivers/nfc/st21nfca/i2c.c | 9 +- drivers/nfc/st21nfca/st21nfca.c | 272 ++- drivers/nfc/st21nfca/st21nfca.h | 26 +- drivers/nfc/st21nfca/st21nfca_dep.c | 661 +++++++ drivers/nfc/st21nfca/st21nfca_dep.h | 43 + drivers/nfc/st21nfcb/Kconfig | 22 + drivers/nfc/st21nfcb/Makefile | 8 + drivers/nfc/st21nfcb/i2c.c | 462 +++++ drivers/nfc/st21nfcb/ndlc.c | 298 ++++ drivers/nfc/st21nfcb/ndlc.h | 55 + drivers/nfc/st21nfcb/st21nfcb.c | 129 ++ drivers/nfc/st21nfcb/st21nfcb.h | 38 + include/linux/bcma/bcma.h | 23 +- include/linux/platform_data/st21nfcb.h | 32 + include/net/6lowpan.h | 50 - include/net/bluetooth/hci.h | 6 +- include/net/bluetooth/hci_core.h | 3 + include/net/bluetooth/mgmt.h | 4 +- include/net/nfc/digital.h | 13 + include/net/nfc/hci.h | 1 + net/6lowpan/iphc.c | 194 +- net/bluetooth/hci_core.c | 185 +- net/bluetooth/hci_event.c | 50 +- net/bluetooth/hidp/core.c | 2 +- net/bluetooth/mgmt.c | 57 +- net/bluetooth/rfcomm/core.c | 7 +- net/bluetooth/smp.c | 33 +- net/nfc/digital.h | 3 + net/nfc/digital_core.c | 27 +- net/nfc/digital_dep.c | 11 +- net/nfc/digital_technology.c | 96 +- net/nfc/hci/core.c | 7 +- net/nfc/nci/ntf.c | 4 +- 85 files changed, 7534 insertions(+), 361 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/nfc/st21nfcb.txt create mode 100644 Documentation/devicetree/bindings/net/wireless/brcm,bcm43xx-fmac.txt create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/commonring.c create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/commonring.h create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/flowring.c create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/flowring.h create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/msgbuf.h create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/of.c create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/of.h create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/pcie.c create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/pcie.h create mode 100644 drivers/nfc/st21nfca/st21nfca_dep.c create mode 100644 drivers/nfc/st21nfca/st21nfca_dep.h create mode 100644 drivers/nfc/st21nfcb/Kconfig create mode 100644 drivers/nfc/st21nfcb/Makefile create mode 100644 drivers/nfc/st21nfcb/i2c.c create mode 100644 drivers/nfc/st21nfcb/ndlc.c create mode 100644 drivers/nfc/st21nfcb/ndlc.h create mode 100644 drivers/nfc/st21nfcb/st21nfcb.c create mode 100644 drivers/nfc/st21nfcb/st21nfcb.h create mode 100644 include/linux/platform_data/st21nfcb.h Merging bluetooth/master (dc6be9f54a4e bcma: use NS prefix for names of Northstar specific cores) $ git merge bluetooth/master Already up-to-date. Merging infiniband/for-next (56c5333cfc84 Merge branches 'cxgb4' and 'mlx5' into for-next) $ git merge infiniband/for-next Already up-to-date. Merging mtd/master (b6603fe574af Merge tag 'for-linus-20140716' of git://git.infradead.org/linux-mtd) $ git merge mtd/master Already up-to-date. Merging l2-mtd/master (2a500afe1e0e mtd: gpmi: make blockmark swapping optional) $ git merge l2-mtd/master Merge made by the 'recursive' strategy. Documentation/ABI/testing/sysfs-class-mtd | 38 +++ .../devicetree/bindings/mtd/gpmi-nand.txt | 10 + drivers/mtd/chips/cfi_cmdset_0002.c | 375 +++++++++++++++++++-- drivers/mtd/cmdlinepart.c | 2 +- drivers/mtd/devices/phram.c | 7 +- drivers/mtd/ftl.c | 4 - drivers/mtd/maps/rbtx4939-flash.c | 2 - drivers/mtd/mtdcore.c | 59 +++- drivers/mtd/mtdpart.c | 13 +- drivers/mtd/nand/Makefile | 2 +- drivers/mtd/nand/atmel_nand.c | 142 ++++++-- drivers/mtd/nand/atmel_nand_nfc.h | 4 + drivers/mtd/nand/bf5xx_nand.c | 24 -- drivers/mtd/nand/denali.c | 6 +- drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 71 ++-- drivers/mtd/nand/lpc32xx_mlc.c | 6 - drivers/mtd/nand/lpc32xx_slc.c | 6 - drivers/mtd/nand/nand_base.c | 18 + drivers/mtd/nand/nand_bbt.c | 14 + drivers/mtd/nand/nand_timings.c | 253 ++++++++++++++ drivers/mtd/nand/s3c2410.c | 4 +- drivers/mtd/spi-nor/spi-nor.c | 53 +++ fs/jffs2/acl.c | 3 +- fs/jffs2/xattr.c | 3 +- include/linux/mtd/mtd.h | 2 + include/linux/mtd/nand.h | 53 +++ include/linux/mtd/spi-nor.h | 4 + 27 files changed, 1032 insertions(+), 146 deletions(-) create mode 100644 drivers/mtd/nand/nand_timings.c Merging crypto/master (4839ddcaba26 crypto: ccp - Remove "select OF" from Kconfig) $ git merge crypto/master Auto-merging drivers/crypto/caam/jr.c Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. .../devicetree/bindings/crypto/amd-ccp.txt | 19 + .../devicetree/bindings/crypto/qcom-qce.txt | 25 + Documentation/ioctl/ioctl-number.txt | 1 + MAINTAINERS | 6 + arch/powerpc/boot/dts/fsl/qoriq-sec6.0-0.dtsi | 3 +- arch/x86/crypto/Makefile | 4 +- arch/x86/crypto/aes_ctrby8_avx-x86_64.S | 546 ++++++ arch/x86/crypto/aesni-intel_glue.c | 40 +- arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 281 ++- arch/x86/crypto/des3_ede-asm_64.S | 805 ++++++++ arch/x86/crypto/des3_ede_glue.c | 509 +++++ crypto/Kconfig | 50 +- crypto/Makefile | 1 + crypto/algapi.c | 14 + crypto/des_generic.c | 22 +- crypto/drbg.c | 2044 ++++++++++++++++++++ crypto/lzo.c | 8 +- crypto/tcrypt.c | 37 +- crypto/testmgr.c | 304 ++- crypto/testmgr.h | 894 ++++++++- drivers/crypto/Kconfig | 20 +- drivers/crypto/Makefile | 2 + drivers/crypto/amcc/crypto4xx_core.c | 2 +- drivers/crypto/caam/caamalg.c | 80 +- drivers/crypto/caam/caamhash.c | 186 +- drivers/crypto/caam/caamrng.c | 79 +- drivers/crypto/caam/ctrl.c | 76 +- drivers/crypto/caam/desc.h | 1 - drivers/crypto/caam/intern.h | 1 + drivers/crypto/caam/jr.c | 6 +- drivers/crypto/caam/regs.h | 105 +- drivers/crypto/ccp/Makefile | 5 + drivers/crypto/ccp/ccp-dev.c | 34 + drivers/crypto/ccp/ccp-dev.h | 14 +- drivers/crypto/ccp/ccp-pci.c | 39 +- drivers/crypto/ccp/ccp-platform.c | 230 +++ drivers/crypto/nx/nx-842.c | 2 +- drivers/crypto/qat/Kconfig | 23 + drivers/crypto/qat/Makefile | 2 + drivers/crypto/qat/qat_common/Makefile | 14 + drivers/crypto/qat/qat_common/adf_accel_devices.h | 205 ++ drivers/crypto/qat/qat_common/adf_accel_engine.c | 168 ++ drivers/crypto/qat/qat_common/adf_aer.c | 259 +++ drivers/crypto/qat/qat_common/adf_cfg.c | 362 ++++ drivers/crypto/qat/qat_common/adf_cfg.h | 87 + drivers/crypto/qat/qat_common/adf_cfg_common.h | 100 + drivers/crypto/qat/qat_common/adf_cfg_strings.h | 83 + drivers/crypto/qat/qat_common/adf_cfg_user.h | 94 + drivers/crypto/qat/qat_common/adf_common_drv.h | 192 ++ drivers/crypto/qat/qat_common/adf_ctl_drv.c | 490 +++++ drivers/crypto/qat/qat_common/adf_dev_mgr.c | 215 ++ drivers/crypto/qat/qat_common/adf_init.c | 388 ++++ drivers/crypto/qat/qat_common/adf_transport.c | 567 ++++++ drivers/crypto/qat/qat_common/adf_transport.h | 63 + .../qat/qat_common/adf_transport_access_macros.h | 160 ++ .../crypto/qat/qat_common/adf_transport_debug.c | 304 +++ .../crypto/qat/qat_common/adf_transport_internal.h | 115 ++ drivers/crypto/qat/qat_common/icp_qat_fw.h | 316 +++ .../crypto/qat/qat_common/icp_qat_fw_init_admin.h | 131 ++ drivers/crypto/qat/qat_common/icp_qat_fw_la.h | 403 ++++ .../qat/qat_common/icp_qat_fw_loader_handle.h | 78 + drivers/crypto/qat/qat_common/icp_qat_hal.h | 125 ++ drivers/crypto/qat/qat_common/icp_qat_hw.h | 305 +++ drivers/crypto/qat/qat_common/icp_qat_uclo.h | 377 ++++ drivers/crypto/qat/qat_common/qat_algs.c | 1038 ++++++++++ drivers/crypto/qat/qat_common/qat_crypto.c | 284 +++ drivers/crypto/qat/qat_common/qat_crypto.h | 83 + drivers/crypto/qat/qat_common/qat_hal.c | 1405 ++++++++++++++ drivers/crypto/qat/qat_common/qat_uclo.c | 1195 ++++++++++++ drivers/crypto/qat/qat_dh895xcc/Makefile | 8 + drivers/crypto/qat/qat_dh895xcc/adf_admin.c | 144 ++ .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c | 214 ++ .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h | 86 + drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 449 +++++ drivers/crypto/qat/qat_dh895xcc/adf_drv.h | 67 + drivers/crypto/qat/qat_dh895xcc/adf_hw_arbiter.c | 159 ++ drivers/crypto/qat/qat_dh895xcc/adf_isr.c | 266 +++ drivers/crypto/qat/qat_dh895xcc/qat_admin.c | 107 + drivers/crypto/qce/Makefile | 6 + drivers/crypto/qce/ablkcipher.c | 431 +++++ drivers/crypto/qce/cipher.h | 68 + drivers/crypto/qce/common.c | 438 +++++ drivers/crypto/qce/common.h | 102 + drivers/crypto/qce/core.c | 286 +++ drivers/crypto/qce/core.h | 68 + drivers/crypto/qce/dma.c | 186 ++ drivers/crypto/qce/dma.h | 58 + drivers/crypto/qce/regs-v5.h | 334 ++++ drivers/crypto/qce/sha.c | 588 ++++++ drivers/crypto/qce/sha.h | 81 + drivers/crypto/ux500/cryp/cryp_core.c | 25 +- include/crypto/algapi.h | 6 + include/crypto/des.h | 3 + include/crypto/drbg.h | 290 +++ include/crypto/internal/skcipher.h | 3 +- include/crypto/scatterwalk.h | 6 - kernel/module.c | 4 - 97 files changed, 20266 insertions(+), 343 deletions(-) create mode 100644 Documentation/devicetree/bindings/crypto/amd-ccp.txt create mode 100644 Documentation/devicetree/bindings/crypto/qcom-qce.txt create mode 100644 arch/x86/crypto/aes_ctrby8_avx-x86_64.S create mode 100644 arch/x86/crypto/des3_ede-asm_64.S create mode 100644 arch/x86/crypto/des3_ede_glue.c create mode 100644 crypto/drbg.c create mode 100644 drivers/crypto/ccp/ccp-platform.c create mode 100644 drivers/crypto/qat/Kconfig create mode 100644 drivers/crypto/qat/Makefile create mode 100644 drivers/crypto/qat/qat_common/Makefile create mode 100644 drivers/crypto/qat/qat_common/adf_accel_devices.h create mode 100644 drivers/crypto/qat/qat_common/adf_accel_engine.c create mode 100644 drivers/crypto/qat/qat_common/adf_aer.c create mode 100644 drivers/crypto/qat/qat_common/adf_cfg.c create mode 100644 drivers/crypto/qat/qat_common/adf_cfg.h create mode 100644 drivers/crypto/qat/qat_common/adf_cfg_common.h create mode 100644 drivers/crypto/qat/qat_common/adf_cfg_strings.h create mode 100644 drivers/crypto/qat/qat_common/adf_cfg_user.h create mode 100644 drivers/crypto/qat/qat_common/adf_common_drv.h create mode 100644 drivers/crypto/qat/qat_common/adf_ctl_drv.c create mode 100644 drivers/crypto/qat/qat_common/adf_dev_mgr.c create mode 100644 drivers/crypto/qat/qat_common/adf_init.c create mode 100644 drivers/crypto/qat/qat_common/adf_transport.c create mode 100644 drivers/crypto/qat/qat_common/adf_transport.h create mode 100644 drivers/crypto/qat/qat_common/adf_transport_access_macros.h create mode 100644 drivers/crypto/qat/qat_common/adf_transport_debug.c create mode 100644 drivers/crypto/qat/qat_common/adf_transport_internal.h create mode 100644 drivers/crypto/qat/qat_common/icp_qat_fw.h create mode 100644 drivers/crypto/qat/qat_common/icp_qat_fw_init_admin.h create mode 100644 drivers/crypto/qat/qat_common/icp_qat_fw_la.h create mode 100644 drivers/crypto/qat/qat_common/icp_qat_fw_loader_handle.h create mode 100644 drivers/crypto/qat/qat_common/icp_qat_hal.h create mode 100644 drivers/crypto/qat/qat_common/icp_qat_hw.h create mode 100644 drivers/crypto/qat/qat_common/icp_qat_uclo.h create mode 100644 drivers/crypto/qat/qat_common/qat_algs.c create mode 100644 drivers/crypto/qat/qat_common/qat_crypto.c create mode 100644 drivers/crypto/qat/qat_common/qat_crypto.h create mode 100644 drivers/crypto/qat/qat_common/qat_hal.c create mode 100644 drivers/crypto/qat/qat_common/qat_uclo.c create mode 100644 drivers/crypto/qat/qat_dh895xcc/Makefile create mode 100644 drivers/crypto/qat/qat_dh895xcc/adf_admin.c create mode 100644 drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c create mode 100644 drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h create mode 100644 drivers/crypto/qat/qat_dh895xcc/adf_drv.c create mode 100644 drivers/crypto/qat/qat_dh895xcc/adf_drv.h create mode 100644 drivers/crypto/qat/qat_dh895xcc/adf_hw_arbiter.c create mode 100644 drivers/crypto/qat/qat_dh895xcc/adf_isr.c create mode 100644 drivers/crypto/qat/qat_dh895xcc/qat_admin.c create mode 100644 drivers/crypto/qce/Makefile create mode 100644 drivers/crypto/qce/ablkcipher.c create mode 100644 drivers/crypto/qce/cipher.h create mode 100644 drivers/crypto/qce/common.c create mode 100644 drivers/crypto/qce/common.h create mode 100644 drivers/crypto/qce/core.c create mode 100644 drivers/crypto/qce/core.h create mode 100644 drivers/crypto/qce/dma.c create mode 100644 drivers/crypto/qce/dma.h create mode 100644 drivers/crypto/qce/regs-v5.h create mode 100644 drivers/crypto/qce/sha.c create mode 100644 drivers/crypto/qce/sha.h create mode 100644 include/crypto/drbg.h Merging drm/drm-next (8bed5cc765ff drm/rcar-du: Fix maximum frame buffer pitch computation) $ git merge drm/drm-next Resolved 'drivers/gpu/drm/i915/i915_gem_render_state.c' using previous resolution. Resolved 'drivers/gpu/drm/i915/intel_drv.h' using previous resolution. Auto-merging drivers/gpu/drm/nouveau/nouveau_fbcon.c Auto-merging drivers/gpu/drm/i915/intel_opregion.c Auto-merging drivers/gpu/drm/i915/intel_lvds.c Auto-merging drivers/gpu/drm/i915/intel_dsi.c Auto-merging drivers/gpu/drm/i915/intel_drv.h CONFLICT (content): Merge conflict in 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/i915_reg.h Auto-merging drivers/gpu/drm/i915/i915_irq.c Auto-merging drivers/gpu/drm/i915/i915_gem_stolen.c Auto-merging drivers/gpu/drm/i915/i915_gem_render_state.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_render_state.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_dma.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master f6dd6104fe95] Merge remote-tracking branch 'drm/drm-next' $ git diff -M --stat --summary HEAD^.. Documentation/DocBook/drm.tmpl | 12 +- .../bindings/drm/armada/marvell,dove-lcd.txt | 30 + drivers/base/component.c | 192 +- drivers/gpu/drm/Makefile | 3 +- drivers/gpu/drm/armada/armada_510.c | 23 +- drivers/gpu/drm/armada/armada_crtc.c | 187 +- drivers/gpu/drm/armada/armada_crtc.h | 11 +- drivers/gpu/drm/armada/armada_drm.h | 13 +- drivers/gpu/drm/armada/armada_drv.c | 245 +- drivers/gpu/drm/armada/armada_fbdev.c | 4 +- drivers/gpu/drm/armada/armada_output.c | 4 +- drivers/gpu/drm/ast/ast_drv.h | 2 +- drivers/gpu/drm/ast/ast_fb.c | 6 +- drivers/gpu/drm/ast/ast_mode.c | 16 +- drivers/gpu/drm/bochs/bochs_drv.c | 2 + drivers/gpu/drm/bochs/bochs_fbdev.c | 7 +- drivers/gpu/drm/bochs/bochs_kms.c | 17 +- drivers/gpu/drm/bochs/bochs_mm.c | 2 +- drivers/gpu/drm/bridge/ptn3460.c | 2 +- drivers/gpu/drm/cirrus/cirrus_drv.c | 2 + drivers/gpu/drm/cirrus/cirrus_drv.h | 2 +- drivers/gpu/drm/cirrus/cirrus_fbdev.c | 6 +- drivers/gpu/drm/cirrus/cirrus_mode.c | 14 +- drivers/gpu/drm/drm_buffer.c | 6 +- drivers/gpu/drm/drm_crtc.c | 447 +++- drivers/gpu/drm/drm_crtc_helper.c | 1 + drivers/gpu/drm/drm_debugfs.c | 182 ++ drivers/gpu/drm/drm_dp_mst_topology.c | 2715 ++++++++++++++++++++ drivers/gpu/drm/drm_drv.c | 2 +- drivers/gpu/drm/drm_edid.c | 1 + drivers/gpu/drm/drm_fb_cma_helper.c | 5 +- drivers/gpu/drm/drm_fb_helper.c | 115 +- drivers/gpu/drm/drm_gem.c | 29 +- drivers/gpu/drm/drm_gem_cma_helper.c | 2 +- drivers/gpu/drm/drm_ioctl.c | 2 - drivers/gpu/drm/drm_of.c | 67 + drivers/gpu/drm/drm_plane_helper.c | 7 +- drivers/gpu/drm/drm_probe_helper.c | 9 +- drivers/gpu/drm/drm_stub.c | 14 +- drivers/gpu/drm/drm_sysfs.c | 2 - drivers/gpu/drm/exynos/exynos_dp_core.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_connector.c | 21 +- drivers/gpu/drm/exynos/exynos_drm_dpi.c | 4 +- drivers/gpu/drm/exynos/exynos_drm_drv.c | 4 - drivers/gpu/drm/exynos/exynos_drm_drv.h | 2 - drivers/gpu/drm/exynos/exynos_drm_dsi.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 5 +- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 2 +- drivers/gpu/drm/exynos/exynos_hdmi.c | 2 +- drivers/gpu/drm/gma500/cdv_intel_crt.c | 4 +- drivers/gpu/drm/gma500/cdv_intel_dp.c | 4 +- drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 4 +- drivers/gpu/drm/gma500/cdv_intel_lvds.c | 4 +- drivers/gpu/drm/gma500/framebuffer.c | 5 +- drivers/gpu/drm/gma500/gtt.c | 2 +- drivers/gpu/drm/gma500/mdfld_dsi_output.c | 4 +- drivers/gpu/drm/gma500/oaktrail_hdmi.c | 2 +- drivers/gpu/drm/gma500/oaktrail_lvds.c | 2 +- drivers/gpu/drm/gma500/psb_intel_lvds.c | 4 +- drivers/gpu/drm/gma500/psb_intel_sdvo.c | 4 +- drivers/gpu/drm/i2c/tda998x_drv.c | 3 +- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_cmd_parser.c | 3 + drivers/gpu/drm/i915/i915_debugfs.c | 392 +-- drivers/gpu/drm/i915/i915_dma.c | 53 +- drivers/gpu/drm/i915/i915_drv.c | 63 +- drivers/gpu/drm/i915/i915_drv.h | 164 +- drivers/gpu/drm/i915/i915_gem.c | 80 +- drivers/gpu/drm/i915/i915_gem_context.c | 145 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 308 ++- drivers/gpu/drm/i915/i915_gem_gtt.c | 54 +- drivers/gpu/drm/i915/i915_gem_gtt.h | 5 +- drivers/gpu/drm/i915/i915_gem_render_state.c | 161 +- drivers/gpu/drm/i915/i915_gem_stolen.c | 104 +- drivers/gpu/drm/i915/i915_gpu_error.c | 79 +- drivers/gpu/drm/i915/i915_irq.c | 556 +++- drivers/gpu/drm/i915/i915_params.c | 5 + drivers/gpu/drm/i915/i915_reg.h | 492 ++-- drivers/gpu/drm/i915/intel_crt.c | 34 +- drivers/gpu/drm/i915/intel_ddi.c | 447 ++-- drivers/gpu/drm/i915/intel_display.c | 1439 ++++++++--- drivers/gpu/drm/i915/intel_dp.c | 533 +++- drivers/gpu/drm/i915/intel_dp_mst.c | 548 ++++ drivers/gpu/drm/i915/intel_drv.h | 115 +- drivers/gpu/drm/i915/intel_dsi.c | 28 +- drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 8 +- drivers/gpu/drm/i915/intel_dvo.c | 10 +- drivers/gpu/drm/i915/intel_fbdev.c | 37 +- drivers/gpu/drm/i915/intel_hdmi.c | 67 +- drivers/gpu/drm/i915/intel_i2c.c | 54 - drivers/gpu/drm/i915/intel_lvds.c | 20 +- drivers/gpu/drm/i915/intel_opregion.c | 1 + drivers/gpu/drm/i915/intel_overlay.c | 22 +- drivers/gpu/drm/i915/intel_pm.c | 703 +++-- drivers/gpu/drm/i915/intel_renderstate.h | 2 - drivers/gpu/drm/i915/intel_renderstate_gen6.c | 1 + drivers/gpu/drm/i915/intel_renderstate_gen7.c | 1 + drivers/gpu/drm/i915/intel_renderstate_gen8.c | 1 + drivers/gpu/drm/i915/intel_ringbuffer.c | 432 +++- drivers/gpu/drm/i915/intel_ringbuffer.h | 90 +- drivers/gpu/drm/i915/intel_sdvo.c | 10 +- drivers/gpu/drm/i915/intel_sprite.c | 21 +- drivers/gpu/drm/i915/intel_tv.c | 2 +- drivers/gpu/drm/i915/intel_uncore.c | 182 +- drivers/gpu/drm/mgag200/mgag200_drv.h | 2 +- drivers/gpu/drm/mgag200/mgag200_fb.c | 5 +- drivers/gpu/drm/mgag200/mgag200_mode.c | 16 +- drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 4 +- drivers/gpu/drm/msm/msm_drv.c | 83 +- drivers/gpu/drm/msm/msm_fbdev.c | 4 +- drivers/gpu/drm/msm/msm_gem.c | 2 +- drivers/gpu/drm/nouveau/nouveau_bo.c | 6 +- drivers/gpu/drm/nouveau/nouveau_connector.c | 20 +- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 5 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 4 +- drivers/gpu/drm/nouveau/nouveau_ttm.c | 3 + drivers/gpu/drm/omapdrm/omap_connector.c | 4 +- drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 6 +- drivers/gpu/drm/omapdrm/omap_fbdev.c | 4 +- drivers/gpu/drm/omapdrm/omap_gem.c | 33 +- drivers/gpu/drm/omapdrm/omap_plane.c | 4 +- drivers/gpu/drm/qxl/qxl_display.c | 4 +- drivers/gpu/drm/qxl/qxl_fb.c | 7 +- drivers/gpu/drm/qxl/qxl_object.h | 4 +- drivers/gpu/drm/radeon/r100.c | 6 +- drivers/gpu/drm/radeon/r600_cs.c | 6 +- drivers/gpu/drm/radeon/radeon_connectors.c | 72 +- drivers/gpu/drm/radeon/radeon_fb.c | 6 +- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 2 +- drivers/gpu/drm/rcar-du/rcar_du_kms.c | 13 +- drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 4 +- drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | 4 +- drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 6 +- drivers/gpu/drm/shmobile/shmob_drm_drv.c | 2 +- drivers/gpu/drm/tegra/drm.c | 8 +- drivers/gpu/drm/tegra/drm.h | 1 + drivers/gpu/drm/tegra/fb.c | 53 +- drivers/gpu/drm/tegra/output.c | 4 +- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 15 +- drivers/gpu/drm/tilcdc/tilcdc_drv.h | 1 - drivers/gpu/drm/tilcdc/tilcdc_panel.c | 41 +- drivers/gpu/drm/tilcdc/tilcdc_slave.c | 29 +- drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 37 +- drivers/gpu/drm/ttm/ttm_bo.c | 20 +- drivers/gpu/drm/ttm/ttm_bo_manager.c | 3 +- drivers/gpu/drm/ttm/ttm_bo_util.c | 2 +- drivers/gpu/drm/ttm/ttm_module.c | 2 +- drivers/gpu/drm/ttm/ttm_page_alloc.c | 2 +- drivers/gpu/drm/udl/udl_connector.c | 13 +- drivers/gpu/drm/udl/udl_fb.c | 5 +- drivers/gpu/drm/udl/udl_gem.c | 8 +- drivers/gpu/drm/udl/udl_main.c | 15 + drivers/gpu/drm/udl/udl_modeset.c | 21 + drivers/gpu/drm/vmwgfx/Makefile | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 341 +++ drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 38 +- drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c | 6 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 9 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 74 +- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 227 +- drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 1 + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 12 +- drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 396 +-- drivers/gpu/vga/vgaarb.c | 40 +- drivers/staging/imx-drm/imx-drm-core.c | 6 +- include/drm/drmP.h | 15 +- include/drm/drm_crtc.h | 19 +- include/drm/drm_dp_mst_helper.h | 509 ++++ include/drm/drm_fb_helper.h | 8 +- include/drm/drm_of.h | 18 + include/drm/ttm/ttm_bo_driver.h | 14 +- include/linux/component.h | 7 + include/uapi/drm/drm.h | 2 +- 176 files changed, 11003 insertions(+), 3336 deletions(-) create mode 100644 Documentation/devicetree/bindings/drm/armada/marvell,dove-lcd.txt create mode 100644 drivers/gpu/drm/drm_dp_mst_topology.c create mode 100644 drivers/gpu/drm/drm_of.c create mode 100644 drivers/gpu/drm/i915/intel_dp_mst.c create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c create mode 100644 include/drm/drm_dp_mst_helper.h create mode 100644 include/drm/drm_of.h Merging drm-panel/drm/panel/for-next (ea44739db37f drm/panel: simple: add support for InnoLux N156BGE-L21 panel) $ git merge drm-panel/drm/panel/for-next Merge made by the 'recursive' strategy. .../bindings/panel/foxlink,fl500wvr00-a0t.txt | 7 +++ .../bindings/panel/innolux,n156bge-l21.txt | 7 +++ drivers/gpu/drm/drm_mipi_dsi.c | 14 +++--- drivers/gpu/drm/panel/Kconfig | 7 +-- drivers/gpu/drm/panel/panel-s6e8aa0.c | 13 +++-- drivers/gpu/drm/panel/panel-simple.c | 55 +++++++++++++++++++++- include/drm/drm_mipi_dsi.h | 10 ++-- 7 files changed, 89 insertions(+), 24 deletions(-) create mode 100644 Documentation/devicetree/bindings/panel/foxlink,fl500wvr00-a0t.txt create mode 100644 Documentation/devicetree/bindings/panel/innolux,n156bge-l21.txt Merging drm-intel/for-linux-next (17c58fe801f5 drm/i915: Align intel_dsi*.c files a bit) $ git merge drm-intel/for-linux-next Auto-merging drivers/gpu/drm/i915/intel_panel.c Auto-merging drivers/gpu/drm/i915/intel_opregion.c Auto-merging drivers/gpu/drm/i915/intel_dsi_cmd.c Auto-merging drivers/gpu/drm/i915/intel_dsi.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_bios.c Auto-merging drivers/gpu/drm/i915/i915_reg.h Auto-merging drivers/gpu/drm/i915/i915_irq.c Auto-merging drivers/gpu/drm/i915/i915_drv.h Auto-merging drivers/gpu/drm/i915/i915_dma.c Merge made by the 'recursive' strategy. Documentation/DocBook/drm.tmpl | 78 ++--- drivers/gpu/drm/drm_crtc.c | 98 +++++- drivers/gpu/drm/drm_edid.c | 10 +- drivers/gpu/drm/drm_rect.c | 140 ++++++++ drivers/gpu/drm/i915/Kconfig | 12 - drivers/gpu/drm/i915/i915_debugfs.c | 35 +- drivers/gpu/drm/i915/i915_dma.c | 20 +- drivers/gpu/drm/i915/i915_drv.c | 11 +- drivers/gpu/drm/i915/i915_drv.h | 34 +- drivers/gpu/drm/i915/i915_gem.c | 13 +- drivers/gpu/drm/i915/i915_gem_context.c | 6 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 14 +- drivers/gpu/drm/i915/i915_gem_userptr.c | 149 ++++++--- drivers/gpu/drm/i915/i915_gpu_error.c | 24 +- drivers/gpu/drm/i915/i915_irq.c | 73 +++-- drivers/gpu/drm/i915/i915_params.c | 10 +- drivers/gpu/drm/i915/i915_reg.h | 39 ++- drivers/gpu/drm/i915/i915_sysfs.c | 57 +++- drivers/gpu/drm/i915/intel_bios.c | 3 +- drivers/gpu/drm/i915/intel_bios.h | 3 +- drivers/gpu/drm/i915/intel_crt.c | 4 - drivers/gpu/drm/i915/intel_ddi.c | 126 +++++--- drivers/gpu/drm/i915/intel_display.c | 238 ++++++++------ drivers/gpu/drm/i915/intel_dp.c | 291 ++++++++++------- drivers/gpu/drm/i915/intel_drv.h | 43 ++- drivers/gpu/drm/i915/intel_dsi.c | 67 +++- drivers/gpu/drm/i915/intel_dsi.h | 3 + drivers/gpu/drm/i915/intel_dsi_cmd.c | 16 + drivers/gpu/drm/i915/intel_dsi_cmd.h | 1 + drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 38 ++- drivers/gpu/drm/i915/intel_dsi_pll.c | 94 +++++- drivers/gpu/drm/i915/intel_hdmi.c | 41 ++- drivers/gpu/drm/i915/intel_opregion.c | 2 +- drivers/gpu/drm/i915/intel_panel.c | 160 +++++++++- drivers/gpu/drm/i915/intel_pm.c | 495 ++++++++++++++++++++++++++--- drivers/gpu/drm/i915/intel_ringbuffer.c | 49 +-- drivers/gpu/drm/i915/intel_sprite.c | 20 +- drivers/gpu/drm/i915/intel_uncore.c | 30 +- drivers/gpu/drm/omapdrm/omap_drv.h | 7 - drivers/gpu/drm/omapdrm/omap_plane.c | 17 +- include/drm/drmP.h | 11 + include/drm/drm_crtc.h | 17 +- include/drm/drm_rect.h | 6 + include/uapi/drm/drm_mode.h | 5 + 44 files changed, 1993 insertions(+), 617 deletions(-) Merging drm-tegra/drm/tegra/for-next (9a9195228478 drm/tegra: dsi - Handle non-continuous clock flag) $ git merge drm-tegra/drm/tegra/for-next Auto-merging drivers/gpu/drm/tegra/sor.c Merge made by the 'recursive' strategy. drivers/gpu/drm/tegra/dsi.c | 3 ++- drivers/gpu/drm/tegra/sor.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) Merging sound/for-next (00ef99408b6c ALSA: hda - add mic mute led hook for dell machines) $ git merge sound/for-next Auto-merging sound/pci/hda/patch_sigmatel.c Merge made by the 'recursive' strategy. Documentation/sound/alsa/HD-Audio-Models.txt | 5 + include/sound/pcm.h | 11 +- include/uapi/sound/asound.h | 9 +- sound/aoa/soundbus/i2sbus/core.c | 12 +- sound/core/compress_offload.c | 2 +- sound/core/pcm_compat.c | 8 +- sound/core/pcm_native.c | 9 +- sound/core/seq/seq_memory.c | 4 +- sound/firewire/Kconfig | 14 +- sound/oss/mpu401.c | 2 +- sound/pci/echoaudio/echoaudio.c | 6 - sound/pci/hda/dell_wmi_helper.c | 76 + sound/pci/hda/hda_auto_parser.c | 17 +- sound/pci/hda/hda_codec.c | 45 +- sound/pci/hda/hda_codec.h | 4 +- sound/pci/hda/hda_controller.c | 203 +- sound/pci/hda/hda_controller.h | 9 +- sound/pci/hda/hda_eld.c | 46 +- sound/pci/hda/hda_generic.c | 22 +- sound/pci/hda/hda_i915.c | 4 +- sound/pci/hda/hda_intel.c | 369 +++- sound/pci/hda/hda_local.h | 9 +- sound/pci/hda/hda_priv.h | 253 +-- sound/pci/hda/hda_tegra.c | 36 +- sound/pci/hda/patch_ca0132.c | 6 +- sound/pci/hda/patch_cirrus.c | 4 +- sound/pci/hda/patch_cmedia.c | 624 +----- sound/pci/hda/patch_conexant.c | 2715 +------------------------- sound/pci/hda/patch_hdmi.c | 11 +- sound/pci/hda/patch_realtek.c | 170 +- sound/pci/hda/patch_sigmatel.c | 17 +- sound/pci/ice1712/ice1712.h | 15 +- sound/pci/mixart/mixart_core.c | 4 +- sound/pci/trident/trident_main.c | 2 - sound/pci/trident/trident_memory.c | 3 +- sound/sparc/dbri.c | 6 +- 36 files changed, 932 insertions(+), 3820 deletions(-) create mode 100644 sound/pci/hda/dell_wmi_helper.c Merging sound-asoc/for-next (e6e8c40bd606 Merge remote-tracking branches 'asoc/topic/wm8904', 'asoc/topic/wm8962' and 'asoc/topic/wm8985' into asoc-next) $ git merge sound-asoc/for-next Removing sound/soc/samsung/dma.c Removing sound/soc/kirkwood/kirkwood-t5325.c Removing sound/soc/kirkwood/kirkwood-openrd.c Auto-merging include/linux/platform_data/dma-imx.h Auto-merging include/linux/dmaengine.h Auto-merging drivers/dma/edma.c Auto-merging arch/arm/mach-shmobile/board-mackerel.c Auto-merging arch/arm/mach-shmobile/board-kzm9g.c Auto-merging arch/arm/mach-shmobile/board-armadillo800eva.c Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/sound/ak5386.txt | 4 + Documentation/devicetree/bindings/sound/cs4265.txt | 29 + .../devicetree/bindings/sound/fsl,asrc.txt | 60 + .../devicetree/bindings/sound/max98090.txt | 2 +- .../devicetree/bindings/sound/renesas,rsnd.txt | 9 + .../devicetree/bindings/sound/rockchip-i2s.txt | 37 + .../bindings/sound/samsung,odroidx2-max98090.txt | 35 + .../devicetree/bindings/sound/sirf-usp.txt | 27 + Documentation/devicetree/bindings/sound/snow.txt | 5 + .../devicetree/bindings/sound/tas2552.txt | 26 + .../devicetree/bindings/sound/ti,tas5086.txt | 5 + Documentation/devicetree/bindings/sound/wm8904.txt | 33 + MAINTAINERS | 7 + arch/arm/mach-shmobile/board-armadillo800eva.c | 4 + arch/arm/mach-shmobile/board-kzm9g.c | 2 + arch/arm/mach-shmobile/board-mackerel.c | 4 + arch/sh/boards/mach-ecovec24/setup.c | 2 + arch/x86/include/asm/platform_sst_audio.h | 78 + drivers/dma/edma.c | 1 + drivers/misc/atmel-ssc.c | 13 + include/linux/atmel-ssc.h | 13 + include/linux/dmaengine.h | 1 + include/linux/mfd/arizona/core.h | 6 + include/linux/platform_data/asoc-s3c.h | 9 - include/linux/platform_data/dma-imx.h | 1 + include/sound/control.h | 7 +- include/sound/rcar_snd.h | 1 + include/sound/rt286.h | 19 + include/sound/rt5670.h | 27 + include/sound/soc-dai.h | 5 +- include/sound/soc-dapm.h | 8 +- include/sound/soc.h | 94 +- include/sound/tas2552-plat.h | 25 + include/sound/wm8962.h | 1 + include/trace/events/asoc.h | 6 +- sound/arm/pxa2xx-ac97-lib.c | 12 +- sound/core/control.c | 6 +- sound/core/pcm_dmaengine.c | 4 +- sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/atmel/atmel_ssc_dai.c | 34 +- sound/soc/atmel/atmel_wm8904.c | 50 - sound/soc/blackfin/bf5xx-i2s-pcm.c | 8 +- sound/soc/codecs/88pm860x-codec.c | 12 +- sound/soc/codecs/Kconfig | 27 +- sound/soc/codecs/Makefile | 8 + sound/soc/codecs/ac97.c | 4 +- sound/soc/codecs/adau1701.c | 6 +- sound/soc/codecs/adau17x1.c | 8 +- sound/soc/codecs/ak4642.c | 4 +- sound/soc/codecs/ak5386.c | 50 + sound/soc/codecs/arizona.c | 288 ++- sound/soc/codecs/arizona.h | 1 + sound/soc/codecs/cs4265.c | 682 +++++ sound/soc/codecs/cs4265.h | 64 + sound/soc/codecs/cs4270.c | 4 +- sound/soc/codecs/cs42l52.c | 14 +- sound/soc/codecs/cs42l56.c | 76 +- sound/soc/codecs/cs42l73.c | 6 +- sound/soc/codecs/cs42xx8.c | 5 +- sound/soc/codecs/cs42xx8.h | 8 +- sound/soc/codecs/cx20442.c | 6 +- sound/soc/codecs/max98088.c | 6 +- sound/soc/codecs/max98090.c | 44 +- sound/soc/codecs/max98095.c | 12 +- sound/soc/codecs/mc13783.c | 6 +- sound/soc/codecs/pcm1792a.c | 3 + sound/soc/codecs/pcm1792a.h | 3 +- sound/soc/codecs/rl6231.c | 19 - sound/soc/codecs/rt286.c | 1222 +++++++++ sound/soc/codecs/rt286.h | 198 ++ sound/soc/codecs/rt5631.c | 10 +- sound/soc/codecs/rt5640.c | 10 +- sound/soc/codecs/rt5645.c | 10 +- sound/soc/codecs/rt5651.c | 10 +- sound/soc/codecs/rt5670-dsp.h | 54 + sound/soc/codecs/rt5670.c | 2692 ++++++++++++++++++++ sound/soc/codecs/rt5670.h | 2000 +++++++++++++++ sound/soc/codecs/rt5677.c | 272 +- sound/soc/codecs/rt5677.h | 15 - sound/soc/codecs/sgtl5000.c | 25 +- sound/soc/codecs/si476x.c | 10 +- sound/soc/codecs/sirf-audio-codec.c | 4 +- sound/soc/codecs/sn95031.c | 6 +- sound/soc/codecs/spdif_transmitter.c | 2 +- sound/soc/codecs/ssm2518.c | 6 +- sound/soc/codecs/ssm2602.c | 10 +- sound/soc/codecs/sta32x.c | 19 +- sound/soc/codecs/sta529.c | 12 +- sound/soc/codecs/tas2552.c | 544 ++++ sound/soc/codecs/tas2552.h | 129 + sound/soc/codecs/tas5086.c | 75 +- sound/soc/codecs/tlv320aic23.c | 10 +- sound/soc/codecs/tlv320aic26.c | 14 +- sound/soc/codecs/tlv320aic31xx.c | 40 +- sound/soc/codecs/tlv320aic32x4.c | 31 +- sound/soc/codecs/tlv320aic3x.c | 12 +- sound/soc/codecs/tlv320dac33.c | 12 +- sound/soc/codecs/tpa6130a2.c | 4 +- sound/soc/codecs/twl4030.c | 19 +- sound/soc/codecs/uda134x.c | 10 +- sound/soc/codecs/wl1273.c | 9 +- sound/soc/codecs/wm0010.c | 14 +- sound/soc/codecs/wm1250-ev1.c | 1 - sound/soc/codecs/wm2000.c | 4 +- sound/soc/codecs/wm5100.c | 3 +- sound/soc/codecs/wm5102.c | 65 + sound/soc/codecs/wm5110.c | 4 + sound/soc/codecs/wm8350.c | 13 +- sound/soc/codecs/wm8400.c | 10 +- sound/soc/codecs/wm8510.c | 10 +- sound/soc/codecs/wm8523.c | 10 +- sound/soc/codecs/wm8580.c | 10 +- sound/soc/codecs/wm8711.c | 8 +- sound/soc/codecs/wm8728.c | 8 +- sound/soc/codecs/wm8731.c | 8 +- sound/soc/codecs/wm8737.c | 10 +- sound/soc/codecs/wm8741.c | 14 +- sound/soc/codecs/wm8750.c | 10 +- sound/soc/codecs/wm8753.c | 20 +- sound/soc/codecs/wm8770.c | 10 +- sound/soc/codecs/wm8804.c | 10 +- sound/soc/codecs/wm8900.c | 10 +- sound/soc/codecs/wm8903.c | 13 +- sound/soc/codecs/wm8904.c | 27 +- sound/soc/codecs/wm8940.c | 12 +- sound/soc/codecs/wm8955.c | 10 +- sound/soc/codecs/wm8958-dsp2.c | 24 +- sound/soc/codecs/wm8960.c | 17 +- sound/soc/codecs/wm8961.c | 10 +- sound/soc/codecs/wm8962.c | 29 +- sound/soc/codecs/wm8971.c | 10 +- sound/soc/codecs/wm8974.c | 10 +- sound/soc/codecs/wm8978.c | 14 +- sound/soc/codecs/wm8983.c | 12 +- sound/soc/codecs/wm8985.c | 15 +- sound/soc/codecs/wm8988.c | 10 +- sound/soc/codecs/wm8990.c | 10 +- sound/soc/codecs/wm8991.c | 10 +- sound/soc/codecs/wm8993.c | 10 +- sound/soc/codecs/wm8994.c | 35 +- sound/soc/codecs/wm8995.c | 12 +- sound/soc/codecs/wm8996.c | 6 +- sound/soc/codecs/wm8997.c | 2 + sound/soc/codecs/wm9081.c | 10 +- sound/soc/codecs/wm9090.c | 4 +- sound/soc/codecs/wm9713.c | 10 +- sound/soc/codecs/wm_adsp.c | 6 +- sound/soc/codecs/wm_hubs.c | 4 +- sound/soc/davinci/Kconfig | 17 +- sound/soc/davinci/Makefile | 2 + sound/soc/davinci/davinci-mcasp.c | 93 +- sound/soc/davinci/edma-pcm.c | 2 +- sound/soc/davinci/edma-pcm.h | 7 + sound/soc/fsl/Kconfig | 16 +- sound/soc/fsl/Makefile | 2 + sound/soc/fsl/fsl_asrc.c | 992 ++++++++ sound/soc/fsl/fsl_asrc.h | 461 ++++ sound/soc/fsl/fsl_asrc_dma.c | 386 +++ sound/soc/fsl/fsl_esai.c | 2 + sound/soc/fsl/fsl_sai.c | 39 +- sound/soc/fsl/fsl_spdif.c | 88 +- sound/soc/fsl/fsl_spdif.h | 10 +- sound/soc/fsl/fsl_ssi.c | 6 +- sound/soc/generic/simple-card.c | 13 +- sound/soc/intel/Kconfig | 12 + sound/soc/intel/Makefile | 2 + sound/soc/intel/broadwell.c | 251 ++ sound/soc/intel/byt-max98090.c | 27 +- sound/soc/intel/byt-rt5640.c | 1 + sound/soc/intel/sst-atom-controls.h | 30 + sound/soc/intel/sst-baytrail-ipc.c | 30 + sound/soc/intel/sst-baytrail-pcm.c | 2 +- sound/soc/intel/sst-dsp.c | 10 +- sound/soc/intel/sst-dsp.h | 39 +- sound/soc/intel/sst-haswell-dsp.c | 70 +- sound/soc/intel/sst-haswell-ipc.c | 31 +- sound/soc/intel/sst-haswell-pcm.c | 27 +- sound/soc/intel/sst-mfld-dsp.h | 429 +++- sound/soc/intel/sst-mfld-platform-compress.c | 11 +- sound/soc/intel/sst-mfld-platform-pcm.c | 319 ++- sound/soc/intel/sst-mfld-platform.h | 29 +- sound/soc/kirkwood/Kconfig | 19 +- sound/soc/kirkwood/Makefile | 4 - sound/soc/kirkwood/kirkwood-dma.c | 11 +- sound/soc/kirkwood/kirkwood-i2s.c | 33 +- sound/soc/kirkwood/kirkwood-openrd.c | 109 - sound/soc/kirkwood/kirkwood-t5325.c | 116 - sound/soc/kirkwood/kirkwood.h | 7 +- sound/soc/omap/ams-delta.c | 2 +- sound/soc/omap/omap-dmic.c | 35 +- sound/soc/omap/omap-mcbsp.c | 7 +- sound/soc/omap/omap-pcm.c | 1 + sound/soc/pxa/pxa-ssp.c | 3 +- sound/soc/rockchip/Kconfig | 12 + sound/soc/rockchip/Makefile | 4 + sound/soc/rockchip/rockchip_i2s.c | 529 ++++ sound/soc/rockchip/rockchip_i2s.h | 223 ++ sound/soc/s6000/Kconfig | 13 +- sound/soc/s6000/Makefile | 2 +- sound/soc/s6000/s6000-i2s.c | 4 +- sound/soc/s6000/s6105-ipcam.c | 17 +- sound/soc/samsung/Kconfig | 40 +- sound/soc/samsung/Makefile | 6 +- sound/soc/samsung/ac97.c | 32 - sound/soc/samsung/dma.c | 454 ---- sound/soc/samsung/dma.h | 7 - sound/soc/samsung/dmaengine.c | 3 + sound/soc/samsung/i2s.c | 35 +- sound/soc/samsung/idma.c | 3 +- sound/soc/samsung/odroidx2_max98090.c | 177 ++ sound/soc/samsung/pcm.c | 12 - sound/soc/samsung/s3c-i2s-v2.c | 19 +- sound/soc/samsung/s3c2412-i2s.c | 43 +- sound/soc/samsung/s3c24xx-i2s.c | 58 +- sound/soc/samsung/smdk_wm8580pcm.c | 2 +- sound/soc/samsung/snow.c | 4 + sound/soc/samsung/spdif.c | 5 - sound/soc/sh/Kconfig | 2 +- sound/soc/sh/fsi.c | 201 +- sound/soc/sh/rcar/core.c | 204 +- sound/soc/sh/rcar/dvc.c | 50 +- sound/soc/sh/rcar/gen.c | 554 ++-- sound/soc/sh/rcar/rsnd.h | 26 +- sound/soc/sh/rcar/src.c | 86 +- sound/soc/sh/rcar/ssi.c | 33 +- sound/soc/sirf/Kconfig | 6 + sound/soc/sirf/Makefile | 2 + sound/soc/sirf/sirf-usp.c | 415 +++ sound/soc/sirf/sirf-usp.h | 293 +++ sound/soc/soc-cache.c | 7 +- sound/soc/soc-compress.c | 13 +- sound/soc/soc-core.c | 900 ++++--- sound/soc/soc-dapm.c | 279 +- sound/soc/soc-generic-dmaengine-pcm.c | 37 +- sound/soc/soc-jack.c | 4 +- sound/soc/soc-pcm.c | 581 +++-- sound/soc/tegra/tegra_alc5632.c | 5 +- sound/soc/tegra/tegra_max98090.c | 5 +- sound/soc/tegra/tegra_rt5640.c | 5 +- sound/soc/tegra/tegra_wm8753.c | 3 +- sound/soc/tegra/tegra_wm8903.c | 5 +- sound/soc/tegra/trimslice.c | 3 +- 243 files changed, 15979 insertions(+), 3415 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/cs4265.txt create mode 100644 Documentation/devicetree/bindings/sound/fsl,asrc.txt create mode 100644 Documentation/devicetree/bindings/sound/rockchip-i2s.txt create mode 100644 Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt create mode 100644 Documentation/devicetree/bindings/sound/sirf-usp.txt create mode 100644 Documentation/devicetree/bindings/sound/tas2552.txt create mode 100644 Documentation/devicetree/bindings/sound/wm8904.txt create mode 100644 arch/x86/include/asm/platform_sst_audio.h create mode 100644 include/sound/rt286.h create mode 100644 include/sound/rt5670.h create mode 100644 include/sound/tas2552-plat.h create mode 100644 sound/soc/codecs/cs4265.c create mode 100644 sound/soc/codecs/cs4265.h create mode 100644 sound/soc/codecs/rt286.c create mode 100644 sound/soc/codecs/rt286.h create mode 100644 sound/soc/codecs/rt5670-dsp.h create mode 100644 sound/soc/codecs/rt5670.c create mode 100644 sound/soc/codecs/rt5670.h create mode 100644 sound/soc/codecs/tas2552.c create mode 100644 sound/soc/codecs/tas2552.h create mode 100644 sound/soc/fsl/fsl_asrc.c create mode 100644 sound/soc/fsl/fsl_asrc.h create mode 100644 sound/soc/fsl/fsl_asrc_dma.c create mode 100644 sound/soc/intel/broadwell.c create mode 100644 sound/soc/intel/sst-atom-controls.h delete mode 100644 sound/soc/kirkwood/kirkwood-openrd.c delete mode 100644 sound/soc/kirkwood/kirkwood-t5325.c create mode 100644 sound/soc/rockchip/Kconfig create mode 100644 sound/soc/rockchip/Makefile create mode 100644 sound/soc/rockchip/rockchip_i2s.c create mode 100644 sound/soc/rockchip/rockchip_i2s.h delete mode 100644 sound/soc/samsung/dma.c create mode 100644 sound/soc/samsung/odroidx2_max98090.c create mode 100644 sound/soc/sirf/sirf-usp.c create mode 100644 sound/soc/sirf/sirf-usp.h Merging modules/modules-next (2e3a10a1551d ARM: avoid ARM binutils leaking ELF local symbols) $ git merge modules/modules-next Auto-merging kernel/module.c Auto-merging include/linux/kernel.h Merge made by the 'recursive' strategy. include/linux/kernel.h | 2 ++ include/linux/module.h | 11 +++++++-- include/linux/moduleloader.h | 6 +++-- kernel/module.c | 14 +++++------ scripts/mod/modpost.c | 58 +++++++++++--------------------------------- 5 files changed, 35 insertions(+), 56 deletions(-) $ git reset --hard HEAD^ HEAD is now at bf1b103bac56 Merge remote-tracking branch 'sound-asoc/for-next' Merging next-20140725 version of modules $ git merge -m next-20140725/modules 4982223e51e8ea9d09bb33c8323b5ec1877b2b51 Already up-to-date. Merging virtio/virtio-next (eeec626366ff Revert "hwrng: virtio - ensure reads happen after successful probe") $ git merge virtio/virtio-next Merge made by the 'recursive' strategy. drivers/char/hw_random/core.c | 6 ------ drivers/char/hw_random/virtio-rng.c | 39 ++++++++++++++++--------------------- drivers/char/virtio_console.c | 6 ++---- drivers/virtio/virtio_pci.c | 2 +- 4 files changed, 20 insertions(+), 33 deletions(-) Merging input/next (e179d5fa8d6d Input: imx_keypad - remove ifdef round PM methods) $ git merge input/next Auto-merging arch/arm/boot/dts/am43x-epos-evm.dts Auto-merging arch/arm/boot/dts/am437x-gp-evm.dts Auto-merging MAINTAINERS Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt Merge made by the 'recursive' strategy. .../devicetree/bindings/input/atmel,maxtouch.txt | 25 + .../devicetree/bindings/input/cap1106.txt | 53 + .../bindings/input/touchscreen/pixcir_i2c_ts.txt | 26 + .../bindings/input/touchscreen/zforce_ts.txt | 4 + .../devicetree/bindings/vendor-prefixes.txt | 1 + MAINTAINERS | 7 + arch/arm/boot/dts/am437x-gp-evm.dts | 4 +- arch/arm/boot/dts/am43x-epos-evm.dts | 4 +- drivers/input/keyboard/Kconfig | 10 + drivers/input/keyboard/Makefile | 1 + drivers/input/keyboard/cap1106.c | 335 +++++ drivers/input/keyboard/imx_keypad.c | 6 +- drivers/input/keyboard/max7359_keypad.c | 45 +- drivers/input/misc/keyspan_remote.c | 1 - drivers/input/misc/soc_button_array.c | 3 + drivers/input/misc/uinput.c | 47 +- drivers/input/mouse/alps.c | 691 ++++++---- drivers/input/mouse/alps.h | 60 +- drivers/input/tablet/Kconfig | 10 + drivers/input/tablet/Makefile | 1 + drivers/input/tablet/wacom_serial4.c | 620 +++++++++ drivers/input/touchscreen/Kconfig | 12 + drivers/input/touchscreen/Makefile | 1 + drivers/input/touchscreen/ads7846.c | 6 +- drivers/input/touchscreen/atmel_mxt_ts.c | 1315 +++++++++++++++----- drivers/input/touchscreen/edt-ft5x06.c | 3 +- drivers/input/touchscreen/ipaq-micro-ts.c | 166 +++ drivers/input/touchscreen/jornada720_ts.c | 70 +- drivers/input/touchscreen/mcs5000_ts.c | 6 +- drivers/input/touchscreen/pixcir_i2c_ts.c | 250 +++- drivers/input/touchscreen/s3c2410_ts.c | 4 +- drivers/input/touchscreen/zforce_ts.c | 31 + drivers/platform/chrome/chromeos_laptop.c | 4 - include/linux/i2c/atmel_mxt_ts.h | 3 - include/linux/input/pixcir_ts.h | 12 + include/uapi/linux/serio.h | 1 + include/uapi/linux/uinput.h | 9 + 37 files changed, 3119 insertions(+), 728 deletions(-) create mode 100644 Documentation/devicetree/bindings/input/atmel,maxtouch.txt create mode 100644 Documentation/devicetree/bindings/input/cap1106.txt create mode 100644 Documentation/devicetree/bindings/input/touchscreen/pixcir_i2c_ts.txt create mode 100644 drivers/input/keyboard/cap1106.c create mode 100644 drivers/input/tablet/wacom_serial4.c create mode 100644 drivers/input/touchscreen/ipaq-micro-ts.c Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) $ git merge input-mt/for-next Already up-to-date. Merging block/for-next (a84352f82862 Merge branch 'for-3.17/core' into for-next) $ git merge block/for-next Auto-merging kernel/workqueue.c Auto-merging kernel/cgroup.c Auto-merging include/linux/percpu-defs.h Auto-merging fs/aio.c Auto-merging drivers/block/drbd/drbd_nl.c Auto-merging block/compat_ioctl.c Merge made by the 'recursive' strategy. arch/x86/include/asm/percpu.h | 3 +- block/bio-integrity.c | 12 +- block/blk-core.c | 13 +- block/blk-mq.c | 81 ++-- block/blk-mq.h | 2 +- block/blk-sysfs.c | 2 +- block/compat_ioctl.c | 6 +- block/ioctl.c | 5 +- block/partitions/aix.c | 2 +- block/partitions/amiga.c | 12 +- block/partitions/efi.c | 46 +- block/partitions/msdos.c | 13 +- block/scsi_ioctl.c | 20 +- drivers/block/drbd/Makefile | 1 + drivers/block/drbd/drbd_actlog.c | 518 ++++++++------------ drivers/block/drbd/drbd_bitmap.c | 150 ++---- drivers/block/drbd/drbd_debugfs.c | 958 +++++++++++++++++++++++++++++++++++++ drivers/block/drbd/drbd_debugfs.h | 39 ++ drivers/block/drbd/drbd_int.h | 383 ++++++++++----- drivers/block/drbd/drbd_interval.h | 4 +- drivers/block/drbd/drbd_main.c | 302 +++++------- drivers/block/drbd/drbd_nl.c | 110 +++-- drivers/block/drbd/drbd_proc.c | 125 +++-- drivers/block/drbd/drbd_receiver.c | 316 ++++++++---- drivers/block/drbd/drbd_req.c | 527 +++++++++++++------- drivers/block/drbd/drbd_req.h | 1 + drivers/block/drbd/drbd_state.c | 90 ++-- drivers/block/drbd/drbd_worker.c | 348 +++++++++++--- drivers/block/virtio_blk.c | 104 +++- drivers/target/target_core_tpg.c | 4 +- fs/aio.c | 6 +- include/asm-generic/percpu.h | 410 +++++++++++++--- include/linux/bio.h | 1 + include/linux/blkdev.h | 4 +- include/linux/drbd.h | 4 +- include/linux/drbd_genl.h | 4 + include/linux/drbd_limits.h | 6 + include/linux/percpu-defs.h | 380 ++++++++++++++- include/linux/percpu-refcount.h | 64 ++- include/linux/percpu.h | 673 -------------------------- include/scsi/sg.h | 3 + include/uapi/linux/bsg.h | 11 +- include/uapi/linux/virtio_blk.h | 5 + kernel/cgroup.c | 8 +- kernel/workqueue.c | 19 +- lib/lru_cache.c | 23 +- lib/percpu-refcount.c | 86 ++-- mm/percpu.c | 3 +- 48 files changed, 3740 insertions(+), 2167 deletions(-) create mode 100644 drivers/block/drbd/drbd_debugfs.c create mode 100644 drivers/block/drbd/drbd_debugfs.h Merging device-mapper/for-next (2ca3856b413b dm crypt: sort writes) $ git merge device-mapper/for-next Merge made by the 'recursive' strategy. block/bio.c | 3 +- drivers/md/dm-cache-metadata.c | 4 +- drivers/md/dm-cache-metadata.h | 8 +- drivers/md/dm-cache-target.c | 128 ++++++++----- drivers/md/dm-crypt.c | 401 +++++++++++++++++++++-------------------- drivers/md/dm-io.c | 77 ++++---- drivers/md/dm-mpath.c | 6 +- drivers/md/dm-table.c | 73 ++++---- drivers/md/dm-thin.c | 181 +++++++++++++------ drivers/md/dm.h | 1 - 10 files changed, 505 insertions(+), 377 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 (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet) $ git merge mmc/mmc-next Already up-to-date. Merging mmc-uh/next (25f7dadbd982 mmc: dw_mmc: change to use recommended reset procedure) $ git merge mmc-uh/next Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/mmc/mmc.txt | 4 +- .../devicetree/bindings/mmc/renesas,mmcif.txt | 32 +++ .../devicetree/bindings/mmc/sdhci-msm.txt | 8 +- Documentation/devicetree/bindings/mmc/sdhci-st.txt | 33 +++ .../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 54 ++++ Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 1 + drivers/mmc/card/block.c | 6 +- drivers/mmc/core/bus.c | 10 +- drivers/mmc/core/core.c | 3 +- drivers/mmc/core/mmc.c | 11 +- drivers/mmc/core/quirks.c | 2 +- drivers/mmc/core/sd_ops.c | 3 + drivers/mmc/host/Kconfig | 28 +- drivers/mmc/host/Makefile | 1 + drivers/mmc/host/dw_mmc.c | 86 +++++-- drivers/mmc/host/dw_mmc.h | 5 + drivers/mmc/host/mmci.c | 127 ++++++++- drivers/mmc/host/mmci.h | 20 ++ drivers/mmc/host/moxart-mmc.c | 1 - drivers/mmc/host/mxs-mmc.c | 3 +- drivers/mmc/host/omap_hsmmc.c | 283 +++++++++++++++++++-- drivers/mmc/host/s3cmci.c | 186 ++++---------- drivers/mmc/host/s3cmci.h | 4 +- drivers/mmc/host/sdhci-acpi.c | 4 +- drivers/mmc/host/sdhci-msm.c | 1 - drivers/mmc/host/sdhci-pci.c | 38 +-- drivers/mmc/host/sdhci-pci.h | 1 + drivers/mmc/host/sdhci-pxav3.c | 12 +- drivers/mmc/host/sdhci-st.c | 176 +++++++++++++ drivers/mmc/host/sdhci-tegra.c | 2 - drivers/mmc/host/sdhci.c | 144 +++++------ drivers/mmc/host/sh_mmcif.c | 96 +++---- drivers/mmc/host/tmio_mmc_dma.c | 2 + drivers/mmc/host/wmt-sdmmc.c | 33 ++- include/linux/mmc/sdhci.h | 3 - include/linux/platform_data/mmc-omap.h | 1 + 36 files changed, 998 insertions(+), 426 deletions(-) create mode 100644 Documentation/devicetree/bindings/mmc/renesas,mmcif.txt create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-st.txt create mode 100644 drivers/mmc/host/sdhci-st.c $ git reset --hard HEAD^ HEAD is now at b4d827c452f2 Merge remote-tracking branch 'device-mapper/for-next' Merging next-20140725 version of mmc-uh $ git merge -m next-20140725/mmc-uh f25c33724d1512a72554c0ad4cb70b43ba15374e Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/mmc/mmc.txt | 4 +- Documentation/devicetree/bindings/mmc/sdhci-st.txt | 33 +++ .../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 54 ++++ Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 1 + drivers/mmc/core/bus.c | 10 +- drivers/mmc/core/mmc.c | 11 +- drivers/mmc/core/quirks.c | 2 +- drivers/mmc/core/sd_ops.c | 3 + drivers/mmc/host/Kconfig | 26 +- drivers/mmc/host/Makefile | 1 + drivers/mmc/host/mmci.c | 127 ++++++++- drivers/mmc/host/mmci.h | 20 ++ drivers/mmc/host/moxart-mmc.c | 1 - drivers/mmc/host/mxs-mmc.c | 3 +- drivers/mmc/host/omap_hsmmc.c | 283 +++++++++++++++++++-- drivers/mmc/host/s3cmci.c | 186 ++++---------- drivers/mmc/host/s3cmci.h | 4 +- drivers/mmc/host/sdhci-acpi.c | 4 +- drivers/mmc/host/sdhci-pci.c | 15 +- drivers/mmc/host/sdhci-pci.h | 1 + drivers/mmc/host/sdhci-st.c | 176 +++++++++++++ drivers/mmc/host/sdhci-tegra.c | 2 - drivers/mmc/host/sdhci.c | 144 +++++------ drivers/mmc/host/sh_mmcif.c | 83 ++---- drivers/mmc/host/wmt-sdmmc.c | 33 ++- include/linux/mmc/sdhci.h | 3 - include/linux/platform_data/mmc-omap.h | 1 + 27 files changed, 867 insertions(+), 364 deletions(-) create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-st.txt create mode 100644 drivers/mmc/host/sdhci-st.c Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command) $ git merge kgdb/kgdb-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 (af5628f05db6 md: disable probing for md devices 512 and over.) $ git merge md/for-next Merge made by the 'recursive' strategy. drivers/md/md.c | 4 ++-- drivers/md/raid1.c | 8 ++++---- drivers/md/raid10.c | 11 +++++------ 3 files changed, 11 insertions(+), 12 deletions(-) Merging mfd/for-mfd-next (7caa79917ad4 MAINTAINERS: Update MFD repo location) $ git merge mfd/for-mfd-next Auto-merging sound/soc/codecs/arizona.c Auto-merging include/linux/mfd/arizona/core.h Removing drivers/mfd/max77693-irq.c Removing drivers/mfd/max77686-irq.c Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/mfd/arizona.txt | 10 + Documentation/devicetree/bindings/mfd/as3722.txt | 8 + Documentation/devicetree/bindings/mfd/s2mps11.txt | 11 +- .../devicetree/bindings/mfd/sun6i-prcm.txt | 2 +- .../bindings/regulator/s5m8767-regulator.txt | 2 +- MAINTAINERS | 3 +- drivers/extcon/extcon-max77693.c | 35 +- drivers/gpio/Kconfig | 13 + drivers/gpio/Makefile | 1 + drivers/gpio/gpio-crystalcove.c | 380 ++++++++++ drivers/i2c/busses/i2c-cros-ec-tunnel.c | 17 +- drivers/input/keyboard/cros_ec_keyb.c | 70 +- drivers/mfd/88pm805.c | 2 +- drivers/mfd/88pm860x-core.c | 37 +- drivers/mfd/88pm860x-i2c.c | 3 +- drivers/mfd/Kconfig | 26 +- drivers/mfd/Makefile | 7 +- drivers/mfd/aat2870-core.c | 5 +- drivers/mfd/ab3100-core.c | 54 +- drivers/mfd/ab8500-core.c | 49 +- drivers/mfd/ab8500-debugfs.c | 308 ++++---- drivers/mfd/arizona-core.c | 53 +- drivers/mfd/arizona-i2c.c | 5 +- drivers/mfd/arizona-irq.c | 29 +- drivers/mfd/arizona-spi.c | 3 +- drivers/mfd/arizona.h | 5 +- drivers/mfd/asic3.c | 12 +- drivers/mfd/cros_ec.c | 97 +-- drivers/mfd/cros_ec_i2c.c | 44 +- drivers/mfd/cros_ec_spi.c | 56 +- drivers/mfd/da9063-core.c | 6 +- drivers/mfd/da9063-i2c.c | 134 +++- drivers/mfd/dm355evm_msp.c | 2 +- drivers/mfd/ezx-pcap.c | 3 +- drivers/mfd/htc-i2cpld.c | 5 - drivers/mfd/intel_soc_pmic_core.c | 170 +++++ drivers/mfd/intel_soc_pmic_core.h | 32 + drivers/mfd/intel_soc_pmic_crc.c | 158 +++++ drivers/mfd/ipaq-micro.c | 8 +- drivers/mfd/kempld-core.c | 10 +- drivers/mfd/lp8788-irq.c | 2 + drivers/mfd/max77686-irq.c | 319 --------- drivers/mfd/max77686.c | 329 ++++++++- drivers/mfd/max77693-irq.c | 336 --------- drivers/mfd/max77693.c | 210 ++++-- drivers/mfd/max8925-core.c | 2 + drivers/mfd/max8925-i2c.c | 2 + drivers/mfd/mc13xxx-core.c | 310 ++------ drivers/mfd/mc13xxx.h | 11 +- drivers/mfd/mcp-core.c | 1 + drivers/mfd/omap-usb-host.c | 2 +- drivers/mfd/pcf50633-core.c | 18 +- drivers/mfd/pm8921-core.c | 4 - drivers/mfd/rtsx_pcr.c | 76 +- drivers/mfd/sec-core.c | 82 ++- drivers/mfd/sec-irq.c | 110 ++- drivers/mfd/si476x-cmd.c | 12 +- drivers/mfd/stmpe-i2c.c | 4 +- drivers/mfd/stmpe.c | 2 +- drivers/mfd/stmpe.h | 2 +- drivers/mfd/sun6i-prcm.c | 30 + drivers/mfd/tc3589x.c | 2 +- drivers/mfd/tc6387xb.c | 7 +- drivers/mfd/tps6105x.c | 17 +- drivers/mfd/tps65910.c | 10 +- drivers/mfd/tps65912-spi.c | 3 +- drivers/mfd/twl4030-irq.c | 6 +- drivers/mfd/twl6030-irq.c | 4 +- drivers/mfd/twl6040.c | 2 +- drivers/mfd/wm5102-tables.c | 8 +- drivers/mfd/wm5110-tables.c | 245 ++++++- drivers/mfd/wm8350-i2c.c | 8 +- drivers/mfd/wm8350-irq.c | 3 +- drivers/mfd/wm8994-regmap.c | 64 ++ drivers/mfd/wm8997-tables.c | 16 +- drivers/mmc/host/rtsx_pci_sdmmc.c | 133 +++- drivers/regulator/max77693.c | 12 +- drivers/regulator/s2mps11.c | 321 ++++++++- drivers/rtc/rtc-da9063.c | 54 +- drivers/rtc/rtc-max77686.c | 27 +- include/dt-bindings/mfd/as3722.h | 2 +- include/linux/mfd/abx500/ab8500.h | 1 + include/linux/mfd/arizona/core.h | 35 +- include/linux/mfd/arizona/registers.h | 785 +++++++++++++++++++-- include/linux/mfd/cros_ec.h | 110 +-- include/linux/mfd/da9063/core.h | 3 +- include/linux/mfd/da9063/registers.h | 129 ++-- include/linux/mfd/intel_soc_pmic.h | 30 + include/linux/mfd/max77686-private.h | 239 ++++++- include/linux/mfd/max77686.h | 59 +- include/linux/mfd/max77693-private.h | 54 +- include/linux/mfd/mc13783.h | 1 - include/linux/mfd/mc13xxx.h | 23 +- include/linux/mfd/rtsx_pci.h | 6 + include/linux/mfd/samsung/core.h | 1 + include/linux/mfd/samsung/irq.h | 24 + include/linux/mfd/samsung/s2mpu02.h | 201 ++++++ include/linux/mfd/tps65910.h | 2 +- sound/soc/codecs/arizona.c | 10 +- 99 files changed, 4526 insertions(+), 1870 deletions(-) create mode 100644 drivers/gpio/gpio-crystalcove.c create mode 100644 drivers/mfd/intel_soc_pmic_core.c create mode 100644 drivers/mfd/intel_soc_pmic_core.h create mode 100644 drivers/mfd/intel_soc_pmic_crc.c delete mode 100644 drivers/mfd/max77686-irq.c delete mode 100644 drivers/mfd/max77693-irq.c create mode 100644 include/linux/mfd/intel_soc_pmic.h create mode 100644 include/linux/mfd/samsung/s2mpu02.h Merging backlight/for-backlight-next (2188a988bb87 backlight: Add driver for iPAQ micro backlight) $ git merge backlight/for-backlight-next Auto-merging drivers/video/backlight/Makefile Auto-merging drivers/video/backlight/Kconfig Merge made by the 'recursive' strategy. drivers/macintosh/via-pmu-backlight.c | 6 --- drivers/platform/x86/samsung-q10.c | 6 --- drivers/video/backlight/Kconfig | 9 ++++ drivers/video/backlight/Makefile | 1 + drivers/video/backlight/aat2870_bl.c | 6 --- drivers/video/backlight/ams369fg06.c | 6 --- drivers/video/backlight/backlight.c | 2 + drivers/video/backlight/bd6107.c | 6 --- drivers/video/backlight/gpio_backlight.c | 6 --- drivers/video/backlight/ipaq_micro_bl.c | 83 ++++++++++++++++++++++++++++++ drivers/video/backlight/jornada720_lcd.c | 37 ++++++------- drivers/video/backlight/ld9040.c | 6 --- drivers/video/backlight/lp855x_bl.c | 6 --- drivers/video/backlight/lp8788_bl.c | 6 --- drivers/video/backlight/lv5207lp.c | 6 --- drivers/video/backlight/pandora_bl.c | 6 --- drivers/video/backlight/pwm_bl.c | 13 +---- drivers/video/backlight/s6e63m0.c | 6 --- drivers/video/backlight/tps65217_bl.c | 6 --- drivers/video/fbdev/aty/aty128fb.c | 6 --- drivers/video/fbdev/aty/atyfb_base.c | 6 --- drivers/video/fbdev/aty/radeon_backlight.c | 6 --- drivers/video/fbdev/exynos/s6e8ax0.c | 6 --- drivers/video/fbdev/nvidia/nv_backlight.c | 6 --- drivers/video/fbdev/riva/fbdev.c | 6 --- 25 files changed, 116 insertions(+), 143 deletions(-) create mode 100644 drivers/video/backlight/ipaq_micro_bl.c Merging battery/master (5e37195f30cc ipaq_micro_battery: fix sparse non static symbol warning) $ git merge battery/master Auto-merging drivers/power/reset/Makefile Auto-merging drivers/power/reset/Kconfig Merge made by the 'recursive' strategy. .../devicetree/bindings/power/rx51-battery.txt | 25 ++ Documentation/power/power_supply_class.txt | 6 + drivers/power/Kconfig | 7 + drivers/power/Makefile | 1 + drivers/power/bq2415x_charger.c | 8 +- drivers/power/bq27x00_battery.c | 28 +- drivers/power/ipaq_micro_battery.c | 290 +++++++++++++++++++++ drivers/power/power_supply_core.c | 3 +- drivers/power/power_supply_sysfs.c | 4 + drivers/power/reset/Kconfig | 11 + drivers/power/reset/Makefile | 1 + drivers/power/reset/brcmstb-reboot.c | 120 +++++++++ drivers/power/reset/gpio-poweroff.c | 52 ++-- drivers/power/reset/restart-poweroff.c | 2 +- drivers/power/rx51_battery.c | 90 +++++-- drivers/power/tps65090-charger.c | 76 ++++-- drivers/power/twl4030_charger.c | 44 +++- include/linux/power_supply.h | 4 + 18 files changed, 673 insertions(+), 99 deletions(-) create mode 100644 Documentation/devicetree/bindings/power/rx51-battery.txt create mode 100644 drivers/power/ipaq_micro_battery.c create mode 100644 drivers/power/reset/brcmstb-reboot.c 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 (fea85621060f Merge branch '3.17/hdmi-infoframe' into for-next) $ git merge omap_dss2/for-next Auto-merging drivers/video/fbdev/atmel_lcdfb.c Auto-merging drivers/video/fbdev/Makefile Auto-merging drivers/video/fbdev/Kconfig Auto-merging drivers/gpu/drm/omapdrm/omap_drv.h Auto-merging drivers/gpu/drm/omapdrm/omap_connector.c Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. .../devicetree/bindings/video/arm,pl11x.txt | 109 ++++++ .../devicetree/bindings/video/atmel,lcdc.txt | 1 + .../bindings/video/cirrus,clps711x-fb.txt | 47 +++ MAINTAINERS | 74 ++-- drivers/gpu/drm/omapdrm/omap_connector.c | 12 + drivers/gpu/drm/omapdrm/omap_drv.h | 1 + drivers/gpu/drm/omapdrm/omap_encoder.c | 27 ++ drivers/video/fbdev/68328fb.c | 8 +- drivers/video/fbdev/Kconfig | 22 +- drivers/video/fbdev/Makefile | 3 +- drivers/video/fbdev/amba-clcd.c | 263 ++++++++++++++ drivers/video/fbdev/atmel_lcdfb.c | 3 +- drivers/video/fbdev/clps711x-fb.c | 397 +++++++++++++++++++++ drivers/video/fbdev/da8xx-fb.c | 9 +- drivers/video/fbdev/mbx/mbxfb.c | 4 +- drivers/video/fbdev/msm/mddi_client_dummy.c | 19 +- .../fbdev/omap2/displays-new/connector-hdmi.c | 19 + .../fbdev/omap2/displays-new/encoder-tpd12s015.c | 20 ++ .../omap2/displays-new/panel-sony-acx565akm.c | 5 + drivers/video/fbdev/omap2/dss/Kconfig | 1 + drivers/video/fbdev/omap2/dss/dispc.c | 22 +- drivers/video/fbdev/omap2/dss/hdmi.h | 107 +----- drivers/video/fbdev/omap2/dss/hdmi4.c | 53 ++- drivers/video/fbdev/omap2/dss/hdmi4_core.c | 164 ++------- drivers/video/fbdev/omap2/dss/hdmi4_core.h | 1 + drivers/video/fbdev/omap2/dss/hdmi5.c | 53 ++- drivers/video/fbdev/omap2/dss/hdmi5_core.c | 124 +++---- drivers/video/fbdev/omap2/dss/hdmi_common.c | 316 ---------------- drivers/video/fbdev/s3c2410fb.c | 10 +- drivers/video/fbdev/sis/init.c | 2 +- drivers/video/fbdev/sis/sis_main.c | 4 - include/linux/fb.h | 2 +- include/video/omapdss.h | 9 + 33 files changed, 1133 insertions(+), 778 deletions(-) create mode 100644 Documentation/devicetree/bindings/video/arm,pl11x.txt create mode 100644 Documentation/devicetree/bindings/video/cirrus,clps711x-fb.txt create mode 100644 drivers/video/fbdev/clps711x-fb.c Merging regulator/for-next (e38dc0902f68 Merge remote-tracking branches 'regulator/topic/tps65217', 'regulator/topic/tps65218', 'regulator/topic/tps6586x' and 'regulator/topic/twl' into regulator-next) $ git merge regulator/for-next Auto-merging drivers/regulator/s2mps11.c Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/mfd/palmas.txt | 2 + .../bindings/regulator/act8865-regulator.txt | 7 +- .../devicetree/bindings/regulator/palmas-pmic.txt | 1 + .../devicetree/bindings/regulator/tps65218.txt | 23 + Documentation/power/regulator/consumer.txt | 35 + drivers/mfd/palmas.c | 233 ++++- drivers/regulator/88pm800.c | 1 - drivers/regulator/Kconfig | 14 +- drivers/regulator/Makefile | 1 + drivers/regulator/ab8500.c | 38 +- drivers/regulator/act8865-regulator.c | 329 +++--- drivers/regulator/arizona-ldo1.c | 2 - drivers/regulator/as3722-regulator.c | 4 +- drivers/regulator/bcm590xx-regulator.c | 16 +- drivers/regulator/core.c | 126 ++- drivers/regulator/da9211-regulator.c | 368 +++++++ drivers/regulator/da9211-regulator.h | 271 +++++ drivers/regulator/lp872x.c | 9 - drivers/regulator/lp8755.c | 23 +- drivers/regulator/ltc3589.c | 2 +- drivers/regulator/max8952.c | 34 +- drivers/regulator/mc13xxx-regulator-core.c | 37 +- drivers/regulator/mc13xxx.h | 1 - drivers/regulator/palmas-regulator.c | 1104 ++++++++++++++------ drivers/regulator/s2mps11.c | 2 +- drivers/regulator/s5m8767.c | 4 +- drivers/regulator/tps65090-regulator.c | 76 +- drivers/regulator/tps65217-regulator.c | 4 +- drivers/regulator/tps65218-regulator.c | 52 +- drivers/regulator/tps6586x-regulator.c | 129 +-- drivers/regulator/twl-regulator.c | 13 +- include/linux/mfd/palmas.h | 837 +++++++++++++++ include/linux/regulator/ab8500.h | 14 - include/linux/regulator/act8865.h | 23 +- include/linux/regulator/consumer.h | 26 + include/linux/regulator/da9211.h | 32 + 36 files changed, 3085 insertions(+), 808 deletions(-) create mode 100644 Documentation/devicetree/bindings/regulator/tps65218.txt create mode 100644 drivers/regulator/da9211-regulator.c create mode 100644 drivers/regulator/da9211-regulator.h create mode 100644 include/linux/regulator/da9211.h Merging security/next (a3d64df849bc tpm: simplify code by using %*phN specifier) $ git merge security/next Auto-merging net/rxrpc/ar-key.c Auto-merging net/dns_resolver/dns_query.c Auto-merging kernel/seccomp.c Auto-merging include/linux/sched.h Auto-merging arch/mips/kernel/scall64-o32.S Auto-merging arch/mips/kernel/scall64-n32.S Auto-merging arch/mips/kernel/scall64-64.S Auto-merging arch/mips/kernel/scall32-o32.S Auto-merging arch/arm/include/uapi/asm/unistd.h Auto-merging MAINTAINERS Auto-merging Documentation/kernel-parameters.txt Merge made by the 'recursive' strategy. Documentation/ABI/testing/ima_policy | 4 +- Documentation/kernel-parameters.txt | 22 ++ Documentation/security/keys.txt | 14 +- MAINTAINERS | 10 + arch/Kconfig | 1 + arch/arm/include/uapi/asm/unistd.h | 1 + arch/arm/kernel/calls.S | 1 + arch/mips/include/uapi/asm/unistd.h | 15 +- arch/mips/kernel/scall32-o32.S | 1 + arch/mips/kernel/scall64-64.S | 1 + arch/mips/kernel/scall64-n32.S | 1 + arch/mips/kernel/scall64-o32.S | 1 + arch/x86/syscalls/syscall_32.tbl | 1 + arch/x86/syscalls/syscall_64.tbl | 1 + crypto/asymmetric_keys/Kconfig | 34 ++- crypto/asymmetric_keys/Makefile | 37 +++ crypto/asymmetric_keys/asymmetric_keys.h | 2 + crypto/asymmetric_keys/asymmetric_type.c | 78 +++-- crypto/asymmetric_keys/mscode.asn1 | 28 ++ crypto/asymmetric_keys/mscode_parser.c | 126 ++++++++ crypto/asymmetric_keys/pkcs7.asn1 | 127 +++++++++ crypto/asymmetric_keys/pkcs7_key_type.c | 100 +++++++ crypto/asymmetric_keys/pkcs7_parser.c | 396 ++++++++++++++++++++++++++ crypto/asymmetric_keys/pkcs7_parser.h | 61 ++++ crypto/asymmetric_keys/pkcs7_trust.c | 219 ++++++++++++++ crypto/asymmetric_keys/pkcs7_verify.c | 323 +++++++++++++++++++++ crypto/asymmetric_keys/verify_pefile.c | 457 ++++++++++++++++++++++++++++++ crypto/asymmetric_keys/verify_pefile.h | 42 +++ crypto/asymmetric_keys/x509.asn1 | 2 +- crypto/asymmetric_keys/x509_cert_parser.c | 20 ++ crypto/asymmetric_keys/x509_parser.h | 13 +- crypto/asymmetric_keys/x509_public_key.c | 111 +++++++- drivers/base/firmware_class.c | 30 +- drivers/char/tpm/tpm-interface.c | 73 +++-- drivers/char/tpm/tpm_eventlog.c | 4 +- drivers/char/tpm/tpm_i2c_stm_st33.c | 1 + drivers/char/tpm/tpm_tis.c | 31 ++ fs/exec.c | 6 +- fs/nfs/idmap.c | 10 +- fs/proc/array.c | 11 +- include/crypto/pkcs7.h | 36 +++ include/keys/big_key-type.h | 3 +- include/keys/system_keyring.h | 10 +- include/keys/user-type.h | 3 +- include/linux/capability.h | 5 +- include/linux/ima.h | 6 + include/linux/key-type.h | 5 +- include/linux/key.h | 2 + include/linux/oid_registry.h | 8 +- include/linux/pe.h | 448 +++++++++++++++++++++++++++++ include/linux/sched.h | 18 +- include/linux/seccomp.h | 8 +- include/linux/security.h | 17 ++ include/linux/syscalls.h | 2 + include/linux/tpm.h | 3 + include/linux/verify_pefile.h | 18 ++ include/uapi/asm-generic/unistd.h | 4 +- include/uapi/linux/seccomp.h | 7 + kernel/audit.c | 2 +- kernel/capability.c | 4 + kernel/fork.c | 49 +++- kernel/seccomp.c | 412 +++++++++++++++++++++++---- kernel/sys.c | 4 +- kernel/sys_ni.c | 3 + kernel/system_keyring.c | 1 + lib/Kconfig | 3 +- net/ceph/crypto.c | 26 +- net/dns_resolver/dns_key.c | 43 +-- net/dns_resolver/dns_query.c | 1 + net/rxrpc/ar-key.c | 165 ++++++----- scripts/selinux/genheaders/Makefile | 1 - scripts/selinux/mdp/Makefile | 2 +- security/apparmor/domain.c | 4 +- security/capability.c | 6 + security/commoncap.c | 75 +++-- security/integrity/digsig.c | 28 ++ security/integrity/ima/Kconfig | 10 + security/integrity/ima/ima.h | 15 +- security/integrity/ima/ima_appraise.c | 10 +- security/integrity/ima/ima_crypto.c | 312 +++++++++++++++++++- security/integrity/ima/ima_main.c | 28 +- security/integrity/ima/ima_policy.c | 13 +- security/integrity/integrity.h | 14 +- security/keys/big_key.c | 41 +-- security/keys/key.c | 49 +++- security/keys/keyctl.c | 21 +- security/keys/keyring.c | 34 ++- security/keys/request_key_auth.c | 13 + security/keys/user_defined.c | 41 +-- security/security.c | 11 + security/selinux/hooks.c | 14 + security/selinux/include/netif.h | 2 + security/selinux/include/netnode.h | 2 + security/selinux/include/netport.h | 2 + security/selinux/include/security.h | 3 +- security/selinux/netif.c | 15 +- security/selinux/netnode.c | 15 +- security/selinux/netport.c | 15 +- security/selinux/ss/conditional.c | 11 +- security/selinux/ss/policydb.c | 141 +++------ security/selinux/ss/services.c | 41 ++- 101 files changed, 4161 insertions(+), 560 deletions(-) create mode 100644 crypto/asymmetric_keys/mscode.asn1 create mode 100644 crypto/asymmetric_keys/mscode_parser.c create mode 100644 crypto/asymmetric_keys/pkcs7.asn1 create mode 100644 crypto/asymmetric_keys/pkcs7_key_type.c create mode 100644 crypto/asymmetric_keys/pkcs7_parser.c create mode 100644 crypto/asymmetric_keys/pkcs7_parser.h create mode 100644 crypto/asymmetric_keys/pkcs7_trust.c create mode 100644 crypto/asymmetric_keys/pkcs7_verify.c create mode 100644 crypto/asymmetric_keys/verify_pefile.c create mode 100644 crypto/asymmetric_keys/verify_pefile.h create mode 100644 include/crypto/pkcs7.h create mode 100644 include/linux/pe.h create mode 100644 include/linux/verify_pefile.h Merging integrity/next (e27319cdf468 ima: provide double buffering for hash calculation) $ git merge integrity/next Resolved 'include/linux/key.h' using previous resolution. Auto-merging include/linux/key.h CONFLICT (content): Merge conflict in include/linux/key.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master a97f205ff41a] Merge remote-tracking branch 'integrity/next' $ git diff -M --stat --summary HEAD^.. Merging selinux/next (615e51fdda6f selinux: reduce the number of calls to synchronize_net() when flushing caches) $ git merge selinux/next Already up-to-date. Merging lblnet/next (d8ec26d7f828 Linux 3.13) $ git merge lblnet/next Already up-to-date. Merging watchdog/master (4ebe25a4b055 Documentation: fix two typos in watchdog-api.txt) $ git merge watchdog/master Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.txt | 5 +++++ Documentation/watchdog/watchdog-api.txt | 2 +- drivers/watchdog/dw_wdt.c | 3 --- drivers/watchdog/imx2_wdt.c | 7 +++++++ drivers/watchdog/lantiq_wdt.c | 5 ----- drivers/watchdog/shwdt.c | 5 +---- 6 files changed, 14 insertions(+), 13 deletions(-) Merging iommu/next (e2045c68c4b6 Merge branches 'x86/vt-d', 'x86/amd', 'arm/omap', 'ppc/pamu' and 'arm/smmu' into next) $ git merge iommu/next Auto-merging drivers/iommu/tegra-smmu.c Removing drivers/iommu/pci.h Removing drivers/iommu/omap-iovmm.c Auto-merging drivers/iommu/dmar.c Auto-merging arch/arm/mach-omap2/omap_hwmod_44xx_data.c Merge made by the 'recursive' strategy. Documentation/ABI/testing/sysfs-class-iommu | 17 + .../ABI/testing/sysfs-class-iommu-amd-iommu | 14 + .../ABI/testing/sysfs-class-iommu-intel-iommu | 32 + .../devicetree/bindings/iommu/arm,smmu.txt | 6 - arch/arm/mach-omap2/omap-iommu.c | 2 - arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 4 - arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 4 - drivers/iommu/Kconfig | 12 +- drivers/iommu/Makefile | 2 +- drivers/iommu/amd_iommu.c | 224 ++---- drivers/iommu/amd_iommu_init.c | 38 + drivers/iommu/amd_iommu_types.h | 10 +- drivers/iommu/amd_iommu_v2.c | 105 ++- drivers/iommu/arm-smmu.c | 495 ++++++------- drivers/iommu/dmar.c | 12 +- drivers/iommu/exynos-iommu.c | 2 +- drivers/iommu/fsl_pamu.c | 2 +- drivers/iommu/fsl_pamu_domain.c | 73 +- drivers/iommu/intel-iommu.c | 825 ++++++++++----------- drivers/iommu/intel_irq_remapping.c | 55 +- drivers/iommu/iommu-sysfs.c | 134 ++++ drivers/iommu/iommu.c | 201 ++++- drivers/iommu/ipmmu-vmsa.c | 2 +- drivers/iommu/msm_iommu.c | 2 +- drivers/iommu/omap-iommu-debug.c | 114 --- drivers/iommu/omap-iommu.c | 15 +- drivers/iommu/omap-iommu.h | 8 +- drivers/iommu/omap-iovmm.c | 791 -------------------- drivers/iommu/pci.h | 29 - drivers/iommu/shmobile-iommu.c | 2 +- drivers/iommu/tegra-gart.c | 2 +- drivers/iommu/tegra-smmu.c | 2 +- include/linux/amd-iommu.h | 7 + include/linux/device.h | 2 +- include/linux/dmar.h | 50 +- include/linux/intel-iommu.h | 3 + include/linux/iommu.h | 32 +- include/linux/iova.h | 5 + include/linux/omap-iommu.h | 37 +- include/linux/platform_data/iommu-omap.h | 6 - 40 files changed, 1347 insertions(+), 2031 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-class-iommu create mode 100644 Documentation/ABI/testing/sysfs-class-iommu-amd-iommu create mode 100644 Documentation/ABI/testing/sysfs-class-iommu-intel-iommu create mode 100644 drivers/iommu/iommu-sysfs.c delete mode 100644 drivers/iommu/omap-iovmm.c delete mode 100644 drivers/iommu/pci.h Merging dwmw2-iommu/master (1860e379875d Linux 3.15) $ git merge dwmw2-iommu/master Already up-to-date. Merging vfio/next (fd49c81f080a drivers/vfio/pci: Fix wrong MSI interrupt count) $ git merge vfio/next Already up-to-date. Merging osd/linux-next (ce5d36aac26c ore: Support for raid 6) $ 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 (51a7097426f2 doc: fix two typos in watchdog-api.txt) $ git merge trivial/for-next Resolved 'Documentation/laptops/freefall.c' using previous resolution. Resolved 'arch/arm/mach-msm/Kconfig' using previous resolution. Auto-merging fs/befs/linuxvfs.c Auto-merging drivers/usb/phy/phy.c Auto-merging drivers/irqchip/irq-gic.c Auto-merging drivers/cpuidle/governors/menu.c Auto-merging arch/sh/boards/Kconfig Auto-merging arch/arm/mach-msm/Kconfig CONFLICT (content): Merge conflict in arch/arm/mach-msm/Kconfig Auto-merging Documentation/laptops/freefall.c CONFLICT (content): Merge conflict in Documentation/laptops/freefall.c Auto-merging Documentation/SubmittingPatches Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master fd3f0274502f] Merge remote-tracking branch 'trivial/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/PCI/MSI-HOWTO.txt | 2 +- Documentation/RCU/RTFP.txt | 4 ++-- Documentation/SubmittingDrivers | 4 ---- Documentation/SubmittingPatches | 4 ++-- Documentation/laptops/freefall.c | 1 + Documentation/scsi/ncr53c8xx.txt | 2 +- Documentation/security/LSM.txt | 2 +- Documentation/usb/hotplug.txt | 8 ++++---- Documentation/zh_CN/SubmittingDrivers | 4 ---- arch/arm/mach-msm/Kconfig | 3 --- arch/hexagon/include/asm/cache.h | 2 +- arch/sh/boards/Kconfig | 2 +- drivers/cpuidle/governors/menu.c | 2 +- drivers/gpu/drm/gma500/mid_bios.c | 1 - drivers/irqchip/irq-gic.c | 2 -- drivers/mfd/intel_msic.c | 2 +- drivers/scsi/mvsas/mv_sas.c | 24 ++++++++++++++---------- drivers/usb/phy/phy.c | 2 +- fs/befs/linuxvfs.c | 2 -- scripts/Makefile.modinst | 2 +- 20 files changed, 32 insertions(+), 43 deletions(-) Merging audit/master (3efe33f5d2da audit: x86: drop arch from __audit_syscall_entry() interface) $ git merge audit/master Resolved 'arch/mips/include/asm/syscall.h' using previous resolution. Resolved 'arch/mips/kernel/ptrace.c' using previous resolution. Resolved 'arch/powerpc/Kconfig' using previous resolution. Resolved 'arch/x86/Kconfig' using previous resolution. Resolved 'kernel/audit.c' using previous resolution. Auto-merging kernel/auditsc.c Auto-merging kernel/audit.c CONFLICT (content): Merge conflict in kernel/audit.c Auto-merging include/uapi/linux/audit.h Auto-merging arch/x86/kernel/ptrace.c Auto-merging arch/x86/kernel/entry_64.S Auto-merging arch/x86/kernel/entry_32.S Auto-merging arch/x86/Kconfig CONFLICT (content): Merge conflict in arch/x86/Kconfig Auto-merging arch/um/kernel/ptrace.c Auto-merging arch/s390/kernel/ptrace.c Auto-merging arch/powerpc/Kconfig CONFLICT (content): Merge conflict in arch/powerpc/Kconfig Auto-merging arch/mips/kernel/ptrace.c CONFLICT (content): Merge conflict in arch/mips/kernel/ptrace.c Auto-merging arch/mips/include/asm/syscall.h CONFLICT (content): Merge conflict in arch/mips/include/asm/syscall.h Auto-merging arch/arm/kernel/ptrace.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 15be406b2b85] Merge remote-tracking branch 'audit/master' $ git diff -M --stat --summary HEAD^.. arch/alpha/include/asm/syscall.h | 11 +++++++++++ arch/alpha/kernel/ptrace.c | 2 +- arch/arm/kernel/ptrace.c | 4 ++-- arch/ia64/include/asm/syscall.h | 6 ++++++ arch/ia64/kernel/ptrace.c | 2 +- arch/microblaze/include/asm/syscall.h | 5 +++++ arch/microblaze/kernel/ptrace.c | 3 +-- arch/mips/include/asm/syscall.h | 2 +- arch/mips/kernel/ptrace.c | 4 +--- arch/openrisc/include/asm/syscall.h | 5 +++++ arch/openrisc/kernel/ptrace.c | 3 +-- arch/parisc/include/asm/syscall.h | 11 +++++++++++ arch/parisc/kernel/ptrace.c | 9 +++------ arch/powerpc/include/asm/syscall.h | 6 ++++++ arch/powerpc/kernel/ptrace.c | 7 ++----- arch/s390/kernel/ptrace.c | 4 +--- arch/sh/include/asm/syscall_32.h | 10 ++++++++++ arch/sh/include/asm/syscall_64.h | 14 ++++++++++++++ arch/sh/kernel/ptrace_32.c | 14 +------------- arch/sh/kernel/ptrace_64.c | 17 +---------------- arch/sparc/include/asm/syscall.h | 7 +++++++ arch/sparc/include/asm/thread_info_32.h | 2 ++ arch/sparc/include/asm/thread_info_64.h | 2 ++ arch/sparc/kernel/ptrace_64.c | 9 ++------- arch/um/kernel/ptrace.c | 3 +-- arch/x86/ia32/ia32entry.S | 12 ++++++------ arch/x86/kernel/entry_32.S | 11 +++++------ arch/x86/kernel/entry_64.S | 11 +++++------ arch/x86/kernel/ptrace.c | 8 ++------ arch/x86/um/asm/ptrace.h | 4 ---- arch/x86/um/asm/syscall.h | 15 +++++++++++++++ arch/xtensa/kernel/ptrace.c | 2 +- include/asm-generic/syscall.h | 2 +- include/linux/audit.h | 11 ++++++----- include/uapi/linux/audit.h | 14 +------------- kernel/auditsc.c | 17 +++++++---------- 36 files changed, 147 insertions(+), 122 deletions(-) create mode 100644 arch/alpha/include/asm/syscall.h create mode 100644 arch/x86/um/asm/syscall.h Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls) $ git merge fsnotify/for-next Already up-to-date. Merging devicetree/devicetree/next (5194066ed8ae Merge branch 'devicetree/next-overlay' into devicetree/next) $ git merge devicetree/devicetree/next Auto-merging drivers/tty/serial/pmac_zilog.c Removing drivers/of/testcase-data/testcases.dtsi Auto-merging drivers/of/fdt.c Auto-merging drivers/crypto/nx/nx-842.c Auto-merging arch/powerpc/platforms/pseries/setup.c Auto-merging arch/powerpc/platforms/powermac/feature.c Auto-merging arch/powerpc/kernel/prom.c Auto-merging arch/arm/boot/dts/versatile-pb.dts Auto-merging arch/arm/boot/dts/versatile-ab.dts Merge made by the 'recursive' strategy. Documentation/devicetree/changesets.txt | 40 ++ Documentation/devicetree/todo.txt | 11 + arch/arm/boot/dts/versatile-ab.dts | 4 + arch/arm/boot/dts/versatile-pb.dts | 2 - arch/powerpc/kernel/prom.c | 70 --- arch/powerpc/platforms/powermac/feature.c | 20 +- arch/powerpc/platforms/powermac/pci.c | 2 +- arch/powerpc/platforms/powermac/smp.c | 2 +- arch/powerpc/platforms/powermac/udbg_adb.c | 2 +- arch/powerpc/platforms/pseries/hotplug-memory.c | 2 +- arch/powerpc/platforms/pseries/setup.c | 3 +- drivers/cpufreq/pmac64-cpufreq.c | 3 +- drivers/crypto/nx/nx-842.c | 30 +- drivers/edac/cell_edac.c | 3 +- drivers/of/Kconfig | 2 + drivers/of/Makefile | 4 +- drivers/of/base.c | 451 +++++----------- drivers/of/device.c | 4 +- drivers/of/dynamic.c | 660 ++++++++++++++++++++++++ drivers/of/fdt.c | 22 +- drivers/of/of_private.h | 59 ++- drivers/of/of_reserved_mem.c | 70 +++ drivers/of/platform.c | 32 +- drivers/of/selftest.c | 235 +++++++++ drivers/of/testcase-data/testcases.dts | 15 + drivers/of/testcase-data/testcases.dtsi | 4 - drivers/pci/hotplug/rpaphp_core.c | 4 +- drivers/tty/ehv_bytechan.c | 43 +- drivers/tty/hvc/hvc_opal.c | 15 +- drivers/tty/hvc/hvc_vio.c | 29 +- drivers/tty/serial/pmac_zilog.c | 9 +- drivers/tty/serial/serial_core.c | 3 + include/linux/of.h | 87 +++- include/linux/of_platform.h | 7 +- include/linux/of_reserved_mem.h | 7 + sound/ppc/pmac.c | 6 +- 36 files changed, 1382 insertions(+), 580 deletions(-) create mode 100644 Documentation/devicetree/changesets.txt create mode 100644 Documentation/devicetree/todo.txt create mode 100644 drivers/of/dynamic.c create mode 100644 drivers/of/testcase-data/testcases.dts delete mode 100644 drivers/of/testcase-data/testcases.dtsi Merging dt-rh/for-next (99de64984c3a OF: fix of_find_node_by_path() assumption that of_allnodes is root) $ git merge dt-rh/for-next Already up-to-date. Merging spi/for-next (62219aa00e43 Merge remote-tracking branch 'spi/topic/topcliff-pch' into spi-next) $ git merge spi/for-next Auto-merging drivers/spi/spi-s3c64xx.c Auto-merging drivers/spi/spi-au1550.c Auto-merging arch/arm/boot/dts/exynos5250-smdk5250.dts Auto-merging Documentation/devicetree/bindings/spi/spi-samsung.txt Merge made by the 'recursive' strategy. .../devicetree/bindings/spi/efm32-spi.txt | 13 +- .../devicetree/bindings/spi/qcom,spi-qup.txt | 6 +- .../devicetree/bindings/spi/snps,dw-apb-ssi.txt | 28 + .../devicetree/bindings/spi/spi-rockchip.txt | 37 + .../devicetree/bindings/spi/spi-samsung.txt | 26 +- arch/arm/boot/dts/exynos4210-smdkv310.dts | 2 +- arch/arm/boot/dts/exynos4412-trats2.dts | 2 +- arch/arm/boot/dts/exynos5250-smdk5250.dts | 2 +- drivers/spi/Kconfig | 16 +- drivers/spi/Makefile | 1 + drivers/spi/spi-adi-v3.c | 5 +- drivers/spi/spi-atmel.c | 18 +- drivers/spi/spi-au1550.c | 6 +- drivers/spi/spi-cadence.c | 37 +- drivers/spi/spi-clps711x.c | 2 - drivers/spi/spi-davinci.c | 12 +- drivers/spi/spi-dw-mmio.c | 19 +- drivers/spi/spi-efm32.c | 8 +- drivers/spi/spi-falcon.c | 2 - drivers/spi/spi-fsl-lib.c | 2 +- drivers/spi/spi-fsl-spi.c | 2 +- drivers/spi/spi-omap-100k.c | 2 - drivers/spi/spi-omap-uwire.c | 11 +- drivers/spi/spi-omap2-mcspi.c | 14 + drivers/spi/spi-orion.c | 78 +- drivers/spi/spi-qup.c | 36 +- drivers/spi/spi-rockchip.c | 837 +++++++++++++++++++++ drivers/spi/spi-rspi.c | 45 +- drivers/spi/spi-s3c64xx.c | 54 +- drivers/spi/spi-sh-hspi.c | 2 +- drivers/spi/spi-sh-msiof.c | 527 +++++++++++-- drivers/spi/spi-sh.c | 15 +- drivers/spi/spi-topcliff-pch.c | 12 +- drivers/spi/spi-xilinx.c | 2 +- drivers/spi/spi.c | 12 +- include/linux/spi/sh_msiof.h | 2 + 36 files changed, 1670 insertions(+), 225 deletions(-) create mode 100644 Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.txt create mode 100644 Documentation/devicetree/bindings/spi/spi-rockchip.txt create mode 100644 drivers/spi/spi-rockchip.c Merging tip/auto-latest (49144c53f900 Merge branch 'x86/xsave') $ git merge tip/auto-latest Resolved 'drivers/acpi/acpi_extlog.c' using previous resolution. Resolved 'drivers/net/wireless/ath/ath9k/hw.c' using previous resolution. Auto-merging net/bluetooth/hci_core.c Auto-merging mm/filemap.c Auto-merging lib/Kconfig.debug Auto-merging kernel/time/timer.c Auto-merging kernel/time/time.c Auto-merging kernel/time/posix-timers.c Auto-merging kernel/time/hrtimer.c Auto-merging kernel/sched/idle.c Auto-merging kernel/fork.c Auto-merging kernel/Makefile Auto-merging init/Kconfig Removing include/trace/events/ras.h Auto-merging include/linux/sched.h Auto-merging include/linux/mlx5/driver.h Removing include/linux/irqchip/spear-shirq.h Auto-merging fs/proc/array.c Auto-merging fs/nfs/write.c Auto-merging fs/nfs/pnfs.c Auto-merging fs/nfs/pagelist.c Auto-merging fs/nfs/nfs4state.c Auto-merging fs/nfs/internal.h Auto-merging fs/nfs/filelayout/filelayoutdev.c Auto-merging fs/gfs2/super.c Auto-merging fs/cifs/misc.c Auto-merging fs/cifs/inode.c Auto-merging fs/cifs/file.c Auto-merging fs/cifs/connect.c Auto-merging drivers/net/wireless/ath/ath9k/hw.c CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath9k/hw.c Auto-merging drivers/net/ethernet/mellanox/mlx5/core/cmd.c Auto-merging drivers/mfd/cros_ec_spi.c Auto-merging drivers/media/usb/dvb-usb-v2/dvb_usb_core.c Auto-merging drivers/irqchip/Kconfig Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_drv.h Auto-merging drivers/gpu/drm/i915/intel_pm.c Auto-merging drivers/gpu/drm/i915/i915_gem.c Auto-merging drivers/gpu/drm/i915/i915_drv.h Auto-merging drivers/firmware/efi/libstub/fdt.c Auto-merging drivers/firmware/efi/libstub/efi-stub-helper.c Auto-merging drivers/firmware/efi/libstub/arm-stub.c Auto-merging drivers/firmware/efi/cper.c Auto-merging drivers/acpi/acpi_extlog.c CONFLICT (content): Merge conflict in drivers/acpi/acpi_extlog.c Auto-merging drivers/acpi/Kconfig Removing arch/x86/vdso/vdso-fakesections.c Auto-merging arch/x86/kernel/entry_64.S Auto-merging arch/x86/include/uapi/asm/msr-index.h Auto-merging arch/x86/Kconfig Auto-merging arch/arm64/kernel/vdso.c Auto-merging arch/arm64/kernel/Makefile Auto-merging arch/arm64/include/asm/processor.h Auto-merging arch/arm64/Makefile Auto-merging arch/arm64/Kconfig Removing arch/arm/mach-pxa/time.c Auto-merging arch/arm/mach-pxa/generic.c Auto-merging arch/arm/Kconfig Auto-merging MAINTAINERS Auto-merging Documentation/kernel-parameters.txt Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 4c8b8b568d70] Merge remote-tracking branch 'tip/auto-latest' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/sysfs-platform-ts5500 | 7 + Documentation/DocBook/device-drivers.tmpl | 4 +- Documentation/RCU/rcuref.txt | 9 + .../atmel,aic.txt} | 0 .../interrupt-controller/opencores,or1k-pic.txt | 23 + .../bindings/timer/cirrus,clps711x-timer.txt | 29 + .../bindings/timer/mediatek,mtk-timer.txt | 17 + .../devicetree/bindings/vendor-prefixes.txt | 1 + Documentation/filesystems/caching/operations.txt | 2 +- Documentation/filesystems/proc.txt | 19 + Documentation/kernel-parameters.txt | 22 + Documentation/memory-barriers.txt | 27 +- Documentation/timers/00-INDEX | 2 + Documentation/timers/timekeeping.txt | 179 +++ Documentation/trace/ftrace.txt | 2 +- MAINTAINERS | 24 +- arch/alpha/include/asm/processor.h | 1 + arch/arc/include/asm/processor.h | 2 + arch/arc/kernel/perf_event.c | 7 +- arch/arm/Kconfig | 2 +- arch/arm/common/bL_switcher.c | 16 +- arch/arm/include/asm/processor.h | 2 + arch/arm/mach-pxa/Makefile | 2 +- arch/arm/mach-pxa/generic.c | 11 + arch/arm/mach-pxa/time.c | 162 --- arch/arm64/Kconfig | 6 + arch/arm64/Makefile | 1 + arch/arm64/include/asm/efi.h | 33 + arch/arm64/include/asm/processor.h | 1 + arch/arm64/kernel/Makefile | 3 +- arch/arm64/kernel/efi-stub.c | 48 +- arch/arm64/kernel/efi.c | 42 +- arch/arm64/kernel/vdso.c | 10 +- arch/avr32/include/asm/processor.h | 1 + arch/blackfin/include/asm/processor.h | 2 +- arch/blackfin/kernel/perf_event.c | 15 +- arch/c6x/include/asm/processor.h | 1 + arch/cris/include/asm/processor.h | 1 + arch/hexagon/Kconfig | 1 - arch/hexagon/include/asm/processor.h | 1 + arch/ia64/include/asm/io.h | 1 + arch/ia64/include/asm/processor.h | 1 + arch/ia64/kernel/process.c | 2 +- arch/ia64/kernel/time.c | 4 +- arch/m32r/include/asm/processor.h | 1 + arch/m68k/include/asm/processor.h | 1 + arch/metag/include/asm/processor.h | 1 + arch/metag/kernel/perf/perf_event.c | 19 +- arch/microblaze/include/asm/processor.h | 1 + arch/mips/include/asm/processor.h | 1 + arch/mn10300/include/asm/processor.h | 2 + arch/openrisc/Kconfig | 1 + arch/openrisc/include/asm/irq.h | 3 + arch/openrisc/include/asm/processor.h | 1 + arch/openrisc/kernel/irq.c | 146 +-- arch/parisc/include/asm/processor.h | 1 + arch/powerpc/include/asm/processor.h | 2 + arch/powerpc/kernel/time.c | 4 +- arch/powerpc/perf/hv-24x7.c | 6 +- arch/powerpc/perf/hv-gpci.c | 6 +- arch/powerpc/platforms/cell/spu_base.c | 11 +- arch/powerpc/platforms/cell/spufs/context.c | 4 +- arch/powerpc/platforms/cell/spufs/file.c | 4 +- arch/powerpc/platforms/cell/spufs/sched.c | 4 +- arch/s390/Kconfig | 1 - arch/s390/include/asm/processor.h | 2 +- arch/s390/include/uapi/asm/Kbuild | 1 + arch/s390/include/uapi/asm/kvm_perf.h | 25 + arch/s390/kernel/perf_cpum_cf.c | 12 +- arch/s390/kernel/time.c | 16 +- arch/score/include/asm/processor.h | 1 + arch/sh/include/asm/processor.h | 1 + arch/sh/kernel/perf_event.c | 15 +- arch/sparc/include/asm/processor_32.h | 2 + arch/sparc/include/asm/processor_64.h | 1 + arch/tile/include/asm/processor.h | 2 + arch/tile/kernel/time.c | 13 +- arch/tile/kernel/vdso/vgettimeofday.c | 7 +- arch/unicore32/include/asm/processor.h | 1 + arch/x86/Kconfig | 9 +- arch/x86/Makefile | 9 +- arch/x86/boot/code16gcc.h | 24 +- arch/x86/boot/compressed/Makefile | 3 +- arch/x86/boot/compressed/eboot.c | 48 +- arch/x86/boot/compressed/eboot.h | 16 - arch/x86/boot/header.S | 2 +- arch/x86/include/asm/alternative.h | 14 + arch/x86/include/asm/apic.h | 14 +- arch/x86/include/asm/barrier.h | 2 +- arch/x86/include/asm/cmpxchg.h | 4 +- arch/x86/include/asm/cmpxchg_32.h | 2 - arch/x86/include/asm/cmpxchg_64.h | 2 - arch/x86/include/asm/cpufeature.h | 409 +++---- arch/x86/include/asm/efi.h | 33 + arch/x86/include/asm/fpu-internal.h | 11 +- arch/x86/include/asm/hardirq.h | 3 - arch/x86/include/asm/i8259.h | 5 + arch/x86/include/asm/io_apic.h | 56 +- arch/x86/include/asm/irqflags.h | 2 +- arch/x86/include/asm/mc146818rtc.h | 2 +- arch/x86/include/asm/mpspec.h | 13 - arch/x86/include/asm/mutex_32.h | 16 +- arch/x86/include/asm/mwait.h | 2 +- arch/x86/include/asm/pmc_atom.h | 107 ++ arch/x86/include/asm/processor.h | 6 +- arch/x86/include/asm/prom.h | 2 - arch/x86/include/asm/qrwlock.h | 2 +- arch/x86/include/asm/uv/uv_bau.h | 19 +- arch/x86/include/asm/vdso.h | 18 +- arch/x86/include/asm/xsave.h | 223 +++- arch/x86/include/uapi/asm/Kbuild | 1 + arch/x86/include/uapi/asm/kvm_perf.h | 16 + arch/x86/include/uapi/asm/msr-index.h | 2 + arch/x86/kernel/Makefile | 1 + arch/x86/kernel/acpi/boot.c | 404 ++++--- arch/x86/kernel/apic/apic.c | 62 +- arch/x86/kernel/apic/io_apic.c | 775 ++++++++----- arch/x86/kernel/cpu/amd.c | 341 +++--- arch/x86/kernel/cpu/common.c | 17 + arch/x86/kernel/cpu/intel.c | 4 +- arch/x86/kernel/cpu/mcheck/mce.c | 9 +- arch/x86/kernel/cpu/mkcapflags.sh | 51 +- arch/x86/kernel/cpu/perf_event_amd_uncore.c | 111 +- arch/x86/kernel/cpu/perf_event_intel_uncore.c | 5 +- arch/x86/kernel/cpu/proc.c | 8 + arch/x86/kernel/cpu/scattered.c | 1 - arch/x86/kernel/devicetree.c | 207 ++-- arch/x86/kernel/entry_64.S | 80 +- arch/x86/kernel/i387.c | 2 +- arch/x86/kernel/irqinit.c | 12 +- arch/x86/kernel/mpparse.c | 108 +- arch/x86/kernel/paravirt_patch_64.c | 2 - arch/x86/kernel/pmc_atom.c | 321 ++++++ arch/x86/kernel/process.c | 1 + arch/x86/kernel/reboot.c | 24 +- arch/x86/kernel/setup.c | 4 +- arch/x86/kernel/tsc.c | 28 +- arch/x86/kernel/vsyscall_64.c | 8 +- arch/x86/kernel/vsyscall_gtod.c | 23 +- arch/x86/kernel/xsave.c | 118 +- arch/x86/kvm/x86.c | 62 +- arch/x86/mm/fault.c | 6 + arch/x86/pci/acpi.c | 6 +- arch/x86/pci/intel_mid_pci.c | 27 +- arch/x86/pci/irq.c | 15 +- arch/x86/pci/xen.c | 7 +- arch/x86/platform/ce4100/ce4100.c | 11 +- arch/x86/platform/efi/Makefile | 2 +- arch/x86/platform/efi/efi.c | 483 +-------- arch/x86/platform/efi/quirks.c | 290 +++++ .../platform/intel-mid/device_libs/platform_wdt.c | 22 +- arch/x86/platform/intel-mid/sfi.c | 56 +- arch/x86/platform/sfi/sfi.c | 10 +- arch/x86/platform/ts5500/ts5500.c | 94 +- arch/x86/platform/uv/tlb_uv.c | 69 +- arch/x86/um/asm/processor.h | 3 +- arch/x86/vdso/Makefile | 16 +- arch/x86/vdso/vdso-fakesections.c | 21 - arch/x86/vdso/vdso-layout.lds.S | 44 +- arch/x86/vdso/vdso2c.c | 128 ++- arch/x86/vdso/vdso2c.h | 227 +--- arch/x86/vdso/vma.c | 22 +- arch/x86/xen/Makefile | 1 + arch/x86/xen/efi.c | 43 + arch/x86/xen/enlighten.c | 2 + arch/x86/xen/xen-ops.h | 8 + arch/xtensa/include/asm/processor.h | 1 + drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/acpi/Kconfig | 4 +- drivers/acpi/acpi_extlog.c | 46 +- drivers/acpi/pci_irq.c | 3 +- drivers/char/hangcheck-timer.c | 33 +- drivers/clocksource/Kconfig | 14 +- drivers/clocksource/Makefile | 3 + drivers/clocksource/clps711x-timer.c | 131 +++ drivers/clocksource/exynos_mct.c | 63 +- drivers/clocksource/mtk_timer.c | 261 +++++ drivers/clocksource/pxa_timer.c | 227 ++++ drivers/clocksource/timer-marco.c | 3 + drivers/clocksource/timer-prima2.c | 3 + drivers/connector/cn_proc.c | 36 +- drivers/edac/Kconfig | 1 + drivers/edac/edac_mc.c | 3 - drivers/firewire/core-cdev.c | 6 +- drivers/firmware/efi/Kconfig | 6 + drivers/firmware/efi/Makefile | 4 +- drivers/firmware/efi/cper.c | 192 +++- drivers/firmware/efi/efi.c | 40 +- drivers/firmware/efi/efivars.c | 1 + drivers/firmware/efi/libstub/Makefile | 26 + drivers/firmware/efi/{ => libstub}/arm-stub.c | 32 +- .../firmware/efi/{ => libstub}/efi-stub-helper.c | 74 +- drivers/firmware/efi/libstub/efistub.h | 42 + drivers/firmware/efi/{ => libstub}/fdt.c | 20 +- drivers/firmware/efi/reboot.c | 56 + drivers/firmware/efi/runtime-wrappers.c | 161 +++ drivers/gpu/drm/drm_irq.c | 16 +- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/i915_gem.c | 33 +- drivers/gpu/drm/i915/intel_pm.c | 12 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_marker.c | 44 +- drivers/hwmon/ibmaem.c | 6 +- drivers/input/evdev.c | 7 +- drivers/irqchip/Kconfig | 18 + drivers/irqchip/Makefile | 3 + drivers/irqchip/irq-atmel-aic-common.c | 254 +++++ drivers/irqchip/irq-atmel-aic-common.h | 39 + drivers/irqchip/irq-atmel-aic.c | 262 +++++ drivers/irqchip/irq-atmel-aic5.c | 353 ++++++ drivers/irqchip/irq-nvic.c | 13 +- drivers/irqchip/irq-or1k-pic.c | 182 ++++ drivers/irqchip/spear-shirq.c | 304 +++--- drivers/md/dm-bufio.c | 41 +- drivers/md/dm-snap.c | 10 +- drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 12 +- drivers/mfd/cros_ec_spi.c | 8 +- drivers/misc/ioc4.c | 7 +- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 16 +- drivers/of/address.c | 36 + drivers/pci/pcie/aer/Kconfig | 1 + drivers/pci/pcie/aer/aerdrv_errprint.c | 4 +- drivers/ras/Kconfig | 2 + drivers/ras/Makefile | 1 + drivers/ras/debugfs.c | 56 + drivers/ras/ras.c | 29 + drivers/xen/Kconfig | 4 + drivers/xen/Makefile | 3 + drivers/xen/efi.c | 368 +++++++ fs/btrfs/extent_io.c | 10 +- fs/buffer.c | 11 +- fs/cifs/connect.c | 10 +- fs/cifs/file.c | 9 +- fs/cifs/inode.c | 6 +- fs/cifs/misc.c | 2 +- fs/fs-writeback.c | 3 +- fs/fscache/cookie.c | 7 +- fs/fscache/internal.h | 2 - fs/fscache/main.c | 18 - fs/fscache/page.c | 4 +- fs/gfs2/glock.c | 25 +- fs/gfs2/lock_dlm.c | 8 +- fs/gfs2/ops_fstype.c | 11 +- fs/gfs2/recovery.c | 8 +- fs/gfs2/super.c | 8 +- fs/inode.c | 7 - fs/jbd2/transaction.c | 10 +- fs/lockd/mon.c | 4 +- fs/nfs/file.c | 4 +- fs/nfs/filelayout/filelayoutdev.c | 4 +- fs/nfs/inode.c | 6 +- fs/nfs/internal.h | 2 +- fs/nfs/nfs4state.c | 4 +- fs/nfs/pagelist.c | 14 +- fs/nfs/pnfs.c | 2 +- fs/nfs/write.c | 4 +- fs/proc/array.c | 7 +- fs/timerfd.c | 77 +- include/clocksource/pxa.h | 18 + include/linux/clocksource.h | 2 - include/linux/cper.h | 32 + include/linux/efi.h | 63 +- include/linux/hrtimer.h | 16 +- include/linux/iio/iio.h | 9 +- include/linux/init_task.h | 9 +- include/linux/io.h | 2 + include/linux/irq.h | 2 + include/linux/irq_work.h | 5 + include/linux/irqchip/spear-shirq.h | 64 -- include/linux/irqdomain.h | 2 + include/linux/ktime.h | 228 +--- include/linux/mlx5/driver.h | 4 +- include/linux/mutex.h | 4 - include/linux/of_address.h | 11 + include/linux/ras.h | 14 + include/linux/rcupdate.h | 45 +- include/linux/rtmutex.h | 6 +- include/linux/sched.h | 22 +- include/linux/seqlock.h | 29 +- include/linux/sunrpc/sched.h | 2 +- include/linux/tick.h | 29 +- include/linux/time.h | 65 +- include/linux/time64.h | 190 ++++ include/linux/timekeeper_internal.h | 150 +-- include/linux/timekeeping.h | 209 ++++ include/linux/timerfd.h | 5 + include/linux/wait.h | 125 ++- include/linux/writeback.h | 3 +- include/ras/ras_event.h | 128 +++ include/trace/events/ras.h | 77 -- include/xen/interface/platform.h | 123 +++ include/xen/xen-ops.h | 11 + init/Kconfig | 6 +- kernel/Makefile | 25 +- kernel/acct.c | 10 +- kernel/cpu.c | 33 +- kernel/debug/kdb/kdb_main.c | 2 +- kernel/delayacct.c | 62 +- kernel/events/core.c | 8 +- kernel/fork.c | 6 +- kernel/futex.c | 402 ++++--- kernel/irq/generic-chip.c | 5 +- kernel/irq/irqdomain.c | 2 +- kernel/irq/manage.c | 10 +- kernel/irq_work.c | 110 +- kernel/locking/lockdep.c | 2 + kernel/locking/mcs_spinlock.c | 8 +- kernel/locking/mcs_spinlock.h | 4 +- kernel/locking/mutex.c | 39 +- kernel/locking/qrwlock.c | 9 +- kernel/locking/rtmutex-debug.c | 5 +- kernel/locking/rtmutex-debug.h | 7 +- kernel/locking/rtmutex.c | 562 +++++++--- kernel/locking/rtmutex.h | 7 +- kernel/locking/rtmutex_common.h | 22 +- kernel/locking/rwsem-xadd.c | 4 +- kernel/ptrace.c | 8 +- kernel/rcu/rcu.h | 8 +- kernel/rcu/srcu.c | 4 +- kernel/rcu/tree.c | 59 +- kernel/rcu/tree.h | 36 +- kernel/rcu/tree_plugin.h | 302 +++++- kernel/rcu/update.c | 3 - kernel/sched/core.c | 119 +- kernel/sched/deadline.c | 18 +- kernel/sched/fair.c | 244 +++-- kernel/sched/idle.c | 4 +- kernel/sched/idle_task.c | 2 +- kernel/sched/rt.c | 30 +- kernel/sched/sched.h | 38 +- kernel/sched/wait.c | 30 +- kernel/signal.c | 4 + kernel/smp.c | 9 + kernel/time/Kconfig | 9 +- kernel/time/Makefile | 19 + kernel/time/clocksource.c | 12 +- kernel/{ => time}/hrtimer.c | 125 +-- kernel/{ => time}/itimer.c | 0 kernel/time/ntp.c | 15 +- kernel/time/ntp_internal.h | 2 +- kernel/{ => time}/posix-cpu-timers.c | 0 kernel/{ => time}/posix-timers.c | 2 + kernel/time/sched_clock.c | 4 +- kernel/time/tick-internal.h | 2 + kernel/time/tick-sched.c | 20 +- kernel/{ => time}/time.c | 64 ++ kernel/{ => time}/timeconst.bc | 0 kernel/time/timekeeping.c | 1147 +++++++++++--------- kernel/time/timekeeping.h | 20 + kernel/time/timekeeping_debug.c | 2 +- kernel/time/timekeeping_internal.h | 17 +- kernel/{ => time}/timer.c | 34 +- kernel/time/udelay_test.c | 168 +++ kernel/torture.c | 2 +- kernel/trace/trace.c | 9 +- kernel/trace/trace_event_perf.c | 12 + kernel/tsacct.c | 19 +- lib/Kconfig.debug | 25 +- lib/devres.c | 2 - lib/lockref.c | 3 +- mm/filemap.c | 20 +- mm/ksm.c | 8 +- net/bluetooth/hci_core.c | 8 +- net/sunrpc/sched.c | 4 +- scripts/get_maintainer.pl | 22 +- security/keys/gc.c | 11 +- security/keys/request_key.c | 23 +- security/tomoyo/audit.c | 8 +- security/tomoyo/common.c | 4 +- tools/lib/traceevent/event-parse.c | 6 +- tools/lib/traceevent/plugin_cfg80211.c | 3 +- tools/lib/traceevent/plugin_jbd2.c | 6 +- tools/lib/traceevent/plugin_kvm.c | 64 +- tools/perf/Documentation/perf-bench.txt | 4 + tools/perf/Documentation/perf-inject.txt | 3 + tools/perf/Documentation/perf-kvm.txt | 16 +- tools/perf/Documentation/perf-timechart.txt | 38 +- tools/perf/Documentation/perf-trace.txt | 46 + tools/perf/Documentation/perf.txt | 10 +- tools/perf/MANIFEST | 3 + tools/perf/Makefile.perf | 4 + tools/perf/arch/powerpc/Makefile | 1 + tools/perf/arch/powerpc/util/header.c | 4 +- tools/perf/arch/powerpc/util/skip-callchain-idx.c | 266 +++++ tools/perf/arch/s390/Makefile | 3 + tools/perf/arch/s390/util/header.c | 28 + tools/perf/arch/s390/util/kvm-stat.c | 105 ++ tools/perf/arch/x86/Makefile | 2 + tools/perf/arch/x86/tests/dwarf-unwind.c | 1 + tools/perf/arch/x86/util/kvm-stat.c | 156 +++ tools/perf/arch/x86/util/tsc.c | 31 +- tools/perf/arch/x86/util/tsc.h | 3 - tools/perf/arch/x86/util/unwind-libunwind.c | 1 + tools/perf/bench/bench.h | 1 + tools/perf/bench/futex-requeue.c | 10 +- tools/perf/bench/futex-wake.c | 12 +- tools/perf/bench/mem-memcpy.c | 9 +- tools/perf/bench/mem-memset.c | 9 +- tools/perf/bench/sched-messaging.c | 47 +- tools/perf/builtin-bench.c | 7 + tools/perf/builtin-buildid-cache.c | 8 +- tools/perf/builtin-evlist.c | 1 + tools/perf/builtin-help.c | 1 + tools/perf/builtin-inject.c | 5 + tools/perf/builtin-kvm.c | 414 +++---- tools/perf/builtin-record.c | 7 +- tools/perf/builtin-sched.c | 16 +- tools/perf/builtin-script.c | 60 +- tools/perf/builtin-stat.c | 2 +- tools/perf/builtin-timechart.c | 694 +++++++++++- tools/perf/builtin-trace.c | 266 ++++- tools/perf/config/Makefile | 14 + tools/perf/config/feature-checks/Makefile | 4 + tools/perf/config/feature-checks/test-all.c | 5 + .../feature-checks/test-sync-compare-and-swap.c | 14 + tools/perf/perf-sys.h | 1 + tools/perf/perf.c | 13 +- tools/perf/scripts/perl/bin/failed-syscalls-record | 3 +- tools/perf/scripts/perl/failed-syscalls.pl | 5 + .../python/Perf-Trace-Util/lib/Perf/Trace/Core.py | 3 +- .../python/bin/failed-syscalls-by-pid-record | 3 +- tools/perf/scripts/python/bin/sctop-record | 3 +- .../python/bin/syscall-counts-by-pid-record | 3 +- .../perf/scripts/python/bin/syscall-counts-record | 3 +- tools/perf/scripts/python/check-perf-trace.py | 4 +- .../perf/scripts/python/failed-syscalls-by-pid.py | 7 +- tools/perf/scripts/python/futex-contention.py | 4 +- tools/perf/scripts/python/net_dropmonitor.py | 2 +- tools/perf/scripts/python/netdev-times.py | 26 +- tools/perf/scripts/python/sched-migration.py | 41 +- tools/perf/scripts/python/sctop.py | 7 +- tools/perf/scripts/python/syscall-counts-by-pid.py | 7 +- tools/perf/scripts/python/syscall-counts.py | 7 +- tools/perf/tests/attr/base-record | 3 +- tools/perf/tests/attr/base-stat | 3 +- tools/perf/tests/bp_signal.c | 4 +- tools/perf/tests/bp_signal_overflow.c | 4 +- tools/perf/tests/dso-data.c | 1 + tools/perf/tests/evsel-roundtrip-name.c | 1 + tools/perf/tests/evsel-tp-sched.c | 1 + tools/perf/tests/open-syscall-tp-fields.c | 1 + tools/perf/tests/parse-events.c | 1 + tools/perf/tests/parse-no-sample-id-all.c | 1 + tools/perf/tests/perf-time-to-tsc.c | 12 +- tools/perf/tests/rdpmc.c | 4 +- tools/perf/tests/sample-parsing.c | 1 + tools/perf/tests/thread-mg-share.c | 1 + tools/perf/ui/browser.c | 39 +- tools/perf/ui/browser.h | 3 +- tools/perf/ui/browsers/hists.c | 153 ++- tools/perf/ui/stdio/hist.c | 2 +- tools/perf/util/callchain.c | 2 +- tools/perf/util/callchain.h | 13 + tools/perf/util/cloexec.c | 57 + tools/perf/util/cloexec.h | 6 + tools/perf/util/config.c | 13 + tools/perf/util/data.c | 3 +- tools/perf/util/debug.c | 56 +- tools/perf/util/debug.h | 22 + tools/perf/util/dso.c | 71 +- tools/perf/util/dso.h | 26 + tools/perf/util/event.c | 52 +- tools/perf/util/event.h | 10 + tools/perf/util/evlist.c | 51 +- tools/perf/util/evsel.c | 26 +- tools/perf/util/evsel.h | 2 + tools/perf/util/header.c | 51 +- tools/perf/util/header.h | 2 + tools/perf/util/include/linux/kernel.h | 21 - tools/perf/util/kvm-stat.h | 140 +++ tools/perf/util/machine.c | 139 ++- tools/perf/util/machine.h | 8 + tools/perf/util/map.c | 47 +- tools/perf/util/map.h | 15 +- tools/perf/util/parse-options.h | 5 + tools/perf/util/probe-finder.c | 1 - tools/perf/util/pstack.c | 1 + tools/perf/util/python.c | 4 +- tools/perf/util/record.c | 27 +- .../perf/util/scripting-engines/trace-event-perl.c | 1 + .../util/scripting-engines/trace-event-python.c | 197 +++- tools/perf/util/session.c | 39 +- tools/perf/util/session.h | 3 + tools/perf/util/sort.c | 2 +- tools/perf/util/svghelper.c | 168 ++- tools/perf/util/svghelper.h | 6 +- tools/perf/util/symbol-elf.c | 41 +- tools/perf/util/symbol-minimal.c | 43 + tools/perf/util/symbol.c | 21 +- tools/perf/util/symbol.h | 9 +- tools/perf/util/thread.c | 13 +- tools/perf/util/thread.h | 1 + tools/perf/util/trace-event-info.c | 13 +- tools/perf/util/trace-event-read.c | 2 +- tools/perf/util/tsc.c | 30 + tools/perf/util/tsc.h | 12 + tools/perf/util/unwind-libdw.c | 1 + tools/perf/util/unwind-libunwind.c | 1 + tools/perf/util/util.c | 10 +- tools/perf/util/vdso.c | 97 +- tools/perf/util/vdso.h | 13 +- .../selftests/rcutorture/bin/kvm-recheck.sh | 8 +- .../selftests/rcutorture/bin/kvm-test-1-run.sh | 9 +- tools/testing/selftests/rcutorture/bin/kvm.sh | 21 +- .../selftests/rcutorture/configs/rcu/TREE01 | 1 - .../selftests/rcutorture/configs/rcu/TREE02 | 1 - .../selftests/rcutorture/configs/rcu/TREE02-T | 1 - .../selftests/rcutorture/configs/rcu/TREE03 | 1 - .../selftests/rcutorture/configs/rcu/TREE04 | 1 - .../selftests/rcutorture/configs/rcu/TREE05 | 1 - .../selftests/rcutorture/configs/rcu/TREE06 | 1 - .../selftests/rcutorture/configs/rcu/TREE07 | 1 - .../selftests/rcutorture/configs/rcu/TREE08 | 1 - .../selftests/rcutorture/configs/rcu/TREE08-T | 1 - .../selftests/rcutorture/configs/rcu/TREE09 | 1 - .../configs/rcu/v0.0/P5-U-T-NH-sd-SMP-hp | 1 - .../configs/rcu/v3.12/P5-U-T-NH-sd-SMP-hp | 1 - .../configs/rcu/v3.3/P5-U-T-NH-sd-SMP-hp | 1 - .../configs/rcu/v3.5/P5-U-T-NH-sd-SMP-hp | 1 - .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 1 - tools/time/udelay_test.sh | 66 ++ 522 files changed, 14131 insertions(+), 6680 deletions(-) rename Documentation/devicetree/bindings/{arm/atmel-aic.txt => interrupt-controller/atmel,aic.txt} (100%) create mode 100644 Documentation/devicetree/bindings/interrupt-controller/opencores,or1k-pic.txt create mode 100644 Documentation/devicetree/bindings/timer/cirrus,clps711x-timer.txt create mode 100644 Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt create mode 100644 Documentation/timers/timekeeping.txt delete mode 100644 arch/arm/mach-pxa/time.c create mode 100644 arch/s390/include/uapi/asm/kvm_perf.h create mode 100644 arch/x86/include/asm/pmc_atom.h create mode 100644 arch/x86/include/uapi/asm/kvm_perf.h create mode 100644 arch/x86/kernel/pmc_atom.c create mode 100644 arch/x86/platform/efi/quirks.c delete mode 100644 arch/x86/vdso/vdso-fakesections.c create mode 100644 arch/x86/xen/efi.c create mode 100644 drivers/clocksource/clps711x-timer.c create mode 100644 drivers/clocksource/mtk_timer.c create mode 100644 drivers/clocksource/pxa_timer.c create mode 100644 drivers/firmware/efi/libstub/Makefile rename drivers/firmware/efi/{ => libstub}/arm-stub.c (93%) rename drivers/firmware/efi/{ => libstub}/efi-stub-helper.c (88%) create mode 100644 drivers/firmware/efi/libstub/efistub.h rename drivers/firmware/efi/{ => libstub}/fdt.c (94%) create mode 100644 drivers/firmware/efi/reboot.c create mode 100644 drivers/firmware/efi/runtime-wrappers.c create mode 100644 drivers/irqchip/irq-atmel-aic-common.c create mode 100644 drivers/irqchip/irq-atmel-aic-common.h create mode 100644 drivers/irqchip/irq-atmel-aic.c create mode 100644 drivers/irqchip/irq-atmel-aic5.c create mode 100644 drivers/irqchip/irq-or1k-pic.c create mode 100644 drivers/ras/Kconfig create mode 100644 drivers/ras/Makefile create mode 100644 drivers/ras/debugfs.c create mode 100644 drivers/ras/ras.c create mode 100644 drivers/xen/efi.c create mode 100644 include/clocksource/pxa.h delete mode 100644 include/linux/irqchip/spear-shirq.h create mode 100644 include/linux/ras.h create mode 100644 include/linux/time64.h create mode 100644 include/linux/timekeeping.h delete mode 100644 include/trace/events/ras.h rename kernel/{ => time}/hrtimer.c (94%) rename kernel/{ => time}/itimer.c (100%) rename kernel/{ => time}/posix-cpu-timers.c (100%) rename kernel/{ => time}/posix-timers.c (99%) rename kernel/{ => time}/time.c (92%) rename kernel/{ => time}/timeconst.bc (100%) create mode 100644 kernel/time/timekeeping.h rename kernel/{ => time}/timer.c (99%) create mode 100644 kernel/time/udelay_test.c create mode 100644 tools/perf/arch/powerpc/util/skip-callchain-idx.c create mode 100644 tools/perf/arch/s390/util/header.c create mode 100644 tools/perf/arch/s390/util/kvm-stat.c create mode 100644 tools/perf/arch/x86/util/kvm-stat.c create mode 100644 tools/perf/config/feature-checks/test-sync-compare-and-swap.c create mode 100644 tools/perf/util/cloexec.c create mode 100644 tools/perf/util/cloexec.h create mode 100644 tools/perf/util/kvm-stat.h create mode 100644 tools/perf/util/tsc.c create mode 100644 tools/perf/util/tsc.h create mode 100755 tools/time/udelay_test.sh Merging clockevents/clockevents/next (3252a646aa2c clocksource: exynos_mct: Only use 32-bits where possible) $ git merge clockevents/clockevents/next Already up-to-date. Merging edac/linux_next (50d1bb93672f sb_edac: add support for Haswell based systems) $ git merge edac/linux_next Auto-merging drivers/edac/Kconfig Merge made by the 'recursive' strategy. drivers/edac/Kconfig | 4 +- drivers/edac/edac_mc_sysfs.c | 4 +- drivers/edac/sb_edac.c | 810 +++++++++++++++++++++++++++++-------------- include/linux/edac.h | 5 + 4 files changed, 551 insertions(+), 272 deletions(-) Merging edac-amd/for-next (eba4bfb34d45 EDAC, MCE, AMD: Add MCE decoding for F15h M60h) $ git merge edac-amd/for-next Auto-merging drivers/edac/Kconfig Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 7 + drivers/edac/Kconfig | 7 + drivers/edac/Makefile | 1 + drivers/edac/edac_module.c | 2 +- drivers/edac/ie31200_edac.c | 536 ++++++++++++++++++++++++++++ drivers/edac/mce_amd.c | 44 ++- drivers/edac/x38_edac.c | 15 +- include/asm-generic/io-64-nonatomic-hi-lo.h | 14 +- include/asm-generic/io-64-nonatomic-lo-hi.h | 14 +- 9 files changed, 616 insertions(+), 24 deletions(-) create mode 100644 drivers/edac/ie31200_edac.c Merging irqchip/irqchip/for-next (c115d15552c0 Merge branch 'irqchip/atmel-aic' into irqchip/for-next) $ git merge irqchip/irqchip/for-next Resolved 'Documentation/devicetree/bindings/arm/gic.txt' using previous resolution. Resolved 'arch/arm64/Kconfig' using previous resolution. Resolved 'drivers/irqchip/irq-gic.c' using previous resolution. Auto-merging drivers/irqchip/irq-gic.c CONFLICT (content): Merge conflict in drivers/irqchip/irq-gic.c Auto-merging drivers/irqchip/Kconfig Auto-merging arch/arm64/Kconfig CONFLICT (content): Merge conflict in arch/arm64/Kconfig Auto-merging Documentation/devicetree/bindings/arm/gic.txt CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/arm/gic.txt Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 6a0f85cb5117] Merge remote-tracking branch 'irqchip/irqchip/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/devicetree/bindings/arm/gic.txt | 20 +- arch/arm64/Kconfig | 3 +- drivers/irqchip/Kconfig | 7 + drivers/irqchip/Makefile | 1 + drivers/irqchip/irq-gic-v2m.c | 251 ++++++++++++++++++++++++++ drivers/irqchip/irq-gic-v2m.h | 13 ++ drivers/irqchip/irq-gic.c | 87 +++++---- drivers/irqchip/irq-gic.h | 67 +++++++ 8 files changed, 408 insertions(+), 41 deletions(-) create mode 100644 drivers/irqchip/irq-gic-v2m.c create mode 100644 drivers/irqchip/irq-gic-v2m.h create mode 100644 drivers/irqchip/irq-gic.h Merging ftrace/for-next (6386b361ccf0 Merge branch 'trace/ftrace/core' into trace/for-next) $ git merge ftrace/for-next Auto-merging kernel/trace/trace.c Auto-merging kernel/power/suspend.c Auto-merging arch/x86/kernel/entry_32.S Auto-merging arch/x86/Kconfig Auto-merging arch/sparc/Kconfig Auto-merging arch/s390/Kconfig Auto-merging arch/mips/kernel/mcount.S Auto-merging arch/mips/kernel/ftrace.c Auto-merging arch/mips/Kconfig Auto-merging Documentation/kernel-parameters.txt Merge made by the 'recursive' strategy. Documentation/kernel-parameters.txt | 6 + Documentation/trace/ftrace-design.txt | 26 -- arch/arm64/kernel/entry-ftrace.S | 5 - arch/blackfin/Kconfig | 1 - arch/blackfin/kernel/ftrace-entry.S | 18 -- arch/metag/Kconfig | 1 - arch/metag/kernel/ftrace_stub.S | 14 - arch/microblaze/Kconfig | 1 - arch/microblaze/kernel/ftrace.c | 3 + arch/microblaze/kernel/mcount.S | 5 - arch/mips/Kconfig | 1 - arch/mips/kernel/ftrace.c | 3 + arch/mips/kernel/mcount.S | 7 - arch/parisc/Kconfig | 1 - arch/parisc/kernel/ftrace.c | 6 +- arch/powerpc/kernel/ftrace.c | 3 + arch/s390/Kconfig | 1 - arch/s390/kernel/mcount.S | 10 +- arch/s390/kernel/mcount64.S | 3 - arch/sh/Kconfig | 1 - arch/sh/kernel/ftrace.c | 3 + arch/sh/lib/mcount.S | 24 +- arch/sparc/Kconfig | 1 - arch/sparc/lib/mcount.S | 10 +- arch/tile/Kconfig | 1 - arch/tile/kernel/mcount_64.S | 18 -- arch/x86/Kconfig | 1 - arch/x86/include/asm/ftrace.h | 2 + arch/x86/kernel/entry_32.S | 9 - arch/x86/kernel/ftrace.c | 3 + arch/x86/kernel/mcount_64.S | 13 +- arch/x86/kvm/mmutrace.h | 2 +- arch/x86/power/cpu.c | 4 +- drivers/scsi/scsi_trace.c | 16 +- include/linux/ftrace.h | 68 ++--- include/linux/ftrace_event.h | 3 - include/linux/trace_seq.h | 36 ++- kernel/power/hibernate.c | 6 - kernel/power/suspend.c | 2 - kernel/trace/Kconfig | 5 - kernel/trace/Makefile | 1 + kernel/trace/ftrace.c | 445 +++++++++++++++++++++++------ kernel/trace/ring_buffer.c | 26 +- kernel/trace/trace.c | 96 ++++--- kernel/trace/trace.h | 2 + kernel/trace/trace_events.c | 60 ++-- kernel/trace/trace_events_filter.c | 73 ++--- kernel/trace/trace_functions_graph.c | 43 ++- kernel/trace/trace_output.c | 282 +----------------- kernel/trace/trace_output.h | 4 - kernel/trace/trace_seq.c | 428 +++++++++++++++++++++++++++ kernel/trace/trace_uprobe.c | 3 +- samples/trace_events/trace-events-sample.h | 2 +- 53 files changed, 1051 insertions(+), 757 deletions(-) create mode 100644 kernel/trace/trace_seq.c Merging rcu/rcu/next (1c91efb24799 rcutorture: Specify CONFIG_CPUMASK_OFFSTACK=y for TREE07) $ git merge rcu/rcu/next Auto-merging kernel/rcu/rcutorture.c Merge made by the 'recursive' strategy. Documentation/memory-barriers.txt | 20 +- include/linux/rcupdate.h | 46 +--- init/main.c | 1 + kernel/rcu/rcutorture.c | 2 +- kernel/rcu/tiny.c | 4 +- kernel/rcu/tree.c | 38 ++- kernel/rcu/tree.h | 5 +- kernel/rcu/tree_plugin.h | 273 ++++++++++++++------- kernel/rcu/update.c | 32 +++ .../selftests/rcutorture/bin/config2frag.sh | 4 +- .../selftests/rcutorture/bin/configcheck.sh | 4 +- .../testing/selftests/rcutorture/bin/configinit.sh | 4 +- .../testing/selftests/rcutorture/bin/functions.sh | 20 ++ .../testing/selftests/rcutorture/bin/kvm-build.sh | 2 +- .../selftests/rcutorture/bin/kvm-recheck-lock.sh | 2 +- .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 2 +- .../selftests/rcutorture/bin/kvm-recheck.sh | 2 +- .../selftests/rcutorture/bin/kvm-test-1-run.sh | 3 +- tools/testing/selftests/rcutorture/bin/kvm.sh | 6 +- .../selftests/rcutorture/bin/parse-build.sh | 5 +- .../selftests/rcutorture/bin/parse-console.sh | 5 +- .../selftests/rcutorture/bin/parse-torture.sh | 5 +- .../selftests/rcutorture/configs/rcu/TREE01 | 4 +- .../selftests/rcutorture/configs/rcu/TREE01.boot | 2 +- .../selftests/rcutorture/configs/rcu/TREE07 | 3 +- .../selftests/rcutorture/configs/rcu/TREE07.boot | 1 + tools/testing/selftests/rcutorture/doc/initrd.txt | 1 + 27 files changed, 326 insertions(+), 170 deletions(-) mode change 100644 => 100755 tools/testing/selftests/rcutorture/bin/config2frag.sh mode change 100644 => 100755 tools/testing/selftests/rcutorture/bin/kvm.sh create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE07.boot 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 (42cbc04fd3b5 x86/kvm: Resolve shadow warnings in macro expansion) $ git merge kvm/linux-next Recorded preimage for 'arch/x86/kvm/mmutrace.h' Auto-merging arch/x86/kvm/x86.c Auto-merging arch/x86/kvm/mmutrace.h CONFLICT (content): Merge conflict in arch/x86/kvm/mmutrace.h Auto-merging arch/x86/include/uapi/asm/msr-index.h Auto-merging arch/x86/include/asm/kvm_host.h Auto-merging arch/mips/kvm/trap_emul.c Auto-merging arch/mips/kvm/tlb.c Auto-merging arch/mips/kvm/stats.c Auto-merging arch/mips/kvm/mips.c Auto-merging arch/mips/kvm/locore.S Removing arch/mips/kvm/kvm_mips_opcode.h Removing arch/mips/kvm/kvm_mips_commpage.c Removing arch/mips/kvm/kvm_mips_comm.h Auto-merging arch/mips/kvm/interrupt.h Auto-merging arch/mips/kvm/interrupt.c Auto-merging arch/mips/kvm/emulate.c Auto-merging arch/mips/kvm/dyntrans.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'arch/x86/kvm/mmutrace.h'. [master 26e7a4608b83] Merge remote-tracking branch 'kvm/linux-next' $ git diff -M --stat --summary HEAD^.. Documentation/virtual/kvm/api.txt | 345 +++++++++----- arch/mips/include/asm/kvm_host.h | 12 +- arch/mips/include/asm/r4kcache.h | 3 + arch/mips/kvm/Makefile | 8 +- arch/mips/kvm/{kvm_cb.c => callback.c} | 0 arch/mips/kvm/commpage.c | 33 ++ arch/mips/kvm/commpage.h | 24 + arch/mips/kvm/{kvm_mips_dyntrans.c => dyntrans.c} | 40 +- arch/mips/kvm/{kvm_mips_emul.c => emulate.c} | 539 +++++++++++----------- arch/mips/kvm/{kvm_mips_int.c => interrupt.c} | 47 +- arch/mips/kvm/{kvm_mips_int.h => interrupt.h} | 22 +- arch/mips/kvm/kvm_mips_comm.h | 23 - arch/mips/kvm/kvm_mips_commpage.c | 37 -- arch/mips/kvm/kvm_mips_opcode.h | 24 - arch/mips/kvm/{kvm_locore.S => locore.S} | 55 ++- arch/mips/kvm/{kvm_mips.c => mips.c} | 224 +++++---- arch/mips/kvm/opcode.h | 22 + arch/mips/kvm/{kvm_mips_stats.c => stats.c} | 28 +- arch/mips/kvm/{kvm_tlb.c => tlb.c} | 258 +++++------ arch/mips/kvm/trace.h | 18 +- arch/mips/kvm/{kvm_trap_emul.c => trap_emul.c} | 112 +++-- arch/s390/include/asm/kvm_host.h | 3 +- arch/s390/include/uapi/asm/sie.h | 1 + arch/s390/kvm/diag.c | 3 +- arch/s390/kvm/intercept.c | 32 +- arch/s390/kvm/interrupt.c | 103 ++--- arch/s390/kvm/kvm-s390.c | 66 ++- arch/s390/kvm/kvm-s390.h | 12 +- arch/s390/kvm/sigp.c | 44 +- arch/x86/include/asm/kvm_emulate.h | 33 +- arch/x86/include/asm/kvm_host.h | 15 +- arch/x86/include/asm/vmx.h | 7 +- arch/x86/include/uapi/asm/kvm.h | 3 + arch/x86/include/uapi/asm/msr-index.h | 1 + arch/x86/kvm/cpuid.h | 8 + arch/x86/kvm/emulate.c | 494 +++++++++++--------- arch/x86/kvm/lapic.c | 4 +- arch/x86/kvm/mmutrace.h | 4 +- arch/x86/kvm/pmu.c | 9 + arch/x86/kvm/svm.c | 57 ++- arch/x86/kvm/trace.h | 6 +- arch/x86/kvm/vmx.c | 239 ++++++---- arch/x86/kvm/x86.c | 171 +++++-- arch/x86/kvm/x86.h | 27 ++ include/uapi/linux/kvm.h | 7 +- virt/kvm/ioapic.c | 7 +- virt/kvm/irq_comm.c | 4 +- 47 files changed, 1790 insertions(+), 1444 deletions(-) rename arch/mips/kvm/{kvm_cb.c => callback.c} (100%) create mode 100644 arch/mips/kvm/commpage.c create mode 100644 arch/mips/kvm/commpage.h rename arch/mips/kvm/{kvm_mips_dyntrans.c => dyntrans.c} (79%) rename arch/mips/kvm/{kvm_mips_emul.c => emulate.c} (83%) rename arch/mips/kvm/{kvm_mips_int.c => interrupt.c} (85%) rename arch/mips/kvm/{kvm_mips_int.h => interrupt.h} (74%) delete mode 100644 arch/mips/kvm/kvm_mips_comm.h delete mode 100644 arch/mips/kvm/kvm_mips_commpage.c delete mode 100644 arch/mips/kvm/kvm_mips_opcode.h rename arch/mips/kvm/{kvm_locore.S => locore.S} (93%) rename arch/mips/kvm/{kvm_mips.c => mips.c} (84%) create mode 100644 arch/mips/kvm/opcode.h rename arch/mips/kvm/{kvm_mips_stats.c => stats.c} (63%) rename arch/mips/kvm/{kvm_tlb.c => tlb.c} (78%) rename arch/mips/kvm/{kvm_trap_emul.c => trap_emul.c} (83%) Merging kvm-arm/next (fb3ec67942e9 KVM: arm64: GICv3: mandate page-aligned GICV region) $ git merge kvm-arm/next Resolved 'virt/kvm/arm/vgic.c' using previous resolution. Auto-merging virt/kvm/arm/vgic.c CONFLICT (content): Merge conflict in virt/kvm/arm/vgic.c Auto-merging arch/arm64/kernel/debug-monitors.c Auto-merging arch/arm/kvm/init.S Auto-merging arch/arm/kvm/guest.c Auto-merging arch/arm/kernel/hyp-stub.S Auto-merging Documentation/arm64/booting.txt Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 72a3b3410b4a] Merge remote-tracking branch 'kvm-arm/next' $ git diff -M --stat --summary HEAD^.. Documentation/arm64/booting.txt | 8 + Documentation/devicetree/bindings/arm/gic-v3.txt | 79 +++ arch/arm/include/asm/kvm_asm.h | 18 + arch/arm/include/asm/kvm_emulate.h | 22 +- arch/arm/include/asm/kvm_host.h | 8 +- arch/arm/include/asm/kvm_mmu.h | 12 + arch/arm/kernel/asm-offsets.c | 14 +- arch/arm/kernel/hyp-stub.S | 4 +- arch/arm/kvm/Kconfig | 2 +- arch/arm/kvm/Makefile | 1 + arch/arm/kvm/arm.c | 37 -- arch/arm/kvm/coproc.c | 88 +++- arch/arm/kvm/guest.c | 10 - arch/arm/kvm/init.S | 4 +- arch/arm/kvm/interrupts.S | 9 +- arch/arm/kvm/interrupts_head.S | 48 +- arch/arm/kvm/mmu.c | 214 +++++--- arch/arm64/include/asm/debug-monitors.h | 19 +- arch/arm64/include/asm/kvm_arm.h | 5 +- arch/arm64/include/asm/kvm_asm.h | 53 +- arch/arm64/include/asm/kvm_coproc.h | 3 +- arch/arm64/include/asm/kvm_emulate.h | 22 + arch/arm64/include/asm/kvm_host.h | 46 +- arch/arm64/include/asm/kvm_mmu.h | 15 + arch/arm64/include/asm/virt.h | 4 + arch/arm64/kernel/asm-offsets.c | 26 +- arch/arm64/kernel/debug-monitors.c | 9 - arch/arm64/kvm/Makefile | 4 + arch/arm64/kvm/guest.c | 68 ++- arch/arm64/kvm/handle_exit.c | 4 +- arch/arm64/kvm/hyp.S | 600 +++++++++++++++++++---- arch/arm64/kvm/sys_regs.c | 551 ++++++++++++++++++--- arch/arm64/kvm/vgic-v2-switch.S | 133 +++++ arch/arm64/kvm/vgic-v3-switch.S | 267 ++++++++++ include/kvm/arm_arch_timer.h | 14 + include/kvm/arm_vgic.h | 115 ++++- virt/kvm/arm/vgic-v2.c | 249 ++++++++++ virt/kvm/arm/vgic-v3.c | 247 ++++++++++ virt/kvm/arm/vgic.c | 391 ++++++++------- 39 files changed, 2842 insertions(+), 581 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/gic-v3.txt create mode 100644 arch/arm64/kvm/vgic-v2-switch.S create mode 100644 arch/arm64/kvm/vgic-v3-switch.S create mode 100644 virt/kvm/arm/vgic-v2.c create mode 100644 virt/kvm/arm/vgic-v3.c $ git am -3 ../patches/0001-merge-fixup-provided-by-Marc-Zyngier-marc.zyngier-ar.patch Applying: merge fixup provided by Marc Zyngier $ git reset HEAD^ Unstaged changes after reset: M virt/kvm/arm/vgic-v2.c M virt/kvm/arm/vgic.c $ git add -A . $ git commit -v -a --amend [master 27f405efe567] Merge remote-tracking branch 'kvm-arm/next' Merging kvm-ppc/kvm-ppc-next (1287cb3fa85c KVM: PPC: Book3S: Move vcore definition to end of kvm_arch struct) $ git merge kvm-ppc/kvm-ppc-next Resolved 'Documentation/virtual/kvm/api.txt' using previous resolution. Auto-merging include/uapi/linux/kvm.h Auto-merging arch/powerpc/kvm/e500_mmu_host.c Auto-merging arch/powerpc/kvm/book3s_hv_rmhandlers.S Auto-merging arch/powerpc/kvm/book3s_hv_rm_mmu.c Auto-merging arch/powerpc/kvm/book3s_64_mmu_hv.c Auto-merging arch/powerpc/kernel/asm-offsets.c Auto-merging arch/powerpc/include/asm/reg.h Auto-merging arch/powerpc/include/asm/kvm_book3s_64.h Auto-merging Documentation/virtual/kvm/api.txt CONFLICT (content): Merge conflict in Documentation/virtual/kvm/api.txt Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master b5cf5fb7f5ca] Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next' $ git diff -M --stat --summary HEAD^.. Documentation/virtual/kvm/api.txt | 44 ++++++++- arch/powerpc/include/asm/asm-compat.h | 4 + arch/powerpc/include/asm/hvcall.h | 6 ++ arch/powerpc/include/asm/kvm_book3s.h | 10 +- arch/powerpc/include/asm/kvm_book3s_64.h | 23 +++-- arch/powerpc/include/asm/kvm_host.h | 14 ++- arch/powerpc/include/asm/kvm_ppc.h | 2 +- arch/powerpc/include/asm/mmu-book3e.h | 5 +- arch/powerpc/include/asm/reg.h | 9 ++ arch/powerpc/include/asm/time.h | 9 ++ arch/powerpc/kernel/asm-offsets.c | 1 + arch/powerpc/kvm/Kconfig | 1 - arch/powerpc/kvm/book3s.c | 17 ++++ arch/powerpc/kvm/book3s_64_mmu_hv.c | 128 ++++++++++++------------ arch/powerpc/kvm/book3s_emulate.c | 22 +++-- arch/powerpc/kvm/book3s_hv.c | 164 ++++++++++++++++++++++++++----- arch/powerpc/kvm/book3s_hv_builtin.c | 13 +++ arch/powerpc/kvm/book3s_hv_ras.c | 6 +- arch/powerpc/kvm/book3s_hv_rm_mmu.c | 146 +++++++++++++++------------ arch/powerpc/kvm/book3s_hv_rmhandlers.S | 70 ++++++++----- arch/powerpc/kvm/book3s_pr.c | 37 +++++++ arch/powerpc/kvm/book3s_pr_papr.c | 83 ++++++++++++++-- arch/powerpc/kvm/e500_emulate.c | 12 +++ arch/powerpc/kvm/e500_mmu_host.c | 4 + arch/powerpc/kvm/e500mc.c | 6 +- arch/powerpc/kvm/powerpc.c | 47 +++++++++ include/uapi/linux/kvm.h | 1 + 27 files changed, 667 insertions(+), 217 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 (28d4ce7322cf Merge branch 'devel/for-linus-3.17' into linux-next) $ git merge xen-tip/linux-next Resolved 'arch/x86/xen/grant-table.c' using previous resolution. Resolved 'drivers/xen/grant-table.c' using previous resolution. Resolved 'include/xen/grant_table.h' using previous resolution. Auto-merging include/xen/grant_table.h CONFLICT (content): Merge conflict in include/xen/grant_table.h Auto-merging include/linux/device.h Auto-merging drivers/xen/grant-table.c CONFLICT (content): Merge conflict in drivers/xen/grant-table.c Auto-merging arch/x86/xen/grant-table.c CONFLICT (content): Merge conflict in arch/x86/xen/grant-table.c Auto-merging arch/x86/xen/enlighten.c Auto-merging arch/arm/xen/grant-table.c Auto-merging MAINTAINERS Auto-merging Documentation/kernel-parameters.txt Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master e22b8c386440] Merge remote-tracking branch 'xen-tip/linux-next' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/sysfs-driver-pciback | 26 +++ Documentation/kernel-parameters.txt | 4 + MAINTAINERS | 7 + arch/arm/xen/enlighten.c | 6 +- arch/arm/xen/grant-table.c | 6 +- arch/x86/xen/enlighten.c | 13 ++ arch/x86/xen/grant-table.c | 60 +---- drivers/xen/grant-table.c | 309 +------------------------ drivers/xen/xen-pciback/passthrough.c | 14 +- drivers/xen/xen-pciback/pci_stub.c | 42 ++-- drivers/xen/xen-pciback/pciback.h | 7 +- drivers/xen/xen-pciback/vpci.c | 14 +- drivers/xen/xen-pciback/xenbus.c | 4 +- include/linux/device.h | 5 + include/xen/grant_table.h | 30 +-- 15 files changed, 122 insertions(+), 425 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-driver-pciback Merging percpu/for-next (1e59e00cdf4d Merge branch 'for-3.17' into for-next) $ git merge percpu/for-next Merge made by the 'recursive' strategy. include/linux/percpu.h | 90 +++++++++++++++++++++++++ mm/percpu.c | 178 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 268 insertions(+) Merging workqueues/for-next (ebb48ccd98d1 Merge branch 'for-3.17' into for-next) $ git merge workqueues/for-next Resolved 'kernel/workqueue.c' using previous resolution. Auto-merging kernel/workqueue.c CONFLICT (content): Merge conflict in kernel/workqueue.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 32739923f770] Merge remote-tracking branch 'workqueues/for-next' $ git diff -M --stat --summary HEAD^.. include/linux/kthread.h | 13 +--- kernel/kthread.c | 2 +- kernel/workqueue.c | 193 ++++++++++++++++-------------------------------- 3 files changed, 65 insertions(+), 143 deletions(-) Merging drivers-x86/linux-next (f82bdd0d77b6 hp-wmi: Enable hotkeys on some systems) $ git merge drivers-x86/linux-next Already up-to-date. Merging chrome-platform/for-next (5502486a2077 platform/chrome: chromeos_laptop - Add a limit for deferred retries) $ git merge chrome-platform/for-next Auto-merging drivers/platform/chrome/chromeos_laptop.c Merge made by the 'recursive' strategy. drivers/platform/chrome/chromeos_laptop.c | 140 +++++++++++++++++++++++++++--- drivers/platform/chrome/chromeos_pstore.c | 14 +-- 2 files changed, 132 insertions(+), 22 deletions(-) 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 (3059bfa09df6 Merge remote-tracking branches 'regmap/topic/getdev' and 'regmap/topic/getreg' into regmap-next) $ git merge regmap/for-next Merge made by the 'recursive' strategy. drivers/base/regmap/regmap.c | 13 +++++++++++++ include/linux/regmap.h | 7 +++++++ 2 files changed, 20 insertions(+) Merging hsi/for-next (3fd276e9c0d7 HSI: omap_ssi: Fix return value check in ssi_debug_add_ctrl()) $ git merge hsi/for-next Auto-merging drivers/hsi/clients/ssi_protocol.c Merge made by the 'recursive' strategy. drivers/hsi/clients/ssi_protocol.c | 2 +- drivers/hsi/controllers/omap_ssi.c | 14 +++++++------- drivers/hsi/controllers/omap_ssi_port.c | 15 ++++++++------- 3 files changed, 16 insertions(+), 15 deletions(-) Merging leds/for-next (e661c8978e48 leds: ipaq-micro: fix sparse non static symbol warning) $ git merge leds/for-next Resolved 'drivers/hid/hid-gt683r.c' using previous resolution. Auto-merging drivers/leds/Makefile Auto-merging drivers/leds/Kconfig Auto-merging drivers/hid/hid-gt683r.c CONFLICT (add/add): Merge conflict in drivers/hid/hid-gt683r.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 2778aacf092a] Merge remote-tracking branch 'leds/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/sysfs-class-leds-gt683r | 16 +++ Documentation/devicetree/bindings/leds/pca963x.txt | 9 +- Documentation/devicetree/bindings/leds/tca6507.txt | 2 +- drivers/hid/hid-gt683r.c | 42 +++--- drivers/input/keyboard/lm8323.c | 22 ++-- drivers/leds/Kconfig | 7 + drivers/leds/Makefile | 1 + drivers/leds/led-class.c | 19 +-- drivers/leds/led-core.c | 11 +- drivers/leds/leds-ipaq-micro.c | 141 +++++++++++++++++++++ drivers/leds/leds-lm3530.c | 20 +-- drivers/leds/leds-lm3533.c | 20 ++- drivers/leds/leds-lm355x.c | 21 ++- drivers/leds/leds-lm3642.c | 30 ++--- drivers/leds/leds-lp55xx-common.c | 20 +-- drivers/leds/leds-max8997.c | 16 +-- drivers/leds/leds-netxbig.c | 31 ++--- drivers/leds/leds-ns2.c | 16 +-- drivers/leds/leds-pca963x.c | 28 ++-- drivers/leds/leds-ss4200.c | 14 +- drivers/leds/leds-wm831x-status.c | 23 ++-- include/linux/leds.h | 5 +- 22 files changed, 332 insertions(+), 182 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-class-leds-gt683r create mode 100644 drivers/leds/leds-ipaq-micro.c Merging driver-core/driver-core-next (0542ad88fbdd firmware loader: Fix _request_firmware_load() return val for fw load abort) $ git merge driver-core/driver-core-next Resolved 'arch/arm/mach-shmobile/setup-r7s72100.c' using previous resolution. Resolved 'drivers/gpu/drm/armada/armada_crtc.c' using previous resolution. Resolved 'lib/Kconfig.debug' using previous resolution. Removing scripts/coccinelle/api/devm_ioremap_resource.cocci Auto-merging lib/devres.c Auto-merging lib/Kconfig.debug CONFLICT (content): Merge conflict in lib/Kconfig.debug Auto-merging include/linux/device.h Auto-merging include/drm/drmP.h Auto-merging drivers/media/v4l2-core/videobuf2-dma-contig.c Auto-merging drivers/gpu/drm/radeon/radeon_drv.c Auto-merging drivers/gpu/drm/armada/armada_crtc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/armada/armada_crtc.c Auto-merging drivers/dma-buf/dma-buf.c Removing drivers/base/reservation.c Auto-merging drivers/base/firmware_class.c Auto-merging drivers/Makefile Auto-merging arch/arm/mach-shmobile/setup-r8a7791.c Auto-merging arch/arm/mach-shmobile/setup-r8a7790.c Auto-merging arch/arm/mach-shmobile/setup-r8a7779.c Auto-merging arch/arm/mach-shmobile/setup-r8a7778.c Auto-merging arch/arm/mach-shmobile/setup-r8a73a4.c Auto-merging arch/arm/mach-shmobile/setup-r7s72100.c CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-r7s72100.c Auto-merging arch/arm/mach-shmobile/board-marzen.c Auto-merging arch/arm/mach-shmobile/board-lager.c Auto-merging arch/arm/mach-shmobile/board-koelsch.c Auto-merging arch/arm/mach-shmobile/board-genmai.c Auto-merging arch/arm/mach-shmobile/board-bockw.c Auto-merging arch/arm/mach-shmobile/board-ape6evm.c Auto-merging arch/arm/mach-clps711x/board-p720t.c Auto-merging arch/arm/mach-clps711x/board-edb7211.c Auto-merging MAINTAINERS Auto-merging Documentation/DocBook/device-drivers.tmpl Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master d61a52e2c291] Merge remote-tracking branch 'driver-core/driver-core-next' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/sysfs-bus-platform | 20 + Documentation/DocBook/device-drivers.tmpl | 8 +- Documentation/driver-model/devres.txt | 112 +-- Documentation/firmware_class/README | 6 +- Documentation/stable_kernel_rules.txt | 3 + MAINTAINERS | 4 +- arch/arm/mach-bcm/board_bcm21664.c | 3 +- arch/arm/mach-bcm/board_bcm281xx.c | 3 +- arch/arm/mach-clps711x/board-edb7211.c | 6 +- arch/arm/mach-clps711x/board-p720t.c | 6 +- arch/arm/mach-imx/mach-mx27ads.c | 2 +- arch/arm/mach-shmobile/board-ape6evm.c | 14 +- arch/arm/mach-shmobile/board-bockw.c | 19 +- arch/arm/mach-shmobile/board-genmai.c | 5 +- arch/arm/mach-shmobile/board-koelsch.c | 26 +- arch/arm/mach-shmobile/board-lager.c | 34 +- arch/arm/mach-shmobile/board-marzen.c | 1 - arch/arm/mach-shmobile/setup-r8a73a4.c | 8 +- arch/arm/mach-shmobile/setup-r8a7778.c | 13 +- arch/arm/mach-shmobile/setup-r8a7779.c | 6 +- arch/arm/mach-shmobile/setup-r8a7790.c | 10 +- arch/arm/mach-shmobile/setup-r8a7791.c | 8 +- arch/unicore32/kernel/puv3-core.c | 2 +- arch/unicore32/kernel/puv3-nb0916.c | 6 +- drivers/Makefile | 1 + drivers/base/Kconfig | 19 +- drivers/base/Makefile | 1 - drivers/base/firmware_class.c | 47 +- drivers/base/platform.c | 51 +- drivers/base/reservation.c | 39 - drivers/bus/brcmstb_gisb.c | 6 +- drivers/dma-buf/Makefile | 1 + drivers/{base => dma-buf}/dma-buf.c | 168 +++- drivers/dma-buf/fence.c | 431 ++++++++++ drivers/dma-buf/reservation.c | 477 +++++++++++ drivers/dma-buf/seqno-fence.c | 73 ++ drivers/gpu/drm/armada/armada_crtc.c | 8 +- drivers/gpu/drm/armada/armada_gem.c | 2 +- drivers/gpu/drm/drm_prime.c | 8 +- drivers/gpu/drm/exynos/exynos_drm_dmabuf.c | 2 +- drivers/gpu/drm/i915/i915_gem_dmabuf.c | 3 +- drivers/gpu/drm/nouveau/nouveau_drm.c | 1 + drivers/gpu/drm/nouveau/nouveau_gem.h | 1 + drivers/gpu/drm/nouveau/nouveau_prime.c | 7 + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 2 +- drivers/gpu/drm/radeon/radeon_drv.c | 2 + drivers/gpu/drm/radeon/radeon_prime.c | 8 + drivers/gpu/drm/tegra/gem.c | 2 +- drivers/gpu/drm/ttm/ttm_object.c | 2 +- drivers/media/v4l2-core/videobuf2-dma-contig.c | 2 +- drivers/staging/android/Kconfig | 1 + drivers/staging/android/Makefile | 2 +- drivers/staging/android/ion/ion.c | 3 +- drivers/staging/android/sw_sync.c | 6 +- drivers/staging/android/sync.c | 913 +++++++-------------- drivers/staging/android/sync.h | 79 +- drivers/staging/android/sync_debug.c | 252 ++++++ drivers/staging/android/trace/sync.h | 12 +- fs/debugfs/file.c | 2 +- fs/debugfs/inode.c | 39 +- fs/kernfs/file.c | 2 +- include/drm/drmP.h | 3 + include/linux/device.h | 2 - include/linux/dma-buf.h | 21 +- include/linux/fence.h | 360 ++++++++ include/linux/firmware.h | 15 +- include/linux/platform_device.h | 1 + include/linux/reservation.h | 82 +- include/linux/seqno-fence.h | 116 +++ include/trace/events/fence.h | 128 +++ lib/Kconfig.debug | 13 + lib/Makefile | 1 + lib/devres.c | 28 - lib/test_firmware.c | 117 +++ scripts/coccinelle/api/devm_ioremap_resource.cocci | 90 -- tools/testing/selftests/Makefile | 1 + tools/testing/selftests/firmware/Makefile | 27 + tools/testing/selftests/firmware/fw_filesystem.sh | 62 ++ tools/testing/selftests/firmware/fw_userhelper.sh | 89 ++ 79 files changed, 3118 insertions(+), 1038 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-platform delete mode 100644 drivers/base/reservation.c create mode 100644 drivers/dma-buf/Makefile rename drivers/{base => dma-buf}/dma-buf.c (81%) create mode 100644 drivers/dma-buf/fence.c create mode 100644 drivers/dma-buf/reservation.c create mode 100644 drivers/dma-buf/seqno-fence.c create mode 100644 drivers/staging/android/sync_debug.c create mode 100644 include/linux/fence.h create mode 100644 include/linux/seqno-fence.h create mode 100644 include/trace/events/fence.h create mode 100644 lib/test_firmware.c delete mode 100644 scripts/coccinelle/api/devm_ioremap_resource.cocci create mode 100644 tools/testing/selftests/firmware/Makefile create mode 100644 tools/testing/selftests/firmware/fw_filesystem.sh create mode 100644 tools/testing/selftests/firmware/fw_userhelper.sh Merging tty/tty-next (22524b02b17b Revert "ARC: [arcfpga] stdout-path now suffices for earlycon/console") $ git merge tty/tty-next Auto-merging drivers/tty/serial/serial_core.c Auto-merging drivers/tty/serial/samsung.c Auto-merging drivers/tty/n_gsm.c Auto-merging arch/arm/boot/dts/exynos5410.dtsi Auto-merging arch/arm/boot/dts/exynos5260.dtsi Auto-merging arch/arm/boot/dts/exynos4.dtsi Auto-merging arch/arm/boot/dts/exynos3250.dtsi Auto-merging arch/arc/plat-arcfpga/platform.c Merge made by the 'recursive' strategy. Documentation/ABI/testing/sysfs-tty | 16 + .../devicetree/bindings/serial/efm32-uart.txt | 4 +- .../devicetree/bindings/serial/fsl-lpuart.txt | 6 +- .../devicetree/bindings/serial/samsung_uart.txt | 56 +- .../bindings/serial/snps-dw-apb-uart.txt | 32 + arch/arc/boot/dts/angel4.dts | 2 +- arch/arc/plat-arcfpga/Kconfig | 7 - arch/arc/plat-arcfpga/platform.c | 97 +-- arch/arm/boot/dts/exynos3250.dtsi | 2 + arch/arm/boot/dts/exynos4.dtsi | 12 +- arch/arm/boot/dts/exynos5.dtsi | 15 +- arch/arm/boot/dts/exynos5260.dtsi | 4 + arch/arm/boot/dts/exynos5410.dtsi | 6 + arch/arm/boot/dts/exynos5440.dtsi | 6 +- arch/arm/boot/dts/s3c2416.dtsi | 6 +- arch/arm/boot/dts/s3c24xx.dtsi | 9 +- arch/arm/boot/dts/s3c64xx.dtsi | 4 + drivers/char/pcmcia/synclink_cs.c | 4 +- drivers/staging/dgrp/dgrp_tty.c | 10 - drivers/tty/cyclades.c | 2 +- drivers/tty/ipwireless/tty.c | 5 - drivers/tty/n_gsm.c | 4 +- drivers/tty/pty.c | 21 +- drivers/tty/serial/21285.c | 5 - drivers/tty/serial/8250/8250.h | 2 + drivers/tty/serial/8250/8250_core.c | 230 +++++-- drivers/tty/serial/8250/8250_dw.c | 190 +++--- drivers/tty/serial/8250/8250_fsl.c | 3 +- drivers/tty/serial/8250/8250_pci.c | 6 +- drivers/tty/serial/Kconfig | 4 +- drivers/tty/serial/altera_jtaguart.c | 19 +- drivers/tty/serial/altera_uart.c | 13 +- drivers/tty/serial/amba-pl010.c | 48 +- drivers/tty/serial/amba-pl011.c | 30 +- drivers/tty/serial/apbuart.c | 6 - drivers/tty/serial/ar933x_uart.c | 5 - drivers/tty/serial/arc_uart.c | 337 ++++------ drivers/tty/serial/atmel_serial.c | 8 +- drivers/tty/serial/bfin_sport_uart.c | 17 +- drivers/tty/serial/bfin_uart.c | 22 +- drivers/tty/serial/clps711x.c | 1 - drivers/tty/serial/cpm_uart/cpm_uart_core.c | 9 - drivers/tty/serial/crisv10.c | 15 +- drivers/tty/serial/dz.c | 6 - drivers/tty/serial/efm32-uart.c | 14 +- drivers/tty/serial/fsl_lpuart.c | 689 ++++++++++++++++++++- drivers/tty/serial/icom.c | 6 - drivers/tty/serial/ioc3_serial.c | 1 - drivers/tty/serial/ioc4_serial.c | 1 - drivers/tty/serial/jsm/jsm_tty.c | 6 - drivers/tty/serial/kgdb_nmi.c | 36 +- drivers/tty/serial/lantiq.c | 8 +- drivers/tty/serial/lpc32xx_hs.c | 7 - drivers/tty/serial/max310x.c | 1 - drivers/tty/serial/mcf.c | 11 +- drivers/tty/serial/men_z135_uart.c | 6 +- drivers/tty/serial/mpsc.c | 5 - drivers/tty/serial/mrst_max3110.c | 5 - drivers/tty/serial/msm_serial.c | 32 +- drivers/tty/serial/msm_serial.h | 4 +- drivers/tty/serial/mux.c | 11 - drivers/tty/serial/mxs-auart.c | 6 - drivers/tty/serial/nwpserial.c | 6 - drivers/tty/serial/pch_uart.c | 2 +- drivers/tty/serial/pxa.c | 2 +- drivers/tty/serial/samsung.c | 44 +- drivers/tty/serial/sc16is7xx.c | 10 +- drivers/tty/serial/sccnxp.c | 6 - drivers/tty/serial/serial-tegra.c | 4 + drivers/tty/serial/serial_core.c | 59 +- drivers/tty/serial/serial_txx9.c | 7 - drivers/tty/serial/sh-sci.c | 94 ++- drivers/tty/serial/sirfsoc_uart.c | 3 +- drivers/tty/serial/sirfsoc_uart.h | 2 +- drivers/tty/serial/sn_console.c | 10 - drivers/tty/serial/st-asc.c | 20 +- drivers/tty/serial/sunhv.c | 6 - drivers/tty/serial/sunsab.c | 7 - drivers/tty/serial/tilegx.c | 10 - drivers/tty/serial/timbuart.c | 6 - drivers/tty/serial/uartlite.c | 6 - drivers/tty/serial/ucc_uart.c | 11 - drivers/tty/serial/xilinx_uartps.c | 6 - drivers/tty/synclink.c | 10 +- drivers/tty/synclink_gt.c | 10 +- drivers/tty/synclinkmp.c | 11 +- drivers/tty/tty_io.c | 39 +- drivers/tty/tty_port.c | 43 +- include/linux/serial_8250.h | 7 + include/linux/serial_core.h | 2 + include/linux/tty.h | 4 +- include/linux/tty_driver.h | 8 +- include/uapi/linux/serial_reg.h | 5 + net/irda/ircomm/ircomm_tty.c | 6 +- 94 files changed, 1570 insertions(+), 1051 deletions(-) Merging usb/usb-next (d508d992026c Merge tag 'for_3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-next) $ git merge usb/usb-next Resolved 'Documentation/devicetree/bindings/phy/samsung-phy.txt' using previous resolution. Resolved 'drivers/phy/Kconfig' using previous resolution. Resolved 'drivers/phy/Makefile' using previous resolution. Resolved 'drivers/phy/phy-samsung-usb2.c' using previous resolution. Resolved 'drivers/phy/phy-samsung-usb2.h' using previous resolution. Resolved 'drivers/usb/musb/musb_host.c' using previous resolution. Auto-merging drivers/usb/musb/musb_host.c CONFLICT (content): Merge conflict in drivers/usb/musb/musb_host.c Auto-merging drivers/usb/musb/musb_cppi41.c Auto-merging drivers/usb/musb/musb_core.c Auto-merging drivers/usb/gadget/udc/s3c2410_udc.c Auto-merging drivers/usb/gadget/udc/r8a66597-udc.c Auto-merging drivers/usb/gadget/udc/pxa27x_udc.c Auto-merging drivers/usb/gadget/udc/pxa25x_udc.c Auto-merging drivers/usb/gadget/udc/omap_udc.c Auto-merging drivers/usb/gadget/udc/net2272.c Auto-merging drivers/usb/gadget/udc/mv_udc_core.c Auto-merging drivers/usb/gadget/udc/m66592-udc.c Auto-merging drivers/usb/gadget/udc/lpc32xx_udc.c Auto-merging drivers/usb/gadget/udc/gr_udc.c Auto-merging drivers/usb/gadget/udc/fusb300_udc.c Auto-merging drivers/usb/gadget/udc/fsl_usb2_udc.h Auto-merging drivers/usb/gadget/udc/fsl_udc_core.c Auto-merging drivers/usb/gadget/udc/fsl_qe_udc.c Auto-merging drivers/usb/gadget/udc/fsl_mxc_udc.c Auto-merging drivers/usb/gadget/udc/atmel_usba_udc.c Removing drivers/usb/gadget/net2280.h Removing drivers/usb/gadget/net2280.c Auto-merging drivers/usb/gadget/legacy/zero.c Auto-merging drivers/usb/gadget/legacy/webcam.c Auto-merging drivers/usb/gadget/legacy/nokia.c Auto-merging drivers/usb/gadget/legacy/ncm.c Auto-merging drivers/usb/gadget/legacy/multi.c Auto-merging drivers/usb/gadget/legacy/gmidi.c Auto-merging drivers/usb/gadget/legacy/g_ffs.c Auto-merging drivers/usb/gadget/legacy/ether.c Auto-merging drivers/usb/gadget/legacy/cdc2.c Auto-merging drivers/usb/gadget/legacy/audio.c Auto-merging drivers/usb/gadget/legacy/acm_ms.c Auto-merging drivers/usb/gadget/function/u_fs.h Auto-merging drivers/usb/gadget/function/u_ether.h Auto-merging drivers/usb/gadget/function/u_ether.c Auto-merging drivers/usb/gadget/function/f_uac2.c Auto-merging drivers/usb/gadget/function/f_rndis.c Auto-merging drivers/usb/gadget/function/f_ncm.c Auto-merging drivers/usb/gadget/function/f_fs.c Auto-merging drivers/usb/gadget/function/f_eem.c Auto-merging drivers/usb/core/hub.c Auto-merging drivers/phy/phy-samsung-usb2.h CONFLICT (content): Merge conflict in drivers/phy/phy-samsung-usb2.h Auto-merging drivers/phy/phy-samsung-usb2.c CONFLICT (content): Merge conflict in drivers/phy/phy-samsung-usb2.c Auto-merging drivers/phy/Makefile CONFLICT (content): Merge conflict in drivers/phy/Makefile Auto-merging drivers/phy/Kconfig CONFLICT (content): Merge conflict in drivers/phy/Kconfig Auto-merging arch/arm/boot/dts/tegra30.dtsi Auto-merging arch/arm/boot/dts/tegra20.dtsi Auto-merging arch/arm/boot/dts/tegra124.dtsi Auto-merging arch/arm/boot/dts/tegra114.dtsi Auto-merging Documentation/devicetree/bindings/phy/samsung-phy.txt CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/phy/samsung-phy.txt Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master b123e1ee0183] Merge remote-tracking branch 'usb/usb-next' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/stable/sysfs-bus-usb | 14 +- Documentation/ABI/testing/sysfs-bus-usb-lvstest | 47 + Documentation/DocBook/gadget.tmpl | 10 +- .../devicetree/bindings/phy/berlin-sata-phy.txt | 34 + .../devicetree/bindings/phy/hix5hd2-phy.txt | 22 + .../devicetree/bindings/phy/phy-bindings.txt | 4 + .../devicetree/bindings/phy/phy-miphy365x.txt | 76 + .../bindings/phy/qcom-apq8064-sata-phy.txt | 24 + .../bindings/phy/qcom-ipq806x-sata-phy.txt | 23 + .../devicetree/bindings/phy/samsung-phy.txt | 2 + Documentation/devicetree/bindings/phy/ti-phy.txt | 23 +- .../devicetree/bindings/usb/ci-hdrc-imx.txt | 2 +- .../bindings/usb/nvidia,tegra20-usb-phy.txt | 8 + Documentation/devicetree/bindings/usb/usb-xhci.txt | 3 +- Documentation/phy.txt | 10 +- Documentation/usb/power-management.txt | 245 +- arch/arm/boot/dts/tegra114.dtsi | 5 + arch/arm/boot/dts/tegra124.dtsi | 7 + arch/arm/boot/dts/tegra20.dtsi | 7 + arch/arm/boot/dts/tegra30.dtsi | 7 + drivers/phy/Kconfig | 78 +- drivers/phy/Makefile | 5 + drivers/phy/phy-bcm-kona-usb2.c | 2 +- drivers/phy/phy-berlin-sata.c | 284 ++ drivers/phy/phy-core.c | 56 +- drivers/phy/phy-exynos-dp-video.c | 7 +- drivers/phy/phy-exynos-mipi-video.c | 7 +- drivers/phy/phy-exynos4x12-usb2.c | 125 +- drivers/phy/phy-exynos5-usbdrd.c | 9 +- drivers/phy/phy-exynos5250-sata.c | 2 +- drivers/phy/phy-exynos5250-usb2.c | 2 - drivers/phy/phy-hix5hd2-sata.c | 192 + drivers/phy/phy-miphy365x.c | 636 ++++ drivers/phy/phy-mvebu-sata.c | 2 +- drivers/phy/phy-omap-control.c | 52 +- drivers/phy/phy-omap-usb2.c | 2 +- drivers/phy/phy-qcom-apq8064-sata.c | 289 ++ drivers/phy/phy-qcom-ipq806x-sata.c | 211 ++ drivers/phy/phy-samsung-usb2.c | 9 +- drivers/phy/phy-samsung-usb2.h | 5 +- drivers/phy/phy-sun4i-usb.c | 7 +- drivers/phy/phy-ti-pipe3.c | 107 +- drivers/phy/phy-twl4030-usb.c | 2 +- drivers/phy/phy-xgene.c | 2 +- drivers/usb/chipidea/ci_hdrc_imx.c | 3 + drivers/usb/chipidea/debug.c | 4 +- drivers/usb/class/usbtmc.c | 2 +- drivers/usb/core/driver.c | 7 +- drivers/usb/core/hcd-pci.c | 2 + drivers/usb/core/hcd.c | 4 - drivers/usb/core/hub.c | 94 +- drivers/usb/core/hub.h | 2 + drivers/usb/core/port.c | 21 +- drivers/usb/core/quirks.c | 3 + drivers/usb/core/urb.c | 1 + drivers/usb/core/usb.c | 1 + drivers/usb/dwc2/gadget.c | 12 +- drivers/usb/dwc3/Kconfig | 7 + drivers/usb/dwc3/core.c | 51 +- drivers/usb/dwc3/core.h | 13 + drivers/usb/dwc3/dwc3-omap.c | 172 +- drivers/usb/dwc3/gadget.c | 7 +- drivers/usb/dwc3/host.c | 14 + drivers/usb/gadget/Kconfig | 824 +---- drivers/usb/gadget/Makefile | 101 +- drivers/usb/gadget/composite.c | 1 + drivers/usb/gadget/configfs.c | 4 +- drivers/usb/gadget/function/Makefile | 34 + drivers/usb/gadget/{ => function}/f_acm.c | 0 drivers/usb/gadget/{ => function}/f_ecm.c | 0 drivers/usb/gadget/{ => function}/f_eem.c | 22 +- drivers/usb/gadget/{ => function}/f_fs.c | 352 +- drivers/usb/gadget/{ => function}/f_hid.c | 0 drivers/usb/gadget/{ => function}/f_loopback.c | 0 drivers/usb/gadget/{ => function}/f_mass_storage.c | 0 drivers/usb/gadget/{ => function}/f_mass_storage.h | 0 drivers/usb/gadget/{ => function}/f_midi.c | 0 drivers/usb/gadget/{ => function}/f_ncm.c | 480 ++- drivers/usb/gadget/{ => function}/f_obex.c | 0 drivers/usb/gadget/{ => function}/f_phonet.c | 0 drivers/usb/gadget/{ => function}/f_rndis.c | 4 + drivers/usb/gadget/{ => function}/f_serial.c | 0 drivers/usb/gadget/{ => function}/f_sourcesink.c | 0 drivers/usb/gadget/{ => function}/f_subset.c | 0 drivers/usb/gadget/{ => function}/f_uac1.c | 0 drivers/usb/gadget/{ => function}/f_uac2.c | 24 +- drivers/usb/gadget/{ => function}/f_uvc.c | 0 drivers/usb/gadget/{ => function}/f_uvc.h | 0 drivers/usb/gadget/{ => function}/g_zero.h | 0 drivers/usb/gadget/{ => function}/ndis.h | 0 drivers/usb/gadget/{ => function}/rndis.c | 0 drivers/usb/gadget/{ => function}/rndis.h | 0 drivers/usb/gadget/{ => function}/storage_common.c | 0 drivers/usb/gadget/{ => function}/storage_common.h | 0 drivers/usb/gadget/{ => function}/u_ecm.h | 0 drivers/usb/gadget/{ => function}/u_eem.h | 0 drivers/usb/gadget/{ => function}/u_ether.c | 19 +- drivers/usb/gadget/{ => function}/u_ether.h | 2 + .../usb/gadget/{ => function}/u_ether_configfs.h | 0 drivers/usb/gadget/{ => function}/u_fs.h | 7 + drivers/usb/gadget/{ => function}/u_gether.h | 0 drivers/usb/gadget/{ => function}/u_ncm.h | 0 drivers/usb/gadget/{ => function}/u_phonet.h | 0 drivers/usb/gadget/{ => function}/u_rndis.h | 0 drivers/usb/gadget/{ => function}/u_serial.c | 0 drivers/usb/gadget/{ => function}/u_serial.h | 0 drivers/usb/gadget/{ => function}/u_uac1.c | 0 drivers/usb/gadget/{ => function}/u_uac1.h | 0 drivers/usb/gadget/{ => function}/uvc.h | 0 drivers/usb/gadget/{ => function}/uvc_queue.c | 0 drivers/usb/gadget/{ => function}/uvc_queue.h | 0 drivers/usb/gadget/{ => function}/uvc_v4l2.c | 0 drivers/usb/gadget/{ => function}/uvc_video.c | 0 drivers/usb/gadget/legacy/Kconfig | 475 +++ drivers/usb/gadget/legacy/Makefile | 44 + drivers/usb/gadget/{ => legacy}/acm_ms.c | 14 +- drivers/usb/gadget/{ => legacy}/audio.c | 12 +- drivers/usb/gadget/{ => legacy}/cdc2.c | 14 +- drivers/usb/gadget/{ => legacy}/dbgp.c | 0 drivers/usb/gadget/{ => legacy}/ether.c | 14 +- drivers/usb/gadget/{ => legacy}/g_ffs.c | 2 +- drivers/usb/gadget/{ => legacy}/gmidi.c | 13 +- drivers/usb/gadget/{ => legacy}/hid.c | 0 drivers/usb/gadget/{ => legacy}/inode.c | 0 drivers/usb/gadget/{ => legacy}/mass_storage.c | 0 drivers/usb/gadget/{ => legacy}/multi.c | 13 +- drivers/usb/gadget/{ => legacy}/ncm.c | 14 +- drivers/usb/gadget/{ => legacy}/nokia.c | 12 +- drivers/usb/gadget/{ => legacy}/printer.c | 0 drivers/usb/gadget/{ => legacy}/serial.c | 0 drivers/usb/gadget/{ => legacy}/tcm_usb_gadget.c | 0 drivers/usb/gadget/{ => legacy}/tcm_usb_gadget.h | 0 drivers/usb/gadget/{ => legacy}/webcam.c | 15 +- drivers/usb/gadget/{ => legacy}/zero.c | 14 +- drivers/usb/gadget/net2280.c | 2905 --------------- drivers/usb/gadget/net2280.h | 308 -- drivers/usb/gadget/u_os_desc.h | 59 +- drivers/usb/gadget/udc/Kconfig | 385 ++ drivers/usb/gadget/udc/Makefile | 31 + drivers/usb/gadget/{ => udc}/amd5536udc.c | 0 drivers/usb/gadget/{ => udc}/amd5536udc.h | 0 drivers/usb/gadget/{ => udc}/at91_udc.c | 0 drivers/usb/gadget/{ => udc}/at91_udc.h | 0 drivers/usb/gadget/{ => udc}/atmel_usba_udc.c | 2 +- drivers/usb/gadget/{ => udc}/atmel_usba_udc.h | 0 drivers/usb/gadget/{ => udc}/bcm63xx_udc.c | 0 drivers/usb/gadget/{ => udc}/dummy_hcd.c | 0 drivers/usb/gadget/{ => udc}/fotg210-udc.c | 0 drivers/usb/gadget/{ => udc}/fotg210.h | 0 drivers/usb/gadget/{ => udc}/fsl_mxc_udc.c | 2 + drivers/usb/gadget/{ => udc}/fsl_qe_udc.c | 19 +- drivers/usb/gadget/{ => udc}/fsl_qe_udc.h | 0 drivers/usb/gadget/{ => udc}/fsl_udc_core.c | 19 +- drivers/usb/gadget/{ => udc}/fsl_usb2_udc.h | 3 + drivers/usb/gadget/{ => udc}/fusb300_udc.c | 4 +- drivers/usb/gadget/{ => udc}/fusb300_udc.h | 0 drivers/usb/gadget/{ => udc}/gadget_chips.h | 0 drivers/usb/gadget/{ => udc}/goku_udc.c | 0 drivers/usb/gadget/{ => udc}/goku_udc.h | 0 drivers/usb/gadget/{ => udc}/gr_udc.c | 2 +- drivers/usb/gadget/{ => udc}/gr_udc.h | 0 drivers/usb/gadget/{ => udc}/lpc32xx_udc.c | 7 +- drivers/usb/gadget/{ => udc}/m66592-udc.c | 4 +- drivers/usb/gadget/{ => udc}/m66592-udc.h | 0 drivers/usb/gadget/{ => udc}/mv_u3d.h | 0 drivers/usb/gadget/{ => udc}/mv_u3d_core.c | 0 drivers/usb/gadget/{ => udc}/mv_udc.h | 0 drivers/usb/gadget/{ => udc}/mv_udc_core.c | 4 +- drivers/usb/gadget/{ => udc}/net2272.c | 2 +- drivers/usb/gadget/{ => udc}/net2272.h | 0 drivers/usb/gadget/udc/net2280.c | 3827 ++++++++++++++++++++ drivers/usb/gadget/udc/net2280.h | 403 +++ drivers/usb/gadget/{ => udc}/omap_udc.c | 5 +- drivers/usb/gadget/{ => udc}/omap_udc.h | 0 drivers/usb/gadget/{ => udc}/pch_udc.c | 0 drivers/usb/gadget/{ => udc}/pxa25x_udc.c | 75 +- drivers/usb/gadget/{ => udc}/pxa25x_udc.h | 0 drivers/usb/gadget/{ => udc}/pxa27x_udc.c | 6 + drivers/usb/gadget/{ => udc}/pxa27x_udc.h | 0 drivers/usb/gadget/{ => udc}/r8a66597-udc.c | 92 +- drivers/usb/gadget/{ => udc}/r8a66597-udc.h | 0 drivers/usb/gadget/{ => udc}/s3c-hsudc.c | 0 drivers/usb/gadget/{ => udc}/s3c2410_udc.c | 8 +- drivers/usb/gadget/{ => udc}/s3c2410_udc.h | 0 drivers/usb/gadget/{ => udc}/udc-core.c | 0 drivers/usb/host/Kconfig | 8 + drivers/usb/host/Makefile | 3 + drivers/usb/host/ehci-exynos.c | 2 +- drivers/usb/host/ehci-mem.c | 2 +- drivers/usb/host/ehci-msm.c | 2 +- drivers/usb/host/ehci-pci.c | 25 + drivers/usb/host/ehci-spear.c | 2 +- drivers/usb/host/ehci-tegra.c | 67 +- drivers/usb/host/fhci-dbg.c | 8 +- drivers/usb/host/fotg210-hcd.c | 48 +- drivers/usb/host/max3421-hcd.c | 48 +- drivers/usb/host/ohci-dbg.c | 9 +- drivers/usb/host/ohci-exynos.c | 2 +- drivers/usb/host/ohci-hcd.c | 381 +- drivers/usb/host/ohci-hub.c | 11 +- drivers/usb/host/ohci-mem.c | 1 + drivers/usb/host/ohci-q.c | 262 +- drivers/usb/host/ohci-spear.c | 2 +- drivers/usb/host/ohci.h | 23 +- drivers/usb/host/oxu210hp-hcd.c | 48 +- drivers/usb/host/uhci-grlib.c | 31 +- drivers/usb/host/uhci-hcd.c | 2 +- drivers/usb/host/uhci-platform.c | 22 +- drivers/usb/host/xhci-plat.c | 52 +- drivers/usb/host/xhci-rcar.c | 148 + drivers/usb/host/xhci-rcar.h | 27 + drivers/usb/host/xhci.c | 153 +- drivers/usb/misc/Kconfig | 7 + drivers/usb/misc/Makefile | 1 + drivers/usb/misc/lvstest.c | 460 +++ drivers/usb/misc/usb3503.c | 37 +- drivers/usb/musb/blackfin.c | 20 +- drivers/usb/musb/davinci.c | 20 +- drivers/usb/musb/jz4740.c | 3 + drivers/usb/musb/musb_core.c | 25 +- drivers/usb/musb/musb_core.h | 12 +- drivers/usb/musb/musb_cppi41.c | 59 +- drivers/usb/musb/musb_dsps.c | 104 +- drivers/usb/musb/musb_host.c | 18 +- drivers/usb/musb/musb_regs.h | 7 + drivers/usb/musb/tusb6010.c | 16 +- drivers/usb/musb/ux500.c | 28 +- drivers/usb/phy/phy-am335x.c | 12 +- drivers/usb/phy/phy-gpio-vbus-usb.c | 45 +- drivers/usb/phy/phy-msm-usb.c | 12 +- drivers/usb/phy/phy-tegra-usb.c | 11 +- drivers/usb/renesas_usbhs/Makefile | 2 +- drivers/usb/renesas_usbhs/common.c | 66 +- drivers/usb/renesas_usbhs/common.h | 2 + drivers/usb/renesas_usbhs/mod_gadget.c | 2 + drivers/usb/renesas_usbhs/pipe.c | 11 + drivers/usb/renesas_usbhs/pipe.h | 1 + drivers/usb/renesas_usbhs/rcar2.c | 77 + drivers/usb/renesas_usbhs/rcar2.h | 4 + drivers/usb/serial/cp210x.c | 3 - drivers/usb/serial/ftdi_sio.c | 82 +- drivers/usb/serial/kl5kusb105.c | 30 - drivers/usb/serial/mos7840.c | 5 +- include/dt-bindings/phy/phy-miphy365x.h | 14 + include/linux/phy/omap_control_phy.h | 10 + include/linux/phy/phy.h | 17 +- include/linux/usb/composite.h | 15 + include/linux/usb/renesas_usbhs.h | 6 + include/linux/usb/usb338x.h | 199 + include/linux/usb/xhci_pdriver.h | 27 + include/uapi/linux/usb/functionfs.h | 82 +- .../multibuff/device_app/aio_multibuff.c | 39 +- .../usb/ffs-aio-example/multibuff/host_app/test.c | 27 + .../ffs-aio-example/simple/device_app/aio_simple.c | 39 +- tools/usb/ffs-aio-example/simple/host_app/test.c | 27 + 255 files changed, 11106 insertions(+), 5755 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-usb-lvstest create mode 100644 Documentation/devicetree/bindings/phy/berlin-sata-phy.txt create mode 100644 Documentation/devicetree/bindings/phy/hix5hd2-phy.txt create mode 100644 Documentation/devicetree/bindings/phy/phy-miphy365x.txt create mode 100644 Documentation/devicetree/bindings/phy/qcom-apq8064-sata-phy.txt create mode 100644 Documentation/devicetree/bindings/phy/qcom-ipq806x-sata-phy.txt create mode 100644 drivers/phy/phy-berlin-sata.c create mode 100644 drivers/phy/phy-hix5hd2-sata.c create mode 100644 drivers/phy/phy-miphy365x.c create mode 100644 drivers/phy/phy-qcom-apq8064-sata.c create mode 100644 drivers/phy/phy-qcom-ipq806x-sata.c create mode 100644 drivers/usb/gadget/function/Makefile rename drivers/usb/gadget/{ => function}/f_acm.c (100%) rename drivers/usb/gadget/{ => function}/f_ecm.c (100%) rename drivers/usb/gadget/{ => function}/f_eem.c (97%) rename drivers/usb/gadget/{ => function}/f_fs.c (87%) rename drivers/usb/gadget/{ => function}/f_hid.c (100%) rename drivers/usb/gadget/{ => function}/f_loopback.c (100%) rename drivers/usb/gadget/{ => function}/f_mass_storage.c (100%) rename drivers/usb/gadget/{ => function}/f_mass_storage.h (100%) rename drivers/usb/gadget/{ => function}/f_midi.c (100%) rename drivers/usb/gadget/{ => function}/f_ncm.c (78%) rename drivers/usb/gadget/{ => function}/f_obex.c (100%) rename drivers/usb/gadget/{ => function}/f_phonet.c (100%) rename drivers/usb/gadget/{ => function}/f_rndis.c (99%) rename drivers/usb/gadget/{ => function}/f_serial.c (100%) rename drivers/usb/gadget/{ => function}/f_sourcesink.c (100%) rename drivers/usb/gadget/{ => function}/f_subset.c (100%) rename drivers/usb/gadget/{ => function}/f_uac1.c (100%) rename drivers/usb/gadget/{ => function}/f_uac2.c (98%) rename drivers/usb/gadget/{ => function}/f_uvc.c (100%) rename drivers/usb/gadget/{ => function}/f_uvc.h (100%) rename drivers/usb/gadget/{ => function}/g_zero.h (100%) rename drivers/usb/gadget/{ => function}/ndis.h (100%) rename drivers/usb/gadget/{ => function}/rndis.c (100%) rename drivers/usb/gadget/{ => function}/rndis.h (100%) rename drivers/usb/gadget/{ => function}/storage_common.c (100%) rename drivers/usb/gadget/{ => function}/storage_common.h (100%) rename drivers/usb/gadget/{ => function}/u_ecm.h (100%) rename drivers/usb/gadget/{ => function}/u_eem.h (100%) rename drivers/usb/gadget/{ => function}/u_ether.c (98%) rename drivers/usb/gadget/{ => function}/u_ether.h (99%) rename drivers/usb/gadget/{ => function}/u_ether_configfs.h (100%) rename drivers/usb/gadget/{ => function}/u_fs.h (96%) rename drivers/usb/gadget/{ => function}/u_gether.h (100%) rename drivers/usb/gadget/{ => function}/u_ncm.h (100%) rename drivers/usb/gadget/{ => function}/u_phonet.h (100%) rename drivers/usb/gadget/{ => function}/u_rndis.h (100%) rename drivers/usb/gadget/{ => function}/u_serial.c (100%) rename drivers/usb/gadget/{ => function}/u_serial.h (100%) rename drivers/usb/gadget/{ => function}/u_uac1.c (100%) rename drivers/usb/gadget/{ => function}/u_uac1.h (100%) rename drivers/usb/gadget/{ => function}/uvc.h (100%) rename drivers/usb/gadget/{ => function}/uvc_queue.c (100%) rename drivers/usb/gadget/{ => function}/uvc_queue.h (100%) rename drivers/usb/gadget/{ => function}/uvc_v4l2.c (100%) rename drivers/usb/gadget/{ => function}/uvc_video.c (100%) create mode 100644 drivers/usb/gadget/legacy/Kconfig create mode 100644 drivers/usb/gadget/legacy/Makefile rename drivers/usb/gadget/{ => legacy}/acm_ms.c (97%) rename drivers/usb/gadget/{ => legacy}/audio.c (95%) rename drivers/usb/gadget/{ => legacy}/cdc2.c (96%) rename drivers/usb/gadget/{ => legacy}/dbgp.c (100%) rename drivers/usb/gadget/{ => legacy}/ether.c (98%) rename drivers/usb/gadget/{ => legacy}/g_ffs.c (99%) rename drivers/usb/gadget/{ => legacy}/gmidi.c (95%) rename drivers/usb/gadget/{ => legacy}/hid.c (100%) rename drivers/usb/gadget/{ => legacy}/inode.c (100%) rename drivers/usb/gadget/{ => legacy}/mass_storage.c (100%) rename drivers/usb/gadget/{ => legacy}/multi.c (98%) rename drivers/usb/gadget/{ => legacy}/ncm.c (96%) rename drivers/usb/gadget/{ => legacy}/nokia.c (97%) rename drivers/usb/gadget/{ => legacy}/printer.c (100%) rename drivers/usb/gadget/{ => legacy}/serial.c (100%) rename drivers/usb/gadget/{ => legacy}/tcm_usb_gadget.c (100%) rename drivers/usb/gadget/{ => legacy}/tcm_usb_gadget.h (100%) rename drivers/usb/gadget/{ => legacy}/webcam.c (98%) rename drivers/usb/gadget/{ => legacy}/zero.c (98%) delete mode 100644 drivers/usb/gadget/net2280.c delete mode 100644 drivers/usb/gadget/net2280.h create mode 100644 drivers/usb/gadget/udc/Kconfig create mode 100644 drivers/usb/gadget/udc/Makefile rename drivers/usb/gadget/{ => udc}/amd5536udc.c (100%) rename drivers/usb/gadget/{ => udc}/amd5536udc.h (100%) rename drivers/usb/gadget/{ => udc}/at91_udc.c (100%) rename drivers/usb/gadget/{ => udc}/at91_udc.h (100%) rename drivers/usb/gadget/{ => udc}/atmel_usba_udc.c (99%) rename drivers/usb/gadget/{ => udc}/atmel_usba_udc.h (100%) rename drivers/usb/gadget/{ => udc}/bcm63xx_udc.c (100%) rename drivers/usb/gadget/{ => udc}/dummy_hcd.c (100%) rename drivers/usb/gadget/{ => udc}/fotg210-udc.c (100%) rename drivers/usb/gadget/{ => udc}/fotg210.h (100%) rename drivers/usb/gadget/{ => udc}/fsl_mxc_udc.c (99%) rename drivers/usb/gadget/{ => udc}/fsl_qe_udc.c (99%) rename drivers/usb/gadget/{ => udc}/fsl_qe_udc.h (100%) rename drivers/usb/gadget/{ => udc}/fsl_udc_core.c (99%) rename drivers/usb/gadget/{ => udc}/fsl_usb2_udc.h (99%) rename drivers/usb/gadget/{ => udc}/fusb300_udc.c (99%) rename drivers/usb/gadget/{ => udc}/fusb300_udc.h (100%) rename drivers/usb/gadget/{ => udc}/gadget_chips.h (100%) rename drivers/usb/gadget/{ => udc}/goku_udc.c (100%) rename drivers/usb/gadget/{ => udc}/goku_udc.h (100%) rename drivers/usb/gadget/{ => udc}/gr_udc.c (99%) rename drivers/usb/gadget/{ => udc}/gr_udc.h (100%) rename drivers/usb/gadget/{ => udc}/lpc32xx_udc.c (99%) rename drivers/usb/gadget/{ => udc}/m66592-udc.c (99%) rename drivers/usb/gadget/{ => udc}/m66592-udc.h (100%) rename drivers/usb/gadget/{ => udc}/mv_u3d.h (100%) rename drivers/usb/gadget/{ => udc}/mv_u3d_core.c (100%) rename drivers/usb/gadget/{ => udc}/mv_udc.h (100%) rename drivers/usb/gadget/{ => udc}/mv_udc_core.c (99%) rename drivers/usb/gadget/{ => udc}/net2272.c (99%) rename drivers/usb/gadget/{ => udc}/net2272.h (100%) create mode 100644 drivers/usb/gadget/udc/net2280.c create mode 100644 drivers/usb/gadget/udc/net2280.h rename drivers/usb/gadget/{ => udc}/omap_udc.c (99%) rename drivers/usb/gadget/{ => udc}/omap_udc.h (100%) rename drivers/usb/gadget/{ => udc}/pch_udc.c (100%) rename drivers/usb/gadget/{ => udc}/pxa25x_udc.c (97%) rename drivers/usb/gadget/{ => udc}/pxa25x_udc.h (100%) rename drivers/usb/gadget/{ => udc}/pxa27x_udc.c (99%) rename drivers/usb/gadget/{ => udc}/pxa27x_udc.h (100%) rename drivers/usb/gadget/{ => udc}/r8a66597-udc.c (96%) rename drivers/usb/gadget/{ => udc}/r8a66597-udc.h (100%) rename drivers/usb/gadget/{ => udc}/s3c-hsudc.c (100%) rename drivers/usb/gadget/{ => udc}/s3c2410_udc.c (99%) rename drivers/usb/gadget/{ => udc}/s3c2410_udc.h (100%) rename drivers/usb/gadget/{ => udc}/udc-core.c (100%) create mode 100644 drivers/usb/host/xhci-rcar.c create mode 100644 drivers/usb/host/xhci-rcar.h create mode 100644 drivers/usb/misc/lvstest.c create mode 100644 drivers/usb/renesas_usbhs/rcar2.c create mode 100644 drivers/usb/renesas_usbhs/rcar2.h create mode 100644 include/dt-bindings/phy/phy-miphy365x.h create mode 100644 include/linux/usb/usb338x.h create mode 100644 include/linux/usb/xhci_pdriver.h $ git am -3 ../patches/0001-phy-fix-up-for-devm_phy_create-api-change.patch Applying: phy: fix up for devm_phy_create api change $ git reset HEAD^ Unstaged changes after reset: M drivers/phy/phy-spear1310-miphy.c M drivers/phy/phy-spear1340-miphy.c M drivers/pinctrl/pinctrl-tegra-xusb.c $ git add -A . $ git commit -v -a --amend [master ff2645011712] Merge remote-tracking branch 'usb/usb-next' Merging usb-gadget/next (8346b33fad01 Documentation: DocBook: elieminate doc build break) $ git merge usb-gadget/next Already up-to-date. Merging usb-serial/usb-next (5bc9e5933a41 USB: kl5kusb105: Remove klsi_105_tiocmset function) $ git merge usb-serial/usb-next Already up-to-date. Merging staging/staging-next (bf6c0d110e0b Staging: rts5208: Replace custom macro with dev_dbg) $ git merge staging/staging-next Auto-merging kernel/time/alarmtimer.c Removing include/linux/platform_data/dsp-omap.h Auto-merging include/linux/device.h Auto-merging drivers/staging/wlan-ng/p80211netdev.c Removing drivers/staging/wlags49_h25/wl_wext.h Removing drivers/staging/wlags49_h25/wl_wext.c Removing drivers/staging/wlags49_h25/wl_version.h Removing drivers/staging/wlags49_h25/wl_util.h Removing drivers/staging/wlags49_h25/wl_util.c Removing drivers/staging/wlags49_h25/wl_profile.h Removing drivers/staging/wlags49_h25/wl_profile.c Removing drivers/staging/wlags49_h25/wl_priv.h Removing drivers/staging/wlags49_h25/wl_priv.c Removing drivers/staging/wlags49_h25/wl_netdev.h Removing drivers/staging/wlags49_h25/wl_netdev.c Removing drivers/staging/wlags49_h25/wl_main.h Removing drivers/staging/wlags49_h25/wl_main.c Removing drivers/staging/wlags49_h25/wl_internal.h Removing drivers/staging/wlags49_h25/wl_if.h Removing drivers/staging/wlags49_h25/wl_enc.h Removing drivers/staging/wlags49_h25/wl_enc.c Removing drivers/staging/wlags49_h25/wl_cs.h Removing drivers/staging/wlags49_h25/wl_cs.c Removing drivers/staging/wlags49_h25/sta_h25.c Removing drivers/staging/wlags49_h25/mmd.h Removing drivers/staging/wlags49_h25/mmd.c Removing drivers/staging/wlags49_h25/mdd.h Removing drivers/staging/wlags49_h25/hcfdef.h Removing drivers/staging/wlags49_h25/hcfcfg.h Removing drivers/staging/wlags49_h25/hcf.h Removing drivers/staging/wlags49_h25/hcf.c Removing drivers/staging/wlags49_h25/dhfcfg.h Removing drivers/staging/wlags49_h25/dhf.h Removing drivers/staging/wlags49_h25/dhf.c Removing drivers/staging/wlags49_h25/debug.h Removing drivers/staging/wlags49_h25/ap_h25.c Removing drivers/staging/wlags49_h25/TODO Removing drivers/staging/wlags49_h25/README.txt Removing drivers/staging/wlags49_h25/Makefile Removing drivers/staging/wlags49_h25/Kconfig Removing drivers/staging/wlags49_h2/wl_wext.h Removing drivers/staging/wlags49_h2/wl_wext.c Removing drivers/staging/wlags49_h2/wl_version.h Removing drivers/staging/wlags49_h2/wl_util.h Removing drivers/staging/wlags49_h2/wl_util.c Removing drivers/staging/wlags49_h2/wl_profile.h Removing drivers/staging/wlags49_h2/wl_profile.c Removing drivers/staging/wlags49_h2/wl_priv.h Removing drivers/staging/wlags49_h2/wl_priv.c Removing drivers/staging/wlags49_h2/wl_netdev.h Removing drivers/staging/wlags49_h2/wl_netdev.c Removing drivers/staging/wlags49_h2/wl_main.h Removing drivers/staging/wlags49_h2/wl_main.c Removing drivers/staging/wlags49_h2/wl_internal.h Removing drivers/staging/wlags49_h2/wl_if.h Removing drivers/staging/wlags49_h2/wl_enc.h Removing drivers/staging/wlags49_h2/wl_enc.c Removing drivers/staging/wlags49_h2/wl_cs.h Removing drivers/staging/wlags49_h2/wl_cs.c Removing drivers/staging/wlags49_h2/sta_h25.c Removing drivers/staging/wlags49_h2/sta_h2.c Removing drivers/staging/wlags49_h2/mmd.h Removing drivers/staging/wlags49_h2/mmd.c Removing drivers/staging/wlags49_h2/mdd.h Removing drivers/staging/wlags49_h2/man/wlags49.4 Removing drivers/staging/wlags49_h2/hcfdef.h Removing drivers/staging/wlags49_h2/hcfcfg.h Removing drivers/staging/wlags49_h2/hcf.h Removing drivers/staging/wlags49_h2/hcf.c Removing drivers/staging/wlags49_h2/dhfcfg.h Removing drivers/staging/wlags49_h2/dhf.h Removing drivers/staging/wlags49_h2/dhf.c Removing drivers/staging/wlags49_h2/debug.h Removing drivers/staging/wlags49_h2/ap_h25.c Removing drivers/staging/wlags49_h2/ap_h2.c Removing drivers/staging/wlags49_h2/WARNING.txt Removing drivers/staging/wlags49_h2/TODO Removing drivers/staging/wlags49_h2/README.wlags49 Removing drivers/staging/wlags49_h2/README.ubuntu Removing drivers/staging/wlags49_h2/Makefile Removing drivers/staging/wlags49_h2/Kconfig Removing drivers/staging/winbond/wbusb.c Removing drivers/staging/winbond/wbhal.h Removing drivers/staging/winbond/wb35tx_s.h Removing drivers/staging/winbond/wb35tx_f.h Removing drivers/staging/winbond/wb35tx.c Removing drivers/staging/winbond/wb35rx_s.h Removing drivers/staging/winbond/wb35rx_f.h Removing drivers/staging/winbond/wb35rx.c Removing drivers/staging/winbond/wb35reg_s.h Removing drivers/staging/winbond/wb35reg_f.h Removing drivers/staging/winbond/wb35reg.c Removing drivers/staging/winbond/sme_api.h Removing drivers/staging/winbond/reg.c Removing drivers/staging/winbond/phy_calibration.h Removing drivers/staging/winbond/phy_calibration.c Removing drivers/staging/winbond/mto.h Removing drivers/staging/winbond/mto.c Removing drivers/staging/winbond/mds_s.h Removing drivers/staging/winbond/mds_f.h Removing drivers/staging/winbond/mds.c Removing drivers/staging/winbond/mac_structures.h Removing drivers/staging/winbond/localpara.h Removing drivers/staging/winbond/core.h Removing drivers/staging/winbond/TODO Removing drivers/staging/winbond/Makefile Removing drivers/staging/winbond/Kconfig Removing drivers/staging/vt6656/wpactl.h Removing drivers/staging/vt6656/wpactl.c Removing drivers/staging/vt6656/wpa2.h Removing drivers/staging/vt6656/wpa2.c Removing drivers/staging/vt6656/wpa.h Removing drivers/staging/vt6656/wpa.c Removing drivers/staging/vt6656/wmgr.h Removing drivers/staging/vt6656/wmgr.c Removing drivers/staging/vt6656/wctl.h Removing drivers/staging/vt6656/wctl.c Removing drivers/staging/vt6656/vntconfiguration.dat Removing drivers/staging/vt6656/tmacro.h Removing drivers/staging/vt6656/tkip.h Removing drivers/staging/vt6656/tkip.c Removing drivers/staging/vt6656/tether.h Removing drivers/staging/vt6656/tether.c Removing drivers/staging/vt6656/rc4.h Removing drivers/staging/vt6656/rc4.c Removing drivers/staging/vt6656/michael.h Removing drivers/staging/vt6656/michael.c Removing drivers/staging/vt6656/iwctl.h Removing drivers/staging/vt6656/iwctl.c Removing drivers/staging/vt6656/iowpa.h Removing drivers/staging/vt6656/iocmd.h Removing drivers/staging/vt6656/datarate.h Removing drivers/staging/vt6656/datarate.c Removing drivers/staging/vt6656/country.h Removing drivers/staging/vt6656/bssdb.h Removing drivers/staging/vt6656/bssdb.c Removing drivers/staging/vt6656/80211mgr.h Removing drivers/staging/vt6656/80211mgr.c Removing drivers/staging/vt6656/80211hdr.h Auto-merging drivers/staging/vt6655/wpactl.c Auto-merging drivers/staging/vt6655/device_main.c Auto-merging drivers/staging/vt6655/bssdb.c Removing drivers/staging/unisys/visorchipset/controlvm_direct.c Removing drivers/staging/unisys/visorchipset/controlvm.h Removing drivers/staging/tidspbridge/rmgr/strm.c Removing drivers/staging/tidspbridge/rmgr/rmm.c Removing drivers/staging/tidspbridge/rmgr/pwr.c Removing drivers/staging/tidspbridge/rmgr/proc.c Removing drivers/staging/tidspbridge/rmgr/node.c Removing drivers/staging/tidspbridge/rmgr/nldr.c Removing drivers/staging/tidspbridge/rmgr/mgr.c Removing drivers/staging/tidspbridge/rmgr/dspdrv.c Removing drivers/staging/tidspbridge/rmgr/drv_interface.c Removing drivers/staging/tidspbridge/rmgr/drv.c Removing drivers/staging/tidspbridge/rmgr/disp.c Removing drivers/staging/tidspbridge/rmgr/dbdcd.c Removing drivers/staging/tidspbridge/pmgr/msgobj.h Removing drivers/staging/tidspbridge/pmgr/msg.c Removing drivers/staging/tidspbridge/pmgr/ioobj.h Removing drivers/staging/tidspbridge/pmgr/io.c Removing drivers/staging/tidspbridge/pmgr/dspapi.c Removing drivers/staging/tidspbridge/pmgr/dmm.c Removing drivers/staging/tidspbridge/pmgr/dev.c Removing drivers/staging/tidspbridge/pmgr/dbll.c Removing drivers/staging/tidspbridge/pmgr/cod.c Removing drivers/staging/tidspbridge/pmgr/cmm.c Removing drivers/staging/tidspbridge/pmgr/chnlobj.h Removing drivers/staging/tidspbridge/pmgr/chnl.c Removing drivers/staging/tidspbridge/include/dspbridge/wdt.h Removing drivers/staging/tidspbridge/include/dspbridge/uuidutil.h Removing drivers/staging/tidspbridge/include/dspbridge/sync.h Removing drivers/staging/tidspbridge/include/dspbridge/strmdefs.h Removing drivers/staging/tidspbridge/include/dspbridge/strm.h Removing drivers/staging/tidspbridge/include/dspbridge/rmstypes.h Removing drivers/staging/tidspbridge/include/dspbridge/rms_sh.h Removing drivers/staging/tidspbridge/include/dspbridge/rmm.h Removing drivers/staging/tidspbridge/include/dspbridge/resourcecleanup.h Removing drivers/staging/tidspbridge/include/dspbridge/pwr.h Removing drivers/staging/tidspbridge/include/dspbridge/procpriv.h Removing drivers/staging/tidspbridge/include/dspbridge/proc.h Removing drivers/staging/tidspbridge/include/dspbridge/ntfy.h Removing drivers/staging/tidspbridge/include/dspbridge/nodepriv.h Removing drivers/staging/tidspbridge/include/dspbridge/nodedefs.h Removing drivers/staging/tidspbridge/include/dspbridge/node.h Removing drivers/staging/tidspbridge/include/dspbridge/nldrdefs.h Removing drivers/staging/tidspbridge/include/dspbridge/nldr.h Removing drivers/staging/tidspbridge/include/dspbridge/msgdefs.h Removing drivers/staging/tidspbridge/include/dspbridge/msg.h Removing drivers/staging/tidspbridge/include/dspbridge/mgrpriv.h Removing drivers/staging/tidspbridge/include/dspbridge/mgr.h Removing drivers/staging/tidspbridge/include/dspbridge/memdefs.h Removing drivers/staging/tidspbridge/include/dspbridge/mbx_sh.h Removing drivers/staging/tidspbridge/include/dspbridge/io_sm.h Removing drivers/staging/tidspbridge/include/dspbridge/io.h Removing drivers/staging/tidspbridge/include/dspbridge/host_os.h Removing drivers/staging/tidspbridge/include/dspbridge/gh.h Removing drivers/staging/tidspbridge/include/dspbridge/getsection.h Removing drivers/staging/tidspbridge/include/dspbridge/dynamic_loader.h Removing drivers/staging/tidspbridge/include/dspbridge/dspmsg.h Removing drivers/staging/tidspbridge/include/dspbridge/dspioctl.h Removing drivers/staging/tidspbridge/include/dspbridge/dspio.h Removing drivers/staging/tidspbridge/include/dspbridge/dspdrv.h Removing drivers/staging/tidspbridge/include/dspbridge/dspdeh.h Removing drivers/staging/tidspbridge/include/dspbridge/dspdefs.h Removing drivers/staging/tidspbridge/include/dspbridge/dspchnl.h Removing drivers/staging/tidspbridge/include/dspbridge/dspapi.h Removing drivers/staging/tidspbridge/include/dspbridge/dspapi-ioctl.h Removing drivers/staging/tidspbridge/include/dspbridge/drv.h Removing drivers/staging/tidspbridge/include/dspbridge/dmm.h Removing drivers/staging/tidspbridge/include/dspbridge/disp.h Removing drivers/staging/tidspbridge/include/dspbridge/devdefs.h Removing drivers/staging/tidspbridge/include/dspbridge/dev.h Removing drivers/staging/tidspbridge/include/dspbridge/dblldefs.h Removing drivers/staging/tidspbridge/include/dspbridge/dbll.h Removing drivers/staging/tidspbridge/include/dspbridge/dbdefs.h Removing drivers/staging/tidspbridge/include/dspbridge/dbdcddef.h Removing drivers/staging/tidspbridge/include/dspbridge/dbdcd.h Removing drivers/staging/tidspbridge/include/dspbridge/cod.h Removing drivers/staging/tidspbridge/include/dspbridge/cmmdefs.h Removing drivers/staging/tidspbridge/include/dspbridge/cmm.h Removing drivers/staging/tidspbridge/include/dspbridge/clk.h Removing drivers/staging/tidspbridge/include/dspbridge/chnlpriv.h Removing drivers/staging/tidspbridge/include/dspbridge/chnldefs.h Removing drivers/staging/tidspbridge/include/dspbridge/chnl.h Removing drivers/staging/tidspbridge/include/dspbridge/cfgdefs.h Removing drivers/staging/tidspbridge/include/dspbridge/brddefs.h Removing drivers/staging/tidspbridge/include/dspbridge/_chnl_sm.h Removing drivers/staging/tidspbridge/hw/hw_mmu.h Removing drivers/staging/tidspbridge/hw/hw_mmu.c Removing drivers/staging/tidspbridge/hw/hw_defs.h Removing drivers/staging/tidspbridge/hw/MMURegAcM.h Removing drivers/staging/tidspbridge/hw/MMUAccInt.h Removing drivers/staging/tidspbridge/hw/EasiGlobal.h Removing drivers/staging/tidspbridge/gen/gh.c Removing drivers/staging/tidspbridge/dynload/tramp_table_c6000.c Removing drivers/staging/tidspbridge/dynload/tramp.c Removing drivers/staging/tidspbridge/dynload/reloc_table_c6000.c Removing drivers/staging/tidspbridge/dynload/reloc_table.h Removing drivers/staging/tidspbridge/dynload/reloc.c Removing drivers/staging/tidspbridge/dynload/params.h Removing drivers/staging/tidspbridge/dynload/module_list.h Removing drivers/staging/tidspbridge/dynload/header.h Removing drivers/staging/tidspbridge/dynload/getsection.c Removing drivers/staging/tidspbridge/dynload/doff.h Removing drivers/staging/tidspbridge/dynload/dload_internal.h Removing drivers/staging/tidspbridge/dynload/cload.c Removing drivers/staging/tidspbridge/core/wdt.c Removing drivers/staging/tidspbridge/core/ue_deh.c Removing drivers/staging/tidspbridge/core/tiomap_io.h Removing drivers/staging/tidspbridge/core/tiomap_io.c Removing drivers/staging/tidspbridge/core/tiomap3430_pwr.c Removing drivers/staging/tidspbridge/core/tiomap3430.c Removing drivers/staging/tidspbridge/core/sync.c Removing drivers/staging/tidspbridge/core/msg_sm.c Removing drivers/staging/tidspbridge/core/io_sm.c Removing drivers/staging/tidspbridge/core/dsp-clock.c Removing drivers/staging/tidspbridge/core/chnl_sm.c Removing drivers/staging/tidspbridge/core/_tiomap_pwr.h Removing drivers/staging/tidspbridge/core/_tiomap.h Removing drivers/staging/tidspbridge/core/_msg_sm.h Removing drivers/staging/tidspbridge/core/_deh.h Removing drivers/staging/tidspbridge/core/_cmm.h Removing drivers/staging/tidspbridge/TODO Removing drivers/staging/tidspbridge/Makefile Removing drivers/staging/tidspbridge/Kconfig Removing drivers/staging/tidspbridge/Documentation/error-codes Removing drivers/staging/tidspbridge/Documentation/README Removing drivers/staging/tidspbridge/Documentation/CONTRIBUTORS Removing drivers/staging/silicom/libbp_sd.h Removing drivers/staging/silicom/bypasslib/libbp_sd.h Removing drivers/staging/silicom/bypasslib/bypass.c Removing drivers/staging/silicom/bypasslib/bplibk.h Removing drivers/staging/silicom/bypasslib/bp_ioctl.h Removing drivers/staging/silicom/bypasslib/Makefile Removing drivers/staging/silicom/bypass.h Removing drivers/staging/silicom/bpctl_mod.c Removing drivers/staging/silicom/bp_mod.h Removing drivers/staging/silicom/bp_ioctl.h Removing drivers/staging/silicom/bits.h Removing drivers/staging/silicom/TODO Removing drivers/staging/silicom/README Removing drivers/staging/silicom/Makefile Removing drivers/staging/silicom/Kconfig Removing drivers/staging/serqt_usb2/serqt_usb2.c Removing drivers/staging/serqt_usb2/Makefile Removing drivers/staging/serqt_usb2/Kconfig Removing drivers/staging/sep/sep_trace_events.h Removing drivers/staging/sep/sep_main.c Removing drivers/staging/sep/sep_driver_hw_defs.h Removing drivers/staging/sep/sep_driver_config.h Removing drivers/staging/sep/sep_driver_api.h Removing drivers/staging/sep/sep_dev.h Removing drivers/staging/sep/sep_crypto.h Removing drivers/staging/sep/sep_crypto.c Removing drivers/staging/sep/TODO Removing drivers/staging/sep/Makefile Removing drivers/staging/sep/Kconfig Removing drivers/staging/rts5208/debug.h Auto-merging drivers/staging/rtl8723au/os_dep/usb_intf.c Removing drivers/staging/rtl8723au/include/rtw_ioctl_set.h Removing drivers/staging/rtl8723au/include/odm_RegDefine11AC.h Removing drivers/staging/rtl8723au/core/rtw_ioctl_set.c Removing drivers/staging/rtl8188eu/include/usb_vendor_req.h Removing drivers/staging/rtl8188eu/include/usb_osintf.h Removing drivers/staging/rtl8188eu/include/usb_ops.h Removing drivers/staging/rtl8188eu/include/rtw_version.h Removing drivers/staging/rtl8188eu/include/rtw_p2p.h Removing drivers/staging/rtl8188eu/include/rtw_mp_ioctl.h Removing drivers/staging/rtl8188eu/include/rtw_mp.h Removing drivers/staging/rtl8188eu/include/rtw_io.h Removing drivers/staging/rtl8188eu/include/rtw_br_ext.h Removing drivers/staging/rtl8188eu/include/rtl8188e_sreset.h Removing drivers/staging/rtl8188eu/include/cmd_osdep.h Removing drivers/staging/rtl8188eu/include/HalPhyRf.h Removing drivers/staging/rtl8188eu/include/Hal8188EReg.h Removing drivers/staging/rtl8188eu/hal/usb_ops_linux.c Removing drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c Removing drivers/staging/rtl8188eu/hal/rtl8188e_mp.c Removing drivers/staging/rtl8188eu/hal/HalPhyRf.c Removing drivers/staging/rtl8188eu/core/rtw_p2p.c Removing drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c Removing drivers/staging/rtl8188eu/core/rtw_mp.c Removing drivers/staging/rtl8188eu/core/rtw_io.c Removing drivers/staging/rtl8188eu/core/rtw_br_ext.c Removing drivers/staging/quickstart/quickstart.c Removing drivers/staging/quickstart/Makefile Removing drivers/staging/quickstart/Kconfig Removing drivers/staging/phison/phison.c Removing drivers/staging/phison/Makefile Removing drivers/staging/phison/Kconfig CONFLICT (modify/delete): drivers/staging/media/sn9c102/Kconfig deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/sn9c102/Kconfig left in tree. Removing drivers/staging/lustre/lustre/ptlrpc/gss/sec_gss.c Removing drivers/staging/lustre/lustre/ptlrpc/gss/lproc_gss.c Removing drivers/staging/lustre/lustre/ptlrpc/gss/gss_svc_upcall.c Removing drivers/staging/lustre/lustre/ptlrpc/gss/gss_rawobj.c Removing drivers/staging/lustre/lustre/ptlrpc/gss/gss_pipefs.c Removing drivers/staging/lustre/lustre/ptlrpc/gss/gss_mech_switch.c Removing drivers/staging/lustre/lustre/ptlrpc/gss/gss_krb5_mech.c Removing drivers/staging/lustre/lustre/ptlrpc/gss/gss_krb5.h Removing drivers/staging/lustre/lustre/ptlrpc/gss/gss_keyring.c Removing drivers/staging/lustre/lustre/ptlrpc/gss/gss_internal.h Removing drivers/staging/lustre/lustre/ptlrpc/gss/gss_generic_token.c Removing drivers/staging/lustre/lustre/ptlrpc/gss/gss_err.h Removing drivers/staging/lustre/lustre/ptlrpc/gss/gss_cli_upcall.c Removing drivers/staging/lustre/lustre/ptlrpc/gss/gss_bulk.c Removing drivers/staging/lustre/lustre/ptlrpc/gss/gss_asn1.h Removing drivers/staging/lustre/lustre/ptlrpc/gss/gss_api.h Removing drivers/staging/lustre/lustre/ptlrpc/gss/Makefile Auto-merging drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.h Removing drivers/staging/lustre/include/linux/libcfs/params_tree.h Removing drivers/staging/lustre/include/linux/libcfs/linux/linux-types.h Removing drivers/staging/lustre/include/linux/libcfs/linux/linux-tcpip.h Removing drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h Removing drivers/staging/lustre/include/linux/libcfs/linux/linux-lock.h Removing drivers/staging/lustre/include/linux/libcfs/linux/linux-bitops.h Removing drivers/staging/lustre/include/linux/libcfs/linux/kp30.h Removing drivers/staging/lustre/include/linux/libcfs/bitmap.h Removing drivers/staging/keucr/usb.h Removing drivers/staging/keucr/usb.c Removing drivers/staging/keucr/transport.h Removing drivers/staging/keucr/transport.c Removing drivers/staging/keucr/smscsi.c Removing drivers/staging/keucr/smilsub.c Removing drivers/staging/keucr/smilmain.c Removing drivers/staging/keucr/smilecc.c Removing drivers/staging/keucr/smil.h Removing drivers/staging/keucr/smcommon.h Removing drivers/staging/keucr/scsiglue.h Removing drivers/staging/keucr/scsiglue.c Removing drivers/staging/keucr/init.h Removing drivers/staging/keucr/init.c Removing drivers/staging/keucr/common.h Removing drivers/staging/keucr/TODO Removing drivers/staging/keucr/Makefile Removing drivers/staging/keucr/Kconfig Auto-merging drivers/staging/imx-drm/imx-drm-core.c Auto-merging drivers/staging/iio/magnetometer/hmc5843_core.c Auto-merging drivers/staging/gdm72xx/gdm_wimax.c Auto-merging drivers/staging/gdm724x/gdm_lte.c Removing drivers/staging/ft1000/ft1000-usb/ft1000_proc.c Removing drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c Removing drivers/staging/frontier/tranzport.c Removing drivers/staging/frontier/alphatrack.h Removing drivers/staging/frontier/alphatrack.c Removing drivers/staging/frontier/TODO Removing drivers/staging/frontier/README Removing drivers/staging/frontier/Makefile Removing drivers/staging/frontier/Kconfig Removing drivers/staging/dgrp/drp.h Removing drivers/staging/dgrp/digirp.h CONFLICT (modify/delete): drivers/staging/dgrp/dgrp_tty.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/dgrp/dgrp_tty.c left in tree. Removing drivers/staging/dgrp/dgrp_sysfs.c Removing drivers/staging/dgrp/dgrp_specproc.c Removing drivers/staging/dgrp/dgrp_ports_ops.c Removing drivers/staging/dgrp/dgrp_net_ops.c Removing drivers/staging/dgrp/dgrp_mon_ops.c Removing drivers/staging/dgrp/dgrp_driver.c Removing drivers/staging/dgrp/dgrp_dpa_ops.c Removing drivers/staging/dgrp/dgrp_common.h Removing drivers/staging/dgrp/dgrp_common.c Removing drivers/stagingRecorded preimage for 'MAINTAINERS' /dgrp/TODO Removing drivers/staging/dgrp/README Removing drivers/staging/dgrp/Makefile Removing drivers/staging/dgrp/Kconfig Removing drivers/staging/cxt1e1/sbew_ioc.h Removing drivers/staging/cxt1e1/sbeproc.h Removing drivers/staging/cxt1e1/sbeproc.c Removing drivers/staging/cxt1e1/sbeid.c Removing drivers/staging/cxt1e1/sbecrc.c Removing drivers/staging/cxt1e1/sbecom_inline_linux.h Removing drivers/staging/cxt1e1/sbe_promformat.h Removing drivers/staging/cxt1e1/sbe_bid.h Removing drivers/staging/cxt1e1/pmcc4_sysdep.h Removing drivers/staging/cxt1e1/pmcc4_private.h Removing drivers/staging/cxt1e1/pmcc4_ioctls.h Removing drivers/staging/cxt1e1/pmcc4_drv.c Removing drivers/staging/cxt1e1/pmcc4_defs.h Removing drivers/staging/cxt1e1/pmcc4_cpld.h Removing drivers/staging/cxt1e1/pmcc4.h Removing drivers/staging/cxt1e1/pmc93x6_eeprom.h Removing drivers/staging/cxt1e1/pmc93x6_eeprom.c Removing drivers/staging/cxt1e1/musycc.h Removing drivers/staging/cxt1e1/musycc.c CONFLICT (modify/delete): drivers/staging/cxt1e1/linux.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/cxt1e1/linux.c left in tree. Removing drivers/staging/cxt1e1/libsbew.h Removing drivers/staging/cxt1e1/hwprobe.c Removing drivers/staging/cxt1e1/functions.c Removing drivers/staging/cxt1e1/comet_tables.h Removing drivers/staging/cxt1e1/comet_tables.c Removing drivers/staging/cxt1e1/comet.h Removing drivers/staging/cxt1e1/comet.c Removing drivers/staging/cxt1e1/Makefile Removing drivers/staging/cxt1e1/Kconfig Removing drivers/staging/crystalhd/crystalhd_misc.h Removing drivers/staging/crystalhd/crystalhd_misc.c Removing drivers/staging/crystalhd/crystalhd_lnx.h Removing drivers/staging/crystalhd/crystalhd_lnx.c Removing drivers/staging/crystalhd/crystalhd_hw.h Removing drivers/staging/crystalhd/crystalhd_hw.c Removing drivers/staging/crystalhd/crystalhd_fw_if.h Removing drivers/staging/crystalhd/crystalhd_cmds.h Removing drivers/staging/crystalhd/crystalhd_cmds.c Removing drivers/staging/crystalhd/crystalhd.h Removing drivers/staging/crystalhd/bcm_70012_regs.h Removing drivers/staging/crystalhd/bc_dts_glob_lnx.h Removing drivers/staging/crystalhd/bc_dts_defs.h Removing drivers/staging/crystalhd/TODO Removing drivers/staging/crystalhd/Makefile Removing drivers/staging/crystalhd/Kconfig Removing drivers/staging/ced1401/userspace/use1401.c Removing drivers/staging/ced1401/use14_ioc.h Removing drivers/staging/ced1401/use1401.h Removing drivers/staging/ced1401/usb1401.h Removing drivers/staging/ced1401/usb1401.c Removing drivers/staging/ced1401/machine.h Removing drivers/staging/ced1401/ced_ioctl.h Removing drivers/staging/ced1401/ced_ioc.c Removing drivers/staging/ced1401/TODO Removing drivers/staging/ced1401/Makefile Removing drivers/staging/ced1401/Kconfig Auto-merging drivers/staging/android/sync.c Auto-merging drivers/staging/android/Kconfig Auto-merging drivers/iio/industrialio-event.c Auto-merging drivers/iio/industrialio-buffer.c Auto-merging drivers/iio/adc/ad7291.c Auto-merging drivers/iio/accel/mma8452.c Removing arch/arm/mach-omap2/dsp.c Auto-merging arch/arm/mach-omap2/Makefile Auto-merging arch/arm/boot/dts/exynos3250.dtsi Auto-merging MAINTAINERS CONFLICT (content): Merge conflict in MAINTAINERS Auto-merging Documentation/kernel-parameters.txt Auto-merging Documentation/devicetree/bindings/i2c/trivial-devices.txt Automatic merge failed; fix conflicts and then commit the result. $ git rm -f drivers/staging/dgrp/dgrp_tty.c drivers/staging/cxt1e1/linux.c drivers/staging/media/sn9c102/Kconfig drivers/staging/cxt1e1/linux.c: needs merge drivers/staging/dgrp/dgrp_tty.c: needs merge drivers/staging/media/sn9c102/Kconfig: needs merge rm 'drivers/staging/cxt1e1/linux.c' rm 'drivers/staging/dgrp/dgrp_tty.c' rm 'drivers/staging/media/sn9c102/Kconfig' $ git commit -v -a Recorded resolution for 'MAINTAINERS'. [master 7271e81d68ac] Merge remote-tracking branch 'staging/staging-next' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/sysfs-bus-iio | 95 + .../ABI/testing}/sysfs-bus-iio-trigger-sysfs | 0 .../devicetree/bindings/arm/samsung/exynos-adc.txt | 25 +- .../devicetree/bindings/i2c/trivial-devices.txt | 1 + .../devicetree/bindings/iio/adc/max1027-adc.txt | 22 + .../bindings/iio/magnetometer/hmc5843.txt | 4 + .../devicetree/bindings/iio/st-sensors.txt | 54 + Documentation/kernel-parameters.txt | 4 - MAINTAINERS | 67 +- arch/arm/boot/dts/exynos3250.dtsi | 5 +- arch/arm/mach-omap2/Makefile | 4 - arch/arm/mach-omap2/common.c | 2 - arch/arm/mach-omap2/dsp.c | 134 - .../cavium-octeon/executive/cvmx-helper-sgmii.c | 12 +- arch/mips/configs/cavium_octeon_defconfig | 1 - arch/parisc/configs/generic-64bit_defconfig | 1 - arch/powerpc/configs/85xx/kmp204x_defconfig | 1 - drivers/base/devres.c | 55 + drivers/iio/accel/Kconfig | 12 + drivers/iio/accel/Makefile | 1 + drivers/iio/accel/kxcjk-1013.c | 764 ++ drivers/iio/accel/mma8452.c | 6 + drivers/iio/accel/st_accel_core.c | 12 +- drivers/iio/accel/st_accel_i2c.c | 51 + drivers/iio/adc/Kconfig | 19 + drivers/iio/adc/Makefile | 2 + drivers/{staging => }/iio/adc/ad7291.c | 107 +- drivers/iio/adc/ad7298.c | 21 +- drivers/iio/adc/ad7476.c | 5 +- drivers/iio/adc/ad7887.c | 21 +- drivers/iio/adc/ad799x.c | 507 +- drivers/iio/adc/ad_sigma_delta.c | 2 +- drivers/iio/adc/at91_adc.c | 2 +- drivers/iio/adc/exynos_adc.c | 335 +- drivers/iio/adc/max1027.c | 521 ++ drivers/iio/adc/xilinx-xadc-core.c | 2 +- drivers/iio/adc/xilinx-xadc-events.c | 6 - .../iio/common/hid-sensors/hid-sensor-attributes.c | 5 +- drivers/iio/common/st_sensors/st_sensors_core.c | 64 +- drivers/iio/common/st_sensors/st_sensors_i2c.c | 30 + drivers/iio/dac/Kconfig | 10 + drivers/iio/dac/Makefile | 1 + drivers/iio/dac/ad5504.c | 16 +- drivers/iio/dac/ad5624r_spi.c | 5 +- drivers/iio/dac/ad5686.c | 3 +- drivers/iio/dac/ad5791.c | 29 +- drivers/iio/dac/mcp4922.c | 216 + drivers/iio/gyro/adis16260.c | 124 +- drivers/iio/gyro/itg3200_core.c | 101 +- drivers/iio/gyro/st_gyro_core.c | 12 +- drivers/iio/gyro/st_gyro_i2c.c | 39 + drivers/iio/imu/adis16400_buffer.c | 3 +- drivers/iio/imu/adis16400_core.c | 78 +- drivers/iio/imu/adis16480.c | 82 +- drivers/iio/industrialio-buffer.c | 5 +- drivers/iio/industrialio-core.c | 4 + drivers/iio/industrialio-event.c | 1 + drivers/iio/industrialio-trigger.c | 8 +- drivers/iio/light/Kconfig | 24 + drivers/iio/light/Makefile | 2 + drivers/iio/light/cm32181.c | 11 +- drivers/iio/light/gp2ap020a00f.c | 2 +- drivers/iio/light/isl29125.c | 347 + drivers/iio/light/tcs3414.c | 405 ++ drivers/iio/magnetometer/Kconfig | 10 + drivers/iio/magnetometer/Makefile | 1 + drivers/iio/magnetometer/ak09911.c | 326 + drivers/iio/magnetometer/ak8975.c | 58 +- drivers/iio/magnetometer/hid-sensor-magn-3d.c | 202 +- drivers/iio/magnetometer/st_magn_core.c | 12 +- drivers/iio/magnetometer/st_magn_i2c.c | 23 + drivers/iio/pressure/Kconfig | 10 + drivers/iio/pressure/Makefile | 1 + drivers/iio/pressure/st_pressure_core.c | 27 +- drivers/iio/pressure/st_pressure_i2c.c | 23 + drivers/iio/pressure/t5403.c | 275 + drivers/iio/proximity/as3935.c | 2 +- drivers/iio/trigger/iio-trig-interrupt.c | 3 +- drivers/iio/trigger/iio-trig-sysfs.c | 2 +- drivers/staging/Kconfig | 32 +- drivers/staging/Makefile | 17 +- drivers/staging/android/Kconfig | 2 +- drivers/staging/android/alarm-dev.c | 2 +- drivers/staging/android/binder.c | 225 +- drivers/staging/android/ion/Kconfig | 2 +- drivers/staging/android/ion/ion.h | 1 - drivers/staging/android/ion/ion_chunk_heap.c | 2 +- drivers/staging/android/ion/ion_cma_heap.c | 9 +- drivers/staging/android/ion/ion_system_heap.c | 71 +- drivers/staging/android/logger.c | 7 +- drivers/staging/android/sync.c | 3 +- drivers/staging/android/timed_output.c | 4 +- drivers/staging/bcm/Bcmchar.c | 2 +- drivers/staging/bcm/CmHost.c | 3 +- drivers/staging/bcm/DDRInit.c | 338 +- drivers/staging/bcm/HandleControlPacket.c | 24 +- drivers/staging/bcm/IPv6Protocol.c | 217 +- drivers/staging/bcm/InterfaceDld.c | 1 + drivers/staging/bcm/InterfaceInit.c | 304 +- drivers/staging/bcm/InterfaceMisc.c | 126 +- drivers/staging/bcm/InterfaceRx.c | 206 +- drivers/staging/bcm/InterfaceTx.c | 185 +- drivers/staging/bcm/LeakyBucket.c | 312 +- drivers/staging/bcm/Misc.c | 27 +- drivers/staging/bcm/PHSModule.c | 1099 +-- drivers/staging/bcm/PHSModule.h | 25 +- drivers/staging/bcm/Prototypes.h | 89 +- drivers/staging/bcm/Qos.c | 1053 ++- drivers/staging/bcm/Queue.h | 46 +- drivers/staging/bcm/TODO | 4 + drivers/staging/bcm/Transmit.c | 88 +- drivers/staging/bcm/hostmibs.c | 62 +- drivers/staging/bcm/led_control.c | 668 +- drivers/staging/bcm/led_control.h | 16 +- drivers/staging/bcm/nvm.c | 146 +- drivers/staging/board/Kconfig | 9 + drivers/staging/board/Makefile | 2 + drivers/staging/board/TODO | 2 + drivers/staging/board/board.c | 41 + drivers/staging/board/board.h | 20 + drivers/staging/board/kzm9d.c | 19 + drivers/staging/ced1401/Kconfig | 6 - drivers/staging/ced1401/Makefile | 3 - drivers/staging/ced1401/TODO | 10 - drivers/staging/ced1401/ced_ioc.c | 1494 ---- drivers/staging/ced1401/ced_ioctl.h | 336 - drivers/staging/ced1401/machine.h | 119 - drivers/staging/ced1401/usb1401.c | 1582 ---- drivers/staging/ced1401/usb1401.h | 246 - drivers/staging/ced1401/use1401.h | 288 - drivers/staging/ced1401/use14_ioc.h | 299 - drivers/staging/ced1401/userspace/use1401.c | 3035 -------- drivers/staging/comedi/Kconfig | 24 +- drivers/staging/comedi/comedi.h | 127 +- drivers/staging/comedi/comedi_compat32.c | 28 +- drivers/staging/comedi/comedi_compat32.h | 3 +- drivers/staging/comedi/comedi_fops.c | 93 +- drivers/staging/comedi/comedi_internal.h | 1 + drivers/staging/comedi/comedidev.h | 152 +- drivers/staging/comedi/drivers.c | 9 +- drivers/staging/comedi/drivers/8253.h | 6 +- drivers/staging/comedi/drivers/8255.c | 3 +- drivers/staging/comedi/drivers/8255_pci.c | 27 +- drivers/staging/comedi/drivers/Makefile | 4 +- .../staging/comedi/drivers/addi-data/addi_common.c | 10 +- .../staging/comedi/drivers/addi-data/addi_common.h | 20 - .../comedi/drivers/addi-data/hwdrv_apci035.c | 9 +- .../comedi/drivers/addi-data/hwdrv_apci1500.c | 7 +- .../comedi/drivers/addi-data/hwdrv_apci1564.c | 313 +- .../comedi/drivers/addi-data/hwdrv_apci3120.c | 61 +- .../comedi/drivers/addi-data/hwdrv_apci3200.c | 228 +- drivers/staging/comedi/drivers/addi_apci_035.c | 2 +- drivers/staging/comedi/drivers/addi_apci_1500.c | 2 +- drivers/staging/comedi/drivers/addi_apci_1564.c | 386 +- drivers/staging/comedi/drivers/addi_apci_3120.c | 11 +- drivers/staging/comedi/drivers/addi_apci_3200.c | 8 +- drivers/staging/comedi/drivers/addi_apci_3501.c | 2 +- drivers/staging/comedi/drivers/addi_apci_3xxx.c | 84 +- drivers/staging/comedi/drivers/adl_pci9111.c | 101 +- drivers/staging/comedi/drivers/adl_pci9118.c | 161 +- drivers/staging/comedi/drivers/adq12b.c | 148 +- drivers/staging/comedi/drivers/adv_pci1710.c | 22 +- drivers/staging/comedi/drivers/adv_pci1723.c | 5 +- drivers/staging/comedi/drivers/adv_pci1724.c | 15 +- drivers/staging/comedi/drivers/adv_pci_dio.c | 11 +- drivers/staging/comedi/drivers/aio_iiro_16.c | 3 +- drivers/staging/comedi/drivers/amcc_s5933.h | 8 +- drivers/staging/comedi/drivers/amplc_dio200.c | 3 +- drivers/staging/comedi/drivers/amplc_dio200.h | 13 - .../staging/comedi/drivers/amplc_dio200_common.c | 45 +- drivers/staging/comedi/drivers/amplc_dio200_pci.c | 45 +- drivers/staging/comedi/drivers/amplc_pc236.c | 591 +- drivers/staging/comedi/drivers/amplc_pc236.h | 42 + .../staging/comedi/drivers/amplc_pc236_common.c | 206 + drivers/staging/comedi/drivers/amplc_pc263.c | 7 +- drivers/staging/comedi/drivers/amplc_pci224.c | 26 +- drivers/staging/comedi/drivers/amplc_pci230.c | 1310 ++-- drivers/staging/comedi/drivers/amplc_pci236.c | 161 + drivers/staging/comedi/drivers/amplc_pci263.c | 11 +- drivers/staging/comedi/drivers/cb_das16_cs.c | 2 - drivers/staging/comedi/drivers/cb_pcidas.c | 24 +- drivers/staging/comedi/drivers/cb_pcidas64.c | 154 +- drivers/staging/comedi/drivers/cb_pcimdas.c | 3 - drivers/staging/comedi/drivers/comedi_test.c | 6 +- drivers/staging/comedi/drivers/contec_pci_dio.c | 4 +- drivers/staging/comedi/drivers/daqboard2000.c | 87 +- drivers/staging/comedi/drivers/das08.c | 3 +- drivers/staging/comedi/drivers/das08_pci.c | 4 +- drivers/staging/comedi/drivers/das16.c | 16 +- drivers/staging/comedi/drivers/das16m1.c | 13 +- drivers/staging/comedi/drivers/das1800.c | 120 +- drivers/staging/comedi/drivers/das800.c | 3 +- drivers/staging/comedi/drivers/dmm32at.c | 13 +- drivers/staging/comedi/drivers/dt2801.c | 5 +- drivers/staging/comedi/drivers/dt2811.c | 4 +- drivers/staging/comedi/drivers/dt2814.c | 12 +- drivers/staging/comedi/drivers/dt2815.c | 5 +- drivers/staging/comedi/drivers/dt2817.c | 4 +- drivers/staging/comedi/drivers/dt282x.c | 1351 ++-- drivers/staging/comedi/drivers/dt3000.c | 117 +- drivers/staging/comedi/drivers/dt9812.c | 1 + drivers/staging/comedi/drivers/gsc_hpdi.c | 44 +- drivers/staging/comedi/drivers/icp_multi.c | 94 +- drivers/staging/comedi/drivers/ii_pci20kc.c | 42 +- drivers/staging/comedi/drivers/jr3_pci.c | 5 +- drivers/staging/comedi/drivers/ke_counter.c | 66 +- drivers/staging/comedi/drivers/me4000.c | 1 - drivers/staging/comedi/drivers/me_daq.c | 67 +- drivers/staging/comedi/drivers/mf6x4.c | 47 +- drivers/staging/comedi/drivers/mite.c | 46 +- drivers/staging/comedi/drivers/mite.h | 136 +- drivers/staging/comedi/drivers/mpc624.c | 5 +- drivers/staging/comedi/drivers/multiq3.c | 8 +- drivers/staging/comedi/drivers/ni_6527.c | 154 +- drivers/staging/comedi/drivers/ni_65xx.c | 797 ++- drivers/staging/comedi/drivers/ni_660x.c | 67 +- drivers/staging/comedi/drivers/ni_670x.c | 68 +- drivers/staging/comedi/drivers/ni_at_a2150.c | 254 +- drivers/staging/comedi/drivers/ni_atmio.c | 392 +- drivers/staging/comedi/drivers/ni_atmio16d.c | 14 +- drivers/staging/comedi/drivers/ni_daq_700.c | 89 +- drivers/staging/comedi/drivers/ni_labpc.c | 231 +- drivers/staging/comedi/drivers/ni_labpc.h | 7 +- drivers/staging/comedi/drivers/ni_labpc_isadma.c | 2 +- drivers/staging/comedi/drivers/ni_labpc_pci.c | 51 +- drivers/staging/comedi/drivers/ni_mio_common.c | 5866 +++++++-------- drivers/staging/comedi/drivers/ni_mio_cs.c | 107 +- drivers/staging/comedi/drivers/ni_pcidio.c | 374 +- drivers/staging/comedi/drivers/ni_pcimio.c | 775 +- drivers/staging/comedi/drivers/ni_stc.h | 187 +- drivers/staging/comedi/drivers/ni_tio.c | 1739 ++--- drivers/staging/comedi/drivers/ni_tio.h | 4 +- drivers/staging/comedi/drivers/ni_tio_internal.h | 387 +- drivers/staging/comedi/drivers/ni_tiocmd.c | 140 +- drivers/staging/comedi/drivers/pcl711.c | 2 +- drivers/staging/comedi/drivers/pcl724.c | 11 +- drivers/staging/comedi/drivers/pcl730.c | 21 +- drivers/staging/comedi/drivers/pcl812.c | 2 +- drivers/staging/comedi/drivers/pcl816.c | 118 +- drivers/staging/comedi/drivers/pcl818.c | 9 +- drivers/staging/comedi/drivers/pcm3724.c | 18 +- drivers/staging/comedi/drivers/pcmuio.c | 1 + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 12 +- drivers/staging/comedi/drivers/rtd520.c | 207 +- drivers/staging/comedi/drivers/rti800.c | 4 +- drivers/staging/comedi/drivers/s526.c | 6 +- drivers/staging/comedi/drivers/s626.c | 890 +-- drivers/staging/comedi/drivers/s626.h | 28 +- drivers/staging/comedi/drivers/serial2002.c | 112 +- drivers/staging/comedi/drivers/skel.c | 9 +- drivers/staging/comedi/drivers/unioxx5.c | 3 +- drivers/staging/comedi/drivers/usbdux.c | 12 +- drivers/staging/comedi/drivers/usbduxfast.c | 8 +- drivers/staging/comedi/drivers/usbduxsigma.c | 14 +- drivers/staging/comedi/drivers/vmk80xx.c | 1 - drivers/staging/cptm1217/clearpad_tm1217.c | 15 +- drivers/staging/crystalhd/Kconfig | 6 - drivers/staging/crystalhd/Makefile | 6 - drivers/staging/crystalhd/TODO | 15 - drivers/staging/crystalhd/bc_dts_defs.h | 572 -- drivers/staging/crystalhd/bc_dts_glob_lnx.h | 300 - drivers/staging/crystalhd/bcm_70012_regs.h | 758 -- drivers/staging/crystalhd/crystalhd.h | 13 - drivers/staging/crystalhd/crystalhd_cmds.c | 1066 --- drivers/staging/crystalhd/crystalhd_cmds.h | 92 - drivers/staging/crystalhd/crystalhd_fw_if.h | 370 - drivers/staging/crystalhd/crystalhd_hw.c | 2458 ------- drivers/staging/crystalhd/crystalhd_hw.h | 407 -- drivers/staging/crystalhd/crystalhd_lnx.c | 782 -- drivers/staging/crystalhd/crystalhd_lnx.h | 93 - drivers/staging/crystalhd/crystalhd_misc.c | 1044 --- drivers/staging/crystalhd/crystalhd_misc.h | 232 - drivers/staging/cxt1e1/Kconfig | 21 - drivers/staging/cxt1e1/Makefile | 18 - drivers/staging/cxt1e1/comet.c | 596 -- drivers/staging/cxt1e1/comet.h | 353 - drivers/staging/cxt1e1/comet_tables.c | 538 -- drivers/staging/cxt1e1/comet_tables.h | 61 - drivers/staging/cxt1e1/functions.c | 318 - drivers/staging/cxt1e1/hwprobe.c | 382 - drivers/staging/cxt1e1/libsbew.h | 549 -- drivers/staging/cxt1e1/linux.c | 1143 --- drivers/staging/cxt1e1/musycc.c | 1720 ----- drivers/staging/cxt1e1/musycc.h | 427 -- drivers/staging/cxt1e1/pmc93x6_eeprom.c | 532 -- drivers/staging/cxt1e1/pmc93x6_eeprom.h | 39 - drivers/staging/cxt1e1/pmcc4.h | 108 - drivers/staging/cxt1e1/pmcc4_cpld.h | 91 - drivers/staging/cxt1e1/pmcc4_defs.h | 68 - drivers/staging/cxt1e1/pmcc4_drv.c | 1613 ----- drivers/staging/cxt1e1/pmcc4_ioctls.h | 65 - drivers/staging/cxt1e1/pmcc4_private.h | 295 - drivers/staging/cxt1e1/pmcc4_sysdep.h | 63 - drivers/staging/cxt1e1/sbe_bid.h | 47 - drivers/staging/cxt1e1/sbe_promformat.h | 130 - drivers/staging/cxt1e1/sbecom_inline_linux.h | 193 - drivers/staging/cxt1e1/sbecrc.c | 133 - drivers/staging/cxt1e1/sbeid.c | 205 - drivers/staging/cxt1e1/sbeproc.c | 219 - drivers/staging/cxt1e1/sbeproc.h | 42 - drivers/staging/cxt1e1/sbew_ioc.h | 81 - drivers/staging/dgap/dgap.c | 662 +- drivers/staging/dgap/dgap.h | 2 - drivers/staging/dgnc/dgnc_cls.c | 5 +- drivers/staging/dgnc/dgnc_driver.c | 18 +- drivers/staging/dgnc/dgnc_driver.h | 57 +- drivers/staging/dgnc/dgnc_sysfs.c | 20 +- drivers/staging/dgnc/dgnc_trace.c | 131 - drivers/staging/dgnc/dgnc_trace.h | 10 - drivers/staging/dgnc/dgnc_tty.c | 52 +- drivers/staging/dgnc/digi.h | 35 +- drivers/staging/dgrp/Kconfig | 9 - drivers/staging/dgrp/Makefile | 12 - drivers/staging/dgrp/README | 2 - drivers/staging/dgrp/TODO | 13 - drivers/staging/dgrp/dgrp_common.c | 169 - drivers/staging/dgrp/dgrp_common.h | 150 - drivers/staging/dgrp/dgrp_dpa_ops.c | 534 -- drivers/staging/dgrp/dgrp_driver.c | 105 - drivers/staging/dgrp/dgrp_mon_ops.c | 327 - drivers/staging/dgrp/dgrp_net_ops.c | 3666 ---------- drivers/staging/dgrp/dgrp_ports_ops.c | 156 - drivers/staging/dgrp/dgrp_specproc.c | 541 -- drivers/staging/dgrp/dgrp_sysfs.c | 558 -- drivers/staging/dgrp/dgrp_tty.c | 3327 --------- drivers/staging/dgrp/digirp.h | 129 - drivers/staging/dgrp/drp.h | 693 -- drivers/staging/emxx_udc/Kconfig | 10 + drivers/staging/emxx_udc/Makefile | 1 + drivers/staging/emxx_udc/TODO | 4 + drivers/staging/emxx_udc/emxx_udc.c | 3520 +++++++++ drivers/staging/emxx_udc/emxx_udc.h | 653 ++ drivers/staging/et131x/et131x.c | 26 +- drivers/staging/et131x/et131x.h | 46 +- drivers/staging/frontier/Kconfig | 5 - drivers/staging/frontier/Makefile | 2 - drivers/staging/frontier/README | 47 - drivers/staging/frontier/TODO | 9 - drivers/staging/frontier/alphatrack.c | 849 --- drivers/staging/frontier/alphatrack.h | 78 - drivers/staging/frontier/tranzport.c | 973 --- drivers/staging/ft1000/ft1000-pcmcia/Makefile | 3 +- drivers/staging/ft1000/ft1000-pcmcia/ft1000.h | 2 - drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c | 4 +- drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 4 - drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c | 211 - drivers/staging/ft1000/ft1000-usb/Makefile | 2 +- drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 6 +- drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 25 +- drivers/staging/ft1000/ft1000-usb/ft1000_proc.c | 241 - drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 8 - drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 5 +- drivers/staging/ft1000/ft1000.h | 2 - drivers/staging/fwserial/fwserial.c | 6 +- drivers/staging/gdm724x/gdm_lte.c | 2 + drivers/staging/gdm724x/gdm_tty.c | 5 + drivers/staging/gdm724x/gdm_usb.c | 40 +- drivers/staging/gdm724x/netlink_k.c | 2 +- drivers/staging/gdm72xx/Kconfig | 19 +- drivers/staging/gdm72xx/gdm_qos.c | 61 +- drivers/staging/gdm72xx/gdm_qos.h | 18 +- drivers/staging/gdm72xx/gdm_sdio.c | 107 +- drivers/staging/gdm72xx/gdm_sdio.h | 6 +- drivers/staging/gdm72xx/gdm_usb.c | 121 +- drivers/staging/gdm72xx/gdm_usb.h | 6 +- drivers/staging/gdm72xx/gdm_wimax.c | 379 +- drivers/staging/gdm72xx/gdm_wimax.h | 17 +- drivers/staging/gdm72xx/hci.h | 22 +- drivers/staging/gdm72xx/netlink_k.h | 7 +- drivers/staging/gdm72xx/sdio_boot.h | 6 +- drivers/staging/gdm72xx/usb_boot.c | 10 +- drivers/staging/gdm72xx/usb_boot.h | 6 +- drivers/staging/gdm72xx/usb_ids.h | 6 +- drivers/staging/gdm72xx/wm_ioctl.h | 7 +- drivers/staging/goldfish/goldfish_audio.c | 65 +- drivers/staging/iio/Documentation/generic_buffer.c | 9 +- .../staging/iio/Documentation/iio_event_monitor.c | 8 + drivers/staging/iio/Documentation/iio_utils.h | 6 +- drivers/staging/iio/Documentation/trigger.txt | 2 +- drivers/staging/iio/accel/adis16201_core.c | 14 +- drivers/staging/iio/accel/adis16203_core.c | 11 +- drivers/staging/iio/accel/adis16204_core.c | 12 +- drivers/staging/iio/accel/adis16209_core.c | 18 +- drivers/staging/iio/accel/adis16240_core.c | 12 +- drivers/staging/iio/accel/lis3l02dq_ring.c | 2 +- drivers/staging/iio/accel/sca3000_ring.c | 6 + drivers/staging/iio/adc/Kconfig | 9 +- drivers/staging/iio/adc/Makefile | 1 - drivers/staging/iio/adc/ad7606_par.c | 37 +- drivers/staging/iio/adc/mxs-lradc.c | 2 +- drivers/staging/iio/frequency/ad9832.c | 16 +- drivers/staging/iio/frequency/ad9850.c | 6 - drivers/staging/iio/iio_simple_dummy.c | 2 + drivers/staging/iio/magnetometer/Kconfig | 30 +- drivers/staging/iio/magnetometer/Makefile | 4 +- drivers/staging/iio/magnetometer/hmc5843.h | 59 + .../iio/magnetometer/{hmc5843.c => hmc5843_core.c} | 266 +- drivers/staging/iio/magnetometer/hmc5843_i2c.c | 104 + drivers/staging/iio/magnetometer/hmc5843_spi.c | 100 + drivers/staging/iio/meter/ade7758_trigger.c | 2 +- drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 33 +- .../staging/iio/trigger/iio-trig-periodic-rtc.c | 29 +- drivers/staging/imx-drm/imx-drm-core.c | 57 +- drivers/staging/keucr/Kconfig | 14 - drivers/staging/keucr/Makefile | 13 - drivers/staging/keucr/TODO | 12 - drivers/staging/keucr/common.h | 7 - drivers/staging/keucr/init.c | 333 - drivers/staging/keucr/init.h | 518 -- drivers/staging/keucr/scsiglue.c | 467 -- drivers/staging/keucr/scsiglue.h | 10 - drivers/staging/keucr/smcommon.h | 29 - drivers/staging/keucr/smil.h | 288 - drivers/staging/keucr/smilecc.c | 211 - drivers/staging/keucr/smilmain.c | 760 -- drivers/staging/keucr/smilsub.c | 679 -- drivers/staging/keucr/smscsi.c | 194 - drivers/staging/keucr/transport.c | 865 --- drivers/staging/keucr/transport.h | 73 - drivers/staging/keucr/usb.c | 642 -- drivers/staging/keucr/usb.h | 240 - drivers/staging/line6/driver.c | 2 +- drivers/staging/lustre/Makefile | 2 - drivers/staging/lustre/TODO | 3 +- .../staging/lustre/include/linux/libcfs/bitmap.h | 1 - .../staging/lustre/include/linux/libcfs/curproc.h | 2 +- .../staging/lustre/include/linux/libcfs/libcfs.h | 55 +- .../lustre/include/linux/libcfs/libcfs_debug.h | 10 +- .../lustre/include/linux/libcfs/libcfs_fail.h | 2 + .../lustre/include/linux/libcfs/libcfs_hash.h | 18 +- .../lustre/include/linux/libcfs/libcfs_ioctl.h | 33 +- .../include/linux/libcfs/libcfs_kernelcomm.h | 17 +- .../lustre/include/linux/libcfs/libcfs_prim.h | 4 +- .../lustre/include/linux/libcfs/libcfs_private.h | 43 +- .../lustre/include/linux/libcfs/libcfs_time.h | 29 +- .../lustre/include/linux/libcfs/linux/kp30.h | 93 - .../lustre/include/linux/libcfs/linux/libcfs.h | 67 +- .../include/linux/libcfs/linux/linux-bitops.h | 38 - .../lustre/include/linux/libcfs/linux/linux-cpu.h | 84 - .../lustre/include/linux/libcfs/linux/linux-lock.h | 204 - .../lustre/include/linux/libcfs/linux/linux-mem.h | 11 +- .../lustre/include/linux/libcfs/linux/linux-prim.h | 82 - .../include/linux/libcfs/linux/linux-tcpip.h | 72 - .../lustre/include/linux/libcfs/linux/linux-time.h | 149 +- .../include/linux/libcfs/linux/linux-types.h | 36 - .../include/linux/libcfs/linux/portals_compat25.h | 22 +- .../staging/lustre/include/linux/libcfs/lucache.h | 16 +- .../lustre/include/linux/libcfs/params_tree.h | 164 - .../lustre/include/linux/lnet/api-support.h | 8 +- drivers/staging/lustre/include/linux/lnet/api.h | 5 +- .../staging/lustre/include/linux/lnet/lib-lnet.h | 50 +- .../staging/lustre/include/linux/lnet/lib-types.h | 23 +- .../lustre/include/linux/lnet/linux/api-support.h | 1 - .../lustre/include/linux/lnet/linux/lib-lnet.h | 5 +- .../lustre/include/linux/lnet/lnet-sysctl.h | 2 - drivers/staging/lustre/include/linux/lnet/lnet.h | 6 +- .../staging/lustre/include/linux/lnet/lnetctl.h | 22 +- drivers/staging/lustre/include/linux/lnet/lnetst.h | 6 +- drivers/staging/lustre/include/linux/lnet/ptllnd.h | 3 +- .../lustre/include/linux/lnet/ptllnd_wire.h | 3 +- .../staging/lustre/include/linux/lnet/socklnd.h | 4 +- drivers/staging/lustre/include/linux/lnet/types.h | 4 +- drivers/staging/lustre/lnet/klnds/o2iblnd/Makefile | 3 - .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 39 +- .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 22 +- .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 11 +- drivers/staging/lustre/lnet/klnds/socklnd/Makefile | 4 - .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 98 +- .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 46 +- .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 43 +- .../lustre/lnet/klnds/socklnd/socklnd_lib-linux.c | 2 +- .../lustre/lnet/klnds/socklnd/socklnd_lib-linux.h | 4 +- .../lustre/lnet/klnds/socklnd/socklnd_proto.c | 12 +- drivers/staging/lustre/lnet/lnet/Makefile | 3 - drivers/staging/lustre/lnet/lnet/acceptor.c | 28 +- drivers/staging/lustre/lnet/lnet/api-ni.c | 34 +- drivers/staging/lustre/lnet/lnet/config.c | 4 +- drivers/staging/lustre/lnet/lnet/lib-eq.c | 4 +- drivers/staging/lustre/lnet/lnet/lib-md.c | 12 +- drivers/staging/lustre/lnet/lnet/lib-me.c | 15 +- drivers/staging/lustre/lnet/lnet/lib-move.c | 108 +- drivers/staging/lustre/lnet/lnet/lib-msg.c | 2 +- drivers/staging/lustre/lnet/lnet/lib-ptl.c | 18 +- drivers/staging/lustre/lnet/lnet/lo.c | 2 +- drivers/staging/lustre/lnet/lnet/module.c | 2 +- drivers/staging/lustre/lnet/lnet/peer.c | 2 +- drivers/staging/lustre/lnet/lnet/router.c | 23 +- drivers/staging/lustre/lnet/lnet/router_proc.c | 84 +- drivers/staging/lustre/lnet/selftest/Makefile | 2 - drivers/staging/lustre/lnet/selftest/brw_test.c | 2 +- drivers/staging/lustre/lnet/selftest/conctl.c | 8 +- drivers/staging/lustre/lnet/selftest/conrpc.c | 16 +- drivers/staging/lustre/lnet/selftest/conrpc.h | 10 +- drivers/staging/lustre/lnet/selftest/console.c | 16 +- drivers/staging/lustre/lnet/selftest/console.h | 10 +- drivers/staging/lustre/lnet/selftest/framework.c | 12 +- drivers/staging/lustre/lnet/selftest/rpc.c | 14 +- drivers/staging/lustre/lnet/selftest/rpc.h | 2 +- drivers/staging/lustre/lnet/selftest/selftest.h | 12 +- drivers/staging/lustre/lnet/selftest/timer.c | 16 +- drivers/staging/lustre/lnet/selftest/timer.h | 2 +- drivers/staging/lustre/lustre/Kconfig | 1 + drivers/staging/lustre/lustre/fid/Makefile | 3 - drivers/staging/lustre/lustre/fid/fid_internal.h | 8 +- drivers/staging/lustre/lustre/fid/fid_lib.c | 6 +- drivers/staging/lustre/lustre/fid/fid_request.c | 38 +- drivers/staging/lustre/lustre/fid/lproc_fid.c | 32 +- drivers/staging/lustre/lustre/fld/Makefile | 3 - drivers/staging/lustre/lustre/fld/fld_cache.c | 34 +- drivers/staging/lustre/lustre/fld/fld_internal.h | 12 +- drivers/staging/lustre/lustre/fld/fld_request.c | 54 +- drivers/staging/lustre/lustre/fld/lproc_fld.c | 25 +- drivers/staging/lustre/lustre/include/cl_object.h | 8 +- drivers/staging/lustre/lustre/include/dt_object.h | 8 +- .../staging/lustre/lustre/include/interval_tree.h | 2 +- .../lustre/lustre/include/linux/lprocfs_status.h | 2 +- .../lustre/lustre/include/linux/lustre_acl.h | 2 +- .../lustre/lustre/include/linux/lustre_compat25.h | 4 +- .../lustre/lustre/include/linux/lustre_fsfilt.h | 10 +- .../lustre/lustre/include/linux/lustre_lib.h | 4 +- .../lustre/lustre/include/linux/lustre_lite.h | 10 +- drivers/staging/lustre/lustre/include/linux/lvfs.h | 6 +- .../lustre/lustre/include/linux/lvfs_linux.h | 9 +- drivers/staging/lustre/lustre/include/linux/obd.h | 4 +- .../lustre/lustre/include/linux/obd_support.h | 10 +- .../staging/lustre/lustre/include/lprocfs_status.h | 21 +- drivers/staging/lustre/lustre/include/lu_object.h | 6 +- .../lustre/lustre/include/lustre/lustre_idl.h | 17 +- .../lustre/lustre/include/lustre/lustre_user.h | 14 +- drivers/staging/lustre/lustre/include/lustre_acl.h | 2 +- .../staging/lustre/lustre/include/lustre_capa.h | 14 +- drivers/staging/lustre/lustre/include/lustre_cfg.h | 4 +- .../staging/lustre/lustre/include/lustre_debug.h | 4 +- .../staging/lustre/lustre/include/lustre_disk.h | 4 +- drivers/staging/lustre/lustre/include/lustre_dlm.h | 28 +- .../staging/lustre/lustre/include/lustre_export.h | 16 +- drivers/staging/lustre/lustre/include/lustre_fid.h | 6 +- drivers/staging/lustre/lustre/include/lustre_fld.h | 4 +- .../staging/lustre/lustre/include/lustre_fsfilt.h | 2 +- .../staging/lustre/lustre/include/lustre_handles.h | 4 +- .../staging/lustre/lustre/include/lustre_idmap.h | 2 +- .../staging/lustre/lustre/include/lustre_import.h | 10 +- drivers/staging/lustre/lustre/include/lustre_lib.h | 30 +- .../staging/lustre/lustre/include/lustre_lite.h | 14 +- drivers/staging/lustre/lustre/include/lustre_log.h | 10 +- drivers/staging/lustre/lustre/include/lustre_mdc.h | 16 +- drivers/staging/lustre/lustre/include/lustre_mds.h | 12 +- drivers/staging/lustre/lustre/include/lustre_net.h | 58 +- .../staging/lustre/lustre/include/lustre_quota.h | 8 +- .../lustre/lustre/include/lustre_req_layout.h | 2 +- drivers/staging/lustre/lustre/include/lustre_sec.h | 10 +- drivers/staging/lustre/lustre/include/lvfs.h | 6 +- drivers/staging/lustre/lustre/include/md_object.h | 2 +- drivers/staging/lustre/lustre/include/obd.h | 21 +- drivers/staging/lustre/lustre/include/obd_cksum.h | 4 +- drivers/staging/lustre/lustre/include/obd_class.h | 32 +- drivers/staging/lustre/lustre/include/obd_ost.h | 6 +- .../staging/lustre/lustre/include/obd_support.h | 23 +- drivers/staging/lustre/lustre/lclient/glimpse.c | 28 +- drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 37 +- .../staging/lustre/lustre/lclient/lcommon_misc.c | 16 +- drivers/staging/lustre/lustre/ldlm/interval_tree.c | 6 +- drivers/staging/lustre/lustre/ldlm/l_lock.c | 6 +- drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 16 +- drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 14 +- .../staging/lustre/lustre/ldlm/ldlm_inodebits.c | 7 +- drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 46 +- drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 53 +- drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 15 +- drivers/staging/lustre/lustre/ldlm/ldlm_plain.c | 6 +- drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 38 +- drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 38 +- drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 34 +- drivers/staging/lustre/lustre/libcfs/Makefile | 3 - drivers/staging/lustre/lustre/libcfs/debug.c | 10 +- drivers/staging/lustre/lustre/libcfs/fail.c | 12 +- drivers/staging/lustre/lustre/libcfs/hash.c | 2 +- drivers/staging/lustre/lustre/libcfs/heap.c | 2 +- .../lustre/lustre/libcfs/kernel_user_comm.c | 2 +- drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c | 2 +- drivers/staging/lustre/lustre/libcfs/libcfs_lock.c | 2 +- drivers/staging/lustre/lustre/libcfs/libcfs_mem.c | 2 +- .../staging/lustre/lustre/libcfs/libcfs_string.c | 2 +- .../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 2 +- .../lustre/libcfs/linux/linux-crypto-adler.c | 5 +- .../lustre/lustre/libcfs/linux/linux-crypto.c | 4 +- .../linux => lustre}/libcfs/linux/linux-crypto.h | 20 - .../lustre/lustre/libcfs/linux/linux-curproc.c | 2 +- .../lustre/lustre/libcfs/linux/linux-debug.c | 6 +- .../lustre/lustre/libcfs/linux/linux-module.c | 16 +- .../lustre/lustre/libcfs/linux/linux-prim.c | 6 +- .../lustre/lustre/libcfs/linux/linux-proc.c | 94 +- .../lustre/lustre/libcfs/linux/linux-tcpip.c | 31 +- .../lustre/lustre/libcfs/linux/linux-tracefile.c | 6 +- drivers/staging/lustre/lustre/libcfs/module.c | 11 +- drivers/staging/lustre/lustre/libcfs/nidstrings.c | 9 +- drivers/staging/lustre/lustre/libcfs/prng.c | 2 +- drivers/staging/lustre/lustre/libcfs/tracefile.c | 2 +- drivers/staging/lustre/lustre/libcfs/tracefile.h | 2 +- .../staging/lustre/lustre/libcfs/upcall_cache.c | 26 +- drivers/staging/lustre/lustre/libcfs/workitem.c | 2 +- drivers/staging/lustre/lustre/llite/Makefile | 3 - drivers/staging/lustre/lustre/llite/dcache.c | 16 +- drivers/staging/lustre/lustre/llite/dir.c | 62 +- drivers/staging/lustre/lustre/llite/file.c | 24 +- drivers/staging/lustre/lustre/llite/llite_capa.c | 24 +- drivers/staging/lustre/lustre/llite/llite_close.c | 4 +- .../staging/lustre/lustre/llite/llite_internal.h | 26 +- drivers/staging/lustre/lustre/llite/llite_lib.c | 52 +- drivers/staging/lustre/lustre/llite/llite_mmap.c | 6 +- drivers/staging/lustre/lustre/llite/llite_nfs.c | 2 +- drivers/staging/lustre/lustre/llite/llite_rmtacl.c | 4 +- drivers/staging/lustre/lustre/llite/lloop.c | 4 +- drivers/staging/lustre/lustre/llite/lproc_llite.c | 79 +- drivers/staging/lustre/lustre/llite/namei.c | 14 +- drivers/staging/lustre/lustre/llite/remote_perm.c | 14 +- drivers/staging/lustre/lustre/llite/rw.c | 15 +- drivers/staging/lustre/lustre/llite/rw26.c | 4 +- drivers/staging/lustre/lustre/llite/statahead.c | 30 +- drivers/staging/lustre/lustre/llite/super25.c | 8 +- drivers/staging/lustre/lustre/llite/symlink.c | 2 +- drivers/staging/lustre/lustre/llite/vvp_dev.c | 4 +- drivers/staging/lustre/lustre/llite/vvp_internal.h | 2 +- drivers/staging/lustre/lustre/llite/vvp_io.c | 10 +- drivers/staging/lustre/lustre/llite/vvp_lock.c | 4 +- drivers/staging/lustre/lustre/llite/vvp_object.c | 6 +- drivers/staging/lustre/lustre/llite/vvp_page.c | 4 +- drivers/staging/lustre/lustre/llite/xattr.c | 11 +- drivers/staging/lustre/lustre/llite/xattr_cache.c | 8 +- drivers/staging/lustre/lustre/lmv/Makefile | 2 - drivers/staging/lustre/lustre/lmv/lmv_fld.c | 20 +- drivers/staging/lustre/lustre/lmv/lmv_intent.c | 17 +- drivers/staging/lustre/lustre/lmv/lmv_internal.h | 6 +- drivers/staging/lustre/lustre/lmv/lmv_obd.c | 30 +- drivers/staging/lustre/lustre/lmv/lproc_lmv.c | 4 +- drivers/staging/lustre/lustre/lov/Makefile | 4 - .../staging/lustre/lustre/lov/lov_cl_internal.h | 6 +- drivers/staging/lustre/lustre/lov/lov_dev.c | 4 +- drivers/staging/lustre/lustre/lov/lov_ea.c | 8 +- drivers/staging/lustre/lustre/lov/lov_internal.h | 8 +- drivers/staging/lustre/lustre/lov/lov_io.c | 6 +- drivers/staging/lustre/lustre/lov/lov_merge.c | 31 +- drivers/staging/lustre/lustre/lov/lov_obd.c | 52 +- drivers/staging/lustre/lustre/lov/lov_offset.c | 6 +- drivers/staging/lustre/lustre/lov/lov_pack.c | 12 +- drivers/staging/lustre/lustre/lov/lov_pool.c | 10 +- drivers/staging/lustre/lustre/lov/lov_request.c | 43 +- drivers/staging/lustre/lustre/lov/lproc_lov.c | 8 +- drivers/staging/lustre/lustre/lvfs/Makefile | 3 - drivers/staging/lustre/lustre/lvfs/fsfilt.c | 4 +- drivers/staging/lustre/lustre/lvfs/lvfs_lib.c | 4 +- drivers/staging/lustre/lustre/lvfs/lvfs_linux.c | 18 +- drivers/staging/lustre/lustre/mdc/Makefile | 3 - drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 48 +- drivers/staging/lustre/lustre/mdc/mdc_internal.h | 6 +- drivers/staging/lustre/lustre/mdc/mdc_lib.c | 4 +- drivers/staging/lustre/lustre/mdc/mdc_locks.c | 18 +- drivers/staging/lustre/lustre/mdc/mdc_reint.c | 6 +- drivers/staging/lustre/lustre/mdc/mdc_request.c | 34 +- drivers/staging/lustre/lustre/mgc/Makefile | 3 - drivers/staging/lustre/lustre/mgc/libmgc.c | 12 +- drivers/staging/lustre/lustre/mgc/lproc_mgc.c | 4 +- drivers/staging/lustre/lustre/mgc/mgc_internal.h | 16 +- drivers/staging/lustre/lustre/mgc/mgc_request.c | 29 +- drivers/staging/lustre/lustre/obdclass/Makefile | 3 - drivers/staging/lustre/lustre/obdclass/acl.c | 8 +- drivers/staging/lustre/lustre/obdclass/capa.c | 23 +- drivers/staging/lustre/lustre/obdclass/cl_io.c | 10 +- drivers/staging/lustre/lustre/obdclass/cl_lock.c | 8 +- drivers/staging/lustre/lustre/obdclass/cl_object.c | 15 +- drivers/staging/lustre/lustre/obdclass/cl_page.c | 8 +- drivers/staging/lustre/lustre/obdclass/class_obd.c | 56 +- drivers/staging/lustre/lustre/obdclass/debug.c | 24 +- drivers/staging/lustre/lustre/obdclass/dt_object.c | 22 +- drivers/staging/lustre/lustre/obdclass/genops.c | 16 +- drivers/staging/lustre/lustre/obdclass/idmap.c | 6 +- drivers/staging/lustre/lustre/obdclass/linkea.c | 6 +- .../lustre/lustre/obdclass/linux/linux-module.c | 20 +- .../lustre/lustre/obdclass/linux/linux-obdo.c | 8 +- .../lustre/lustre/obdclass/linux/linux-sysctl.c | 98 +- drivers/staging/lustre/lustre/obdclass/llog.c | 6 +- drivers/staging/lustre/lustre/obdclass/llog_cat.c | 2 +- .../staging/lustre/lustre/obdclass/llog_internal.h | 2 +- .../staging/lustre/lustre/obdclass/llog_ioctl.c | 4 +- drivers/staging/lustre/lustre/obdclass/llog_lvfs.c | 50 +- drivers/staging/lustre/lustre/obdclass/llog_obd.c | 4 +- drivers/staging/lustre/lustre/obdclass/llog_osd.c | 22 +- drivers/staging/lustre/lustre/obdclass/llog_swab.c | 6 +- drivers/staging/lustre/lustre/obdclass/llog_test.c | 12 +- .../staging/lustre/lustre/obdclass/local_storage.c | 10 +- .../staging/lustre/lustre/obdclass/local_storage.h | 8 +- .../lustre/lustre/obdclass/lprocfs_status.c | 48 +- drivers/staging/lustre/lustre/obdclass/lu_object.c | 18 +- drivers/staging/lustre/lustre/obdclass/lu_ref.c | 10 +- drivers/staging/lustre/lustre/obdclass/lu_ucred.c | 8 +- .../lustre/lustre/obdclass/lustre_handles.c | 14 +- .../staging/lustre/lustre/obdclass/lustre_peer.c | 14 +- drivers/staging/lustre/lustre/obdclass/md_attrs.c | 6 +- drivers/staging/lustre/lustre/obdclass/mea.c | 6 +- .../staging/lustre/lustre/obdclass/obd_config.c | 22 +- drivers/staging/lustre/lustre/obdclass/obd_mount.c | 32 +- drivers/staging/lustre/lustre/obdclass/obdo.c | 8 +- .../staging/lustre/lustre/obdclass/statfs_pack.c | 8 +- drivers/staging/lustre/lustre/obdclass/uuid.c | 6 +- drivers/staging/lustre/lustre/obdecho/Makefile | 3 - drivers/staging/lustre/lustre/obdecho/echo.c | 32 +- .../staging/lustre/lustre/obdecho/echo_client.c | 40 +- drivers/staging/lustre/lustre/obdecho/lproc_echo.c | 16 +- drivers/staging/lustre/lustre/osc/Makefile | 4 - drivers/staging/lustre/lustre/osc/lproc_osc.c | 12 +- drivers/staging/lustre/lustre/osc/osc_cache.c | 13 +- .../staging/lustre/lustre/osc/osc_cl_internal.h | 14 +- drivers/staging/lustre/lustre/osc/osc_dev.c | 16 +- drivers/staging/lustre/lustre/osc/osc_internal.h | 6 +- drivers/staging/lustre/lustre/osc/osc_io.c | 4 +- drivers/staging/lustre/lustre/osc/osc_lock.c | 17 +- drivers/staging/lustre/lustre/osc/osc_object.c | 12 +- drivers/staging/lustre/lustre/osc/osc_page.c | 6 +- drivers/staging/lustre/lustre/osc/osc_quota.c | 2 +- drivers/staging/lustre/lustre/osc/osc_request.c | 93 +- drivers/staging/lustre/lustre/ptlrpc/Makefile | 5 - drivers/staging/lustre/lustre/ptlrpc/client.c | 92 +- drivers/staging/lustre/lustre/ptlrpc/connection.c | 6 +- drivers/staging/lustre/lustre/ptlrpc/errno.c | 4 +- drivers/staging/lustre/lustre/ptlrpc/events.c | 27 +- drivers/staging/lustre/lustre/ptlrpc/gss/Makefile | 8 - drivers/staging/lustre/lustre/ptlrpc/gss/gss_api.h | 179 - .../staging/lustre/lustre/ptlrpc/gss/gss_asn1.h | 84 - .../staging/lustre/lustre/ptlrpc/gss/gss_bulk.c | 505 -- .../lustre/lustre/ptlrpc/gss/gss_cli_upcall.c | 446 -- drivers/staging/lustre/lustre/ptlrpc/gss/gss_err.h | 193 - .../lustre/lustre/ptlrpc/gss/gss_generic_token.c | 296 - .../lustre/lustre/ptlrpc/gss/gss_internal.h | 526 -- .../staging/lustre/lustre/ptlrpc/gss/gss_keyring.c | 1409 ---- .../staging/lustre/lustre/ptlrpc/gss/gss_krb5.h | 163 - .../lustre/lustre/ptlrpc/gss/gss_krb5_mech.c | 1786 ----- .../lustre/lustre/ptlrpc/gss/gss_mech_switch.c | 358 - .../staging/lustre/lustre/ptlrpc/gss/gss_pipefs.c | 1233 ---- .../staging/lustre/lustre/ptlrpc/gss/gss_rawobj.c | 242 - .../lustre/lustre/ptlrpc/gss/gss_svc_upcall.c | 1093 --- .../staging/lustre/lustre/ptlrpc/gss/lproc_gss.c | 220 - drivers/staging/lustre/lustre/ptlrpc/gss/sec_gss.c | 2889 -------- drivers/staging/lustre/lustre/ptlrpc/import.c | 89 +- drivers/staging/lustre/lustre/ptlrpc/layout.c | 16 +- drivers/staging/lustre/lustre/ptlrpc/llog_client.c | 8 +- drivers/staging/lustre/lustre/ptlrpc/llog_net.c | 10 +- .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 26 +- drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 49 +- drivers/staging/lustre/lustre/ptlrpc/nrs.c | 10 +- drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c | 14 +- .../staging/lustre/lustre/ptlrpc/pack_generic.c | 38 +- drivers/staging/lustre/lustre/ptlrpc/pers.c | 10 +- drivers/staging/lustre/lustre/ptlrpc/pinger.c | 26 +- .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 6 +- .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c | 8 +- drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 19 +- drivers/staging/lustre/lustre/ptlrpc/recover.c | 26 +- drivers/staging/lustre/lustre/ptlrpc/sec.c | 42 +- drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 40 +- drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 24 +- drivers/staging/lustre/lustre/ptlrpc/sec_gc.c | 16 +- drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c | 20 +- drivers/staging/lustre/lustre/ptlrpc/sec_null.c | 21 +- drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 22 +- drivers/staging/lustre/lustre/ptlrpc/service.c | 84 +- drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 8 +- drivers/staging/netlogic/xlr_net.c | 1 - drivers/staging/nokia_h4p/nokia_core.c | 1 + drivers/staging/nvec/nvec.c | 17 +- drivers/staging/nvec/nvec_paz00.c | 1 + drivers/staging/nvec/nvec_power.c | 1 + drivers/staging/nvec/nvec_ps2.c | 2 + drivers/staging/octeon-usb/octeon-hcd.c | 69 +- drivers/staging/octeon/ethernet-mdio.c | 79 +- drivers/staging/octeon/ethernet-mem.c | 11 +- drivers/staging/octeon/ethernet-rgmii.c | 23 +- drivers/staging/octeon/ethernet-sgmii.c | 87 +- drivers/staging/octeon/ethernet-xaui.c | 84 +- drivers/staging/octeon/ethernet.c | 2 +- drivers/staging/octeon/octeon-ethernet.h | 4 + drivers/staging/panel/panel.c | 9 +- drivers/staging/phison/Kconfig | 5 - drivers/staging/phison/Makefile | 1 - drivers/staging/phison/phison.c | 94 - drivers/staging/quickstart/Kconfig | 10 - drivers/staging/quickstart/Makefile | 1 - drivers/staging/quickstart/quickstart.c | 458 -- drivers/staging/rtl8188eu/Kconfig | 8 - drivers/staging/rtl8188eu/Makefile | 9 - drivers/staging/rtl8188eu/core/rtw_ap.c | 60 +- drivers/staging/rtl8188eu/core/rtw_br_ext.c | 1191 ---- drivers/staging/rtl8188eu/core/rtw_cmd.c | 933 +-- drivers/staging/rtl8188eu/core/rtw_debug.c | 28 +- drivers/staging/rtl8188eu/core/rtw_efuse.c | 1509 ++-- drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 262 +- drivers/staging/rtl8188eu/core/rtw_io.c | 301 - drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 480 +- drivers/staging/rtl8188eu/core/rtw_iol.c | 14 - drivers/staging/rtl8188eu/core/rtw_led.c | 52 +- drivers/staging/rtl8188eu/core/rtw_mlme.c | 216 +- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 3330 +-------- drivers/staging/rtl8188eu/core/rtw_mp.c | 995 --- drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c | 1430 ---- drivers/staging/rtl8188eu/core/rtw_p2p.c | 2041 ------ drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 171 +- drivers/staging/rtl8188eu/core/rtw_recv.c | 80 +- drivers/staging/rtl8188eu/core/rtw_security.c | 59 +- drivers/staging/rtl8188eu/core/rtw_sreset.c | 19 +- drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 54 +- drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 19 +- drivers/staging/rtl8188eu/core/rtw_xmit.c | 252 +- .../staging/rtl8188eu/hal/Hal8188ERateAdaptive.c | 10 +- drivers/staging/rtl8188eu/hal/HalPhyRf.c | 49 - drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c | 99 +- drivers/staging/rtl8188eu/hal/HalPwrSeqCmd.c | 7 +- drivers/staging/rtl8188eu/hal/hal_com.c | 60 - drivers/staging/rtl8188eu/hal/hal_intf.c | 67 - drivers/staging/rtl8188eu/hal/odm.c | 28 +- drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c | 2 +- drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 107 +- drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 8 +- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 1395 +--- drivers/staging/rtl8188eu/hal/rtl8188e_mp.c | 854 --- drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c | 26 +- drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c | 2 +- drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c | 2 +- drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c | 80 - drivers/staging/rtl8188eu/hal/rtl8188eu_led.c | 15 +- drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 6 +- drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 33 +- drivers/staging/rtl8188eu/hal/usb_halinit.c | 560 +- drivers/staging/rtl8188eu/hal/usb_ops_linux.c | 684 -- drivers/staging/rtl8188eu/include/Hal8188EReg.h | 46 - drivers/staging/rtl8188eu/include/HalPhyRf.h | 30 - drivers/staging/rtl8188eu/include/HalPhyRf_8188e.h | 2 +- drivers/staging/rtl8188eu/include/cmd_osdep.h | 32 - drivers/staging/rtl8188eu/include/drv_types.h | 78 +- drivers/staging/rtl8188eu/include/hal_com.h | 4 - drivers/staging/rtl8188eu/include/hal_intf.h | 46 - drivers/staging/rtl8188eu/include/ieee80211.h | 13 - drivers/staging/rtl8188eu/include/odm_precomp.h | 4 +- drivers/staging/rtl8188eu/include/osdep_intf.h | 38 +- drivers/staging/rtl8188eu/include/osdep_service.h | 178 - drivers/staging/rtl8188eu/include/recv_osdep.h | 3 - drivers/staging/rtl8188eu/include/rtl8188e_cmd.h | 5 - drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 14 +- .../staging/rtl8188eu/include/rtl8188e_sreset.h | 31 - drivers/staging/rtl8188eu/include/rtl8188e_xmit.h | 1 - drivers/staging/rtl8188eu/include/rtw_br_ext.h | 66 - drivers/staging/rtl8188eu/include/rtw_cmd.h | 612 +- drivers/staging/rtl8188eu/include/rtw_debug.h | 2 +- drivers/staging/rtl8188eu/include/rtw_efuse.h | 51 +- drivers/staging/rtl8188eu/include/rtw_io.h | 343 - drivers/staging/rtl8188eu/include/rtw_ioctl_set.h | 8 - drivers/staging/rtl8188eu/include/rtw_iol.h | 2 - drivers/staging/rtl8188eu/include/rtw_mlme.h | 28 +- drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 93 +- drivers/staging/rtl8188eu/include/rtw_mp.h | 495 -- drivers/staging/rtl8188eu/include/rtw_mp_ioctl.h | 340 - drivers/staging/rtl8188eu/include/rtw_p2p.h | 135 - drivers/staging/rtl8188eu/include/rtw_security.h | 1 - drivers/staging/rtl8188eu/include/rtw_sreset.h | 5 - drivers/staging/rtl8188eu/include/rtw_version.h | 1 - drivers/staging/rtl8188eu/include/sta_info.h | 15 - drivers/staging/rtl8188eu/include/usb_ops.h | 114 - drivers/staging/rtl8188eu/include/usb_ops_linux.h | 42 +- drivers/staging/rtl8188eu/include/usb_osintf.h | 45 - drivers/staging/rtl8188eu/include/usb_vendor_req.h | 52 - drivers/staging/rtl8188eu/include/wlan_bssdef.h | 4 - drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 6617 ++--------------- drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 64 +- drivers/staging/rtl8188eu/os_dep/os_intfs.c | 111 +- drivers/staging/rtl8188eu/os_dep/osdep_service.c | 287 +- drivers/staging/rtl8188eu/os_dep/recv_linux.c | 28 +- drivers/staging/rtl8188eu/os_dep/usb_intf.c | 255 +- drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 646 +- drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 5 +- drivers/staging/rtl8192e/dot11d.c | 8 +- drivers/staging/rtl8192e/rtllib_module.c | 5 +- drivers/staging/rtl8192e/rtllib_rx.c | 3 +- drivers/staging/rtl8192ee/Kconfig | 1 - drivers/staging/rtl8192ee/base.c | 5 +- drivers/staging/rtl8192ee/base.h | 4 +- .../staging/rtl8192ee/btcoexist/halbtc8821a2ant.c | 2 +- drivers/staging/rtl8192ee/btcoexist/halbtcoutsrc.h | 2 +- drivers/staging/rtl8192ee/pci.c | 2 +- drivers/staging/rtl8192ee/rtl8192ee/trx.c | 4 +- drivers/staging/rtl8192ee/rtl8192ee/trx.h | 2 +- drivers/staging/rtl8192ee/wifi.h | 2 +- drivers/staging/rtl8192u/ieee80211/ieee80211.h | 10 +- drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 2 - drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 8 +- drivers/staging/rtl8192u/r8192U_core.c | 548 +- drivers/staging/rtl8192u/r8192U_wx.c | 159 +- drivers/staging/rtl8192u/r819xU_phy.c | 25 +- drivers/staging/rtl8712/drv_types.h | 3 +- drivers/staging/rtl8712/hal_init.c | 2 - drivers/staging/rtl8712/ieee80211.h | 4 +- drivers/staging/rtl8712/mlme_linux.c | 3 + drivers/staging/rtl8712/os_intfs.c | 3 +- drivers/staging/rtl8712/osdep_service.h | 82 +- drivers/staging/rtl8712/rtl8712_cmd.c | 6 +- drivers/staging/rtl8712/rtl8712_led.c | 4 +- drivers/staging/rtl8712/rtl8712_recv.c | 57 +- drivers/staging/rtl8712/rtl8712_xmit.c | 20 +- drivers/staging/rtl8712/rtl871x_cmd.c | 114 +- drivers/staging/rtl8712/rtl871x_cmd.h | 2 +- drivers/staging/rtl8712/rtl871x_io.c | 12 +- drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 31 +- drivers/staging/rtl8712/rtl871x_ioctl_set.c | 6 +- drivers/staging/rtl8712/rtl871x_led.h | 2 +- drivers/staging/rtl8712/rtl871x_mlme.c | 64 +- drivers/staging/rtl8712/rtl871x_mp.c | 8 +- drivers/staging/rtl8712/rtl871x_pwrctrl.c | 10 +- drivers/staging/rtl8712/rtl871x_pwrctrl.h | 4 +- drivers/staging/rtl8712/rtl871x_recv.c | 18 +- drivers/staging/rtl8712/rtl871x_sta_mgt.c | 51 +- drivers/staging/rtl8712/rtl871x_xmit.c | 56 +- drivers/staging/rtl8712/rtl871x_xmit.h | 6 +- drivers/staging/rtl8712/usb_intf.c | 40 +- drivers/staging/rtl8723au/Makefile | 4 +- drivers/staging/rtl8723au/core/rtw_ap.c | 205 +- drivers/staging/rtl8723au/core/rtw_cmd.c | 29 +- drivers/staging/rtl8723au/core/rtw_efuse.c | 6 +- drivers/staging/rtl8723au/core/rtw_ieee80211.c | 348 +- drivers/staging/rtl8723au/core/rtw_ioctl_set.c | 425 -- drivers/staging/rtl8723au/core/rtw_mlme.c | 541 +- drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 1747 ++--- drivers/staging/rtl8723au/core/rtw_pwrctrl.c | 34 +- drivers/staging/rtl8723au/core/rtw_recv.c | 8 +- drivers/staging/rtl8723au/core/rtw_sreset.c | 49 +- drivers/staging/rtl8723au/core/rtw_sta_mgt.c | 63 +- drivers/staging/rtl8723au/core/rtw_wlan_util.c | 418 +- drivers/staging/rtl8723au/core/rtw_xmit.c | 12 +- drivers/staging/rtl8723au/hal/HalHWImg8723A_BB.c | 160 - drivers/staging/rtl8723au/hal/HalHWImg8723A_RF.c | 5 +- drivers/staging/rtl8723au/hal/hal_com.c | 36 +- drivers/staging/rtl8723au/hal/odm.c | 429 +- drivers/staging/rtl8723au/hal/odm_HWConfig.c | 61 +- drivers/staging/rtl8723au/hal/odm_RegConfig8723A.c | 58 - .../staging/rtl8723au/hal/rtl8723a_bt-coexist.c | 5 +- drivers/staging/rtl8723au/hal/rtl8723a_cmd.c | 89 +- drivers/staging/rtl8723au/hal/rtl8723a_dm.c | 81 +- drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c | 125 +- drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c | 28 +- drivers/staging/rtl8723au/hal/rtl8723a_rf6052.c | 13 +- drivers/staging/rtl8723au/hal/rtl8723a_sreset.c | 19 - drivers/staging/rtl8723au/hal/rtl8723a_xmit.c | 21 - drivers/staging/rtl8723au/hal/usb_halinit.c | 141 +- drivers/staging/rtl8723au/hal/usb_ops_linux.c | 317 +- drivers/staging/rtl8723au/include/Hal8723APhyCfg.h | 1 - .../staging/rtl8723au/include/HalHWImg8723A_BB.h | 6 - drivers/staging/rtl8723au/include/drv_types.h | 14 +- drivers/staging/rtl8723au/include/hal_com.h | 3 +- drivers/staging/rtl8723au/include/hal_intf.h | 5 +- drivers/staging/rtl8723au/include/ieee80211.h | 109 +- drivers/staging/rtl8723au/include/ioctl_cfg80211.h | 3 - drivers/staging/rtl8723au/include/odm.h | 101 +- drivers/staging/rtl8723au/include/odm_HWConfig.h | 17 - .../staging/rtl8723au/include/odm_RegConfig8723A.h | 6 - .../staging/rtl8723au/include/odm_RegDefine11AC.h | 49 - drivers/staging/rtl8723au/include/odm_interface.h | 11 +- drivers/staging/rtl8723au/include/odm_precomp.h | 1 - drivers/staging/rtl8723au/include/rtl8723a_cmd.h | 2 +- drivers/staging/rtl8723au/include/rtl8723a_dm.h | 4 - drivers/staging/rtl8723au/include/rtl8723a_hal.h | 5 - drivers/staging/rtl8723au/include/rtl8723a_spec.h | 10 - .../staging/rtl8723au/include/rtl8723a_sreset.h | 1 - drivers/staging/rtl8723au/include/rtl8723a_xmit.h | 1 - drivers/staging/rtl8723au/include/rtw_ap.h | 3 +- drivers/staging/rtl8723au/include/rtw_debug.h | 2 +- drivers/staging/rtl8723au/include/rtw_event.h | 2 +- drivers/staging/rtl8723au/include/rtw_ht.h | 4 +- drivers/staging/rtl8723au/include/rtw_ioctl_set.h | 32 - drivers/staging/rtl8723au/include/rtw_mlme.h | 50 +- drivers/staging/rtl8723au/include/rtw_mlme_ext.h | 37 +- drivers/staging/rtl8723au/include/rtw_pwrctrl.h | 18 - drivers/staging/rtl8723au/include/rtw_rf.h | 11 - drivers/staging/rtl8723au/include/rtw_security.h | 3 - drivers/staging/rtl8723au/include/rtw_sreset.h | 20 - drivers/staging/rtl8723au/include/sta_info.h | 2 +- drivers/staging/rtl8723au/include/usb_ops_linux.h | 14 +- drivers/staging/rtl8723au/include/wifi.h | 71 - drivers/staging/rtl8723au/include/wlan_bssdef.h | 6 +- drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 1105 ++- drivers/staging/rtl8723au/os_dep/mlme_linux.c | 1 - drivers/staging/rtl8723au/os_dep/os_intfs.c | 19 +- drivers/staging/rtl8723au/os_dep/usb_intf.c | 45 +- drivers/staging/rtl8723au/os_dep/usb_ops_linux.c | 10 +- drivers/staging/rtl8821ae/Kconfig | 1 - .../staging/rtl8821ae/btcoexist/HalBtc8812a1Ant.c | 14 +- .../staging/rtl8821ae/btcoexist/halbtc8192e2ant.h | 2 +- drivers/staging/rtl8821ae/btcoexist/halbtcoutsrc.h | 2 +- drivers/staging/rtl8821ae/cam.c | 7 - drivers/staging/rtl8821ae/pci.c | 2 +- drivers/staging/rtl8821ae/ps.c | 6 +- drivers/staging/rtl8821ae/rtl8821ae/hal_btc.c | 17 +- drivers/staging/rtl8821ae/rtl8821ae/hw.c | 2 +- drivers/staging/rtl8821ae/rtl8821ae/reg.h | 1 + drivers/staging/rtl8821ae/rtl8821ae/sw.c | 4 +- drivers/staging/rtl8821ae/wifi.h | 2 +- drivers/staging/rts5208/debug.h | 43 - drivers/staging/rts5208/ms.c | 126 +- drivers/staging/rts5208/rtsx.c | 6 +- drivers/staging/rts5208/rtsx.h | 1 - drivers/staging/rts5208/rtsx_card.c | 73 +- drivers/staging/rts5208/rtsx_card.h | 1 - drivers/staging/rts5208/rtsx_chip.c | 133 +- drivers/staging/rts5208/rtsx_chip.h | 5 + drivers/staging/rts5208/rtsx_scsi.c | 44 +- drivers/staging/rts5208/rtsx_scsi.h | 2 +- drivers/staging/rts5208/rtsx_transport.c | 55 +- drivers/staging/rts5208/sd.c | 185 +- drivers/staging/rts5208/spi.c | 7 +- drivers/staging/rts5208/trace.h | 10 +- drivers/staging/rts5208/xd.c | 104 +- drivers/staging/sep/Kconfig | 11 - drivers/staging/sep/Makefile | 3 - drivers/staging/sep/TODO | 3 - drivers/staging/sep/sep_crypto.c | 3962 ---------- drivers/staging/sep/sep_crypto.h | 359 - drivers/staging/sep/sep_dev.h | 162 - drivers/staging/sep/sep_driver_api.h | 402 -- drivers/staging/sep/sep_driver_config.h | 298 - drivers/staging/sep/sep_driver_hw_defs.h | 56 - drivers/staging/sep/sep_main.c | 4452 ------------ drivers/staging/sep/sep_trace_events.h | 193 - drivers/staging/serqt_usb2/Kconfig | 9 - drivers/staging/serqt_usb2/Makefile | 1 - drivers/staging/serqt_usb2/serqt_usb2.c | 1528 ---- drivers/staging/silicom/Kconfig | 45 - drivers/staging/silicom/Makefile | 6 - drivers/staging/silicom/README | 14 - drivers/staging/silicom/TODO | 8 - drivers/staging/silicom/bits.h | 56 - drivers/staging/silicom/bp_ioctl.h | 140 - drivers/staging/silicom/bp_mod.h | 711 -- drivers/staging/silicom/bpctl_mod.c | 7530 -------------------- drivers/staging/silicom/bypass.h | 202 - drivers/staging/silicom/bypasslib/Makefile | 6 - drivers/staging/silicom/bypasslib/bp_ioctl.h | 198 - drivers/staging/silicom/bypasslib/bplibk.h | 36 - drivers/staging/silicom/bypasslib/bypass.c | 536 -- drivers/staging/silicom/bypasslib/libbp_sd.h | 532 -- drivers/staging/silicom/libbp_sd.h | 550 -- drivers/staging/skein/skein_iv.h | 26 +- drivers/staging/slicoss/slicoss.c | 22 +- drivers/staging/speakup/TODO | 2 +- drivers/staging/speakup/main.c | 2 +- drivers/staging/speakup/speakup_dectlk.c | 2 +- .../staging/tidspbridge/Documentation/CONTRIBUTORS | 45 - drivers/staging/tidspbridge/Documentation/README | 70 - .../staging/tidspbridge/Documentation/error-codes | 157 - drivers/staging/tidspbridge/Kconfig | 69 - drivers/staging/tidspbridge/Makefile | 32 - drivers/staging/tidspbridge/TODO | 18 - drivers/staging/tidspbridge/core/_cmm.h | 45 - drivers/staging/tidspbridge/core/_deh.h | 35 - drivers/staging/tidspbridge/core/_msg_sm.h | 142 - drivers/staging/tidspbridge/core/_tiomap.h | 382 - drivers/staging/tidspbridge/core/_tiomap_pwr.h | 85 - drivers/staging/tidspbridge/core/chnl_sm.c | 907 --- drivers/staging/tidspbridge/core/dsp-clock.c | 391 - drivers/staging/tidspbridge/core/io_sm.c | 2245 ------ drivers/staging/tidspbridge/core/msg_sm.c | 564 -- drivers/staging/tidspbridge/core/sync.c | 121 - drivers/staging/tidspbridge/core/tiomap3430.c | 1813 ----- drivers/staging/tidspbridge/core/tiomap3430_pwr.c | 556 -- drivers/staging/tidspbridge/core/tiomap_io.c | 438 -- drivers/staging/tidspbridge/core/tiomap_io.h | 104 - drivers/staging/tidspbridge/core/ue_deh.c | 272 - drivers/staging/tidspbridge/core/wdt.c | 143 - drivers/staging/tidspbridge/dynload/cload.c | 1952 ----- .../staging/tidspbridge/dynload/dload_internal.h | 344 - drivers/staging/tidspbridge/dynload/doff.h | 354 - drivers/staging/tidspbridge/dynload/getsection.c | 407 -- drivers/staging/tidspbridge/dynload/header.h | 49 - drivers/staging/tidspbridge/dynload/module_list.h | 159 - drivers/staging/tidspbridge/dynload/params.h | 226 - drivers/staging/tidspbridge/dynload/reloc.c | 484 -- drivers/staging/tidspbridge/dynload/reloc_table.h | 102 - .../tidspbridge/dynload/reloc_table_c6000.c | 257 - drivers/staging/tidspbridge/dynload/tramp.c | 1143 --- .../tidspbridge/dynload/tramp_table_c6000.c | 164 - drivers/staging/tidspbridge/gen/gh.c | 141 - drivers/staging/tidspbridge/hw/EasiGlobal.h | 41 - drivers/staging/tidspbridge/hw/MMUAccInt.h | 76 - drivers/staging/tidspbridge/hw/MMURegAcM.h | 225 - drivers/staging/tidspbridge/hw/hw_defs.h | 58 - drivers/staging/tidspbridge/hw/hw_mmu.c | 487 -- drivers/staging/tidspbridge/hw/hw_mmu.h | 160 - .../tidspbridge/include/dspbridge/_chnl_sm.h | 177 - .../tidspbridge/include/dspbridge/brddefs.h | 37 - .../tidspbridge/include/dspbridge/cfgdefs.h | 61 - .../staging/tidspbridge/include/dspbridge/chnl.h | 80 - .../tidspbridge/include/dspbridge/chnldefs.h | 63 - .../tidspbridge/include/dspbridge/chnlpriv.h | 85 - .../staging/tidspbridge/include/dspbridge/clk.h | 101 - .../staging/tidspbridge/include/dspbridge/cmm.h | 337 - .../tidspbridge/include/dspbridge/cmmdefs.h | 104 - .../staging/tidspbridge/include/dspbridge/cod.h | 329 - .../staging/tidspbridge/include/dspbridge/dbdcd.h | 358 - .../tidspbridge/include/dspbridge/dbdcddef.h | 78 - .../staging/tidspbridge/include/dspbridge/dbdefs.h | 488 -- .../staging/tidspbridge/include/dspbridge/dbll.h | 56 - .../tidspbridge/include/dspbridge/dblldefs.h | 431 -- .../staging/tidspbridge/include/dspbridge/dev.h | 620 -- .../tidspbridge/include/dspbridge/devdefs.h | 26 - .../staging/tidspbridge/include/dspbridge/disp.h | 186 - .../staging/tidspbridge/include/dspbridge/dmm.h | 71 - .../staging/tidspbridge/include/dspbridge/drv.h | 468 -- .../tidspbridge/include/dspbridge/dspapi-ioctl.h | 467 -- .../staging/tidspbridge/include/dspbridge/dspapi.h | 167 - .../tidspbridge/include/dspbridge/dspchnl.h | 72 - .../tidspbridge/include/dspbridge/dspdefs.h | 1048 --- .../staging/tidspbridge/include/dspbridge/dspdeh.h | 43 - .../staging/tidspbridge/include/dspbridge/dspdrv.h | 60 - .../staging/tidspbridge/include/dspbridge/dspio.h | 41 - .../tidspbridge/include/dspbridge/dspioctl.h | 68 - .../staging/tidspbridge/include/dspbridge/dspmsg.h | 56 - .../tidspbridge/include/dspbridge/dynamic_loader.h | 490 -- .../tidspbridge/include/dspbridge/getsection.h | 108 - drivers/staging/tidspbridge/include/dspbridge/gh.h | 32 - .../tidspbridge/include/dspbridge/host_os.h | 57 - drivers/staging/tidspbridge/include/dspbridge/io.h | 80 - .../staging/tidspbridge/include/dspbridge/io_sm.h | 160 - .../staging/tidspbridge/include/dspbridge/mbx_sh.h | 144 - .../tidspbridge/include/dspbridge/memdefs.h | 30 - .../staging/tidspbridge/include/dspbridge/mgr.h | 205 - .../tidspbridge/include/dspbridge/mgrpriv.h | 45 - .../staging/tidspbridge/include/dspbridge/msg.h | 59 - .../tidspbridge/include/dspbridge/msgdefs.h | 29 - .../staging/tidspbridge/include/dspbridge/nldr.h | 55 - .../tidspbridge/include/dspbridge/nldrdefs.h | 259 - .../staging/tidspbridge/include/dspbridge/node.h | 524 -- .../tidspbridge/include/dspbridge/nodedefs.h | 28 - .../tidspbridge/include/dspbridge/nodepriv.h | 181 - .../staging/tidspbridge/include/dspbridge/ntfy.h | 217 - .../staging/tidspbridge/include/dspbridge/proc.h | 591 -- .../tidspbridge/include/dspbridge/procpriv.h | 25 - .../staging/tidspbridge/include/dspbridge/pwr.h | 113 - .../include/dspbridge/resourcecleanup.h | 41 - .../staging/tidspbridge/include/dspbridge/rmm.h | 156 - .../staging/tidspbridge/include/dspbridge/rms_sh.h | 86 - .../tidspbridge/include/dspbridge/rmstypes.h | 24 - .../staging/tidspbridge/include/dspbridge/strm.h | 306 - .../tidspbridge/include/dspbridge/strmdefs.h | 44 - .../staging/tidspbridge/include/dspbridge/sync.h | 119 - .../tidspbridge/include/dspbridge/uuidutil.h | 24 - .../staging/tidspbridge/include/dspbridge/wdt.h | 79 - drivers/staging/tidspbridge/pmgr/chnl.c | 115 - drivers/staging/tidspbridge/pmgr/chnlobj.h | 46 - drivers/staging/tidspbridge/pmgr/cmm.c | 915 --- drivers/staging/tidspbridge/pmgr/cod.c | 537 -- drivers/staging/tidspbridge/pmgr/dbll.c | 1421 ---- drivers/staging/tidspbridge/pmgr/dev.c | 969 --- drivers/staging/tidspbridge/pmgr/dmm.c | 487 -- drivers/staging/tidspbridge/pmgr/dspapi.c | 1843 ----- drivers/staging/tidspbridge/pmgr/io.c | 93 - drivers/staging/tidspbridge/pmgr/ioobj.h | 38 - drivers/staging/tidspbridge/pmgr/msg.c | 91 - drivers/staging/tidspbridge/pmgr/msgobj.h | 38 - drivers/staging/tidspbridge/rmgr/dbdcd.c | 1483 ---- drivers/staging/tidspbridge/rmgr/disp.c | 655 -- drivers/staging/tidspbridge/rmgr/drv.c | 816 --- drivers/staging/tidspbridge/rmgr/drv_interface.c | 648 -- drivers/staging/tidspbridge/rmgr/dspdrv.c | 139 - drivers/staging/tidspbridge/rmgr/mgr.c | 352 - drivers/staging/tidspbridge/rmgr/nldr.c | 1860 ----- drivers/staging/tidspbridge/rmgr/node.c | 3029 -------- drivers/staging/tidspbridge/rmgr/proc.c | 1833 ----- drivers/staging/tidspbridge/rmgr/pwr.c | 176 - drivers/staging/tidspbridge/rmgr/rmm.c | 456 -- drivers/staging/tidspbridge/rmgr/strm.c | 733 -- .../Documentation/ABI/sysfs-platform-visorchipset | 101 + drivers/staging/unisys/Kconfig | 2 +- drivers/staging/unisys/channels/Kconfig | 2 +- drivers/staging/unisys/channels/Makefile | 2 - .../unisys/common-spar/include/channels/channel.h | 54 +- .../include/channels/controlframework.h | 4 +- .../include/channels/controlvmchannel.h | 24 +- .../common-spar/include/channels/diagchannel.h | 32 +- .../common-spar/include/channels/iochannel.h | 66 +- .../common-spar/include/channels/vbuschannel.h | 38 +- .../unisys/common-spar/include/vbusdeviceinfo.h | 42 +- .../unisys/common-spar/include/vmcallinterface.h | 8 +- drivers/staging/unisys/include/commontypes.h | 1 - drivers/staging/unisys/include/guestlinuxdebug.h | 6 +- drivers/staging/unisys/include/uisqueue.h | 14 +- drivers/staging/unisys/include/uisutils.h | 8 +- drivers/staging/unisys/include/vbushelper.h | 8 +- drivers/staging/unisys/uislib/Makefile | 3 - drivers/staging/unisys/uislib/uislib.c | 26 +- drivers/staging/unisys/uislib/uisqueue.c | 8 +- drivers/staging/unisys/uislib/uisutils.c | 11 +- drivers/staging/unisys/virthba/Makefile | 3 - drivers/staging/unisys/virthba/virthba.c | 194 +- drivers/staging/unisys/virtpci/Makefile | 3 - drivers/staging/unisys/virtpci/virtpci.c | 353 +- drivers/staging/unisys/virtpci/virtpci.h | 2 - drivers/staging/unisys/visorchannel/Makefile | 2 - drivers/staging/unisys/visorchannel/visorchannel.h | 2 +- .../unisys/visorchannel/visorchannel_funcs.c | 4 +- drivers/staging/unisys/visorchipset/Makefile | 5 +- drivers/staging/unisys/visorchipset/controlvm.h | 27 - .../staging/unisys/visorchipset/controlvm_direct.c | 62 - drivers/staging/unisys/visorchipset/visorchipset.h | 24 +- .../unisys/visorchipset/visorchipset_main.c | 1096 +-- drivers/staging/unisys/visorutil/Makefile | 1 - .../staging/unisys/visorutil/memregion_direct.c | 2 +- drivers/staging/usbip/stub_main.c | 10 +- drivers/staging/usbip/stub_rx.c | 1 - .../usbip/userspace/libsrc/usbip_host_driver.c | 7 +- drivers/staging/usbip/vhci_hcd.c | 3 +- drivers/staging/usbip/vhci_rx.c | 2 - drivers/staging/vme/devices/vme_pio2_core.c | 12 +- drivers/staging/vme/devices/vme_pio2_gpio.c | 6 +- drivers/staging/vme/devices/vme_user.c | 4 - drivers/staging/vt6655/80211hdr.h | 7 - drivers/staging/vt6655/80211mgr.c | 37 +- drivers/staging/vt6655/80211mgr.h | 38 - drivers/staging/vt6655/IEEE11h.c | 175 - drivers/staging/vt6655/IEEE11h.h | 10 - drivers/staging/vt6655/aes_ccmp.c | 1 + drivers/staging/vt6655/aes_ccmp.h | 9 - drivers/staging/vt6655/baseband.c | 350 +- drivers/staging/vt6655/baseband.h | 36 +- drivers/staging/vt6655/bssdb.c | 72 +- drivers/staging/vt6655/bssdb.h | 28 +- drivers/staging/vt6655/card.c | 40 +- drivers/staging/vt6655/card.h | 18 +- drivers/staging/vt6655/channel.h | 4 - drivers/staging/vt6655/country.h | 1 - drivers/staging/vt6655/datarate.c | 37 +- drivers/staging/vt6655/datarate.h | 28 +- drivers/staging/vt6655/desc.h | 185 +- drivers/staging/vt6655/device.h | 78 +- drivers/staging/vt6655/device_cfg.h | 5 +- drivers/staging/vt6655/device_main.c | 772 +- drivers/staging/vt6655/dpc.c | 48 +- drivers/staging/vt6655/dpc.h | 10 - drivers/staging/vt6655/hostap.c | 48 +- drivers/staging/vt6655/hostap.h | 8 - drivers/staging/vt6655/iocmd.h | 25 +- drivers/staging/vt6655/ioctl.c | 8 +- drivers/staging/vt6655/ioctl.h | 8 - drivers/staging/vt6655/iowpa.h | 10 - drivers/staging/vt6655/iwctl.c | 134 +- drivers/staging/vt6655/iwctl.h | 18 +- drivers/staging/vt6655/key.c | 33 +- drivers/staging/vt6655/key.h | 25 +- drivers/staging/vt6655/mac.c | 104 +- drivers/staging/vt6655/mac.h | 107 +- drivers/staging/vt6655/mib.h | 45 +- drivers/staging/vt6655/michael.h | 6 - drivers/staging/vt6655/power.c | 9 +- drivers/staging/vt6655/power.h | 9 - drivers/staging/vt6655/rc4.c | 1 + drivers/staging/vt6655/rf.c | 20 +- drivers/staging/vt6655/rf.h | 8 +- drivers/staging/vt6655/rxtx.c | 26 +- drivers/staging/vt6655/srom.c | 24 +- drivers/staging/vt6655/srom.h | 24 +- drivers/staging/vt6655/tcrc.c | 2 +- drivers/staging/vt6655/upc.h | 52 +- drivers/staging/vt6655/vntwifi.c | 19 +- drivers/staging/vt6655/wcmd.c | 39 +- drivers/staging/vt6655/wcmd.h | 15 +- drivers/staging/vt6655/wmgr.c | 89 +- drivers/staging/vt6655/wmgr.h | 12 +- drivers/staging/vt6655/wpa.c | 10 +- drivers/staging/vt6655/wpactl.c | 5 +- drivers/staging/vt6656/80211hdr.h | 324 - drivers/staging/vt6656/80211mgr.c | 861 --- drivers/staging/vt6656/80211mgr.h | 808 --- drivers/staging/vt6656/Kconfig | 4 +- drivers/staging/vt6656/Makefile | 13 - drivers/staging/vt6656/baseband.c | 1034 +-- drivers/staging/vt6656/baseband.h | 19 +- drivers/staging/vt6656/bssdb.c | 1466 ---- drivers/staging/vt6656/bssdb.h | 276 - drivers/staging/vt6656/card.c | 384 +- drivers/staging/vt6656/card.h | 48 +- drivers/staging/vt6656/channel.c | 549 +- drivers/staging/vt6656/channel.h | 9 +- drivers/staging/vt6656/country.h | 162 - drivers/staging/vt6656/datarate.c | 364 - drivers/staging/vt6656/datarate.h | 76 - drivers/staging/vt6656/desc.h | 2 - drivers/staging/vt6656/device.h | 544 +- drivers/staging/vt6656/dpc.c | 999 +-- drivers/staging/vt6656/dpc.h | 11 +- drivers/staging/vt6656/firmware.c | 78 +- drivers/staging/vt6656/firmware.h | 6 +- drivers/staging/vt6656/int.c | 213 +- drivers/staging/vt6656/int.h | 4 +- drivers/staging/vt6656/iocmd.h | 38 - drivers/staging/vt6656/iowpa.h | 75 - drivers/staging/vt6656/iwctl.c | 1802 ----- drivers/staging/vt6656/iwctl.h | 138 - drivers/staging/vt6656/key.c | 789 +- drivers/staging/vt6656/key.h | 79 +- drivers/staging/vt6656/mac.c | 37 +- drivers/staging/vt6656/mac.h | 708 +- drivers/staging/vt6656/main_usb.c | 1608 ++--- drivers/staging/vt6656/michael.c | 167 - drivers/staging/vt6656/michael.h | 52 - drivers/staging/vt6656/power.c | 254 +- drivers/staging/vt6656/power.h | 17 +- drivers/staging/vt6656/rc4.c | 87 - drivers/staging/vt6656/rc4.h | 46 - drivers/staging/vt6656/rf.c | 1303 ++-- drivers/staging/vt6656/rf.h | 11 +- drivers/staging/vt6656/rxtx.c | 2408 ++----- drivers/staging/vt6656/rxtx.h | 36 +- drivers/staging/vt6656/tether.c | 60 - drivers/staging/vt6656/tether.h | 101 - drivers/staging/vt6656/tkip.c | 246 - drivers/staging/vt6656/tkip.h | 45 - drivers/staging/vt6656/tmacro.h | 52 - drivers/staging/vt6656/usbpipe.c | 321 +- drivers/staging/vt6656/usbpipe.h | 7 +- drivers/staging/vt6656/vntconfiguration.dat | 6 - drivers/staging/vt6656/wcmd.c | 1066 +-- drivers/staging/vt6656/wcmd.h | 91 +- drivers/staging/vt6656/wctl.c | 244 - drivers/staging/vt6656/wctl.h | 94 - drivers/staging/vt6656/wmgr.c | 4362 ------------ drivers/staging/vt6656/wmgr.h | 397 -- drivers/staging/vt6656/wpa.c | 314 - drivers/staging/vt6656/wpa.h | 72 - drivers/staging/vt6656/wpa2.c | 235 - drivers/staging/vt6656/wpa2.h | 53 - drivers/staging/vt6656/wpactl.c | 247 - drivers/staging/vt6656/wpactl.h | 47 - drivers/staging/winbond/Kconfig | 11 - drivers/staging/winbond/Makefile | 15 - drivers/staging/winbond/TODO | 12 - drivers/staging/winbond/core.h | 61 - drivers/staging/winbond/localpara.h | 311 - drivers/staging/winbond/mac_structures.h | 71 - drivers/staging/winbond/mds.c | 650 -- drivers/staging/winbond/mds_f.h | 22 - drivers/staging/winbond/mds_s.h | 130 - drivers/staging/winbond/mto.c | 167 - drivers/staging/winbond/mto.h | 134 - drivers/staging/winbond/phy_calibration.c | 1317 ---- drivers/staging/winbond/phy_calibration.h | 85 - drivers/staging/winbond/reg.c | 2328 ------ drivers/staging/winbond/sme_api.h | 191 - drivers/staging/winbond/wb35reg.c | 806 --- drivers/staging/winbond/wb35reg_f.h | 65 - drivers/staging/winbond/wb35reg_s.h | 240 - drivers/staging/winbond/wb35rx.c | 358 - drivers/staging/winbond/wb35rx_f.h | 15 - drivers/staging/winbond/wb35rx_s.h | 44 - drivers/staging/winbond/wb35tx.c | 290 - drivers/staging/winbond/wb35tx_f.h | 22 - drivers/staging/winbond/wb35tx_s.h | 39 - drivers/staging/winbond/wbhal.h | 513 -- drivers/staging/winbond/wbusb.c | 853 --- drivers/staging/wlags49_h2/Kconfig | 11 - drivers/staging/wlags49_h2/Makefile | 53 - drivers/staging/wlags49_h2/README.ubuntu | 180 - drivers/staging/wlags49_h2/README.wlags49 | 641 -- drivers/staging/wlags49_h2/TODO | 33 - drivers/staging/wlags49_h2/WARNING.txt | 3 - drivers/staging/wlags49_h2/ap_h2.c | 3337 --------- drivers/staging/wlags49_h2/ap_h25.c | 4094 ----------- drivers/staging/wlags49_h2/debug.h | 199 - drivers/staging/wlags49_h2/dhf.c | 380 - drivers/staging/wlags49_h2/dhf.h | 225 - drivers/staging/wlags49_h2/dhfcfg.h | 158 - drivers/staging/wlags49_h2/hcf.c | 4748 ------------ drivers/staging/wlags49_h2/hcf.h | 394 - drivers/staging/wlags49_h2/hcfcfg.h | 785 -- drivers/staging/wlags49_h2/hcfdef.h | 752 -- drivers/staging/wlags49_h2/man/wlags49.4 | 734 -- drivers/staging/wlags49_h2/mdd.h | 1155 --- drivers/staging/wlags49_h2/mmd.c | 250 - drivers/staging/wlags49_h2/mmd.h | 77 - drivers/staging/wlags49_h2/sta_h2.c | 4480 ------------ drivers/staging/wlags49_h2/sta_h25.c | 5255 -------------- drivers/staging/wlags49_h2/wl_cs.c | 440 -- drivers/staging/wlags49_h2/wl_cs.h | 89 - drivers/staging/wlags49_h2/wl_enc.c | 217 - drivers/staging/wlags49_h2/wl_enc.h | 118 - drivers/staging/wlags49_h2/wl_if.h | 221 - drivers/staging/wlags49_h2/wl_internal.h | 1040 --- drivers/staging/wlags49_h2/wl_main.c | 3702 ---------- drivers/staging/wlags49_h2/wl_main.h | 138 - drivers/staging/wlags49_h2/wl_netdev.c | 1951 ----- drivers/staging/wlags49_h2/wl_netdev.h | 154 - drivers/staging/wlags49_h2/wl_priv.c | 1928 ----- drivers/staging/wlags49_h2/wl_priv.h | 127 - drivers/staging/wlags49_h2/wl_profile.c | 995 --- drivers/staging/wlags49_h2/wl_profile.h | 87 - drivers/staging/wlags49_h2/wl_util.c | 1367 ---- drivers/staging/wlags49_h2/wl_util.h | 96 - drivers/staging/wlags49_h2/wl_version.h | 146 - drivers/staging/wlags49_h2/wl_wext.c | 3794 ---------- drivers/staging/wlags49_h2/wl_wext.h | 88 - drivers/staging/wlags49_h25/Kconfig | 11 - drivers/staging/wlags49_h25/Makefile | 52 - drivers/staging/wlags49_h25/README.txt | 30 - drivers/staging/wlags49_h25/TODO | 33 - drivers/staging/wlags49_h25/ap_h25.c | 2 - drivers/staging/wlags49_h25/debug.h | 2 - drivers/staging/wlags49_h25/dhf.c | 2 - drivers/staging/wlags49_h25/dhf.h | 2 - drivers/staging/wlags49_h25/dhfcfg.h | 2 - drivers/staging/wlags49_h25/hcf.c | 2 - drivers/staging/wlags49_h25/hcf.h | 2 - drivers/staging/wlags49_h25/hcfcfg.h | 2 - drivers/staging/wlags49_h25/hcfdef.h | 2 - drivers/staging/wlags49_h25/mdd.h | 2 - drivers/staging/wlags49_h25/mmd.c | 2 - drivers/staging/wlags49_h25/mmd.h | 2 - drivers/staging/wlags49_h25/sta_h25.c | 2 - drivers/staging/wlags49_h25/wl_cs.c | 2 - drivers/staging/wlags49_h25/wl_cs.h | 2 - drivers/staging/wlags49_h25/wl_enc.c | 2 - drivers/staging/wlags49_h25/wl_enc.h | 2 - drivers/staging/wlags49_h25/wl_if.h | 2 - drivers/staging/wlags49_h25/wl_internal.h | 2 - drivers/staging/wlags49_h25/wl_main.c | 2 - drivers/staging/wlags49_h25/wl_main.h | 2 - drivers/staging/wlags49_h25/wl_netdev.c | 2 - drivers/staging/wlags49_h25/wl_netdev.h | 2 - drivers/staging/wlags49_h25/wl_priv.c | 2 - drivers/staging/wlags49_h25/wl_priv.h | 2 - drivers/staging/wlags49_h25/wl_profile.c | 2 - drivers/staging/wlags49_h25/wl_profile.h | 2 - drivers/staging/wlags49_h25/wl_util.c | 2 - drivers/staging/wlags49_h25/wl_util.h | 2 - drivers/staging/wlags49_h25/wl_version.h | 2 - drivers/staging/wlags49_h25/wl_wext.c | 2 - drivers/staging/wlags49_h25/wl_wext.h | 2 - drivers/staging/wlan-ng/cfg80211.c | 2 + drivers/staging/wlan-ng/hfa384x_usb.c | 19 +- drivers/staging/wlan-ng/p80211netdev.c | 40 +- drivers/staging/wlan-ng/p80211netdev.h | 1 - drivers/staging/wlan-ng/prism2fw.c | 2 + drivers/staging/wlan-ng/prism2mgmt.c | 42 +- drivers/staging/wlan-ng/prism2mib.c | 4 +- drivers/staging/wlan-ng/prism2sta.c | 7 +- drivers/staging/xillybus/README | 23 - drivers/staging/xillybus/xillybus.h | 48 +- drivers/staging/xillybus/xillybus_core.c | 541 +- drivers/staging/xillybus/xillybus_of.c | 72 +- drivers/staging/xillybus/xillybus_pcie.c | 66 +- drivers/usb/storage/Kconfig | 2 +- drivers/usb/storage/ene_ub6250.c | 4 +- include/linux/device.h | 4 + include/linux/iio/accel/kxcjk_1013.h | 22 + include/linux/iio/common/st_sensors.h | 12 +- include/linux/iio/common/st_sensors_i2c.h | 11 + include/linux/iio/imu/adis.h | 33 +- include/linux/iio/trigger.h | 5 +- include/linux/iio/types.h | 5 + .../adc => include/linux/platform_data}/ad7291.h | 0 include/linux/platform_data/dsp-omap.h | 34 - kernel/time/alarmtimer.c | 2 +- 1463 files changed, 38241 insertions(+), 253386 deletions(-) rename {drivers/staging/iio/Documentation => Documentation/ABI/testing}/sysfs-bus-iio-trigger-sysfs (100%) create mode 100644 Documentation/devicetree/bindings/iio/adc/max1027-adc.txt create mode 100644 Documentation/devicetree/bindings/iio/st-sensors.txt delete mode 100644 arch/arm/mach-omap2/dsp.c create mode 100644 drivers/iio/accel/kxcjk-1013.c rename drivers/{staging => }/iio/adc/ad7291.c (89%) create mode 100644 drivers/iio/adc/max1027.c create mode 100644 drivers/iio/dac/mcp4922.c create mode 100644 drivers/iio/light/isl29125.c create mode 100644 drivers/iio/light/tcs3414.c create mode 100644 drivers/iio/magnetometer/ak09911.c create mode 100644 drivers/iio/pressure/t5403.c create mode 100644 drivers/staging/board/Kconfig create mode 100644 drivers/staging/board/Makefile create mode 100644 drivers/staging/board/TODO create mode 100644 drivers/staging/board/board.c create mode 100644 drivers/staging/board/board.h create mode 100644 drivers/staging/board/kzm9d.c delete mode 100644 drivers/staging/ced1401/Kconfig delete mode 100644 drivers/staging/ced1401/Makefile delete mode 100644 drivers/staging/ced1401/TODO delete mode 100644 drivers/staging/ced1401/ced_ioc.c delete mode 100644 drivers/staging/ced1401/ced_ioctl.h delete mode 100644 drivers/staging/ced1401/machine.h delete mode 100644 drivers/staging/ced1401/usb1401.c delete mode 100644 drivers/staging/ced1401/usb1401.h delete mode 100644 drivers/staging/ced1401/use1401.h delete mode 100644 drivers/staging/ced1401/use14_ioc.h delete mode 100644 drivers/staging/ced1401/userspace/use1401.c create mode 100644 drivers/staging/comedi/drivers/amplc_pc236.h create mode 100644 drivers/staging/comedi/drivers/amplc_pc236_common.c create mode 100644 drivers/staging/comedi/drivers/amplc_pci236.c delete mode 100644 drivers/staging/crystalhd/Kconfig delete mode 100644 drivers/staging/crystalhd/Makefile delete mode 100644 drivers/staging/crystalhd/TODO delete mode 100644 drivers/staging/crystalhd/bc_dts_defs.h delete mode 100644 drivers/staging/crystalhd/bc_dts_glob_lnx.h delete mode 100644 drivers/staging/crystalhd/bcm_70012_regs.h delete mode 100644 drivers/staging/crystalhd/crystalhd.h delete mode 100644 drivers/staging/crystalhd/crystalhd_cmds.c delete mode 100644 drivers/staging/crystalhd/crystalhd_cmds.h delete mode 100644 drivers/staging/crystalhd/crystalhd_fw_if.h delete mode 100644 drivers/staging/crystalhd/crystalhd_hw.c delete mode 100644 drivers/staging/crystalhd/crystalhd_hw.h delete mode 100644 drivers/staging/crystalhd/crystalhd_lnx.c delete mode 100644 drivers/staging/crystalhd/crystalhd_lnx.h delete mode 100644 drivers/staging/crystalhd/crystalhd_misc.c delete mode 100644 drivers/staging/crystalhd/crystalhd_misc.h delete mode 100644 drivers/staging/cxt1e1/Kconfig delete mode 100644 drivers/staging/cxt1e1/Makefile delete mode 100644 drivers/staging/cxt1e1/comet.c delete mode 100644 drivers/staging/cxt1e1/comet.h delete mode 100644 drivers/staging/cxt1e1/comet_tables.c delete mode 100644 drivers/staging/cxt1e1/comet_tables.h delete mode 100644 drivers/staging/cxt1e1/functions.c delete mode 100644 drivers/staging/cxt1e1/hwprobe.c delete mode 100644 drivers/staging/cxt1e1/libsbew.h delete mode 100644 drivers/staging/cxt1e1/linux.c delete mode 100644 drivers/staging/cxt1e1/musycc.c delete mode 100644 drivers/staging/cxt1e1/musycc.h delete mode 100644 drivers/staging/cxt1e1/pmc93x6_eeprom.c delete mode 100644 drivers/staging/cxt1e1/pmc93x6_eeprom.h delete mode 100644 drivers/staging/cxt1e1/pmcc4.h delete mode 100644 drivers/staging/cxt1e1/pmcc4_cpld.h delete mode 100644 drivers/staging/cxt1e1/pmcc4_defs.h delete mode 100644 drivers/staging/cxt1e1/pmcc4_drv.c delete mode 100644 drivers/staging/cxt1e1/pmcc4_ioctls.h delete mode 100644 drivers/staging/cxt1e1/pmcc4_private.h delete mode 100644 drivers/staging/cxt1e1/pmcc4_sysdep.h delete mode 100644 drivers/staging/cxt1e1/sbe_bid.h delete mode 100644 drivers/staging/cxt1e1/sbe_promformat.h delete mode 100644 drivers/staging/cxt1e1/sbecom_inline_linux.h delete mode 100644 drivers/staging/cxt1e1/sbecrc.c delete mode 100644 drivers/staging/cxt1e1/sbeid.c delete mode 100644 drivers/staging/cxt1e1/sbeproc.c delete mode 100644 drivers/staging/cxt1e1/sbeproc.h delete mode 100644 drivers/staging/cxt1e1/sbew_ioc.h delete mode 100644 drivers/staging/dgrp/Kconfig delete mode 100644 drivers/staging/dgrp/Makefile delete mode 100644 drivers/staging/dgrp/README delete mode 100644 drivers/staging/dgrp/TODO delete mode 100644 drivers/staging/dgrp/dgrp_common.c delete mode 100644 drivers/staging/dgrp/dgrp_common.h delete mode 100644 drivers/staging/dgrp/dgrp_dpa_ops.c delete mode 100644 drivers/staging/dgrp/dgrp_driver.c delete mode 100644 drivers/staging/dgrp/dgrp_mon_ops.c delete mode 100644 drivers/staging/dgrp/dgrp_net_ops.c delete mode 100644 drivers/staging/dgrp/dgrp_ports_ops.c delete mode 100644 drivers/staging/dgrp/dgrp_specproc.c delete mode 100644 drivers/staging/dgrp/dgrp_sysfs.c delete mode 100644 drivers/staging/dgrp/dgrp_tty.c delete mode 100644 drivers/staging/dgrp/digirp.h delete mode 100644 drivers/staging/dgrp/drp.h create mode 100644 drivers/staging/emxx_udc/Kconfig create mode 100644 drivers/staging/emxx_udc/Makefile create mode 100644 drivers/staging/emxx_udc/TODO create mode 100644 drivers/staging/emxx_udc/emxx_udc.c create mode 100644 drivers/staging/emxx_udc/emxx_udc.h delete mode 100644 drivers/staging/frontier/Kconfig delete mode 100644 drivers/staging/frontier/Makefile delete mode 100644 drivers/staging/frontier/README delete mode 100644 drivers/staging/frontier/TODO delete mode 100644 drivers/staging/frontier/alphatrack.c delete mode 100644 drivers/staging/frontier/alphatrack.h delete mode 100644 drivers/staging/frontier/tranzport.c delete mode 100644 drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c delete mode 100644 drivers/staging/ft1000/ft1000-usb/ft1000_proc.c create mode 100644 drivers/staging/iio/magnetometer/hmc5843.h rename drivers/staging/iio/magnetometer/{hmc5843.c => hmc5843_core.c} (73%) create mode 100644 drivers/staging/iio/magnetometer/hmc5843_i2c.c create mode 100644 drivers/staging/iio/magnetometer/hmc5843_spi.c delete mode 100644 drivers/staging/keucr/Kconfig delete mode 100644 drivers/staging/keucr/Makefile delete mode 100644 drivers/staging/keucr/TODO delete mode 100644 drivers/staging/keucr/common.h delete mode 100644 drivers/staging/keucr/init.c delete mode 100644 drivers/staging/keucr/init.h delete mode 100644 drivers/staging/keucr/scsiglue.c delete mode 100644 drivers/staging/keucr/scsiglue.h delete mode 100644 drivers/staging/keucr/smcommon.h delete mode 100644 drivers/staging/keucr/smil.h delete mode 100644 drivers/staging/keucr/smilecc.c delete mode 100644 drivers/staging/keucr/smilmain.c delete mode 100644 drivers/staging/keucr/smilsub.c delete mode 100644 drivers/staging/keucr/smscsi.c delete mode 100644 drivers/staging/keucr/transport.c delete mode 100644 drivers/staging/keucr/transport.h delete mode 100644 drivers/staging/keucr/usb.c delete mode 100644 drivers/staging/keucr/usb.h delete mode 100644 drivers/staging/lustre/include/linux/libcfs/bitmap.h delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/kp30.h delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-bitops.h delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-lock.h delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-tcpip.h delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-types.h delete mode 100644 drivers/staging/lustre/include/linux/libcfs/params_tree.h rename drivers/staging/lustre/{include/linux => lustre}/libcfs/linux/linux-crypto.h (72%) delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/Makefile delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_api.h delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_asn1.h delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_bulk.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_cli_upcall.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_err.h delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_generic_token.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_internal.h delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_keyring.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_krb5.h delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_krb5_mech.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_mech_switch.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_pipefs.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_rawobj.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_svc_upcall.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/lproc_gss.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/sec_gss.c delete mode 100644 drivers/staging/phison/Kconfig delete mode 100644 drivers/staging/phison/Makefile delete mode 100644 drivers/staging/phison/phison.c delete mode 100644 drivers/staging/quickstart/Kconfig delete mode 100644 drivers/staging/quickstart/Makefile delete mode 100644 drivers/staging/quickstart/quickstart.c delete mode 100644 drivers/staging/rtl8188eu/core/rtw_br_ext.c delete mode 100644 drivers/staging/rtl8188eu/core/rtw_io.c delete mode 100644 drivers/staging/rtl8188eu/core/rtw_mp.c delete mode 100644 drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c delete mode 100644 drivers/staging/rtl8188eu/core/rtw_p2p.c delete mode 100644 drivers/staging/rtl8188eu/hal/HalPhyRf.c delete mode 100644 drivers/staging/rtl8188eu/hal/rtl8188e_mp.c delete mode 100644 drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c delete mode 100644 drivers/staging/rtl8188eu/hal/usb_ops_linux.c delete mode 100644 drivers/staging/rtl8188eu/include/Hal8188EReg.h delete mode 100644 drivers/staging/rtl8188eu/include/HalPhyRf.h delete mode 100644 drivers/staging/rtl8188eu/include/cmd_osdep.h delete mode 100644 drivers/staging/rtl8188eu/include/rtl8188e_sreset.h delete mode 100644 drivers/staging/rtl8188eu/include/rtw_br_ext.h delete mode 100644 drivers/staging/rtl8188eu/include/rtw_io.h delete mode 100644 drivers/staging/rtl8188eu/include/rtw_mp.h delete mode 100644 drivers/staging/rtl8188eu/include/rtw_mp_ioctl.h delete mode 100644 drivers/staging/rtl8188eu/include/rtw_p2p.h delete mode 100644 drivers/staging/rtl8188eu/include/rtw_version.h delete mode 100644 drivers/staging/rtl8188eu/include/usb_ops.h delete mode 100644 drivers/staging/rtl8188eu/include/usb_osintf.h delete mode 100644 drivers/staging/rtl8188eu/include/usb_vendor_req.h delete mode 100644 drivers/staging/rtl8723au/core/rtw_ioctl_set.c delete mode 100644 drivers/staging/rtl8723au/include/odm_RegDefine11AC.h delete mode 100644 drivers/staging/rtl8723au/include/rtw_ioctl_set.h delete mode 100644 drivers/staging/rts5208/debug.h delete mode 100644 drivers/staging/sep/Kconfig delete mode 100644 drivers/staging/sep/Makefile delete mode 100644 drivers/staging/sep/TODO delete mode 100644 drivers/staging/sep/sep_crypto.c delete mode 100644 drivers/staging/sep/sep_crypto.h delete mode 100644 drivers/staging/sep/sep_dev.h delete mode 100644 drivers/staging/sep/sep_driver_api.h delete mode 100644 drivers/staging/sep/sep_driver_config.h delete mode 100644 drivers/staging/sep/sep_driver_hw_defs.h delete mode 100644 drivers/staging/sep/sep_main.c delete mode 100644 drivers/staging/sep/sep_trace_events.h delete mode 100644 drivers/staging/serqt_usb2/Kconfig delete mode 100644 drivers/staging/serqt_usb2/Makefile delete mode 100644 drivers/staging/serqt_usb2/serqt_usb2.c delete mode 100644 drivers/staging/silicom/Kconfig delete mode 100644 drivers/staging/silicom/Makefile delete mode 100644 drivers/staging/silicom/README delete mode 100644 drivers/staging/silicom/TODO delete mode 100644 drivers/staging/silicom/bits.h delete mode 100644 drivers/staging/silicom/bp_ioctl.h delete mode 100644 drivers/staging/silicom/bp_mod.h delete mode 100644 drivers/staging/silicom/bpctl_mod.c delete mode 100644 drivers/staging/silicom/bypass.h delete mode 100644 drivers/staging/silicom/bypasslib/Makefile delete mode 100644 drivers/staging/silicom/bypasslib/bp_ioctl.h delete mode 100644 drivers/staging/silicom/bypasslib/bplibk.h delete mode 100644 drivers/staging/silicom/bypasslib/bypass.c delete mode 100644 drivers/staging/silicom/bypasslib/libbp_sd.h delete mode 100644 drivers/staging/silicom/libbp_sd.h delete mode 100644 drivers/staging/tidspbridge/Documentation/CONTRIBUTORS delete mode 100644 drivers/staging/tidspbridge/Documentation/README delete mode 100644 drivers/staging/tidspbridge/Documentation/error-codes delete mode 100644 drivers/staging/tidspbridge/Kconfig delete mode 100644 drivers/staging/tidspbridge/Makefile delete mode 100644 drivers/staging/tidspbridge/TODO delete mode 100644 drivers/staging/tidspbridge/core/_cmm.h delete mode 100644 drivers/staging/tidspbridge/core/_deh.h delete mode 100644 drivers/staging/tidspbridge/core/_msg_sm.h delete mode 100644 drivers/staging/tidspbridge/core/_tiomap.h delete mode 100644 drivers/staging/tidspbridge/core/_tiomap_pwr.h delete mode 100644 drivers/staging/tidspbridge/core/chnl_sm.c delete mode 100644 drivers/staging/tidspbridge/core/dsp-clock.c delete mode 100644 drivers/staging/tidspbridge/core/io_sm.c delete mode 100644 drivers/staging/tidspbridge/core/msg_sm.c delete mode 100644 drivers/staging/tidspbridge/core/sync.c delete mode 100644 drivers/staging/tidspbridge/core/tiomap3430.c delete mode 100644 drivers/staging/tidspbridge/core/tiomap3430_pwr.c delete mode 100644 drivers/staging/tidspbridge/core/tiomap_io.c delete mode 100644 drivers/staging/tidspbridge/core/tiomap_io.h delete mode 100644 drivers/staging/tidspbridge/core/ue_deh.c delete mode 100644 drivers/staging/tidspbridge/core/wdt.c delete mode 100644 drivers/staging/tidspbridge/dynload/cload.c delete mode 100644 drivers/staging/tidspbridge/dynload/dload_internal.h delete mode 100644 drivers/staging/tidspbridge/dynload/doff.h delete mode 100644 drivers/staging/tidspbridge/dynload/getsection.c delete mode 100644 drivers/staging/tidspbridge/dynload/header.h delete mode 100644 drivers/staging/tidspbridge/dynload/module_list.h delete mode 100644 drivers/staging/tidspbridge/dynload/params.h delete mode 100644 drivers/staging/tidspbridge/dynload/reloc.c delete mode 100644 drivers/staging/tidspbridge/dynload/reloc_table.h delete mode 100644 drivers/staging/tidspbridge/dynload/reloc_table_c6000.c delete mode 100644 drivers/staging/tidspbridge/dynload/tramp.c delete mode 100644 drivers/staging/tidspbridge/dynload/tramp_table_c6000.c delete mode 100644 drivers/staging/tidspbridge/gen/gh.c delete mode 100644 drivers/staging/tidspbridge/hw/EasiGlobal.h delete mode 100644 drivers/staging/tidspbridge/hw/MMUAccInt.h delete mode 100644 drivers/staging/tidspbridge/hw/MMURegAcM.h delete mode 100644 drivers/staging/tidspbridge/hw/hw_defs.h delete mode 100644 drivers/staging/tidspbridge/hw/hw_mmu.c delete mode 100644 drivers/staging/tidspbridge/hw/hw_mmu.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/_chnl_sm.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/brddefs.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/cfgdefs.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/chnl.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/chnldefs.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/chnlpriv.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/clk.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/cmm.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/cmmdefs.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/cod.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dbdcd.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dbdcddef.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dbdefs.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dbll.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dblldefs.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dev.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/devdefs.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/disp.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dmm.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/drv.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dspapi-ioctl.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dspapi.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dspchnl.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dspdefs.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dspdeh.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dspdrv.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dspio.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dspioctl.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dspmsg.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dynamic_loader.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/getsection.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/gh.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/host_os.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/io.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/io_sm.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/mbx_sh.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/memdefs.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/mgr.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/mgrpriv.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/msg.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/msgdefs.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/nldr.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/nldrdefs.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/node.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/nodedefs.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/nodepriv.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/ntfy.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/proc.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/procpriv.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/pwr.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/resourcecleanup.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/rmm.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/rms_sh.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/rmstypes.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/strm.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/strmdefs.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/sync.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/uuidutil.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/wdt.h delete mode 100644 drivers/staging/tidspbridge/pmgr/chnl.c delete mode 100644 drivers/staging/tidspbridge/pmgr/chnlobj.h delete mode 100644 drivers/staging/tidspbridge/pmgr/cmm.c delete mode 100644 drivers/staging/tidspbridge/pmgr/cod.c delete mode 100644 drivers/staging/tidspbridge/pmgr/dbll.c delete mode 100644 drivers/staging/tidspbridge/pmgr/dev.c delete mode 100644 drivers/staging/tidspbridge/pmgr/dmm.c delete mode 100644 drivers/staging/tidspbridge/pmgr/dspapi.c delete mode 100644 drivers/staging/tidspbridge/pmgr/io.c delete mode 100644 drivers/staging/tidspbridge/pmgr/ioobj.h delete mode 100644 drivers/staging/tidspbridge/pmgr/msg.c delete mode 100644 drivers/staging/tidspbridge/pmgr/msgobj.h delete mode 100644 drivers/staging/tidspbridge/rmgr/dbdcd.c delete mode 100644 drivers/staging/tidspbridge/rmgr/disp.c delete mode 100644 drivers/staging/tidspbridge/rmgr/drv.c delete mode 100644 drivers/staging/tidspbridge/rmgr/drv_interface.c delete mode 100644 drivers/staging/tidspbridge/rmgr/dspdrv.c delete mode 100644 drivers/staging/tidspbridge/rmgr/mgr.c delete mode 100644 drivers/staging/tidspbridge/rmgr/nldr.c delete mode 100644 drivers/staging/tidspbridge/rmgr/node.c delete mode 100644 drivers/staging/tidspbridge/rmgr/proc.c delete mode 100644 drivers/staging/tidspbridge/rmgr/pwr.c delete mode 100644 drivers/staging/tidspbridge/rmgr/rmm.c delete mode 100644 drivers/staging/tidspbridge/rmgr/strm.c create mode 100644 drivers/staging/unisys/Documentation/ABI/sysfs-platform-visorchipset delete mode 100644 drivers/staging/unisys/visorchipset/controlvm.h delete mode 100644 drivers/staging/unisys/visorchipset/controlvm_direct.c delete mode 100644 drivers/staging/vt6656/80211hdr.h delete mode 100644 drivers/staging/vt6656/80211mgr.c delete mode 100644 drivers/staging/vt6656/80211mgr.h delete mode 100644 drivers/staging/vt6656/bssdb.c delete mode 100644 drivers/staging/vt6656/bssdb.h delete mode 100644 drivers/staging/vt6656/country.h delete mode 100644 drivers/staging/vt6656/datarate.c delete mode 100644 drivers/staging/vt6656/datarate.h delete mode 100644 drivers/staging/vt6656/iocmd.h delete mode 100644 drivers/staging/vt6656/iowpa.h delete mode 100644 drivers/staging/vt6656/iwctl.c delete mode 100644 drivers/staging/vt6656/iwctl.h delete mode 100644 drivers/staging/vt6656/michael.c delete mode 100644 drivers/staging/vt6656/michael.h delete mode 100644 drivers/staging/vt6656/rc4.c delete mode 100644 drivers/staging/vt6656/rc4.h delete mode 100644 drivers/staging/vt6656/tether.c delete mode 100644 drivers/staging/vt6656/tether.h delete mode 100644 drivers/staging/vt6656/tkip.c delete mode 100644 drivers/staging/vt6656/tkip.h delete mode 100644 drivers/staging/vt6656/tmacro.h delete mode 100644 drivers/staging/vt6656/vntconfiguration.dat delete mode 100644 drivers/staging/vt6656/wctl.c delete mode 100644 drivers/staging/vt6656/wctl.h delete mode 100644 drivers/staging/vt6656/wmgr.c delete mode 100644 drivers/staging/vt6656/wmgr.h delete mode 100644 drivers/staging/vt6656/wpa.c delete mode 100644 drivers/staging/vt6656/wpa.h delete mode 100644 drivers/staging/vt6656/wpa2.c delete mode 100644 drivers/staging/vt6656/wpa2.h delete mode 100644 drivers/staging/vt6656/wpactl.c delete mode 100644 drivers/staging/vt6656/wpactl.h delete mode 100644 drivers/staging/winbond/Kconfig delete mode 100644 drivers/staging/winbond/Makefile delete mode 100644 drivers/staging/winbond/TODO delete mode 100644 drivers/staging/winbond/core.h delete mode 100644 drivers/staging/winbond/localpara.h delete mode 100644 drivers/staging/winbond/mac_structures.h delete mode 100644 drivers/staging/winbond/mds.c delete mode 100644 drivers/staging/winbond/mds_f.h delete mode 100644 drivers/staging/winbond/mds_s.h delete mode 100644 drivers/staging/winbond/mto.c delete mode 100644 drivers/staging/winbond/mto.h delete mode 100644 drivers/staging/winbond/phy_calibration.c delete mode 100644 drivers/staging/winbond/phy_calibration.h delete mode 100644 drivers/staging/winbond/reg.c delete mode 100644 drivers/staging/winbond/sme_api.h delete mode 100644 drivers/staging/winbond/wb35reg.c delete mode 100644 drivers/staging/winbond/wb35reg_f.h delete mode 100644 drivers/staging/winbond/wb35reg_s.h delete mode 100644 drivers/staging/winbond/wb35rx.c delete mode 100644 drivers/staging/winbond/wb35rx_f.h delete mode 100644 drivers/staging/winbond/wb35rx_s.h delete mode 100644 drivers/staging/winbond/wb35tx.c delete mode 100644 drivers/staging/winbond/wb35tx_f.h delete mode 100644 drivers/staging/winbond/wb35tx_s.h delete mode 100644 drivers/staging/winbond/wbhal.h delete mode 100644 drivers/staging/winbond/wbusb.c delete mode 100644 drivers/staging/wlags49_h2/Kconfig delete mode 100644 drivers/staging/wlags49_h2/Makefile delete mode 100644 drivers/staging/wlags49_h2/README.ubuntu delete mode 100644 drivers/staging/wlags49_h2/README.wlags49 delete mode 100644 drivers/staging/wlags49_h2/TODO delete mode 100644 drivers/staging/wlags49_h2/WARNING.txt delete mode 100644 drivers/staging/wlags49_h2/ap_h2.c delete mode 100644 drivers/staging/wlags49_h2/ap_h25.c delete mode 100644 drivers/staging/wlags49_h2/debug.h delete mode 100644 drivers/staging/wlags49_h2/dhf.c delete mode 100644 drivers/staging/wlags49_h2/dhf.h delete mode 100644 drivers/staging/wlags49_h2/dhfcfg.h delete mode 100644 drivers/staging/wlags49_h2/hcf.c delete mode 100644 drivers/staging/wlags49_h2/hcf.h delete mode 100644 drivers/staging/wlags49_h2/hcfcfg.h delete mode 100644 drivers/staging/wlags49_h2/hcfdef.h delete mode 100644 drivers/staging/wlags49_h2/man/wlags49.4 delete mode 100644 drivers/staging/wlags49_h2/mdd.h delete mode 100644 drivers/staging/wlags49_h2/mmd.c delete mode 100644 drivers/staging/wlags49_h2/mmd.h delete mode 100644 drivers/staging/wlags49_h2/sta_h2.c delete mode 100644 drivers/staging/wlags49_h2/sta_h25.c delete mode 100644 drivers/staging/wlags49_h2/wl_cs.c delete mode 100644 drivers/staging/wlags49_h2/wl_cs.h delete mode 100644 drivers/staging/wlags49_h2/wl_enc.c delete mode 100644 drivers/staging/wlags49_h2/wl_enc.h delete mode 100644 drivers/staging/wlags49_h2/wl_if.h delete mode 100644 drivers/staging/wlags49_h2/wl_internal.h delete mode 100644 drivers/staging/wlags49_h2/wl_main.c delete mode 100644 drivers/staging/wlags49_h2/wl_main.h delete mode 100644 drivers/staging/wlags49_h2/wl_netdev.c delete mode 100644 drivers/staging/wlags49_h2/wl_netdev.h delete mode 100644 drivers/staging/wlags49_h2/wl_priv.c delete mode 100644 drivers/staging/wlags49_h2/wl_priv.h delete mode 100644 drivers/staging/wlags49_h2/wl_profile.c delete mode 100644 drivers/staging/wlags49_h2/wl_profile.h delete mode 100644 drivers/staging/wlags49_h2/wl_util.c delete mode 100644 drivers/staging/wlags49_h2/wl_util.h delete mode 100644 drivers/staging/wlags49_h2/wl_version.h delete mode 100644 drivers/staging/wlags49_h2/wl_wext.c delete mode 100644 drivers/staging/wlags49_h2/wl_wext.h delete mode 100644 drivers/staging/wlags49_h25/Kconfig delete mode 100644 drivers/staging/wlags49_h25/Makefile delete mode 100644 drivers/staging/wlags49_h25/README.txt delete mode 100644 drivers/staging/wlags49_h25/TODO delete mode 100644 drivers/staging/wlags49_h25/ap_h25.c delete mode 100644 drivers/staging/wlags49_h25/debug.h delete mode 100644 drivers/staging/wlags49_h25/dhf.c delete mode 100644 drivers/staging/wlags49_h25/dhf.h delete mode 100644 drivers/staging/wlags49_h25/dhfcfg.h delete mode 100644 drivers/staging/wlags49_h25/hcf.c delete mode 100644 drivers/staging/wlags49_h25/hcf.h delete mode 100644 drivers/staging/wlags49_h25/hcfcfg.h delete mode 100644 drivers/staging/wlags49_h25/hcfdef.h delete mode 100644 drivers/staging/wlags49_h25/mdd.h delete mode 100644 drivers/staging/wlags49_h25/mmd.c delete mode 100644 drivers/staging/wlags49_h25/mmd.h delete mode 100644 drivers/staging/wlags49_h25/sta_h25.c delete mode 100644 drivers/staging/wlags49_h25/wl_cs.c delete mode 100644 drivers/staging/wlags49_h25/wl_cs.h delete mode 100644 drivers/staging/wlags49_h25/wl_enc.c delete mode 100644 drivers/staging/wlags49_h25/wl_enc.h delete mode 100644 drivers/staging/wlags49_h25/wl_if.h delete mode 100644 drivers/staging/wlags49_h25/wl_internal.h delete mode 100644 drivers/staging/wlags49_h25/wl_main.c delete mode 100644 drivers/staging/wlags49_h25/wl_main.h delete mode 100644 drivers/staging/wlags49_h25/wl_netdev.c delete mode 100644 drivers/staging/wlags49_h25/wl_netdev.h delete mode 100644 drivers/staging/wlags49_h25/wl_priv.c delete mode 100644 drivers/staging/wlags49_h25/wl_priv.h delete mode 100644 drivers/staging/wlags49_h25/wl_profile.c delete mode 100644 drivers/staging/wlags49_h25/wl_profile.h delete mode 100644 drivers/staging/wlags49_h25/wl_util.c delete mode 100644 drivers/staging/wlags49_h25/wl_util.h delete mode 100644 drivers/staging/wlags49_h25/wl_version.h delete mode 100644 drivers/staging/wlags49_h25/wl_wext.c delete mode 100644 drivers/staging/wlags49_h25/wl_wext.h create mode 100644 include/linux/iio/accel/kxcjk_1013.h rename {drivers/staging/iio/adc => include/linux/platform_data}/ad7291.h (100%) delete mode 100644 include/linux/platform_data/dsp-omap.h Merging char-misc/char-misc-next (16eb2bfc65ef Merge tag 'extcon-next-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next) $ git merge char-misc/char-misc-next Resolved 'drivers/Kconfig' using previous resolution. Resolved 'drivers/Makefile' using previous resolution. Resolved 'drivers/dma/Makefile' using previous resolution. Auto-merging tools/testing/selftests/Makefile Auto-merging include/linux/pci.h Auto-merging drivers/pcmcia/Makefile Auto-merging drivers/pcmcia/Kconfig Auto-merging drivers/pci/quirks.c Auto-merging drivers/dma/Makefile CONFLICT (content): Merge conflict in drivers/dma/Makefile Auto-merging drivers/dma/Kconfig Auto-merging drivers/Makefile CONFLICT (content): Merge conflict in drivers/Makefile Auto-merging drivers/Kconfig CONFLICT (content): Merge conflict in drivers/Kconfig Auto-merging MAINTAINERS Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 7336662b3888] Merge remote-tracking branch 'char-misc/char-misc-next' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/sysfs-class-mei | 16 + Documentation/ABI/testing/sysfs-driver-genwqe | 9 + .../devicetree/bindings/extcon/extcon-sm5502.txt | 23 + Documentation/mic/mic_overview.txt | 67 +- Documentation/mic/mpssd/mpss | 14 +- Documentation/w1/slaves/w1_ds2406 | 25 + MAINTAINERS | 5 + drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/char/bsr.c | 2 +- drivers/char/dsp56k.c | 2 +- drivers/char/i8k.c | 123 ++-- drivers/char/xilinx_hwicap/xilinx_hwicap.c | 1 + drivers/dma/Kconfig | 18 + drivers/dma/Makefile | 1 + drivers/dma/mic_x100_dma.c | 774 +++++++++++++++++++++ drivers/dma/mic_x100_dma.h | 286 ++++++++ drivers/extcon/Kconfig | 38 +- drivers/extcon/Makefile | 7 +- drivers/extcon/extcon-adc-jack.c | 1 - drivers/extcon/extcon-arizona.c | 74 +- drivers/extcon/extcon-class.c | 2 + drivers/extcon/extcon-gpio.c | 1 - drivers/extcon/extcon-max14577.c | 5 +- drivers/extcon/extcon-max77693.c | 6 +- drivers/extcon/extcon-max8997.c | 5 +- drivers/extcon/extcon-palmas.c | 3 +- drivers/extcon/extcon-sm5502.c | 724 +++++++++++++++++++ drivers/hv/channel.c | 6 +- drivers/ipack/carriers/tpci200.c | 2 +- drivers/ipack/devices/ipoctal.c | 20 +- drivers/misc/bh1770glc.c | 35 +- drivers/misc/bh1780gli.c | 33 +- drivers/misc/carma/carma-fpga.c | 5 +- drivers/misc/dummy-irq.c | 1 + drivers/misc/genwqe/Kconfig | 6 + drivers/misc/genwqe/card_base.c | 217 +++++- drivers/misc/genwqe/card_base.h | 2 + drivers/misc/genwqe/card_ddcb.c | 28 +- drivers/misc/genwqe/card_debugfs.c | 7 + drivers/misc/genwqe/card_dev.c | 5 + drivers/misc/genwqe/card_sysfs.c | 25 + drivers/misc/genwqe/card_utils.c | 20 +- drivers/misc/genwqe/genwqe_driver.h | 2 +- drivers/misc/lattice-ecp3-config.c | 16 +- drivers/misc/lkdtm.c | 1 + drivers/misc/mei/client.c | 17 +- drivers/misc/mei/hw-me-regs.h | 1 + drivers/misc/mei/hw-me.c | 54 -- drivers/misc/mei/hw-txe.c | 32 - drivers/misc/mei/main.c | 148 +++- drivers/misc/mei/mei_dev.h | 12 +- drivers/misc/mei/pci-me.c | 6 +- drivers/misc/mei/pci-txe.c | 4 +- drivers/misc/mic/Kconfig | 21 +- drivers/misc/mic/Makefile | 1 + drivers/misc/mic/bus/Makefile | 5 + drivers/misc/mic/bus/mic_bus.c | 218 ++++++ drivers/misc/mic/card/mic_device.c | 23 +- drivers/misc/mic/card/mic_device.h | 9 +- drivers/misc/mic/card/mic_virtio.c | 7 +- drivers/misc/mic/card/mic_x100.c | 62 +- drivers/misc/mic/host/mic_boot.c | 83 ++- drivers/misc/mic/host/mic_device.h | 24 + drivers/misc/mic/host/mic_intr.c | 121 ++-- drivers/misc/mic/host/mic_intr.h | 27 +- drivers/misc/mic/host/mic_main.c | 7 +- drivers/misc/mic/host/mic_virtio.c | 187 ++++- drivers/misc/mic/host/mic_virtio.h | 21 +- drivers/misc/mic/host/mic_x100.c | 8 + drivers/misc/ti-st/st_kim.c | 8 +- drivers/misc/vexpress-syscfg.c | 4 +- drivers/misc/vmw_vmci/vmci_guest.c | 2 +- drivers/pci/pci-driver.c | 18 +- drivers/pci/quirks.c | 104 +++ drivers/pcmcia/Kconfig | 2 +- drivers/pcmcia/Makefile | 1 + drivers/pcmcia/bcm63xx_pcmcia.c | 2 +- drivers/pcmcia/i82092.c | 2 +- drivers/pcmcia/pd6729.c | 2 +- drivers/pcmcia/sa1111_jornada720.c | 10 +- drivers/pcmcia/vrc4173_cardu.c | 2 +- drivers/pcmcia/yenta_socket.c | 2 +- drivers/spmi/spmi.c | 1 - drivers/thunderbolt/Kconfig | 13 + drivers/thunderbolt/Makefile | 3 + drivers/thunderbolt/cap.c | 116 +++ drivers/thunderbolt/ctl.c | 731 +++++++++++++++++++ drivers/thunderbolt/ctl.h | 75 ++ drivers/thunderbolt/eeprom.c | 449 ++++++++++++ drivers/thunderbolt/nhi.c | 675 ++++++++++++++++++ drivers/thunderbolt/nhi.h | 114 +++ drivers/thunderbolt/nhi_regs.h | 101 +++ drivers/thunderbolt/path.c | 215 ++++++ drivers/thunderbolt/switch.c | 507 ++++++++++++++ drivers/thunderbolt/tb.c | 436 ++++++++++++ drivers/thunderbolt/tb.h | 271 ++++++++ drivers/thunderbolt/tb_regs.h | 213 ++++++ drivers/thunderbolt/tunnel_pci.c | 232 ++++++ drivers/thunderbolt/tunnel_pci.h | 30 + drivers/uio/uio_pruss.c | 37 +- drivers/vme/bridges/vme_ca91cx42.h | 1 - drivers/w1/masters/ds1wm.c | 2 +- drivers/w1/masters/ds2482.c | 2 +- drivers/w1/masters/ds2490.c | 50 +- drivers/w1/masters/mxc_w1.c | 64 +- drivers/w1/slaves/Kconfig | 8 + drivers/w1/slaves/Makefile | 1 + drivers/w1/slaves/w1_ds2406.c | 168 +++++ drivers/w1/slaves/w1_ds2760.c | 3 +- drivers/w1/w1.c | 10 +- drivers/w1/w1_family.c | 2 +- drivers/w1/w1_family.h | 1 + drivers/w1/w1_int.c | 19 +- drivers/w1/w1_log.h | 4 +- drivers/w1/w1_netlink.c | 3 +- include/asm-generic/vmlinux.lds.h | 3 + include/linux/extcon/sm5502.h | 287 ++++++++ include/linux/mfd/arizona/pdata.h | 3 + include/linux/mic_bus.h | 110 +++ include/linux/pci.h | 12 +- include/uapi/linux/genwqe/genwqe_card.h | 1 + include/uapi/linux/i8k.h | 3 +- tools/hv/hv_fcopy_daemon.c | 3 +- tools/testing/selftests/Makefile | 18 + tools/testing/selftests/README.txt | 27 +- tools/testing/selftests/cpu-hotplug/Makefile | 3 + tools/testing/selftests/cpu-hotplug/on-off-test.sh | 52 +- tools/testing/selftests/kcmp/kcmp_test.c | 2 +- tools/testing/selftests/memory-hotplug/Makefile | 3 + .../selftests/memory-hotplug/on-off-test.sh | 8 + tools/testing/selftests/mqueue/Makefile | 4 +- tools/testing/selftests/mqueue/mq_open_tests.c | 20 +- tools/testing/selftests/mqueue/mq_perf_tests.c | 40 +- 134 files changed, 8429 insertions(+), 650 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-class-mei create mode 100644 Documentation/devicetree/bindings/extcon/extcon-sm5502.txt create mode 100644 Documentation/w1/slaves/w1_ds2406 create mode 100644 drivers/dma/mic_x100_dma.c create mode 100644 drivers/dma/mic_x100_dma.h create mode 100644 drivers/extcon/extcon-sm5502.c create mode 100644 drivers/misc/mic/bus/Makefile create mode 100644 drivers/misc/mic/bus/mic_bus.c create mode 100644 drivers/thunderbolt/Kconfig create mode 100644 drivers/thunderbolt/Makefile create mode 100644 drivers/thunderbolt/cap.c create mode 100644 drivers/thunderbolt/ctl.c create mode 100644 drivers/thunderbolt/ctl.h create mode 100644 drivers/thunderbolt/eeprom.c create mode 100644 drivers/thunderbolt/nhi.c create mode 100644 drivers/thunderbolt/nhi.h create mode 100644 drivers/thunderbolt/nhi_regs.h create mode 100644 drivers/thunderbolt/path.c create mode 100644 drivers/thunderbolt/switch.c create mode 100644 drivers/thunderbolt/tb.c create mode 100644 drivers/thunderbolt/tb.h create mode 100644 drivers/thunderbolt/tb_regs.h create mode 100644 drivers/thunderbolt/tunnel_pci.c create mode 100644 drivers/thunderbolt/tunnel_pci.h create mode 100644 drivers/w1/slaves/w1_ds2406.c create mode 100644 include/linux/extcon/sm5502.h create mode 100644 include/linux/mic_bus.h Merging cgroup/for-next (abdfd21809f2 Merge branch 'for-3.17' into for-next) $ git merge cgroup/for-next Auto-merging mm/memcontrol.c Auto-merging kernel/sched/core.c Auto-merging kernel/cgroup.c Auto-merging block/blk-cgroup.c Merge made by the 'recursive' strategy. Documentation/cgroups/cgroups.txt | 14 + Documentation/cgroups/unified-hierarchy.txt | 35 +- block/blk-cgroup.c | 13 +- block/blk-throttle.c | 6 +- include/linux/cgroup.h | 165 ++++----- kernel/cgroup.c | 453 +++++++++++++++++-------- kernel/cgroup_freezer.c | 2 +- kernel/cpuset.c | 500 +++++++++++++++++----------- kernel/sched/core.c | 2 +- kernel/sched/cpuacct.c | 2 +- mm/hugetlb_cgroup.c | 5 +- mm/memcontrol.c | 37 +- net/core/netclassid_cgroup.c | 2 +- net/core/netprio_cgroup.c | 2 +- net/ipv4/tcp_memcontrol.c | 2 +- security/device_cgroup.c | 2 +- 16 files changed, 806 insertions(+), 436 deletions(-) Merging scsi/for-next (cbf67842c3d9 scsi_debug: support scsi-mq, queues and locks) $ git merge scsi/for-next Resolved 'drivers/scsi/cxgbi/libcxgbi.h' using previous resolution. Resolved 'include/scsi/sg.h' using previous resolution. Auto-merging include/scsi/sg.h CONFLICT (content): Merge conflict in include/scsi/sg.h Removing include/scsi/scsi_tgt_if.h Removing include/scsi/scsi_tgt.h Removing include/scsi/libsrp.h Auto-merging drivers/usb/storage/Kconfig Auto-merging drivers/staging/rts5208/rtsx.c Removing drivers/scsi/scsi_transport_srp_internal.h Removing drivers/scsi/scsi_transport_fc_internal.h Removing drivers/scsi/scsi_tgt_priv.h Removing drivers/scsi/scsi_tgt_lib.c Removing drivers/scsi/scsi_tgt_if.c Removing drivers/scsi/libsrp.c Removing drivers/scsi/ibmvscsi/ibmvstgt.c Auto-merging drivers/scsi/cxgbi/libcxgbi.h CONFLICT (content): Merge conflict in drivers/scsi/cxgbi/libcxgbi.h Auto-merging drivers/scsi/cxgbi/libcxgbi.c Auto-merging arch/mips/configs/loongson3_defconfig Auto-merging MAINTAINERS Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master dae0e6be34b4] Merge remote-tracking branch 'scsi/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/scsi/tmscsim.txt | 2 - MAINTAINERS | 4 +- arch/arm/configs/msm_defconfig | 1 - arch/arm/configs/s3c2410_defconfig | 1 - arch/m68k/configs/amiga_defconfig | 1 - arch/m68k/configs/apollo_defconfig | 1 - arch/m68k/configs/atari_defconfig | 1 - arch/m68k/configs/bvme6000_defconfig | 1 - arch/m68k/configs/hp300_defconfig | 1 - arch/m68k/configs/mac_defconfig | 1 - arch/m68k/configs/multi_defconfig | 1 - arch/m68k/configs/mvme147_defconfig | 1 - arch/m68k/configs/mvme16x_defconfig | 1 - arch/m68k/configs/q40_defconfig | 1 - arch/m68k/configs/sun3_defconfig | 1 - arch/m68k/configs/sun3x_defconfig | 1 - arch/mips/configs/db1xxx_defconfig | 1 - arch/mips/configs/decstation_defconfig | 1 - arch/mips/configs/ip22_defconfig | 1 - arch/mips/configs/ip27_defconfig | 1 - arch/mips/configs/ip32_defconfig | 1 - arch/mips/configs/jazz_defconfig | 1 - arch/mips/configs/loongson3_defconfig | 1 - arch/mips/configs/malta_defconfig | 1 - arch/mips/configs/malta_kvm_defconfig | 1 - arch/mips/configs/malta_kvm_guest_defconfig | 1 - arch/mips/configs/markeins_defconfig | 1 - arch/mips/configs/nlm_xlp_defconfig | 3 - arch/mips/configs/nlm_xlr_defconfig | 3 - arch/mips/configs/rm200_defconfig | 1 - arch/mips/configs/tb0226_defconfig | 1 - arch/mips/configs/tb0287_defconfig | 1 - arch/powerpc/configs/52xx/motionpro_defconfig | 1 - arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig | 1 - arch/powerpc/configs/mpc5200_defconfig | 1 - arch/powerpc/configs/ppc6xx_defconfig | 2 - arch/s390/configs/default_defconfig | 2 - arch/s390/configs/gcov_defconfig | 2 - arch/s390/configs/performance_defconfig | 2 - arch/sh/configs/sh2007_defconfig | 1 - arch/tile/configs/tilegx_defconfig | 1 - arch/tile/configs/tilepro_defconfig | 1 - drivers/ata/libata-scsi.c | 2 +- drivers/ata/libata.h | 2 +- drivers/message/fusion/mptbase.c | 23 +- drivers/message/fusion/mptbase.h | 4 +- drivers/message/fusion/mptctl.c | 18 +- drivers/message/fusion/mptfc.c | 9 +- drivers/message/fusion/mptsas.c | 76 +- drivers/message/fusion/mptsas.h | 2 +- drivers/message/fusion/mptscsih.c | 31 +- drivers/message/fusion/mptscsih.h | 4 +- drivers/message/fusion/mptspi.c | 5 +- drivers/message/i2o/i2o_scsi.c | 11 +- drivers/s390/scsi/zfcp_dbf.c | 3 +- drivers/s390/scsi/zfcp_unit.c | 4 +- drivers/scsi/3w-xxxx.h | 4 +- drivers/scsi/53c700.c | 7 +- drivers/scsi/Kconfig | 61 +- drivers/scsi/Makefile | 5 - drivers/scsi/NCR5380.c | 31 +- drivers/scsi/NCR53c406a.c | 4 +- drivers/scsi/a100u2w.c | 2 +- drivers/scsi/aacraid/linit.c | 2 +- drivers/scsi/advansys.c | 6 +- drivers/scsi/aha152x.c | 6 +- drivers/scsi/aic7xxx/aic7770_osm.c | 3 +- drivers/scsi/aic7xxx/aic79xx.h | 2 +- drivers/scsi/aic7xxx/aic79xx_osm.c | 6 +- drivers/scsi/aic7xxx/aic79xx_osm_pci.c | 3 +- drivers/scsi/aic7xxx/aic79xx_proc.c | 2 +- drivers/scsi/aic7xxx/aic7xxx_osm.c | 11 +- drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 3 +- drivers/scsi/aic7xxx/aic7xxx_proc.c | 2 +- drivers/scsi/arcmsr/arcmsr_hba.c | 8 +- drivers/scsi/arm/acornscsi.c | 14 +- drivers/scsi/arm/fas216.c | 11 +- drivers/scsi/arm/queue.c | 3 +- drivers/scsi/atari_NCR5380.c | 62 +- drivers/scsi/be2iscsi/be_iscsi.c | 2 +- drivers/scsi/be2iscsi/be_mgmt.c | 20 +- drivers/scsi/bfa/bfa_fcs.c | 6 +- drivers/scsi/bfa/bfa_ioc.h | 2 +- drivers/scsi/bfa/bfad_bsg.c | 16 +- drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h | 13 + drivers/scsi/bnx2fc/Kconfig | 4 +- drivers/scsi/bnx2fc/bnx2fc.h | 7 +- drivers/scsi/bnx2fc/bnx2fc_constants.h | 13 + drivers/scsi/bnx2fc/bnx2fc_debug.c | 13 + drivers/scsi/bnx2fc/bnx2fc_debug.h | 13 + drivers/scsi/bnx2fc/bnx2fc_els.c | 3 +- drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 11 +- drivers/scsi/bnx2fc/bnx2fc_hwi.c | 3 +- drivers/scsi/bnx2fc/bnx2fc_io.c | 7 +- drivers/scsi/bnx2fc/bnx2fc_tgt.c | 3 +- drivers/scsi/bnx2i/57xx_iscsi_constants.h | 6 +- drivers/scsi/bnx2i/57xx_iscsi_hsi.h | 6 +- drivers/scsi/bnx2i/Kconfig | 4 +- drivers/scsi/bnx2i/bnx2i.h | 6 +- drivers/scsi/bnx2i/bnx2i_hwi.c | 6 +- drivers/scsi/bnx2i/bnx2i_init.c | 14 +- drivers/scsi/bnx2i/bnx2i_iscsi.c | 15 +- drivers/scsi/bnx2i/bnx2i_sysfs.c | 6 +- drivers/scsi/ch.c | 30 +- drivers/scsi/csiostor/csio_scsi.c | 24 +- drivers/scsi/cxgbi/libcxgbi.c | 2 +- drivers/scsi/cxgbi/libcxgbi.h | 2 +- drivers/scsi/dc395x.c | 51 +- drivers/scsi/dpt_i2o.c | 38 +- drivers/scsi/dpti.h | 6 +- drivers/scsi/eata.c | 4 +- drivers/scsi/fnic/fnic_scsi.c | 20 +- drivers/scsi/g_NCR5380.c | 2 +- drivers/scsi/hosts.c | 50 +- drivers/scsi/hpsa.c | 37 +- drivers/scsi/hptiop.c | 2 +- drivers/scsi/ibmvscsi/Makefile | 1 - drivers/scsi/ibmvscsi/ibmvfc.c | 477 +++---- drivers/scsi/ibmvscsi/ibmvfc.h | 268 ++-- drivers/scsi/ibmvscsi/ibmvstgt.c | 1001 --------------- drivers/scsi/in2000.c | 6 +- drivers/scsi/libiscsi.c | 12 +- drivers/scsi/libsas/sas_scsi_host.c | 16 +- drivers/scsi/libsrp.c | 447 ------- drivers/scsi/lpfc/lpfc_attr.c | 10 +- drivers/scsi/lpfc/lpfc_scsi.c | 36 +- drivers/scsi/megaraid.c | 6 +- drivers/scsi/megaraid/mega_common.h | 2 +- drivers/scsi/megaraid/megaraid_sas_fusion.c | 4 +- drivers/scsi/mesh.c | 2 +- drivers/scsi/mpt2sas/mpt2sas_base.c | 75 +- drivers/scsi/mpt2sas/mpt2sas_base.h | 2 +- drivers/scsi/mpt2sas/mpt2sas_scsih.c | 83 +- drivers/scsi/mpt3sas/mpt3sas_base.c | 75 +- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 92 +- drivers/scsi/ncr53c8xx.c | 2 +- drivers/scsi/ncr53c8xx.h | 4 - drivers/scsi/nsp32.c | 2 +- drivers/scsi/pas16.c | 2 - drivers/scsi/pcmcia/nsp_cs.c | 2 +- drivers/scsi/pcmcia/sym53c500_cs.c | 2 +- drivers/scsi/pm8001/pm8001_ctl.c | 11 +- drivers/scsi/pm8001/pm8001_hwi.c | 65 +- drivers/scsi/pm8001/pm8001_init.c | 35 +- drivers/scsi/pm8001/pm8001_sas.c | 38 +- drivers/scsi/pm8001/pm8001_sas.h | 2 +- drivers/scsi/pm8001/pm80xx_hwi.c | 48 +- drivers/scsi/pmcraid.c | 2 +- drivers/scsi/ps3rom.c | 2 +- drivers/scsi/qla2xxx/qla_def.h | 6 +- drivers/scsi/qla2xxx/qla_gbl.h | 18 +- drivers/scsi/qla2xxx/qla_init.c | 10 +- drivers/scsi/qla2xxx/qla_iocb.c | 11 +- drivers/scsi/qla2xxx/qla_isr.c | 4 +- drivers/scsi/qla2xxx/qla_mbx.c | 12 +- drivers/scsi/qla2xxx/qla_mr.c | 8 +- drivers/scsi/qla2xxx/qla_os.c | 48 +- drivers/scsi/qla4xxx/ql4_glbl.h | 4 +- drivers/scsi/qla4xxx/ql4_iocb.c | 2 +- drivers/scsi/qla4xxx/ql4_isr.c | 22 +- drivers/scsi/qla4xxx/ql4_mbx.c | 6 +- drivers/scsi/qla4xxx/ql4_os.c | 20 +- drivers/scsi/qlogicfas.c | 2 - drivers/scsi/qlogicpti.c | 2 +- drivers/scsi/scsi.c | 128 +- drivers/scsi/scsi_debug.c | 1483 +++++++++++++++------- drivers/scsi/scsi_error.c | 186 +-- drivers/scsi/scsi_ioctl.c | 17 +- drivers/scsi/scsi_lib.c | 935 ++++++++++---- drivers/scsi/scsi_priv.h | 5 +- drivers/scsi/scsi_proc.c | 2 +- drivers/scsi/scsi_scan.c | 181 ++- drivers/scsi/scsi_sysfs.c | 45 +- drivers/scsi/scsi_tgt_if.c | 399 ------ drivers/scsi/scsi_tgt_lib.c | 661 ---------- drivers/scsi/scsi_tgt_priv.h | 32 - drivers/scsi/scsi_transport_fc.c | 20 +- drivers/scsi/scsi_transport_fc_internal.h | 26 - drivers/scsi/scsi_transport_iscsi.c | 8 +- drivers/scsi/scsi_transport_sas.c | 2 +- drivers/scsi/scsi_transport_srp.c | 18 - drivers/scsi/scsi_transport_srp_internal.h | 25 - drivers/scsi/sd.c | 220 ++-- drivers/scsi/sd.h | 3 + drivers/scsi/sg.c | 657 +++++----- drivers/scsi/sr.c | 70 +- drivers/scsi/sr.h | 5 + drivers/scsi/sr_ioctl.c | 26 +- drivers/scsi/sr_vendor.c | 36 +- drivers/scsi/st.c | 605 ++++----- drivers/scsi/storvsc_drv.c | 123 +- drivers/scsi/sun3_NCR5380.c | 57 +- drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +- drivers/scsi/sym53c8xx_2/sym_hipd.h | 2 +- drivers/scsi/tmscsim.c | 6 +- drivers/scsi/u14-34f.c | 10 +- drivers/scsi/ufs/ufs.h | 38 +- drivers/scsi/ufs/ufshcd-pci.c | 26 - drivers/scsi/ufs/ufshcd.c | 427 +++++-- drivers/scsi/ufs/ufshci.h | 5 + drivers/scsi/virtio_scsi.c | 75 +- drivers/scsi/wd33c93.c | 33 +- drivers/staging/rts5208/rtsx.c | 4 +- drivers/target/loopback/tcm_loop.c | 2 +- drivers/target/target_core_pscsi.c | 12 +- drivers/usb/storage/Kconfig | 4 +- drivers/usb/storage/sddr09.c | 4 +- drivers/usb/storage/usb.c | 10 +- include/linux/moduleparam.h | 5 + include/linux/scatterlist.h | 6 +- include/scsi/libsrp.h | 78 -- include/scsi/scsi.h | 3 +- include/scsi/scsi_cmnd.h | 3 - include/scsi/scsi_device.h | 39 +- include/scsi/scsi_devinfo.h | 3 + include/scsi/scsi_driver.h | 3 - include/scsi/scsi_host.h | 68 +- include/scsi/scsi_tcq.h | 28 +- include/scsi/scsi_tgt.h | 21 - include/scsi/scsi_tgt_if.h | 108 -- include/scsi/scsi_transport.h | 2 +- include/scsi/scsi_transport_fc.h | 4 + include/scsi/sg.h | 91 +- kernel/params.c | 1 + lib/scatterlist.c | 25 +- 225 files changed, 4886 insertions(+), 6217 deletions(-) delete mode 100644 drivers/scsi/ibmvscsi/ibmvstgt.c delete mode 100644 drivers/scsi/libsrp.c delete mode 100644 drivers/scsi/scsi_tgt_if.c delete mode 100644 drivers/scsi/scsi_tgt_lib.c delete mode 100644 drivers/scsi/scsi_tgt_priv.h delete mode 100644 drivers/scsi/scsi_transport_fc_internal.h delete mode 100644 drivers/scsi/scsi_transport_srp_internal.h delete mode 100644 include/scsi/libsrp.h delete mode 100644 include/scsi/scsi_tgt.h delete mode 100644 include/scsi/scsi_tgt_if.h Merging scsi-core/core-for-3.16 (89fb4cd1f717 scsi: handle flush errors properly) $ git merge scsi-core/core-for-3.16 Already up-to-date. Merging scsi-drivers/drivers-for-3.16 (8faeb529b2da virtio-scsi: fix various bad behavior on aborted requests) $ git merge scsi-drivers/drivers-for-3.16 Already up-to-date. Merging target-updates/for-next (a497c3ba1d97 Linux 3.16-rc2) $ git merge target-updates/for-next Already up-to-date. Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) $ 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 Already up-to-date. Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries) $ git merge hwspinlock/linux-next Already up-to-date. Merging pinctrl/for-next (e1ee5c578fb1 pinctrl: baytrail: Convert to use gpiolib irqchip) $ git merge pinctrl/for-next Auto-merging drivers/pinctrl/sunxi/pinctrl-sunxi.c Auto-merging drivers/pinctrl/samsung/pinctrl-samsung.h Auto-merging drivers/pinctrl/samsung/pinctrl-samsung.c Auto-merging drivers/pinctrl/samsung/pinctrl-exynos5440.c Auto-merging drivers/pinctrl/samsung/pinctrl-exynos.c Auto-merging drivers/pinctrl/qcom/pinctrl-msm8x74.c Auto-merging drivers/pinctrl/qcom/pinctrl-msm.c Auto-merging drivers/pinctrl/qcom/pinctrl-ipq8064.c Auto-merging drivers/pinctrl/qcom/pinctrl-apq8064.c Auto-merging drivers/pinctrl/pinctrl-st.c Auto-merging drivers/pinctrl/nomadik/pinctrl-nomadik.c Auto-merging drivers/pinctrl/nomadik/pinctrl-abx500.c Auto-merging drivers/pinctrl/Makefile Auto-merging drivers/pinctrl/Kconfig Auto-merging arch/arm/mach-sunxi/Kconfig Merge made by the 'recursive' strategy. .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 2 + .../bindings/pinctrl/qcom,apq8064-pinctrl.txt | 2 +- .../bindings/pinctrl/qcom,ipq8064-pinctrl.txt | 2 +- .../bindings/pinctrl/qcom,msm8960-pinctrl.txt | 181 +++ .../bindings/pinctrl/qcom,msm8974-pinctrl.txt | 2 +- .../bindings/pinctrl/renesas,pfc-pinctrl.txt | 1 + .../bindings/pinctrl/rockchip,pinctrl.txt | 4 +- .../bindings/pinctrl/samsung-pinctrl.txt | 24 +- arch/arm/boot/dts/imx27-pinfunc.h | 46 - arch/arm/mach-sunxi/Kconfig | 1 - drivers/pinctrl/Kconfig | 117 +- drivers/pinctrl/Makefile | 24 +- drivers/pinctrl/core.c | 24 +- drivers/pinctrl/nomadik/Kconfig | 51 + drivers/pinctrl/nomadik/Makefile | 10 + drivers/pinctrl/{ => nomadik}/pinctrl-ab8500.c | 0 drivers/pinctrl/{ => nomadik}/pinctrl-ab8505.c | 0 drivers/pinctrl/{ => nomadik}/pinctrl-ab8540.c | 0 drivers/pinctrl/{ => nomadik}/pinctrl-ab9540.c | 0 drivers/pinctrl/{ => nomadik}/pinctrl-abx500.c | 19 +- drivers/pinctrl/{ => nomadik}/pinctrl-abx500.h | 0 .../pinctrl/{ => nomadik}/pinctrl-nomadik-db8500.c | 0 .../pinctrl/{ => nomadik}/pinctrl-nomadik-db8540.c | 0 .../{ => nomadik}/pinctrl-nomadik-stn8815.c | 0 drivers/pinctrl/{ => nomadik}/pinctrl-nomadik.c | 18 +- drivers/pinctrl/{ => nomadik}/pinctrl-nomadik.h | 0 drivers/pinctrl/pinctrl-adi2.c | 41 +- drivers/pinctrl/pinctrl-as3722.c | 11 +- drivers/pinctrl/pinctrl-at91.c | 27 +- drivers/pinctrl/pinctrl-baytrail.c | 103 +- drivers/pinctrl/pinctrl-bcm281xx.c | 2 +- drivers/pinctrl/pinctrl-bcm2835.c | 11 - drivers/pinctrl/pinctrl-coh901.c | 10 +- drivers/pinctrl/pinctrl-imx.c | 2 +- drivers/pinctrl/pinctrl-imx1-core.c | 2 +- drivers/pinctrl/pinctrl-imx1.c | 279 +++++ drivers/pinctrl/pinctrl-imx27.c | 52 - drivers/pinctrl/pinctrl-rockchip.c | 401 ++++-- drivers/pinctrl/pinctrl-single.c | 61 +- drivers/pinctrl/pinctrl-st.c | 15 +- drivers/pinctrl/pinctrl-tb10x.c | 17 - drivers/pinctrl/pinctrl-tegra.c | 13 - drivers/pinctrl/pinctrl-tz1090-pdc.c | 28 - drivers/pinctrl/pinctrl-tz1090.c | 58 - drivers/pinctrl/pinctrl-u300.c | 14 - drivers/pinctrl/pinmux.c | 4 - drivers/pinctrl/qcom/Kconfig | 42 + drivers/pinctrl/qcom/Makefile | 6 + drivers/pinctrl/{ => qcom}/pinctrl-apq8064.c | 19 +- drivers/pinctrl/{ => qcom}/pinctrl-ipq8064.c | 17 +- drivers/pinctrl/{ => qcom}/pinctrl-msm.c | 42 +- drivers/pinctrl/{ => qcom}/pinctrl-msm.h | 0 drivers/pinctrl/qcom/pinctrl-msm8960.c | 1282 ++++++++++++++++++++ drivers/pinctrl/{ => qcom}/pinctrl-msm8x74.c | 29 +- drivers/pinctrl/samsung/Kconfig | 28 + drivers/pinctrl/samsung/Makefile | 7 + drivers/pinctrl/{ => samsung}/pinctrl-exynos.c | 307 +---- drivers/pinctrl/{ => samsung}/pinctrl-exynos.h | 0 drivers/pinctrl/{ => samsung}/pinctrl-exynos5440.c | 10 +- drivers/pinctrl/{ => samsung}/pinctrl-s3c24xx.c | 0 drivers/pinctrl/{ => samsung}/pinctrl-s3c64xx.c | 0 drivers/pinctrl/{ => samsung}/pinctrl-samsung.c | 728 ++++++----- drivers/pinctrl/{ => samsung}/pinctrl-samsung.h | 18 +- drivers/pinctrl/sh-pfc/gpio.c | 9 +- drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 417 +++++++ drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 11 +- drivers/pinctrl/sh-pfc/pinctrl.c | 22 - drivers/pinctrl/sirf/pinctrl-sirf.c | 10 - drivers/pinctrl/spear/Kconfig | 1 + drivers/pinctrl/spear/pinctrl-plgpio.c | 84 +- drivers/pinctrl/spear/pinctrl-spear.c | 7 - drivers/pinctrl/sunxi/Kconfig | 24 +- drivers/pinctrl/sunxi/Makefile | 2 + drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c | 1 + drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c | 1 + drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c | 4 +- drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c | 1 + drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c | 217 ++-- drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c | 1 + drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c | 142 +++ drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c | 593 +++++++++ drivers/pinctrl/sunxi/pinctrl-sunxi.c | 187 ++- drivers/pinctrl/sunxi/pinctrl-sunxi.h | 44 +- drivers/pinctrl/vt8500/pinctrl-wmt.c | 21 +- include/linux/pinctrl/pinmux.h | 2 - 85 files changed, 4411 insertions(+), 1604 deletions(-) create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8960-pinctrl.txt create mode 100644 drivers/pinctrl/nomadik/Kconfig create mode 100644 drivers/pinctrl/nomadik/Makefile rename drivers/pinctrl/{ => nomadik}/pinctrl-ab8500.c (100%) rename drivers/pinctrl/{ => nomadik}/pinctrl-ab8505.c (100%) rename drivers/pinctrl/{ => nomadik}/pinctrl-ab8540.c (100%) rename drivers/pinctrl/{ => nomadik}/pinctrl-ab9540.c (100%) rename drivers/pinctrl/{ => nomadik}/pinctrl-abx500.c (98%) rename drivers/pinctrl/{ => nomadik}/pinctrl-abx500.h (100%) rename drivers/pinctrl/{ => nomadik}/pinctrl-nomadik-db8500.c (100%) rename drivers/pinctrl/{ => nomadik}/pinctrl-nomadik-db8540.c (100%) rename drivers/pinctrl/{ => nomadik}/pinctrl-nomadik-stn8815.c (100%) rename drivers/pinctrl/{ => nomadik}/pinctrl-nomadik.c (99%) rename drivers/pinctrl/{ => nomadik}/pinctrl-nomadik.h (100%) create mode 100644 drivers/pinctrl/pinctrl-imx1.c create mode 100644 drivers/pinctrl/qcom/Kconfig create mode 100644 drivers/pinctrl/qcom/Makefile rename drivers/pinctrl/{ => qcom}/pinctrl-apq8064.c (95%) rename drivers/pinctrl/{ => qcom}/pinctrl-ipq8064.c (95%) rename drivers/pinctrl/{ => qcom}/pinctrl-msm.c (96%) rename drivers/pinctrl/{ => qcom}/pinctrl-msm.h (100%) create mode 100644 drivers/pinctrl/qcom/pinctrl-msm8960.c rename drivers/pinctrl/{ => qcom}/pinctrl-msm8x74.c (95%) create mode 100644 drivers/pinctrl/samsung/Kconfig create mode 100644 drivers/pinctrl/samsung/Makefile rename drivers/pinctrl/{ => samsung}/pinctrl-exynos.c (79%) rename drivers/pinctrl/{ => samsung}/pinctrl-exynos.h (100%) rename drivers/pinctrl/{ => samsung}/pinctrl-exynos5440.c (99%) rename drivers/pinctrl/{ => samsung}/pinctrl-s3c24xx.c (100%) rename drivers/pinctrl/{ => samsung}/pinctrl-s3c64xx.c (100%) rename drivers/pinctrl/{ => samsung}/pinctrl-samsung.c (71%) rename drivers/pinctrl/{ => samsung}/pinctrl-samsung.h (93%) create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c Merging vhost/linux-next (970379f59d81 vhost: move memory pointer to VQs) $ git merge vhost/linux-next Resolved 'drivers/vhost/net.c' using previous resolution. Auto-merging drivers/vhost/net.c CONFLICT (content): Merge conflict in drivers/vhost/net.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 3898cb3c445e] Merge remote-tracking branch 'vhost/linux-next' $ git diff -M --stat --summary HEAD^.. Merging remoteproc/for-next (9a3c4145af32 Linux 3.16-rc6) $ 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 (39b2bbe3d715 gpio: add flags argument to gpiod_get*() functions) $ git merge gpio/for-next Resolved 'arch/arm/mach-tegra/board-paz00.c' using previous resolution. Auto-merging drivers/gpio/gpio-rcar.c Auto-merging drivers/gpio/gpio-mcp23s08.c Auto-merging drivers/gpio/Makefile Auto-merging drivers/gpio/Kconfig Auto-merging arch/arm/mach-tegra/board-paz00.c CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-paz00.c Auto-merging MAINTAINERS Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 40f41eae1676] Merge remote-tracking branch 'gpio/for-next' $ git diff -M --stat --summary HEAD^.. .../devicetree/bindings/gpio/gpio-zynq.txt | 26 + Documentation/gpio/board.txt | 2 +- Documentation/gpio/consumer.txt | 26 +- Documentation/gpio/driver.txt | 25 +- MAINTAINERS | 4 +- arch/arm/mach-at91/at91rm9200_devices.c | 2 +- arch/arm/mach-tegra/board-paz00.c | 2 +- arch/mips/jz4740/board-qi_lb60.c | 1 + drivers/gpio/Kconfig | 10 +- drivers/gpio/Makefile | 3 + drivers/gpio/devres.c | 40 +- drivers/gpio/gpio-74x164.c | 8 +- drivers/gpio/gpio-adnp.c | 9 +- drivers/gpio/gpio-adp5520.c | 8 +- drivers/gpio/gpio-adp5588.c | 6 +- drivers/gpio/gpio-amd8111.c | 3 +- drivers/gpio/gpio-arizona.c | 3 +- drivers/gpio/gpio-cs5535.c | 8 +- drivers/gpio/gpio-da9052.c | 3 +- drivers/gpio/gpio-da9055.c | 3 +- drivers/gpio/gpio-dwapb.c | 2 +- drivers/gpio/gpio-em.c | 5 +- drivers/gpio/gpio-f7188x.c | 18 +- drivers/gpio/gpio-generic.c | 3 +- drivers/gpio/gpio-grgpio.c | 4 +- drivers/gpio/gpio-ich.c | 9 +- drivers/gpio/gpio-intel-mid.c | 86 +- drivers/gpio/gpio-it8761e.c | 6 +- drivers/gpio/gpio-janz-ttl.c | 8 +- drivers/gpio/gpio-kempld.c | 3 +- drivers/gpio/gpio-lp3943.c | 3 +- drivers/gpio/gpio-lpc32xx.c | 2 +- drivers/gpio/gpio-lynxpoint.c | 98 +- drivers/gpio/gpio-max730x.c | 13 +- drivers/gpio/gpio-max732x.c | 7 +- drivers/gpio/gpio-mc33880.c | 11 +- drivers/gpio/gpio-mc9s08dz60.c | 3 +- drivers/gpio/gpio-mcp23s08.c | 26 +- drivers/gpio/gpio-ml-ioh.c | 8 +- drivers/gpio/gpio-msm-v2.c | 5 +- drivers/gpio/gpio-mxc.c | 2 +- drivers/gpio/gpio-octeon.c | 3 +- drivers/gpio/gpio-omap.c | 275 ++-- drivers/gpio/gpio-palmas.c | 3 +- drivers/gpio/gpio-pca953x.c | 7 +- drivers/gpio/gpio-pcf857x.c | 4 +- drivers/gpio/gpio-pch.c | 10 +- drivers/gpio/gpio-pxa.c | 7 +- drivers/gpio/gpio-rc5t583.c | 3 +- drivers/gpio/gpio-rcar.c | 9 +- drivers/gpio/gpio-rdc321x.c | 7 +- drivers/gpio/gpio-sch.c | 16 +- drivers/gpio/gpio-sch311x.c | 6 +- drivers/gpio/gpio-sodaville.c | 4 +- drivers/gpio/gpio-stmpe.c | 119 +- drivers/gpio/gpio-sx150x.c | 7 +- drivers/gpio/gpio-syscon.c | 3 +- drivers/gpio/gpio-tb10x.c | 5 +- drivers/gpio/gpio-tc3589x.c | 8 +- drivers/gpio/gpio-timberdale.c | 5 +- drivers/gpio/gpio-tps6586x.c | 3 +- drivers/gpio/gpio-tps65910.c | 3 +- drivers/gpio/gpio-tps65912.c | 3 +- drivers/gpio/gpio-ts5500.c | 6 +- drivers/gpio/gpio-twl4030.c | 6 +- drivers/gpio/gpio-twl6040.c | 3 +- drivers/gpio/gpio-ucb1400.c | 4 +- drivers/gpio/gpio-viperboard.c | 10 +- drivers/gpio/gpio-vr41xx.c | 8 +- drivers/gpio/gpio-vx855.c | 3 +- drivers/gpio/gpio-wm831x.c | 3 +- drivers/gpio/gpio-wm8350.c | 3 +- drivers/gpio/gpio-wm8994.c | 3 +- drivers/gpio/gpio-zynq.c | 692 ++++++++++ drivers/gpio/gpiolib-acpi.c | 44 +- drivers/gpio/gpiolib-legacy.c | 102 ++ drivers/gpio/gpiolib-of.c | 10 +- drivers/gpio/gpiolib-sysfs.c | 827 ++++++++++++ drivers/gpio/gpiolib.c | 1421 +++----------------- drivers/gpio/gpiolib.h | 105 +- include/asm-generic/gpio.h | 3 - include/linux/gpio/consumer.h | 81 +- include/linux/gpio/driver.h | 66 +- include/linux/gpio/machine.h | 58 + 84 files changed, 2480 insertions(+), 2002 deletions(-) create mode 100644 Documentation/devicetree/bindings/gpio/gpio-zynq.txt create mode 100644 drivers/gpio/gpio-zynq.c create mode 100644 drivers/gpio/gpiolib-legacy.c create mode 100644 drivers/gpio/gpiolib-sysfs.c create mode 100644 include/linux/gpio/machine.h $ git reset --hard HEAD^ HEAD is now at 3898cb3c445e Merge remote-tracking branch 'vhost/linux-next' Merging next-20140728 version of gpio $ git merge -m next-20140728/gpio c7caf86823c71fae652cc50c7d8dd0d2b5c41229 Auto-merging drivers/gpio/gpio-rcar.c Auto-merging drivers/gpio/gpio-mcp23s08.c Auto-merging drivers/gpio/Makefile Auto-merging drivers/gpio/Kconfig Merge made by the 'recursive' strategy. .../devicetree/bindings/gpio/gpio-zynq.txt | 26 + Documentation/gpio/driver.txt | 25 +- drivers/gpio/Kconfig | 8 + drivers/gpio/Makefile | 3 + drivers/gpio/gpio-74x164.c | 8 +- drivers/gpio/gpio-adnp.c | 9 +- drivers/gpio/gpio-adp5520.c | 8 +- drivers/gpio/gpio-adp5588.c | 6 +- drivers/gpio/gpio-amd8111.c | 3 +- drivers/gpio/gpio-arizona.c | 3 +- drivers/gpio/gpio-cs5535.c | 8 +- drivers/gpio/gpio-da9052.c | 3 +- drivers/gpio/gpio-da9055.c | 3 +- drivers/gpio/gpio-dwapb.c | 2 +- drivers/gpio/gpio-em.c | 5 +- drivers/gpio/gpio-f7188x.c | 18 +- drivers/gpio/gpio-generic.c | 3 +- drivers/gpio/gpio-grgpio.c | 4 +- drivers/gpio/gpio-ich.c | 9 +- drivers/gpio/gpio-intel-mid.c | 86 +- drivers/gpio/gpio-it8761e.c | 6 +- drivers/gpio/gpio-janz-ttl.c | 8 +- drivers/gpio/gpio-kempld.c | 3 +- drivers/gpio/gpio-lp3943.c | 3 +- drivers/gpio/gpio-lpc32xx.c | 2 +- drivers/gpio/gpio-lynxpoint.c | 5 +- drivers/gpio/gpio-max730x.c | 13 +- drivers/gpio/gpio-max732x.c | 7 +- drivers/gpio/gpio-mc33880.c | 11 +- drivers/gpio/gpio-mc9s08dz60.c | 3 +- drivers/gpio/gpio-mcp23s08.c | 26 +- drivers/gpio/gpio-ml-ioh.c | 8 +- drivers/gpio/gpio-msm-v2.c | 5 +- drivers/gpio/gpio-mxc.c | 2 +- drivers/gpio/gpio-octeon.c | 3 +- drivers/gpio/gpio-omap.c | 275 ++-- drivers/gpio/gpio-palmas.c | 3 +- drivers/gpio/gpio-pca953x.c | 7 +- drivers/gpio/gpio-pcf857x.c | 4 +- drivers/gpio/gpio-pch.c | 10 +- drivers/gpio/gpio-pxa.c | 7 +- drivers/gpio/gpio-rc5t583.c | 3 +- drivers/gpio/gpio-rcar.c | 9 +- drivers/gpio/gpio-rdc321x.c | 7 +- drivers/gpio/gpio-sch.c | 16 +- drivers/gpio/gpio-sch311x.c | 6 +- drivers/gpio/gpio-sodaville.c | 4 +- drivers/gpio/gpio-stmpe.c | 119 +- drivers/gpio/gpio-sx150x.c | 7 +- drivers/gpio/gpio-syscon.c | 3 +- drivers/gpio/gpio-tb10x.c | 5 +- drivers/gpio/gpio-tc3589x.c | 8 +- drivers/gpio/gpio-timberdale.c | 5 +- drivers/gpio/gpio-tps6586x.c | 3 +- drivers/gpio/gpio-tps65910.c | 3 +- drivers/gpio/gpio-tps65912.c | 3 +- drivers/gpio/gpio-ts5500.c | 6 +- drivers/gpio/gpio-twl4030.c | 6 +- drivers/gpio/gpio-twl6040.c | 3 +- drivers/gpio/gpio-ucb1400.c | 4 +- drivers/gpio/gpio-viperboard.c | 10 +- drivers/gpio/gpio-vr41xx.c | 8 +- drivers/gpio/gpio-vx855.c | 3 +- drivers/gpio/gpio-wm831x.c | 3 +- drivers/gpio/gpio-wm8350.c | 3 +- drivers/gpio/gpio-wm8994.c | 3 +- drivers/gpio/gpio-zynq.c | 692 ++++++++++ drivers/gpio/gpiolib-acpi.c | 6 +- drivers/gpio/gpiolib-legacy.c | 102 ++ drivers/gpio/gpiolib-of.c | 10 +- drivers/gpio/gpiolib-sysfs.c | 827 ++++++++++++ drivers/gpio/gpiolib.c | 1371 ++------------------ drivers/gpio/gpiolib.h | 96 +- include/asm-generic/gpio.h | 3 - include/linux/gpio/driver.h | 12 +- 75 files changed, 2205 insertions(+), 1815 deletions(-) create mode 100644 Documentation/devicetree/bindings/gpio/gpio-zynq.txt create mode 100644 drivers/gpio/gpio-zynq.c create mode 100644 drivers/gpio/gpiolib-legacy.c create mode 100644 drivers/gpio/gpiolib-sysfs.c Merging dma-mapping/dma-mapping-next (f70e3c4f8b6a CMA: correct unlock target) $ git merge dma-mapping/dma-mapping-next Already up-to-date. Merging pwm/for-next (eae266a284f3 pwm: rockchip: document device tree bindings) $ git merge pwm/for-next Auto-merging drivers/pwm/Kconfig Merge made by the 'recursive' strategy. .../devicetree/bindings/pwm/pwm-rockchip.txt | 17 ++ drivers/pwm/Kconfig | 7 + drivers/pwm/Makefile | 1 + drivers/pwm/pwm-rockchip.c | 177 +++++++++++++++++++++ 4 files changed, 202 insertions(+) create mode 100644 Documentation/devicetree/bindings/pwm/pwm-rockchip.txt create mode 100644 drivers/pwm/pwm-rockchip.c Merging dma-buf/for-next (b23b35445ec8 Documentation: devres: Add devm_kmalloc() et al) $ git merge dma-buf/for-next Already up-to-date. Merging userns/for-next (99ac1b6393f0 mnt: Add tests for unprivileged remount cases that have found to be faulty) $ git merge userns/for-next Auto-merging tools/testing/selftests/Makefile Merge made by the 'recursive' strategy. fs/namespace.c | 65 +++++- fs/proc/proc_net.c | 4 +- fs/proc_namespace.c | 8 +- include/linux/mount.h | 9 +- include/linux/nsproxy.h | 16 +- ipc/namespace.c | 6 +- kernel/nsproxy.c | 15 +- kernel/utsname.c | 6 +- net/core/net_namespace.c | 10 +- tools/testing/selftests/Makefile | 1 + tools/testing/selftests/mount/Makefile | 17 ++ .../selftests/mount/unprivileged-remount-test.c | 242 +++++++++++++++++++++ 12 files changed, 351 insertions(+), 48 deletions(-) create mode 100644 tools/testing/selftests/mount/Makefile create mode 100644 tools/testing/selftests/mount/unprivileged-remount-test.c Merging ktest/for-next (4c16b1d6d5e0 ktest: Update documentation on config_bisect) $ git merge ktest/for-next Merge made by the 'recursive' strategy. tools/testing/ktest/ktest.pl | 581 +++++++++++++++++++--------------------- tools/testing/ktest/sample.conf | 65 ++--- 2 files changed, 297 insertions(+), 349 deletions(-) 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 (d14c17b235ab clk: clps711x: Add DT bindings documentation) $ git merge clk/clk-next Resolved 'drivers/base/platform.c' using previous resolution. Auto-merging drivers/spi/spi.c Auto-merging drivers/i2c/i2c-core.c Auto-merging drivers/clk/ti/clk-7xx.c Auto-merging drivers/clk/tegra/clk.c Auto-merging drivers/base/platform.c CONFLICT (content): Merge conflict in drivers/base/platform.c Auto-merging MAINTAINERS Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 283b56f07591] Merge remote-tracking branch 'clk/clk-next' $ git diff -M --stat --summary HEAD^.. .../bindings/clock/clk-palmas-clk32kg-clocks.txt | 35 + .../devicetree/bindings/clock/clock-bindings.txt | 36 + .../devicetree/bindings/clock/clps711x-clock.txt | 19 + .../devicetree/bindings/clock/qcom,gcc.txt | 2 + .../devicetree/bindings/clock/qcom,mmcc.txt | 2 + .../bindings/clock/st/st,clkgen-divmux.txt | 28 +- .../devicetree/bindings/clock/st/st,clkgen-mux.txt | 6 +- .../devicetree/bindings/clock/st/st,clkgen-pll.txt | 17 +- .../bindings/clock/st/st,clkgen-prediv.txt | 8 +- .../devicetree/bindings/clock/st/st,clkgen-vcc.txt | 34 +- .../devicetree/bindings/clock/st/st,clkgen.txt | 59 +- .../devicetree/bindings/clock/st/st,flexgen.txt | 119 + .../devicetree/bindings/clock/st/st,quadfs.txt | 15 +- MAINTAINERS | 7 + drivers/base/platform.c | 5 + drivers/clk/Kconfig | 7 + drivers/clk/Makefile | 5 + drivers/clk/at91/clk-main.c | 1 + drivers/clk/clk-clps711x.c | 192 ++ drivers/clk/clk-conf.c | 143 + drivers/clk/clk-palmas.c | 307 ++ drivers/clk/clk-ppc-corenet.c | 2 +- drivers/clk/clk-s2mps11.c | 33 +- drivers/clk/clk.c | 128 +- drivers/clk/clkdev.c | 5 +- drivers/clk/qcom/Kconfig | 25 + drivers/clk/qcom/Makefile | 3 + drivers/clk/qcom/clk-pll.c | 15 +- drivers/clk/qcom/clk-pll.h | 2 + drivers/clk/qcom/clk-rcg.c | 51 +- drivers/clk/qcom/clk-rcg.h | 1 + drivers/clk/qcom/common.c | 39 +- drivers/clk/qcom/common.h | 6 + drivers/clk/qcom/gcc-apq8084.c | 3611 ++++++++++++++++++++ drivers/clk/qcom/gcc-ipq806x.c | 2424 +++++++++++++ drivers/clk/qcom/gcc-msm8960.c | 583 +++- drivers/clk/qcom/mmcc-apq8084.c | 3352 ++++++++++++++++++ drivers/clk/qcom/mmcc-msm8960.c | 526 ++- drivers/clk/qcom/mmcc-msm8974.c | 10 +- drivers/clk/spear/spear1310_clock.c | 6 +- drivers/clk/spear/spear1340_clock.c | 2 +- drivers/clk/st/Makefile | 2 +- drivers/clk/st/clk-flexgen.c | 331 ++ drivers/clk/st/clkgen-fsyn.c | 223 +- drivers/clk/st/clkgen-mux.c | 12 +- drivers/clk/st/clkgen-pll.c | 94 +- drivers/clk/sunxi/clk-a20-gmac.c | 2 +- drivers/clk/sunxi/clk-sun6i-apb0-gates.c | 2 +- drivers/clk/sunxi/clk-sun6i-apb0.c | 2 +- drivers/clk/sunxi/clk-sun6i-ar100.c | 4 +- drivers/clk/sunxi/clk-sun8i-apb0.c | 2 +- drivers/clk/sunxi/clk-sunxi.c | 10 +- drivers/clk/tegra/clk-pll.c | 19 + drivers/clk/tegra/clk-tegra-periph.c | 4 +- drivers/clk/tegra/clk-tegra114.c | 31 +- drivers/clk/tegra/clk-tegra124.c | 10 +- drivers/clk/tegra/clk.c | 6 + drivers/clk/ti/clk-7xx.c | 11 + drivers/i2c/i2c-core.c | 5 + drivers/spi/spi.c | 5 + include/dt-bindings/clock/clps711x-clock.h | 27 + include/dt-bindings/clock/qcom,gcc-apq8084.h | 351 ++ include/dt-bindings/clock/qcom,gcc-ipq806x.h | 293 ++ include/dt-bindings/clock/qcom,gcc-msm8960.h | 11 + include/dt-bindings/clock/qcom,mmcc-apq8084.h | 183 + include/dt-bindings/clock/qcom,mmcc-msm8960.h | 8 + include/dt-bindings/mfd/palmas.h | 18 + include/dt-bindings/reset/qcom,gcc-apq8084.h | 109 + include/dt-bindings/reset/qcom,gcc-ipq806x.h | 132 + include/dt-bindings/reset/qcom,gcc-msm8960.h | 16 + include/dt-bindings/reset/qcom,mmcc-apq8084.h | 64 + include/dt-bindings/reset/qcom,mmcc-msm8960.h | 8 + include/linux/clk-provider.h | 5 + include/linux/clk/clk-conf.h | 20 + 74 files changed, 13571 insertions(+), 320 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/clk-palmas-clk32kg-clocks.txt create mode 100644 Documentation/devicetree/bindings/clock/clps711x-clock.txt create mode 100644 Documentation/devicetree/bindings/clock/st/st,flexgen.txt create mode 100644 drivers/clk/clk-clps711x.c create mode 100644 drivers/clk/clk-conf.c create mode 100644 drivers/clk/clk-palmas.c create mode 100644 drivers/clk/qcom/gcc-apq8084.c create mode 100644 drivers/clk/qcom/gcc-ipq806x.c create mode 100644 drivers/clk/qcom/mmcc-apq8084.c create mode 100644 drivers/clk/st/clk-flexgen.c create mode 100644 include/dt-bindings/clock/clps711x-clock.h create mode 100644 include/dt-bindings/clock/qcom,gcc-apq8084.h create mode 100644 include/dt-bindings/clock/qcom,gcc-ipq806x.h create mode 100644 include/dt-bindings/clock/qcom,mmcc-apq8084.h create mode 100644 include/dt-bindings/mfd/palmas.h create mode 100644 include/dt-bindings/reset/qcom,gcc-apq8084.h create mode 100644 include/dt-bindings/reset/qcom,gcc-ipq806x.h create mode 100644 include/dt-bindings/reset/qcom,mmcc-apq8084.h create mode 100644 include/linux/clk/clk-conf.h Merging random/dev (b65797d576be random: limit the contribution of the hw rng to at most half) $ git merge random/dev Resolved 'arch/x86/syscalls/syscall_32.tbl' using previous resolution. Resolved 'arch/x86/syscalls/syscall_64.tbl' using previous resolution. Resolved 'drivers/char/hw_random/core.c' using previous resolution. Resolved 'include/linux/syscalls.h' using previous resolution. Resolved 'include/uapi/asm-generic/unistd.h' using previous resolution. Auto-merging include/uapi/asm-generic/unistd.h CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h Auto-merging include/linux/syscalls.h CONFLICT (content): Merge conflict in include/linux/syscalls.h Auto-merging drivers/char/random.c Auto-merging drivers/char/hw_random/core.c CONFLICT (content): Merge conflict in drivers/char/hw_random/core.c Auto-merging arch/x86/syscalls/syscall_64.tbl CONFLICT (content): Merge conflict in arch/x86/syscalls/syscall_64.tbl Auto-merging arch/x86/syscalls/syscall_32.tbl CONFLICT (content): Merge conflict in arch/x86/syscalls/syscall_32.tbl Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 213611a63d58] Merge remote-tracking branch 'random/dev' $ git diff -M --stat --summary HEAD^.. arch/x86/syscalls/syscall_32.tbl | 1 + arch/x86/syscalls/syscall_64.tbl | 1 + drivers/char/hw_random/core.c | 67 +++++++- drivers/char/random.c | 315 ++++++++++++++++++++++---------------- include/linux/hw_random.h | 5 + include/linux/syscalls.h | 3 + include/uapi/asm-generic/unistd.h | 4 +- include/uapi/linux/random.h | 9 ++ 8 files changed, 274 insertions(+), 131 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 Auto-merging lib/lzo/lzo1x_decompress_safe.c Merge made by the 'recursive' strategy. lib/lzo/lzo1x_decompress_safe.c | 4 ++++ lib/lzo/lzodefs.h | 6 ++++++ 2 files changed, 10 insertions(+) Merging aio/master (00fefb9cf2b5 aio: use iovec array rather than the single one) $ git merge aio/master Auto-merging fs/aio.c Merge made by the 'recursive' strategy. fs/aio.c | 86 ++++++++++++++++++++++------------------------------------------ 1 file changed, 30 insertions(+), 56 deletions(-) Merging llvmlinux/for-next (7380100aa7ce arm64: LLVMLinux: Use current_stack_pointer in kernel/traps.c) $ git merge llvmlinux/for-next Auto-merging arch/arm64/kernel/traps.c Auto-merging arch/arm64/include/asm/thread_info.h Auto-merging arch/arm/kernel/unwind.c Auto-merging arch/arm/include/asm/thread_info.h Auto-merging arch/arm/include/asm/ptrace.h Merge made by the 'recursive' strategy. arch/arm/include/asm/ptrace.h | 5 ++--- arch/arm/include/asm/thread_info.h | 9 +++++++-- arch/arm/kernel/return_address.c | 3 +-- arch/arm/kernel/stacktrace.c | 4 +--- arch/arm/kernel/unwind.c | 3 +-- arch/arm64/include/asm/thread_info.h | 9 +++++++-- arch/arm64/kernel/stacktrace.c | 3 +-- arch/arm64/kernel/traps.c | 3 +-- 8 files changed, 21 insertions(+), 18 deletions(-) Merging powernv-cpuidle/powernv-cpuidle (0888839c5b62 cpuidle/powernv: Parse device tree to setup idle states) $ git merge powernv-cpuidle/powernv-cpuidle Already up-to-date. Merging rd-docs/master (da8a7613e7ef Maintainers often repeat the same feedback on poorly written changelogs - describe the problem, justify your changes, quantify optimizations, describe user-visible changes - but our documentation on writing changelogs doesn't include these things. Fix that.) $ git merge rd-docs/master Resolved 'Documentation/laptops/freefall.c' using previous resolution. Auto-merging Documentation/laptops/freefall.c CONFLICT (content): Merge conflict in Documentation/laptops/freefall.c Auto-merging Documentation/SubmittingPatches Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 1e1100d499c3] Merge branch 'rd-docs/master' $ git diff -M --stat --summary HEAD^.. Documentation/SubmittingPatches | 38 ++++- Documentation/ioctl/00-INDEX | 2 + Documentation/ioctl/botching-up-ioctls.txt | 219 +++++++++++++++++++++++++++++ Documentation/laptops/freefall.c | 6 +- 4 files changed, 253 insertions(+), 12 deletions(-) create mode 100644 Documentation/ioctl/botching-up-ioctls.txt Merging signal-cleanup/signal_v4 (b9f0fb2d4a7a powerpc: Use sigsp()) $ git merge signal-cleanup/signal_v4 Auto-merging kernel/signal.c Auto-merging include/linux/sched.h Auto-merging arch/arm64/kernel/signal32.c Merge made by the 'recursive' strategy. arch/arm64/include/asm/signal32.h | 11 ++-- arch/arm64/kernel/signal.c | 58 +++++++------------ arch/arm64/kernel/signal32.c | 24 +++----- arch/avr32/kernel/signal.c | 50 +++++++--------- arch/blackfin/kernel/signal.c | 51 ++++++---------- arch/c6x/kernel/signal.c | 53 +++++++---------- arch/cris/arch-v10/kernel/signal.c | 89 +++++++++++----------------- arch/cris/arch-v32/kernel/signal.c | 89 +++++++++++----------------- arch/frv/kernel/signal.c | 112 ++++++++++++++---------------------- arch/hexagon/kernel/signal.c | 57 +++++++----------- arch/ia64/kernel/signal.c | 46 +++++++-------- arch/m32r/kernel/signal.c | 57 +++++++----------- arch/m68k/kernel/signal.c | 75 +++++++++--------------- arch/metag/kernel/signal.c | 10 +--- arch/microblaze/kernel/signal.c | 55 ++++++------------ arch/mips/include/asm/abi.h | 10 ++-- arch/mips/kernel/signal-common.h | 2 +- arch/mips/kernel/signal.c | 72 +++++++++-------------- arch/mips/kernel/signal32.c | 39 +++++-------- arch/mips/kernel/signal_n32.c | 20 +++---- arch/mn10300/kernel/signal.c | 102 ++++++++++++-------------------- arch/openrisc/kernel/signal.c | 20 +------ arch/parisc/kernel/signal.c | 58 ++++++++----------- arch/powerpc/kernel/signal.c | 41 +++++-------- arch/powerpc/kernel/signal.h | 14 ++--- arch/powerpc/kernel/signal_32.c | 36 ++++++------ arch/powerpc/kernel/signal_64.c | 28 +++++---- arch/s390/kernel/compat_signal.c | 79 +++++++++++-------------- arch/s390/kernel/entry.h | 4 +- arch/s390/kernel/signal.c | 78 +++++++++++-------------- arch/score/kernel/signal.c | 43 ++++++-------- arch/sh/kernel/signal_32.c | 79 +++++++++++-------------- arch/sh/kernel/signal_64.c | 82 +++++++++++--------------- arch/tile/include/asm/compat.h | 3 +- arch/tile/kernel/compat_signal.c | 29 +++++----- arch/tile/kernel/signal.c | 54 ++++++++--------- arch/um/include/shared/frame_kern.h | 12 ++-- arch/um/kernel/signal.c | 27 ++++----- arch/unicore32/kernel/signal.c | 48 +++++++--------- arch/x86/um/signal.c | 45 +++++++-------- arch/xtensa/kernel/signal.c | 43 ++++++-------- include/linux/sched.h | 6 +- include/linux/signal.h | 15 +---- include/linux/tracehook.h | 8 +-- kernel/signal.c | 46 +++++++-------- 45 files changed, 772 insertions(+), 1208 deletions(-) Merging akpm-current/current (929c76e4e629 fs/dlm/debug_fs.c: remove unnecessary null test before debugfs_remove) $ git merge --no-ff akpm-current/current Recorded preimage for 'drivers/rapidio/devices/tsi721_dma.c' Recorded preimage for 'kernel/kexec.c' Resolved 'arch/arm64/Kconfig' using previous resolution. Auto-merging net/bridge/br_multicast.c Auto-merging mm/shmem.c Auto-merging mm/page_alloc.c Auto-merging mm/page-writeback.c Auto-merging mm/memory.c Auto-merging mm/memory-failure.c Auto-merging mm/memcontrol.c Auto-merging mm/hugetlb.c Auto-merging mm/filemap.c Auto-merging lib/scatterlist.c Auto-merging lib/Makefile Auto-merging lib/Kconfig.debug Auto-merging lib/Kconfig Auto-merging kernel/kexec.c CONFLICT (content): Merge conflict in kernel/kexec.c Auto-merging kernel/fork.c Auto-merging kernel/acct.c Auto-merging init/Kconfig Auto-merging include/scsi/scsi.h Auto-merging include/linux/sched.h Auto-merging include/linux/scatterlist.h Auto-merging include/linux/kernel.h Auto-merging include/linux/hugetlb.h Auto-merging include/linux/fs.h Auto-merging fs/nilfs2/super.c Auto-merging fs/namespace.c Auto-merging fs/fscache/main.c Auto-merging fs/exec.c Auto-merging fs/cifs/smb2pdu.c Auto-merging fs/cifs/smb2ops.c Auto-merging fs/cifs/sess.c Auto-merging fs/cifs/file.c Auto-merging fs/cifs/cifssmb.c Auto-merging drivers/video/backlight/backlight.c Auto-merging drivers/staging/lustre/lustre/libcfs/hash.c Auto-merging drivers/staging/android/binder.c Auto-merging drivers/rapidio/devices/tsi721_dma.c CONFLICT (content): Merge conflict in drivers/rapidio/devices/tsi721_dma.c Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c Auto-merging drivers/net/ethernet/intel/i40e/i40e_ethtool.c Auto-merging drivers/leds/Kconfig Auto-merging drivers/base/Kconfig Auto-merging drivers/ata/Kconfig Auto-merging block/bio-integrity.c Auto-merging arch/x86/mm/fault.c Removing arch/x86/include/asm/scatterlist.h Auto-merging arch/x86/Kconfig Removing arch/sparc/include/asm/scatterlist.h Auto-merging arch/sparc/Kconfig Removing arch/score/include/asm/scatterlist.h Removing arch/s390/include/asm/scatterlist.h Auto-merging arch/s390/Kconfig Removing arch/powerpc/kvm/book3s_hv_cma.h Removing arch/powerpc/kvm/book3s_hv_cma.c Auto-merging arch/powerpc/kvm/book3s_hv_builtin.c Auto-merging arch/powerpc/kvm/book3s_64_mmu_hv.c Removing arch/powerpc/include/asm/scatterlist.h Removing arch/mn10300/include/asm/scatterlist.h Removing arch/microblaze/include/asm/scatterlist.h Removing arch/m32r/include/asm/scatterlist.h Auto-merging arch/ia64/kernel/time.c Removing arch/ia64/include/asm/scatterlist.h Auto-merging arch/ia64/Kconfig Removing arch/frv/include/asm/scatterlist.h Removing arch/cris/include/asm/scatterlist.h Auto-merging arch/arm64/Kconfig CONFLICT (content): Merge conflict in arch/arm64/Kconfig Auto-merging arch/arm/mm/dma-mapping.c Removing arch/arm/include/asm/scatterlist.h Auto-merging arch/arm/Kconfig Removing arch/alpha/include/asm/scatterlist.h Auto-merging Makefile Auto-merging Documentation/kernel-parameters.txt Auto-merging Documentation/devicetree/bindings/i2c/trivial-devices.txt Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/rapidio/devices/tsi721_dma.c'. Recorded resolution for 'kernel/kexec.c'. [master 4353c9537752] Merge branch 'akpm-current/current' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/sysfs-fs-nilfs2 | 269 +++ Documentation/RCU/whatisRCU.txt | 2 +- Documentation/cgroups/memcg_test.txt | 160 +- .../devicetree/bindings/i2c/trivial-devices.txt | 1 + Documentation/kernel-parameters.txt | 8 +- Documentation/leds/leds-class.txt | 3 - Documentation/oops-tracing.txt | 2 + Documentation/printk-formats.txt | 6 + Documentation/rapidio/tsi721.txt | 19 +- Documentation/sysctl/kernel.txt | 1 + .../trace/postprocess/trace-vmscan-postprocess.pl | 53 + Makefile | 19 + arch/alpha/include/asm/Kbuild | 1 + arch/alpha/include/asm/scatterlist.h | 6 - arch/arm/Kconfig | 1 + arch/arm/include/asm/Kbuild | 1 + arch/arm/include/asm/scatterlist.h | 12 - arch/arm/mm/dma-mapping.c | 1 + arch/arm64/Kconfig | 1 + arch/cris/include/asm/Kbuild | 1 + arch/cris/include/asm/scatterlist.h | 6 - arch/frv/include/asm/Kbuild | 1 + arch/frv/include/asm/scatterlist.h | 6 - arch/ia64/Kconfig | 1 + arch/ia64/include/asm/Kbuild | 1 + arch/ia64/include/asm/scatterlist.h | 7 - arch/ia64/kernel/time.c | 15 - arch/ia64/mm/init.c | 3 +- arch/m32r/include/asm/Kbuild | 1 + arch/m32r/include/asm/scatterlist.h | 6 - arch/m68k/kernel/sys_m68k.c | 18 +- arch/microblaze/include/asm/Kbuild | 1 + arch/microblaze/include/asm/scatterlist.h | 1 - arch/mn10300/include/asm/Kbuild | 1 + arch/mn10300/include/asm/scatterlist.h | 16 - arch/powerpc/Kconfig | 1 + arch/powerpc/include/asm/Kbuild | 1 + arch/powerpc/include/asm/scatterlist.h | 17 - arch/powerpc/kvm/Makefile | 1 - arch/powerpc/kvm/book3s_64_mmu_hv.c | 4 +- arch/powerpc/kvm/book3s_hv_builtin.c | 19 +- arch/powerpc/kvm/book3s_hv_cma.c | 240 --- arch/powerpc/kvm/book3s_hv_cma.h | 27 - arch/powerpc/mm/dma-noncoherent.c | 1 + arch/powerpc/mm/mem.c | 3 +- arch/powerpc/platforms/44x/warp.c | 1 + arch/powerpc/platforms/52xx/efika.c | 1 + arch/powerpc/platforms/amigaone/setup.c | 1 + arch/s390/Kconfig | 1 + arch/s390/include/asm/Kbuild | 1 + arch/s390/include/asm/scatterlist.h | 3 - arch/score/include/asm/Kbuild | 1 + arch/score/include/asm/scatterlist.h | 6 - arch/score/include/uapi/asm/ptrace.h | 11 - arch/sh/drivers/dma/Kconfig | 5 +- arch/sh/include/cpu-sh4/cpu/dma-register.h | 1 - arch/sh/include/cpu-sh4a/cpu/dma.h | 3 +- arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 4 +- arch/sh/kernel/time.c | 4 +- arch/sh/mm/asids-debugfs.c | 4 +- arch/sh/mm/init.c | 5 +- arch/sparc/Kconfig | 1 + arch/sparc/include/asm/Kbuild | 1 + arch/sparc/include/asm/scatterlist.h | 8 - arch/tile/include/asm/hardwall.h | 2 +- arch/tile/kernel/hardwall.c | 6 +- arch/tile/kernel/module.c | 2 +- arch/um/include/asm/Kbuild | 1 + arch/x86/Kconfig | 1 + arch/x86/include/asm/Kbuild | 3 +- arch/x86/include/asm/numa.h | 1 - arch/x86/include/asm/pgtable_64.h | 3 +- arch/x86/include/asm/scatterlist.h | 8 - arch/x86/mm/fault.c | 5 +- arch/x86/mm/init_32.c | 3 +- arch/x86/mm/init_64.c | 39 +- arch/x86/mm/numa.c | 34 +- arch/x86/platform/efi/efi-bgrt.c | 36 +- block/bio-integrity.c | 2 - block/genhd.c | 2 +- crypto/zlib.c | 8 +- drivers/ata/Kconfig | 1 + drivers/ata/libata-core.c | 72 +- drivers/base/Kconfig | 10 - drivers/base/dma-contiguous.c | 220 +-- drivers/base/memory.c | 30 +- drivers/base/node.c | 2 +- drivers/block/zram/zram_drv.c | 71 +- drivers/block/zram/zram_drv.h | 29 +- drivers/firmware/memmap.c | 6 +- drivers/gpu/drm/drm_hashtab.c | 2 +- drivers/hwmon/asus_atk0110.c | 2 +- drivers/input/Kconfig | 9 + drivers/input/Makefile | 3 + drivers/input/input.c | 6 + drivers/input/leds.c | 249 +++ drivers/leds/Kconfig | 3 - drivers/lguest/core.c | 7 +- drivers/misc/ti-st/st_core.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 2 +- drivers/net/irda/donauboe.c | 15 +- drivers/parport/parport_ip32.c | 2 +- drivers/rapidio/devices/tsi721.h | 12 +- drivers/rapidio/devices/tsi721_dma.c | 718 ++++---- drivers/rapidio/rio.c | 66 +- drivers/rtc/Kconfig | 29 +- drivers/rtc/Makefile | 5 + drivers/rtc/class.c | 16 +- drivers/rtc/interface.c | 2 + drivers/rtc/rtc-ds1343.c | 75 +- drivers/rtc/rtc-ds1742.c | 2 +- drivers/rtc/rtc-efi-platform.c | 31 + drivers/rtc/rtc-efi.c | 32 +- drivers/rtc/rtc-isl12022.c | 12 + drivers/rtc/rtc-pcf85063.c | 204 +++ drivers/rtc/rtc-pcf8563.c | 231 ++- drivers/staging/android/binder.c | 4 +- drivers/staging/lustre/lustre/libcfs/hash.c | 4 +- drivers/tty/Kconfig | 4 + drivers/tty/sysrq.c | 2 +- drivers/tty/vt/keyboard.c | 110 +- drivers/video/backlight/backlight.c | 2 - fs/adfs/adfs.h | 1 + fs/adfs/dir.c | 2 +- fs/adfs/dir_fplus.c | 9 +- fs/autofs4/autofs_i.h | 63 - fs/autofs4/expire.c | 1 - fs/autofs4/root.c | 10 +- fs/bfs/bfs.h | 1 + fs/bfs/dir.c | 4 +- fs/bfs/inode.c | 8 +- fs/binfmt_elf.c | 21 +- fs/cachefiles/bind.c | 6 +- fs/cachefiles/daemon.c | 6 +- fs/cifs/cifsacl.c | 2 +- fs/cifs/cifssmb.c | 20 +- fs/cifs/file.c | 4 +- fs/cifs/sess.c | 2 +- fs/cifs/smb2file.c | 4 +- fs/cifs/smb2misc.c | 38 +- fs/cifs/smb2ops.c | 2 +- fs/cifs/smb2pdu.c | 2 +- fs/cifs/smb2pdu.h | 28 +- fs/coda/cache.c | 2 +- fs/coda/coda_linux.c | 2 +- fs/coda/dir.c | 3 +- fs/coda/file.c | 2 +- fs/coda/inode.c | 4 +- fs/coda/pioctl.c | 2 +- fs/coda/psdev.c | 2 +- fs/coda/upcall.c | 2 +- fs/compat.c | 2 +- fs/cramfs/inode.c | 45 +- fs/cramfs/uncompress.c | 10 +- fs/dlm/debug_fs.c | 15 +- fs/efs/namei.c | 11 +- fs/exec.c | 4 - fs/exofs/ore_raid.c | 2 +- fs/ext4/fsync.c | 5 +- fs/fscache/main.c | 4 +- fs/hfsplus/catalog.c | 89 +- fs/hfsplus/dir.c | 11 +- fs/hfsplus/hfsplus_fs.h | 4 +- fs/hfsplus/super.c | 4 +- fs/hpfs/dnode.c | 17 +- fs/isofs/Makefile | 2 + fs/isofs/compress.c | 10 +- fs/isofs/export.c | 11 +- fs/isofs/inode.c | 88 +- fs/isofs/namei.c | 5 +- fs/isofs/rock.c | 44 +- fs/jffs2/compr_zlib.c | 7 +- fs/logfs/readwrite.c | 15 +- fs/mpage.c | 23 +- fs/namespace.c | 2 +- fs/nilfs2/Makefile | 2 +- fs/nilfs2/nilfs.h | 8 + fs/nilfs2/super.c | 11 +- fs/nilfs2/sysfs.c | 1137 +++++++++++++ fs/nilfs2/sysfs.h | 176 ++ fs/nilfs2/the_nilfs.c | 17 +- fs/nilfs2/the_nilfs.h | 20 +- fs/notify/inode_mark.c | 2 +- fs/notify/vfsmount_mark.c | 2 +- fs/ntfs/file.c | 3 - fs/ocfs2/alloc.c | 43 +- fs/ocfs2/alloc.h | 2 +- fs/ocfs2/aops.c | 37 +- fs/ocfs2/cluster/quorum.c | 13 +- fs/ocfs2/cluster/tcp.c | 45 +- fs/ocfs2/cluster/tcp.h | 1 + fs/ocfs2/dir.c | 2 +- fs/ocfs2/dlm/dlmdomain.c | 5 +- fs/ocfs2/dlm/dlmmaster.c | 26 +- fs/ocfs2/dlm/dlmthread.c | 10 + fs/ocfs2/file.c | 2 +- fs/ocfs2/inode.c | 10 +- fs/ocfs2/ioctl.c | 129 +- fs/ocfs2/move_extents.c | 2 +- fs/ocfs2/refcounttree.c | 2 +- fs/ocfs2/slot_map.c | 2 +- fs/omfs/inode.c | 2 +- fs/proc/base.c | 181 +- fs/proc/fd.c | 2 +- fs/proc/generic.c | 32 +- fs/proc/internal.h | 9 +- fs/proc/kcore.c | 2 +- fs/proc/meminfo.c | 2 +- fs/proc/proc_sysctl.c | 2 +- fs/proc/proc_tty.c | 4 +- fs/proc/root.c | 4 +- fs/proc/vmcore.c | 82 +- fs/pstore/ram_core.c | 2 +- fs/qnx6/Makefile | 1 + fs/qnx6/dir.c | 26 +- fs/qnx6/inode.c | 99 +- fs/qnx6/namei.c | 6 +- fs/qnx6/qnx6.h | 12 +- fs/qnx6/super_mmi.c | 22 +- fs/ramfs/file-nommu.c | 2 +- fs/reiserfs/dir.c | 2 +- fs/reiserfs/do_balan.c | 2 +- fs/reiserfs/file.c | 2 +- fs/reiserfs/ibalance.c | 2 +- fs/reiserfs/inode.c | 2 +- fs/reiserfs/ioctl.c | 2 +- fs/reiserfs/item_ops.c | 4 +- fs/reiserfs/lbalance.c | 2 +- fs/reiserfs/prints.c | 4 +- fs/reiserfs/procfs.c | 2 +- fs/reiserfs/stree.c | 2 +- fs/reiserfs/super.c | 9 +- fs/reiserfs/xattr.c | 22 +- fs/reiserfs/xattr_acl.c | 2 +- fs/reiserfs/xattr_security.c | 2 +- fs/reiserfs/xattr_trusted.c | 2 +- fs/reiserfs/xattr_user.c | 2 +- fs/romfs/super.c | 23 +- fs/squashfs/file_direct.c | 2 +- fs/squashfs/super.c | 5 +- fs/ufs/Makefile | 1 + fs/ufs/inode.c | 32 +- fs/ufs/super.c | 304 ++-- fs/ufs/ufs.h | 10 +- include/linux/bitmap.h | 62 +- include/linux/byteorder/generic.h | 2 +- include/linux/cma.h | 27 + include/linux/crc64_ecma.h | 56 + include/linux/decompress/bunzip2.h | 8 +- include/linux/decompress/generic.h | 10 +- include/linux/decompress/inflate.h | 8 +- include/linux/decompress/unlz4.h | 8 +- include/linux/decompress/unlzma.h | 8 +- include/linux/decompress/unlzo.h | 8 +- include/linux/decompress/unxz.h | 8 +- include/linux/dma-contiguous.h | 11 +- include/linux/fs.h | 2 +- include/linux/gfp.h | 2 +- include/linux/glob.h | 10 + include/linux/huge_mm.h | 4 - include/linux/hugetlb.h | 1 - include/linux/input.h | 21 + include/linux/kernel.h | 38 +- include/linux/klist.h | 2 +- include/linux/list.h | 14 +- include/linux/memblock.h | 4 +- include/linux/memcontrol.h | 98 +- include/linux/memory_hotplug.h | 10 +- include/linux/mm_types.h | 1 + include/linux/mmdebug.h | 2 + include/linux/mmzone.h | 219 +-- include/linux/nodemask.h | 11 +- include/linux/oom.h | 4 +- include/linux/page-flags.h | 21 +- include/linux/page_cgroup.h | 70 +- include/linux/pagemap.h | 3 + include/linux/printk.h | 2 +- include/linux/rculist.h | 8 +- include/linux/rio_drv.h | 5 + include/linux/scatterlist.h | 2 +- include/linux/sched.h | 13 +- include/linux/shm.h | 18 +- include/linux/string.h | 1 + include/linux/swap.h | 16 +- include/linux/sysctl.h | 2 - include/linux/user_namespace.h | 6 +- include/linux/vmalloc.h | 2 +- include/linux/zbud.h | 2 +- include/linux/zlib.h | 122 +- include/linux/zpool.h | 106 ++ include/scsi/scsi.h | 2 +- include/trace/events/migrate.h | 1 + include/trace/events/pagemap.h | 16 +- init/Kconfig | 46 +- init/do_mounts.c | 12 +- init/do_mounts_rd.c | 10 +- init/initramfs.c | 60 +- ipc/shm.c | 75 +- kernel/acct.c | 30 +- kernel/auditfilter.c | 4 +- kernel/bounds.c | 2 - kernel/events/uprobes.c | 15 +- kernel/exit.c | 50 +- kernel/fork.c | 77 +- kernel/gcov/fs.c | 3 +- kernel/kallsyms.c | 2 +- kernel/panic.c | 1 + kernel/printk/printk.c | 157 +- kernel/sysctl.c | 9 +- kernel/test_kprobes.c | 87 +- kernel/user_namespace.c | 6 +- kernel/watchdog.c | 11 +- lib/Kconfig | 47 + lib/Kconfig.debug | 2 +- lib/Makefile | 3 + lib/bitmap.c | 111 +- lib/cmdline.c | 15 +- lib/crc64_ecma.c | 341 ++++ lib/decompress.c | 2 +- lib/decompress_bunzip2.c | 26 +- lib/decompress_inflate.c | 12 +- lib/decompress_unlz4.c | 83 +- lib/decompress_unlzma.c | 28 +- lib/decompress_unlzo.c | 12 +- lib/decompress_unxz.c | 10 +- lib/glob.c | 287 ++++ lib/idr.c | 25 +- lib/kfifo.c | 6 +- lib/klist.c | 6 +- lib/list_sort.c | 71 +- lib/rbtree.c | 2 +- lib/scatterlist.c | 4 +- lib/string_helpers.c | 15 +- lib/test-kstrtox.c | 2 +- lib/vsprintf.c | 20 +- lib/zlib_deflate/deflate.c | 143 -- lib/zlib_inflate/inflate.c | 132 -- mm/Kconfig | 54 +- mm/Makefile | 2 + mm/cma.c | 335 ++++ mm/compaction.c | 17 +- mm/filemap.c | 52 +- mm/gup.c | 18 +- mm/huge_memory.c | 89 +- mm/hugetlb.c | 129 +- mm/hwpoison-inject.c | 3 +- mm/internal.h | 2 +- mm/madvise.c | 3 - mm/memcontrol.c | 1781 ++++++++------------ mm/memory-failure.c | 10 + mm/memory.c | 91 +- mm/memory_hotplug.c | 45 +- mm/migrate.c | 38 +- mm/mlock.c | 9 +- mm/mmap.c | 5 + mm/oom_kill.c | 38 +- mm/page-writeback.c | 5 +- mm/page_alloc.c | 161 +- mm/readahead.c | 3 +- mm/rmap.c | 20 - mm/shmem.c | 84 +- mm/slab.c | 514 +++--- mm/slab.h | 22 +- mm/slab_common.c | 101 ++ mm/slub.c | 221 +-- mm/swap.c | 54 +- mm/swap_state.c | 8 +- mm/swapfile.c | 21 +- mm/truncate.c | 9 - mm/util.c | 132 +- mm/vmalloc.c | 30 +- mm/vmscan.c | 264 ++- mm/vmstat.c | 150 +- mm/zbud.c | 98 +- mm/zpool.c | 364 ++++ mm/zsmalloc.c | 86 +- mm/zswap.c | 81 +- net/batman-adv/fragmentation.c | 2 +- net/bridge/br_multicast.c | 2 +- net/ipv4/fib_trie.c | 2 +- net/ipv6/addrlabel.c | 2 +- net/xfrm/xfrm_policy.c | 4 +- scripts/checkpatch.pl | 570 +++++-- scripts/checkstack.pl | 12 +- scripts/coccinelle/free/ifnullfree.cocci | 54 + scripts/tags.sh | 2 + 387 files changed, 9680 insertions(+), 6073 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-fs-nilfs2 delete mode 100644 arch/alpha/include/asm/scatterlist.h delete mode 100644 arch/arm/include/asm/scatterlist.h delete mode 100644 arch/cris/include/asm/scatterlist.h delete mode 100644 arch/frv/include/asm/scatterlist.h delete mode 100644 arch/ia64/include/asm/scatterlist.h delete mode 100644 arch/m32r/include/asm/scatterlist.h delete mode 100644 arch/microblaze/include/asm/scatterlist.h delete mode 100644 arch/mn10300/include/asm/scatterlist.h delete mode 100644 arch/powerpc/include/asm/scatterlist.h delete mode 100644 arch/powerpc/kvm/book3s_hv_cma.c delete mode 100644 arch/powerpc/kvm/book3s_hv_cma.h delete mode 100644 arch/s390/include/asm/scatterlist.h delete mode 100644 arch/score/include/asm/scatterlist.h delete mode 100644 arch/sparc/include/asm/scatterlist.h delete mode 100644 arch/x86/include/asm/scatterlist.h create mode 100644 drivers/input/leds.c create mode 100644 drivers/rtc/rtc-efi-platform.c create mode 100644 drivers/rtc/rtc-pcf85063.c create mode 100644 fs/nilfs2/sysfs.c create mode 100644 fs/nilfs2/sysfs.h create mode 100644 include/linux/cma.h create mode 100644 include/linux/crc64_ecma.h create mode 100644 include/linux/glob.h create mode 100644 include/linux/zpool.h create mode 100644 lib/crc64_ecma.c create mode 100644 lib/glob.c create mode 100644 mm/cma.c create mode 100644 mm/zpool.c create mode 100644 scripts/coccinelle/free/ifnullfree.cocci $ 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: drivers/gpio/gpio-zevio.c: fix build Applying: x86, vdso: fix vdso2c's special_pages error checking Applying: arm64,ia64,ppc,s390,sh,tile,um,x86,mm: remove default gate area Applying: init/main.c: code clean-up Applying: Update Roland McGrath's mail Applying: MAINTAINERS: remove two ancient EATA sections Applying: MAINTAINERS: update IBM ServeRAID RAID info Applying: arch/arm/mach-omap2: replace strict_strto* with kstrto* Applying: arch/arm/mach-pxa: replace strict_strto call with kstrto Applying: arch/arm/mach-s3c24xx/mach-jive.c: replace strict_strto* with kstrto* Applying: arch/arm/mach-w90x900/cpu.c: replace obsolete strict_strto Applying: arch/powerpc: replace obsolete strict_strto* calls Applying: arch/x86: replace strict_strto calls Applying: drivers/scsi: replace strict_strto calls Applying: include/linux: remove strict_strto* definitions Applying: pci-dma-compat: add pci_zalloc_consistent helper Applying: atm: use pci_zalloc_consistent Applying: block: use pci_zalloc_consistent Applying: crypto: use pci_zalloc_consistent Applying: infiniband: use pci_zalloc_consistent Applying: i810: use pci_zalloc_consistent Applying: media: use pci_zalloc_consistent Applying: amd: use pci_zalloc_consistent Applying: atl1e: use pci_zalloc_consistent Applying: enic: use pci_zalloc_consistent Applying: sky2: use pci_zalloc_consistent Applying: micrel: use pci_zalloc_consistent Applying: qlogic: use pci_zalloc_consistent Applying: irda: use pci_zalloc_consistent Applying: ipw2100: use pci_zalloc_consistent Applying: mwl8k: use pci_zalloc_consistent Applying: rtl818x: use pci_zalloc_consistent Applying: rtlwifi: use pci_zalloc_consistent Applying: scsi: use pci_zalloc_consistent Applying: staging: use pci_zalloc_consistent Applying: synclink_gt: use pci_zalloc_consistent Applying: vme: bridges: use pci_zalloc_consistent Applying: drivers/net/ethernet/amd/pcnet32.c: neaten and remove unnecessary OOM messages Applying: kernel/posix-timers.c: code clean-up Applying: kernel-posix-timersc-code-clean-up-checkpatch-fixes Applying: MAINTAINERS: update microcode patterns Applying: MAINTAINERS: update cifs location Applying: MAINTAINERS: use the correct efi-stub location Applying: MAINTAINERS: update clk/sirf patterns Applying: MAINTAINERS: fix ssbi pattern Applying: MAINTAINERS: use correct filename for sdhci-bcm-kona Applying: MAINTAINERS: fix PXA3xx NAND FLASH DRIVER pattern Applying: MAINTAINERS: update picoxcell patterns Applying: MAINTAINERS: remove section CIRRUS LOGIC EP93XX OHCI USB HOST DRIVER Applying: MAINTAINERS: remove METAG imgdafs pattern Applying: MAINTAINERS: remove unused radeon drm pattern Applying: MAINTAINERS: remove unusd ARM/QUALCOMM MSM pattern Applying: MAINTAINERS: remove unused NFSD pattern Applying: mm: allow drivers to prevent new writable mappings Applying: shm: add sealing API Applying: shm: add memfd_create() syscall Applying: selftests: add memfd_create() + sealing tests Using index info to reconstruct a base tree... M tools/testing/selftests/Makefile Falling back to patching base and 3-way merge... Auto-merging tools/testing/selftests/Makefile Applying: selftests: add memfd/sealing page-pinning tests Applying: shm: wait for pins to be released when sealing Applying: bin2c: move bin2c in scripts/basic Applying: kernel: build bin2c based on config option CONFIG_BUILD_BIN2C Applying: kexec: rename unusebale_pages to unusable_pages Applying: kexec: move segment verification code in a separate function Applying: kexec: use common function for kimage_normal_alloc() and kimage_crash_alloc() Applying: resource: provide new functions to walk through resources Applying: kexec: make kexec_segment user buffer pointer a union Applying: kexec: new syscall kexec_file_load() declaration Applying: kexec: implementation of new syscall kexec_file_load Applying: kexec-implementation-of-new-syscall-kexec_file_load-checkpatch-fixes Applying: kexec: return error if file bytes are less then file size Applying: purgatory/sha256: provide implementation of sha256 in purgaotory context Applying: purgatory: core purgatory functionality Applying: purgatory: run host built programs from objtree Applying: kexec: load and relocate purgatory at kernel load time Applying: kexec-load-and-relocate-purgatory-at-kernel-load-time-fix Applying: kexec-bzImage64: support for loading bzImage using 64bit entry Applying: kexec: fix freeing up for image loader data loading Applying: kexec: support for kexec on panic using new system call Applying: kexec-bzimage64: fix the ordering of registers Applying: kexec: support kexec/kdump on EFI systems Applying: kexec-support-kexec-kdump-on-efi-systems-fix Applying: kexec: verify the signature of signed PE bzImage Applying: fs.h: remove unnecessary extern prototypes Applying: fs.h: whitespace neatening Applying: fs.h: a few more whitespace neatenings Applying: fs.h: add argument names to struct file_lock_operations (*funcs) Applying: fs.h: add member argument descriptions to lock_manager_operations Applying: fs/dlm/plock.c: add argument descriptions to notify Applying: dlm, lockd: remove unused conf from lm_grant Applying: dlm: plock: reduce indentation by rearranging order Applying: timer: provide an api for deferrable timeout Applying: ksm: provide support to use deferrable timers for scanner thread Applying: ksm-provide-support-to-use-deferrable-timers-for-scanner-thread-fix Applying: ksm-provide-support-to-use-deferrable-timers-for-scanner-thread-fix-fix-2 Applying: MAINTAINERS: update DMA BUFFER SHARING patterns Applying: MAINTAINERS: update usb/gadget patterns Applying: MAINTAINERS: update samsung pinctrl patterns Applying: MAINTAINERS: update nomadik patterns Applying: kernel/kprobes.c: convert printk to pr_foo() Applying: mm: replace remap_file_pages() syscall with emulation Applying: mm-replace-remap_file_pages-syscall-with-emulation-fix Applying: mm: remap_file_pages: initialize populate before usage Applying: mm: remap_file_pages: grab file ref to prevent race while mmaping Applying: fat: add i_disksize to represent uninitialized size Applying: fat: add fat_fallocate operation Applying: fat: zero out seek range on _fat_get_block Applying: fat: fallback to buffered write in case of fallocated region on direct IO Applying: fat: permit to return phy block number by fibmap in fallocated region Applying: Documentation/filesystems/vfat.txt: update the limitation for fat fallocate Applying: drivers/w1/w1_int.c: call put_device if device_register fails Applying: mm: add strictlimit knob $ cd ../next $ git fetch -f ../rebase-tmp akpm:akpm/master From ../rebase-tmp + df2802f340ae...3f83f83b8230 akpm -> akpm/master (forced update) $ rm -rf ../rebase-tmp Merging akpm/master (3f83f83b8230 mm: add strictlimit knob) $ git merge --no-ff akpm/master Auto-merging scripts/basic/bin2c.c Removing mm/fremap.c Merge made by the 'recursive' strategy. CREDITS | 7 + Documentation/ABI/testing/sysfs-class-bdi | 8 + Documentation/filesystems/vfat.txt | 10 + Documentation/vm/ksm.txt | 7 + Documentation/vm/remap_file_pages.txt | 7 +- MAINTAINERS | 77 +- arch/arm/Kconfig | 2 + arch/arm/mach-omap2/board-omap3touchbook.c | 2 +- arch/arm/mach-omap2/mux.c | 22 +- arch/arm/mach-pxa/balloon3.c | 2 +- arch/arm/mach-pxa/viper.c | 2 +- arch/arm/mach-s3c24xx/mach-jive.c | 2 +- arch/arm/mach-w90x900/cpu.c | 3 +- arch/arm64/include/asm/page.h | 3 - arch/arm64/kernel/vdso.c | 19 - arch/ia64/Kconfig | 2 + arch/ia64/include/asm/page.h | 2 + arch/ia64/mm/init.c | 31 + arch/m68k/Kconfig | 2 + arch/mips/Kconfig | 2 + arch/powerpc/Kconfig | 2 + arch/powerpc/include/asm/page.h | 3 - arch/powerpc/kernel/setup_64.c | 6 +- arch/powerpc/kernel/vdso.c | 16 - arch/powerpc/kernel/vio.c | 2 +- arch/powerpc/platforms/pseries/dlpar.c | 4 +- arch/powerpc/platforms/pseries/mobility.c | 2 +- arch/s390/Kconfig | 2 + arch/s390/include/asm/page.h | 2 - arch/s390/kernel/vdso.c | 15 - arch/sh/Kconfig | 2 + arch/sh/include/asm/page.h | 5 - arch/sh/kernel/vsyscall/vsyscall.c | 15 - arch/tile/Kconfig | 2 + arch/tile/include/asm/page.h | 6 - arch/tile/kernel/vdso.c | 15 - arch/um/include/asm/page.h | 5 + arch/x86/Kbuild | 4 + arch/x86/Kconfig | 25 + arch/x86/Makefile | 8 + arch/x86/include/asm/crash.h | 9 + arch/x86/include/asm/kexec-bzimage64.h | 6 + arch/x86/include/asm/kexec.h | 45 + arch/x86/include/asm/page.h | 1 - arch/x86/include/asm/page_64.h | 2 + arch/x86/kernel/Makefile | 1 + arch/x86/kernel/cpu/intel_cacheinfo.c | 4 +- arch/x86/kernel/cpu/mcheck/mce.c | 6 +- arch/x86/kernel/cpu/mcheck/mce_amd.c | 4 +- arch/x86/kernel/crash.c | 563 +++++++++ arch/x86/kernel/kexec-bzimage64.c | 553 ++++++++ arch/x86/kernel/machine_kexec_64.c | 239 ++++ arch/x86/kvm/mmu_audit.c | 2 +- arch/x86/platform/uv/tlb_uv.c | 2 +- arch/x86/purgatory/Makefile | 30 + arch/x86/purgatory/entry64.S | 101 ++ arch/x86/purgatory/purgatory.c | 72 ++ arch/x86/purgatory/setup-x86_64.S | 58 + arch/x86/purgatory/sha256.c | 283 +++++ arch/x86/purgatory/sha256.h | 22 + arch/x86/purgatory/stack.S | 19 + arch/x86/purgatory/string.c | 13 + arch/x86/syscalls/syscall_32.tbl | 1 + arch/x86/syscalls/syscall_64.tbl | 2 + arch/x86/um/asm/elf.h | 1 - arch/x86/um/mem_64.c | 15 - arch/x86/vdso/vdso2c.h | 12 +- arch/x86/vdso/vdso32-setup.c | 19 +- drivers/atm/he.c | 31 +- drivers/atm/idt77252.c | 15 +- drivers/block/DAC960.c | 18 +- drivers/block/cciss.c | 11 +- drivers/block/skd_main.c | 25 +- drivers/crypto/hifn_795x.c | 5 +- drivers/firmware/efi/runtime-map.c | 21 + drivers/gpio/gpio-zevio.c | 4 + drivers/gpu/drm/i810/i810_dma.c | 5 +- drivers/infiniband/hw/amso1100/c2.c | 6 +- drivers/infiniband/hw/nes/nes_hw.c | 12 +- drivers/infiniband/hw/nes/nes_verbs.c | 5 +- drivers/media/common/saa7146/saa7146_core.c | 15 +- drivers/media/common/saa7146/saa7146_fops.c | 5 +- drivers/media/pci/bt8xx/bt878.c | 16 +- drivers/media/pci/ngene/ngene-core.c | 7 +- drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 11 +- drivers/media/usb/ttusb-dec/ttusb_dec.c | 11 +- drivers/net/ethernet/amd/pcnet32.c | 45 +- drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 7 +- drivers/net/ethernet/cisco/enic/vnic_dev.c | 8 +- drivers/net/ethernet/marvell/sky2.c | 5 +- drivers/net/ethernet/micrel/ksz884x.c | 7 +- .../net/ethernet/qlogic/netxen/netxen_nic_ctx.c | 4 +- drivers/net/ethernet/qlogic/qlge/qlge_main.c | 11 +- drivers/net/irda/vlsi_ir.c | 4 +- drivers/net/wireless/ipw2x00/ipw2100.c | 16 +- drivers/net/wireless/mwl8k.c | 6 +- drivers/net/wireless/rtl818x/rtl8180/dev.c | 11 +- drivers/net/wireless/rtlwifi/pci.c | 17 +- drivers/scsi/3w-sas.c | 5 +- drivers/scsi/a100u2w.c | 8 +- drivers/scsi/be2iscsi/be_main.c | 10 +- drivers/scsi/be2iscsi/be_mgmt.c | 3 +- drivers/scsi/csiostor/csio_wr.c | 8 +- drivers/scsi/eata.c | 5 +- drivers/scsi/hpsa.c | 8 +- drivers/scsi/megaraid/megaraid_mbox.c | 16 +- drivers/scsi/megaraid/megaraid_sas_base.c | 8 +- drivers/scsi/mesh.c | 6 +- drivers/scsi/mvumi.c | 9 +- drivers/scsi/pm8001/pm8001_sas.c | 5 +- drivers/scsi/pmcraid.c | 4 +- drivers/scsi/scsi_sysfs.c | 4 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 15 +- drivers/staging/rtl8192ee/pci.c | 37 +- drivers/staging/rtl8821ae/pci.c | 36 +- drivers/staging/slicoss/slicoss.c | 9 +- drivers/staging/vt6655/device_main.c | 40 +- drivers/tty/synclink_gt.c | 5 +- drivers/vme/bridges/vme_ca91cx42.c | 6 +- drivers/vme/bridges/vme_tsi148.c | 6 +- drivers/w1/w1_int.c | 3 +- fs/dlm/plock.c | 34 +- fs/fat/cache.c | 70 +- fs/fat/fat.h | 6 +- fs/fat/file.c | 78 +- fs/fat/inode.c | 87 +- fs/fcntl.c | 5 + fs/inode.c | 1 + fs/lockd/svclock.c | 12 +- include/asm-generic/pci-dma-compat.h | 8 + include/linux/efi.h | 19 + include/linux/fs.h | 1238 +++++++++--------- include/linux/ioport.h | 6 + include/linux/kernel.h | 4 - include/linux/kexec.h | 104 +- include/linux/mm.h | 17 +- include/linux/sched.h | 2 + include/linux/shmem_fs.h | 17 + include/linux/syscalls.h | 5 + include/uapi/linux/fcntl.h | 15 + include/uapi/linux/kexec.h | 11 + include/uapi/linux/memfd.h | 8 + init/Kconfig | 5 + init/main.c | 23 +- kernel/Makefile | 2 +- kernel/fork.c | 2 +- kernel/kexec.c | 1335 +++++++++++++++++--- kernel/kprobes.c | 36 +- kernel/resource.c | 101 +- kernel/sys_ni.c | 2 + kernel/time/posix-timers.c | 57 +- kernel/time/timer.c | 27 +- mm/Makefile | 2 +- mm/backing-dev.c | 35 + mm/fremap.c | 283 ----- mm/ksm.c | 41 +- mm/memory.c | 38 - mm/mmap.c | 99 +- mm/nommu.c | 13 - mm/shmem.c | 324 +++++ mm/swap_state.c | 1 + scripts/.gitignore | 1 - scripts/Makefile | 1 - scripts/basic/.gitignore | 1 + scripts/basic/Makefile | 1 + scripts/{ => basic}/bin2c.c | 7 +- tools/testing/selftests/Makefile | 1 + tools/testing/selftests/memfd/.gitignore | 4 + tools/testing/selftests/memfd/Makefile | 41 + tools/testing/selftests/memfd/fuse_mnt.c | 110 ++ tools/testing/selftests/memfd/fuse_test.c | 311 +++++ tools/testing/selftests/memfd/memfd_test.c | 913 +++++++++++++ tools/testing/selftests/memfd/run_fuse_test.sh | 14 + 173 files changed, 6809 insertions(+), 1827 deletions(-) create mode 100644 arch/x86/include/asm/crash.h create mode 100644 arch/x86/include/asm/kexec-bzimage64.h create mode 100644 arch/x86/kernel/kexec-bzimage64.c create mode 100644 arch/x86/purgatory/Makefile create mode 100644 arch/x86/purgatory/entry64.S create mode 100644 arch/x86/purgatory/purgatory.c create mode 100644 arch/x86/purgatory/setup-x86_64.S create mode 100644 arch/x86/purgatory/sha256.c create mode 100644 arch/x86/purgatory/sha256.h create mode 100644 arch/x86/purgatory/stack.S create mode 100644 arch/x86/purgatory/string.c create mode 100644 include/uapi/linux/memfd.h delete mode 100644 mm/fremap.c rename scripts/{ => basic}/bin2c.c (88%) create mode 100644 tools/testing/selftests/memfd/.gitignore create mode 100644 tools/testing/selftests/memfd/Makefile create mode 100644 tools/testing/selftests/memfd/fuse_mnt.c create mode 100644 tools/testing/selftests/memfd/fuse_test.c create mode 100644 tools/testing/selftests/memfd/memfd_test.c create mode 100644 tools/testing/selftests/memfd/run_fuse_test.sh