blob: e86e019c76ed1818471a680d4a91fe1f18d6979b [file] [log] [blame]
$ date
Friday 3 October 09:39:42 AEST 2014
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at a44f867247d5 Merge branch 'for-3.17' of git://linux-nfs.org/~bfields/linux
Merging origin/master (b601ce0fe3aa Merge tag 'media/v3.17-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media)
$ git merge origin/master
Updating a44f867247d5..b601ce0fe3aa
Fast-forward
MAINTAINERS | 8 +-
drivers/media/usb/em28xx/em28xx-cards.c | 1 +
drivers/net/ethernet/broadcom/bnx2.c | 5 +-
drivers/net/ethernet/broadcom/tg3.c | 3 +-
drivers/net/ethernet/cadence/macb.c | 11 ---
drivers/net/ethernet/mellanox/mlx4/main.c | 4 +-
.../net/ethernet/qlogic/netxen/netxen_nic_init.c | 6 +-
.../net/ethernet/qlogic/netxen/netxen_nic_main.c | 2 -
.../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 5 +-
.../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 10 +--
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 11 ++-
drivers/net/hyperv/netvsc_drv.c | 3 +-
drivers/net/macvtap.c | 18 ++---
drivers/net/usb/r8152.c | 88 +++++++++++-----------
drivers/parisc/superio.c | 3 +-
include/net/ip6_fib.h | 5 +-
include/net/net_namespace.h | 20 +----
lib/rhashtable.c | 8 +-
mm/huge_memory.c | 7 +-
mm/migrate.c | 5 +-
net/core/skbuff.c | 3 +
net/ipv4/ip_tunnel.c | 11 ++-
net/ipv4/route.c | 2 +-
net/ipv6/addrconf.c | 3 +-
net/ipv6/addrconf_core.c | 7 ++
net/ipv6/ip6_fib.c | 20 +++++
net/ipv6/ip6_gre.c | 3 +
net/ipv6/ip6_tunnel.c | 6 +-
net/ipv6/ip6_vti.c | 6 +-
net/ipv6/route.c | 4 -
net/netfilter/Kconfig | 1 +
net/netfilter/nfnetlink.c | 64 +++++++++++++++-
net/netfilter/nft_hash.c | 12 +--
net/netfilter/nft_rbtree.c | 2 -
net/sched/ematch.c | 6 +-
sound/soc/codecs/rt286.c | 7 +-
sound/soc/codecs/ssm2602.c | 2 +-
sound/soc/fsl/fsl_ssi.c | 12 +--
sound/soc/soc-compress.c | 6 +-
sound/soc/soc-core.c | 2 +-
40 files changed, 249 insertions(+), 153 deletions(-)
Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge fixes/master
Already up-to-date.
Merging kbuild-current/rc-fixes (7d1311b93e58 Linux 3.17-rc1)
$ git merge kbuild-current/rc-fixes
Already up-to-date.
Merging arc-current/for-curr (2ce7598c9a45 Linux 3.17-rc4)
$ git merge arc-current/for-curr
Already up-to-date.
Merging arm-current/fixes (ad684dce87fa ARM: 8179/1: kprobes-test: Fix compile error "bad immediate value for offset")
$ git merge arm-current/fixes
Already up-to-date.
Merging m68k-current/for-linus (4ed7800987b1 m68k: Wire up memfd_create)
$ 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 (1795cd9b3a91 Linux 3.16-rc5)
$ git merge mips-fixes/mips-fixes
Already up-to-date.
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 powerpc-merge-mpe/for-linus (7d59deb50aaf powerpc: Wire up sys_seccomp(), sys_getrandom() and sys_memfd_create())
$ git merge powerpc-merge-mpe/for-linus
Already up-to-date.
Merging sparc/master (ca605b7dd740 sparc64: Add vio_set_intr() to enable/disable Rx interrupts)
$ git merge sparc/master
Auto-merging drivers/net/ethernet/sun/sunvnet.c
Merge made by the 'recursive' strategy.
arch/sparc/include/asm/dma-mapping.h | 6 +-
arch/sparc/include/asm/hypervisor.h | 11 +++
arch/sparc/include/asm/ldc.h | 5 +-
arch/sparc/include/asm/spitfire.h | 2 +
arch/sparc/include/asm/thread_info_64.h | 1 +
arch/sparc/include/asm/vio.h | 60 ++++++++++--
arch/sparc/kernel/cpu.c | 12 +++
arch/sparc/kernel/cpumap.c | 2 +
arch/sparc/kernel/ds.c | 4 +-
arch/sparc/kernel/head_64.S | 12 +++
arch/sparc/kernel/hvapi.c | 1 +
arch/sparc/kernel/hvcalls.S | 16 +++
arch/sparc/kernel/ioport.c | 5 +-
arch/sparc/kernel/ldc.c | 41 ++++----
arch/sparc/kernel/leon_kernel.c | 31 +++++-
arch/sparc/kernel/pcr.c | 47 ++++++++-
arch/sparc/kernel/perf_event.c | 3 +-
arch/sparc/kernel/setup_64.c | 26 +++--
arch/sparc/kernel/sun4v_tlb_miss.S | 35 ++++---
arch/sparc/kernel/traps_64.c | 15 +--
arch/sparc/kernel/vio.c | 13 ++-
arch/sparc/kernel/viohs.c | 18 +++-
arch/sparc/lib/memset.S | 18 +++-
arch/sparc/mm/fault_64.c | 3 +
arch/sparc/mm/init_64.c | 54 ++++++++++-
arch/sparc/power/hibernate_asm.S | 4 +-
drivers/block/sunvdc.c | 167 ++++++++++++++++++++++++--------
drivers/net/ethernet/sun/sunvnet.c | 4 +-
28 files changed, 486 insertions(+), 130 deletions(-)
Merging net/master (50dddff3cb9a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge net/master
Already up-to-date.
Merging ipsec/master (b8c203b2d2fc xfrm: Generate queueing routes only from route lookup functions)
$ git merge ipsec/master
Already up-to-date.
Merging sound-current/for-linus (b7c2dc8e684a Merge tag 'asoc-v3.17-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
$ git merge sound-current/for-linus
Already up-to-date.
Merging pci-current/for-linus (7cbeb9f90db8 PCI: pciehp: Fix pcie_wait_cmd() timeout)
$ git merge pci-current/for-linus
Already up-to-date.
Merging wireless/master (f8adaf0ae978 brcmfmac: Fix off by one bug in brcmf_count_20mhz_channels())
$ git merge wireless/master
Already up-to-date.
Merging driver-core.current/driver-core-linus (9e82bf014195 Linux 3.17-rc5)
$ git merge driver-core.current/driver-core-linus
Already up-to-date.
Merging tty.current/tty-linus (9e82bf014195 Linux 3.17-rc5)
$ git merge tty.current/tty-linus
Already up-to-date.
Merging usb.current/usb-linus (0f33be009b89 Linux 3.17-rc6)
$ git merge usb.current/usb-linus
Already up-to-date.
Merging usb-gadget-fixes/fixes (0b93a4c838fa usb: dwc3: fix TRB completion when multiple TRBs are started)
$ git merge usb-gadget-fixes/fixes
Already up-to-date.
Merging usb-serial-fixes/usb-linus (dee80ad12d2b USB: cp210x: add support for Seluxit USB dongle)
$ git merge usb-serial-fixes/usb-linus
Merge made by the 'recursive' strategy.
drivers/usb/serial/cp210x.c | 2 ++
1 file changed, 2 insertions(+)
Merging staging.current/staging-linus (0f33be009b89 Linux 3.17-rc6)
$ git merge staging.current/staging-linus
Already up-to-date.
Merging char-misc.current/char-misc-linus (9e82bf014195 Linux 3.17-rc5)
$ git merge char-misc.current/char-misc-linus
Already up-to-date.
Merging input-current/for-linus (3049683eafdb Input: i8042 - fix Asus X450LCP touchpad detection)
$ 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 (7da4b29d496b crypto: aesni - disable "by8" AVX CTR optimization)
$ git merge crypto-current/master
Already up-to-date.
Merging ide/master (a53dae49b2fe ide: use module_platform_driver())
$ 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 (e66c98c7a0ea of: Fix NULL dereference in selftest removal code)
$ git merge devicetree-current/devicetree/merge
Merge made by the 'recursive' strategy.
drivers/of/selftest.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
Merging rr-fixes/fixes (f49819560f53 virtio-rng: skip reading when we start to remove the device)
$ 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 kselftest-fixes/fixes (ce6a144a0d01 selftests/memfd: Run test on all architectures)
$ git merge kselftest-fixes/fixes
Merge made by the 'recursive' strategy.
tools/testing/selftests/memfd/Makefile | 21 -----------------
tools/testing/selftests/memfd/memfd_test.c | 36 ++++++++++++++----------------
2 files changed, 17 insertions(+), 40 deletions(-)
Merging drm-intel-fixes/for-linux-next-fixes (91e56499304f drm/i915: Flush the PTEs after updating them before suspend)
$ git merge drm-intel-fixes/for-linux-next-fixes
Merge made by the 'recursive' strategy.
drivers/gpu/drm/i915/i915_gem_gtt.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
Merging asm-generic/master (f3670394c29f Revert "x86/efi: Fixup GOT in all boot code paths")
$ git merge asm-generic/master
Already up-to-date.
Merging arc/for-next (517eefb5de44 ARC: unbork FPU save/restore)
$ git merge arc/for-next
Removing arch/arc/plat-arcfpga/include/plat/memmap.h
Removing arch/arc/plat-arcfpga/include/plat/irq.h
Merge made by the 'recursive' strategy.
arch/arc/Kconfig | 6 +-
arch/arc/Makefile | 17 +-
arch/arc/boot/dts/angel4.dts | 5 -
arch/arc/boot/dts/nsimosci.dts | 7 +-
arch/arc/configs/fpga_defconfig | 1 -
arch/arc/configs/fpga_noramfs_defconfig | 1 -
arch/arc/configs/nsimosci_defconfig | 1 -
arch/arc/include/asm/arcregs.h | 77 +++++----
arch/arc/include/asm/atomic.h | 4 -
arch/arc/include/asm/bitops.h | 4 -
arch/arc/include/asm/bug.h | 7 +-
arch/arc/include/asm/cache.h | 2 +-
arch/arc/include/asm/current.h | 4 -
arch/arc/include/asm/entry.h | 45 ++---
arch/arc/include/asm/irqflags.h | 4 -
arch/arc/include/asm/kgdb.h | 32 ++--
arch/arc/include/asm/processor.h | 13 +-
arch/arc/include/asm/setup.h | 1 -
arch/arc/include/asm/smp.h | 10 +-
arch/arc/include/asm/string.h | 3 -
arch/arc/include/asm/syscalls.h | 4 -
arch/arc/include/asm/thread_info.h | 4 -
arch/arc/include/asm/unaligned.h | 2 +-
arch/arc/kernel/Makefile | 2 +-
arch/arc/kernel/disasm.c | 4 +-
arch/arc/kernel/head.S | 10 --
arch/arc/kernel/perf_event.c | 21 ++-
arch/arc/kernel/setup.c | 245 +++++++++++++---------------
arch/arc/kernel/smp.c | 2 +-
arch/arc/mm/cache_arc700.c | 14 +-
arch/arc/mm/tlb.c | 8 +-
arch/arc/plat-arcfpga/Kconfig | 13 +-
arch/arc/plat-arcfpga/include/plat/irq.h | 27 ---
arch/arc/plat-arcfpga/include/plat/memmap.h | 29 ----
arch/arc/plat-arcfpga/platform.c | 61 +------
arch/arc/plat-arcfpga/smp.c | 3 +-
arch/arc/plat-tb10x/Kconfig | 1 -
arch/arc/plat-tb10x/tb10x.c | 13 --
38 files changed, 254 insertions(+), 453 deletions(-)
delete mode 100644 arch/arc/plat-arcfpga/include/plat/irq.h
delete mode 100644 arch/arc/plat-arcfpga/include/plat/memmap.h
Merging arm/for-next (49e37117f8f6 Merge branches 'fiq' (early part), 'fixes' and 'misc' into for-next)
$ git merge arm/for-next
Merge made by the 'recursive' strategy.
arch/arm/Makefile | 2 +-
arch/arm/boot/bootp/Makefile | 2 +
arch/arm/boot/compressed/Makefile | 2 +
arch/arm/configs/ep93xx_defconfig | 1 +
arch/arm/configs/versatile_defconfig | 1 +
arch/arm/crypto/sha1-armv7-neon.S | 39 +++++++------
arch/arm/include/asm/ftrace.h | 2 +-
arch/arm/include/asm/smp.h | 6 --
arch/arm/include/asm/syscall.h | 8 +--
arch/arm/kernel/atags_parse.c | 2 +-
arch/arm/kernel/entry-armv.S | 108 ++++++++++++++++++++++++++++++-----
arch/arm/kernel/entry-common.S | 2 +-
arch/arm/kernel/entry-header.S | 63 ++++++++++++++++++--
arch/arm/kernel/fiq.c | 17 ++++--
arch/arm/kernel/hw_breakpoint.c | 18 +++---
arch/arm/kernel/irq.c | 4 +-
arch/arm/kernel/perf_event_cpu.c | 4 +-
arch/arm/kernel/process.c | 62 ++++++++++++++++----
arch/arm/kernel/return_address.c | 9 ---
arch/arm/kernel/setup.c | 8 ++-
arch/arm/kernel/smp.c | 14 ++---
arch/arm/kernel/traps.c | 26 ++++++++-
arch/arm/kernel/unwind.c | 24 ++++----
arch/arm/mach-sa1100/Kconfig | 2 +
arch/arm/mach-sa1100/h3xxx.c | 15 +++++
arch/arm/mm/idmap.c | 2 +-
arch/arm/mm/mmu.c | 4 +-
arch/arm/mm/proc-v7.S | 2 +-
crypto/Kconfig | 4 +-
kernel/gcov/Kconfig | 2 +-
30 files changed, 338 insertions(+), 117 deletions(-)
Merging arm-perf/for-next/perf (7d1311b93e58 Linux 3.17-rc1)
$ git merge arm-perf/for-next/perf
Already up-to-date.
Merging arm-soc/for-next (058bb16eb709 arm-soc: document merges)
$ git merge arm-soc/for-next
Removing include/linux/platform_data/tegra_emc.h
Removing arch/arm/mach-shmobile/r7s72100.h
Removing arch/arm/mach-shmobile/clock-r7s72100.c
Removing arch/arm/mach-shmobile/board-genmai.c
Removing arch/arm/mach-shmobile/board-genmai-reference.c
Removing arch/arm/mach-shmobile/board-armadillo800eva-reference.c
Auto-merging arch/arm/mach-s5pv210/regs-clock.h
Removing arch/arm/mach-omap2/irq.c
Removing arch/arm/mach-msm/board-mahimahi.c
Removing arch/arm/mach-imx/pcm970-baseboard.c
Removing arch/arm/mach-imx/mach-pcm038.c
Removing arch/arm/mach-imx/mach-mxt_td60.c
Removing arch/arm/mach-imx/mach-mx1ads.c
Removing arch/arm/mach-imx/mach-cpuimx27.c
Removing arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
Removing arch/arm/mach-imx/board-pcm038.h
Removing arch/arm/mach-exynos/include/mach/memory.h
Removing arch/arm/mach-at91/board-rsi-ews.c
Removing arch/arm/mach-at91/board-foxg20.c
Removing arch/arm/mach-at91/at91sam9g45_reset.S
Removing arch/arm/mach-at91/at91sam9_alt_reset.S
Removing arch/arm/mach-at91/at91sam926x_time.c
Removing arch/arm/mach-at91/at91_shdwc.h
Removing arch/arm/mach-at91/at91_rstc.h
Auto-merging arch/arm/configs/hisi_defconfig
Auto-merging arch/arm/boot/dts/vf610-colibri.dtsi
Removing arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
Auto-merging arch/arm/boot/dts/omap3-gta04.dtsi
Auto-merging arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts
Removing arch/arm/boot/dts/kirkwood-rd88f6281-a0.dts
Removing arch/arm/boot/dts/exynos5250-cros-common.dtsi
Auto-merging arch/arm/Makefile
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
Documentation/arm/Marvell/README | 4 +
.../bindings/arm/altera/socfpga-sdram-edac.txt | 15 +
Documentation/devicetree/bindings/arm/amlogic.txt | 8 +
.../devicetree/bindings/arm/atmel-at91.txt | 45 +-
.../devicetree/bindings/arm/bcm/bcm63138.txt | 9 +
.../devicetree/bindings/arm/cavium-thunder.txt | 10 +
Documentation/devicetree/bindings/arm/cpus.txt | 1 +
.../devicetree/bindings/arm/geniatech.txt | 5 +
.../bindings/arm/hisilicon/hisilicon.txt | 23 +
Documentation/devicetree/bindings/arm/mediatek.txt | 6 +
Documentation/devicetree/bindings/arm/omap/mpu.txt | 3 +
.../devicetree/bindings/arm/omap/omap.txt | 12 +
Documentation/devicetree/bindings/arm/shmobile.txt | 71 +
.../bindings/arm/tegra/nvidia,tegra20-flowctrl.txt | 12 +
.../devicetree/bindings/clock/at91-clock.txt | 14 +
.../bindings/clock/renesas,cpg-mstp-clocks.txt | 2 +
.../devicetree/bindings/i2c/trivial-devices.txt | 2 +-
.../devicetree/bindings/leds/register-bit-led.txt | 99 ++
.../devicetree/bindings/mailbox/omap-mailbox.txt | 108 ++
.../bindings/memory-controllers/synopsys.txt | 11 +
.../devicetree/bindings/pci/fsl,imx6q-pcie.txt | 4 +-
.../devicetree/bindings/regulator/da9210.txt | 4 +-
.../devicetree/bindings/rtc/sun6i-rtc.txt | 17 +
.../bindings/soc/ti/keystone-navigator-dma.txt | 111 ++
.../bindings/soc/ti/keystone-navigator-qmss.txt | 232 +++
.../devicetree/bindings/vendor-prefixes.txt | 3 +
MAINTAINERS | 60 +-
arch/arm/Kconfig | 14 +
arch/arm/Kconfig.debug | 80 +-
arch/arm/Makefile | 1 +
arch/arm/arm-soc-for-next-contents.txt | 300 ++++
arch/arm/boot/dts/Makefile | 35 +-
arch/arm/boot/dts/am335x-bone-common.dtsi | 8 +-
arch/arm/boot/dts/am335x-bone.dts | 5 +
arch/arm/boot/dts/am335x-boneblack.dts | 5 +
arch/arm/boot/dts/am33xx.dtsi | 12 +-
arch/arm/boot/dts/am4372.dtsi | 13 +-
arch/arm/boot/dts/armada-370-db.dts | 6 +
arch/arm/boot/dts/armada-370-mirabox.dts | 6 +
arch/arm/boot/dts/armada-370-netgear-rn102.dts | 10 +-
arch/arm/boot/dts/armada-370-netgear-rn104.dts | 12 +-
arch/arm/boot/dts/armada-370-rd.dts | 47 +-
arch/arm/boot/dts/armada-370-xp.dtsi | 4 +-
arch/arm/boot/dts/armada-370.dtsi | 23 +
arch/arm/boot/dts/armada-375.dtsi | 6 +
arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 6 +-
arch/arm/boot/dts/at91-sama5d4ek.dts | 260 +++
arch/arm/boot/dts/at91sam9263.dtsi | 12 +-
arch/arm/boot/dts/at91sam9g20.dtsi | 4 +
arch/arm/boot/dts/at91sam9g45.dtsi | 47 +-
arch/arm/boot/dts/at91sam9m10g45ek.dts | 4 +
arch/arm/boot/dts/at91sam9n12.dtsi | 2 +
arch/arm/boot/dts/at91sam9n12ek.dts | 2 +
arch/arm/boot/dts/at91sam9rl.dtsi | 4 +-
arch/arm/boot/dts/at91sam9x5.dtsi | 4 +-
arch/arm/boot/dts/bcm2835-rpi-b.dts | 8 +-
arch/arm/boot/dts/bcm2835.dtsi | 1 +
arch/arm/boot/dts/bcm63138.dtsi | 134 ++
arch/arm/boot/dts/bcm963138dvt.dts | 30 +
arch/arm/boot/dts/cros-adc-thermistors.dtsi | 44 +
arch/arm/boot/dts/da850-evm.dts | 72 +
arch/arm/boot/dts/da850.dtsi | 19 +
arch/arm/boot/dts/dra7-evm.dts | 2 +
arch/arm/boot/dts/dra7.dtsi | 25 +-
arch/arm/boot/dts/dra72-evm.dts | 120 ++
arch/arm/boot/dts/dra72x.dtsi | 5 +
arch/arm/boot/dts/dra74x.dtsi | 6 +
arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 8 +-
arch/arm/boot/dts/exynos4412-origen.dts | 8 +-
arch/arm/boot/dts/exynos4412-trats2.dts | 8 +-
arch/arm/boot/dts/exynos5250-arndale.dts | 22 +-
arch/arm/boot/dts/exynos5250-cros-common.dtsi | 164 --
arch/arm/boot/dts/exynos5250-smdk5250.dts | 18 +-
arch/arm/boot/dts/exynos5250-snow.dts | 195 ++-
arch/arm/boot/dts/exynos5250.dtsi | 15 -
arch/arm/boot/dts/exynos5260-xyref5260.dts | 18 +-
arch/arm/boot/dts/exynos5410-smdk5410.dts | 18 +-
arch/arm/boot/dts/exynos5420-arndale-octa.dts | 16 +-
arch/arm/boot/dts/exynos5420-peach-pit.dts | 482 +++++-
arch/arm/boot/dts/exynos5420-smdk5420.dts | 16 +-
arch/arm/boot/dts/exynos5800-peach-pi.dts | 472 ++++-
arch/arm/boot/dts/hip04-d01.dts | 32 +
arch/arm/boot/dts/hip04.dtsi | 267 +++
arch/arm/boot/dts/imx1-ads.dts | 152 ++
arch/arm/boot/dts/imx1-apf9328.dts | 129 ++
arch/arm/boot/dts/imx1-pinfunc.h | 302 ++++
arch/arm/boot/dts/imx1.dtsi | 266 +++
arch/arm/boot/dts/imx23-evk.dts | 4 +-
arch/arm/boot/dts/imx25-pinfunc.h | 33 +-
arch/arm/boot/dts/imx25.dtsi | 4 +-
arch/arm/boot/dts/imx27-apf27dev.dts | 17 +
arch/arm/boot/dts/imx28-apf28dev.dts | 4 +-
arch/arm/boot/dts/imx28-apx4devkit.dts | 4 +-
arch/arm/boot/dts/imx28-cfa10049.dts | 4 +-
arch/arm/boot/dts/imx28-cfa10055.dts | 4 +-
arch/arm/boot/dts/imx28-cfa10056.dts | 4 +-
arch/arm/boot/dts/imx28-cfa10057.dts | 4 +-
arch/arm/boot/dts/imx28-cfa10058.dts | 4 +-
arch/arm/boot/dts/imx28-evk.dts | 4 +-
arch/arm/boot/dts/imx28-m28cu3.dts | 4 +-
arch/arm/boot/dts/imx28-m28evk.dts | 4 +-
arch/arm/boot/dts/imx28-tx28.dts | 107 +-
arch/arm/boot/dts/imx28.dtsi | 43 +
arch/arm/boot/dts/imx35.dtsi | 1 +
arch/arm/boot/dts/imx50.dtsi | 2 +
arch/arm/boot/dts/imx51.dtsi | 3 +
arch/arm/boot/dts/imx53-smd.dts | 2 +-
arch/arm/boot/dts/imx53.dtsi | 8 +
arch/arm/boot/dts/imx6dl-gw552x.dts | 20 +
arch/arm/boot/dts/imx6dl-hummingboard.dts | 203 +--
arch/arm/boot/dts/imx6q-gw5400-a.dts | 203 +--
arch/arm/boot/dts/imx6q-gw552x.dts | 24 +
arch/arm/boot/dts/imx6q-hummingboard.dts | 21 +
arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 192 +--
arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 314 ++--
arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 338 ++--
arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 278 ++-
arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 267 +++
arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 200 +++
arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 38 +
arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 2 +-
arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 45 +-
arch/arm/boot/dts/imx6qdl.dtsi | 24 +-
arch/arm/boot/dts/imx6sl-evk.dts | 104 +-
arch/arm/boot/dts/imx6sl.dtsi | 31 +-
arch/arm/boot/dts/imx6sx-sdb.dts | 93 +
arch/arm/boot/dts/imx6sx.dtsi | 7 +-
arch/arm/boot/dts/k2e.dtsi | 13 +
arch/arm/boot/dts/k2hk.dtsi | 56 +
arch/arm/boot/dts/k2l.dtsi | 46 +
arch/arm/boot/dts/keystone.dtsi | 10 +-
arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 16 +-
arch/arm/boot/dts/kirkwood-rd88f6281-a.dts | 43 +
arch/arm/boot/dts/kirkwood-rd88f6281-a0.dts | 26 -
...-rd88f6281-a1.dts => kirkwood-rd88f6281-z0.dts} | 18 +-
arch/arm/boot/dts/kirkwood-rd88f6281.dtsi | 27 +-
arch/arm/boot/dts/kirkwood.dtsi | 4 +-
arch/arm/boot/dts/meson.dtsi | 105 ++
arch/arm/boot/dts/meson6-atv1200.dts | 66 +
arch/arm/boot/dts/meson6.dtsi | 78 +
arch/arm/boot/dts/mt6589-aquaris5.dts | 5 +
arch/arm/boot/dts/mt6589.dtsi | 4 +-
arch/arm/boot/dts/omap2.dtsi | 1 -
arch/arm/boot/dts/omap2420-n810.dts | 7 +
arch/arm/boot/dts/omap2420-n8x0-common.dtsi | 6 +
arch/arm/boot/dts/omap2420.dtsi | 8 +
arch/arm/boot/dts/omap2430.dtsi | 4 +
arch/arm/boot/dts/omap3-beagle-xm.dts | 4 +-
.../boot/dts/{omap3-gta04.dts => omap3-gta04.dtsi} | 150 +-
arch/arm/boot/dts/omap3-gta04a3.dts | 48 +
arch/arm/boot/dts/omap3-gta04a4.dts | 13 +
arch/arm/boot/dts/omap3-gta04a5.dts | 17 +
arch/arm/boot/dts/omap3-ha-common.dtsi | 88 +
arch/arm/boot/dts/omap3-ha-lcd.dts | 165 ++
arch/arm/boot/dts/omap3-ha.dts | 28 +
arch/arm/boot/dts/omap3-ldp.dts | 5 +
arch/arm/boot/dts/omap3-n900.dts | 54 +-
.../boot/dts/omap3-overo-common-peripherals.dtsi | 5 +-
arch/arm/boot/dts/omap3-tao3530.dtsi | 337 ++++
arch/arm/boot/dts/omap3-thunder.dts | 129 ++
arch/arm/boot/dts/omap3.dtsi | 8 +-
arch/arm/boot/dts/omap4-panda-common.dtsi | 3 -
arch/arm/boot/dts/omap4-panda-es.dts | 5 +
arch/arm/boot/dts/omap4-panda.dts | 5 +
arch/arm/boot/dts/omap4.dtsi | 15 +
arch/arm/boot/dts/omap5-cm-t54.dts | 272 ++-
arch/arm/boot/dts/omap5-sbc-t54.dts | 8 +-
arch/arm/boot/dts/omap5.dtsi | 46 +-
arch/arm/boot/dts/pxa2xx.dtsi | 4 +-
arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 43 +
arch/arm/boot/dts/qcom-apq8064.dtsi | 183 ++
arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 21 +
arch/arm/boot/dts/qcom-apq8084-ifc6540.dts | 23 +
arch/arm/boot/dts/qcom-apq8084-mtp.dts | 6 +
arch/arm/boot/dts/qcom-apq8084.dtsi | 51 +
arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 85 +
arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi | 1 +
arch/arm/boot/dts/qcom-ipq8064.dtsi | 250 +++
arch/arm/boot/dts/qcom-msm8660-surf.dts | 42 +
arch/arm/boot/dts/qcom-msm8660.dtsi | 93 +
arch/arm/boot/dts/qcom-msm8960-cdp.dts | 27 +
arch/arm/boot/dts/qcom-msm8960.dtsi | 87 +
arch/arm/boot/dts/qcom-msm8974.dtsi | 15 +-
arch/arm/boot/dts/r7s72100-genmai.dts | 4 +
arch/arm/boot/dts/r7s72100.dtsi | 10 +
arch/arm/boot/dts/r8a73a4.dtsi | 6 +-
.../boot/dts/r8a7740-armadillo800eva-reference.dts | 283 ---
arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 276 ++-
arch/arm/boot/dts/r8a7740.dtsi | 220 ++-
arch/arm/boot/dts/r8a7778.dtsi | 6 +
arch/arm/boot/dts/r8a7779-marzen.dts | 4 +
arch/arm/boot/dts/r8a7779.dtsi | 58 +-
arch/arm/boot/dts/r8a7790-lager.dts | 44 +-
arch/arm/boot/dts/r8a7790.dtsi | 159 +-
arch/arm/boot/dts/r8a7791-henninger.dts | 35 +
arch/arm/boot/dts/r8a7791-koelsch.dts | 41 +-
arch/arm/boot/dts/r8a7791.dtsi | 140 +-
arch/arm/boot/dts/r8a7794-alt.dts | 47 +
arch/arm/boot/dts/r8a7794.dtsi | 531 ++++++
arch/arm/boot/dts/rk3066a-bqcurie2.dts | 15 +-
arch/arm/boot/dts/rk3066a.dtsi | 67 +
arch/arm/boot/dts/rk3188-radxarock.dts | 68 +-
arch/arm/boot/dts/rk3188.dtsi | 69 +
arch/arm/boot/dts/rk3288-evb-act8846.dts | 10 +-
arch/arm/boot/dts/rk3288-evb-rk808.dts | 132 ++
arch/arm/boot/dts/rk3288-evb.dtsi | 87 +
arch/arm/boot/dts/rk3288.dtsi | 380 ++++
arch/arm/boot/dts/rk3xxx.dtsi | 109 +-
arch/arm/boot/dts/sama5d3.dtsi | 37 +-
arch/arm/boot/dts/sama5d3_can.dtsi | 2 +-
arch/arm/boot/dts/sama5d3xcm.dtsi | 30 +
arch/arm/boot/dts/sama5d3xmb.dtsi | 4 +
arch/arm/boot/dts/sama5d4.dtsi | 1240 +++++++++++++
arch/arm/boot/dts/sh7372.dtsi | 1 +
arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 8 +-
arch/arm/boot/dts/sh73a0.dtsi | 36 +-
arch/arm/boot/dts/socfpga.dtsi | 11 +
arch/arm/boot/dts/socfpga_arria5.dtsi | 11 +-
arch/arm/boot/dts/socfpga_arria5_socdk.dts | 7 -
arch/arm/boot/dts/socfpga_cyclone5.dtsi | 13 +-
arch/arm/boot/dts/socfpga_cyclone5_socdk.dts | 4 +
arch/arm/boot/dts/socfpga_vt.dts | 9 +-
arch/arm/boot/dts/sun4i-a10.dtsi | 19 +-
arch/arm/boot/dts/sun5i-a10s.dtsi | 17 +-
arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 130 ++
arch/arm/boot/dts/sun5i-a13.dtsi | 17 +-
arch/arm/boot/dts/sun6i-a31.dtsi | 56 +-
arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 236 +++
arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 137 ++
arch/arm/boot/dts/sun7i-a20.dtsi | 102 +-
arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts | 41 +
arch/arm/boot/dts/sun8i-a23.dtsi | 237 ++-
arch/arm/boot/dts/sunxi-common-regulators.dtsi | 7 +
arch/arm/boot/dts/tegra114.dtsi | 5 +
arch/arm/boot/dts/tegra124-jetson-tk1.dts | 98 +-
arch/arm/boot/dts/tegra124-nyan-big.dts | 1136 ++++++++++++
arch/arm/boot/dts/tegra124-venice2.dts | 18 +-
arch/arm/boot/dts/tegra124.dtsi | 100 +-
arch/arm/boot/dts/tegra20.dtsi | 5 +
arch/arm/boot/dts/tegra30.dtsi | 5 +
arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 36 +-
arch/arm/boot/dts/vexpress-v2m.dtsi | 36 +-
arch/arm/boot/dts/vexpress-v2p-ca9.dts | 31 +
arch/arm/boot/dts/vf610-colibri-eval-v3.dts | 46 +
.../dts/{vf610-colibri.dts => vf610-colibri.dtsi} | 22 +-
arch/arm/boot/dts/vf610-twr.dts | 26 +-
arch/arm/boot/dts/vf610.dtsi | 60 +-
arch/arm/boot/dts/zynq-7000.dtsi | 19 +-
arch/arm/boot/dts/zynq-parallella.dts | 27 +-
arch/arm/boot/dts/zynq-zc702.dts | 18 +-
arch/arm/boot/dts/zynq-zc706.dts | 12 +-
arch/arm/boot/dts/zynq-zed.dts | 14 +-
arch/arm/configs/ape6evm_defconfig | 9 +-
arch/arm/configs/at91_dt_defconfig | 35 +-
arch/arm/configs/at91sam9260_9g20_defconfig | 13 +-
arch/arm/configs/at91sam9261_9g10_defconfig | 5 +-
arch/arm/configs/at91sam9263_defconfig | 13 +-
arch/arm/configs/at91sam9g45_defconfig | 19 +-
arch/arm/configs/at91sam9rl_defconfig | 19 +-
arch/arm/configs/bcm2835_defconfig | 1 +
arch/arm/configs/bcm_defconfig | 1 -
arch/arm/configs/bockw_defconfig | 3 +-
arch/arm/configs/clps711x_defconfig | 4 +-
arch/arm/configs/ezx_defconfig | 1 -
.../configs/{hi3xxx_defconfig => hisi_defconfig} | 13 +
arch/arm/configs/imote2_defconfig | 1 -
arch/arm/configs/imx_v4_v5_defconfig | 16 +-
arch/arm/configs/imx_v6_v7_defconfig | 10 +-
arch/arm/configs/koelsch_defconfig | 17 +
arch/arm/configs/kzm9g_defconfig | 1 +
arch/arm/configs/lager_defconfig | 8 +-
arch/arm/configs/lpc32xx_defconfig | 2 +
arch/arm/configs/marzen_defconfig | 1 +
arch/arm/configs/multi_v7_defconfig | 40 +-
arch/arm/configs/mvebu_v7_defconfig | 68 +-
arch/arm/configs/omap2plus_defconfig | 79 +-
arch/arm/configs/pxa3xx_defconfig | 1 -
arch/arm/configs/qcom_defconfig | 14 +-
arch/arm/configs/sama5_defconfig | 19 +-
arch/arm/configs/shmobile_defconfig | 16 +
arch/arm/configs/sunxi_defconfig | 4 +-
arch/arm/configs/tegra_defconfig | 5 +-
arch/arm/include/asm/mcpm.h | 5 +
arch/arm/include/debug/bcm63xx.S | 33 +
arch/arm/include/debug/meson.S | 35 +
arch/arm/mach-at91/Kconfig | 49 +-
arch/arm/mach-at91/Kconfig.non_dt | 18 +-
arch/arm/mach-at91/Makefile | 9 +-
arch/arm/mach-at91/at91_rstc.h | 53 -
arch/arm/mach-at91/at91_shdwc.h | 50 -
arch/arm/mach-at91/at91sam9260.c | 51 +-
arch/arm/mach-at91/at91sam9261.c | 51 +-
arch/arm/mach-at91/at91sam9263.c | 51 +-
arch/arm/mach-at91/at91sam926x_time.c | 294 ----
arch/arm/mach-at91/at91sam9_alt_reset.S | 40 -
arch/arm/mach-at91/at91sam9g45.c | 55 +-
arch/arm/mach-at91/at91sam9g45_reset.S | 45 -
arch/arm/mach-at91/at91sam9rl.c | 51 +-
arch/arm/mach-at91/board-afeb-9260v1.c | 4 +-
arch/arm/mach-at91/board-cam60.c | 4 +-
arch/arm/mach-at91/board-cpu9krea.c | 4 +-
arch/arm/mach-at91/board-dt-rm9200.c | 13 -
arch/arm/mach-at91/board-dt-sam9.c | 23 -
arch/arm/mach-at91/board-dt-sama5.c | 59 +-
arch/arm/mach-at91/board-flexibity.c | 4 +-
arch/arm/mach-at91/board-foxg20.c | 272 ---
arch/arm/mach-at91/board-gsia18s.c | 2 +-
arch/arm/mach-at91/board-pcontrol-g20.c | 2 +-
arch/arm/mach-at91/board-rsi-ews.c | 232 ---
arch/arm/mach-at91/board-sam9-l9260.c | 4 +-
arch/arm/mach-at91/board-sam9260ek.c | 5 +-
arch/arm/mach-at91/board-sam9261ek.c | 7 +-
arch/arm/mach-at91/board-sam9263ek.c | 5 +-
arch/arm/mach-at91/board-sam9g20ek.c | 4 +-
arch/arm/mach-at91/board-sam9m10g45ek.c | 5 +-
arch/arm/mach-at91/board-sam9rlek.c | 5 +-
arch/arm/mach-at91/board-snapper9260.c | 4 +-
arch/arm/mach-at91/board-stamp9g20.c | 4 +-
arch/arm/mach-at91/clock.c | 1 +
arch/arm/mach-at91/generic.h | 19 +-
arch/arm/mach-at91/include/mach/cpu.h | 22 +-
arch/arm/mach-at91/include/mach/debug-macro.S | 5 +-
arch/arm/mach-at91/include/mach/hardware.h | 23 +-
arch/arm/mach-at91/include/mach/sama5d4.h | 33 +
arch/arm/mach-at91/include/mach/uncompress.h | 21 +-
arch/arm/mach-at91/irq.c | 270 +--
arch/arm/mach-at91/pm.c | 104 +-
arch/arm/mach-at91/sama5d4.c | 64 +
arch/arm/mach-at91/setup.c | 273 ++-
arch/arm/mach-at91/soc.h | 7 +
arch/arm/mach-bcm/Kconfig | 17 +
arch/arm/mach-bcm/Makefile | 3 +
arch/arm/mach-bcm/bcm63xx.c | 27 +
arch/arm/mach-clps711x/board-edb7211.c | 37 +-
arch/arm/mach-clps711x/common.c | 138 +-
arch/arm/mach-clps711x/common.h | 5 +
arch/arm/mach-clps711x/devices.c | 52 +-
arch/arm/mach-cns3xxx/cns3420vb.c | 1 +
arch/arm/mach-cns3xxx/core.c | 1 +
arch/arm/mach-cns3xxx/core.h | 6 +
arch/arm/mach-cns3xxx/pcie.c | 49 +-
arch/arm/mach-davinci/board-da850-evm.c | 15 +
arch/arm/mach-davinci/da8xx-dt.c | 1 +
arch/arm/mach-exynos/include/mach/memory.h | 26 -
arch/arm/mach-exynos/platsmp.c | 4 +-
arch/arm/mach-hisi/Kconfig | 11 +-
arch/arm/mach-hisi/Makefile | 3 +
arch/arm/mach-hisi/hisilicon.c | 9 +
arch/arm/mach-hisi/platmcpm.c | 386 +++++
arch/arm/mach-imx/Kconfig | 111 +-
arch/arm/mach-imx/Makefile | 10 +-
arch/arm/mach-imx/anatop.c | 13 +
arch/arm/mach-imx/board-pcm038.h | 36 -
arch/arm/mach-imx/clk-gate-exclusive.c | 94 +
arch/arm/mach-imx/clk-imx6q.c | 99 +-
arch/arm/mach-imx/clk-imx6sl.c | 103 +-
arch/arm/mach-imx/clk-imx6sx.c | 63 +-
arch/arm/mach-imx/clk-pllv3.c | 37 -
arch/arm/mach-imx/clk-vf610.c | 21 +-
arch/arm/mach-imx/clk.h | 3 +
arch/arm/mach-imx/common.h | 2 -
arch/arm/mach-imx/cpuidle-imx6q.c | 4 -
arch/arm/mach-imx/eukrea-baseboards.h | 10 +-
arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 351 ----
arch/arm/mach-imx/imx1-dt.c | 26 +
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-armadillo5x0.c | 2 +-
arch/arm/mach-imx/mach-cpuimx27.c | 321 ----
arch/arm/mach-imx/mach-imx6sx.c | 3 +
arch/arm/mach-imx/mach-mx1ads.c | 154 --
arch/arm/mach-imx/mach-mx31_3ds.c | 4 +-
arch/arm/mach-imx/mach-mx31lite.c | 2 +-
arch/arm/mach-imx/mach-mxt_td60.c | 273 ---
arch/arm/mach-imx/mach-pcm037.c | 4 +-
arch/arm/mach-imx/mach-pcm038.c | 358 ----
arch/arm/mach-imx/mxc.h | 2 +
arch/arm/mach-imx/pcm970-baseboard.c | 231 ---
arch/arm/mach-imx/platsmp.c | 10 -
arch/arm/mach-imx/time.c | 31 +-
arch/arm/mach-integrator/impd1.c | 48 +
arch/arm/mach-lpc32xx/common.c | 29 +-
arch/arm/mach-meson/Kconfig | 13 +
arch/arm/mach-meson/Makefile | 1 +
arch/arm/mach-meson/meson.c | 27 +
arch/arm/mach-msm/board-mahimahi.c | 83 -
arch/arm/mach-msm/board-msm7x30.c | 2 +-
arch/arm/mach-msm/board-trout-gpio.c | 2 +-
arch/arm/mach-msm/board-trout.c | 2 +-
arch/arm/mach-msm/io.c | 6 +-
arch/arm/mach-omap2/Kconfig | 6 +-
arch/arm/mach-omap2/Makefile | 15 +-
arch/arm/mach-omap2/board-3430sdp.c | 1 -
arch/arm/mach-omap2/board-am3517crane.c | 1 -
arch/arm/mach-omap2/board-am3517evm.c | 1 -
arch/arm/mach-omap2/board-cm-t35.c | 2 -
arch/arm/mach-omap2/board-cm-t3517.c | 1 -
arch/arm/mach-omap2/board-devkit8000.c | 1 -
arch/arm/mach-omap2/board-generic.c | 44 +-
arch/arm/mach-omap2/board-ldp.c | 1 -
arch/arm/mach-omap2/board-n8x0.c | 26 +-
arch/arm/mach-omap2/board-omap3beagle.c | 1 -
arch/arm/mach-omap2/board-omap3logic.c | 2 -
arch/arm/mach-omap2/board-omap3pandora.c | 1 -
arch/arm/mach-omap2/board-omap3stalker.c | 1 -
arch/arm/mach-omap2/board-omap3touchbook.c | 1 -
arch/arm/mach-omap2/board-overo.c | 1 -
arch/arm/mach-omap2/board-rx51.c | 1 -
arch/arm/mach-omap2/common-board-devices.h | 5 +
arch/arm/mach-omap2/common.h | 27 +-
arch/arm/mach-omap2/display.c | 2 +-
arch/arm/mach-omap2/gpmc.c | 2 +-
arch/arm/mach-omap2/hdq1w.c | 4 +-
arch/arm/mach-omap2/i2c.c | 2 +-
arch/arm/mach-omap2/io.c | 23 +-
arch/arm/mach-omap2/irq.c | 380 ----
arch/arm/mach-omap2/msdi.c | 4 +-
arch/arm/mach-omap2/mux.c | 2 +-
arch/arm/mach-omap2/omap-mpuss-lowpower.c | 106 +-
arch/arm/mach-omap2/omap-secure.h | 1 +
arch/arm/mach-omap2/omap-wakeupgen.c | 20 +-
arch/arm/mach-omap2/omap-wakeupgen.h | 1 +
arch/arm/mach-omap2/omap4-common.c | 22 +-
arch/arm/mach-omap2/omap_hwmod.c | 30 +-
arch/arm/mach-omap2/omap_hwmod.h | 4 +
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 12 +-
arch/arm/mach-omap2/pdata-quirks.c | 27 +-
arch/arm/mach-omap2/pm.h | 1 +
arch/arm/mach-omap2/pm34xx.c | 2 +-
arch/arm/mach-omap2/pm44xx.c | 57 +-
arch/arm/mach-omap2/powerdomain.c | 79 +-
arch/arm/mach-omap2/powerdomain.h | 4 +
arch/arm/mach-omap2/powerdomains54xx_data.c | 12 +-
arch/arm/mach-omap2/powerdomains7xx_data.c | 14 +-
arch/arm/mach-omap2/prm3xxx.c | 18 +
arch/arm/mach-omap2/prm44xx.c | 90 +-
arch/arm/mach-omap2/prm_common.c | 2 +-
arch/arm/mach-omap2/prminst44xx.c | 40 +-
arch/arm/mach-omap2/prminst44xx.h | 3 +
arch/arm/mach-omap2/smartreflex-class3.c | 4 +-
arch/arm/mach-omap2/sr_device.c | 2 +-
arch/arm/mach-omap2/sram.c | 39 +-
arch/arm/mach-omap2/sram.h | 7 -
arch/arm/mach-omap2/timer.c | 6 +-
arch/arm/mach-omap2/vc.c | 2 +-
arch/arm/mach-omap2/voltage.c | 22 +-
arch/arm/mach-omap2/wd_timer.c | 4 +-
arch/arm/mach-orion5x/dns323-setup.c | 8 +-
arch/arm/mach-orion5x/terastation_pro2-setup.c | 2 +-
arch/arm/mach-orion5x/ts209-setup.c | 2 +-
arch/arm/mach-orion5x/ts409-setup.c | 2 +-
arch/arm/mach-orion5x/ts78xx-setup.c | 4 +-
arch/arm/mach-pxa/devices.c | 42 +-
arch/arm/mach-pxa/devices.h | 3 +
arch/arm/mach-pxa/pxa3xx.c | 14 +-
arch/arm/mach-qcom/board.c | 2 +
arch/arm/mach-rockchip/Kconfig | 1 +
arch/arm/mach-s3c24xx/Kconfig | 2 -
arch/arm/mach-s3c24xx/common.c | 4 -
arch/arm/mach-s3c24xx/common.h | 5 -
.../mach-s3c24xx/include/mach/regs-s3c2443-clock.h | 2 -
arch/arm/mach-s3c24xx/mach-amlm5900.c | 1 -
arch/arm/mach-s3c24xx/mach-anubis.c | 1 -
arch/arm/mach-s3c24xx/mach-at2440evb.c | 1 -
arch/arm/mach-s3c24xx/mach-bast.c | 1 -
arch/arm/mach-s3c24xx/mach-gta02.c | 1 -
arch/arm/mach-s3c24xx/mach-h1940.c | 1 -
arch/arm/mach-s3c24xx/mach-jive.c | 1 -
arch/arm/mach-s3c24xx/mach-mini2440.c | 1 -
arch/arm/mach-s3c24xx/mach-n30.c | 2 -
arch/arm/mach-s3c24xx/mach-nexcoder.c | 1 -
arch/arm/mach-s3c24xx/mach-osiris.c | 1 -
arch/arm/mach-s3c24xx/mach-otom.c | 1 -
arch/arm/mach-s3c24xx/mach-qt2410.c | 1 -
arch/arm/mach-s3c24xx/mach-rx1950.c | 1 -
arch/arm/mach-s3c24xx/mach-rx3715.c | 1 -
arch/arm/mach-s3c24xx/mach-s3c2416-dt.c | 1 -
arch/arm/mach-s3c24xx/mach-smdk2410.c | 1 -
arch/arm/mach-s3c24xx/mach-smdk2413.c | 3 -
arch/arm/mach-s3c24xx/mach-smdk2416.c | 1 -
arch/arm/mach-s3c24xx/mach-smdk2440.c | 1 -
arch/arm/mach-s3c24xx/mach-smdk2443.c | 1 -
arch/arm/mach-s3c24xx/mach-tct_hammer.c | 1 -
arch/arm/mach-s3c24xx/mach-vr1000.c | 1 -
arch/arm/mach-s3c24xx/mach-vstms.c | 1 -
arch/arm/mach-s3c24xx/s3c2410.c | 13 -
arch/arm/mach-s3c24xx/s3c2412.c | 23 -
arch/arm/mach-s3c24xx/s3c2416.c | 8 -
arch/arm/mach-s3c24xx/s3c2443.c | 8 -
arch/arm/mach-s3c24xx/s3c244x.c | 12 -
arch/arm/mach-s5pv210/pm.c | 3 +-
.../mach-s5pv210/{include/mach => }/regs-clock.h | 3 +-
arch/arm/mach-s5pv210/s5pv210.c | 2 +-
arch/arm/mach-shmobile/Kconfig | 118 +-
arch/arm/mach-shmobile/Makefile | 37 +-
arch/arm/mach-shmobile/Makefile.boot | 2 -
arch/arm/mach-shmobile/board-ape6evm-reference.c | 4 +-
arch/arm/mach-shmobile/board-ape6evm.c | 3 +-
.../board-armadillo800eva-reference.c | 198 ---
arch/arm/mach-shmobile/board-armadillo800eva.c | 8 +-
arch/arm/mach-shmobile/board-bockw-reference.c | 3 +-
arch/arm/mach-shmobile/board-bockw.c | 2 +-
arch/arm/mach-shmobile/board-genmai-reference.c | 55 -
arch/arm/mach-shmobile/board-genmai.c | 161 --
arch/arm/mach-shmobile/board-koelsch-reference.c | 2 -
arch/arm/mach-shmobile/board-kzm9g-reference.c | 4 +-
arch/arm/mach-shmobile/board-kzm9g.c | 2 +-
arch/arm/mach-shmobile/board-lager-reference.c | 2 -
arch/arm/mach-shmobile/board-mackerel.c | 3 +-
arch/arm/mach-shmobile/board-marzen-reference.c | 12 +-
arch/arm/mach-shmobile/clock-r7s72100.c | 231 ---
arch/arm/mach-shmobile/common.h | 2 -
arch/arm/mach-shmobile/dma-register.h | 4 +-
arch/arm/mach-shmobile/intc.h | 5 +
arch/arm/mach-shmobile/irqs.h | 8 +-
arch/arm/mach-shmobile/pm-r8a7740.c | 17 +-
arch/arm/mach-shmobile/pm-rcar.c | 4 -
arch/arm/mach-shmobile/pm-rmobile.c | 2 -
arch/arm/mach-shmobile/pm-rmobile.h | 4 +-
arch/arm/mach-shmobile/r7s72100.h | 7 -
arch/arm/mach-shmobile/r8a73a4.h | 1 -
arch/arm/mach-shmobile/r8a7740.h | 5 +-
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 | 24 +-
arch/arm/mach-shmobile/setup-r8a73a4.c | 10 +-
arch/arm/mach-shmobile/setup-r8a7740.c | 60 +-
arch/arm/mach-shmobile/setup-r8a7778.c | 5 +-
arch/arm/mach-shmobile/setup-r8a7779.c | 20 +-
arch/arm/mach-shmobile/setup-r8a7790.c | 7 +-
arch/arm/mach-shmobile/setup-r8a7791.c | 7 +-
arch/arm/mach-shmobile/setup-r8a7794.c | 33 +
arch/arm/mach-shmobile/setup-sh7372.c | 6 +-
arch/arm/mach-shmobile/setup-sh73a0.c | 21 +-
arch/arm/mach-shmobile/timer.c | 30 +-
arch/arm/mach-spear/Kconfig | 9 +-
arch/arm/mach-sunxi/sunxi.c | 76 -
arch/arm/mach-tegra/flowctrl.c | 44 +-
arch/arm/mach-tegra/flowctrl.h | 2 +
arch/arm/mach-tegra/tegra.c | 2 +
arch/arm/mach-vt8500/vt8500.c | 2 +-
arch/arm/mach-zynq/Makefile | 3 +-
arch/arm/mach-zynq/common.c | 11 +-
arch/arm/mach-zynq/common.h | 16 +-
arch/arm/mach-zynq/hotplug.c | 47 +-
arch/arm/mach-zynq/platsmp.c | 41 +-
arch/arm/mach-zynq/pm.c | 83 +
arch/arm/mach-zynq/slcr.c | 43 +-
arch/arm/plat-omap/dma.c | 737 +-------
arch/arm/plat-pxa/ssp.c | 1 +
arch/arm64/Kconfig | 5 +
arch/arm64/boot/dts/Makefile | 1 +
arch/arm64/boot/dts/thunder-88xx.dts | 67 +
arch/arm64/boot/dts/thunder-88xx.dtsi | 401 +++++
arch/arm64/configs/defconfig | 1 +
drivers/Kconfig | 2 +
drivers/ata/Kconfig | 2 +-
drivers/bus/arm-ccn.c | 5 +-
drivers/clk/at91/Makefile | 1 +
drivers/clk/at91/clk-h32mx.c | 123 ++
drivers/clk/at91/clk-system.c | 8 +-
drivers/clk/at91/pmc.c | 6 +
drivers/clk/at91/pmc.h | 5 +
drivers/clk/shmobile/Makefile | 1 +
drivers/clocksource/Kconfig | 4 +
drivers/clocksource/Makefile | 1 +
drivers/clocksource/tcb_clksrc.c | 15 +-
drivers/clocksource/timer-atmel-pit.c | 296 ++++
drivers/cpufreq/Kconfig.arm | 4 +-
drivers/cpuidle/Kconfig.arm | 2 +-
drivers/cpuidle/cpuidle-zynq.c | 10 +-
drivers/edac/Kconfig | 9 +
drivers/edac/Makefile | 2 +
drivers/edac/altera_edac.c | 410 +++++
drivers/irqchip/Kconfig | 5 +
drivers/irqchip/Makefile | 1 +
drivers/irqchip/irq-omap-intc.c | 403 +++++
drivers/leds/Kconfig | 14 +-
drivers/leds/Makefile | 1 +
drivers/leds/leds-syscon.c | 166 ++
drivers/mailbox/omap-mailbox.c | 156 +-
drivers/memory/Kconfig | 10 +
drivers/memory/Makefile | 1 +
drivers/memory/atmel-sdramc.c | 98 ++
drivers/mfd/da9055-core.c | 26 +-
drivers/misc/atmel_tclib.c | 101 +-
drivers/power/reset/Kconfig | 42 +-
drivers/power/reset/Makefile | 3 +
drivers/power/reset/arm-versatile-reboot.c | 111 ++
drivers/power/reset/at91-poweroff.c | 156 ++
drivers/power/reset/at91-reset.c | 252 +++
drivers/pwm/pwm-atmel-tcb.c | 2 +-
drivers/rtc/Kconfig | 11 +-
drivers/rtc/Makefile | 1 +
drivers/rtc/rtc-sun6i.c | 447 +++++
drivers/soc/Kconfig | 2 +
drivers/soc/Makefile | 2 +
drivers/soc/ti/Kconfig | 31 +
drivers/soc/ti/Makefile | 5 +
drivers/soc/ti/knav_dma.c | 815 +++++++++
drivers/soc/ti/knav_qmss.h | 386 +++++
drivers/soc/ti/knav_qmss_acc.c | 591 +++++++
drivers/soc/ti/knav_qmss_queue.c | 1816 ++++++++++++++++++++
drivers/soc/versatile/Kconfig | 10 +
drivers/soc/versatile/Makefile | 1 +
drivers/soc/versatile/soc-realview.c | 144 ++
drivers/thermal/Kconfig | 2 +-
drivers/watchdog/Kconfig | 2 +-
include/dt-bindings/clock/imx6qdl-clock.h | 35 +-
include/dt-bindings/clock/imx6sl-clock.h | 30 +-
include/dt-bindings/clock/imx6sx-clock.h | 25 +-
include/dt-bindings/clock/r8a7740-clock.h | 77 +
include/dt-bindings/clock/r8a7790-clock.h | 1 +
include/dt-bindings/clock/r8a7791-clock.h | 1 +
include/dt-bindings/clock/r8a7794-clock.h | 80 +
include/dt-bindings/clock/vf610-clock.h | 5 +-
include/linux/atmel_tc.h | 13 +-
include/linux/clk/at91_pmc.h | 1 +
include/linux/irqchip/irq-omap-intc.h | 32 +
include/linux/omap-dma.h | 37 -
include/linux/platform_data/tegra_emc.h | 34 -
include/linux/soc/ti/knav_dma.h | 175 ++
include/linux/soc/ti/knav_qmss.h | 90 +
625 files changed, 26022 insertions(+), 9035 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/altera/socfpga-sdram-edac.txt
create mode 100644 Documentation/devicetree/bindings/arm/amlogic.txt
create mode 100644 Documentation/devicetree/bindings/arm/bcm/bcm63138.txt
create mode 100644 Documentation/devicetree/bindings/arm/cavium-thunder.txt
create mode 100644 Documentation/devicetree/bindings/arm/geniatech.txt
create mode 100644 Documentation/devicetree/bindings/arm/shmobile.txt
create mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-flowctrl.txt
create mode 100644 Documentation/devicetree/bindings/leds/register-bit-led.txt
create mode 100644 Documentation/devicetree/bindings/mailbox/omap-mailbox.txt
create mode 100644 Documentation/devicetree/bindings/memory-controllers/synopsys.txt
create mode 100644 Documentation/devicetree/bindings/rtc/sun6i-rtc.txt
create mode 100644 Documentation/devicetree/bindings/soc/ti/keystone-navigator-dma.txt
create mode 100644 Documentation/devicetree/bindings/soc/ti/keystone-navigator-qmss.txt
create mode 100644 arch/arm/arm-soc-for-next-contents.txt
create mode 100644 arch/arm/boot/dts/at91-sama5d4ek.dts
create mode 100644 arch/arm/boot/dts/bcm63138.dtsi
create mode 100644 arch/arm/boot/dts/bcm963138dvt.dts
create mode 100644 arch/arm/boot/dts/cros-adc-thermistors.dtsi
delete mode 100644 arch/arm/boot/dts/exynos5250-cros-common.dtsi
create mode 100644 arch/arm/boot/dts/hip04-d01.dts
create mode 100644 arch/arm/boot/dts/hip04.dtsi
create mode 100644 arch/arm/boot/dts/imx1-ads.dts
create mode 100644 arch/arm/boot/dts/imx1-apf9328.dts
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/imx6dl-gw552x.dts
create mode 100644 arch/arm/boot/dts/imx6q-gw552x.dts
create mode 100644 arch/arm/boot/dts/imx6q-hummingboard.dts
create mode 100644 arch/arm/boot/dts/imx6qdl-gw552x.dtsi
create mode 100644 arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
create mode 100644 arch/arm/boot/dts/kirkwood-rd88f6281-a.dts
delete mode 100644 arch/arm/boot/dts/kirkwood-rd88f6281-a0.dts
rename arch/arm/boot/dts/{kirkwood-rd88f6281-a1.dts => kirkwood-rd88f6281-z0.dts} (57%)
create mode 100644 arch/arm/boot/dts/meson.dtsi
create mode 100644 arch/arm/boot/dts/meson6-atv1200.dts
create mode 100644 arch/arm/boot/dts/meson6.dtsi
rename arch/arm/boot/dts/{omap3-gta04.dts => omap3-gta04.dtsi} (67%)
create mode 100644 arch/arm/boot/dts/omap3-gta04a3.dts
create mode 100644 arch/arm/boot/dts/omap3-gta04a4.dts
create mode 100644 arch/arm/boot/dts/omap3-gta04a5.dts
create mode 100644 arch/arm/boot/dts/omap3-ha-common.dtsi
create mode 100644 arch/arm/boot/dts/omap3-ha-lcd.dts
create mode 100644 arch/arm/boot/dts/omap3-ha.dts
create mode 100644 arch/arm/boot/dts/omap3-tao3530.dtsi
create mode 100644 arch/arm/boot/dts/omap3-thunder.dts
create mode 100644 arch/arm/boot/dts/qcom-apq8084-ifc6540.dts
create mode 100644 arch/arm/boot/dts/qcom-ipq8064-ap148.dts
create mode 100644 arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi
create mode 100644 arch/arm/boot/dts/qcom-ipq8064.dtsi
delete mode 100644 arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
create mode 100644 arch/arm/boot/dts/r8a7794-alt.dts
create mode 100644 arch/arm/boot/dts/r8a7794.dtsi
create mode 100644 arch/arm/boot/dts/sama5d4.dtsi
create mode 100644 arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
create mode 100644 arch/arm/boot/dts/sun7i-a20-hummingbird.dts
create mode 100644 arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
create mode 100644 arch/arm/boot/dts/tegra124-nyan-big.dts
create mode 100644 arch/arm/boot/dts/vf610-colibri-eval-v3.dts
rename arch/arm/boot/dts/{vf610-colibri.dts => vf610-colibri.dtsi} (92%)
rename arch/arm/configs/{hi3xxx_defconfig => hisi_defconfig} (77%)
create mode 100644 arch/arm/include/debug/bcm63xx.S
create mode 100644 arch/arm/include/debug/meson.S
delete mode 100644 arch/arm/mach-at91/at91_rstc.h
delete mode 100644 arch/arm/mach-at91/at91_shdwc.h
delete mode 100644 arch/arm/mach-at91/at91sam926x_time.c
delete mode 100644 arch/arm/mach-at91/at91sam9_alt_reset.S
delete mode 100644 arch/arm/mach-at91/at91sam9g45_reset.S
delete mode 100644 arch/arm/mach-at91/board-foxg20.c
delete mode 100644 arch/arm/mach-at91/board-rsi-ews.c
create mode 100644 arch/arm/mach-at91/include/mach/sama5d4.h
create mode 100644 arch/arm/mach-at91/sama5d4.c
create mode 100644 arch/arm/mach-bcm/bcm63xx.c
delete mode 100644 arch/arm/mach-exynos/include/mach/memory.h
create mode 100644 arch/arm/mach-hisi/platmcpm.c
delete mode 100644 arch/arm/mach-imx/board-pcm038.h
create mode 100644 arch/arm/mach-imx/clk-gate-exclusive.c
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
delete mode 100644 arch/arm/mach-imx/mach-mx1ads.c
delete mode 100644 arch/arm/mach-imx/mach-mxt_td60.c
delete mode 100644 arch/arm/mach-imx/mach-pcm038.c
delete mode 100644 arch/arm/mach-imx/pcm970-baseboard.c
create mode 100644 arch/arm/mach-meson/Kconfig
create mode 100644 arch/arm/mach-meson/Makefile
create mode 100644 arch/arm/mach-meson/meson.c
delete mode 100644 arch/arm/mach-msm/board-mahimahi.c
delete mode 100644 arch/arm/mach-omap2/irq.c
rename arch/arm/mach-s5pv210/{include/mach => }/regs-clock.h (99%)
delete mode 100644 arch/arm/mach-shmobile/board-armadillo800eva-reference.c
delete mode 100644 arch/arm/mach-shmobile/board-genmai-reference.c
delete mode 100644 arch/arm/mach-shmobile/board-genmai.c
delete mode 100644 arch/arm/mach-shmobile/clock-r7s72100.c
delete mode 100644 arch/arm/mach-shmobile/r7s72100.h
create mode 100644 arch/arm/mach-shmobile/setup-r8a7794.c
create mode 100644 arch/arm/mach-zynq/pm.c
create mode 100644 arch/arm64/boot/dts/thunder-88xx.dts
create mode 100644 arch/arm64/boot/dts/thunder-88xx.dtsi
create mode 100644 drivers/clk/at91/clk-h32mx.c
create mode 100644 drivers/clocksource/timer-atmel-pit.c
create mode 100644 drivers/edac/altera_edac.c
create mode 100644 drivers/irqchip/irq-omap-intc.c
create mode 100644 drivers/leds/leds-syscon.c
create mode 100644 drivers/memory/atmel-sdramc.c
create mode 100644 drivers/power/reset/arm-versatile-reboot.c
create mode 100644 drivers/power/reset/at91-poweroff.c
create mode 100644 drivers/power/reset/at91-reset.c
create mode 100644 drivers/rtc/rtc-sun6i.c
create mode 100644 drivers/soc/ti/Kconfig
create mode 100644 drivers/soc/ti/Makefile
create mode 100644 drivers/soc/ti/knav_dma.c
create mode 100644 drivers/soc/ti/knav_qmss.h
create mode 100644 drivers/soc/ti/knav_qmss_acc.c
create mode 100644 drivers/soc/ti/knav_qmss_queue.c
create mode 100644 drivers/soc/versatile/Kconfig
create mode 100644 drivers/soc/versatile/Makefile
create mode 100644 drivers/soc/versatile/soc-realview.c
create mode 100644 include/dt-bindings/clock/r8a7740-clock.h
create mode 100644 include/dt-bindings/clock/r8a7794-clock.h
create mode 100644 include/linux/irqchip/irq-omap-intc.h
delete mode 100644 include/linux/platform_data/tegra_emc.h
create mode 100644 include/linux/soc/ti/knav_dma.h
create mode 100644 include/linux/soc/ti/knav_qmss.h
Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6)
$ git merge bcm2835/for-next
Already up-to-date.
Merging berlin/berlin/for-next (8d4f3361e05c Merge branch 'berlin/dt' into berlin/for-next)
$ git merge berlin/berlin/for-next
Merge made by the 'recursive' strategy.
.../devicetree/bindings/arm/marvell,berlin.txt | 10 ++
arch/arm/boot/dts/berlin2.dtsi | 1 +
arch/arm/boot/dts/berlin2cd.dtsi | 1 +
arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 8 ++
arch/arm/boot/dts/berlin2q.dtsi | 41 ++++++-
arch/arm/mach-berlin/Kconfig | 2 +
drivers/reset/Makefile | 1 +
drivers/reset/reset-berlin.c | 131 +++++++++++++++++++++
8 files changed, 194 insertions(+), 1 deletion(-)
create mode 100644 drivers/reset/reset-berlin.c
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 (2b2244a3e7c3 ARM: dts: imx6: make gpt per clock can be from OSC)
$ git merge imx-mxs/for-next
Already up-to-date.
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 (65a3bb88bb33 Merge branch 'mvebu/dt' into mvebu/for-next)
$ git merge mvebu/for-next
Merge made by the 'recursive' strategy.
drivers/clk/mvebu/armada-370.c | 8 +++++
drivers/clk/mvebu/armada-375.c | 4 +--
drivers/clk/mvebu/common.c | 82 ++++++++++++++++++++++++++++++++++++++++++
drivers/clk/mvebu/common.h | 7 ++++
4 files changed, 99 insertions(+), 2 deletions(-)
Merging renesas/next (cc38f02b87ef Merge branches 'heads/dt-for-v3.18' and 'heads/soc-for-v3.18' into next)
$ git merge renesas/next
Merge made by the 'recursive' strategy.
arch/arm/boot/dts/r8a7740.dtsi | 14 ++++++++++----
arch/arm/mach-shmobile/clock-r8a7740.c | 7 ++++++-
include/dt-bindings/clock/r8a7740-clock.h | 1 +
3 files changed, 17 insertions(+), 5 deletions(-)
Merging samsung/for-next (a84aaa7556a5 ARM: cacheflush: Fix v7_exit_coherency_flush exynos build breakage on ARMv6)
$ git merge samsung/for-next
Resolved 'Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt' using previous resolution.
Auto-merging drivers/clk/mvebu/common.h
Auto-merging drivers/clk/mvebu/common.c
Removing arch/arm/mach-exynos/hotplug.c
Auto-merging arch/arm/boot/dts/Makefile
Auto-merging Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master edee221b695a] Merge remote-tracking branch 'samsung/for-next'
$ git diff -M --stat --summary HEAD^..
Documentation/arm/firmware.txt | 28 +-
.../devicetree/bindings/clock/maxim,max77686.txt | 16 +-
.../devicetree/bindings/clock/maxim,max77802.txt | 44 +
.../bindings/clock/renesas,cpg-mstp-clocks.txt | 1 +
.../clock/renesas,rcar-gen2-cpg-clocks.txt | 1 +
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/exynos3250.dtsi | 10 +
arch/arm/boot/dts/exynos4210.dtsi | 17 +
arch/arm/boot/dts/exynos4212.dtsi | 17 +
arch/arm/boot/dts/exynos4412-trats2.dts | 352 +++++++-
arch/arm/boot/dts/exynos4412.dtsi | 29 +
arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 18 +-
arch/arm/boot/dts/exynos5250-arndale.dts | 907 ++++++++++-----------
arch/arm/boot/dts/exynos5250-smdk5250.dts | 618 +++++++-------
arch/arm/boot/dts/exynos5250-snow.dts | 266 +++---
arch/arm/boot/dts/exynos5250-spring.dts | 536 ++++++++++++
arch/arm/boot/dts/exynos5250.dtsi | 16 +-
arch/arm/boot/dts/exynos5420-arndale-octa.dts | 4 +
arch/arm/boot/dts/exynos5420-peach-pit.dts | 15 +-
arch/arm/boot/dts/exynos5420.dtsi | 4 +-
arch/arm/boot/dts/exynos5800-peach-pi.dts | 15 +-
arch/arm/boot/dts/s3c6410-mini6410.dts | 4 -
arch/arm/boot/dts/s3c64xx.dtsi | 1 -
arch/arm/configs/exynos_defconfig | 24 +-
arch/arm/include/asm/firmware.h | 10 +-
arch/arm/mach-exynos/Kconfig | 5 +
arch/arm/mach-exynos/Makefile | 9 +-
arch/arm/mach-exynos/common.h | 15 +-
arch/arm/mach-exynos/exynos.c | 7 +-
arch/arm/mach-exynos/firmware.c | 65 +-
arch/arm/mach-exynos/hotplug.c | 91 ---
arch/arm/mach-exynos/platsmp.c | 136 +++
arch/arm/mach-exynos/pm.c | 310 +------
arch/arm/mach-exynos/pmu.c | 1 +
arch/arm/mach-exynos/regs-pmu.h | 6 +
arch/arm/mach-exynos/sleep.S | 28 +
arch/arm/mach-exynos/smc.h | 4 +
arch/arm/mach-exynos/suspend.c | 356 ++++++++
arch/arm/mach-tegra/cpuidle-tegra114.c | 2 +-
arch/arm/mm/proc-macros.S | 2 +-
arch/arm/plat-samsung/Kconfig | 5 +-
arch/arm/plat-samsung/Makefile | 1 +
arch/arm/plat-samsung/pm-debug.c | 1 +
drivers/clk/Kconfig | 11 +
drivers/clk/Makefile | 2 +
drivers/clk/at91/clk-pll.c | 160 ++--
drivers/clk/at91/clk-usb.c | 20 +-
drivers/clk/clk-fractional-divider.c | 2 +-
drivers/clk/clk-max-gen.c | 192 +++++
drivers/clk/clk-max-gen.h | 32 +
drivers/clk/clk-max77686.c | 183 +----
drivers/clk/clk-max77802.c | 98 +++
drivers/clk/clk.c | 73 +-
drivers/clk/mvebu/common.c | 9 +-
drivers/clk/mvebu/common.h | 2 +
drivers/clk/mvebu/kirkwood.c | 102 ++-
drivers/clk/rockchip/clk-rk3188.c | 8 +
drivers/clk/rockchip/clk-rk3288.c | 8 +
drivers/clk/rockchip/clk.c | 73 +-
drivers/clk/rockchip/clk.h | 1 +
drivers/clk/shmobile/clk-rcar-gen2.c | 1 +
drivers/clk/zynq/clkc.c | 30 +-
drivers/clk/zynq/pll.c | 4 +-
drivers/cpufreq/kirkwood-cpufreq.c | 14 +-
include/dt-bindings/clock/maxim,max77686.h | 23 +
include/dt-bindings/clock/maxim,max77802.h | 22 +
include/linux/clk-private.h | 1 +
67 files changed, 3394 insertions(+), 1675 deletions(-)
create mode 100644 Documentation/devicetree/bindings/clock/maxim,max77802.txt
create mode 100644 arch/arm/boot/dts/exynos5250-spring.dts
delete mode 100644 arch/arm/mach-exynos/hotplug.c
create mode 100644 arch/arm/mach-exynos/suspend.c
create mode 100644 drivers/clk/clk-max-gen.c
create mode 100644 drivers/clk/clk-max-gen.h
create mode 100644 drivers/clk/clk-max77802.c
create mode 100644 include/dt-bindings/clock/maxim,max77686.h
create mode 100644 include/dt-bindings/clock/maxim,max77802.h
Merging sunxi/sunxi/for-next (429823087fec Merge branches 'sunxi/dt-for-3.18' and 'sunxi/drivers-for-3.18' into sunxi/for-next)
$ git merge sunxi/sunxi/for-next
Merge made by the 'recursive' strategy.
drivers/clk/sunxi/clk-sunxi.c | 9 +++++++++
1 file changed, 9 insertions(+)
Merging tegra/for-next (5599b9197647 Merge branch for-3.18/defconfig into for-next)
$ git merge tegra/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging arm64/for-next/core (7acf71d1a224 arm64: Fix typos in KGDB macros)
$ git merge arm64/for-next/core
Resolved 'Documentation/networking/filter.txt' using previous resolution.
Auto-merging arch/arm64/mm/init.c
Auto-merging arch/arm64/kernel/process.c
Auto-merging arch/arm64/Kconfig
Auto-merging Documentation/networking/filter.txt
CONFLICT (content): Merge conflict in Documentation/networking/filter.txt
Auto-merging Documentation/devicetree/bindings/arm/cpus.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master b3d8b076f41a] Merge remote-tracking branch 'arm64/for-next/core'
$ git diff -M --stat --summary HEAD^..
Documentation/devicetree/bindings/arm/cpus.txt | 8 +
.../devicetree/bindings/arm/idle-states.txt | 679 +++++++++++++++++++++
Documentation/devicetree/bindings/arm/psci.txt | 14 +-
Documentation/networking/filter.txt | 6 +-
arch/arm64/Kconfig | 7 +-
arch/arm64/Kconfig.debug | 11 +
arch/arm64/Makefile | 1 +
arch/arm64/include/asm/cacheflush.h | 4 +
arch/arm64/include/asm/cachetype.h | 20 +
arch/arm64/include/asm/cpu_ops.h | 3 +
arch/arm64/include/asm/cpuidle.h | 13 +
arch/arm64/include/asm/debug-monitors.h | 30 +-
arch/arm64/include/asm/dma-mapping.h | 7 +
arch/arm64/include/asm/insn.h | 249 ++++++++
arch/arm64/include/asm/kgdb.h | 2 +-
arch/arm64/include/asm/percpu.h | 4 +-
arch/arm64/include/asm/pgtable.h | 33 +-
arch/arm64/include/asm/proc-fns.h | 2 +
arch/arm64/include/asm/suspend.h | 1 +
arch/arm64/include/asm/thread_info.h | 9 +-
arch/arm64/kernel/Makefile | 1 +
arch/arm64/kernel/cpuidle.c | 31 +
arch/arm64/kernel/cpuinfo.c | 28 +-
arch/arm64/kernel/efi-stub.c | 16 +-
arch/arm64/kernel/entry.S | 1 -
arch/arm64/kernel/ftrace.c | 10 +-
arch/arm64/kernel/head.S | 6 +-
arch/arm64/kernel/insn.c | 671 +++++++++++++++++++-
arch/arm64/kernel/kgdb.c | 4 +-
arch/arm64/kernel/process.c | 30 +-
arch/arm64/kernel/psci.c | 104 ++++
arch/arm64/kernel/return_address.c | 3 +-
arch/arm64/kernel/setup.c | 11 +-
arch/arm64/kernel/sleep.S | 47 +-
arch/arm64/kernel/smp_spin_table.c | 22 +-
arch/arm64/kernel/stacktrace.c | 3 +-
arch/arm64/kernel/suspend.c | 48 +-
arch/arm64/kernel/traps.c | 3 +-
arch/arm64/mm/Makefile | 2 +-
arch/arm64/mm/dma-mapping.c | 31 -
arch/arm64/mm/init.c | 2 +-
arch/arm64/mm/mmu.c | 2 +-
arch/arm64/mm/pageattr.c | 97 +++
arch/arm64/mm/proc.S | 15 +
arch/arm64/net/Makefile | 4 +
arch/arm64/net/bpf_jit.h | 169 +++++
arch/arm64/net/bpf_jit_comp.c | 679 +++++++++++++++++++++
drivers/of/platform.c | 7 +-
48 files changed, 2970 insertions(+), 180 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/idle-states.txt
create mode 100644 arch/arm64/include/asm/cpuidle.h
create mode 100644 arch/arm64/kernel/cpuidle.c
create mode 100644 arch/arm64/mm/pageattr.c
create mode 100644 arch/arm64/net/Makefile
create mode 100644 arch/arm64/net/bpf_jit.h
create mode 100644 arch/arm64/net/bpf_jit_comp.c
Merging blackfin/for-linus (275f5a8573e7 blackfin: defconfigs: cleanup unused CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP)
$ git merge blackfin/for-linus
Merge made by the 'recursive' strategy.
arch/blackfin/configs/BF518F-EZBRD_defconfig | 1 -
arch/blackfin/configs/BF527-TLL6527M_defconfig | 1 -
arch/blackfin/configs/BF533-EZKIT_defconfig | 1 -
arch/blackfin/configs/BF533-STAMP_defconfig | 1 -
arch/blackfin/configs/BF537-STAMP_defconfig | 3 ++-
arch/blackfin/configs/BF538-EZKIT_defconfig | 1 -
arch/blackfin/configs/BF561-ACVILON_defconfig | 1 -
arch/blackfin/configs/BF561-EZKIT-SMP_defconfig | 1 -
arch/blackfin/configs/BF561-EZKIT_defconfig | 1 -
arch/blackfin/configs/CM-BF527_defconfig | 1 -
arch/blackfin/configs/CM-BF533_defconfig | 1 -
arch/blackfin/configs/CM-BF537E_defconfig | 1 -
arch/blackfin/configs/CM-BF537U_defconfig | 1 -
arch/blackfin/configs/CM-BF548_defconfig | 1 -
arch/blackfin/configs/CM-BF561_defconfig | 1 -
arch/blackfin/configs/DNP5370_defconfig | 1 -
arch/blackfin/configs/IP0X_defconfig | 1 -
arch/blackfin/configs/PNAV-10_defconfig | 1 -
arch/blackfin/configs/SRV1_defconfig | 1 -
arch/blackfin/configs/TCM-BF518_defconfig | 1 -
arch/blackfin/configs/TCM-BF537_defconfig | 1 -
arch/blackfin/kernel/kgdb.c | 12 ++++--------
arch/blackfin/mach-bf609/boards/ezkit.c | 8 ++++----
23 files changed, 10 insertions(+), 33 deletions(-)
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 (0f33be009b89 Linux 3.17-rc6)
$ git merge ia64/next
Already up-to-date.
Merging m68k/for-next (fd4d453b64d4 m68k: AMIGA_BUILTIN_SERIAL should depend on TTY)
$ git merge m68k/for-next
Merge made by the 'recursive' strategy.
arch/m68k/Kconfig.devices | 2 +-
arch/m68k/atari/stram.c | 1 +
arch/m68k/include/asm/io_mm.h | 9 ++++++++-
3 files changed, 10 insertions(+), 2 deletions(-)
Merging m68knommu/for-next (e803d4bd3118 m68k: Fix typo 'COFNIG_MBAR')
$ git merge m68knommu/for-next
Removing arch/m68k/platform/Makefile
Auto-merging arch/m68k/coldfire/vectors.c
Auto-merging arch/m68k/coldfire/m54xx.c
Auto-merging arch/m68k/coldfire/m5407.c
Auto-merging arch/m68k/coldfire/m5307.c
Auto-merging arch/m68k/coldfire/m528x.c
Auto-merging arch/m68k/coldfire/m527x.c
Auto-merging arch/m68k/coldfire/m5272.c
Auto-merging arch/m68k/coldfire/m525x.c
Auto-merging arch/m68k/coldfire/m5249.c
Auto-merging arch/m68k/coldfire/m523x.c
Auto-merging arch/m68k/coldfire/m520x.c
Auto-merging arch/m68k/coldfire/m5206.c
Auto-merging arch/m68k/coldfire/intc-5272.c
Auto-merging arch/m68k/coldfire/entry.S
Auto-merging arch/m68k/68360/ints.c
Auto-merging arch/m68k/68360/head-rom.S
Auto-merging arch/m68k/68360/head-ram.S
Auto-merging arch/m68k/68360/entry.S
Auto-merging arch/m68k/68360/config.c
Auto-merging arch/m68k/68360/Makefile
Auto-merging arch/m68k/68000/entry.S
Merge made by the 'recursive' strategy.
arch/m68k/{platform => }/68000/Makefile | 0
arch/m68k/{platform => }/68000/bootlogo-vz.h | 0
arch/m68k/{platform => }/68000/bootlogo.h | 0
arch/m68k/{platform => }/68000/entry.S | 2 +-
arch/m68k/{platform => }/68000/head.S | 0
arch/m68k/{platform => }/68000/ints.c | 0
arch/m68k/{platform => }/68000/m68328.c | 0
arch/m68k/{platform => }/68000/m68EZ328.c | 0
arch/m68k/{platform => }/68000/m68VZ328.c | 0
arch/m68k/{platform => }/68000/romvec.S | 0
arch/m68k/{platform => }/68000/timers.c | 0
arch/m68k/{platform => }/68360/Makefile | 2 +-
arch/m68k/{platform => }/68360/commproc.c | 0
arch/m68k/{platform => }/68360/config.c | 2 +-
arch/m68k/{platform => }/68360/entry.S | 2 +-
arch/m68k/{platform => }/68360/head-ram.S | 5 ++---
arch/m68k/{platform => }/68360/head-rom.S | 5 ++---
arch/m68k/{platform => }/68360/ints.c | 2 +-
arch/m68k/Makefile | 12 ++++++------
arch/m68k/{platform => }/coldfire/Makefile | 0
arch/m68k/{platform => }/coldfire/cache.c | 0
arch/m68k/{platform => }/coldfire/clk.c | 0
arch/m68k/{platform => }/coldfire/device.c | 0
arch/m68k/{platform => }/coldfire/dma.c | 0
arch/m68k/{platform => }/coldfire/dma_timer.c | 0
arch/m68k/{platform => }/coldfire/entry.S | 2 +-
arch/m68k/{platform => }/coldfire/firebee.c | 0
arch/m68k/{platform => }/coldfire/gpio.c | 0
arch/m68k/{platform => }/coldfire/head.S | 0
arch/m68k/{platform => }/coldfire/intc-2.c | 0
arch/m68k/{platform => }/coldfire/intc-5249.c | 0
arch/m68k/{platform => }/coldfire/intc-525x.c | 0
arch/m68k/{platform => }/coldfire/intc-5272.c | 2 +-
arch/m68k/{platform => }/coldfire/intc-simr.c | 0
arch/m68k/{platform => }/coldfire/intc.c | 0
arch/m68k/{platform => }/coldfire/m5206.c | 2 +-
arch/m68k/{platform => }/coldfire/m520x.c | 2 +-
arch/m68k/{platform => }/coldfire/m523x.c | 2 +-
arch/m68k/{platform => }/coldfire/m5249.c | 2 +-
arch/m68k/{platform => }/coldfire/m525x.c | 2 +-
arch/m68k/{platform => }/coldfire/m5272.c | 2 +-
arch/m68k/{platform => }/coldfire/m527x.c | 4 ++--
arch/m68k/{platform => }/coldfire/m528x.c | 2 +-
arch/m68k/{platform => }/coldfire/m5307.c | 2 +-
arch/m68k/{platform => }/coldfire/m53xx.c | 0
arch/m68k/{platform => }/coldfire/m5407.c | 2 +-
arch/m68k/{platform => }/coldfire/m5441x.c | 0
arch/m68k/{platform => }/coldfire/m54xx.c | 3 +--
arch/m68k/{platform => }/coldfire/mcf8390.c | 0
arch/m68k/{platform => }/coldfire/nettel.c | 0
arch/m68k/{platform => }/coldfire/pci.c | 0
arch/m68k/{platform => }/coldfire/pit.c | 0
arch/m68k/{platform => }/coldfire/reset.c | 0
arch/m68k/{platform => }/coldfire/sltimers.c | 0
arch/m68k/{platform => }/coldfire/timers.c | 0
arch/m68k/{platform => }/coldfire/vectors.c | 2 +-
arch/m68k/include/asm/io_no.h | 9 +++++++++
arch/m68k/include/asm/m54xxpci.h | 2 +-
arch/m68k/platform/Makefile | 3 ---
59 files changed, 40 insertions(+), 37 deletions(-)
rename arch/m68k/{platform => }/68000/Makefile (100%)
rename arch/m68k/{platform => }/68000/bootlogo-vz.h (100%)
rename arch/m68k/{platform => }/68000/bootlogo.h (100%)
rename arch/m68k/{platform => }/68000/entry.S (98%)
rename arch/m68k/{platform => }/68000/head.S (100%)
rename arch/m68k/{platform => }/68000/ints.c (100%)
rename arch/m68k/{platform => }/68000/m68328.c (100%)
rename arch/m68k/{platform => }/68000/m68EZ328.c (100%)
rename arch/m68k/{platform => }/68000/m68VZ328.c (100%)
rename arch/m68k/{platform => }/68000/romvec.S (100%)
rename arch/m68k/{platform => }/68000/timers.c (100%)
rename arch/m68k/{platform => }/68360/Makefile (81%)
rename arch/m68k/{platform => }/68360/commproc.c (100%)
rename arch/m68k/{platform => }/68360/config.c (98%)
rename arch/m68k/{platform => }/68360/entry.S (98%)
rename arch/m68k/{platform => }/68360/head-ram.S (99%)
rename arch/m68k/{platform => }/68360/head-rom.S (99%)
rename arch/m68k/{platform => }/68360/ints.c (98%)
rename arch/m68k/{platform => }/coldfire/Makefile (100%)
rename arch/m68k/{platform => }/coldfire/cache.c (100%)
rename arch/m68k/{platform => }/coldfire/clk.c (100%)
rename arch/m68k/{platform => }/coldfire/device.c (100%)
rename arch/m68k/{platform => }/coldfire/dma.c (100%)
rename arch/m68k/{platform => }/coldfire/dma_timer.c (100%)
rename arch/m68k/{platform => }/coldfire/entry.S (98%)
rename arch/m68k/{platform => }/coldfire/firebee.c (100%)
rename arch/m68k/{platform => }/coldfire/gpio.c (100%)
rename arch/m68k/{platform => }/coldfire/head.S (100%)
rename arch/m68k/{platform => }/coldfire/intc-2.c (100%)
rename arch/m68k/{platform => }/coldfire/intc-5249.c (100%)
rename arch/m68k/{platform => }/coldfire/intc-525x.c (100%)
rename arch/m68k/{platform => }/coldfire/intc-5272.c (99%)
rename arch/m68k/{platform => }/coldfire/intc-simr.c (100%)
rename arch/m68k/{platform => }/coldfire/intc.c (100%)
rename arch/m68k/{platform => }/coldfire/m5206.c (96%)
rename arch/m68k/{platform => }/coldfire/m520x.c (98%)
rename arch/m68k/{platform => }/coldfire/m523x.c (97%)
rename arch/m68k/{platform => }/coldfire/m5249.c (97%)
rename arch/m68k/{platform => }/coldfire/m525x.c (97%)
rename arch/m68k/{platform => }/coldfire/m5272.c (98%)
rename arch/m68k/{platform => }/coldfire/m527x.c (97%)
rename arch/m68k/{platform => }/coldfire/m528x.c (98%)
rename arch/m68k/{platform => }/coldfire/m5307.c (97%)
rename arch/m68k/{platform => }/coldfire/m53xx.c (100%)
rename arch/m68k/{platform => }/coldfire/m5407.c (95%)
rename arch/m68k/{platform => }/coldfire/m5441x.c (100%)
rename arch/m68k/{platform => }/coldfire/m54xx.c (97%)
rename arch/m68k/{platform => }/coldfire/mcf8390.c (100%)
rename arch/m68k/{platform => }/coldfire/nettel.c (100%)
rename arch/m68k/{platform => }/coldfire/pci.c (100%)
rename arch/m68k/{platform => }/coldfire/pit.c (100%)
rename arch/m68k/{platform => }/coldfire/reset.c (100%)
rename arch/m68k/{platform => }/coldfire/sltimers.c (100%)
rename arch/m68k/{platform => }/coldfire/timers.c (100%)
rename arch/m68k/{platform => }/coldfire/vectors.c (96%)
delete mode 100644 arch/m68k/platform/Makefile
Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check)
$ git merge metag/for-next
Already up-to-date.
Merging microblaze/next (554336c714f4 microblaze: Use empty asm-generic/linkage.h)
$ git merge microblaze/next
Merge made by the 'recursive' strategy.
arch/microblaze/include/asm/linkage.h | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
Merging mips/mips-for-linux-next (31d6f57d3c65 MIPS: ralink: remove deprecated IRQF_DISABLED)
$ git merge mips/mips-for-linux-next
Auto-merging include/asm-generic/dma-contiguous.h
Removing arch/mips/ralink/dts/Makefile
Removing arch/mips/netlogic/dts/Makefile
Removing arch/mips/lantiq/dts/Makefile
Removing arch/mips/cavium-octeon/.gitignore
Removing arch/arm64/include/asm/dma-contiguous.h
Merge made by the 'recursive' strategy.
arch/arm64/include/asm/Kbuild | 1 +
arch/arm64/include/asm/dma-contiguous.h | 28 ------------
arch/mips/Kconfig | 6 +++
arch/mips/Makefile | 11 +++++
arch/mips/alchemy/devboards/db1300.c | 47 ++++++++++++++++++-
arch/mips/alchemy/devboards/db1550.c | 9 ++--
arch/mips/alchemy/devboards/platform.c | 3 ++
arch/mips/boot/.gitignore | 1 +
arch/mips/boot/dts/Makefile | 20 ++++++++
arch/mips/{lantiq => boot}/dts/danube.dtsi | 0
arch/mips/{lantiq => boot}/dts/easy50712.dts | 0
arch/mips/{ralink => boot}/dts/mt7620a.dtsi | 0
arch/mips/{ralink => boot}/dts/mt7620a_eval.dts | 0
.../{cavium-octeon => boot/dts}/octeon_3xxx.dts | 0
.../{cavium-octeon => boot/dts}/octeon_68xx.dts | 0
arch/mips/{ralink => boot}/dts/rt2880.dtsi | 0
arch/mips/{ralink => boot}/dts/rt2880_eval.dts | 0
arch/mips/{ralink => boot}/dts/rt3050.dtsi | 0
arch/mips/{ralink => boot}/dts/rt3052_eval.dts | 0
arch/mips/{ralink => boot}/dts/rt3883.dtsi | 0
arch/mips/{ralink => boot}/dts/rt3883_eval.dts | 0
arch/mips/{mti-sead3 => boot/dts}/sead3.dts | 0
arch/mips/{netlogic => boot}/dts/xlp_evp.dts | 0
arch/mips/{netlogic => boot}/dts/xlp_fvp.dts | 0
arch/mips/{netlogic => boot}/dts/xlp_gvp.dts | 0
arch/mips/{netlogic => boot}/dts/xlp_svp.dts | 0
arch/mips/cavium-octeon/.gitignore | 2 -
arch/mips/cavium-octeon/Makefile | 10 ----
arch/mips/configs/sead3_defconfig | 2 +-
arch/mips/configs/sead3micro_defconfig | 2 +-
arch/mips/include/asm/Kbuild | 1 +
arch/mips/include/asm/cpu-features.h | 10 ++++
arch/mips/include/asm/cpu-info.h | 5 ++
.../asm/mach-au1x00/cpu-feature-overrides.h | 12 +++++
.../asm/mach-cavium-octeon/cpu-feature-overrides.h | 1 +
.../asm/mach-loongson/cpu-feature-overrides.h | 2 +
arch/mips/include/asm/pgtable-bits.h | 44 ++++++++++++------
arch/mips/include/asm/pgtable.h | 10 ++++
arch/mips/include/uapi/asm/swab.h | 18 ++++++--
arch/mips/kernel/cpu-probe.c | 21 +++++++++
arch/mips/kernel/setup.c | 9 ++++
arch/mips/lantiq/Kconfig | 1 +
arch/mips/lantiq/Makefile | 2 -
arch/mips/lantiq/dts/Makefile | 1 -
arch/mips/lib/csum_partial.S | 10 +++-
arch/mips/mm/dma-default.c | 37 ++++++++++-----
arch/mips/mti-sead3/Makefile | 4 --
arch/mips/net/bpf_jit.c | 53 ++++++++--------------
arch/mips/netlogic/Kconfig | 4 ++
arch/mips/netlogic/Makefile | 1 -
arch/mips/netlogic/dts/Makefile | 4 --
arch/mips/ralink/Kconfig | 4 ++
arch/mips/ralink/Makefile | 2 -
arch/mips/ralink/dts/Makefile | 4 --
arch/mips/ralink/timer.c | 2 +-
arch/x86/include/asm/Kbuild | 1 +
.../asm => include/asm-generic}/dma-contiguous.h | 7 +--
57 files changed, 274 insertions(+), 138 deletions(-)
delete mode 100644 arch/arm64/include/asm/dma-contiguous.h
create mode 100644 arch/mips/boot/dts/Makefile
rename arch/mips/{lantiq => boot}/dts/danube.dtsi (100%)
rename arch/mips/{lantiq => boot}/dts/easy50712.dts (100%)
rename arch/mips/{ralink => boot}/dts/mt7620a.dtsi (100%)
rename arch/mips/{ralink => boot}/dts/mt7620a_eval.dts (100%)
rename arch/mips/{cavium-octeon => boot/dts}/octeon_3xxx.dts (100%)
rename arch/mips/{cavium-octeon => boot/dts}/octeon_68xx.dts (100%)
rename arch/mips/{ralink => boot}/dts/rt2880.dtsi (100%)
rename arch/mips/{ralink => boot}/dts/rt2880_eval.dts (100%)
rename arch/mips/{ralink => boot}/dts/rt3050.dtsi (100%)
rename arch/mips/{ralink => boot}/dts/rt3052_eval.dts (100%)
rename arch/mips/{ralink => boot}/dts/rt3883.dtsi (100%)
rename arch/mips/{ralink => boot}/dts/rt3883_eval.dts (100%)
rename arch/mips/{mti-sead3 => boot/dts}/sead3.dts (100%)
rename arch/mips/{netlogic => boot}/dts/xlp_evp.dts (100%)
rename arch/mips/{netlogic => boot}/dts/xlp_fvp.dts (100%)
rename arch/mips/{netlogic => boot}/dts/xlp_gvp.dts (100%)
rename arch/mips/{netlogic => boot}/dts/xlp_svp.dts (100%)
delete mode 100644 arch/mips/cavium-octeon/.gitignore
delete mode 100644 arch/mips/lantiq/dts/Makefile
delete mode 100644 arch/mips/netlogic/dts/Makefile
delete mode 100644 arch/mips/ralink/dts/Makefile
rename {arch/x86/include/asm => include/asm-generic}/dma-contiguous.h (57%)
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 (7575e4d56f6f Merge tag 'sound-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound)
$ git merge parisc-hd/for-next
Already up-to-date.
Merging powerpc/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate)
$ git merge powerpc/next
Already up-to-date.
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 powerpc-mpe/next (2013add4ce73 powerpc/eeh: Show hex prefix for PE state sysfs)
$ git merge powerpc-mpe/next
Merge made by the 'recursive' strategy.
arch/powerpc/Kconfig | 3 +-
arch/powerpc/Makefile | 1 +
arch/powerpc/boot/Makefile | 5 +
arch/powerpc/include/asm/bug.h | 1 -
arch/powerpc/include/asm/dma-mapping.h | 1 +
arch/powerpc/include/asm/eeh.h | 39 +-
arch/powerpc/include/asm/hydra.h | 1 -
arch/powerpc/include/asm/irq.h | 5 -
arch/powerpc/include/asm/kexec.h | 1 -
arch/powerpc/include/asm/mmu-hash64.h | 2 +
arch/powerpc/include/asm/opal.h | 43 +-
arch/powerpc/include/asm/page_64.h | 1 -
arch/powerpc/include/asm/pgtable-ppc32.h | 2 -
arch/powerpc/include/asm/prom.h | 2 -
arch/powerpc/include/asm/rio.h | 1 -
arch/powerpc/include/asm/sstep.h | 62 ++
arch/powerpc/include/asm/tsi108.h | 4 -
arch/powerpc/include/asm/udbg.h | 1 -
arch/powerpc/include/asm/word-at-a-time.h | 112 ++-
arch/powerpc/include/asm/xics.h | 1 +
arch/powerpc/kernel/Makefile | 3 +
arch/powerpc/kernel/dma.c | 14 +-
arch/powerpc/kernel/eeh.c | 269 ++++--
arch/powerpc/kernel/eeh_driver.c | 106 ++-
arch/powerpc/kernel/eeh_pe.c | 23 +-
arch/powerpc/kernel/eeh_sysfs.c | 41 +-
arch/powerpc/kernel/hw_breakpoint.c | 2 +-
arch/powerpc/kernel/ibmebus.c | 2 +-
arch/powerpc/kernel/idle_power7.S | 2 +-
arch/powerpc/kernel/legacy_serial.c | 2 +-
arch/powerpc/kernel/nvram_64.c | 2 +-
arch/powerpc/kernel/of_platform.c | 2 +-
arch/powerpc/kernel/pci-common.c | 2 +-
arch/powerpc/kernel/pci_of_scan.c | 2 +-
arch/powerpc/kernel/ppc_ksyms.c | 192 +---
arch/powerpc/kernel/ppc_ksyms_32.c | 61 ++
arch/powerpc/kernel/process.c | 2 +
arch/powerpc/kernel/prom.c | 9 +-
arch/powerpc/kernel/prom_init_check.sh | 22 +-
arch/powerpc/kernel/ptrace.c | 2 +-
arch/powerpc/kernel/rtasd.c | 2 +-
arch/powerpc/kernel/setup-common.c | 3 +
arch/powerpc/kernel/setup_64.c | 30 +-
arch/powerpc/kernel/smp.c | 11 +-
arch/powerpc/kernel/time.c | 5 +-
arch/powerpc/lib/Makefile | 2 +-
arch/powerpc/lib/feature-fixups.c | 2 +-
arch/powerpc/lib/ppc_ksyms.c | 39 +
arch/powerpc/lib/sstep.c | 996 +++++++++++++--------
arch/powerpc/mm/hash_utils_64.c | 124 +--
arch/powerpc/mm/init_64.c | 3 -
arch/powerpc/mm/numa.c | 19 +-
arch/powerpc/mm/pgtable.c | 2 +-
arch/powerpc/mm/slice.c | 2 +
arch/powerpc/oprofile/backtrace.c | 1 +
arch/powerpc/perf/core-book3s.c | 18 +-
arch/powerpc/platforms/40x/ep405.c | 2 +-
arch/powerpc/platforms/40x/ppc40x_simple.c | 2 +-
arch/powerpc/platforms/40x/virtex.c | 2 +-
arch/powerpc/platforms/40x/walnut.c | 2 +-
arch/powerpc/platforms/44x/Kconfig | 6 +-
arch/powerpc/platforms/44x/canyonlands.c | 2 +-
arch/powerpc/platforms/44x/ebony.c | 2 +-
arch/powerpc/platforms/44x/iss4xx.c | 2 +-
arch/powerpc/platforms/44x/ppc44x_simple.c | 2 +-
arch/powerpc/platforms/44x/ppc476.c | 2 +-
arch/powerpc/platforms/44x/sam440ep.c | 2 +-
arch/powerpc/platforms/44x/virtex.c | 2 +-
arch/powerpc/platforms/44x/warp.c | 2 +-
arch/powerpc/platforms/512x/mpc512x_shared.c | 2 +-
arch/powerpc/platforms/52xx/lite5200.c | 4 +-
arch/powerpc/platforms/52xx/media5200.c | 2 +-
arch/powerpc/platforms/52xx/mpc52xx_common.c | 12 +-
arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 2 +-
arch/powerpc/platforms/52xx/mpc52xx_pic.c | 4 +-
arch/powerpc/platforms/82xx/ep8248e.c | 2 +-
arch/powerpc/platforms/82xx/km82xx.c | 2 +-
arch/powerpc/platforms/82xx/mpc8272_ads.c | 2 +-
arch/powerpc/platforms/82xx/pq2fads.c | 2 +-
arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | 2 +-
arch/powerpc/platforms/83xx/misc.c | 2 +-
arch/powerpc/platforms/83xx/mpc834x_itx.c | 2 +-
arch/powerpc/platforms/83xx/suspend.c | 4 +-
arch/powerpc/platforms/85xx/common.c | 2 +-
arch/powerpc/platforms/85xx/ppa8548.c | 2 +-
arch/powerpc/platforms/85xx/sgy_cts1000.c | 4 +-
arch/powerpc/platforms/86xx/gef_ppc9a.c | 2 +-
arch/powerpc/platforms/86xx/gef_sbc310.c | 2 +-
arch/powerpc/platforms/86xx/gef_sbc610.c | 2 +-
arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 2 +-
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 2 +-
arch/powerpc/platforms/86xx/sbc8641d.c | 2 +-
arch/powerpc/platforms/8xx/adder875.c | 2 +-
arch/powerpc/platforms/8xx/ep88xc.c | 2 +-
arch/powerpc/platforms/8xx/mpc86xads_setup.c | 2 +-
arch/powerpc/platforms/8xx/mpc885ads_setup.c | 2 +-
arch/powerpc/platforms/8xx/tqm8xx_setup.c | 2 +-
arch/powerpc/platforms/Kconfig.cputype | 6 +
arch/powerpc/platforms/cell/celleb_pci.c | 2 +-
arch/powerpc/platforms/cell/celleb_setup.c | 2 +-
arch/powerpc/platforms/embedded6xx/gamecube.c | 2 +-
arch/powerpc/platforms/embedded6xx/linkstation.c | 2 +-
arch/powerpc/platforms/embedded6xx/mvme5100.c | 2 +-
arch/powerpc/platforms/embedded6xx/storcenter.c | 2 +-
arch/powerpc/platforms/embedded6xx/wii.c | 2 +-
arch/powerpc/platforms/pasemi/gpio_mdio.c | 2 +-
arch/powerpc/platforms/pasemi/setup.c | 2 +-
arch/powerpc/platforms/powernv/eeh-ioda.c | 226 ++++-
arch/powerpc/platforms/powernv/eeh-powernv.c | 26 +
arch/powerpc/platforms/powernv/opal-dump.c | 18 +-
arch/powerpc/platforms/powernv/opal-elog.c | 4 +
arch/powerpc/platforms/powernv/opal-rtc.c | 15 +-
arch/powerpc/platforms/powernv/opal-tracepoints.c | 2 +-
arch/powerpc/platforms/powernv/opal-wrappers.S | 2 +
arch/powerpc/platforms/powernv/pci-ioda.c | 94 +-
arch/powerpc/platforms/powernv/pci.c | 11 +
arch/powerpc/platforms/powernv/pci.h | 4 +
arch/powerpc/platforms/powernv/powernv.h | 6 +
arch/powerpc/platforms/powernv/setup.c | 11 +-
arch/powerpc/platforms/powernv/smp.c | 8 +-
arch/powerpc/platforms/powernv/subcore.c | 1 +
arch/powerpc/platforms/pseries/cmm.c | 1 -
arch/powerpc/platforms/pseries/dlpar.c | 29 +-
arch/powerpc/platforms/pseries/eeh_pseries.c | 40 +-
arch/powerpc/platforms/pseries/hotplug-cpu.c | 10 +-
arch/powerpc/platforms/pseries/hotplug-memory.c | 1 +
arch/powerpc/platforms/pseries/lpar.c | 4 +-
arch/powerpc/platforms/pseries/nvram.c | 12 +-
arch/powerpc/platforms/pseries/pci.c | 1 +
arch/powerpc/platforms/pseries/ras.c | 2 +-
arch/powerpc/platforms/pseries/setup.c | 2 +-
arch/powerpc/sysdev/axonram.c | 2 +-
arch/powerpc/sysdev/dcr.c | 1 +
arch/powerpc/sysdev/fsl_85xx_l2ctlr.c | 2 +-
arch/powerpc/sysdev/mpic.c | 2 +-
arch/powerpc/sysdev/msi_bitmap.c | 6 +-
arch/powerpc/sysdev/mv64x60_dev.c | 2 +-
arch/powerpc/sysdev/pmi.c | 2 +-
arch/powerpc/sysdev/xics/icp-native.c | 25 +
arch/powerpc/sysdev/xilinx_intc.c | 2 +-
arch/powerpc/sysdev/xilinx_pci.c | 2 +-
drivers/macintosh/adb.c | 5 +
drivers/macintosh/via-cuda.c | 2 +
tools/testing/selftests/powerpc/Makefile | 2 +-
.../testing/selftests/powerpc/primitives/Makefile | 17 +
.../selftests/powerpc/primitives/asm/asm-compat.h | 1 +
.../selftests/powerpc/primitives/asm/ppc-opcode.h | 0
.../powerpc/primitives/load_unaligned_zeropad.c | 147 +++
.../selftests/powerpc/primitives/word-at-a-time.h | 1 +
149 files changed, 2176 insertions(+), 1010 deletions(-)
create mode 100644 arch/powerpc/kernel/ppc_ksyms_32.c
create mode 100644 arch/powerpc/lib/ppc_ksyms.c
create mode 100644 tools/testing/selftests/powerpc/primitives/Makefile
create mode 120000 tools/testing/selftests/powerpc/primitives/asm/asm-compat.h
create mode 100644 tools/testing/selftests/powerpc/primitives/asm/ppc-opcode.h
create mode 100644 tools/testing/selftests/powerpc/primitives/load_unaligned_zeropad.c
create mode 120000 tools/testing/selftests/powerpc/primitives/word-at-a-time.h
Merging fsl/next (cb0446c1b625 Revert "powerpc/fsl_msi: spread msi ints across different MSIRs")
$ git merge fsl/next
Auto-merging arch/powerpc/mm/numa.c
Auto-merging arch/powerpc/mm/mem.c
Auto-merging arch/powerpc/kernel/dma.c
Auto-merging arch/powerpc/include/asm/reg.h
Auto-merging arch/powerpc/configs/corenet64_smp_defconfig
Auto-merging arch/powerpc/Kconfig
Merge made by the 'recursive' strategy.
Documentation/devicetree/bindings/pci/fsl,pci.txt | 27 ++++
arch/powerpc/Kconfig | 4 +
arch/powerpc/boot/dts/fsl/t2081si-post.dtsi | 4 +-
arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 4 +-
arch/powerpc/boot/dts/t1040rdb.dts | 48 +++++++
arch/powerpc/boot/dts/t1042rdb.dts | 48 +++++++
arch/powerpc/boot/dts/t1042rdb_pi.dts | 57 ++++++++
arch/powerpc/boot/dts/t104xrdb.dtsi | 156 ++++++++++++++++++++++
arch/powerpc/configs/corenet32_smp_defconfig | 2 +
arch/powerpc/configs/corenet64_smp_defconfig | 46 ++-----
arch/powerpc/configs/mpc85xx_defconfig | 4 +-
arch/powerpc/configs/mpc85xx_smp_defconfig | 4 +-
arch/powerpc/configs/mpc86xx_defconfig | 3 +
arch/powerpc/include/asm/pgtable.h | 3 +
arch/powerpc/include/asm/reg.h | 3 +-
arch/powerpc/kernel/dma-swiotlb.c | 8 +-
arch/powerpc/kernel/dma.c | 33 +++++
arch/powerpc/kernel/head_8xx.S | 150 ++++++++-------------
arch/powerpc/mm/mem.c | 68 +++++++++-
arch/powerpc/mm/numa.c | 8 --
arch/powerpc/platforms/85xx/Kconfig | 2 +-
arch/powerpc/platforms/85xx/corenet_generic.c | 14 ++
arch/powerpc/platforms/85xx/qemu_e500.c | 10 ++
arch/powerpc/sysdev/fsl_msi.c | 95 ++++++-------
arch/powerpc/sysdev/fsl_msi.h | 4 +-
arch/powerpc/sysdev/fsl_pci.c | 3 +-
include/linux/fsl_ifc.h | 6 +-
27 files changed, 610 insertions(+), 204 deletions(-)
create mode 100644 Documentation/devicetree/bindings/pci/fsl,pci.txt
create mode 100644 arch/powerpc/boot/dts/t1040rdb.dts
create mode 100644 arch/powerpc/boot/dts/t1042rdb.dts
create mode 100644 arch/powerpc/boot/dts/t1042rdb_pi.dts
create mode 100644 arch/powerpc/boot/dts/t104xrdb.dtsi
Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate)
$ git merge mpc5xxx/next
Already up-to-date.
Merging s390/features (cfb0b24143b4 s390/mm: make use of ipte range facility)
$ git merge s390/features
Merge made by the 'recursive' strategy.
Documentation/kprobes.txt | 1 +
arch/s390/Kconfig | 5 +
arch/s390/Makefile | 17 +-
arch/s390/include/asm/barrier.h | 6 +-
arch/s390/include/asm/ftrace.h | 7 +-
arch/s390/include/asm/irq.h | 1 +
arch/s390/include/asm/kprobes.h | 4 +
arch/s390/include/asm/pgtable.h | 25 ++-
arch/s390/include/asm/ptrace.h | 6 +
arch/s390/include/asm/setup.h | 3 -
arch/s390/include/asm/smp.h | 2 -
arch/s390/include/asm/spinlock.h | 135 +++++++++---
arch/s390/include/asm/spinlock_types.h | 1 +
arch/s390/include/asm/thread_info.h | 3 +
arch/s390/include/asm/uprobes.h | 42 ++++
arch/s390/include/asm/vdso.h | 18 +-
arch/s390/kernel/Makefile | 5 +-
arch/s390/kernel/asm-offsets.c | 7 +
arch/s390/kernel/early.c | 2 -
arch/s390/kernel/entry.h | 1 +
arch/s390/kernel/entry64.S | 17 +-
arch/s390/kernel/ftrace.c | 94 ++++++--
arch/s390/kernel/head.S | 2 +-
arch/s390/kernel/irq.c | 1 +
arch/s390/kernel/kprobes.c | 159 +-------------
arch/s390/kernel/mcount.S | 2 -
arch/s390/kernel/mcount64.S | 64 ++++--
arch/s390/kernel/ptrace.c | 5 +-
arch/s390/kernel/setup.c | 4 +-
arch/s390/kernel/smp.c | 6 -
arch/s390/kernel/time.c | 13 ++
arch/s390/kernel/topology.c | 18 +-
arch/s390/kernel/traps.c | 33 ++-
arch/s390/kernel/uprobes.c | 332 ++++++++++++++++++++++++++++
arch/s390/kernel/vdso32/clock_getres.S | 11 +-
arch/s390/kernel/vdso32/clock_gettime.S | 32 ++-
arch/s390/kernel/vdso32/gettimeofday.S | 4 +-
arch/s390/kernel/vdso64/clock_getres.S | 8 +-
arch/s390/kernel/vdso64/clock_gettime.S | 32 ++-
arch/s390/kernel/vdso64/gettimeofday.S | 4 +-
arch/s390/lib/Makefile | 2 +
arch/s390/lib/probes.c | 159 ++++++++++++++
arch/s390/lib/spinlock.c | 105 +++++----
arch/s390/mm/dump_pagetables.c | 5 +-
arch/s390/mm/hugetlbpage.c | 2 +-
arch/s390/mm/pageattr.c | 38 +++-
arch/s390/mm/vmem.c | 8 +-
drivers/s390/char/Kconfig | 13 ++
drivers/s390/char/Makefile | 3 +
drivers/s390/char/diag_ftp.c | 237 ++++++++++++++++++++
drivers/s390/char/diag_ftp.h | 21 ++
drivers/s390/char/hmcdrv_cache.c | 252 ++++++++++++++++++++++
drivers/s390/char/hmcdrv_cache.h | 24 +++
drivers/s390/char/hmcdrv_dev.c | 370 ++++++++++++++++++++++++++++++++
drivers/s390/char/hmcdrv_dev.h | 14 ++
drivers/s390/char/hmcdrv_ftp.c | 343 +++++++++++++++++++++++++++++
drivers/s390/char/hmcdrv_ftp.h | 63 ++++++
drivers/s390/char/hmcdrv_mod.c | 64 ++++++
drivers/s390/char/sclp.h | 2 +
drivers/s390/char/sclp_diag.h | 89 ++++++++
drivers/s390/char/sclp_early.c | 2 +-
drivers/s390/char/sclp_ftp.c | 275 ++++++++++++++++++++++++
drivers/s390/char/sclp_ftp.h | 21 ++
drivers/s390/char/sclp_rw.c | 13 +-
drivers/s390/char/sclp_vt220.c | 4 -
drivers/s390/char/tape_char.c | 4 +-
drivers/s390/crypto/ap_bus.c | 14 +-
drivers/s390/crypto/ap_bus.h | 6 +-
drivers/s390/crypto/zcrypt_api.c | 7 +-
69 files changed, 2891 insertions(+), 401 deletions(-)
create mode 100644 arch/s390/include/asm/uprobes.h
create mode 100644 arch/s390/kernel/uprobes.c
create mode 100644 arch/s390/lib/probes.c
create mode 100644 drivers/s390/char/diag_ftp.c
create mode 100644 drivers/s390/char/diag_ftp.h
create mode 100644 drivers/s390/char/hmcdrv_cache.c
create mode 100644 drivers/s390/char/hmcdrv_cache.h
create mode 100644 drivers/s390/char/hmcdrv_dev.c
create mode 100644 drivers/s390/char/hmcdrv_dev.h
create mode 100644 drivers/s390/char/hmcdrv_ftp.c
create mode 100644 drivers/s390/char/hmcdrv_ftp.h
create mode 100644 drivers/s390/char/hmcdrv_mod.c
create mode 100644 drivers/s390/char/sclp_diag.h
create mode 100644 drivers/s390/char/sclp_ftp.c
create mode 100644 drivers/s390/char/sclp_ftp.h
Merging sparc-next/master (619df5d2870b Merge tag 'microblaze-3.17-rc5' of git://git.monstr.eu/linux-2.6-microblaze)
$ git merge sparc-next/master
Already up-to-date.
Merging tile/master (78410af51146 tile: add clock_gettime support to vDSO)
$ git merge tile/master
Merge made by the 'recursive' strategy.
arch/tile/Kconfig | 1 +
arch/tile/gxio/mpipe.c | 37 ++++++-
arch/tile/include/asm/sections.h | 3 -
arch/tile/include/asm/vdso.h | 20 ++--
arch/tile/include/uapi/arch/sim_def.h | 10 +-
arch/tile/kernel/time.c | 61 ++++++++----
arch/tile/kernel/traps.c | 2 +-
arch/tile/kernel/vdso/vdso.lds.S | 2 +
arch/tile/kernel/vdso/vgettimeofday.c | 176 +++++++++++++++++++++++++---------
arch/tile/kernel/vmlinux.lds.S | 2 -
arch/tile/mm/init.c | 12 +--
drivers/char/tile-srom.c | 13 ++-
12 files changed, 245 insertions(+), 94 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 8f1b73bfb783] 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 (f2589bff1ce8 xtensa/uapi: Add definition of TIOC[SG]RS485)
$ git merge xtensa/for_next
Merge made by the 'recursive' strategy.
arch/xtensa/include/uapi/asm/ioctls.h | 2 ++
1 file changed, 2 insertions(+)
Merging btrfs/next (1d52c78afbbf Btrfs: try not to ENOSPC on log replay)
$ git merge btrfs/next
Auto-merging fs/btrfs/volumes.c
Auto-merging fs/btrfs/tree-log.c
Auto-merging fs/btrfs/btrfs_inode.h
Merge made by the 'recursive' strategy.
fs/btrfs/async-thread.c | 1 +
fs/btrfs/async-thread.h | 1 +
fs/btrfs/backref.c | 121 ++++++-
fs/btrfs/backref.h | 3 +
fs/btrfs/btrfs_inode.h | 16 +-
fs/btrfs/check-integrity.c | 18 +-
fs/btrfs/compression.c | 10 +-
fs/btrfs/ctree.c | 44 +--
fs/btrfs/ctree.h | 53 ++-
fs/btrfs/delayed-inode.c | 8 +-
fs/btrfs/dev-replace.c | 82 +++--
fs/btrfs/dir-item.c | 12 +-
fs/btrfs/disk-io.c | 129 ++++----
fs/btrfs/disk-io.h | 3 +-
fs/btrfs/export.c | 4 +-
fs/btrfs/extent-tree.c | 221 ++++++++++---
fs/btrfs/extent_io.c | 341 +++++++++++--------
fs/btrfs/extent_io.h | 41 ++-
fs/btrfs/file-item.c | 30 +-
fs/btrfs/file.c | 147 ++++++---
fs/btrfs/free-space-cache.c | 157 ++++++++-
fs/btrfs/hash.c | 4 +-
fs/btrfs/inode-item.c | 12 +-
fs/btrfs/inode-map.c | 68 ++--
fs/btrfs/inode.c | 635 +++++++++++++++++++++++++++--------
fs/btrfs/ioctl.c | 49 +--
fs/btrfs/lzo.c | 3 +-
fs/btrfs/orphan.c | 4 +-
fs/btrfs/print-tree.c | 4 +-
fs/btrfs/qgroup.c | 20 +-
fs/btrfs/raid56.c | 8 +-
fs/btrfs/reada.c | 2 +-
fs/btrfs/relocation.c | 22 +-
fs/btrfs/scrub.c | 50 ++-
fs/btrfs/send.c | 43 ++-
fs/btrfs/super.c | 24 +-
fs/btrfs/sysfs.c | 41 ++-
fs/btrfs/sysfs.h | 16 +-
fs/btrfs/tests/free-space-tests.c | 516 ++++++++++++++++++++++++++++-
fs/btrfs/transaction.c | 10 +-
fs/btrfs/tree-log.c | 259 ++++++++-------
fs/btrfs/tree-log.h | 2 +
fs/btrfs/uuid-tree.c | 1 -
fs/btrfs/volumes.c | 672 ++++++++++++++++++++++++--------------
fs/btrfs/volumes.h | 166 ++++++++--
fs/btrfs/xattr.c | 4 +-
fs/btrfs/zlib.c | 141 ++++----
include/trace/events/btrfs.h | 85 ++++-
48 files changed, 3071 insertions(+), 1232 deletions(-)
Merging ceph/master (c27a3e4d667f libceph: do not hard code max auth ticket len)
$ git merge ceph/master
Already up-to-date.
Merging cifs/for-next (1209bbdff2f6 CIFS: Fix readpages retrying on reconnects)
$ git merge cifs/for-next
Merge made by the 'recursive' strategy.
fs/cifs/file.c | 8 +-------
fs/cifs/smb1ops.c | 2 +-
fs/cifs/smb2maperror.c | 2 ++
3 files changed, 4 insertions(+), 8 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 (c53f755d339b ocfs2: Back out change to use OCFS2_MAXQUOTAS in ocfs2_setattr())
$ git merge ext3/for_next
Auto-merging fs/ocfs2/super.c
Merge made by the 'recursive' strategy.
fs/ext3/ext3.h | 12 +++++++-----
fs/ext3/super.c | 14 +++++++-------
fs/ocfs2/file.c | 2 +-
fs/ocfs2/quota.h | 5 ++++-
fs/ocfs2/quota_global.c | 4 ++--
fs/ocfs2/quota_local.c | 33 +++++++++++++++++----------------
fs/ocfs2/super.c | 30 +++++++++++++++++-------------
fs/reiserfs/reiserfs.h | 5 ++++-
fs/reiserfs/super.c | 16 ++++++++--------
fs/udf/file.c | 9 ++++++++-
fs/udf/udftime.c | 2 --
11 files changed, 75 insertions(+), 57 deletions(-)
Merging ext4/dev (c13e87d490d3 ext4: optimize block allocation on grow indepth)
$ git merge ext4/dev
Auto-merging fs/ext4/namei.c
Auto-merging fs/buffer.c
Merge made by the 'recursive' strategy.
fs/buffer.c | 48 +-
fs/ext4/balloc.c | 3 +-
fs/ext4/dir.c | 8 +-
fs/ext4/ext4.h | 37 +-
fs/ext4/ext4_extents.h | 1 +
fs/ext4/ext4_jbd2.c | 4 +-
fs/ext4/ext4_jbd2.h | 6 +-
fs/ext4/extents.c | 613 +++++++++++++++++---------
fs/ext4/extents_status.c | 200 ++++++++-
fs/ext4/extents_status.h | 13 +-
fs/ext4/indirect.c | 86 ++--
fs/ext4/inline.c | 4 +-
fs/ext4/inode.c | 93 ++--
fs/ext4/mballoc.c | 15 +-
fs/ext4/migrate.c | 11 +-
fs/ext4/move_extent.c | 1009 +++++--------------------------------------
fs/ext4/namei.c | 195 ++++-----
fs/ext4/super.c | 223 +++++-----
fs/ext4/xattr.c | 38 +-
fs/jbd/journal.c | 2 +-
fs/jbd2/checkpoint.c | 334 ++++++--------
fs/jbd2/journal.c | 18 +-
fs/jbd2/recovery.c | 1 +
include/linux/buffer_head.h | 47 +-
include/linux/jbd2.h | 2 +-
include/linux/mm.h | 8 +
include/trace/events/ext4.h | 59 ++-
mm/truncate.c | 57 +++
28 files changed, 1392 insertions(+), 1743 deletions(-)
Merging f2fs/dev (539debb4a318 f2fs: support atomic_write feature for database)
$ git merge f2fs/dev
Merge made by the 'recursive' strategy.
Documentation/ABI/testing/sysfs-fs-f2fs | 7 +
Documentation/filesystems/f2fs.txt | 13 +-
fs/f2fs/checkpoint.c | 97 +++---
fs/f2fs/data.c | 73 +++--
fs/f2fs/debug.c | 20 +-
fs/f2fs/dir.c | 19 +-
fs/f2fs/f2fs.h | 159 +++++++---
fs/f2fs/file.c | 241 ++++++++++----
fs/f2fs/gc.c | 26 +-
fs/f2fs/inline.c | 20 +-
fs/f2fs/inode.c | 37 ++-
fs/f2fs/namei.c | 53 ++--
fs/f2fs/node.c | 460 +++++++++++++--------------
fs/f2fs/node.h | 57 ++--
fs/f2fs/recovery.c | 191 +++++++-----
fs/f2fs/segment.c | 537 +++++++++++++++++++++++---------
fs/f2fs/segment.h | 162 ++++++----
fs/f2fs/super.c | 47 ++-
fs/f2fs/xattr.c | 8 +-
include/linux/f2fs_fs.h | 6 +-
include/trace/events/f2fs.h | 16 +-
21 files changed, 1455 insertions(+), 794 deletions(-)
Merging fscache/fscache (1a8ed18fb7db cachefiles: remove two unused pagevecs.)
$ git merge fscache/fscache
Resolved 'fs/fscache/object.c' using previous resolution.
Auto-merging fs/fscache/object.c
CONFLICT (content): Merge conflict in fs/fscache/object.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 343d8ef0c996] Merge remote-tracking branch 'fscache/fscache'
$ git diff -M --stat --summary HEAD^..
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 (19aeb5a65f1a GFS2: Make rename not save dirent location)
$ git merge gfs2/master
Merge made by the 'recursive' strategy.
fs/gfs2/dir.c | 9 +++++++--
fs/gfs2/dir.h | 1 +
fs/gfs2/inode.c | 7 ++++---
fs/gfs2/rgrp.c | 8 ++++++++
fs/gfs2/rgrp.h | 1 +
5 files changed, 21 insertions(+), 5 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 (b4b56796fe63 Merge branch 'client-4.2' into linux-next)
$ git merge nfs/linux-next
Auto-merging fs/nfsd/nfs4xdr.c
Auto-merging fs/nfs_common/grace.c
Removing fs/nfs/blocklayout/extents.c
Removing fs/nfs/blocklayout/blocklayoutdm.c
Removing fs/nfs/blocklayout/blocklayoutdev.c
Auto-merging fs/lockd/svc.c
Merge made by the 'recursive' strategy.
fs/Kconfig | 6 +-
fs/lockd/Makefile | 3 +-
fs/lockd/mon.c | 6 +
fs/lockd/netns.h | 1 -
fs/lockd/procfs.c | 92 ++
fs/lockd/procfs.h | 28 +
fs/lockd/svc.c | 16 +-
fs/nfs/Makefile | 1 +
fs/nfs/blocklayout/Makefile | 3 +-
fs/nfs/blocklayout/blocklayout.c | 1386 +++++++++---------------------
fs/nfs/blocklayout/blocklayout.h | 213 +++--
fs/nfs/blocklayout/blocklayoutdev.c | 384 ---------
fs/nfs/blocklayout/blocklayoutdm.c | 108 ---
fs/nfs/blocklayout/dev.c | 363 ++++++++
fs/nfs/blocklayout/extent_tree.c | 602 +++++++++++++
fs/nfs/blocklayout/extents.c | 908 -------------------
fs/nfs/blocklayout/rpc_pipefs.c | 285 ++++++
fs/nfs/callback.c | 4 +-
fs/nfs/callback_proc.c | 23 +-
fs/nfs/client.c | 6 +-
fs/nfs/direct.c | 14 -
fs/nfs/file.c | 52 +-
fs/nfs/filelayout/filelayout.c | 34 +-
fs/nfs/filelayout/filelayout.h | 7 +-
fs/nfs/filelayout/filelayoutdev.c | 108 +--
fs/nfs/fscache-index.c | 3 +-
fs/nfs/inode.c | 6 +-
fs/nfs/internal.h | 7 -
fs/nfs/nfs3_fs.h | 34 +
fs/nfs/nfs3acl.c | 1 +
fs/nfs/nfs3client.c | 1 +
fs/nfs/nfs3proc.c | 1 +
fs/nfs/nfs3super.c | 1 +
fs/nfs/nfs42.h | 14 +
fs/nfs/nfs42proc.c | 69 ++
fs/nfs/nfs42xdr.c | 98 +++
fs/nfs/nfs4_fs.h | 3 +
fs/nfs/nfs4file.c | 25 +
fs/nfs/nfs4proc.c | 142 ++-
fs/nfs/nfs4renewd.c | 12 +-
fs/nfs/nfs4state.c | 18 +-
fs/nfs/nfs4xdr.c | 186 +---
fs/nfs/objlayout/objio_osd.c | 113 +--
fs/nfs/objlayout/objlayout.c | 70 --
fs/nfs/objlayout/objlayout.h | 5 -
fs/nfs/pagelist.c | 8 +
fs/nfs/pnfs.c | 105 ++-
fs/nfs/pnfs.h | 50 +-
fs/nfs/pnfs_dev.c | 150 +++-
fs/nfs/super.c | 11 -
fs/nfs/write.c | 150 ++--
fs/nfs_common/Makefile | 3 +-
fs/{lockd => nfs_common}/grace.c | 68 +-
fs/nfsd/Kconfig | 4 +-
fs/nfsd/cache.h | 1 -
fs/nfsd/export.c | 1 +
fs/nfsd/nfs3proc.c | 13 +-
fs/nfsd/nfs4callback.c | 145 +---
fs/nfsd/nfs4idmap.c | 20 +-
fs/nfsd/nfs4proc.c | 49 ++
fs/nfsd/nfs4recover.c | 205 ++++-
fs/nfsd/nfs4state.c | 118 ++-
fs/nfsd/nfs4xdr.c | 75 +-
fs/nfsd/nfscache.c | 214 ++---
fs/nfsd/nfsctl.c | 45 +
fs/nfsd/nfsd.h | 2 +-
fs/nfsd/nfsfh.c | 6 +-
fs/nfsd/state.h | 28 +-
fs/nfsd/vfs.c | 37 +-
fs/nfsd/xdr4.h | 14 +
include/linux/nfs4.h | 29 +-
include/linux/nfs_fs.h | 41 -
include/linux/nfs_fs_sb.h | 1 +
include/linux/nfs_xdr.h | 36 +-
include/linux/pagemap.h | 12 +-
include/linux/proc_fs.h | 2 +
include/linux/sunrpc/svc.h | 1 -
include/linux/sunrpc/xprt.h | 1 +
include/linux/wait.h | 5 +-
include/uapi/linux/nfsd/export.h | 5 +-
kernel/sched/wait.c | 36 +
mm/filemap.c | 21 +-
net/sunrpc/clnt.c | 5 +
net/sunrpc/sched.c | 2 -
net/sunrpc/svc.c | 2 -
net/sunrpc/svc_xprt.c | 81 +-
net/sunrpc/svcsock.c | 25 +-
net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 +-
net/sunrpc/xprtrdma/transport.c | 2 -
net/sunrpc/xprtrdma/xprt_rdma.h | 7 +
net/sunrpc/xprtsock.c | 121 +--
91 files changed, 3708 insertions(+), 3713 deletions(-)
create mode 100644 fs/lockd/procfs.c
create mode 100644 fs/lockd/procfs.h
delete mode 100644 fs/nfs/blocklayout/blocklayoutdev.c
delete mode 100644 fs/nfs/blocklayout/blocklayoutdm.c
create mode 100644 fs/nfs/blocklayout/dev.c
create mode 100644 fs/nfs/blocklayout/extent_tree.c
delete mode 100644 fs/nfs/blocklayout/extents.c
create mode 100644 fs/nfs/blocklayout/rpc_pipefs.c
create mode 100644 fs/nfs/nfs3_fs.h
create mode 100644 fs/nfs/nfs42.h
create mode 100644 fs/nfs/nfs42proc.c
create mode 100644 fs/nfs/nfs42xdr.c
rename fs/{lockd => nfs_common}/grace.c (50%)
Merging nfsd/nfsd-next (34549ab09e62 nfsd: eliminate "to_delegation" define)
$ git merge nfsd/nfsd-next
Merge made by the 'recursive' strategy.
fs/nfsd/nfs4callback.c | 5 +----
fs/nfsd/nfs4state.c | 3 ---
fs/nfsd/state.h | 3 +++
3 files changed, 4 insertions(+), 7 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 (443b39cdd5c3 UBIFS: Fix trivial typo in power_cut_emulated())
$ git merge ubifs/linux-next
Merge made by the 'recursive' strategy.
drivers/mtd/ubi/block.c | 36 +++++++++++++++++++++++++-----------
drivers/mtd/ubi/cdev.c | 6 ++++--
drivers/mtd/ubi/eba.c | 5 ++---
drivers/mtd/ubi/fastmap.c | 1 +
drivers/mtd/ubi/ubi.h | 12 +++++++-----
drivers/mtd/ubi/wl.c | 28 +++++++++++++++-------------
fs/ubifs/commit.c | 8 +++-----
fs/ubifs/debug.c | 6 +++---
fs/ubifs/journal.c | 7 +++----
fs/ubifs/log.c | 19 ++++++++++++++-----
10 files changed, 77 insertions(+), 51 deletions(-)
Merging xfs/for-next (bdb119bb6e9d Merge branch 'xfs-misc-fixes-for-3.18-3' into for-next)
$ git merge xfs/for-next
Removing fs/xfs/time.h
Merge made by the 'recursive' strategy.
fs/xfs/kmem.c | 1 -
fs/xfs/libxfs/xfs_alloc.c | 4 +
fs/xfs/libxfs/xfs_bmap.c | 365 ++++++++++++++--------
fs/xfs/libxfs/xfs_bmap.h | 7 +-
fs/xfs/libxfs/xfs_da_btree.c | 3 +-
fs/xfs/libxfs/xfs_da_format.c | 1 -
fs/xfs/libxfs/xfs_dir2.c | 67 +---
fs/xfs/libxfs/xfs_dir2.h | 2 +-
fs/xfs/libxfs/xfs_ialloc.c | 7 +-
fs/xfs/libxfs/xfs_rtbitmap.c | 49 ++-
fs/xfs/libxfs/xfs_sb.c | 7 +
fs/xfs/time.h | 36 ---
fs/xfs/xfs_aops.c | 23 +-
fs/xfs/xfs_bmap_util.c | 126 ++++----
fs/xfs/xfs_buf.c | 355 +++++++++++-----------
fs/xfs/xfs_buf.h | 15 +-
fs/xfs/xfs_buf_item.c | 10 +-
fs/xfs/xfs_file.c | 178 ++++-------
fs/xfs/xfs_fsops.c | 11 +-
fs/xfs/xfs_globals.c | 4 +
fs/xfs/xfs_icache.c | 1 -
fs/xfs/xfs_inode.c | 34 ++-
fs/xfs/xfs_inode.h | 2 +-
fs/xfs/xfs_inode_item.c | 2 +-
fs/xfs/xfs_ioctl.c | 28 +-
fs/xfs/xfs_ioctl32.c | 2 +
fs/xfs/xfs_ioctl32.h | 3 +-
fs/xfs/xfs_iomap.c | 4 +-
fs/xfs/xfs_iops.c | 30 ++
fs/xfs/xfs_linux.h | 6 +-
fs/xfs/xfs_log.c | 59 ++--
fs/xfs/xfs_log_cil.c | 47 ++-
fs/xfs/xfs_log_recover.c | 689 ++++++++++++++++++++++--------------------
fs/xfs/xfs_mount.c | 58 ++--
fs/xfs/xfs_mru_cache.c | 3 +-
fs/xfs/xfs_qm.c | 1 +
fs/xfs/xfs_rtalloc.c | 85 +-----
fs/xfs/xfs_rtalloc.h | 4 +
fs/xfs/xfs_super.c | 39 ++-
fs/xfs/xfs_symlink.c | 8 +-
fs/xfs/xfs_sysctl.h | 5 +
fs/xfs/xfs_sysfs.c | 74 +++++
fs/xfs/xfs_sysfs.h | 1 +
fs/xfs/xfs_trace.h | 3 +-
fs/xfs/xfs_trans_buf.c | 16 +-
fs/xfs/xfs_trans_inode.c | 2 +-
46 files changed, 1302 insertions(+), 1175 deletions(-)
delete mode 100644 fs/xfs/time.h
Merging file-locks/linux-next (c68f11db3d2f locks: fix fcntl_setlease/getlease return when !CONFIG_FILE_LOCKING)
$ git merge file-locks/linux-next
Resolved 'fs/locks.c' using previous resolution.
Auto-merging net/socket.c
Auto-merging fs/nfsd/state.h
Auto-merging fs/nfsd/nfs4state.c
Auto-merging fs/nfs/nfs4file.c
Auto-merging fs/nfs/internal.h
Auto-merging fs/nfs/file.c
Auto-merging fs/locks.c
CONFLICT (content): Merge conflict in fs/locks.c
Auto-merging fs/gfs2/file.c
Auto-merging fs/cifs/cifsfs.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 55a5819b7fb9] Merge remote-tracking branch 'file-locks/linux-next'
$ git diff -M --stat --summary HEAD^..
Documentation/filesystems/Locking | 11 +-
Documentation/filesystems/vfs.txt | 7 +-
drivers/net/tun.c | 4 +-
drivers/tty/tty_io.c | 3 +-
fs/cifs/cifsfs.c | 7 +-
fs/dlm/plock.c | 8 +-
fs/fcntl.c | 21 +-
fs/gfs2/file.c | 22 +-
fs/libfs.c | 18 ++
fs/lockd/svclock.c | 68 +-----
fs/locks.c | 444 +++++++++++++++++---------------------
fs/nfs/file.c | 13 +-
fs/nfs/internal.h | 1 -
fs/nfs/nfs4file.c | 2 +-
fs/nfsd/nfs4state.c | 104 +++++----
fs/nfsd/state.h | 1 -
fs/notify/dnotify/dnotify.c | 8 +-
include/linux/fs.h | 59 ++---
include/linux/lockd/lockd.h | 1 -
include/linux/security.h | 8 +-
include/trace/events/filelock.h | 14 +-
net/socket.c | 3 +-
security/capability.c | 4 +-
security/security.c | 2 +-
security/selinux/hooks.c | 4 +-
security/smack/smack_lsm.c | 3 +-
26 files changed, 353 insertions(+), 487 deletions(-)
Merging vfs/for-next (bb4623448d40 vfs: move getname() from callers to do_mount())
$ git merge vfs/for-next
Auto-merging mm/iov_iter.c
Auto-merging kernel/printk/printk.c
Auto-merging include/linux/uio.h
Auto-merging include/linux/fs.h
Auto-merging include/linux/dcache.h
Auto-merging fs/namei.c
Auto-merging fs/gfs2/inode.c
Auto-merging fs/ecryptfs/file.c
Auto-merging fs/dcache.c
Auto-merging fs/cifs/file.c
Auto-merging fs/cachefiles/rdwr.c
Auto-merging fs/buffer.c
Auto-merging fs/btrfs/ioctl.c
Auto-merging drivers/usb/gadget/function/f_fs.c
Auto-merging Documentation/filesystems/vfs.txt
Merge made by the 'recursive' strategy.
Documentation/filesystems/vfs.txt | 2 +-
arch/alpha/kernel/osf_sys.c | 23 ++-
arch/x86/ia32/ia32_aout.c | 21 +--
drivers/block/rsxx/core.c | 81 +++--------
drivers/bluetooth/hci_vhci.c | 22 ++-
drivers/char/mem.c | 56 ++------
drivers/dma-buf/dma-buf.c | 2 +-
drivers/gpu/drm/nouveau/nouveau_nvif.c | 4 +-
drivers/gpu/drm/nouveau/nvif/driver.h | 4 +-
drivers/gpu/drm/nouveau/nvif/object.h | 6 +-
drivers/infiniband/hw/ipath/ipath_fs.c | 1 -
drivers/infiniband/hw/qib/qib_fs.c | 1 -
drivers/misc/carma/carma-fpga-program.c | 30 +---
drivers/s390/char/vmlogrdr.c | 1 -
drivers/staging/android/ashmem.c | 2 +-
drivers/staging/android/ion/compat_ion.c | 2 +-
drivers/staging/android/logger.c | 103 ++++---------
drivers/staging/vme/devices/vme_user.c | 28 +---
drivers/usb/gadget/function/f_fs.c | 24 ++--
drivers/usb/gadget/legacy/inode.c | 26 ++--
fs/9p/fid.c | 4 +-
fs/9p/vfs_addr.c | 4 +-
fs/9p/vfs_dentry.c | 8 +-
fs/9p/vfs_dir.c | 4 +-
fs/9p/vfs_file.c | 8 +-
fs/9p/vfs_inode.c | 32 ++---
fs/9p/vfs_inode_dotl.c | 8 +-
fs/afs/dir.c | 5 -
fs/autofs4/expire.c | 6 -
fs/binfmt_aout.c | 25 +---
fs/binfmt_elf.c | 25 +---
fs/binfmt_elf_fdpic.c | 24 ++--
fs/btrfs/ioctl.c | 5 +-
fs/buffer.c | 5 +
fs/cachefiles/rdwr.c | 48 +++----
fs/ceph/dir.c | 1 -
fs/cifs/dir.c | 14 +-
fs/cifs/file.c | 12 +-
fs/cifs/inode.c | 12 +-
fs/cifs/readdir.c | 6 +-
fs/compat.c | 28 ++--
fs/dcache.c | 174 ++++++++--------------
fs/ecryptfs/file.c | 2 +-
fs/exec.c | 17 ++-
fs/file.c | 1 +
fs/fuse/dir.c | 7 +-
fs/gfs2/dentry.c | 3 -
fs/gfs2/inode.c | 5 +
fs/internal.h | 2 +-
fs/jffs2/jffs2_fs_sb.h | 2 -
fs/jffs2/wbuf.c | 17 +--
fs/jfs/super.c | 2 +-
fs/kernfs/dir.c | 11 --
fs/mount.h | 25 +++-
fs/namei.c | 22 +--
fs/namespace.c | 203 +++++++++++++++++++-------
fs/nfs/dir.c | 7 +-
fs/proc/base.c | 10 +-
fs/proc/fd.c | 2 -
fs/read_write.c | 2 +
fs/super.c | 2 +
include/linux/dcache.h | 3 +-
include/linux/fs.h | 5 +-
include/linux/uio.h | 3 +
kernel/printk/printk.c | 20 +--
mm/iov_iter.c | 240 +++++++++++++++++++++++++++++--
tools/perf/util/string.c | 90 ++++--------
67 files changed, 771 insertions(+), 829 deletions(-)
Merging pci/next (5b750d4fb905 Merge branch 'pci/host-xgene' into next)
$ git merge pci/next
Auto-merging kernel/resource.c
Auto-merging include/linux/pci.h
Auto-merging drivers/pci/probe.c
Removing drivers/pci/hotplug/pcihp_slot.c
Auto-merging drivers/pci/hotplug/pciehp_hpc.c
Auto-merging drivers/pci/hotplug/acpiphp_glue.c
Auto-merging drivers/pci/host/Kconfig
Auto-merging drivers/net/vmxnet3/vmxnet3_int.h
Auto-merging arch/powerpc/sysdev/fsl_msi.c
Auto-merging arch/powerpc/platforms/powernv/pci.c
Auto-merging arch/arm64/kernel/Makefile
Auto-merging arch/arm64/include/asm/pgtable.h
Auto-merging arch/arm64/include/asm/Kbuild
Auto-merging arch/arm64/Kconfig
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
Documentation/ABI/testing/sysfs-bus-pci | 10 +
.../devicetree/bindings/pci/designware-pcie.txt | 3 +
.../bindings/pci/nvidia,tegra20-pcie.txt | 25 +-
.../devicetree/bindings/pci/pci-keystone.txt | 63 ++
.../devicetree/bindings/pci/xgene-pci.txt | 57 ++
.../devicetree/bindings/pci/xilinx-pcie.txt | 62 ++
Documentation/driver-model/devres.txt | 2 +
MAINTAINERS | 15 +
arch/arm/boot/dts/spear1310.dtsi | 18 +-
arch/arm/boot/dts/spear1340.dtsi | 6 +-
arch/arm/include/asm/io.h | 1 +
arch/arm/mach-integrator/pci_v3.c | 23 +-
arch/arm64/Kconfig | 22 +-
arch/arm64/boot/dts/apm-mustang.dts | 8 +
arch/arm64/boot/dts/apm-storm.dtsi | 165 ++++
arch/arm64/include/asm/Kbuild | 1 +
arch/arm64/include/asm/io.h | 3 +-
arch/arm64/include/asm/pci.h | 37 +
arch/arm64/include/asm/pgtable.h | 2 +
arch/arm64/kernel/Makefile | 1 +
arch/arm64/kernel/pci.c | 70 ++
arch/ia64/kernel/msi_ia64.c | 2 +-
arch/ia64/sn/kernel/msi_sn.c | 4 +-
arch/mips/pci/msi-octeon.c | 6 +-
arch/powerpc/include/asm/machdep.h | 2 -
arch/powerpc/kernel/msi.c | 12 +-
arch/powerpc/platforms/cell/axon_msi.c | 9 -
arch/powerpc/platforms/powernv/pci.c | 19 +-
arch/powerpc/platforms/pseries/msi.c | 44 +-
arch/powerpc/sysdev/fsl_msi.c | 12 +-
arch/powerpc/sysdev/mpic_pasemi_msi.c | 11 +-
arch/powerpc/sysdev/mpic_u3msi.c | 28 +-
arch/powerpc/sysdev/ppc4xx_hsta_msi.c | 18 +-
arch/powerpc/sysdev/ppc4xx_msi.c | 19 +-
arch/x86/pci/common.c | 20 +-
arch/x86/pci/mmconfig-shared.c | 40 +-
arch/x86/pci/pcbios.c | 8 +-
drivers/gpu/drm/vmwgfx/svga_reg.h | 1 -
drivers/irqchip/irq-armada-370-xp.c | 14 +-
drivers/misc/vmw_vmci/vmci_guest.c | 1 -
drivers/net/vmxnet3/vmxnet3_int.h | 1 -
drivers/of/address.c | 154 ++++
drivers/of/of_pci.c | 142 +++
drivers/pci/host/Kconfig | 28 +
drivers/pci/host/Makefile | 3 +
drivers/pci/host/pci-imx6.c | 13 +-
drivers/pci/host/pci-keystone-dw.c | 516 +++++++++++
drivers/pci/host/pci-keystone.c | 415 +++++++++
drivers/pci/host/pci-keystone.h | 58 ++
drivers/pci/host/pci-mvebu.c | 6 +-
drivers/pci/host/pci-tegra.c | 277 +++++-
drivers/pci/host/pci-xgene.c | 659 ++++++++++++++
drivers/pci/host/pcie-designware.c | 268 +++---
drivers/pci/host/pcie-designware.h | 22 +-
drivers/pci/host/pcie-rcar.c | 21 +-
drivers/pci/host/pcie-spear13xx.c | 2 +-
drivers/pci/host/pcie-xilinx.c | 970 +++++++++++++++++++++
drivers/pci/hotplug/Makefile | 2 +-
drivers/pci/hotplug/acpi_pcihp.c | 254 +-----
drivers/pci/hotplug/acpiphp_glue.c | 11 +-
drivers/pci/hotplug/acpiphp_ibm.c | 2 +-
drivers/pci/hotplug/cpci_hotplug_core.c | 13 +-
drivers/pci/hotplug/cpcihp_generic.c | 28 +-
drivers/pci/hotplug/cpcihp_zt5550.c | 44 +-
drivers/pci/hotplug/cpqphp.h | 2 +-
drivers/pci/hotplug/cpqphp_core.c | 3 +-
drivers/pci/hotplug/cpqphp_ctrl.c | 19 +-
drivers/pci/hotplug/cpqphp_nvram.c | 13 +-
drivers/pci/hotplug/ibmphp_core.c | 19 +-
drivers/pci/hotplug/ibmphp_ebda.c | 3 +-
drivers/pci/hotplug/ibmphp_hpc.c | 3 +-
drivers/pci/hotplug/ibmphp_pci.c | 6 +-
drivers/pci/hotplug/ibmphp_res.c | 45 +-
drivers/pci/hotplug/pciehp.h | 2 +-
drivers/pci/hotplug/pciehp_core.c | 7 +
drivers/pci/hotplug/pciehp_hpc.c | 17 +-
drivers/pci/hotplug/pciehp_pci.c | 9 +-
drivers/pci/hotplug/pcihp_slot.c | 176 ----
drivers/pci/hotplug/shpchp_ctrl.c | 14 +-
drivers/pci/hotplug/shpchp_hpc.c | 5 +-
drivers/pci/hotplug/shpchp_pci.c | 8 +-
drivers/pci/iov.c | 2 +-
drivers/pci/msi.c | 75 +-
drivers/pci/pci-acpi.c | 276 +++++-
drivers/pci/pci-driver.c | 5 +-
drivers/pci/pci-sysfs.c | 41 +-
drivers/pci/pci.c | 57 +-
drivers/pci/pcie/aer/aerdrv_errprint.c | 11 +-
drivers/pci/pcie/portdrv_pci.c | 74 --
drivers/pci/probe.c | 167 +++-
drivers/pci/quirks.c | 112 +--
drivers/pci/search.c | 34 -
drivers/pci/setup-bus.c | 2 +-
drivers/scsi/vmw_pvscsi.h | 1 -
drivers/vfio/pci/vfio_pci_config.c | 2 +-
drivers/xen/xen-pciback/pci_stub.c | 4 +-
include/asm-generic/io.h | 2 +-
include/asm-generic/pgtable.h | 4 +
include/linux/aer.h | 2 +
include/linux/ioport.h | 5 +
include/linux/msi.h | 6 -
include/linux/of_address.h | 27 +-
include/linux/of_pci.h | 13 +
include/linux/pci.h | 60 +-
include/linux/pci_hotplug.h | 2 -
include/linux/pci_ids.h | 2 +
include/ras/ras_event.h | 48 +-
include/uapi/linux/pci_regs.h | 3 +-
kernel/resource.c | 70 ++
virt/kvm/assigned-dev.c | 2 +-
virt/kvm/iommu.c | 4 +-
111 files changed, 4904 insertions(+), 1333 deletions(-)
create mode 100644 Documentation/devicetree/bindings/pci/pci-keystone.txt
create mode 100644 Documentation/devicetree/bindings/pci/xgene-pci.txt
create mode 100644 Documentation/devicetree/bindings/pci/xilinx-pcie.txt
create mode 100644 arch/arm64/include/asm/pci.h
create mode 100644 arch/arm64/kernel/pci.c
create mode 100644 drivers/pci/host/pci-keystone-dw.c
create mode 100644 drivers/pci/host/pci-keystone.c
create mode 100644 drivers/pci/host/pci-keystone.h
create mode 100644 drivers/pci/host/pci-xgene.c
create mode 100644 drivers/pci/host/pcie-xilinx.c
delete mode 100644 drivers/pci/hotplug/pcihp_slot.c
Merging hid/for-next (3fd9127d236c Merge branch 'for-3.18/uhid' into for-next)
$ git merge hid/for-next
Merge made by the 'recursive' strategy.
.../ABI/testing/sysfs-class-hid-driver-gt683r | 14 +
Documentation/hid/uhid.txt | 179 +++++-----
drivers/hid/Kconfig | 11 +
drivers/hid/Makefile | 1 +
drivers/hid/hid-core.c | 7 +-
drivers/hid/hid-holtek-mouse.c | 4 +
drivers/hid/hid-ids.h | 7 +
drivers/hid/hid-input.c | 6 +
drivers/hid/hid-logitech-dj.c | 35 +-
drivers/hid/hid-penmount.c | 49 +++
drivers/hid/hid-picolcd_core.c | 4 +-
drivers/hid/hid-rmi.c | 44 ++-
drivers/hid/hid-sony.c | 100 +++---
drivers/hid/hid-thingm.c | 6 +-
drivers/hid/uhid.c | 394 ++++++++++++---------
drivers/hid/usbhid/hid-core.c | 60 ++--
drivers/hid/usbhid/hid-quirks.c | 3 +
drivers/hid/wacom.h | 6 +
drivers/hid/wacom_sys.c | 271 ++++++++++----
drivers/hid/wacom_wac.c | 312 ++++++++++++++++
drivers/hid/wacom_wac.h | 17 +
include/linux/hid.h | 3 +
include/uapi/linux/uhid.h | 120 +++++--
23 files changed, 1187 insertions(+), 466 deletions(-)
create mode 100644 Documentation/ABI/testing/sysfs-class-hid-driver-gt683r
create mode 100644 drivers/hid/hid-penmount.c
Merging i2c/i2c/for-next (6c97c9c1acfc i2c: cros-ec-tunnel: Add of match table)
$ git merge i2c/i2c/for-next
Merge made by the 'recursive' strategy.
drivers/i2c/busses/i2c-cros-ec-tunnel.c | 9 +++++++++
drivers/i2c/busses/i2c-designware-platdrv.c | 29 ++++++++++++++++++++++++++--
drivers/i2c/busses/i2c-imx.c | 8 ++++++++
drivers/i2c/busses/i2c-ismt.c | 2 +-
drivers/i2c/busses/i2c-rcar.c | 21 ++++++++++----------
drivers/i2c/busses/i2c-rk3x.c | 4 ++--
include/linux/platform_data/i2c-designware.h | 21 ++++++++++++++++++++
7 files changed, 79 insertions(+), 15 deletions(-)
create mode 100644 include/linux/platform_data/i2c-designware.h
Merging jdelvare-hwmon/master (c7208164e66f Linux 3.15-rc7)
$ git merge jdelvare-hwmon/master
Already up-to-date.
Merging hwmon-staging/hwmon-next (7ad8966f4f0a Merge tag 'mfd-hwmon-leds-watchdog-v3.18' into hwmon-next)
$ git merge hwmon-staging/hwmon-next
Auto-merging drivers/watchdog/Kconfig
Auto-merging drivers/leds/Makefile
Auto-merging drivers/leds/Kconfig
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
.../devicetree/bindings/hwmon/ntc_thermistor.txt | 3 +
Documentation/hwmon/k10temp | 2 +-
Documentation/hwmon/menf21bmc | 50 +++++
MAINTAINERS | 8 +
drivers/hwmon/Kconfig | 15 +-
drivers/hwmon/Makefile | 1 +
drivers/hwmon/ads1015.c | 21 +-
drivers/hwmon/da9052-hwmon.c | 54 +----
drivers/hwmon/da9055-hwmon.c | 52 +----
drivers/hwmon/k10temp.c | 157 +++++++-------
drivers/hwmon/menf21bmc_hwmon.c | 230 +++++++++++++++++++++
drivers/hwmon/ntc_thermistor.c | 25 +++
drivers/hwmon/smsc47b397.c | 51 +----
drivers/leds/Kconfig | 9 +
drivers/leds/Makefile | 1 +
drivers/leds/leds-menf21bmc.c | 131 ++++++++++++
drivers/mfd/Kconfig | 15 ++
drivers/mfd/Makefile | 1 +
drivers/mfd/menf21bmc.c | 132 ++++++++++++
drivers/watchdog/Kconfig | 10 +
drivers/watchdog/Makefile | 1 +
drivers/watchdog/menf21bmc_wdt.c | 203 ++++++++++++++++++
22 files changed, 946 insertions(+), 226 deletions(-)
create mode 100644 Documentation/hwmon/menf21bmc
create mode 100644 drivers/hwmon/menf21bmc_hwmon.c
create mode 100644 drivers/leds/leds-menf21bmc.c
create mode 100644 drivers/mfd/menf21bmc.c
create mode 100644 drivers/watchdog/menf21bmc_wdt.c
Merging v4l-dvb/master (6c239d99a592 Merge branch 'topic/si2165' into to_next)
$ git merge v4l-dvb/master
Removing drivers/staging/media/as102/as102_fe.c
Auto-merging drivers/media/usb/as102/as10x_handle.h
Auto-merging drivers/media/usb/as102/as10x_cmd_stream.c
Auto-merging drivers/media/usb/as102/as10x_cmd_cfg.c
Auto-merging drivers/media/usb/as102/as10x_cmd.h
Auto-merging drivers/media/usb/as102/as10x_cmd.c
Auto-merging drivers/media/usb/as102/as102_usb_drv.h
Auto-merging drivers/media/usb/as102/as102_usb_drv.c
Auto-merging drivers/media/usb/as102/as102_fw.h
Auto-merging drivers/media/usb/as102/as102_fw.c
Auto-merging drivers/media/usb/as102/as102_drv.h
Auto-merging drivers/media/usb/as102/as102_drv.c
Auto-merging drivers/media/usb/as102/Makefile
Removing drivers/media/tuners/tuner_it913x_priv.h
Removing drivers/media/tuners/tuner_it913x.c
Auto-merging drivers/media/tuners/it913x.h
Removing drivers/media/platform/vivi.c
Removing drivers/media/platform/coda.c
Auto-merging drivers/media/dvb-frontends/as102_fe_types.h
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
Documentation/DocBook/media/v4l/compat.xml | 6 +
Documentation/DocBook/media/v4l/controls.xml | 55 +
.../DocBook/media/v4l/pixfmt-packed-rgb.xml | 52 +-
Documentation/DocBook/media/v4l/vidioc-dqevent.xml | 7 +-
Documentation/DocBook/media/v4l/vidioc-g-edid.xml | 14 +-
.../DocBook/media/v4l/vidioc-subscribe-event.xml | 2 +-
.../devicetree/bindings/media/hix5hd2-ir.txt | 25 +
Documentation/dvb/get_dvb_firmware | 44 +-
Documentation/video4linux/vivid.txt | 1111 ++++++
MAINTAINERS | 28 +-
drivers/media/common/b2c2/flexcop.h | 2 +-
drivers/media/common/saa7146/saa7146_fops.c | 3 -
drivers/media/common/siano/sms-cards.c | 6 +
drivers/media/common/siano/sms-cards.h | 1 +
drivers/media/common/siano/smscoreapi.c | 4 +-
drivers/media/dvb-core/dmxdev.c | 7 +-
drivers/media/dvb-core/dvb-usb-ids.h | 2 +
drivers/media/dvb-core/dvb_frontend.c | 45 +-
drivers/media/dvb-core/dvb_frontend.h | 2 +
drivers/media/dvb-core/dvb_ringbuffer.c | 26 +
drivers/media/dvb-core/dvb_ringbuffer.h | 2 +
drivers/media/dvb-frontends/Kconfig | 21 +
drivers/media/dvb-frontends/Makefile | 4 +-
drivers/media/dvb-frontends/af9013.c | 24 +-
drivers/media/dvb-frontends/af9033.c | 757 ++--
drivers/media/dvb-frontends/af9033.h | 58 +-
drivers/media/dvb-frontends/af9033_priv.h | 1 +
drivers/media/dvb-frontends/as102_fe.c | 480 +++
drivers/media/dvb-frontends/as102_fe.h | 29 +
.../dvb-frontends/as102_fe_types.h} | 6 -
drivers/media/dvb-frontends/bcm3510.c | 6 +-
drivers/media/dvb-frontends/cxd2820r_c.c | 4 +-
drivers/media/dvb-frontends/cxd2820r_core.c | 4 +-
drivers/media/dvb-frontends/cxd2820r_t.c | 4 +-
drivers/media/dvb-frontends/dib7000p.c | 2 +-
drivers/media/dvb-frontends/drx39xyj/drxj.c | 38 +-
drivers/media/dvb-frontends/drxd_hard.c | 9 +-
drivers/media/dvb-frontends/drxk_hard.c | 37 +-
drivers/media/dvb-frontends/m88ds3103.c | 101 +-
drivers/media/dvb-frontends/m88ds3103.h | 35 +-
drivers/media/dvb-frontends/mb86a16.c | 6 +-
drivers/media/dvb-frontends/mb86a20s.c | 14 +-
drivers/media/dvb-frontends/mt312.c | 2 +-
drivers/media/dvb-frontends/or51211.c | 2 +-
drivers/media/dvb-frontends/rtl2832.c | 2 +-
drivers/media/dvb-frontends/rtl2832_sdr.c | 118 +-
drivers/media/dvb-frontends/si2165.c | 168 +-
drivers/media/dvb-frontends/si2165_priv.h | 2 +-
drivers/media/dvb-frontends/si2168.c | 131 +-
drivers/media/dvb-frontends/si2168.h | 6 +
drivers/media/dvb-frontends/si2168_priv.h | 2 +
drivers/media/dvb-frontends/si21xx.c | 3 +
drivers/media/dvb-frontends/sp2.c | 441 +++
drivers/media/dvb-frontends/sp2.h | 53 +
drivers/media/dvb-frontends/sp2_priv.h | 50 +
drivers/media/dvb-frontends/sp8870.c | 3 +-
drivers/media/dvb-frontends/stv0367.c | 12 +-
drivers/media/dvb-frontends/stv0900_core.c | 7 +-
drivers/media/dvb-frontends/stv0900_sw.c | 3 +-
drivers/media/dvb-frontends/tc90522.c | 840 +++++
drivers/media/dvb-frontends/tc90522.h | 42 +
drivers/media/dvb-frontends/tda10071.c | 2 +-
drivers/media/dvb-frontends/zl10039.c | 2 +-
drivers/media/firewire/firedtv-avc.c | 10 +
drivers/media/i2c/adv7343_regs.h | 2 +-
drivers/media/i2c/adv7604.c | 2 +-
drivers/media/i2c/adv7842.c | 4 +-
drivers/media/i2c/cx25840/cx25840-ir.c | 2 +-
drivers/media/i2c/lm3560.c | 4 +-
drivers/media/i2c/ov7670.c | 14 +-
drivers/media/i2c/s5k5baf.c | 2 +-
drivers/media/i2c/saa6752hs.c | 6 +-
drivers/media/i2c/smiapp/smiapp-core.c | 143 +-
drivers/media/i2c/smiapp/smiapp.h | 4 +
drivers/media/i2c/soc_camera/mt9t112.c | 4 +-
drivers/media/i2c/soc_camera/ov772x.c | 5 +-
drivers/media/i2c/soc_camera/ov9740.c | 4 +-
drivers/media/i2c/tda7432.c | 2 +-
drivers/media/i2c/tvp7002.c | 21 +-
drivers/media/i2c/vs6624.c | 14 +-
drivers/media/media-device.c | 6 +-
drivers/media/media-devnode.c | 3 +-
drivers/media/parport/pms.c | 7 +-
drivers/media/pci/Kconfig | 2 +
drivers/media/pci/Makefile | 3 +-
drivers/media/pci/bt8xx/bttv-driver.c | 5 +-
drivers/media/pci/bt8xx/dst_ca.c | 4 +-
drivers/media/pci/cx18/cx18-alsa-pcm.c | 2 +-
drivers/media/pci/cx18/cx18-firmware.c | 6 +-
drivers/media/pci/cx18/cx18-queue.c | 2 +-
drivers/media/pci/cx23885/Kconfig | 9 +-
drivers/media/pci/cx23885/Makefile | 1 -
drivers/media/pci/cx23885/altera-ci.c | 8 +-
drivers/media/pci/cx23885/altera-ci.h | 4 -
drivers/media/pci/cx23885/cimax2.c | 4 -
drivers/media/pci/cx23885/cimax2.h | 4 -
drivers/media/pci/cx23885/cx23885-417.c | 503 +--
drivers/media/pci/cx23885/cx23885-alsa.c | 109 +-
drivers/media/pci/cx23885/cx23885-av.c | 5 -
drivers/media/pci/cx23885/cx23885-av.h | 5 -
drivers/media/pci/cx23885/cx23885-cards.c | 32 +-
drivers/media/pci/cx23885/cx23885-core.c | 362 +-
drivers/media/pci/cx23885/cx23885-dvb.c | 323 +-
drivers/media/pci/cx23885/cx23885-f300.c | 4 -
drivers/media/pci/cx23885/cx23885-i2c.c | 12 -
drivers/media/pci/cx23885/cx23885-input.c | 5 -
drivers/media/pci/cx23885/cx23885-input.h | 5 -
drivers/media/pci/cx23885/cx23885-ioctl.c | 10 +-
drivers/media/pci/cx23885/cx23885-ioctl.h | 4 -
drivers/media/pci/cx23885/cx23885-ir.c | 5 -
drivers/media/pci/cx23885/cx23885-ir.h | 5 -
drivers/media/pci/cx23885/cx23885-reg.h | 4 -
drivers/media/pci/cx23885/cx23885-vbi.c | 284 +-
drivers/media/pci/cx23885/cx23885-video.c | 1294 ++-----
drivers/media/pci/cx23885/cx23885-video.h | 5 -
drivers/media/pci/cx23885/cx23885.h | 136 +-
drivers/media/pci/cx23885/cx23888-ir.c | 7 +-
drivers/media/pci/cx23885/cx23888-ir.h | 5 -
drivers/media/pci/cx23885/netup-eeprom.c | 4 -
drivers/media/pci/cx23885/netup-eeprom.h | 4 -
drivers/media/pci/cx23885/netup-init.c | 4 -
drivers/media/pci/cx23885/netup-init.h | 4 -
drivers/media/pci/cx25821/cx25821-video-upstream.c | 5 +-
drivers/media/pci/cx88/cx88-cards.c | 632 ++--
drivers/media/pci/cx88/cx88-video.c | 3 -
drivers/media/pci/ddbridge/ddbridge-core.c | 30 +-
drivers/media/pci/ddbridge/ddbridge.h | 12 +-
drivers/media/pci/dm1105/dm1105.c | 2 +-
drivers/media/pci/ivtv/ivtv-alsa-pcm.c | 2 +-
drivers/media/pci/ivtv/ivtv-firmware.c | 4 +-
drivers/media/pci/ivtv/ivtv-irq.c | 12 +-
drivers/media/pci/mantis/hopper_vp3028.c | 2 +-
drivers/media/pci/mantis/mantis_common.h | 2 +-
drivers/media/pci/mantis/mantis_vp1033.c | 4 +-
drivers/media/pci/mantis/mantis_vp1034.c | 2 +-
drivers/media/pci/mantis/mantis_vp1041.c | 4 +-
drivers/media/pci/mantis/mantis_vp2033.c | 4 +-
drivers/media/pci/mantis/mantis_vp2040.c | 4 +-
drivers/media/pci/mantis/mantis_vp3030.c | 4 +-
drivers/media/pci/ngene/ngene-cards.c | 2 +-
drivers/media/pci/ngene/ngene-core.c | 14 +-
drivers/media/pci/ngene/ngene-dvb.c | 7 +-
drivers/media/pci/ngene/ngene.h | 2 +-
drivers/media/pci/pt3/Kconfig | 10 +
drivers/media/pci/pt3/Makefile | 8 +
drivers/media/pci/pt3/pt3.c | 876 +++++
drivers/media/pci/pt3/pt3.h | 186 +
drivers/media/pci/pt3/pt3_dma.c | 225 ++
drivers/media/pci/pt3/pt3_i2c.c | 240 ++
drivers/media/pci/saa7134/Kconfig | 8 +
drivers/media/pci/saa7134/Makefile | 2 +
drivers/media/pci/saa7134/saa7134-cards.c | 29 +
drivers/media/pci/saa7134/saa7134-core.c | 10 +-
drivers/media/pci/saa7134/saa7134-go7007.c | 531 +++
drivers/media/pci/saa7134/saa7134-vbi.c | 2 +-
drivers/media/pci/saa7134/saa7134-video.c | 2 +-
drivers/media/pci/saa7134/saa7134.h | 5 +
drivers/media/pci/saa7164/saa7164-api.c | 3 +-
drivers/media/pci/saa7164/saa7164-core.c | 6 +-
drivers/media/pci/solo6x10/Kconfig | 1 +
drivers/media/pci/solo6x10/solo6x10-disp.c | 4 +-
drivers/media/pci/solo6x10/solo6x10-eeprom.c | 8 +-
drivers/media/pci/solo6x10/solo6x10.h | 4 +-
drivers/media/pci/sta2x11/Kconfig | 1 +
drivers/media/pci/sta2x11/sta2x11_vip.c | 2 +-
drivers/media/pci/ttpci/Kconfig | 4 +
drivers/media/pci/ttpci/Makefile | 2 +-
drivers/media/pci/ttpci/av7110.c | 8 +-
drivers/media/pci/tw68/Kconfig | 10 +
drivers/media/pci/tw68/Makefile | 3 +
drivers/media/pci/tw68/tw68-core.c | 434 +++
drivers/media/pci/tw68/tw68-reg.h | 195 +
drivers/media/pci/tw68/tw68-risc.c | 230 ++
drivers/media/pci/tw68/tw68-video.c | 1051 ++++++
drivers/media/pci/tw68/tw68.h | 231 ++
drivers/media/pci/zoran/zoran_device.c | 2 +-
drivers/media/platform/Kconfig | 54 +-
drivers/media/platform/Makefile | 8 +-
drivers/media/platform/blackfin/Kconfig | 1 +
drivers/media/platform/coda.c | 3933 --------------------
drivers/media/platform/coda/Makefile | 3 +
drivers/media/platform/coda/coda-bit.c | 1861 +++++++++
drivers/media/platform/coda/coda-common.c | 2052 ++++++++++
drivers/media/platform/coda/coda-h264.c | 37 +
drivers/media/platform/coda/coda.h | 287 ++
.../media/platform/{coda.h => coda/coda_regs.h} | 0
drivers/media/platform/davinci/Kconfig | 18 +-
drivers/media/platform/davinci/dm355_ccdc.c | 2 +-
drivers/media/platform/davinci/dm644x_ccdc.c | 14 +-
drivers/media/platform/davinci/vpfe_capture.c | 16 +-
drivers/media/platform/davinci/vpif.c | 1 +
drivers/media/platform/davinci/vpif_capture.c | 13 +-
drivers/media/platform/davinci/vpif_display.c | 22 +-
drivers/media/platform/exynos-gsc/gsc-core.c | 6 +-
drivers/media/platform/exynos-gsc/gsc-m2m.c | 3 -
drivers/media/platform/exynos-gsc/gsc-regs.c | 8 +-
drivers/media/platform/exynos4-is/Kconfig | 5 +-
drivers/media/platform/exynos4-is/fimc-is-errno.c | 4 +-
drivers/media/platform/exynos4-is/fimc-is-errno.h | 4 +-
drivers/media/platform/exynos4-is/fimc-is-param.c | 2 -
drivers/media/platform/exynos4-is/fimc-is.c | 10 +-
drivers/media/platform/exynos4-is/fimc-isp-video.c | 9 +-
drivers/media/platform/exynos4-is/media-dev.c | 4 +-
drivers/media/platform/exynos4-is/mipi-csis.c | 3 +-
drivers/media/platform/marvell-ccic/Kconfig | 2 +
drivers/media/platform/marvell-ccic/mcam-core.c | 2 +-
drivers/media/platform/mx2_emmaprp.c | 2 +-
drivers/media/platform/omap/Kconfig | 2 +-
drivers/media/platform/omap/omap_vout.c | 16 +-
drivers/media/platform/omap/omap_vout_vrfb.c | 10 +-
drivers/media/platform/omap/omap_vout_vrfb.h | 18 +-
drivers/media/platform/omap3isp/cfa_coef_table.h | 10 -
drivers/media/platform/omap3isp/gamma_table.h | 10 -
drivers/media/platform/omap3isp/isp.c | 20 +-
drivers/media/platform/omap3isp/isp.h | 10 -
drivers/media/platform/omap3isp/ispccdc.c | 424 ++-
drivers/media/platform/omap3isp/ispccdc.h | 21 +-
drivers/media/platform/omap3isp/ispccp2.c | 10 -
drivers/media/platform/omap3isp/ispccp2.h | 10 -
drivers/media/platform/omap3isp/ispcsi2.c | 10 -
drivers/media/platform/omap3isp/ispcsi2.h | 10 -
drivers/media/platform/omap3isp/ispcsiphy.c | 10 -
drivers/media/platform/omap3isp/ispcsiphy.h | 10 -
drivers/media/platform/omap3isp/isph3a.h | 10 -
drivers/media/platform/omap3isp/isph3a_aewb.c | 10 -
drivers/media/platform/omap3isp/isph3a_af.c | 10 -
drivers/media/platform/omap3isp/isphist.c | 10 -
drivers/media/platform/omap3isp/isphist.h | 10 -
drivers/media/platform/omap3isp/isppreview.c | 10 -
drivers/media/platform/omap3isp/isppreview.h | 10 -
drivers/media/platform/omap3isp/ispreg.h | 20 +-
drivers/media/platform/omap3isp/ispresizer.c | 80 +-
drivers/media/platform/omap3isp/ispresizer.h | 13 +-
drivers/media/platform/omap3isp/ispstat.c | 10 -
drivers/media/platform/omap3isp/ispstat.h | 10 -
drivers/media/platform/omap3isp/ispvideo.c | 59 +-
drivers/media/platform/omap3isp/ispvideo.h | 12 +-
.../media/platform/omap3isp/luma_enhance_table.h | 10 -
.../media/platform/omap3isp/noise_filter_table.h | 10 -
drivers/media/platform/s3c-camif/camif-capture.c | 4 +-
drivers/media/platform/s3c-camif/camif-regs.c | 4 +-
drivers/media/platform/s5p-g2d/g2d.c | 7 +-
drivers/media/platform/s5p-jpeg/jpeg-core.c | 2 +-
.../media/platform/s5p-jpeg/jpeg-hw-exynos3250.c | 2 +
drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c | 11 +-
drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c | 6 +-
drivers/media/platform/s5p-mfc/s5p_mfc.c | 83 +-
drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c | 1 +
drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c | 1 +
drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 6 +
drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 27 +-
drivers/media/platform/s5p-mfc/s5p_mfc_debug.h | 6 +-
drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 54 +-
drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 67 +-
drivers/media/platform/s5p-mfc/s5p_mfc_opr.c | 4 +-
drivers/media/platform/s5p-mfc/s5p_mfc_opr.h | 488 +--
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 31 +-
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 491 ++-
drivers/media/platform/s5p-mfc/s5p_mfc_pm.c | 2 +-
drivers/media/platform/s5p-tv/Kconfig | 4 +-
drivers/media/platform/s5p-tv/hdmi_drv.c | 2 +-
drivers/media/platform/s5p-tv/sdo_drv.c | 2 +-
drivers/media/platform/s5p-tv/sii9234_drv.c | 2 +-
drivers/media/platform/sh_veu.c | 4 +-
drivers/media/platform/soc_camera/Kconfig | 16 +-
drivers/media/platform/soc_camera/atmel-isi.c | 13 +-
drivers/media/platform/soc_camera/mx2_camera.c | 5 +-
drivers/media/platform/soc_camera/pxa_camera.c | 2 +-
drivers/media/platform/soc_camera/rcar_vin.c | 4 +-
drivers/media/platform/soc_camera/soc_camera.c | 21 +-
drivers/media/platform/ti-vpe/vpdma.c | 4 +-
drivers/media/platform/ti-vpe/vpe.c | 20 +-
drivers/media/platform/via-camera.c | 13 +-
drivers/media/platform/vivi.c | 1542 --------
drivers/media/platform/vivid/Kconfig | 19 +
drivers/media/platform/vivid/Makefile | 6 +
drivers/media/platform/vivid/vivid-core.c | 1390 +++++++
drivers/media/platform/vivid/vivid-core.h | 520 +++
drivers/media/platform/vivid/vivid-ctrls.c | 1502 ++++++++
drivers/media/platform/vivid/vivid-ctrls.h | 34 +
drivers/media/platform/vivid/vivid-kthread-cap.c | 886 +++++
drivers/media/platform/vivid/vivid-kthread-cap.h | 26 +
drivers/media/platform/vivid/vivid-kthread-out.c | 305 ++
drivers/media/platform/vivid/vivid-kthread-out.h | 26 +
drivers/media/platform/vivid/vivid-osd.c | 400 ++
drivers/media/platform/vivid/vivid-osd.h | 27 +
drivers/media/platform/vivid/vivid-radio-common.c | 189 +
drivers/media/platform/vivid/vivid-radio-common.h | 40 +
drivers/media/platform/vivid/vivid-radio-rx.c | 287 ++
drivers/media/platform/vivid/vivid-radio-rx.h | 31 +
drivers/media/platform/vivid/vivid-radio-tx.c | 141 +
drivers/media/platform/vivid/vivid-radio-tx.h | 29 +
drivers/media/platform/vivid/vivid-rds-gen.c | 166 +
drivers/media/platform/vivid/vivid-rds-gen.h | 53 +
drivers/media/platform/vivid/vivid-sdr-cap.c | 499 +++
drivers/media/platform/vivid/vivid-sdr-cap.h | 34 +
drivers/media/platform/vivid/vivid-tpg-colors.c | 310 ++
drivers/media/platform/vivid/vivid-tpg-colors.h | 64 +
drivers/media/platform/vivid/vivid-tpg.c | 1439 +++++++
drivers/media/platform/vivid/vivid-tpg.h | 439 +++
drivers/media/platform/vivid/vivid-vbi-cap.c | 371 ++
drivers/media/platform/vivid/vivid-vbi-cap.h | 40 +
drivers/media/platform/vivid/vivid-vbi-gen.c | 323 ++
drivers/media/platform/vivid/vivid-vbi-gen.h | 33 +
drivers/media/platform/vivid/vivid-vbi-out.c | 248 ++
drivers/media/platform/vivid/vivid-vbi-out.h | 34 +
drivers/media/platform/vivid/vivid-vid-cap.c | 1730 +++++++++
drivers/media/platform/vivid/vivid-vid-cap.h | 71 +
drivers/media/platform/vivid/vivid-vid-common.c | 571 +++
drivers/media/platform/vivid/vivid-vid-common.h | 61 +
drivers/media/platform/vivid/vivid-vid-out.c | 1146 ++++++
drivers/media/platform/vivid/vivid-vid-out.h | 56 +
drivers/media/radio/radio-gemtek.c | 2 +-
drivers/media/radio/radio-sf16fmi.c | 6 +-
drivers/media/radio/radio-sf16fmr2.c | 4 +-
drivers/media/radio/radio-tea5764.c | 12 +-
drivers/media/radio/si470x/radio-si470x-common.c | 4 +-
drivers/media/radio/si470x/radio-si470x-usb.c | 4 +-
drivers/media/radio/wl128x/fmdrv_common.c | 11 +-
drivers/media/radio/wl128x/fmdrv_rx.c | 10 +-
drivers/media/radio/wl128x/fmdrv_tx.c | 2 +-
drivers/media/rc/Kconfig | 15 +-
drivers/media/rc/Makefile | 1 +
drivers/media/rc/ene_ir.c | 2 +-
drivers/media/rc/fintek-cir.c | 6 +-
drivers/media/rc/img-ir/img-ir-hw.c | 6 -
drivers/media/rc/img-ir/img-ir-hw.h | 6 +
drivers/media/rc/imon.c | 304 +-
drivers/media/rc/ir-hix5hd2.c | 348 ++
drivers/media/rc/ite-cir.c | 3 +-
drivers/media/rc/keymaps/Makefile | 1 +
drivers/media/rc/keymaps/rc-dvbsky.c | 78 +
drivers/media/rc/lirc_dev.c | 14 +-
drivers/media/rc/mceusb.c | 15 +-
drivers/media/rc/nuvoton-cir.c | 6 +-
drivers/media/rc/st_rc.c | 16 +-
drivers/media/rc/streamzap.c | 6 +-
drivers/media/tuners/Kconfig | 17 +
drivers/media/tuners/Makefile | 4 +-
drivers/media/tuners/e4000.c | 75 +-
drivers/media/tuners/it913x.c | 478 +++
drivers/media/tuners/{tuner_it913x.h => it913x.h} | 41 +-
drivers/media/tuners/m88ts2022.c | 355 +-
drivers/media/tuners/m88ts2022_priv.h | 5 +-
drivers/media/tuners/msi001.c | 56 +-
drivers/media/tuners/mt2060.c | 3 +-
drivers/media/tuners/mt2063.c | 26 +-
drivers/media/tuners/mxl301rf.c | 349 ++
drivers/media/tuners/mxl301rf.h | 26 +
drivers/media/tuners/mxl5005s.c | 3 +-
drivers/media/tuners/qm1d1c0042.c | 448 +++
drivers/media/tuners/qm1d1c0042.h | 37 +
drivers/media/tuners/si2157.c | 86 +-
drivers/media/tuners/si2157.h | 2 +-
drivers/media/tuners/si2157_priv.h | 3 +-
drivers/media/tuners/tda18212.c | 272 +-
drivers/media/tuners/tda18212.h | 19 +-
drivers/media/tuners/tda18271-common.c | 19 +-
drivers/media/tuners/tda18271-priv.h | 4 +-
drivers/media/tuners/tuner-xc2028.c | 62 +-
drivers/media/tuners/tuner_it913x.c | 453 ---
drivers/media/tuners/tuner_it913x_priv.h | 78 -
drivers/media/tuners/xc4000.c | 62 +-
drivers/media/tuners/xc5000.c | 242 +-
drivers/media/usb/Kconfig | 4 +-
drivers/media/usb/Makefile | 4 +-
drivers/media/usb/airspy/airspy.c | 222 +-
drivers/{staging/media => media/usb}/as102/Kconfig | 0
.../{staging/media => media/usb}/as102/Makefile | 3 +-
.../{staging/media => media/usb}/as102/as102_drv.c | 152 +-
.../{staging/media => media/usb}/as102/as102_drv.h | 26 +-
.../{staging/media => media/usb}/as102/as102_fw.c | 4 -
.../{staging/media => media/usb}/as102/as102_fw.h | 4 -
.../media => media/usb}/as102/as102_usb_drv.c | 53 +-
.../media => media/usb}/as102/as102_usb_drv.h | 4 -
.../{staging/media => media/usb}/as102/as10x_cmd.c | 23 +-
.../{staging/media => media/usb}/as102/as10x_cmd.h | 108 +-
.../media => media/usb}/as102/as10x_cmd_cfg.c | 9 +-
.../media => media/usb}/as102/as10x_cmd_stream.c | 4 -
.../media => media/usb}/as102/as10x_handle.h | 7 +-
drivers/media/usb/au0828/au0828-cards.c | 36 +-
drivers/media/usb/au0828/au0828-core.c | 84 +-
drivers/media/usb/au0828/au0828-dvb.c | 110 +-
drivers/media/usb/au0828/au0828-i2c.c | 15 +-
drivers/media/usb/au0828/au0828-input.c | 36 +-
drivers/media/usb/au0828/au0828-vbi.c | 4 +-
drivers/media/usb/au0828/au0828-video.c | 90 +-
drivers/media/usb/au0828/au0828.h | 34 +-
drivers/media/usb/cx231xx/cx231xx-avcore.c | 14 +-
drivers/media/usb/cx231xx/cx231xx-cards.c | 10 +-
drivers/media/usb/cx231xx/cx231xx-core.c | 2 +-
drivers/media/usb/cx231xx/cx231xx-dvb.c | 8 +-
drivers/media/usb/dvb-usb-v2/Kconfig | 7 +
drivers/media/usb/dvb-usb-v2/Makefile | 3 +
drivers/media/usb/dvb-usb-v2/af9015.c | 2 +-
drivers/media/usb/dvb-usb-v2/af9035.c | 644 +++-
drivers/media/usb/dvb-usb-v2/af9035.h | 12 +-
drivers/media/usb/dvb-usb-v2/anysee.c | 185 +-
drivers/media/usb/dvb-usb-v2/anysee.h | 3 +
drivers/media/usb/dvb-usb-v2/dvb_usb.h | 3 +
drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 28 +-
drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c | 2 +-
drivers/media/usb/dvb-usb-v2/dvbsky.c | 460 +++
drivers/media/usb/dvb-usb-v2/lmedm04.c | 2 +-
drivers/media/usb/dvb-usb-v2/mxl111sf.c | 8 +-
drivers/media/usb/dvb-usb/Kconfig | 2 +-
drivers/media/usb/dvb-usb/af9005.c | 2 +-
drivers/media/usb/dvb-usb/cxusb.c | 130 +-
drivers/media/usb/dvb-usb/cxusb.h | 4 +
drivers/media/usb/dvb-usb/dib0700_devices.c | 383 +-
drivers/media/usb/dvb-usb/dibusb-common.c | 12 +-
drivers/media/usb/dvb-usb/dw2102.c | 14 +-
drivers/media/usb/dvb-usb/opera1.c | 4 +-
drivers/media/usb/dvb-usb/pctv452e.c | 8 +-
drivers/media/usb/em28xx/em28xx-audio.c | 10 +-
drivers/media/usb/em28xx/em28xx-cards.c | 43 +-
drivers/media/usb/em28xx/em28xx-core.c | 47 +-
drivers/media/usb/em28xx/em28xx-dvb.c | 37 +-
drivers/media/usb/em28xx/em28xx-input.c | 29 +-
drivers/media/usb/em28xx/em28xx-vbi.c | 11 -
drivers/media/usb/em28xx/em28xx-video.c | 29 +-
drivers/media/usb/em28xx/em28xx.h | 19 +-
drivers/media/usb/go7007/go7007-usb.c | 4 +-
drivers/media/usb/gspca/gspca.c | 5 +-
drivers/media/usb/gspca/gspca.h | 2 +-
drivers/media/usb/gspca/kinect.c | 12 +-
drivers/media/usb/gspca/sn9c20x.c | 12 +-
drivers/media/usb/hackrf/Kconfig | 10 +
drivers/media/usb/hackrf/Makefile | 1 +
drivers/media/usb/hackrf/hackrf.c | 1142 ++++++
drivers/media/usb/hdpvr/hdpvr-control.c | 21 +-
drivers/media/usb/hdpvr/hdpvr-core.c | 27 +-
drivers/media/usb/msi2500/msi2500.c | 174 +-
drivers/media/usb/pwc/pwc-v4l.c | 2 +-
drivers/media/usb/s2255/s2255drv.c | 2 +-
drivers/media/usb/siano/smsusb.c | 6 +-
drivers/media/usb/ttusb-dec/ttusbdecfe.c | 3 +
drivers/media/usb/usbtv/Kconfig | 3 +-
drivers/media/usb/usbtv/Makefile | 3 +-
drivers/media/usb/usbtv/usbtv-audio.c | 385 ++
drivers/media/usb/usbtv/usbtv-core.c | 17 +-
drivers/media/usb/usbtv/usbtv-video.c | 18 +-
drivers/media/usb/usbtv/usbtv.h | 21 +-
drivers/media/usb/uvc/uvc_ctrl.c | 60 +-
drivers/media/usb/uvc/uvc_driver.c | 20 +-
drivers/media/usb/uvc/uvc_v4l2.c | 1 +
drivers/media/usb/uvc/uvc_video.c | 10 +-
drivers/media/usb/uvc/uvcvideo.h | 5 +-
drivers/media/v4l2-core/tuner-core.c | 10 +-
drivers/media/v4l2-core/v4l2-common.c | 9 +-
drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 30 +-
drivers/media/v4l2-core/v4l2-ctrls.c | 6 +
drivers/media/v4l2-core/v4l2-dv-timings.c | 3 +-
drivers/media/v4l2-core/v4l2-ioctl.c | 6 +-
drivers/media/v4l2-core/v4l2-subdev.c | 9 +
drivers/media/v4l2-core/videobuf-core.c | 11 +-
drivers/media/v4l2-core/videobuf-dma-sg.c | 6 +-
drivers/media/v4l2-core/videobuf2-core.c | 66 +-
drivers/staging/media/Kconfig | 2 -
drivers/staging/media/Makefile | 1 -
drivers/staging/media/as102/as102_fe.c | 571 ---
drivers/staging/media/davinci_vpfe/Kconfig | 1 +
drivers/staging/media/dt3155v4l/Kconfig | 1 +
drivers/staging/media/lirc/lirc_imon.c | 1 +
drivers/staging/media/lirc/lirc_sasem.c | 1 +
drivers/staging/media/omap4iss/Kconfig | 1 +
include/media/davinci/dm644x_ccdc.h | 2 +-
include/media/omap3isp.h | 3 +
include/media/rc-map.h | 1 +
include/media/videobuf2-core.h | 15 +-
include/uapi/linux/Kbuild | 1 +
include/uapi/linux/smiapp.h | 29 +
include/uapi/linux/v4l2-controls.h | 6 +
include/uapi/linux/v4l2-dv-timings.h | 9 -
include/uapi/linux/videodev2.h | 13 +-
475 files changed, 36282 insertions(+), 13110 deletions(-)
create mode 100644 Documentation/devicetree/bindings/media/hix5hd2-ir.txt
create mode 100644 Documentation/video4linux/vivid.txt
create mode 100644 drivers/media/dvb-frontends/as102_fe.c
create mode 100644 drivers/media/dvb-frontends/as102_fe.h
rename drivers/{staging/media/as102/as10x_types.h => media/dvb-frontends/as102_fe_types.h} (95%)
create mode 100644 drivers/media/dvb-frontends/sp2.c
create mode 100644 drivers/media/dvb-frontends/sp2.h
create mode 100644 drivers/media/dvb-frontends/sp2_priv.h
create mode 100644 drivers/media/dvb-frontends/tc90522.c
create mode 100644 drivers/media/dvb-frontends/tc90522.h
create mode 100644 drivers/media/pci/pt3/Kconfig
create mode 100644 drivers/media/pci/pt3/Makefile
create mode 100644 drivers/media/pci/pt3/pt3.c
create mode 100644 drivers/media/pci/pt3/pt3.h
create mode 100644 drivers/media/pci/pt3/pt3_dma.c
create mode 100644 drivers/media/pci/pt3/pt3_i2c.c
create mode 100644 drivers/media/pci/saa7134/saa7134-go7007.c
create mode 100644 drivers/media/pci/tw68/Kconfig
create mode 100644 drivers/media/pci/tw68/Makefile
create mode 100644 drivers/media/pci/tw68/tw68-core.c
create mode 100644 drivers/media/pci/tw68/tw68-reg.h
create mode 100644 drivers/media/pci/tw68/tw68-risc.c
create mode 100644 drivers/media/pci/tw68/tw68-video.c
create mode 100644 drivers/media/pci/tw68/tw68.h
delete mode 100644 drivers/media/platform/coda.c
create mode 100644 drivers/media/platform/coda/Makefile
create mode 100644 drivers/media/platform/coda/coda-bit.c
create mode 100644 drivers/media/platform/coda/coda-common.c
create mode 100644 drivers/media/platform/coda/coda-h264.c
create mode 100644 drivers/media/platform/coda/coda.h
rename drivers/media/platform/{coda.h => coda/coda_regs.h} (100%)
delete mode 100644 drivers/media/platform/vivi.c
create mode 100644 drivers/media/platform/vivid/Kconfig
create mode 100644 drivers/media/platform/vivid/Makefile
create mode 100644 drivers/media/platform/vivid/vivid-core.c
create mode 100644 drivers/media/platform/vivid/vivid-core.h
create mode 100644 drivers/media/platform/vivid/vivid-ctrls.c
create mode 100644 drivers/media/platform/vivid/vivid-ctrls.h
create mode 100644 drivers/media/platform/vivid/vivid-kthread-cap.c
create mode 100644 drivers/media/platform/vivid/vivid-kthread-cap.h
create mode 100644 drivers/media/platform/vivid/vivid-kthread-out.c
create mode 100644 drivers/media/platform/vivid/vivid-kthread-out.h
create mode 100644 drivers/media/platform/vivid/vivid-osd.c
create mode 100644 drivers/media/platform/vivid/vivid-osd.h
create mode 100644 drivers/media/platform/vivid/vivid-radio-common.c
create mode 100644 drivers/media/platform/vivid/vivid-radio-common.h
create mode 100644 drivers/media/platform/vivid/vivid-radio-rx.c
create mode 100644 drivers/media/platform/vivid/vivid-radio-rx.h
create mode 100644 drivers/media/platform/vivid/vivid-radio-tx.c
create mode 100644 drivers/media/platform/vivid/vivid-radio-tx.h
create mode 100644 drivers/media/platform/vivid/vivid-rds-gen.c
create mode 100644 drivers/media/platform/vivid/vivid-rds-gen.h
create mode 100644 drivers/media/platform/vivid/vivid-sdr-cap.c
create mode 100644 drivers/media/platform/vivid/vivid-sdr-cap.h
create mode 100644 drivers/media/platform/vivid/vivid-tpg-colors.c
create mode 100644 drivers/media/platform/vivid/vivid-tpg-colors.h
create mode 100644 drivers/media/platform/vivid/vivid-tpg.c
create mode 100644 drivers/media/platform/vivid/vivid-tpg.h
create mode 100644 drivers/media/platform/vivid/vivid-vbi-cap.c
create mode 100644 drivers/media/platform/vivid/vivid-vbi-cap.h
create mode 100644 drivers/media/platform/vivid/vivid-vbi-gen.c
create mode 100644 drivers/media/platform/vivid/vivid-vbi-gen.h
create mode 100644 drivers/media/platform/vivid/vivid-vbi-out.c
create mode 100644 drivers/media/platform/vivid/vivid-vbi-out.h
create mode 100644 drivers/media/platform/vivid/vivid-vid-cap.c
create mode 100644 drivers/media/platform/vivid/vivid-vid-cap.h
create mode 100644 drivers/media/platform/vivid/vivid-vid-common.c
create mode 100644 drivers/media/platform/vivid/vivid-vid-common.h
create mode 100644 drivers/media/platform/vivid/vivid-vid-out.c
create mode 100644 drivers/media/platform/vivid/vivid-vid-out.h
create mode 100644 drivers/media/rc/ir-hix5hd2.c
create mode 100644 drivers/media/rc/keymaps/rc-dvbsky.c
create mode 100644 drivers/media/tuners/it913x.c
rename drivers/media/tuners/{tuner_it913x.h => it913x.h} (67%)
create mode 100644 drivers/media/tuners/mxl301rf.c
create mode 100644 drivers/media/tuners/mxl301rf.h
create mode 100644 drivers/media/tuners/qm1d1c0042.c
create mode 100644 drivers/media/tuners/qm1d1c0042.h
delete mode 100644 drivers/media/tuners/tuner_it913x.c
delete mode 100644 drivers/media/tuners/tuner_it913x_priv.h
rename drivers/{staging/media => media/usb}/as102/Kconfig (100%)
rename drivers/{staging/media => media/usb}/as102/Makefile (65%)
rename drivers/{staging/media => media/usb}/as102/as102_drv.c (66%)
rename drivers/{staging/media => media/usb}/as102/as102_drv.h (75%)
rename drivers/{staging/media => media/usb}/as102/as102_fw.c (96%)
rename drivers/{staging/media => media/usb}/as102/as102_fw.h (83%)
rename drivers/{staging/media => media/usb}/as102/as102_usb_drv.c (90%)
rename drivers/{staging/media => media/usb}/as102/as102_usb_drv.h (90%)
rename drivers/{staging/media => media/usb}/as102/as10x_cmd.c (92%)
rename drivers/{staging/media => media/usb}/as102/as10x_cmd.h (89%)
rename drivers/{staging/media => media/usb}/as102/as10x_cmd_cfg.c (93%)
rename drivers/{staging/media => media/usb}/as102/as10x_cmd_stream.c (96%)
rename drivers/{staging/media => media/usb}/as102/as10x_handle.h (88%)
create mode 100644 drivers/media/usb/dvb-usb-v2/dvbsky.c
create mode 100644 drivers/media/usb/hackrf/Kconfig
create mode 100644 drivers/media/usb/hackrf/Makefile
create mode 100644 drivers/media/usb/hackrf/hackrf.c
create mode 100644 drivers/media/usb/usbtv/usbtv-audio.c
delete mode 100644 drivers/staging/media/as102/as102_fe.c
create mode 100644 include/uapi/linux/smiapp.h
Merging kbuild/for-next (758cd932b2d5 Merge branch 'kbuild/kbuild' into kbuild/for-next)
$ git merge kbuild/for-next
Resolved 'scripts/tags.sh' using previous resolution.
Auto-merging scripts/tags.sh
CONFLICT (content): Merge conflict in scripts/tags.sh
Auto-merging lib/Kconfig.debug
Auto-merging kernel/gcov/Kconfig
Auto-merging arch/x86/Kconfig
Auto-merging Makefile
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 4edb3e4cdfed] Merge remote-tracking branch 'kbuild/for-next'
$ git diff -M --stat --summary HEAD^..
Documentation/kbuild/makefiles.txt | 94 ++++++---------
Documentation/lto-build | 173 ++++++++++++++++++++++++++
Makefile | 101 +++++++++-------
arch/x86/Kconfig | 2 +-
init/Kconfig | 73 +++++++++++
kernel/gcov/Kconfig | 2 +-
lib/Kconfig.debug | 2 +-
scripts/Makefile.build | 10 +-
scripts/Makefile.host | 6 +-
scripts/Makefile.lib | 9 ++
scripts/Makefile.lto | 84 +++++++++++++
scripts/Makefile.modpost | 7 +-
scripts/bootgraph.pl | 0
scripts/coccinelle/misc/simple_return.cocci | 180 ++++++++++++++++++++++++++++
scripts/export_report.pl | 0
scripts/gcc-goto.sh | 0
scripts/gcc-ld | 0
scripts/gcc-version.sh | 0
scripts/gcc-x86_32-has-stack-protector.sh | 0
scripts/gcc-x86_64-has-stack-protector.sh | 0
scripts/gen_initramfs_list.sh | 0
scripts/headers_check.pl | 0
scripts/headers_install.sh | 0
scripts/kconfig/Makefile | 38 +-----
scripts/kconfig/lxdialog/check-lxdialog.sh | 6 +-
scripts/kconfig/lxdialog/dialog.h | 2 +-
scripts/kconfig/streamline_config.pl | 0
scripts/link-vmlinux.sh | 2 +-
scripts/markup_oops.pl | 0
scripts/mkmakefile | 0
scripts/mksysmap | 0
scripts/package/builddeb | 24 ++--
scripts/package/buildtar | 0
scripts/profile2linkerlist.pl | 0
scripts/rt-tester/rt-tester.py | 0
scripts/selinux/install_policy.sh | 0
scripts/tags.sh | 10 +-
scripts/tracing/draw_functrace.py | 0
scripts/xz_wrap.sh | 0
39 files changed, 649 insertions(+), 176 deletions(-)
create mode 100644 Documentation/lto-build
create mode 100644 scripts/Makefile.lto
mode change 100644 => 100755 scripts/bootgraph.pl
create mode 100644 scripts/coccinelle/misc/simple_return.cocci
mode change 100644 => 100755 scripts/export_report.pl
mode change 100644 => 100755 scripts/gcc-goto.sh
mode change 100644 => 100755 scripts/gcc-ld
mode change 100644 => 100755 scripts/gcc-version.sh
mode change 100644 => 100755 scripts/gcc-x86_32-has-stack-protector.sh
mode change 100644 => 100755 scripts/gcc-x86_64-has-stack-protector.sh
mode change 100644 => 100755 scripts/gen_initramfs_list.sh
mode change 100644 => 100755 scripts/headers_check.pl
mode change 100644 => 100755 scripts/headers_install.sh
mode change 100644 => 100755 scripts/kconfig/lxdialog/check-lxdialog.sh
mode change 100644 => 100755 scripts/kconfig/streamline_config.pl
mode change 100644 => 100755 scripts/link-vmlinux.sh
mode change 100644 => 100755 scripts/markup_oops.pl
mode change 100644 => 100755 scripts/mkmakefile
mode change 100644 => 100755 scripts/mksysmap
mode change 100644 => 100755 scripts/package/builddeb
mode change 100644 => 100755 scripts/package/buildtar
mode change 100644 => 100755 scripts/profile2linkerlist.pl
mode change 100644 => 100755 scripts/rt-tester/rt-tester.py
mode change 100644 => 100755 scripts/selinux/install_policy.sh
mode change 100644 => 100755 scripts/tracing/draw_functrace.py
mode change 100644 => 100755 scripts/xz_wrap.sh
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 (3a9262e50dba Merge branch 'for-3.18' into for-next)
$ git merge libata/for-next
Merge made by the 'recursive' strategy.
.../devicetree/bindings/ata/qcom-sata.txt | 48 ++++++++++++++++++++++
arch/blackfin/mach-bf537/boards/cm_bf537e.c | 3 +-
arch/blackfin/mach-bf537/boards/cm_bf537u.c | 3 +-
arch/blackfin/mach-bf537/boards/stamp.c | 3 +-
arch/blackfin/mach-bf537/boards/tcm_bf537.c | 3 +-
arch/blackfin/mach-bf561/boards/cm_bf561.c | 3 +-
drivers/ata/ahci.c | 20 ++++-----
drivers/ata/ahci.h | 4 +-
drivers/ata/ahci_platform.c | 18 +-------
drivers/ata/ahci_xgene.c | 10 ++++-
drivers/ata/libahci_platform.c | 29 +------------
drivers/ata/libata-core.c | 37 +++++++----------
drivers/ata/libata-sff.c | 20 ++++-----
drivers/ata/pata_of_platform.c | 24 +++--------
drivers/ata/pata_platform.c | 4 +-
include/linux/ahci_platform.h | 13 ------
include/linux/ata_platform.h | 5 ---
include/linux/libata.h | 12 +++---
18 files changed, 110 insertions(+), 149 deletions(-)
create mode 100644 Documentation/devicetree/bindings/ata/qcom-sata.txt
Merging pm/linux-next (6f28c5c49468 Merge branch 'pm-devfreq' into linux-next)
$ git merge pm/linux-next
Auto-merging drivers/cpuidle/Kconfig.arm
Auto-merging arch/arm/mach-shmobile/pm-rmobile.c
Auto-merging arch/arm/mach-exynos/exynos.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
.../bindings/arm/exynos/power_domain.txt | 13 +-
.../devicetree/bindings/power/power_domain.txt | 49 ++
.../bindings/power/rockchip-io-domain.txt | 83 +++
Documentation/kernel-parameters.txt | 10 +-
Documentation/power/suspend-and-interrupts.txt | 123 ++++
MAINTAINERS | 4 +-
arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 23 +
arch/arm/mach-exynos/exynos.c | 1 -
arch/arm/mach-exynos/pm_domains.c | 78 +-
arch/arm/mach-s3c64xx/common.c | 5 -
arch/arm/mach-s3c64xx/common.h | 7 -
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-mini6410.c | 1 -
arch/arm/mach-s3c64xx/mach-ncp.c | 1 -
arch/arm/mach-s3c64xx/mach-real6410.c | 1 -
arch/arm/mach-s3c64xx/mach-smartq5.c | 1