Google Git
Sign in
kernel / pub / scm / linux / kernel / git / mpe / linux-next / a897436e0e233e84b664bb7f33c4e0d4d3e3bdad / . / Next / merge.log
blob: 0c1ab0d21e56bf6c1ae382afac159053c5ef1040 [file] [log] [blame]
$ date
Wednesday 8 April 09:57:44 AEST 2015
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at f22e6e847115 Linux 4.0-rc7
Merging origin/master (f22e6e847115 Linux 4.0-rc7)
$ git merge origin/master
Already up-to-date.
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 (c517d838eb7d Linux 4.0-rc1)
$ git merge kbuild-current/rc-fixes
Already up-to-date.
Merging arc-current/for-curr (e4140819dadc ARC: signal handling robustify)
$ git merge arc-current/for-curr
Already up-to-date.
Merging arm-current/fixes (f6ac49ba2949 ARM: vexpress: fix CPU hotplug with CT9x4 tile.)
$ git merge arm-current/fixes
Merge made by the 'recursive' strategy.
arch/arm/include/asm/elf.h | 2 +-
arch/arm/mach-vexpress/Kconfig | 1 +
arch/arm/mm/Kconfig | 2 +-
arch/arm/mm/dma-mapping.c | 27 +++++++++++++++++++++------
4 files changed, 24 insertions(+), 8 deletions(-)
Merging m68k-current/for-linus (4436820a98cd m68k/defconfig: Enable Ethernet bridging)
$ git merge m68k-current/for-linus
Already up-to-date.
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
$ 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 (c517d838eb7d Linux 4.0-rc1)
$ git merge powerpc-merge/merge
Already up-to-date.
Merging powerpc-merge-mpe/fixes (1cced5015b17 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
$ git merge powerpc-merge-mpe/fixes
Already up-to-date.
Merging sparc/master (90a5a895cc8b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge sparc/master
Already up-to-date.
Merging net/master (0ad2a8365975 netem: Fixes byte backlog accounting for the first of two chained netem instances)
$ git merge net/master
Merge made by the 'recursive' strategy.
net/sched/sch_netem.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Merging ipsec/master (092a29a40bab vti6: fix uninit when using x-netns)
$ git merge ipsec/master
Merge made by the 'recursive' strategy.
net/ipv6/ip6_vti.c | 3 +--
net/xfrm/xfrm_input.c | 10 +++++-----
2 files changed, 6 insertions(+), 7 deletions(-)
Merging sound-current/for-linus (9fc88ad6fd86 ALSA: usb-audio: don't try to get Benchmark DAC1 sample rate)
$ git merge sound-current/for-linus
Merge made by the 'recursive' strategy.
sound/pci/hda/patch_realtek.c | 16 ++++++++++++++++
sound/usb/quirks.c | 9 +++++++--
2 files changed, 23 insertions(+), 2 deletions(-)
Merging pci-current/for-linus (72061d93de31 PCI: Don't look for ACPI hotplug parameters if ACPI is disabled)
$ git merge pci-current/for-linus
Merge made by the 'recursive' strategy.
Documentation/DMA-API-HOWTO.txt | 29 +++++++++-------
Documentation/DMA-API.txt | 30 ++++++++--------
arch/sparc/kernel/pci.c | 7 +++-
arch/sparc/kernel/pci_common.c | 15 ++++++--
arch/sparc/kernel/pci_impl.h | 1 +
drivers/pci/Kconfig | 4 +++
drivers/pci/bus.c | 10 +++---
drivers/pci/host/pcie-designware.c | 2 +-
drivers/pci/host/pcie-spear13xx.c | 6 ++--
drivers/pci/hotplug/cpci_hotplug_pci.c | 3 +-
drivers/pci/pci-acpi.c | 3 ++
drivers/pci/pcie/aer/aerdrv_errprint.c | 12 ++-----
drivers/pci/probe.c | 63 ++++++++++++++++++++++++++++++----
include/linux/pci.h | 12 +++++--
include/linux/types.h | 12 +++++--
15 files changed, 148 insertions(+), 61 deletions(-)
Merging wireless-drivers/master (69628cd0652a Merge tag 'iwlwifi-for-kalle-2015-03-30' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
$ git merge wireless-drivers/master
Already up-to-date.
Merging driver-core.current/driver-core-linus (bc465aa9d045 Linux 4.0-rc5)
$ git merge driver-core.current/driver-core-linus
Already up-to-date.
Merging tty.current/tty-linus (f22e6e847115 Linux 4.0-rc7)
$ git merge tty.current/tty-linus
Already up-to-date.
Merging usb.current/usb-linus (f22e6e847115 Linux 4.0-rc7)
$ git merge usb.current/usb-linus
Already up-to-date.
Merging usb-gadget-fixes/fixes (65582a7f4ce5 usb: isp1760: fix spin unlock in the error path of isp1760_udc_start)
$ git merge usb-gadget-fixes/fixes
Already up-to-date.
Merging usb-serial-fixes/usb-linus (f22e6e847115 Linux 4.0-rc7)
$ git merge usb-serial-fixes/usb-linus
Already up-to-date.
Merging staging.current/staging-linus (f22e6e847115 Linux 4.0-rc7)
$ git merge staging.current/staging-linus
Already up-to-date.
Merging char-misc.current/char-misc-linus (bc465aa9d045 Linux 4.0-rc5)
$ git merge char-misc.current/char-misc-linus
Already up-to-date.
Merging input-current/for-linus (bd884149aca6 Input: elantech - fix absolute mode setting on some ASUS laptops)
$ git merge input-current/for-linus
Merge made by the 'recursive' strategy.
drivers/input/mouse/elantech.c | 22 ++++++++++++++++++++++
drivers/input/mouse/elantech.h | 1 +
2 files changed, 23 insertions(+)
Merging crypto-current/master (ccfe8c3f7e52 crypto: aesni - fix memory usage in GCM decryption)
$ git merge crypto-current/master
Already up-to-date.
Merging ide/master (b314acaccd7e Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
$ git merge ide/master
Already up-to-date.
Merging devicetree-current/devicetree/merge (41d9489319f2 drivers/of: Add empty ranges quirk for PA-Semi)
$ git merge devicetree-current/devicetree/merge
Already up-to-date.
Merging rr-fixes/fixes (f47689345931 lguest: update help text.)
$ git merge rr-fixes/fixes
Already up-to-date.
Merging vfio-fixes/for-linus (ec76f4007079 vfio-pci: Add missing break to enable VFIO_PCI_ERR_IRQ_INDEX)
$ git merge vfio-fixes/for-linus
Already up-to-date.
Merging kselftest-fixes/fixes (67d8712dcc70 selftests: Fix build failures when invoked from kselftest target)
$ git merge kselftest-fixes/fixes
Already up-to-date.
Merging drm-intel-fixes/for-linux-next-fixes (5df0582bf036 drm/i915/vlv: remove wait for previous GFX clk disable request)
$ git merge drm-intel-fixes/for-linux-next-fixes
Merge made by the 'recursive' strategy.
drivers/gpu/drm/i915/i915_drv.c | 14 ++------------
drivers/gpu/drm/i915/i915_drv.h | 1 +
2 files changed, 3 insertions(+), 12 deletions(-)
Merging asm-generic/master (643165c8bbc8 Merge tag 'uaccess_for_upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost into asm-generic)
$ git merge asm-generic/master
Already up-to-date.
Merging arc/for-next (18e1d1b115f7 arc: copy_thread(): rename 'arg' argument to 'kthread_arg')
$ git merge arc/for-next
Merge made by the 'recursive' strategy.
arch/arc/kernel/process.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
Merging arm/for-next (f40620630ac0 Merge branch 'devel-stable' into for-next)
$ git merge arm/for-next
Auto-merging arch/arm/Kconfig
Merge made by the 'recursive' strategy.
Documentation/devicetree/bindings/arm/pmu.txt | 2 +
.../bindings/arm/tegra/nvidia,tegra20-ahb.txt | 7 +-
arch/arm/Kconfig | 3 +-
arch/arm/Makefile | 10 +-
arch/arm/boot/compressed/head.S | 52 +-
arch/arm/include/asm/Kbuild | 1 -
arch/arm/include/asm/auxvec.h | 1 +
arch/arm/include/asm/cputype.h | 16 +
arch/arm/include/asm/elf.h | 9 +
arch/arm/include/asm/futex.h | 2 +-
arch/arm/include/asm/mmu.h | 3 +
arch/arm/include/asm/pmu.h | 1 +
arch/arm/include/asm/smp_plat.h | 1 +
arch/arm/include/asm/uaccess.h | 10 +-
arch/arm/include/asm/unified.h | 8 +
arch/arm/include/asm/vdso.h | 32 ++
arch/arm/include/asm/vdso_datapage.h | 60 +++
arch/arm/include/asm/word-at-a-time.h | 2 +-
arch/arm/include/uapi/asm/Kbuild | 1 +
arch/arm/include/uapi/asm/auxvec.h | 7 +
arch/arm/kernel/Makefile | 5 +-
arch/arm/kernel/asm-offsets.c | 5 +
arch/arm/kernel/bios32.c | 10 +-
arch/arm/kernel/entry-armv.S | 2 +-
arch/arm/kernel/head.S | 14 +-
arch/arm/kernel/hibernate.c | 6 +-
arch/arm/kernel/machine_kexec.c | 3 +-
arch/arm/kernel/module.c | 38 +-
arch/arm/kernel/perf_event.c | 21 +-
arch/arm/kernel/perf_event_cpu.c | 71 ++-
arch/arm/kernel/perf_event_v7.c | 525 ++++++++++++++++++---
arch/arm/kernel/process.c | 159 +------
arch/arm/kernel/psci-call.S | 31 ++
arch/arm/kernel/psci.c | 39 +-
arch/arm/kernel/reboot.c | 155 ++++++
arch/arm/kernel/reboot.h | 7 +
arch/arm/kernel/return_address.c | 4 +-
arch/arm/kernel/setup.c | 44 +-
arch/arm/kernel/sleep.S | 15 +-
arch/arm/kernel/smp.c | 5 +
arch/arm/kernel/swp_emulate.c | 2 +-
arch/arm/kernel/vdso.c | 337 +++++++++++++
arch/arm/kernel/vmlinux.lds.S | 7 +-
arch/arm/lib/clear_user.S | 2 +-
arch/arm/lib/copy_to_user.S | 2 +-
arch/arm/lib/csumpartialcopyuser.S | 2 +-
arch/arm/mach-exynos/sleep.S | 31 +-
arch/arm/mach-s5pv210/sleep.S | 2 +-
arch/arm/mm/Kconfig | 14 +
arch/arm/mm/alignment.c | 6 +-
arch/arm/mm/cache-l2x0.c | 7 +
arch/arm/mm/cache-v7.S | 38 +-
arch/arm/mm/dma-mapping.c | 89 ++--
arch/arm/mm/proc-arm1020.S | 4 +-
arch/arm/mm/proc-arm1020e.S | 4 +-
arch/arm/mm/proc-arm1022.S | 4 +-
arch/arm/mm/proc-arm1026.S | 4 +-
arch/arm/mm/proc-arm720.S | 4 +-
arch/arm/mm/proc-arm740.S | 4 +-
arch/arm/mm/proc-arm7tdmi.S | 4 +-
arch/arm/mm/proc-arm920.S | 4 +-
arch/arm/mm/proc-arm922.S | 4 +-
arch/arm/mm/proc-arm925.S | 4 +-
arch/arm/mm/proc-arm926.S | 4 +-
arch/arm/mm/proc-arm940.S | 4 +-
arch/arm/mm/proc-arm946.S | 4 +-
arch/arm/mm/proc-arm9tdmi.S | 4 +-
arch/arm/mm/proc-fa526.S | 4 +-
arch/arm/mm/proc-feroceon.S | 5 +-
arch/arm/mm/proc-macros.S | 4 +
arch/arm/mm/proc-mohawk.S | 4 +-
arch/arm/mm/proc-sa110.S | 4 +-
arch/arm/mm/proc-sa1100.S | 4 +-
arch/arm/mm/proc-v6.S | 4 +-
arch/arm/mm/proc-v7.S | 28 +-
arch/arm/mm/proc-v7m.S | 4 +-
arch/arm/mm/proc-xsc3.S | 4 +-
arch/arm/mm/proc-xscale.S | 4 +-
arch/arm/nwfpe/entry.S | 2 +-
arch/arm/vdso/.gitignore | 1 +
arch/arm/vdso/Makefile | 74 +++
arch/arm/vdso/datapage.S | 15 +
arch/arm/vdso/vdso.S | 35 ++
arch/arm/vdso/vdso.lds.S | 87 ++++
arch/arm/vdso/vdsomunge.c | 201 ++++++++
arch/arm/vdso/vgettimeofday.c | 282 +++++++++++
drivers/amba/tegra-ahb.c | 78 +--
include/asm-generic/vmlinux.lds.h | 2 +-
88 files changed, 2320 insertions(+), 508 deletions(-)
create mode 100644 arch/arm/include/asm/auxvec.h
create mode 100644 arch/arm/include/asm/vdso.h
create mode 100644 arch/arm/include/asm/vdso_datapage.h
create mode 100644 arch/arm/include/uapi/asm/auxvec.h
create mode 100644 arch/arm/kernel/psci-call.S
create mode 100644 arch/arm/kernel/reboot.c
create mode 100644 arch/arm/kernel/reboot.h
create mode 100644 arch/arm/kernel/vdso.c
create mode 100644 arch/arm/vdso/.gitignore
create mode 100644 arch/arm/vdso/Makefile
create mode 100644 arch/arm/vdso/datapage.S
create mode 100644 arch/arm/vdso/vdso.S
create mode 100644 arch/arm/vdso/vdso.lds.S
create mode 100644 arch/arm/vdso/vdsomunge.c
create mode 100644 arch/arm/vdso/vgettimeofday.c
Merging arm-perf/for-next/perf (874c571414d5 arm-cci: Fix CCI PMU event validation)
$ git merge arm-perf/for-next/perf
Auto-merging arch/arm/mach-vexpress/Kconfig
Merge made by the 'recursive' strategy.
Documentation/devicetree/bindings/arm/cci.txt | 7 +-
arch/arm/include/asm/arm-cci.h | 42 +++
arch/arm/mach-exynos/Kconfig | 2 +-
arch/arm/mach-vexpress/Kconfig | 4 +-
arch/arm64/include/asm/arm-cci.h | 27 ++
drivers/bus/Kconfig | 28 +-
drivers/bus/arm-cci.c | 517 +++++++++++++++-----------
include/linux/arm-cci.h | 9 +-
8 files changed, 399 insertions(+), 237 deletions(-)
create mode 100644 arch/arm/include/asm/arm-cci.h
create mode 100644 arch/arm64/include/asm/arm-cci.h
Merging arm-soc/for-next (f12318bc515f ARM: SoC: document merges)
$ git merge arm-soc/for-next
Removing include/linux/platform_data/mmc-msm_sdcc.h
Auto-merging drivers/pcmcia/Kconfig
Removing drivers/mmc/host/msm_sdcc.h
Removing drivers/mmc/host/msm_sdcc.c
Removing drivers/gpio/gpio-msm-v1.c
Auto-merging drivers/clocksource/timer-atmel-st.c
Auto-merging drivers/clocksource/Kconfig
Auto-merging arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
Auto-merging arch/arm64/boot/dts/qcom/apq8016-sbc.dts
Removing arch/arm/mach-shmobile/sleep-sh7372.S
Removing arch/arm/mach-shmobile/sh7372.h
Removing arch/arm/mach-shmobile/setup-sh7372.c
Removing arch/arm/mach-shmobile/r8a73a4.h
Removing arch/arm/mach-shmobile/pm-sh7372.c
Removing arch/arm/mach-shmobile/pm-r8a7791.c
Removing arch/arm/mach-shmobile/pm-r8a7790.c
Removing arch/arm/mach-shmobile/intc-sh7372.c
Removing arch/arm/mach-shmobile/include/mach/uncompress.h
Removing arch/arm/mach-shmobile/include/mach/system.h
Removing arch/arm/mach-shmobile/include/mach/sdhi.h
Removing arch/arm/mach-shmobile/include/mach/sdhi-sh7372.h
Removing arch/arm/mach-shmobile/include/mach/mmc.h
Removing arch/arm/mach-shmobile/include/mach/mmc-mackerel.h
Removing arch/arm/mach-shmobile/include/mach/head-mackerel.txt
Removing arch/arm/mach-shmobile/include/mach/clkdev.h
Removing arch/arm/mach-shmobile/entry-intc.S
Removing arch/arm/mach-shmobile/cpuidle.c
Removing arch/arm/mach-shmobile/clock-sh7372.c
Removing arch/arm/mach-shmobile/clock-r8a73a4.c
Removing arch/arm/mach-shmobile/board-mackerel.c
Removing arch/arm/mach-shmobile/board-kzm9g-reference.c
Removing arch/arm/mach-shmobile/board-ape6evm.c
Removing arch/arm/mach-shmobile/board-ape6evm-reference.c
Removing arch/arm/mach-qcom/scm.c
Removing arch/arm/mach-qcom/scm-boot.c
Removing arch/arm/mach-omap2/board-omap3touchbook.c
Removing arch/arm/mach-omap2/board-omap3stalker.c
Removing arch/arm/mach-omap2/board-devkit8000.c
Removing arch/arm/mach-msm/vreg.c
Removing arch/arm/mach-msm/smd_private.h
Removing arch/arm/mach-msm/smd_debug.c
Removing arch/arm/mach-msm/smd.c
Removing arch/arm/mach-msm/sirc.c
Removing arch/arm/mach-msm/proc_comm.h
Removing arch/arm/mach-msm/proc_comm.c
Removing arch/arm/mach-msm/last_radio_log.c
Removing arch/arm/mach-msm/irq.c
Removing arch/arm/mach-msm/irq-vic.c
Removing arch/arm/mach-msm/io.c
Removing arch/arm/mach-msm/include/mach/vreg.h
Removing arch/arm/mach-msm/include/mach/sirc.h
Removing arch/arm/mach-msm/include/mach/msm_smd.h
Removing arch/arm/mach-msm/include/mach/msm_iomap.h
Removing arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
Removing arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
Removing arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
Removing arch/arm/mach-msm/include/mach/msm_gpiomux.h
Removing arch/arm/mach-msm/include/mach/irqs.h
Removing arch/arm/mach-msm/include/mach/irqs-8x50.h
Removing arch/arm/mach-msm/include/mach/irqs-7x30.h
Removing arch/arm/mach-msm/include/mach/irqs-7x00.h
Removing arch/arm/mach-msm/include/mach/hardware.h
Removing arch/arm/mach-msm/include/mach/entry-macro.S
Removing arch/arm/mach-msm/include/mach/dma.h
Removing arch/arm/mach-msm/include/mach/clk.h
Removing arch/arm/mach-msm/gpiomux.h
Removing arch/arm/mach-msm/gpiomux.c
Removing arch/arm/mach-msm/gpiomux-v1.h
Removing arch/arm/mach-msm/gpiomux-8x50.c
Removing arch/arm/mach-msm/dma.c
Removing arch/arm/mach-msm/devices.h
Removing arch/arm/mach-msm/devices-qsd8x50.c
Removing arch/arm/mach-msm/devices-msm7x30.c
Removing arch/arm/mach-msm/devices-msm7x00.c
Removing arch/arm/mach-msm/common.h
Removing arch/arm/mach-msm/clock.h
Removing arch/arm/mach-msm/clock.c
Removing arch/arm/mach-msm/clock-pcom.h
Removing arch/arm/mach-msm/clock-pcom.c
Removing arch/arm/mach-msm/board-trout.h
Removing arch/arm/mach-msm/board-trout.c
Removing arch/arm/mach-msm/board-trout-panel.c
Removing arch/arm/mach-msm/board-trout-mmc.c
Removing arch/arm/mach-msm/board-trout-gpio.c
Removing arch/arm/mach-msm/board-sapphire.c
Removing arch/arm/mach-msm/board-qsd8x50.c
Removing arch/arm/mach-msm/board-msm7x30.c
Removing arch/arm/mach-msm/board-halibut.c
Removing arch/arm/mach-msm/Makefile.boot
Removing arch/arm/mach-msm/Makefile
Removing arch/arm/mach-msm/Kconfig
Removing arch/arm/mach-imx/mx25.h
Removing arch/arm/mach-imx/mm-imx25.c
Removing arch/arm/mach-imx/mach-mx25_3ds.c
Auto-merging arch/arm/mach-imx/mach-imx25.c
Removing arch/arm/mach-imx/mach-eukrea_cpuimx25.c
Removing arch/arm/mach-imx/iomux-mx25.h
Removing arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c
Removing arch/arm/mach-imx/ehci-imx25.c
Removing arch/arm/mach-imx/devices/platform-imxdi_rtc.c
Removing arch/arm/mach-imx/devices-imx25.h
Removing arch/arm/mach-at91/setup.c
Removing arch/arm/mach-at91/pm_slowclock.S
Removing arch/arm/mach-at91/include/mach/uncompress.h
Removing arch/arm/mach-at91/include/mach/sama5d4.h
Removing arch/arm/mach-at91/include/mach/sama5d3.h
Removing arch/arm/mach-at91/include/mach/hardware.h
Removing arch/arm/mach-at91/include/mach/cpu.h
Removing arch/arm/mach-at91/include/mach/at91sam9x5_matrix.h
Removing arch/arm/mach-at91/include/mach/at91sam9x5.h
Removing arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h
Removing arch/arm/mach-at91/include/mach/at91sam9rl.h
Removing arch/arm/mach-at91/include/mach/at91sam9n12_matrix.h
Removing arch/arm/mach-at91/include/mach/at91sam9n12.h
Removing arch/arm/mach-at91/include/mach/at91sam9g45_matrix.h
Removing arch/arm/mach-at91/include/mach/at91sam9g45.h
Removing arch/arm/mach-at91/include/mach/at91sam9263_matrix.h
Removing arch/arm/mach-at91/include/mach/at91sam9263.h
Removing arch/arm/mach-at91/include/mach/at91sam9261_matrix.h
Removing arch/arm/mach-at91/include/mach/at91sam9261.h
Removing arch/arm/mach-at91/include/mach/at91sam9260_matrix.h
Removing arch/arm/mach-at91/include/mach/at91sam9260.h
Removing arch/arm/mach-at91/include/mach/at91rm9200.h
Removing arch/arm/mach-at91/include/mach/at91_st.h
Removing arch/arm/mach-at91/include/mach/at91_matrix.h
Removing arch/arm/mach-at91/include/mach/at91_dbgu.h
Auto-merging arch/arm/mach-alpine/alpine_cpu_pm.h
Removing arch/arm/configs/msm_defconfig
Removing arch/arm/configs/mackerel_defconfig
Removing arch/arm/configs/ape6evm_defconfig
Removing arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
Removing arch/arm/boot/dts/sh7372.dtsi
Removing arch/arm/boot/dts/sh7372-mackerel.dts
Removing arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
Removing arch/arm/boot/dts/omap36xx-hs.dtsi
Removing arch/arm/boot/dts/omap34xx-hs.dtsi
Removing arch/arm/boot/compressed/sdhi-shmobile.h
Removing arch/arm/boot/compressed/sdhi-shmobile.c
Removing arch/arm/boot/compressed/sdhi-sh7372.c
Removing arch/arm/boot/compressed/mmcif-sh7372.c
Auto-merging arch/arm/Makefile
Auto-merging arch/arm/Kconfig
Auto-merging MAINTAINERS
Removing Documentation/devicetree/bindings/arm/geniatech.txt
Removing Documentation/arm/msm/gpiomux.txt
Removing Documentation/arm/SH-Mobile/zboot-rom-sdhi.txt
Removing Documentation/arm/SH-Mobile/zboot-rom-mmcif.txt
Removing Documentation/arm/SH-Mobile/vrl4.c
Removing Documentation/arm/SH-Mobile/Makefile
Removing Documentation/arm/Makefile
Merge made by the 'recursive' strategy.
Documentation/Makefile | 2 +-
Documentation/arm/00-INDEX | 2 -
Documentation/arm/Makefile | 1 -
Documentation/arm/Marvell/README | 5 +
Documentation/arm/SH-Mobile/Makefile | 7 -
Documentation/arm/SH-Mobile/vrl4.c | 170 --
Documentation/arm/SH-Mobile/zboot-rom-mmcif.txt | 29 -
Documentation/arm/SH-Mobile/zboot-rom-sdhi.txt | 42 -
Documentation/arm/msm/gpiomux.txt | 176 --
.../devicetree/bindings/arm/al,alpine.txt | 88 +
Documentation/devicetree/bindings/arm/amlogic.txt | 4 +
.../devicetree/bindings/arm/armada-39x.txt | 20 +
.../devicetree/bindings/arm/atmel-at91.txt | 4 +-
.../bindings/arm/cpu-enable-method/al,alpine-smp | 52 +
Documentation/devicetree/bindings/arm/cpus.txt | 1 +
.../bindings/arm/exynos/power_domain.txt | 3 +
.../devicetree/bindings/arm/geniatech.txt | 5 -
Documentation/devicetree/bindings/arm/gic.txt | 2 +
.../devicetree/bindings/arm/marvell,kirkwood.txt | 1 +
.../bindings/arm/msm/qcom,idle-state.txt | 84 +
.../devicetree/bindings/arm/msm/qcom,saw2.txt | 40 +-
Documentation/devicetree/bindings/arm/rockchip.txt | 4 +
Documentation/devicetree/bindings/arm/shmobile.txt | 8 -
.../bindings/arm/tegra/nvidia,tegra30-actmon.txt | 32 +
.../devicetree/bindings/bus/omap-ocp2scp.txt | 3 +-
.../devicetree/bindings/bus/renesas,bsc.txt | 46 +
.../devicetree/bindings/bus/simple-pm-bus.txt | 44 +
.../devicetree/bindings/clock/qcom,gcc.txt | 1 +
.../bindings/clock/renesas,r8a7778-cpg-clocks.txt | 25 +
.../devicetree/bindings/i2c/trivial-devices.txt | 1 +
.../devicetree/bindings/media/ti,omap3isp.txt | 71 +
.../devicetree/bindings/mfd/qcom,tcsr.txt | 22 +
.../devicetree/bindings/net/wireless/ti,wlcore.txt | 47 +
.../devicetree/bindings/power/fsl,imx-gpc.txt | 59 +
.../bindings/power/renesas,sysc-rmobile.txt | 1 +
.../devicetree/bindings/serial/atmel-usart.txt | 3 +-
.../devicetree/bindings/serial/omap_serial.txt | 20 +
.../devicetree/bindings/soc/mediatek/pwrap.txt | 58 +
.../devicetree/bindings/soc/qcom/qcom,gsbi.txt | 30 +-
.../devicetree/bindings/sound/omap-twl4030.txt | 3 +-
.../devicetree/bindings/vendor-prefixes.txt | 3 +
.../devicetree/bindings/video/atmel,lcdc.txt | 12 +-
MAINTAINERS | 31 +-
arch/arm/Kconfig | 63 +-
arch/arm/Kconfig.debug | 53 +-
arch/arm/Makefile | 3 +-
arch/arm/arm-soc-for-next-contents.txt | 216 ++
arch/arm/boot/compressed/Makefile | 15 -
arch/arm/boot/compressed/head-shmobile.S | 30 -
arch/arm/boot/compressed/mmcif-sh7372.c | 88 -
arch/arm/boot/compressed/sdhi-sh7372.c | 95 -
arch/arm/boot/compressed/sdhi-shmobile.c | 449 ----
arch/arm/boot/compressed/sdhi-shmobile.h | 11 -
arch/arm/boot/dts/Makefile | 31 +-
arch/arm/boot/dts/alpine-db.dts | 35 +
arch/arm/boot/dts/alpine.dtsi | 141 ++
arch/arm/boot/dts/am335x-chiliboard.dts | 112 +
arch/arm/boot/dts/am335x-chilisom.dtsi | 239 ++
arch/arm/boot/dts/am335x-evmsk.dts | 11 +
arch/arm/boot/dts/am335x-nano.dts | 18 +-
arch/arm/boot/dts/am4372.dtsi | 6 +-
arch/arm/boot/dts/am437x-idk-evm.dts | 22 +
arch/arm/boot/dts/am57xx-beagle-x15.dts | 58 +-
arch/arm/boot/dts/armada-370-db.dts | 2 +-
arch/arm/boot/dts/armada-370-mirabox.dts | 2 +-
arch/arm/boot/dts/armada-370-netgear-rn102.dts | 2 +-
arch/arm/boot/dts/armada-370-netgear-rn104.dts | 2 +-
arch/arm/boot/dts/armada-370-rd.dts | 2 +-
arch/arm/boot/dts/armada-370-synology-ds213j.dts | 3 +-
arch/arm/boot/dts/armada-370-xp.dtsi | 11 +-
arch/arm/boot/dts/armada-370.dtsi | 3 +-
arch/arm/boot/dts/armada-375-db.dts | 2 +-
arch/arm/boot/dts/armada-375.dtsi | 15 +-
arch/arm/boot/dts/armada-385-db-ap.dts | 44 +-
arch/arm/boot/dts/armada-388-db.dts | 4 +-
arch/arm/boot/dts/armada-388-gp.dts | 5 +-
arch/arm/boot/dts/armada-388-rd.dts | 12 +-
arch/arm/boot/dts/armada-38x.dtsi | 23 +-
arch/arm/boot/dts/armada-390.dtsi | 57 +
arch/arm/boot/dts/armada-398-db.dts | 153 ++
arch/arm/boot/dts/armada-398.dtsi | 60 +
arch/arm/boot/dts/armada-39x.dtsi | 508 ++++
arch/arm/boot/dts/armada-xp-axpwifiap.dts | 2 +-
arch/arm/boot/dts/armada-xp-db.dts | 2 +-
arch/arm/boot/dts/armada-xp-gp.dts | 2 +-
arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 3 +-
arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 393 ++++
arch/arm/boot/dts/armada-xp-matrix.dts | 2 +-
arch/arm/boot/dts/armada-xp-mv78260.dtsi | 1 -
arch/arm/boot/dts/armada-xp-mv78460.dtsi | 1 -
arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 2 +-
arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 2 +-
arch/arm/boot/dts/armada-xp-synology-ds414.dts | 3 +-
arch/arm/boot/dts/armada-xp.dtsi | 8 +-
arch/arm/boot/dts/at91-sama5d3_xplained.dts | 14 +
arch/arm/boot/dts/at91-sama5d4_xplained.dts | 241 ++
arch/arm/boot/dts/at91-sama5d4ek.dts | 55 +-
arch/arm/boot/dts/at91rm9200.dtsi | 8 +-
arch/arm/boot/dts/at91sam9260.dtsi | 2 +-
arch/arm/boot/dts/at91sam9261.dtsi | 2 +-
arch/arm/boot/dts/at91sam9263.dtsi | 2 +-
arch/arm/boot/dts/at91sam9g25.dtsi | 1 +
arch/arm/boot/dts/at91sam9g25ek.dts | 18 +
arch/arm/boot/dts/at91sam9g45.dtsi | 2 +-
arch/arm/boot/dts/at91sam9n12.dtsi | 11 +-
arch/arm/boot/dts/at91sam9n12ek.dts | 18 +
arch/arm/boot/dts/at91sam9rl.dtsi | 2 +-
arch/arm/boot/dts/at91sam9x5.dtsi | 2 +-
arch/arm/boot/dts/at91sam9x5_isi.dtsi | 46 +
arch/arm/boot/dts/at91sam9x5cm.dtsi | 4 +
arch/arm/boot/dts/at91sam9x5ek.dtsi | 48 +
arch/arm/boot/dts/bcm-cygnus.dtsi | 78 +
arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 4 +-
arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 77 +
arch/arm/boot/dts/bcm7445.dtsi | 14 +-
arch/arm/boot/dts/bcm911360_entphn.dts | 13 +
arch/arm/boot/dts/bcm958300k.dts | 8 +
arch/arm/boot/dts/bcm958305k.dts | 53 +
arch/arm/boot/dts/dm8168-evm.dts | 14 +-
arch/arm/boot/dts/dm816x.dtsi | 60 +
arch/arm/boot/dts/dove.dtsi | 63 +-
arch/arm/boot/dts/dra7-evm.dts | 8 +
arch/arm/boot/dts/dra7.dtsi | 30 +-
arch/arm/boot/dts/dra72-evm.dts | 8 +
arch/arm/boot/dts/dra72x.dtsi | 5 +
arch/arm/boot/dts/dra74x.dtsi | 5 +
arch/arm/boot/dts/dra7xx-clocks.dtsi | 8 +
arch/arm/boot/dts/emev2-kzm9d.dts | 13 +
arch/arm/boot/dts/emev2.dtsi | 10 +
arch/arm/boot/dts/exynos3250.dtsi | 4 +
arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 14 +
arch/arm/boot/dts/exynos5250-snow.dts | 57 +-
arch/arm/boot/dts/exynos5250-spring.dts | 21 +-
arch/arm/boot/dts/exynos5250.dtsi | 2 +-
arch/arm/boot/dts/exynos5420-arndale-octa.dts | 4 +-
arch/arm/boot/dts/exynos5420-peach-pit.dts | 99 +-
arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 7 +
arch/arm/boot/dts/exynos5420-smdk5420.dts | 7 +-
arch/arm/boot/dts/exynos5420.dtsi | 10 +-
arch/arm/boot/dts/exynos5422-odroidxu3.dts | 21 +-
arch/arm/boot/dts/exynos5800-peach-pi.dts | 71 +-
arch/arm/boot/dts/kirkwood-nas2big.dts | 143 ++
arch/arm/boot/dts/kirkwood-net2big.dts | 5 +
arch/arm/boot/dts/meson.dtsi | 20 +
arch/arm/boot/dts/meson6-atv1200.dts | 4 +
arch/arm/boot/dts/meson8-minix-neo-x8.dts | 128 ++
arch/arm/boot/dts/meson8.dtsi | 68 +
arch/arm/boot/dts/mt6589.dtsi | 5 +
arch/arm/boot/dts/mt8135-pinfunc.h | 1302 +++++++++++
arch/arm/boot/dts/mt8135.dtsi | 25 +
arch/arm/boot/dts/nspire-classic.dtsi | 5 +
arch/arm/boot/dts/nspire-cx.dts | 4 +
arch/arm/boot/dts/nspire.dtsi | 21 +
arch/arm/boot/dts/omap3-beagle-xm.dts | 1 -
arch/arm/boot/dts/omap3-beagle.dts | 53 +-
arch/arm/boot/dts/omap3-cm-t3517.dts | 10 +
arch/arm/boot/dts/omap3-cm-t3730.dts | 10 +
arch/arm/boot/dts/omap3-cm-t3x30.dtsi | 1 -
arch/arm/boot/dts/omap3-devkit8000.dts | 1 -
arch/arm/boot/dts/omap3-evm-common.dtsi | 10 +
arch/arm/boot/dts/omap3-gta04.dtsi | 1 -
arch/arm/boot/dts/omap3-igep.dtsi | 1 -
arch/arm/boot/dts/omap3-igep0020-rev-f.dts | 9 +
arch/arm/boot/dts/omap3-igep0030-rev-g.dts | 9 +
arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 1 -
arch/arm/boot/dts/omap3-n9.dts | 37 +
arch/arm/boot/dts/omap3-n900.dts | 16 +-
arch/arm/boot/dts/omap3-n950-n9.dtsi | 2 +-
arch/arm/boot/dts/omap3-n950.dts | 37 +
arch/arm/boot/dts/omap3-overo-base.dtsi | 1 -
arch/arm/boot/dts/omap3-pandora-1ghz.dts | 70 +
arch/arm/boot/dts/omap3-pandora-600mhz.dts | 65 +
arch/arm/boot/dts/omap3-pandora-common.dtsi | 640 ++++++
arch/arm/boot/dts/omap3-tao3530.dtsi | 12 +-
arch/arm/boot/dts/omap3-zoom3.dts | 10 +
arch/arm/boot/dts/omap34xx-hs.dtsi | 16 -
arch/arm/boot/dts/omap34xx.dtsi | 17 +
arch/arm/boot/dts/omap36xx-hs.dtsi | 16 -
arch/arm/boot/dts/omap36xx.dtsi | 17 +
arch/arm/boot/dts/omap4-cpu-thermal.dtsi | 4 +-
arch/arm/boot/dts/omap4-panda-common.dtsi | 10 +
arch/arm/boot/dts/omap4-sdp.dts | 11 +
arch/arm/boot/dts/omap4-var-som-om44-wlan.dtsi | 10 +
arch/arm/boot/dts/qcom-apq8064.dtsi | 51 +-
arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 2 +
arch/arm/boot/dts/qcom-apq8084-ifc6540.dts | 1 +
arch/arm/boot/dts/qcom-apq8084-mtp.dts | 1 +
arch/arm/boot/dts/qcom-apq8084.dtsi | 56 +-
arch/arm/boot/dts/qcom-ipq8064.dtsi | 38 +
arch/arm/boot/dts/qcom-msm8660.dtsi | 8 +
arch/arm/boot/dts/qcom-msm8960.dtsi | 15 +
.../boot/dts/qcom-msm8974-sony-xperia-honami.dts | 2 +
arch/arm/boot/dts/qcom-msm8974.dtsi | 56 +-
arch/arm/boot/dts/qcom-pm8841.dtsi | 18 +
arch/arm/boot/dts/qcom-pm8941.dtsi | 18 +
arch/arm/boot/dts/qcom-pma8084.dtsi | 18 +
arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 156 --
arch/arm/boot/dts/r8a73a4-ape6evm.dts | 59 +-
arch/arm/boot/dts/r8a73a4.dtsi | 557 ++++-
arch/arm/boot/dts/r8a7740.dtsi | 79 +-
arch/arm/boot/dts/r8a7778-bockw.dts | 174 ++
arch/arm/boot/dts/r8a7778.dtsi | 293 +++
arch/arm/boot/dts/r8a7779-marzen.dts | 9 +
arch/arm/boot/dts/r8a7790-lager.dts | 87 +
arch/arm/boot/dts/r8a7790.dtsi | 259 ++-
arch/arm/boot/dts/r8a7791-henninger.dts | 11 +
arch/arm/boot/dts/r8a7791-koelsch.dts | 87 +-
arch/arm/boot/dts/r8a7791.dtsi | 278 ++-
arch/arm/boot/dts/r8a7794-alt.dts | 13 +
arch/arm/boot/dts/r8a7794.dtsi | 157 +-
arch/arm/boot/dts/rk3188-radxarock.dts | 16 +
arch/arm/boot/dts/rk3288-evb-act8846.dts | 10 +
arch/arm/boot/dts/rk3288-evb-rk808.dts | 7 +
arch/arm/boot/dts/rk3288-evb.dtsi | 13 +
arch/arm/boot/dts/rk3288-firefly.dtsi | 20 +
arch/arm/boot/dts/rk3288-popmetal.dts | 447 ++++
arch/arm/boot/dts/rk3288.dtsi | 35 +
arch/arm/boot/dts/sama5d3.dtsi | 36 +-
arch/arm/boot/dts/sama5d35ek.dts | 2 -
arch/arm/boot/dts/sama5d3_can.dtsi | 2 +-
arch/arm/boot/dts/sama5d3_emac.dtsi | 2 +-
arch/arm/boot/dts/sama5d3_gmac.dtsi | 2 +-
arch/arm/boot/dts/sama5d3_lcd.dtsi | 207 +-
arch/arm/boot/dts/sama5d3_mci2.dtsi | 2 +-
arch/arm/boot/dts/sama5d3_tcb1.dtsi | 2 +-
arch/arm/boot/dts/sama5d3_uart.dtsi | 2 +-
arch/arm/boot/dts/sama5d4.dtsi | 344 ++-
arch/arm/boot/dts/sh7372-mackerel.dts | 26 -
arch/arm/boot/dts/sh7372.dtsi | 35 -
arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 366 ---
arch/arm/boot/dts/sh73a0-kzm9g.dts | 378 ++-
arch/arm/boot/dts/sh73a0.dtsi | 245 +-
arch/arm/boot/dts/tegra124-jetson-tk1-emc.dtsi | 2421 ++++++++++++++++++++
arch/arm/boot/dts/tegra124-jetson-tk1.dts | 559 +++--
arch/arm/boot/dts/tegra124-nyan-big-emc.dtsi | 2023 ++++++++++++++++
arch/arm/boot/dts/tegra124-nyan-big.dts | 2121 +++++++++--------
arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi | 2049 +++++++++++++++++
arch/arm/boot/dts/tegra124-nyan-blaze.dts | 1334 +++++++++++
arch/arm/boot/dts/tegra124-nyan.dtsi | 695 ++++++
arch/arm/boot/dts/tegra124.dtsi | 19 +
arch/arm/boot/dts/tegra30-beaver.dts | 1653 ++++++++++++-
arch/arm/common/mcpm_entry.c | 202 +-
arch/arm/configs/ape6evm_defconfig | 109 -
arch/arm/configs/at91_dt_defconfig | 5 +-
arch/arm/configs/exynos_defconfig | 20 +-
arch/arm/configs/imx_v4_v5_defconfig | 4 +-
arch/arm/configs/imx_v6_v7_defconfig | 4 +
arch/arm/configs/mackerel_defconfig | 157 --
arch/arm/configs/msm_defconfig | 121 -
arch/arm/configs/multi_v5_defconfig | 2 +-
arch/arm/configs/multi_v7_defconfig | 12 +-
arch/arm/configs/mvebu_v7_defconfig | 2 +
arch/arm/configs/mxs_defconfig | 1 +
arch/arm/configs/omap1_defconfig | 16 -
arch/arm/configs/omap2plus_defconfig | 27 +
arch/arm/configs/qcom_defconfig | 9 +-
arch/arm/configs/shmobile_defconfig | 9 +-
arch/arm/configs/sunxi_defconfig | 1 +
arch/arm/include/asm/mcpm.h | 65 +-
arch/arm/include/debug/msm.S | 14 -
arch/arm/mach-alpine/Kconfig | 10 +
arch/arm/mach-alpine/Makefile | 2 +
arch/arm/mach-alpine/alpine_cpu_pm.c | 70 +
.../mach/io.h => mach-alpine/alpine_cpu_pm.h} | 21 +-
arch/arm/mach-alpine/alpine_cpu_resume.h | 38 +
arch/arm/mach-alpine/alpine_machine.c | 28 +
arch/arm/mach-alpine/platsmp.c | 49 +
arch/arm/mach-at91/Kconfig | 132 +-
arch/arm/mach-at91/Makefile | 8 +-
arch/arm/mach-at91/at91rm9200.c | 46 +-
arch/arm/mach-at91/at91sam9.c | 76 +-
arch/arm/mach-at91/generic.h | 7 -
arch/arm/mach-at91/include/mach/at91_dbgu.h | 63 -
arch/arm/mach-at91/include/mach/at91_matrix.h | 23 -
arch/arm/mach-at91/include/mach/at91_st.h | 61 -
arch/arm/mach-at91/include/mach/at91rm9200.h | 103 -
arch/arm/mach-at91/include/mach/at91sam9260.h | 129 --
.../mach-at91/include/mach/at91sam9260_matrix.h | 80 -
arch/arm/mach-at91/include/mach/at91sam9261.h | 99 -
.../mach-at91/include/mach/at91sam9261_matrix.h | 64 -
arch/arm/mach-at91/include/mach/at91sam9263.h | 117 -
.../mach-at91/include/mach/at91sam9263_matrix.h | 129 --
arch/arm/mach-at91/include/mach/at91sam9_smc.h | 2 -
arch/arm/mach-at91/include/mach/at91sam9g45.h | 143 --
.../mach-at91/include/mach/at91sam9g45_matrix.h | 153 --
arch/arm/mach-at91/include/mach/at91sam9n12.h | 65 -
.../mach-at91/include/mach/at91sam9n12_matrix.h | 53 -
arch/arm/mach-at91/include/mach/at91sam9rl.h | 105 -
.../arm/mach-at91/include/mach/at91sam9rl_matrix.h | 96 -
arch/arm/mach-at91/include/mach/at91sam9x5.h | 71 -
.../arm/mach-at91/include/mach/at91sam9x5_matrix.h | 53 -
arch/arm/mach-at91/include/mach/cpu.h | 216 --
arch/arm/mach-at91/include/mach/hardware.h | 134 --
arch/arm/mach-at91/include/mach/sama5d3.h | 86 -
arch/arm/mach-at91/include/mach/sama5d4.h | 33 -
arch/arm/mach-at91/include/mach/uncompress.h | 218 --
arch/arm/mach-at91/pm.c | 151 +-
arch/arm/mach-at91/pm.h | 14 +-
arch/arm/mach-at91/pm_slowclock.S | 335 ---
arch/arm/mach-at91/pm_suspend.S | 337 +++
arch/arm/mach-at91/sama5.c | 95 +-
arch/arm/mach-at91/setup.c | 330 ---
arch/arm/mach-at91/soc.c | 97 +
arch/arm/mach-at91/soc.h | 78 +
arch/arm/mach-cns3xxx/pm.c | 1 -
arch/arm/mach-davinci/Kconfig | 11 -
arch/arm/mach-davinci/asp.h | 7 +
arch/arm/mach-davinci/board-da850-evm.c | 112 -
arch/arm/mach-davinci/devices-da8xx.c | 80 +-
arch/arm/mach-davinci/dm646x.c | 24 +-
arch/arm/mach-davinci/include/mach/irqs.h | 2 +-
arch/arm/mach-exynos/common.h | 6 +
arch/arm/mach-exynos/exynos.c | 3 +-
arch/arm/mach-exynos/firmware.c | 33 +-
arch/arm/mach-exynos/mcpm-exynos.c | 247 +-
arch/arm/mach-exynos/platsmp.c | 23 +-
arch/arm/mach-exynos/pm.c | 14 +-
arch/arm/mach-exynos/pm_domains.c | 29 +-
arch/arm/mach-exynos/regs-pmu.h | 3 +
arch/arm/mach-exynos/smc.h | 9 +
arch/arm/mach-exynos/suspend.c | 22 +-
arch/arm/mach-imx/Kconfig | 84 +-
arch/arm/mach-imx/Makefile | 8 +-
arch/arm/mach-imx/clk-imx25.c | 75 -
arch/arm/mach-imx/clk-imx6q.c | 8 +-
arch/arm/mach-imx/common.h | 5 -
arch/arm/mach-imx/cpu-imx25.c | 11 +-
arch/arm/mach-imx/devices-imx25.h | 85 -
arch/arm/mach-imx/devices/Kconfig | 3 -
arch/arm/mach-imx/devices/Makefile | 1 -
arch/arm/mach-imx/devices/platform-fec.c | 5 -
arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c | 5 -
arch/arm/mach-imx/devices/platform-imx-fb.c | 5 -
arch/arm/mach-imx/devices/platform-imx-i2c.c | 10 -
arch/arm/mach-imx/devices/platform-imx-keypad.c | 5 -
arch/arm/mach-imx/devices/platform-imx-ssi.c | 9 -
arch/arm/mach-imx/devices/platform-imx-uart.c | 12 -
arch/arm/mach-imx/devices/platform-imx2-wdt.c | 5 -
arch/arm/mach-imx/devices/platform-imxdi_rtc.c | 42 -
arch/arm/mach-imx/devices/platform-mx2-camera.c | 5 -
arch/arm/mach-imx/devices/platform-mxc-ehci.c | 7 -
arch/arm/mach-imx/devices/platform-mxc_nand.c | 5 -
arch/arm/mach-imx/devices/platform-spi_imx.c | 11 -
arch/arm/mach-imx/ehci-imx25.c | 99 -
arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 310 ---
arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 2 +-
arch/arm/mach-imx/gpc.c | 213 ++
arch/arm/mach-imx/hardware.h | 1 -
arch/arm/mach-imx/iomux-mx25.h | 524 -----
arch/arm/mach-imx/iomux-mx3.h | 2 +-
arch/arm/mach-imx/iomux-v3.c | 5 +-
arch/arm/mach-imx/iomux-v3.h | 5 +-
arch/arm/mach-imx/mach-cpuimx35.c | 2 +-
arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 172 --
arch/arm/mach-imx/{imx25-dt.c => mach-imx25.c} | 20 +-
arch/arm/mach-imx/mach-mx25_3ds.c | 270 ---
arch/arm/mach-imx/mach-mx35_3ds.c | 2 +-
arch/arm/mach-imx/mach-pcm043.c | 2 +-
arch/arm/mach-imx/mach-vpr200.c | 2 +-
arch/arm/mach-imx/mm-imx25.c | 89 -
arch/arm/mach-imx/mx25.h | 117 -
arch/arm/mach-mediatek/Kconfig | 1 +
arch/arm/mach-meson/Kconfig | 3 +
arch/arm/mach-msm/Kconfig | 109 -
arch/arm/mach-msm/Makefile | 23 -
arch/arm/mach-msm/Makefile.boot | 3 -
arch/arm/mach-msm/board-halibut.c | 110 -
arch/arm/mach-msm/board-msm7x30.c | 191 --
arch/arm/mach-msm/board-qsd8x50.c | 254 --
arch/arm/mach-msm/board-sapphire.c | 114 -
arch/arm/mach-msm/board-trout-gpio.c | 233 --
arch/arm/mach-msm/board-trout-mmc.c | 185 --
arch/arm/mach-msm/board-trout-panel.c | 292 ---
arch/arm/mach-msm/board-trout.c | 111 -
arch/arm/mach-msm/board-trout.h | 162 --
arch/arm/mach-msm/clock-pcom.c | 176 --
arch/arm/mach-msm/clock-pcom.h | 145 --
arch/arm/mach-msm/clock.c | 28 -
arch/arm/mach-msm/clock.h | 43 -
arch/arm/mach-msm/common.h | 41 -
arch/arm/mach-msm/devices-msm7x00.c | 480 ----
arch/arm/mach-msm/devices-msm7x30.c | 246 --
arch/arm/mach-msm/devices-qsd8x50.c | 388 ----
arch/arm/mach-msm/devices.h | 53 -
arch/arm/mach-msm/dma.c | 298 ---
arch/arm/mach-msm/gpiomux-8x50.c | 51 -
arch/arm/mach-msm/gpiomux-v1.h | 67 -
arch/arm/mach-msm/gpiomux.c | 111 -
arch/arm/mach-msm/gpiomux.h | 84 -
arch/arm/mach-msm/include/mach/clk.h | 31 -
arch/arm/mach-msm/include/mach/dma.h | 151 --
arch/arm/mach-msm/include/mach/entry-macro.S | 36 -
arch/arm/mach-msm/include/mach/hardware.h | 18 -
arch/arm/mach-msm/include/mach/irqs-7x00.h | 75 -
arch/arm/mach-msm/include/mach/irqs-7x30.h | 153 --
arch/arm/mach-msm/include/mach/irqs-8x50.h | 88 -
arch/arm/mach-msm/include/mach/irqs.h | 37 -
arch/arm/mach-msm/include/mach/msm_gpiomux.h | 38 -
arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 108 -
arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 103 -
arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 125 -
arch/arm/mach-msm/include/mach/msm_iomap.h | 53 -
arch/arm/mach-msm/include/mach/msm_smd.h | 109 -
arch/arm/mach-msm/include/mach/sirc.h | 98 -
arch/arm/mach-msm/include/mach/vreg.h | 29 -
arch/arm/mach-msm/io.c | 161 --
arch/arm/mach-msm/irq-vic.c | 363 ---
arch/arm/mach-msm/irq.c | 151 --
arch/arm/mach-msm/last_radio_log.c | 71 -
arch/arm/mach-msm/proc_comm.c | 129 --
arch/arm/mach-msm/proc_comm.h | 258 ---
arch/arm/mach-msm/sirc.c | 172 --
arch/arm/mach-msm/smd.c | 1034 ---------
arch/arm/mach-msm/smd_debug.c | 311 ---
arch/arm/mach-msm/smd_private.h | 403 ----
arch/arm/mach-msm/vreg.c | 220 --
arch/arm/mach-mvebu/Kconfig | 14 +
arch/arm/mach-mvebu/board-v7.c | 20 +-
arch/arm/mach-mvebu/dove.c | 2 +-
arch/arm/mach-mvebu/kirkwood.c | 2 +-
arch/arm/mach-mvebu/platsmp-a9.c | 2 +
arch/arm/mach-mvebu/pmsu.c | 16 +-
arch/arm/mach-omap1/pm.c | 51 +-
arch/arm/mach-omap2/Kconfig | 40 +-
arch/arm/mach-omap2/Makefile | 4 -
arch/arm/mach-omap2/board-devkit8000.c | 654 ------
arch/arm/mach-omap2/board-omap3stalker.c | 433 ----
arch/arm/mach-omap2/board-omap3touchbook.c | 395 ----
arch/arm/mach-omap2/common.c | 1 -
arch/arm/mach-omap2/common.h | 3 -
arch/arm/mach-omap2/gpmc-nand.c | 18 +-
arch/arm/mach-omap2/gpmc-onenand.c | 4 +-
arch/arm/mach-omap2/io.c | 2 -
arch/arm/mach-omap2/mux.c | 2 +-
arch/arm/mach-omap2/omap-secure.h | 7 -
arch/arm/mach-omap2/omap4-common.c | 69 -
arch/arm/mach-omap2/omap_device.c | 3 +
arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 36 +
arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 113 +-
arch/arm/mach-omap2/pdata-quirks.c | 74 -
arch/arm/mach-omap2/prcm43xx.h | 1 +
arch/arm/mach-omap2/sleep44xx.S | 2 -
arch/arm/mach-omap2/usb-tusb6010.c | 4 +-
arch/arm/mach-qcom/Kconfig | 3 -
arch/arm/mach-qcom/Makefile | 3 -
arch/arm/mach-qcom/platsmp.c | 23 +-
arch/arm/mach-qcom/scm-boot.c | 39 -
arch/arm/mach-qcom/scm.c | 326 ---
arch/arm/mach-rockchip/platsmp.c | 4 +-
arch/arm/mach-rockchip/pm.c | 14 +-
arch/arm/mach-rockchip/pm.h | 6 +
arch/arm/mach-s3c24xx/Kconfig | 19 +-
arch/arm/mach-s3c24xx/Makefile | 3 +-
arch/arm/mach-s3c24xx/include/mach/pm-core.h | 24 +-
arch/arm/mach-s3c24xx/pm-s3c2416.c | 3 +-
arch/arm/mach-s3c24xx/pm.c | 6 +-
arch/arm/mach-s3c24xx/s3c2410.c | 2 +-
arch/arm/mach-s3c24xx/s3c2412.c | 2 +-
arch/arm/mach-s3c24xx/s3c2416.c | 2 +-
arch/arm/mach-s3c24xx/s3c2440.c | 4 +-
arch/arm/mach-s3c24xx/s3c2442.c | 4 +-
arch/arm/mach-s3c24xx/s3c244x.c | 7 +-
arch/arm/mach-s3c64xx/Kconfig | 4 +-
arch/arm/mach-s3c64xx/Makefile | 3 +-
arch/arm/mach-s3c64xx/crag6410.h | 1 +
arch/arm/mach-s3c64xx/mach-crag6410.c | 1 +
arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +-
arch/arm/mach-s3c64xx/pm.c | 2 +
arch/arm/mach-shmobile/Kconfig | 66 +-
arch/arm/mach-shmobile/Makefile | 22 +-
arch/arm/mach-shmobile/Makefile.boot | 4 -
arch/arm/mach-shmobile/board-ape6evm-reference.c | 60 -
arch/arm/mach-shmobile/board-ape6evm.c | 306 ---
arch/arm/mach-shmobile/board-bockw-reference.c | 2 +
arch/arm/mach-shmobile/board-kzm9g-reference.c | 62 -
arch/arm/mach-shmobile/board-mackerel.c | 1522 ------------
arch/arm/mach-shmobile/clock-r8a73a4.c | 659 ------
arch/arm/mach-shmobile/clock-sh7372.c | 620 -----
arch/arm/mach-shmobile/clock.c | 11 -
arch/arm/mach-shmobile/common.h | 10 -
arch/arm/mach-shmobile/cpuidle.c | 37 -
arch/arm/mach-shmobile/entry-intc.S | 54 -
arch/arm/mach-shmobile/include/mach/clkdev.h | 7 -
.../mach-shmobile/include/mach/head-mackerel.txt | 93 -
arch/arm/mach-shmobile/include/mach/mmc-mackerel.h | 38 -
arch/arm/mach-shmobile/include/mach/mmc.h | 16 -
arch/arm/mach-shmobile/include/mach/sdhi-sh7372.h | 21 -
arch/arm/mach-shmobile/include/mach/sdhi.h | 16 -
arch/arm/mach-shmobile/include/mach/system.h | 11 -
arch/arm/mach-shmobile/include/mach/uncompress.h | 19 -
arch/arm/mach-shmobile/include/mach/zboot.h | 5 +-
arch/arm/mach-shmobile/intc-sh7372.c | 672 ------
arch/arm/mach-shmobile/pm-r8a7790.c | 82 -
arch/arm/mach-shmobile/pm-r8a7791.c | 73 -
arch/arm/mach-shmobile/pm-rcar-gen2.c | 115 +
arch/arm/mach-shmobile/pm-sh7372.c | 549 -----
arch/arm/mach-shmobile/r8a73a4.h | 17 -
arch/arm/mach-shmobile/r8a7790.h | 1 -
arch/arm/mach-shmobile/r8a7791.h | 1 -
arch/arm/mach-shmobile/rcar-gen2.h | 1 +
arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 147 ++
arch/arm/mach-shmobile/setup-r8a73a4.c | 273 +--
arch/arm/mach-shmobile/setup-r8a7740.c | 8 -
arch/arm/mach-shmobile/setup-r8a7778.c | 19 +
arch/arm/mach-shmobile/setup-rcar-gen2.c | 7 +-
arch/arm/mach-shmobile/setup-sh7372.c | 1016 --------
arch/arm/mach-shmobile/setup-sh73a0.c | 19 +-
arch/arm/mach-shmobile/sh7372.h | 84 -
arch/arm/mach-shmobile/sh73a0.h | 1 -
arch/arm/mach-shmobile/sleep-sh7372.S | 98 -
arch/arm/mach-shmobile/smp-r8a7779.c | 7 -
arch/arm/mach-shmobile/smp-r8a7790.c | 7 +-
arch/arm/mach-shmobile/smp-r8a7791.c | 4 +-
arch/arm/mach-shmobile/smp-sh73a0.c | 2 +-
arch/arm/mach-vexpress/dcscb.c | 197 +-
arch/arm/mach-vexpress/tc2_pm.c | 291 +--
arch/arm/plat-samsung/include/plat/pm.h | 14 +-
arch/arm/plat-samsung/pm-debug.c | 1 +
arch/arm/plat-samsung/pm.c | 20 -
arch/arm/tools/mach-types | 1 -
arch/arm64/Kconfig | 17 +
arch/arm64/boot/dts/Makefile | 3 +
arch/arm64/boot/dts/arm/juno.dts | 14 +-
arch/arm64/boot/dts/mediatek/mt8173-pinfunc.h | 682 ++++++
arch/arm64/boot/dts/mediatek/mt8173.dtsi | 20 +
arch/arm64/boot/dts/qcom/Makefile | 5 +
.../boot/dts/qcom/apq8016-sbc.dts} | 21 +-
.../scm.h => arm64/boot/dts/qcom/apq8016-sbc.dtsi} | 30 +-
arch/arm64/boot/dts/qcom/msm8916-mtp.dts | 22 +
arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi | 33 +
arch/arm64/boot/dts/qcom/msm8916.dtsi | 196 ++
arch/arm64/boot/dts/sprd/Makefile | 5 +
arch/arm64/boot/dts/sprd/sc9836-openphone.dts | 49 +
arch/arm64/boot/dts/sprd/sc9836.dtsi | 129 ++
arch/arm64/boot/dts/sprd/sharkl64.dtsi | 65 +
arch/arm64/boot/dts/xilinx/Makefile | 5 +
arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts | 47 +
arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 305 +++
arch/arm64/configs/defconfig | 10 +
drivers/bus/Kconfig | 93 +-
drivers/bus/Makefile | 15 +-
drivers/bus/imx-weim.c | 13 +-
drivers/bus/omap-ocp2scp.c | 34 +
drivers/bus/simple-pm-bus.c | 58 +
drivers/clk/shmobile/Makefile | 1 +
drivers/clk/shmobile/clk-r8a7778.c | 143 ++
drivers/clocksource/Kconfig | 4 +
drivers/clocksource/Makefile | 1 +
.../clocksource/timer-atmel-st.c | 117 +-
drivers/cpuidle/cpuidle-exynos.c | 3 +-
drivers/firmware/Kconfig | 4 +
drivers/firmware/Makefile | 2 +
drivers/firmware/qcom_scm.c | 494 ++++
drivers/gpio/Kconfig | 8 -
drivers/gpio/Makefile | 1 -
drivers/gpio/gpio-msm-v1.c | 714 ------
drivers/memory/omap-gpmc.c | 358 ++-
drivers/mmc/host/Kconfig | 8 -
drivers/mmc/host/Makefile | 1 -
drivers/mmc/host/msm_sdcc.c | 1474 ------------
drivers/mmc/host/msm_sdcc.h | 256 ---
drivers/net/wireless/ti/wilink_platform_data.c | 25 -
drivers/net/wireless/ti/wl12xx/main.c | 63 +-
drivers/net/wireless/ti/wl12xx/wl12xx.h | 28 +
drivers/net/wireless/ti/wlcore/boot.c | 1 -
drivers/net/wireless/ti/wlcore/debugfs.c | 2 +-
drivers/net/wireless/ti/wlcore/main.c | 31 +-
drivers/net/wireless/ti/wlcore/sdio.c | 63 +-
drivers/net/wireless/ti/wlcore/spi.c | 6 +-
drivers/net/wireless/ti/wlcore/wlcore.h | 5 +-
drivers/net/wireless/ti/wlcore/wlcore_i.h | 6 +-
drivers/pcmcia/Kconfig | 1 +
drivers/pcmcia/at91_cf.c | 13 +-
drivers/soc/Kconfig | 1 +
drivers/soc/Makefile | 1 +
drivers/soc/mediatek/Kconfig | 11 +
drivers/soc/mediatek/Makefile | 1 +
drivers/soc/mediatek/mtk-pmic-wrap.c | 977 ++++++++
drivers/soc/qcom/Kconfig | 1 +
drivers/soc/qcom/qcom_gsbi.c | 152 ++
drivers/watchdog/Kconfig | 2 +-
drivers/watchdog/at91rm9200_wdt.c | 61 +-
include/dt-bindings/clock/imx6qdl-clock.h | 5 +-
include/dt-bindings/clock/qcom,gcc-msm8916.h | 156 ++
include/dt-bindings/clock/r8a73a4-clock.h | 62 +
include/dt-bindings/clock/r8a7778-clock.h | 71 +
include/dt-bindings/clock/r8a7790-clock.h | 3 +
include/dt-bindings/clock/r8a7791-clock.h | 3 +
include/dt-bindings/clock/sh73a0-clock.h | 3 +
include/dt-bindings/media/omap3-isp.h | 22 +
include/dt-bindings/reset/qcom,gcc-msm8916.h | 108 +
include/linux/clk/shmobile.h | 1 +
include/linux/mfd/syscon/atmel-st.h | 49 +
include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 1 +
include/linux/omap-gpmc.h | 3 +-
include/linux/platform_data/mmc-msm_sdcc.h | 27 -
include/linux/qcom_scm.h | 28 +
include/linux/wl12xx.h | 49 -
scripts/Makefile.lib | 3 +-
599 files changed, 29685 insertions(+), 30040 deletions(-)
delete mode 100644 Documentation/arm/Makefile
delete mode 100644 Documentation/arm/SH-Mobile/Makefile
delete mode 100644 Documentation/arm/SH-Mobile/vrl4.c
delete mode 100644 Documentation/arm/SH-Mobile/zboot-rom-mmcif.txt
delete mode 100644 Documentation/arm/SH-Mobile/zboot-rom-sdhi.txt
delete mode 100644 Documentation/arm/msm/gpiomux.txt
create mode 100644 Documentation/devicetree/bindings/arm/al,alpine.txt
create mode 100644 Documentation/devicetree/bindings/arm/armada-39x.txt
create mode 100644 Documentation/devicetree/bindings/arm/cpu-enable-method/al,alpine-smp
delete mode 100644 Documentation/devicetree/bindings/arm/geniatech.txt
create mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,idle-state.txt
create mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra30-actmon.txt
create mode 100644 Documentation/devicetree/bindings/bus/renesas,bsc.txt
create mode 100644 Documentation/devicetree/bindings/bus/simple-pm-bus.txt
create mode 100644 Documentation/devicetree/bindings/clock/renesas,r8a7778-cpg-clocks.txt
create mode 100644 Documentation/devicetree/bindings/media/ti,omap3isp.txt
create mode 100644 Documentation/devicetree/bindings/mfd/qcom,tcsr.txt
create mode 100644 Documentation/devicetree/bindings/net/wireless/ti,wlcore.txt
create mode 100644 Documentation/devicetree/bindings/power/fsl,imx-gpc.txt
create mode 100644 Documentation/devicetree/bindings/soc/mediatek/pwrap.txt
create mode 100644 arch/arm/arm-soc-for-next-contents.txt
delete mode 100644 arch/arm/boot/compressed/mmcif-sh7372.c
delete mode 100644 arch/arm/boot/compressed/sdhi-sh7372.c
delete mode 100644 arch/arm/boot/compressed/sdhi-shmobile.c
delete mode 100644 arch/arm/boot/compressed/sdhi-shmobile.h
create mode 100644 arch/arm/boot/dts/alpine-db.dts
create mode 100644 arch/arm/boot/dts/alpine.dtsi
create mode 100644 arch/arm/boot/dts/am335x-chiliboard.dts
create mode 100644 arch/arm/boot/dts/am335x-chilisom.dtsi
create mode 100644 arch/arm/boot/dts/armada-390.dtsi
create mode 100644 arch/arm/boot/dts/armada-398-db.dts
create mode 100644 arch/arm/boot/dts/armada-398.dtsi
create mode 100644 arch/arm/boot/dts/armada-39x.dtsi
create mode 100644 arch/arm/boot/dts/armada-xp-linksys-mamba.dts
create mode 100644 arch/arm/boot/dts/at91-sama5d4_xplained.dts
create mode 100644 arch/arm/boot/dts/bcm4709-netgear-r8000.dts
create mode 100644 arch/arm/boot/dts/bcm958305k.dts
create mode 100644 arch/arm/boot/dts/kirkwood-nas2big.dts
create mode 100644 arch/arm/boot/dts/meson8-minix-neo-x8.dts
create mode 100644 arch/arm/boot/dts/mt8135-pinfunc.h
create mode 100644 arch/arm/boot/dts/omap3-pandora-1ghz.dts
create mode 100644 arch/arm/boot/dts/omap3-pandora-600mhz.dts
create mode 100644 arch/arm/boot/dts/omap3-pandora-common.dtsi
delete mode 100644 arch/arm/boot/dts/omap34xx-hs.dtsi
delete mode 100644 arch/arm/boot/dts/omap36xx-hs.dtsi
create mode 100644 arch/arm/boot/dts/qcom-pm8841.dtsi
create mode 100644 arch/arm/boot/dts/qcom-pm8941.dtsi
create mode 100644 arch/arm/boot/dts/qcom-pma8084.dtsi
delete mode 100644 arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
create mode 100644 arch/arm/boot/dts/rk3288-popmetal.dts
delete mode 100644 arch/arm/boot/dts/sh7372-mackerel.dts
delete mode 100644 arch/arm/boot/dts/sh7372.dtsi
delete mode 100644 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
create mode 100644 arch/arm/boot/dts/tegra124-jetson-tk1-emc.dtsi
create mode 100644 arch/arm/boot/dts/tegra124-nyan-big-emc.dtsi
create mode 100644 arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi
create mode 100644 arch/arm/boot/dts/tegra124-nyan-blaze.dts
create mode 100644 arch/arm/boot/dts/tegra124-nyan.dtsi
delete mode 100644 arch/arm/configs/ape6evm_defconfig
delete mode 100644 arch/arm/configs/mackerel_defconfig
delete mode 100644 arch/arm/configs/msm_defconfig
create mode 100644 arch/arm/mach-alpine/Kconfig
create mode 100644 arch/arm/mach-alpine/Makefile
create mode 100644 arch/arm/mach-alpine/alpine_cpu_pm.c
rename arch/arm/{mach-at91/include/mach/io.h => mach-alpine/alpine_cpu_pm.h} (55%)
create mode 100644 arch/arm/mach-alpine/alpine_cpu_resume.h
create mode 100644 arch/arm/mach-alpine/alpine_machine.c
create mode 100644 arch/arm/mach-alpine/platsmp.c
delete mode 100644 arch/arm/mach-at91/include/mach/at91_dbgu.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91_matrix.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91_st.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91rm9200.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9260.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9260_matrix.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9261.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9261_matrix.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9263.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9263_matrix.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9g45.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9g45_matrix.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9n12.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9n12_matrix.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9rl.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9x5.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9x5_matrix.h
delete mode 100644 arch/arm/mach-at91/include/mach/cpu.h
delete mode 100644 arch/arm/mach-at91/include/mach/hardware.h
delete mode 100644 arch/arm/mach-at91/include/mach/sama5d3.h
delete mode 100644 arch/arm/mach-at91/include/mach/sama5d4.h
delete mode 100644 arch/arm/mach-at91/include/mach/uncompress.h
delete mode 100644 arch/arm/mach-at91/pm_slowclock.S
create mode 100644 arch/arm/mach-at91/pm_suspend.S
delete mode 100644 arch/arm/mach-at91/setup.c
create mode 100644 arch/arm/mach-at91/soc.c
create mode 100644 arch/arm/mach-at91/soc.h
delete mode 100644 arch/arm/mach-imx/devices-imx25.h
delete mode 100644 arch/arm/mach-imx/devices/platform-imxdi_rtc.c
delete mode 100644 arch/arm/mach-imx/ehci-imx25.c
delete mode 100644 arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c
delete mode 100644 arch/arm/mach-imx/iomux-mx25.h
delete mode 100644 arch/arm/mach-imx/mach-eukrea_cpuimx25.c
rename arch/arm/mach-imx/{imx25-dt.c => mach-imx25.c} (68%)
delete mode 100644 arch/arm/mach-imx/mach-mx25_3ds.c
delete mode 100644 arch/arm/mach-imx/mm-imx25.c
delete mode 100644 arch/arm/mach-imx/mx25.h
delete mode 100644 arch/arm/mach-msm/Kconfig
delete mode 100644 arch/arm/mach-msm/Makefile
delete mode 100644 arch/arm/mach-msm/Makefile.boot
delete mode 100644 arch/arm/mach-msm/board-halibut.c
delete mode 100644 arch/arm/mach-msm/board-msm7x30.c
delete mode 100644 arch/arm/mach-msm/board-qsd8x50.c
delete mode 100644 arch/arm/mach-msm/board-sapphire.c
delete mode 100644 arch/arm/mach-msm/board-trout-gpio.c
delete mode 100644 arch/arm/mach-msm/board-trout-mmc.c
delete mode 100644 arch/arm/mach-msm/board-trout-panel.c
delete mode 100644 arch/arm/mach-msm/board-trout.c
delete mode 100644 arch/arm/mach-msm/board-trout.h
delete mode 100644 arch/arm/mach-msm/clock-pcom.c
delete mode 100644 arch/arm/mach-msm/clock-pcom.h
delete mode 100644 arch/arm/mach-msm/clock.c
delete mode 100644 arch/arm/mach-msm/clock.h
delete mode 100644 arch/arm/mach-msm/common.h
delete mode 100644 arch/arm/mach-msm/devices-msm7x00.c
delete mode 100644 arch/arm/mach-msm/devices-msm7x30.c
delete mode 100644 arch/arm/mach-msm/devices-qsd8x50.c
delete mode 100644 arch/arm/mach-msm/devices.h
delete mode 100644 arch/arm/mach-msm/dma.c
delete mode 100644 arch/arm/mach-msm/gpiomux-8x50.c
delete mode 100644 arch/arm/mach-msm/gpiomux-v1.h
delete mode 100644 arch/arm/mach-msm/gpiomux.c
delete mode 100644 arch/arm/mach-msm/gpiomux.h
delete mode 100644 arch/arm/mach-msm/include/mach/clk.h
delete mode 100644 arch/arm/mach-msm/include/mach/dma.h
delete mode 100644 arch/arm/mach-msm/include/mach/entry-macro.S
delete mode 100644 arch/arm/mach-msm/include/mach/hardware.h
delete mode 100644 arch/arm/mach-msm/include/mach/irqs-7x00.h
delete mode 100644 arch/arm/mach-msm/include/mach/irqs-7x30.h
delete mode 100644 arch/arm/mach-msm/include/mach/irqs-8x50.h
delete mode 100644 arch/arm/mach-msm/include/mach/irqs.h
delete mode 100644 arch/arm/mach-msm/include/mach/msm_gpiomux.h
delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap.h
delete mode 100644 arch/arm/mach-msm/include/mach/msm_smd.h
delete mode 100644 arch/arm/mach-msm/include/mach/sirc.h
delete mode 100644 arch/arm/mach-msm/include/mach/vreg.h
delete mode 100644 arch/arm/mach-msm/io.c
delete mode 100644 arch/arm/mach-msm/irq-vic.c
delete mode 100644 arch/arm/mach-msm/irq.c
delete mode 100644 arch/arm/mach-msm/last_radio_log.c
delete mode 100644 arch/arm/mach-msm/proc_comm.c
delete mode 100644 arch/arm/mach-msm/proc_comm.h
delete mode 100644 arch/arm/mach-msm/sirc.c
delete mode 100644 arch/arm/mach-msm/smd.c
delete mode 100644 arch/arm/mach-msm/smd_debug.c
delete mode 100644 arch/arm/mach-msm/smd_private.h
delete mode 100644 arch/arm/mach-msm/vreg.c
delete mode 100644 arch/arm/mach-omap2/board-devkit8000.c
delete mode 100644 arch/arm/mach-omap2/board-omap3stalker.c
delete mode 100644 arch/arm/mach-omap2/board-omap3touchbook.c
delete mode 100644 arch/arm/mach-qcom/scm-boot.c
delete mode 100644 arch/arm/mach-qcom/scm.c
delete mode 100644 arch/arm/mach-shmobile/board-ape6evm-reference.c
delete mode 100644 arch/arm/mach-shmobile/board-ape6evm.c
delete mode 100644 arch/arm/mach-shmobile/board-kzm9g-reference.c
delete mode 100644 arch/arm/mach-shmobile/board-mackerel.c
delete mode 100644 arch/arm/mach-shmobile/clock-r8a73a4.c
delete mode 100644 arch/arm/mach-shmobile/clock-sh7372.c
delete mode 100644 arch/arm/mach-shmobile/cpuidle.c
delete mode 100644 arch/arm/mach-shmobile/entry-intc.S
delete mode 100644 arch/arm/mach-shmobile/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-shmobile/include/mach/head-mackerel.txt
delete mode 100644 arch/arm/mach-shmobile/include/mach/mmc-mackerel.h
delete mode 100644 arch/arm/mach-shmobile/include/mach/mmc.h
delete mode 100644 arch/arm/mach-shmobile/include/mach/sdhi-sh7372.h
delete mode 100644 arch/arm/mach-shmobile/include/mach/sdhi.h
delete mode 100644 arch/arm/mach-shmobile/include/mach/system.h
delete mode 100644 arch/arm/mach-shmobile/include/mach/uncompress.h
delete mode 100644 arch/arm/mach-shmobile/intc-sh7372.c
delete mode 100644 arch/arm/mach-shmobile/pm-r8a7790.c
delete mode 100644 arch/arm/mach-shmobile/pm-r8a7791.c
create mode 100644 arch/arm/mach-shmobile/pm-rcar-gen2.c
delete mode 100644 arch/arm/mach-shmobile/pm-sh7372.c
delete mode 100644 arch/arm/mach-shmobile/r8a73a4.h
create mode 100644 arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c
delete mode 100644 arch/arm/mach-shmobile/setup-sh7372.c
delete mode 100644 arch/arm/mach-shmobile/sh7372.h
delete mode 100644 arch/arm/mach-shmobile/sleep-sh7372.S
create mode 100644 arch/arm64/boot/dts/mediatek/mt8173-pinfunc.h
create mode 100644 arch/arm64/boot/dts/qcom/Makefile
rename arch/{arm/mach-qcom/scm-boot.h => arm64/boot/dts/qcom/apq8016-sbc.dts} (50%)
rename arch/{arm/mach-qcom/scm.h => arm64/boot/dts/qcom/apq8016-sbc.dtsi} (54%)
create mode 100644 arch/arm64/boot/dts/qcom/msm8916-mtp.dts
create mode 100644 arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi
create mode 100644 arch/arm64/boot/dts/qcom/msm8916.dtsi
create mode 100644 arch/arm64/boot/dts/sprd/Makefile
create mode 100644 arch/arm64/boot/dts/sprd/sc9836-openphone.dts
create mode 100644 arch/arm64/boot/dts/sprd/sc9836.dtsi
create mode 100644 arch/arm64/boot/dts/sprd/sharkl64.dtsi
create mode 100644 arch/arm64/boot/dts/xilinx/Makefile
create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp.dtsi
create mode 100644 drivers/bus/simple-pm-bus.c
create mode 100644 drivers/clk/shmobile/clk-r8a7778.c
rename arch/arm/mach-at91/at91rm9200_time.c => drivers/clocksource/timer-atmel-st.c (73%)
create mode 100644 drivers/firmware/qcom_scm.c
delete mode 100644 drivers/gpio/gpio-msm-v1.c
delete mode 100644 drivers/mmc/host/msm_sdcc.c
delete mode 100644 drivers/mmc/host/msm_sdcc.h
create mode 100644 drivers/soc/mediatek/Kconfig
create mode 100644 drivers/soc/mediatek/Makefile
create mode 100644 drivers/soc/mediatek/mtk-pmic-wrap.c
create mode 100644 include/dt-bindings/clock/qcom,gcc-msm8916.h
create mode 100644 include/dt-bindings/clock/r8a73a4-clock.h
create mode 100644 include/dt-bindings/clock/r8a7778-clock.h
create mode 100644 include/dt-bindings/media/omap3-isp.h
create mode 100644 include/dt-bindings/reset/qcom,gcc-msm8916.h
create mode 100644 include/linux/mfd/syscon/atmel-st.h
delete mode 100644 include/linux/platform_data/mmc-msm_sdcc.h
create mode 100644 include/linux/qcom_scm.h
$ git am -3 ../patches/0001-Revert-ARM-dts-mt8135-Add-pinctrl-GPIO-EINT-node-for.patch
Applying: Revert "ARM: dts: mt8135: Add pinctrl/GPIO/EINT node for mt8135."
$ git reset HEAD^
Unstaged changes after reset:
D arch/arm/boot/dts/mt8135-pinfunc.h
M arch/arm/boot/dts/mt8135.dtsi
$ git add -A .
$ git commit -v -a --amend
[master 9e57577c84a8] Merge remote-tracking branch 'arm-soc/for-next'
Date: Wed Apr 8 10:15:02 2015 +1000
Merging at91/at91-next (d8a291a11778 Merge tag 'at91-dt2' into at91-next)
$ git merge at91/at91-next
Auto-merging drivers/clocksource/Kconfig
Merge made by the 'recursive' strategy.
arch/arm/mach-at91/Makefile | 3 +
arch/arm/mach-at91/include/mach/at91_ramc.h | 4 --
arch/arm/mach-at91/pm.c | 89 ++++++++++++++++++++++++++
arch/arm/mach-at91/pm.h | 96 ++---------------------------
drivers/clocksource/Kconfig | 1 +
5 files changed, 97 insertions(+), 96 deletions(-)
Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
$ git merge bcm2835/for-next
Already up-to-date.
Merging rpi/for-rpi-next (9a5a3543e168 ARM: bcm2835: Fix i2c0 node name)
$ git merge rpi/for-rpi-next
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Merge made by the 'recursive' strategy.
Documentation/devicetree/bindings/arm/bcm2835.txt | 31 ++++++++++++++++++++--
.../devicetree/bindings/vendor-prefixes.txt | 1 +
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 4 +--
arch/arm/boot/dts/bcm2835-rpi-b.dts | 4 +--
arch/arm/boot/dts/bcm2835-rpi.dtsi | 8 +++---
arch/arm/boot/dts/bcm2835.dtsi | 5 ++--
include/dt-bindings/pinctrl/bcm2835.h | 27 +++++++++++++++++++
7 files changed, 68 insertions(+), 12 deletions(-)
create mode 100644 include/dt-bindings/pinctrl/bcm2835.h
Merging berlin/berlin/for-next (c517d838eb7d Linux 4.0-rc1)
$ git merge berlin/berlin/for-next
Already up-to-date.
Merging cortex-m/for-next (e799b6f37e6c ARM: zImage: add support for ARMv7-M)
$ git merge cortex-m/for-next
Merge made by the 'recursive' strategy.
Merging imx-mxs/for-next (33e156f34c26 Merge branch 'imx/defconfig' into for-next)
$ git merge imx-mxs/for-next
Auto-merging arch/arm/mach-imx/mach-imx6q.c
Auto-merging arch/arm/boot/dts/Makefile
Merge made by the 'recursive' strategy.
.../arm/freescale/fsl,vf610-mscm-cpucfg.txt | 14 +
.../bindings/arm/freescale/fsl,vf610-mscm-ir.txt | 33 ++
arch/arm/boot/dts/Makefile | 4 +-
arch/arm/boot/dts/imx25-pdk.dts | 58 ++
arch/arm/boot/dts/imx25-pinfunc.h | 86 ++-
arch/arm/boot/dts/imx27.dtsi | 2 +
arch/arm/boot/dts/imx28-apf28.dts | 2 +-
arch/arm/boot/dts/imx28-apf28dev.dts | 30 +-
arch/arm/boot/dts/imx28.dtsi | 14 +
arch/arm/boot/dts/imx35.dtsi | 1 +
arch/arm/boot/dts/imx50.dtsi | 3 +
arch/arm/boot/dts/imx51.dtsi | 3 +
arch/arm/boot/dts/imx53.dtsi | 3 +
arch/arm/boot/dts/imx6dl-aristainetos_4.dts | 4 +
arch/arm/boot/dts/imx6dl-aristainetos_7.dts | 4 +
arch/arm/boot/dts/imx6dl-cubox-i.dts | 38 ++
arch/arm/boot/dts/imx6dl-hummingboard.dts | 38 ++
arch/arm/boot/dts/imx6q-cubox-i.dts | 38 ++
arch/arm/boot/dts/imx6q-hummingboard.dts | 38 ++
arch/arm/boot/dts/imx6q.dtsi | 20 +-
arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 62 +++
arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 101 +++-
arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi | 38 ++
arch/arm/boot/dts/imx6qdl-microsom.dtsi | 38 ++
arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 35 ++
arch/arm/boot/dts/imx6qdl.dtsi | 49 +-
arch/arm/boot/dts/imx6sl-warp.dts | 262 +++++++++
arch/arm/boot/dts/imx6sl.dtsi | 13 +-
arch/arm/boot/dts/imx6sx-sdb-reva.dts | 143 +++++
arch/arm/boot/dts/imx6sx-sdb.dts | 603 +--------------------
arch/arm/boot/dts/imx6sx-sdb.dtsi | 562 +++++++++++++++++++
arch/arm/boot/dts/imx6sx.dtsi | 9 +-
arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 31 ++
arch/arm/boot/dts/vf-colibri.dtsi | 15 +
arch/arm/boot/dts/vf500.dtsi | 137 +----
arch/arm/boot/dts/vfxxx.dtsi | 64 ++-
arch/arm/mach-imx/Kconfig | 1 +
arch/arm/mach-imx/common.h | 2 +-
arch/arm/mach-imx/gpc.c | 140 ++++-
arch/arm/mach-imx/mach-imx6q.c | 2 +-
arch/arm/mach-imx/mach-imx6sl.c | 2 +-
arch/arm/mach-imx/mach-imx6sx.c | 2 +-
arch/arm/mach-imx/pm-imx6.c | 6 +-
drivers/irqchip/Makefile | 1 +
drivers/irqchip/irq-vf610-mscm-ir.c | 212 ++++++++
45 files changed, 2174 insertions(+), 789 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/freescale/fsl,vf610-mscm-cpucfg.txt
create mode 100644 Documentation/devicetree/bindings/arm/freescale/fsl,vf610-mscm-ir.txt
create mode 100644 arch/arm/boot/dts/imx6sl-warp.dts
create mode 100644 arch/arm/boot/dts/imx6sx-sdb-reva.dts
create mode 100644 arch/arm/boot/dts/imx6sx-sdb.dtsi
create mode 100644 drivers/irqchip/irq-vf610-mscm-ir.c
Merging keystone/next (b17275a4a6cc Merge branch 'for_3.19/soc' into next)
$ git merge keystone/next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging mvebu/for-next (692763a6e674 Merge branch 'mvebu/leds-kirkwood' into mvebu/for-next)
$ git merge mvebu/for-next
Removing arch/arm/mach-mvebu/netxbig.c
Removing arch/arm/mach-mvebu/board.h
Merge made by the 'recursive' strategy.
.../devicetree/bindings/gpio/netxbig-gpio-ext.txt | 22 ++
.../devicetree/bindings/leds/leds-netxbig.txt | 90 ++++++++
.../devicetree/bindings/leds/leds-ns2.txt | 9 +
arch/arm/boot/dts/kirkwood-d2net.dts | 5 +
arch/arm/boot/dts/kirkwood-is2.dts | 5 +
arch/arm/boot/dts/kirkwood-net5big.dts | 60 +++++
arch/arm/boot/dts/kirkwood-netxbig.dtsi | 80 +++++++
arch/arm/boot/dts/kirkwood-ns2.dts | 5 +
arch/arm/boot/dts/kirkwood-ns2max.dts | 5 +
arch/arm/boot/dts/kirkwood-ns2mini.dts | 5 +
arch/arm/mach-mvebu/Kconfig | 7 -
arch/arm/mach-mvebu/Makefile | 1 -
arch/arm/mach-mvebu/board.h | 21 --
arch/arm/mach-mvebu/kirkwood.c | 4 -
arch/arm/mach-mvebu/netxbig.c | 191 ----------------
drivers/leds/Kconfig | 12 +-
drivers/leds/leds-netxbig.c | 244 +++++++++++++++++++--
drivers/leds/leds-ns2.c | 156 +++++++------
include/dt-bindings/leds/leds-netxbig.h | 18 ++
include/dt-bindings/leds/leds-ns2.h | 8 +
include/linux/platform_data/leds-kirkwood-ns2.h | 14 ++
21 files changed, 652 insertions(+), 310 deletions(-)
create mode 100644 Documentation/devicetree/bindings/gpio/netxbig-gpio-ext.txt
create mode 100644 Documentation/devicetree/bindings/leds/leds-netxbig.txt
delete mode 100644 arch/arm/mach-mvebu/board.h
delete mode 100644 arch/arm/mach-mvebu/netxbig.c
create mode 100644 include/dt-bindings/leds/leds-netxbig.h
create mode 100644 include/dt-bindings/leds/leds-ns2.h
Merging omap/for-next (23aa6c6f4bed Merge branch 'omap-for-v4.0/fixes' into for-next)
$ git merge omap/for-next
Auto-merging arch/arm/boot/dts/omap3-n900.dts
Merge made by the 'recursive' strategy.
.../devicetree/bindings/arm/omap/ctrl.txt | 79 +++++++
Documentation/devicetree/bindings/arm/omap/l4.txt | 26 +++
.../devicetree/bindings/arm/omap/prcm.txt | 6 +-
arch/arm/boot/dts/am33xx-clocks.dtsi | 2 +-
arch/arm/boot/dts/am33xx.dtsi | 87 +++----
arch/arm/boot/dts/am3517.dtsi | 2 +-
arch/arm/boot/dts/am35xx-clocks.dtsi | 2 +-
arch/arm/boot/dts/am4372.dtsi | 85 ++++---
arch/arm/boot/dts/am43x-epos-evm.dts | 84 +++----
arch/arm/boot/dts/am43xx-clocks.dtsi | 2 +-
arch/arm/boot/dts/dra7.dtsi | 156 ++++++++-----
arch/arm/boot/dts/omap2420.dtsi | 80 ++++---
arch/arm/boot/dts/omap2430-clocks.dtsi | 8 +-
arch/arm/boot/dts/omap2430.dtsi | 107 +++++----
arch/arm/boot/dts/omap24xx-clocks.dtsi | 6 +-
arch/arm/boot/dts/omap3-n900.dts | 4 +
arch/arm/boot/dts/omap3.dtsi | 96 ++++----
arch/arm/boot/dts/omap3xxx-clocks.dtsi | 13 +-
arch/arm/boot/dts/omap4.dtsi | 200 +++++++++-------
arch/arm/boot/dts/omap5.dtsi | 182 +++++++++------
arch/arm/mach-omap2/clock.c | 111 +++++++--
arch/arm/mach-omap2/clock.h | 8 +-
arch/arm/mach-omap2/cm.h | 2 +
arch/arm/mach-omap2/cm2xxx.c | 2 +-
arch/arm/mach-omap2/cm2xxx.h | 2 +-
arch/arm/mach-omap2/cm33xx.c | 2 +-
arch/arm/mach-omap2/cm33xx.h | 3 +-
arch/arm/mach-omap2/cm3xxx.c | 3 +-
arch/arm/mach-omap2/cm3xxx.h | 2 +-
arch/arm/mach-omap2/cm44xx.h | 3 +-
arch/arm/mach-omap2/cm_common.c | 156 +++++++++++++
arch/arm/mach-omap2/cminst44xx.c | 6 +-
arch/arm/mach-omap2/control.c | 201 +++++++++++++---
arch/arm/mach-omap2/control.h | 10 +-
arch/arm/mach-omap2/display.c | 15 +-
arch/arm/mach-omap2/id.c | 5 +-
arch/arm/mach-omap2/io.c | 112 ++++-----
arch/arm/mach-omap2/pm24xx.c | 24 +-
arch/arm/mach-omap2/pm34xx.c | 18 +-
arch/arm/mach-omap2/prcm-common.h | 20 ++
arch/arm/mach-omap2/prm.h | 27 ++-
arch/arm/mach-omap2/prm2xxx.c | 6 +-
arch/arm/mach-omap2/prm2xxx.h | 4 +-
arch/arm/mach-omap2/prm33xx.c | 2 +-
arch/arm/mach-omap2/prm33xx.h | 2 +-
arch/arm/mach-omap2/prm3xxx.c | 20 +-
arch/arm/mach-omap2/prm3xxx.h | 7 +-
arch/arm/mach-omap2/prm44xx.c | 70 +++---
arch/arm/mach-omap2/prm44xx.h | 1 -
arch/arm/mach-omap2/prm44xx_54xx.h | 8 +-
arch/arm/mach-omap2/prm54xx.h | 1 -
arch/arm/mach-omap2/prm7xx.h | 2 +-
arch/arm/mach-omap2/prm_common.c | 258 +++++++++++++++++----
arch/arm/mach-omap2/prminst44xx.c | 18 +-
arch/arm/mach-omap2/prminst44xx.h | 1 +
arch/arm/mach-omap2/vp.h | 9 -
arch/arm/mach-omap2/vp3xxx_data.c | 4 +-
arch/arm/mach-omap2/vp44xx_data.c | 4 +-
drivers/clk/ti/apll.c | 5 +-
drivers/clk/ti/autoidle.c | 2 +-
drivers/clk/ti/clk.c | 7 +-
drivers/clk/ti/divider.c | 4 +-
drivers/clk/ti/dpll.c | 6 +-
drivers/clk/ti/gate.c | 4 +-
drivers/clk/ti/interface.c | 2 +-
drivers/clk/ti/mux.c | 4 +-
include/linux/clk/ti.h | 6 +-
67 files changed, 1616 insertions(+), 800 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/omap/ctrl.txt
create mode 100644 Documentation/devicetree/bindings/arm/omap/l4.txt
$ git am -3 ../patches/0001-ARM-dts-omap3-fixup-for-merge-conflict-around-omap3_.patch
Applying: ARM: dts: omap3: fixup for merge conflict around omap3_scm_general
$ git reset HEAD^
Unstaged changes after reset:
M arch/arm/boot/dts/omap34xx.dtsi
M arch/arm/boot/dts/omap36xx.dtsi
$ git add -A .
$ git commit -v -a --amend
[master 0ac53b4d3d8f] Merge remote-tracking branch 'omap/for-next'
Date: Wed Apr 8 10:21:07 2015 +1000
Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data)
$ git merge omap-pending/for-next
Resolved 'arch/arm/mach-omap2/omap_hwmod_43xx_data.c' using previous resolution.
Auto-merging arch/arm/mach-omap2/omap_hwmod_43xx_data.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master bcaa2916cc32] Merge remote-tracking branch 'omap-pending/for-next'
$ git diff -M --stat --summary HEAD^..
Merging renesas/next (53a6e5250291 Merge branch 'heads/soc-cleanup-for-v4.1' into next)
$ git merge renesas/next
Merge made by the 'recursive' strategy.
Merging samsung/for-next (5d5443b9c3ba Merge branch 'v4.1-next/mach-samsung' into for-next)
$ git merge samsung/for-next
Resolved 'arch/arm/mach-exynos/platsmp.c' using previous resolution.
Auto-merging arch/arm/mach-exynos/platsmp.c
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/platsmp.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master c12939d5cde9] Merge remote-tracking branch 'samsung/for-next'
$ git diff -M --stat --summary HEAD^..
.../devicetree/bindings/arm/samsung/pmu.txt | 1 +
arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi | 698 +++++++++++++++
.../dts/exynos/exynos5433-tmu-sensor-conf.dtsi | 22 +
arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi | 231 +++++
arch/arm64/boot/dts/exynos/exynos5433.dtsi | 931 +++++++++++++++++++++
5 files changed, 1883 insertions(+)
create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi
create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tmu-sensor-conf.dtsi
create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi
create mode 100644 arch/arm64/boot/dts/exynos/exynos5433.dtsi
Merging sunxi/sunxi/for-next (952934e18fef Merge branch 'sunxi/dt-for-4.1' into sunxi/for-next)
$ git merge sunxi/sunxi/for-next
Auto-merging arch/arm/boot/dts/Makefile
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Merge made by the 'recursive' strategy.
Documentation/devicetree/bindings/clock/sunxi.txt | 3 +
.../devicetree/bindings/vendor-prefixes.txt | 2 +
arch/arm/boot/dts/Makefile | 19 +-
arch/arm/boot/dts/sun4i-a10-a1000.dts | 202 +++----
arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 176 +++---
arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 35 ++
arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 216 +++----
arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 176 ++++++
arch/arm/boot/dts/sun4i-a10-hackberry.dts | 191 +++----
arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts | 8 +
arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 118 ++--
arch/arm/boot/dts/sun4i-a10-marsboard.dts | 8 +
arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 144 ++---
arch/arm/boot/dts/sun4i-a10-mk802.dts | 8 +
arch/arm/boot/dts/sun4i-a10-mk802ii.dts | 8 +
arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 196 +++----
arch/arm/boot/dts/sun4i-a10-pcduino.dts | 180 +++---
arch/arm/boot/dts/sun4i-a10.dtsi | 54 +-
arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 159 ++++++
arch/arm/boot/dts/sun5i-a10s-mk802.dts | 8 +
arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 319 +++++------
arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 134 ++---
arch/arm/boot/dts/sun5i-a10s.dtsi | 620 +++------------------
arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 138 ++---
arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 150 ++---
arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 240 ++++----
arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 203 +++++++
arch/arm/boot/dts/sun5i-a13.dtsi | 570 +++----------------
arch/arm/boot/dts/sun5i.dtsi | 583 +++++++++++++++++++
arch/arm/boot/dts/sun6i-a31-app4-evb1.dts | 58 +-
arch/arm/boot/dts/sun6i-a31-colombus.dts | 140 ++---
arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 103 +++-
arch/arm/boot/dts/sun6i-a31-i7.dts | 154 +++++
arch/arm/boot/dts/sun6i-a31-m9.dts | 154 ++---
arch/arm/boot/dts/sun6i-a31.dtsi | 96 +++-
arch/arm/boot/dts/sun6i-a31s-cs908.dts | 43 +-
arch/arm/boot/dts/sun7i-a20-bananapi.dts | 264 ++++-----
arch/arm/boot/dts/sun7i-a20-bananapro.dts | 10 +
arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 200 +++----
arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 326 +++++------
arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 430 +++++++-------
arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 262 ++++-----
arch/arm/boot/dts/sun7i-a20-m3.dts | 186 ++++---
arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 192 +++----
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 296 +++++-----
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 414 +++++++-------
arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 199 +++++++
arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 212 +++----
arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 188 +++++++
arch/arm/boot/dts/sun7i-a20.dtsi | 23 +-
arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts | 112 ++--
arch/arm/boot/dts/sun8i-a23.dtsi | 16 +
arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 99 ++++
arch/arm/boot/dts/sun9i-a80-optimus.dts | 67 ++-
arch/arm/boot/dts/sun9i-a80.dtsi | 132 +++++
drivers/clk/sunxi/Makefile | 1 +
drivers/clk/sunxi/clk-sunxi.c | 185 +++---
drivers/clk/sunxi/clk-usb.c | 233 ++++++++
58 files changed, 5745 insertions(+), 3918 deletions(-)
create mode 100644 arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
create mode 100644 arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
create mode 100644 arch/arm/boot/dts/sun5i-a13-utoo-p66.dts
create mode 100644 arch/arm/boot/dts/sun5i.dtsi
create mode 100644 arch/arm/boot/dts/sun6i-a31-i7.dts
create mode 100644 arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
create mode 100644 arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
create mode 100644 arch/arm/boot/dts/sun9i-a80-cubieboard4.dts
create mode 100644 drivers/clk/sunxi/clk-usb.c
Merging tegra/for-next (47ee17a644f4 Merge branch for-4.1/dt into for-next)
$ git merge tegra/for-next
Auto-merging drivers/clk/clk.c
Merge made by the 'recursive' strategy.
.../bindings/clock/nvidia,tegra124-car.txt | 44 +-
.../memory-controllers/nvidia,tegra-mc.txt | 84 +-
.../bindings/memory-controllers/tegra-emc.txt | 374 +++++++
.../bindings/misc/nvidia,tegra20-apbmisc.txt | 2 +
arch/arm/mach-tegra/cpuidle-tegra20.c | 5 +-
arch/arm/mach-tegra/reset-handler.S | 10 +-
arch/arm/mach-tegra/reset.h | 4 +
arch/arm/mach-tegra/sleep-tegra20.S | 37 +-
arch/arm/mach-tegra/sleep.h | 4 +
arch/arm/mach-tegra/tegra.c | 1 -
drivers/clk/Kconfig | 1 +
drivers/clk/clk.c | 8 +
drivers/clk/tegra/Kconfig | 3 +
drivers/clk/tegra/Makefile | 1 +
drivers/clk/tegra/clk-emc.c | 539 ++++++++++
drivers/clk/tegra/clk-tegra124.c | 18 +-
drivers/clk/tegra/clk.h | 12 +
drivers/gpio/gpio-tegra.c | 4 +-
drivers/memory/tegra/Kconfig | 10 +
drivers/memory/tegra/Makefile | 2 +
drivers/memory/tegra/mc.c | 140 ++-
drivers/memory/tegra/tegra114.c | 32 +-
drivers/memory/tegra/tegra124-emc.c | 1137 ++++++++++++++++++++
drivers/memory/tegra/tegra124.c | 90 +-
drivers/memory/tegra/tegra30.c | 32 +-
drivers/soc/tegra/fuse/fuse-tegra20.c | 6 +-
drivers/soc/tegra/fuse/tegra-apbmisc.c | 21 +
drivers/soc/tegra/pmc.c | 23 +-
include/linux/clk-provider.h | 1 +
include/soc/tegra/emc.h | 19 +
include/soc/tegra/fuse.h | 1 +
include/soc/tegra/mc.h | 15 +-
include/soc/tegra/pmc.h | 2 -
33 files changed, 2572 insertions(+), 110 deletions(-)
create mode 100644 Documentation/devicetree/bindings/memory-controllers/tegra-emc.txt
create mode 100644 drivers/clk/tegra/Kconfig
create mode 100644 drivers/clk/tegra/clk-emc.c
create mode 100644 drivers/memory/tegra/tegra124-emc.c
create mode 100644 include/soc/tegra/emc.h
Merging arm64/for-next/core (6d1966dfd6e0 arm64: fix midr range for Cortex-A57 erratum 832075)
$ git merge arm64/for-next/core
Resolved 'arch/arm64/configs/defconfig' using previous resolution.
Removing arch/arm64/kernel/cputable.c
Auto-merging arch/arm64/include/asm/proc-fns.h
Auto-merging arch/arm64/include/asm/mmu_context.h
Auto-merging arch/arm64/include/asm/kvm_mmu.h
Removing arch/arm64/include/asm/cputable.h
Auto-merging arch/arm64/configs/defconfig
CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig
Auto-merging arch/arm64/Kconfig
Auto-merging arch/arm/kvm/mmu.c
Auto-merging arch/arm/kernel/vmlinux.lds.S
Auto-merging arch/arm/include/asm/kvm_mmu.h
Auto-merging Documentation/devicetree/bindings/arm/pmu.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master ef2ea4cbdf45] Merge remote-tracking branch 'arm64/for-next/core'
$ git diff -M --stat --summary HEAD^..
Documentation/devicetree/bindings/arm/pmu.txt | 7 +
arch/arm/include/asm/kvm_mmu.h | 10 +
arch/arm/kernel/vmlinux.lds.S | 11 +-
arch/arm/kvm/mmu.c | 69 +++----
arch/arm64/Kconfig | 35 +++-
arch/arm64/Makefile | 2 +-
arch/arm64/configs/defconfig | 14 +-
arch/arm64/crypto/aes-ce-ccm-core.S | 12 +-
arch/arm64/crypto/aes-ce.S | 10 +-
arch/arm64/include/asm/assembler.h | 48 +++++
arch/arm64/include/asm/cpufeature.h | 18 +-
arch/arm64/include/asm/cputable.h | 30 ---
arch/arm64/include/asm/dma-mapping.h | 2 +-
arch/arm64/include/asm/fixmap.h | 2 +-
arch/arm64/include/asm/insn.h | 1 +
arch/arm64/include/asm/kvm_mmu.h | 33 ++++
arch/arm64/include/asm/mmu_context.h | 43 +++++
arch/arm64/include/asm/page.h | 6 +-
arch/arm64/include/asm/pgtable-hwdef.h | 7 +-
arch/arm64/include/asm/pmu.h | 1 +
arch/arm64/include/asm/proc-fns.h | 9 -
arch/arm64/include/asm/processor.h | 6 +-
arch/arm64/include/asm/smp_plat.h | 2 +
arch/arm64/include/asm/unistd32.h | 2 +-
arch/arm64/kernel/Makefile | 4 +-
arch/arm64/kernel/alternative.c | 55 +++++-
arch/arm64/kernel/asm-offsets.c | 4 -
arch/arm64/kernel/cpu_errata.c | 47 ++---
arch/arm64/kernel/cpufeature.c | 47 +++++
arch/arm64/kernel/cpuinfo.c | 1 +
arch/arm64/kernel/cputable.c | 33 ----
arch/arm64/kernel/entry.S | 20 ++
arch/arm64/kernel/entry32.S | 18 ++
arch/arm64/kernel/head.S | 261 +++++++++-----------------
arch/arm64/kernel/insn.c | 81 ++++++--
arch/arm64/kernel/perf_event.c | 78 +++++++-
arch/arm64/kernel/setup.c | 55 ++++--
arch/arm64/kernel/smp.c | 3 +-
arch/arm64/kernel/sys32.c | 1 +
arch/arm64/kernel/vmlinux.lds.S | 17 +-
arch/arm64/kvm/hyp-init.S | 25 +++
arch/arm64/mm/mmu.c | 12 +-
arch/arm64/mm/pageattr.c | 2 -
arch/arm64/mm/proc-macros.S | 10 +
arch/arm64/mm/proc.S | 3 +
45 files changed, 748 insertions(+), 409 deletions(-)
delete mode 100644 arch/arm64/include/asm/cputable.h
create mode 100644 arch/arm64/kernel/cpufeature.c
delete mode 100644 arch/arm64/kernel/cputable.c
Merging arm64-acpi/for-next/acpi (7676fa70feb2 ARM64 / ACPI: make acpi_map_gic_cpu_interface() as void function)
$ git merge arm64-acpi/for-next/acpi
Auto-merging drivers/xen/Kconfig
Auto-merging arch/x86/kernel/acpi/boot.c
Auto-merging arch/arm64/kernel/smp.c
Auto-merging arch/arm64/kernel/setup.c
Auto-merging arch/arm64/kernel/Makefile
Auto-merging arch/arm64/include/asm/fixmap.h
Auto-merging arch/arm64/Kconfig
Merge made by the 'recursive' strategy.
Documentation/arm64/acpi_object_usage.txt | 593 ++++++++++++++++++++++++++++++
Documentation/arm64/arm-acpi.txt | 505 +++++++++++++++++++++++++
Documentation/kernel-parameters.txt | 3 +-
arch/arm64/Kconfig | 4 +
arch/arm64/include/asm/acenv.h | 18 +
arch/arm64/include/asm/acpi.h | 96 +++++
arch/arm64/include/asm/cpu_ops.h | 1 +
arch/arm64/include/asm/fixmap.h | 3 +
arch/arm64/include/asm/irq.h | 13 +
arch/arm64/include/asm/pci.h | 6 +
arch/arm64/include/asm/psci.h | 3 +-
arch/arm64/include/asm/smp.h | 5 +-
arch/arm64/kernel/Makefile | 1 +
arch/arm64/kernel/acpi.c | 345 +++++++++++++++++
arch/arm64/kernel/cpu_ops.c | 2 +-
arch/arm64/kernel/pci.c | 25 ++
arch/arm64/kernel/psci.c | 112 ++++--
arch/arm64/kernel/setup.c | 21 +-
arch/arm64/kernel/smp.c | 2 +-
arch/arm64/kernel/time.c | 7 +
arch/ia64/Kconfig | 1 +
arch/ia64/kernel/acpi.c | 2 +-
arch/x86/Kconfig | 1 +
arch/x86/kernel/acpi/boot.c | 2 +-
drivers/acpi/Kconfig | 10 +-
drivers/acpi/Makefile | 3 +-
drivers/acpi/acpi_processor.c | 7 +-
drivers/acpi/bus.c | 3 +
drivers/acpi/gsi.c | 105 ++++++
drivers/acpi/internal.h | 4 +
drivers/acpi/osl.c | 6 +-
drivers/acpi/processor_core.c | 60 ++-
drivers/acpi/tables.c | 52 ++-
drivers/clocksource/arm_arch_timer.c | 132 +++++--
drivers/irqchip/irq-gic.c | 104 ++++++
drivers/irqchip/irqchip.c | 3 +
drivers/xen/Kconfig | 4 +
drivers/xen/Makefile | 2 +-
include/acpi/acpi_io.h | 4 +
include/acpi/processor.h | 6 +-
include/linux/acpi.h | 8 +-
include/linux/acpi_irq.h | 10 +
include/linux/clocksource.h | 6 +
include/linux/irqchip/arm-gic-acpi.h | 31 ++
44 files changed, 2216 insertions(+), 115 deletions(-)
create mode 100644 Documentation/arm64/acpi_object_usage.txt
create mode 100644 Documentation/arm64/arm-acpi.txt
create mode 100644 arch/arm64/include/asm/acenv.h
create mode 100644 arch/arm64/include/asm/acpi.h
create mode 100644 arch/arm64/kernel/acpi.c
create mode 100644 drivers/acpi/gsi.c
create mode 100644 include/linux/acpi_irq.h
create mode 100644 include/linux/irqchip/arm-gic-acpi.h
Merging blackfin/for-linus (275f5a8573e7 blackfin: defconfigs: cleanup unused CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP)
$ git merge blackfin/for-linus
Auto-merging arch/blackfin/mach-bf609/boards/ezkit.c
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 (3083ca2376a7 c6x: platforms: cache: Export symbol L1P_cache_block_invalidate and L1D_cache_block_writeback)
$ git merge c6x/for-linux-next
Merge made by the 'recursive' strategy.
arch/c6x/Makefile | 2 +-
arch/c6x/include/asm/Kbuild | 1 +
arch/c6x/include/asm/dma-mapping.h | 8 ++++++++
arch/c6x/include/asm/flat.h | 12 ++++++++++++
arch/c6x/include/asm/setup.h | 1 +
arch/c6x/kernel/setup.c | 10 +++++++---
arch/c6x/kernel/time.c | 2 +-
arch/c6x/platforms/cache.c | 2 ++
8 files changed, 33 insertions(+), 5 deletions(-)
create mode 100644 arch/c6x/include/asm/flat.h
Merging cris/for-next (d939b52abe0c cris: fix integer overflow in ELF_ET_DYN_BASE)
$ git merge cris/for-next
Removing arch/cris/include/asm/topology.h
Removing arch/cris/include/asm/spinlock.h
Removing arch/cris/include/asm/smp.h
Removing arch/cris/include/asm/percpu.h
Removing arch/cris/include/asm/local64.h
Removing arch/cris/include/asm/local.h
Removing arch/cris/include/asm/kmap_types.h
Removing arch/cris/include/asm/kdebug.h
Removing arch/cris/include/asm/irq_regs.h
Removing arch/cris/include/asm/hardirq.h
Removing arch/cris/include/asm/futex.h
Removing arch/cris/include/asm/emergency-restart.h
Removing arch/cris/include/asm/div64.h
Removing arch/cris/include/asm/device.h
Removing arch/cris/include/asm/cmpxchg.h
Removing arch/cris/include/asm/atomic.h
Removing arch/cris/include/arch-v32/arch/spinlock.h
Removing arch/cris/include/arch-v32/arch/atomic.h
Removing arch/cris/include/arch-v10/arch/atomic.h
Removing arch/cris/arch-v32/lib/spinlock.S
Removing arch/cris/arch-v32/kernel/smp.c
Merge made by the 'recursive' strategy.
Documentation/devicetree/bindings/cris/axis.txt | 9 +
Documentation/devicetree/bindings/cris/boards.txt | 8 +
.../devicetree/bindings/cris/interrupts.txt | 23 ++
arch/cris/Kconfig | 12 +-
arch/cris/Makefile | 4 +
arch/cris/arch-v32/kernel/Makefile | 1 -
arch/cris/arch-v32/kernel/entry.S | 42 +--
arch/cris/arch-v32/kernel/head.S | 32 --
arch/cris/arch-v32/kernel/irq.c | 31 +-
arch/cris/arch-v32/kernel/setup.c | 5 -
arch/cris/arch-v32/kernel/signal.c | 5 +
arch/cris/arch-v32/kernel/smp.c | 358 ---------------------
arch/cris/arch-v32/kernel/time.c | 180 ++++++-----
arch/cris/arch-v32/lib/Makefile | 2 +-
arch/cris/arch-v32/lib/spinlock.S | 40 ---
arch/cris/arch-v32/mm/init.c | 11 -
arch/cris/arch-v32/mm/mmu.S | 4 -
arch/cris/boot/dts/Makefile | 6 +
arch/cris/boot/dts/dev88.dts | 18 ++
arch/cris/boot/dts/etraxfs.dtsi | 38 +++
arch/cris/include/arch-v10/arch/atomic.h | 7 -
arch/cris/include/arch-v10/arch/system.h | 8 -
arch/cris/include/arch-v32/arch/atomic.h | 36 ---
arch/cris/include/arch-v32/arch/processor.h | 3 +-
arch/cris/include/arch-v32/arch/spinlock.h | 131 --------
arch/cris/include/asm/Kbuild | 15 +-
arch/cris/include/asm/atomic.h | 149 ---------
arch/cris/include/asm/bitops.h | 111 +------
arch/cris/include/asm/cmpxchg.h | 53 ---
arch/cris/include/asm/device.h | 7 -
arch/cris/include/asm/div64.h | 1 -
arch/cris/include/asm/elf.h | 2 +-
arch/cris/include/asm/emergency-restart.h | 6 -
arch/cris/include/asm/futex.h | 6 -
arch/cris/include/asm/hardirq.h | 7 -
arch/cris/include/asm/irq_regs.h | 1 -
arch/cris/include/asm/kdebug.h | 1 -
arch/cris/include/asm/kmap_types.h | 10 -
arch/cris/include/asm/local.h | 1 -
arch/cris/include/asm/local64.h | 1 -
arch/cris/include/asm/percpu.h | 6 -
arch/cris/include/asm/smp.h | 10 -
arch/cris/include/asm/spinlock.h | 1 -
arch/cris/include/asm/tlbflush.h | 7 -
arch/cris/include/asm/topology.h | 6 -
arch/cris/kernel/Makefile | 1 +
arch/cris/kernel/devicetree.c | 14 +
arch/cris/kernel/ptrace.c | 23 ++
arch/cris/kernel/setup.c | 15 +
arch/cris/kernel/time.c | 2 +
50 files changed, 325 insertions(+), 1145 deletions(-)
create mode 100644 Documentation/devicetree/bindings/cris/axis.txt
create mode 100644 Documentation/devicetree/bindings/cris/boards.txt
create mode 100644 Documentation/devicetree/bindings/cris/interrupts.txt
delete mode 100644 arch/cris/arch-v32/kernel/smp.c
delete mode 100644 arch/cris/arch-v32/lib/spinlock.S
create mode 100644 arch/cris/boot/dts/Makefile
create mode 100644 arch/cris/boot/dts/dev88.dts
create mode 100644 arch/cris/boot/dts/etraxfs.dtsi
delete mode 100644 arch/cris/include/arch-v10/arch/atomic.h
delete mode 100644 arch/cris/include/arch-v32/arch/atomic.h
delete mode 100644 arch/cris/include/arch-v32/arch/spinlock.h
delete mode 100644 arch/cris/include/asm/atomic.h
delete mode 100644 arch/cris/include/asm/cmpxchg.h
delete mode 100644 arch/cris/include/asm/device.h
delete mode 100644 arch/cris/include/asm/div64.h
delete mode 100644 arch/cris/include/asm/emergency-restart.h
delete mode 100644 arch/cris/include/asm/futex.h
delete mode 100644 arch/cris/include/asm/hardirq.h
delete mode 100644 arch/cris/include/asm/irq_regs.h
delete mode 100644 arch/cris/include/asm/kdebug.h
delete mode 100644 arch/cris/include/asm/kmap_types.h
delete mode 100644 arch/cris/include/asm/local.h
delete mode 100644 arch/cris/include/asm/local64.h
delete mode 100644 arch/cris/include/asm/percpu.h
delete mode 100644 arch/cris/include/asm/smp.h
delete mode 100644 arch/cris/include/asm/spinlock.h
delete mode 100644 arch/cris/include/asm/topology.h
create mode 100644 arch/cris/kernel/devicetree.c
Merging hexagon/linux-next (8914d7e85780 Hexagon: fix signal delivery for debug traps)
$ git merge hexagon/linux-next
Already up-to-date.
Merging ia64/next (62f269ef8191 pstore: Fix the ramoops module parameters update)
$ git merge ia64/next
Merge made by the 'recursive' strategy.
fs/pstore/ram.c | 3 +++
1 file changed, 3 insertions(+)
Merging m68k/for-next (b24f670b7f5b m68k/mac: Fix out-of-bounds array index in OSS IRQ source initialization)
$ git merge m68k/for-next
Merge made by the 'recursive' strategy.
arch/m68k/configs/amiga_defconfig | 3 +++
arch/m68k/configs/apollo_defconfig | 3 +++
arch/m68k/configs/atari_defconfig | 3 +++
arch/m68k/configs/bvme6000_defconfig | 3 +++
arch/m68k/configs/hp300_defconfig | 3 +++
arch/m68k/configs/mac_defconfig | 3 +++
arch/m68k/configs/multi_defconfig | 3 +++
arch/m68k/configs/mvme147_defconfig | 3 +++
arch/m68k/configs/mvme16x_defconfig | 3 +++
arch/m68k/configs/q40_defconfig | 5 ++++-
arch/m68k/configs/sun3_defconfig | 3 +++
arch/m68k/configs/sun3x_defconfig | 3 +++
arch/m68k/include/asm/mcfqspi.h | 5 -----
arch/m68k/kernel/pcibios.c | 2 +-
arch/m68k/lib/ashldi3.c | 7 +------
arch/m68k/lib/ashrdi3.c | 7 +------
arch/m68k/lib/divsi3.S | 7 +------
arch/m68k/lib/lshrdi3.c | 7 +------
arch/m68k/lib/modsi3.S | 7 +------
arch/m68k/lib/muldi3.c | 7 +------
arch/m68k/lib/mulsi3.S | 7 +------
arch/m68k/lib/udivsi3.S | 7 +------
arch/m68k/lib/umodsi3.S | 7 +------
arch/m68k/mac/oss.c | 3 +--
24 files changed, 48 insertions(+), 63 deletions(-)
Merging m68knommu/for-next (6e4206136faa m68knommu: fix fec setup warning for ColdFire 5271 builds)
$ git merge m68knommu/for-next
Merge made by the 'recursive' strategy.
arch/m68k/coldfire/m527x.c | 3 ++-
arch/m68k/include/asm/m527xsim.h | 2 ++
arch/m68k/include/asm/m68360_pram.h | 4 ++--
3 files changed, 6 insertions(+), 3 deletions(-)
Merging metag/for-next (40346a0327fe metag: copy_thread(): rename 'arg' argument to 'kthread_arg')
$ git merge metag/for-next
Merge made by the 'recursive' strategy.
arch/metag/kernel/process.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
Merging microblaze/next (c2219eda5478 microblaze: Fix syscall error recovery for invalid syscall IDs)
$ git merge microblaze/next
Already up-to-date.
Merging mips/mips-for-linux-next (3bb621412207 Merge branch '4.0-fixes' into mips-for-linux-next)
$ git merge mips/mips-for-linux-next
Resolved 'drivers/bus/Makefile' using previous resolution.
Resolved 'drivers/irqchip/Makefile' using previous resolution.
Auto-merging include/linux/bcm47xx_nvram.h
Auto-merging drivers/irqchip/Makefile
CONFLICT (content): Merge conflict in drivers/irqchip/Makefile
Auto-merging drivers/clocksource/Kconfig
Auto-merging drivers/bus/Makefile
CONFLICT (content): Merge conflict in drivers/bus/Makefile
Auto-merging drivers/bus/Kconfig
Auto-merging arch/mips/power/hibernate_asm.S
Removing arch/mips/mti-sead3/sead3-net.c
Removing arch/mips/mti-sead3/sead3-mtd.c
Removing arch/mips/mti-sead3/sead3-leds.c
Removing arch/mips/mti-sead3/sead3-i2c.c
Removing arch/mips/mti-sead3/sead3-i2c-drv.c
Removing arch/mips/mti-sead3/sead3-i2c-dev.c
Removing arch/mips/mti-sead3/sead3-ehci.c
Removing arch/mips/include/asm/mach-vr41xx/war.h
Removing arch/mips/include/asm/mach-tx39xx/war.h
Removing arch/mips/include/asm/mach-pnx833x/war.h
Removing arch/mips/include/asm/mach-paravirt/war.h
Removing arch/mips/include/asm/mach-netlogic/war.h
Removing arch/mips/include/asm/mach-netlogic/topology.h
Removing arch/mips/include/asm/mach-loongson1/war.h
Removing arch/mips/include/asm/mach-loongson/war.h
Removing arch/mips/include/asm/mach-lasat/war.h
Removing arch/mips/include/asm/mach-lantiq/war.h
Removing arch/mips/include/asm/mach-jz4740/war.h
Removing arch/mips/include/asm/mach-jazz/war.h
Auto-merging arch/mips/include/asm/mach-generic/war.h
Removing arch/mips/include/asm/mach-emma2rh/war.h
Removing arch/mips/include/asm/mach-dec/war.h
Removing arch/mips/include/asm/mach-cobalt/war.h
Auto-merging arch/mips/include/asm/mach-bmips/dma-coherence.h
Removing arch/mips/include/asm/mach-bcm63xx/war.h
Removing arch/mips/include/asm/mach-bcm47xx/war.h
Removing arch/mips/include/asm/mach-bcm3384/war.h
Removing arch/mips/include/asm/mach-au1x00/war.h
Removing arch/mips/include/asm/mach-ath79/war.h
Removing arch/mips/include/asm/mach-ath25/war.h
Removing arch/mips/include/asm/mach-ar7/war.h
Auto-merging arch/mips/configs/bmips_be_defconfig
Auto-merging arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts
Auto-merging arch/mips/boot/dts/brcm/bcm93384wvg.dts
Removing arch/mips/boot/dts/bcm3384.dtsi
Removing arch/mips/bcm3384/setup.c
Removing arch/mips/bcm3384/irq.c
Removing arch/mips/bcm3384/dma.c
Removing arch/mips/bcm3384/Platform
Auto-merging Documentation/kernel-parameters.txt
Removing Documentation/devicetree/bindings/mips/brcm/cm-dsl.txt
Removing Documentation/devicetree/bindings/mips/brcm/bcm3384-intc.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 3c8cfc3cf2b0] Merge remote-tracking branch 'mips/mips-for-linux-next'
$ git diff -M --stat --summary HEAD^..
Documentation/IRQ-domain.txt | 3 +-
.../devicetree/bindings/clock/pistachio-clock.txt | 123 ++
.../interrupt-controller/brcm,bcm3380-l2-intc.txt | 41 +
.../interrupt-controller/brcm,bcm7038-l1-intc.txt | 52 +
.../interrupt-controller/brcm,bcm7120-l2-intc.txt | 12 +-
.../bindings/interrupt-controller/mips-gic.txt | 5 +
.../devicetree/bindings/mips/brcm/bcm3384-intc.txt | 37 -
.../devicetree/bindings/mips/brcm/cm-dsl.txt | 11 -
.../devicetree/bindings/mips/brcm/soc.txt | 12 +
.../devicetree/bindings/mips/img/pistachio.txt | 42 +
Documentation/devicetree/booting-without-of.txt | 28 +
Documentation/kernel-parameters.txt | 2 +-
arch/mips/Kbuild.platforms | 3 +-
arch/mips/Kconfig | 118 +-
arch/mips/Makefile | 21 +-
arch/mips/ar7/platform.c | 5 +-
arch/mips/ath79/common.h | 2 +-
arch/mips/bcm3384/Platform | 7 -
arch/mips/bcm3384/dma.c | 81 --
arch/mips/bcm3384/irq.c | 193 ---
arch/mips/bcm3384/setup.c | 97 --
arch/mips/bcm47xx/bcm47xx_private.h | 4 +
arch/mips/bcm47xx/board.c | 61 +-
arch/mips/bcm47xx/buttons.c | 18 +
arch/mips/bcm47xx/leds.c | 10 +
arch/mips/bcm47xx/nvram.c | 77 +-
arch/mips/bcm47xx/prom.c | 3 +-
arch/mips/bcm47xx/serial.c | 8 +-
arch/mips/bcm47xx/setup.c | 13 +-
arch/mips/bcm47xx/sprom.c | 675 ++++------
arch/mips/bcm47xx/time.c | 2 -
arch/mips/bcm63xx/prom.c | 4 -
arch/mips/bcm63xx/setup.c | 4 +
arch/mips/bmips/Kconfig | 62 +
arch/mips/{bcm3384 => bmips}/Makefile | 0
arch/mips/bmips/Platform | 7 +
arch/mips/bmips/dma.c | 117 ++
arch/mips/bmips/irq.c | 38 +
arch/mips/bmips/setup.c | 194 +++
arch/mips/boot/compressed/Makefile | 9 +-
arch/mips/boot/compressed/decompress.c | 5 +
arch/mips/boot/dts/Makefile | 33 +-
arch/mips/boot/dts/bcm3384.dtsi | 109 --
arch/mips/boot/dts/brcm/Makefile | 19 +
arch/mips/boot/dts/brcm/bcm3384_viper.dtsi | 108 ++
arch/mips/boot/dts/brcm/bcm3384_zephyr.dtsi | 126 ++
arch/mips/boot/dts/brcm/bcm6328.dtsi | 86 ++
arch/mips/boot/dts/brcm/bcm6368.dtsi | 93 ++
arch/mips/boot/dts/brcm/bcm7125.dtsi | 139 +++
arch/mips/boot/dts/brcm/bcm7346.dtsi | 224 ++++
arch/mips/boot/dts/brcm/bcm7358.dtsi | 161 +++
arch/mips/boot/dts/brcm/bcm7360.dtsi | 161 +++
arch/mips/boot/dts/brcm/bcm7362.dtsi | 167 +++
arch/mips/boot/dts/brcm/bcm7420.dtsi | 184 +++
arch/mips/boot/dts/brcm/bcm7425.dtsi | 225 ++++
arch/mips/boot/dts/{ => brcm}/bcm93384wvg.dts | 9 +-
arch/mips/boot/dts/brcm/bcm93384wvg_viper.dts | 25 +
arch/mips/boot/dts/brcm/bcm96368mvwg.dts | 31 +
arch/mips/boot/dts/brcm/bcm97125cbmb.dts | 31 +
arch/mips/boot/dts/brcm/bcm97346dbsmb.dts | 58 +
arch/mips/boot/dts/brcm/bcm97358svmb.dts | 34 +
arch/mips/boot/dts/brcm/bcm97360svmb.dts | 34 +
arch/mips/boot/dts/brcm/bcm97362svmb.dts | 34 +
arch/mips/boot/dts/brcm/bcm97420c.dts | 45 +
arch/mips/boot/dts/brcm/bcm97425svmb.dts | 60 +
arch/mips/boot/dts/brcm/bcm9ejtagprb.dts | 22 +
arch/mips/boot/dts/cavium-octeon/Makefile | 9 +
.../boot/dts/{ => cavium-octeon}/octeon_3xxx.dts | 12 +
.../boot/dts/{ => cavium-octeon}/octeon_68xx.dts | 0
arch/mips/boot/dts/lantiq/Makefile | 9 +
arch/mips/boot/dts/{ => lantiq}/danube.dtsi | 0
arch/mips/boot/dts/{ => lantiq}/easy50712.dts | 0
arch/mips/boot/dts/mti/Makefile | 9 +
arch/mips/boot/dts/{ => mti}/sead3.dts | 0
arch/mips/boot/dts/netlogic/Makefile | 13 +
arch/mips/boot/dts/{ => netlogic}/xlp_evp.dts | 0
arch/mips/boot/dts/{ => netlogic}/xlp_fvp.dts | 0
arch/mips/boot/dts/{ => netlogic}/xlp_gvp.dts | 0
arch/mips/boot/dts/netlogic/xlp_rvp.dts | 77 ++
arch/mips/boot/dts/{ => netlogic}/xlp_svp.dts | 0
arch/mips/boot/dts/ralink/Makefile | 12 +
arch/mips/boot/dts/{ => ralink}/mt7620a.dtsi | 0
arch/mips/boot/dts/{ => ralink}/mt7620a_eval.dts | 0
arch/mips/boot/dts/{ => ralink}/rt2880.dtsi | 0
arch/mips/boot/dts/{ => ralink}/rt2880_eval.dts | 0
arch/mips/boot/dts/{ => ralink}/rt3050.dtsi | 0
arch/mips/boot/dts/{ => ralink}/rt3052_eval.dts | 0
arch/mips/boot/dts/{ => ralink}/rt3883.dtsi | 0
arch/mips/boot/dts/{ => ralink}/rt3883_eval.dts | 0
arch/mips/cavium-octeon/crypto/Makefile | 5 +-
arch/mips/cavium-octeon/crypto/octeon-crypto.c | 4 +-
arch/mips/cavium-octeon/crypto/octeon-crypto.h | 89 +-
arch/mips/cavium-octeon/crypto/octeon-md5.c | 8 -
arch/mips/cavium-octeon/crypto/octeon-sha1.c | 241 ++++
arch/mips/cavium-octeon/crypto/octeon-sha256.c | 280 +++++
arch/mips/cavium-octeon/crypto/octeon-sha512.c | 277 +++++
arch/mips/cavium-octeon/dma-octeon.c | 2 +-
arch/mips/cavium-octeon/executive/cvmx-l2c.c | 45 +
arch/mips/cavium-octeon/flash_setup.c | 83 +-
arch/mips/cavium-octeon/octeon-platform.c | 19 +
arch/mips/cavium-octeon/octeon_boot.h | 23 +
arch/mips/cavium-octeon/setup.c | 10 +-
.../{bcm3384_defconfig => bmips_be_defconfig} | 11 +-
arch/mips/configs/bmips_stb_defconfig | 88 ++
arch/mips/configs/maltaup_xpa_defconfig | 439 +++++++
arch/mips/configs/pistachio_defconfig | 336 +++++
arch/mips/dec/int-handler.S | 7 +-
arch/mips/dec/setup.c | 16 +-
arch/mips/include/asm/asm-eva.h | 137 +-
arch/mips/include/asm/asmmacro-32.h | 96 +-
arch/mips/include/asm/asmmacro.h | 218 ++--
arch/mips/include/asm/bitops.h | 7 +-
arch/mips/include/asm/bmips.h | 16 +
arch/mips/include/asm/cacheflush.h | 35 +-
arch/mips/include/asm/cdmm.h | 98 ++
arch/mips/include/asm/cevt-r4k.h | 19 -
arch/mips/include/asm/checksum.h | 6 +-
arch/mips/include/asm/cmpxchg.h | 11 +-
arch/mips/include/asm/cpu-features.h | 48 +-
arch/mips/include/asm/cpu-info.h | 2 +
arch/mips/include/asm/cpu-type.h | 1 +
arch/mips/include/asm/cpu.h | 8 +-
arch/mips/include/asm/dma-mapping.h | 2 +-
arch/mips/include/asm/elf.h | 12 +
arch/mips/include/asm/fpu.h | 27 +-
arch/mips/include/asm/fpu_emulator.h | 6 +-
arch/mips/include/asm/irq.h | 3 +
arch/mips/include/asm/mach-ar7/war.h | 24 -
arch/mips/include/asm/mach-ath25/dma-coherence.h | 14 +-
arch/mips/include/asm/mach-ath25/war.h | 25 -
arch/mips/include/asm/mach-ath79/war.h | 24 -
arch/mips/include/asm/mach-au1x00/war.h | 24 -
arch/mips/include/asm/mach-bcm3384/war.h | 24 -
arch/mips/include/asm/mach-bcm47xx/bcm47xx.h | 1 +
arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h | 4 +
arch/mips/include/asm/mach-bcm47xx/war.h | 24 -
arch/mips/include/asm/mach-bcm63xx/dma-coherence.h | 10 +
arch/mips/include/asm/mach-bcm63xx/war.h | 24 -
.../{mach-bcm3384 => mach-bmips}/dma-coherence.h | 12 +-
arch/mips/include/asm/mach-bmips/spaces.h | 18 +
.../asm/mach-cavium-octeon/cpu-feature-overrides.h | 1 -
.../include/asm/mach-cavium-octeon/dma-coherence.h | 4 +
.../include/asm/mach-cavium-octeon/mangle-port.h | 74 ++
.../asm/mach-cobalt/cpu-feature-overrides.h | 1 -
arch/mips/include/asm/mach-cobalt/war.h | 24 -
.../include/asm/mach-dec/cpu-feature-overrides.h | 1 -
arch/mips/include/asm/mach-dec/war.h | 24 -
arch/mips/include/asm/mach-emma2rh/war.h | 24 -
arch/mips/include/asm/mach-generic/dma-coherence.h | 6 +
.../asm/{mach-ralink => mach-generic}/war.h | 6 +-
.../include/asm/mach-ip22/cpu-feature-overrides.h | 1 -
arch/mips/include/asm/mach-ip27/dma-coherence.h | 4 +
.../include/asm/mach-ip32/cpu-feature-overrides.h | 1 -
arch/mips/include/asm/mach-ip32/dma-coherence.h | 4 +
arch/mips/include/asm/mach-jazz/dma-coherence.h | 4 +
arch/mips/include/asm/mach-jazz/war.h | 24 -
arch/mips/include/asm/mach-jz4740/war.h | 24 -
arch/mips/include/asm/mach-lantiq/war.h | 23 -
arch/mips/include/asm/mach-lasat/war.h | 24 -
.../asm/mach-loongson/cpu-feature-overrides.h | 1 -
.../mips/include/asm/mach-loongson/dma-coherence.h | 4 +
arch/mips/include/asm/mach-loongson/loongson.h | 4 +
arch/mips/include/asm/mach-loongson/war.h | 24 -
arch/mips/include/asm/mach-loongson1/war.h | 24 -
arch/mips/include/asm/mach-netlogic/multi-node.h | 9 -
arch/mips/include/asm/mach-netlogic/topology.h | 15 -
arch/mips/include/asm/mach-netlogic/war.h | 25 -
arch/mips/include/asm/mach-paravirt/war.h | 25 -
arch/mips/include/asm/mach-pistachio/gpio.h | 21 +
arch/mips/include/asm/mach-pistachio/irq.h | 18 +
arch/mips/include/asm/mach-pnx833x/war.h | 24 -
.../include/asm/mach-rm/cpu-feature-overrides.h | 1 -
arch/mips/include/asm/mach-tx39xx/war.h | 24 -
arch/mips/include/asm/mach-vr41xx/war.h | 24 -
arch/mips/include/asm/mips-boards/sead3-addr.h | 83 ++
arch/mips/include/asm/mips-r2-to-r6-emul.h | 9 +-
arch/mips/include/asm/mipsregs.h | 312 +++--
arch/mips/include/asm/netlogic/common.h | 21 +-
arch/mips/include/asm/netlogic/mips-extns.h | 8 +-
.../mips/include/asm/netlogic/xlp-hal/cpucontrol.h | 2 +
arch/mips/include/asm/netlogic/xlp-hal/sys.h | 3 +
arch/mips/include/asm/netlogic/xlp-hal/xlp.h | 3 +-
arch/mips/include/asm/octeon/cvmx-address.h | 67 +
arch/mips/include/asm/octeon/cvmx-bootinfo.h | 55 +
arch/mips/include/asm/octeon/cvmx-bootmem.h | 14 +
arch/mips/include/asm/octeon/cvmx-fau.h | 22 +
arch/mips/include/asm/octeon/cvmx-fpa.h | 7 +
arch/mips/include/asm/octeon/cvmx-l2c.h | 9 +
arch/mips/include/asm/octeon/cvmx-packet.h | 8 +
arch/mips/include/asm/octeon/cvmx-pko.h | 31 +
arch/mips/include/asm/octeon/cvmx-pow.h | 247 ++++
arch/mips/include/asm/octeon/cvmx-wqe.h | 71 ++
arch/mips/include/asm/octeon/cvmx.h | 8 -
arch/mips/include/asm/octeon/octeon.h | 2 +
arch/mips/include/asm/octeon/pci-octeon.h | 3 -
arch/mips/include/asm/page.h | 2 -
arch/mips/include/asm/pci.h | 2 +
arch/mips/include/asm/pci/bridge.h | 1 +
arch/mips/include/asm/pgtable-32.h | 15 +-
arch/mips/include/asm/pgtable-64.h | 10 +-
arch/mips/include/asm/pgtable-bits.h | 96 +-
arch/mips/include/asm/pgtable.h | 83 +-
arch/mips/include/asm/processor.h | 2 +-
arch/mips/include/asm/r4kcache.h | 89 +-
arch/mips/include/asm/sgi/sgi.h | 15 +-
arch/mips/include/asm/spinlock.h | 2 +-
arch/mips/include/asm/thread_info.h | 4 +-
arch/mips/include/uapi/asm/perf_regs.h | 41 +
arch/mips/jz4740/Platform | 1 +
arch/mips/jz4740/time.c | 8 +
arch/mips/kernel/Makefile | 2 +-
arch/mips/kernel/asm-offsets.c | 66 -
arch/mips/kernel/branch.c | 6 +-
arch/mips/kernel/cevt-r4k.c | 33 +-
arch/mips/kernel/cevt-txx9.c | 9 +
arch/mips/kernel/cpu-probe.c | 200 ++-
arch/mips/kernel/csrc-bcm1480.c | 12 +-
arch/mips/kernel/csrc-ioasic.c | 13 +-
arch/mips/kernel/csrc-r4k.c | 8 +
arch/mips/kernel/csrc-sb1250.c | 23 +-
arch/mips/kernel/elf.c | 14 +-
arch/mips/kernel/entry.S | 3 +-
arch/mips/kernel/genex.S | 13 +-
arch/mips/kernel/idle.c | 13 +-
arch/mips/kernel/mips-r2-to-r6-emul.c | 15 +-
arch/mips/kernel/perf_event_mipsxx.c | 83 +-
arch/mips/kernel/perf_regs.c | 60 +
arch/mips/kernel/proc.c | 1 +
arch/mips/kernel/process.c | 10 +-
arch/mips/kernel/prom.c | 5 +-
arch/mips/kernel/ptrace.c | 40 +-
arch/mips/kernel/r2300_switch.S | 7 +-
arch/mips/kernel/r4k_fpu.S | 2 +-
arch/mips/kernel/r4k_switch.S | 7 +-
arch/mips/kernel/reset.c | 25 +
arch/mips/kernel/setup.c | 2 +
arch/mips/kernel/smp-cps.c | 6 +
arch/mips/kernel/smp.c | 6 +-
arch/mips/kernel/traps.c | 269 ++--
arch/mips/kernel/unaligned.c | 346 ++++--
arch/mips/lantiq/prom.c | 2 +-
arch/mips/lantiq/xway/vmmc.c | 1 -
arch/mips/lasat/sysctl.c | 15 -
arch/mips/lib/csum_partial.S | 38 +-
arch/mips/loongson/common/env.c | 9 +
arch/mips/loongson/common/pci.c | 6 +
arch/mips/loongson/loongson-3/cop2-ex.c | 2 +-
arch/mips/loongson/loongson-3/hpet.c | 2 +-
arch/mips/loongson/loongson-3/irq.c | 1 +
arch/mips/math-emu/Makefile | 15 +-
arch/mips/math-emu/cp1emu.c | 288 +++--
arch/mips/math-emu/dp_add.c | 14 +-
arch/mips/math-emu/dp_cmp.c | 13 +-
arch/mips/math-emu/dp_div.c | 9 +-
arch/mips/math-emu/dp_fsp.c | 16 +-
arch/mips/math-emu/dp_mul.c | 9 +-
arch/mips/math-emu/dp_simple.c | 55 +-
arch/mips/math-emu/dp_sqrt.c | 13 +-
arch/mips/math-emu/dp_sub.c | 14 +-
arch/mips/math-emu/dsemul.c | 6 +-
arch/mips/math-emu/ieee754.h | 111 +-
arch/mips/math-emu/ieee754dp.c | 25 +-
arch/mips/math-emu/ieee754dp.h | 1 -
arch/mips/math-emu/ieee754int.h | 5 +
arch/mips/math-emu/ieee754sp.c | 25 +-
arch/mips/math-emu/ieee754sp.h | 1 -
arch/mips/math-emu/me-debugfs.c | 1 +
arch/mips/math-emu/sp_add.c | 14 +-
arch/mips/math-emu/sp_cmp.c | 13 +-
arch/mips/math-emu/sp_div.c | 9 +-
arch/mips/math-emu/sp_fdp.c | 22 +-
arch/mips/math-emu/sp_mul.c | 9 +-
arch/mips/math-emu/sp_simple.c | 55 +-
arch/mips/math-emu/sp_sqrt.c | 13 +-
arch/mips/math-emu/sp_sub.c | 14 +-
arch/mips/mm/c-r4k.c | 33 +-
arch/mips/mm/cache.c | 27 +-
arch/mips/mm/dma-default.c | 4 +-
arch/mips/mm/init.c | 7 +-
arch/mips/mm/page.c | 1 +
arch/mips/mm/tlb-r4k.c | 15 +-
arch/mips/mm/tlbex.c | 116 +-
arch/mips/mti-malta/malta-memory.c | 13 +
arch/mips/mti-malta/malta-time.c | 20 +-
arch/mips/mti-sead3/Makefile | 7 +-
arch/mips/mti-sead3/leds-sead3.c | 41 +-
arch/mips/mti-sead3/sead3-ehci.c | 53 -
arch/mips/mti-sead3/sead3-i2c-dev.c | 33 -
arch/mips/mti-sead3/sead3-i2c-drv.c | 404 ------
arch/mips/mti-sead3/sead3-i2c.c | 31 -
arch/mips/mti-sead3/sead3-init.c | 2 +-
arch/mips/mti-sead3/sead3-leds.c | 79 --
arch/mips/mti-sead3/sead3-mtd.c | 53 -
arch/mips/mti-sead3/sead3-net.c | 57 -
arch/mips/mti-sead3/sead3-platform.c | 184 ++-
arch/mips/netlogic/Kconfig | 9 +
arch/mips/netlogic/common/irq.c | 10 +-
arch/mips/netlogic/common/reset.S | 22 +-
arch/mips/netlogic/common/smp.c | 25 +-
arch/mips/netlogic/common/time.c | 1 -
arch/mips/netlogic/xlp/ahci-init-xlp2.c | 13 +
arch/mips/netlogic/xlp/ahci-init.c | 2 +-
arch/mips/netlogic/xlp/dt.c | 10 +-
arch/mips/netlogic/xlp/nlm_hal.c | 57 +-
arch/mips/netlogic/xlp/setup.c | 7 +-
arch/mips/netlogic/xlp/usb-init-xlp2.c | 10 +-
arch/mips/netlogic/xlp/wakeup.c | 10 +-
arch/mips/oprofile/common.c | 1 +
arch/mips/oprofile/op_model_mipsxx.c | 15 +-
arch/mips/pci/Makefile | 2 +-
arch/mips/pci/msi-xlp.c | 19 +-
arch/mips/pci/pci-ar2315.c | 1 -
arch/mips/pci/pci-octeon.c | 8 +-
arch/mips/pci/pci-rt2880.c | 1 -
arch/mips/pci/pci.c | 5 +-
arch/mips/pci/pcie-octeon.c | 8 -
arch/mips/pistachio/Makefile | 1 +
arch/mips/pistachio/Platform | 8 +
arch/mips/pistachio/init.c | 131 ++
arch/mips/pistachio/irq.c | 28 +
arch/mips/pistachio/time.c | 52 +
arch/mips/power/Makefile | 2 +-
arch/mips/power/hibernate.c | 10 +
arch/mips/power/{hibernate.S => hibernate_asm.S} | 5 +-
arch/mips/ralink/Kconfig | 5 +
arch/mips/sgi-ip27/ip27-timer.c | 8 +
arch/mips/sgi-ip32/ip32-platform.c | 5 -
crypto/Kconfig | 27 +
drivers/bcma/driver_mips.c | 2 +-
drivers/bus/Kconfig | 13 +
drivers/bus/Makefile | 1 +
drivers/bus/mips_cdmm.c | 716 +++++++++++
drivers/clk/Makefile | 1 +
drivers/clk/pistachio/Makefile | 3 +
drivers/clk/pistachio/clk-pistachio.c | 329 +++++
drivers/clk/pistachio/clk-pll.c | 401 ++++++
drivers/clk/pistachio/clk.c | 140 +++
drivers/clk/pistachio/clk.h | 174 +++
drivers/clocksource/Kconfig | 2 +-
drivers/clocksource/mips-gic-timer.c | 13 +-
drivers/irqchip/Kconfig | 5 +
drivers/irqchip/Makefile | 1 +
drivers/irqchip/irq-bcm7038-l1.c | 335 +++++
drivers/irqchip/irq-bcm7120-l2.c | 193 ++-
drivers/irqchip/irq-brcmstb-l2.c | 9 +-
drivers/irqchip/irq-mips-gic.c | 61 +-
drivers/net/ethernet/broadcom/b44.c | 2 +-
drivers/net/ethernet/broadcom/bgmac.c | 2 +-
drivers/platform/Kconfig | 3 +
drivers/platform/Makefile | 1 +
drivers/platform/mips/Kconfig | 30 +
drivers/platform/mips/Makefile | 2 +
drivers/platform/mips/acpi_init.c | 150 +++
drivers/platform/mips/cpu_hwmon.c | 207 ++++
drivers/ssb/Kconfig | 1 +
drivers/ssb/driver_chipcommon_pmu.c | 2 +-
drivers/ssb/driver_mipscore.c | 2 +-
drivers/staging/octeon/ethernet-tx.c | 5 +-
drivers/staging/octeon/ethernet.c | 10 +
drivers/tty/Kconfig | 47 +
drivers/tty/Makefile | 1 +
drivers/tty/mips_ejtag_fdc.c | 1303 ++++++++++++++++++++
include/dt-bindings/clock/pistachio-clk.h | 183 +++
.../mach-bcm47xx => include/linux}/bcm47xx_nvram.h | 19 +-
include/linux/irqchip/mips-gic.h | 9 +
include/linux/mod_devicetable.h | 8 +
scripts/mod/devicetable-offsets.c | 3 +
scripts/mod/file2alias.c | 16 +
368 files changed, 13572 insertions(+), 4077 deletions(-)
create mode 100644 Documentation/devicetree/bindings/clock/pistachio-clock.txt
create mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,bcm3380-l2-intc.txt
create mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7038-l1-intc.txt
delete mode 100644 Documentation/devicetree/bindings/mips/brcm/bcm3384-intc.txt
delete mode 100644 Documentation/devicetree/bindings/mips/brcm/cm-dsl.txt
create mode 100644 Documentation/devicetree/bindings/mips/brcm/soc.txt
create mode 100644 Documentation/devicetree/bindings/mips/img/pistachio.txt
delete mode 100644 arch/mips/bcm3384/Platform
delete mode 100644 arch/mips/bcm3384/dma.c
delete mode 100644 arch/mips/bcm3384/irq.c
delete mode 100644 arch/mips/bcm3384/setup.c
create mode 100644 arch/mips/bmips/Kconfig
rename arch/mips/{bcm3384 => bmips}/Makefile (100%)
create mode 100644 arch/mips/bmips/Platform
create mode 100644 arch/mips/bmips/dma.c
create mode 100644 arch/mips/bmips/irq.c
create mode 100644 arch/mips/bmips/setup.c
delete mode 100644 arch/mips/boot/dts/bcm3384.dtsi
create mode 100644 arch/mips/boot/dts/brcm/Makefile
create mode 100644 arch/mips/boot/dts/brcm/bcm3384_viper.dtsi
create mode 100644 arch/mips/boot/dts/brcm/bcm3384_zephyr.dtsi
create mode 100644 arch/mips/boot/dts/brcm/bcm6328.dtsi
create mode 100644 arch/mips/boot/dts/brcm/bcm6368.dtsi
create mode 100644 arch/mips/boot/dts/brcm/bcm7125.dtsi
create mode 100644 arch/mips/boot/dts/brcm/bcm7346.dtsi
create mode 100644 arch/mips/boot/dts/brcm/bcm7358.dtsi
create mode 100644 arch/mips/boot/dts/brcm/bcm7360.dtsi
create mode 100644 arch/mips/boot/dts/brcm/bcm7362.dtsi
create mode 100644 arch/mips/boot/dts/brcm/bcm7420.dtsi
create mode 100644 arch/mips/boot/dts/brcm/bcm7425.dtsi
rename arch/mips/boot/dts/{ => brcm}/bcm93384wvg.dts (63%)
create mode 100644 arch/mips/boot/dts/brcm/bcm93384wvg_viper.dts
create mode 100644 arch/mips/boot/dts/brcm/bcm96368mvwg.dts
create mode 100644 arch/mips/boot/dts/brcm/bcm97125cbmb.dts
create mode 100644 arch/mips/boot/dts/brcm/bcm97346dbsmb.dts
create mode 100644 arch/mips/boot/dts/brcm/bcm97358svmb.dts
create mode 100644 arch/mips/boot/dts/brcm/bcm97360svmb.dts
create mode 100644 arch/mips/boot/dts/brcm/bcm97362svmb.dts
create mode 100644 arch/mips/boot/dts/brcm/bcm97420c.dts
create mode 100644 arch/mips/boot/dts/brcm/bcm97425svmb.dts
create mode 100644 arch/mips/boot/dts/brcm/bcm9ejtagprb.dts
create mode 100644 arch/mips/boot/dts/cavium-octeon/Makefile
rename arch/mips/boot/dts/{ => cavium-octeon}/octeon_3xxx.dts (98%)
rename arch/mips/boot/dts/{ => cavium-octeon}/octeon_68xx.dts (100%)
create mode 100644 arch/mips/boot/dts/lantiq/Makefile
rename arch/mips/boot/dts/{ => lantiq}/danube.dtsi (100%)
rename arch/mips/boot/dts/{ => lantiq}/easy50712.dts (100%)
create mode 100644 arch/mips/boot/dts/mti/Makefile
rename arch/mips/boot/dts/{ => mti}/sead3.dts (100%)
create mode 100644 arch/mips/boot/dts/netlogic/Makefile
rename arch/mips/boot/dts/{ => netlogic}/xlp_evp.dts (100%)
rename arch/mips/boot/dts/{ => netlogic}/xlp_fvp.dts (100%)
rename arch/mips/boot/dts/{ => netlogic}/xlp_gvp.dts (100%)
create mode 100644 arch/mips/boot/dts/netlogic/xlp_rvp.dts
rename arch/mips/boot/dts/{ => netlogic}/xlp_svp.dts (100%)
create mode 100644 arch/mips/boot/dts/ralink/Makefile
rename arch/mips/boot/dts/{ => ralink}/mt7620a.dtsi (100%)
rename arch/mips/boot/dts/{ => ralink}/mt7620a_eval.dts (100%)
rename arch/mips/boot/dts/{ => ralink}/rt2880.dtsi (100%)
rename arch/mips/boot/dts/{ => ralink}/rt2880_eval.dts (100%)
rename arch/mips/boot/dts/{ => ralink}/rt3050.dtsi (100%)
rename arch/mips/boot/dts/{ => ralink}/rt3052_eval.dts (100%)
rename arch/mips/boot/dts/{ => ralink}/rt3883.dtsi (100%)
rename arch/mips/boot/dts/{ => ralink}/rt3883_eval.dts (100%)
create mode 100644 arch/mips/cavium-octeon/crypto/octeon-sha1.c
create mode 100644 arch/mips/cavium-octeon/crypto/octeon-sha256.c
create mode 100644 arch/mips/cavium-octeon/crypto/octeon-sha512.c
rename arch/mips/configs/{bcm3384_defconfig => bmips_be_defconfig} (89%)
create mode 100644 arch/mips/configs/bmips_stb_defconfig
create mode 100644 arch/mips/configs/maltaup_xpa_defconfig
create mode 100644 arch/mips/configs/pistachio_defconfig
create mode 100644 arch/mips/include/asm/cdmm.h
delete mode 100644 arch/mips/include/asm/mach-ar7/war.h
delete mode 100644 arch/mips/include/asm/mach-ath25/war.h
delete mode 100644 arch/mips/include/asm/mach-ath79/war.h
delete mode 100644 arch/mips/include/asm/mach-au1x00/war.h
delete mode 100644 arch/mips/include/asm/mach-bcm3384/war.h
delete mode 100644 arch/mips/include/asm/mach-bcm47xx/war.h
create mode 100644 arch/mips/include/asm/mach-bcm63xx/dma-coherence.h
delete mode 100644 arch/mips/include/asm/mach-bcm63xx/war.h
rename arch/mips/include/asm/{mach-bcm3384 => mach-bmips}/dma-coherence.h (83%)
create mode 100644 arch/mips/include/asm/mach-bmips/spaces.h
create mode 100644 arch/mips/include/asm/mach-cavium-octeon/mangle-port.h
delete mode 100644 arch/mips/include/asm/mach-cobalt/war.h
delete mode 100644 arch/mips/include/asm/mach-dec/war.h
delete mode 100644 arch/mips/include/asm/mach-emma2rh/war.h
rename arch/mips/include/asm/{mach-ralink => mach-generic}/war.h (86%)
delete mode 100644 arch/mips/include/asm/mach-jazz/war.h
delete mode 100644 arch/mips/include/asm/mach-jz4740/war.h
delete mode 100644 arch/mips/include/asm/mach-lantiq/war.h
delete mode 100644 arch/mips/include/asm/mach-lasat/war.h
delete mode 100644 arch/mips/include/asm/mach-loongson/war.h
delete mode 100644 arch/mips/include/asm/mach-loongson1/war.h
delete mode 100644 arch/mips/include/asm/mach-netlogic/topology.h
delete mode 100644 arch/mips/include/asm/mach-netlogic/war.h
delete mode 100644 arch/mips/include/asm/mach-paravirt/war.h
create mode 100644 arch/mips/include/asm/mach-pistachio/gpio.h
create mode 100644 arch/mips/include/asm/mach-pistachio/irq.h
delete mode 100644 arch/mips/include/asm/mach-pnx833x/war.h
delete mode 100644 arch/mips/include/asm/mach-tx39xx/war.h
delete mode 100644 arch/mips/include/asm/mach-vr41xx/war.h
create mode 100644 arch/mips/include/asm/mips-boards/sead3-addr.h
create mode 100644 arch/mips/include/uapi/asm/perf_regs.h
create mode 100644 arch/mips/kernel/perf_regs.c
delete mode 100644 arch/mips/mti-sead3/sead3-ehci.c
delete mode 100644 arch/mips/mti-sead3/sead3-i2c-dev.c
delete mode 100644 arch/mips/mti-sead3/sead3-i2c-drv.c
delete mode 100644 arch/mips/mti-sead3/sead3-i2c.c
delete mode 100644 arch/mips/mti-sead3/sead3-leds.c
delete mode 100644 arch/mips/mti-sead3/sead3-mtd.c
delete mode 100644 arch/mips/mti-sead3/sead3-net.c
create mode 100644 arch/mips/pistachio/Makefile
create mode 100644 arch/mips/pistachio/Platform
create mode 100644 arch/mips/pistachio/init.c
create mode 100644 arch/mips/pistachio/irq.c
create mode 100644 arch/mips/pistachio/time.c
create mode 100644 arch/mips/power/hibernate.c
rename arch/mips/power/{hibernate.S => hibernate_asm.S} (91%)
create mode 100644 drivers/bus/mips_cdmm.c
create mode 100644 drivers/clk/pistachio/Makefile
create mode 100644 drivers/clk/pistachio/clk-pistachio.c
create mode 100644 drivers/clk/pistachio/clk-pll.c
create mode 100644 drivers/clk/pistachio/clk.c
create mode 100644 drivers/clk/pistachio/clk.h
create mode 100644 drivers/irqchip/irq-bcm7038-l1.c
create mode 100644 drivers/platform/mips/Kconfig
create mode 100644 drivers/platform/mips/Makefile
create mode 100644 drivers/platform/mips/acpi_init.c
create mode 100644 drivers/platform/mips/cpu_hwmon.c
create mode 100644 drivers/tty/mips_ejtag_fdc.c
create mode 100644 include/dt-bindings/clock/pistachio-clk.h
rename {arch/mips/include/asm/mach-bcm47xx => include/linux}/bcm47xx_nvram.h (63%)
Merging nios2/nios2-next (6347e2a10f70 nios2: mm: do not invoke OOM killer on kernel fault OOM)
$ git merge nios2/nios2-next
Already up-to-date.
Merging parisc-hd/for-next (476840458128 parisc: Eliminate sg_virt_addr() and private scatterlist.h)
$ git merge parisc-hd/for-next
Removing arch/parisc/include/asm/scatterlist.h
Merge made by the 'recursive' strategy.
arch/parisc/include/asm/Kbuild | 1 +
arch/parisc/include/asm/scatterlist.h | 10 ----------
arch/parisc/kernel/pci-dma.c | 8 ++++----
drivers/parisc/ccio-dma.c | 6 +++---
drivers/parisc/iommu-helpers.h | 26 ++++++++++++++------------
drivers/parisc/sba_iommu.c | 7 +++----
6 files changed, 25 insertions(+), 33 deletions(-)
delete mode 100644 arch/parisc/include/asm/scatterlist.h
Merging powerpc/next (910681de70b7 Merge branch 'next-misc' into next)
$ git merge powerpc/next
Removing arch/powerpc/platforms/powernv/eeh-ioda.c
Merge made by the 'recursive' strategy.
arch/powerpc/include/asm/cache.h | 3 -
arch/powerpc/include/asm/dbdma.h | 12 +-
arch/powerpc/include/asm/device.h | 6 +
arch/powerpc/include/asm/eeh.h | 29 +-
arch/powerpc/include/asm/kvm_host.h | 2 +-
arch/powerpc/include/asm/machdep.h | 2 +-
arch/powerpc/include/asm/opal.h | 2 +
arch/powerpc/include/asm/pci-bridge.h | 28 +-
arch/powerpc/include/asm/ppc-pci.h | 5 +
arch/powerpc/include/asm/rtas.h | 26 +
arch/powerpc/include/asm/swab.h | 26 -
arch/powerpc/include/asm/vga.h | 4 +-
arch/powerpc/kernel/eeh.c | 176 +--
arch/powerpc/kernel/eeh_cache.c | 25 +-
arch/powerpc/kernel/eeh_dev.c | 14 +-
arch/powerpc/kernel/eeh_driver.c | 22 -
arch/powerpc/kernel/eeh_pe.c | 116 +-
arch/powerpc/kernel/of_platform.c | 2 +-
arch/powerpc/kernel/pci-hotplug.c | 2 +-
arch/powerpc/kernel/pci_dn.c | 180 +++-
arch/powerpc/kernel/pci_of_scan.c | 2 +-
arch/powerpc/kernel/rtas_pci.c | 2 +-
arch/powerpc/kvm/powerpc.c | 38 +-
arch/powerpc/lib/copy_32.S | 127 ---
arch/powerpc/lib/locks.c | 1 +
arch/powerpc/lib/ppc_ksyms.c | 4 -
arch/powerpc/mm/ppc_mmu_32.c | 2 +-
arch/powerpc/platforms/powermac/bootx_init.c | 2 +-
arch/powerpc/platforms/powermac/pic.c | 3 +
arch/powerpc/platforms/powernv/Makefile | 2 +-
arch/powerpc/platforms/powernv/eeh-ioda.c | 1149 --------------------
arch/powerpc/platforms/powernv/eeh-powernv.c | 1300 ++++++++++++++++++++---
arch/powerpc/platforms/powernv/opal-flash.c | 6 +-
arch/powerpc/platforms/powernv/opal.c | 49 +-
arch/powerpc/platforms/powernv/pci-ioda.c | 7 +-
arch/powerpc/platforms/powernv/pci.c | 69 +-
arch/powerpc/platforms/powernv/pci.h | 29 +-
arch/powerpc/platforms/pseries/dlpar.c | 118 +-
arch/powerpc/platforms/pseries/eeh_pseries.c | 98 +-
arch/powerpc/platforms/pseries/hotplug-memory.c | 473 +++++++++
arch/powerpc/platforms/pseries/msi.c | 6 +-
arch/powerpc/platforms/pseries/pci_dlpar.c | 2 +-
arch/powerpc/platforms/pseries/pseries.h | 12 +
arch/powerpc/platforms/pseries/setup.c | 2 +-
drivers/ata/pata_macio.c | 10 +-
drivers/block/swim3.c | 12 +-
drivers/ide/pmac.c | 10 +-
drivers/macintosh/rack-meter.c | 30 +-
drivers/macintosh/smu.c | 3 +-
drivers/macintosh/via-pmu.c | 25 +-
drivers/media/pci/bt8xx/bt878.c | 12 -
drivers/media/pci/bt8xx/bt878.h | 11 -
drivers/mmc/host/mxcmmc.c | 2 +-
drivers/net/ethernet/apple/bmac.c | 30 +-
drivers/net/ethernet/apple/mace.c | 44 +-
drivers/net/ethernet/ibm/emac/core.c | 12 +-
drivers/net/ethernet/sfc/efx.c | 4 +-
drivers/net/ethernet/sfc/siena.c | 3 +-
drivers/pci/hotplug/rpadlpar_core.c | 2 +-
drivers/scsi/mac53c94.c | 10 +-
drivers/scsi/mesh.c | 14 +-
drivers/video/fbdev/controlfb.c | 2 +-
drivers/video/fbdev/platinumfb.c | 2 +-
sound/ppc/pmac.c | 58 +-
64 files changed, 2480 insertions(+), 2001 deletions(-)
delete mode 100644 arch/powerpc/platforms/powernv/eeh-ioda.c
Merging powerpc-mpe/next (6a840791182c powerpc32/chrp: fix section mismatch warning)
$ git merge powerpc-mpe/next
Removing arch/powerpc/relocs_check.pl
Auto-merging arch/powerpc/platforms/pseries/mobility.c
Auto-merging arch/powerpc/kernel/cputable.c
Auto-merging arch/powerpc/include/asm/rtas.h
Removing arch/powerpc/include/asm/local64.h
Removing arch/powerpc/include/asm/irq_regs.h
Removing arch/powerpc/include/asm/div64.h
Merge made by the 'recursive' strategy.
Documentation/ABI/testing/sysfs-class-cxl | 2 +-
arch/powerpc/Kconfig | 3 -
arch/powerpc/Kconfig.debug | 2 +-
arch/powerpc/Makefile | 4 +-
arch/powerpc/boot/Makefile | 2 +-
arch/powerpc/boot/crt0.S | 26 +-
arch/powerpc/boot/libfdt-wrapper.c | 6 +-
arch/powerpc/boot/libfdt_env.h | 14 +-
arch/powerpc/boot/of.h | 8 +
arch/powerpc/boot/planetcore.c | 33 -
arch/powerpc/boot/planetcore.h | 3 -
arch/powerpc/boot/wrapper | 2 +-
arch/powerpc/include/asm/Kbuild | 4 +-
arch/powerpc/include/asm/cputable.h | 8 +-
arch/powerpc/include/asm/dcr-native.h | 2 +-
arch/powerpc/include/asm/div64.h | 1 -
arch/powerpc/include/asm/dma-mapping.h | 4 +-
arch/powerpc/include/asm/irq_regs.h | 2 -
arch/powerpc/include/asm/kvm_book3s_64.h | 4 +-
arch/powerpc/include/asm/local64.h | 1 -
arch/powerpc/include/asm/mmu-hash64.h | 1 +
arch/powerpc/include/asm/mpic.h | 20 -
arch/powerpc/include/asm/nvram.h | 50 +-
arch/powerpc/include/asm/opal-api.h | 732 ++++++++++++++++++++
arch/powerpc/include/asm/opal.h | 761 +--------------------
arch/powerpc/include/asm/ppc_asm.h | 192 +++---
arch/powerpc/include/asm/rtas.h | 7 +-
arch/powerpc/include/asm/systbl.h | 1 +
arch/powerpc/include/asm/ucc_slow.h | 13 -
arch/powerpc/include/asm/unistd.h | 2 +-
arch/powerpc/include/uapi/asm/ptrace.h | 2 +-
arch/powerpc/include/uapi/asm/unistd.h | 1 +
arch/powerpc/kernel/Makefile | 4 +-
arch/powerpc/kernel/cpu_setup_power.S | 10 +-
arch/powerpc/kernel/cputable.c | 4 +-
arch/powerpc/kernel/entry_64.S | 5 +
arch/powerpc/kernel/idle_power7.S | 1 +
arch/powerpc/kernel/mce_power.c | 53 +-
arch/powerpc/kernel/nvram_64.c | 677 ++++++++++++++++++
arch/powerpc/kernel/process.c | 9 +-
arch/powerpc/kernel/rtas.c | 26 +-
arch/powerpc/kernel/syscalls.c | 17 +
arch/powerpc/kernel/systbl.S | 2 +
arch/powerpc/kernel/systbl_chk.c | 2 +
arch/powerpc/kernel/tm.S | 8 +-
arch/powerpc/kernel/vector.S | 24 +-
arch/powerpc/kvm/book3s_hv_ras.c | 4 +-
arch/powerpc/lib/copypage_power7.S | 32 +-
arch/powerpc/lib/copyuser_power7.S | 226 +++---
arch/powerpc/lib/crtsavres.S | 96 +--
arch/powerpc/lib/ldstfp.S | 32 +-
arch/powerpc/lib/memcpy_power7.S | 226 +++---
arch/powerpc/lib/rheap.c | 2 +-
arch/powerpc/mm/Makefile | 1 +
arch/powerpc/mm/init_64.c | 1 +
arch/powerpc/mm/numa.c | 62 +-
arch/powerpc/mm/pgtable_32.c | 2 +-
arch/powerpc/mm/vphn.c | 70 ++
arch/powerpc/mm/vphn.h | 16 +
arch/powerpc/perf/core-book3s.c | 4 +-
arch/powerpc/platforms/Kconfig.cputype | 3 +-
arch/powerpc/platforms/cell/celleb_pci.c | 5 +-
arch/powerpc/platforms/cell/spu_callbacks.c | 1 +
arch/powerpc/platforms/chrp/setup.c | 2 +-
arch/powerpc/platforms/powernv/opal-dump.c | 3 +-
arch/powerpc/platforms/powernv/opal-elog.c | 3 +-
arch/powerpc/platforms/powernv/opal-nvram.c | 10 +
arch/powerpc/platforms/powernv/opal-sensor.c | 30 +-
arch/powerpc/platforms/powernv/opal-wrappers.S | 2 +-
arch/powerpc/platforms/powernv/opal.c | 29 +-
arch/powerpc/platforms/powernv/setup.c | 35 +-
arch/powerpc/platforms/pseries/Kconfig | 1 -
arch/powerpc/platforms/pseries/mobility.c | 26 +-
arch/powerpc/platforms/pseries/nvram.c | 674 +-----------------
arch/powerpc/relocs_check.pl | 66 --
arch/powerpc/relocs_check.sh | 59 ++
arch/powerpc/sysdev/dcr.c | 2 +-
arch/powerpc/sysdev/mpic.c | 35 -
arch/powerpc/sysdev/qe_lib/ucc_slow.c | 5 -
drivers/ata/sata_svw.c | 11 +-
drivers/ps3/ps3-lpm.c | 4 +-
drivers/video/fbdev/Kconfig | 4 +-
drivers/video/fbdev/aty/aty128fb.c | 4 +-
drivers/video/fbdev/aty/radeon_base.c | 24 +-
drivers/video/fbdev/aty/radeon_monitor.c | 20 +-
drivers/video/fbdev/aty/radeon_pm.c | 16 +-
drivers/video/fbdev/aty/radeonfb.h | 4 +-
drivers/video/fbdev/core/fbmon.c | 4 -
drivers/video/fbdev/imsttfb.c | 6 +-
drivers/video/fbdev/nvidia/Makefile | 3 +-
drivers/video/fbdev/nvidia/nv_of.c | 3 -
drivers/video/fbdev/nvidia/nv_proto.h | 8 -
drivers/video/fbdev/nvidia/nvidia.c | 4 -
drivers/video/fbdev/riva/fbdev.c | 17 +-
fs/pstore/inode.c | 3 +
include/linux/pstore.h | 1 +
tools/testing/selftests/powerpc/Makefile | 12 +-
tools/testing/selftests/powerpc/copyloops/Makefile | 1 +
.../selftests/powerpc/copyloops/asm/ppc_asm.h | 33 -
.../selftests/powerpc/switch_endian/.gitignore | 2 +
.../selftests/powerpc/switch_endian/Makefile | 24 +
.../selftests/powerpc/switch_endian/check.S | 100 +++
.../selftests/powerpc/switch_endian/common.h | 6 +
.../powerpc/switch_endian/switch_endian_test.S | 81 +++
tools/testing/selftests/powerpc/utils.h | 1 +
tools/testing/selftests/powerpc/vphn/.gitignore | 1 +
tools/testing/selftests/powerpc/vphn/Makefile | 15 +
tools/testing/selftests/powerpc/vphn/test-vphn.c | 410 +++++++++++
tools/testing/selftests/powerpc/vphn/vphn.c | 1 +
tools/testing/selftests/powerpc/vphn/vphn.h | 1 +
110 files changed, 3034 insertions(+), 2310 deletions(-)
delete mode 100644 arch/powerpc/include/asm/div64.h
delete mode 100644 arch/powerpc/include/asm/irq_regs.h
delete mode 100644 arch/powerpc/include/asm/local64.h
create mode 100644 arch/powerpc/include/asm/opal-api.h
create mode 100644 arch/powerpc/mm/vphn.c
create mode 100644 arch/powerpc/mm/vphn.h
delete mode 100755 arch/powerpc/relocs_check.pl
create mode 100755 arch/powerpc/relocs_check.sh
create mode 100644 tools/testing/selftests/powerpc/switch_endian/.gitignore
create mode 100644 tools/testing/selftests/powerpc/switch_endian/Makefile
create mode 100644 tools/testing/selftests/powerpc/switch_endian/check.S
create mode 100644 tools/testing/selftests/powerpc/switch_endian/common.h
create mode 100644 tools/testing/selftests/powerpc/switch_endian/switch_endian_test.S
create mode 100644 tools/testing/selftests/powerpc/vphn/.gitignore
create mode 100644 tools/testing/selftests/powerpc/vphn/Makefile
create mode 100644 tools/testing/selftests/powerpc/vphn/test-vphn.c
create mode 120000 tools/testing/selftests/powerpc/vphn/vphn.c
create mode 120000 tools/testing/selftests/powerpc/vphn/vphn.h
Merging fsl/next (d41444daba1f powerpc/corenet: enable CONFIG_I2C_MUX and CONFIG_I2C_MUX_PCA954x)
$ git merge fsl/next
Removing arch/powerpc/boot/dts/b4860emu.dts
Merge made by the 'recursive' strategy.
arch/powerpc/boot/dts/b4860emu.dts | 223 ----------------------
arch/powerpc/boot/dts/b4qds.dtsi | 17 +-
arch/powerpc/boot/dts/fsl/b4860si-post.dtsi | 60 +++++-
arch/powerpc/boot/dts/fsl/b4si-post.dtsi | 89 ++++++++-
arch/powerpc/boot/dts/fsl/p1023si-post.dtsi | 37 +++-
arch/powerpc/boot/dts/fsl/p2041si-post.dtsi | 11 +-
arch/powerpc/boot/dts/fsl/p3041si-post.dtsi | 11 +-
arch/powerpc/boot/dts/fsl/p4080si-post.dtsi | 11 +-
arch/powerpc/boot/dts/fsl/p5020si-post.dtsi | 11 +-
arch/powerpc/boot/dts/fsl/p5040si-post.dtsi | 11 +-
arch/powerpc/boot/dts/fsl/t1040si-post.dtsi | 65 ++++++-
arch/powerpc/boot/dts/fsl/t2081si-post.dtsi | 105 +++++++++-
arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 265 +++++++++++++++++++++++++-
arch/powerpc/boot/dts/kmcoge4.dts | 15 ++
arch/powerpc/boot/dts/oca4080.dts | 15 ++
arch/powerpc/boot/dts/p1023rdb.dts | 18 +-
arch/powerpc/boot/dts/p2041rdb.dts | 17 +-
arch/powerpc/boot/dts/p3041ds.dts | 17 +-
arch/powerpc/boot/dts/p4080ds.dts | 17 +-
arch/powerpc/boot/dts/p5020ds.dts | 17 +-
arch/powerpc/boot/dts/p5040ds.dts | 17 +-
arch/powerpc/boot/dts/t104xqds.dtsi | 17 +-
arch/powerpc/boot/dts/t104xrdb.dtsi | 14 ++
arch/powerpc/boot/dts/t208xqds.dtsi | 19 +-
arch/powerpc/boot/dts/t208xrdb.dtsi | 15 ++
arch/powerpc/boot/dts/t4240qds.dts | 17 +-
arch/powerpc/boot/dts/t4240rdb.dts | 15 ++
arch/powerpc/configs/corenet32_smp_defconfig | 7 +-
arch/powerpc/configs/corenet64_smp_defconfig | 15 +-
arch/powerpc/configs/mpc85xx_defconfig | 3 +-
arch/powerpc/configs/mpc85xx_smp_defconfig | 2 +-
arch/powerpc/include/asm/mpc85xx.h | 1 +
arch/powerpc/include/asm/mpic.h | 3 +
arch/powerpc/include/asm/paca.h | 4 +-
arch/powerpc/platforms/85xx/common.c | 1 +
arch/powerpc/platforms/85xx/corenet_generic.c | 12 ++
arch/powerpc/platforms/85xx/smp.c | 4 +-
arch/powerpc/sysdev/fsl_msi.c | 29 ++-
arch/powerpc/sysdev/fsl_msi.h | 2 +
arch/powerpc/sysdev/mpic.c | 11 +-
arch/powerpc/sysdev/qe_lib/qe_io.c | 25 ---
41 files changed, 981 insertions(+), 284 deletions(-)
delete mode 100644 arch/powerpc/boot/dts/b4860emu.dts
Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate)
$ git merge mpc5xxx/next
Already up-to-date.
Merging s390/features (1a327ffd3d6a s390/syscalls: simplify syscall_get_arch())
$ git merge s390/features
Removing arch/s390/math-emu/math.c
Removing arch/s390/math-emu/Makefile
Removing arch/s390/lib/ucmpdi2.c
Removing arch/s390/lib/qrnnd.S
Removing arch/s390/lib/mem32.S
Removing arch/s390/lib/div64.c
Removing arch/s390/kernel/relocate_kernel64.S
Removing arch/s390/kernel/reipl64.S
Removing arch/s390/kernel/head31.S
Removing arch/s390/kernel/entry64.S
Removing arch/s390/boot/compressed/head31.S
Merge made by the 'recursive' strategy.
arch/s390/Kbuild | 1 -
arch/s390/Kconfig | 79 +-
arch/s390/Makefile | 16 +-
arch/s390/boot/compressed/Makefile | 12 +-
arch/s390/boot/compressed/{head64.S => head.S} | 0
arch/s390/boot/compressed/head31.S | 51 -
arch/s390/boot/compressed/vmlinux.lds.S | 5 -
arch/s390/crypto/crypt_s390.h | 8 +-
arch/s390/hypfs/hypfs_diag0c.c | 4 -
arch/s390/include/asm/appldata.h | 24 -
arch/s390/include/asm/atomic.h | 95 -
arch/s390/include/asm/bitops.h | 28 -
arch/s390/include/asm/cmpxchg.h | 7 +-
arch/s390/include/asm/cputime.h | 26 -
arch/s390/include/asm/ctl_reg.h | 14 +-
arch/s390/include/asm/elf.h | 4 -
arch/s390/include/asm/idals.h | 16 -
arch/s390/include/asm/jump_label.h | 12 +-
arch/s390/include/asm/lowcore.h | 159 --
arch/s390/include/asm/mman.h | 2 +-
arch/s390/include/asm/mmu_context.h | 4 -
arch/s390/include/asm/percpu.h | 4 -
arch/s390/include/asm/perf_event.h | 3 -
arch/s390/include/asm/pgalloc.h | 24 -
arch/s390/include/asm/pgtable.h | 125 +-
arch/s390/include/asm/processor.h | 66 +-
arch/s390/include/asm/ptrace.h | 4 -
arch/s390/include/asm/qdio.h | 10 -
arch/s390/include/asm/runtime_instr.h | 10 +-
arch/s390/include/asm/rwsem.h | 81 -
arch/s390/include/asm/setup.h | 35 -
arch/s390/include/asm/sfp-util.h | 10 -
arch/s390/include/asm/sparsemem.h | 9 -
arch/s390/include/asm/switch_to.h | 21 +-
arch/s390/include/asm/syscall.h | 2 +-
arch/s390/include/asm/thread_info.h | 11 +-
arch/s390/include/asm/tlb.h | 4 -
arch/s390/include/asm/tlbflush.h | 7 -
arch/s390/include/asm/types.h | 17 -
arch/s390/include/asm/uaccess.h | 1 +
arch/s390/include/asm/unistd.h | 8 -
arch/s390/include/asm/vdso.h | 2 -
arch/s390/kernel/Makefile | 24 +-
arch/s390/kernel/asm-offsets.c | 4 -
arch/s390/kernel/base.S | 76 -
arch/s390/kernel/cpcmd.c | 10 -
arch/s390/kernel/diag.c | 15 -
arch/s390/kernel/dis.c | 48 +-
arch/s390/kernel/dumpstack.c | 26 +-
arch/s390/kernel/early.c | 69 -
arch/s390/kernel/entry.S | 1005 ++++++-----
arch/s390/kernel/entry64.S | 1059 -----------
arch/s390/kernel/ftrace.c | 12 +-
arch/s390/kernel/head.S | 49 -
arch/s390/kernel/head31.S | 106 --
arch/s390/kernel/head_kdump.S | 8 -
arch/s390/kernel/ipl.c | 157 +-
arch/s390/kernel/irq.c | 3 +-
arch/s390/kernel/jump_label.c | 2 +-
arch/s390/kernel/kprobes.c | 2 +-
arch/s390/kernel/module.c | 12 -
arch/s390/kernel/nmi.c | 92 +-
arch/s390/kernel/pgm_check.S | 22 +-
arch/s390/kernel/process.c | 29 +-
arch/s390/kernel/ptrace.c | 46 +-
arch/s390/kernel/reipl.S | 133 +-
arch/s390/kernel/reipl64.S | 155 --
arch/s390/kernel/relocate_kernel.S | 63 +-
arch/s390/kernel/relocate_kernel64.S | 121 --
arch/s390/kernel/sclp.S | 10 -
arch/s390/kernel/setup.c | 72 -
arch/s390/kernel/signal.c | 10 -
arch/s390/kernel/smp.c | 33 -
arch/s390/kernel/{swsusp_asm64.S => swsusp.S} | 0
arch/s390/kernel/sys_s390.c | 49 -
arch/s390/kernel/syscalls.S | 716 ++++----
arch/s390/kernel/topology.c | 2 +-
arch/s390/kernel/traps.c | 155 +-
arch/s390/kernel/uprobes.c | 4 +-
arch/s390/kernel/vdso.c | 16 +-
arch/s390/kernel/vmlinux.lds.S | 7 -
arch/s390/lib/Makefile | 3 +-
arch/s390/lib/div64.c | 147 --
arch/s390/lib/{mem64.S => mem.S} | 0
arch/s390/lib/mem32.S | 92 -
arch/s390/lib/qrnnd.S | 78 -
arch/s390/lib/uaccess.c | 136 +-
arch/s390/lib/ucmpdi2.c | 26 -
arch/s390/math-emu/Makefile | 7 -
arch/s390/math-emu/math.c | 2255 ------------------------
arch/s390/mm/dump_pagetables.c | 24 +-
arch/s390/mm/extmem.c | 14 -
arch/s390/mm/fault.c | 36 -
arch/s390/mm/gup.c | 4 -
arch/s390/mm/init.c | 5 -
arch/s390/mm/maccess.c | 70 +-
arch/s390/mm/mem_detect.c | 4 -
arch/s390/mm/mmap.c | 27 +-
arch/s390/mm/pageattr.c | 2 +-
arch/s390/mm/pgtable.c | 8 -
arch/s390/mm/vmem.c | 10 +-
arch/s390/oprofile/Makefile | 2 +-
arch/s390/oprofile/init.c | 11 -
arch/s390/pci/pci.c | 3 +-
drivers/s390/block/dasd.c | 13 +-
drivers/s390/block/dasd_diag.h | 42 -
drivers/s390/block/dasd_eckd.c | 6 -
drivers/s390/block/dasd_fba.c | 2 -
drivers/s390/char/Kconfig | 2 +-
drivers/s390/char/sclp_sdias.c | 4 -
drivers/s390/char/zcore.c | 32 -
drivers/s390/cio/cio.c | 2 -
drivers/s390/cio/qdio.h | 7 -
drivers/s390/cio/qdio_setup.c | 3 -
drivers/s390/crypto/ap_bus.c | 24 +-
drivers/s390/net/ctcm_mpc.c | 12 -
drivers/watchdog/diag288_wdt.c | 20 +-
117 files changed, 1327 insertions(+), 7249 deletions(-)
rename arch/s390/boot/compressed/{head64.S => head.S} (100%)
delete mode 100644 arch/s390/boot/compressed/head31.S
delete mode 100644 arch/s390/kernel/entry64.S
delete mode 100644 arch/s390/kernel/head31.S
delete mode 100644 arch/s390/kernel/reipl64.S
delete mode 100644 arch/s390/kernel/relocate_kernel64.S
rename arch/s390/kernel/{swsusp_asm64.S => swsusp.S} (100%)
delete mode 100644 arch/s390/lib/div64.c
rename arch/s390/lib/{mem64.S => mem.S} (100%)
delete mode 100644 arch/s390/lib/mem32.S
delete mode 100644 arch/s390/lib/qrnnd.S
delete mode 100644 arch/s390/lib/ucmpdi2.c
delete mode 100644 arch/s390/math-emu/Makefile
delete mode 100644 arch/s390/math-emu/math.c
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
$ git merge sparc-next/master
Already up-to-date.
Merging tile/master (28d86a60ebad tile: nohz: warn if nohz_full uses hypervisor shared cores)
$ git merge tile/master
Merge made by the 'recursive' strategy.
arch/tile/Kconfig | 1 +
arch/tile/include/asm/Kbuild | 1 -
arch/tile/include/asm/ftrace.h | 2 ++
arch/tile/include/asm/irq_work.h | 14 +++++++++++
arch/tile/include/asm/smp.h | 1 +
arch/tile/include/asm/thread_info.h | 9 ++++---
arch/tile/include/hv/hypervisor.h | 6 ++++-
arch/tile/kernel/compat_signal.c | 9 +++----
arch/tile/kernel/ftrace.c | 6 ++++-
arch/tile/kernel/mcount_64.S | 7 +++++-
arch/tile/kernel/process.c | 12 ++++++----
arch/tile/kernel/ptrace.c | 22 +++++++++++++++--
arch/tile/kernel/setup.c | 23 ++++++++++++++++++
arch/tile/kernel/single_step.c | 3 +++
arch/tile/kernel/smp.c | 32 ++++++++++++++++++++++++-
arch/tile/kernel/stack.c | 15 ++++++------
arch/tile/kernel/traps.c | 16 +++++++------
arch/tile/kernel/unaligned.c | 22 ++++++++++-------
arch/tile/mm/elf.c | 47 +++++++++++++++++++++++--------------
arch/tile/mm/fault.c | 10 +++++---
arch/tile/mm/init.c | 7 ++++--
drivers/net/ethernet/tile/tilegx.c | 5 +++-
include/linux/tick.h | 14 +++++++++++
23 files changed, 217 insertions(+), 67 deletions(-)
create mode 100644 arch/tile/include/asm/irq_work.h
Merging uml/linux-next (b98b91029cf8 hostfs: No need to box and later unbox the file mode)
$ git merge uml/linux-next
Merge made by the 'recursive' strategy.
fs/hostfs/hostfs.h | 3 +-
fs/hostfs/hostfs_kern.c | 111 ++++++++++++++++++++++++++----------------------
fs/hostfs/hostfs_user.c | 17 ++------
3 files changed, 65 insertions(+), 66 deletions(-)
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
$ git merge unicore32/unicore32
Already up-to-date.
Merging xtensa/for_next (0372c1abdd0d Merge tag 'xtensa-for-next-20150304' of git://github.com/jcmvbkbc/linux-xtensa into for_next)
$ git merge xtensa/for_next
Merge made by the 'recursive' strategy.
arch/xtensa/Kconfig | 30 +++++
arch/xtensa/boot/dts/xtfpga.dtsi | 64 ++++++++++
arch/xtensa/configs/audio_kc705_defconfig | 142 +++++++++++++++++++++
arch/xtensa/include/uapi/asm/unistd.h | 8 +-
arch/xtensa/platforms/xtfpga/Makefile | 3 +-
.../platforms/xtfpga/include/platform/hardware.h | 3 -
.../xtensa/platforms/xtfpga/include/platform/lcd.h | 15 +++
arch/xtensa/platforms/xtfpga/lcd.c | 55 +++++---
8 files changed, 293 insertions(+), 27 deletions(-)
create mode 100644 arch/xtensa/configs/audio_kc705_defconfig
Merging btrfs/next (4a3d1caf8a2c fs: btrfs: Add missing include file)
$ git merge btrfs/next
Merge made by the 'recursive' strategy.
fs/btrfs/async-thread.c | 4 +-
fs/btrfs/async-thread.h | 2 +-
fs/btrfs/backref.c | 4 +-
fs/btrfs/btrfs_inode.h | 14 +-
fs/btrfs/check-integrity.c | 9 +-
fs/btrfs/compression.c | 4 +-
fs/btrfs/compression.h | 4 +-
fs/btrfs/ctree.c | 62 ++---
fs/btrfs/ctree.h | 5 +-
fs/btrfs/delayed-inode.c | 9 +-
fs/btrfs/dev-replace.c | 6 +-
fs/btrfs/disk-io.c | 564 ++++++++++++++++++++++++--------------------
fs/btrfs/disk-io.h | 4 +-
fs/btrfs/extent-tree.c | 38 ++-
fs/btrfs/extent_io.c | 5 +-
fs/btrfs/extent_io.h | 2 +-
fs/btrfs/file-item.c | 6 +-
fs/btrfs/file.c | 51 ++--
fs/btrfs/free-space-cache.c | 36 ++-
fs/btrfs/inode.c | 3 +-
fs/btrfs/ioctl.c | 4 +-
fs/btrfs/lzo.c | 2 +-
fs/btrfs/math.h | 6 +-
fs/btrfs/props.c | 2 +
fs/btrfs/qgroup.c | 16 +-
fs/btrfs/raid56.c | 16 +-
fs/btrfs/scrub.c | 25 +-
fs/btrfs/send.c | 83 ++-----
fs/btrfs/super.c | 23 +-
fs/btrfs/sysfs.c | 2 +-
fs/btrfs/sysfs.h | 22 +-
fs/btrfs/transaction.c | 9 +-
fs/btrfs/transaction.h | 2 +
fs/btrfs/tree-log.c | 374 +++++++++++++++++++++++++++--
fs/btrfs/tree-log.h | 2 +
fs/btrfs/volumes.c | 116 ++++-----
fs/btrfs/volumes.h | 3 +-
fs/btrfs/xattr.c | 53 +++--
fs/btrfs/zlib.c | 2 +-
39 files changed, 985 insertions(+), 609 deletions(-)
Merging ceph/master (388cfdc9bc19 libceph: require cephx message signature by default)
$ git merge ceph/master
Resolved 'fs/ceph/inode.c' using previous resolution.
Resolved 'fs/ceph/snap.c' using previous resolution.
Resolved 'fs/ceph/super.c' using previous resolution.
Resolved 'fs/ceph/super.h' using previous resolution.
Resolved 'include/linux/ceph/libceph.h' using previous resolution.
Resolved 'net/ceph/auth_x.c' using previous resolution.
Resolved 'net/ceph/ceph_common.c' using previous resolution.
Auto-merging net/ceph/ceph_common.c
CONFLICT (content): Merge conflict in net/ceph/ceph_common.c
Auto-merging net/ceph/auth_x.c
CONFLICT (content): Merge conflict in net/ceph/auth_x.c
Auto-merging include/linux/ceph/libceph.h
CONFLICT (content): Merge conflict in include/linux/ceph/libceph.h
Auto-merging fs/ceph/super.h
CONFLICT (content): Merge conflict in fs/ceph/super.h
Auto-merging fs/ceph/super.c
CONFLICT (content): Merge conflict in fs/ceph/super.c
Auto-merging fs/ceph/snap.c
CONFLICT (content): Merge conflict in fs/ceph/snap.c
Auto-merging fs/ceph/inode.c
CONFLICT (content): Merge conflict in fs/ceph/inode.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 10a2a12c223f] Merge remote-tracking branch 'ceph/master'
$ git diff -M --stat --summary HEAD^..
Merging cifs/for-next (be4a8e38d68f Update negotiate protocol for SMB3.1 dialect)
$ git merge cifs/for-next
Merge made by the 'recursive' strategy.
fs/cifs/Kconfig | 9 +++++++
fs/cifs/cifs_dfs_ref.c | 3 ++-
fs/cifs/cifsfs.c | 2 ++
fs/cifs/cifsglob.h | 7 ++++++
fs/cifs/cifsproto.h | 4 ++--
fs/cifs/cifssmb.c | 21 +++++++++--------
fs/cifs/connect.c | 10 ++++++++
fs/cifs/dir.c | 3 +--
fs/cifs/file.c | 3 +--
fs/cifs/inode.c | 6 ++---
fs/cifs/link.c | 3 ++-
fs/cifs/readdir.c | 2 ++
fs/cifs/smb1ops.c | 3 ++-
fs/cifs/smb2ops.c | 22 +++++++++++++++++
fs/cifs/smb2pdu.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++---
fs/cifs/smb2pdu.h | 50 ++++++++++++++++++++++++++++++++-------
16 files changed, 178 insertions(+), 34 deletions(-)
Merging ecryptfs/next (6d65261a09ad eCryptfs: don't pass fs-specific ioctl commands through)
$ git merge ecryptfs/next
Already up-to-date.
Merging ext3/for_next (5ce1aca81435 reiserfs: fix __RASSERT format string)
$ git merge ext3/for_next
Merge made by the 'recursive' strategy.
fs/ext3/super.c | 2 +-
fs/ext4/super.c | 2 +-
fs/gfs2/quota.c | 28 +++---
fs/quota/dquot.c | 131 +++++++++++++++++-----------
fs/quota/quota.c | 217 +++++++++++++++++++++++++++++++++++++++++++++--
fs/quota/quota_tree.c | 7 ++
fs/quota/quota_v2.c | 12 ++-
fs/reiserfs/reiserfs.h | 1 -
fs/reiserfs/super.c | 2 +-
fs/udf/balloc.c | 20 ++---
fs/udf/dir.c | 1 -
fs/udf/directory.c | 1 -
fs/udf/file.c | 1 -
fs/udf/inode.c | 1 -
fs/udf/misc.c | 1 -
fs/udf/namei.c | 1 -
fs/udf/partition.c | 1 -
fs/udf/super.c | 1 -
fs/udf/symlink.c | 1 -
fs/udf/truncate.c | 1 -
fs/xfs/xfs_qm.h | 4 -
fs/xfs/xfs_qm_syscalls.c | 176 --------------------------------------
fs/xfs/xfs_quotaops.c | 117 +++++++++++++++++++++----
include/linux/quota.h | 88 ++++++++++++++++---
include/linux/quotaops.h | 14 +--
25 files changed, 511 insertions(+), 320 deletions(-)
Merging ext4/dev (2f5baf845b0f ext4 crypto: enable encryption feature flag)
$ git merge ext4/dev
Auto-merging fs/ext4/super.c
Merge made by the 'recursive' strategy.
fs/ext4/Kconfig | 20 ++
fs/ext4/Makefile | 4 +-
fs/ext4/acl.c | 5 -
fs/ext4/balloc.c | 3 -
fs/ext4/bitmap.c | 1 -
fs/ext4/block_validity.c | 1 -
fs/ext4/crypto.c | 603 ++++++++++++++++++++++++++++++++++++++++
fs/ext4/crypto_fname.c | 707 +++++++++++++++++++++++++++++++++++++++++++++++
fs/ext4/crypto_key.c | 170 ++++++++++++
fs/ext4/crypto_policy.c | 206 ++++++++++++++
fs/ext4/dir.c | 100 ++++++-
fs/ext4/ext4.h | 157 ++++++++++-
fs/ext4/ext4_crypto.h | 136 +++++++++
fs/ext4/extents.c | 70 ++---
fs/ext4/extents_status.c | 2 -
fs/ext4/file.c | 21 +-
fs/ext4/fsync.c | 1 -
fs/ext4/hash.c | 1 -
fs/ext4/ialloc.c | 29 +-
fs/ext4/inline.c | 19 +-
fs/ext4/inode.c | 129 ++++++++-
fs/ext4/ioctl.c | 86 +++++-
fs/ext4/namei.c | 609 ++++++++++++++++++++++++++++++++++------
fs/ext4/page-io.c | 48 +++-
fs/ext4/readpage.c | 321 +++++++++++++++++++++
fs/ext4/super.c | 50 ++--
fs/ext4/symlink.c | 105 ++++++-
fs/ext4/xattr.c | 4 +-
fs/ext4/xattr.h | 3 +
29 files changed, 3397 insertions(+), 214 deletions(-)
create mode 100644 fs/ext4/crypto.c
create mode 100644 fs/ext4/crypto_fname.c
create mode 100644 fs/ext4/crypto_key.c
create mode 100644 fs/ext4/crypto_policy.c
create mode 100644 fs/ext4/ext4_crypto.h
create mode 100644 fs/ext4/readpage.c
Merging f2fs/dev (d492701ff78c f2fs: do not recover wrong data index)
$ git merge f2fs/dev
Merge made by the 'recursive' strategy.
Documentation/filesystems/f2fs.txt | 6 +
fs/Kconfig | 2 +-
fs/f2fs/Kconfig | 2 +-
fs/f2fs/acl.c | 14 +-
fs/f2fs/checkpoint.c | 32 +-
fs/f2fs/data.c | 742 +++++++++++++++++++++++++++++++++----
fs/f2fs/debug.c | 22 +-
fs/f2fs/dir.c | 91 +++--
fs/f2fs/f2fs.h | 164 ++++++--
fs/f2fs/file.c | 64 +++-
fs/f2fs/gc.c | 6 +-
fs/f2fs/inline.c | 67 ++--
fs/f2fs/inode.c | 25 +-
fs/f2fs/namei.c | 50 +++
fs/f2fs/node.c | 18 +-
fs/f2fs/node.h | 1 +
fs/f2fs/recovery.c | 74 ++--
fs/f2fs/segment.c | 17 +-
fs/f2fs/segment.h | 3 +-
fs/f2fs/super.c | 38 +-
fs/f2fs/xattr.c | 4 +-
fs/xfs/libxfs/xfs_fs.h | 8 +-
include/linux/f2fs_fs.h | 3 +-
include/trace/events/f2fs.h | 161 +++++++-
include/uapi/linux/fs.h | 8 +
25 files changed, 1361 insertions(+), 261 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 12bb25aa4e3c] Merge remote-tracking branch 'fscache/fscache'
$ git diff -M --stat --summary HEAD^..
Merging fuse/for-next (94e4fe2cab3d fuse: explicitly set /dev/fuse file's private_data)
$ git merge fuse/for-next
Already up-to-date.
Merging gfs2/for-next (7b4ddfa7c952 gfs2: incorrect check for debugfs returns)
$ git merge gfs2/for-next
Auto-merging fs/gfs2/quota.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
MAINTAINERS | 4 +--
fs/gfs2/acl.c | 6 +---
fs/gfs2/aops.c | 6 ++--
fs/gfs2/bmap.c | 2 +-
fs/gfs2/file.c | 101 ++++++++++++++++++++++++++++++++++++++-----------------
fs/gfs2/glock.c | 47 +++++++++++++++-----------
fs/gfs2/incore.h | 4 ++-
fs/gfs2/inode.c | 18 +++++-----
fs/gfs2/quota.c | 54 +++++++++++++++++++++--------
fs/gfs2/quota.h | 8 +++--
fs/gfs2/rgrp.c | 20 ++++++++---
fs/gfs2/rgrp.h | 3 +-
fs/gfs2/xattr.c | 2 +-
13 files changed, 182 insertions(+), 93 deletions(-)
Merging jfs/jfs-next (7d2ac45611b0 jfs: %pf is only for function pointers)
$ git merge jfs/jfs-next
Merge made by the 'recursive' strategy.
fs/jfs/super.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging nfs/linux-next (9eccca084320 Linux 4.0-rc3)
$ git merge nfs/linux-next
Already up-to-date.
Merging nfsd/nfsd-next (1ec8c0c47f63 nfsd: Remove duplicate macro define for max sec label length)
$ git merge nfsd/nfsd-next
Merge made by the 'recursive' strategy.
fs/nfsd/Kconfig | 2 +-
fs/nfsd/export.c | 3 +--
fs/nfsd/nfs4acl.c | 50 +-------------------------------------------------
fs/nfsd/nfs4proc.c | 8 ++++----
fs/nfsd/nfs4state.c | 3 +--
fs/nfsd/nfs4xdr.c | 4 ++--
fs/nfsd/xdr4.h | 3 +--
7 files changed, 11 insertions(+), 62 deletions(-)
Merging overlayfs/overlayfs-next (71cbad7e694e ovl: upper fs should not be R/O)
$ git merge overlayfs/overlayfs-next
Already up-to-date.
Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option)
$ git merge squashfs/master
Already up-to-date.
Merging v9fs/for-next (f569d3ef8254 net/9p: add a privport option for RDMA transport.)
$ git merge v9fs/for-next
Merge made by the 'recursive' strategy.
fs/9p/v9fs.h | 1 -
fs/9p/vfs_addr.c | 2 --
fs/9p/vfs_file.c | 10 ++++++----
net/9p/protocol.c | 6 +++---
net/9p/trans_fd.c | 3 +--
net/9p/trans_rdma.c | 52 +++++++++++++++++++++++++++++++++++++++++++--------
net/9p/trans_virtio.c | 5 ++++-
7 files changed, 58 insertions(+), 21 deletions(-)
Merging ubifs/linux-next (3527a86b7ae1 Merge tag 'v4.0-rc5' into linux-next)
$ git merge ubifs/linux-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging xfs/for-next (a448f8f1b744 Merge branch 'fallocate-insert-range' into for-next)
$ git merge xfs/for-next
Merge made by the 'recursive' strategy.
Documentation/filesystems/xfs.txt | 29 +-
fs/open.c | 8 +-
fs/xfs/libxfs/xfs_alloc.c | 104 +++--
fs/xfs/libxfs/xfs_bmap.c | 554 ++++++++++++++++-------
fs/xfs/libxfs/xfs_bmap.h | 13 +-
fs/xfs/libxfs/xfs_btree.c | 24 +-
fs/xfs/libxfs/xfs_da_btree.c | 8 +-
fs/xfs/libxfs/xfs_dir2_data.c | 39 +-
fs/xfs/libxfs/xfs_format.h | 62 ---
fs/xfs/libxfs/xfs_ialloc.c | 48 +-
fs/xfs/libxfs/xfs_sb.c | 20 +-
fs/xfs/xfs_bmap_util.c | 162 ++++---
fs/xfs/xfs_bmap_util.h | 2 +
fs/xfs/xfs_buf_item.c | 4 +-
fs/xfs/xfs_discard.c | 2 +-
fs/xfs/xfs_error.c | 2 +-
fs/xfs/xfs_error.h | 8 +-
fs/xfs/xfs_file.c | 111 ++++-
fs/xfs/xfs_filestream.c | 2 +-
fs/xfs/xfs_fsops.c | 20 +-
fs/xfs/xfs_icache.c | 4 +-
fs/xfs/xfs_inode.c | 558 ++++++++++++++---------
fs/xfs/xfs_inode.h | 49 +-
fs/xfs/xfs_ioctl.c | 5 +-
fs/xfs/xfs_iomap.c | 3 +-
fs/xfs/xfs_iops.c | 89 ++--
fs/xfs/xfs_iops.h | 2 -
fs/xfs/xfs_itable.c | 2 +-
fs/xfs/xfs_linux.h | 9 -
fs/xfs/xfs_log_recover.c | 4 +-
fs/xfs/xfs_mount.c | 918 +++++---------------------------------
fs/xfs/xfs_mount.h | 95 +---
fs/xfs/xfs_mru_cache.c | 2 +-
fs/xfs/xfs_qm.c | 13 +-
fs/xfs/xfs_super.c | 126 ++++--
fs/xfs/xfs_super.h | 2 +
fs/xfs/xfs_symlink.c | 58 ++-
fs/xfs/xfs_trace.h | 24 +-
fs/xfs/xfs_trans.c | 234 ++++++----
include/linux/falloc.h | 6 +
include/uapi/linux/falloc.h | 17 +
41 files changed, 1626 insertions(+), 1816 deletions(-)
Merging file-locks/linux-next (0429c2b5c1c4 locks: use cmpxchg to assign i_flctx pointer)
$ git merge file-locks/linux-next
Auto-merging fs/nfsd/nfs4state.c
Merge made by the 'recursive' strategy.
fs/locks.c | 56 ++++++++++++++++++++++++++---------------------------
fs/nfsd/nfs4state.c | 18 +++++++++--------
include/linux/fs.h | 4 ++--
3 files changed, 39 insertions(+), 39 deletions(-)
Merging net-next/master (ee90b81203a9 hv_netvsc: Fix the packet free when it is in skb headroom)
$ git merge net-next/master
Auto-merging net/ipv6/ip6_vti.c
Auto-merging net/9p/trans_fd.c
Removing kernel/bpf/test_stub.c
Removing drivers/s390/net/claw.h
Removing drivers/s390/net/claw.c
Auto-merging drivers/net/ethernet/tile/tilegx.c
Auto-merging drivers/net/ethernet/sfc/efx.c
Auto-merging drivers/net/ethernet/ibm/emac/core.c
Removing drivers/net/ethernet/cadence/at91_ether.c
Auto-merging drivers/net/ethernet/broadcom/bgmac.c
Auto-merging drivers/net/ethernet/apple/mace.c
Auto-merging drivers/net/ethernet/apple/bmac.c
Auto-merging arch/s390/kernel/irq.c
Auto-merging arch/powerpc/net/bpf_jit_asm.S
Auto-merging arch/powerpc/Kconfig
Auto-merging arch/arm/boot/dts/sama5d3_emac.dtsi
Auto-merging arch/arm/boot/dts/at91sam9g45.dtsi
Auto-merging arch/arm/boot/dts/at91sam9263.dtsi
Auto-merging arch/arm/boot/dts/at91sam9260.dtsi
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
Documentation/ABI/testing/sysfs-class-net | 8 +
Documentation/ABI/testing/sysfs-class-net-queues | 8 +
.../devicetree/bindings/net/apm-xgene-enet.txt | 7 +-
.../bindings/net/ieee802154/at86rf230.txt | 8 +-
.../devicetree/bindings/net/ieee802154/cc2520.txt | 4 +
.../devicetree/bindings/net/keystone-netcp.txt | 34 +-
Documentation/devicetree/bindings/net/macb.txt | 5 +-
Documentation/networking/can.txt | 20 +-
Documentation/networking/filter.txt | 3 +-
Documentation/networking/ip-sysctl.txt | 49 +-
Documentation/networking/ipvs-sysctl.txt | 21 +
Documentation/networking/mpls-sysctl.txt | 20 +
Documentation/networking/packet_mmap.txt | 13 +-
Documentation/networking/pktgen.txt | 62 +-
Documentation/networking/s2io.txt | 2 +-
Documentation/networking/scaling.txt | 9 +
Documentation/networking/vxge.txt | 2 +-
MAINTAINERS | 4 +-
arch/arm/boot/dts/at91sam9260.dtsi | 2 +-
arch/arm/boot/dts/at91sam9263.dtsi | 2 +-
arch/arm/boot/dts/at91sam9g45.dtsi | 2 +-
arch/arm/boot/dts/at91sam9x5_macb0.dtsi | 2 +-
arch/arm/boot/dts/at91sam9x5_macb1.dtsi | 2 +-
arch/arm/boot/dts/sama5d3_emac.dtsi | 2 +-
arch/arm64/boot/dts/apm/apm-mustang.dts | 4 +
arch/arm64/boot/dts/apm/apm-storm.dtsi | 32 +-
arch/powerpc/Kconfig | 2 +-
arch/powerpc/include/asm/asm-compat.h | 4 +
arch/powerpc/include/asm/ppc-opcode.h | 2 +
arch/powerpc/net/Makefile | 2 +-
arch/powerpc/net/bpf_jit.h | 64 +-
arch/powerpc/net/{bpf_jit_64.S => bpf_jit_asm.S} | 70 +-
arch/powerpc/net/bpf_jit_comp.c | 46 +-
arch/s390/include/asm/irq.h | 1 -
arch/s390/kernel/irq.c | 1 -
arch/tile/gxio/mpipe.c | 4 +-
arch/tile/include/gxio/mpipe.h | 4 +-
crypto/af_alg.c | 18 +-
crypto/algif_hash.c | 8 +-
crypto/algif_rng.c | 4 +-
crypto/algif_skcipher.c | 241 +-
drivers/atm/nicstar.c | 90 -
drivers/bcma/Kconfig | 17 +
drivers/bcma/Makefile | 4 +-
drivers/bcma/bcma_private.h | 67 +
drivers/bcma/driver_gpio.c | 27 +-
drivers/bcma/driver_pci.c | 53 +-
drivers/bcma/driver_pci_host.c | 1 +
drivers/bcma/driver_pcie2.c | 29 +-
drivers/bcma/host_pci.c | 77 +-
drivers/bcma/main.c | 2 +-
drivers/bluetooth/ath3k.c | 1 +
drivers/bluetooth/btmrvl_drv.h | 1 +
drivers/bluetooth/btmrvl_main.c | 14 +
drivers/bluetooth/btusb.c | 508 ++-
drivers/bluetooth/hci_ldisc.c | 13 +-
drivers/bluetooth/hci_uart.h | 1 +
drivers/firewire/net.c | 13 -
drivers/infiniband/hw/mlx4/main.c | 11 +-
drivers/infiniband/hw/mlx5/ah.c | 2 +-
drivers/infiniband/hw/mlx5/cq.c | 14 +-
drivers/infiniband/hw/mlx5/doorbell.c | 2 +-
drivers/infiniband/hw/mlx5/mad.c | 2 +-
drivers/infiniband/hw/mlx5/main.c | 107 +-
drivers/infiniband/hw/mlx5/mem.c | 2 +-
drivers/infiniband/hw/mlx5/mlx5_ib.h | 5 +-
drivers/infiniband/hw/mlx5/mr.c | 2 +-
drivers/infiniband/hw/mlx5/odp.c | 2 +-
drivers/infiniband/hw/mlx5/qp.c | 8 +-
drivers/infiniband/hw/mlx5/srq.c | 4 +-
drivers/infiniband/hw/mlx5/user.h | 2 +-
drivers/infiniband/ulp/ipoib/ipoib_main.c | 8 +
drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 1 -
drivers/isdn/gigaset/ev-layer.c | 365 +-
drivers/isdn/i4l/isdn_net.c | 33 -
drivers/isdn/mISDN/socket.c | 7 +-
drivers/media/dvb-core/dvb_net.c | 1 -
drivers/net/arcnet/arcnet.c | 55 -
drivers/net/bonding/bond_3ad.c | 65 +-
drivers/net/bonding/bond_main.c | 40 +-
drivers/net/bonding/bond_procfs.c | 43 +-
drivers/net/caif/caif_serial.c | 1 -
drivers/net/can/at91_can.c | 4 +-
drivers/net/can/bfin_can.c | 258 +-
drivers/net/can/cc770/cc770_platform.c | 2 +-
drivers/net/can/grcan.c | 2 +-
drivers/net/can/led.c | 22 +-
drivers/net/can/m_can/m_can.c | 4 +-
drivers/net/can/mscan/mpc5xxx_can.c | 2 +-
drivers/net/can/sja1000/sja1000_platform.c | 2 +-
drivers/net/can/usb/ems_usb.c | 11 +-
drivers/net/can/usb/esd_usb2.c | 4 +-
drivers/net/can/usb/kvaser_usb.c | 2 +-
drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 2 +-
drivers/net/can/xilinx_can.c | 2 +-
drivers/net/dsa/Kconfig | 13 +-
drivers/net/dsa/bcm_sf2.c | 155 +-
drivers/net/dsa/bcm_sf2.h | 2 +
drivers/net/dsa/bcm_sf2_regs.h | 15 +
drivers/net/dsa/mv88e6123_61_65.c | 199 +-
drivers/net/dsa/mv88e6131.c | 182 +-
drivers/net/dsa/mv88e6171.c | 202 +-
drivers/net/dsa/mv88e6352.c | 307 +-
drivers/net/dsa/mv88e6xxx.c | 982 +++++-
drivers/net/dsa/mv88e6xxx.h | 245 +-
drivers/net/ethernet/adi/bfin_mac.c | 16 +-
drivers/net/ethernet/aeroflex/greth.c | 2 +-
drivers/net/ethernet/allwinner/sun4i-emac.c | 2 +-
drivers/net/ethernet/altera/altera_tse_main.c | 24 +-
drivers/net/ethernet/amd/amd8111e.c | 4 +-
drivers/net/ethernet/amd/amd8111e.h | 2 +-
drivers/net/ethernet/amd/pcnet32.c | 2 +-
drivers/net/ethernet/amd/xgbe/xgbe-common.h | 2 +
drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 28 +-
drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 45 +-
drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 19 +-
drivers/net/ethernet/amd/xgbe/xgbe-main.c | 19 +-
drivers/net/ethernet/amd/xgbe/xgbe-ptp.c | 13 +-
drivers/net/ethernet/amd/xgbe/xgbe.h | 8 +-
drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 2 +
drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 189 +-
drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 23 +-
drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c | 10 +-
drivers/net/ethernet/apple/bmac.c | 2 +-
drivers/net/ethernet/apple/mace.c | 4 +-
drivers/net/ethernet/apple/macmace.c | 2 +-
drivers/net/ethernet/atheros/atl1c/atl1c_hw.c | 4 +-
drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 +-
drivers/net/ethernet/broadcom/Kconfig | 10 +-
drivers/net/ethernet/broadcom/bgmac.c | 278 +-
drivers/net/ethernet/broadcom/bgmac.h | 11 +-
drivers/net/ethernet/broadcom/bnx2.c | 29 +-
drivers/net/ethernet/broadcom/bnx2.h | 4 +-
drivers/net/ethernet/broadcom/bnx2_fw.h | 4 +-
.../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 2 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 15 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h | 2 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 94 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 31 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 4 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 2 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 2 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 4 +-
drivers/net/ethernet/broadcom/cnic.c | 6 +-
drivers/net/ethernet/broadcom/cnic_if.h | 8 +-
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 1106 ++++--
drivers/net/ethernet/broadcom/genet/bcmgenet.h | 50 +-
drivers/net/ethernet/broadcom/genet/bcmmii.c | 45 +-
drivers/net/ethernet/broadcom/tg3.c | 18 +-
drivers/net/ethernet/brocade/Kconfig | 8 +-
drivers/net/ethernet/brocade/Makefile | 2 +-
drivers/net/ethernet/brocade/bna/Kconfig | 12 +-
drivers/net/ethernet/brocade/bna/Makefile | 3 +-
drivers/net/ethernet/brocade/bna/bfa_cee.c | 7 +-
drivers/net/ethernet/brocade/bna/bfa_cee.h | 7 +-
drivers/net/ethernet/brocade/bna/bfa_cs.h | 7 +-
drivers/net/ethernet/brocade/bna/bfa_defs.h | 7 +-
drivers/net/ethernet/brocade/bna/bfa_defs_cna.h | 9 +-
.../net/ethernet/brocade/bna/bfa_defs_mfg_comm.h | 7 +-
drivers/net/ethernet/brocade/bna/bfa_defs_status.h | 7 +-
drivers/net/ethernet/brocade/bna/bfa_ioc.c | 11 +-
drivers/net/ethernet/brocade/bna/bfa_ioc.h | 7 +-
drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c | 9 +-
drivers/net/ethernet/brocade/bna/bfa_msgq.c | 7 +-
drivers/net/ethernet/brocade/bna/bfa_msgq.h | 7 +-
drivers/net/ethernet/brocade/bna/bfi.h | 11 +-
drivers/net/ethernet/brocade/bna/bfi_cna.h | 7 +-
drivers/net/ethernet/brocade/bna/bfi_enet.h | 7 +-
drivers/net/ethernet/brocade/bna/bfi_reg.h | 13 +-
drivers/net/ethernet/brocade/bna/bna.h | 7 +-
drivers/net/ethernet/brocade/bna/bna_enet.c | 7 +-
drivers/net/ethernet/brocade/bna/bna_hw_defs.h | 9 +-
drivers/net/ethernet/brocade/bna/bna_tx_rx.c | 7 +-
drivers/net/ethernet/brocade/bna/bna_types.h | 7 +-
drivers/net/ethernet/brocade/bna/bnad.c | 11 +-
drivers/net/ethernet/brocade/bna/bnad.h | 9 +-
drivers/net/ethernet/brocade/bna/bnad_debugfs.c | 7 +-
drivers/net/ethernet/brocade/bna/bnad_ethtool.c | 7 +-
drivers/net/ethernet/brocade/bna/cna.h | 11 +-
drivers/net/ethernet/brocade/bna/cna_fwimg.c | 7 +-
drivers/net/ethernet/cadence/Kconfig | 12 +-
drivers/net/ethernet/cadence/Makefile | 1 -
drivers/net/ethernet/cadence/at91_ether.c | 481 ---
drivers/net/ethernet/cadence/macb.c | 740 +++-
drivers/net/ethernet/cadence/macb.h | 40 +-
drivers/net/ethernet/calxeda/xgmac.c | 20 +-
drivers/net/ethernet/chelsio/Kconfig | 11 +
drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 2 +-
drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 +-
drivers/net/ethernet/chelsio/cxgb3/t3_hw.c | 2 +-
drivers/net/ethernet/chelsio/cxgb4/Makefile | 3 +-
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 60 +-
drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 4 +
drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 915 +++++
drivers/net/ethernet/chelsio/cxgb4/cxgb4_fcoe.c | 122 +
drivers/net/ethernet/chelsio/cxgb4/cxgb4_fcoe.h | 57 +
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 1754 +---------
drivers/net/ethernet/chelsio/cxgb4/sge.c | 74 +-
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 734 +++-
drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 25 +
drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 5 +-
drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 2 +-
.../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 2 +-
drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 2 +-
drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 2 +-
drivers/net/ethernet/cirrus/cs89x0.c | 2 +-
drivers/net/ethernet/cisco/enic/enic_main.c | 8 +-
drivers/net/ethernet/dec/tulip/dmfe.c | 2 +-
drivers/net/ethernet/dec/tulip/uli526x.c | 2 +-
drivers/net/ethernet/emulex/benet/be.h | 56 +-
drivers/net/ethernet/emulex/benet/be_cmds.c | 203 +-
drivers/net/ethernet/emulex/benet/be_cmds.h | 23 +-
drivers/net/ethernet/emulex/benet/be_ethtool.c | 2 +-
drivers/net/ethernet/emulex/benet/be_main.c | 1234 ++++---
drivers/net/ethernet/ethoc.c | 2 +-
drivers/net/ethernet/freescale/Kconfig | 2 -
drivers/net/ethernet/freescale/fec_mpc52xx.c | 2 +-
drivers/net/ethernet/freescale/fec_mpc52xx_phy.c | 2 +-
drivers/net/ethernet/freescale/fec_ptp.c | 17 +-
.../net/ethernet/freescale/fs_enet/fs_enet-main.c | 4 +-
.../net/ethernet/freescale/fs_enet/mii-bitbang.c | 2 +-
drivers/net/ethernet/freescale/fs_enet/mii-fec.c | 4 +-
drivers/net/ethernet/freescale/fsl_pq_mdio.c | 2 +-
drivers/net/ethernet/freescale/gianfar.c | 204 +-
drivers/net/ethernet/freescale/gianfar.h | 32 +-
drivers/net/ethernet/freescale/gianfar_ptp.c | 23 +-
drivers/net/ethernet/freescale/ucc_geth.c | 2 +-
drivers/net/ethernet/freescale/xgmac_mdio.c | 98 +-
drivers/net/ethernet/ibm/ehea/ehea_main.c | 4 +-
drivers/net/ethernet/ibm/emac/core.c | 2 +-
drivers/net/ethernet/ibm/emac/mal.c | 2 +-
drivers/net/ethernet/ibm/emac/rgmii.c | 2 +-
drivers/net/ethernet/ibm/emac/tah.c | 2 +-
drivers/net/ethernet/ibm/emac/zmii.c | 2 +-
drivers/net/ethernet/intel/e100.c | 2 +-
drivers/net/ethernet/intel/e1000/e1000_main.c | 14 +-
drivers/net/ethernet/intel/e1000e/defines.h | 1 +
drivers/net/ethernet/intel/e1000e/e1000.h | 2 +
drivers/net/ethernet/intel/e1000e/ethtool.c | 6 +-
drivers/net/ethernet/intel/e1000e/hw.h | 6 +
drivers/net/ethernet/intel/e1000e/ich8lan.c | 776 ++++-
drivers/net/ethernet/intel/e1000e/ich8lan.h | 9 +
drivers/net/ethernet/intel/e1000e/netdev.c | 65 +-
drivers/net/ethernet/intel/e1000e/ptp.c | 25 +-
drivers/net/ethernet/intel/e1000e/regs.h | 3 +
drivers/net/ethernet/intel/fm10k/fm10k.h | 1 +
drivers/net/ethernet/intel/fm10k/fm10k_common.c | 3 +-
drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 2 +-
drivers/net/ethernet/intel/fm10k/fm10k_iov.c | 2 +-
drivers/net/ethernet/intel/fm10k/fm10k_main.c | 39 +-
drivers/net/ethernet/intel/fm10k/fm10k_mbx.c | 20 +-
drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 19 +-
drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 2 +-
drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 23 +-
drivers/net/ethernet/intel/fm10k/fm10k_ptp.c | 12 +-
drivers/net/ethernet/intel/fm10k/fm10k_tlv.c | 2 +-
drivers/net/ethernet/intel/fm10k/fm10k_type.h | 5 +-
drivers/net/ethernet/intel/fm10k/fm10k_vf.c | 14 +-
drivers/net/ethernet/intel/i40e/Makefile | 2 +-
drivers/net/ethernet/intel/i40e/i40e.h | 60 +-
drivers/net/ethernet/intel/i40e/i40e_adminq.c | 4 +-
drivers/net/ethernet/intel/i40e/i40e_adminq.h | 1 +
drivers/net/ethernet/intel/i40e/i40e_common.c | 289 +-
drivers/net/ethernet/intel/i40e/i40e_dcb.c | 2 +-
drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c | 25 +-
drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 48 +-
drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 494 ++-
drivers/net/ethernet/intel/i40e/i40e_fcoe.c | 35 +-
drivers/net/ethernet/intel/i40e/i40e_fcoe.h | 1 -
drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 4 +-
drivers/net/ethernet/intel/i40e/i40e_main.c | 921 +++--
drivers/net/ethernet/intel/i40e/i40e_nvm.c | 95 +-
drivers/net/ethernet/intel/i40e/i40e_prototype.h | 12 +-
drivers/net/ethernet/intel/i40e/i40e_ptp.c | 26 +-
drivers/net/ethernet/intel/i40e/i40e_register.h | 50 +-
drivers/net/ethernet/intel/i40e/i40e_txrx.c | 489 ++-
drivers/net/ethernet/intel/i40e/i40e_txrx.h | 17 +-
drivers/net/ethernet/intel/i40e/i40e_type.h | 20 +-
drivers/net/ethernet/intel/i40e/i40e_virtchnl.h | 42 +-
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 413 +--
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 17 +-
drivers/net/ethernet/intel/i40evf/i40e_adminq.h | 1 +
drivers/net/ethernet/intel/i40evf/i40e_common.c | 59 +-
drivers/net/ethernet/intel/i40evf/i40e_prototype.h | 3 +-
drivers/net/ethernet/intel/i40evf/i40e_register.h | 50 +-
drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 463 ++-
drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 17 +-
drivers/net/ethernet/intel/i40evf/i40e_type.h | 9 +-
drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h | 42 +-
drivers/net/ethernet/intel/i40evf/i40evf.h | 2 +
drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 23 +-
drivers/net/ethernet/intel/i40evf/i40evf_main.c | 174 +-
.../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 2 +
drivers/net/ethernet/intel/igb/igb_main.c | 5 +-
drivers/net/ethernet/intel/igb/igb_ptp.c | 77 +-
drivers/net/ethernet/intel/igbvf/defines.h | 128 +-
drivers/net/ethernet/intel/igbvf/ethtool.c | 83 +-
drivers/net/ethernet/intel/igbvf/igbvf.h | 103 +-
drivers/net/ethernet/intel/igbvf/mbx.c | 21 +-
drivers/net/ethernet/intel/igbvf/mbx.h | 53 +-
drivers/net/ethernet/intel/igbvf/netdev.c | 394 +--
drivers/net/ethernet/intel/igbvf/regs.h | 123 +-
drivers/net/ethernet/intel/igbvf/vf.c | 43 +-
drivers/net/ethernet/intel/igbvf/vf.h | 83 +-
drivers/net/ethernet/intel/ixgb/ixgb_main.c | 3 +-
drivers/net/ethernet/intel/ixgbe/ixgbe.h | 1 -
drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 10 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 7 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 56 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 2 +
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 17 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 32 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 23 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 2 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 9 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 2 +
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 47 +-
drivers/net/ethernet/intel/ixgbevf/defines.h | 285 +-
drivers/net/ethernet/intel/ixgbevf/ethtool.c | 86 +-
drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 82 +-
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 229 +-
drivers/net/ethernet/intel/ixgbevf/mbx.c | 43 +-
drivers/net/ethernet/intel/ixgbevf/mbx.h | 93 +-
drivers/net/ethernet/intel/ixgbevf/regs.h | 105 +-
drivers/net/ethernet/intel/ixgbevf/vf.c | 65 +-
drivers/net/ethernet/intel/ixgbevf/vf.h | 15 +-
drivers/net/ethernet/marvell/mvneta.c | 106 +-
drivers/net/ethernet/marvell/mvpp2.c | 4 +-
drivers/net/ethernet/mellanox/mlx4/Makefile | 5 +-
drivers/net/ethernet/mellanox/mlx4/cmd.c | 301 +-
drivers/net/ethernet/mellanox/mlx4/en_clock.c | 15 +-
drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c | 223 ++
drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 252 +-
drivers/net/ethernet/mellanox/mlx4/en_main.c | 5 +
drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 192 +-
drivers/net/ethernet/mellanox/mlx4/en_port.c | 182 +-
drivers/net/ethernet/mellanox/mlx4/en_rx.c | 5 +-
drivers/net/ethernet/mellanox/mlx4/en_selftest.c | 2 +-
drivers/net/ethernet/mellanox/mlx4/fw.c | 103 +-
drivers/net/ethernet/mellanox/mlx4/fw.h | 2 +
drivers/net/ethernet/mellanox/mlx4/fw_qos.c | 289 ++
drivers/net/ethernet/mellanox/mlx4/fw_qos.h | 145 +
drivers/net/ethernet/mellanox/mlx4/main.c | 33 +
drivers/net/ethernet/mellanox/mlx4/mlx4.h | 32 +-
drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 57 +-
drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h | 107 +
drivers/net/ethernet/mellanox/mlx4/port.c | 145 +-
drivers/net/ethernet/mellanox/mlx4/qp.c | 10 +
.../net/ethernet/mellanox/mlx4/resource_tracker.c | 19 +-
drivers/net/ethernet/mellanox/mlx5/core/alloc.c | 5 +-
drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 85 +-
drivers/net/ethernet/mellanox/mlx5/core/cq.c | 2 +-
drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 2 +-
drivers/net/ethernet/mellanox/mlx5/core/eq.c | 2 +-
drivers/net/ethernet/mellanox/mlx5/core/fw.c | 2 +-
drivers/net/ethernet/mellanox/mlx5/core/health.c | 2 +-
drivers/net/ethernet/mellanox/mlx5/core/mad.c | 2 +-
drivers/net/ethernet/mellanox/mlx5/core/main.c | 124 +-
drivers/net/ethernet/mellanox/mlx5/core/mcg.c | 2 +-
.../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 2 +-
drivers/net/ethernet/mellanox/mlx5/core/mr.c | 4 +-
.../net/ethernet/mellanox/mlx5/core/pagealloc.c | 5 +-
drivers/net/ethernet/mellanox/mlx5/core/pd.c | 2 +-
drivers/net/ethernet/mellanox/mlx5/core/port.c | 2 +-
drivers/net/ethernet/mellanox/mlx5/core/qp.c | 2 +-
drivers/net/ethernet/mellanox/mlx5/core/srq.c | 2 +-
drivers/net/ethernet/mellanox/mlx5/core/uar.c | 2 +-
drivers/net/ethernet/micrel/ksz884x.c | 2 +-
drivers/net/ethernet/moxa/moxart_ether.c | 2 +-
drivers/net/ethernet/neterion/s2io.c | 2 +-
drivers/net/ethernet/neterion/vxge/vxge-ethtool.c | 19 +
drivers/net/ethernet/neterion/vxge/vxge-ethtool.h | 19 -
drivers/net/ethernet/octeon/octeon_mgmt.c | 2 +-
.../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c | 2 +-
drivers/net/ethernet/packetengines/hamachi.c | 2 +-
drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | 2 +-
.../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 2 +-
.../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 4 +-
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 1 +
drivers/net/ethernet/qlogic/qlge/qlge_main.c | 2 +-
drivers/net/ethernet/qualcomm/qca_spi.c | 2 +-
drivers/net/ethernet/renesas/sh_eth.c | 259 +-
drivers/net/ethernet/renesas/sh_eth.h | 23 +-
drivers/net/ethernet/rocker/rocker.c | 854 ++++-
drivers/net/ethernet/rocker/rocker.h | 32 +-
drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 12 +-
drivers/net/ethernet/sfc/efx.c | 2 +-
drivers/net/ethernet/sfc/farch.c | 4 +-
drivers/net/ethernet/sfc/mcdi_pcol.h | 2 +-
drivers/net/ethernet/sfc/ptp.c | 22 +-
drivers/net/ethernet/sfc/siena_sriov.c | 2 +-
drivers/net/ethernet/sfc/vfdi.h | 4 +-
drivers/net/ethernet/smsc/smc91x.c | 26 +-
drivers/net/ethernet/smsc/smsc911x.c | 2 +-
.../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 4 +-
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +-
drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 12 +-
drivers/net/ethernet/sun/sungem.c | 4 +-
drivers/net/ethernet/sun/sunvnet.c | 2 +
drivers/net/ethernet/ti/Kconfig | 1 +
drivers/net/ethernet/ti/cpsw.c | 2 +-
drivers/net/ethernet/ti/cpts.c | 19 +-
drivers/net/ethernet/ti/netcp.h | 5 +-
drivers/net/ethernet/ti/netcp_core.c | 27 +-
drivers/net/ethernet/ti/netcp_ethss.c | 1581 +++++++--
drivers/net/ethernet/tile/tilegx.c | 9 +-
drivers/net/ethernet/toshiba/ps3_gelic_net.c | 2 +-
drivers/net/ethernet/toshiba/ps3_gelic_wireless.c | 4 +-
drivers/net/ethernet/via/via-rhine.c | 31 +-
drivers/net/ethernet/via/via-velocity.c | 2 +-
drivers/net/ethernet/wiznet/w5100.c | 2 +-
drivers/net/ethernet/wiznet/w5300.c | 2 +-
drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +-
drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +-
drivers/net/ethernet/xilinx/xilinx_emaclite.c | 4 +-
drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 +-
drivers/net/hamradio/6pack.c | 31 +-
drivers/net/hamradio/baycom_epp.c | 3 +
drivers/net/hamradio/bpqether.c | 3 +
drivers/net/hamradio/dmascc.c | 3 +
drivers/net/hamradio/hdlcdrv.c | 3 +
drivers/net/hamradio/mkiss.c | 44 +-
drivers/net/hamradio/scc.c | 3 +
drivers/net/hamradio/yam.c | 3 +
drivers/net/hyperv/hyperv_net.h | 28 +-
drivers/net/hyperv/netvsc.c | 195 +-
drivers/net/hyperv/netvsc_drv.c | 77 +-
drivers/net/hyperv/rndis_filter.c | 16 +-
drivers/net/ieee802154/at86rf230.c | 356 +-
drivers/net/ieee802154/cc2520.c | 150 +-
drivers/net/ipvlan/ipvlan_core.c | 2 +-
drivers/net/ipvlan/ipvlan_main.c | 10 +-
drivers/net/macvlan.c | 10 +-
drivers/net/macvtap.c | 9 +-
drivers/net/netconsole.c | 5 +-
drivers/net/phy/amd-xgbe-phy.c | 98 +-
drivers/net/phy/at803x.c | 11 +-
drivers/net/phy/bcm7xxx.c | 1 +
drivers/net/phy/dp83640.c | 19 +-
drivers/net/phy/fixed_phy.c | 29 +
drivers/net/phy/mdio-bcm-unimac.c | 2 +-
drivers/net/phy/mdio-gpio.c | 2 +-
drivers/net/phy/mdio-mux-gpio.c | 2 +-
drivers/net/phy/mdio-mux-mmioreg.c | 2 +-
drivers/net/phy/mdio-octeon.c | 2 +-
drivers/net/ppp/pppoe.c | 25 +-
drivers/net/ppp/pptp.c | 2 +-
drivers/net/team/team.c | 4 +
drivers/net/tun.c | 6 +-
drivers/net/usb/catc.c | 4 +-
drivers/net/usb/cdc_mbim.c | 2 +-
drivers/net/usb/cx82310_eth.c | 2 +-
drivers/net/usb/hso.c | 13 +-
drivers/net/usb/lg-vl600.c | 2 +-
drivers/net/usb/qmi_wwan.c | 2 +-
drivers/net/usb/r8152.c | 131 +-
drivers/net/veth.c | 15 +
drivers/net/virtio_net.c | 16 +-
drivers/net/vmxnet3/vmxnet3_drv.c | 29 +-
drivers/net/vmxnet3/vmxnet3_ethtool.c | 4 +-
drivers/net/vmxnet3/vmxnet3_int.h | 5 +-
drivers/net/vxlan.c | 287 +-
drivers/net/wan/cosa.c | 1 +
drivers/net/wan/lmc/lmc_main.c | 1 +
drivers/net/wireless/airo.c | 4 +-
drivers/net/wireless/at76c50x-usb.c | 6 +-
drivers/net/wireless/ath/ar5523/ar5523.c | 9 +-
drivers/net/wireless/ath/ar5523/ar5523.h | 1 -
drivers/net/wireless/ath/ath.h | 3 +
drivers/net/wireless/ath/ath10k/ce.h | 2 +-
drivers/net/wireless/ath/ath10k/core.c | 8 +-
drivers/net/wireless/ath/ath10k/core.h | 27 +
drivers/net/wireless/ath/ath10k/debug.c | 101 +-
drivers/net/wireless/ath/ath10k/htt_rx.c | 2 +-
drivers/net/wireless/ath/ath10k/mac.c | 169 +-
drivers/net/wireless/ath/ath10k/pci.c | 4 +-
drivers/net/wireless/ath/ath10k/wmi-ops.h | 7 +-
drivers/net/wireless/ath/ath10k/wmi-tlv.c | 132 +-
drivers/net/wireless/ath/ath10k/wmi-tlv.h | 15 +
drivers/net/wireless/ath/ath10k/wmi.c | 27 +-
drivers/net/wireless/ath/ath10k/wmi.h | 18 +-
drivers/net/wireless/ath/ath5k/ath5k.h | 1 +
drivers/net/wireless/ath/ath5k/base.c | 33 +-
drivers/net/wireless/ath/ath5k/reset.c | 24 -
drivers/net/wireless/ath/ath6kl/cfg80211.c | 17 +-
drivers/net/wireless/ath/ath6kl/cfg80211.h | 1 +
drivers/net/wireless/ath/ath6kl/core.c | 4 +-
drivers/net/wireless/ath/ath6kl/main.c | 2 +-
drivers/net/wireless/ath/ath9k/Makefile | 3 +-
drivers/net/wireless/ath/ath9k/ani.c | 20 +-
drivers/net/wireless/ath/ath9k/ar5008_phy.c | 5 +-
drivers/net/wireless/ath/ath9k/ar9002_calib.c | 77 +-
drivers/net/wireless/ath/ath9k/ar9003_aic.c | 599 ++++
drivers/net/wireless/ath/ath9k/ar9003_aic.h | 61 +
drivers/net/wireless/ath/ath9k/ar9003_hw.c | 84 +-
drivers/net/wireless/ath/ath9k/ar9003_mci.c | 178 +-
drivers/net/wireless/ath/ath9k/ar9003_mci.h | 61 +-
drivers/net/wireless/ath/ath9k/ar9003_phy.h | 25 -
drivers/net/wireless/ath/ath9k/ar9003_rtt.c | 6 +-
drivers/net/wireless/ath/ath9k/ar9003_wow.c | 61 +-
drivers/net/wireless/ath/ath9k/ath9k.h | 3 +-
drivers/net/wireless/ath/ath9k/btcoex.c | 43 +-
drivers/net/wireless/ath/ath9k/btcoex.h | 13 +
drivers/net/wireless/ath/ath9k/calib.c | 19 +-
drivers/net/wireless/ath/ath9k/debug.c | 5 +-
drivers/net/wireless/ath/ath9k/dfs.c | 44 +-
drivers/net/wireless/ath/ath9k/eeprom.c | 7 +-
drivers/net/wireless/ath/ath9k/eeprom_4k.c | 36 +-
drivers/net/wireless/ath/ath9k/eeprom_def.c | 34 +-
drivers/net/wireless/ath/ath9k/gpio.c | 95 +-
drivers/net/wireless/ath/ath9k/hif_usb.c | 1 +
drivers/net/wireless/ath/ath9k/htc.h | 5 +
drivers/net/wireless/ath/ath9k/htc_drv_init.c | 142 +-
drivers/net/wireless/ath/ath9k/htc_drv_main.c | 2 +-
drivers/net/wireless/ath/ath9k/hw-ops.h | 8 +
drivers/net/wireless/ath/ath9k/hw.c | 37 +
drivers/net/wireless/ath/ath9k/hw.h | 32 +-
drivers/net/wireless/ath/ath9k/init.c | 23 +-
drivers/net/wireless/ath/ath9k/main.c | 56 +-
drivers/net/wireless/ath/ath9k/mci.c | 5 +-
drivers/net/wireless/ath/ath9k/reg.h | 275 --
drivers/net/wireless/ath/ath9k/reg_aic.h | 168 +
drivers/net/wireless/ath/ath9k/reg_mci.h | 310 ++
drivers/net/wireless/ath/ath9k/reg_wow.h | 10 +-
drivers/net/wireless/ath/ath9k/wmi.c | 3 +
drivers/net/wireless/ath/ath9k/wmi.h | 16 +
drivers/net/wireless/ath/ath9k/xmit.c | 42 +-
drivers/net/wireless/ath/dfs_pattern_detector.c | 2 +-
drivers/net/wireless/ath/wil6210/cfg80211.c | 68 +-
drivers/net/wireless/ath/wil6210/debugfs.c | 37 +-
drivers/net/wireless/ath/wil6210/ethtool.c | 34 +-
drivers/net/wireless/ath/wil6210/fw.c | 3 +-
drivers/net/wireless/ath/wil6210/fw_inc.c | 4 +-
drivers/net/wireless/ath/wil6210/interrupt.c | 70 +-
drivers/net/wireless/ath/wil6210/main.c | 202 +-
drivers/net/wireless/ath/wil6210/netdev.c | 4 +-
drivers/net/wireless/ath/wil6210/pcie_bus.c | 24 +-
drivers/net/wireless/ath/wil6210/txrx.c | 417 ++-
drivers/net/wireless/ath/wil6210/wil6210.h | 42 +-
drivers/net/wireless/ath/wil6210/wmi.c | 25 +-
drivers/net/wireless/ath/wil6210/wmi.h | 23 +-
drivers/net/wireless/atmel.c | 16 +-
drivers/net/wireless/b43/main.c | 14 +-
drivers/net/wireless/b43legacy/main.c | 8 +-
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 174 +-
drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c | 28 +-
drivers/net/wireless/brcm80211/brcmfmac/chip.c | 310 +-
drivers/net/wireless/brcm80211/brcmfmac/chip.h | 12 +-
drivers/net/wireless/brcm80211/brcmfmac/core.c | 30 +
drivers/net/wireless/brcm80211/brcmfmac/flowring.c | 2 +-
drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c | 5 +-
drivers/net/wireless/brcm80211/brcmfmac/msgbuf.h | 8 +-
drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 5 +-
drivers/net/wireless/brcm80211/brcmfmac/p2p.h | 1 +
drivers/net/wireless/brcm80211/brcmfmac/pcie.c | 24 +-
drivers/net/wireless/brcm80211/brcmfmac/sdio.c | 308 +-
drivers/net/wireless/brcm80211/brcmfmac/sdio.h | 47 +-
drivers/net/wireless/brcm80211/brcmsmac/main.c | 10 +-
.../net/wireless/brcm80211/brcmsmac/phy/phy_n.c | 11 +-
.../net/wireless/brcm80211/include/brcm_hw_ids.h | 2 +
.../net/wireless/brcm80211/include/chipcommon.h | 9 +-
drivers/net/wireless/cw1200/cw1200_spi.c | 11 +-
drivers/net/wireless/cw1200/sta.c | 6 +-
drivers/net/wireless/cw1200/txrx.c | 2 +-
drivers/net/wireless/hostap/hostap_80211_tx.c | 4 +-
drivers/net/wireless/hostap/hostap_ap.c | 8 +-
drivers/net/wireless/hostap/hostap_info.c | 2 +-
drivers/net/wireless/hostap/hostap_main.c | 5 +-
drivers/net/wireless/hostap/hostap_wlan.h | 33 +-
drivers/net/wireless/ipw2x00/Kconfig | 2 +-
drivers/net/wireless/ipw2x00/ipw2100.c | 8 +-
drivers/net/wireless/ipw2x00/ipw2200.c | 6 +-
drivers/net/wireless/iwlegacy/4965-rs.c | 2 +-
drivers/net/wireless/iwlegacy/common.c | 2 +-
drivers/net/wireless/iwlwifi/dvm/mac80211.c | 15 +-
drivers/net/wireless/iwlwifi/dvm/main.c | 2 +-
drivers/net/wireless/iwlwifi/dvm/rs.c | 7 +-
drivers/net/wireless/iwlwifi/dvm/tx.c | 6 +-
drivers/net/wireless/iwlwifi/iwl-7000.c | 12 +-
drivers/net/wireless/iwlwifi/iwl-8000.c | 6 +-
drivers/net/wireless/iwlwifi/iwl-debug.h | 2 +
drivers/net/wireless/iwlwifi/iwl-devtrace.h | 18 +-
drivers/net/wireless/iwlwifi/iwl-drv.c | 90 +-
drivers/net/wireless/iwlwifi/iwl-drv.h | 2 +-
drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h | 1 +
drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h | 46 +
drivers/net/wireless/iwlwifi/iwl-fw-file.h | 159 +-
drivers/net/wireless/iwlwifi/iwl-fw.h | 53 +-
drivers/net/wireless/iwlwifi/iwl-io.c | 2 +
drivers/net/wireless/iwlwifi/iwl-modparams.h | 2 +
drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 411 ++-
drivers/net/wireless/iwlwifi/iwl-nvm-parse.h | 19 +-
drivers/net/wireless/iwlwifi/iwl-phy-db.c | 2 +-
drivers/net/wireless/iwlwifi/iwl-prph.h | 28 +-
drivers/net/wireless/iwlwifi/iwl-trans.h | 19 +-
drivers/net/wireless/iwlwifi/mvm/coex.c | 226 +-
drivers/net/wireless/iwlwifi/mvm/coex_legacy.c | 75 +-
drivers/net/wireless/iwlwifi/mvm/d3.c | 26 +-
drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c | 55 +-
drivers/net/wireless/iwlwifi/mvm/debugfs.c | 32 +-
drivers/net/wireless/iwlwifi/mvm/fw-api-coex.h | 47 -
drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h | 1 +
drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 191 -
drivers/net/wireless/iwlwifi/mvm/fw-api-stats.h | 64 +-
drivers/net/wireless/iwlwifi/mvm/fw-api.h | 134 +-
drivers/net/wireless/iwlwifi/mvm/fw.c | 143 +-
drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 36 +
drivers/net/wireless/iwlwifi/mvm/mac80211.c | 362 +-
drivers/net/wireless/iwlwifi/mvm/mvm.h | 194 +-
drivers/net/wireless/iwlwifi/mvm/nvm.c | 290 +-
drivers/net/wireless/iwlwifi/mvm/ops.c | 55 +-
drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c | 4 +
drivers/net/wireless/iwlwifi/mvm/power.c | 9 +-
drivers/net/wireless/iwlwifi/mvm/quota.c | 3 +-
drivers/net/wireless/iwlwifi/mvm/rs.c | 270 +-
drivers/net/wireless/iwlwifi/mvm/rs.h | 7 +-
drivers/net/wireless/iwlwifi/mvm/rx.c | 150 +-
drivers/net/wireless/iwlwifi/mvm/scan.c | 600 +---
drivers/net/wireless/iwlwifi/mvm/sf.c | 67 +-
drivers/net/wireless/iwlwifi/mvm/sta.c | 5 +-
drivers/net/wireless/iwlwifi/mvm/time-event.c | 20 +-
drivers/net/wireless/iwlwifi/mvm/tx.c | 4 +
drivers/net/wireless/iwlwifi/mvm/utils.c | 209 +-
drivers/net/wireless/iwlwifi/pcie/drv.c | 27 +-
drivers/net/wireless/iwlwifi/pcie/internal.h | 4 +
drivers/net/wireless/iwlwifi/pcie/trans.c | 163 +-
drivers/net/wireless/iwlwifi/pcie/tx.c | 63 +-
drivers/net/wireless/libertas/cfg.c | 6 +-
drivers/net/wireless/libertas/debugfs.c | 3 +-
drivers/net/wireless/libertas/main.c | 4 +-
drivers/net/wireless/libertas_tf/if_usb.c | 2 -
drivers/net/wireless/libertas_tf/main.c | 4 +-
drivers/net/wireless/mac80211_hwsim.c | 109 +-
drivers/net/wireless/mwifiex/11n.c | 18 +-
drivers/net/wireless/mwifiex/11n.h | 32 -
drivers/net/wireless/mwifiex/11n_aggr.c | 16 +-
drivers/net/wireless/mwifiex/11n_rxreorder.c | 7 +-
drivers/net/wireless/mwifiex/cfg80211.c | 202 +-
drivers/net/wireless/mwifiex/decl.h | 11 +-
drivers/net/wireless/mwifiex/fw.h | 11 +
drivers/net/wireless/mwifiex/init.c | 31 +-
drivers/net/wireless/mwifiex/main.c | 98 +-
drivers/net/wireless/mwifiex/main.h | 34 +-
drivers/net/wireless/mwifiex/pcie.c | 33 +-
drivers/net/wireless/mwifiex/pcie.h | 6 +-
drivers/net/wireless/mwifiex/sdio.c | 233 +-
drivers/net/wireless/mwifiex/sdio.h | 74 +-
drivers/net/wireless/mwifiex/sta_cmd.c | 61 +-
drivers/net/wireless/mwifiex/sta_cmdresp.c | 21 +
drivers/net/wireless/mwifiex/sta_event.c | 6 +-
drivers/net/wireless/mwifiex/txrx.c | 136 +-
drivers/net/wireless/mwifiex/usb.c | 6 +-
drivers/net/wireless/mwifiex/util.c | 30 +
drivers/net/wireless/mwifiex/wmm.c | 50 +-
drivers/net/wireless/mwifiex/wmm.h | 2 +
drivers/net/wireless/mwl8k.c | 2 +-
drivers/net/wireless/orinoco/Kconfig | 2 +-
drivers/net/wireless/orinoco/airport.c | 2 +-
drivers/net/wireless/orinoco/wext.c | 2 +-
drivers/net/wireless/p54/fwio.c | 2 +-
drivers/net/wireless/p54/main.c | 8 +-
drivers/net/wireless/ray_cs.c | 2 +-
drivers/net/wireless/rndis_wlan.c | 28 +-
drivers/net/wireless/rt2x00/rt2800usb.c | 13 +-
drivers/net/wireless/rt2x00/rt2x00usb.h | 4 +-
drivers/net/wireless/rtlwifi/base.h | 7 -
drivers/net/wireless/rtlwifi/cam.h | 2 -
drivers/net/wireless/rtlwifi/core.c | 6 +-
drivers/net/wireless/rtlwifi/core.h | 2 -
drivers/net/wireless/rtlwifi/efuse.h | 6 -
drivers/net/wireless/rtlwifi/rtl8188ee/def.h | 41 -
drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | 7 +-
drivers/net/wireless/rtlwifi/rtl8188ee/phy.c | 3 +-
drivers/net/wireless/rtlwifi/rtl8188ee/rf.h | 1 -
drivers/net/wireless/rtlwifi/rtl8192ce/def.h | 41 -
drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8192ce/rf.h | 1 -
drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 11 +-
drivers/net/wireless/rtlwifi/rtl8192cu/hw.h | 2 -
drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8192cu/rf.h | 1 -
drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 2 +
drivers/net/wireless/rtlwifi/rtl8192de/def.h | 39 -
drivers/net/wireless/rtlwifi/rtl8192de/hw.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8192ee/hw.c | 4 +-
drivers/net/wireless/rtlwifi/rtl8192ee/rf.h | 1 -
drivers/net/wireless/rtlwifi/rtl8192se/def.h | 1 -
drivers/net/wireless/rtlwifi/rtl8192se/hw.c | 4 +-
drivers/net/wireless/rtlwifi/rtl8723ae/def.h | 41 -
drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | 4 +-
drivers/net/wireless/rtlwifi/rtl8723ae/rf.h | 1 -
drivers/net/wireless/rtlwifi/rtl8723be/hw.c | 4 +-
drivers/net/wireless/rtlwifi/rtl8723be/rf.h | 1 -
drivers/net/wireless/rtlwifi/rtl8821ae/def.h | 41 -
drivers/net/wireless/rtlwifi/rtl8821ae/hw.c | 8 +-
drivers/net/wireless/rtlwifi/rtl8821ae/rf.h | 1 -
drivers/net/wireless/rtlwifi/rtl8821ae/trx.c | 16 +-
drivers/net/wireless/rtlwifi/stats.c | 24 +-
drivers/net/wireless/rtlwifi/stats.h | 1 -
drivers/net/wireless/rtlwifi/usb.c | 11 +-
drivers/net/wireless/ti/wl1251/main.c | 4 +-
drivers/net/wireless/ti/wl18xx/debugfs.c | 2 +-
drivers/net/wireless/ti/wl18xx/event.c | 4 +-
drivers/net/wireless/ti/wlcore/cmd.c | 4 +-
drivers/net/wireless/ti/wlcore/debugfs.h | 4 +-
drivers/net/xen-netback/common.h | 4 +
drivers/net/xen-netback/interface.c | 3 +-
drivers/net/xen-netback/netback.c | 4 +-
drivers/net/xen-netback/xenbus.c | 57 +
drivers/of/of_mdio.c | 3 +-
drivers/ptp/ptp_chardev.c | 8 +-
drivers/ptp/ptp_clock.c | 12 +-
drivers/ptp/ptp_ixp46x.c | 8 +-
drivers/ptp/ptp_pch.c | 8 +-
drivers/s390/net/Kconfig | 13 +-
drivers/s390/net/Makefile | 1 -
drivers/s390/net/claw.c | 3377 ------------------
drivers/s390/net/claw.h | 348 --
drivers/s390/net/qeth_core_main.c | 5 +-
drivers/scsi/csiostor/csio_init.c | 2 +-
drivers/ssb/main.c | 2 +
drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 6 +-
drivers/vhost/net.c | 6 +-
fs/compat_ioctl.c | 2 +
include/crypto/if_alg.h | 4 +-
include/linux/bcma/bcma.h | 21 +
include/linux/bcma/bcma_driver_chipcommon.h | 11 -
include/linux/bcma/bcma_driver_gmac_cmn.h | 6 -
include/linux/bcma/bcma_driver_mips.h | 15 -
include/linux/bcma/bcma_driver_pci.h | 12 +-
include/linux/bcma/bcma_driver_pcie2.h | 4 +-
include/linux/bpf.h | 63 +-
include/linux/brcmphy.h | 1 +
include/linux/can/dev.h | 2 +
include/linux/can/led.h | 6 +-
include/linux/can/skb.h | 7 +-
include/linux/dccp.h | 4 +-
include/linux/etherdevice.h | 1 -
include/linux/filter.h | 7 +-
include/linux/ieee802154.h | 14 +-
include/linux/if_bridge.h | 1 +
include/linux/if_pppox.h | 2 +
include/linux/if_vlan.h | 67 +
include/linux/inet_diag.h | 43 +-
include/linux/ipv6.h | 4 +
include/linux/jhash.h | 17 +-
include/linux/mlx4/cmd.h | 26 +-
include/linux/mlx4/device.h | 40 +-
include/linux/mlx4/qp.h | 18 +-
include/linux/mlx5/cmd.h | 2 +-
include/linux/mlx5/cq.h | 7 +-
include/linux/mlx5/device.h | 2 +-
include/linux/mlx5/doorbell.h | 2 +-
include/linux/mlx5/driver.h | 16 +-
include/linux/mlx5/mlx5_ifc.h | 2 +-
include/linux/mlx5/qp.h | 2 +-
include/linux/mlx5/srq.h | 2 +-
include/linux/mmc/sdio_ids.h | 2 +
include/linux/net.h | 10 +-
include/linux/netdevice.h | 86 +-
include/linux/netfilter.h | 103 +-
include/linux/netfilter/ipset/ip_set.h | 5 +-
include/linux/netfilter_arp/arp_tables.h | 3 +-
include/linux/netfilter_bridge.h | 82 +-
include/linux/netfilter_ipv4/ip_tables.h | 3 +-
include/linux/netfilter_ipv6/ip6_tables.h | 3 +-
include/linux/of_mdio.h | 7 +
include/linux/of_net.h | 8 +
include/linux/phy_fixed.h | 9 +
include/linux/ptp_clock_kernel.h | 12 +-
include/linux/rhashtable.h | 527 ++-
include/linux/security.h | 8 -
include/linux/skbuff.h | 5 +-
include/linux/sock_diag.h | 4 +-
include/linux/socket.h | 3 +
include/linux/spi/at86rf230.h | 1 +
include/linux/spi/cc2520.h | 1 +
include/linux/tcp.h | 5 +-
include/linux/udp.h | 2 +-
include/net/af_vsock.h | 4 +-
include/net/arp.h | 20 +-
include/net/ax25.h | 5 +-
include/net/bluetooth/bluetooth.h | 45 +-
include/net/bluetooth/hci.h | 40 +-
include/net/bluetooth/hci_core.h | 230 +-
include/net/bluetooth/mgmt.h | 101 +-
include/net/bond_3ad.h | 29 +
include/net/cfg80211.h | 69 +-
include/net/dcbnl.h | 3 +
include/net/dn_neigh.h | 5 +-
include/net/dsa.h | 27 +
include/net/dst_ops.h | 1 -
include/net/fib_rules.h | 11 +-
include/net/genetlink.h | 4 +-
include/net/if_inet6.h | 4 +-
include/net/inet6_connection_sock.h | 3 +-
include/net/inet6_hashtables.h | 2 -
include/net/inet_common.h | 7 +-
include/net/inet_connection_sock.h | 28 +-
include/net/inet_hashtables.h | 36 +-
include/net/inet_sock.h | 30 +-
include/net/inet_timewait_sock.h | 1 +
include/net/inetpeer.h | 3 +-
include/net/ip.h | 15 +-
include/net/ip6_route.h | 3 +-
include/net/ip6_tunnel.h | 6 +-
include/net/ip_fib.h | 70 +-
include/net/ip_tunnels.h | 1 +
include/net/ip_vs.h | 69 +-
include/net/ipv6.h | 12 +-
include/net/iw_handler.h | 22 +
include/net/mac80211.h | 150 +-
include/net/mac802154.h | 9 +-
include/net/ndisc.h | 19 +-
include/net/neighbour.h | 67 +-
include/net/net_namespace.h | 58 +-
include/net/netfilter/ipv4/nf_reject.h | 8 +-
include/net/netfilter/ipv6/nf_reject.h | 13 +-
include/net/netfilter/nf_conntrack.h | 5 +-
include/net/netfilter/nf_nat_l3proto.h | 48 +-
include/net/netfilter/nf_queue.h | 6 +-
include/net/netfilter/nf_tables.h | 373 +-
include/net/netfilter/nf_tables_ipv4.h | 5 +-
include/net/netfilter/nf_tables_ipv6.h | 5 +-
include/net/netlink.h | 50 +
include/net/netns/hash.h | 4 +-
include/net/netns/ipv4.h | 13 +-
include/net/netns/ipv6.h | 3 +
include/net/netns/mpls.h | 17 +
include/net/netns/x_tables.h | 1 +
include/net/ping.h | 7 +-
include/net/request_sock.h | 140 +-
include/net/sch_generic.h | 4 +-
include/net/sctp/sctp.h | 3 +
include/net/sock.h | 63 +-
include/net/switchdev.h | 55 +
include/net/tc_act/tc_bpf.h | 6 +-
include/net/tcp.h | 122 +-
include/net/tcp_states.h | 4 +-
include/net/udp.h | 24 +-
include/net/udp_tunnel.h | 5 +-
include/net/vxlan.h | 4 +-
include/net/xfrm.h | 22 +-
include/uapi/linux/bpf.h | 58 +
include/uapi/linux/can/raw.h | 1 +
include/uapi/linux/dcbnl.h | 66 +
include/uapi/linux/filter.h | 3 +-
include/uapi/linux/if_addr.h | 2 +
include/uapi/linux/if_link.h | 6 +
include/uapi/linux/if_packet.h | 1 +
include/uapi/linux/ip_vs.h | 7 +-
include/uapi/linux/ipv6.h | 1 +
include/uapi/linux/neighbour.h | 1 +
include/uapi/linux/netfilter/nf_tables.h | 1 +
include/uapi/linux/nl80211.h | 34 +-
include/uapi/linux/pkt_cls.h | 2 +
include/uapi/linux/rtnetlink.h | 16 +
include/uapi/linux/tc_act/tc_bpf.h | 2 +
include/uapi/linux/tipc_netlink.h | 9 +
include/uapi/linux/xfrm.h | 2 +
kernel/bpf/Makefile | 3 -
kernel/bpf/arraymap.c | 6 +-
kernel/bpf/core.c | 8 +
kernel/bpf/hashtab.c | 6 +-
kernel/bpf/helpers.c | 30 +-
kernel/bpf/syscall.c | 11 +-
kernel/bpf/test_stub.c | 78 -
kernel/bpf/verifier.c | 177 +-
lib/rhashtable.c | 1022 ++----
lib/sha1.c | 1 +
lib/test_rhashtable.c | 58 +-
net/6lowpan/Kconfig | 57 +-
net/6lowpan/Makefile | 13 +-
net/6lowpan/iphc.c | 200 +-
net/6lowpan/nhc.c | 241 ++
net/6lowpan/nhc.h | 146 +
net/6lowpan/nhc_dest.c | 28 +
net/6lowpan/nhc_fragment.c | 27 +
net/6lowpan/nhc_hop.c | 27 +
net/6lowpan/nhc_ipv6.c | 27 +
net/6lowpan/nhc_mobility.c | 27 +
net/6lowpan/nhc_routing.c | 27 +
net/6lowpan/nhc_udp.c | 157 +
net/802/fc.c | 21 -
net/802/fddi.c | 26 -
net/802/hippi.c | 28 -
net/8021q/vlan.c | 16 +-
net/8021q/vlan_dev.c | 47 +-
net/9p/trans_fd.c | 4 +-
net/Makefile | 2 +-
net/appletalk/aarp.c | 6 +-
net/appletalk/ddp.c | 7 +-
net/atm/common.c | 7 +-
net/atm/common.h | 7 +-
net/atm/lec.c | 4 +-
net/atm/signaling.c | 24 -
net/ax25/af_ax25.c | 7 +-
net/ax25/ax25_ip.c | 30 +-
net/batman-adv/gateway_client.c | 19 +-
net/batman-adv/hard-interface.c | 5 +-
net/bluetooth/Kconfig | 8 +
net/bluetooth/Makefile | 3 +-
net/bluetooth/a2mp.c | 44 +-
net/bluetooth/a2mp.h | 8 -
net/bluetooth/af_bluetooth.c | 20 +-
net/bluetooth/bnep/bnep.h | 4 +
net/bluetooth/bnep/core.c | 70 +-
net/bluetooth/bnep/netdev.c | 2 +-
net/bluetooth/bnep/sock.c | 7 +
net/bluetooth/cmtp/capi.c | 2 +-
net/bluetooth/cmtp/core.c | 15 +-
net/bluetooth/hci_conn.c | 34 +-
net/bluetooth/hci_core.c | 430 +--
net/bluetooth/hci_debugfs.c | 98 +-
net/bluetooth/hci_debugfs.h | 22 +
net/bluetooth/hci_event.c | 412 ++-
net/bluetooth/hci_request.c | 48 +-
net/bluetooth/hci_request.h | 5 +-
net/bluetooth/hci_sock.c | 329 +-
net/bluetooth/hidp/core.c | 15 +-
net/bluetooth/l2cap_core.c | 98 +-
net/bluetooth/l2cap_sock.c | 18 +-
net/bluetooth/mgmt.c | 3646 ++++++++++++--------
net/bluetooth/mgmt_util.c | 210 ++
net/bluetooth/mgmt_util.h | 53 +
net/bluetooth/rfcomm/sock.c | 10 +-
net/bluetooth/sco.c | 33 +-
net/bluetooth/selftest.c | 35 +-
net/bluetooth/smp.c | 415 ++-
net/bluetooth/smp.h | 1 +
net/bridge/br_device.c | 10 +-
net/bridge/br_forward.c | 20 +-
net/bridge/br_input.c | 33 +-
net/bridge/br_multicast.c | 3 +-
net/bridge/br_netfilter.c | 217 +-
net/bridge/br_netlink.c | 131 +-
net/bridge/br_nf_core.c | 1 -
net/bridge/br_private.h | 12 +-
net/bridge/br_stp_bpdu.c | 5 +-
net/bridge/br_sysfs_if.c | 2 +
net/bridge/netfilter/ebtable_filter.c | 14 +-
net/bridge/netfilter/ebtable_nat.c | 14 +-
net/bridge/netfilter/nf_tables_bridge.c | 28 +-
net/bridge/netfilter/nft_reject_bridge.c | 84 +-
net/caif/caif_socket.c | 17 +-
net/can/bcm.c | 9 +-
net/can/raw.c | 63 +-
net/compat.c | 12 +-
net/core/dev.c | 119 +-
net/core/ethtool.c | 2 +-
net/core/fib_rules.c | 25 +-
net/core/filter.c | 460 ++-
net/core/link_watch.c | 4 +-
net/core/neighbour.c | 112 +-
net/core/net-sysfs.c | 125 +-
net/core/net_namespace.c | 114 +-
net/core/request_sock.c | 45 +-
net/core/rtnetlink.c | 67 +-
net/core/skbuff.c | 54 +-
net/core/sock.c | 106 +-
net/core/sock_diag.c | 37 +-
net/core/sysctl_net_core.c | 2 -
net/dcb/dcbnl.c | 44 +-
net/dccp/dccp.h | 12 +-
net/dccp/diag.c | 7 +-
net/dccp/ipv4.c | 99 +-
net/dccp/ipv6.c | 86 +-
net/dccp/minisocks.c | 7 +-
net/dccp/probe.c | 3 +-
net/dccp/proto.c | 7 +-
net/dccp/timer.c | 24 +-
net/decnet/af_decnet.c | 7 +-
net/decnet/dn_neigh.c | 137 +-
net/decnet/dn_nsp_in.c | 5 +-
net/decnet/dn_route.c | 36 +-
net/decnet/netfilter/dn_rtmsg.c | 4 +-
net/dsa/Kconfig | 7 +-
net/dsa/dsa.c | 251 +-
net/dsa/dsa_priv.h | 9 +-
net/dsa/slave.c | 327 +-
net/ethernet/eth.c | 38 +-
net/ieee802154/6lowpan/core.c | 8 +-
net/ieee802154/core.c | 6 +-
net/ieee802154/nl-mac.c | 1 -
net/ieee802154/socket.c | 21 +-
net/ieee802154/sysfs.c | 49 -
net/ipv4/af_inet.c | 21 +-
net/ipv4/arp.c | 150 +-
net/ipv4/cipso_ipv4.c | 42 +-
net/ipv4/devinet.c | 91 +-
net/ipv4/esp4.c | 2 +-
net/ipv4/fib_frontend.c | 134 +-
net/ipv4/fib_lookup.h | 4 +-
net/ipv4/fib_rules.c | 39 +-
net/ipv4/fib_semantics.c | 43 +-
net/ipv4/fib_trie.c | 1767 +++++-----
net/ipv4/geneve.c | 6 +-
net/ipv4/gre_offload.c | 4 +-
net/ipv4/icmp.c | 6 +-
net/ipv4/igmp.c | 72 +-
net/ipv4/inet_connection_sock.c | 197 +-
net/ipv4/inet_diag.c | 432 +--
net/ipv4/inet_fragment.c | 4 +-
net/ipv4/inet_hashtables.c | 68 +-
net/ipv4/inet_timewait_sock.c | 7 +-
net/ipv4/ip_forward.c | 8 +-
net/ipv4/ip_fragment.c | 14 +-
net/ipv4/ip_gre.c | 14 +-
net/ipv4/ip_input.c | 17 +-
net/ipv4/ip_options.c | 2 +-
net/ipv4/ip_output.c | 86 +-
net/ipv4/ip_sockglue.c | 34 +-
net/ipv4/ip_tunnel.c | 21 +-
net/ipv4/ip_tunnel_core.c | 2 +-
net/ipv4/ip_vti.c | 12 +-
net/ipv4/ipcomp.c | 2 +-
net/ipv4/ipconfig.c | 6 +-
net/ipv4/ipip.c | 12 +-
net/ipv4/ipmr.c | 81 +-
net/ipv4/netfilter.c | 4 +-
net/ipv4/netfilter/Kconfig | 38 +-
net/ipv4/netfilter/arp_tables.c | 11 +-
net/ipv4/netfilter/arptable_filter.c | 7 +-
net/ipv4/netfilter/ip_tables.c | 13 +-
net/ipv4/netfilter/ipt_CLUSTERIP.c | 17 +-
net/ipv4/netfilter/ipt_REJECT.c | 17 +-
net/ipv4/netfilter/ipt_SYNPROXY.c | 6 +-
net/ipv4/netfilter/iptable_filter.c | 8 +-
net/ipv4/netfilter/iptable_mangle.c | 19 +-
net/ipv4/netfilter/iptable_nat.c | 29 +-
net/ipv4/netfilter/iptable_raw.c | 7 +-
net/ipv4/netfilter/iptable_security.c | 8 +-
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 28 +-
.../netfilter/nf_conntrack_l3proto_ipv4_compat.c | 4 +-
net/ipv4/netfilter/nf_defrag_ipv4.c | 4 +-
net/ipv4/netfilter/nf_log_arp.c | 4 +-
net/ipv4/netfilter/nf_log_ipv4.c | 4 +-
net/ipv4/netfilter/nf_nat_l3proto_ipv4.c | 33 +-
net/ipv4/netfilter/nf_reject_ipv4.c | 25 +-
net/ipv4/netfilter/nf_tables_arp.c | 6 +-
net/ipv4/netfilter/nf_tables_ipv4.c | 12 +-
net/ipv4/netfilter/nft_chain_nat_ipv4.c | 29 +-
net/ipv4/netfilter/nft_chain_route_ipv4.c | 6 +-
net/ipv4/netfilter/nft_reject_ipv4.c | 3 +-
net/ipv4/ping.c | 17 +-
net/ipv4/raw.c | 19 +-
net/ipv4/route.c | 40 +-
net/ipv4/syncookies.c | 24 +-
net/ipv4/sysctl_net_ipv4.c | 20 +-
net/ipv4/tcp.c | 49 +-
net/ipv4/tcp_cong.c | 2 +-
net/ipv4/tcp_diag.c | 6 +-
net/ipv4/tcp_fastopen.c | 20 +-
net/ipv4/tcp_input.c | 208 +-
net/ipv4/tcp_ipv4.c | 217 +-
net/ipv4/tcp_metrics.c | 208 +-
net/ipv4/tcp_minisocks.c | 18 +-
net/ipv4/tcp_offload.c | 4 +-
net/ipv4/tcp_output.c | 175 +-
net/ipv4/tcp_timer.c | 21 +-
net/ipv4/udp.c | 39 +-
net/ipv4/udp_diag.c | 24 +-
net/ipv4/udp_impl.h | 4 +-
net/ipv4/udp_offload.c | 4 +-
net/ipv4/udp_tunnel.c | 4 +-
net/ipv4/xfrm4_input.c | 7 +-
net/ipv4/xfrm4_mode_tunnel.c | 2 +-
net/ipv4/xfrm4_output.c | 12 +-
net/ipv4/xfrm4_policy.c | 3 +-
net/ipv6/addrconf.c | 433 ++-
net/ipv6/addrconf_core.c | 2 +-
net/ipv6/addrlabel.c | 13 +-
net/ipv6/af_inet6.c | 18 +-
net/ipv6/ah6.c | 2 +-
net/ipv6/anycast.c | 22 +-
net/ipv6/datagram.c | 6 +-
net/ipv6/esp6.c | 2 +-
net/ipv6/exthdrs_core.c | 10 +-
net/ipv6/fib6_rules.c | 21 +-
net/ipv6/icmp.c | 13 +-
net/ipv6/inet6_connection_sock.c | 23 +-
net/ipv6/inet6_hashtables.c | 58 +-
net/ipv6/ip6_fib.c | 4 +-
net/ipv6/ip6_flowlabel.c | 25 +-
net/ipv6/ip6_gre.c | 34 +-
net/ipv6/ip6_input.c | 13 +-
net/ipv6/ip6_offload.c | 2 +-
net/ipv6/ip6_output.c | 63 +-
net/ipv6/ip6_tunnel.c | 42 +-
net/ipv6/ip6_udp_tunnel.c | 5 +-
net/ipv6/ip6_vti.c | 27 +-
net/ipv6/ip6mr.c | 74 +-
net/ipv6/ipv6_sockglue.c | 42 +-
net/ipv6/mcast.c | 75 +-
net/ipv6/ndisc.c | 36 +-
net/ipv6/netfilter.c | 4 +-
net/ipv6/netfilter/Kconfig | 18 +-
net/ipv6/netfilter/ip6_tables.c | 18 +-
net/ipv6/netfilter/ip6t_REJECT.c | 3 +-
net/ipv6/netfilter/ip6t_SYNPROXY.c | 6 +-
net/ipv6/netfilter/ip6table_filter.c | 8 +-
net/ipv6/netfilter/ip6table_mangle.c | 19 +-
net/ipv6/netfilter/ip6table_nat.c | 29 +-
net/ipv6/netfilter/ip6table_raw.c | 8 +-
net/ipv6/netfilter/ip6table_security.c | 8 +-
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 32 +-
net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 10 +-
net/ipv6/netfilter/nf_log_ipv6.c | 4 +-
net/ipv6/netfilter/nf_nat_l3proto_ipv6.c | 32 +-
net/ipv6/netfilter/nf_reject_ipv6.c | 37 +-
net/ipv6/netfilter/nf_tables_ipv6.c | 12 +-
net/ipv6/netfilter/nft_chain_nat_ipv6.c | 29 +-
net/ipv6/netfilter/nft_chain_route_ipv6.c | 6 +-
net/ipv6/output_core.c | 37 +-
net/ipv6/ping.c | 3 +-
net/ipv6/raw.c | 28 +-
net/ipv6/reassembly.c | 8 +-
net/ipv6/route.c | 40 +-
net/ipv6/sit.c | 40 +-
net/ipv6/syncookies.c | 12 +-
net/ipv6/sysctl_net_ipv6.c | 18 +-
net/ipv6/tcp_ipv6.c | 165 +-
net/ipv6/tcpv6_offload.c | 4 +-
net/ipv6/udp.c | 40 +-
net/ipv6/udp_impl.h | 7 +-
net/ipv6/udp_offload.c | 4 +-
net/ipv6/xfrm6_input.c | 3 +-
net/ipv6/xfrm6_mode_beet.c | 4 +-
net/ipv6/xfrm6_output.c | 15 +-
net/ipv6/xfrm6_policy.c | 7 +-
net/ipx/af_ipx.c | 7 +-
net/irda/af_irda.c | 29 +-
net/iucv/af_iucv.c | 8 +-
net/key/af_key.c | 8 +-
net/l2tp/l2tp_eth.c | 2 +-
net/l2tp/l2tp_ip.c | 4 +-
net/l2tp/l2tp_ip6.c | 8 +-
net/l2tp/l2tp_netlink.c | 18 +-
net/l2tp/l2tp_ppp.c | 7 +-
net/llc/af_llc.c | 7 +-
net/mac80211/aes_ccm.c | 12 +-
net/mac80211/aes_gcm.c | 12 +-
net/mac80211/aes_gmac.c | 4 +-
net/mac80211/agg-rx.c | 8 +
net/mac80211/agg-tx.c | 14 +-
net/mac80211/cfg.c | 99 +-
net/mac80211/debugfs.c | 170 -
net/mac80211/debugfs_netdev.c | 2 -
net/mac80211/debugfs_sta.c | 134 -
net/mac80211/driver-ops.h | 12 +-
net/mac80211/ht.c | 2 -
net/mac80211/ibss.c | 343 +-
net/mac80211/ieee80211_i.h | 39 +-
net/mac80211/iface.c | 4 +-
net/mac80211/key.c | 1 +
net/mac80211/key.h | 2 +
net/mac80211/main.c | 4 +-
net/mac80211/mesh.c | 5 +-
net/mac80211/mesh_plink.c | 10 +-
net/mac80211/mlme.c | 222 +-
net/mac80211/pm.c | 28 +-
net/mac80211/rc80211_minstrel_ht.c | 6 +-
net/mac80211/rx.c | 17 +-
net/mac80211/scan.c | 25 +-
net/mac80211/sta_info.c | 56 +-
net/mac80211/sta_info.h | 22 -
net/mac80211/status.c | 74 -
net/mac80211/tdls.c | 155 +-
net/mac80211/trace.h | 14 +-
net/mac80211/tx.c | 266 +-
net/mac80211/util.c | 128 +-
net/mac80211/vht.c | 4 -
net/mac80211/wpa.c | 13 +-
net/mac802154/driver-ops.h | 4 +-
net/mac802154/iface.c | 20 +-
net/mac802154/util.c | 13 +-
net/mpls/Kconfig | 21 +
net/mpls/Makefile | 3 +
net/mpls/af_mpls.c | 1023 ++++++
net/mpls/internal.h | 59 +
net/netfilter/Kconfig | 23 +-
net/netfilter/core.c | 31 +-
net/netfilter/ipvs/ip_vs_core.c | 101 +-
net/netfilter/ipvs/ip_vs_ctl.c | 182 +-
net/netfilter/ipvs/ip_vs_est.c | 102 +-
net/netfilter/ipvs/ip_vs_sync.c | 23 +-
net/netfilter/ipvs/ip_vs_xmit.c | 15 +-
net/netfilter/nf_conntrack_acct.c | 8 +-
net/netfilter/nf_conntrack_amanda.c | 10 +-
net/netfilter/nf_conntrack_expect.c | 4 +-
net/netfilter/nf_internals.h | 11 +-
net/netfilter/nf_log_common.c | 2 +-
net/netfilter/nf_queue.c | 58 +-
net/netfilter/nf_tables_api.c | 227 +-
net/netfilter/nf_tables_core.c | 113 +-
net/netfilter/nfnetlink_log.c | 14 +-
net/netfilter/nfnetlink_queue_core.c | 32 +-
net/netfilter/nft_compat.c | 9 +
net/netfilter/nft_hash.c | 223 +-
net/netfilter/nft_log.c | 2 +-
net/netfilter/nft_lookup.c | 6 +-
net/netfilter/nft_meta.c | 6 +-
net/netfilter/nft_rbtree.c | 129 +-
net/netfilter/nft_reject_inet.c | 6 +-
net/netfilter/xt_TPROXY.c | 18 +-
net/netfilter/xt_physdev.c | 3 +-
net/netfilter/xt_set.c | 4 +-
net/netfilter/xt_socket.c | 34 +-
net/netfilter/xt_string.c | 3 +-
net/netlabel/netlabel_mgmt.c | 20 +-
net/netlabel/netlabel_unlabeled.c | 28 +-
net/netlink/af_netlink.c | 95 +-
net/netrom/af_netrom.c | 7 +-
net/netrom/nr_dev.c | 31 -
net/nfc/llcp_sock.c | 8 +-
net/nfc/rawsock.c | 7 +-
net/openvswitch/Kconfig | 1 +
net/openvswitch/datapath.c | 4 +-
net/openvswitch/datapath.h | 4 +-
net/openvswitch/flow_netlink.c | 10 +-
net/openvswitch/vport-vxlan.c | 5 +-
net/packet/af_packet.c | 62 +-
net/packet/internal.h | 4 +-
net/phonet/datagram.c | 8 +-
net/phonet/pep.c | 8 +-
net/phonet/socket.c | 6 +-
net/rds/rds.h | 7 +-
net/rds/recv.c | 4 +-
net/rds/send.c | 3 +-
net/rose/af_rose.c | 7 +-
net/rose/rose_dev.c | 53 +-
net/rxrpc/af_rxrpc.c | 7 +-
net/rxrpc/ar-internal.h | 10 +-
net/rxrpc/ar-output.c | 20 +-
net/rxrpc/ar-recvmsg.c | 6 +-
net/sched/act_bpf.c | 295 +-
net/sched/cls_api.c | 14 +-
net/sched/cls_basic.c | 6 +-
net/sched/cls_bpf.c | 221 +-
net/sched/cls_cgroup.c | 6 +-
net/sched/cls_flow.c | 6 +-
net/sched/cls_fw.c | 34 +-
net/sched/cls_route.c | 26 +-
net/sched/cls_rsvp.h | 12 +-
net/sched/cls_tcindex.c | 6 +-
net/sched/cls_u32.c | 25 +-
net/sched/em_text.c | 3 +-
net/sched/sch_api.c | 14 +-
net/sched/sch_fq.c | 4 +-
net/sctp/protocol.c | 3 +-
net/sctp/socket.c | 13 +-
net/sctp/sysctl.c | 4 -
net/socket.c | 90 +-
net/switchdev/switchdev.c | 217 +-
net/tipc/Kconfig | 8 +
net/tipc/Makefile | 1 +
net/tipc/addr.c | 7 +
net/tipc/addr.h | 1 +
net/tipc/bcast.c | 95 +-
net/tipc/bcast.h | 4 -
net/tipc/bearer.c | 13 +-
net/tipc/bearer.h | 17 +-
net/tipc/discover.c | 11 +-
net/tipc/eth_media.c | 8 +-
net/tipc/ib_media.c | 2 +-
net/tipc/link.c | 862 ++---
net/tipc/link.h | 51 +-
net/tipc/msg.c | 130 +-
net/tipc/msg.h | 133 +-
net/tipc/name_distr.c | 4 +-
net/tipc/name_table.c | 4 +-
net/tipc/node.c | 116 +-
net/tipc/node.h | 18 +-
net/tipc/server.c | 47 +-
net/tipc/socket.c | 272 +-
net/tipc/socket.h | 4 -
net/tipc/subscr.c | 23 +-
net/tipc/udp_media.c | 448 +++
net/unix/af_unix.c | 50 +-
net/vmw_vsock/af_vsock.c | 20 +-
net/vmw_vsock/vmci_transport.c | 3 +-
net/wireless/Kconfig | 8 +
net/wireless/ibss.c | 4 +-
net/wireless/mlme.c | 6 +-
net/wireless/nl80211.c | 96 +-
net/wireless/rdev-ops.h | 5 +-
net/wireless/reg.c | 111 +-
net/wireless/reg.h | 15 +-
net/wireless/scan.c | 302 +-
net/wireless/sme.c | 16 +-
net/wireless/trace.h | 41 +-
net/wireless/util.c | 130 +
net/wireless/wext-compat.c | 18 +-
net/wireless/wext-compat.h | 6 +
net/wireless/wext-sme.c | 2 +-
net/x25/af_x25.c | 6 +-
net/xfrm/xfrm_output.c | 16 +-
net/xfrm/xfrm_state.c | 8 +-
samples/bpf/Makefile | 1 +
samples/bpf/bpf_helpers.h | 7 +
samples/bpf/libbpf.h | 4 +-
samples/bpf/sockex1_kern.c | 8 +-
samples/bpf/sockex1_user.c | 2 +-
samples/bpf/sockex2_kern.c | 26 +-
samples/bpf/sockex2_user.c | 11 +-
samples/bpf/tcbpf1_kern.c | 71 +
samples/bpf/test_verifier.c | 84 +-
samples/pktgen/pktgen.conf-1-1 | 59 +
samples/pktgen/pktgen.conf-1-1-flows | 67 +
samples/pktgen/pktgen.conf-1-1-ip6 | 60 +
samples/pktgen/pktgen.conf-1-1-ip6-rdos | 63 +
samples/pktgen/pktgen.conf-1-1-rdos | 64 +
samples/pktgen/pktgen.conf-1-2 | 69 +
samples/pktgen/pktgen.conf-2-1 | 66 +
samples/pktgen/pktgen.conf-2-2 | 73 +
security/capability.c | 6 -
security/security.c | 5 -
security/selinux/hooks.c | 35 +-
security/smack/smack_netfilter.c | 8 +-
tools/net/bpf_exp.l | 6 +-
tools/net/bpf_exp.y | 23 +-
1321 files changed, 47264 insertions(+), 29239 deletions(-)
create mode 100644 Documentation/networking/mpls-sysctl.txt
rename arch/powerpc/net/{bpf_jit_64.S => bpf_jit_asm.S} (76%)
delete mode 100644 drivers/net/ethernet/cadence/at91_ether.c
create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c
create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_fcoe.c
create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_fcoe.h
create mode 100644 drivers/net/ethernet/mellanox/mlx4/fw_qos.c
create mode 100644 drivers/net/ethernet/mellanox/mlx4/fw_qos.h
create mode 100644 drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h
create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_aic.c
create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_aic.h
create mode 100644 drivers/net/wireless/ath/ath9k/reg_aic.h
create mode 100644 drivers/net/wireless/ath/ath9k/reg_mci.h
delete mode 100644 drivers/s390/net/claw.c
delete mode 100644 drivers/s390/net/claw.h
create mode 100644 include/net/netns/mpls.h
delete mode 100644 kernel/bpf/test_stub.c
create mode 100644 net/6lowpan/nhc.c
create mode 100644 net/6lowpan/nhc.h
create mode 100644 net/6lowpan/nhc_dest.c
create mode 100644 net/6lowpan/nhc_fragment.c
create mode 100644 net/6lowpan/nhc_hop.c
create mode 100644 net/6lowpan/nhc_ipv6.c
create mode 100644 net/6lowpan/nhc_mobility.c
create mode 100644 net/6lowpan/nhc_routing.c
create mode 100644 net/6lowpan/nhc_udp.c
create mode 100644 net/bluetooth/mgmt_util.c
create mode 100644 net/bluetooth/mgmt_util.h
create mode 100644 net/mpls/af_mpls.c
create mode 100644 net/mpls/internal.h
create mode 100644 net/tipc/udp_media.c
create mode 100644 samples/bpf/tcbpf1_kern.c
create mode 100755 samples/pktgen/pktgen.conf-1-1
create mode 100755 samples/pktgen/pktgen.conf-1-1-flows
create mode 100755 samples/pktgen/pktgen.conf-1-1-ip6
create mode 100755 samples/pktgen/pktgen.conf-1-1-ip6-rdos
create mode 100755 samples/pktgen/pktgen.conf-1-1-rdos
create mode 100755 samples/pktgen/pktgen.conf-1-2
create mode 100755 samples/pktgen/pktgen.conf-2-1
create mode 100755 samples/pktgen/pktgen.conf-2-2
Merging vfs/for-next (d987f083c43b ntfs: move iov_iter_truncate() closer to generic_write_checks())
$ git merge vfs/for-next
Resolved 'fs/ext4/inode.c' using previous resolution.
Resolved 'fs/udf/file.c' using previous resolution.
Resolved 'net/9p/protocol.c' using previous resolution.
Auto-merging security/selinux/hooks.c
Auto-merging net/ipv4/raw.c
Auto-merging net/9p/trans_virtio.c
Auto-merging net/9p/protocol.c
CONFLICT (content): Merge conflict in net/9p/protocol.c
Auto-merging kernel/sysctl.c
Auto-merging include/net/sock.h
Auto-merging include/linux/fs.h
Auto-merging fs/xfs/xfs_file.c
Auto-merging fs/udf/inode.c
Auto-merging fs/udf/file.c
CONFLICT (content): Merge conflict in fs/udf/file.c
Auto-merging fs/open.c
Auto-merging fs/hostfs/hostfs_kern.c
Auto-merging fs/gfs2/file.c
Auto-merging fs/gfs2/aops.c
Auto-merging fs/f2fs/file.c
Auto-merging fs/f2fs/data.c
Auto-merging fs/ext4/page-io.c
Auto-merging fs/ext4/inode.c
CONFLICT (content): Merge conflict in fs/ext4/inode.c
Auto-merging fs/ext4/file.c
Auto-merging fs/ext4/ext4.h
Auto-merging fs/cifs/file.c
Auto-merging fs/cifs/cifsfs.c
Auto-merging fs/btrfs/inode.c
Auto-merging fs/btrfs/file.c
Auto-merging fs/affs/file.c
Auto-merging fs/9p/vfs_file.c
Auto-merging fs/9p/vfs_addr.c
Auto-merging crypto/algif_skcipher.c
Auto-merging arch/arc/kernel/process.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master f1cd97232b69] Merge remote-tracking branch 'vfs/for-next'
$ git diff -M --stat --summary HEAD^..
Documentation/filesystems/Locking | 4 +-
Documentation/filesystems/porting | 12 +
Documentation/filesystems/vfs.txt | 8 +-
arch/arc/kernel/process.c | 2 -
arch/c6x/kernel/process.c | 1 -
arch/frv/kernel/signal.c | 4 -
arch/hexagon/kernel/process.c | 2 -
arch/m32r/kernel/signal.c | 2 -
arch/metag/include/asm/processor.h | 1 -
arch/microblaze/kernel/signal.c | 2 -
arch/nios2/kernel/process.c | 1 -
arch/openrisc/kernel/process.c | 1 -
arch/s390/hypfs/inode.c | 4 +-
arch/sh/kernel/signal_32.c | 4 -
arch/sh/kernel/signal_64.c | 4 -
arch/xtensa/kernel/signal.c | 5 -
block/blk-map.c | 6 +-
block/scsi_ioctl.c | 12 +-
crypto/algif_skcipher.c | 2 +-
drivers/block/loop.c | 12 +-
drivers/char/mem.c | 22 +-
drivers/char/raw.c | 2 -
drivers/char/tile-srom.c | 1 -
drivers/infiniband/hw/ipath/ipath_file_ops.c | 19 +-
drivers/infiniband/hw/qib/qib_file_ops.c | 21 +-
drivers/misc/mei/amthif.c | 1 -
drivers/misc/mei/main.c | 1 -
drivers/misc/mei/pci-me.c | 1 -
drivers/net/macvtap.c | 2 -
drivers/net/tun.c | 2 -
drivers/scsi/sg.c | 15 +-
drivers/staging/android/ashmem.c | 2 +-
drivers/staging/comedi/drivers/serial2002.c | 18 +-
drivers/staging/lustre/lustre/llite/file.c | 6 -
.../staging/lustre/lustre/llite/llite_internal.h | 2 -
drivers/staging/lustre/lustre/llite/rw26.c | 22 +-
drivers/staging/unisys/include/timskmod.h | 1 -
drivers/usb/gadget/function/f_fs.c | 8 +-
drivers/usb/gadget/legacy/inode.c | 8 +-
fs/9p/v9fs_vfs.h | 4 -
fs/9p/vfs_addr.c | 85 +--
fs/9p/vfs_dir.c | 15 +-
fs/9p/vfs_file.c | 314 ++-------
fs/9p/xattr.c | 80 +--
fs/adfs/file.c | 2 -
fs/affs/file.c | 13 +-
fs/afs/file.c | 2 -
fs/afs/write.c | 1 -
fs/aio.c | 213 +++---
fs/autofs4/autofs_i.h | 2 +-
fs/autofs4/waitq.c | 2 +-
fs/bfs/file.c | 2 -
fs/bfs/inode.c | 1 +
fs/block_dev.c | 11 +-
fs/btrfs/file.c | 4 +-
fs/btrfs/inode.c | 23 +-
fs/ceph/addr.c | 3 +-
fs/ceph/file.c | 5 +-
fs/cifs/cifsfs.c | 12 -
fs/cifs/file.c | 3 +-
fs/coda/file.c | 38 +-
fs/coredump.c | 2 +-
fs/dax.c | 27 +-
fs/dcache.c | 2 +-
fs/direct-io.c | 44 +-
fs/ecryptfs/file.c | 9 -
fs/exofs/file.c | 2 -
fs/exofs/inode.c | 4 +-
fs/ext2/file.c | 4 -
fs/ext2/inode.c | 13 +-
fs/ext3/file.c | 2 -
fs/ext3/inode.c | 16 +-
fs/ext4/ext4.h | 4 +-
fs/ext4/file.c | 6 +-
fs/ext4/indirect.c | 27 +-
fs/ext4/inode.c | 29 +-
fs/ext4/page-io.c | 1 -
fs/f2fs/data.c | 24 +-
fs/f2fs/file.c | 2 -
fs/fat/file.c | 2 -
fs/fat/inode.c | 10 +-
fs/file_table.c | 4 +-
fs/fuse/cuse.c | 27 +-
fs/fuse/dev.c | 64 +-
fs/fuse/file.c | 138 ++--
fs/fuse/fuse_i.h | 1 +
fs/gfs2/aops.c | 18 +-
fs/gfs2/file.c | 5 -
fs/hfs/inode.c | 12 +-
fs/hfsplus/inode.c | 13 +-
fs/hostfs/hostfs_kern.c | 2 -
fs/hpfs/file.c | 2 -
fs/hugetlbfs/inode.c | 91 +--
fs/jffs2/file.c | 2 -
fs/jfs/file.c | 2 -
fs/jfs/inode.c | 10 +-
fs/logfs/file.c | 2 -
fs/minix/file.c | 2 -
fs/namei.c | 160 ++---
fs/ncpfs/file.c | 90 +--
fs/ncpfs/ncplib_kernel.c | 6 +-
fs/ncpfs/ncplib_kernel.h | 2 +-
fs/nfs/direct.c | 9 +-
fs/nfs/file.c | 3 -
fs/nfs/nfs4file.c | 2 -
fs/nilfs2/file.c | 2 -
fs/nilfs2/inode.c | 12 +-
fs/ntfs/Makefile | 2 +-
fs/ntfs/file.c | 781 ++++++++-------------
fs/ntfs/inode.c | 1 -
fs/ocfs2/aops.c | 23 +-
fs/ocfs2/aops.h | 2 +-
fs/ocfs2/file.c | 12 +-
fs/omfs/file.c | 2 -
fs/open.c | 9 +-
fs/pipe.c | 3 -
fs/ramfs/file-mmu.c | 2 -
fs/ramfs/file-nommu.c | 2 -
fs/read_write.c | 213 ++----
fs/reiserfs/file.c | 2 -
fs/reiserfs/inode.c | 10 +-
fs/romfs/mmap-nommu.c | 1 -
fs/splice.c | 28 +-
fs/stat.c | 2 +-
fs/sysv/file.c | 2 -
fs/ubifs/file.c | 3 -
fs/udf/file.c | 9 +-
fs/udf/inode.c | 9 +-
fs/ufs/file.c | 2 -
fs/xfs/xfs_aops.c | 13 +-
fs/xfs/xfs_file.c | 3 -
include/linux/aio.h | 70 +-
include/linux/fs.h | 55 +-
include/linux/nfs_fs.h | 2 +-
include/linux/security.h | 7 +-
include/linux/uio.h | 23 +
include/net/9p/client.h | 8 +-
include/net/9p/transport.h | 2 +-
include/net/compat.h | 2 +-
include/net/sock.h | 1 -
kernel/acct.c | 2 +-
kernel/printk/printk.c | 4 +-
kernel/sysctl.c | 1 +
lib/iov_iter.c | 83 +++
mm/filemap.c | 5 +-
mm/nommu.c | 4 +-
mm/page_io.c | 7 +-
mm/process_vm_access.c | 35 +-
mm/shmem.c | 4 +-
net/9p/client.c | 262 ++++---
net/9p/protocol.c | 24 +-
net/9p/trans_common.c | 42 +-
net/9p/trans_common.h | 2 -
net/9p/trans_virtio.c | 137 ++--
net/compat.c | 18 +-
net/ipv4/raw.c | 1 -
net/socket.c | 83 +--
security/apparmor/lsm.c | 6 +-
security/capability.c | 2 +-
security/keys/compat.c | 29 +-
security/keys/internal.h | 5 +-
security/keys/keyctl.c | 78 +-
security/security.c | 6 +-
security/selinux/hooks.c | 12 +-
security/smack/smack_lsm.c | 13 +-
security/tomoyo/common.h | 4 +-
security/tomoyo/file.c | 4 +-
security/tomoyo/realpath.c | 6 +-
security/tomoyo/tomoyo.c | 5 +-
sound/core/pcm_native.c | 41 +-
170 files changed, 1639 insertions(+), 2581 deletions(-)
Merging pci/next (8e795840e4d8 Merge branches 'pci/enumeration' and 'pci/virtualization' into next)
$ git merge pci/next
Auto-merging include/linux/pci.h
Auto-merging drivers/pci/probe.c
Auto-merging arch/x86/pci/common.c
Auto-merging arch/sparc/kernel/pci.c
Auto-merging arch/s390/pci/pci.c
Auto-merging arch/mips/pci/pci.c
Auto-merging arch/arm/mm/dma-mapping.c
Merge made by the 'recursive' strategy.
arch/alpha/kernel/pci.c | 7 ++++
arch/alpha/kernel/sys_nautilus.c | 4 ++
arch/arm/mach-dove/pcie.c | 12 ++----
arch/arm/mach-mv78xx0/pcie.c | 12 ++----
arch/arm/mach-orion5x/pci.c | 32 +++++++--------
arch/arm/mm/dma-mapping.c | 7 ++++
arch/frv/mb93090-mb00/pci-vdk.c | 6 ++-
arch/ia64/sn/kernel/io_init.c | 2 +
arch/m68k/coldfire/pci.c | 4 ++
arch/microblaze/pci/pci-common.c | 4 ++
arch/mips/pci/pci.c | 32 ++++++++-------
arch/mn10300/unit-asb2305/pci.c | 6 ++-
arch/s390/pci/pci.c | 2 +-
arch/sh/drivers/pci/pci.c | 25 +++++++-----
arch/sparc/kernel/leon_pci.c | 16 ++++----
arch/sparc/kernel/pci.c | 3 +-
arch/sparc/kernel/pcic.c | 4 ++
arch/tile/kernel/pci.c | 2 +
arch/tile/kernel/pci_gx.c | 2 +
arch/unicore32/kernel/pci.c | 9 +----
arch/x86/pci/common.c | 2 +
arch/xtensa/kernel/pci.c | 15 ++++++-
drivers/iommu/of_iommu.c | 10 ++++-
drivers/of/device.c | 84 +++++++++++++++++++++++++++++++++++++++
drivers/of/of_pci.c | 21 ++++++++++
drivers/of/platform.c | 58 +--------------------------
drivers/pci/host-bridge.c | 14 +++++++
drivers/pci/host/pci-versatile.c | 1 +
drivers/pci/hotplug/ibmphp_core.c | 8 +++-
drivers/pci/pci.c | 9 +++--
drivers/pci/probe.c | 4 +-
drivers/pci/quirks.c | 32 +++++++++++++++
drivers/pci/setup-res.c | 2 +
drivers/pnp/quirks.c | 9 +++--
include/linux/of_device.h | 3 ++
include/linux/of_iommu.h | 6 ++-
include/linux/of_pci.h | 3 ++
include/linux/pci.h | 3 ++
38 files changed, 322 insertions(+), 153 deletions(-)
Merging hid/for-next (9e17aa316bdd Merge branch 'for-4.1/upstream' into for-next)
$ git merge hid/for-next
Auto-merging include/uapi/linux/input.h
Removing drivers/hid/hid-huion.c
Merge made by the 'recursive' strategy.
Documentation/ABI/testing/sysfs-driver-hid | 10 +
.../ABI/testing/sysfs-driver-hid-logitech-lg4ff | 45 ++
drivers/hid/Kconfig | 33 +-
drivers/hid/Makefile | 1 -
drivers/hid/hid-core.c | 21 +
drivers/hid/hid-debug.c | 1 +
drivers/hid/hid-huion.c | 290 ----------
drivers/hid/hid-ids.h | 10 +
drivers/hid/hid-input.c | 23 +
drivers/hid/hid-kye.c | 140 +++++
drivers/hid/hid-lg.c | 7 +
drivers/hid/hid-lg.h | 12 -
drivers/hid/hid-lg4ff.c | 600 ++++++++++++++++++---
drivers/hid/hid-lg4ff.h | 18 +
drivers/hid/hid-logitech-hidpp.c | 11 +
drivers/hid/hid-multitouch.c | 26 +-
drivers/hid/hid-rmi.c | 177 +++++-
drivers/hid/hid-sensor-hub.c | 198 ++++---
drivers/hid/hid-sony.c | 31 +-
drivers/hid/hid-steelseries.c | 1 -
drivers/hid/hid-uclogic.c | 325 ++++++++++-
drivers/hid/i2c-hid/i2c-hid.c | 68 ++-
drivers/hid/usbhid/hid-pidff.c | 6 +
drivers/hid/usbhid/hid-quirks.c | 12 +-
drivers/hid/wacom.h | 8 +-
drivers/hid/wacom_sys.c | 97 +++-
drivers/hid/wacom_wac.c | 406 +++++++++-----
drivers/hid/wacom_wac.h | 17 +-
drivers/iio/accel/hid-sensor-accel-3d.c | 3 +-
.../iio/common/hid-sensors/hid-sensor-attributes.c | 24 +-
.../iio/common/hid-sensors/hid-sensor-trigger.c | 13 +-
drivers/iio/gyro/hid-sensor-gyro-3d.c | 3 +-
drivers/iio/light/hid-sensor-als.c | 3 +-
drivers/iio/light/hid-sensor-prox.c | 3 +-
drivers/iio/magnetometer/hid-sensor-magn-3d.c | 3 +-
drivers/iio/orientation/hid-sensor-incl-3d.c | 3 +-
drivers/iio/pressure/hid-sensor-press.c | 3 +-
drivers/input/input-mt.c | 9 +-
drivers/rtc/rtc-hid-sensor-time.c | 2 +-
include/linux/hid-sensor-hub.h | 55 +-
include/linux/hid-sensor-ids.h | 2 +
include/linux/hid.h | 2 +
include/uapi/linux/input.h | 4 +
samples/hidraw/Makefile | 2 +
samples/hidraw/hid-example.c | 6 +-
45 files changed, 2029 insertions(+), 705 deletions(-)
delete mode 100644 drivers/hid/hid-huion.c
create mode 100644 drivers/hid/hid-lg4ff.h
Merging i2c/i2c/for-next (3b10db23c041 i2c: dln2: set the device tree node of the adapter)
$ git merge i2c/i2c/for-next
Auto-merging drivers/of/base.c
Auto-merging drivers/i2c/i2c-core.c
Merge made by the 'recursive' strategy.
.../devicetree/bindings/i2c/i2c-digicolor.txt | 25 ++
Documentation/i2c/slave-eeprom-backend | 14 +
Documentation/i2c/slave-interface | 179 ++++++++++
Documentation/i2c/summary | 4 -
drivers/i2c/busses/Kconfig | 9 +
drivers/i2c/busses/Makefile | 1 +
drivers/i2c/busses/i2c-at91.c | 39 +--
drivers/i2c/busses/i2c-axxia.c | 27 +-
drivers/i2c/busses/i2c-bcm-iproc.c | 15 +-
drivers/i2c/busses/i2c-bcm2835.c | 2 +-
drivers/i2c/busses/i2c-cadence.c | 6 +-
drivers/i2c/busses/i2c-cpm.c | 20 +-
drivers/i2c/busses/i2c-davinci.c | 17 +-
drivers/i2c/busses/i2c-designware-core.c | 3 +-
drivers/i2c/busses/i2c-designware-platdrv.c | 6 +-
drivers/i2c/busses/i2c-digicolor.c | 385 +++++++++++++++++++++
drivers/i2c/busses/i2c-dln2.c | 13 +-
drivers/i2c/busses/i2c-i801.c | 51 +--
drivers/i2c/busses/i2c-img-scb.c | 14 +-
drivers/i2c/busses/i2c-imx.c | 10 +-
drivers/i2c/busses/i2c-ismt.c | 5 +-
drivers/i2c/busses/i2c-mpc.c | 33 +-
drivers/i2c/busses/i2c-mxs.c | 5 +-
drivers/i2c/busses/i2c-nomadik.c | 6 +-
drivers/i2c/busses/i2c-opal.c | 24 +-
drivers/i2c/busses/i2c-pmcmsp.c | 42 +--
drivers/i2c/busses/i2c-powermac.c | 10 +-
drivers/i2c/busses/i2c-qup.c | 21 +-
drivers/i2c/busses/i2c-rcar.c | 10 +-
drivers/i2c/busses/i2c-tegra.c | 12 +-
drivers/i2c/busses/i2c-viperboard.c | 10 +-
drivers/i2c/busses/i2c-wmt.c | 10 +-
drivers/i2c/i2c-core.c | 69 ++++
drivers/i2c/i2c-slave-eeprom.c | 18 +-
drivers/i2c/muxes/i2c-mux-pca954x.c | 6 +-
drivers/of/base.c | 26 ++
include/linux/i2c.h | 51 ++-
include/linux/of.h | 6 +
38 files changed, 980 insertions(+), 224 deletions(-)
create mode 100644 Documentation/devicetree/bindings/i2c/i2c-digicolor.txt
create mode 100644 Documentation/i2c/slave-eeprom-backend
create mode 100644 Documentation/i2c/slave-interface
create mode 100644 drivers/i2c/busses/i2c-digicolor.c
Merging jdelvare-hwmon/master (26bc420b59a3 Linux 3.19-rc6)
$ git merge jdelvare-hwmon/master
Already up-to-date.
Merging hwmon-staging/hwmon-next (e4e66eca68b6 hwmon: (ibmpowernv) add a label attribute)
$ git merge hwmon-staging/hwmon-next
Merge made by the 'recursive' strategy.
.../devicetree/bindings/gpio/gpio-fan.txt | 19 +-
Documentation/hwmon/it87 | 48 +-
Documentation/hwmon/jc42 | 8 +-
Documentation/hwmon/nct7904 | 60 +++
drivers/hwmon/Kconfig | 18 +-
drivers/hwmon/Makefile | 1 +
drivers/hwmon/coretemp.c | 11 +-
drivers/hwmon/gpio-fan.c | 127 ++++-
drivers/hwmon/ibmpex.c | 19 +-
drivers/hwmon/ibmpowernv.c | 223 ++++++--
drivers/hwmon/it87.c | 295 +++++++---
drivers/hwmon/jc42.c | 16 +-
drivers/hwmon/nct6775.c | 76 ++-
drivers/hwmon/nct7904.c | 593 +++++++++++++++++++++
drivers/hwmon/pwm-fan.c | 175 +++++-
drivers/hwmon/vexpress.c | 2 +-
16 files changed, 1436 insertions(+), 255 deletions(-)
create mode 100644 Documentation/hwmon/nct7904
create mode 100644 drivers/hwmon/nct7904.c
Merging v4l-dvb/master (7e91bcc94ea9 Merge branch 'v4l_for_linus' into to_next)
$ git merge v4l-dvb/master
Auto-merging drivers/usb/gadget/function/uvc_video.c
Auto-merging drivers/usb/gadget/function/uvc_v4l2.c
Auto-merging drivers/media/dvb-core/dvb_net.c
Merge made by the 'recursive' strategy.
.../DocBook/media/v4l/media-ioc-enum-entities.xml | 92 +-
.../DocBook/media/v4l/pixfmt-srggb10p.xml | 2 +-
Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml | 4 +-
Documentation/DocBook/media/v4l/pixfmt.xml | 41 +-
Documentation/DocBook/media/v4l/v4l2.xml | 9 +
.../v4l/vidioc-subdev-enum-frame-interval.xml | 13 +-
.../media/v4l/vidioc-subdev-enum-frame-size.xml | 13 +-
.../media/v4l/vidioc-subdev-enum-mbus-code.xml | 11 +-
drivers/input/ff-memless.c | 18 +-
drivers/media/Kconfig | 10 +-
drivers/media/common/saa7146/saa7146_vbi.c | 4 +-
drivers/media/common/siano/sms-cards.c | 8 +-
drivers/media/common/siano/sms-cards.h | 3 +-
drivers/media/common/siano/smscoreapi.c | 164 +-
drivers/media/common/siano/smscoreapi.h | 32 +-
drivers/media/common/siano/smsdvb-debugfs.c | 6 +-
drivers/media/common/siano/smsdvb-main.c | 74 +-
drivers/media/common/siano/smsir.c | 18 +-
drivers/media/dvb-core/dmxdev.c | 11 +-
drivers/media/dvb-core/dvb_ca_en50221.c | 6 +-
drivers/media/dvb-core/dvb_frontend.c | 124 +-
drivers/media/dvb-core/dvb_net.c | 6 +-
drivers/media/dvb-core/dvbdev.c | 144 +-
drivers/media/dvb-core/dvbdev.h | 27 +
drivers/media/dvb-frontends/Kconfig | 8 +
drivers/media/dvb-frontends/Makefile | 1 +
drivers/media/dvb-frontends/lgdt3306a.c | 2144 ++++++++++++++++++++
drivers/media/dvb-frontends/lgdt3306a.h | 74 +
drivers/media/dvb-frontends/mn88473.h | 6 +
drivers/media/dvb-frontends/rtl2832.c | 2 +-
drivers/media/i2c/adv7180.c | 10 +-
drivers/media/i2c/adv7343.c | 1 -
drivers/media/i2c/adv7511.c | 16 +-
drivers/media/i2c/adv7604.c | 940 ++++-----
drivers/media/i2c/cx25840/cx25840-core.c | 30 +
drivers/media/i2c/cx25840/cx25840-core.h | 11 +
drivers/media/i2c/m5mols/m5mols_core.c | 16 +-
drivers/media/i2c/mt9m032.c | 34 +-
drivers/media/i2c/mt9p031.c | 36 +-
drivers/media/i2c/mt9t001.c | 36 +-
drivers/media/i2c/mt9v032.c | 37 +-
drivers/media/i2c/noon010pc30.c | 17 +-
drivers/media/i2c/ov7670.c | 37 +-
drivers/media/i2c/ov9650.c | 16 +-
drivers/media/i2c/s5c73m3/s5c73m3-core.c | 72 +-
drivers/media/i2c/s5c73m3/s5c73m3-spi.c | 2 +-
drivers/media/i2c/s5k4ecgx.c | 16 +-
drivers/media/i2c/s5k5baf.c | 38 +-
drivers/media/i2c/s5k6a3.c | 18 +-
drivers/media/i2c/s5k6aa.c | 34 +-
drivers/media/i2c/smiapp/smiapp-core.c | 80 +-
drivers/media/i2c/soc_camera/mt9m111.c | 1 -
drivers/media/i2c/ths7303.c | 4 -
drivers/media/i2c/ths8200.c | 1 -
drivers/media/i2c/tvp514x.c | 13 +-
drivers/media/i2c/tvp7002.c | 15 +-
drivers/media/mmc/siano/smssdio.c | 17 +-
drivers/media/pci/cx18/cx18-driver.h | 1 +
drivers/media/pci/cx18/cx18-ioctl.c | 9 +-
drivers/media/pci/cx23885/cx23885-417.c | 13 +-
drivers/media/pci/cx88/cx88-mpeg.c | 3 +-
drivers/media/pci/saa7164/saa7164-core.c | 4 +-
drivers/media/platform/Kconfig | 2 +-
drivers/media/platform/am437x/Kconfig | 2 +-
drivers/media/platform/am437x/am437x-vpfe.c | 2 +
drivers/media/platform/exynos4-is/fimc-capture.c | 22 +-
drivers/media/platform/exynos4-is/fimc-isp.c | 28 +-
drivers/media/platform/exynos4-is/fimc-lite.c | 33 +-
drivers/media/platform/exynos4-is/mipi-csis.c | 16 +-
drivers/media/platform/marvell-ccic/mcam-core.c | 48 +-
drivers/media/platform/omap/omap_vout.c | 2 +-
drivers/media/platform/omap/omap_vout_vrfb.c | 1 +
drivers/media/platform/omap/omap_vout_vrfb.h | 4 +-
drivers/media/platform/omap3isp/ispccdc.c | 86 +-
drivers/media/platform/omap3isp/ispccp2.c | 46 +-
drivers/media/platform/omap3isp/ispcsi2.c | 42 +-
drivers/media/platform/omap3isp/isppreview.c | 70 +-
drivers/media/platform/omap3isp/ispresizer.c | 80 +-
drivers/media/platform/s3c-camif/camif-capture.c | 18 +-
drivers/media/platform/s5p-jpeg/jpeg-core.c | 3 +
.../media/platform/s5p-jpeg/jpeg-hw-exynos3250.c | 2 +-
drivers/media/platform/s5p-mfc/s5p_mfc.c | 1 +
drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 2 +-
drivers/media/platform/s5p-mfc/s5p_mfc_opr.h | 2 +-
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 6 +-
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 6 +-
drivers/media/platform/s5p-tv/Kconfig | 1 +
drivers/media/platform/sh_veu.c | 1 +
drivers/media/platform/sh_vou.c | 9 +-
drivers/media/platform/soc_camera/atmel-isi.c | 2 +
drivers/media/platform/soc_camera/sh_mobile_csi2.c | 1 -
drivers/media/platform/soc_camera/soc_camera.c | 32 +-
drivers/media/platform/via-camera.c | 15 +-
drivers/media/platform/vivid/vivid-sdr-cap.c | 66 +-
drivers/media/platform/vsp1/vsp1_bru.c | 42 +-
drivers/media/platform/vsp1/vsp1_entity.c | 16 +-
drivers/media/platform/vsp1/vsp1_entity.h | 4 +-
drivers/media/platform/vsp1/vsp1_hsit.c | 18 +-
drivers/media/platform/vsp1/vsp1_lif.c | 22 +-
drivers/media/platform/vsp1/vsp1_lut.c | 22 +-
drivers/media/platform/vsp1/vsp1_rwpf.c | 37 +-
drivers/media/platform/vsp1/vsp1_rwpf.h | 12 +-
drivers/media/platform/vsp1/vsp1_sru.c | 30 +-
drivers/media/platform/vsp1/vsp1_uds.c | 30 +-
drivers/media/radio/radio-wl1273.c | 27 +-
drivers/media/radio/si470x/radio-si470x-common.c | 14 +-
drivers/media/rc/ir-hix5hd2.c | 8 -
drivers/media/tuners/si2157.c | 25 +-
drivers/media/tuners/si2157_priv.h | 1 +
drivers/media/usb/au0828/au0828-video.c | 104 +-
drivers/media/usb/au0828/au0828.h | 4 +-
drivers/media/usb/cx231xx/Kconfig | 1 +
drivers/media/usb/cx231xx/cx231xx-cards.c | 142 +-
drivers/media/usb/cx231xx/cx231xx-core.c | 13 +-
drivers/media/usb/cx231xx/cx231xx-dvb.c | 71 +
drivers/media/usb/cx231xx/cx231xx-video.c | 86 +-
drivers/media/usb/cx231xx/cx231xx.h | 6 +
drivers/media/usb/dvb-usb-v2/dvb_usb.h | 1 +
drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 58 +
drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 2 -
drivers/media/usb/dvb-usb/dvb-usb-dvb.c | 52 +
drivers/media/usb/em28xx/em28xx-cards.c | 13 +-
drivers/media/usb/em28xx/em28xx-dvb.c | 1 +
drivers/media/usb/em28xx/em28xx.h | 1 +
drivers/media/usb/gspca/Kconfig | 1 +
drivers/media/usb/gspca/ov534.c | 11 +-
drivers/media/usb/gspca/topro.c | 4 +-
drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 84 +-
drivers/media/usb/siano/smsusb.c | 136 +-
drivers/media/usb/stkwebcam/stk-webcam.c | 6 +-
drivers/media/v4l2-core/tuner-core.c | 22 +
drivers/media/v4l2-core/v4l2-dev.c | 39 +-
drivers/media/v4l2-core/v4l2-device.c | 5 +-
drivers/media/v4l2-core/v4l2-ioctl.c | 6 +-
drivers/media/v4l2-core/v4l2-subdev.c | 30 +-
drivers/media/v4l2-core/videobuf2-core.c | 11 +-
drivers/media/v4l2-core/videobuf2-dma-contig.c | 3 +-
drivers/staging/media/bcm2048/radio-bcm2048.c | 6 +-
drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 51 +-
drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 49 +-
drivers/staging/media/davinci_vpfe/dm365_isif.c | 83 +-
drivers/staging/media/davinci_vpfe/dm365_resizer.c | 59 +-
drivers/staging/media/dt3155v4l/dt3155v4l.c | 13 +-
drivers/staging/media/mn88472/mn88472.c | 11 +-
drivers/staging/media/mn88473/mn88473.c | 53 +-
drivers/staging/media/mn88473/mn88473_priv.h | 1 +
drivers/staging/media/omap4iss/iss_csi2.c | 42 +-
drivers/staging/media/omap4iss/iss_ipipe.c | 42 +-
drivers/staging/media/omap4iss/iss_ipipeif.c | 52 +-
drivers/staging/media/omap4iss/iss_resizer.c | 46 +-
drivers/usb/gadget/function/f_uvc.c | 2 +
drivers/usb/gadget/function/uvc.h | 1 +
drivers/usb/gadget/function/uvc_queue.c | 79 +-
drivers/usb/gadget/function/uvc_queue.h | 4 +-
drivers/usb/gadget/function/uvc_v4l2.c | 8 +-
drivers/usb/gadget/function/uvc_video.c | 3 +-
include/linux/fixp-arith.h | 145 +-
include/media/adv7604.h | 83 +-
include/media/atmel-isi.h | 4 +
include/media/media-entity.h | 12 +-
include/media/v4l2-dev.h | 1 -
include/media/v4l2-device.h | 2 -
include/media/v4l2-ioctl.h | 6 -
include/media/v4l2-subdev.h | 55 +-
include/uapi/linux/media.h | 52 +-
include/uapi/linux/v4l2-subdev.h | 12 +-
166 files changed, 5291 insertions(+), 2211 deletions(-)
create mode 100644 drivers/media/dvb-frontends/lgdt3306a.c
create mode 100644 drivers/media/dvb-frontends/lgdt3306a.h
Merging kbuild/for-next (d8d26a8d103a Merge branch 'kbuild/kbuild' into kbuild/for-next)
$ git merge kbuild/for-next
Auto-merging arch/x86/Kconfig
Auto-merging arch/mips/Makefile
Auto-merging Makefile
Merge made by the 'recursive' strategy.
Documentation/lto-build | 173 +++++++++++++++++++++++++++++
Kbuild | 21 ++--
Makefile | 47 ++++----
arch/arm/boot/Makefile | 2 +-
arch/ia64/kernel/Makefile | 2 +-
arch/mips/Makefile | 2 +-
arch/um/Makefile | 6 +-
arch/x86/Kconfig | 2 +-
arch/x86/Makefile | 2 +-
arch/x86/Makefile.um | 2 +-
init/Kconfig | 73 ++++++++++++
kernel/gcov/Kconfig | 2 +-
lib/Kconfig.debug | 2 +-
scripts/Makefile.dtbinst | 2 +-
scripts/Makefile.fwinst | 2 +-
scripts/Makefile.lto | 84 ++++++++++++++
scripts/Makefile.modpost | 7 +-
scripts/coccinelle/misc/irqf_oneshot.cocci | 24 ++++
scripts/kallsyms.c | 29 +++--
scripts/kconfig/Makefile | 20 ++--
scripts/kconfig/confdata.c | 5 +
scripts/kconfig/expr.c | 22 ++--
scripts/kconfig/expr.h | 5 -
scripts/kconfig/gconf.c | 24 ----
scripts/kconfig/lkc.h | 14 ---
scripts/kconfig/lkc_proto.h | 85 +++++++-------
scripts/kconfig/menu.c | 4 +-
scripts/kconfig/merge_config.sh | 27 +++--
scripts/kconfig/symbol.c | 42 +++----
scripts/kconfig/util.c | 10 --
scripts/link-vmlinux.sh | 2 +-
31 files changed, 534 insertions(+), 210 deletions(-)
create mode 100644 Documentation/lto-build
create mode 100644 scripts/Makefile.lto
Merging kconfig/for-next (bfa76d495765 Linux 3.19)
$ git merge kconfig/for-next
Already up-to-date.
Merging libata/for-next (b4b681e73717 Merge branch 'for-4.1' into for-next)
$ git merge libata/for-next
Merge made by the 'recursive' strategy.
Documentation/devicetree/bindings/ata/ahci-st.txt | 47 +-
drivers/ata/Makefile | 3 +-
drivers/ata/ahci_st.c | 6 +-
drivers/ata/ahci_xgene.c | 10 +
drivers/ata/libata-core.c | 32 +-
drivers/ata/libata-eh.c | 168 ++++-
drivers/ata/libata-scsi.c | 116 +--
drivers/ata/libata-trace.c | 151 ++++
drivers/ata/libata.h | 6 +-
drivers/ata/sata_dwc_460ex.c | 848 +++++-----------------
drivers/ata/sata_mv.c | 20 +-
drivers/ata/sata_sil24.c | 2 +-
drivers/ide/ide-lib.c | 4 +-
drivers/ide/ide-probe.c | 2 +-
drivers/scsi/scsi_error.c | 31 +
include/linux/ata.h | 29 +-
include/linux/libata.h | 1 -
include/scsi/scsi_eh.h | 1 +
include/trace/events/libata.h | 325 +++++++++
19 files changed, 1031 insertions(+), 771 deletions(-)
create mode 100644 drivers/ata/libata-trace.c
create mode 100644 include/trace/events/libata.h
Merging pm/linux-next (09d26e637a56 Merge branches 'pm-cpufreq-next' and 'pm-cpuidle-next' into linux-next)
$ git merge pm/linux-next
Auto-merging include/linux/pm-trace.h
Auto-merging include/linux/i2c.h
Auto-merging include/linux/acpi.h
Auto-merging include/asm-generic/vmlinux.lds.h
Auto-merging drivers/i2c/i2c-core.c
Auto-merging drivers/i2c/busses/i2c-designware-platdrv.c
Auto-merging drivers/cpuidle/cpuidle-exynos.c
Auto-merging drivers/cpuidle/cpuidle-arm.c
Removing drivers/cpuidle/Kconfig.arm64
Auto-merging drivers/cpufreq/qoriq-cpufreq.c
Auto-merging arch/x86/include/asm/pm-trace.h
Auto-merging arch/arm64/configs/defconfig
Auto-merging arch/arm/mach-tegra/cpuidle-tegra20.c
Auto-merging MAINTAINERS
Auto-merging Documentation/kernel-parameters.txt
Merge made by the 'recursive' strategy.
Documentation/acpi/enumeration.txt | 26 +-
Documentation/kernel-parameters.txt | 7 +
Documentation/power/basic-pm-debugging.txt | 10 +-
MAINTAINERS | 9 +
arch/arm/include/asm/cpuidle.h | 23 +
arch/arm/kernel/cpuidle.c | 133 +++++-
arch/arm/mach-davinci/cpuidle.c | 1 -
arch/arm/mach-imx/cpuidle-imx6q.c | 1 -
arch/arm/mach-imx/cpuidle-imx6sl.c | 1 -
arch/arm/mach-imx/cpuidle-imx6sx.c | 1 -
arch/arm/mach-omap2/cpuidle44xx.c | 1 -
arch/arm/mach-s3c64xx/cpuidle.c | 2 +-
arch/arm/mach-tegra/cpuidle-tegra20.c | 1 -
arch/arm/mach-tegra/cpuidle-tegra30.c | 1 -
arch/arm64/configs/defconfig | 2 +-
arch/arm64/include/asm/cpuidle.h | 9 +-
arch/arm64/kernel/cpuidle.c | 2 +-
.../x86/include/asm/{resume-trace.h => pm-trace.h} | 10 +-
drivers/acpi/acpi_platform.c | 2 +-
drivers/acpi/battery.c | 4 +-
drivers/acpi/blacklist.c | 8 +
drivers/acpi/dock.c | 2 +-
drivers/acpi/ec.c | 123 +++--
drivers/acpi/glue.c | 4 +-
drivers/acpi/pmic/intel_pmic_crc.c | 2 +-
drivers/acpi/processor_idle.c | 2 +-
drivers/acpi/scan.c | 4 +-
drivers/acpi/sleep.c | 17 +-
drivers/acpi/sleep.h | 2 -
drivers/acpi/sysfs.c | 2 +-
drivers/acpi/video.c | 36 +-
drivers/acpi/video_detect.c | 8 -
drivers/ata/pata_isapnp.c | 14 +-
drivers/base/core.c | 51 +++
drivers/base/dd.c | 14 +
drivers/base/platform.c | 2 +-
drivers/base/power/domain.c | 70 ++-
drivers/base/power/main.c | 20 +-
drivers/base/power/trace.c | 6 +-
drivers/base/property.c | 198 +++++---
drivers/char/tpm/tpm_infineon.c | 13 +-
drivers/cpufreq/Kconfig | 8 +
drivers/cpufreq/Kconfig.arm | 9 +
drivers/cpufreq/Kconfig.powerpc | 9 -
drivers/cpufreq/Makefile | 3 +-
drivers/cpufreq/cpufreq.c | 19 +-
drivers/cpufreq/hisi-acpu-cpufreq.c | 42 ++
drivers/cpufreq/powernv-cpufreq.c | 47 +-
.../{ppc-corenet-cpufreq.c => qoriq-cpufreq.c} | 161 ++++---
drivers/cpuidle/Kconfig | 7 +-
drivers/cpuidle/Kconfig.arm | 28 +-
drivers/cpuidle/Kconfig.arm64 | 13 -
drivers/cpuidle/Makefile | 5 +-
drivers/cpuidle/{cpuidle-arm64.c => cpuidle-arm.c} | 83 +++-
drivers/cpuidle/cpuidle-at91.c | 1 -
drivers/cpuidle/cpuidle-exynos.c | 1 -
drivers/cpuidle/cpuidle-kirkwood.c | 1 -
drivers/cpuidle/cpuidle-ux500.c | 1 -
drivers/cpuidle/cpuidle-zynq.c | 1 -
drivers/cpuidle/cpuidle.c | 3 -
drivers/cpuidle/sysfs.c | 5 +-
drivers/devfreq/devfreq.c | 1 -
drivers/devfreq/event/exynos-ppmu.c | 2 +-
drivers/devfreq/tegra-devfreq.c | 509 ++++++++++++---------
drivers/gpio/gpiolib.h | 2 +
drivers/i2c/busses/i2c-designware-platdrv.c | 4 +-
drivers/i2c/i2c-core.c | 4 +-
drivers/ide/ide-pnp.c | 14 +-
drivers/iommu/intel-iommu.c | 2 +-
drivers/media/rc/ene_ir.c | 13 +-
drivers/media/rc/fintek-cir.c | 13 +-
drivers/media/rc/ite-cir.c | 13 +-
drivers/media/rc/nuvoton-cir.c | 13 +-
drivers/net/sb1000.c | 15 +-
drivers/platform/x86/apple-gmux.c | 14 +-
drivers/pnp/base.h | 2 +-
drivers/pnp/card.c | 25 +-
drivers/pnp/core.c | 64 ++-
drivers/pnp/driver.c | 10 +-
drivers/pnp/pnpacpi/core.c | 5 +-
drivers/tty/serial/8250/8250_fintek.c | 13 +-
drivers/watchdog/iTCO_wdt.c | 51 +++
include/acpi/acpi_bus.h | 4 +-
include/asm-generic/vmlinux.lds.h | 2 +
include/linux/acpi.h | 15 +-
include/linux/cpuidle.h | 1 -
include/linux/devfreq-event.h | 2 +-
include/linux/device.h | 16 +-
include/linux/fwnode.h | 27 ++
include/linux/i2c.h | 4 +-
include/linux/platform_device.h | 2 +-
include/linux/{resume-trace.h => pm-trace.h} | 9 +-
include/linux/pm.h | 8 +
include/linux/pm_domain.h | 6 +-
include/linux/pnp.h | 12 +
include/linux/property.h | 44 +-
kernel/power/main.c | 2 +-
kernel/power/snapshot.c | 21 +-
kernel/power/suspend.c | 13 +-
99 files changed, 1488 insertions(+), 780 deletions(-)
rename arch/x86/include/asm/{resume-trace.h => pm-trace.h} (68%)
create mode 100644 drivers/cpufreq/hisi-acpu-cpufreq.c
rename drivers/cpufreq/{ppc-corenet-cpufreq.c => qoriq-cpufreq.c} (70%)
delete mode 100644 drivers/cpuidle/Kconfig.arm64
rename drivers/cpuidle/{cpuidle-arm64.c => cpuidle-arm.c} (56%)
create mode 100644 include/linux/fwnode.h
rename include/linux/{resume-trace.h => pm-trace.h} (75%)
Merging idle/next (ec9b792ef33e Merge branches 'cpuidle' and 'turbostat' into release)
$ git merge idle/next
Merge made by the 'recursive' strategy.
arch/x86/include/uapi/asm/msr-index.h | 10 +-
drivers/cpufreq/intel_pstate.c | 2 +-
drivers/idle/intel_idle.c | 66 +++++-
tools/power/x86/turbostat/Makefile | 6 +-
tools/power/x86/turbostat/turbostat.8 | 138 ++++++------
tools/power/x86/turbostat/turbostat.c | 383 +++++++++++++++++++++++++---------
6 files changed, 437 insertions(+), 168 deletions(-)
Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
$ git merge apm/for-next
Already up-to-date.
Merging thermal/next (c0c01971b43f Thermal: do thermal zone update after a cooling device registered)
$ git merge thermal/next
Merge made by the 'recursive' strategy.
drivers/thermal/step_wise.c | 15 ++++++++--
drivers/thermal/thermal_core.c | 66 ++++++++++++++++++++++++++++++++++++++++--
drivers/thermal/thermal_core.h | 1 +
include/linux/thermal.h | 3 ++
4 files changed, 81 insertions(+), 4 deletions(-)
Merging thermal-soc/next (96d927aa14de thermal: cpu_cooling: Fix power calculation when CPUs are offline)
$ git merge thermal-soc/next
Resolved 'include/linux/thermal.h' using previous resolution.
Auto-merging include/linux/thermal.h
CONFLICT (content): Merge conflict in include/linux/thermal.h
Auto-merging drivers/thermal/thermal_core.h
Auto-merging drivers/thermal/thermal_core.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 27bd25f51bd4] Merge remote-tracking branch 'thermal-soc/next'
$ git diff -M --stat --summary HEAD^..
.../bindings/thermal/qcom-spmi-temp-alarm.txt | 57 ++
.../devicetree/bindings/thermal/thermal.txt | 9 +
Documentation/thermal/cpu-cooling-api.txt | 156 +++++-
Documentation/thermal/power_allocator.txt | 247 +++++++++
Documentation/thermal/sysfs-api.txt | 83 ++-
drivers/acpi/thermal.c | 9 +-
drivers/platform/x86/acerhdf.c | 3 +-
drivers/thermal/Kconfig | 36 ++
drivers/thermal/Makefile | 2 +
drivers/thermal/cpu_cooling.c | 585 ++++++++++++++++++++-
drivers/thermal/db8500_thermal.c | 2 +-
drivers/thermal/fair_share.c | 41 +-
drivers/thermal/imx_thermal.c | 3 +-
drivers/thermal/of-thermal.c | 15 +-
drivers/thermal/power_allocator.c | 538 +++++++++++++++++++
drivers/thermal/qcom-spmi-temp-alarm.c | 309 +++++++++++
drivers/thermal/thermal_core.c | 310 ++++++++++-
drivers/thermal/thermal_core.h | 11 +
drivers/thermal/ti-soc-thermal/ti-bandgap.c | 104 ++--
drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 5 +-
drivers/thermal/x86_pkg_temp_thermal.c | 2 +-
include/linux/cpu_cooling.h | 39 ++
include/linux/thermal.h | 86 ++-
include/trace/events/thermal.h | 58 ++
include/trace/events/thermal_power_allocator.h | 87 +++
25 files changed, 2664 insertions(+), 133 deletions(-)
create mode 100644 Documentation/devicetree/bindings/thermal/qcom-spmi-temp-alarm.txt
create mode 100644 Documentation/thermal/power_allocator.txt
create mode 100644 drivers/thermal/power_allocator.c
create mode 100644 drivers/thermal/qcom-spmi-temp-alarm.c
create mode 100644 include/trace/events/thermal_power_allocator.h
Merging ieee1394/for-next (d71e6a11737f firewire: core: use correct vendor/model IDs)
$ git merge ieee1394/for-next
Already up-to-date.
Merging dlm/next (2ab4bd8ea3a6 dlm: adopt orphan locks)
$ git merge dlm/next
Already up-to-date.
Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid)
$ git merge swiotlb/linux-next
Already up-to-date.
Merging slave-dma/next (733dbbd78164 Merge branch 'for-linus' into next)
$ git merge slave-dma/next
Removing drivers/dma/sh/rcar-audmapp.c
Auto-merging arch/arm64/boot/dts/apm/apm-storm.dtsi
CONFLICT (modify/delete): arch/arm/mach-shmobile/board-mackerel.c deleted in HEAD and modified in slave-dma/next. Version slave-dma/next of arch/arm/mach-shmobile/board-mackerel.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-shmobile/board-ape6evm.c deleted in HEAD and modified in slave-dma/next. Version slave-dma/next of arch/arm/mach-shmobile/board-ape6evm.c left in tree.
Auto-merging MAINTAINERS
Removing Documentation/devicetree/bindings/dma/rcar-audmapp.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git rm -f arch/arm/mach-shmobile/board-mackerel.c arch/arm/mach-shmobile/board-ape6evm.c
arch/arm/mach-shmobile/board-ape6evm.c: needs merge
arch/arm/mach-shmobile/board-mackerel.c: needs merge
rm 'arch/arm/mach-shmobile/board-ape6evm.c'
rm 'arch/arm/mach-shmobile/board-mackerel.c'
$ git commit -v -a
[master 378cc1df1f5e] Merge remote-tracking branch 'slave-dma/next'
$ git diff -M --stat --summary HEAD^..
.../devicetree/bindings/dma/apm-xgene-dma.txt | 47 +
.../devicetree/bindings/dma/jz4780-dma.txt | 56 +
.../devicetree/bindings/dma/qcom_bam_dma.txt | 1 +
.../devicetree/bindings/dma/rcar-audmapp.txt | 29 -
.../devicetree/bindings/dma/renesas,usb-dmac.txt | 37 +
MAINTAINERS | 5 +
arch/arm/mach-shmobile/board-armadillo800eva.c | 20 +-
arch/arm/mach-shmobile/board-bockw.c | 14 +-
arch/arm/mach-shmobile/board-kzm9g.c | 20 +-
arch/arm/mach-shmobile/board-marzen.c | 10 +-
arch/arm64/boot/dts/apm/apm-storm.dtsi | 26 +
arch/sh/boards/board-sh7757lcr.c | 9 +-
arch/sh/boards/mach-ap325rxa/setup.c | 9 +-
arch/sh/boards/mach-ecovec24/setup.c | 20 +-
arch/sh/boards/mach-kfr2r09/setup.c | 10 +-
arch/sh/boards/mach-migor/setup.c | 9 +-
arch/sh/boards/mach-se/7724/setup.c | 17 +-
drivers/dma/Kconfig | 29 +
drivers/dma/Makefile | 3 +
drivers/dma/amba-pl08x.c | 11 -
drivers/dma/at_hdmac.c | 175 +-
drivers/dma/bestcomm/bestcomm.c | 4 +-
drivers/dma/dma-jz4740.c | 12 +-
drivers/dma/dma-jz4780.c | 877 ++++++++
drivers/dma/dmaengine.c | 18 -
drivers/dma/dw/core.c | 18 +-
drivers/dma/edma.c | 2 +-
drivers/dma/fsl_raid.c | 904 +++++++++
drivers/dma/fsl_raid.h | 306 +++
drivers/dma/img-mdc-dma.c | 6 -
drivers/dma/imx-sdma.c | 4 +
drivers/dma/intel_mid_dma.c | 4 -
drivers/dma/intel_mid_dma_regs.h | 4 -
drivers/dma/ioat/dca.c | 4 -
drivers/dma/ioat/dma.c | 4 -
drivers/dma/ioat/dma.h | 4 -
drivers/dma/ioat/dma_v2.c | 4 -
drivers/dma/ioat/dma_v2.h | 4 -
drivers/dma/ioat/dma_v3.c | 4 -
drivers/dma/ioat/hw.h | 4 -
drivers/dma/ioat/pci.c | 4 -
drivers/dma/ioat/registers.h | 4 -
drivers/dma/iop-adma.c | 4 -
drivers/dma/k3dma.c | 8 +-
drivers/dma/mmp_pdma.c | 2 +-
drivers/dma/mmp_tdma.c | 2 +-
drivers/dma/mpc512x_dma.c | 6 +-
drivers/dma/mv_xor.c | 6 +-
drivers/dma/mv_xor.h | 4 -
drivers/dma/pl330.c | 26 +-
drivers/dma/ppc4xx/adma.c | 4 -
drivers/dma/qcom_bam_dma.c | 44 +-
drivers/dma/s3c24xx-dma.c | 13 +-
drivers/dma/sa11x0-dma.c | 6 -
drivers/dma/sh/Kconfig | 15 +-
drivers/dma/sh/Makefile | 2 +-
drivers/dma/sh/rcar-audmapp.c | 376 ----
drivers/dma/sh/shdma-base.c | 73 +-
drivers/dma/sh/usb-dmac.c | 910 +++++++++
drivers/dma/sirf-dma.c | 2 +-
drivers/dma/ste_dma40.c | 6 +-
drivers/dma/sun6i-dma.c | 8 +-
drivers/dma/xgene-dma.c | 2090 ++++++++++++++++++++
drivers/dma/xilinx/xilinx_vdma.c | 2 +-
drivers/mmc/host/sh_mmcif.c | 13 +-
drivers/mmc/host/sh_mobile_sdhi.c | 26 +-
drivers/mmc/host/tmio_mmc.h | 4 -
drivers/mmc/host/tmio_mmc_dma.c | 10 +-
drivers/mtd/nand/sh_flctl.c | 2 -
drivers/spi/spi-rspi.c | 1 -
drivers/spi/spi-sh-msiof.c | 1 -
include/dt-bindings/dma/jz4780-dma.h | 49 +
include/linux/{amba => dma}/xilinx_dma.h | 0
include/linux/dmaengine.h | 36 -
include/linux/mfd/tmio.h | 2 +
include/linux/mmc/sh_mobile_sdhi.h | 10 -
include/linux/platform_data/dma-imx-sdma.h | 3 +
include/linux/shdma-base.h | 1 +
sound/soc/sh/fsi.c | 18 +-
79 files changed, 5758 insertions(+), 779 deletions(-)
create mode 100644 Documentation/devicetree/bindings/dma/apm-xgene-dma.txt
create mode 100644 Documentation/devicetree/bindings/dma/jz4780-dma.txt
delete mode 100644 Documentation/devicetree/bindings/dma/rcar-audmapp.txt
create mode 100644 Documentation/devicetree/bindings/dma/renesas,usb-dmac.txt
create mode 100644 drivers/dma/dma-jz4780.c
create mode 100644 drivers/dma/fsl_raid.c
create mode 100644 drivers/dma/fsl_raid.h
delete mode 100644 drivers/dma/sh/rcar-audmapp.c
create mode 100644 drivers/dma/sh/usb-dmac.c
create mode 100755 drivers/dma/xgene-dma.c
create mode 100644 include/dt-bindings/dma/jz4780-dma.h
rename include/linux/{amba => dma}/xilinx_dma.h (100%)
Merging ipsec-next/master (74005991b78a xfrm: Do not parse 32bits compiled xfrm netlink msg on 64bits host)
$ git merge ipsec-next/master
Merge made by the 'recursive' strategy.
net/xfrm/xfrm_user.c | 5 +++++
1 file changed, 5 insertions(+)
Merging wireless-drivers-next/master (f56d9e23b78e ssb: add delay after PCI reset to fix SoC reboots)
$ git merge wireless-drivers-next/master
Merge made by the 'recursive' strategy.
drivers/net/wireless/ath/ath9k/gpio.c | 8 +-
drivers/net/wireless/ath/ath9k/hw.c | 17 ++-
drivers/net/wireless/ath/ath9k/hw.h | 1 +
drivers/net/wireless/ath/ath9k/reg.h | 4 +
drivers/net/wireless/ath/ath9k/wmi.c | 12 +-
drivers/net/wireless/ath/ath9k/wmi.h | 2 +-
drivers/net/wireless/b43/dma.c | 12 +-
drivers/net/wireless/b43legacy/dma.c | 6 +-
drivers/net/wireless/b43legacy/rfkill.c | 8 +-
.../net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c | 2 +-
.../net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c | 2 +-
drivers/net/wireless/iwlwifi/iwl-8000.c | 12 +-
drivers/net/wireless/iwlwifi/iwl-config.h | 10 +-
drivers/net/wireless/iwlwifi/iwl-drv.c | 42 ++++--
drivers/net/wireless/iwlwifi/iwl-drv.h | 2 +-
drivers/net/wireless/iwlwifi/iwl-eeprom-read.c | 4 +-
drivers/net/wireless/iwlwifi/iwl-fh.h | 2 +-
drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h | 12 +-
drivers/net/wireless/iwlwifi/iwl-fw-file.h | 85 ++++++++++-
drivers/net/wireless/iwlwifi/iwl-io.c | 13 +-
drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 57 ++-----
drivers/net/wireless/iwlwifi/iwl-nvm-parse.h | 3 +-
drivers/net/wireless/iwlwifi/iwl-op-mode.h | 4 +-
drivers/net/wireless/iwlwifi/iwl-phy-db.c | 2 +-
drivers/net/wireless/iwlwifi/iwl-prph.h | 25 +---
drivers/net/wireless/iwlwifi/iwl-trans.h | 12 +-
drivers/net/wireless/iwlwifi/mvm/d3.c | 6 +
drivers/net/wireless/iwlwifi/mvm/debugfs.c | 31 +---
drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h | 4 +-
drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h | 2 +-
drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 14 +-
drivers/net/wireless/iwlwifi/mvm/fw.c | 23 ++-
drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 7 +-
drivers/net/wireless/iwlwifi/mvm/mac80211.c | 166 ++++++++++++++++++---
drivers/net/wireless/iwlwifi/mvm/mvm.h | 24 ++-
drivers/net/wireless/iwlwifi/mvm/nvm.c | 63 +++++---
drivers/net/wireless/iwlwifi/mvm/ops.c | 34 ++---
drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c | 2 +-
drivers/net/wireless/iwlwifi/mvm/rs.c | 19 +--
drivers/net/wireless/iwlwifi/mvm/rx.c | 4 +-
drivers/net/wireless/iwlwifi/mvm/scan.c | 73 ++++++++-
drivers/net/wireless/iwlwifi/mvm/sta.c | 28 +++-
drivers/net/wireless/iwlwifi/mvm/sta.h | 6 +-
drivers/net/wireless/iwlwifi/mvm/time-event.c | 81 ++++++++--
drivers/net/wireless/iwlwifi/mvm/time-event.h | 4 +-
drivers/net/wireless/iwlwifi/mvm/tx.c | 8 +
drivers/net/wireless/iwlwifi/mvm/utils.c | 72 ++++++++-
drivers/net/wireless/iwlwifi/pcie/rx.c | 8 +-
drivers/net/wireless/iwlwifi/pcie/trans.c | 62 +++-----
drivers/net/wireless/rtlwifi/base.c | 7 +-
drivers/net/wireless/rtlwifi/base.h | 3 +-
drivers/net/wireless/rtlwifi/pci.c | 2 +-
drivers/net/wireless/rtlwifi/rc.c | 5 +-
drivers/net/wireless/ti/wl1251/main.c | 2 +-
drivers/ssb/driver_pcicore.c | 9 ++
55 files changed, 784 insertions(+), 344 deletions(-)
Merging bluetooth/master (40f66c05c360 Bluetooth: Add local SSP OOB data to OOB ext data mgmt command)
$ git merge bluetooth/master
Merge made by the 'recursive' strategy.
drivers/bluetooth/Kconfig | 41 ++++
drivers/bluetooth/Makefile | 4 +
drivers/bluetooth/btbcm.c | 387 ++++++++++++++++++++++++++++++++++++++
drivers/bluetooth/btbcm.h | 54 ++++++
drivers/bluetooth/btintel.c | 101 ++++++++++
drivers/bluetooth/btintel.h | 74 ++++++++
drivers/bluetooth/btusb.c | 390 ++-------------------------------------
drivers/bluetooth/hci_ath.c | 49 ++---
drivers/bluetooth/hci_bcm.c | 153 +++++++++++++++
drivers/bluetooth/hci_bcsp.c | 18 +-
drivers/bluetooth/hci_h4.c | 132 +++++++++++--
drivers/bluetooth/hci_h5.c | 16 +-
drivers/bluetooth/hci_intel.c | 31 ++++
drivers/bluetooth/hci_ldisc.c | 86 +++++++--
drivers/bluetooth/hci_ll.c | 16 +-
drivers/bluetooth/hci_uart.h | 55 +++++-
include/net/bluetooth/hci.h | 6 +-
include/net/bluetooth/hci_core.h | 3 -
net/bluetooth/hci_core.c | 148 +--------------
net/bluetooth/mgmt.c | 154 +++++++++++++++-
20 files changed, 1292 insertions(+), 626 deletions(-)
create mode 100644 drivers/bluetooth/btbcm.c
create mode 100644 drivers/bluetooth/btbcm.h
create mode 100644 drivers/bluetooth/btintel.c
create mode 100644 drivers/bluetooth/btintel.h
create mode 100644 drivers/bluetooth/hci_bcm.c
create mode 100644 drivers/bluetooth/hci_intel.c
Merging infiniband/for-next (8494057ab5e4 IB/uverbs: Prevent integer overflow in ib_umem_get address arithmetic)
$ git merge infiniband/for-next
Already up-to-date.
Merging mtd/master (5e0899db69e2 mtd: nand: MTD_NAND_HISI504 should depend on HAS_DMA)
$ git merge mtd/master
Already up-to-date.
Merging l2-mtd/master (81a1209c9091 mtd: spi-nor: Add support for Macronix mx25u6435f serial flash)
$ git merge l2-mtd/master
Merge made by the 'recursive' strategy.
Documentation/ABI/testing/sysfs-class-mtd | 10 ++
Documentation/devicetree/bindings/mtd/m25p80.txt | 13 +-
.../devicetree/bindings/mtd/pxa3xx-nand.txt | 2 +-
.../devicetree/bindings/mtd/sunxi-nand.txt | 2 +-
drivers/mtd/Kconfig | 13 ++
drivers/mtd/chips/cfi_cmdset_0020.c | 30 ++---
drivers/mtd/devices/block2mtd.c | 58 +++++---
drivers/mtd/devices/docg3.c | 11 +-
drivers/mtd/devices/m25p80.c | 21 ++-
drivers/mtd/maps/Kconfig | 2 +-
drivers/mtd/maps/sa1100-flash.c | 4 +-
drivers/mtd/maps/ts5500_flash.c | 2 +-
drivers/mtd/mtd_blkdevs.c | 3 -
drivers/mtd/mtdcore.c | 52 +++++---
drivers/mtd/mtdpart.c | 68 ++++++----
drivers/mtd/nand/atmel_nand.c | 26 ++--
drivers/mtd/nand/atmel_nand_ecc.h | 3 +
drivers/mtd/nand/atmel_nand_nfc.h | 1 +
drivers/mtd/nand/denali.c | 6 +-
drivers/mtd/nand/fsl_ifc_nand.c | 4 +-
drivers/mtd/nand/fsmc_nand.c | 7 +-
drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 16 ++-
drivers/mtd/nand/mxc_nand.c | 146 +++++++++++++--------
drivers/mtd/nand/nand_base.c | 41 ++++--
drivers/mtd/nand/pxa3xx_nand.c | 48 ++++---
drivers/mtd/nand/s3c2410.c | 3 -
drivers/mtd/onenand/onenand_base.c | 12 +-
drivers/mtd/spi-nor/fsl-quadspi.c | 11 +-
drivers/mtd/spi-nor/spi-nor.c | 61 ++++++---
drivers/mtd/tests/mtd_nandecctest.c | 6 +
drivers/mtd/tests/mtd_test.h | 12 ++
drivers/mtd/tests/nandbiterrs.c | 4 +
drivers/mtd/tests/oobtest.c | 90 ++++++++-----
drivers/mtd/tests/pagetest.c | 10 +-
drivers/mtd/tests/readtest.c | 5 +-
drivers/mtd/tests/speedtest.c | 38 ++++--
drivers/mtd/tests/stresstest.c | 9 +-
drivers/mtd/tests/subpagetest.c | 29 +++-
drivers/mtd/tests/torturetest.c | 23 +++-
fs/jffs2/xattr.c | 1 -
include/linux/mtd/map.h | 54 +++++---
include/linux/mtd/spi-nor.h | 5 +
42 files changed, 642 insertions(+), 320 deletions(-)
Merging crypto/master (f2f770d74a8d crypto: arm/sha256 - Add optimized SHA-256/224)
$ git merge crypto/master
Resolved 'crypto/Kconfig' using previous resolution.
Auto-merging crypto/algif_rng.c
Auto-merging crypto/Kconfig
CONFLICT (content): Merge conflict in crypto/Kconfig
Auto-merging arch/x86/crypto/aesni-intel_glue.c
Auto-merging arch/mips/cavium-octeon/crypto/octeon-crypto.h
Auto-merging arch/arm/Kconfig
Auto-merging MAINTAINERS
Removing Documentation/crypto/crypto-API-userspace.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master a64b08e6e294] Merge remote-tracking branch 'crypto/master'
$ git diff -M --stat --summary HEAD^..
Documentation/DocBook/crypto-API.tmpl | 860 ++++++
Documentation/crypto/crypto-API-userspace.txt | 205 --
.../devicetree/bindings/crypto/img-hash.txt | 27 +
.../bindings/hwrng/brcm,iproc-rng200.txt | 12 +
MAINTAINERS | 1 +
arch/arm/Kconfig | 3 +
arch/arm/crypto/Kconfig | 130 +
arch/arm/crypto/Makefile | 16 +-
arch/arm/crypto/aes-ce-core.S | 518 ++++
arch/arm/crypto/aes-ce-glue.c | 524 ++++
arch/arm/crypto/aesbs-glue.c | 9 +-
arch/arm/crypto/ghash-ce-core.S | 94 +
arch/arm/crypto/ghash-ce-glue.c | 320 +++
arch/arm/crypto/sha1-ce-core.S | 134 +
arch/arm/crypto/sha1-ce-glue.c | 150 ++
arch/arm/crypto/sha2-ce-core.S | 134 +
arch/arm/crypto/sha2-ce-glue.c | 203 ++
arch/arm/crypto/sha256-armv4.pl | 716 +++++
arch/arm/crypto/sha256-core.S_shipped | 2808 ++++++++++++++++++++
arch/arm/crypto/sha256_glue.c | 246 ++
arch/arm/crypto/sha256_glue.h | 23 +
arch/arm/crypto/sha256_neon_glue.c | 172 ++
arch/arm64/crypto/aes-glue.c | 12 +-
arch/mips/cavium-octeon/crypto/octeon-crypto.h | 74 +
arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 14 -
arch/powerpc/crypto/Makefile | 8 +
arch/powerpc/crypto/aes-spe-core.S | 351 +++
arch/powerpc/crypto/aes-spe-glue.c | 512 ++++
arch/powerpc/crypto/aes-spe-keys.S | 283 ++
arch/powerpc/crypto/aes-spe-modes.S | 630 +++++
arch/powerpc/crypto/aes-spe-regs.h | 42 +
arch/powerpc/crypto/aes-tab-4k.S | 331 +++
arch/powerpc/crypto/md5-asm.S | 243 ++
arch/powerpc/crypto/md5-glue.c | 165 ++
arch/powerpc/crypto/sha1-spe-asm.S | 299 +++
arch/powerpc/crypto/sha1-spe-glue.c | 210 ++
arch/powerpc/crypto/sha256-spe-asm.S | 323 +++
arch/powerpc/crypto/sha256-spe-glue.c | 275 ++
arch/x86/crypto/aesni-intel_glue.c | 187 +-
arch/x86/crypto/camellia_aesni_avx2_glue.c | 15 +-
arch/x86/crypto/camellia_aesni_avx_glue.c | 15 +-
arch/x86/crypto/cast5_avx_glue.c | 9 +-
arch/x86/crypto/cast6_avx_glue.c | 15 +-
arch/x86/crypto/ghash-clmulni-intel_glue.c | 7 +-
arch/x86/crypto/glue_helper.c | 1 -
arch/x86/crypto/serpent_avx2_glue.c | 15 +-
arch/x86/crypto/serpent_avx_glue.c | 15 +-
arch/x86/crypto/serpent_sse2_glue.c | 15 +-
arch/x86/crypto/sha-mb/sha1_mb.c | 9 +-
arch/x86/crypto/sha-mb/sha1_mb_mgr_init_avx2.c | 2 +-
arch/x86/crypto/twofish_avx_glue.c | 15 +-
crypto/Kconfig | 117 +-
crypto/Makefile | 1 +
crypto/ablk_helper.c | 3 +-
crypto/algapi.c | 29 +-
crypto/algif_aead.c | 666 +++++
crypto/algif_rng.c | 2 +-
crypto/ansi_cprng.c | 6 +-
crypto/api.c | 10 +
crypto/cryptd.c | 49 +-
crypto/crypto_user.c | 2 +-
crypto/drbg.c | 64 +-
crypto/mcryptd.c | 25 +-
crypto/proc.c | 3 +
crypto/tcrypt.c | 4 +-
crypto/testmgr.c | 24 +-
drivers/char/hw_random/Kconfig | 13 +
drivers/char/hw_random/Makefile | 1 +
drivers/char/hw_random/bcm63xx-rng.c | 120 +-
drivers/char/hw_random/core.c | 45 +-
drivers/char/hw_random/exynos-rng.c | 12 +-
drivers/char/hw_random/iproc-rng200.c | 239 ++
drivers/char/hw_random/msm-rng.c | 11 +-
drivers/char/hw_random/octeon-rng.c | 4 +-
drivers/char/hw_random/omap-rng.c | 23 +-
drivers/char/hw_random/pseries-rng.c | 4 +-
drivers/char/hw_random/xgene-rng.c | 10 +
drivers/crypto/Kconfig | 24 +-
drivers/crypto/Makefile | 2 +
drivers/crypto/amcc/crypto4xx_core.c | 6 +-
drivers/crypto/atmel-aes.c | 2 +-
drivers/crypto/atmel-sha.c | 2 +-
drivers/crypto/atmel-tdes.c | 2 +-
drivers/crypto/caam/caamhash.c | 1 +
drivers/crypto/caam/caamrng.c | 6 +-
drivers/crypto/ccp/Makefile | 9 +-
drivers/crypto/ccp/ccp-crypto-aes-cmac.c | 12 +-
drivers/crypto/ccp/ccp-crypto-aes-xts.c | 4 +-
drivers/crypto/ccp/ccp-crypto-aes.c | 3 +-
drivers/crypto/ccp/ccp-crypto-main.c | 5 +-
drivers/crypto/ccp/ccp-crypto-sha.c | 12 +-
drivers/crypto/ccp/ccp-crypto.h | 3 -
drivers/crypto/ccp/ccp-dev.c | 7 +-
drivers/crypto/ccp/ccp-dev.h | 12 +-
drivers/crypto/ccp/ccp-ops.c | 24 +-
drivers/crypto/ccp/ccp-pci.c | 21 +-
drivers/crypto/ccp/ccp-platform.c | 111 +-
drivers/crypto/img-hash.c | 1029 +++++++
drivers/crypto/mxs-dcp.c | 2 +-
drivers/crypto/omap-aes.c | 14 +-
drivers/crypto/omap-sham.c | 2 +
drivers/crypto/qat/qat_common/adf_accel_devices.h | 1 -
drivers/crypto/qat/qat_common/adf_accel_engine.c | 21 +-
drivers/crypto/qat/qat_common/adf_aer.c | 21 +-
drivers/crypto/qat/qat_common/adf_cfg.c | 5 +-
drivers/crypto/qat/qat_common/adf_cfg_strings.h | 10 +-
drivers/crypto/qat/qat_common/adf_ctl_drv.c | 66 +-
drivers/crypto/qat/qat_common/adf_dev_mgr.c | 3 +-
drivers/crypto/qat/qat_common/adf_init.c | 83 +-
drivers/crypto/qat/qat_common/adf_transport.c | 31 +-
drivers/crypto/qat/qat_common/icp_qat_hw.h | 2 +-
drivers/crypto/qat/qat_common/qat_crypto.c | 9 +-
drivers/crypto/qat/qat_common/qat_hal.c | 6 +-
drivers/crypto/qat/qat_dh895xcc/adf_admin.c | 3 +-
.../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c | 3 +-
.../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h | 6 +-
drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 4 +-
drivers/crypto/qat/qat_dh895xcc/adf_isr.c | 15 +-
drivers/crypto/sahara.c | 14 +-
drivers/crypto/talitos.c | 17 +-
drivers/crypto/ux500/hash/hash_core.c | 2 +-
drivers/crypto/vmx/Kconfig | 8 +
drivers/crypto/vmx/Makefile | 19 +
drivers/crypto/vmx/aes.c | 139 +
drivers/crypto/vmx/aes_cbc.c | 184 ++
drivers/crypto/vmx/aes_ctr.c | 167 ++
drivers/crypto/vmx/aesp8-ppc.h | 20 +
drivers/crypto/vmx/aesp8-ppc.pl | 1930 ++++++++++++++
drivers/crypto/vmx/ghash.c | 214 ++
drivers/crypto/vmx/ghashp8-ppc.pl | 228 ++
drivers/crypto/vmx/ppc-xlate.pl | 207 ++
drivers/crypto/vmx/vmx.c | 88 +
include/crypto/algapi.h | 2 +-
include/crypto/rng.h | 3 +-
include/linux/crypto.h | 6 +
include/linux/hw_random.h | 4 +
lib/string.c | 2 +-
137 files changed, 16890 insertions(+), 852 deletions(-)
delete mode 100644 Documentation/crypto/crypto-API-userspace.txt
create mode 100644 Documentation/devicetree/bindings/crypto/img-hash.txt
create mode 100644 Documentation/devicetree/bindings/hwrng/brcm,iproc-rng200.txt
create mode 100644 arch/arm/crypto/Kconfig
create mode 100644 arch/arm/crypto/aes-ce-core.S
create mode 100644 arch/arm/crypto/aes-ce-glue.c
create mode 100644 arch/arm/crypto/ghash-ce-core.S
create mode 100644 arch/arm/crypto/ghash-ce-glue.c
create mode 100644 arch/arm/crypto/sha1-ce-core.S
create mode 100644 arch/arm/crypto/sha1-ce-glue.c
create mode 100644 arch/arm/crypto/sha2-ce-core.S
create mode 100644 arch/arm/crypto/sha2-ce-glue.c
create mode 100644 arch/arm/crypto/sha256-armv4.pl
create mode 100644 arch/arm/crypto/sha256-core.S_shipped
create mode 100644 arch/arm/crypto/sha256_glue.c
create mode 100644 arch/arm/crypto/sha256_glue.h
create mode 100644 arch/arm/crypto/sha256_neon_glue.c
create mode 100644 arch/powerpc/crypto/aes-spe-core.S
create mode 100644 arch/powerpc/crypto/aes-spe-glue.c
create mode 100644 arch/powerpc/crypto/aes-spe-keys.S
create mode 100644 arch/powerpc/crypto/aes-spe-modes.S
create mode 100644 arch/powerpc/crypto/aes-spe-regs.h
create mode 100644 arch/powerpc/crypto/aes-tab-4k.S
create mode 100644 arch/powerpc/crypto/md5-asm.S
create mode 100644 arch/powerpc/crypto/md5-glue.c
create mode 100644 arch/powerpc/crypto/sha1-spe-asm.S
create mode 100644 arch/powerpc/crypto/sha1-spe-glue.c
create mode 100644 arch/powerpc/crypto/sha256-spe-asm.S
create mode 100644 arch/powerpc/crypto/sha256-spe-glue.c
create mode 100644 crypto/algif_aead.c
create mode 100644 drivers/char/hw_random/iproc-rng200.c
create mode 100644 drivers/crypto/img-hash.c
create mode 100644 drivers/crypto/vmx/Kconfig
create mode 100644 drivers/crypto/vmx/Makefile
create mode 100644 drivers/crypto/vmx/aes.c
create mode 100644 drivers/crypto/vmx/aes_cbc.c
create mode 100644 drivers/crypto/vmx/aes_ctr.c
create mode 100644 drivers/crypto/vmx/aesp8-ppc.h
create mode 100644 drivers/crypto/vmx/aesp8-ppc.pl
create mode 100644 drivers/crypto/vmx/ghash.c
create mode 100644 drivers/crypto/vmx/ghashp8-ppc.pl
create mode 100644 drivers/crypto/vmx/ppc-xlate.pl
create mode 100644 drivers/crypto/vmx/vmx.c
$ git am -3 ../patches/0001-crypto-fix-for-sendmsg-recvmsg-API-change.patch
Applying: crypto: fix for sendmsg/recvmsg API change
$ git reset HEAD^
Unstaged changes after reset:
M crypto/algif_aead.c
$ git add -A .
$ git commit -v -a --amend
[master f2eedf9f4cfd] Merge remote-tracking branch 'crypto/master'
Date: Wed Apr 8 13:27:37 2015 +1000
Merging drm/drm-next (502e95c66785 drm/vgem: implement virtual GEM)
$ git merge drm/drm-next
Resolved 'drivers/gpu/drm/i915/intel_sprite.c' using previous resolution.
Auto-merging drivers/gpu/drm/vgem/vgem_drv.h
Auto-merging drivers/gpu/drm/radeon/radeon.h
Auto-merging drivers/gpu/drm/radeon/cikd.h
Auto-merging drivers/gpu/drm/i915/intel_sprite.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_sprite.c
Removing drivers/gpu/drm/i915/i915_ums.c
Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Auto-merging drivers/gpu/drm/i915/i915_drv.c
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 8ce946643395] Merge remote-tracking branch 'drm/drm-next'
$ git diff -M --stat --summary HEAD^..
Documentation/DocBook/drm.tmpl | 29 +-
MAINTAINERS | 1 -
drivers/gpu/drm/Kconfig | 9 +
drivers/gpu/drm/Makefile | 1 +
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 13 +-
drivers/gpu/drm/amd/amdkfd/kfd_device.c | 17 +-
.../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 18 +-
drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 17 +-
drivers/gpu/drm/amd/amdkfd/kfd_module.c | 12 +-
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 13 +-
drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 14 +-
drivers/gpu/drm/amd/amdkfd/kfd_process.c | 6 +
drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 12 +-
drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 64 +-
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 311 ++--
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 40 +
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 62 +-
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.c | 4 +-
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.h | 3 +-
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 41 +-
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 640 ++++---
drivers/gpu/drm/bochs/bochs_hw.c | 1 +
drivers/gpu/drm/drm_atomic.c | 139 +-
drivers/gpu/drm/drm_atomic_helper.c | 265 +--
drivers/gpu/drm/drm_bridge.c | 2 +-
drivers/gpu/drm/drm_crtc.c | 90 +-
drivers/gpu/drm/drm_crtc_helper.c | 10 +-
drivers/gpu/drm/drm_dp_helper.c | 80 +-
drivers/gpu/drm/drm_dp_mst_topology.c | 13 +
drivers/gpu/drm/drm_drv.c | 2 +-
drivers/gpu/drm/drm_fb_cma_helper.c | 2 +-
drivers/gpu/drm/drm_fb_helper.c | 54 +-
drivers/gpu/drm/drm_info.c | 1 +
drivers/gpu/drm/drm_ioc32.c | 2 +-
drivers/gpu/drm/drm_ioctl.c | 63 +-
drivers/gpu/drm/drm_irq.c | 58 +-
drivers/gpu/drm/drm_modes.c | 12 +-
drivers/gpu/drm/drm_pci.c | 1 +
drivers/gpu/drm/drm_plane_helper.c | 35 +-
drivers/gpu/drm/drm_sysfs.c | 61 +-
drivers/gpu/drm/drm_vm.c | 1 +
drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 5 +-
drivers/gpu/drm/i2c/adv7511.c | 197 +--
drivers/gpu/drm/i2c/tda998x_drv.c | 101 +-
drivers/gpu/drm/i915/Makefile | 7 +-
drivers/gpu/drm/i915/i915_cmd_parser.c | 75 +-
drivers/gpu/drm/i915/i915_debugfs.c | 352 +++-
drivers/gpu/drm/i915/i915_dma.c | 242 ++-
drivers/gpu/drm/i915/i915_drv.c | 178 +-
drivers/gpu/drm/i915/i915_drv.h | 392 ++---
drivers/gpu/drm/i915/i915_gem.c | 545 +++---
drivers/gpu/drm/i915/i915_gem_context.c | 115 +-
drivers/gpu/drm/i915/i915_gem_evict.c | 4 +
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 194 ++-
drivers/gpu/drm/i915/i915_gem_gtt.c | 1068 ++++++++----
drivers/gpu/drm/i915/i915_gem_gtt.h | 160 +-
drivers/gpu/drm/i915/i915_gem_shrinker.c | 335 ++++
drivers/gpu/drm/i915/i915_gem_stolen.c | 8 +-
drivers/gpu/drm/i915/i915_gpu_error.c | 22 +-
drivers/gpu/drm/i915/i915_irq.c | 286 +---
drivers/gpu/drm/i915/i915_params.c | 19 +-
drivers/gpu/drm/i915/i915_reg.h | 199 ++-
drivers/gpu/drm/i915/i915_suspend.c | 215 +--
drivers/gpu/drm/i915/i915_sysfs.c | 78 +-
drivers/gpu/drm/i915/i915_trace.h | 107 +-
drivers/gpu/drm/i915/i915_ums.c | 552 -------
drivers/gpu/drm/i915/i915_vgpu.c | 264 +++
drivers/gpu/drm/i915/i915_vgpu.h | 91 +
drivers/gpu/drm/i915/intel_atomic.c | 16 +-
drivers/gpu/drm/i915/intel_atomic_plane.c | 24 +-
drivers/gpu/drm/i915/intel_bios.c | 7 +
drivers/gpu/drm/i915/intel_bios.h | 1 +
drivers/gpu/drm/i915/intel_crt.c | 9 +-
drivers/gpu/drm/i915/intel_ddi.c | 107 +-
drivers/gpu/drm/i915/intel_display.c | 1740 +++++++++++++-------
drivers/gpu/drm/i915/intel_dp.c | 430 ++++-
drivers/gpu/drm/i915/intel_dp_mst.c | 36 +-
drivers/gpu/drm/i915/intel_drv.h | 124 +-
drivers/gpu/drm/i915/intel_dsi.c | 3 +-
drivers/gpu/drm/i915/intel_dvo.c | 1 +
drivers/gpu/drm/i915/intel_fbc.c | 184 ++-
drivers/gpu/drm/i915/intel_fbdev.c | 32 +-
drivers/gpu/drm/i915/intel_frontbuffer.c | 21 +-
drivers/gpu/drm/i915/intel_hdmi.c | 22 +-
drivers/gpu/drm/i915/intel_lrc.c | 208 ++-
drivers/gpu/drm/i915/intel_lrc.h | 12 +-
drivers/gpu/drm/i915/intel_lvds.c | 5 +-
drivers/gpu/drm/i915/intel_opregion.c | 6 +-
drivers/gpu/drm/i915/intel_overlay.c | 5 +-
drivers/gpu/drm/i915/intel_pm.c | 1286 ++++++++-------
drivers/gpu/drm/i915/intel_psr.c | 2 -
drivers/gpu/drm/i915/intel_ringbuffer.c | 351 ++--
drivers/gpu/drm/i915/intel_ringbuffer.h | 13 +-
drivers/gpu/drm/i915/intel_runtime_pm.c | 266 ++-
drivers/gpu/drm/i915/intel_sdvo.c | 3 +-
drivers/gpu/drm/i915/intel_sprite.c | 476 ++----
drivers/gpu/drm/i915/intel_tv.c | 3 +-
drivers/gpu/drm/i915/intel_uncore.c | 69 +-
drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 6 +-
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 6 +-
drivers/gpu/drm/msm/msm_atomic.c | 4 +-
drivers/gpu/drm/radeon/Makefile | 2 +-
drivers/gpu/drm/radeon/atombios_crtc.c | 25 +-
drivers/gpu/drm/radeon/atombios_dp.c | 17 +-
drivers/gpu/drm/radeon/atombios_encoders.c | 171 +-
drivers/gpu/drm/radeon/btc_dpm.c | 55 +-
drivers/gpu/drm/radeon/ci_dpm.c | 14 +
drivers/gpu/drm/radeon/cik.c | 132 +-
drivers/gpu/drm/radeon/cikd.h | 2 +
drivers/gpu/drm/radeon/evergreen.c | 129 +-
drivers/gpu/drm/radeon/evergreend.h | 1 +
drivers/gpu/drm/radeon/kv_dpm.c | 23 +
drivers/gpu/drm/radeon/ni.c | 29 +
drivers/gpu/drm/radeon/ni_dpm.c | 36 +
drivers/gpu/drm/radeon/ni_reg.h | 44 +
drivers/gpu/drm/radeon/nid.h | 47 +
drivers/gpu/drm/radeon/r600.c | 26 +
drivers/gpu/drm/radeon/radeon.h | 10 +
drivers/gpu/drm/radeon/radeon_asic.c | 49 +
drivers/gpu/drm/radeon/radeon_asic.h | 30 +
drivers/gpu/drm/radeon/radeon_atombios.c | 1 +
drivers/gpu/drm/radeon/radeon_audio.c | 24 +
drivers/gpu/drm/radeon/radeon_connectors.c | 116 +-
drivers/gpu/drm/radeon/radeon_device.c | 5 +
drivers/gpu/drm/radeon/radeon_display.c | 15 +-
drivers/gpu/drm/radeon/radeon_dp_auxch.c | 206 +++
drivers/gpu/drm/radeon/radeon_dp_mst.c | 782 +++++++++
drivers/gpu/drm/radeon/radeon_drv.c | 10 +-
drivers/gpu/drm/radeon/radeon_encoders.c | 14 +-
drivers/gpu/drm/radeon/radeon_fb.c | 11 +
drivers/gpu/drm/radeon/radeon_irq_kms.c | 15 +
drivers/gpu/drm/radeon/radeon_kfd.c | 10 +-
drivers/gpu/drm/radeon/radeon_kms.c | 29 +
drivers/gpu/drm/radeon/radeon_mode.h | 72 +
drivers/gpu/drm/radeon/rs780_dpm.c | 22 +
drivers/gpu/drm/radeon/rv6xx_dpm.c | 46 +
drivers/gpu/drm/radeon/rv770_dpm.c | 44 +
drivers/gpu/drm/radeon/si.c | 130 +-
drivers/gpu/drm/radeon/si_dpm.c | 36 +
drivers/gpu/drm/radeon/sid.h | 1 +
drivers/gpu/drm/radeon/sumo_dpm.c | 28 +
drivers/gpu/drm/radeon/trinity_dpm.c | 25 +
drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 400 +++--
drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 8 +-
drivers/gpu/drm/rcar-du/rcar_du_drv.c | 20 +-
drivers/gpu/drm/rcar-du/rcar_du_drv.h | 16 +-
drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 71 +-
drivers/gpu/drm/rcar-du/rcar_du_group.h | 5 +
drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c | 9 +-
drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c | 65 +-
drivers/gpu/drm/rcar-du/rcar_du_kms.c | 333 +++-
drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 9 +-
drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c | 18 +-
drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h | 8 +-
drivers/gpu/drm/rcar-du/rcar_du_plane.c | 422 ++---
drivers/gpu/drm/rcar-du/rcar_du_plane.h | 69 +-
drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | 9 +-
drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 4 +-
drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 17 +-
drivers/gpu/drm/rockchip/rockchip_drm_gem.h | 3 +-
drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 118 +-
drivers/gpu/drm/sti/sti_drm_crtc.c | 175 +-
drivers/gpu/drm/sti/sti_drm_drv.c | 86 +-
drivers/gpu/drm/sti/sti_drm_drv.h | 6 +
drivers/gpu/drm/sti/sti_drm_plane.c | 66 +-
drivers/gpu/drm/sti/sti_dvo.c | 6 +-
drivers/gpu/drm/sti/sti_hda.c | 6 +-
drivers/gpu/drm/sti/sti_hdmi.c | 6 +-
drivers/gpu/drm/tegra/dc.c | 6 +-
drivers/gpu/drm/tegra/drm.c | 4 +-
drivers/gpu/drm/vgem/Makefile | 4 +
drivers/gpu/drm/vgem/vgem_dma_buf.c | 94 ++
drivers/gpu/drm/vgem/vgem_drv.c | 364 ++++
.../drm/{i915/intel_dsi_cmd.h => vgem/vgem_drv.h} | 46 +-
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 4 +-
include/drm/drmP.h | 20 +-
include/drm/drm_atomic_helper.h | 6 +-
include/drm/drm_crtc.h | 10 +-
include/drm/drm_crtc_helper.h | 3 +-
include/drm/drm_dp_helper.h | 176 +-
include/drm/drm_dp_mst_helper.h | 2 +
include/drm/drm_fb_helper.h | 19 +
include/drm/drm_modes.h | 2 +-
include/drm/drm_plane_helper.h | 10 +-
include/drm/i915_pciids.h | 77 +-
include/uapi/drm/drm.h | 1 +
include/uapi/drm/drm_fourcc.h | 78 +
include/uapi/drm/drm_mode.h | 9 +
include/uapi/drm/i915_drm.h | 5 +-
include/uapi/drm/radeon_drm.h | 4 +
190 files changed, 12514 insertions(+), 6377 deletions(-)
create mode 100644 drivers/gpu/drm/i915/i915_gem_shrinker.c
delete mode 100644 drivers/gpu/drm/i915/i915_ums.c
create mode 100644 drivers/gpu/drm/i915/i915_vgpu.c
create mode 100644 drivers/gpu/drm/i915/i915_vgpu.h
create mode 100644 drivers/gpu/drm/radeon/radeon_dp_auxch.c
create mode 100644 drivers/gpu/drm/radeon/radeon_dp_mst.c
create mode 100644 drivers/gpu/drm/vgem/Makefile
create mode 100644 drivers/gpu/drm/vgem/vgem_dma_buf.c
create mode 100644 drivers/gpu/drm/vgem/vgem_drv.c
rename drivers/gpu/drm/{i915/intel_dsi_cmd.h => vgem/vgem_drv.h} (51%)
Merging drm-panel/drm/panel/for-next (1c550fa193d0 drm/panel: Add support for Ampire AM-800480R3TMQW-A1H 800x480 7" panel)
$ git merge drm-panel/drm/panel/for-next
Auto-merging include/drm/drm_crtc.h
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Merge made by the 'recursive' strategy.
.../bindings/panel/ampire,am800480r3tmqwa1h.txt | 7 +
.../devicetree/bindings/panel/auo,b101ean01.txt | 7 +
.../bindings/panel/innolux,at043tn24.txt | 7 +
.../bindings/panel/innolux,zj070na-01p.txt | 7 +
.../bindings/panel/ortustech,com43h4m85ulc.txt | 7 +
.../bindings/panel/samsung,ltn140at29-301.txt | 7 +
.../bindings/panel/shelly,sca07010-bfn-lnn.txt | 7 +
.../devicetree/bindings/vendor-prefixes.txt | 2 +
drivers/gpu/drm/bridge/Kconfig | 11 +
drivers/gpu/drm/bridge/Makefile | 1 +
drivers/gpu/drm/bridge/ps8622.c | 684 +++++++++++++++++++++
drivers/gpu/drm/bridge/ptn3460.c | 2 +-
drivers/gpu/drm/panel/Kconfig | 1 +
drivers/gpu/drm/panel/panel-simple.c | 256 +++++++-
include/drm/drm_crtc.h | 1 -
include/drm/drm_panel.h | 5 +
16 files changed, 997 insertions(+), 15 deletions(-)
create mode 100644 Documentation/devicetree/bindings/panel/ampire,am800480r3tmqwa1h.txt
create mode 100644 Documentation/devicetree/bindings/panel/auo,b101ean01.txt
create mode 100644 Documentation/devicetree/bindings/panel/innolux,at043tn24.txt
create mode 100644 Documentation/devicetree/bindings/panel/innolux,zj070na-01p.txt
create mode 100644 Documentation/devicetree/bindings/panel/ortustech,com43h4m85ulc.txt
create mode 100644 Documentation/devicetree/bindings/panel/samsung,ltn140at29-301.txt
create mode 100644 Documentation/devicetree/bindings/panel/shelly,sca07010-bfn-lnn.txt
create mode 100644 drivers/gpu/drm/bridge/ps8622.c
Merging drm-intel/for-linux-next (6e0aa8018f9c Merge tag 'v4.0-rc6' into drm-intel-next)
$ git merge drm-intel/for-linux-next
Already up-to-date.
Merging drm-tegra/drm/tegra/for-next (535a65db484f drm/tegra: sor: Reset during initialization)
$ git merge drm-tegra/drm/tegra/for-next
Auto-merging include/drm/drm_atomic_helper.h
Auto-merging drivers/gpu/drm/tegra/drm.c
Auto-merging drivers/gpu/drm/tegra/dc.c
Auto-merging drivers/gpu/drm/drm_atomic_helper.c
Merge made by the 'recursive' strategy.
drivers/gpu/drm/drm_atomic_helper.c | 144 ++++++++++++++++++++++---
drivers/gpu/drm/tegra/dc.c | 99 ++++++++++--------
drivers/gpu/drm/tegra/dc.h | 7 +-
drivers/gpu/drm/tegra/drm.c | 18 +++-
drivers/gpu/drm/tegra/drm.h | 4 +-
drivers/gpu/drm/tegra/hdmi.c | 4 +-
drivers/gpu/drm/tegra/hdmi.h | 2 +-
drivers/gpu/drm/tegra/sor.c | 202 +++++++++++++++++++++++++++++++++---
drivers/gpu/host1x/syncpt.c | 6 ++
include/drm/drm_atomic_helper.h | 14 +++
include/linux/host1x.h | 1 +
include/uapi/drm/tegra_drm.h | 3 +-
12 files changed, 421 insertions(+), 83 deletions(-)
Merging drm-misc/topic/drm-misc (0578be680c66 drm: Use kref_put_mutex in drm_gem_object_unreference_unlocked)
$ git merge drm-misc/topic/drm-misc
Auto-merging drivers/gpu/drm/drm_probe_helper.c
Merge made by the 'recursive' strategy.
drivers/gpu/drm/drm_atomic.c | 4 ++--
drivers/gpu/drm/drm_crtc_helper.c | 24 ++++++++++++------------
drivers/gpu/drm/drm_fb_helper.c | 8 ++++----
drivers/gpu/drm/drm_plane_helper.c | 4 ++--
drivers/gpu/drm/drm_probe_helper.c | 2 +-
drivers/gpu/drm/exynos/exynos_hdmi.c | 2 +-
drivers/gpu/drm/gma500/cdv_intel_display.c | 2 +-
drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 2 +-
drivers/gpu/drm/gma500/cdv_intel_lvds.c | 2 +-
drivers/gpu/drm/gma500/gma_display.c | 10 +++++-----
drivers/gpu/drm/gma500/mdfld_dsi_output.c | 2 +-
drivers/gpu/drm/gma500/mdfld_intel_display.c | 2 +-
drivers/gpu/drm/gma500/oaktrail_crtc.c | 2 +-
drivers/gpu/drm/gma500/oaktrail_hdmi.c | 2 +-
drivers/gpu/drm/gma500/psb_intel_display.c | 2 +-
drivers/gpu/drm/gma500/psb_intel_lvds.c | 2 +-
drivers/gpu/drm/mgag200/mgag200_mode.c | 2 +-
drivers/gpu/drm/nouveau/dispnv04/crtc.c | 4 ++--
drivers/gpu/drm/nouveau/dispnv04/dac.c | 4 ++--
drivers/gpu/drm/nouveau/dispnv04/dfp.c | 4 ++--
drivers/gpu/drm/nouveau/dispnv04/disp.c | 6 +++---
drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 4 ++--
drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 4 ++--
drivers/gpu/drm/nouveau/nouveau_connector.c | 4 ++--
drivers/gpu/drm/qxl/qxl_drv.c | 2 +-
drivers/gpu/drm/radeon/radeon_connectors.c | 16 ++++++++--------
drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 2 +-
include/drm/drm_gem.h | 14 ++++++++------
28 files changed, 70 insertions(+), 68 deletions(-)
Merging drm-exynos/exynos-drm/for-next (377b8fc67dc3 drm/exynos: Enable DP clock to fix display on Exynos5250 and other)
$ git merge drm-exynos/exynos-drm/for-next
Auto-merging drivers/gpu/drm/exynos/exynos_hdmi.c
Merge made by the 'recursive' strategy.
drivers/gpu/drm/exynos/exynos7_drm_decon.c | 178 +++++++-------------
drivers/gpu/drm/exynos/exynos_dp_core.c | 10 ++
drivers/gpu/drm/exynos/exynos_drm_crtc.c | 101 +++++------
drivers/gpu/drm/exynos/exynos_drm_crtc.h | 7 +-
drivers/gpu/drm/exynos/exynos_drm_drv.c | 27 ---
drivers/gpu/drm/exynos/exynos_drm_drv.h | 40 +++--
drivers/gpu/drm/exynos/exynos_drm_dsi.c | 7 -
drivers/gpu/drm/exynos/exynos_drm_fb.c | 10 +-
drivers/gpu/drm/exynos/exynos_drm_fimd.c | 251 +++++++++++++---------------
drivers/gpu/drm/exynos/exynos_drm_fimd.h | 15 ++
drivers/gpu/drm/exynos/exynos_drm_ipp.c | 44 +++++
drivers/gpu/drm/exynos/exynos_drm_plane.c | 78 +++------
drivers/gpu/drm/exynos/exynos_drm_plane.h | 7 +-
drivers/gpu/drm/exynos/exynos_drm_vidi.c | 136 ++++-----------
drivers/gpu/drm/exynos/exynos_hdmi.c | 2 +-
drivers/gpu/drm/exynos/exynos_mixer.c | 260 ++++++++++++-----------------
drivers/gpu/drm/exynos/regs-mixer.h | 2 +-
include/video/samsung_fimd.h | 11 ++
18 files changed, 495 insertions(+), 691 deletions(-)
create mode 100644 drivers/gpu/drm/exynos/exynos_drm_fimd.h
Merging sound/for-next (2d846c740272 ALSA: hda_intel: add AZX_DCAPS_I915_POWERWELL for SKL and BSW)
$ git merge sound/for-next
Auto-merging sound/usb/quirks.c
Removing sound/soc/davinci/davinci-pcm.h
Removing sound/soc/davinci/davinci-pcm.c
Auto-merging sound/pci/hda/patch_realtek.c
Removing sound/pci/hda/hda_trace.h
Removing sound/pci/hda/hda_priv.h
Auto-merging sound/pci/hda/hda_intel.c
Auto-merging sound/core/pcm_native.c
Merge made by the 'recursive' strategy.
.../bindings/sound/nvidia,tegra-audio-max98090.txt | 1 +
Documentation/sound/alsa/HD-Audio.txt | 6 +-
Documentation/sound/alsa/timestamping.txt | 200 ++
include/sound/ac97_codec.h | 4 +-
include/sound/compress_driver.h | 4 +-
include/sound/control.h | 2 +-
include/sound/core.h | 3 +-
include/sound/hda_regmap.h | 217 ++
include/sound/hdaudio.h | 243 ++
include/sound/pcm.h | 66 +-
include/sound/pcm_params.h | 7 +
include/sound/seq_device.h | 46 +-
include/sound/seq_kernel.h | 6 +-
include/sound/soc.h | 18 +-
include/uapi/sound/asequencer.h | 1 +
include/uapi/sound/asound.h | 39 +-
include/uapi/sound/compress_offload.h | 2 +-
include/uapi/sound/emu10k1.h | 3 +-
include/uapi/sound/hdspm.h | 6 +
sound/Kconfig | 2 +
sound/Makefile | 2 +-
sound/aoa/soundbus/i2sbus/core.c | 2 +-
sound/core/control.c | 271 ++-
sound/core/device.c | 47 +-
sound/core/hwdep.c | 4 +-
sound/core/init.c | 5 +-
sound/core/oss/mixer_oss.c | 4 +-
sound/core/oss/pcm_oss.c | 1 -
sound/core/pcm.c | 105 +-
sound/core/pcm_compat.c | 28 +-
sound/core/pcm_dmaengine.c | 4 +-
sound/core/pcm_lib.c | 88 +-
sound/core/pcm_native.c | 41 +-
sound/core/rawmidi.c | 8 +-
sound/core/seq/oss/seq_oss.c | 22 +-
sound/core/seq/oss/seq_oss_init.c | 4 +-
sound/core/seq/oss/seq_oss_midi.c | 5 +-
sound/core/seq/oss/seq_oss_readq.c | 9 +-
sound/core/seq/oss/seq_oss_synth.c | 12 +-
sound/core/seq/oss/seq_oss_synth.h | 4 +-
sound/core/seq/seq_device.c | 571 ++---
sound/core/seq/seq_dummy.c | 6 +-
sound/core/seq/seq_fifo.c | 4 +-
sound/core/seq/seq_memory.c | 8 +-
sound/core/seq/seq_midi.c | 36 +-
sound/core/seq/seq_ports.c | 4 +-
sound/core/seq/seq_prioq.c | 4 +-
sound/core/seq/seq_queue.c | 4 +-
sound/core/seq/seq_timer.c | 4 +-
sound/core/sound.c | 14 +-
sound/core/timer.c | 4 +-
sound/drivers/opl3/opl3_seq.c | 34 +-
sound/drivers/opl4/opl4_seq.c | 33 +-
sound/firewire/amdtp.c | 8 +-
sound/firewire/fireworks/fireworks_transaction.c | 2 +-
sound/hda/Kconfig | 3 +
sound/hda/Makefile | 7 +
sound/hda/array.c | 49 +
sound/hda/hda_bus_type.c | 42 +
sound/hda/hdac_bus.c | 186 ++
sound/hda/hdac_device.c | 571 +++++
sound/hda/hdac_regmap.c | 472 ++++
sound/hda/hdac_sysfs.c | 404 ++++
sound/hda/local.h | 23 +
sound/hda/trace.c | 6 +
sound/hda/trace.h | 62 +
sound/i2c/other/ak4113.c | 4 +-
sound/isa/sb/emu8000_synth.c | 35 +-
sound/isa/wavefront/wavefront_fx.c | 6 +-
sound/isa/wavefront/wavefront_synth.c | 26 +-
sound/mips/au1x00.c | 12 +-
sound/oss/dev_table.c | 6 +-
sound/oss/opl3.c | 4 +-
sound/oss/sb_ess.c | 19 +-
sound/oss/sb_midi.c | 6 +-
sound/oss/sys_timer.c | 35 +-
sound/oss/v_midi.c | 4 +-
sound/pci/ac97/ac97_codec.c | 4 +-
sound/pci/ac97/ac97_patch.c | 27 +
sound/pci/ad1889.c | 2 +-
sound/pci/asihpi/asihpi.c | 2 +-
sound/pci/atiixp.c | 2 +-
sound/pci/azt3328.c | 7 +-
sound/pci/cmipci.c | 2 +-
sound/pci/cs5535audio/cs5535audio.c | 2 +-
sound/pci/echoaudio/echoaudio.c | 16 +-
sound/pci/emu10k1/emu10k1_main.c | 16 +
sound/pci/emu10k1/emu10k1_synth.c | 35 +-
sound/pci/hda/Kconfig | 1 +
sound/pci/hda/Makefile | 3 +-
sound/pci/hda/hda_auto_parser.c | 33 +-
sound/pci/hda/hda_beep.c | 37 +-
sound/pci/hda/hda_beep.h | 1 +
sound/pci/hda/hda_bind.c | 273 +++
sound/pci/hda/hda_codec.c | 2325 ++++----------------
sound/pci/hda/hda_codec.h | 286 +--
sound/pci/hda/hda_controller.c | 269 +--
sound/pci/hda/hda_controller.h | 397 +++-
sound/pci/hda/hda_generic.c | 582 +++--
sound/pci/hda/hda_generic.h | 9 +-
sound/pci/hda/hda_hwdep.c | 5 +-
sound/pci/hda/hda_i915.c | 2 +-
sound/pci/hda/hda_intel.c | 99 +-
sound/pci/hda/hda_intel.h | 2 +-
sound/pci/hda/hda_jack.c | 8 +-
sound/pci/hda/hda_local.h | 123 +-
sound/pci/hda/hda_priv.h | 406 ----
sound/pci/hda/hda_proc.c | 76 +-
sound/pci/hda/hda_sysfs.c | 62 +-
sound/pci/hda/hda_tegra.c | 50 +-
sound/pci/hda/hda_trace.h | 143 --
sound/pci/hda/local.h | 39 +
sound/pci/hda/patch_analog.c | 34 +-
sound/pci/hda/patch_ca0110.c | 16 +-
sound/pci/hda/patch_ca0132.c | 56 +-
sound/pci/hda/patch_cirrus.c | 16 +-
sound/pci/hda/patch_cmedia.c | 16 +-
sound/pci/hda/patch_conexant.c | 41 +-
sound/pci/hda/patch_hdmi.c | 95 +-
sound/pci/hda/patch_realtek.c | 144 +-
sound/pci/hda/patch_si3054.c | 37 +-
sound/pci/hda/patch_sigmatel.c | 138 +-
sound/pci/hda/patch_via.c | 777 +------
sound/pci/hda/thinkpad_helper.c | 2 +-
sound/pci/ice1712/wtm.c | 172 +-
sound/pci/intel8x0.c | 2 +-
sound/pci/rme9652/hdspm.c | 141 +-
sound/pci/via82xx.c | 2 +-
sound/soc/atmel/atmel_ssc_dai.c | 111 +-
sound/soc/atmel/atmel_ssc_dai.h | 1 +
sound/soc/codecs/Kconfig | 18 +-
sound/soc/codecs/Makefile | 4 +
sound/soc/codecs/adau1977.c | 17 +-
sound/soc/codecs/cs35l32.c | 19 +-
sound/soc/codecs/cs4265.c | 19 +-
sound/soc/codecs/max98357a.c | 11 +-
sound/soc/codecs/pcm512x.c | 178 +-
sound/soc/codecs/rt286.c | 17 +-
sound/soc/codecs/rt5670.h | 3 +
sound/soc/codecs/rt5677.c | 44 +-
sound/soc/codecs/rt5677.h | 6 +
sound/soc/codecs/sn95031.c | 14 +-
sound/soc/codecs/sn95031.h | 3 +-
sound/soc/codecs/sta350.c | 30 +-
sound/soc/codecs/tas2552.c | 13 +-
sound/soc/codecs/wm8804-i2c.c | 64 +
sound/soc/codecs/wm8804-spi.c | 56 +
sound/soc/codecs/wm8804.c | 281 +--
sound/soc/codecs/wm8804.h | 7 +
sound/soc/codecs/wm_adsp.c | 13 +-
sound/soc/davinci/Kconfig | 18 +-
sound/soc/davinci/Makefile | 2 -
sound/soc/davinci/davinci-i2s.c | 67 +-
sound/soc/davinci/davinci-mcasp.c | 99 +-
sound/soc/davinci/davinci-pcm.c | 861 --------
sound/soc/davinci/davinci-pcm.h | 41 -
sound/soc/davinci/davinci-vcif.c | 55 +-
sound/soc/fsl/fsl-asoc-card.c | 6 +
sound/soc/fsl/imx-es8328.c | 6 +-
sound/soc/fsl/wm1133-ev1.c | 12 +-
sound/soc/generic/simple-card.c | 20 +-
sound/soc/intel/broadwell.c | 16 +-
sound/soc/intel/byt-max98090.c | 11 +-
sound/soc/intel/bytcr_dpcm_rt5640.c | 4 +-
sound/soc/intel/cht_bsw_rt5645.c | 16 +-
sound/soc/intel/cht_bsw_rt5672.c | 9 +-
sound/soc/intel/haswell.c | 4 +-
sound/soc/intel/mfld_machine.c | 24 +-
sound/soc/intel/sst-mfld-platform-pcm.c | 60 +
sound/soc/intel/sst-mfld-platform.h | 1 +
sound/soc/intel/sst/sst.c | 128 +-
sound/soc/intel/sst/sst.h | 12 +
sound/soc/intel/sst/sst_drv_interface.c | 65 +-
sound/soc/intel/sst/sst_loader.c | 10 +-
sound/soc/omap/Kconfig | 4 +-
sound/soc/omap/ams-delta.c | 4 +-
sound/soc/omap/omap-abe-twl6040.c | 10 +-
sound/soc/omap/omap-pcm.c | 21 +-
sound/soc/omap/omap-twl4030.c | 12 +-
sound/soc/omap/rx51.c | 6 +-
sound/soc/pxa/hx4700.c | 11 +-
sound/soc/pxa/palm27x.c | 11 +-
sound/soc/pxa/ttc-dkb.c | 15 +-
sound/soc/pxa/z2.c | 10 +-
sound/soc/samsung/h1940_uda1380.c | 9 +-
sound/soc/samsung/littlemill.c | 12 +-
sound/soc/samsung/lowland.c | 14 +-
sound/soc/samsung/rx1950_uda1380.c | 9 +-
sound/soc/samsung/smartq_wm8987.c | 11 +-
sound/soc/samsung/speyside.c | 14 +-
sound/soc/samsung/tobermory.c | 13 +-
sound/soc/soc-core.c | 16 +-
sound/soc/soc-jack.c | 42 +-
sound/soc/soc-pcm.c | 1 +
sound/soc/tegra/tegra_alc5632.c | 9 +-
sound/soc/tegra/tegra_max98090.c | 26 +-
sound/soc/tegra/tegra_rt5640.c | 10 +-
sound/soc/tegra/tegra_rt5677.c | 14 +-
sound/soc/tegra/tegra_wm8903.c | 18 +-
sound/usb/quirks.c | 40 +-
200 files changed, 7091 insertions(+), 7042 deletions(-)
create mode 100644 Documentation/sound/alsa/timestamping.txt
create mode 100644 include/sound/hda_regmap.h
create mode 100644 include/sound/hdaudio.h
create mode 100644 sound/hda/Kconfig
create mode 100644 sound/hda/Makefile
create mode 100644 sound/hda/array.c
create mode 100644 sound/hda/hda_bus_type.c
create mode 100644 sound/hda/hdac_bus.c
create mode 100644 sound/hda/hdac_device.c
create mode 100644 sound/hda/hdac_regmap.c
create mode 100644 sound/hda/hdac_sysfs.c
create mode 100644 sound/hda/local.h
create mode 100644 sound/hda/trace.c
create mode 100644 sound/hda/trace.h
create mode 100644 sound/pci/hda/hda_bind.c
delete mode 100644 sound/pci/hda/hda_priv.h
delete mode 100644 sound/pci/hda/hda_trace.h
create mode 100644 sound/pci/hda/local.h
create mode 100644 sound/soc/codecs/wm8804-i2c.c
create mode 100644 sound/soc/codecs/wm8804-spi.c
delete mode 100644 sound/soc/davinci/davinci-pcm.c
delete mode 100644 sound/soc/davinci/davinci-pcm.h
Merging sound-asoc/for-next (cbfa938ccf20 Merge remote-tracking branches 'asoc/topic/wm8804' and 'asoc/topic/wm8996' into asoc-next)
$ git merge sound-asoc/for-next
Auto-merging sound/soc/sh/fsi.c
Auto-merging sound/soc/intel/haswell/sst-haswell-pcm.c
Auto-merging sound/soc/intel/haswell/sst-haswell-ipc.h
Auto-merging sound/soc/intel/haswell/sst-haswell-ipc.c
Auto-merging sound/soc/intel/haswell/sst-haswell-dsp.c
Auto-merging sound/soc/intel/common/sst-firmware.c
Auto-merging sound/soc/intel/common/sst-dsp.h
Auto-merging sound/soc/intel/common/sst-dsp-priv.h
Auto-merging sound/soc/intel/common/sst-acpi.c
Auto-merging sound/soc/intel/boards/haswell.c
Auto-merging sound/soc/intel/boards/cht_bsw_rt5672.c
Auto-merging sound/soc/intel/boards/cht_bsw_rt5645.c
Auto-merging sound/soc/intel/boards/bytcr_rt5640.c
Auto-merging sound/soc/intel/boards/byt-rt5640.c
Auto-merging sound/soc/intel/boards/byt-max98090.c
Auto-merging sound/soc/intel/boards/broadwell.c
Auto-merging sound/soc/intel/baytrail/sst-baytrail-pcm.c
Auto-merging sound/soc/intel/baytrail/sst-baytrail-ipc.c
Auto-merging sound/soc/intel/baytrail/sst-baytrail-dsp.c
Auto-merging sound/soc/intel/atom/sst/sst_stream.c
Auto-merging sound/soc/intel/atom/sst/sst_pvt.c
Auto-merging sound/soc/intel/atom/sst/sst_loader.c
Auto-merging sound/soc/intel/atom/sst/sst_ipc.c
Auto-merging sound/soc/intel/atom/sst/sst_drv_interface.c
Auto-merging sound/soc/intel/atom/sst/sst_acpi.c
Auto-merging sound/soc/intel/atom/sst/sst.c
Removing sound/soc/atmel/atmel-pcm.c
Auto-merging include/sound/soc.h
Auto-merging arch/arm/mach-shmobile/board-armadillo800eva.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
.../bindings/sound/ingenic,jz4740-i2s.txt | 2 +-
.../devicetree/bindings/sound/max98925.txt | 22 +
.../devicetree/bindings/sound/qcom,lpass-cpu.txt | 43 ++
.../devicetree/bindings/sound/renesas,rsnd.txt | 125 +++-
.../bindings/sound/renesas,rsrc-card.txt | 67 ++
Documentation/devicetree/bindings/sound/storm.txt | 23 +
Documentation/devicetree/bindings/sound/wm8804.txt | 3 +
Documentation/sound/alsa/ControlNames.txt | 10 +-
MAINTAINERS | 9 +-
arch/arm/mach-shmobile/board-armadillo800eva.c | 3 +-
drivers/dma/of-dma.c | 1 +
drivers/regulator/devres.c | 85 +++
include/linux/regulator/consumer.h | 16 +
include/sound/rt5670.h | 1 +
include/sound/simple_card.h | 1 -
include/sound/soc-dapm.h | 6 +-
include/sound/soc.h | 14 +
sound/soc/Kconfig | 1 +
sound/soc/Makefile | 1 +
sound/soc/atmel/Makefile | 2 -
sound/soc/atmel/atmel-pcm-dma.c | 4 +-
sound/soc/atmel/atmel-pcm-pdc.c | 79 ++
sound/soc/atmel/atmel-pcm.c | 121 ---
sound/soc/atmel/atmel-pcm.h | 5 -
sound/soc/codecs/Kconfig | 4 +
sound/soc/codecs/Makefile | 2 +
sound/soc/codecs/ab8500-codec.c | 2 -
sound/soc/codecs/ak4554.c | 2 +-
sound/soc/codecs/ak4642.c | 37 +-
sound/soc/codecs/arizona.c | 6 +-
sound/soc/codecs/cs4271.c | 4 +-
sound/soc/codecs/cx20442.c | 4 +-
sound/soc/codecs/max98925.c | 655 ++++++++++++++++
sound/soc/codecs/max98925.h | 832 +++++++++++++++++++++
sound/soc/codecs/pcm512x.c | 27 +-
sound/soc/codecs/rt286.c | 17 +-
sound/soc/codecs/rt5631.c | 2 +-
sound/soc/codecs/rt5645.c | 90 ++-
sound/soc/codecs/rt5645.h | 2 -
sound/soc/codecs/rt5670.c | 213 +++++-
sound/soc/codecs/rt5670.h | 7 +
sound/soc/codecs/rt5677.c | 163 ++++
sound/soc/codecs/rt5677.h | 79 ++
sound/soc/codecs/tlv320aic23-i2c.c | 4 +-
sound/soc/codecs/wm2200.c | 9 +-
sound/soc/codecs/wm5100.c | 7 +-
sound/soc/codecs/wm5102.c | 1 -
sound/soc/codecs/wm8350.c | 25 +-
sound/soc/codecs/wm8731.c | 34 +
sound/soc/codecs/wm8741.c | 8 +-
sound/soc/codecs/wm8753.c | 73 +-
sound/soc/codecs/wm8804.c | 28 +-
sound/soc/codecs/wm8971.c | 99 +--
sound/soc/codecs/wm8996.c | 12 +-
sound/soc/davinci/davinci-evm.c | 10 -
sound/soc/davinci/davinci-mcasp.c | 236 +++++-
sound/soc/fsl/mpc5200_psc_ac97.c | 2 +-
sound/soc/fsl/mpc5200_psc_i2s.c | 2 +-
sound/soc/fsl/pcm030-audio-fabric.c | 2 +-
sound/soc/generic/simple-card.c | 30 +-
sound/soc/intel/Makefile | 42 +-
sound/soc/intel/atom/Makefile | 7 +
sound/soc/intel/{ => atom}/sst-atom-controls.c | 0
sound/soc/intel/{ => atom}/sst-atom-controls.h | 0
sound/soc/intel/{ => atom}/sst-mfld-dsp.h | 0
.../intel/{ => atom}/sst-mfld-platform-compress.c | 0
sound/soc/intel/{ => atom}/sst-mfld-platform-pcm.c | 0
sound/soc/intel/{ => atom}/sst-mfld-platform.h | 0
sound/soc/intel/{ => atom}/sst/Makefile | 0
sound/soc/intel/{ => atom}/sst/sst.c | 2 +-
sound/soc/intel/{ => atom}/sst/sst.h | 0
sound/soc/intel/{ => atom}/sst/sst_acpi.c | 4 +-
sound/soc/intel/{ => atom}/sst/sst_drv_interface.c | 2 +-
sound/soc/intel/{ => atom}/sst/sst_ipc.c | 2 +-
sound/soc/intel/{ => atom}/sst/sst_loader.c | 2 +-
sound/soc/intel/{ => atom}/sst/sst_pci.c | 0
sound/soc/intel/{ => atom}/sst/sst_pvt.c | 6 +-
sound/soc/intel/{ => atom}/sst/sst_stream.c | 2 +-
sound/soc/intel/baytrail/Makefile | 4 +
sound/soc/intel/{ => baytrail}/sst-baytrail-dsp.c | 4 +-
sound/soc/intel/{ => baytrail}/sst-baytrail-ipc.c | 4 +-
sound/soc/intel/{ => baytrail}/sst-baytrail-ipc.h | 0
sound/soc/intel/{ => baytrail}/sst-baytrail-pcm.c | 4 +-
sound/soc/intel/boards/Makefile | 15 +
sound/soc/intel/{ => boards}/broadwell.c | 34 +-
sound/soc/intel/{ => boards}/byt-max98090.c | 2 +-
sound/soc/intel/{ => boards}/byt-rt5640.c | 4 +-
.../{bytcr_dpcm_rt5640.c => boards/bytcr_rt5640.c} | 4 +-
sound/soc/intel/{ => boards}/cht_bsw_rt5645.c | 4 +-
sound/soc/intel/{ => boards}/cht_bsw_rt5672.c | 99 ++-
sound/soc/intel/{ => boards}/haswell.c | 6 +-
sound/soc/intel/{ => boards}/mfld_machine.c | 0
sound/soc/intel/common/Makefile | 6 +
sound/soc/intel/{ => common}/sst-acpi.c | 1 +
sound/soc/intel/{ => common}/sst-dsp-priv.h | 13 +
sound/soc/intel/{ => common}/sst-dsp.c | 0
sound/soc/intel/{ => common}/sst-dsp.h | 2 +-
sound/soc/intel/{ => common}/sst-firmware.c | 10 +-
sound/soc/intel/haswell/Makefile | 4 +
sound/soc/intel/{ => haswell}/sst-haswell-dsp.c | 9 +-
sound/soc/intel/{ => haswell}/sst-haswell-ipc.c | 428 ++++++++++-
sound/soc/intel/{ => haswell}/sst-haswell-ipc.h | 53 ++
sound/soc/intel/{ => haswell}/sst-haswell-pcm.c | 138 +++-
sound/soc/jz4740/jz4740-i2s.c | 84 ++-
sound/soc/kirkwood/kirkwood-i2s.c | 2 +-
sound/soc/nuc900/nuc900-audio.h | 3 -
sound/soc/nuc900/nuc900-pcm.c | 31 +-
sound/soc/omap/Kconfig | 2 +-
sound/soc/omap/omap-hdmi-audio.c | 2 -
sound/soc/qcom/Kconfig | 25 +
sound/soc/qcom/Makefile | 11 +
sound/soc/qcom/lpass-cpu.c | 491 ++++++++++++
sound/soc/qcom/lpass-lpaif-ipq806x.h | 172 +++++
sound/soc/qcom/lpass-platform.c | 526 +++++++++++++
sound/soc/qcom/lpass.h | 51 ++
sound/soc/qcom/storm.c | 162 ++++
sound/soc/sh/Kconfig | 5 +
sound/soc/sh/fsi.c | 71 +-
sound/soc/sh/rcar/Makefile | 7 +-
sound/soc/sh/rcar/adg.c | 4 +-
sound/soc/sh/rcar/core.c | 278 ++-----
sound/soc/sh/rcar/dma.c | 616 +++++++++++++++
sound/soc/sh/rcar/dvc.c | 45 +-
sound/soc/sh/rcar/gen.c | 152 +---
sound/soc/sh/rcar/rsnd.h | 92 ++-
sound/soc/sh/rcar/rsrc-card.c | 512 +++++++++++++
sound/soc/sh/rcar/src.c | 250 +++++--
sound/soc/sh/rcar/ssi.c | 73 +-
sound/soc/soc-core.c | 23 +-
sound/soc/soc-dapm.c | 179 ++++-
sound/soc/tegra/tegra_rt5677.c | 1 -
131 files changed, 6991 insertions(+), 1170 deletions(-)
create mode 100644 Documentation/devicetree/bindings/sound/max98925.txt
create mode 100644 Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txt
create mode 100644 Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt
create mode 100644 Documentation/devicetree/bindings/sound/storm.txt
delete mode 100644 sound/soc/atmel/atmel-pcm.c
create mode 100644 sound/soc/codecs/max98925.c
create mode 100644 sound/soc/codecs/max98925.h
create mode 100644 sound/soc/intel/atom/Makefile
rename sound/soc/intel/{ => atom}/sst-atom-controls.c (100%)
rename sound/soc/intel/{ => atom}/sst-atom-controls.h (100%)
rename sound/soc/intel/{ => atom}/sst-mfld-dsp.h (100%)
rename sound/soc/intel/{ => atom}/sst-mfld-platform-compress.c (100%)
rename sound/soc/intel/{ => atom}/sst-mfld-platform-pcm.c (100%)
rename sound/soc/intel/{ => atom}/sst-mfld-platform.h (100%)
rename sound/soc/intel/{ => atom}/sst/Makefile (100%)
rename sound/soc/intel/{ => atom}/sst/sst.c (99%)
rename sound/soc/intel/{ => atom}/sst/sst.h (100%)
rename sound/soc/intel/{ => atom}/sst/sst_acpi.c (99%)
rename sound/soc/intel/{ => atom}/sst/sst_drv_interface.c (99%)
rename sound/soc/intel/{ => atom}/sst/sst_ipc.c (99%)
rename sound/soc/intel/{ => atom}/sst/sst_loader.c (99%)
rename sound/soc/intel/{ => atom}/sst/sst_pci.c (100%)
rename sound/soc/intel/{ => atom}/sst/sst_pvt.c (98%)
rename sound/soc/intel/{ => atom}/sst/sst_stream.c (99%)
create mode 100644 sound/soc/intel/baytrail/Makefile
rename sound/soc/intel/{ => baytrail}/sst-baytrail-dsp.c (99%)
rename sound/soc/intel/{ => baytrail}/sst-baytrail-ipc.c (99%)
rename sound/soc/intel/{ => baytrail}/sst-baytrail-ipc.h (100%)
rename sound/soc/intel/{ => baytrail}/sst-baytrail-pcm.c (99%)
create mode 100644 sound/soc/intel/boards/Makefile
rename sound/soc/intel/{ => boards}/broadwell.c (89%)
rename sound/soc/intel/{ => boards}/byt-max98090.c (99%)
rename sound/soc/intel/{ => boards}/byt-rt5640.c (98%)
rename sound/soc/intel/{bytcr_dpcm_rt5640.c => boards/bytcr_rt5640.c} (98%)
rename sound/soc/intel/{ => boards}/cht_bsw_rt5645.c (99%)
rename sound/soc/intel/{ => boards}/cht_bsw_rt5672.c (76%)
rename sound/soc/intel/{ => boards}/haswell.c (98%)
rename sound/soc/intel/{ => boards}/mfld_machine.c (100%)
create mode 100644 sound/soc/intel/common/Makefile
rename sound/soc/intel/{ => common}/sst-acpi.c (99%)
rename sound/soc/intel/{ => common}/sst-dsp-priv.h (97%)
rename sound/soc/intel/{ => common}/sst-dsp.c (100%)
rename sound/soc/intel/{ => common}/sst-dsp.h (99%)
rename sound/soc/intel/{ => common}/sst-firmware.c (99%)
create mode 100644 sound/soc/intel/haswell/Makefile
rename sound/soc/intel/{ => haswell}/sst-haswell-dsp.c (98%)
rename sound/soc/intel/{ => haswell}/sst-haswell-ipc.c (81%)
rename sound/soc/intel/{ => haswell}/sst-haswell-ipc.h (87%)
rename sound/soc/intel/{ => haswell}/sst-haswell-pcm.c (88%)
create mode 100644 sound/soc/qcom/Kconfig
create mode 100644 sound/soc/qcom/Makefile
create mode 100644 sound/soc/qcom/lpass-cpu.c
create mode 100644 sound/soc/qcom/lpass-lpaif-ipq806x.h
create mode 100644 sound/soc/qcom/lpass-platform.c
create mode 100644 sound/soc/qcom/lpass.h
create mode 100644 sound/soc/qcom/storm.c
create mode 100644 sound/soc/sh/rcar/dma.c
create mode 100644 sound/soc/sh/rcar/rsrc-card.c
Merging modules/modules-next (cc9e605dc6cb module: do not print allocation-fail warning on bogus user buffer size)
$ git merge modules/modules-next
Auto-merging kernel/module.c
Merge made by the 'recursive' strategy.
kernel/module.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
Merging virtio/virtio-next (2f921b5bb051 lguest: suppress interrupts for single insn, not range.)
$ git merge virtio/virtio-next
Merge made by the 'recursive' strategy.
arch/x86/include/asm/lguest.h | 7 ++-----
arch/x86/lguest/boot.c | 7 +++----
arch/x86/lguest/head_32.S | 30 +++++++++++++-----------------
drivers/lguest/hypercalls.c | 5 ++---
drivers/lguest/interrupts_and_traps.c | 8 ++++----
drivers/lguest/lg.h | 2 +-
drivers/lguest/lguest_user.c | 8 ++++++++
include/linux/lguest.h | 4 ++--
8 files changed, 35 insertions(+), 36 deletions(-)
Merging input/next (8d289842c8ab Input: ALPS - V7 devices can report 5-finger taps)
$ git merge input/next
Auto-merging include/uapi/linux/input.h
Auto-merging drivers/input/input-mt.c
Auto-merging drivers/hid/hid-debug.c
Auto-merging drivers/gpio/Kconfig
Auto-merging MAINTAINERS
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Merge made by the 'recursive' strategy.
.../devicetree/bindings/input/brcm,bcm-keypad.txt | 108 +++++
.../bindings/input/qcom,pm8941-pwrkey.txt | 43 ++
.../input/touchscreen/brcm,iproc-touchscreen.txt | 76 +++
.../bindings/input/touchscreen/chipone_icn8318.txt | 46 ++
.../bindings/input/touchscreen/goodix.txt | 29 ++
.../bindings/input/touchscreen/sun4i.txt | 22 +-
.../bindings/input/touchscreen/sx8654.txt | 16 +
.../bindings/input/touchscreen/touchscreen.txt | 2 +
.../devicetree/bindings/vendor-prefixes.txt | 2 +
MAINTAINERS | 7 +
drivers/gpio/Kconfig | 1 +
drivers/gpio/gpio-tc3589x.c | 3 -
drivers/hid/hid-debug.c | 2 +-
drivers/input/input-mt.c | 26 +-
drivers/input/keyboard/Kconfig | 21 +
drivers/input/keyboard/Makefile | 2 +
drivers/input/keyboard/bcm-keypad.c | 458 ++++++++++++++++++
drivers/input/keyboard/cros_ec_keyb.c | 2 +-
drivers/input/keyboard/ipaq-micro-keys.c | 168 +++++++
drivers/input/keyboard/tc3589x-keypad.c | 42 +-
drivers/input/misc/Kconfig | 24 +
drivers/input/misc/Makefile | 2 +
drivers/input/misc/max77843-haptic.c | 358 ++++++++++++++
drivers/input/misc/mma8450.c | 35 +-
drivers/input/misc/palmas-pwrbutton.c | 2 +-
drivers/input/misc/pm8941-pwrkey.c | 293 ++++++++++++
drivers/input/misc/pwm-beeper.c | 9 +-
drivers/input/misc/regulator-haptic.c | 2 +-
drivers/input/misc/tps65218-pwrbutton.c | 2 +-
drivers/input/mouse/alps.c | 368 ++++++++++++++-
drivers/input/mouse/alps.h | 78 ++-
drivers/input/mouse/elan_i2c.h | 2 +-
drivers/input/mouse/elan_i2c_core.c | 15 +-
drivers/input/mouse/elan_i2c_i2c.c | 10 +-
drivers/input/mouse/lifebook.c | 6 +-
drivers/input/mouse/psmouse-base.c | 40 +-
drivers/input/mouse/synaptics.c | 42 +-
drivers/input/mouse/synaptics.h | 1 +
drivers/input/serio/gscps2.c | 1 -
drivers/input/serio/i8042.c | 28 +-
drivers/input/touchscreen/Kconfig | 41 +-
drivers/input/touchscreen/Makefile | 3 +
drivers/input/touchscreen/ar1021_i2c.c | 2 +-
drivers/input/touchscreen/atmel_mxt_ts.c | 391 +++++++++++++--
drivers/input/touchscreen/bcm_iproc_tsc.c | 522 +++++++++++++++++++++
drivers/input/touchscreen/chipone_icn8318.c | 316 +++++++++++++
drivers/input/touchscreen/edt-ft5x06.c | 6 +-
drivers/input/touchscreen/elants_i2c.c | 14 +-
drivers/input/touchscreen/goodix.c | 36 +-
drivers/input/touchscreen/of_touchscreen.c | 62 ++-
drivers/input/touchscreen/sun4i-ts.c | 46 +-
drivers/input/touchscreen/sx8654.c | 286 +++++++++++
drivers/input/touchscreen/tsc2007.c | 11 +-
drivers/input/touchscreen/usbtouchscreen.c | 11 +
drivers/mfd/Kconfig | 1 +
drivers/mfd/tc3589x.c | 9 -
drivers/platform/x86/fujitsu-tablet.c | 6 +-
drivers/platform/x86/hp-wmi.c | 2 +-
include/linux/mfd/tc3589x.h | 23 -
include/uapi/linux/input.h | 3 +-
60 files changed, 3927 insertions(+), 258 deletions(-)
create mode 100644 Documentation/devicetree/bindings/input/brcm,bcm-keypad.txt
create mode 100644 Documentation/devicetree/bindings/input/qcom,pm8941-pwrkey.txt
create mode 100644 Documentation/devicetree/bindings/input/touchscreen/brcm,iproc-touchscreen.txt
create mode 100644 Documentation/devicetree/bindings/input/touchscreen/chipone_icn8318.txt
create mode 100644 Documentation/devicetree/bindings/input/touchscreen/goodix.txt
create mode 100644 Documentation/devicetree/bindings/input/touchscreen/sx8654.txt
create mode 100644 drivers/input/keyboard/bcm-keypad.c
create mode 100644 drivers/input/keyboard/ipaq-micro-keys.c
create mode 100644 drivers/input/misc/max77843-haptic.c
create mode 100644 drivers/input/misc/pm8941-pwrkey.c
create mode 100644 drivers/input/touchscreen/bcm_iproc_tsc.c
create mode 100644 drivers/input/touchscreen/chipone_icn8318.c
create mode 100644 drivers/input/touchscreen/sx8654.c
Merging block/for-next (ddd4f001660c Merge branch 'for-4.1/drivers' into for-next)
$ git merge block/for-next
Removing include/linux/nbd.h
Auto-merging drivers/block/nvme-core.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
Documentation/blockdev/nbd.txt | 48 +++++++++-----
MAINTAINERS | 2 +-
block/blk-core.c | 19 +++++-
block/blk-mq-sysfs.c | 1 +
block/blk-mq.c | 54 +++++++++-------
drivers/block/drbd/drbd_main.c | 7 +--
drivers/block/drbd/drbd_req.c | 3 +-
drivers/block/nbd.c | 140 ++++++++++++++++-------------------------
drivers/block/nvme-core.c | 30 +++++----
include/linux/blk-mq.h | 3 +
include/linux/nbd.h | 46 --------------
11 files changed, 158 insertions(+), 195 deletions(-)
delete mode 100644 include/linux/nbd.h
Merging device-mapper/for-next (a9da1e30fce5 dm crypt: fix deadlock when algo returns -EBUSY)
$ git merge device-mapper/for-next
Merge made by the 'recursive' strategy.
Documentation/ABI/testing/sysfs-block-dm | 22 +
Documentation/device-mapper/dm-crypt.txt | 4 +-
Documentation/device-mapper/log-writes.txt | 140 ++++
Documentation/device-mapper/switch.txt | 4 +-
Documentation/device-mapper/thin-provisioning.txt | 3 -
Documentation/device-mapper/verity.txt | 21 +-
block/blk-core.c | 5 +-
drivers/md/Kconfig | 27 +
drivers/md/Makefile | 1 +
drivers/md/dm-cache-policy-mq.c | 251 +++++--
drivers/md/dm-crypt.c | 14 +-
drivers/md/dm-delay.c | 2 +-
drivers/md/dm-log-userspace-base.c | 91 +--
drivers/md/dm-log-userspace-transfer.c | 5 +-
drivers/md/dm-log-writes.c | 825 ++++++++++++++++++++++
drivers/md/dm-mpath.c | 6 +-
drivers/md/dm-sysfs.c | 43 +-
drivers/md/dm-table.c | 71 +-
drivers/md/dm-verity.c | 147 +++-
drivers/md/dm.c | 556 +++++++++++----
drivers/md/dm.h | 10 +-
include/linux/blkdev.h | 2 -
include/linux/device-mapper.h | 5 -
include/linux/mount.h | 2 +-
include/uapi/linux/dm-ioctl.h | 4 +-
init/do_mounts.c | 6 +-
26 files changed, 1925 insertions(+), 342 deletions(-)
create mode 100644 Documentation/device-mapper/log-writes.txt
create mode 100644 drivers/md/dm-log-writes.c
Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
$ git merge mmc/mmc-next
Already up-to-date.
Merging mmc-uh/next (81f8a7be6642 mmc: Add support for marking hpi as broken through devicetree)
$ git merge mmc-uh/next
Removing include/linux/mmc/sdhci.h
Removing include/linux/mmc/sdhci-spear.h
Auto-merging drivers/mmc/host/sh_mmcif.c
Auto-merging drivers/mmc/host/Makefile
Auto-merging drivers/mmc/host/Kconfig
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
CREDITS | 4 +
.../devicetree/bindings/mmc/brcm,sdhci-iproc.txt | 23 ++
.../devicetree/bindings/mmc/exynos-dw-mshc.txt | 7 +
.../devicetree/bindings/mmc/fsl-imx-esdhc.txt | 4 +
Documentation/devicetree/bindings/mmc/mmc-card.txt | 31 +++
MAINTAINERS | 16 +-
arch/arm/mach-omap2/hsmmc.c | 33 ++-
drivers/mmc/core/core.c | 15 +-
drivers/mmc/core/mmc.c | 10 +-
drivers/mmc/core/pwrseq.c | 16 +-
drivers/mmc/core/pwrseq.h | 6 +-
drivers/mmc/core/pwrseq_emmc.c | 11 +-
drivers/mmc/core/pwrseq_simple.c | 11 +-
drivers/mmc/core/sdio.c | 32 +--
drivers/mmc/host/Kconfig | 21 +-
drivers/mmc/host/Makefile | 1 +
drivers/mmc/host/atmel-mci-regs.h | 11 +-
drivers/mmc/host/dw_mmc-exynos.c | 185 +++++++++++++---
drivers/mmc/host/dw_mmc-exynos.h | 19 +-
drivers/mmc/host/dw_mmc-rockchip.c | 8 +
drivers/mmc/host/dw_mmc.c | 169 +++++++++++++--
drivers/mmc/host/dw_mmc.h | 2 +
drivers/mmc/host/mmc_spi.c | 2 +-
drivers/mmc/host/mmci.c | 5 +-
drivers/mmc/host/omap_hsmmc.c | 119 +++-------
drivers/mmc/host/sdhci-acpi.c | 1 -
drivers/mmc/host/sdhci-bcm-kona.c | 61 ++----
drivers/mmc/host/sdhci-bcm2835.c | 7 +-
drivers/mmc/host/sdhci-cns3xxx.c | 7 +-
drivers/mmc/host/sdhci-dove.c | 39 +---
drivers/mmc/host/sdhci-esdhc-imx.c | 8 +-
drivers/mmc/host/sdhci-iproc.c | 241 +++++++++++++++++++++
drivers/mmc/host/sdhci-msm.c | 29 ++-
drivers/mmc/host/sdhci-of-arasan.c | 1 -
drivers/mmc/host/sdhci-of-esdhc.c | 7 +-
drivers/mmc/host/sdhci-of-hlwd.c | 7 +-
drivers/mmc/host/sdhci-pltfm.c | 56 ++---
drivers/mmc/host/sdhci-sirf.c | 42 +---
drivers/mmc/host/sdhci-spear.c | 47 +---
drivers/mmc/host/sdhci-st.c | 12 +-
drivers/mmc/host/sdhci-tegra.c | 105 +++------
drivers/mmc/host/sdhci.c | 27 +--
drivers/mmc/host/sdhci.h | 203 ++++++++++++++++-
drivers/mmc/host/sh_mmcif.c | 17 +-
drivers/mmc/host/sunxi-mmc.c | 11 +-
drivers/mmc/host/tmio_mmc_pio.c | 2 -
drivers/mmc/host/wmt-sdmmc.c | 2 +-
include/linux/mmc/dw_mmc.h | 2 +
include/linux/mmc/host.h | 6 -
include/linux/mmc/sdhci-spear.h | 34 ---
include/linux/mmc/sdhci.h | 218 -------------------
include/linux/platform_data/hsmmc-omap.h | 6 +-
52 files changed, 1163 insertions(+), 796 deletions(-)
create mode 100644 Documentation/devicetree/bindings/mmc/brcm,sdhci-iproc.txt
create mode 100644 Documentation/devicetree/bindings/mmc/mmc-card.txt
create mode 100644 drivers/mmc/host/sdhci-iproc.c
delete mode 100644 include/linux/mmc/sdhci-spear.h
delete mode 100644 include/linux/mmc/sdhci.h
Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
$ git merge kgdb/kgdb-next
Merge made by the 'recursive' strategy.
kernel/debug/kdb/kdb_io.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging md/for-next (4bbe5e27f0c6 md/raid5: allow the stripe_cache to grow and shrink.)
$ git merge md/for-next
Auto-merging drivers/md/Makefile
Auto-merging drivers/md/Kconfig
Merge made by the 'recursive' strategy.
Documentation/md-cluster.txt | 176 ++++++++
crypto/async_tx/async_pq.c | 19 +-
drivers/md/Kconfig | 16 +
drivers/md/Makefile | 1 +
drivers/md/bitmap.c | 187 ++++++++-
drivers/md/bitmap.h | 10 +-
drivers/md/md-cluster.c | 889 +++++++++++++++++++++++++++++++++++++++++
drivers/md/md-cluster.h | 27 ++
drivers/md/md.c | 287 +++++++++++--
drivers/md/md.h | 24 +-
drivers/md/raid0.c | 48 ++-
drivers/md/raid1.c | 29 +-
drivers/md/raid10.c | 8 +-
drivers/md/raid5.c | 811 +++++++++++++++++++++++++++++++------
drivers/md/raid5.h | 59 ++-
include/linux/async_tx.h | 3 +
include/linux/raid/pq.h | 1 +
include/uapi/linux/raid/md_p.h | 7 +
include/uapi/linux/raid/md_u.h | 1 +
lib/raid6/algos.c | 41 +-
lib/raid6/altivec.uc | 1 +
lib/raid6/avx2.c | 3 +
lib/raid6/int.uc | 41 +-
lib/raid6/mmx.c | 2 +
lib/raid6/neon.c | 1 +
lib/raid6/sse1.c | 2 +
lib/raid6/sse2.c | 227 +++++++++++
lib/raid6/test/test.c | 51 ++-
lib/raid6/tilegx.uc | 1 +
29 files changed, 2702 insertions(+), 271 deletions(-)
create mode 100644 Documentation/md-cluster.txt
create mode 100644 drivers/md/md-cluster.c
create mode 100644 drivers/md/md-cluster.h
Merging mfd/for-mfd-next (ba867bc60a44 mfd: twl6040: Remove wrong and unneeded "platform:twl6040" modalias)
$ git merge mfd/for-mfd-next
Auto-merging sound/soc/codecs/arizona.c
Auto-merging include/dt-bindings/mfd/arizona.h
Removing drivers/mfd/rtsx_gops.c
Auto-merging drivers/mfd/kempld-core.c
Auto-merging drivers/mfd/Kconfig
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Auto-merging Documentation/devicetree/bindings/i2c/trivial-devices.txt
Merge made by the 'recursive' strategy.
.../devicetree/bindings/i2c/trivial-devices.txt | 1 +
Documentation/devicetree/bindings/mfd/arizona.txt | 41 +-
Documentation/devicetree/bindings/mfd/axp20x.txt | 96 ++
Documentation/devicetree/bindings/mfd/da9150.txt | 43 +
Documentation/devicetree/bindings/mfd/mt6397.txt | 70 ++
.../devicetree/bindings/mfd/qcom,spmi-pmic.txt | 19 +-
Documentation/devicetree/bindings/mfd/qcom-rpm.txt | 1 +
Documentation/devicetree/bindings/mfd/sky81452.txt | 35 +
.../devicetree/bindings/vendor-prefixes.txt | 2 +
.../video/backlight/sky81452-backlight.txt | 29 +
drivers/extcon/extcon-arizona.c | 1 +
drivers/gpio/gpio-arizona.c | 1 +
drivers/mfd/Kconfig | 57 +-
drivers/mfd/Makefile | 6 +-
drivers/mfd/ab8500-debugfs.c | 196 ++--
drivers/mfd/arizona-core.c | 25 +-
drivers/mfd/arizona-i2c.c | 2 +
drivers/mfd/arizona-irq.c | 1 +
drivers/mfd/arizona-spi.c | 2 +
drivers/mfd/axp20x.c | 10 +-
drivers/mfd/da9052-irq.c | 2 +
drivers/mfd/da9052-spi.c | 6 +-
drivers/mfd/da9150-core.c | 2 +-
drivers/mfd/dln2.c | 2 +-
drivers/mfd/hi6421-pmic-core.c | 2 +-
drivers/mfd/intel_quark_i2c_gpio.c | 282 +++++
drivers/mfd/intel_soc_pmic_core.c | 14 +-
drivers/mfd/kempld-core.c | 11 +-
drivers/mfd/lpc_ich.c | 172 +--
drivers/mfd/max77693.c | 4 +-
drivers/mfd/max77843.c | 243 +++++
drivers/mfd/mc13xxx-core.c | 6 +-
drivers/mfd/menelaus.c | 29 +-
drivers/mfd/mfd-core.c | 2 +-
drivers/mfd/mt6397-core.c | 227 ++++
drivers/mfd/qcom-spmi-pmic.c | 103 +-
drivers/mfd/qcom_rpm.c | 41 +
drivers/mfd/rk808.c | 3 +-
drivers/mfd/rtl8411.c | 11 +-
drivers/mfd/rts5209.c | 4 +-
drivers/mfd/rts5227.c | 12 +-
drivers/mfd/rts5229.c | 4 +-
drivers/mfd/rts5249.c | 343 +++++-
drivers/mfd/rtsx_gops.c | 37 -
drivers/mfd/rtsx_pcr.c | 109 +-
drivers/mfd/rtsx_pcr.h | 8 +
drivers/mfd/sec-core.c | 7 +-
drivers/mfd/sky81452.c | 108 ++
drivers/mfd/ti_am335x_tscadc.c | 13 +-
drivers/mfd/twl4030-power.c | 2 +-
drivers/mfd/twl6040.c | 1 -
drivers/mfd/vexpress-sysreg.c | 71 +-
drivers/regulator/arizona-micsupp.c | 1 +
drivers/rtc/rtc-s5m.c | 60 --
drivers/video/backlight/Kconfig | 10 +
drivers/video/backlight/Makefile | 1 +
drivers/video/backlight/sky81452-backlight.c | 353 +++++++
.../arizona/gpio.h => dt-bindings/mfd/arizona.h} | 67 +-
include/dt-bindings/mfd/qcom-rpm.h | 6 +
include/linux/mfd/arizona/core.h | 1 +
include/linux/mfd/arizona/pdata.h | 24 +-
include/linux/mfd/max77693-private.h | 5 +-
include/linux/mfd/max77693.h | 13 -
include/linux/mfd/max77843-private.h | 454 ++++++++
include/linux/mfd/menelaus.h | 7 -
include/linux/mfd/mt6397/core.h | 64 ++
include/linux/mfd/mt6397/registers.h | 362 +++++++
include/linux/mfd/rk808.h | 3 +
include/linux/mfd/rtsx_pci.h | 1116 ++++++++++----------
include/linux/mfd/samsung/core.h | 9 -
include/linux/mfd/sky81452.h | 31 +
include/linux/mfd/ti_am335x_tscadc.h | 1 +
include/linux/platform_data/sky81452-backlight.h | 46 +
sound/soc/codecs/arizona.c | 3 +-
74 files changed, 4011 insertions(+), 1145 deletions(-)
create mode 100644 Documentation/devicetree/bindings/mfd/axp20x.txt
create mode 100644 Documentation/devicetree/bindings/mfd/da9150.txt
create mode 100644 Documentation/devicetree/bindings/mfd/mt6397.txt
create mode 100644 Documentation/devicetree/bindings/mfd/sky81452.txt
create mode 100644 Documentation/devicetree/bindings/video/backlight/sky81452-backlight.txt
create mode 100644 drivers/mfd/intel_quark_i2c_gpio.c
create mode 100644 drivers/mfd/max77843.c
create mode 100644 drivers/mfd/mt6397-core.c
delete mode 100644 drivers/mfd/rtsx_gops.c
create mode 100644 drivers/mfd/sky81452.c
create mode 100644 drivers/video/backlight/sky81452-backlight.c
rename include/{linux/mfd/arizona/gpio.h => dt-bindings/mfd/arizona.h} (54%)
create mode 100644 include/linux/mfd/max77843-private.h
create mode 100644 include/linux/mfd/mt6397/core.h
create mode 100644 include/linux/mfd/mt6397/registers.h
create mode 100644 include/linux/mfd/sky81452.h
create mode 100644 include/linux/platform_data/sky81452-backlight.h
Merging backlight/for-backlight-next (1926469377bb backlight: da9052_bl: Terminate da9052_wled_ids array with empty element)
$ git merge backlight/for-backlight-next
Merge made by the 'recursive' strategy.
drivers/video/backlight/88pm860x_bl.c | 5 +----
drivers/video/backlight/da9052_bl.c | 1 +
2 files changed, 2 insertions(+), 4 deletions(-)
Merging battery/master (5939d9dfe440 power: twl4030_madc_battery: Add missing MODULE_ALIAS)
$ git merge battery/master
Resolved 'drivers/hid/wacom.h' using previous resolution.
Resolved 'drivers/hid/wacom_sys.c' using previous resolution.
Auto-merging include/linux/hid.h
Auto-merging drivers/iio/adc/Kconfig
Auto-merging drivers/hid/wacom_sys.c
CONFLICT (content): Merge conflict in drivers/hid/wacom_sys.c
Auto-merging drivers/hid/wacom.h
CONFLICT (content): Merge conflict in drivers/hid/wacom.h
Auto-merging drivers/hid/hid-sony.c
Auto-merging drivers/hid/hid-input.c
Auto-merging drivers/acpi/battery.c
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 1ebb73f571ed] Merge remote-tracking branch 'battery/master'
$ git diff -M --stat --summary HEAD^..
.../devicetree/bindings/iio/adc/da9150-gpadc.txt | 16 +
.../devicetree/bindings/power/da9150-charger.txt | 26 +
.../bindings/power/reset/syscon-poweroff.txt | 23 +
MAINTAINERS | 4 +
arch/arm/mach-pxa/raumfeld.c | 4 +-
arch/x86/platform/olpc/olpc-xo1-sci.c | 4 +-
arch/x86/platform/olpc/olpc-xo15-sci.c | 4 +-
drivers/acpi/ac.c | 32 +-
drivers/acpi/battery.c | 54 +-
drivers/acpi/sbs.c | 68 +-
drivers/hid/hid-input.c | 53 +-
drivers/hid/hid-sony.c | 43 +-
drivers/hid/hid-wiimote-modules.c | 41 +-
drivers/hid/hid-wiimote.h | 3 +-
drivers/hid/wacom.h | 6 +-
drivers/hid/wacom_sys.c | 70 +-
drivers/iio/adc/Kconfig | 9 +
drivers/iio/adc/Makefile | 1 +
drivers/iio/adc/da9150-gpadc.c | 407 +++++++
drivers/mfd/ab8500-sysctrl.c | 9 +-
drivers/platform/x86/compal-laptop.c | 35 +-
drivers/power/88pm860x_battery.c | 40 +-
drivers/power/88pm860x_charger.c | 66 +-
drivers/power/Kconfig | 21 +
drivers/power/Makefile | 4 +-
drivers/power/ab8500_btemp.c | 75 +-
drivers/power/ab8500_charger.c | 139 +--
drivers/power/ab8500_fg.c | 205 ++--
drivers/power/abx500_chargalg.c | 98 +-
drivers/power/apm_power.c | 6 +-
drivers/power/axp288_fuel_gauge.c | 1154 ++++++++++++++++++++
drivers/power/bq2415x_charger.c | 147 ++-
drivers/power/bq24190_charger.c | 103 +-
drivers/power/bq24735-charger.c | 53 +-
drivers/power/bq27x00_battery.c | 123 ++-
drivers/power/charger-manager.c | 161 +--
drivers/power/collie_battery.c | 75 +-
drivers/power/da9030_battery.c | 33 +-
drivers/power/da9052-battery.c | 25 +-
drivers/power/da9150-charger.c | 694 ++++++++++++
drivers/power/ds2760_battery.c | 56 +-
drivers/power/ds2780_battery.c | 45 +-
drivers/power/ds2781_battery.c | 47 +-
drivers/power/ds2782_battery.c | 30 +-
drivers/power/generic-adc-battery.c | 56 +-
drivers/power/goldfish_battery.c | 63 +-
drivers/power/gpio-charger.c | 42 +-
drivers/power/intel_mid_battery.c | 57 +-
drivers/power/ipaq_micro_battery.c | 46 +-
drivers/power/isp1704_charger.c | 49 +-
drivers/power/jz4740-battery.c | 37 +-
drivers/power/lp8727_charger.c | 94 +-
drivers/power/lp8788-charger.c | 62 +-
drivers/power/ltc2941-battery-gauge.c | 53 +-
drivers/power/max14577_charger.c | 148 ++-
drivers/power/max17040_battery.c | 40 +-
drivers/power/max17042_battery.c | 90 +-
drivers/power/max77693_charger.c | 131 ++-
drivers/power/max8903_charger.c | 52 +-
drivers/power/max8925_power.c | 98 +-
drivers/power/max8997_charger.c | 31 +-
drivers/power/max8998_charger.c | 32 +-
drivers/power/olpc_battery.c | 54 +-
drivers/power/pcf50633-charger.c | 105 +-
drivers/power/pda_power.c | 66 +-
drivers/power/pm2301_charger.c | 48 +-
drivers/power/pm2301_charger.h | 1 +
drivers/power/pmu_battery.c | 42 +-
drivers/power/power_supply_core.c | 353 +++++-
drivers/power/power_supply_leds.c | 25 +-
drivers/power/power_supply_sysfs.c | 24 +-
drivers/power/reset/Kconfig | 8 +
drivers/power/reset/Makefile | 1 +
drivers/power/reset/at91-poweroff.c | 2 +-
drivers/power/reset/at91-reset.c | 12 +-
drivers/power/reset/hisi-reboot.c | 2 +-
drivers/power/reset/keystone-reset.c | 2 +-
drivers/power/reset/st-poweroff.c | 2 +-
drivers/power/reset/syscon-poweroff.c | 102 ++
drivers/power/reset/syscon-reboot.c | 2 +-
drivers/power/reset/vexpress-poweroff.c | 2 +-
drivers/power/reset/xgene-reboot.c | 2 +-
drivers/power/rt5033_battery.c | 29 +-
drivers/power/rx51_battery.c | 27 +-
drivers/power/s3c_adc_battery.c | 77 +-
drivers/power/sbs-battery.c | 71 +-
drivers/power/smb347-charger.c | 111 +-
drivers/power/test_power.c | 53 +-
drivers/power/tosa_battery.c | 112 +-
drivers/power/tps65090-charger.c | 45 +-
drivers/power/twl4030_charger.c | 65 +-
drivers/power/twl4030_madc_battery.c | 135 ++-
drivers/power/wm831x_backup.c | 26 +-
drivers/power/wm831x_power.c | 95 +-
drivers/power/wm8350_power.c | 89 +-
drivers/power/wm97xx_battery.c | 37 +-
drivers/power/z2_battery.c | 60 +-
drivers/staging/nvec/nvec_power.c | 34 +-
include/linux/hid.h | 6 +-
include/linux/mfd/abx500/ux500_chargalg.h | 11 +-
include/linux/mfd/rt5033.h | 2 +-
include/linux/mfd/wm8350/supply.h | 6 +-
include/linux/power/charger-manager.h | 3 +-
include/linux/power/max17042_battery.h | 9 +-
include/linux/power_supply.h | 78 +-
105 files changed, 5430 insertions(+), 2099 deletions(-)
create mode 100644 Documentation/devicetree/bindings/iio/adc/da9150-gpadc.txt
create mode 100644 Documentation/devicetree/bindings/power/da9150-charger.txt
create mode 100644 Documentation/devicetree/bindings/power/reset/syscon-poweroff.txt
create mode 100644 drivers/iio/adc/da9150-gpadc.c
create mode 100644 drivers/power/axp288_fuel_gauge.c
create mode 100644 drivers/power/da9150-charger.c
create mode 100644 drivers/power/reset/syscon-poweroff.c
$ git am -3 ../patches/0001-HID-wacom-merge-fix-for-Change-ownership-from-driver.patch
Applying: HID: wacom: merge fix for "Change ownership from driver to core"
$ git reset HEAD^
Unstaged changes after reset:
M drivers/hid/wacom_wac.c
$ git add -A .
$ git commit -v -a --amend
[master 1558d2ee0c95] Merge remote-tracking branch 'battery/master'
Date: Wed Apr 8 13:58:03 2015 +1000
$ git am -3 ../patches/0001-HID-wacom-merge-fix-2-for-Change-ownership-from-driv.patch
Applying: HID: wacom: merge fix 2 for "Change ownership from driver to core"
$ git reset HEAD^
Unstaged changes after reset:
M drivers/hid/wacom_sys.c
M drivers/hid/wacom_wac.c
$ git add -A .
$ git commit -v -a --amend
[master 6c060b6556bb] Merge remote-tracking branch 'battery/master'
Date: Wed Apr 8 13:58:03 2015 +1000
Merging omap_dss2/for-next (72fc8b7187cd Merge branches '4.1/fbdev' and '4.1/omapdss' into for-next)
$ git merge omap_dss2/for-next
Auto-merging include/video/omapdss.h
Merge made by the 'recursive' strategy.
.../devicetree/bindings/video/ti,omap-dss.txt | 4 +-
drivers/gpu/drm/omapdrm/omap_connector.c | 2 +-
drivers/video/fbdev/hyperv_fb.c | 6 +-
drivers/video/fbdev/imxfb.c | 2 +-
.../video/fbdev/omap2/displays-new/connector-dvi.c | 2 +-
.../fbdev/omap2/displays-new/encoder-tfp410.c | 11 ++
.../omap2/displays-new/panel-lgphilips-lb035q02.c | 2 +-
.../omap2/displays-new/panel-sharp-ls037v7dw01.c | 2 +-
.../omap2/displays-new/panel-sony-acx565akm.c | 2 +-
.../omap2/displays-new/panel-tpo-td028ttec1.c | 2 +-
.../omap2/displays-new/panel-tpo-td043mtea1.c | 2 +-
drivers/video/fbdev/omap2/dss/dispc.c | 147 +++++++++++++++++++--
drivers/video/fbdev/omap2/dss/display.c | 2 +-
drivers/video/fbdev/omap2/dss/dsi.c | 2 +-
drivers/video/fbdev/omap2/dss/dss.c | 3 +
drivers/video/fbdev/omap2/dss/dss_features.c | 2 +-
drivers/video/fbdev/omap2/dss/hdmi4.c | 50 +++++++
drivers/video/fbdev/omap2/dss/hdmi5.c | 50 +++++++
drivers/video/fbdev/omap2/dss/hdmi5_core.c | 2 +-
drivers/video/fbdev/omap2/dss/rfbi.c | 2 +-
drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 4 +-
drivers/video/fbdev/pm3fb.c | 6 +-
drivers/video/fbdev/pxafb.c | 6 +-
drivers/video/fbdev/sm501fb.c | 2 +-
drivers/video/fbdev/via/via_clock.c | 2 +-
include/video/omapdss.h | 7 +-
26 files changed, 281 insertions(+), 43 deletions(-)
Merging regulator/for-next (15a51c696979 Merge remote-tracking branches 'regulator/topic/notifier', 'regulator/topic/palmas', 'regulator/topic/stw481x' and 'regulator/topic/wm8350' into regulator-next)
$ git merge regulator/for-next
Auto-merging include/linux/mfd/max77693.h
Auto-merging drivers/regulator/arizona-micsupp.c
Merge made by the 'recursive' strategy.
.../bindings/regulator/act8865-regulator.txt | 27 +++-
Documentation/power/regulator/consumer.txt | 2 +-
drivers/gpu/drm/msm/edp/edp_ctrl.c | 6 +-
drivers/phy/phy-qcom-ufs.c | 4 +-
drivers/regulator/act8865-regulator.c | 161 ++++++++++++++++++---
drivers/regulator/arizona-ldo1.c | 5 +-
drivers/regulator/arizona-micsupp.c | 5 +-
drivers/regulator/core.c | 152 ++++++++++++-------
drivers/regulator/da9211-regulator.c | 8 +-
drivers/regulator/dbx500-prcmu.c | 32 ++--
drivers/regulator/max77693.c | 93 ++----------
drivers/regulator/palmas-regulator.c | 11 +-
drivers/regulator/qcom_rpm-regulator.c | 30 ++++
drivers/regulator/stw481x-vmmc.c | 8 +-
drivers/regulator/wm8350-regulator.c | 5 +-
drivers/scsi/ufs/ufshcd.c | 27 +---
drivers/usb/phy/phy-ab8500-usb.c | 4 +-
drivers/usb/phy/phy-msm-usb.c | 15 +-
include/linux/mfd/max77693.h | 12 +-
include/linux/mfd/palmas.h | 1 +
include/linux/mfd/stw481x.h | 4 -
include/linux/regulator/act8865.h | 14 ++
include/linux/regulator/consumer.h | 7 +-
include/linux/regulator/driver.h | 4 +
24 files changed, 377 insertions(+), 260 deletions(-)
Merging security/next (4f9a60f5c7e7 Merge branch 'smack-for-4.1' of git://github.com/cschaufler/smack-next into next)
$ git merge security/next
Resolved 'drivers/char/tpm/tpm-chip.c' using previous resolution.
Auto-merging security/smack/smack_lsm.c
Auto-merging include/linux/platform_data/st33zp24.h
Auto-merging drivers/char/tpm/tpm_infineon.c
Removing drivers/char/tpm/tpm_i2c_stm_st33.c
Auto-merging drivers/char/tpm/tpm-chip.c
CONFLICT (content): Merge conflict in drivers/char/tpm/tpm-chip.c
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master d75b5125060e] Merge remote-tracking branch 'security/next'
$ git diff -M --stat --summary HEAD^..
.../bindings/security/tpm/st33zp24-spi.txt | 34 +
Documentation/security/Smack.txt | 129 +--
MAINTAINERS | 1 +
drivers/char/tpm/Kconfig | 20 +-
drivers/char/tpm/Makefile | 2 +-
drivers/char/tpm/st33zp24/Kconfig | 30 +
drivers/char/tpm/st33zp24/Makefile | 12 +
drivers/char/tpm/st33zp24/i2c.c | 276 +++++++
drivers/char/tpm/st33zp24/spi.c | 399 +++++++++
drivers/char/tpm/st33zp24/st33zp24.c | 698 ++++++++++++++++
drivers/char/tpm/st33zp24/st33zp24.h | 37 +
drivers/char/tpm/tpm-chip.c | 66 +-
drivers/char/tpm/tpm_i2c_stm_st33.c | 911 ---------------------
drivers/char/tpm/tpm_infineon.c | 34 +-
.../platform_data/{tpm_stm_st33.h => st33zp24.h} | 21 +-
security/smack/smack.h | 8 +
security/smack/smack_access.c | 43 +-
security/smack/smack_lsm.c | 99 ++-
security/smack/smackfs.c | 97 ++-
security/yama/Kconfig | 2 -
security/yama/yama_lsm.c | 13 +-
21 files changed, 1862 insertions(+), 1070 deletions(-)
create mode 100644 Documentation/devicetree/bindings/security/tpm/st33zp24-spi.txt
create mode 100644 drivers/char/tpm/st33zp24/Kconfig
create mode 100644 drivers/char/tpm/st33zp24/Makefile
create mode 100644 drivers/char/tpm/st33zp24/i2c.c
create mode 100644 drivers/char/tpm/st33zp24/spi.c
create mode 100644 drivers/char/tpm/st33zp24/st33zp24.c
create mode 100644 drivers/char/tpm/st33zp24/st33zp24.h
delete mode 100644 drivers/char/tpm/tpm_i2c_stm_st33.c
rename include/linux/platform_data/{tpm_stm_st33.h => st33zp24.h} (60%)
Merging integrity/next (7bea7ff67e0c ima: /proc/keys is now mandatory)
$ git merge integrity/next
Merge made by the 'recursive' strategy.
Merging selinux/next (cf7b6c0205f1 selinux: increase avtab max buckets)
$ git merge selinux/next
Merge made by the 'recursive' strategy.
security/selinux/avc.c | 6 ++--
security/selinux/ss/avtab.c | 72 ++++++++++++++++++++++++++++++++----------
security/selinux/ss/avtab.h | 8 +++--
security/selinux/ss/mls.c | 10 ++----
security/selinux/ss/services.c | 6 +---
5 files changed, 67 insertions(+), 35 deletions(-)
Merging lblnet/next (b2776bf7149b Linux 3.18)
$ git merge lblnet/next
Already up-to-date.
Merging watchdog/master (fe92a2e35727 watchdog: octeon: use fixed length string for register names)
$ git merge watchdog/master
Auto-merging drivers/watchdog/Kconfig
Auto-merging arch/arm/boot/dts/qcom-ipq8064.dtsi
Merge made by the 'recursive' strategy.
.../devicetree/bindings/arm/msm/timer.txt | 16 +-
arch/arm/boot/dts/qcom-ipq8064.dtsi | 14 +-
drivers/watchdog/Kconfig | 2 +-
drivers/watchdog/bcm_kona_wdt.c | 27 +--
drivers/watchdog/octeon-wdt-main.c | 201 +++++----------------
drivers/watchdog/qcom-wdt.c | 21 ++-
6 files changed, 106 insertions(+), 175 deletions(-)
Merging iommu/next (7f65ef01e131 Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'arm/smmu', 'arm/tegra' and 'core' into next)
$ git merge iommu/next
Auto-merging drivers/iommu/intel-iommu.c
Merge made by the 'recursive' strategy.
drivers/iommu/amd_iommu.c | 250 ++++++++++++++++++------------------
drivers/iommu/amd_iommu_types.h | 13 +-
drivers/iommu/amd_iommu_v2.c | 2 +-
drivers/iommu/arm-smmu.c | 171 +++++++++++++++---------
drivers/iommu/exynos-iommu.c | 87 +++++++------
drivers/iommu/fsl_pamu_domain.c | 60 +++++----
drivers/iommu/fsl_pamu_domain.h | 2 +-
drivers/iommu/intel-iommu.c | 61 +++++----
drivers/iommu/intel_irq_remapping.c | 12 +-
drivers/iommu/io-pgtable-arm.c | 5 +
drivers/iommu/iommu.c | 26 ++--
drivers/iommu/ipmmu-vmsa.c | 41 +++---
drivers/iommu/msm_iommu.c | 73 ++++++-----
drivers/iommu/omap-iommu.c | 49 ++++---
drivers/iommu/rockchip-iommu.c | 40 +++---
drivers/iommu/shmobile-iommu.c | 39 +++---
drivers/iommu/tegra-gart.c | 88 ++++++++-----
drivers/iommu/tegra-smmu.c | 59 +++++----
include/linux/iommu.h | 33 ++++-
19 files changed, 634 insertions(+), 477 deletions(-)
Merging dwmw2-iommu/master (03ecc32c5274 iommu/vt-d: support extended root and context entries)
$ git merge dwmw2-iommu/master
Auto-merging drivers/iommu/intel_irq_remapping.c
Auto-merging drivers/iommu/intel-iommu.c
Merge made by the 'recursive' strategy.
drivers/iommu/intel-iommu.c | 142 +++++++++++++++++-------------------
drivers/iommu/intel_irq_remapping.c | 5 +-
include/linux/intel-iommu.h | 18 ++++-
3 files changed, 82 insertions(+), 83 deletions(-)
Merging vfio/next (6eb7018705de vfio-pci: Move idle devices to D3hot power state)
$ git merge vfio/next
Merge made by the 'recursive' strategy.
drivers/vfio/Kconfig | 6 +
drivers/vfio/Makefile | 4 +
drivers/vfio/pci/Kconfig | 1 +
drivers/vfio/pci/vfio_pci.c | 187 +++++++--
drivers/vfio/pci/vfio_pci_intrs.c | 238 +-----------
drivers/vfio/pci/vfio_pci_private.h | 3 -
drivers/vfio/platform/Kconfig | 20 +
drivers/vfio/platform/Makefile | 8 +
drivers/vfio/platform/vfio_amba.c | 115 ++++++
drivers/vfio/platform/vfio_platform.c | 103 +++++
drivers/vfio/platform/vfio_platform_common.c | 521 ++++++++++++++++++++++++++
drivers/vfio/platform/vfio_platform_irq.c | 336 +++++++++++++++++
drivers/vfio/platform/vfio_platform_private.h | 85 +++++
drivers/vfio/vfio.c | 13 +-
drivers/vfio/virqfd.c | 226 +++++++++++
include/linux/vfio.h | 25 ++
include/linux/vgaarb.h | 5 +
include/uapi/linux/vfio.h | 2 +
18 files changed, 1639 insertions(+), 259 deletions(-)
create mode 100644 drivers/vfio/platform/Kconfig
create mode 100644 drivers/vfio/platform/Makefile
create mode 100644 drivers/vfio/platform/vfio_amba.c
create mode 100644 drivers/vfio/platform/vfio_platform.c
create mode 100644 drivers/vfio/platform/vfio_platform_common.c
create mode 100644 drivers/vfio/platform/vfio_platform_irq.c
create mode 100644 drivers/vfio/platform/vfio_platform_private.h
create mode 100644 drivers/vfio/virqfd.c
Merging osd/linux-next (1fa3a002b254 Boaz Harrosh - fix email in Documentation)
$ git merge osd/linux-next
Already up-to-date.
Merging jc_docs/docs-next (c8a329c777f5 doc: Add guest_nice column to example output of `cat /proc/stat')
$ git merge jc_docs/docs-next
Auto-merging MAINTAINERS
Auto-merging Documentation/kernel-parameters.txt
Auto-merging Documentation/input/event-codes.txt
Auto-merging Documentation/input/alps.txt
Removing Documentation/i2o/ioctl
Removing Documentation/i2o/README
Auto-merging Documentation/DocBook/drm.tmpl
Merge made by the 'recursive' strategy.
Documentation/CodingStyle | 149 ++++----
Documentation/DocBook/drm.tmpl | 2 +-
Documentation/DocBook/media/v4l/biblio.xml | 11 +-
Documentation/DocBook/media/v4l/dev-sliced-vbi.xml | 2 +-
.../DocBook/media/v4l/vidioc-g-sliced-vbi-cap.xml | 2 +-
Documentation/PCI/MSI-HOWTO.txt | 21 +-
Documentation/PCI/pci-error-recovery.txt | 2 +-
Documentation/PCI/pcieaer-howto.txt | 4 +-
Documentation/arm/Booting | 9 +-
Documentation/arm/README | 15 +-
Documentation/block/biodoc.txt | 36 +-
Documentation/email-clients.txt | 11 +-
Documentation/filesystems/proc.txt | 6 +-
Documentation/gpio/board.txt | 41 ++-
Documentation/i2o/README | 63 ----
Documentation/i2o/ioctl | 394 ---------------------
Documentation/input/alps.txt | 4 +-
Documentation/input/event-codes.txt | 2 +-
Documentation/input/gpio-tilt.txt | 2 +-
Documentation/input/iforce-protocol.txt | 2 +-
Documentation/input/walkera0701.txt | 2 +-
Documentation/input/yealink.txt | 2 +-
Documentation/kernel-parameters.txt | 12 +-
Documentation/kmemcheck.txt | 4 +-
Documentation/kprobes.txt | 4 +-
Documentation/memory-hotplug.txt | 47 ++-
Documentation/printk-formats.txt | 11 +-
Documentation/scheduler/completion.txt | 132 +++----
Documentation/vm/transhuge.txt | 11 +
Documentation/zh_CN/arm64/booting.txt | 54 ++-
Documentation/zh_CN/arm64/legacy_instructions.txt | 72 ++++
Documentation/zh_CN/arm64/memory.txt | 65 ++--
MAINTAINERS | 4 +-
README | 42 +--
include/linux/hsi/hsi.h | 6 +-
35 files changed, 482 insertions(+), 764 deletions(-)
delete mode 100644 Documentation/i2o/README
delete mode 100644 Documentation/i2o/ioctl
create mode 100644 Documentation/zh_CN/arm64/legacy_instructions.txt
Merging trivial/for-next (0e4f93e5017d goldfish: goldfish_tty_probe() is not using 'i' any more)
$ git merge trivial/for-next
Auto-merging tools/perf/util/probe-finder.c
Auto-merging sound/soc/soc-core.c
Auto-merging net/sunrpc/xprtrdma/verbs.c
Auto-merging init/main.c
Auto-merging include/linux/stacktrace.h
Auto-merging fs/jffs2/xattr.c
Auto-merging drivers/tty/ipwireless/hardware.c
Auto-merging drivers/tty/goldfish.c
Auto-merging drivers/scsi/qla2xxx/qla_os.c
Auto-merging drivers/scsi/qla2xxx/qla_init.c
Auto-merging drivers/scsi/ch.c
Auto-merging drivers/pinctrl/nomadik/pinctrl-abx500.c
Auto-merging drivers/net/wireless/rtlwifi/rtl8821ae/dm.c
Auto-merging drivers/net/wireless/rtlwifi/rtl8723be/dm.c
Auto-merging drivers/net/wireless/ath/wcn36xx/smd.c
Auto-merging drivers/net/wireless/ath/ath10k/mac.c
Auto-merging drivers/net/wireless/airo.c
Auto-merging drivers/net/phy/dp83640.c
Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
Auto-merging drivers/mtd/nand/gpmi-nand/gpmi-lib.c
Auto-merging drivers/mmc/core/sd.c
Auto-merging drivers/mmc/core/mmc.c
Auto-merging drivers/media/dvb-frontends/si2168_priv.h
Auto-merging drivers/media/dvb-frontends/m88ds3103.c
Auto-merging arch/powerpc/perf/hv-24x7.c
Auto-merging arch/powerpc/kernel/prom.c
Merge made by the 'recursive' strategy.
arch/arc/kernel/unwind.c | 2 +-
arch/powerpc/include/asm/smu.h | 2 +-
arch/powerpc/kernel/prom.c | 2 +-
arch/powerpc/perf/hv-24x7.c | 2 +-
arch/powerpc/platforms/85xx/p1022_rdk.c | 4 ++--
arch/x86/kernel/test_rodata.c | 2 +-
drivers/iio/adc/max1027.c | 2 +-
drivers/isdn/hardware/mISDN/mISDNinfineon.c | 2 +-
drivers/isdn/mISDN/dsp_cmx.c | 2 +-
drivers/isdn/mISDN/dsp_core.c | 4 ++--
drivers/media/dvb-frontends/m88ds3103.c | 2 +-
drivers/media/dvb-frontends/si2168_priv.h | 2 +-
drivers/media/dvb-frontends/tda10071_priv.h | 2 +-
drivers/media/tuners/msi001.c | 2 +-
drivers/mfd/si476x-i2c.c | 2 +-
drivers/mmc/core/mmc.c | 4 ++--
drivers/mmc/core/sd.c | 4 ++--
drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 2 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 2 +-
drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 2 +-
drivers/net/phy/dp83640.c | 2 +-
drivers/net/wireless/airo.c | 4 ++--
drivers/net/wireless/ath/ath10k/mac.c | 2 +-
drivers/net/wireless/ath/wcn36xx/smd.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8723be/dm.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8821ae/dm.c | 2 +-
drivers/parisc/eisa_enumerator.c | 2 +-
drivers/pinctrl/nomadik/pinctrl-abx500.c | 2 +-
drivers/scsi/be2iscsi/be_cmds.c | 2 +-
drivers/scsi/ch.c | 2 +-
drivers/scsi/osd/osd_initiator.c | 2 +-
drivers/scsi/qla2xxx/qla_init.c | 4 ++--
drivers/scsi/qla2xxx/qla_mid.c | 2 +-
drivers/scsi/qla2xxx/qla_nx.c | 2 +-
drivers/scsi/qla2xxx/qla_os.c | 8 ++++----
drivers/tty/goldfish.c | 2 --
drivers/tty/ipwireless/hardware.c | 2 +-
drivers/usb/storage/isd200.c | 2 +-
fs/jffs2/xattr.c | 2 +-
include/linux/smpboot.h | 1 -
include/linux/stacktrace.h | 2 --
init/main.c | 2 +-
lib/div64.c | 2 +-
net/atm/mpoa_proc.c | 2 +-
net/sunrpc/xprtrdma/verbs.c | 4 ++--
sound/soc/soc-core.c | 4 ++--
tools/perf/util/probe-finder.c | 2 +-
47 files changed, 55 insertions(+), 60 deletions(-)
Merging audit/next (724e7bfcc566 audit: Remove condition which always evaluates to false)
$ git merge audit/next
Auto-merging kernel/auditsc.c
Auto-merging kernel/audit_tree.c
Auto-merging kernel/audit.h
Auto-merging kernel/audit.c
Merge made by the 'recursive' strategy.
kernel/audit.c | 47 +++++++++++++++++-----------
kernel/audit.h | 3 ++
kernel/audit_tree.c | 88 ++++++++++++++++++++++++++++++++++++-----------------
kernel/auditsc.c | 9 +-----
4 files changed, 94 insertions(+), 53 deletions(-)
Merging devicetree/devicetree/next (a2166ca5f320 Merge remote-tracking branch 'robh/for-next' into devicetree/next)
$ git merge devicetree/devicetree/next
Auto-merging include/linux/of.h
Auto-merging drivers/of/base.c
Auto-merging drivers/media/platform/soc_camera/soc_camera.c
Auto-merging drivers/media/platform/am437x/am437x-vpfe.c
Auto-merging drivers/gpu/drm/rcar-du/rcar_du_kms.c
Auto-merging MAINTAINERS
Auto-merging Documentation/devicetree/of_unittest.txt
CONFLICT (rename/delete): Documentation/devicetree/bindings/mips/brcm/brcm,cm-dsl.txt deleted in HEAD and renamed in devicetree/devicetree/next. Version devicetree/devicetree/next of Documentation/devicetree/bindings/mips/brcm/brcm,cm-dsl.txt left in tree.
CONFLICT (rename/delete): Documentation/devicetree/bindings/mips/brcm/brcm,bcm3384-intc.txt deleted in HEAD and renamed in devicetree/devicetree/next. Version devicetree/devicetree/next of Documentation/devicetree/bindings/mips/brcm/brcm,bcm3384-intc.txt left in tree.
Automatic merge failed; fix conflicts and then commit the result.
$ git rm -f Documentation/devicetree/bindings/mips/brcm/brcm,bcm3384-intc.txt Documentation/devicetree/bindings/mips/brcm/brcm,cm-dsl.txt
Documentation/devicetree/bindings/mips/brcm/brcm,bcm3384-intc.txt: needs merge
Documentation/devicetree/bindings/mips/brcm/brcm,cm-dsl.txt: needs merge
rm 'Documentation/devicetree/bindings/mips/brcm/brcm,bcm3384-intc.txt'
rm 'Documentation/devicetree/bindings/mips/brcm/brcm,cm-dsl.txt'
$ git commit -v -a
[master 47e81b914492] Merge remote-tracking branch 'devicetree/devicetree/next'
$ git diff -M --stat --summary HEAD^..
...351-cpu-method => brcm,bcm11351-cpu-method.txt} | 0
.../arm/bcm/{bcm11351.txt => brcm,bcm11351.txt} | 0
.../arm/bcm/{bcm21664.txt => brcm,bcm21664.txt} | 0
.../arm/{bcm2835.txt => bcm/brcm,bcm2835.txt} | 0
.../arm/{bcm4708.txt => bcm/brcm,bcm4708.txt} | 0
.../arm/bcm/{bcm63138.txt => brcm,bcm63138.txt} | 0
.../arm/{brcm-brcmstb.txt => bcm/brcm,brcmstb.txt} | 0
.../arm/bcm/{cygnus.txt => brcm,cygnus.txt} | 0
.../bindings/bus/{bcma.txt => brcm,bus-axi.txt} | 0
.../{bcm-kona-clock.txt => brcm,kona-ccu.txt} | 0
.../dma/{bcm2835-dma.txt => brcm,bcm2835-dma.txt} | 0
.../gpio/{gpio-bcm-kona.txt => brcm,kona-gpio.txt} | 0
.../i2c/{i2c-bcm-kona.txt => brcm,kona-i2c.txt} | 0
.../mfd/{bcm590xx.txt => brcm,bcm59056.txt} | 0
.../mips/brcm/{bmips.txt => brcm,bmips.txt} | 0
.../bindings/misc/{smc.txt => brcm,kona-smc.txt} | 0
.../mmc/{kona-sdhci.txt => brcm,kona-sdhci.txt} | 0
...oadcom-sf2.txt => brcm,bcm7445-switch-v4.0.txt} | 0
.../{broadcom-bcmgenet.txt => brcm,bcmgenet.txt} | 0
...broadcom-systemport.txt => brcm,systemport.txt} | 0
...oadcom-mdio-unimac.txt => brcm,unimac-mdio.txt} | 0
.../phy/{bcm-phy.txt => brcm,kona-usb2-phy.txt} | 0
.../pwm/{bcm-kona-pwm.txt => brcm,kona-pwm.txt} | 0
.../brcm,bcm21664-resetmgr.txt} | 0
.../{bcm63xx-uart.txt => brcm,bcm6345-uart.txt} | 0
.../{bcm2835-i2s.txt => brcm,bcm2835-i2s.txt} | 0
.../kona-timer.txt => timer/brcm,kona-timer.txt} | 0
Documentation/devicetree/bindings/unittest.txt | 44 +-
.../brcm/usb.txt => usb/brcm,bcm3384-usb.txt} | 0
.../kona-wdt.txt => watchdog/brcm,kona-wdt.txt} | 0
.../{of_selftest.txt => of_unittest.txt} | 28 +-
MAINTAINERS | 9 +
drivers/coresight/of_coresight.c | 13 +-
drivers/gpu/drm/imx/imx-drm-core.c | 11 +-
drivers/gpu/drm/rcar-du/rcar_du_kms.c | 15 +-
drivers/media/platform/am437x/am437x-vpfe.c | 1 -
drivers/media/platform/soc_camera/soc_camera.c | 3 +-
drivers/of/Kconfig | 11 +-
drivers/of/Makefile | 5 +-
drivers/of/base.c | 41 +-
drivers/of/of_net.c | 29 +-
drivers/of/unittest-data/.gitignore | 2 +
drivers/of/unittest-data/Makefile | 7 +
drivers/of/unittest-data/tests-overlay.dtsi | 108 +--
drivers/of/unittest.c | 744 +++++++++++----------
drivers/video/fbdev/omap2/dss/omapdss-boot-init.c | 7 +-
include/linux/of.h | 32 +
include/linux/of_graph.h | 20 +
48 files changed, 612 insertions(+), 518 deletions(-)
rename Documentation/devicetree/bindings/arm/bcm/{brcm,bcm11351-cpu-method => brcm,bcm11351-cpu-method.txt} (100%)
rename Documentation/devicetree/bindings/arm/bcm/{bcm11351.txt => brcm,bcm11351.txt} (100%)
rename Documentation/devicetree/bindings/arm/bcm/{bcm21664.txt => brcm,bcm21664.txt} (100%)
rename Documentation/devicetree/bindings/arm/{bcm2835.txt => bcm/brcm,bcm2835.txt} (100%)
rename Documentation/devicetree/bindings/arm/{bcm4708.txt => bcm/brcm,bcm4708.txt} (100%)
rename Documentation/devicetree/bindings/arm/bcm/{bcm63138.txt => brcm,bcm63138.txt} (100%)
rename Documentation/devicetree/bindings/arm/{brcm-brcmstb.txt => bcm/brcm,brcmstb.txt} (100%)
rename Documentation/devicetree/bindings/arm/bcm/{cygnus.txt => brcm,cygnus.txt} (100%)
rename Documentation/devicetree/bindings/bus/{bcma.txt => brcm,bus-axi.txt} (100%)
rename Documentation/devicetree/bindings/clock/{bcm-kona-clock.txt => brcm,kona-ccu.txt} (100%)
rename Documentation/devicetree/bindings/dma/{bcm2835-dma.txt => brcm,bcm2835-dma.txt} (100%)
rename Documentation/devicetree/bindings/gpio/{gpio-bcm-kona.txt => brcm,kona-gpio.txt} (100%)
rename Documentation/devicetree/bindings/i2c/{i2c-bcm-kona.txt => brcm,kona-i2c.txt} (100%)
rename Documentation/devicetree/bindings/mfd/{bcm590xx.txt => brcm,bcm59056.txt} (100%)
rename Documentation/devicetree/bindings/mips/brcm/{bmips.txt => brcm,bmips.txt} (100%)
rename Documentation/devicetree/bindings/misc/{smc.txt => brcm,kona-smc.txt} (100%)
rename Documentation/devicetree/bindings/mmc/{kona-sdhci.txt => brcm,kona-sdhci.txt} (100%)
rename Documentation/devicetree/bindings/net/{broadcom-sf2.txt => brcm,bcm7445-switch-v4.0.txt} (100%)
rename Documentation/devicetree/bindings/net/{broadcom-bcmgenet.txt => brcm,bcmgenet.txt} (100%)
rename Documentation/devicetree/bindings/net/{broadcom-systemport.txt => brcm,systemport.txt} (100%)
rename Documentation/devicetree/bindings/net/{broadcom-mdio-unimac.txt => brcm,unimac-mdio.txt} (100%)
rename Documentation/devicetree/bindings/phy/{bcm-phy.txt => brcm,kona-usb2-phy.txt} (100%)
rename Documentation/devicetree/bindings/pwm/{bcm-kona-pwm.txt => brcm,kona-pwm.txt} (100%)
rename Documentation/devicetree/bindings/{arm/bcm/kona-resetmgr.txt => reset/brcm,bcm21664-resetmgr.txt} (100%)
rename Documentation/devicetree/bindings/serial/{bcm63xx-uart.txt => brcm,bcm6345-uart.txt} (100%)
rename Documentation/devicetree/bindings/sound/{bcm2835-i2s.txt => brcm,bcm2835-i2s.txt} (100%)
rename Documentation/devicetree/bindings/{arm/bcm/kona-timer.txt => timer/brcm,kona-timer.txt} (100%)
rename Documentation/devicetree/bindings/{mips/brcm/usb.txt => usb/brcm,bcm3384-usb.txt} (100%)
rename Documentation/devicetree/bindings/{arm/bcm/kona-wdt.txt => watchdog/brcm,kona-wdt.txt} (100%)
rename Documentation/devicetree/{of_selftest.txt => of_unittest.txt} (90%)
create mode 100644 drivers/of/unittest-data/.gitignore
create mode 100644 drivers/of/unittest-data/Makefile
Merging dt-rh/for-next (01218bf14ee6 of: Explicitly include linux/types.h in of_graph.h)
$ git merge dt-rh/for-next
Already up-to-date.
Merging mailbox/mailbox-for-next (ee23d66af921 mailbox: arm_mhu: add driver for ARM MHU controller)
$ git merge mailbox/mailbox-for-next
Merge made by the 'recursive' strategy.
.../devicetree/bindings/mailbox/arm-mhu.txt | 43 +++++
drivers/mailbox/Kconfig | 9 +
drivers/mailbox/Makefile | 2 +
drivers/mailbox/arm_mhu.c | 195 +++++++++++++++++++++
drivers/mailbox/pcc.c | 122 ++++---------
5 files changed, 286 insertions(+), 85 deletions(-)
create mode 100644 Documentation/devicetree/bindings/mailbox/arm-mhu.txt
create mode 100644 drivers/mailbox/arm_mhu.c
Merging spi/for-next (8a8d1324c885 Merge remote-tracking branches 'spi/topic/spidev' and 'spi/topic/spidev-test' into spi-next)
$ git merge spi/for-next
Removing include/linux/intel_mid_dma.h
Auto-merging drivers/spi/spi-rspi.c
CONFLICT (modify/delete): drivers/dma/intel_mid_dma_regs.h deleted in spi/for-next and modified in HEAD. Version HEAD of drivers/dma/intel_mid_dma_regs.h left in tree.
CONFLICT (modify/delete): drivers/dma/intel_mid_dma.c deleted in spi/for-next and modified in HEAD. Version HEAD of drivers/dma/intel_mid_dma.c left in tree.
Auto-merging drivers/dma/Makefile
Auto-merging drivers/dma/Kconfig
Automatic merge failed; fix conflicts and then commit the result.
$ git rm -f drivers/dma/intel_mid_dma_regs.h drivers/dma/intel_mid_dma.c
drivers/dma/intel_mid_dma.c: needs merge
drivers/dma/intel_mid_dma_regs.h: needs merge
rm 'drivers/dma/intel_mid_dma.c'
rm 'drivers/dma/intel_mid_dma_regs.h'
$ git commit -v -a
[master 6ea414c7681f] Merge remote-tracking branch 'spi/for-next'
$ git diff -M --stat --summary HEAD^..
.../devicetree/bindings/spi/fsl-imx-cspi.txt | 12 +-
.../devicetree/bindings/spi/qcom,spi-qup.txt | 8 +
.../devicetree/bindings/spi/spi-fsl-dspi.txt | 8 +
.../devicetree/bindings/spi/spi-rockchip.txt | 4 +
Documentation/spi/spi-summary | 3 +-
Documentation/spi/spidev_test.c | 115 +-
drivers/dma/Kconfig | 13 -
drivers/dma/Makefile | 1 -
drivers/dma/intel_mid_dma.c | 1443 --------------------
drivers/dma/intel_mid_dma_regs.h | 295 ----
drivers/spi/Kconfig | 5 +-
drivers/spi/spi-atmel.c | 8 +-
drivers/spi/spi-bcm2835.c | 296 ++--
drivers/spi/spi-bcm53xx.c | 4 +-
drivers/spi/spi-bfin5xx.c | 3 +-
drivers/spi/spi-bitbang-txrx.h | 18 +-
drivers/spi/spi-dw-mid.c | 167 ++-
drivers/spi/spi-dw.c | 306 ++---
drivers/spi/spi-dw.h | 70 +-
drivers/spi/spi-fsl-dspi.c | 97 +-
drivers/spi/spi-img-spfi.c | 43 +-
drivers/spi/spi-imx.c | 8 +-
drivers/spi/spi-mpc512x-psc.c | 2 +-
drivers/spi/spi-octeon.c | 2 +-
drivers/spi/spi-omap-100k.c | 101 +-
drivers/spi/spi-omap-uwire.c | 1 -
drivers/spi/spi-pl022.c | 14 +-
drivers/spi/spi-pxa2xx.c | 192 ++-
drivers/spi/spi-qup.c | 336 ++++-
drivers/spi/spi-rockchip.c | 38 +-
drivers/spi/spi-rspi.c | 124 +-
drivers/spi/spi-s3c64xx.c | 4 +-
drivers/spi/spi-sc18is602.c | 2 +-
drivers/spi/spi-st-ssc4.c | 2 +-
drivers/spi/spi.c | 121 +-
drivers/spi/spidev.c | 55 +-
include/linux/intel_mid_dma.h | 76 --
include/linux/spi/spi.h | 8 +-
38 files changed, 1352 insertions(+), 2653 deletions(-)
delete mode 100644 drivers/dma/intel_mid_dma.c
delete mode 100644 drivers/dma/intel_mid_dma_regs.h
delete mode 100644 include/linux/intel_mid_dma.h
Merging tip/auto-latest (05154531bcc3 Merge branch 'x86/vdso')
$ git merge tip/auto-latest
Resolved 'include/linux/bpf.h' using previous resolution.
Resolved 'include/uapi/linux/bpf.h' using previous resolution.
Resolved 'samples/bpf/Makefile' using previous resolution.
Auto-merging tools/perf/util/probe-finder.c
Auto-merging tools/build/feature/test-pthread-attr-setaffinity-np.c
Auto-merging tools/build/feature/test-all.c
Auto-merging tools/build/feature/Makefile
Auto-merging tools/build/feature/.gitignore
Auto-merging samples/bpf/test_verifier.c
Auto-merging samples/bpf/libbpf.h
Auto-merging samples/bpf/bpf_helpers.h
Auto-merging samples/bpf/Makefile
CONFLICT (content): Merge conflict in samples/bpf/Makefile
Auto-merging lib/Kconfig.debug
Auto-merging kernel/bpf/syscall.c
Auto-merging init/Kconfig
Auto-merging include/uapi/linux/bpf.h
CONFLICT (content): Merge conflict in include/uapi/linux/bpf.h
Auto-merging include/linux/vfio.h
Auto-merging include/linux/tick.h
Auto-merging include/linux/clocksource.h
Auto-merging include/linux/bpf.h
CONFLICT (content): Merge conflict in include/linux/bpf.h
Auto-merging drivers/idle/intel_idle.c
Auto-merging drivers/clocksource/arm_arch_timer.c
Auto-merging drivers/acpi/processor_idle.c
Auto-merging arch/x86/lguest/boot.c
Auto-merging arch/x86/include/uapi/asm/msr-index.h
Removing arch/x86/ia32/syscall_ia32.c
Removing arch/x86/ia32/nosyscall.c
Auto-merging arch/x86/Kconfig
Auto-merging arch/powerpc/perf/core-book3s.c
Auto-merging arch/mips/lasat/sysctl.c
Auto-merging arch/arm/mach-tegra/cpuidle-tegra30.c
Auto-merging arch/arm/mach-tegra/cpuidle-tegra20.c
Auto-merging arch/arm/mach-omap2/cpuidle44xx.c
Auto-merging MAINTAINERS
Auto-merging Documentation/kernel-parameters.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master c060d29a10d3] Merge remote-tracking branch 'tip/auto-latest'
$ git diff -M --stat --summary HEAD^..
Documentation/acpi/apei/einj.txt | 196 +--
Documentation/atomic_ops.txt | 45 +-
Documentation/kernel-parameters.txt | 29 +-
Documentation/kernel-per-CPU-kthreads.txt | 34 +-
Documentation/memory-barriers.txt | 42 +-
Documentation/scsi/ncr53c8xx.txt | 25 -
Documentation/scsi/tmscsim.txt | 4 -
Documentation/timers/NO_HZ.txt | 10 +-
Documentation/x86/boot.txt | 6 +
MAINTAINERS | 6 +
arch/alpha/kernel/rtc.c | 8 +-
arch/arm/common/bL_switcher.c | 16 +-
arch/arm/include/asm/mach/time.h | 3 +-
arch/arm/kernel/hw_breakpoint.c | 2 +-
arch/arm/kernel/time.c | 6 +-
arch/arm/mach-omap2/cpuidle44xx.c | 10 +-
arch/arm/mach-tegra/cpuidle-tegra114.c | 6 +-
arch/arm/mach-tegra/cpuidle-tegra20.c | 10 +-
arch/arm/mach-tegra/cpuidle-tegra30.c | 10 +-
arch/arm/plat-omap/counter_32k.c | 20 +-
arch/arm64/kernel/hw_breakpoint.c | 2 +-
arch/arm64/kernel/vdso.c | 10 +-
arch/blackfin/mach-common/smp.c | 6 +-
arch/metag/kernel/smp.c | 5 +-
arch/mips/lasat/sysctl.c | 4 +-
arch/powerpc/include/asm/kvm_book3s.h | 4 -
arch/powerpc/perf/core-book3s.c | 13 +-
arch/s390/kernel/time.c | 20 +-
arch/sparc/kernel/time_32.c | 6 +-
arch/tile/kernel/time.c | 24 +-
arch/x86/Kconfig | 58 +-
arch/x86/boot/compressed/aslr.c | 5 +-
arch/x86/boot/compressed/head_32.S | 3 +-
arch/x86/boot/compressed/head_64.S | 5 +-
arch/x86/boot/compressed/misc.c | 5 +-
arch/x86/boot/compressed/misc.h | 6 +-
arch/x86/boot/string.c | 2 +-
arch/x86/boot/video-mode.c | 4 +-
arch/x86/boot/video.c | 2 +
arch/x86/boot/video.h | 1 -
arch/x86/configs/i386_defconfig | 2 +-
arch/x86/configs/x86_64_defconfig | 2 +-
arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 2 +-
arch/x86/crypto/twofish-x86_64-asm_64.S | 4 +-
arch/x86/ia32/Makefile | 1 -
arch/x86/ia32/ia32_signal.c | 19 +-
arch/x86/ia32/ia32entry.S | 483 ++++---
arch/x86/ia32/nosyscall.c | 7 -
arch/x86/ia32/sys_ia32.c | 14 -
arch/x86/ia32/syscall_ia32.c | 25 -
arch/x86/include/asm/alternative-asm.h | 53 +-
arch/x86/include/asm/alternative.h | 73 +-
arch/x86/include/asm/apic.h | 3 +-
arch/x86/include/asm/barrier.h | 6 +-
arch/x86/include/asm/calling.h | 284 ++--
arch/x86/include/asm/compat.h | 2 +-
arch/x86/include/asm/cpu.h | 2 -
arch/x86/include/asm/cpufeature.h | 42 +-
arch/x86/include/asm/desc.h | 7 +-
arch/x86/include/asm/dwarf2.h | 24 +
arch/x86/include/asm/efi.h | 6 +-
arch/x86/include/asm/elf.h | 8 +-
arch/x86/include/asm/fpu-internal.h | 130 +-
arch/x86/include/asm/insn.h | 2 +-
arch/x86/include/asm/irqflags.h | 49 +-
arch/x86/include/asm/mce.h | 16 +-
arch/x86/include/asm/microcode.h | 73 ++
arch/x86/include/asm/microcode_intel.h | 13 +-
arch/x86/include/asm/mwait.h | 8 +
arch/x86/include/asm/paravirt.h | 5 -
arch/x86/include/asm/processor.h | 110 +-
arch/x86/include/asm/ptrace.h | 45 +-
arch/x86/include/asm/segment.h | 289 ++--
arch/x86/include/asm/setup.h | 5 +
arch/x86/include/asm/sigcontext.h | 6 +-
arch/x86/include/asm/sighandling.h | 4 +-
arch/x86/include/asm/smap.h | 30 +-
arch/x86/include/asm/smp.h | 3 +-
arch/x86/include/asm/special_insns.h | 24 +
arch/x86/include/asm/thread_info.h | 74 +-
arch/x86/include/uapi/asm/bootparam.h | 1 +
arch/x86/include/uapi/asm/e820.h | 10 +
arch/x86/include/uapi/asm/msr-index.h | 18 +
arch/x86/include/uapi/asm/ptrace-abi.h | 16 +-
arch/x86/include/uapi/asm/ptrace.h | 13 +-
arch/x86/include/uapi/asm/sigcontext.h | 21 +-
arch/x86/kernel/Makefile | 2 +
arch/x86/kernel/alternative.c | 163 ++-
arch/x86/kernel/apic/apic.c | 62 -
arch/x86/kernel/apic/x2apic_cluster.c | 8 +-
arch/x86/kernel/asm-offsets_32.c | 2 +-
arch/x86/kernel/asm-offsets_64.c | 1 +
arch/x86/kernel/cpu/Makefile | 3 +-
arch/x86/kernel/cpu/amd.c | 9 +
arch/x86/kernel/cpu/common.c | 126 +-
arch/x86/kernel/cpu/intel_cacheinfo.c | 715 +++-------
arch/x86/kernel/cpu/intel_pt.h | 131 ++
arch/x86/kernel/cpu/mcheck/mce-internal.h | 11 +-
arch/x86/kernel/cpu/mcheck/mce-severity.c | 66 +-
arch/x86/kernel/cpu/mcheck/mce.c | 154 +--
arch/x86/kernel/cpu/mcheck/mce_amd.c | 11 +-
arch/x86/kernel/cpu/mcheck/mce_intel.c | 63 +-
arch/x86/kernel/cpu/microcode/amd.c | 1 -
arch/x86/kernel/cpu/microcode/core_early.c | 75 +-
arch/x86/kernel/cpu/microcode/intel.c | 4 +-
arch/x86/kernel/cpu/microcode/intel_early.c | 345 +++--
arch/x86/kernel/cpu/microcode/intel_lib.c | 22 +-
arch/x86/kernel/cpu/mkcapflags.sh | 2 +-
arch/x86/kernel/cpu/perf_event.c | 223 +++-
arch/x86/kernel/cpu/perf_event.h | 167 ++-
arch/x86/kernel/cpu/perf_event_amd.c | 9 +-
arch/x86/kernel/cpu/perf_event_amd_ibs.c | 12 +-
arch/x86/kernel/cpu/perf_event_intel.c | 908 ++++++++++++-
arch/x86/kernel/cpu/perf_event_intel_bts.c | 525 ++++++++
arch/x86/kernel/cpu/perf_event_intel_cqm.c | 1379 ++++++++++++++++++++
arch/x86/kernel/cpu/perf_event_intel_ds.c | 31 +-
arch/x86/kernel/cpu/perf_event_intel_lbr.c | 321 ++++-
arch/x86/kernel/cpu/perf_event_intel_pt.c | 1096 ++++++++++++++++
.../x86/kernel/cpu/perf_event_intel_uncore_snbep.c | 3 +-
arch/x86/kernel/cpu/scattered.c | 1 +
arch/x86/kernel/crash.c | 2 +-
arch/x86/kernel/devicetree.c | 4 +-
arch/x86/kernel/dumpstack.c | 15 +-
arch/x86/kernel/dumpstack_32.c | 13 +-
arch/x86/kernel/dumpstack_64.c | 11 +-
arch/x86/kernel/e820.c | 28 +-
arch/x86/kernel/early_printk.c | 32 +-
arch/x86/kernel/entry_32.S | 42 +-
arch/x86/kernel/entry_64.S | 739 +++++------
arch/x86/kernel/head64.c | 3 -
arch/x86/kernel/head_32.S | 3 +-
arch/x86/kernel/head_64.S | 6 +-
arch/x86/kernel/i387.c | 56 +-
arch/x86/kernel/ioport.c | 2 +-
arch/x86/kernel/irq.c | 4 +-
arch/x86/kernel/irq_32.c | 2 +-
arch/x86/kernel/irq_64.c | 2 +-
arch/x86/kernel/kgdb.c | 4 +-
arch/x86/kernel/kprobes/core.c | 13 +-
arch/x86/kernel/module.c | 11 +-
arch/x86/kernel/perf_regs.c | 2 +-
arch/x86/kernel/pmem.c | 53 +
arch/x86/kernel/process.c | 106 +-
arch/x86/kernel/process_32.c | 27 +-
arch/x86/kernel/process_64.c | 24 +-
arch/x86/kernel/ptrace.c | 12 +-
arch/x86/kernel/relocate_kernel_32.S | 8 +-
arch/x86/kernel/relocate_kernel_64.S | 16 +-
arch/x86/kernel/setup.c | 21 +-
arch/x86/kernel/signal.c | 52 +-
arch/x86/kernel/smpboot.c | 77 +-
arch/x86/kernel/sys_x86_64.c | 30 +-
arch/x86/kernel/syscall_32.c | 16 +-
arch/x86/kernel/time.c | 2 +-
arch/x86/kernel/traps.c | 62 +-
arch/x86/kernel/uprobes.c | 2 +-
arch/x86/kernel/vm86_32.c | 4 +-
arch/x86/kernel/vsyscall_gtod.c | 24 +-
arch/x86/kernel/xsave.c | 39 +-
arch/x86/kvm/x86.c | 14 +-
arch/x86/lguest/boot.c | 1 +
arch/x86/lib/atomic64_cx8_32.S | 50 +-
arch/x86/lib/checksum_32.S | 64 +-
arch/x86/lib/clear_page_64.S | 66 +-
arch/x86/lib/copy_page_64.S | 37 +-
arch/x86/lib/copy_user_64.S | 46 +-
arch/x86/lib/csum-copy_64.S | 2 +-
arch/x86/lib/insn.c | 13 +
arch/x86/lib/memcpy_64.S | 68 +-
arch/x86/lib/memmove_64.S | 19 +-
arch/x86/lib/memset_64.S | 61 +-
arch/x86/lib/msr-reg.S | 24 +-
arch/x86/lib/rwsem.S | 44 +-
arch/x86/lib/thunk_32.S | 18 +-
arch/x86/lib/thunk_64.S | 28 +-
arch/x86/lib/x86-opcode-map.txt | 9 +
arch/x86/mm/fault.c | 8 +-
arch/x86/mm/init.c | 69 +-
arch/x86/mm/init_64.c | 14 -
arch/x86/mm/numa.c | 11 +-
arch/x86/mm/pageattr.c | 4 -
arch/x86/mm/pat.c | 6 +-
arch/x86/mm/pgtable.c | 81 +-
arch/x86/oprofile/backtrace.c | 2 +-
arch/x86/platform/efi/efi-bgrt.c | 4 +-
arch/x86/platform/efi/efi.c | 17 +-
arch/x86/platform/efi/efi_32.c | 22 +-
arch/x86/platform/efi/efi_64.c | 29 +-
arch/x86/platform/intel-quark/imr_selftest.c | 10 +-
arch/x86/platform/uv/tlb_uv.c | 6 +-
arch/x86/power/cpu.c | 2 +-
arch/x86/syscalls/syscall_32.tbl | 4 +-
arch/x86/syscalls/syscall_64.tbl | 2 +-
arch/x86/um/asm/barrier.h | 4 +-
arch/x86/um/sys_call_table_64.c | 2 +-
arch/x86/vdso/Makefile | 4 +-
arch/x86/vdso/vdso32/syscall.S | 2 -
arch/x86/xen/enlighten.c | 1 +
arch/x86/xen/smp.c | 60 +-
arch/x86/xen/suspend.c | 11 +-
arch/x86/xen/xen-asm_64.S | 8 +-
drivers/acpi/acpi_pad.c | 29 +-
drivers/acpi/processor_idle.c | 20 +-
drivers/block/Kconfig | 11 +
drivers/block/Makefile | 1 +
drivers/block/cpqarray.c | 4 +-
drivers/block/pmem.c | 262 ++++
drivers/bus/omap_l3_noc.c | 4 +-
drivers/bus/omap_l3_smx.c | 10 +-
drivers/clocksource/arm_arch_timer.c | 12 +-
drivers/clocksource/dw_apb_timer_of.c | 2 +-
drivers/clocksource/em_sti.c | 2 +-
drivers/clocksource/sh_cmt.c | 2 +-
drivers/clocksource/sh_tmu.c | 2 +-
drivers/clocksource/sun4i_timer.c | 10 +-
drivers/clocksource/tegra20_timer.c | 19 +-
drivers/clocksource/time-efm32.c | 2 +-
drivers/clocksource/timer-atmel-pit.c | 4 +-
drivers/clocksource/timer-sun5i.c | 299 ++++-
drivers/cpuidle/driver.c | 23 +-
drivers/firmware/dmi_scan.c | 38 +-
drivers/firmware/efi/libstub/arm-stub.c | 7 +-
drivers/firmware/efi/libstub/efistub.h | 2 +-
drivers/firmware/efi/libstub/fdt.c | 7 +-
drivers/idle/intel_idle.c | 17 +-
drivers/misc/sgi-xp/xpc_main.c | 2 +-
drivers/mtd/nand/hisi504_nand.c | 3 +-
drivers/rtc/class.c | 8 +-
drivers/rtc/interface.c | 8 +-
drivers/rtc/rtc-ab3100.c | 55 +-
drivers/rtc/rtc-mc13xxx.c | 32 +-
drivers/rtc/rtc-mxc.c | 55 +-
drivers/rtc/rtc-test.c | 19 +-
drivers/rtc/systohc.c | 7 +-
include/linux/clockchips.h | 154 +--
include/linux/clocksource.h | 25 +-
include/linux/compiler.h | 16 -
include/linux/context_tracking.h | 15 +-
include/linux/context_tracking_state.h | 9 +-
include/linux/cpu.h | 14 +
include/linux/efi.h | 1 +
include/linux/ftrace_event.h | 14 +
include/linux/hardirq.h | 2 +-
include/linux/init.h | 38 +-
include/linux/interrupt.h | 4 +-
include/linux/irq_work.h | 3 +-
include/linux/irqflags.h | 43 +-
include/linux/kvm_host.h | 3 +-
include/linux/lockdep.h | 7 +-
include/linux/perf_event.h | 121 +-
include/linux/rcupdate.h | 40 +-
include/linux/rtc.h | 1 +
include/linux/sched.h | 21 +-
include/linux/seqlock.h | 6 +-
include/linux/srcu.h | 2 +-
include/linux/stddef.h | 9 +
include/linux/tick.h | 190 +--
include/linux/timekeeper_internal.h | 16 +-
include/linux/timekeeping.h | 18 +-
include/linux/vfio.h | 13 -
include/linux/watchdog.h | 8 +
include/uapi/linux/bpf.h | 5 +
include/uapi/linux/perf_event.h | 115 +-
init/Kconfig | 15 +-
kernel/bpf/syscall.c | 7 +-
kernel/context_tracking.c | 59 +-
kernel/cpu.c | 9 +-
kernel/events/core.c | 752 ++++++++---
kernel/events/hw_breakpoint.c | 8 +-
kernel/events/internal.h | 33 +
kernel/events/ring_buffer.c | 327 ++++-
kernel/futex.c | 2 +-
kernel/irq/manage.c | 36 +-
kernel/locking/mcs_spinlock.h | 6 +-
kernel/locking/mutex.c | 57 +-
kernel/locking/osq_lock.c | 14 +-
kernel/locking/rtmutex.c | 2 +-
kernel/locking/rwsem-spinlock.c | 7 +
kernel/locking/rwsem-xadd.c | 98 +-
kernel/locking/rwsem.c | 22 +-
kernel/locking/rwsem.h | 20 +
kernel/rcu/rcutorture.c | 27 +-
kernel/rcu/srcu.c | 19 +-
kernel/rcu/tiny.c | 14 +-
kernel/rcu/tree.c | 437 +++++--
kernel/rcu/tree.h | 11 +-
kernel/rcu/tree_plugin.h | 267 ++--
kernel/rcu/tree_trace.c | 4 +-
kernel/rcu/update.c | 72 +-
kernel/sched/core.c | 98 +-
kernel/sched/deadline.c | 77 +-
kernel/sched/debug.c | 12 +-
kernel/sched/fair.c | 425 +++---
kernel/sched/features.h | 13 +
kernel/sched/idle.c | 14 +-
kernel/sched/rt.c | 181 ++-
kernel/sched/sched.h | 38 +-
kernel/smpboot.c | 156 +++
kernel/time/Kconfig | 6 -
kernel/time/Makefile | 6 +-
kernel/time/clockevents.c | 229 ++--
kernel/time/clocksource.c | 173 ++-
kernel/time/hrtimer.c | 9 +-
kernel/time/jiffies.c | 7 +-
kernel/time/ntp.c | 14 +-
kernel/time/sched_clock.c | 236 ++--
kernel/time/tick-broadcast.c | 179 +--
kernel/time/tick-common.c | 82 +-
kernel/time/tick-internal.h | 211 ++-
kernel/time/tick-oneshot.c | 6 +-
kernel/time/tick-sched.c | 7 +-
kernel/time/tick-sched.h | 74 ++
kernel/time/timekeeping.c | 490 ++++---
kernel/time/timekeeping.h | 7 +
kernel/time/timer.c | 149 +--
kernel/time/timer_list.c | 34 +-
kernel/trace/Kconfig | 8 +
kernel/trace/Makefile | 1 +
kernel/trace/bpf_trace.c | 222 ++++
kernel/trace/trace_kprobe.c | 10 +-
kernel/trace/trace_uprobe.c | 10 +-
kernel/watchdog.c | 28 +
lib/Kconfig.debug | 48 +-
lib/lockref.c | 2 +-
samples/bpf/Makefile | 16 +
samples/bpf/bpf_helpers.h | 6 +
samples/bpf/bpf_load.c | 125 +-
samples/bpf/bpf_load.h | 3 +
samples/bpf/libbpf.c | 14 +-
samples/bpf/libbpf.h | 5 +-
samples/bpf/sock_example.c | 2 +-
samples/bpf/test_verifier.c | 2 +-
samples/bpf/tracex1_kern.c | 50 +
samples/bpf/tracex1_user.c | 25 +
samples/bpf/tracex2_kern.c | 86 ++
samples/bpf/tracex2_user.c | 95 ++
samples/bpf/tracex3_kern.c | 89 ++
samples/bpf/tracex3_user.c | 150 +++
samples/bpf/tracex4_kern.c | 54 +
samples/bpf/tracex4_user.c | 69 +
tools/build/Build.include | 81 ++
tools/build/Documentation/Build.txt | 139 ++
tools/build/Makefile.build | 130 ++
tools/build/Makefile.feature | 171 +++
.../feature-checks => build/feature}/.gitignore | 1 +
.../feature-checks => build/feature}/Makefile | 31 +-
.../feature-checks => build/feature}/test-all.c | 19 +-
.../feature}/test-backtrace.c | 0
.../feature-checks => build/feature}/test-bionic.c | 0
.../feature}/test-compile.c | 0
.../feature}/test-cplus-demangle.c | 0
.../feature-checks => build/feature}/test-dwarf.c | 0
.../feature}/test-fortify-source.c | 0
.../feature-checks => build/feature}/test-glibc.c | 0
.../feature}/test-gtk2-infobar.c | 0
.../feature-checks => build/feature}/test-gtk2.c | 0
.../feature-checks => build/feature}/test-hello.c | 0
.../feature}/test-libaudit.c | 0
tools/build/feature/test-libbabeltrace.c | 9 +
.../feature-checks => build/feature}/test-libbfd.c | 0
.../feature}/test-libdw-dwarf-unwind.c | 0
.../feature}/test-libelf-getphdrnum.c | 0
.../feature}/test-libelf-mmap.c | 0
.../feature-checks => build/feature}/test-libelf.c | 0
.../feature}/test-libnuma.c | 0
.../feature}/test-libperl.c | 0
.../feature}/test-libpython-version.c | 0
.../feature}/test-libpython.c | 0
.../feature}/test-libslang.c | 0
.../feature}/test-libunwind-debug-frame.c | 0
.../feature}/test-libunwind.c | 0
tools/build/feature/test-lzma.c | 10 +
.../feature}/test-pthread-attr-setaffinity-np.c | 4 +-
.../feature}/test-stackprotector-all.c | 0
.../feature}/test-sync-compare-and-swap.c | 0
.../feature}/test-timerfd.c | 0
.../feature-checks => build/feature}/test-zlib.c | 0
tools/build/tests/ex/Build | 8 +
tools/build/tests/ex/Makefile | 23 +
tools/build/tests/ex/a.c | 5 +
tools/build/tests/ex/arch/Build | 2 +
tools/build/tests/ex/arch/e.c | 5 +
tools/build/tests/ex/arch/f.c | 5 +
tools/build/tests/ex/b.c | 5 +
tools/build/tests/ex/c.c | 5 +
tools/build/tests/ex/d.c | 5 +
tools/build/tests/ex/empty/Build | 0
tools/build/tests/ex/ex.c | 19 +
tools/build/tests/run.sh | 42 +
tools/lib/api/Build | 2 +
tools/lib/api/Makefile | 58 +-
tools/lib/api/fd/Build | 1 +
tools/lib/api/fs/Build | 4 +
tools/lib/api/fs/debugfs.c | 69 +-
tools/lib/api/fs/debugfs.h | 13 +-
tools/lib/api/fs/findfs.c | 63 +
tools/lib/api/fs/findfs.h | 23 +
tools/lib/api/fs/tracefs.c | 78 ++
tools/lib/api/fs/tracefs.h | 21 +
tools/lib/lockdep/Build | 1 +
tools/lib/lockdep/Makefile | 132 +-
tools/lib/traceevent/Build | 17 +
tools/lib/traceevent/Makefile | 169 +--
tools/lib/traceevent/event-parse.c | 288 +++-
tools/lib/traceevent/event-parse.h | 24 +-
tools/lib/traceevent/event-plugin.c | 60 +-
tools/lib/traceevent/kbuffer-parse.c | 12 +-
tools/lib/traceevent/kbuffer.h | 1 +
tools/lib/traceevent/parse-filter.c | 2 +
tools/lib/traceevent/trace-seq.c | 13 +-
tools/perf/.gitignore | 1 +
tools/perf/Build | 44 +
tools/perf/Documentation/Build.txt | 49 +
tools/perf/Documentation/perf-buildid-cache.txt | 24 +-
tools/perf/Documentation/perf-data.txt | 40 +
tools/perf/Documentation/perf-diff.txt | 8 +
tools/perf/Documentation/perf-kmem.txt | 4 +
tools/perf/Documentation/perf-list.txt | 6 +
tools/perf/Documentation/perf-probe.txt | 16 +-
tools/perf/Documentation/perf-record.txt | 23 +-
tools/perf/Documentation/perf-report.txt | 5 +
tools/perf/Documentation/perf-script.txt | 6 +
tools/perf/Documentation/perf-trace.txt | 6 +
tools/perf/Documentation/perf.txt | 7 +-
tools/perf/MANIFEST | 1 +
tools/perf/Makefile | 4 +-
tools/perf/Makefile.perf | 622 ++-------
tools/perf/arch/Build | 2 +
tools/perf/arch/arm/Build | 2 +
tools/perf/arch/arm/Makefile | 11 -
tools/perf/arch/arm/tests/Build | 2 +
tools/perf/arch/arm/util/Build | 4 +
tools/perf/arch/arm64/Build | 1 +
tools/perf/arch/arm64/Makefile | 4 -
tools/perf/arch/arm64/util/Build | 2 +
tools/perf/arch/powerpc/Build | 1 +
tools/perf/arch/powerpc/Makefile | 3 -
tools/perf/arch/powerpc/util/Build | 4 +
tools/perf/arch/s390/Build | 1 +
tools/perf/arch/s390/Makefile | 3 -
tools/perf/arch/s390/util/Build | 4 +
tools/perf/arch/sh/Build | 1 +
tools/perf/arch/sh/Makefile | 1 -
tools/perf/arch/sh/util/Build | 1 +
tools/perf/arch/sparc/Build | 1 +
tools/perf/arch/sparc/Makefile | 1 -
tools/perf/arch/sparc/util/Build | 1 +
tools/perf/arch/x86/Build | 2 +
tools/perf/arch/x86/Makefile | 15 -
tools/perf/arch/x86/tests/Build | 2 +
tools/perf/arch/x86/util/Build | 8 +
tools/perf/bench/Build | 11 +
tools/perf/bench/mem-memcpy-x86-64-asm-def.h | 6 +-
tools/perf/bench/mem-memcpy-x86-64-asm.S | 2 -
tools/perf/bench/mem-memcpy.c | 128 +-
tools/perf/bench/mem-memset-x86-64-asm-def.h | 6 +-
tools/perf/bench/mem-memset-x86-64-asm.S | 2 -
tools/perf/builtin-annotate.c | 2 +-
tools/perf/builtin-buildid-cache.c | 107 +-
tools/perf/builtin-buildid-list.c | 2 +-
tools/perf/builtin-data.c | 123 ++
tools/perf/builtin-diff.c | 6 +-
tools/perf/builtin-evlist.c | 2 +
tools/perf/builtin-help.c | 17 +-
tools/perf/builtin-inject.c | 16 +-
tools/perf/builtin-kmem.c | 37 +-
tools/perf/builtin-kvm.c | 15 +-
tools/perf/builtin-list.c | 28 +-
tools/perf/builtin-lock.c | 7 +-
tools/perf/builtin-mem.c | 7 +-
tools/perf/builtin-record.c | 17 +-
tools/perf/builtin-report.c | 14 +-
tools/perf/builtin-sched.c | 34 +-
tools/perf/builtin-script.c | 34 +-
tools/perf/builtin-stat.c | 98 +-
tools/perf/builtin-timechart.c | 12 +-
tools/perf/builtin-top.c | 10 +-
tools/perf/builtin-trace.c | 281 +++-
tools/perf/builtin.h | 1 +
tools/perf/command-list.txt | 1 +
tools/perf/config/Makefile | 293 ++---
tools/perf/config/Makefile.arch | 29 +-
tools/perf/config/utilities.mak | 3 +-
tools/perf/perf-completion.sh | 94 +-
tools/perf/perf.c | 29 +
tools/perf/perf.h | 3 +-
tools/perf/scripts/Build | 2 +
tools/perf/scripts/perl/Perf-Trace-Util/Build | 3 +
tools/perf/scripts/python/Perf-Trace-Util/Build | 3 +
tools/perf/tests/Build | 43 +
tools/perf/tests/builtin-test.c | 9 +-
tools/perf/tests/dso-data.c | 22 +-
tools/perf/tests/kmod-path.c | 73 ++
tools/perf/tests/make | 2 +-
tools/perf/tests/open-syscall-all-cpus.c | 7 +-
tools/perf/tests/open-syscall.c | 7 +-
tools/perf/tests/parse-events.c | 13 +-
tools/perf/tests/tests.h | 1 +
tools/perf/ui/Build | 14 +
tools/perf/ui/browsers/Build | 10 +
tools/perf/ui/browsers/annotate.c | 8 +-
tools/perf/ui/browsers/hists.c | 88 +-
tools/perf/ui/gtk/Build | 9 +
tools/perf/ui/tui/Build | 4 +
tools/perf/util/Build | 145 ++
tools/perf/util/annotate.c | 32 +-
tools/perf/util/build-id.c | 207 ++-
tools/perf/util/build-id.h | 8 +-
tools/perf/util/cache.h | 1 +
tools/perf/util/callchain.c | 8 +
tools/perf/util/callchain.h | 1 +
tools/perf/util/cloexec.c | 6 +
tools/perf/util/cloexec.h | 6 +
tools/perf/util/data-convert-bt.c | 857 ++++++++++++
tools/perf/util/data-convert-bt.h | 8 +
tools/perf/util/db-export.c | 4 +-
tools/perf/util/db-export.h | 3 +-
tools/perf/util/debug.c | 2 +
tools/perf/util/debug.h | 1 +
tools/perf/util/dso.c | 159 ++-
tools/perf/util/dso.h | 49 +-
tools/perf/util/dwarf-aux.c | 29 +-
tools/perf/util/dwarf-aux.h | 3 +
tools/perf/util/event.c | 167 ++-
tools/perf/util/event.h | 1 -
tools/perf/util/evlist.c | 41 +-
tools/perf/util/evlist.h | 5 +-
tools/perf/util/evsel.c | 29 +-
tools/perf/util/evsel.h | 5 +
tools/perf/util/header.c | 2 +-
tools/perf/util/hist.c | 11 +-
tools/perf/util/hist.h | 11 +-
tools/perf/util/include/asm/alternative-asm.h | 1 +
tools/perf/util/kvm-stat.h | 1 +
tools/perf/util/lzma.c | 95 ++
tools/perf/util/machine.c | 327 +++--
tools/perf/util/machine.h | 1 -
tools/perf/util/ordered-events.c | 65 +-
tools/perf/util/ordered-events.h | 19 +-
tools/perf/util/parse-events.c | 234 ++--
tools/perf/util/parse-events.h | 13 +-
tools/perf/util/parse-options.c | 32 +-
tools/perf/util/parse-options.h | 2 +
tools/perf/util/probe-event.c | 365 +++++-
tools/perf/util/probe-finder.c | 25 +-
tools/perf/util/python-ext-sources | 1 -
tools/perf/util/scripting-engines/Build | 6 +
.../perf/util/scripting-engines/trace-event-perl.c | 10 +-
.../util/scripting-engines/trace-event-python.c | 21 +-
tools/perf/util/session.c | 317 +++--
tools/perf/util/session.h | 18 +-
tools/perf/util/setup.py | 2 +-
tools/perf/util/sort.c | 9 +
tools/perf/util/sort.h | 2 +-
tools/perf/util/symbol-elf.c | 71 +-
tools/perf/util/symbol-minimal.c | 7 +-
tools/perf/util/symbol.c | 31 +-
tools/perf/util/symbol.h | 8 +
tools/perf/util/target.c | 7 +-
tools/perf/util/thread.c | 15 +-
tools/perf/util/thread.h | 24 +
tools/perf/util/tool.h | 8 +-
tools/perf/util/trace-event-parse.c | 12 +-
tools/perf/util/trace-event-scripting.c | 1 -
tools/perf/util/trace-event.h | 6 +-
tools/perf/util/unwind-libunwind.c | 8 +-
tools/perf/util/util.c | 67 +-
tools/perf/util/util.h | 6 +
tools/testing/selftests/rcutorture/bin/kvm.sh | 2 +-
.../selftests/rcutorture/configs/rcu/CFcommon | 1 +
570 files changed, 20159 insertions(+), 8133 deletions(-)
delete mode 100644 arch/x86/ia32/nosyscall.c
delete mode 100644 arch/x86/ia32/syscall_ia32.c
create mode 100644 arch/x86/kernel/cpu/intel_pt.h
create mode 100644 arch/x86/kernel/cpu/perf_event_intel_bts.c
create mode 100644 arch/x86/kernel/cpu/perf_event_intel_cqm.c
create mode 100644 arch/x86/kernel/cpu/perf_event_intel_pt.c
create mode 100644 arch/x86/kernel/pmem.c
create mode 100644 drivers/block/pmem.c
create mode 100644 kernel/locking/rwsem.h
create mode 100644 kernel/time/tick-sched.h
create mode 100644 kernel/trace/bpf_trace.c
create mode 100644 samples/bpf/tracex1_kern.c
create mode 100644 samples/bpf/tracex1_user.c
create mode 100644 samples/bpf/tracex2_kern.c
create mode 100644 samples/bpf/tracex2_user.c
create mode 100644 samples/bpf/tracex3_kern.c
create mode 100644 samples/bpf/tracex3_user.c
create mode 100644 samples/bpf/tracex4_kern.c
create mode 100644 samples/bpf/tracex4_user.c
create mode 100644 tools/build/Build.include
create mode 100644 tools/build/Documentation/Build.txt
create mode 100644 tools/build/Makefile.build
create mode 100644 tools/build/Makefile.feature
rename tools/{perf/config/feature-checks => build/feature}/.gitignore (52%)
rename tools/{perf/config/feature-checks => build/feature}/Makefile (72%)
rename tools/{perf/config/feature-checks => build/feature}/test-all.c (87%)
rename tools/{perf/config/feature-checks => build/feature}/test-backtrace.c (100%)
rename tools/{perf/config/feature-checks => build/feature}/test-bionic.c (100%)
rename tools/{perf/config/feature-checks => build/feature}/test-compile.c (100%)
rename tools/{perf/config/feature-checks => build/feature}/test-cplus-demangle.c (100%)
rename tools/{perf/config/feature-checks => build/feature}/test-dwarf.c (100%)
rename tools/{perf/config/feature-checks => build/feature}/test-fortify-source.c (100%)
rename tools/{perf/config/feature-checks => build/feature}/test-glibc.c (100%)
rename tools/{perf/config/feature-checks => build/feature}/test-gtk2-infobar.c (100%)
rename tools/{perf/config/feature-checks => build/feature}/test-gtk2.c (100%)
rename tools/{perf/config/feature-checks => build/feature}/test-hello.c (100%)
rename tools/{perf/config/feature-checks => build/feature}/test-libaudit.c (100%)
create mode 100644 tools/build/feature/test-libbabeltrace.c
rename tools/{perf/config/feature-checks => build/feature}/test-libbfd.c (100%)
rename tools/{perf/config/feature-checks => build/feature}/test-libdw-dwarf-unwind.c (100%)
rename tools/{perf/config/feature-checks => build/feature}/test-libelf-getphdrnum.c (100%)
rename tools/{perf/config/feature-checks => build/feature}/test-libelf-mmap.c (100%)
rename tools/{perf/config/feature-checks => build/feature}/test-libelf.c (100%)
rename tools/{perf/config/feature-checks => build/feature}/test-libnuma.c (100%)
rename tools/{perf/config/feature-checks => build/feature}/test-libperl.c (100%)
rename tools/{perf/config/feature-checks => build/feature}/test-libpython-version.c (100%)
rename tools/{perf/config/feature-checks => build/feature}/test-libpython.c (100%)
rename tools/{perf/config/feature-checks => build/feature}/test-libslang.c (100%)
rename tools/{perf/config/feature-checks => build/feature}/test-libunwind-debug-frame.c (100%)
rename tools/{perf/config/feature-checks => build/feature}/test-libunwind.c (100%)
create mode 100644 tools/build/feature/test-lzma.c
rename tools/{perf/config/feature-checks => build/feature}/test-pthread-attr-setaffinity-np.c (77%)
rename tools/{perf/config/feature-checks => build/feature}/test-stackprotector-all.c (100%)
rename tools/{perf/config/feature-checks => build/feature}/test-sync-compare-and-swap.c (100%)
rename tools/{perf/config/feature-checks => build/feature}/test-timerfd.c (100%)
rename tools/{perf/config/feature-checks => build/feature}/test-zlib.c (100%)
create mode 100644 tools/build/tests/ex/Build
create mode 100644 tools/build/tests/ex/Makefile
create mode 100644 tools/build/tests/ex/a.c
create mode 100644 tools/build/tests/ex/arch/Build
create mode 100644 tools/build/tests/ex/arch/e.c
create mode 100644 tools/build/tests/ex/arch/f.c
create mode 100644 tools/build/tests/ex/b.c
create mode 100644 tools/build/tests/ex/c.c
create mode 100644 tools/build/tests/ex/d.c
create mode 100644 tools/build/tests/ex/empty/Build
create mode 100644 tools/build/tests/ex/ex.c
create mode 100755 tools/build/tests/run.sh
create mode 100644 tools/lib/api/Build
create mode 100644 tools/lib/api/fd/Build
create mode 100644 tools/lib/api/fs/Build
create mode 100644 tools/lib/api/fs/findfs.c
create mode 100644 tools/lib/api/fs/findfs.h
create mode 100644 tools/lib/api/fs/tracefs.c
create mode 100644 tools/lib/api/fs/tracefs.h
create mode 100644 tools/lib/lockdep/Build
create mode 100644 tools/lib/traceevent/Build
create mode 100644 tools/perf/Build
create mode 100644 tools/perf/Documentation/Build.txt
create mode 100644 tools/perf/Documentation/perf-data.txt
create mode 100644 tools/perf/arch/Build
create mode 100644 tools/perf/arch/arm/Build
create mode 100644 tools/perf/arch/arm/tests/Build
create mode 100644 tools/perf/arch/arm/util/Build
create mode 100644 tools/perf/arch/arm64/Build
create mode 100644 tools/perf/arch/arm64/util/Build
create mode 100644 tools/perf/arch/powerpc/Build
create mode 100644 tools/perf/arch/powerpc/util/Build
create mode 100644 tools/perf/arch/s390/Build
create mode 100644 tools/perf/arch/s390/util/Build
create mode 100644 tools/perf/arch/sh/Build
create mode 100644 tools/perf/arch/sh/util/Build
create mode 100644 tools/perf/arch/sparc/Build
create mode 100644 tools/perf/arch/sparc/util/Build
create mode 100644 tools/perf/arch/x86/Build
create mode 100644 tools/perf/arch/x86/tests/Build
create mode 100644 tools/perf/arch/x86/util/Build
create mode 100644 tools/perf/bench/Build
create mode 100644 tools/perf/builtin-data.c
create mode 100644 tools/perf/scripts/Build
create mode 100644 tools/perf/scripts/perl/Perf-Trace-Util/Build
create mode 100644 tools/perf/scripts/python/Perf-Trace-Util/Build
create mode 100644 tools/perf/tests/Build
create mode 100644 tools/perf/tests/kmod-path.c
create mode 100644 tools/perf/ui/Build
create mode 100644 tools/perf/ui/browsers/Build
create mode 100644 tools/perf/ui/gtk/Build
create mode 100644 tools/perf/ui/tui/Build
create mode 100644 tools/perf/util/Build
create mode 100644 tools/perf/util/data-convert-bt.c
create mode 100644 tools/perf/util/data-convert-bt.h
create mode 100644 tools/perf/util/lzma.c
create mode 100644 tools/perf/util/scripting-engines/Build
$ git am -3 ../patches/0001-ARM-VDSO-rename-tkr-to-tkr_mono.patch
Applying: ARM: VDSO: rename tkr to tkr_mono
$ git reset HEAD^
Unstaged changes after reset:
M arch/arm/kernel/vdso.c
$ git add -A .
$ git commit -v -a --amend
[master 030a2b685264] Merge remote-tracking branch 'tip/auto-latest'
Date: Wed Apr 8 14:51:52 2015 +1000
$ git am -3 ../patches/0001-bpf-semantic-merge-conflict-fix-in-kernel-events-cor.patch
Applying: bpf: semantic merge conflict fix in kernel/events/core.c
$ git reset HEAD^
Unstaged changes after reset:
M kernel/events/core.c
$ git add -A .
$ git commit -v -a --amend
[master b673de6f4386] Merge remote-tracking branch 'tip/auto-latest'
Date: Wed Apr 8 14:51:52 2015 +1000
Merging clockevents/clockevents/next (4c8305221193 clocksource: Driver for Conexant Digicolor SoC timer)
$ git merge clockevents/clockevents/next
Resolved 'arch/arm/mach-rockchip/Kconfig' using previous resolution.
Resolved 'drivers/clocksource/Kconfig' using previous resolution.
Resolved 'drivers/clocksource/rockchip_timer.c' using previous resolution.
Auto-merging drivers/clocksource/rockchip_timer.c
CONFLICT (add/add): Merge conflict in drivers/clocksource/rockchip_timer.c
Auto-merging drivers/clocksource/Kconfig
CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig
Auto-merging arch/arm/mach-rockchip/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-rockchip/Kconfig
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 13e316ed7be0] Merge remote-tracking branch 'clockevents/clockevents/next'
$ git diff -M --stat --summary HEAD^..
Merging edac/linux_next (fec53af531dd sb_edac: Fix typo computing number of banks)
$ git merge edac/linux_next
Already up-to-date.
Merging edac-amd/for-next (1afaa0551521 EDAC: Constify of_device_id array)
$ git merge edac-amd/for-next
Merge made by the 'recursive' strategy.
drivers/edac/amd64_edac.c | 80 ++++++-------------
drivers/edac/amd64_edac.h | 24 +-----
drivers/edac/amd64_edac_dbg.c | 43 +++--------
drivers/edac/amd64_edac_inj.c | 51 ++++++------
drivers/edac/edac_core.h | 4 +-
drivers/edac/edac_mc.c | 12 +--
drivers/edac/edac_mc_sysfs.c | 167 ++++++++++++++++++----------------------
drivers/edac/edac_module.c | 13 ++--
drivers/edac/edac_module.h | 3 +-
drivers/edac/highbank_mc_edac.c | 14 ++--
drivers/edac/i7core_edac.c | 34 ++++----
drivers/edac/i82443bxgx_edac.c | 8 +-
drivers/edac/i82860_edac.c | 9 +--
drivers/edac/i82875p_edac.c | 4 +-
drivers/edac/i82975x_edac.c | 4 +-
drivers/edac/mpc85xx_edac.c | 42 +++-------
drivers/edac/octeon_edac-lmc.c | 55 ++++---------
drivers/edac/ppc4xx_edac.c | 2 +-
drivers/edac/synopsys_edac.c | 2 +-
19 files changed, 208 insertions(+), 363 deletions(-)
Merging irqchip/irqchip/for-next (7ecc79901e08 Merge branch 'irqchip/stacked-irq_set_wake' into irqchip/for-next)
$ git merge irqchip/irqchip/for-next
Resolved 'arch/arm/mach-exynos/suspend.c' using previous resolution.
Removing include/linux/irqchip/irq-crossbar.h
Auto-merging drivers/irqchip/irq-gic.c
Auto-merging drivers/irqchip/Makefile
Auto-merging drivers/irqchip/Kconfig
Auto-merging arch/arm/mach-tegra/tegra.c
Auto-merging arch/arm/mach-omap2/omap4-common.c
Auto-merging arch/arm/mach-exynos/suspend.c
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/suspend.c
Auto-merging arch/arm/mach-exynos/exynos.c
Auto-merging arch/arm/boot/dts/tegra124.dtsi
Auto-merging arch/arm/boot/dts/omap5.dtsi
Auto-merging arch/arm/boot/dts/omap4.dtsi
Auto-merging arch/arm/boot/dts/omap4-sdp.dts
Auto-merging arch/arm/boot/dts/omap4-panda-common.dtsi
Auto-merging arch/arm/boot/dts/exynos5420.dtsi
Auto-merging arch/arm/boot/dts/exynos5250.dtsi
Auto-merging arch/arm/boot/dts/exynos4.dtsi
Auto-merging arch/arm/boot/dts/exynos3250.dtsi
Auto-merging arch/arm/boot/dts/dra74x.dtsi
Auto-merging arch/arm/boot/dts/dra72x.dtsi
Auto-merging arch/arm/boot/dts/dra72-evm.dts
Auto-merging arch/arm/boot/dts/dra7.dtsi
Auto-merging arch/arm/boot/dts/dra7-evm.dts
Auto-merging arch/arm/boot/dts/am57xx-beagle-x15.dts
Auto-merging arch/arm/boot/dts/am43x-epos-evm.dts
Auto-merging arch/arm/boot/dts/am4372.dtsi
Auto-merging Documentation/devicetree/bindings/arm/samsung/pmu.txt
Auto-merging Documentation/devicetree/bindings/arm/gic.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 1cddf430d14a] Merge remote-tracking branch 'irqchip/irqchip/for-next'
$ git diff -M --stat --summary HEAD^..
Documentation/devicetree/bindings/arm/gic.txt | 6 -
.../devicetree/bindings/arm/omap/crossbar.txt | 18 +-
.../devicetree/bindings/arm/samsung/pmu.txt | 17 +
.../interrupt-controller/nvidia,tegra-ictlr.txt | 43 +++
.../bindings/interrupt-controller/renesas,irqc.txt | 4 +-
.../interrupt-controller/st,sti-irq-syscfg.txt | 35 ++
.../interrupt-controller/ti,omap4-wugen-mpu | 33 ++
arch/arm/boot/dts/am4372.dtsi | 11 +-
arch/arm/boot/dts/am437x-gp-evm.dts | 1 -
arch/arm/boot/dts/am437x-sk-evm.dts | 1 -
arch/arm/boot/dts/am43x-epos-evm.dts | 1 -
arch/arm/boot/dts/am57xx-beagle-x15.dts | 3 +-
arch/arm/boot/dts/dra7-evm.dts | 2 +-
arch/arm/boot/dts/dra7.dtsi | 43 ++-
arch/arm/boot/dts/dra72-evm.dts | 1 -
arch/arm/boot/dts/dra72x.dtsi | 3 +-
arch/arm/boot/dts/dra74x.dtsi | 5 +-
arch/arm/boot/dts/exynos3250.dtsi | 4 +
arch/arm/boot/dts/exynos4.dtsi | 4 +
arch/arm/boot/dts/exynos5250.dtsi | 4 +
arch/arm/boot/dts/exynos5420.dtsi | 4 +
arch/arm/boot/dts/omap4-duovero.dtsi | 2 -
arch/arm/boot/dts/omap4-panda-common.dtsi | 8 +-
arch/arm/boot/dts/omap4-sdp.dts | 8 +-
arch/arm/boot/dts/omap4-var-som-om44.dtsi | 2 -
arch/arm/boot/dts/omap4.dtsi | 18 +-
arch/arm/boot/dts/omap5-cm-t54.dts | 1 -
arch/arm/boot/dts/omap5-uevm.dts | 2 -
arch/arm/boot/dts/omap5.dtsi | 26 +-
arch/arm/boot/dts/tegra114.dtsi | 16 +-
arch/arm/boot/dts/tegra124.dtsi | 16 +-
arch/arm/boot/dts/tegra20.dtsi | 15 +-
arch/arm/boot/dts/tegra30.dtsi | 16 +-
arch/arm/mach-exynos/exynos.c | 15 +-
arch/arm/mach-exynos/suspend.c | 135 +++++++-
arch/arm/mach-omap2/omap-wakeupgen.c | 128 +++++--
arch/arm/mach-omap2/omap-wakeupgen.h | 1 -
arch/arm/mach-omap2/omap4-common.c | 27 +-
arch/arm/mach-shmobile/intc-sh73a0.c | 7 +-
arch/arm/mach-shmobile/setup-r8a7779.c | 7 +-
arch/arm/mach-tegra/iomap.h | 15 -
arch/arm/mach-tegra/irq.c | 209 +-----------
arch/arm/mach-tegra/irq.h | 6 -
arch/arm/mach-tegra/tegra.c | 1 -
arch/arm/mach-ux500/cpu.c | 2 +-
arch/arm/mach-zynq/common.c | 2 +-
drivers/irqchip/Kconfig | 7 +
drivers/irqchip/Makefile | 2 +
drivers/irqchip/irq-armada-370-xp.c | 88 +++--
drivers/irqchip/irq-crossbar.c | 210 +++++++-----
drivers/irqchip/irq-digicolor.c | 4 +-
drivers/irqchip/irq-gic.c | 60 +---
drivers/irqchip/irq-renesas-irqc.c | 58 +++-
drivers/irqchip/irq-st.c | 206 +++++++++++
drivers/irqchip/irq-tegra.c | 377 +++++++++++++++++++++
include/dt-bindings/interrupt-controller/irq-st.h | 30 ++
include/linux/irq.h | 1 +
include/linux/irqchip/arm-gic.h | 7 +-
include/linux/irqchip/irq-crossbar.h | 11 -
kernel/irq/chip.c | 16 +
60 files changed, 1424 insertions(+), 581 deletions(-)
create mode 100644 Documentation/devicetree/bindings/interrupt-controller/nvidia,tegra-ictlr.txt
create mode 100644 Documentation/devicetree/bindings/interrupt-controller/st,sti-irq-syscfg.txt
create mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,omap4-wugen-mpu
create mode 100644 drivers/irqchip/irq-st.c
create mode 100644 drivers/irqchip/irq-tegra.c
create mode 100644 include/dt-bindings/interrupt-controller/irq-st.h
delete mode 100644 include/linux/irqchip/irq-crossbar.h
Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
$ git merge tiny/tiny/next
Already up-to-date.
Merging ftrace/for-next (e65e0516fb5f Merge branch 'for-next/ftrace/core' into trace/for-next)
$ git merge ftrace/for-next
Auto-merging tools/lib/traceevent/event-parse.c
Auto-merging kernel/trace/trace_uprobe.c
Auto-merging kernel/trace/trace_kprobe.c
Merge made by the 'recursive' strategy.
fs/Makefile | 1 +
fs/tracefs/Makefile | 4 +
fs/tracefs/inode.c | 650 +++++++++++++++++++++++++++++++++++
include/linux/tracefs.h | 45 +++
include/trace/events/btrfs.h | 4 +-
include/trace/events/ext3.h | 2 +-
include/trace/events/ext4.h | 6 +-
include/trace/events/module.h | 4 +-
include/trace/events/random.h | 10 +-
include/uapi/linux/magic.h | 2 +
kernel/trace/ftrace.c | 22 +-
kernel/trace/ring_buffer.c | 10 +-
kernel/trace/trace.c | 187 +++++-----
kernel/trace/trace.h | 2 +-
kernel/trace/trace_entries.h | 6 +-
kernel/trace/trace_events.c | 32 +-
kernel/trace/trace_export.c | 2 +-
kernel/trace/trace_functions_graph.c | 7 +-
kernel/trace/trace_kprobe.c | 15 +-
kernel/trace/trace_probe.c | 19 +-
kernel/trace/trace_probe.h | 12 +-
kernel/trace/trace_stat.c | 10 +-
kernel/trace/trace_uprobe.c | 5 +-
tools/lib/traceevent/event-parse.c | 2 +-
24 files changed, 868 insertions(+), 191 deletions(-)
create mode 100644 fs/tracefs/Makefile
create mode 100644 fs/tracefs/inode.c
create mode 100644 include/linux/tracefs.h
Merging rcu/rcu/next (265f40690e3a locktorture: Change longdelay_us to longdelay_ms)
$ git merge rcu/rcu/next
Auto-merging lib/Kconfig.debug
Auto-merging Documentation/kernel-parameters.txt
Merge made by the 'recursive' strategy.
Documentation/kernel-parameters.txt | 16 +-
Documentation/memory-barriers.txt | 7 +-
arch/powerpc/include/asm/barrier.h | 1 +
include/linux/rculist.h | 10 +-
include/linux/rcupdate.h | 20 +-
include/linux/rcutree.h | 2 -
include/linux/spinlock.h | 2 +-
kernel/locking/locktorture.c | 14 +-
kernel/rcu/rcutorture.c | 4 +-
kernel/rcu/srcu.c | 10 +-
kernel/rcu/tiny_plugin.h | 12 +-
kernel/rcu/tree.c | 366 ++++++++++-----------
kernel/rcu/tree.h | 34 +-
kernel/rcu/tree_plugin.h | 202 ++++++------
kernel/rcu/tree_trace.c | 6 +-
kernel/rcu/update.c | 30 +-
kernel/torture.c | 26 +-
lib/Kconfig.debug | 52 ++-
.../selftests/rcutorture/configs/rcu/CFcommon | 2 +
.../selftests/rcutorture/configs/rcu/TREE03 | 6 +-
.../selftests/rcutorture/configs/rcu/TREE03.boot | 1 +
.../selftests/rcutorture/configs/rcu/TREE04 | 4 +-
.../selftests/rcutorture/configs/rcu/TREE08 | 2 +-
23 files changed, 444 insertions(+), 385 deletions(-)
create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE03.boot
Merging kvm/linux-next (1d804d079a92 x86: Use bool function return values of true/false not 1/0)
$ git merge kvm/linux-next
Resolved 'arch/mips/kernel/genex.S' using previous resolution.
Auto-merging virt/kvm/kvm_main.c
Auto-merging kernel/sched/core.c
Auto-merging include/linux/sched.h
Auto-merging include/linux/kvm_host.h
Auto-merging arch/x86/kvm/x86.c
Auto-merging arch/x86/kvm/vmx.c
Auto-merging arch/x86/kvm/ioapic.c
Auto-merging arch/s390/kvm/kvm-s390.c
Auto-merging arch/s390/kernel/asm-offsets.c
Auto-merging arch/mips/kernel/traps.c
Auto-merging arch/mips/kernel/genex.S
CONFLICT (content): Merge conflict in arch/mips/kernel/genex.S
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 7d3ee1712bc3] Merge remote-tracking branch 'kvm/linux-next'
$ git diff -M --stat --summary HEAD^..
Documentation/virtual/kvm/api.txt | 196 ++++++++++++++++
MAINTAINERS | 2 +
arch/mips/include/asm/kdebug.h | 3 +-
arch/mips/include/asm/kvm_host.h | 125 +++++++---
arch/mips/include/uapi/asm/kvm.h | 164 ++++++++-----
arch/mips/kernel/asm-offsets.c | 39 ++++
arch/mips/kernel/genex.S | 14 +-
arch/mips/kernel/traps.c | 16 +-
arch/mips/kvm/Makefile | 8 +-
arch/mips/kvm/emulate.c | 332 ++++++++++++++++++++++++++-
arch/mips/kvm/fpu.S | 122 ++++++++++
arch/mips/kvm/locore.S | 38 +++
arch/mips/kvm/mips.c | 472 +++++++++++++++++++++++++++++++++++++-
arch/mips/kvm/msa.S | 161 +++++++++++++
arch/mips/kvm/stats.c | 4 +
arch/mips/kvm/tlb.c | 6 +
arch/mips/kvm/trap_emul.c | 199 +++++++++++++++-
arch/s390/include/asm/kvm_host.h | 16 +-
arch/s390/include/uapi/asm/kvm.h | 4 +
arch/s390/include/uapi/asm/sie.h | 4 +-
arch/s390/kernel/asm-offsets.c | 1 +
arch/s390/kvm/diag.c | 4 +-
arch/s390/kvm/gaccess.c | 296 +++++++++++++++++++-----
arch/s390/kvm/gaccess.h | 21 +-
arch/s390/kvm/guestdbg.c | 8 +-
arch/s390/kvm/intercept.c | 5 +-
arch/s390/kvm/interrupt.c | 34 ++-
arch/s390/kvm/kvm-s390.c | 344 ++++++++++++++++++++++++---
arch/s390/kvm/kvm-s390.h | 45 +++-
arch/s390/kvm/priv.c | 135 +++++++----
arch/s390/kvm/sigp.c | 7 +-
arch/x86/include/asm/kvm_host.h | 6 +-
arch/x86/include/asm/kvm_para.h | 2 +-
arch/x86/include/asm/pvclock.h | 1 +
arch/x86/include/uapi/asm/vmx.h | 1 +
arch/x86/kernel/pvclock.c | 44 ++++
arch/x86/kvm/cpuid.h | 2 +-
arch/x86/kvm/emulate.c | 193 ++++++++--------
arch/x86/kvm/ioapic.c | 14 +-
arch/x86/kvm/ioapic.h | 9 +-
arch/x86/kvm/pmu.c | 2 +-
arch/x86/kvm/svm.c | 41 ++--
arch/x86/kvm/vmx.c | 112 ++++-----
arch/x86/kvm/x86.c | 44 +++-
arch/x86/vdso/vclock_gettime.c | 16 +-
include/linux/kvm_host.h | 1 -
include/linux/sched.h | 8 +
include/uapi/linux/kvm.h | 51 +++-
kernel/sched/core.c | 15 ++
virt/kvm/irqchip.c | 2 +-
virt/kvm/kvm_main.c | 94 ++++----
51 files changed, 2935 insertions(+), 548 deletions(-)
create mode 100644 arch/mips/kvm/fpu.S
create mode 100644 arch/mips/kvm/msa.S
Merging kvm-arm/next (d44758c0dfc5 KVM: arm/arm64: enable KVM_CAP_IOEVENTFD)
$ git merge kvm-arm/next
Resolved 'virt/kvm/arm/vgic.c' using previous resolution.
Auto-merging virt/kvm/kvm_main.c
Auto-merging virt/kvm/arm/vgic.c
CONFLICT (content): Merge conflict in virt/kvm/arm/vgic.c
Auto-merging include/linux/kvm_host.h
Auto-merging include/kvm/iodev.h
Auto-merging include/kvm/arm_vgic.h
Auto-merging arch/x86/kvm/x86.c
Auto-merging arch/x86/kvm/vmx.c
Auto-merging arch/x86/kvm/lapic.c
Auto-merging arch/x86/kvm/ioapic.h
Auto-merging arch/x86/kvm/ioapic.c
Auto-merging arch/x86/kvm/i8259.c
Auto-merging arch/s390/kvm/diag.c
Auto-merging arch/powerpc/kvm/powerpc.c
Auto-merging arch/arm64/include/asm/kvm_arm.h
Auto-merging arch/arm/kvm/mmu.c
Auto-merging arch/arm/kernel/asm-offsets.c
Auto-merging Documentation/virtual/kvm/api.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 4666cba65699] Merge remote-tracking branch 'kvm-arm/next'
$ git diff -M --stat --summary HEAD^..
Documentation/virtual/kvm/api.txt | 22 +-
arch/arm/include/asm/kvm_arm.h | 1 +
arch/arm/include/asm/kvm_host.h | 15 +-
arch/arm/include/asm/kvm_mmio.h | 22 --
arch/arm/include/uapi/asm/kvm.h | 3 +
arch/arm/kernel/asm-offsets.c | 4 -
arch/arm/kvm/Kconfig | 30 +--
arch/arm/kvm/Makefile | 12 +-
arch/arm/kvm/arm.c | 45 ++--
arch/arm/kvm/guest.c | 18 --
arch/arm/kvm/interrupts_head.S | 8 -
arch/arm/kvm/mmio.c | 64 ++---
arch/arm/kvm/mmu.c | 134 ++++++++++-
arch/arm/kvm/trace.h | 48 ++++
arch/arm64/include/asm/esr.h | 1 +
arch/arm64/include/asm/kvm_arm.h | 1 +
arch/arm64/include/asm/kvm_host.h | 15 +-
arch/arm64/include/asm/kvm_mmio.h | 22 --
arch/arm64/include/uapi/asm/kvm.h | 3 +
arch/arm64/kvm/Kconfig | 18 +-
arch/arm64/kvm/Makefile | 20 +-
arch/powerpc/kvm/mpic.c | 12 +-
arch/powerpc/kvm/powerpc.c | 4 +-
arch/s390/kvm/diag.c | 2 +-
arch/x86/kvm/Makefile | 2 +-
arch/x86/kvm/i8254.c | 14 +-
arch/x86/kvm/i8254.h | 2 +-
arch/x86/kvm/i8259.c | 12 +-
arch/x86/kvm/ioapic.c | 8 +-
arch/x86/kvm/ioapic.h | 2 +-
arch/x86/kvm/irq.h | 2 +-
arch/x86/kvm/lapic.c | 4 +-
arch/x86/kvm/lapic.h | 2 +-
arch/x86/kvm/vmx.c | 2 +-
arch/x86/kvm/x86.c | 13 +-
include/kvm/arm_arch_timer.h | 31 +--
include/kvm/arm_vgic.h | 117 ++--------
{virt => include}/kvm/iodev.h | 28 ++-
include/linux/kvm_host.h | 24 +-
virt/kvm/arm/arch_timer.c | 45 +++-
virt/kvm/arm/vgic-v2-emul.c | 71 +++---
virt/kvm/arm/vgic-v3-emul.c | 246 ++++++++++----------
virt/kvm/arm/vgic.c | 476 ++++++++++++++++++++++++++++----------
virt/kvm/arm/vgic.h | 37 ++-
virt/kvm/coalesced_mmio.c | 7 +-
virt/kvm/eventfd.c | 9 +-
virt/kvm/kvm_main.c | 34 +--
47 files changed, 1011 insertions(+), 701 deletions(-)
rename {virt => include}/kvm/iodev.h (66%)
Merging kvm-ppc/kvm-ppc-next (2c4aa55a6af0 Merge tag 'signed-kvm-ppc-next' of git://github.com/agraf/linux-2.6 into HEAD)
$ git merge kvm-ppc/kvm-ppc-next
Already up-to-date.
Merging kvms390/next (816c7667ea97 KVM: s390: migrate vcpu interrupt state)
$ git merge kvms390/next
Resolved 'include/uapi/linux/kvm.h' using previous resolution.
Auto-merging virt/kvm/kvm_main.c
Auto-merging include/uapi/linux/kvm.h
CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h
Auto-merging arch/s390/kvm/kvm-s390.c
Auto-merging Documentation/virtual/kvm/api.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master d69fe03f3eb9] Merge remote-tracking branch 'kvms390/next'
$ git diff -M --stat --summary HEAD^..
Documentation/virtual/kvm/api.txt | 117 +++
Documentation/virtual/kvm/devices/s390_flic.txt | 3 +
arch/s390/include/asm/kvm_host.h | 30 +-
arch/s390/kvm/interrupt.c | 1073 ++++++++++++++---------
arch/s390/kvm/kvm-s390.c | 54 +-
arch/s390/kvm/kvm-s390.h | 6 +-
arch/s390/kvm/priv.c | 9 +-
include/uapi/linux/kvm.h | 14 +
virt/kvm/kvm_main.c | 2 +-
9 files changed, 906 insertions(+), 402 deletions(-)
Merging xen-tip/linux-next (278edfc07875 xen-pciback: also support disabling of bus-mastering and memory-write-invalidate)
$ git merge xen-tip/linux-next
Resolved 'drivers/xen/Kconfig' using previous resolution.
Auto-merging drivers/xen/xen-scsiback.c
Auto-merging drivers/xen/Makefile
Auto-merging drivers/xen/Kconfig
CONFLICT (content): Merge conflict in drivers/xen/Kconfig
Auto-merging arch/x86/xen/enlighten.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 717f57e690b7] Merge remote-tracking branch 'xen-tip/linux-next'
$ git diff -M --stat --summary HEAD^..
arch/arm/xen/enlighten.c | 104 +++-----------
arch/x86/syscalls/Makefile | 9 ++
arch/x86/xen/apic.c | 180 +++++++++++++++++++++++
arch/x86/xen/enlighten.c | 90 +-----------
arch/x86/xen/mmu.c | 207 +++++++++++----------------
arch/x86/xen/trace.c | 50 +------
arch/x86/xen/xen-head.S | 63 ++------
drivers/scsi/xen-scsifront.c | 214 +++++++++++++++++++++++-----
drivers/xen/Kconfig | 6 +
drivers/xen/Makefile | 1 +
drivers/xen/mcelog.c | 25 +++-
drivers/xen/pcpu.c | 44 +++---
drivers/xen/privcmd.c | 117 ++++++++++-----
drivers/xen/xen-balloon.c | 45 +++---
drivers/xen/xen-pciback/conf_space_header.c | 15 +-
drivers/xen/xen-pciback/pci_stub.c | 4 +-
drivers/xen/xen-scsiback.c | 94 ++++++------
drivers/xen/xlate_mmu.c | 143 +++++++++++++++++++
include/xen/interface/xen.h | 6 +-
include/xen/xen-ops.h | 47 +++++-
scripts/xen-hypercalls.sh | 12 ++
21 files changed, 909 insertions(+), 567 deletions(-)
create mode 100644 drivers/xen/xlate_mmu.c
create mode 100644 scripts/xen-hypercalls.sh
Merging percpu/for-next (4c907baf36d8 percpu_ref: implement percpu_ref_is_dying())
$ git merge percpu/for-next
Already up-to-date.
Merging workqueues/for-next (6ba94429c8e7 workqueue: Reorder sysfs code)
$ git merge workqueues/for-next
Merge made by the 'recursive' strategy.
drivers/tty/sysrq.c | 1 +
include/linux/workqueue.h | 1 +
kernel/workqueue.c | 1591 +++++++++++++++++++++++++--------------------
mm/percpu.c | 4 +-
4 files changed, 890 insertions(+), 707 deletions(-)
Merging drivers-x86/for-next (5d3fc1d54e5a toshiba_bluetooth: Fix enabling/disabling loop on recent devices)
$ git merge drivers-x86/for-next
Auto-merging drivers/platform/x86/apple-gmux.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
Documentation/laptops/thinkpad-acpi.txt | 18 ++
MAINTAINERS | 15 +-
drivers/platform/x86/apple-gmux.c | 48 ++++-
drivers/platform/x86/intel_oaktrail.c | 2 +-
drivers/platform/x86/thinkpad_acpi.c | 320 +++++++++++++++++++++----------
drivers/platform/x86/toshiba_acpi.c | 147 +++++++++-----
drivers/platform/x86/toshiba_bluetooth.c | 133 ++++++++++---
drivers/platform/x86/wmi.c | 1 -
8 files changed, 503 insertions(+), 181 deletions(-)
Merging chrome-platform/for-next (8ce580932f8e platform/chrome: cros_ec_lpc - Depend on X86 || COMPILE_TEST)
$ git merge chrome-platform/for-next
Auto-merging drivers/input/keyboard/cros_ec_keyb.c
Merge made by the 'recursive' strategy.
Documentation/ioctl/ioctl-number.txt | 1 +
drivers/i2c/busses/i2c-cros-ec-tunnel.c | 51 +---
drivers/input/keyboard/cros_ec_keyb.c | 13 +-
drivers/mfd/cros_ec.c | 19 +-
drivers/platform/chrome/Kconfig | 26 +-
drivers/platform/chrome/Makefile | 3 +
drivers/platform/chrome/cros_ec_dev.c | 274 +++++++++++++++++++++
drivers/platform/chrome/cros_ec_dev.h | 53 +++++
drivers/platform/chrome/cros_ec_lightbar.c | 367 +++++++++++++++++++++++++++++
drivers/platform/chrome/cros_ec_lpc.c | 319 +++++++++++++++++++++++++
drivers/platform/chrome/cros_ec_sysfs.c | 271 +++++++++++++++++++++
include/linux/mfd/cros_ec.h | 23 +-
12 files changed, 1358 insertions(+), 62 deletions(-)
create mode 100644 drivers/platform/chrome/cros_ec_dev.c
create mode 100644 drivers/platform/chrome/cros_ec_dev.h
create mode 100644 drivers/platform/chrome/cros_ec_lightbar.c
create mode 100644 drivers/platform/chrome/cros_ec_lpc.c
create mode 100644 drivers/platform/chrome/cros_ec_sysfs.c
Merging regmap/for-next (5e83a0463ac0 Merge remote-tracking branch 'regmap/topic/trace' into regmap-next)
$ git merge regmap/for-next
Auto-merging drivers/base/regmap/trace.h
Merge made by the 'recursive' strategy.
drivers/base/regmap/Makefile | 3 +++
drivers/base/regmap/regcache.c | 2 +-
drivers/base/regmap/regmap.c | 2 +-
include/trace/events/regmap.h => drivers/base/regmap/trace.h | 8 +++++++-
4 files changed, 12 insertions(+), 3 deletions(-)
rename include/trace/events/regmap.h => drivers/base/regmap/trace.h (97%)
Merging hsi/for-next (265ef3ee9575 HSI: cmt_speech: fix error return code)
$ git merge hsi/for-next
Merge made by the 'recursive' strategy.
drivers/hsi/clients/Kconfig | 12 +-
drivers/hsi/clients/Makefile | 1 +
drivers/hsi/clients/cmt_speech.c | 1457 ++++++++++++++++++++++++++++++++++
drivers/hsi/clients/nokia-modem.c | 33 +-
include/uapi/linux/hsi/Kbuild | 2 +-
include/uapi/linux/hsi/cs-protocol.h | 113 +++
6 files changed, 1615 insertions(+), 3 deletions(-)
create mode 100644 drivers/hsi/clients/cmt_speech.c
create mode 100644 include/uapi/linux/hsi/cs-protocol.h
Merging leds/for-next (ccdc45075aea leds: Don't treat the LED name as a format string)
$ git merge leds/for-next
Auto-merging drivers/leds/Kconfig
Merge made by the 'recursive' strategy.
Documentation/ABI/testing/sysfs-class-led-flash | 80 ++++
Documentation/devicetree/bindings/leds/common.txt | 6 +-
.../devicetree/bindings/leds/leds-gpio.txt | 12 +-
.../devicetree/bindings/leds/leds-pm8941-wled.txt | 43 ++
Documentation/driver-model/devres.txt | 4 +
Documentation/leds/leds-class-flash.txt | 22 ++
drivers/leds/Kconfig | 8 +
drivers/leds/Makefile | 1 +
drivers/leds/led-class-flash.c | 82 ----
drivers/leds/led-class.c | 96 ++++-
drivers/leds/leds-lp8501.c | 2 +-
drivers/leds/leds-lp8860.c | 14 +-
drivers/leds/leds-pca963x.c | 2 +-
drivers/leds/leds-pm8941-wled.c | 435 +++++++++++++++++++++
drivers/leds/leds-pwm.c | 3 -
include/dt-bindings/leds/common.h | 21 +
include/linux/led-class-flash.h | 19 +-
include/linux/leds.h | 5 +-
18 files changed, 735 insertions(+), 120 deletions(-)
create mode 100644 Documentation/ABI/testing/sysfs-class-led-flash
create mode 100644 Documentation/devicetree/bindings/leds/leds-pm8941-wled.txt
create mode 100644 Documentation/leds/leds-class-flash.txt
create mode 100644 drivers/leds/leds-pm8941-wled.c
create mode 100644 include/dt-bindings/leds/common.h
Merging ipmi/for-next (6a83ac6c005c ipmi:ssif: Ignore spaces when comparing I2C adapter names)
$ git merge ipmi/for-next
Merge made by the 'recursive' strategy.
Documentation/IPMI.txt | 5 +-
drivers/char/ipmi/ipmi_msghandler.c | 4 +-
drivers/char/ipmi/ipmi_si_intf.c | 113 +++++++++++++++++++++++++++++++++---
drivers/char/ipmi/ipmi_ssif.c | 37 +++++++++---
4 files changed, 139 insertions(+), 20 deletions(-)
Merging driver-core/driver-core-next (c9e15f25f514 debugfs: allow bad parent pointers to be passed in)
$ git merge driver-core/driver-core-next
Auto-merging include/linux/device.h
Auto-merging drivers/base/property.c
Auto-merging drivers/base/platform.c
Auto-merging drivers/base/dd.c
Auto-merging drivers/base/core.c
Merge made by the 'recursive' strategy.
Documentation/ABI/stable/sysfs-devices | 10 ++++++
Documentation/stable_kernel_rules.txt | 10 ++++++
drivers/base/attribute_container.c | 2 ++
drivers/base/bus.c | 4 +--
drivers/base/cacheinfo.c | 13 ++++++--
drivers/base/class.c | 2 ++
drivers/base/core.c | 19 ++++++++---
drivers/base/dd.c | 16 ++++++----
drivers/base/dma-mapping.c | 2 +-
drivers/base/driver.c | 1 +
drivers/base/firmware_class.c | 49 +++++++++++++++-------------
drivers/base/map.c | 3 +-
drivers/base/memory.c | 58 +++++++++++++++++-----------------
drivers/base/node.c | 28 ++++++++--------
drivers/base/platform.c | 9 ++++++
drivers/base/property.c | 2 +-
drivers/base/soc.c | 10 +++---
fs/debugfs/inode.c | 3 ++
fs/sysfs/group.c | 11 +++++--
include/linux/device.h | 7 ++++
include/linux/sysfs.h | 15 +++++++++
lib/kobject.c | 7 +++-
lib/lz4/lz4_decompress.c | 18 ++++-------
samples/kobject/kobject-example.c | 16 +++++++---
samples/kobject/kset-example.c | 16 +++++++---
25 files changed, 219 insertions(+), 112 deletions(-)
create mode 100644 Documentation/ABI/stable/sysfs-devices
Merging tty/tty-next (b3e3bf2ef2c7 Merge 4.0-rc7 into tty-next)
$ git merge tty/tty-next
Resolved 'drivers/dma/Kconfig' using previous resolution.
Auto-merging kernel/printk/printk.c
Removing include/linux/serial_mfd.h
Removing include/linux/platform_data/msm_serial_hs.h
Auto-merging include/asm-generic/vmlinux.lds.h
Removing drivers/tty/serial/msm_serial_hs.c
Removing drivers/tty/serial/mfd.c
Auto-merging drivers/dma/Makefile
Auto-merging drivers/dma/Kconfig
CONFLICT (content): Merge conflict in drivers/dma/Kconfig
Removing arch/x86/platform/intel-mid/early_printk_intel_mid.c
Auto-merging arch/x86/kernel/early_printk.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 6b2c68ec7fcf] Merge remote-tracking branch 'tty/tty-next'
$ git diff -M --stat --summary HEAD^..
arch/mips/mti-malta/malta-init.c | 4 +-
arch/x86/Kconfig.debug | 4 -
arch/x86/include/asm/intel-mid.h | 3 -
arch/x86/include/asm/serial.h | 8 +-
arch/x86/kernel/early_printk.c | 6 -
arch/x86/platform/intel-mid/Makefile | 1 -
.../platform/intel-mid/early_printk_intel_mid.c | 112 --
drivers/dma/Kconfig | 2 +
drivers/dma/Makefile | 1 +
drivers/dma/hsu/Kconfig | 14 +
drivers/dma/hsu/Makefile | 5 +
drivers/dma/hsu/hsu.c | 495 ++++++
drivers/dma/hsu/hsu.h | 118 ++
drivers/dma/hsu/pci.c | 124 ++
drivers/firmware/pcdp.c | 4 +-
drivers/tty/hvc/hvc_opal.c | 2 +-
drivers/tty/n_gsm.c | 2 +-
drivers/tty/serial/8250/8250.h | 23 +-
drivers/tty/serial/8250/8250_core.c | 477 +++--
drivers/tty/serial/8250/8250_dw.c | 58 +-
drivers/tty/serial/8250/8250_early.c | 52 +-
drivers/tty/serial/8250/8250_em.c | 1 -
drivers/tty/serial/8250/8250_hp300.c | 1 -
drivers/tty/serial/8250/8250_omap.c | 1 -
drivers/tty/serial/8250/8250_pci.c | 304 +++-
drivers/tty/serial/8250/Kconfig | 1 +
drivers/tty/serial/Kconfig | 32 +-
drivers/tty/serial/Makefile | 2 -
drivers/tty/serial/amba-pl011.c | 234 +--
drivers/tty/serial/apbuart.c | 2 +-
drivers/tty/serial/ar933x_uart.c | 2 +-
drivers/tty/serial/atmel_serial.c | 29 +-
drivers/tty/serial/bcm63xx_uart.c | 4 +-
drivers/tty/serial/bfin_uart.c | 2 +
drivers/tty/serial/clps711x.c | 2 +
drivers/tty/serial/cpm_uart/Makefile | 2 +-
drivers/tty/serial/cpm_uart/cpm_uart.h | 2 +-
drivers/tty/serial/cpm_uart/cpm_uart_core.c | 2 +-
drivers/tty/serial/earlycon.c | 140 +-
drivers/tty/serial/fsl_lpuart.c | 2 +-
drivers/tty/serial/imx.c | 317 ++--
drivers/tty/serial/jsm/jsm_cls.c | 2 +-
drivers/tty/serial/jsm/jsm_neo.c | 6 +-
drivers/tty/serial/max3100.c | 2 +-
drivers/tty/serial/mfd.c | 1505 ----------------
drivers/tty/serial/mpc52xx_uart.c | 2 +-
drivers/tty/serial/msm_serial.h | 9 -
drivers/tty/serial/msm_serial_hs.c | 1874 --------------------
drivers/tty/serial/mxs-auart.c | 18 +-
drivers/tty/serial/of_serial.c | 5 +-
drivers/tty/serial/omap-serial.c | 10 +-
drivers/tty/serial/pmac_zilog.c | 2 +-
drivers/tty/serial/pxa.c | 2 +-
drivers/tty/serial/sc16is7xx.c | 12 +-
drivers/tty/serial/serial-tegra.c | 2 +-
drivers/tty/serial/serial_core.c | 52 +-
drivers/tty/serial/serial_mctrl_gpio.c | 50 +-
drivers/tty/serial/sh-sci.c | 88 +-
drivers/tty/serial/sirfsoc_uart.c | 2 +-
drivers/tty/serial/sprd_serial.c | 6 +-
drivers/tty/serial/st-asc.c | 2 +-
drivers/tty/serial/uartlite.c | 2 +-
drivers/tty/serial/ucc_uart.c | 2 +-
drivers/tty/serial/xilinx_uartps.c | 242 +--
drivers/tty/tty_io.c | 24 +-
drivers/tty/vt/vt.c | 74 +-
drivers/tty/vt/vt_ioctl.c | 2 +-
include/asm-generic/vmlinux.lds.h | 9 +
include/linux/console.h | 3 +-
include/linux/dma/hsu.h | 48 +
include/linux/platform_data/dma-hsu.h | 25 +
include/linux/platform_data/msm_serial_hs.h | 49 -
include/linux/platform_data/serial-imx.h | 5 -
include/linux/serial_8250.h | 20 +-
include/linux/serial_core.h | 23 +-
include/linux/serial_mfd.h | 47 -
include/uapi/linux/serial_reg.h | 19 -
kernel/printk/printk.c | 53 +-
78 files changed, 2248 insertions(+), 4647 deletions(-)
delete mode 100644 arch/x86/platform/intel-mid/early_printk_intel_mid.c
create mode 100644 drivers/dma/hsu/Kconfig
create mode 100644 drivers/dma/hsu/Makefile
create mode 100644 drivers/dma/hsu/hsu.c
create mode 100644 drivers/dma/hsu/hsu.h
create mode 100644 drivers/dma/hsu/pci.c
delete mode 100644 drivers/tty/serial/mfd.c
delete mode 100644 drivers/tty/serial/msm_serial_hs.c
create mode 100644 include/linux/dma/hsu.h
create mode 100644 include/linux/platform_data/dma-hsu.h
delete mode 100644 include/linux/platform_data/msm_serial_hs.h
delete mode 100644 include/linux/serial_mfd.h
Merging usb/usb-next (b7a4abb67416 Merge 4.0-rc7 into usb-next)
$ git merge usb/usb-next
Auto-merging drivers/usb/phy/phy-msm-usb.c
Auto-merging drivers/usb/phy/phy-ab8500-usb.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
.../ABI/testing/configfs-usb-gadget-printer | 9 +
Documentation/devicetree/bindings/usb/dwc3.txt | 1 +
.../devicetree/bindings/usb/renesas_usbhs.txt | 5 +-
.../devicetree/bindings/usb/usbmisc-imx.txt | 1 +
Documentation/usb/chipidea.txt | 21 +
Documentation/usb/gadget-testing.txt | 47 +
MAINTAINERS | 10 +-
drivers/usb/Makefile | 2 +-
drivers/usb/atm/ueagle-atm.c | 4 +-
drivers/usb/c67x00/c67x00-hcd.c | 2 +-
drivers/usb/chipidea/Kconfig | 11 +
drivers/usb/chipidea/Makefile | 9 +-
drivers/usb/chipidea/bits.h | 11 +
drivers/usb/chipidea/ci.h | 69 +-
drivers/usb/chipidea/ci_hdrc_imx.c | 153 +-
drivers/usb/chipidea/ci_hdrc_imx.h | 1 +
drivers/usb/chipidea/ci_hdrc_pci.c | 31 +-
drivers/usb/chipidea/ci_hdrc_zevio.c | 2 +-
drivers/usb/chipidea/core.c | 185 ++-
drivers/usb/chipidea/host.c | 74 +-
drivers/usb/chipidea/otg.c | 2 +
drivers/usb/chipidea/otg_fsm.c | 389 +++---
drivers/usb/chipidea/otg_fsm.h | 27 -
drivers/usb/chipidea/udc.c | 39 +-
drivers/usb/chipidea/usbmisc_imx.c | 129 +-
drivers/usb/class/cdc-acm.c | 21 +-
drivers/usb/class/cdc-wdm.c | 47 +-
drivers/usb/core/usb.c | 36 +-
drivers/usb/dwc2/Kconfig | 8 +-
drivers/usb/dwc2/Makefile | 6 +-
drivers/usb/dwc2/core.h | 2 +
drivers/usb/dwc2/hcd.c | 10 +-
drivers/usb/dwc2/pci.c | 160 +--
drivers/usb/dwc2/platform.c | 29 +-
drivers/usb/dwc3/Kconfig | 7 -
drivers/usb/dwc3/core.c | 59 +-
drivers/usb/dwc3/core.h | 2 +
drivers/usb/dwc3/dwc3-omap.c | 11 +-
drivers/usb/dwc3/dwc3-pci.c | 2 -
drivers/usb/dwc3/gadget.c | 37 +-
drivers/usb/dwc3/host.c | 4 +-
drivers/usb/dwc3/platform_data.h | 1 +
drivers/usb/gadget/Kconfig | 17 +
drivers/usb/gadget/composite.c | 17 +-
drivers/usb/gadget/function/Makefile | 2 +
drivers/usb/gadget/function/f_hid.c | 1 -
drivers/usb/gadget/function/f_mass_storage.c | 109 +-
drivers/usb/gadget/function/f_printer.c | 1471 ++++++++++++++++++++
drivers/usb/gadget/function/u_printer.h | 37 +
drivers/usb/gadget/function/u_serial.c | 2 +-
drivers/usb/gadget/legacy/Kconfig | 1 +
drivers/usb/gadget/legacy/printer.c | 1239 +----------------
drivers/usb/gadget/udc/atmel_usba_udc.c | 212 ++-
drivers/usb/gadget/udc/atmel_usba_udc.h | 26 +-
drivers/usb/gadget/udc/dummy_hcd.c | 6 +-
drivers/usb/gadget/udc/goku_udc.c | 233 ++--
drivers/usb/gadget/udc/lpc32xx_udc.c | 15 +-
drivers/usb/gadget/udc/net2280.c | 182 ++-
drivers/usb/gadget/udc/net2280.h | 2 -
drivers/usb/gadget/udc/pxa27x_udc.c | 134 +-
drivers/usb/gadget/udc/udc-core.c | 68 +-
drivers/usb/host/Kconfig | 2 +-
drivers/usb/host/ehci-hub.c | 2 +-
drivers/usb/host/ehci-orion.c | 18 +-
drivers/usb/host/fhci-hub.c | 2 +-
drivers/usb/host/fotg210-hcd.c | 2 +-
drivers/usb/host/fusbh200-hcd.c | 2 +-
drivers/usb/host/imx21-hcd.c | 2 +-
drivers/usb/host/isp116x-hcd.c | 2 +-
drivers/usb/host/isp1362-hcd.c | 2 +-
drivers/usb/host/max3421-hcd.c | 2 +-
drivers/usb/host/ohci-at91.c | 18 +-
drivers/usb/host/ohci-hub.c | 2 +-
drivers/usb/host/oxu210hp-hcd.c | 2 +-
drivers/usb/host/r8a66597-hcd.c | 2 +-
drivers/usb/host/sl811-hcd.c | 3 +-
drivers/usb/host/u132-hcd.c | 2 +-
drivers/usb/host/uhci-hub.c | 2 +-
drivers/usb/host/whci/hcd.c | 3 +-
drivers/usb/host/xhci-plat.c | 19 +-
drivers/usb/host/xhci-ring.c | 4 +-
drivers/usb/image/mdc800.c | 11 +-
drivers/usb/isp1760/isp1760-hcd.c | 2 +-
drivers/usb/misc/Kconfig | 13 +
drivers/usb/misc/Makefile | 1 +
drivers/usb/misc/appledisplay.c | 2 +-
drivers/usb/misc/chaoskey.c | 532 +++++++
drivers/usb/misc/legousbtower.c | 6 +-
drivers/usb/misc/usb3503.c | 47 +-
drivers/usb/musb/musb_core.c | 214 +--
drivers/usb/musb/musb_core.h | 14 +-
drivers/usb/musb/musb_cppi41.c | 84 +-
drivers/usb/musb/musb_dsps.c | 105 +-
drivers/usb/musb/musb_gadget.c | 40 +-
drivers/usb/musb/musb_virthub.c | 2 +-
drivers/usb/phy/Kconfig | 4 +-
drivers/usb/phy/of.c | 2 +-
drivers/usb/phy/phy-ab8500-usb.c | 2 +-
drivers/usb/phy/phy-generic.c | 12 +-
drivers/usb/phy/phy-msm-usb.c | 18 +-
drivers/usb/phy/phy-rcar-gen2-usb.c | 2 +-
drivers/usb/phy/phy.c | 4 +-
drivers/usb/renesas_usbhs/common.c | 19 +
drivers/usb/renesas_usbhs/common.h | 7 +
drivers/usb/renesas_usbhs/fifo.c | 189 ++-
drivers/usb/renesas_usbhs/fifo.h | 1 +
drivers/usb/renesas_usbhs/mod_gadget.c | 22 +-
drivers/usb/renesas_usbhs/mod_host.c | 2 +-
drivers/usb/renesas_usbhs/pipe.c | 39 +
drivers/usb/renesas_usbhs/pipe.h | 1 +
drivers/usb/serial/ch341.c | 1 -
drivers/usb/serial/f81232.c | 558 ++++++--
drivers/usb/storage/alauda.c | 15 +-
drivers/usb/storage/cypress_atacb.c | 17 +-
drivers/usb/usbip/vhci_hcd.c | 2 +-
drivers/usb/wusbcore/rh.c | 2 +-
drivers/uwb/umc-bus.c | 34 -
drivers/uwb/whci.c | 3 +-
include/linux/pci_ids.h | 2 +
include/linux/usb/chipidea.h | 2 +
include/linux/usb/composite.h | 3 +
include/linux/usb/gadget.h | 9 +-
include/linux/usb/msm_hsusb.h | 4 -
include/linux/usb/otg-fsm.h | 2 +
include/linux/usb/renesas_usbhs.h | 2 +
include/linux/uwb/umc.h | 2 -
126 files changed, 4905 insertions(+), 2693 deletions(-)
create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-printer
create mode 100644 drivers/usb/gadget/function/f_printer.c
create mode 100644 drivers/usb/gadget/function/u_printer.h
create mode 100644 drivers/usb/misc/chaoskey.c
Merging usb-gadget/next (bbc78c07a51f usb: core: hub: use new USB_RESUME_TIMEOUT)
$ git merge usb-gadget/next
Auto-merging drivers/usb/musb/musb_virthub.c
Auto-merging drivers/usb/isp1760/isp1760-hcd.c
Auto-merging drivers/usb/host/xhci-ring.c
Auto-merging drivers/usb/host/uhci-hub.c
Auto-merging drivers/usb/host/sl811-hcd.c
Auto-merging drivers/usb/host/r8a66597-hcd.c
Auto-merging drivers/usb/host/oxu210hp-hcd.c
Auto-merging drivers/usb/host/isp116x-hcd.c
Auto-merging drivers/usb/host/fusbh200-hcd.c
Auto-merging drivers/usb/host/fotg210-hcd.c
Auto-merging drivers/usb/host/ehci-hub.c
Auto-merging drivers/usb/dwc2/hcd.c
Merge made by the 'recursive' strategy.
drivers/usb/core/hub.c | 4 ++--
drivers/usb/dwc2/hcd.c | 2 +-
drivers/usb/host/ehci-hcd.c | 10 +++++-----
drivers/usb/host/ehci-hub.c | 9 ++++++---
drivers/usb/host/fotg210-hcd.c | 2 +-
drivers/usb/host/fusbh200-hcd.c | 3 +--
drivers/usb/host/isp116x-hcd.c | 2 +-
drivers/usb/host/oxu210hp-hcd.c | 7 ++++---
drivers/usb/host/r8a66597-hcd.c | 2 +-
drivers/usb/host/sl811-hcd.c | 2 +-
drivers/usb/host/uhci-hub.c | 5 +++--
drivers/usb/host/xhci-ring.c | 2 +-
drivers/usb/isp1760/isp1760-hcd.c | 2 +-
drivers/usb/musb/musb_core.c | 7 ++++---
drivers/usb/musb/musb_virthub.c | 2 +-
include/linux/usb.h | 26 ++++++++++++++++++++++++++
16 files changed, 59 insertions(+), 28 deletions(-)
Merging usb-serial/usb-next (65dd82ae453f USB: f81232: fix some minor style issues)
$ git merge usb-serial/usb-next
Already up-to-date.
Merging staging/staging-next (c610f7f772aa Merge 4.0-rc7 into staging-next)
$ git merge staging/staging-next
Resolved 'drivers/staging/media/mn88473/mn88473.c' using previous resolution.
Auto-merging tools/iio/lsiio.c
Auto-merging tools/iio/iio_utils.c
Auto-merging tools/iio/iio_event_monitor.c
Auto-merging tools/iio/generic_buffer.c
Removing drivers/staging/unisys/visorutil/procobjecttree.c
Removing drivers/staging/unisys/visorutil/easyproc.h
Removing drivers/staging/unisys/visorutil/easyproc.c
Removing drivers/staging/unisys/include/uniklog.h
Auto-merging drivers/staging/unisys/include/timskmod.h
Auto-merging drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
Removing drivers/staging/rtl8192e/rtllib_endianfree.h
Auto-merging drivers/staging/octeon/ethernet.c
Auto-merging drivers/staging/nvec/nvec_power.c
Auto-merging drivers/staging/media/mn88473/mn88473.c
CONFLICT (content): Merge conflict in drivers/staging/media/mn88473/mn88473.c
Auto-merging drivers/staging/media/mn88472/mn88472.c
Auto-merging drivers/staging/media/davinci_vpfe/dm365_resizer.c
Auto-merging drivers/staging/media/davinci_vpfe/dm365_ipipeif.c
Auto-merging drivers/staging/media/bcm2048/radio-bcm2048.c
Auto-merging drivers/staging/lustre/lustre/llite/rw26.c
Auto-merging drivers/staging/lustre/lustre/llite/file.c
Removing drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
Removing drivers/staging/dgnc/dpacompat.h
Removing drivers/staging/dgnc/dgnc_types.h
Removing drivers/staging/dgnc/dgnc_kcompat.h
Auto-merging drivers/staging/comedi/drivers/serial2002.c
Removing drivers/staging/comedi/drivers/comedi_fc.h
Removing drivers/staging/comedi/drivers/8253.h
Auto-merging drivers/iio/adc/Kconfig
Auto-merging drivers/dma/ste_dma40.c
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master d141ee5e5494] Merge remote-tracking branch 'staging/staging-next'
$ git diff -M --stat --summary HEAD^..
Documentation/ABI/testing/sysfs-bus-iio | 137 +-
.../devicetree/bindings/iio/adc/mcp320x.txt | 30 +
.../devicetree/bindings/iio/adc/mcp3422.txt | 17 +
.../devicetree/bindings/iio/adc/ti-adc128s052.txt | 18 +
.../devicetree/bindings/iio/st-sensors.txt | 1 +
MAINTAINERS | 17 +-
drivers/dma/ste_dma40.c | 2 +-
drivers/iio/accel/bmc150-accel.c | 993 +++++---
drivers/iio/accel/kxcjk-1013.c | 6 +-
drivers/iio/accel/mma9551.c | 9 +-
drivers/iio/accel/mma9553.c | 6 +-
drivers/iio/accel/st_accel.h | 1 +
drivers/iio/accel/st_accel_core.c | 81 +
drivers/iio/accel/st_accel_i2c.c | 4 +
drivers/iio/adc/Kconfig | 5 +-
drivers/iio/adc/ad7793.c | 2 +-
drivers/iio/adc/vf610_adc.c | 5 +-
drivers/iio/common/ssp_sensors/ssp_dev.c | 2 +-
drivers/iio/dac/Kconfig | 11 +-
drivers/iio/dac/max517.c | 45 +-
drivers/iio/gyro/bmg160.c | 6 +-
drivers/iio/gyro/itg3200_core.c | 29 +-
drivers/iio/gyro/st_gyro_core.c | 83 +
drivers/iio/imu/inv_mpu6050/Makefile | 2 +-
drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c | 211 ++
drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 7 +
drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 3 +
drivers/iio/imu/kmx61.c | 70 +-
drivers/iio/industrialio-buffer.c | 197 +-
drivers/iio/kfifo_buf.c | 11 +-
drivers/iio/light/Kconfig | 10 +
drivers/iio/light/Makefile | 1 +
drivers/iio/light/cm3232.c | 36 +
drivers/iio/light/cm3323.c | 286 +++
drivers/iio/light/gp2ap020a00f.c | 6 +-
drivers/iio/light/jsa1212.c | 2 +-
drivers/iio/light/ltr501.c | 18 +-
drivers/iio/magnetometer/mag3110.c | 18 +-
drivers/iio/pressure/Kconfig | 27 +
drivers/iio/pressure/Makefile | 3 +
drivers/iio/pressure/ms5611.h | 44 +
drivers/iio/pressure/ms5611_core.c | 215 ++
drivers/iio/pressure/ms5611_i2c.c | 128 +
drivers/iio/pressure/ms5611_spi.c | 127 +
drivers/iio/proximity/sx9500.c | 6 +-
drivers/iio/temperature/mlx90614.c | 97 +-
drivers/staging/Kconfig | 4 +
drivers/staging/Makefile | 2 +
drivers/staging/android/ion/ion.c | 18 +-
drivers/staging/android/ion/ion_test.c | 1 +
drivers/staging/android/sync.c | 2 +-
drivers/staging/comedi/Kconfig | 27 +
drivers/staging/comedi/comedi_fops.c | 143 +-
drivers/staging/comedi/comedi_internal.h | 10 +
drivers/staging/comedi/comedi_pci.c | 3 +-
drivers/staging/comedi/comedi_pci.h | 64 +
drivers/staging/comedi/comedidev.h | 122 +-
drivers/staging/comedi/drivers.c | 10 +-
drivers/staging/comedi/drivers/8253.h | 347 ---
drivers/staging/comedi/drivers/8255.c | 1 -
drivers/staging/comedi/drivers/8255_pci.c | 5 +-
drivers/staging/comedi/drivers/Makefile | 1 +
drivers/staging/comedi/drivers/addi_apci_1032.c | 29 +-
drivers/staging/comedi/drivers/addi_apci_1500.c | 33 +-
drivers/staging/comedi/drivers/addi_apci_1516.c | 4 +-
drivers/staging/comedi/drivers/addi_apci_1564.c | 41 +-
drivers/staging/comedi/drivers/addi_apci_16xx.c | 3 +-
drivers/staging/comedi/drivers/addi_apci_2032.c | 29 +-
drivers/staging/comedi/drivers/addi_apci_2200.c | 3 +-
drivers/staging/comedi/drivers/addi_apci_3120.c | 41 +-
drivers/staging/comedi/drivers/addi_apci_3501.c | 10 +-
drivers/staging/comedi/drivers/addi_apci_3xxx.c | 34 +-
drivers/staging/comedi/drivers/addi_watchdog.c | 2 +-
drivers/staging/comedi/drivers/adl_pci6208.c | 49 +-
drivers/staging/comedi/drivers/adl_pci7x3x.c | 3 +-
drivers/staging/comedi/drivers/adl_pci8164.c | 5 +-
drivers/staging/comedi/drivers/adl_pci9111.c | 97 +-
drivers/staging/comedi/drivers/adl_pci9118.c | 164 +-
drivers/staging/comedi/drivers/adq12b.c | 3 -
drivers/staging/comedi/drivers/adv_pci1710.c | 246 +-
drivers/staging/comedi/drivers/adv_pci1723.c | 3 +-
drivers/staging/comedi/drivers/adv_pci1724.c | 3 +-
drivers/staging/comedi/drivers/adv_pci_dio.c | 139 +-
drivers/staging/comedi/drivers/aio_iiro_16.c | 23 +-
.../staging/comedi/drivers/amplc_dio200_common.c | 364 +--
drivers/staging/comedi/drivers/amplc_dio200_pci.c | 3 +-
.../staging/comedi/drivers/amplc_pc236_common.c | 23 +-
drivers/staging/comedi/drivers/amplc_pci224.c | 82 +-
drivers/staging/comedi/drivers/amplc_pci230.c | 128 +-
drivers/staging/comedi/drivers/amplc_pci236.c | 3 +-
drivers/staging/comedi/drivers/amplc_pci263.c | 3 +-
drivers/staging/comedi/drivers/cb_das16_cs.c | 15 +-
drivers/staging/comedi/drivers/cb_pcidas.c | 173 +-
drivers/staging/comedi/drivers/cb_pcidas64.c | 126 +-
drivers/staging/comedi/drivers/cb_pcidda.c | 4 +-
drivers/staging/comedi/drivers/cb_pcimdas.c | 370 ++-
drivers/staging/comedi/drivers/cb_pcimdda.c | 5 +-
drivers/staging/comedi/drivers/comedi_8254.c | 664 +++++
drivers/staging/comedi/drivers/comedi_8254.h | 133 +
drivers/staging/comedi/drivers/comedi_bond.c | 7 +-
drivers/staging/comedi/drivers/comedi_fc.h | 102 -
drivers/staging/comedi/drivers/comedi_isadma.c | 3 +-
drivers/staging/comedi/drivers/comedi_parport.c | 23 +-
drivers/staging/comedi/drivers/comedi_test.c | 51 +-
drivers/staging/comedi/drivers/contec_pci_dio.c | 5 +-
drivers/staging/comedi/drivers/daqboard2000.c | 5 +-
drivers/staging/comedi/drivers/das08.c | 79 +-
drivers/staging/comedi/drivers/das08_pci.c | 3 +-
drivers/staging/comedi/drivers/das16.c | 98 +-
drivers/staging/comedi/drivers/das16m1.c | 114 +-
drivers/staging/comedi/drivers/das1800.c | 125 +-
drivers/staging/comedi/drivers/das6402.c | 79 +-
drivers/staging/comedi/drivers/das800.c | 80 +-
drivers/staging/comedi/drivers/dmm32at.c | 33 +-
drivers/staging/comedi/drivers/dt2801.c | 3 +-
drivers/staging/comedi/drivers/dt2811.c | 1 -
drivers/staging/comedi/drivers/dt2814.c | 33 +-
drivers/staging/comedi/drivers/dt2815.c | 1 -
drivers/staging/comedi/drivers/dt282x.c | 64 +-
drivers/staging/comedi/drivers/dt3000.c | 49 +-
drivers/staging/comedi/drivers/dyna_pci10xx.c | 20 +-
drivers/staging/comedi/drivers/gsc_hpdi.c | 26 +-
drivers/staging/comedi/drivers/icp_multi.c | 6 +-
drivers/staging/comedi/drivers/jr3_pci.c | 8 +-
drivers/staging/comedi/drivers/ke_counter.c | 3 +-
drivers/staging/comedi/drivers/me4000.c | 170 +-
drivers/staging/comedi/drivers/me_daq.c | 3 +-
drivers/staging/comedi/drivers/mf6x4.c | 5 +-
drivers/staging/comedi/drivers/mite.c | 10 +-
drivers/staging/comedi/drivers/mite.h | 3 +-
drivers/staging/comedi/drivers/mpc624.c | 1 -
drivers/staging/comedi/drivers/ni_6527.c | 26 +-
drivers/staging/comedi/drivers/ni_65xx.c | 30 +-
drivers/staging/comedi/drivers/ni_660x.c | 11 +-
drivers/staging/comedi/drivers/ni_670x.c | 5 +-
drivers/staging/comedi/drivers/ni_at_a2150.c | 52 +-
drivers/staging/comedi/drivers/ni_at_ao.c | 14 +-
drivers/staging/comedi/drivers/ni_atmio.c | 4 +-
drivers/staging/comedi/drivers/ni_atmio16d.c | 33 +-
drivers/staging/comedi/drivers/ni_labpc.c | 1 +
drivers/staging/comedi/drivers/ni_labpc.h | 16 +-
drivers/staging/comedi/drivers/ni_labpc_common.c | 239 +-
drivers/staging/comedi/drivers/ni_labpc_cs.c | 14 +-
drivers/staging/comedi/drivers/ni_labpc_isadma.c | 1 -
drivers/staging/comedi/drivers/ni_labpc_pci.c | 13 +-
drivers/staging/comedi/drivers/ni_mio_common.c | 188 +-
drivers/staging/comedi/drivers/ni_pcidio.c | 43 +-
drivers/staging/comedi/drivers/ni_pcimio.c | 13 +-
drivers/staging/comedi/drivers/ni_tiocmd.c | 36 +-
drivers/staging/comedi/drivers/pcl711.c | 76 +-
drivers/staging/comedi/drivers/pcl726.c | 23 +-
drivers/staging/comedi/drivers/pcl812.c | 96 +-
drivers/staging/comedi/drivers/pcl816.c | 95 +-
drivers/staging/comedi/drivers/pcl818.c | 120 +-
drivers/staging/comedi/drivers/pcmmio.c | 29 +-
drivers/staging/comedi/drivers/pcmuio.c | 33 +-
drivers/staging/comedi/drivers/quatech_daqp_cs.c | 44 +-
drivers/staging/comedi/drivers/rtd520.c | 90 +-
drivers/staging/comedi/drivers/s626.c | 113 +-
drivers/staging/comedi/drivers/serial2002.c | 7 +-
drivers/staging/comedi/drivers/ssv_dnp.c | 1 -
drivers/staging/comedi/drivers/unioxx5.c | 9 +-
drivers/staging/comedi/drivers/usbdux.c | 80 +-
drivers/staging/comedi/drivers/usbduxfast.c | 32 +-
drivers/staging/comedi/drivers/usbduxsigma.c | 99 +-
.../staging/comedi/kcomedilib/kcomedilib_main.c | 2 +-
drivers/staging/dgap/dgap.c | 14 +-
drivers/staging/dgap/dgap.h | 2 +-
drivers/staging/dgnc/Makefile | 2 -
drivers/staging/dgnc/TODO | 6 +-
drivers/staging/dgnc/dgnc_cls.c | 73 +-
drivers/staging/dgnc/dgnc_cls.h | 53 +-
drivers/staging/dgnc/dgnc_driver.c | 75 +-
drivers/staging/dgnc/dgnc_driver.h | 24 +-
drivers/staging/dgnc/dgnc_kcompat.h | 46 -
drivers/staging/dgnc/dgnc_mgmt.c | 25 +-
drivers/staging/dgnc/dgnc_mgmt.h | 6 -
drivers/staging/dgnc/dgnc_neo.c | 88 +-
drivers/staging/dgnc/dgnc_neo.h | 8 -
drivers/staging/dgnc/dgnc_pci.h | 6 -
drivers/staging/dgnc/dgnc_sysfs.c | 20 +-
drivers/staging/dgnc/dgnc_sysfs.h | 11 +-
drivers/staging/dgnc/dgnc_tty.c | 80 +-
drivers/staging/dgnc/dgnc_tty.h | 6 -
drivers/staging/dgnc/dgnc_types.h | 33 -
drivers/staging/dgnc/dgnc_utils.c | 52 -
drivers/staging/dgnc/dgnc_utils.h | 1 -
drivers/staging/dgnc/digi.h | 308 +--
drivers/staging/dgnc/dpacompat.h | 115 -
drivers/staging/emxx_udc/emxx_udc.c | 168 +-
drivers/staging/emxx_udc/emxx_udc.h | 28 +-
drivers/staging/fbtft/Kconfig | 6 +
drivers/staging/fbtft/Makefile | 1 +
drivers/staging/fbtft/README | 12 +-
drivers/staging/fbtft/fb_agm1264k-fl.c | 25 +-
drivers/staging/fbtft/fb_bd663474.c | 100 +-
drivers/staging/fbtft/fb_hx8340bn.c | 23 +-
drivers/staging/fbtft/fb_hx8347d.c | 7 +-
drivers/staging/fbtft/fb_hx8353d.c | 4 +-
drivers/staging/fbtft/fb_ili9163.c | 303 +++
drivers/staging/fbtft/fb_ili9320.c | 8 +-
drivers/staging/fbtft/fb_ili9325.c | 27 +-
drivers/staging/fbtft/fb_ili9340.c | 12 +-
drivers/staging/fbtft/fb_ili9341.c | 4 +-
drivers/staging/fbtft/fb_ili9481.c | 2 +-
drivers/staging/fbtft/fb_ili9486.c | 8 +-
drivers/staging/fbtft/fb_pcd8544.c | 118 +-
drivers/staging/fbtft/fb_ra8875.c | 160 +-
drivers/staging/fbtft/fb_s6d02a1.c | 4 +-
drivers/staging/fbtft/fb_s6d1121.c | 10 +-
drivers/staging/fbtft/fb_ssd1289.c | 15 +-
drivers/staging/fbtft/fb_ssd1306.c | 4 +-
drivers/staging/fbtft/fb_ssd1331.c | 42 +-
drivers/staging/fbtft/fb_ssd1351.c | 15 +-
drivers/staging/fbtft/fb_st7735r.c | 22 +-
drivers/staging/fbtft/fb_tinylcd.c | 2 +-
drivers/staging/fbtft/fb_tls8204.c | 2 +-
drivers/staging/fbtft/fb_uc1701.c | 3 +-
drivers/staging/fbtft/fb_upd161704.c | 90 +-
drivers/staging/fbtft/fb_watterott.c | 2 +-
drivers/staging/fbtft/fbtft-bus.c | 2 +-
drivers/staging/fbtft/fbtft-core.c | 32 +-
drivers/staging/fbtft/fbtft-io.c | 15 +-
drivers/staging/fbtft/fbtft-sysfs.c | 7 +-
drivers/staging/fbtft/fbtft.h | 16 +-
drivers/staging/fbtft/fbtft_device.c | 120 +-
drivers/staging/fbtft/flexfb.c | 2 +-
drivers/staging/fbtft/internal.h | 25 +
drivers/staging/fsl-mc/Kconfig | 1 +
drivers/staging/fsl-mc/Makefile | 2 +
drivers/staging/fsl-mc/TODO | 13 +
drivers/staging/fsl-mc/bus/Kconfig | 24 +
drivers/staging/fsl-mc/bus/Makefile | 17 +
drivers/staging/fsl-mc/bus/dpbp.c | 358 +++
drivers/staging/fsl-mc/bus/dpmcp-cmd.h | 136 +
drivers/staging/fsl-mc/bus/dpmcp.c | 308 +++
drivers/staging/fsl-mc/bus/dpmcp.h | 311 +++
drivers/staging/fsl-mc/bus/dpmng-cmd.h | 47 +
drivers/staging/fsl-mc/bus/dpmng.c | 78 +
drivers/staging/fsl-mc/bus/dprc-cmd.h | 84 +
drivers/staging/fsl-mc/bus/dprc-driver.c | 486 ++++
drivers/staging/fsl-mc/bus/dprc.c | 913 +++++++
drivers/staging/fsl-mc/bus/mc-allocator.c | 573 +++++
drivers/staging/fsl-mc/bus/mc-bus.c | 793 ++++++
drivers/staging/fsl-mc/bus/mc-sys.c | 287 +++
drivers/staging/fsl-mc/include/dpbp-cmd.h | 60 +
drivers/staging/fsl-mc/include/dpbp.h | 330 +++
drivers/staging/fsl-mc/include/dpcon-cmd.h | 62 +
drivers/staging/fsl-mc/include/dpmng.h | 80 +
drivers/staging/fsl-mc/include/dprc.h | 801 ++++++
drivers/staging/fsl-mc/include/mc-cmd.h | 113 +
drivers/staging/fsl-mc/include/mc-private.h | 116 +
drivers/staging/fsl-mc/include/mc-sys.h | 76 +
drivers/staging/fsl-mc/include/mc.h | 201 ++
drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c | 13 +-
drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c | 22 +-
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 605 ++---
drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 27 +-
.../staging/ft1000/ft1000-usb/ft1000_download.c | 18 +-
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 23 +-
drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 5 +-
drivers/staging/fwserial/fwserial.c | 2 +-
drivers/staging/gdm724x/gdm_lte.c | 2 +-
drivers/staging/gdm724x/gdm_mux.c | 8 +-
drivers/staging/gdm724x/gdm_usb.c | 15 +-
drivers/staging/gdm72xx/gdm_qos.c | 3 +-
drivers/staging/gdm72xx/gdm_sdio.c | 6 +-
drivers/staging/gdm72xx/gdm_wimax.c | 6 +-
drivers/staging/goldfish/goldfish_audio.c | 20 +-
drivers/staging/goldfish/goldfish_nand.c | 6 +-
drivers/staging/gs_fpgaboot/gs_fpgaboot.c | 1 -
drivers/staging/i2o/bus-osm.c | 3 +-
drivers/staging/i2o/config-osm.c | 2 +-
drivers/staging/i2o/debug.c | 7 +-
drivers/staging/i2o/device.c | 4 +-
drivers/staging/i2o/driver.c | 7 +-
drivers/staging/i2o/exec-osm.c | 4 +-
drivers/staging/i2o/i2o_block.c | 26 +-
drivers/staging/i2o/i2o_config.c | 5 +-
drivers/staging/i2o/i2o_proc.c | 26 +-
drivers/staging/i2o/iop.c | 26 +-
drivers/staging/i2o/memory.c | 3 +-
drivers/staging/i2o/pci.c | 9 +-
drivers/staging/iio/accel/adis16201.h | 18 +-
drivers/staging/iio/accel/adis16201_core.c | 8 +-
drivers/staging/iio/accel/adis16203.h | 24 +-
drivers/staging/iio/accel/adis16203_core.c | 4 +-
drivers/staging/iio/accel/adis16204.h | 22 +-
drivers/staging/iio/accel/adis16204_core.c | 8 +-
drivers/staging/iio/accel/adis16209.h | 22 +-
drivers/staging/iio/accel/adis16209_core.c | 9 +-
drivers/staging/iio/accel/adis16220.h | 40 +-
drivers/staging/iio/accel/adis16220_core.c | 48 +-
drivers/staging/iio/accel/adis16240.h | 30 +-
drivers/staging/iio/accel/adis16240_core.c | 23 +-
drivers/staging/iio/accel/lis3l02dq.h | 2 +
drivers/staging/iio/accel/lis3l02dq_core.c | 6 +-
drivers/staging/iio/accel/lis3l02dq_ring.c | 20 +-
drivers/staging/iio/accel/sca3000.h | 5 +-
drivers/staging/iio/accel/sca3000_core.c | 6 +-
drivers/staging/iio/accel/sca3000_ring.c | 4 +-
drivers/staging/iio/adc/ad7192.c | 62 +-
drivers/staging/iio/adc/ad7280a.c | 59 +-
drivers/staging/iio/adc/ad7280a.h | 8 +-
drivers/staging/iio/adc/ad7606_ring.c | 2 +-
drivers/staging/iio/adc/ad7780.c | 18 +-
drivers/staging/iio/adc/mxs-lradc.c | 48 +-
drivers/staging/iio/adc/spear_adc.c | 6 +-
drivers/staging/iio/frequency/ad9832.c | 10 +-
drivers/staging/iio/frequency/ad9832.h | 12 +-
drivers/staging/iio/frequency/ad9834.c | 45 +-
drivers/staging/iio/frequency/ad9834.h | 37 +-
drivers/staging/iio/frequency/dds.h | 4 +
drivers/staging/iio/iio_dummy_evgen.c | 4 +-
drivers/staging/iio/iio_simple_dummy.c | 3 +-
drivers/staging/iio/iio_simple_dummy_buffer.c | 6 +-
drivers/staging/iio/impedance-analyzer/ad5933.c | 2 +-
drivers/staging/iio/light/isl29028.c | 8 +-
drivers/staging/iio/light/tsl2583.c | 4 +-
drivers/staging/iio/light/tsl2x7x_core.c | 38 +-
drivers/staging/iio/magnetometer/hmc5843.h | 13 +-
drivers/staging/iio/magnetometer/hmc5843_core.c | 107 +-
drivers/staging/iio/magnetometer/hmc5843_i2c.c | 46 +-
drivers/staging/iio/magnetometer/hmc5843_spi.c | 8 +-
drivers/staging/iio/meter/ade7753.c | 8 +-
drivers/staging/iio/meter/ade7754.c | 26 +-
drivers/staging/iio/meter/ade7758_core.c | 37 +-
drivers/staging/iio/meter/ade7758_ring.c | 8 +-
drivers/staging/iio/meter/ade7758_trigger.c | 2 +-
drivers/staging/iio/meter/ade7759.c | 26 +-
drivers/staging/iio/meter/ade7854-i2c.c | 44 +-
drivers/staging/iio/meter/ade7854-spi.c | 6 +-
drivers/staging/iio/meter/meter.h | 4 +
drivers/staging/iio/resolver/ad2s1210.c | 22 +-
drivers/staging/iio/resolver/ad2s1210.h | 3 +
drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 2 +-
.../staging/iio/trigger/iio-trig-periodic-rtc.c | 16 +-
.../lustre/include/linux/libcfs/libcfs_debug.h | 6 +-
.../lustre/include/linux/libcfs/libcfs_hash.h | 6 +-
.../include/linux/libcfs/libcfs_kernelcomm.h | 4 +-
.../lustre/include/linux/libcfs/libcfs_private.h | 4 +-
.../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 498 ++--
.../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 2 +-
.../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 414 ++--
.../lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c | 18 +-
.../staging/lustre/lnet/klnds/socklnd/socklnd.c | 452 ++--
.../staging/lustre/lnet/klnds/socklnd/socklnd.h | 130 +-
.../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 4 +-
.../lustre/lnet/klnds/socklnd/socklnd_lib-linux.c | 104 +-
.../lustre/lnet/klnds/socklnd/socklnd_lib-linux.h | 2 +-
.../lustre/lnet/klnds/socklnd/socklnd_modparams.c | 6 +-
.../lustre/lnet/klnds/socklnd/socklnd_proto.c | 40 +-
drivers/staging/lustre/lnet/lnet/api-ni.c | 8 +-
drivers/staging/lustre/lnet/lnet/config.c | 64 +-
drivers/staging/lustre/lnet/lnet/lib-eq.c | 3 +-
drivers/staging/lustre/lnet/lnet/lib-md.c | 2 +-
drivers/staging/lustre/lnet/lnet/lib-move.c | 2 +-
drivers/staging/lustre/lnet/lnet/peer.c | 4 +-
drivers/staging/lustre/lnet/lnet/router.c | 98 +-
drivers/staging/lustre/lnet/selftest/brw_test.c | 1 -
drivers/staging/lustre/lnet/selftest/conctl.c | 114 +-
drivers/staging/lustre/lnet/selftest/console.c | 80 +-
drivers/staging/lustre/lnet/selftest/console.h | 3 +
drivers/staging/lustre/lnet/selftest/framework.c | 220 +-
drivers/staging/lustre/lnet/selftest/module.c | 1 -
drivers/staging/lustre/lnet/selftest/ping_test.c | 30 +-
drivers/staging/lustre/lnet/selftest/rpc.c | 163 +-
drivers/staging/lustre/lustre/fid/lproc_fid.c | 23 +-
drivers/staging/lustre/lustre/fld/fld_internal.h | 2 +-
drivers/staging/lustre/lustre/fld/fld_request.c | 8 +-
drivers/staging/lustre/lustre/fld/lproc_fld.c | 3 +-
.../staging/lustre/lustre/include/lprocfs_status.h | 6 +-
drivers/staging/lustre/lustre/include/lu_object.h | 2 +-
drivers/staging/lustre/lustre/include/lustre_dlm.h | 2 +-
.../staging/lustre/lustre/include/lustre_import.h | 2 +
drivers/staging/lustre/lustre/include/lustre_net.h | 2 +-
drivers/staging/lustre/lustre/include/obd_class.h | 103 +-
drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 5 +-
drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 3 +-
drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 16 +-
drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 4 +-
drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 4 +-
drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 6 +-
drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 3 +-
drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 2 +-
drivers/staging/lustre/lustre/libcfs/Makefile | 2 +-
drivers/staging/lustre/lustre/libcfs/debug.c | 4 +-
drivers/staging/lustre/lustre/libcfs/hash.c | 13 +-
.../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 102 +-
.../lustre/lustre/libcfs/linux/linux-debug.c | 2 +-
.../lustre/lustre/libcfs/linux/linux-module.c | 2 +-
.../lustre/lustre/libcfs/linux/linux-prim.c | 24 +-
.../lustre/lustre/libcfs/linux/linux-proc.c | 577 -----
.../lustre/lustre/libcfs/linux/linux-tcpip.c | 10 +-
drivers/staging/lustre/lustre/libcfs/module.c | 566 ++++-
drivers/staging/lustre/lustre/libcfs/tracefile.c | 28 +-
drivers/staging/lustre/lustre/libcfs/workitem.c | 2 +-
drivers/staging/lustre/lustre/llite/dcache.c | 7 +-
drivers/staging/lustre/lustre/llite/dir.c | 31 +-
drivers/staging/lustre/lustre/llite/file.c | 18 +-
drivers/staging/lustre/lustre/llite/llite_close.c | 4 +-
drivers/staging/lustre/lustre/llite/llite_lib.c | 21 +-
drivers/staging/lustre/lustre/llite/llite_mmap.c | 4 +-
drivers/staging/lustre/lustre/llite/lloop.c | 5 +-
drivers/staging/lustre/lustre/llite/lproc_llite.c | 129 +-
drivers/staging/lustre/lustre/llite/namei.c | 18 +-
drivers/staging/lustre/lustre/llite/rw.c | 4 +-
drivers/staging/lustre/lustre/llite/rw26.c | 2 +-
drivers/staging/lustre/lustre/llite/statahead.c | 15 +-
drivers/staging/lustre/lustre/llite/super25.c | 4 +-
drivers/staging/lustre/lustre/llite/vvp_dev.c | 8 +-
drivers/staging/lustre/lustre/llite/xattr_cache.c | 27 +-
drivers/staging/lustre/lustre/lmv/lmv_obd.c | 4 +-
drivers/staging/lustre/lustre/lmv/lproc_lmv.c | 19 +-
drivers/staging/lustre/lustre/lov/lov_dev.c | 2 +-
drivers/staging/lustre/lustre/lov/lov_ea.c | 14 +-
drivers/staging/lustre/lustre/lov/lov_internal.h | 12 +
drivers/staging/lustre/lustre/lov/lov_io.c | 16 +-
drivers/staging/lustre/lustre/lov/lov_lock.c | 26 +-
drivers/staging/lustre/lustre/lov/lov_obd.c | 62 +-
drivers/staging/lustre/lustre/lov/lov_object.c | 10 +-
drivers/staging/lustre/lustre/lov/lov_pool.c | 2 +-
drivers/staging/lustre/lustre/lov/lov_request.c | 9 +
drivers/staging/lustre/lustre/lov/lproc_lov.c | 36 +-
drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 7 +-
drivers/staging/lustre/lustre/mdc/mdc_request.c | 7 +-
drivers/staging/lustre/lustre/mgc/mgc_request.c | 60 +-
drivers/staging/lustre/lustre/obdclass/class_obd.c | 3 -
drivers/staging/lustre/lustre/obdclass/dt_object.c | 5 +-
drivers/staging/lustre/lustre/obdclass/genops.c | 17 +-
.../lustre/lustre/obdclass/linux/linux-module.c | 40 +-
.../lustre/lustre/obdclass/linux/linux-sysctl.c | 4 +-
drivers/staging/lustre/lustre/obdclass/llog_cat.c | 10 +-
.../lustre/lustre/obdclass/lprocfs_status.c | 110 +-
drivers/staging/lustre/lustre/obdclass/lu_object.c | 33 +-
drivers/staging/lustre/lustre/obdclass/obd_mount.c | 6 +-
.../staging/lustre/lustre/obdecho/echo_client.c | 66 +-
drivers/staging/lustre/lustre/obdecho/lproc_echo.c | 2 +-
drivers/staging/lustre/lustre/osc/lproc_osc.c | 69 +-
drivers/staging/lustre/lustre/osc/osc_cache.c | 2 +-
drivers/staging/lustre/lustre/osc/osc_io.c | 2 +-
drivers/staging/lustre/lustre/osc/osc_lock.c | 2 +-
drivers/staging/lustre/lustre/osc/osc_request.c | 7 +-
drivers/staging/lustre/lustre/ptlrpc/client.c | 37 +-
drivers/staging/lustre/lustre/ptlrpc/connection.c | 1 +
drivers/staging/lustre/lustre/ptlrpc/import.c | 15 +-
drivers/staging/lustre/lustre/ptlrpc/layout.c | 6 +-
.../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 29 +-
drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 5 +-
drivers/staging/lustre/lustre/ptlrpc/nrs.c | 8 +-
.../staging/lustre/lustre/ptlrpc/pack_generic.c | 6 +-
drivers/staging/lustre/lustre/ptlrpc/pinger.c | 2 +-
.../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 4 +-
drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 10 +-
drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 89 +-
drivers/staging/lustre/lustre/ptlrpc/service.c | 9 +-
drivers/staging/media/bcm2048/radio-bcm2048.c | 30 +-
drivers/staging/media/cxd2099/cxd2099.c | 1 -
drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 5 +-
drivers/staging/media/davinci_vpfe/dm365_resizer.c | 1 -
.../staging/media/davinci_vpfe/vpfe_mc_capture.c | 7 +-
drivers/staging/media/lirc/lirc_imon.c | 30 +-
drivers/staging/media/lirc/lirc_parallel.c | 6 +-
drivers/staging/media/lirc/lirc_sasem.c | 33 +-
drivers/staging/media/lirc/lirc_serial.c | 6 +-
drivers/staging/media/lirc/lirc_sir.c | 4 +-
drivers/staging/media/lirc/lirc_zilog.c | 3 +-
drivers/staging/media/mn88472/mn88472.c | 2 +-
drivers/staging/media/mn88473/mn88473.c | 24 +-
drivers/staging/media/omap4iss/iss.c | 16 +-
drivers/staging/media/omap4iss/iss_video.c | 3 +-
drivers/staging/mt29f_spinand/mt29f_spinand.c | 2 +-
drivers/staging/netlogic/xlr_net.c | 2 +-
drivers/staging/nvec/Kconfig | 18 +
drivers/staging/nvec/nvec.c | 2 +-
drivers/staging/nvec/nvec_paz00.c | 2 +-
drivers/staging/nvec/nvec_power.c | 2 +-
drivers/staging/nvec/nvec_ps2.c | 2 +-
drivers/staging/octeon-usb/octeon-hcd.c | 1130 ++++-----
drivers/staging/octeon-usb/octeon-hcd.h | 513 ++--
drivers/staging/octeon/ethernet-mdio.c | 13 -
drivers/staging/octeon/ethernet-mdio.h | 3 +
drivers/staging/octeon/ethernet.c | 4 +-
drivers/staging/olpc_dcon/olpc_dcon.c | 2 -
drivers/staging/ozwpan/ozhcd.c | 23 +-
drivers/staging/ozwpan/ozmain.c | 14 +-
drivers/staging/ozwpan/ozpd.c | 63 +-
drivers/staging/ozwpan/ozproto.c | 2 +-
drivers/staging/panel/panel.c | 94 +-
drivers/staging/rtl8188eu/core/rtw_ap.c | 8 +-
drivers/staging/rtl8188eu/core/rtw_cmd.c | 18 +-
drivers/staging/rtl8188eu/core/rtw_efuse.c | 8 +-
drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 11 +-
drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 3 +-
drivers/staging/rtl8188eu/core/rtw_led.c | 66 +-
drivers/staging/rtl8188eu/core/rtw_mlme.c | 29 +-
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 46 +-
drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 8 +-
drivers/staging/rtl8188eu/core/rtw_recv.c | 24 +-
drivers/staging/rtl8188eu/core/rtw_security.c | 20 +-
drivers/staging/rtl8188eu/core/rtw_sreset.c | 2 +-
drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 129 +-
drivers/staging/rtl8188eu/core/rtw_xmit.c | 20 +-
.../staging/rtl8188eu/hal/Hal8188ERateAdaptive.c | 83 +-
drivers/staging/rtl8188eu/hal/bb_cfg.c | 219 +-
drivers/staging/rtl8188eu/hal/fw.c | 3 +-
drivers/staging/rtl8188eu/hal/odm.c | 8 +-
drivers/staging/rtl8188eu/hal/odm_HWConfig.c | 4 +-
drivers/staging/rtl8188eu/hal/phy.c | 184 +-
drivers/staging/rtl8188eu/hal/pwrseqcmd.c | 1 -
drivers/staging/rtl8188eu/hal/rf.c | 2 +-
drivers/staging/rtl8188eu/hal/rf_cfg.c | 4 +-
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 3 +-
drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 2 +-
drivers/staging/rtl8188eu/hal/usb_halinit.c | 8 +-
drivers/staging/rtl8188eu/include/ieee80211.h | 1 -
drivers/staging/rtl8188eu/include/osdep_service.h | 19 -
drivers/staging/rtl8188eu/include/rtw_led.h | 2 +-
drivers/staging/rtl8188eu/include/rtw_mlme.h | 6 +-
drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 16 +-
drivers/staging/rtl8188eu/include/rtw_pwrctrl.h | 5 +-
drivers/staging/rtl8188eu/include/rtw_recv.h | 6 +-
drivers/staging/rtl8188eu/include/rtw_security.h | 26 -
drivers/staging/rtl8188eu/include/wifi.h | 52 +-
drivers/staging/rtl8188eu/include/wlan_bssdef.h | 10 -
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 14 +-
drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 19 +-
drivers/staging/rtl8188eu/os_dep/os_intfs.c | 8 +-
drivers/staging/rtl8188eu/os_dep/recv_linux.c | 5 +-
drivers/staging/rtl8188eu/os_dep/usb_intf.c | 2 +-
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 16 +-
drivers/staging/rtl8192e/dot11d.h | 9 +-
drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c | 51 +-
drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 32 +-
drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h | 30 +-
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 233 +-
.../staging/rtl8192e/rtl8192e/r8192E_firmware.c | 42 +-
drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h | 14 +-
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 234 +-
drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h | 7 -
drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 35 +-
drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 432 ++--
drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 10 +-
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 384 ++-
drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 8 -
drivers/staging/rtl8192e/rtl8192e/rtl_pci.c | 23 +-
drivers/staging/rtl8192e/rtl8192e/rtl_pm.c | 21 +-
drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 50 +-
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 127 +-
drivers/staging/rtl8192e/rtl819x_BAProc.c | 79 +-
drivers/staging/rtl8192e/rtl819x_HT.h | 47 -
drivers/staging/rtl8192e/rtl819x_HTProc.c | 228 +-
drivers/staging/rtl8192e/rtl819x_Qos.h | 18 -
drivers/staging/rtl8192e/rtl819x_TSProc.c | 168 +-
drivers/staging/rtl8192e/rtllib.h | 175 +-
drivers/staging/rtl8192e/rtllib_crypt.c | 17 +-
drivers/staging/rtl8192e/rtllib_crypt.h | 3 +-
drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 32 +-
drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 81 +-
drivers/staging/rtl8192e/rtllib_crypt_wep.c | 14 +-
drivers/staging/rtl8192e/rtllib_debug.h | 4 +-
drivers/staging/rtl8192e/rtllib_endianfree.h | 122 -
drivers/staging/rtl8192e/rtllib_module.c | 14 +-
drivers/staging/rtl8192e/rtllib_rx.c | 305 +--
drivers/staging/rtl8192e/rtllib_softmac.c | 380 +--
drivers/staging/rtl8192e/rtllib_softmac_wx.c | 11 +-
drivers/staging/rtl8192e/rtllib_tx.c | 357 +--
drivers/staging/rtl8192e/rtllib_wx.c | 65 +-
drivers/staging/rtl8192u/ieee80211/dot11d.c | 2 +-
drivers/staging/rtl8192u/ieee80211/dot11d.h | 2 +-
drivers/staging/rtl8192u/ieee80211/ieee80211.h | 105 +-
.../staging/rtl8192u/ieee80211/ieee80211_crypt.c | 19 +-
.../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 15 +-
.../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 3 +-
.../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 11 +-
.../staging/rtl8192u/ieee80211/ieee80211_module.c | 26 +-
drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 81 +-
.../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 315 +--
.../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 24 +-
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 9 +-
.../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 20 +-
.../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 31 +-
drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h | 14 +-
.../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 60 +-
drivers/staging/rtl8192u/r8190_rtl8256.c | 4 +-
drivers/staging/rtl8192u/r8190_rtl8256.h | 5 +-
drivers/staging/rtl8192u/r8192U.h | 2 -
drivers/staging/rtl8192u/r8192U_core.c | 94 +-
drivers/staging/rtl8192u/r8192U_dm.c | 71 +-
drivers/staging/rtl8192u/r8192U_dm.h | 12 +-
drivers/staging/rtl8192u/r8192U_wx.c | 4 +-
drivers/staging/rtl8192u/r8192U_wx.h | 25 +-
drivers/staging/rtl8192u/r819xU_firmware.c | 48 +-
drivers/staging/rtl8192u/r819xU_phy.c | 46 +-
drivers/staging/rtl8712/hal_init.c | 2 +-
drivers/staging/rtl8712/mlme_linux.c | 55 +-
drivers/staging/rtl8712/os_intfs.c | 34 +-
drivers/staging/rtl8712/osdep_service.h | 25 -
drivers/staging/rtl8712/recv_linux.c | 13 +-
drivers/staging/rtl8712/rtl8712_cmd.c | 2 +-
drivers/staging/rtl8712/rtl8712_led.c | 473 ++--
drivers/staging/rtl8712/rtl8712_recv.c | 20 +-
drivers/staging/rtl8712/rtl871x_cmd.c | 22 +-
drivers/staging/rtl8712/rtl871x_eeprom.c | 4 +-
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 100 +-
drivers/staging/rtl8712/rtl871x_ioctl_set.c | 6 +-
drivers/staging/rtl8712/rtl871x_mlme.c | 46 +-
drivers/staging/rtl8712/rtl871x_mp.c | 4 +-
drivers/staging/rtl8712/rtl871x_pwrctrl.c | 10 +-
drivers/staging/rtl8712/rtl871x_recv.c | 3 +-
drivers/staging/rtl8712/rtl871x_security.c | 14 +-
drivers/staging/rtl8712/rtl871x_security.h | 2 +-
drivers/staging/rtl8712/rtl871x_sta_mgt.c | 2 +-
drivers/staging/rtl8712/rtl871x_xmit.c | 3 +-
drivers/staging/rtl8712/wifi.h | 27 +-
drivers/staging/rtl8712/xmit_linux.c | 2 +-
drivers/staging/rtl8723au/core/rtw_ap.c | 50 +-
drivers/staging/rtl8723au/core/rtw_cmd.c | 57 +-
drivers/staging/rtl8723au/core/rtw_efuse.c | 6 +-
drivers/staging/rtl8723au/core/rtw_ieee80211.c | 64 +-
drivers/staging/rtl8723au/core/rtw_mlme.c | 155 +-
drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 121 +-
drivers/staging/rtl8723au/core/rtw_pwrctrl.c | 29 +-
drivers/staging/rtl8723au/core/rtw_recv.c | 274 +-
drivers/staging/rtl8723au/core/rtw_security.c | 830 ++++---
drivers/staging/rtl8723au/core/rtw_sta_mgt.c | 16 +-
drivers/staging/rtl8723au/core/rtw_wlan_util.c | 35 +-
drivers/staging/rtl8723au/core/rtw_xmit.c | 181 +-
.../staging/rtl8723au/hal/HalDMOutSrc8723A_CE.c | 259 +-
drivers/staging/rtl8723au/hal/HalHWImg8723A_BB.c | 53 +-
drivers/staging/rtl8723au/hal/HalHWImg8723A_MAC.c | 7 +-
drivers/staging/rtl8723au/hal/HalHWImg8723A_RF.c | 7 +-
drivers/staging/rtl8723au/hal/HalPwrSeqCmd.c | 39 +-
drivers/staging/rtl8723au/hal/hal_com.c | 56 +-
drivers/staging/rtl8723au/hal/odm.c | 737 +++---
drivers/staging/rtl8723au/hal/odm_HWConfig.c | 35 +-
drivers/staging/rtl8723au/hal/odm_RegConfig8723A.c | 52 +-
drivers/staging/rtl8723au/hal/odm_debug.c | 15 +
drivers/staging/rtl8723au/hal/odm_interface.c | 90 -
.../staging/rtl8723au/hal/rtl8723a_bt-coexist.c | 49 +-
drivers/staging/rtl8723au/hal/rtl8723a_cmd.c | 28 +-
drivers/staging/rtl8723au/hal/rtl8723a_dm.c | 21 +-
drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c | 193 +-
drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c | 157 +-
drivers/staging/rtl8723au/hal/rtl8723a_rf6052.c | 6 +-
drivers/staging/rtl8723au/hal/rtl8723au_recv.c | 6 +-
drivers/staging/rtl8723au/hal/rtl8723au_xmit.c | 24 +-
drivers/staging/rtl8723au/hal/usb_halinit.c | 147 +-
drivers/staging/rtl8723au/hal/usb_ops_linux.c | 52 +-
drivers/staging/rtl8723au/include/Hal8723APhyCfg.h | 12 -
drivers/staging/rtl8723au/include/HalVerDef.h | 22 -
drivers/staging/rtl8723au/include/hal_com.h | 31 -
drivers/staging/rtl8723au/include/hal_intf.h | 7 -
drivers/staging/rtl8723au/include/ieee80211.h | 17 -
drivers/staging/rtl8723au/include/odm.h | 142 +-
.../staging/rtl8723au/include/odm_RegConfig8723A.h | 5 +-
drivers/staging/rtl8723au/include/odm_interface.h | 11 -
drivers/staging/rtl8723au/include/rtl8723a_hal.h | 2 -
drivers/staging/rtl8723au/include/rtw_debug.h | 11 +-
drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 109 +-
drivers/staging/rtl8723au/os_dep/os_intfs.c | 53 +-
drivers/staging/rtl8723au/os_dep/recv_linux.c | 16 +-
drivers/staging/rtl8723au/os_dep/usb_intf.c | 33 +-
drivers/staging/rtl8723au/os_dep/usb_ops_linux.c | 31 +-
drivers/staging/rtl8723au/os_dep/xmit_linux.c | 12 +-
drivers/staging/rts5208/Makefile | 2 +-
drivers/staging/rts5208/ms.c | 1698 +++++++++----
drivers/staging/rts5208/ms.h | 2 +-
drivers/staging/rts5208/rtsx.c | 31 +-
drivers/staging/rts5208/rtsx.h | 13 +-
drivers/staging/rts5208/rtsx_card.c | 181 +-
drivers/staging/rts5208/rtsx_card.h | 8 +-
drivers/staging/rts5208/rtsx_chip.c | 958 +++++--
drivers/staging/rts5208/rtsx_chip.h | 16 -
drivers/staging/rts5208/rtsx_scsi.c | 586 +++--
drivers/staging/rts5208/rtsx_transport.c | 9 +-
drivers/staging/rts5208/sd.c | 2007 ++++++++++-----
drivers/staging/rts5208/sd.h | 2 +-
drivers/staging/rts5208/spi.c | 372 ++-
drivers/staging/rts5208/trace.c | 26 +
drivers/staging/rts5208/trace.h | 61 +-
drivers/staging/rts5208/xd.c | 607 +++--
drivers/staging/skein/skein_block.c | 8 +-
drivers/staging/slicoss/slicoss.c | 65 +-
drivers/staging/sm750fb/Kconfig | 10 +
drivers/staging/sm750fb/Makefile | 4 +
drivers/staging/sm750fb/TODO | 15 +
drivers/staging/sm750fb/ddk750.h | 24 +
drivers/staging/sm750fb/ddk750_chip.c | 622 +++++
drivers/staging/sm750fb/ddk750_chip.h | 87 +
drivers/staging/sm750fb/ddk750_display.c | 307 +++
drivers/staging/sm750fb/ddk750_display.h | 160 ++
drivers/staging/sm750fb/ddk750_dvi.c | 99 +
drivers/staging/sm750fb/ddk750_dvi.h | 67 +
drivers/staging/sm750fb/ddk750_help.c | 19 +
drivers/staging/sm750fb/ddk750_help.h | 29 +
drivers/staging/sm750fb/ddk750_hwi2c.c | 271 ++
drivers/staging/sm750fb/ddk750_hwi2c.h | 10 +
drivers/staging/sm750fb/ddk750_mode.c | 205 ++
drivers/staging/sm750fb/ddk750_mode.h | 43 +
drivers/staging/sm750fb/ddk750_power.c | 239 ++
drivers/staging/sm750fb/ddk750_power.h | 71 +
drivers/staging/sm750fb/ddk750_reg.h | 2616 ++++++++++++++++++++
drivers/staging/sm750fb/ddk750_sii164.c | 425 ++++
drivers/staging/sm750fb/ddk750_sii164.h | 172 ++
drivers/staging/sm750fb/ddk750_swi2c.c | 522 ++++
drivers/staging/sm750fb/ddk750_swi2c.h | 92 +
drivers/staging/sm750fb/modedb.h | 221 ++
drivers/staging/sm750fb/readme | 38 +
drivers/staging/sm750fb/sm750.c | 1403 +++++++++++
drivers/staging/sm750fb/sm750.h | 186 ++
drivers/staging/sm750fb/sm750_accel.c | 437 ++++
drivers/staging/sm750fb/sm750_accel.h | 275 ++
drivers/staging/sm750fb/sm750_cursor.c | 251 ++
drivers/staging/sm750fb/sm750_cursor.h | 17 +
drivers/staging/sm750fb/sm750_help.h | 111 +
drivers/staging/sm750fb/sm750_hw.c | 642 +++++
drivers/staging/sm750fb/sm750_hw.h | 104 +
drivers/staging/sm7xxfb/sm7xx.h | 2 +-
drivers/staging/sm7xxfb/sm7xxfb.c | 48 +-
drivers/staging/speakup/kobjects.c | 4 +-
drivers/staging/speakup/main.c | 11 +-
drivers/staging/speakup/serialio.h | 3 +-
drivers/staging/speakup/speakup.h | 6 +-
drivers/staging/speakup/speakup_acntpc.c | 12 +-
drivers/staging/speakup/speakup_acntsa.c | 12 +-
drivers/staging/speakup/speakup_apollo.c | 12 +-
drivers/staging/speakup/speakup_audptr.c | 12 +-
drivers/staging/speakup/speakup_bns.c | 12 +-
drivers/staging/speakup/speakup_decext.c | 18 +-
drivers/staging/speakup/speakup_decpc.c | 18 +-
drivers/staging/speakup/speakup_dectlk.c | 12 +-
drivers/staging/speakup/speakup_dtlk.c | 12 +-
drivers/staging/speakup/speakup_dummy.c | 12 +-
drivers/staging/speakup/speakup_keypc.c | 12 +-
drivers/staging/speakup/speakup_ltlk.c | 12 +-
drivers/staging/speakup/speakup_soft.c | 13 +-
drivers/staging/speakup/speakup_spkout.c | 12 +-
drivers/staging/speakup/speakup_txprt.c | 12 +-
drivers/staging/speakup/spk_priv.h | 52 +-
drivers/staging/speakup/spk_types.h | 14 +-
drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 21 +-
.../common-spar/include/channels/iochannel.h | 2 +-
.../unisys/common-spar/include/vmcallinterface.h | 9 +-
drivers/staging/unisys/include/procobjecttree.h | 1 -
drivers/staging/unisys/include/timskmod.h | 16 -
drivers/staging/unisys/include/uisqueue.h | 1 -
drivers/staging/unisys/include/uisthread.h | 1 -
drivers/staging/unisys/include/uisutils.h | 33 -
drivers/staging/unisys/include/uniklog.h | 191 --
drivers/staging/unisys/uislib/Kconfig | 2 +-
drivers/staging/unisys/uislib/Makefile | 2 -
drivers/staging/unisys/uislib/uislib.c | 225 +-
drivers/staging/unisys/uislib/uisqueue.c | 6 +-
drivers/staging/unisys/uislib/uisthread.c | 30 +-
drivers/staging/unisys/uislib/uisutils.c | 197 --
drivers/staging/unisys/virthba/Kconfig | 5 +-
drivers/staging/unisys/virthba/Makefile | 1 -
drivers/staging/unisys/virthba/virthba.c | 276 +--
drivers/staging/unisys/virtpci/Kconfig | 2 +-
drivers/staging/unisys/virtpci/virtpci.c | 253 +-
drivers/staging/unisys/visorchannel/Kconfig | 2 +-
drivers/staging/unisys/visorchannel/globals.h | 1 -
.../unisys/visorchannel/visorchannel_funcs.c | 88 +-
.../unisys/visorchannel/visorchannel_main.c | 2 -
drivers/staging/unisys/visorchipset/Kconfig | 3 +-
drivers/staging/unisys/visorchipset/file.c | 123 +-
drivers/staging/unisys/visorchipset/file.h | 2 +-
drivers/staging/unisys/visorchipset/globals.h | 1 -
drivers/staging/unisys/visorchipset/parser.c | 163 +-
drivers/staging/unisys/visorchipset/parser.h | 25 +-
drivers/staging/unisys/visorchipset/visorchipset.h | 1 -
.../unisys/visorchipset/visorchipset_main.c | 1485 +++++------
drivers/staging/unisys/visorutil/Kconfig | 1 -
drivers/staging/unisys/visorutil/Makefile | 3 +-
drivers/staging/unisys/visorutil/charqueue.c | 8 +-
drivers/staging/unisys/visorutil/charqueue.h | 1 -
drivers/staging/unisys/visorutil/easyproc.c | 377 ---
drivers/staging/unisys/visorutil/easyproc.h | 92 -
.../staging/unisys/visorutil/memregion_direct.c | 46 +-
drivers/staging/unisys/visorutil/periodic_work.c | 15 +-
drivers/staging/unisys/visorutil/procobjecttree.c | 353 ---
drivers/staging/unisys/visorutil/visorkmodutils.c | 1 -
drivers/staging/vme/devices/vme_pio2_core.c | 1 -
drivers/staging/vme/devices/vme_pio2_gpio.c | 1 -
drivers/staging/vme/devices/vme_user.c | 94 +-
drivers/staging/vt6655/baseband.c | 48 +-
drivers/staging/vt6655/channel.c | 9 +-
drivers/staging/vt6655/device_main.c | 75 +-
drivers/staging/vt6655/dpc.c | 4 +-
drivers/staging/vt6655/key.h | 2 +-
drivers/staging/vt6655/mac.c | 82 +-
drivers/staging/vt6655/mib.c | 46 +-
drivers/staging/vt6655/rxtx.c | 209 +-
drivers/staging/vt6655/srom.h | 53 +-
drivers/staging/vt6655/tmacro.h | 2 +-
drivers/staging/vt6656/firmware.c | 2 +-
drivers/staging/vt6656/mac.c | 4 +-
drivers/staging/vt6656/main_usb.c | 1 +
drivers/staging/vt6656/rxtx.c | 8 +-
drivers/staging/wlan-ng/hfa384x.h | 19 +-
drivers/staging/wlan-ng/hfa384x_usb.c | 26 +-
drivers/staging/wlan-ng/prism2mib.c | 11 +-
drivers/staging/wlan-ng/prism2sta.c | 13 +-
drivers/staging/xgifb/XGI_main_26.c | 6 +-
drivers/staging/xgifb/vb_setmode.c | 140 +-
drivers/vme/bridges/vme_tsi148.c | 11 +-
drivers/vme/vme.c | 26 +
include/linux/iio/buffer.h | 8 +-
include/linux/iio/dac/max517.h | 2 +-
include/linux/iio/events.h | 30 +-
include/linux/iio/iio.h | 13 +
include/linux/iio/types.h | 78 +-
include/linux/vme.h | 1 +
include/uapi/linux/Kbuild | 1 +
include/uapi/linux/iio/Kbuild | 3 +
include/uapi/linux/iio/events.h | 42 +
include/uapi/linux/iio/types.h | 92 +
tools/iio/Makefile | 16 +
.../Documentation => tools/iio}/generic_buffer.c | 5 +-
.../iio}/iio_event_monitor.c | 4 +-
.../iio_utils.h => tools/iio/iio_utils.c | 74 +-
tools/iio/iio_utils.h | 71 +
.../iio/Documentation => tools/iio}/lsiio.c | 5 -
824 files changed, 38862 insertions(+), 22324 deletions(-)
create mode 100644 Documentation/devicetree/bindings/iio/adc/mcp320x.txt
create mode 100644 Documentation/devicetree/bindings/iio/adc/mcp3422.txt
create mode 100644 Documentation/devicetree/bindings/iio/adc/ti-adc128s052.txt
create mode 100644 drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c
create mode 100644 drivers/iio/light/cm3323.c
create mode 100644 drivers/iio/pressure/ms5611.h
create mode 100644 drivers/iio/pressure/ms5611_core.c
create mode 100644 drivers/iio/pressure/ms5611_i2c.c
create mode 100644 drivers/iio/pressure/ms5611_spi.c
create mode 100644 drivers/staging/comedi/comedi_pci.h
delete mode 100644 drivers/staging/comedi/drivers/8253.h
create mode 100644 drivers/staging/comedi/drivers/comedi_8254.c
create mode 100644 drivers/staging/comedi/drivers/comedi_8254.h
delete mode 100644 drivers/staging/comedi/drivers/comedi_fc.h
delete mode 100644 drivers/staging/dgnc/dgnc_kcompat.h
delete mode 100644 drivers/staging/dgnc/dgnc_types.h
delete mode 100644 drivers/staging/dgnc/dpacompat.h
create mode 100644 drivers/staging/fbtft/fb_ili9163.c
create mode 100644 drivers/staging/fbtft/internal.h
create mode 100644 drivers/staging/fsl-mc/Kconfig
create mode 100644 drivers/staging/fsl-mc/Makefile
create mode 100644 drivers/staging/fsl-mc/TODO
create mode 100644 drivers/staging/fsl-mc/bus/Kconfig
create mode 100644 drivers/staging/fsl-mc/bus/Makefile
create mode 100644 drivers/staging/fsl-mc/bus/dpbp.c
create mode 100644 drivers/staging/fsl-mc/bus/dpmcp-cmd.h
create mode 100644 drivers/staging/fsl-mc/bus/dpmcp.c
create mode 100644 drivers/staging/fsl-mc/bus/dpmcp.h
create mode 100644 drivers/staging/fsl-mc/bus/dpmng-cmd.h
create mode 100644 drivers/staging/fsl-mc/bus/dpmng.c
create mode 100644 drivers/staging/fsl-mc/bus/dprc-cmd.h
create mode 100644 drivers/staging/fsl-mc/bus/dprc-driver.c
create mode 100644 drivers/staging/fsl-mc/bus/dprc.c
create mode 100644 drivers/staging/fsl-mc/bus/mc-allocator.c
create mode 100644 drivers/staging/fsl-mc/bus/mc-bus.c
create mode 100644 drivers/staging/fsl-mc/bus/mc-sys.c
create mode 100644 drivers/staging/fsl-mc/include/dpbp-cmd.h
create mode 100644 drivers/staging/fsl-mc/include/dpbp.h
create mode 100644 drivers/staging/fsl-mc/include/dpcon-cmd.h
create mode 100644 drivers/staging/fsl-mc/include/dpmng.h
create mode 100644 drivers/staging/fsl-mc/include/dprc.h
create mode 100644 drivers/staging/fsl-mc/include/mc-cmd.h
create mode 100644 drivers/staging/fsl-mc/include/mc-private.h
create mode 100644 drivers/staging/fsl-mc/include/mc-sys.h
create mode 100644 drivers/staging/fsl-mc/include/mc.h
delete mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
delete mode 100644 drivers/staging/rtl8192e/rtllib_endianfree.h
create mode 100644 drivers/staging/rts5208/trace.c
create mode 100644 drivers/staging/sm750fb/Kconfig
create mode 100644 drivers/staging/sm750fb/Makefile
create mode 100644 drivers/staging/sm750fb/TODO
create mode 100644 drivers/staging/sm750fb/ddk750.h
create mode 100644 drivers/staging/sm750fb/ddk750_chip.c
create mode 100644 drivers/staging/sm750fb/ddk750_chip.h
create mode 100644 drivers/staging/sm750fb/ddk750_display.c
create mode 100644 drivers/staging/sm750fb/ddk750_display.h
create mode 100644 drivers/staging/sm750fb/ddk750_dvi.c
create mode 100644 drivers/staging/sm750fb/ddk750_dvi.h
create mode 100644 drivers/staging/sm750fb/ddk750_help.c
create mode 100644 drivers/staging/sm750fb/ddk750_help.h
create mode 100644 drivers/staging/sm750fb/ddk750_hwi2c.c
create mode 100644 drivers/staging/sm750fb/ddk750_hwi2c.h
create mode 100644 drivers/staging/sm750fb/ddk750_mode.c
create mode 100644 drivers/staging/sm750fb/ddk750_mode.h
create mode 100644 drivers/staging/sm750fb/ddk750_power.c
create mode 100644 drivers/staging/sm750fb/ddk750_power.h
create mode 100644 drivers/staging/sm750fb/ddk750_reg.h
create mode 100644 drivers/staging/sm750fb/ddk750_sii164.c
create mode 100644 drivers/staging/sm750fb/ddk750_sii164.h
create mode 100644 drivers/staging/sm750fb/ddk750_swi2c.c
create mode 100644 drivers/staging/sm750fb/ddk750_swi2c.h
create mode 100644 drivers/staging/sm750fb/modedb.h
create mode 100644 drivers/staging/sm750fb/readme
create mode 100644 drivers/staging/sm750fb/sm750.c
create mode 100644 drivers/staging/sm750fb/sm750.h
create mode 100644 drivers/staging/sm750fb/sm750_accel.c
create mode 100644 drivers/staging/sm750fb/sm750_accel.h
create mode 100644 drivers/staging/sm750fb/sm750_cursor.c
create mode 100644 drivers/staging/sm750fb/sm750_cursor.h
create mode 100644 drivers/staging/sm750fb/sm750_help.h
create mode 100644 drivers/staging/sm750fb/sm750_hw.c
create mode 100644 drivers/staging/sm750fb/sm750_hw.h
delete mode 100644 drivers/staging/unisys/include/uniklog.h
delete mode 100644 drivers/staging/unisys/visorutil/easyproc.c
delete mode 100644 drivers/staging/unisys/visorutil/easyproc.h
delete mode 100644 drivers/staging/unisys/visorutil/procobjecttree.c
create mode 100644 include/uapi/linux/iio/Kbuild
create mode 100644 include/uapi/linux/iio/events.h
create mode 100644 include/uapi/linux/iio/types.h
create mode 100644 tools/iio/Makefile
rename {drivers/staging/iio/Documentation => tools/iio}/generic_buffer.c (99%)
rename {drivers/staging/iio/Documentation => tools/iio}/iio_event_monitor.c (99%)
rename drivers/staging/iio/Documentation/iio_utils.h => tools/iio/iio_utils.c (90%)
create mode 100644 tools/iio/iio_utils.h
rename {drivers/staging/iio/Documentation => tools/iio}/lsiio.c (97%)
Merging char-misc/char-misc-next (1ac4e6fee41d DTS: ARM: OMAP3-N900: Add lis3lv02d support)
$ git merge char-misc/char-misc-next
Auto-merging sound/soc/codecs/arizona.c
Auto-merging kernel/time/clockevents.c
Auto-merging include/linux/mfd/arizona/core.h
Auto-merging drivers/misc/mei/pci-me.c
Auto-merging drivers/misc/mei/main.c
Auto-merging drivers/misc/mei/amthif.c
Auto-merging drivers/hwtracing/coresight/of_coresight.c
Auto-merging drivers/hwtracing/coresight/coresight.c
Auto-merging drivers/hwtracing/coresight/coresight-tmc.c
Auto-merging drivers/hwtracing/coresight/coresight-replicator.c
Auto-merging drivers/hwtracing/coresight/coresight-etb10.c
Auto-merging drivers/extcon/extcon.c
Auto-merging drivers/extcon/extcon-arizona.c
Auto-merging drivers/char/ipmi/ipmi_si_intf.c
Auto-merging drivers/char/hw_random/core.c
Auto-merging arch/arm/boot/dts/omap3-n900.dts
Auto-merging arch/arm/boot/dts/omap3-beagle.dts
Auto-merging arch/arm/boot/dts/omap3-beagle-xm.dts
Auto-merging arch/arm/Kconfig.debug
Auto-merging MAINTAINERS
Auto-merging Documentation/driver-model/devres.txt
Merge made by the 'recursive' strategy.
.../devicetree/bindings/arm/coresight.txt | 1 -
.../devicetree/bindings/extcon/extcon-usb-gpio.txt | 18 +
.../memory-controllers/ingenic,jz4780-nemc.txt | 75 ++
Documentation/devicetree/bindings/misc/lis302.txt | 9 +-
.../bindings/spmi/qcom,spmi-pmic-arb.txt | 6 +-
Documentation/driver-model/devres.txt | 1 +
Documentation/trace/coresight.txt | 2 +-
MAINTAINERS | 4 +-
arch/arm/Kconfig.debug | 55 +-
arch/arm/boot/dts/hip04.dtsi | 1 -
arch/arm/boot/dts/omap3-beagle-xm.dts | 1 -
arch/arm/boot/dts/omap3-beagle.dts | 1 -
arch/arm/boot/dts/omap3-n900.dts | 52 ++
arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 1 -
arch/arm64/Kconfig.debug | 2 +
arch/m32r/include/asm/io.h | 1 +
arch/x86/include/uapi/asm/hyperv.h | 2 +
drivers/Makefile | 2 +-
drivers/char/hw_random/core.c | 34 +-
drivers/char/hw_random/pasemi-rng.c | 2 +-
drivers/char/hw_random/powernv-rng.c | 2 +-
drivers/char/hw_random/ppc4xx-rng.c | 2 +-
drivers/char/i8k.c | 16 +-
drivers/char/ipmi/ipmi_si_intf.c | 4 +-
drivers/char/misc.c | 20 +-
drivers/char/virtio_console.c | 2 +-
drivers/char/xillybus/xillybus_core.c | 2 +
drivers/char/xillybus/xillybus_of.c | 2 +-
drivers/extcon/Kconfig | 17 +
drivers/extcon/Makefile | 4 +-
drivers/extcon/extcon-arizona.c | 49 +-
drivers/extcon/extcon-max14577.c | 5 +-
drivers/extcon/extcon-max77693.c | 37 +-
drivers/extcon/extcon-max77843.c | 881 +++++++++++++++++++++
drivers/extcon/extcon-max8997.c | 5 +-
drivers/extcon/extcon-rt8973a.c | 6 +-
drivers/extcon/extcon-sm5502.c | 6 +-
drivers/extcon/extcon-usb-gpio.c | 237 ++++++
drivers/extcon/{extcon-class.c => extcon.c} | 36 +-
drivers/hv/channel.c | 125 ++-
drivers/hv/channel_mgmt.c | 223 ++----
drivers/hv/connection.c | 40 +-
drivers/hv/hv.c | 34 +-
drivers/hv/hv_balloon.c | 143 ++--
drivers/hv/hv_util.c | 13 +-
drivers/hv/hyperv_vmbus.h | 31 +
drivers/hv/vmbus_drv.c | 136 +++-
drivers/hwtracing/coresight/Kconfig | 61 ++
drivers/{ => hwtracing}/coresight/Makefile | 0
.../{ => hwtracing}/coresight/coresight-etb10.c | 4 +-
.../{ => hwtracing}/coresight/coresight-etm-cp14.c | 0
drivers/{ => hwtracing}/coresight/coresight-etm.h | 0
.../{ => hwtracing}/coresight/coresight-etm3x.c | 0
.../{ => hwtracing}/coresight/coresight-funnel.c | 0
drivers/{ => hwtracing}/coresight/coresight-priv.h | 0
.../coresight/coresight-replicator.c | 2 +-
drivers/{ => hwtracing}/coresight/coresight-tmc.c | 60 +-
drivers/{ => hwtracing}/coresight/coresight-tpiu.c | 0
drivers/{ => hwtracing}/coresight/coresight.c | 4 +-
drivers/{ => hwtracing}/coresight/of_coresight.c | 18 +-
drivers/mcb/mcb-pci.c | 4 +-
drivers/memory/Kconfig | 9 +
drivers/memory/Makefile | 1 +
drivers/memory/jz4780-nemc.c | 391 +++++++++
drivers/misc/bh1780gli.c | 2 +
drivers/misc/carma/carma-fpga-program.c | 12 +-
drivers/misc/carma/carma-fpga.c | 2 +-
drivers/misc/lis3lv02d/lis3lv02d.c | 56 +-
drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 2 +-
drivers/misc/lis3lv02d/lis3lv02d_spi.c | 2 +-
drivers/misc/mei/Makefile | 3 +
drivers/misc/mei/amthif.c | 423 ++++------
drivers/misc/mei/bus.c | 105 ++-
drivers/misc/mei/client.c | 478 +++++++----
drivers/misc/mei/client.h | 42 +-
drivers/misc/mei/debugfs.c | 21 +-
drivers/misc/mei/hbm.c | 8 +-
drivers/misc/mei/hw-me.c | 170 ++--
drivers/misc/mei/hw-me.h | 4 +-
drivers/misc/mei/hw-txe.c | 2 +-
drivers/misc/mei/init.c | 2 +-
drivers/misc/mei/interrupt.c | 171 ++--
drivers/misc/mei/main.c | 146 ++--
drivers/misc/mei/mei-trace.c | 25 +
drivers/misc/mei/mei-trace.h | 76 ++
drivers/misc/mei/mei_dev.h | 40 +-
drivers/misc/mei/nfc.c | 43 +-
drivers/misc/mei/pci-me.c | 4 +-
drivers/misc/mei/pci-txe.c | 4 +-
drivers/misc/mei/wd.c | 36 +-
drivers/misc/mic/host/mic_boot.c | 14 +-
drivers/misc/mic/host/mic_intr.c | 2 -
drivers/misc/sram.c | 19 +-
drivers/misc/tifm_7xx1.c | 5 +-
drivers/misc/vmw_vmci/vmci_driver.c | 2 +-
drivers/misc/vmw_vmci/vmci_host.c | 6 +
drivers/misc/vmw_vmci/vmci_queue_pair.c | 37 +-
drivers/pcmcia/omap_cf.c | 4 +-
drivers/pcmcia/pd6729.c | 8 +-
drivers/pcmcia/soc_common.c | 5 +-
drivers/pcmcia/yenta_socket.c | 8 +-
drivers/spmi/Kconfig | 1 -
drivers/spmi/spmi-pmic-arb.c | 319 ++++++--
drivers/spmi/spmi.c | 9 +-
drivers/uio/uio.c | 12 +-
drivers/w1/masters/mxc_w1.c | 2 +-
drivers/w1/masters/omap_hdq.c | 2 +-
drivers/w1/masters/w1-gpio.c | 2 +-
include/linux/hyperv.h | 37 +-
include/linux/io.h | 2 +
include/linux/jz4780-nemc.h | 43 +
include/linux/mfd/arizona/core.h | 2 +-
include/linux/miscdevice.h | 2 +
kernel/time/clockevents.c | 2 +-
lib/devres.c | 28 +
scripts/checkkconfigsymbols.py | 147 +++-
sound/soc/codecs/arizona.c | 4 +-
tools/hv/Makefile | 2 +-
tools/hv/hv_vss_daemon.c | 10 +-
119 files changed, 4035 insertions(+), 1482 deletions(-)
create mode 100644 Documentation/devicetree/bindings/extcon/extcon-usb-gpio.txt
create mode 100644 Documentation/devicetree/bindings/memory-controllers/ingenic,jz4780-nemc.txt
create mode 100644 drivers/extcon/extcon-max77843.c
create mode 100644 drivers/extcon/extcon-usb-gpio.c
rename drivers/extcon/{extcon-class.c => extcon.c} (97%)
create mode 100644 drivers/hwtracing/coresight/Kconfig
rename drivers/{ => hwtracing}/coresight/Makefile (100%)
rename drivers/{ => hwtracing}/coresight/coresight-etb10.c (99%)
rename drivers/{ => hwtracing}/coresight/coresight-etm-cp14.c (100%)
rename drivers/{ => hwtracing}/coresight/coresight-etm.h (100%)
rename drivers/{ => hwtracing}/coresight/coresight-etm3x.c (100%)
rename drivers/{ => hwtracing}/coresight/coresight-funnel.c (100%)
rename drivers/{ => hwtracing}/coresight/coresight-priv.h (100%)
rename drivers/{ => hwtracing}/coresight/coresight-replicator.c (98%)
rename drivers/{ => hwtracing}/coresight/coresight-tmc.c (91%)
rename drivers/{ => hwtracing}/coresight/coresight-tpiu.c (100%)
rename drivers/{ => hwtracing}/coresight/coresight.c (99%)
rename drivers/{ => hwtracing}/coresight/of_coresight.c (94%)
create mode 100644 drivers/memory/jz4780-nemc.c
create mode 100644 drivers/misc/mei/mei-trace.c
create mode 100644 drivers/misc/mei/mei-trace.h
create mode 100644 include/linux/jz4780-nemc.h
mode change 100644 => 100755 scripts/checkkconfigsymbols.py
Merging extcon/extcon-next (731840c832bc extcon: Add manufactor name of each extcon device)
$ git merge extcon/extcon-next
Merge made by the 'recursive' strategy.
drivers/extcon/Kconfig | 14 +++++++-------
drivers/extcon/extcon-usb-gpio.c | 24 ++++++++++++------------
2 files changed, 19 insertions(+), 19 deletions(-)
Merging kdbus/kdbus (98ecc663f3f9 selftest/kdbus: enable cross compilation)
$ git merge kdbus/kdbus
Resolved 'Documentation/Makefile' using previous resolution.
Auto-merging tools/testing/selftests/Makefile
Auto-merging init/Kconfig
Auto-merging include/uapi/linux/magic.h
Auto-merging include/uapi/linux/Kbuild
Auto-merging Makefile
Auto-merging MAINTAINERS
Auto-merging Documentation/ioctl/ioctl-number.txt
Auto-merging Documentation/Makefile
CONFLICT (content): Merge conflict in Documentation/Makefile
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 77be95b13221] Merge remote-tracking branch 'kdbus/kdbus'
$ git diff -M --stat --summary HEAD^..
Documentation/Makefile | 2 +-
Documentation/ioctl/ioctl-number.txt | 1 +
Documentation/kdbus/.gitignore | 2 +
Documentation/kdbus/Makefile | 40 +
Documentation/kdbus/kdbus.bus.xml | 360 ++++
Documentation/kdbus/kdbus.connection.xml | 1252 ++++++++++++
Documentation/kdbus/kdbus.endpoint.xml | 436 ++++
Documentation/kdbus/kdbus.fs.xml | 124 ++
Documentation/kdbus/kdbus.item.xml | 840 ++++++++
Documentation/kdbus/kdbus.match.xml | 553 +++++
Documentation/kdbus/kdbus.message.xml | 1277 ++++++++++++
Documentation/kdbus/kdbus.name.xml | 711 +++++++
Documentation/kdbus/kdbus.policy.xml | 406 ++++
Documentation/kdbus/kdbus.pool.xml | 320 +++
Documentation/kdbus/kdbus.xml | 1012 ++++++++++
Documentation/kdbus/stylesheet.xsl | 16 +
MAINTAINERS | 13 +
Makefile | 1 +
include/uapi/linux/Kbuild | 1 +
include/uapi/linux/kdbus.h | 979 +++++++++
include/uapi/linux/magic.h | 2 +
init/Kconfig | 13 +
ipc/Makefile | 2 +-
ipc/kdbus/Makefile | 22 +
ipc/kdbus/bus.c | 560 ++++++
ipc/kdbus/bus.h | 101 +
ipc/kdbus/connection.c | 2214 +++++++++++++++++++++
ipc/kdbus/connection.h | 257 +++
ipc/kdbus/domain.c | 296 +++
ipc/kdbus/domain.h | 77 +
ipc/kdbus/endpoint.c | 275 +++
ipc/kdbus/endpoint.h | 67 +
ipc/kdbus/fs.c | 510 +++++
ipc/kdbus/fs.h | 28 +
ipc/kdbus/handle.c | 617 ++++++
ipc/kdbus/handle.h | 85 +
ipc/kdbus/item.c | 339 ++++
ipc/kdbus/item.h | 64 +
ipc/kdbus/limits.h | 64 +
ipc/kdbus/main.c | 125 ++
ipc/kdbus/match.c | 559 ++++++
ipc/kdbus/match.h | 35 +
ipc/kdbus/message.c | 616 ++++++
ipc/kdbus/message.h | 133 ++
ipc/kdbus/metadata.c | 1164 +++++++++++
ipc/kdbus/metadata.h | 57 +
ipc/kdbus/names.c | 772 +++++++
ipc/kdbus/names.h | 74 +
ipc/kdbus/node.c | 910 +++++++++
ipc/kdbus/node.h | 84 +
ipc/kdbus/notify.c | 248 +++
ipc/kdbus/notify.h | 30 +
ipc/kdbus/policy.c | 489 +++++
ipc/kdbus/policy.h | 51 +
ipc/kdbus/pool.c | 728 +++++++
ipc/kdbus/pool.h | 46 +
ipc/kdbus/queue.c | 678 +++++++
ipc/kdbus/queue.h | 92 +
ipc/kdbus/reply.c | 259 +++
ipc/kdbus/reply.h | 68 +
ipc/kdbus/util.c | 201 ++
ipc/kdbus/util.h | 74 +
samples/Kconfig | 7 +
samples/Makefile | 3 +-
samples/kdbus/.gitignore | 1 +
samples/kdbus/Makefile | 9 +
samples/kdbus/kdbus-api.h | 114 ++
samples/kdbus/kdbus-workers.c | 1326 ++++++++++++
tools/testing/selftests/Makefile | 1 +
tools/testing/selftests/kdbus/.gitignore | 1 +
tools/testing/selftests/kdbus/Makefile | 48 +
tools/testing/selftests/kdbus/kdbus-enum.c | 94 +
tools/testing/selftests/kdbus/kdbus-enum.h | 14 +
tools/testing/selftests/kdbus/kdbus-test.c | 923 +++++++++
tools/testing/selftests/kdbus/kdbus-test.h | 85 +
tools/testing/selftests/kdbus/kdbus-util.c | 1615 +++++++++++++++
tools/testing/selftests/kdbus/kdbus-util.h | 222 +++
tools/testing/selftests/kdbus/test-activator.c | 318 +++
tools/testing/selftests/kdbus/test-attach-flags.c | 750 +++++++
tools/testing/selftests/kdbus/test-benchmark.c | 451 +++++
tools/testing/selftests/kdbus/test-bus.c | 175 ++
tools/testing/selftests/kdbus/test-chat.c | 122 ++
tools/testing/selftests/kdbus/test-connection.c | 616 ++++++
tools/testing/selftests/kdbus/test-daemon.c | 65 +
tools/testing/selftests/kdbus/test-endpoint.c | 341 ++++
tools/testing/selftests/kdbus/test-fd.c | 789 ++++++++
tools/testing/selftests/kdbus/test-free.c | 64 +
tools/testing/selftests/kdbus/test-match.c | 441 ++++
tools/testing/selftests/kdbus/test-message.c | 731 +++++++
tools/testing/selftests/kdbus/test-metadata-ns.c | 506 +++++
tools/testing/selftests/kdbus/test-monitor.c | 176 ++
tools/testing/selftests/kdbus/test-names.c | 194 ++
tools/testing/selftests/kdbus/test-policy-ns.c | 632 ++++++
tools/testing/selftests/kdbus/test-policy-priv.c | 1269 ++++++++++++
tools/testing/selftests/kdbus/test-policy.c | 80 +
tools/testing/selftests/kdbus/test-sync.c | 369 ++++
tools/testing/selftests/kdbus/test-timeout.c | 99 +
97 files changed, 34080 insertions(+), 3 deletions(-)
create mode 100644 Documentation/kdbus/.gitignore
create mode 100644 Documentation/kdbus/Makefile
create mode 100644 Documentation/kdbus/kdbus.bus.xml
create mode 100644 Documentation/kdbus/kdbus.connection.xml
create mode 100644 Documentation/kdbus/kdbus.endpoint.xml
create mode 100644 Documentation/kdbus/kdbus.fs.xml
create mode 100644 Documentation/kdbus/kdbus.item.xml
create mode 100644 Documentation/kdbus/kdbus.match.xml
create mode 100644 Documentation/kdbus/kdbus.message.xml
create mode 100644 Documentation/kdbus/kdbus.name.xml
create mode 100644 Documentation/kdbus/kdbus.policy.xml
create mode 100644 Documentation/kdbus/kdbus.pool.xml
create mode 100644 Documentation/kdbus/kdbus.xml
create mode 100644 Documentation/kdbus/stylesheet.xsl
create mode 100644 include/uapi/linux/kdbus.h
create mode 100644 ipc/kdbus/Makefile
create mode 100644 ipc/kdbus/bus.c
create mode 100644 ipc/kdbus/bus.h
create mode 100644 ipc/kdbus/connection.c
create mode 100644 ipc/kdbus/connection.h
create mode 100644 ipc/kdbus/domain.c
create mode 100644 ipc/kdbus/domain.h
create mode 100644 ipc/kdbus/endpoint.c
create mode 100644 ipc/kdbus/endpoint.h
create mode 100644 ipc/kdbus/fs.c
create mode 100644 ipc/kdbus/fs.h
create mode 100644 ipc/kdbus/handle.c
create mode 100644 ipc/kdbus/handle.h
create mode 100644 ipc/kdbus/item.c
create mode 100644 ipc/kdbus/item.h
create mode 100644 ipc/kdbus/limits.h
create mode 100644 ipc/kdbus/main.c
create mode 100644 ipc/kdbus/match.c
create mode 100644 ipc/kdbus/match.h
create mode 100644 ipc/kdbus/message.c
create mode 100644 ipc/kdbus/message.h
create mode 100644 ipc/kdbus/metadata.c
create mode 100644 ipc/kdbus/metadata.h
create mode 100644 ipc/kdbus/names.c
create mode 100644 ipc/kdbus/names.h
create mode 100644 ipc/kdbus/node.c
create mode 100644 ipc/kdbus/node.h
create mode 100644 ipc/kdbus/notify.c
create mode 100644 ipc/kdbus/notify.h
create mode 100644 ipc/kdbus/policy.c
create mode 100644 ipc/kdbus/policy.h
create mode 100644 ipc/kdbus/pool.c
create mode 100644 ipc/kdbus/pool.h
create mode 100644 ipc/kdbus/queue.c
create mode 100644 ipc/kdbus/queue.h
create mode 100644 ipc/kdbus/reply.c
create mode 100644 ipc/kdbus/reply.h
create mode 100644 ipc/kdbus/util.c
create mode 100644 ipc/kdbus/util.h
create mode 100644 samples/kdbus/.gitignore
create mode 100644 samples/kdbus/Makefile
create mode 100644 samples/kdbus/kdbus-api.h
create mode 100644 samples/kdbus/kdbus-workers.c
create mode 100644 tools/testing/selftests/kdbus/.gitignore
create mode 100644 tools/testing/selftests/kdbus/Makefile
create mode 100644 tools/testing/selftests/kdbus/kdbus-enum.c
create mode 100644 tools/testing/selftests/kdbus/kdbus-enum.h
create mode 100644 tools/testing/selftests/kdbus/kdbus-test.c
create mode 100644 tools/testing/selftests/kdbus/kdbus-test.h
create mode 100644 tools/testing/selftests/kdbus/kdbus-util.c
create mode 100644 tools/testing/selftests/kdbus/kdbus-util.h
create mode 100644 tools/testing/selftests/kdbus/test-activator.c
create mode 100644 tools/testing/selftests/kdbus/test-attach-flags.c
create mode 100644 tools/testing/selftests/kdbus/test-benchmark.c
create mode 100644 tools/testing/selftests/kdbus/test-bus.c
create mode 100644 tools/testing/selftests/kdbus/test-chat.c
create mode 100644 tools/testing/selftests/kdbus/test-connection.c
create mode 100644 tools/testing/selftests/kdbus/test-daemon.c
create mode 100644 tools/testing/selftests/kdbus/test-endpoint.c
create mode 100644 tools/testing/selftests/kdbus/test-fd.c
create mode 100644 tools/testing/selftests/kdbus/test-free.c
create mode 100644 tools/testing/selftests/kdbus/test-match.c
create mode 100644 tools/testing/selftests/kdbus/test-message.c
create mode 100644 tools/testing/selftests/kdbus/test-metadata-ns.c
create mode 100644 tools/testing/selftests/kdbus/test-monitor.c
create mode 100644 tools/testing/selftests/kdbus/test-names.c
create mode 100644 tools/testing/selftests/kdbus/test-policy-ns.c
create mode 100644 tools/testing/selftests/kdbus/test-policy-priv.c
create mode 100644 tools/testing/selftests/kdbus/test-policy.c
create mode 100644 tools/testing/selftests/kdbus/test-sync.c
create mode 100644 tools/testing/selftests/kdbus/test-timeout.c
Merging cgroup/for-next (34ebe933417e cpuset, isolcpus: document relationship between cpusets & isolcpus)
$ git merge cgroup/for-next
Auto-merging kernel/sched/core.c
Auto-merging init/main.c
Auto-merging include/linux/sched.h
Merge made by the 'recursive' strategy.
Documentation/cgroups/cpusets.txt | 10 ++++++++--
include/linux/sched.h | 2 ++
init/main.c | 2 +-
kernel/cgroup.c | 8 ++++----
kernel/cpuset.c | 13 +++++++++++--
kernel/sched/core.c | 6 +++---
6 files changed, 29 insertions(+), 12 deletions(-)
Merging scsi/for-next (4a44b7a98b7f Merge branch 'misc' into for-next)
$ git merge scsi/for-next
Merge made by the 'recursive' strategy.
drivers/scsi/NCR5380.c | 10 ++++----
drivers/scsi/atari_NCR5380.c | 2 +-
drivers/scsi/atari_scsi.c | 1 -
drivers/scsi/g_NCR5380.c | 8 +++----
drivers/scsi/mac_scsi.c | 1 -
drivers/scsi/scsi.c | 20 ++++++++++------
drivers/scsi/scsi_scan.c | 7 +++---
drivers/scsi/sd.c | 55 +++++++++-----------------------------------
drivers/scsi/sun3_scsi.c | 1 -
9 files changed, 37 insertions(+), 68 deletions(-)
Merging target-updates/for-next (5089a08378fb iscsi-target: TargetAddress in SendTargets should bracket ipv6 addresses)
$ git merge target-updates/for-next
Auto-merging drivers/vhost/scsi.c
Auto-merging drivers/target/target_core_transport.c
Auto-merging drivers/target/target_core_spc.c
Auto-merging drivers/target/target_core_sbc.c
Auto-merging drivers/target/loopback/tcm_loop.c
Removing drivers/target/iscsi/iscsi_target_tq.h
Removing drivers/target/iscsi/iscsi_target_tq.c
Auto-merging drivers/target/iscsi/iscsi_target_erl0.c
Auto-merging drivers/target/iscsi/iscsi_target.c
Auto-merging drivers/scsi/qla2xxx/tcm_qla2xxx.c
Merge made by the 'recursive' strategy.
drivers/infiniband/ulp/isert/ib_isert.c | 691 +++++++++++++++------------
drivers/infiniband/ulp/isert/ib_isert.h | 37 +-
drivers/scsi/qla2xxx/tcm_qla2xxx.c | 56 ++-
drivers/scsi/qla2xxx/tcm_qla2xxx.h | 1 +
drivers/target/iscsi/Makefile | 1 -
drivers/target/iscsi/iscsi_target.c | 117 ++---
drivers/target/iscsi/iscsi_target_configfs.c | 32 ++
drivers/target/iscsi/iscsi_target_erl0.c | 14 +-
drivers/target/iscsi/iscsi_target_login.c | 60 ++-
drivers/target/iscsi/iscsi_target_tpg.c | 19 +
drivers/target/iscsi/iscsi_target_tpg.h | 1 +
drivers/target/iscsi/iscsi_target_tq.c | 495 -------------------
drivers/target/iscsi/iscsi_target_tq.h | 84 ----
drivers/target/iscsi/iscsi_target_util.c | 1 -
drivers/target/loopback/tcm_loop.c | 70 ++-
drivers/target/loopback/tcm_loop.h | 1 +
drivers/target/target_core_configfs.c | 16 +-
drivers/target/target_core_file.c | 141 ++----
drivers/target/target_core_iblock.c | 4 +-
drivers/target/target_core_internal.h | 6 +
drivers/target/target_core_pr.c | 30 +-
drivers/target/target_core_rd.c | 6 +-
drivers/target/target_core_sbc.c | 73 ++-
drivers/target/target_core_spc.c | 16 +-
drivers/target/target_core_transport.c | 107 ++++-
drivers/target/target_core_user.c | 6 +-
drivers/target/target_core_xcopy.c | 10 +-
drivers/vhost/scsi.c | 52 +-
include/target/iscsi/iscsi_target_core.h | 15 +-
include/target/target_core_base.h | 1 +
include/target/target_core_fabric.h | 9 +
include/target/target_core_fabric_configfs.h | 5 +
32 files changed, 996 insertions(+), 1181 deletions(-)
delete mode 100644 drivers/target/iscsi/iscsi_target_tq.c
delete mode 100644 drivers/target/iscsi/iscsi_target_tq.h
Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2)
$ git merge target-merge/for-next-merge
Already up-to-date.
Merging pinctrl/for-next (bef6ff0b15ef Merge branch 'devel' into for-next)
$ git merge pinctrl/for-next
Auto-merging drivers/pinctrl/bcm/pinctrl-bcm281xx.c
Merge made by the 'recursive' strategy.
.../bindings/pinctrl/brcm,cygnus-gpio.txt | 98 +
.../bindings/pinctrl/brcm,cygnus-pinmux.txt | 132 ++
.../pinctrl/marvell,armada-39x-pinctrl.txt | 78 +
.../bindings/pinctrl/nvidia,tegra210-pinmux.txt | 166 ++
.../bindings/pinctrl/pinctrl-bindings.txt | 32 +-
.../devicetree/bindings/pinctrl/pinctrl-mt65xx.txt | 145 ++
Documentation/pinctrl.txt | 25 +-
drivers/pinctrl/Kconfig | 31 +-
drivers/pinctrl/Makefile | 6 +-
drivers/pinctrl/bcm/Kconfig | 56 +
drivers/pinctrl/bcm/Makefile | 6 +
drivers/pinctrl/{ => bcm}/pinctrl-bcm281xx.c | 4 +-
drivers/pinctrl/{ => bcm}/pinctrl-bcm2835.c | 0
drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c | 907 +++++++++
drivers/pinctrl/bcm/pinctrl-cygnus-mux.c | 1022 ++++++++++
drivers/pinctrl/freescale/pinctrl-imx.c | 8 +-
drivers/pinctrl/freescale/pinctrl-vf610.c | 2 +-
drivers/pinctrl/mediatek/Kconfig | 23 +
drivers/pinctrl/mediatek/Makefile | 6 +
drivers/pinctrl/mediatek/pinctrl-mt8135.c | 374 ++++
drivers/pinctrl/mediatek/pinctrl-mt8173.c | 453 +++++
drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 1257 ++++++++++++
drivers/pinctrl/mediatek/pinctrl-mtk-common.h | 229 +++
drivers/pinctrl/mediatek/pinctrl-mtk-mt8135.h | 2114 ++++++++++++++++++++
drivers/pinctrl/mediatek/pinctrl-mtk-mt8173.h | 1226 ++++++++++++
drivers/pinctrl/mvebu/Kconfig | 4 +
drivers/pinctrl/mvebu/Makefile | 1 +
drivers/pinctrl/mvebu/pinctrl-armada-39x.c | 432 ++++
drivers/pinctrl/pinctrl-amd.c | 870 ++++++++
drivers/pinctrl/pinctrl-amd.h | 261 +++
drivers/pinctrl/pinctrl-at91.c | 6 +-
drivers/pinctrl/pinctrl-lantiq.h | 2 +-
drivers/pinctrl/pinctrl-st.c | 83 +-
drivers/pinctrl/pinctrl-tegra.c | 28 +-
drivers/pinctrl/pinctrl-tegra.h | 43 +-
drivers/pinctrl/pinctrl-tegra114.c | 17 +-
drivers/pinctrl/pinctrl-tegra124.c | 32 +-
drivers/pinctrl/pinctrl-tegra20.c | 3 +
drivers/pinctrl/pinctrl-tegra210.c | 1588 +++++++++++++++
drivers/pinctrl/pinctrl-tegra30.c | 116 +-
drivers/pinctrl/qcom/pinctrl-msm.c | 17 +-
drivers/pinctrl/samsung/pinctrl-exynos.c | 154 +-
drivers/pinctrl/samsung/pinctrl-samsung.c | 2 +
drivers/pinctrl/samsung/pinctrl-samsung.h | 1 +
drivers/pinctrl/sh-pfc/core.c | 79 +-
drivers/pinctrl/sh-pfc/core.h | 7 +-
drivers/pinctrl/sh-pfc/gpio.c | 31 +-
drivers/pinctrl/sh-pfc/sh_pfc.h | 37 +-
drivers/pinctrl/sirf/pinctrl-sirf.c | 2 +-
include/dt-bindings/pinctrl/mt65xx.h | 40 +
50 files changed, 12001 insertions(+), 255 deletions(-)
create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,cygnus-gpio.txt
create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,cygnus-pinmux.txt
create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,armada-39x-pinctrl.txt
create mode 100644 Documentation/devicetree/bindings/pinctrl/nvidia,tegra210-pinmux.txt
create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-mt65xx.txt
create mode 100644 drivers/pinctrl/bcm/Kconfig
create mode 100644 drivers/pinctrl/bcm/Makefile
rename drivers/pinctrl/{ => bcm}/pinctrl-bcm281xx.c (99%)
rename drivers/pinctrl/{ => bcm}/pinctrl-bcm2835.c (100%)
create mode 100644 drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c
create mode 100644 drivers/pinctrl/bcm/pinctrl-cygnus-mux.c
create mode 100644 drivers/pinctrl/mediatek/Kconfig
create mode 100644 drivers/pinctrl/mediatek/Makefile
create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt8135.c
create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt8173.c
create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-common.c
create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-common.h
create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt8135.h
create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt8173.h
create mode 100644 drivers/pinctrl/mvebu/pinctrl-armada-39x.c
create mode 100644 drivers/pinctrl/pinctrl-amd.c
create mode 100644 drivers/pinctrl/pinctrl-amd.h
create mode 100644 drivers/pinctrl/pinctrl-tegra210.c
create mode 100644 include/dt-bindings/pinctrl/mt65xx.h
Merging vhost/linux-next (1179c21e8917 virtio_blk: fix comment for virtio 1.0)
$ git merge vhost/linux-next
Merge made by the 'recursive' strategy.
Merging remoteproc/for-next (315491e5d6ee remoteproc: add IOMMU hardware capability flag)
$ git merge remoteproc/for-next
Merge made by the 'recursive' strategy.
drivers/remoteproc/da8xx_remoteproc.c | 1 +
drivers/remoteproc/omap_remoteproc.c | 2 ++
drivers/remoteproc/remoteproc_core.c | 15 ++-------------
drivers/remoteproc/ste_modem_rproc.c | 1 +
include/linux/remoteproc.h | 2 ++
5 files changed, 8 insertions(+), 13 deletions(-)
Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small)
$ git merge rpmsg/for-next
Already up-to-date.
Merging gpio/for-next (e03f967e2bd6 Merge branch 'devel' into for-next)
$ git merge gpio/for-next
Auto-merging drivers/gpio/gpiolib.h
Auto-merging drivers/gpio/Makefile
Auto-merging drivers/gpio/Kconfig
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
.../devicetree/bindings/gpio/gpio-altera.txt | 43 +++
Documentation/devicetree/bindings/gpio/gpio.txt | 30 ++
.../devicetree/bindings/gpio/mrvl-gpio.txt | 2 +-
Documentation/gpio/consumer.txt | 65 +++-
MAINTAINERS | 6 +
drivers/gpio/Kconfig | 20 +-
drivers/gpio/Makefile | 1 +
drivers/gpio/devres.c | 107 +++++-
drivers/gpio/gpio-altera.c | 374 +++++++++++++++++++++
drivers/gpio/gpio-crystalcove.c | 7 +-
drivers/gpio/gpio-f7188x.c | 47 ++-
drivers/gpio/gpio-max732x.c | 134 +++-----
drivers/gpio/gpio-mb86s7x.c | 5 +
drivers/gpio/gpio-omap.c | 131 +++-----
drivers/gpio/gpio-pcf857x.c | 134 +++-----
drivers/gpio/gpio-pxa.c | 3 +-
drivers/gpio/gpio-rcar.c | 63 +++-
drivers/gpio/gpio-tb10x.c | 2 +-
drivers/gpio/gpio-vf610.c | 16 +-
drivers/gpio/gpiolib-acpi.c | 86 ++++-
drivers/gpio/gpiolib-of.c | 111 ++++++
drivers/gpio/gpiolib.c | 299 ++++++++++++++--
drivers/gpio/gpiolib.h | 13 +
drivers/input/keyboard/gpio_keys_polled.c | 2 +-
drivers/leds/leds-gpio.c | 2 +-
include/asm-generic/gpio.h | 48 ---
include/linux/gpio/consumer.h | 77 +++++
include/linux/gpio/driver.h | 48 +++
28 files changed, 1494 insertions(+), 382 deletions(-)
create mode 100644 Documentation/devicetree/bindings/gpio/gpio-altera.txt
create mode 100644 drivers/gpio/gpio-altera.c
Merging dma-mapping/dma-mapping-next (04abab698285 include/dma-mapping: Clarify output of dma_map_sg)
$ git merge dma-mapping/dma-mapping-next
Merge made by the 'recursive' strategy.
include/asm-generic/dma-mapping-common.h | 5 +++++
include/linux/dma-mapping.h | 4 ++++
2 files changed, 9 insertions(+)
Merging pwm/for-next (71d54bfabb28 drivers/pwm: Remove __init initializer for pwm_add_table)
$ git merge pwm/for-next
Merge made by the 'recursive' strategy.
Documentation/devicetree/bindings/pwm/imx-pwm.txt | 12 ++++++++-
drivers/pwm/core.c | 2 +-
drivers/pwm/pwm-atmel-hlcdc.c | 4 +++
drivers/pwm/pwm-mxs.c | 8 ++++--
drivers/pwm/pwm-pca9685.c | 2 +-
drivers/pwm/pwm-samsung.c | 32 ++++++++++++++++++++++-
6 files changed, 54 insertions(+), 6 deletions(-)
Merging dma-buf/for-next (56a4d3e2e2d4 staging: android: ion: fix wrong init of dma_buf_export_info)
$ git merge dma-buf/for-next
Auto-merging drivers/staging/android/ion/ion.c
Auto-merging drivers/media/v4l2-core/videobuf2-vmalloc.c
Auto-merging drivers/media/v4l2-core/videobuf2-dma-contig.c
Auto-merging drivers/gpu/drm/tegra/gem.c
Auto-merging drivers/gpu/drm/exynos/exynos_drm_dmabuf.c
Merge made by the 'recursive' strategy.
Documentation/dma-buf-sharing.txt | 23 +++++++------
drivers/dma-buf/dma-buf.c | 47 ++++++++++++--------------
drivers/gpu/drm/armada/armada_gem.c | 10 ++++--
drivers/gpu/drm/drm_prime.c | 12 ++++---
drivers/gpu/drm/exynos/exynos_drm_dmabuf.c | 9 +++--
drivers/gpu/drm/i915/i915_gem_dmabuf.c | 10 ++++--
drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 9 ++++-
drivers/gpu/drm/tegra/gem.c | 10 ++++--
drivers/gpu/drm/ttm/ttm_object.c | 9 +++--
drivers/gpu/drm/udl/udl_dmabuf.c | 9 ++++-
drivers/media/v4l2-core/videobuf2-dma-contig.c | 8 ++++-
drivers/media/v4l2-core/videobuf2-dma-sg.c | 8 ++++-
drivers/media/v4l2-core/videobuf2-vmalloc.c | 8 ++++-
drivers/staging/android/ion/ion.c | 9 +++--
include/linux/dma-buf.h | 34 +++++++++++++++----
15 files changed, 152 insertions(+), 63 deletions(-)
Merging userns/for-next (db86da7cb76f userns: Unbreak the unprivileged remount tests)
$ git merge userns/for-next
Already up-to-date.
Merging ktest/for-next (7c2c49eceb79 ktest: Place quotes around item variable)
$ git merge ktest/for-next
Already up-to-date.
Merging clk/clk-next (3937567ded41 clk: qcom: fix driver dependencies)
$ git merge clk/clk-next
Auto-merging drivers/clk/clk.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
.../devicetree/bindings/clock/exynos3250-clock.txt | 8 +
.../devicetree/bindings/clock/exynos5433-clock.txt | 462 ++
.../devicetree/bindings/clock/mvebu-core-clock.txt | 9 +
.../bindings/clock/mvebu-gated-clock.txt | 15 +-
MAINTAINERS | 3 +-
drivers/clk/clk-cdce706.c | 2 +-
drivers/clk/clk-conf.c | 7 +-
drivers/clk/clk-fractional-divider.c | 3 +
drivers/clk/clk-palmas.c | 2 +-
drivers/clk/clk-si5351.c | 10 +-
drivers/clk/clk-si570.c | 2 +-
drivers/clk/clk.c | 134 +-
drivers/clk/clk.h | 3 -
drivers/clk/clkdev.c | 30 +-
drivers/clk/mvebu/Kconfig | 4 +
drivers/clk/mvebu/Makefile | 1 +
drivers/clk/mvebu/armada-39x.c | 156 +
drivers/clk/mvebu/common.c | 17 +
drivers/clk/mvebu/common.h | 1 +
drivers/clk/qcom/Kconfig | 9 +
drivers/clk/qcom/Makefile | 1 +
drivers/clk/qcom/clk-pll.c | 6 +-
drivers/clk/qcom/clk-rcg.c | 162 +-
drivers/clk/qcom/clk-rcg.h | 15 +-
drivers/clk/qcom/clk-rcg2.c | 23 +-
drivers/clk/qcom/common.c | 12 +
drivers/clk/qcom/common.h | 4 +
drivers/clk/qcom/gcc-apq8084.c | 62 +-
drivers/clk/qcom/gcc-ipq806x.c | 80 +-
drivers/clk/qcom/gcc-msm8660.c | 22 +-
drivers/clk/qcom/gcc-msm8916.c | 2868 +++++++++++
drivers/clk/qcom/gcc-msm8960.c | 32 +-
drivers/clk/qcom/gcc-msm8974.c | 30 +-
drivers/clk/qcom/lcc-ipq806x.c | 35 +-
drivers/clk/qcom/lcc-msm8960.c | 12 +-
drivers/clk/qcom/mmcc-apq8084.c | 168 +-
drivers/clk/qcom/mmcc-msm8960.c | 49 +-
drivers/clk/qcom/mmcc-msm8974.c | 134 +-
drivers/clk/samsung/Makefile | 1 +
drivers/clk/samsung/clk-exynos-clkout.c | 4 +
drivers/clk/samsung/clk-exynos3250.c | 163 +
drivers/clk/samsung/clk-exynos5433.c | 5423 ++++++++++++++++++++
drivers/clk/st/clkgen-fsyn.c | 2 +-
drivers/clk/st/clkgen-mux.c | 8 +-
drivers/clk/st/clkgen-pll.c | 4 +-
drivers/clk/ti/clk-3xxx-legacy.c | 16 +-
drivers/clk/ti/clk-3xxx.c | 19 +-
drivers/clk/ti/clk-44xx.c | 11 -
drivers/clk/ti/clk-54xx.c | 22 +-
drivers/clk/ti/clk-7xx.c | 18 +-
drivers/clk/ti/clk-dra7-atl.c | 2 +-
drivers/clk/ti/clockdomain.c | 2 +-
drivers/clk/ti/fapll.c | 270 +-
drivers/clk/versatile/clk-vexpress-osc.c | 2 +-
include/dt-bindings/clock/exynos3250.h | 61 +
include/dt-bindings/clock/exynos5433.h | 1403 +++++
include/dt-bindings/clock/qcom,gcc-ipq806x.h | 1 +
include/trace/events/clk.h | 198 +
58 files changed, 11732 insertions(+), 491 deletions(-)
create mode 100644 Documentation/devicetree/bindings/clock/exynos5433-clock.txt
create mode 100644 drivers/clk/mvebu/armada-39x.c
create mode 100644 drivers/clk/qcom/gcc-msm8916.c
create mode 100644 drivers/clk/samsung/clk-exynos5433.c
create mode 100644 include/dt-bindings/clock/exynos5433.h
create mode 100644 include/trace/events/clk.h
Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
$ git merge random/dev
Already up-to-date.
Merging aio/master (5f785de58873 aio: Skip timer for io_getevents if timeout=0)
$ git merge aio/master
Already up-to-date.
Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu)
$ git merge llvmlinux/for-next
Merge made by the 'recursive' strategy.
Merging kselftest/next (2bfd4d1f8c2b ftracetest: Do not use usleep directly)
$ git merge kselftest/next
Resolved 'tools/testing/selftests/powerpc/Makefile' using previous resolution.
Auto-merging tools/testing/selftests/powerpc/copyloops/Makefile
Auto-merging tools/testing/selftests/powerpc/Makefile
CONFLICT (content): Merge conflict in tools/testing/selftests/powerpc/Makefile
Auto-merging tools/testing/selftests/memory-hotplug/mem-on-off-test.sh
Auto-merging tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh
Auto-merging tools/testing/selftests/Makefile
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master cdb36ba71ab3] Merge remote-tracking branch 'kselftest/next'
$ git diff -M --stat --summary HEAD^..
Documentation/rtc.txt | 264 +----------------
MAINTAINERS | 1 +
tools/testing/selftests/Makefile | 33 +++
tools/testing/selftests/breakpoints/Makefile | 5 +-
tools/testing/selftests/cpu-hotplug/Makefile | 7 +-
.../{on-off-test.sh => cpu-on-off-test.sh} | 0
tools/testing/selftests/efivarfs/Makefile | 7 +-
tools/testing/selftests/efivarfs/efivarfs.sh | 0
tools/testing/selftests/exec/Makefile | 9 +-
tools/testing/selftests/firmware/Makefile | 20 +-
tools/testing/selftests/firmware/fw_filesystem.sh | 0
tools/testing/selftests/firmware/fw_userhelper.sh | 0
tools/testing/selftests/ftrace/Makefile | 5 +-
.../selftests/ftrace/test.d/00basic/basic4.tc | 2 +-
.../selftests/ftrace/test.d/event/event-enable.tc | 15 +-
.../ftrace/test.d/event/subsystem-enable.tc | 15 +-
.../ftrace/test.d/event/toplevel-enable.tc | 15 +-
.../ftrace/test.d/ftrace/fgraph-filter-stack.tc | 6 +-
.../ftrace/test.d/ftrace/fgraph-filter.tc | 2 +-
.../ftrace/test.d/ftrace/func_profiler.tc | 2 +-
tools/testing/selftests/gen_kselftest_tar.sh | 55 ++++
tools/testing/selftests/ipc/Makefile | 11 +-
tools/testing/selftests/kcmp/Makefile | 6 +-
tools/testing/selftests/kselftest_install.sh | 37 +++
tools/testing/selftests/lib.mk | 35 +++
tools/testing/selftests/memfd/Makefile | 14 +-
tools/testing/selftests/memory-hotplug/Makefile | 9 +-
.../{on-off-test.sh => mem-on-off-test.sh} | 0
tools/testing/selftests/mount/.gitignore | 1 +
tools/testing/selftests/mount/Makefile | 15 +-
tools/testing/selftests/mqueue/Makefile | 22 +-
tools/testing/selftests/net/Makefile | 10 +-
tools/testing/selftests/net/run_afpackettests | 0
tools/testing/selftests/net/run_netsocktests | 0
tools/testing/selftests/powerpc/Makefile | 22 +-
tools/testing/selftests/powerpc/copyloops/Makefile | 15 +-
tools/testing/selftests/powerpc/mm/Makefile | 15 +-
tools/testing/selftests/powerpc/pmu/Makefile | 48 ++--
tools/testing/selftests/powerpc/pmu/ebb/Makefile | 13 +-
.../testing/selftests/powerpc/primitives/Makefile | 15 +-
.../testing/selftests/powerpc/stringloops/Makefile | 15 +-
tools/testing/selftests/powerpc/tm/Makefile | 15 +-
tools/testing/selftests/ptrace/Makefile | 5 +-
tools/testing/selftests/size/Makefile | 7 +-
tools/testing/selftests/sysctl/Makefile | 12 +-
tools/testing/selftests/sysctl/run_numerictests | 0
tools/testing/selftests/sysctl/run_stringtests | 0
tools/testing/selftests/timers/Makefile | 38 ++-
.../testing/selftests/timers/alarmtimer-suspend.c | 185 ++++++++++++
tools/testing/selftests/timers/change_skew.c | 107 +++++++
.../testing/selftests/timers/clocksource-switch.c | 179 ++++++++++++
.../testing/selftests/timers/inconsistency-check.c | 204 +++++++++++++
tools/testing/selftests/timers/leap-a-day.c | 319 +++++++++++++++++++++
tools/testing/selftests/timers/leapcrash.c | 120 ++++++++
tools/testing/selftests/timers/mqueue-lat.c | 124 ++++++++
tools/testing/selftests/timers/nanosleep.c | 174 +++++++++++
tools/testing/selftests/timers/nsleep-lat.c | 190 ++++++++++++
tools/testing/selftests/timers/posix_timers.c | 9 +-
tools/testing/selftests/timers/raw_skew.c | 154 ++++++++++
tools/testing/selftests/timers/rtctest.c | 271 +++++++++++++++++
tools/testing/selftests/timers/set-2038.c | 144 ++++++++++
tools/testing/selftests/timers/set-tai.c | 79 +++++
tools/testing/selftests/timers/set-timer-lat.c | 216 ++++++++++++++
tools/testing/selftests/timers/skew_consistency.c | 89 ++++++
tools/testing/selftests/timers/threadtest.c | 204 +++++++++++++
tools/testing/selftests/timers/valid-adjtimex.c | 202 +++++++++++++
tools/testing/selftests/user/Makefile | 5 +-
tools/testing/selftests/vm/Makefile | 7 +-
tools/testing/selftests/vm/run_vmtests | 0
69 files changed, 3366 insertions(+), 459 deletions(-)
rename tools/testing/selftests/cpu-hotplug/{on-off-test.sh => cpu-on-off-test.sh} (100%)
mode change 100644 => 100755
mode change 100644 => 100755 tools/testing/selftests/efivarfs/efivarfs.sh
mode change 100644 => 100755 tools/testing/selftests/firmware/fw_filesystem.sh
mode change 100644 => 100755 tools/testing/selftests/firmware/fw_userhelper.sh
create mode 100755 tools/testing/selftests/gen_kselftest_tar.sh
create mode 100755 tools/testing/selftests/kselftest_install.sh
create mode 100644 tools/testing/selftests/lib.mk
rename tools/testing/selftests/memory-hotplug/{on-off-test.sh => mem-on-off-test.sh} (100%)
mode change 100644 => 100755
create mode 100644 tools/testing/selftests/mount/.gitignore
mode change 100644 => 100755 tools/testing/selftests/net/run_afpackettests
mode change 100644 => 100755 tools/testing/selftests/net/run_netsocktests
mode change 100644 => 100755 tools/testing/selftests/sysctl/run_numerictests
mode change 100644 => 100755 tools/testing/selftests/sysctl/run_stringtests
create mode 100644 tools/testing/selftests/timers/alarmtimer-suspend.c
create mode 100644 tools/testing/selftests/timers/change_skew.c
create mode 100644 tools/testing/selftests/timers/clocksource-switch.c
create mode 100644 tools/testing/selftests/timers/inconsistency-check.c
create mode 100644 tools/testing/selftests/timers/leap-a-day.c
create mode 100644 tools/testing/selftests/timers/leapcrash.c
create mode 100644 tools/testing/selftests/timers/mqueue-lat.c
create mode 100644 tools/testing/selftests/timers/nanosleep.c
create mode 100644 tools/testing/selftests/timers/nsleep-lat.c
create mode 100644 tools/testing/selftests/timers/raw_skew.c
create mode 100644 tools/testing/selftests/timers/rtctest.c
create mode 100644 tools/testing/selftests/timers/set-2038.c
create mode 100644 tools/testing/selftests/timers/set-tai.c
create mode 100644 tools/testing/selftests/timers/set-timer-lat.c
create mode 100644 tools/testing/selftests/timers/skew_consistency.c
create mode 100644 tools/testing/selftests/timers/threadtest.c
create mode 100644 tools/testing/selftests/timers/valid-adjtimex.c
mode change 100644 => 100755 tools/testing/selftests/vm/run_vmtests
Merging y2038/y2038 (ed8c2241c1ae coredump: Use 64bit time for unix time of coredump)
$ git merge y2038/y2038
Resolved 'drivers/staging/media/lirc/lirc_parallel.c' using previous resolution.
Auto-merging kernel/cpuset.c
Auto-merging fs/coredump.c
Auto-merging drivers/staging/media/lirc/lirc_serial.c
Auto-merging drivers/staging/media/lirc/lirc_sasem.c
Auto-merging drivers/staging/media/lirc/lirc_parallel.c
CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_parallel.c
Auto-merging drivers/staging/gdm72xx/gdm_sdio.c
Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
Auto-merging drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master c5eaff08b1bc] Merge remote-tracking branch 'y2038/y2038'
$ git diff -M --stat --summary HEAD^..
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 4 +-
drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 4 +-
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 4 +-
drivers/staging/ft1000/ft1000.h | 4 +-
drivers/staging/gdm72xx/gdm_sdio.c | 13 +++---
drivers/staging/gdm72xx/gdm_sdio.h | 4 +-
drivers/staging/media/lirc/lirc_parallel.c | 35 +++++++----------
drivers/staging/media/lirc/lirc_sasem.c | 20 +++++-----
drivers/staging/media/lirc/lirc_serial.c | 50 ++++++++----------------
fs/coredump.c | 8 ++--
kernel/cpuset.c | 12 ++++--
11 files changed, 68 insertions(+), 90 deletions(-)
Merging luto-misc/next (a6c5170d1ede Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux)
$ git merge luto-misc/next
Already up-to-date.
Merging access_once/linux-next (bc465aa9d045 Linux 4.0-rc5)
$ git merge access_once/linux-next
Already up-to-date.
Merging livepatching/for-next (075b759be1bb Merge branch 'for-4.1/core-s390' into for-next)
$ git merge livepatching/for-next
Resolved 'arch/s390/Kconfig' using previous resolution.
Auto-merging arch/s390/Kconfig
CONFLICT (content): Merge conflict in arch/s390/Kconfig
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 9de5ddd325c0] Merge remote-tracking branch 'livepatching/for-next'
$ git diff -M --stat --summary HEAD^..
arch/s390/Kconfig | 3 ++
arch/s390/include/asm/livepatch.h | 43 ++++++++++++++++++++++++
arch/x86/include/asm/livepatch.h | 4 +--
include/linux/livepatch.h | 8 ++---
kernel/livepatch/core.c | 69 ++++++++++-----------------------------
5 files changed, 69 insertions(+), 58 deletions(-)
create mode 100644 arch/s390/include/asm/livepatch.h
Merging akpm-current/current (5d77fd3b294b x86: switch to using asm-generic for seccomp.h)
$ git merge --no-ff akpm-current/current
Recorded preimage for 'drivers/rtc/class.c'
Recorded preimage for 'drivers/rtc/rtc-mc13xxx.c'
Recorded preimage for 'fs/ext2/file.c'
Recorded preimage for 'fs/ext4/file.c'
Resolved 'Documentation/printk-formats.txt' using previous resolution.
Resolved 'arch/arm64/Kconfig' using previous resolution.
Resolved 'arch/parisc/include/asm/Kbuild' using previous resolution.
Resolved 'arch/s390/mm/mmap.c' using previous resolution.
Resolved 'fs/fat/inode.c' using previous resolution.
Auto-merging sound/soc/codecs/pcm512x.c
Auto-merging mm/shmem.c
Auto-merging mm/memtest.c
Auto-merging mm/filemap.c
Removing lib/find_next_bit.c
Auto-merging lib/Kconfig.debug
Auto-merging kernel/watchdog.c
Auto-merging kernel/sysctl.c
Auto-merging kernel/sched/fair.c
Auto-merging kernel/cpuset.c
Auto-merging kernel/cgroup.c
Auto-merging init/main.c
Auto-merging init/Kconfig
Auto-merging include/linux/types.h
Auto-merging include/linux/rtc.h
Auto-merging include/linux/io.h
Auto-merging include/linux/fs.h
Auto-merging fs/splice.c
Auto-merging fs/ocfs2/aops.c
Auto-merging fs/nilfs2/inode.c
Auto-merging fs/nfsd/Kconfig
Auto-merging fs/locks.c
Auto-merging fs/hugetlbfs/inode.c
Auto-merging fs/hfsplus/inode.c
Auto-merging fs/fat/inode.c
CONFLICT (content): Merge conflict in fs/fat/inode.c
Auto-merging fs/fat/file.c
Auto-merging fs/ext4/namei.c
Auto-merging fs/ext4/inode.c
Auto-merging fs/ext4/fsync.c
Auto-merging fs/ext4/file.c
CONFLICT (content): Merge conflict in fs/ext4/file.c
Auto-merging fs/ext4/ext4.h
Auto-merging fs/ext2/inode.c
Auto-merging fs/ext2/file.c
CONFLICT (content): Merge conflict in fs/ext2/file.c
Auto-merging fs/dax.c
Auto-merging fs/cifs/file.c
Auto-merging fs/cifs/connect.c
Auto-merging fs/affs/file.c
Auto-merging drivers/rtc/rtc-s5m.c
Auto-merging drivers/rtc/rtc-mc13xxx.c
CONFLICT (content): Merge conflict in drivers/rtc/rtc-mc13xxx.c
Auto-merging drivers/rtc/interface.c
Auto-merging drivers/rtc/class.c
CONFLICT (content): Merge conflict in drivers/rtc/class.c
Auto-merging drivers/parisc/sba_iommu.c
Auto-merging drivers/parisc/ccio-dma.c
Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
Auto-merging drivers/gpu/drm/i915/intel_drv.h
Auto-merging drivers/base/memory.c
Auto-merging arch/x86/xen/mmu.c
Auto-merging arch/x86/mm/pgtable.c
Auto-merging arch/x86/kernel/signal.c
Removing arch/x86/include/asm/seccomp_64.h
Removing arch/x86/include/asm/seccomp_32.h
Auto-merging arch/x86/include/asm/paravirt.h
Auto-merging arch/x86/include/asm/elf.h
Auto-merging arch/x86/Kconfig
Auto-merging arch/tile/Kconfig
Auto-merging arch/s390/mm/mmap.c
CONFLICT (content): Merge conflict in arch/s390/mm/mmap.c
Auto-merging arch/s390/include/asm/elf.h
Auto-merging arch/s390/Kconfig
Removing arch/powerpc/include/uapi/asm/seccomp.h
Auto-merging arch/powerpc/Kconfig
Removing arch/parisc/include/asm/seccomp.h
Auto-merging arch/parisc/include/asm/Kbuild
CONFLICT (content): Merge conflict in arch/parisc/include/asm/Kbuild
Auto-merging arch/mips/include/asm/elf.h
Auto-merging arch/mips/Kconfig
Auto-merging arch/ia64/Kconfig
Auto-merging arch/cris/arch-v32/kernel/setup.c
Auto-merging arch/arm64/mm/mmu.c
Auto-merging arch/arm64/include/asm/pgtable-hwdef.h
Auto-merging arch/arm64/include/asm/page.h
Auto-merging arch/arm64/include/asm/kvm_mmu.h
Auto-merging arch/arm64/Kconfig
CONFLICT (content): Merge conflict in arch/arm64/Kconfig
Removing arch/arm/include/asm/seccomp.h
Auto-merging arch/arm/include/asm/elf.h
Auto-merging arch/arm/include/asm/Kbuild
Auto-merging arch/arm/Kconfig
Auto-merging MAINTAINERS
Auto-merging Documentation/printk-formats.txt
CONFLICT (content): Merge conflict in Documentation/printk-formats.txt
Auto-merging Documentation/kernel-parameters.txt
Auto-merging Documentation/filesystems/proc.txt
Auto-merging Documentation/filesystems/Locking
Auto-merging Documentation/CodingStyle
Auto-merging CREDITS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
Recorded resolution for 'drivers/rtc/class.c'.
Recorded resolution for 'drivers/rtc/rtc-mc13xxx.c'.
Recorded resolution for 'fs/ext2/file.c'.
Recorded resolution for 'fs/ext4/file.c'.
[master 9aa17fb5c857] Merge branch 'akpm-current/current'
$ git diff -M --stat --summary HEAD^..
.mailmap | 1 +
CREDITS | 17 +
Documentation/ABI/obsolete/sysfs-block-zram | 119 +++
Documentation/ABI/testing/sysfs-block-zram | 25 +
Documentation/ABI/testing/sysfs-class-zram | 24 +
Documentation/CodingStyle | 13 +
Documentation/SubmittingPatches | 4 +-
Documentation/blockdev/zram.txt | 120 ++-
Documentation/cgroups/memory.txt | 8 +-
Documentation/cma/debugfs.txt | 21 +
.../devicetree/bindings/rtc/abracon,abx80x.txt | 32 +
.../devicetree/bindings/rtc/digicolor-rtc.txt | 17 +
.../devicetree/bindings/rtc/stmp3xxx-rtc.txt | 5 +
Documentation/filesystems/Locking | 8 +
Documentation/filesystems/proc.txt | 15 +-
Documentation/filesystems/vfat.txt | 10 +
Documentation/kernel-parameters.txt | 10 +-
Documentation/printk-formats.txt | 59 +-
Documentation/sysctl/kernel.txt | 83 +-
Documentation/sysctl/vm.txt | 11 +
Documentation/vm/cleancache.txt | 4 +-
Documentation/vm/hugetlbpage.txt | 55 +-
Documentation/vm/unevictable-lru.txt | 38 +-
Documentation/vm/zsmalloc.txt | 70 ++
MAINTAINERS | 76 +-
arch/Kconfig | 15 +
arch/alpha/Kconfig | 4 +
arch/alpha/include/uapi/asm/mman.h | 1 +
arch/arc/kernel/troubleshoot.c | 3 +-
arch/arm/Kconfig | 7 +-
arch/arm/include/asm/Kbuild | 1 +
arch/arm/include/asm/elf.h | 4 -
arch/arm/include/asm/pgtable-3level.h | 1 +
arch/arm/include/asm/seccomp.h | 11 -
arch/arm/mm/init.c | 3 +
arch/arm/mm/mmap.c | 16 +-
arch/arm/plat-pxa/dma.c | 111 +--
arch/arm64/Kconfig | 16 +-
arch/arm64/include/asm/elf.h | 5 -
arch/arm64/include/asm/kvm_mmu.h | 4 +-
arch/arm64/include/asm/page.h | 4 +-
arch/arm64/include/asm/pgalloc.h | 8 +-
arch/arm64/include/asm/pgtable-hwdef.h | 6 +-
arch/arm64/include/asm/pgtable-types.h | 12 +-
arch/arm64/include/asm/pgtable.h | 10 +-
arch/arm64/include/asm/tlb.h | 4 +-
arch/arm64/mm/init.c | 2 +
arch/arm64/mm/mmap.c | 20 +-
arch/arm64/mm/mmu.c | 4 +-
arch/cris/arch-v10/kernel/fasttimer.c | 85 +-
arch/cris/arch-v10/kernel/setup.c | 58 +-
arch/cris/arch-v32/kernel/fasttimer.c | 85 +-
arch/cris/arch-v32/kernel/setup.c | 62 +-
arch/ia64/Kconfig | 18 +-
arch/ia64/include/asm/page.h | 4 +-
arch/ia64/include/asm/pgalloc.h | 4 +-
arch/ia64/include/asm/pgtable.h | 12 +-
arch/ia64/kernel/ivt.S | 12 +-
arch/ia64/kernel/machine_kexec.c | 4 +-
arch/m68k/Kconfig | 4 +
arch/microblaze/include/asm/seccomp.h | 8 +-
arch/microblaze/kernel/cpu/mb.c | 149 ++-
arch/mips/Kconfig | 7 +-
arch/mips/include/asm/elf.h | 4 -
arch/mips/include/asm/seccomp.h | 7 +-
arch/mips/include/uapi/asm/mman.h | 1 +
arch/mips/mm/mmap.c | 24 +-
arch/nios2/kernel/cpuinfo.c | 77 +-
arch/openrisc/kernel/setup.c | 50 +-
arch/parisc/Kconfig | 5 +
arch/parisc/include/asm/Kbuild | 1 +
arch/parisc/include/asm/pgalloc.h | 2 +-
arch/parisc/include/asm/pgtable.h | 16 +-
arch/parisc/include/asm/seccomp.h | 16 -
arch/parisc/include/uapi/asm/mman.h | 1 +
arch/parisc/kernel/entry.S | 4 +-
arch/parisc/kernel/head.S | 4 +-
arch/parisc/mm/init.c | 2 +-
arch/powerpc/Kconfig | 8 +-
arch/powerpc/include/asm/elf.h | 4 -
arch/powerpc/include/asm/pgtable-ppc64.h | 2 +
arch/powerpc/include/asm/seccomp.h | 10 +
arch/powerpc/include/uapi/asm/Kbuild | 1 -
arch/powerpc/include/uapi/asm/seccomp.h | 16 -
arch/powerpc/mm/mmap.c | 28 +-
arch/powerpc/platforms/powernv/opal-power.c | 5 +-
arch/s390/Kconfig | 7 +
arch/s390/include/asm/elf.h | 12 +-
arch/s390/mm/mmap.c | 32 +-
arch/s390/pci/pci_debug.c | 6 +-
arch/sh/Kconfig | 4 +
arch/sh/kernel/dwarf.c | 18 +-
arch/sparc/Kconfig | 4 +
arch/sparc/include/asm/pgtable_64.h | 9 +
arch/sparc/include/asm/seccomp.h | 11 +-
arch/sparc/kernel/mdesc.c | 22 +-
arch/tile/Kconfig | 5 +
arch/um/Kconfig.um | 5 +
arch/x86/Kconfig | 20 +-
arch/x86/include/asm/e820.h | 8 -
arch/x86/include/asm/elf.h | 3 -
arch/x86/include/asm/page_types.h | 2 +
arch/x86/include/asm/paravirt.h | 8 +-
arch/x86/include/asm/paravirt_types.h | 8 +-
arch/x86/include/asm/pgalloc.h | 8 +-
arch/x86/include/asm/pgtable-2level_types.h | 1 -
arch/x86/include/asm/pgtable-3level_types.h | 2 -
arch/x86/include/asm/pgtable.h | 13 +-
arch/x86/include/asm/pgtable_64_types.h | 1 -
arch/x86/include/asm/pgtable_types.h | 4 +-
arch/x86/include/asm/seccomp.h | 21 +-
arch/x86/include/asm/seccomp_32.h | 11 -
arch/x86/include/asm/seccomp_64.h | 17 -
arch/x86/kernel/cpu/mtrr/if.c | 12 +-
arch/x86/kernel/kvm.c | 2 +-
arch/x86/kernel/machine_kexec_64.c | 1 +
arch/x86/kernel/paravirt.c | 6 +-
arch/x86/kernel/signal.c | 22 +-
arch/x86/mm/Makefile | 2 -
arch/x86/mm/ioremap.c | 23 +-
arch/x86/mm/mmap.c | 38 +-
arch/x86/mm/pgtable.c | 79 +-
arch/x86/xen/mmu.c | 14 +-
arch/xtensa/include/uapi/asm/mman.h | 1 +
block/genhd.c | 2 +-
drivers/base/memory.c | 21 +-
drivers/base/power/wakeup.c | 16 +-
drivers/block/paride/pg.c | 4 +-
drivers/block/zram/zram_drv.c | 860 +++++++++++------
drivers/block/zram/zram_drv.h | 7 +-
drivers/clk/bcm/clk-kona.c | 28 +-
drivers/clk/bcm/clk-kona.h | 1 -
drivers/cpuidle/governors/menu.c | 8 +-
drivers/gpu/drm/i915/intel_drv.h | 3 -
drivers/gpu/drm/i915/intel_panel.c | 1 +
drivers/hwmon/ina2xx.c | 17 +-
drivers/hwmon/lm85.c | 26 +-
drivers/hwmon/w83795.c | 8 +-
drivers/infiniband/hw/cxgb4/mem.c | 2 +-
drivers/media/dvb-frontends/cxd2820r_c.c | 2 +-
drivers/media/dvb-frontends/cxd2820r_core.c | 6 -
drivers/media/dvb-frontends/cxd2820r_priv.h | 2 -
drivers/media/dvb-frontends/cxd2820r_t.c | 2 +-
drivers/media/dvb-frontends/cxd2820r_t2.c | 2 +-
drivers/memstick/core/mspro_block.c | 3 +-
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 15 +-
drivers/parisc/ccio-dma.c | 54 +-
drivers/parisc/sba_iommu.c | 86 +-
drivers/rtc/Kconfig | 26 +-
drivers/rtc/Makefile | 2 +
drivers/rtc/class.c | 30 +-
drivers/rtc/hctosys.c | 6 +-
drivers/rtc/interface.c | 18 +-
drivers/rtc/rtc-ab-b5ze-s3.c | 2 +-
drivers/rtc/rtc-abx80x.c | 307 ++++++
drivers/rtc/rtc-cmos.c | 42 +-
drivers/rtc/rtc-da9052.c | 97 +-
drivers/rtc/rtc-digicolor.c | 227 +++++
drivers/rtc/rtc-ds1305.c | 6 +-
drivers/rtc/rtc-ds1374.c | 8 +-
drivers/rtc/rtc-ds1685.c | 9 +-
drivers/rtc/rtc-ds3232.c | 6 +-
drivers/rtc/rtc-efi-platform.c | 3 +
drivers/rtc/rtc-em3027.c | 11 +
drivers/rtc/rtc-hym8563.c | 12 +-
drivers/rtc/rtc-m41t80.c | 6 +-
drivers/rtc/rtc-max77686.c | 6 +-
drivers/rtc/rtc-max8997.c | 8 +-
drivers/rtc/rtc-mc13xxx.c | 2 +-
drivers/rtc/rtc-mrst.c | 16 +-
drivers/rtc/rtc-msm6242.c | 4 +-
drivers/rtc/rtc-omap.c | 82 +-
drivers/rtc/rtc-opal.c | 3 +-
drivers/rtc/rtc-pcf8563.c | 7 +-
drivers/rtc/rtc-s3c.c | 193 +---
drivers/rtc/rtc-s5m.c | 24 +-
drivers/rtc/rtc-stmp3xxx.c | 66 +-
drivers/rtc/rtc-tegra.c | 4 +-
drivers/rtc/rtc-twl.c | 9 +-
drivers/rtc/rtc-x1205.c | 4 +-
drivers/s390/cio/blacklist.c | 12 +-
drivers/s390/scsi/zfcp_erp.c | 4 +-
drivers/sbus/char/bbc_envctrl.c | 3 +-
drivers/sbus/char/envctrl.c | 7 +-
drivers/scsi/bfa/bfad.c | 22 +-
drivers/staging/lustre/lustre/Kconfig | 1 +
.../lustre/include/linux/lustre_patchless_compat.h | 4 +-
drivers/xen/tmem.c | 16 +-
firmware/ihex2fw.c | 1 +
fs/Kconfig.binfmt | 3 -
fs/adfs/dir_fplus.c | 1 +
fs/adfs/super.c | 20 +-
fs/affs/affs.h | 28 +-
fs/affs/amigaffs.c | 3 +-
fs/affs/file.c | 2 +-
fs/affs/inode.c | 32 +-
fs/affs/namei.c | 6 +-
fs/affs/super.c | 43 +-
fs/befs/befs.h | 22 +-
fs/befs/datastream.c | 4 +-
fs/befs/io.c | 2 +-
fs/befs/linuxvfs.c | 16 +-
fs/befs/super.c | 4 +-
fs/bfs/dir.c | 4 +-
fs/binfmt_elf.c | 22 +-
fs/binfmt_misc.c | 30 +-
fs/buffer.c | 4 +-
fs/cifs/connect.c | 6 +-
fs/cifs/file.c | 8 +-
fs/dax.c | 17 +
fs/exec.c | 6 +-
fs/ext2/ext2.h | 1 -
fs/ext2/file.c | 17 +-
fs/ext2/inode.c | 5 +-
fs/ext2/namei.c | 10 +-
fs/ext4/ext4.h | 1 -
fs/ext4/file.c | 19 +-
fs/ext4/fsync.c | 5 +-
fs/ext4/inode.c | 5 +-
fs/ext4/namei.c | 10 +-
fs/fat/cache.c | 81 +-
fs/fat/dir.c | 6 +-
fs/fat/fat.h | 11 +-
fs/fat/fatent.c | 3 -
fs/fat/file.c | 65 +-
fs/fat/inode.c | 88 +-
fs/fat/misc.c | 4 -
fs/fat/namei_msdos.c | 2 -
fs/fat/namei_vfat.c | 2 -
fs/file.c | 3 +-
fs/hfs/dir.c | 4 +-
fs/hfsplus/bfind.c | 4 +-
fs/hfsplus/catalog.c | 3 +-
fs/hfsplus/dir.c | 4 +-
fs/hfsplus/inode.c | 6 +
fs/hfsplus/ioctl.c | 12 +-
fs/hfsplus/xattr.c | 86 +-
fs/hfsplus/xattr.h | 22 +-
fs/hfsplus/xattr_security.c | 38 +-
fs/hfsplus/xattr_trusted.c | 37 +-
fs/hfsplus/xattr_user.c | 35 +-
fs/hugetlbfs/inode.c | 92 +-
fs/jbd2/journal.c | 11 +-
fs/jbd2/transaction.c | 20 +-
fs/jfs/jfs_metapage.c | 31 +-
fs/jfs/jfs_metapage.h | 1 -
fs/locks.c | 38 +
fs/mpage.c | 23 +-
fs/nfs/Kconfig | 2 +-
fs/nfs/write.c | 5 -
fs/nfsd/Kconfig | 1 +
fs/nilfs2/alloc.c | 5 +-
fs/nilfs2/bmap.c | 48 +-
fs/nilfs2/bmap.h | 13 +-
fs/nilfs2/btree.c | 63 ++
fs/nilfs2/cpfile.c | 58 +-
fs/nilfs2/direct.c | 17 +
fs/nilfs2/inode.c | 6 +-
fs/nilfs2/mdt.c | 54 ++
fs/nilfs2/mdt.h | 10 +-
fs/nilfs2/page.c | 24 +-
fs/nilfs2/segment.c | 17 +-
fs/nilfs2/super.c | 2 +-
fs/ocfs2/alloc.c | 154 ++-
fs/ocfs2/aops.c | 180 +++-
fs/ocfs2/buffer_head_io.c | 6 +
fs/ocfs2/cluster/heartbeat.c | 91 +-
fs/ocfs2/cluster/masklog.h | 5 +-
fs/ocfs2/dir.c | 85 +-
fs/ocfs2/dlm/dlmmaster.c | 23 +-
fs/ocfs2/dlm/dlmthread.c | 10 +
fs/ocfs2/dlmglue.c | 7 +-
fs/ocfs2/export.c | 2 +-
fs/ocfs2/extent_map.c | 22 +-
fs/ocfs2/inode.c | 44 +-
fs/ocfs2/journal.c | 2 +-
fs/ocfs2/localalloc.c | 5 +-
fs/ocfs2/move_extents.c | 8 +-
fs/ocfs2/namei.c | 15 +-
fs/ocfs2/ocfs2.h | 2 +
fs/ocfs2/quota_local.c | 3 +-
fs/ocfs2/refcounttree.c | 83 +-
fs/ocfs2/slot_map.c | 4 +-
fs/ocfs2/stack_o2cb.c | 2 +-
fs/ocfs2/stack_user.c | 8 +-
fs/ocfs2/suballoc.c | 92 +-
fs/ocfs2/super.c | 107 ++-
fs/ocfs2/super.h | 8 +-
fs/ocfs2/xattr.c | 59 +-
fs/posix_acl.c | 46 +-
fs/proc/array.c | 24 +-
fs/proc/base.c | 82 +-
fs/proc/fd.c | 27 +-
fs/splice.c | 3 +
fs/super.c | 2 +-
include/asm-generic/pgtable.h | 30 +
include/asm-generic/seccomp.h | 2 +
include/linux/a.out.h | 67 --
include/linux/bitmap.h | 16 +-
include/linux/bitops.h | 4 +-
include/linux/capability.h | 29 +
include/linux/cleancache.h | 13 +-
include/linux/cma.h | 12 +-
include/linux/compaction.h | 1 +
include/linux/crc64_ecma.h | 56 ++
include/linux/cred.h | 23 +-
include/linux/dmapool.h | 2 +
include/linux/elf-randomize.h | 22 +
include/linux/fs.h | 10 +-
include/linux/gfp.h | 16 +-
include/linux/huge_mm.h | 4 +
include/linux/hugetlb.h | 20 +-
include/linux/io.h | 8 +
include/linux/ioport.h | 8 -
include/linux/kasan.h | 2 +
include/linux/kconfig.h | 15 +-
include/linux/kernel.h | 12 +
include/linux/kexec.h | 2 +
include/linux/ksm.h | 17 -
include/linux/memblock.h | 8 +
include/linux/memory_hotplug.h | 6 +
include/linux/mempool.h | 5 +-
include/linux/mfd/samsung/rtc.h | 2 +
include/linux/migrate.h | 5 -
include/linux/mm.h | 144 +--
include/linux/mm_types.h | 4 +-
include/linux/mmzone.h | 15 +-
include/linux/nmi.h | 21 +-
include/linux/oom.h | 3 +-
include/linux/page-flags.h | 326 +++++--
include/linux/pagemap.h | 25 +-
include/linux/poison.h | 4 +
include/linux/printk.h | 5 +
include/linux/reboot.h | 3 +-
include/linux/rmap.h | 17 +-
include/linux/rtc.h | 4 +
include/linux/slab.h | 12 +-
include/linux/string.h | 1 +
include/linux/string_helpers.h | 8 +-
include/linux/swap.h | 1 +
include/linux/sysctl.h | 3 +
include/linux/types.h | 6 -
include/linux/uidgid.h | 12 +
include/linux/util_macros.h | 40 +
include/linux/vm_event_item.h | 1 +
include/linux/zsmalloc.h | 1 +
include/trace/events/cma.h | 66 ++
include/trace/events/xen.h | 2 +-
include/uapi/asm-generic/mman-common.h | 1 +
init/Kconfig | 25 +-
init/main.c | 6 +-
ipc/msg.c | 37 +-
ipc/sem.c | 26 +-
ipc/shm.c | 42 +-
ipc/util.c | 6 +-
kernel/Makefile | 4 +-
kernel/capability.c | 35 +-
kernel/cgroup.c | 6 +-
kernel/cpuset.c | 18 +-
kernel/cred.c | 3 +
kernel/fork.c | 133 ++-
kernel/gcov/base.c | 5 +-
kernel/groups.c | 3 -
kernel/hung_task.c | 4 +-
kernel/pid.c | 15 +-
kernel/ptrace.c | 39 +-
kernel/reboot.c | 53 +-
kernel/resource.c | 32 -
kernel/sched/fair.c | 4 +-
kernel/signal.c | 14 +-
kernel/sys.c | 2 +
kernel/sys_ni.c | 14 +
kernel/sysctl.c | 60 +-
kernel/trace/trace_stack.c | 4 +-
kernel/watchdog.c | 289 ++++--
lib/Kconfig | 7 +
lib/Kconfig.debug | 12 +
lib/Makefile | 3 +-
lib/bitmap.c | 30 -
lib/cpumask.c | 9 +-
lib/crc64_ecma.c | 341 +++++++
lib/dma-debug.c | 2 +-
lib/find_bit.c | 193 ++++
lib/find_last_bit.c | 36 +-
lib/find_next_bit.c | 285 ------
lib/ioremap.c | 53 +
lib/lru_cache.c | 9 +-
lib/string_helpers.c | 193 ++--
lib/test-string_helpers.c | 40 +-
lib/vsprintf.c | 372 ++++---
mm/Kconfig | 6 +
mm/Makefile | 2 +
mm/cleancache.c | 276 ++----
mm/cma.c | 52 +-
mm/cma.h | 24 +
mm/cma_debug.c | 206 ++++
mm/compaction.c | 30 +-
mm/filemap.c | 30 +-
mm/gup.c | 128 ++-
mm/huge_memory.c | 148 ++-
mm/hugetlb.c | 243 +++--
mm/internal.h | 8 +-
mm/kasan/kasan.c | 13 +
mm/ksm.c | 12 +-
mm/madvise.c | 176 ++++
mm/memblock.c | 22 +-
mm/memcontrol.c | 241 +++--
mm/memory-failure.c | 124 ++-
mm/memory.c | 421 ++++----
mm/memory_hotplug.c | 48 +-
mm/mempolicy.c | 6 +-
mm/mempool.c | 126 ++-
{arch/x86/mm => mm}/memtest.c | 16 +-
mm/migrate.c | 42 +-
mm/mlock.c | 131 +--
mm/mmap.c | 25 +-
mm/mremap.c | 25 +-
mm/oom_kill.c | 9 +-
mm/page-writeback.c | 22 +-
mm/page_alloc.c | 260 +++--
mm/page_isolation.c | 7 +-
mm/rmap.c | 52 +-
mm/shmem.c | 4 +-
mm/slab.c | 35 +-
mm/slab.h | 9 +
mm/slab_common.c | 23 +
mm/slob.c | 13 +
mm/slub.c | 48 +-
mm/swap.c | 64 +-
mm/swap_state.c | 6 +-
mm/swapfile.c | 2 +-
mm/truncate.c | 39 +-
mm/util.c | 73 +-
mm/vmalloc.c | 103 +-
mm/vmscan.c | 120 ++-
mm/vmstat.c | 1 +
mm/zsmalloc.c | 1011 ++++++++++++++------
mm/zswap.c | 4 +-
net/openvswitch/flow.c | 4 +-
net/sunrpc/Kconfig | 2 +
net/sunrpc/cache.c | 8 +-
scripts/checkpatch.pl | 136 ++-
scripts/spelling.txt | 1 +
security/Kconfig | 1 +
sound/soc/codecs/pcm512x.c | 3 +-
.../selftests/powerpc/mm/hugetlb_vs_thp_test.c | 8 +-
tools/testing/selftests/vm/hugetlbfstest.c | 4 +-
tools/testing/selftests/vm/map_hugetlb.c | 6 +-
448 files changed, 10201 insertions(+), 5559 deletions(-)
create mode 100644 Documentation/ABI/obsolete/sysfs-block-zram
create mode 100644 Documentation/ABI/testing/sysfs-class-zram
create mode 100644 Documentation/cma/debugfs.txt
create mode 100644 Documentation/devicetree/bindings/rtc/abracon,abx80x.txt
create mode 100644 Documentation/devicetree/bindings/rtc/digicolor-rtc.txt
create mode 100644 Documentation/vm/zsmalloc.txt
delete mode 100644 arch/arm/include/asm/seccomp.h
delete mode 100644 arch/parisc/include/asm/seccomp.h
create mode 100644 arch/powerpc/include/asm/seccomp.h
delete mode 100644 arch/powerpc/include/uapi/asm/seccomp.h
delete mode 100644 arch/x86/include/asm/seccomp_32.h
delete mode 100644 arch/x86/include/asm/seccomp_64.h
create mode 100644 drivers/rtc/rtc-abx80x.c
create mode 100644 drivers/rtc/rtc-digicolor.c
create mode 100644 include/linux/crc64_ecma.h
create mode 100644 include/linux/elf-randomize.h
create mode 100644 include/linux/util_macros.h
create mode 100644 include/trace/events/cma.h
create mode 100644 lib/crc64_ecma.c
create mode 100644 lib/find_bit.c
delete mode 100644 lib/find_next_bit.c
create mode 100644 mm/cma.h
create mode 100644 mm/cma_debug.c
rename {arch/x86/mm => mm}/memtest.c (84%)
$ git clone -s -l -n -q . ../rebase-tmp
$ cd ../rebase-tmp
$ git checkout -b akpm remotes/origin/akpm/master
Switched to a new branch 'akpm'
$ git rebase --onto master remotes/origin/akpm/master-base
First, rewinding head to replay your work on top of it...
Applying: arch/unicore32/kernel/fpu-ucf64.c: remove unnecessary KERN_ERR
Applying: lib/Kconfig: fix up HAVE_ARCH_BITREVERSE help text
Applying: mips: ip32: add platform data hooks to use DS1685 driver
Applying: oprofile: reduce mmap_sem hold for mm->exe_file
Applying: powerpc/oprofile: reduce mmap_sem hold for exe_file
Applying: oprofile-reduce-mmap_sem-hold-for-mm-exe_file-fix
Applying: tomoyo: reduce mmap_sem hold for mm->exe_file
Applying: tomoyo-reduce-mmap_sem-hold-for-mm-exe_file-checkpatch-fixes
Applying: prctl: avoid using mmap_sem for exe_file serialization
Applying: MAINTAINERS: add Mediatek SoC mailing list
Applying: .gitignore: ignore *.tar
Applying: drivers/rtc/rtc-s5m.c: allow usage on device type different than main MFD type
Applying: rtc-s5m-allow-usage-on-device-type-different-than-main-mfd-type-v2
Applying: Documentation/spi/spidev_test.c: fix warning
Applying: drivers/rtc/rtc-at91rm9200.c: make IO endian agnostic
Applying: mm, x86: document return values of mapping funcs
Applying: mtrr, x86: fix MTRR lookup to handle inclusive entry
Applying: mtrr, x86: remove a wrong address check in __mtrr_type_lookup()
Applying: mtrr, x86: fix MTRR state checks in mtrr_type_lookup()
Applying: mtrr, x86: define MTRR_TYPE_INVALID for mtrr_type_lookup()
Applying: mtrr, x86: clean up mtrr_type_lookup()
Applying: mtrr, mm, x86: enhance MTRR checks for KVA huge page mapping
Applying: drivers/w1/w1_int.c: call put_device if device_register fails
Applying: mm: add strictlimit knob
$ cd ../next
$ git fetch -f ../rebase-tmp akpm:akpm/master
From ../rebase-tmp
+ fcbcd9187962...cb6b3207b28c akpm -> akpm/master (forced update)
$ rm -rf ../rebase-tmp
Merging akpm/master (cb6b3207b28c mm: add strictlimit knob)
$ git merge --no-ff akpm/master
Removing arch/mips/include/asm/mach-ip32/mc146818rtc.h
Merge made by the 'recursive' strategy.
.gitignore | 1 +
Documentation/ABI/testing/sysfs-class-bdi | 8 ++
Documentation/spi/spidev_test.c | 4 +-
MAINTAINERS | 1 +
arch/mips/configs/ip32_defconfig | 3 +-
arch/mips/include/asm/mach-ip32/mc146818rtc.h | 36 -----
arch/mips/sgi-ip32/ip32-platform.c | 46 +++++-
arch/mips/sgi-ip32/ip32-reset.c | 131 ++++++------------
arch/powerpc/oprofile/cell/spu_task_sync.c | 13 +-
arch/unicore32/kernel/fpu-ucf64.c | 4 +-
arch/x86/Kconfig | 2 +-
arch/x86/include/asm/mtrr.h | 7 +-
arch/x86/include/uapi/asm/mtrr.h | 12 +-
arch/x86/kernel/cpu/mtrr/generic.c | 192 +++++++++++++++++---------
arch/x86/mm/pat.c | 4 +-
arch/x86/mm/pgtable.c | 53 +++++--
drivers/oprofile/buffer_sync.c | 30 ++--
drivers/rtc/rtc-at91rm9200.c | 4 +-
drivers/rtc/rtc-s5m.c | 10 +-
drivers/w1/w1_int.c | 3 +-
fs/exec.c | 6 +
kernel/fork.c | 20 ++-
kernel/sys.c | 47 ++++---
lib/Kconfig | 5 +-
mm/backing-dev.c | 35 +++++
security/tomoyo/util.c | 13 +-
26 files changed, 401 insertions(+), 289 deletions(-)
delete mode 100644 arch/mips/include/asm/mach-ip32/mc146818rtc.h