diff options
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 12960 |
1 files changed, 12960 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..a028768b72de --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,12960 @@ +$ date -R +Fri, 10 Feb 2017 09:31:24 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at be11f436a80b Merge tag 'pci-v4.10-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci +Merging origin/master (55aac6ef53e1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending) +$ git merge origin/master +Updating be11f436a80b..55aac6ef53e1 +Fast-forward + arch/arm/kernel/ptrace.c | 2 +- + arch/arm/mm/fault.c | 4 +- + arch/arm/mm/fault.h | 4 ++ + arch/x86/kernel/apic/io_apic.c | 2 - + drivers/char/hw_random/core.c | 3 - + drivers/input/misc/uinput.c | 20 ++++-- + drivers/input/rmi4/Kconfig | 8 ++- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 1 + + drivers/staging/lustre/lustre/llite/llite_mmap.c | 4 +- + drivers/target/target_core_device.c | 10 ++- + drivers/target/target_core_sbc.c | 8 ++- + drivers/target/target_core_transport.c | 86 ++++++++++++++++-------- + drivers/target/target_core_xcopy.c | 2 +- + drivers/vfio/vfio_iommu_spapr_tce.c | 22 ++++++ + fs/pstore/ram.c | 2 +- + include/linux/buffer_head.h | 4 +- + include/linux/cpumask.h | 8 +-- + include/target/target_core_base.h | 1 + + kernel/ucount.c | 3 +- + mm/slub.c | 4 ++ + 20 files changed, 138 insertions(+), 60 deletions(-) +Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (c7858bf16c0b asm-prototypes: Clear any CPP defines before declaring the functions) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (8ba605b607b7 ARC: [plat-*] ARC_HAS_COH_CACHES no longer relevant) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + .../interrupt-controller/snps,archs-idu-intc.txt | 24 +++-------- + arch/arc/Kconfig | 17 -------- + arch/arc/boot/dts/axc003_idu.dtsi | 23 ++--------- + arch/arc/boot/dts/haps_hs_idu.dts | 11 +---- + arch/arc/boot/dts/nsim_hs_idu.dts | 15 +------ + arch/arc/boot/dts/nsimosci_hs_idu.dts | 21 ++-------- + arch/arc/boot/dts/vdk_axc003_idu.dtsi | 13 ++---- + arch/arc/boot/dts/vdk_axs10x_mb.dtsi | 26 ++++++++++++ + arch/arc/configs/vdk_hs38_smp_defconfig | 9 +++- + arch/arc/include/asm/arcregs.h | 3 ++ + arch/arc/include/asm/irq.h | 10 ++++- + arch/arc/kernel/entry-arcv2.S | 7 +++- + arch/arc/kernel/intc-arcv2.c | 42 +++++++++++++------ + arch/arc/kernel/intc-compact.c | 1 + + arch/arc/kernel/mcip.c | 48 +++++++++------------- + arch/arc/plat-eznps/Kconfig | 1 - + arch/arc/plat-sim/Kconfig | 1 - + include/soc/arc/mcip.h | 17 ++++++++ + 18 files changed, 138 insertions(+), 151 deletions(-) +Merging arm-current/fixes (228dbbfb5d77 ARM: 8643/3: arm/ptrace: Preserve previous registers for short regset write) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list()) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging powerpc-fixes/fixes (f83e6862047e powerpc/powernv: Properly set "host-ipi" on IPIs) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/reg.h | 3 ++- + arch/powerpc/include/asm/xics.h | 1 + + arch/powerpc/mm/fault.c | 21 +++++---------------- + arch/powerpc/mm/tlb-radix.c | 6 +----- + arch/powerpc/platforms/powernv/smp.c | 12 ++++++++++-- + arch/powerpc/sysdev/xics/icp-opal.c | 35 +++++++++++++++++++++++++++++++++-- + 6 files changed, 52 insertions(+), 26 deletions(-) +Merging sparc/master (f9a42e0d58cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) +$ git merge sparc/master +Already up-to-date. +Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files) +$ git merge fscrypt-current/for-stable +Already up-to-date. +Merging net/master (bb1a619735b4 net: phy: Initialize mdio clock at probe function) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 108 ++++++++++++++++++--- + drivers/net/ethernet/cavium/thunder/thunder_bgx.h | 5 + + drivers/net/loopback.c | 1 + + drivers/net/phy/mdio-bcm-iproc.c | 6 +- + drivers/net/phy/phy_device.c | 28 ++++-- + drivers/net/usb/sierra_net.c | 111 ++++++++++++++-------- + drivers/net/xen-netfront.c | 43 +++++---- + include/linux/netdevice.h | 4 + + include/net/lwtunnel.h | 5 +- + net/dsa/dsa2.c | 1 + + net/ethernet/eth.c | 1 + + net/ipv4/igmp.c | 1 + + net/ipv4/ping.c | 2 + + net/ipv6/addrconf.c | 6 ++ + net/ipv6/mcast.c | 1 + + net/ipv6/sit.c | 1 + + net/kcm/kcmsock.c | 40 ++++---- + net/packet/af_packet.c | 7 +- + 18 files changed, 264 insertions(+), 107 deletions(-) +Merging ipsec/master (4e5da369df64 Documentation/networking: fix typo in mpls-sysctl) +$ git merge ipsec/master +Already up-to-date. +Merging netfilter/master (f95d7a46bc57 netfilter: ctnetlink: Fix regression in CTA_HELP processing) +$ git merge netfilter/master +Merge made by the 'recursive' strategy. + include/uapi/linux/netfilter/nf_conntrack_common.h | 4 ++ + net/netfilter/nf_conntrack_helper.c | 39 +++++++++++++------- + net/netfilter/nf_conntrack_netlink.c | 43 +++++++++++++++++++--- + 3 files changed, 68 insertions(+), 18 deletions(-) +Merging ipvs/master (045169816b31 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge ipvs/master +Already up-to-date. +Merging wireless-drivers/master (52f5631a4c05 rtlwifi: rtl8192ce: Fix loading of incorrect firmware) +$ git merge wireless-drivers/master +Already up-to-date. +Merging mac80211/master (fd551bac4795 nl80211: Fix mesh HT operation check) +$ git merge mac80211/master +Already up-to-date. +Merging sound-current/for-linus (af677166cf63 ALSA: hda - adding a new NV HDMI/DP codec ID in the driver) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/core/seq/seq_memory.c | 9 +-------- + sound/core/seq/seq_queue.c | 33 ++++++++++++++++++++------------- + sound/pci/hda/patch_hdmi.c | 1 + + sound/usb/line6/driver.c | 3 ++- + 4 files changed, 24 insertions(+), 22 deletions(-) +Merging pci-current/for-linus (d98e0929071e Revert "PCI: pciehp: Add runtime PM support for PCIe hotplug ports") +$ git merge pci-current/for-linus +Already up-to-date. +Merging driver-core.current/driver-core-linus (49def1853334 Linux 4.10-rc4) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (49def1853334 Linux 4.10-rc4) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (d5adbfcd5f7b Linux 4.10-rc7) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (efe357f4633a usb: dwc2: host: fix Wmaybe-uninitialized warning) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (d07830db1bdb USB: serial: pl2303: add ATEN device ID) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Merge made by the 'recursive' strategy. +Merging phy/fixes (7ce7d89f4883 Linux 4.10-rc1) +$ git merge phy/fixes +Already up-to-date. +Merging staging.current/staging-linus (d5adbfcd5f7b Linux 4.10-rc7) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (d5adbfcd5f7b Linux 4.10-rc7) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (413d37326700 Input: synaptics-rmi4 - select 'SERIO' when needed) +$ git merge input-current/for-linus +Already up-to-date. +Merging crypto-current/master (7c2cf1c4615c crypto: chcr - Fix key length for RFC4106) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (da095587e6be Revert "ide: Fix interface autodetection in legacy IDE driver (trial #2)") +$ git merge ide/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging vfio-fixes/for-linus (930a42ded3fe vfio/spapr_tce: Set window when adding additional groups to container) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (7738789fba09 selftests: x86/pkeys: fix spelling mistake: "itertation" -> "iteration") +$ git merge kselftest-fixes/fixes +Already up-to-date. +Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) +$ git merge backlight-fixes/for-backlight-fixes +Already up-to-date. +Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct) +$ git merge ftrace-fixes/for-next-urgent +Already up-to-date. +Merging mfd-fixes/for-mfd-fixes (1a41741fd60b mfd: wm8994-core: Don't use managed regulator bulk get API) +$ git merge mfd-fixes/for-mfd-fixes +Already up-to-date. +Merging v4l-dvb-fixes/fixes (f9f96fc10c09 [media] cec: fix wrong last_la determination) +$ git merge v4l-dvb-fixes/fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (6e7eb1783be7 drm/i915: Always convert incoming exec offsets to non-canonical) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_drv.c | 4 +++- + drivers/gpu/drm/i915/i915_gem.c | 14 +++++++++++--- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 12 ++++++------ + drivers/gpu/drm/i915/i915_gem_internal.c | 12 ++++++++++-- + drivers/gpu/drm/i915/intel_display.c | 4 ++-- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 3 ++- + 6 files changed, 34 insertions(+), 15 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (49d29a077af8 drm: vc4: adapt to new behaviour of drm_crtc.c) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/vc4/vc4_plane.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging kbuild/for-next (fde42bfcd232 genksyms: Regenerate parser) +$ git merge kbuild/for-next +Merge made by the 'recursive' strategy. + scripts/genksyms/parse.tab.c_shipped | 474 +++++++++++++++++------------------ + scripts/genksyms/parse.y | 2 - + 2 files changed, 234 insertions(+), 242 deletions(-) +Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo) +$ git merge asm-generic/master +Resolved 'include/asm-generic/percpu.h' using previous resolution. +Auto-merging include/asm-generic/percpu.h +CONFLICT (content): Merge conflict in include/asm-generic/percpu.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0186a18e4701] Merge remote-tracking branch 'asm-generic/master' +$ git diff -M --stat --summary HEAD^.. + include/asm-generic/page.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging arc/for-next (d5adbfcd5f7b Linux 4.10-rc7) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (1ba318e23204 Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Auto-merging lib/Kconfig.debug +Auto-merging include/linux/mm.h +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 1 + + arch/arm/Kconfig-nommu | 3 +- + arch/arm/common/mcpm_entry.c | 12 ++--- + arch/arm/include/asm/memory.h | 24 +++++++++- + arch/arm/kernel/setup.c | 10 ++++- + arch/arm/kernel/smp.c | 2 +- + arch/arm/mach-alpine/platsmp.c | 2 +- + arch/arm/mach-axxia/platsmp.c | 2 +- + arch/arm/mach-bcm/bcm63xx_smp.c | 2 +- + arch/arm/mach-bcm/platsmp-brcmstb.c | 2 +- + arch/arm/mach-bcm/platsmp.c | 4 +- + arch/arm/mach-berlin/platsmp.c | 5 ++- + arch/arm/mach-exynos/firmware.c | 4 +- + arch/arm/mach-exynos/mcpm-exynos.c | 2 +- + arch/arm/mach-exynos/platsmp.c | 4 +- + arch/arm/mach-exynos/pm.c | 6 +-- + arch/arm/mach-exynos/suspend.c | 6 +-- + arch/arm/mach-hisi/platmcpm.c | 2 +- + arch/arm/mach-hisi/platsmp.c | 6 +-- + arch/arm/mach-imx/platsmp.c | 2 +- + arch/arm/mach-imx/pm-imx6.c | 2 +- + arch/arm/mach-imx/src.c | 2 +- + arch/arm/mach-mediatek/platsmp.c | 2 +- + arch/arm/mach-mvebu/pm.c | 2 +- + arch/arm/mach-mvebu/pmsu.c | 2 +- + arch/arm/mach-mvebu/system-controller.c | 2 +- + arch/arm/mach-omap2/control.c | 8 ++-- + arch/arm/mach-omap2/omap-mpuss-lowpower.c | 12 ++--- + arch/arm/mach-omap2/omap-smp.c | 4 +- + arch/arm/mach-prima2/platsmp.c | 2 +- + arch/arm/mach-prima2/pm.c | 2 +- + arch/arm/mach-pxa/palmz72.c | 2 +- + arch/arm/mach-pxa/pxa25x.c | 2 +- + arch/arm/mach-pxa/pxa27x.c | 2 +- + arch/arm/mach-pxa/pxa3xx.c | 2 +- + arch/arm/mach-realview/platsmp-dt.c | 2 +- + arch/arm/mach-rockchip/platsmp.c | 4 +- + arch/arm/mach-rockchip/pm.c | 2 +- + arch/arm/mach-s3c24xx/mach-jive.c | 2 +- + arch/arm/mach-s3c24xx/pm-s3c2410.c | 2 +- + arch/arm/mach-s3c24xx/pm-s3c2416.c | 2 +- + arch/arm/mach-s3c64xx/pm.c | 2 +- + arch/arm/mach-s5pv210/pm.c | 2 +- + arch/arm/mach-sa1100/pm.c | 2 +- + arch/arm/mach-shmobile/platsmp-apmu.c | 6 +-- + arch/arm/mach-shmobile/platsmp-scu.c | 4 +- + arch/arm/mach-socfpga/platsmp.c | 4 +- + arch/arm/mach-spear/platsmp.c | 2 +- + arch/arm/mach-sti/platsmp.c | 2 +- + arch/arm/mach-sunxi/platsmp.c | 4 +- + arch/arm/mach-tango/platsmp.c | 2 +- + arch/arm/mach-tango/pm.c | 2 +- + arch/arm/mach-tegra/reset.c | 4 +- + arch/arm/mach-ux500/platsmp.c | 2 +- + arch/arm/mach-vexpress/dcscb.c | 2 +- + arch/arm/mach-vexpress/platsmp.c | 2 +- + arch/arm/mach-vexpress/tc2_pm.c | 4 +- + arch/arm/mach-zx/platsmp.c | 4 +- + arch/arm/mach-zynq/platsmp.c | 2 +- + arch/arm/mm/Makefile | 1 + + arch/arm/mm/dma-mapping.c | 3 ++ + arch/arm/mm/dump.c | 5 ++- + arch/arm/mm/flush.c | 6 +++ + arch/arm/mm/init.c | 11 ++--- + arch/arm/mm/mmu.c | 75 ++++++++++++------------------- + arch/arm/mm/nommu.c | 8 ++-- + arch/arm/mm/physaddr.c | 57 +++++++++++++++++++++++ + arch/x86/Kconfig | 1 + + drivers/firmware/psci.c | 2 +- + drivers/mtd/devices/lart.c | 24 +++++----- + include/linux/mm.h | 4 ++ + kernel/kexec_core.c | 2 +- + lib/Kconfig.debug | 5 ++- + mm/cma.c | 15 +++---- + mm/kasan/kasan_init.c | 15 ++++--- + mm/usercopy.c | 4 +- + 76 files changed, 265 insertions(+), 188 deletions(-) + create mode 100644 arch/arm/mm/physaddr.c +Merging arm-perf/for-next/perf (0c744ea4f77d Linux 4.10-rc2) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (3461b12aebf5 Merge branches 'next/arm64' and 'next/dt64' into for-next) +$ git merge arm-soc/for-next +Resolved 'arch/arm/mach-ux500/platsmp.c' using previous resolution. +Removing arch/arm/mach-ux500/ste-dma40-db8500.h +Auto-merging arch/arm/mach-ux500/platsmp.c +CONFLICT (content): Merge conflict in arch/arm/mach-ux500/platsmp.c +Removing arch/arm/mach-ux500/board-mop500.h +Removing arch/arm/mach-ux500/board-mop500-audio.c +Auto-merging arch/arm/mach-shmobile/platsmp-apmu.c +Auto-merging arch/arm/mach-s3c64xx/pm.c +Auto-merging arch/arm/mach-exynos/suspend.c +Auto-merging arch/arm/mach-exynos/mcpm-exynos.c +Removing arch/arm/boot/dts/exynos4x12.dtsi +Auto-merging arch/arm/boot/dts/exynos4412-pinctrl.dtsi +Removing arch/arm/boot/dts/exynos4212.dtsi +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8dd761bdadad] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/arm/sunxi/README | 8 + + Documentation/devicetree/bindings/arm/axentia.txt | 19 + + Documentation/devicetree/bindings/arm/cpus.txt | 2 + + Documentation/devicetree/bindings/arm/davinci.txt | 4 + + Documentation/devicetree/bindings/arm/fsl.txt | 20 +- + .../bindings/arm/hisilicon/hisilicon.txt | 4 + + .../bindings/arm/marvell/98dx3236-resume-ctrl.txt | 16 + + .../devicetree/bindings/arm/marvell/98dx3236.txt | 23 + + Documentation/devicetree/bindings/arm/shmobile.txt | 2 +- + Documentation/devicetree/bindings/arm/sunxi.txt | 1 + + .../devicetree/bindings/clock/qoriq-clock.txt | 1 + + .../devicetree/bindings/clock/st,stm32-rcc.txt | 17 + + .../bindings/display/exynos/exynos7-decon.txt | 2 +- + .../devicetree/bindings/eeprom/eeprom.txt | 2 + + .../devicetree/bindings/gpu/arm,mali-utgard.txt | 81 ++ + .../bindings/interrupt-controller/arm,gic.txt | 2 +- + .../devicetree/bindings/net/marvell,prestera.txt | 50 + + .../devicetree/bindings/power/pd-samsung.txt | 5 + + .../bindings/power/supply/axp20x_usb_power.txt | 5 + + .../bindings/reset/hisilicon,hi3660-reset.txt | 43 + + .../devicetree/bindings/reset/ti-syscon-reset.txt | 8 +- + .../devicetree/bindings/reset/uniphier-reset.txt | 47 +- + .../devicetree/bindings/reset/zte,zx2967-reset.txt | 20 + + .../devicetree/bindings/soc/rockchip/grf.txt | 4 + + .../bindings/soc/rockchip/power_domain.txt | 3 + + .../devicetree/bindings/soc/zte/pd-2967xx.txt | 19 + + .../devicetree/bindings/vendor-prefixes.txt | 5 + + MAINTAINERS | 53 +- + arch/arm/arm-soc-for-next-contents.txt | 253 ++++ + arch/arm/boot/dts/Makefile | 31 +- + arch/arm/boot/dts/alpine.dtsi | 2 +- + arch/arm/boot/dts/am335x-bone-common.dtsi | 2 + + arch/arm/boot/dts/am335x-boneblack-common.dtsi | 163 +++ + arch/arm/boot/dts/am335x-boneblack-wireless.dts | 109 ++ + arch/arm/boot/dts/am335x-boneblack.dts | 155 +-- + arch/arm/boot/dts/am335x-bonegreen-common.dtsi | 44 + + arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 126 ++ + arch/arm/boot/dts/am335x-bonegreen.dts | 38 +- + arch/arm/boot/dts/am335x-chilisom.dtsi | 8 + + arch/arm/boot/dts/am335x-evm.dts | 4 + + arch/arm/boot/dts/am335x-evmsk.dts | 4 + + arch/arm/boot/dts/am335x-icev2.dts | 4 + + arch/arm/boot/dts/am335x-nano.dts | 31 +- + arch/arm/boot/dts/am335x-phycore-som.dtsi | 72 +- + arch/arm/boot/dts/am335x-sl50.dts | 70 +- + arch/arm/boot/dts/am335x-wega.dtsi | 9 +- + arch/arm/boot/dts/am33xx.dtsi | 3 +- + arch/arm/boot/dts/am437x-gp-evm.dts | 4 + + arch/arm/boot/dts/am437x-idk-evm.dts | 4 + + arch/arm/boot/dts/am437x-sk-evm.dts | 4 + + arch/arm/boot/dts/am43x-epos-evm.dts | 4 + + arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 18 +- + arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts | 5 + + arch/arm/boot/dts/am57xx-beagle-x15.dts | 5 + + arch/arm/boot/dts/am57xx-idk-common.dtsi | 4 + + arch/arm/boot/dts/armada-370-db.dts | 10 +- + arch/arm/boot/dts/armada-370-dlink-dns327l.dts | 10 +- + arch/arm/boot/dts/armada-370-mirabox.dts | 10 +- + arch/arm/boot/dts/armada-370-netgear-rn102.dts | 10 +- + arch/arm/boot/dts/armada-370-netgear-rn104.dts | 10 +- + arch/arm/boot/dts/armada-370-rd.dts | 54 +- + arch/arm/boot/dts/armada-370-synology-ds213j.dts | 10 +- + arch/arm/boot/dts/armada-370-xp.dtsi | 10 +- + arch/arm/boot/dts/armada-370.dtsi | 10 +- + arch/arm/boot/dts/armada-375-db.dts | 10 +- + arch/arm/boot/dts/armada-375.dtsi | 10 +- + arch/arm/boot/dts/armada-380.dtsi | 10 +- + arch/arm/boot/dts/armada-385-linksys.dtsi | 52 +- + arch/arm/boot/dts/armada-385-turris-omnia.dts | 58 +- + arch/arm/boot/dts/armada-385.dtsi | 10 +- + arch/arm/boot/dts/armada-388-clearfog-base.dts | 109 ++ + arch/arm/boot/dts/armada-388-clearfog-pro.dts | 55 + + arch/arm/boot/dts/armada-388-clearfog.dts | 435 +++---- + arch/arm/boot/dts/armada-388-clearfog.dtsi | 307 +++++ + arch/arm/boot/dts/armada-388-db.dts | 10 +- + arch/arm/boot/dts/armada-388-rd.dts | 10 +- + .../arm/boot/dts/armada-38x-solidrun-microsom.dtsi | 130 ++- + arch/arm/boot/dts/armada-38x.dtsi | 10 +- + arch/arm/boot/dts/armada-390-db.dts | 10 +- + arch/arm/boot/dts/armada-390.dtsi | 10 +- + arch/arm/boot/dts/armada-395.dtsi | 10 +- + arch/arm/boot/dts/armada-398-db.dts | 10 +- + arch/arm/boot/dts/armada-398.dtsi | 10 +- + arch/arm/boot/dts/armada-39x.dtsi | 10 +- + arch/arm/boot/dts/armada-xp-98dx3236.dtsi | 254 +++++ + arch/arm/boot/dts/armada-xp-98dx3336.dtsi | 76 ++ + arch/arm/boot/dts/armada-xp-98dx4251.dtsi | 90 ++ + arch/arm/boot/dts/armada-xp-axpwifiap.dts | 10 +- + arch/arm/boot/dts/armada-xp-db-dxbc2.dts | 151 +++ + arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts | 142 +++ + arch/arm/boot/dts/armada-xp-db.dts | 10 +- + arch/arm/boot/dts/armada-xp-gp.dts | 10 +- + arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 10 +- + arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 53 + + arch/arm/boot/dts/armada-xp-matrix.dts | 10 +- + arch/arm/boot/dts/armada-xp-mv78230.dtsi | 10 +- + arch/arm/boot/dts/armada-xp-mv78260.dtsi | 10 +- + arch/arm/boot/dts/armada-xp-mv78460.dtsi | 10 +- + arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 10 +- + arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 10 +- + arch/arm/boot/dts/armada-xp-synology-ds414.dts | 10 +- + arch/arm/boot/dts/armada-xp.dtsi | 10 +- + arch/arm/boot/dts/aspeed-ast2500-evb.dts | 14 + + arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 24 +- + arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 45 + + arch/arm/boot/dts/aspeed-g4.dtsi | 776 +++++++++++++ + arch/arm/boot/dts/aspeed-g5.dtsi | 879 ++++++++++++++ + arch/arm/boot/dts/at91-linea.dtsi | 49 + + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 4 + + arch/arm/boot/dts/at91-sama5d4_xplained.dts | 8 + + arch/arm/boot/dts/at91-tse850-3.dts | 274 +++++ + arch/arm/boot/dts/axm55xx.dtsi | 2 +- + arch/arm/boot/dts/axp223.dtsi | 58 + + arch/arm/boot/dts/bcm-nsp.dtsi | 64 +- + arch/arm/boot/dts/bcm2835-rpi.dtsi | 5 + + arch/arm/boot/dts/bcm283x.dtsi | 8 + + arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 3 +- + arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 3 +- + arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 7 +- + arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 4 - + arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 4 - + arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 7 +- + arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 3 +- + arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 7 +- + arch/arm/boot/dts/bcm4708.dtsi | 4 + + arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 3 +- + arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 7 +- + arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 3 +- + arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 60 + + arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 107 ++ + arch/arm/boot/dts/bcm47081.dtsi | 4 + + arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 3 +- + arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 3 +- + arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 11 +- + arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 51 +- + arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 4 - + arch/arm/boot/dts/bcm4709.dtsi | 1 + + arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 7 +- + arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 13 +- + arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 7 +- + arch/arm/boot/dts/bcm47094.dtsi | 1 + + arch/arm/boot/dts/bcm5301x.dtsi | 41 +- + arch/arm/boot/dts/bcm53573.dtsi | 22 + + arch/arm/boot/dts/bcm94708.dts | 4 - + arch/arm/boot/dts/bcm94709.dts | 4 - + arch/arm/boot/dts/bcm953012er.dts | 4 - + arch/arm/boot/dts/bcm953012k.dts | 1 - + arch/arm/boot/dts/bcm958522er.dts | 35 +- + arch/arm/boot/dts/bcm958525er.dts | 35 +- + arch/arm/boot/dts/bcm958525xmc.dts | 68 +- + arch/arm/boot/dts/bcm958622hr.dts | 42 + + arch/arm/boot/dts/bcm958623hr.dts | 58 +- + arch/arm/boot/dts/bcm958625hr.dts | 72 +- + arch/arm/boot/dts/bcm958625k.dts | 151 ++- + arch/arm/boot/dts/bcm988312hr.dts | 42 + + arch/arm/boot/dts/da850-evm.dts | 20 + + arch/arm/boot/dts/da850-lcdk.dts | 86 ++ + arch/arm/boot/dts/da850-lego-ev3.dts | 313 +++++ + arch/arm/boot/dts/da850.dtsi | 45 +- + arch/arm/boot/dts/dm814x.dtsi | 9 +- + arch/arm/boot/dts/dm816x.dtsi | 6 +- + arch/arm/boot/dts/dove-cm-a510.dtsi | 10 +- + arch/arm/boot/dts/dove-sbc-a510.dts | 10 +- + arch/arm/boot/dts/dra7-evm.dts | 286 +---- + arch/arm/boot/dts/dra7.dtsi | 2 +- + arch/arm/boot/dts/dra71-evm.dts | 5 + + arch/arm/boot/dts/dra72-evm-common.dtsi | 20 +- + arch/arm/boot/dts/dra72-evm-revc.dts | 4 + + arch/arm/boot/dts/ecx-2000.dts | 2 +- + arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi | 2 +- + arch/arm/boot/dts/exynos3250.dtsi | 2 +- + arch/arm/boot/dts/exynos4.dtsi | 37 +- + arch/arm/boot/dts/exynos4210.dtsi | 1 + + arch/arm/boot/dts/exynos4212.dtsi | 133 --- + arch/arm/boot/dts/exynos4412-itop-elite.dts | 25 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 28 +- + arch/arm/boot/dts/exynos4412-odroidu3.dts | 5 +- + arch/arm/boot/dts/exynos4412-odroidx.dts | 13 + + arch/arm/boot/dts/exynos4412-odroidx2.dts | 25 +- + ...os4x12-pinctrl.dtsi => exynos4412-pinctrl.dtsi} | 4 +- + arch/arm/boot/dts/exynos4412-prime.dtsi | 41 + + arch/arm/boot/dts/exynos4412.dtsi | 578 +++++++++- + arch/arm/boot/dts/exynos4x12.dtsi | 594 ---------- + arch/arm/boot/dts/exynos5.dtsi | 4 +- + arch/arm/boot/dts/exynos5250.dtsi | 11 + + arch/arm/boot/dts/exynos5260.dtsi | 2 +- + arch/arm/boot/dts/exynos5410.dtsi | 8 + + arch/arm/boot/dts/exynos5420.dtsi | 13 + + arch/arm/boot/dts/exynos5440.dtsi | 2 +- + arch/arm/boot/dts/imx1-ads.dts | 1 - + arch/arm/boot/dts/imx1.dtsi | 3 +- + arch/arm/boot/dts/imx23.dtsi | 5 +- + arch/arm/boot/dts/imx25.dtsi | 7 +- + arch/arm/boot/dts/imx27-apf27dev.dts | 2 - + .../boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts | 1 - + arch/arm/boot/dts/imx27-pdk.dts | 1 - + arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi | 1 - + arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 1 - + arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi | 1 - + arch/arm/boot/dts/imx27.dtsi | 1 + + arch/arm/boot/dts/imx28.dtsi | 7 +- + arch/arm/boot/dts/imx31.dtsi | 5 +- + arch/arm/boot/dts/imx35.dtsi | 5 +- + arch/arm/boot/dts/imx50-evk.dts | 1 - + arch/arm/boot/dts/imx51-apf51dev.dts | 2 - + arch/arm/boot/dts/imx51-babbage.dts | 1 - + arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 1 - + .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 1 - + arch/arm/boot/dts/imx53-qsb-common.dtsi | 20 +- + arch/arm/boot/dts/imx53-qsb.dts | 5 +- + arch/arm/boot/dts/imx53-qsrb.dts | 6 +- + arch/arm/boot/dts/imx53-smd.dts | 1 - + arch/arm/boot/dts/imx53-tqma53.dtsi | 2 - + arch/arm/boot/dts/imx53-tx53.dtsi | 1 - + arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi | 1 - + arch/arm/boot/dts/imx6dl-aristainetos2_4.dts | 10 +- + arch/arm/boot/dts/imx6dl-aristainetos2_7.dts | 10 +- + arch/arm/boot/dts/imx6dl-aristainetos_4.dts | 1 - + arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 10 +- + arch/arm/boot/dts/imx6dl-cubox-i.dts | 10 +- + arch/arm/boot/dts/imx6dl-hummingboard.dts | 10 +- + arch/arm/boot/dts/imx6dl-icore-rqs.dts | 51 + + arch/arm/boot/dts/imx6dl-icore.dts | 10 +- + arch/arm/boot/dts/imx6dl-nit6xlite.dts | 10 +- + arch/arm/boot/dts/imx6dl-nitrogen6x.dts | 10 +- + arch/arm/boot/dts/imx6dl-sabrelite.dts | 10 +- + arch/arm/boot/dts/imx6dl-savageboard.dts | 51 + + arch/arm/boot/dts/imx6dl-ts4900.dts | 10 +- + arch/arm/boot/dts/imx6q-apalis-ixora.dts | 10 +- + arch/arm/boot/dts/imx6q-b450v3.dts | 10 +- + arch/arm/boot/dts/imx6q-b650v3.dts | 10 +- + arch/arm/boot/dts/imx6q-b850v3.dts | 10 +- + arch/arm/boot/dts/imx6q-ba16.dtsi | 11 +- + arch/arm/boot/dts/imx6q-bx50v3.dtsi | 11 +- + arch/arm/boot/dts/imx6q-cm-fx6.dts | 32 +- + arch/arm/boot/dts/imx6q-cubox-i.dts | 10 +- + arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 1 - + arch/arm/boot/dts/imx6q-evi.dts | 3 - + arch/arm/boot/dts/imx6q-gw5400-a.dts | 1 - + arch/arm/boot/dts/imx6q-h100.dts | 10 +- + arch/arm/boot/dts/imx6q-hummingboard.dts | 10 +- + arch/arm/boot/dts/imx6q-icore-rqs.dts | 12 +- + arch/arm/boot/dts/imx6q-icore.dts | 10 +- + arch/arm/boot/dts/imx6q-marsboard.dts | 11 +- + arch/arm/boot/dts/imx6q-mccmon6.dts | 473 ++++++++ + arch/arm/boot/dts/imx6q-nitrogen6_max.dts | 10 +- + arch/arm/boot/dts/imx6q-nitrogen6_som2.dts | 10 +- + arch/arm/boot/dts/imx6q-nitrogen6x.dts | 10 +- + arch/arm/boot/dts/imx6q-novena.dts | 1 - + arch/arm/boot/dts/imx6q-sabrelite.dts | 10 +- + arch/arm/boot/dts/imx6q-savageboard.dts | 55 + + arch/arm/boot/dts/imx6q-ts4900.dts | 10 +- + arch/arm/boot/dts/imx6q-utilite-pro.dts | 115 ++ + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 12 +- + arch/arm/boot/dts/imx6qdl-apf6dev.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-aristainetos.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi | 13 +- + arch/arm/boot/dts/imx6qdl-colibri.dtsi | 11 +- + arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 10 +- + arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 132 ++- + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 166 ++- + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 163 ++- + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 16 + + arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 132 ++- + arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 130 ++- + arch/arm/boot/dts/imx6qdl-gw553x.dtsi | 98 +- + arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 10 +- + arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi | 14 +- + arch/arm/boot/dts/imx6qdl-icore.dtsi | 10 +- + arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi | 10 +- + arch/arm/boot/dts/imx6qdl-microsom.dtsi | 10 +- + arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 13 +- + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 15 +- + arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 13 +- + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 13 +- + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-rex.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 13 +- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-savageboard.dtsi | 255 +++++ + arch/arm/boot/dts/imx6qdl-ts4900.dtsi | 12 +- + arch/arm/boot/dts/imx6qdl-tx6.dtsi | 1 - + arch/arm/boot/dts/imx6qdl.dtsi | 12 +- + arch/arm/boot/dts/imx6qp.dtsi | 6 + + arch/arm/boot/dts/imx6sl-evk.dts | 1 - + arch/arm/boot/dts/imx6sx-nitrogen6sx.dts | 11 +- + arch/arm/boot/dts/imx6sx-sdb-sai.dts | 10 +- + arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 137 +++ + arch/arm/boot/dts/imx6ul-geam-kit.dts | 10 +- + arch/arm/boot/dts/imx6ul-geam.dtsi | 10 +- + arch/arm/boot/dts/imx6ul-isiot-emmc.dts | 77 ++ + arch/arm/boot/dts/imx6ul-isiot-nand.dts | 79 ++ + arch/arm/boot/dts/imx6ul-isiot.dtsi | 114 ++ + arch/arm/boot/dts/imx6ul-liteboard.dts | 10 +- + arch/arm/boot/dts/imx6ul-litesom.dtsi | 10 +- + arch/arm/boot/dts/imx6ul-opos6ul.dtsi | 192 ++++ + arch/arm/boot/dts/imx6ul-opos6uldev.dts | 412 +++++++ + arch/arm/boot/dts/imx6ul-pico-hobbit.dts | 10 +- + arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 1 - + arch/arm/boot/dts/imx6ul.dtsi | 11 +- + arch/arm/boot/dts/imx6ull-14x14-evk.dts | 10 +- + arch/arm/boot/dts/imx6ull.dtsi | 10 +- + arch/arm/boot/dts/imx7-colibri.dtsi | 16 +- + arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 14 +- + arch/arm/boot/dts/imx7d-nitrogen7.dts | 14 +- + arch/arm/boot/dts/imx7d-pinfunc.h | 110 +- + arch/arm/boot/dts/imx7d-sdb.dts | 25 +- + arch/arm/boot/dts/imx7s-warp.dts | 4 +- + arch/arm/boot/dts/imx7s.dtsi | 1 - + arch/arm/boot/dts/keystone-k2e-netcp.dtsi | 3 +- + arch/arm/boot/dts/keystone-k2e.dtsi | 25 + + arch/arm/boot/dts/keystone-k2g.dtsi | 18 +- + arch/arm/boot/dts/keystone-k2hk-netcp.dtsi | 3 +- + arch/arm/boot/dts/keystone-k2hk.dtsi | 32 + + arch/arm/boot/dts/keystone-k2l-netcp.dtsi | 3 +- + arch/arm/boot/dts/keystone-k2l.dtsi | 32 +- + arch/arm/boot/dts/keystone.dtsi | 13 +- + arch/arm/boot/dts/kirkwood-dir665.dts | 49 + + arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi | 10 +- + .../boot/dts/kirkwood-linkstation-duo-6281.dtsi | 10 +- + arch/arm/boot/dts/kirkwood-linkstation-lsqvl.dts | 10 +- + arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts | 10 +- + arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts | 10 +- + arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts | 10 +- + arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts | 10 +- + arch/arm/boot/dts/kirkwood-linkstation.dtsi | 10 +- + arch/arm/boot/dts/kirkwood-linksys-viper.dts | 49 + + arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 49 + + arch/arm/boot/dts/kirkwood-rd88f6281-a.dts | 9 +- + arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts | 11 + + arch/arm/boot/dts/kirkwood-rd88f6281.dtsi | 44 + + arch/arm/boot/dts/ls1021a.dtsi | 4 +- + arch/arm/boot/dts/mt2701-evb.dts | 54 + + arch/arm/boot/dts/mt2701.dtsi | 249 +++- + arch/arm/boot/dts/mt6580.dtsi | 2 +- + arch/arm/boot/dts/mt6589.dtsi | 2 +- + arch/arm/boot/dts/mt7623-evb.dts | 2 +- + arch/arm/boot/dts/mt7623.dtsi | 4 +- + arch/arm/boot/dts/mt8127.dtsi | 2 +- + arch/arm/boot/dts/mt8135.dtsi | 2 +- + arch/arm/boot/dts/mvebu-linkstation-fan.dtsi | 10 +- + .../boot/dts/mvebu-linkstation-gpio-simple.dtsi | 10 +- + arch/arm/boot/dts/omap3-beagle-xm.dts | 16 + + arch/arm/boot/dts/omap3-igep.dtsi | 21 - + arch/arm/boot/dts/omap3-n900.dts | 3 +- + arch/arm/boot/dts/omap4-panda-common.dtsi | 16 + + arch/arm/boot/dts/omap5-igep0050.dts | 21 + + arch/arm/boot/dts/omap5-uevm.dts | 21 + + arch/arm/boot/dts/omap5.dtsi | 2 +- + arch/arm/boot/dts/orion5x-kuroboxpro.dts | 10 +- + arch/arm/boot/dts/orion5x-linkstation-lschl.dts | 10 +- + arch/arm/boot/dts/orion5x-linkstation-lsgl.dts | 10 +- + arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts | 10 +- + arch/arm/boot/dts/orion5x-linkstation.dtsi | 10 +- + arch/arm/boot/dts/orion5x-lswsgl.dts | 10 +- + arch/arm/boot/dts/ox810se.dtsi | 10 +- + arch/arm/boot/dts/ox820.dtsi | 14 +- + arch/arm/boot/dts/qcom-apq8060-dragonboard.dts | 62 +- + .../arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts | 69 ++ + arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 22 - + arch/arm/boot/dts/qcom-apq8064-pins.dtsi | 37 + + .../arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts | 7 + + arch/arm/boot/dts/qcom-apq8064.dtsi | 287 ++++- + arch/arm/boot/dts/qcom-ipq8064.dtsi | 4 +- + arch/arm/boot/dts/qcom-msm8660-surf.dts | 2 +- + arch/arm/boot/dts/qcom-msm8660.dtsi | 12 +- + .../boot/dts/qcom-msm8974-sony-xperia-honami.dts | 8 + + arch/arm/boot/dts/qcom-msm8974.dtsi | 96 +- + arch/arm/boot/dts/r7s72100-rskrza1.dts | 8 + + arch/arm/boot/dts/r7s72100.dtsi | 28 + + arch/arm/boot/dts/r8a73a4.dtsi | 6 +- + arch/arm/boot/dts/r8a7743.dtsi | 18 +- + arch/arm/boot/dts/r8a7745.dtsi | 18 +- + arch/arm/boot/dts/r8a7778.dtsi | 10 +- + arch/arm/boot/dts/r8a7779-marzen.dts | 4 + + arch/arm/boot/dts/r8a7779.dtsi | 9 +- + arch/arm/boot/dts/r8a7790.dtsi | 37 +- + arch/arm/boot/dts/r8a7791.dtsi | 35 +- + arch/arm/boot/dts/r8a7792.dtsi | 26 +- + arch/arm/boot/dts/r8a7793-gose.dts | 21 + + arch/arm/boot/dts/r8a7793.dtsi | 23 +- + arch/arm/boot/dts/r8a7794.dtsi | 23 +- + arch/arm/boot/dts/rk1108.dtsi | 2 +- + arch/arm/boot/dts/rk3036-evb.dts | 2 +- + arch/arm/boot/dts/rk3036-kylin.dts | 12 +- + arch/arm/boot/dts/rk3036.dtsi | 2 +- + arch/arm/boot/dts/rk3066a-bqcurie2.dts | 8 +- + arch/arm/boot/dts/rk3066a-marsboard.dts | 6 +- + arch/arm/boot/dts/rk3066a-mk808.dts | 10 +- + arch/arm/boot/dts/rk3066a-rayeager.dts | 18 +- + arch/arm/boot/dts/rk3066a.dtsi | 4 + + arch/arm/boot/dts/rk3188-px3-evb.dts | 10 +- + arch/arm/boot/dts/rk3188-radxarock.dts | 20 +- + arch/arm/boot/dts/rk3188.dtsi | 4 + + arch/arm/boot/dts/rk3229-evb.dts | 2 +- + arch/arm/boot/dts/rk322x.dtsi | 2 +- + arch/arm/boot/dts/rk3288-evb-act8846.dts | 6 +- + arch/arm/boot/dts/rk3288-evb-rk808.dts | 2 +- + arch/arm/boot/dts/rk3288-evb.dtsi | 14 +- + arch/arm/boot/dts/rk3288-fennec.dts | 6 +- + arch/arm/boot/dts/rk3288-firefly-beta.dts | 2 +- + arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 2 +- + arch/arm/boot/dts/rk3288-firefly-reload.dts | 26 +- + arch/arm/boot/dts/rk3288-firefly.dts | 2 +- + arch/arm/boot/dts/rk3288-firefly.dtsi | 18 +- + arch/arm/boot/dts/rk3288-miqi.dts | 8 +- + arch/arm/boot/dts/rk3288-popmetal.dts | 8 +- + arch/arm/boot/dts/rk3288-r89.dts | 14 +- + arch/arm/boot/dts/rk3288-rock2-som.dtsi | 4 +- + arch/arm/boot/dts/rk3288-rock2-square.dts | 14 +- + arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi | 8 +- + arch/arm/boot/dts/rk3288-veyron-brain.dts | 8 +- + arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 14 +- + arch/arm/boot/dts/rk3288-veyron-jaq.dts | 14 +- + arch/arm/boot/dts/rk3288-veyron-jerry.dts | 12 +- + arch/arm/boot/dts/rk3288-veyron-mickey.dts | 6 +- + arch/arm/boot/dts/rk3288-veyron-minnie.dts | 18 +- + arch/arm/boot/dts/rk3288-veyron-pinky.dts | 4 +- + arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi | 2 +- + arch/arm/boot/dts/rk3288-veyron-speedy.dts | 10 +- + arch/arm/boot/dts/rk3288-veyron.dtsi | 10 +- + arch/arm/boot/dts/rk3288.dtsi | 86 +- + arch/arm/boot/dts/sama5d2.dtsi | 30 +- + arch/arm/boot/dts/sama5d36ek_cmp.dts | 87 ++ + arch/arm/boot/dts/sama5d3_uart.dtsi | 4 +- + arch/arm/boot/dts/sama5d3xcm_cmp.dtsi | 201 ++++ + arch/arm/boot/dts/sama5d3xmb_cmp.dtsi | 301 +++++ + arch/arm/boot/dts/sama5d4.dtsi | 16 +- + arch/arm/boot/dts/sh73a0.dtsi | 2 +- + arch/arm/boot/dts/socfpga.dtsi | 31 +- + arch/arm/boot/dts/socfpga_arria10.dtsi | 41 +- + arch/arm/boot/dts/socfpga_arria10_socdk.dtsi | 9 + + arch/arm/boot/dts/socfpga_arria10_socdk_nand.dts | 31 + + arch/arm/boot/dts/socfpga_arria5.dtsi | 4 + + arch/arm/boot/dts/socfpga_arria5_socdk.dts | 43 + + arch/arm/boot/dts/socfpga_cyclone5_socdk.dts | 53 + + arch/arm/boot/dts/ste-dbx5x0.dtsi | 2 + + arch/arm/boot/dts/ste-href.dtsi | 16 +- + arch/arm/boot/dts/ste-hrefprev60.dtsi | 1 + + arch/arm/boot/dts/ste-hrefv60plus.dtsi | 1 + + arch/arm/boot/dts/ste-snowball.dts | 20 +- + arch/arm/boot/dts/stih407-family.dtsi | 59 +- + arch/arm/boot/dts/stih410-b2120.dts | 6 + + arch/arm/boot/dts/stih410.dtsi | 24 +- + arch/arm/boot/dts/stm32429i-eval.dts | 37 +- + arch/arm/boot/dts/stm32f429-disco.dts | 6 + + arch/arm/boot/dts/stm32f429.dtsi | 450 +++++++- + arch/arm/boot/dts/stm32f469-disco.dts | 36 +- + arch/arm/boot/dts/sun4i-a10-a1000.dts | 43 +- + arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 2 +- + arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 14 +- + arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 14 +- + arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts | 38 +- + arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 6 +- + arch/arm/boot/dts/sun4i-a10-hackberry.dts | 12 +- + arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts | 16 +- + arch/arm/boot/dts/sun4i-a10-inet1.dts | 26 +- + arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 14 +- + arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 29 +- + arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 12 +- + arch/arm/boot/dts/sun4i-a10-marsboard.dts | 13 +- + arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 2 +- + arch/arm/boot/dts/sun4i-a10-mk802.dts | 18 +- + arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 27 +- + arch/arm/boot/dts/sun4i-a10-pcduino.dts | 19 +- + arch/arm/boot/dts/sun4i-a10-pcduino2.dts | 6 +- + arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 32 +- + arch/arm/boot/dts/sun4i-a10.dtsi | 170 +-- + arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts | 18 +- + arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 29 +- + arch/arm/boot/dts/sun5i-a10s-mk802.dts | 19 +- + arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 36 +- + arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 20 +- + arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 21 +- + arch/arm/boot/dts/sun5i-a10s.dtsi | 43 +- + .../boot/dts/sun5i-a13-empire-electronix-d709.dts | 23 +- + arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 22 +- + arch/arm/boot/dts/sun5i-a13-licheepi-one.dts | 224 ++++ + arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 40 +- + arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 36 +- + arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 11 +- + arch/arm/boot/dts/sun5i-a13.dtsi | 24 +- + arch/arm/boot/dts/sun5i-gr8-chip-pro.dts | 12 +- + arch/arm/boot/dts/sun5i-gr8-evb.dts | 24 +- + arch/arm/boot/dts/sun5i-gr8.dtsi | 122 +- + arch/arm/boot/dts/sun5i-r8-chip.dts | 27 +- + .../boot/dts/sun5i-reference-design-tablet.dtsi | 33 +- + arch/arm/boot/dts/sun5i.dtsi | 84 +- + arch/arm/boot/dts/sun6i-a31-app4-evb1.dts | 6 +- + arch/arm/boot/dts/sun6i-a31-colombus.dts | 22 +- + arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 42 +- + arch/arm/boot/dts/sun6i-a31-i7.dts | 49 +- + arch/arm/boot/dts/sun6i-a31-m9.dts | 19 +- + arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts | 19 +- + arch/arm/boot/dts/sun6i-a31.dtsi | 122 +- + arch/arm/boot/dts/sun6i-a31s-primo81.dts | 20 +- + arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 18 +- + arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 29 +- + .../dts/sun6i-a31s-yones-toptech-bs1078-v2.dts | 9 +- + .../boot/dts/sun6i-reference-design-tablet.dtsi | 14 +- + arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 27 +- + arch/arm/boot/dts/sun7i-a20-bananapi.dts | 26 +- + arch/arm/boot/dts/sun7i-a20-bananapro.dts | 70 +- + arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 13 +- + arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 38 +- + arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 24 +- + arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 26 +- + arch/arm/boot/dts/sun7i-a20-itead-ibox.dts | 7 +- + arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 30 +- + arch/arm/boot/dts/sun7i-a20-m3.dts | 6 +- + arch/arm/boot/dts/sun7i-a20-mk808c.dts | 12 +- + arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 70 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 27 +- + .../boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts | 8 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 123 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 28 +- + arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 45 +- + arch/arm/boot/dts/sun7i-a20-orangepi.dts | 38 +- + arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 25 +- + arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 21 +- + arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 25 +- + arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 13 +- + arch/arm/boot/dts/sun7i-a20.dtsi | 287 ++--- + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 151 +-- + arch/arm/boot/dts/sun8i-a23-evb.dts | 7 +- + .../boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts | 8 +- + .../boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts | 8 +- + arch/arm/boot/dts/sun8i-a23-q8-tablet.dts | 23 + + arch/arm/boot/dts/sun8i-a23.dtsi | 16 + + arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts | 9 +- + arch/arm/boot/dts/sun8i-a33-olinuxino.dts | 20 +- + arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 59 +- + arch/arm/boot/dts/sun8i-a33.dtsi | 86 +- + arch/arm/boot/dts/sun8i-a83t.dtsi | 24 +- + arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 160 +++ + arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts | 18 +- + arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 160 +++ + arch/arm/boot/dts/sun8i-h3-nanopi.dtsi | 18 +- + arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 26 +- + arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts | 18 +- + arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 18 +- + arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts | 4 +- + arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 26 +- + arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 10 +- + arch/arm/boot/dts/sun8i-h3.dtsi | 146 +-- + arch/arm/boot/dts/sun8i-q8-common.dtsi | 9 +- + arch/arm/boot/dts/sun8i-r16-parrot.dts | 50 +- + .../boot/dts/sun8i-reference-design-tablet.dtsi | 32 +- + arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts | 103 ++ + arch/arm/boot/dts/sun8i-v3s.dtsi | 309 +++++ + arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 23 +- + arch/arm/boot/dts/sun9i-a80-optimus.dts | 41 +- + arch/arm/boot/dts/sun9i-a80.dtsi | 66 +- + arch/arm/boot/dts/sunxi-common-regulators.dtsi | 24 +- + arch/arm/boot/dts/tango4-common.dtsi | 46 + + arch/arm/boot/dts/tango4-vantage-1172.dts | 5 + + arch/arm/boot/dts/tegra124-apalis-eval.dts | 10 +- + arch/arm/boot/dts/tegra124-apalis.dtsi | 61 +- + arch/arm/boot/dts/tegra124-nyan-big.dts | 26 +- + arch/arm/boot/dts/tegra124-nyan-blaze.dts | 28 +- + arch/arm/boot/dts/tegra124-nyan.dtsi | 5 +- + arch/arm/boot/dts/tegra20-paz00.dts | 1 + + arch/arm/boot/dts/tegra20-trimslice.dts | 1 + + arch/arm/boot/dts/uniphier-pinctrl.dtsi | 18 +- + arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 10 +- + arch/arm/boot/dts/vf-colibri.dtsi | 10 +- + arch/arm/boot/dts/vf500-colibri-eval-v3.dts | 10 +- + arch/arm/boot/dts/vf500-colibri.dtsi | 10 +- + arch/arm/boot/dts/vf500.dtsi | 10 +- + arch/arm/boot/dts/vf610-colibri-eval-v3.dts | 10 +- + arch/arm/boot/dts/vf610-colibri.dtsi | 10 +- + arch/arm/boot/dts/vf610-twr.dts | 10 +- + arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 334 +----- + arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 416 +++++++ + arch/arm/boot/dts/vf610-zii-dev.dtsi | 383 +++++++ + arch/arm/boot/dts/vf610.dtsi | 10 +- + arch/arm/boot/dts/vf610m4-colibri.dts | 10 +- + arch/arm/boot/dts/vf610m4-cosmic.dts | 10 +- + arch/arm/boot/dts/vf610m4.dtsi | 10 +- + arch/arm/boot/dts/vfxxx.dtsi | 10 +- + arch/arm/configs/aspeed_g4_defconfig | 38 +- + arch/arm/configs/aspeed_g5_defconfig | 38 +- + arch/arm/configs/davinci_all_defconfig | 21 + + arch/arm/configs/exynos_defconfig | 1 + + arch/arm/configs/imx_v6_v7_defconfig | 4 +- + arch/arm/configs/keystone_defconfig | 1 + + arch/arm/configs/multi_v7_defconfig | 7 +- + arch/arm/configs/omap2plus_defconfig | 7 +- + arch/arm/configs/pxa_defconfig | 1 - + arch/arm/configs/qcom_defconfig | 34 + + arch/arm/configs/s5pv210_defconfig | 4 - + arch/arm/configs/sama5_defconfig | 7 +- + arch/arm/configs/shmobile_defconfig | 6 + + arch/arm/configs/socfpga_defconfig | 28 +- + arch/arm/configs/stm32_defconfig | 7 + + arch/arm/configs/sunxi_defconfig | 1 + + arch/arm/configs/tango4_defconfig | 94 ++ + arch/arm/configs/tegra_defconfig | 2 +- + arch/arm/configs/vf610m4_defconfig | 3 +- + arch/arm/mach-aspeed/Kconfig | 4 + + arch/arm/mach-at91/pm.c | 2 +- + arch/arm/mach-at91/pm.h | 2 - + arch/arm/mach-davinci/da850.c | 24 +- + arch/arm/mach-ep93xx/include/mach/uncompress.h | 12 + + arch/arm/mach-exynos/Kconfig | 5 - + arch/arm/mach-exynos/exynos.c | 5 +- + arch/arm/mach-exynos/mcpm-exynos.c | 2 +- + arch/arm/mach-exynos/suspend.c | 17 +- + arch/arm/mach-hisi/core.h | 1 - + arch/arm/mach-imx/devices/platform-flexcan.c | 9 - + .../mach-imx/devices/platform-sdhci-esdhc-imx.c | 10 - + arch/arm/mach-imx/mach-mx27_3ds.c | 107 -- + arch/arm/mach-imx/mach-mx31_3ds.c | 160 --- + arch/arm/mach-imx/mach-mx35_3ds.c | 103 -- + arch/arm/mach-imx/mach-pcm037.c | 115 -- + arch/arm/mach-imx/mx31moboard-marxbot.c | 92 -- + arch/arm/mach-imx/mx31moboard-smartbot.c | 74 -- + arch/arm/mach-keystone/Kconfig | 1 + + arch/arm/mach-mv78xx0/pcie.c | 2 +- + arch/arm/mach-mvebu/platsmp.c | 75 ++ + arch/arm/mach-omap1/clock.c | 20 - + arch/arm/mach-omap1/clock.h | 2 - + arch/arm/mach-omap1/include/mach/usb.h | 2 - + arch/arm/mach-omap1/usb.c | 51 +- + arch/arm/mach-omap2/clock.c | 61 - + arch/arm/mach-omap2/clock.h | 4 - + arch/arm/mach-omap2/display.c | 258 +---- + arch/arm/mach-omap2/display.h | 7 - + arch/arm/mach-omap2/id.c | 10 +- + arch/arm/mach-omap2/omap_hwmod.c | 33 + + arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 8 +- + arch/arm/mach-omap2/pdata-quirks.c | 1 - + arch/arm/mach-pxa/ezx.c | 56 +- + arch/arm/mach-pxa/idp.c | 1 + + arch/arm/mach-rockchip/rockchip.c | 12 - + arch/arm/mach-s3c24xx/bast-irq.c | 4 +- + arch/arm/mach-s3c24xx/iotiming-s3c2410.c | 2 +- + arch/arm/mach-s3c24xx/pm-s3c2412.c | 2 +- + arch/arm/mach-s3c64xx/common.c | 3 +- + arch/arm/mach-s3c64xx/dev-audio.c | 19 - + arch/arm/mach-s3c64xx/pm.c | 2 +- + arch/arm/mach-shmobile/platsmp-apmu.c | 41 +- + arch/arm/mach-shmobile/pm-rcar-gen2.c | 40 +- + arch/arm/mach-shmobile/rcar-gen2.h | 2 - + arch/arm/mach-shmobile/setup-rcar-gen2.c | 18 - + arch/arm/mach-shmobile/smp-r8a7791.c | 14 +- + arch/arm/mach-sunxi/sunxi.c | 2 + + arch/arm/mach-tegra/board-paz00.c | 2 +- + arch/arm/mach-ux500/Makefile | 1 - + arch/arm/mach-ux500/board-mop500-audio.c | 77 -- + arch/arm/mach-ux500/board-mop500.h | 17 - + arch/arm/mach-ux500/cpu-db8500.c | 17 - + arch/arm/mach-ux500/platsmp.c | 45 +- + arch/arm/mach-ux500/ste-dma40-db8500.h | 85 -- + arch/arm/plat-samsung/devs.c | 19 - + arch/arm/plat-samsung/include/plat/wakeup-mask.h | 2 +- + arch/arm/plat-samsung/wakeup-mask.c | 2 +- + arch/arm64/Kconfig.platforms | 7 + + arch/arm64/boot/dts/allwinner/Makefile | 1 + + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 120 ++ + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 43 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 137 ++- + arch/arm64/boot/dts/arm/juno-base.dtsi | 43 +- + arch/arm64/boot/dts/arm/juno-clocks.dtsi | 3 +- + arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi | 100 ++ + arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 7 - + arch/arm64/boot/dts/arm/juno-r1.dts | 16 +- + arch/arm64/boot/dts/arm/juno-r2.dts | 16 +- + arch/arm64/boot/dts/arm/juno.dts | 27 +- + arch/arm64/boot/dts/broadcom/Makefile | 2 +- + arch/arm64/boot/dts/broadcom/ns2-svk.dts | 4 + + arch/arm64/boot/dts/broadcom/ns2-xmc.dts | 191 ++++ + arch/arm64/boot/dts/broadcom/ns2.dtsi | 123 +- + arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi | 197 ++++ + arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi | 373 +++--- + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 1203 ++++++++++++++++++++ + arch/arm64/boot/dts/exynos/exynos5433-tm2.dts | 1039 +---------------- + arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts | 12 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 123 +- + arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi | 14 +- + arch/arm64/boot/dts/freescale/Makefile | 3 + + arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts | 115 ++ + arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts | 128 +++ + arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts | 59 + + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 247 ++++ + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 80 ++ + arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts | 1 - + arch/arm64/boot/dts/hisilicon/Makefile | 1 + + arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 33 + + arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 160 +++ + arch/arm64/boot/dts/marvell/Makefile | 1 + + arch/arm64/boot/dts/marvell/armada-371x.dtsi | 10 +- + arch/arm64/boot/dts/marvell/armada-3720-db.dts | 44 +- + .../boot/dts/marvell/armada-3720-espressobin.dts | 76 +- + arch/arm64/boot/dts/marvell/armada-372x.dtsi | 10 +- + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 39 +- + arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 138 +++ + .../boot/dts/marvell/armada-cp110-master.dtsi | 5 +- + .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 5 +- + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 13 +- + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 86 +- + .../arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi | 13 + + arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi | 13 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 32 + + .../boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi | 14 +- + arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 19 + + arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 13 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 315 ++++- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 6 + + arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts | 2 + + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 2 + + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 314 +++-- + arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 37 + + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 245 +++- + arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi | 10 +- + arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts | 10 +- + .../boot/dts/rockchip/rk3368-orion-r68-meta.dts | 14 +- + arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts | 10 +- + arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 16 +- + arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 8 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 41 +- + arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 21 + + arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 10 + + arch/arm64/boot/dts/zte/zx296718.dtsi | 39 + + arch/arm64/configs/defconfig | 9 + + drivers/bus/Kconfig | 1 + + drivers/bus/da8xx-mstpri.c | 2 +- + drivers/clk/samsung/clk-exynos4.c | 4 + + drivers/cpufreq/davinci-cpufreq.c | 2 +- + drivers/firmware/Kconfig | 1 + + drivers/firmware/qcom_scm-32.c | 18 + + drivers/firmware/qcom_scm-64.c | 16 + + drivers/firmware/qcom_scm.c | 8 +- + drivers/firmware/qcom_scm.h | 2 + + drivers/memory/atmel-ebi.c | 126 +- + drivers/memory/tegra/tegra124-emc.c | 5 +- + drivers/reset/Kconfig | 6 + + drivers/reset/Makefile | 1 + + drivers/reset/core.c | 55 +- + drivers/reset/hisilicon/Kconfig | 7 + + drivers/reset/hisilicon/Makefile | 1 + + drivers/reset/hisilicon/reset-hi3660.c | 126 ++ + drivers/reset/reset-ti-syscon.c | 6 +- + drivers/reset/reset-uniphier.c | 4 + + drivers/reset/reset-zx2967.c | 99 ++ + drivers/soc/Kconfig | 1 + + drivers/soc/Makefile | 1 + + drivers/soc/dove/pmu.c | 2 +- + drivers/soc/rockchip/Kconfig | 10 + + drivers/soc/rockchip/Makefile | 1 + + drivers/soc/rockchip/grf.c | 134 +++ + drivers/soc/rockchip/pm_domains.c | 63 +- + drivers/soc/samsung/exynos-pmu.c | 28 +- + drivers/soc/samsung/exynos5250-pmu.c | 2 +- + drivers/soc/samsung/exynos5420-pmu.c | 4 +- + drivers/soc/samsung/pm_domains.c | 31 +- + drivers/soc/ti/knav_dma.c | 4 +- + drivers/soc/ti/knav_qmss_acc.c | 15 +- + drivers/soc/ti/knav_qmss_queue.c | 25 +- + drivers/soc/ti/wkup_m3_ipc.c | 2 - + drivers/soc/zte/Kconfig | 13 + + drivers/soc/zte/Makefile | 5 + + drivers/soc/zte/zx296718_pm_domains.c | 182 +++ + drivers/soc/zte/zx2967_pm_domains.c | 143 +++ + drivers/soc/zte/zx2967_pm_domains.h | 44 + + include/dt-bindings/clock/r7s72100-clock.h | 4 + + include/dt-bindings/clock/stm32fx-clock.h | 39 + + include/dt-bindings/mfd/stm32f4-rcc.h | 24 +- + include/dt-bindings/pinctrl/omap.h | 4 +- + include/dt-bindings/pinctrl/samsung.h | 14 + + include/dt-bindings/power/rk3328-power.h | 18 + + include/dt-bindings/soc/zte,pm_domains.h | 24 + + include/linux/qcom_scm.h | 54 +- + include/linux/reset.h | 45 +- + include/linux/soc/samsung/exynos-pmu.h | 10 + + include/linux/soc/samsung/exynos-regs-pmu.h | 91 +- + 778 files changed, 23788 insertions(+), 8837 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/axentia.txt + create mode 100644 Documentation/devicetree/bindings/arm/marvell/98dx3236-resume-ctrl.txt + create mode 100644 Documentation/devicetree/bindings/arm/marvell/98dx3236.txt + create mode 100644 Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt + create mode 100644 Documentation/devicetree/bindings/net/marvell,prestera.txt + create mode 100644 Documentation/devicetree/bindings/reset/hisilicon,hi3660-reset.txt + create mode 100644 Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt + create mode 100644 Documentation/devicetree/bindings/soc/zte/pd-2967xx.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/am335x-boneblack-common.dtsi + create mode 100644 arch/arm/boot/dts/am335x-boneblack-wireless.dts + create mode 100644 arch/arm/boot/dts/am335x-bonegreen-common.dtsi + create mode 100644 arch/arm/boot/dts/am335x-bonegreen-wireless.dts + create mode 100644 arch/arm/boot/dts/armada-388-clearfog-base.dts + create mode 100644 arch/arm/boot/dts/armada-388-clearfog-pro.dts + create mode 100644 arch/arm/boot/dts/armada-388-clearfog.dtsi + create mode 100644 arch/arm/boot/dts/armada-xp-98dx3236.dtsi + create mode 100644 arch/arm/boot/dts/armada-xp-98dx3336.dtsi + create mode 100644 arch/arm/boot/dts/armada-xp-98dx4251.dtsi + create mode 100644 arch/arm/boot/dts/armada-xp-db-dxbc2.dts + create mode 100644 arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts + create mode 100644 arch/arm/boot/dts/at91-linea.dtsi + create mode 100644 arch/arm/boot/dts/at91-tse850-3.dts + create mode 100644 arch/arm/boot/dts/axp223.dtsi + create mode 100644 arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts + create mode 100644 arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts + create mode 100644 arch/arm/boot/dts/da850-lego-ev3.dts + delete mode 100644 arch/arm/boot/dts/exynos4212.dtsi + rename arch/arm/boot/dts/{exynos4x12-pinctrl.dtsi => exynos4412-pinctrl.dtsi} (99%) + create mode 100644 arch/arm/boot/dts/exynos4412-prime.dtsi + delete mode 100644 arch/arm/boot/dts/exynos4x12.dtsi + create mode 100644 arch/arm/boot/dts/imx6dl-icore-rqs.dts + create mode 100644 arch/arm/boot/dts/imx6dl-savageboard.dts + create mode 100644 arch/arm/boot/dts/imx6q-mccmon6.dts + create mode 100644 arch/arm/boot/dts/imx6q-savageboard.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-savageboard.dtsi + create mode 100644 arch/arm/boot/dts/imx6ul-isiot-emmc.dts + create mode 100644 arch/arm/boot/dts/imx6ul-isiot-nand.dts + create mode 100644 arch/arm/boot/dts/imx6ul-isiot.dtsi + create mode 100644 arch/arm/boot/dts/imx6ul-opos6ul.dtsi + create mode 100644 arch/arm/boot/dts/imx6ul-opos6uldev.dts + create mode 100644 arch/arm/boot/dts/sama5d36ek_cmp.dts + create mode 100644 arch/arm/boot/dts/sama5d3xcm_cmp.dtsi + create mode 100644 arch/arm/boot/dts/sama5d3xmb_cmp.dtsi + create mode 100644 arch/arm/boot/dts/socfpga_arria10_socdk_nand.dts + create mode 100644 arch/arm/boot/dts/sun5i-a13-licheepi-one.dts + create mode 100644 arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts + create mode 100644 arch/arm/boot/dts/sun8i-h3-beelink-x2.dts + create mode 100644 arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts + create mode 100644 arch/arm/boot/dts/sun8i-v3s.dtsi + create mode 100644 arch/arm/boot/dts/vf610-zii-dev-rev-c.dts + create mode 100644 arch/arm/boot/dts/vf610-zii-dev.dtsi + create mode 100644 arch/arm/configs/tango4_defconfig + delete mode 100644 arch/arm/mach-ux500/board-mop500-audio.c + delete mode 100644 arch/arm/mach-ux500/board-mop500.h + delete mode 100644 arch/arm/mach-ux500/ste-dma40-db8500.h + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts + create mode 100644 arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi + create mode 100644 arch/arm64/boot/dts/broadcom/ns2-xmc.dts + create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi + create mode 100644 arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts + create mode 100644 arch/arm64/boot/dts/hisilicon/hi3660.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts + create mode 100644 drivers/reset/hisilicon/reset-hi3660.c + create mode 100644 drivers/reset/reset-zx2967.c + create mode 100644 drivers/soc/rockchip/grf.c + create mode 100644 drivers/soc/zte/Kconfig + create mode 100644 drivers/soc/zte/Makefile + create mode 100644 drivers/soc/zte/zx296718_pm_domains.c + create mode 100644 drivers/soc/zte/zx2967_pm_domains.c + create mode 100644 drivers/soc/zte/zx2967_pm_domains.h + create mode 100644 include/dt-bindings/clock/stm32fx-clock.h + create mode 100644 include/dt-bindings/power/rk3328-power.h + create mode 100644 include/dt-bindings/soc/zte,pm_domains.h +Merging amlogic/for-next (700501d48123 Merge v4.11/dt64) +$ git merge amlogic/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/amlogic.txt | 2 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm64/boot/dts/amlogic/Makefile | 8 +- + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 68 +++++++++++ + arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts | 50 ++++++++ + .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 11 ++ + .../boot/dts/amlogic/meson-gxbb-wetek-hub.dts | 66 +++++++++++ + .../boot/dts/amlogic/meson-gxbb-wetek-play2.dts | 94 +++++++++++++++ + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 128 ++++++++++++--------- + ...ox-a95x.dts => meson-gxl-s905x-nexbox-a95x.dts} | 0 + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 78 +++++++++++++ + ...{meson-gxm-s912-q200.dts => meson-gxm-q200.dts} | 0 + ...{meson-gxm-s912-q201.dts => meson-gxm-q201.dts} | 0 + arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 14 +++ + drivers/clk/meson/gxbb.c | 48 ++++++++ + drivers/clk/meson/gxbb.h | 15 ++- + include/dt-bindings/clock/gxbb-clkc.h | 6 + + 17 files changed, 523 insertions(+), 66 deletions(-) + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts + rename arch/arm64/boot/dts/amlogic/{meson-gxl-nexbox-a95x.dts => meson-gxl-s905x-nexbox-a95x.dts} (100%) + rename arch/arm64/boot/dts/amlogic/{meson-gxm-s912-q200.dts => meson-gxm-q200.dts} (100%) + rename arch/arm64/boot/dts/amlogic/{meson-gxm-s912-q201.dts => meson-gxm-q201.dts} (100%) +Merging aspeed/for-next (ab15e12960f1 Merge branches 'defconfig-for-v4.11', 'soc-for-v4.11' and 'dt-for-v4.11' into for-next) +$ git merge aspeed/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging at91/at91-next (e514f82c67c1 Merge tag 'at91-ab-4.11-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next) +$ git merge at91/at91-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging bcm2835/for-next (8d6e1b09237b Merge branch anholt/bcm2835-dt-next into for-next) +$ git merge bcm2835/for-next +Merge made by the 'recursive' strategy. +Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next) +$ git merge berlin/berlin/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings) +$ git merge cortex-m/for-next +Already up-to-date. +Merging imx-mxs/for-next (57aba12f97c2 Merge branch 'zte/pm-domains' into for-next) +$ git merge imx-mxs/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging keystone/next (9e07c85a01ec Merge branch 'for_4.11/keystone_dts' into next) +$ git merge keystone/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (f8e8eda32b4a Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Merge made by the 'recursive' strategy. +Merging omap/for-next (bfdc40158227 Merge branch 'omap-for-v4.11/dt' into for-next) +$ git merge omap/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/omap/omap.txt | 3 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/am335x-chiliboard.dts | 16 ++ + arch/arm/boot/dts/am335x-pcm-953.dtsi | 288 +++++++++++++++++++++ + arch/arm/boot/dts/am335x-phycore-rdk.dts | 27 ++ + 5 files changed, 335 insertions(+) + create mode 100644 arch/arm/boot/dts/am335x-pcm-953.dtsi + create mode 100644 arch/arm/boot/dts/am335x-phycore-rdk.dts +Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence) +$ git merge omap-pending/for-next +Already up-to-date. +Merging qcom/for-next (a844f941617c Merge tag 'qcom-arm64-for-4.11-2' into final-for-4.11) +$ git merge qcom/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging renesas/next (59fd3e06b3d7 Merge branches 'arm64-dt-for-v4.11', 'dt-for-v4.11' and 'soc-for-v4.11' into next) +$ git merge renesas/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging rockchip/for-next (0aab64671deb Merge branch 'v4.11-clk/next' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + .../bindings/clock/rockchip,rk3328-cru.txt | 57 ++ + .../bindings/clock/rockchip,rk3399-cru.txt | 6 + + drivers/clk/rockchip/Makefile | 2 + + drivers/clk/rockchip/clk-muxgrf.c | 102 +++ + drivers/clk/rockchip/clk-pll.c | 16 +- + drivers/clk/rockchip/clk-rk3188.c | 4 +- + drivers/clk/rockchip/clk-rk3288.c | 36 +- + drivers/clk/rockchip/clk-rk3328.c | 895 +++++++++++++++++++++ + drivers/clk/rockchip/clk-rk3399.c | 2 +- + drivers/clk/rockchip/clk.c | 8 +- + drivers/clk/rockchip/clk.h | 40 + + include/dt-bindings/clock/rk3188-cru-common.h | 2 + + include/dt-bindings/clock/rk3288-cru.h | 2 + + include/dt-bindings/clock/rk3328-cru.h | 400 +++++++++ + 14 files changed, 1550 insertions(+), 22 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3328-cru.txt + create mode 100644 drivers/clk/rockchip/clk-muxgrf.c + create mode 100644 drivers/clk/rockchip/clk-rk3328.c + create mode 100644 include/dt-bindings/clock/rk3328-cru.h +Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) +$ git merge rpi/for-rpi-next +Already up-to-date. +Merging samsung/for-next (1001354ca341 Linux 4.9-rc1) +$ git merge samsung/for-next +Already up-to-date. +Merging samsung-krzk/for-next (9689628ec120 Merge branch 'for-v4.11/drivers-soc-exynos-pmu-the-joy-never-ends' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 12 - + arch/arm64/boot/dts/exynos/exynos5433-tm2.dts | 34 +++ + arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts | 34 +++ + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 49 +++- + arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi | 302 +++++++++++---------- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 34 +++ + drivers/clk/samsung/clk-exynos5433.c | 8 +- + include/dt-bindings/clock/exynos5433.h | 5 +- + include/dt-bindings/pinctrl/samsung.h | 8 + + 9 files changed, 319 insertions(+), 167 deletions(-) +Merging tegra/for-next (6ef2dbf97439 Merge branch for-4.11/i2c into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + .../bindings/i2c/nvidia,tegra186-bpmp-i2c.txt | 42 ++ + drivers/clk/tegra/Kconfig | 4 + + drivers/clk/tegra/Makefile | 1 + + drivers/clk/tegra/clk-bpmp.c | 620 +++++++++++++++++++++ + drivers/i2c/busses/Kconfig | 11 + + drivers/i2c/busses/Makefile | 1 + + drivers/i2c/busses/i2c-tegra-bpmp.c | 365 ++++++++++++ + 7 files changed, 1044 insertions(+) + create mode 100644 Documentation/devicetree/bindings/i2c/nvidia,tegra186-bpmp-i2c.txt + create mode 100644 drivers/clk/tegra/clk-bpmp.c + create mode 100644 drivers/i2c/busses/i2c-tegra-bpmp.c +Merging arm64/for-next/core (2bf47e194608 arm64: head.S: Enable EL1 (host) access to SPE when entered at EL2) +$ git merge arm64/for-next/core +Auto-merging include/linux/cpuhotplug.h +Auto-merging drivers/firmware/qcom_scm-64.c +Auto-merging arch/arm64/mm/init.c +Auto-merging arch/arm64/kernel/traps.c +Auto-merging arch/arm64/kernel/topology.c +Auto-merging arch/arm64/include/asm/memory.h +Merge made by the 'recursive' strategy. + Documentation/arm64/cpu-feature-registers.txt | 240 ++++++ + Documentation/arm64/silicon-errata.txt | 46 +- + Documentation/perf/qcom_l2_pmu.txt | 38 + + arch/arm/kernel/armksyms.c | 4 +- + arch/arm/kernel/perf_event_v6.c | 6 +- + arch/arm/kernel/perf_event_v7.c | 6 +- + arch/arm/kernel/perf_event_xscale.c | 6 +- + arch/arm/kernel/smccc-call.S | 14 +- + arch/arm64/Kconfig | 17 +- + arch/arm64/Kconfig.debug | 8 + + arch/arm64/include/asm/cpucaps.h | 3 +- + arch/arm64/include/asm/cpufeature.h | 26 +- + arch/arm64/include/asm/cputype.h | 7 + + arch/arm64/include/asm/insn.h | 2 + + arch/arm64/include/asm/kvm_arm.h | 3 + + arch/arm64/include/asm/kvm_host.h | 7 +- + arch/arm64/include/asm/kvm_mmu.h | 4 +- + arch/arm64/include/asm/lse.h | 2 +- + arch/arm64/include/asm/memory.h | 66 +- + arch/arm64/include/asm/mmu_context.h | 6 +- + arch/arm64/include/asm/pgtable.h | 17 +- + arch/arm64/include/asm/processor.h | 1 - + arch/arm64/include/asm/sysreg.h | 26 +- + arch/arm64/include/asm/tlbflush.h | 18 +- + arch/arm64/include/asm/uaccess.h | 4 +- + arch/arm64/include/uapi/asm/hwcap.h | 2 + + arch/arm64/kernel/Makefile | 4 + + arch/arm64/kernel/acpi_parking_protocol.c | 3 +- + arch/arm64/kernel/arm64ksyms.c | 4 +- + arch/arm64/kernel/armv8_deprecated.c | 2 +- + arch/arm64/kernel/asm-offsets.c | 7 +- + arch/arm64/kernel/cacheinfo.c | 13 +- + arch/arm64/kernel/cpu-reset.h | 2 +- + arch/arm64/kernel/cpu_errata.c | 24 +- + arch/arm64/kernel/cpufeature.c | 426 +++++++---- + arch/arm64/kernel/cpuinfo.c | 2 + + arch/arm64/kernel/efi-entry.S | 9 +- + arch/arm64/kernel/entry-ftrace.S | 12 +- + arch/arm64/kernel/head.S | 73 +- + arch/arm64/kernel/hibernate.c | 26 +- + arch/arm64/kernel/insn.c | 31 +- + arch/arm64/kernel/process.c | 6 +- + arch/arm64/kernel/psci.c | 3 +- + arch/arm64/kernel/setup.c | 13 +- + arch/arm64/kernel/smccc-call.S | 23 +- + arch/arm64/kernel/smp.c | 4 +- + arch/arm64/kernel/smp_spin_table.c | 3 +- + arch/arm64/kernel/topology.c | 2 - + arch/arm64/kernel/traps.c | 9 +- + arch/arm64/kernel/vdso.c | 8 +- + arch/arm64/kvm/debug.c | 6 + + arch/arm64/kvm/hyp/debug-sr.c | 66 +- + arch/arm64/kvm/hyp/switch.c | 17 +- + arch/arm64/kvm/hyp/tlb.c | 13 +- + arch/arm64/mm/Makefile | 2 + + arch/arm64/mm/dma-mapping.c | 38 +- + arch/arm64/mm/fault.c | 14 - + arch/arm64/mm/init.c | 12 +- + arch/arm64/mm/ioremap.c | 2 +- + arch/arm64/mm/kasan_init.c | 22 +- + arch/arm64/mm/mmu.c | 33 +- + arch/arm64/mm/physaddr.c | 30 + + drivers/acpi/arm64/iort.c | 8 +- + drivers/firmware/psci.c | 2 +- + drivers/firmware/qcom_scm-64.c | 13 +- + drivers/of/base.c | 26 + + drivers/perf/Kconfig | 9 + + drivers/perf/Makefile | 1 + + drivers/perf/qcom_l2_pmu.c | 1013 +++++++++++++++++++++++++ + drivers/perf/xgene_pmu.c | 1 + + include/linux/arm-smccc.h | 52 +- + include/linux/cpuhotplug.h | 1 + + include/linux/of.h | 1 + + 73 files changed, 2268 insertions(+), 402 deletions(-) + create mode 100644 Documentation/arm64/cpu-feature-registers.txt + create mode 100644 Documentation/perf/qcom_l2_pmu.txt + create mode 100644 arch/arm64/mm/physaddr.c + create mode 100644 drivers/perf/qcom_l2_pmu.c +Merging clk/clk-next (09bdcd6e1784 clk: sunxi-ng: sun9i-a80: Fix wrong pointer passed to PTR_ERR()) +$ git merge clk/clk-next +Auto-merging include/linux/platform_data/x86/pmc_atom.h +Removing include/dt-bindings/clock/exynos4415.h +Auto-merging drivers/platform/x86/pmc_atom.c +Auto-merging drivers/platform/x86/Kconfig +Removing drivers/clk/samsung/clk-exynos4415.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/arm/boot/dts/sun9i-a80.dtsi +Auto-merging arch/arm/boot/dts/sun5i.dtsi +Auto-merging arch/arm/boot/dts/sun5i-gr8.dtsi +Auto-merging arch/arm/boot/dts/sun5i-a13.dtsi +Auto-merging arch/arm/boot/dts/sun5i-a10s.dtsi +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/clock/exynos4415-clock.txt +Merge made by the 'recursive' strategy. + .../bindings/clock/brcm,bcm2835-cprman.txt | 15 +- + .../devicetree/bindings/clock/exynos4415-clock.txt | 38 - + .../devicetree/bindings/clock/hi3660-clock.txt | 42 + + .../devicetree/bindings/clock/idt,versaclock5.txt | 65 ++ + .../bindings/clock/mvebu-corediv-clock.txt | 1 + + .../devicetree/bindings/clock/mvebu-cpu-clock.txt | 1 + + .../devicetree/bindings/clock/qcom,rpmcc.txt | 1 + + .../devicetree/bindings/clock/renesas,cpg-mssr.txt | 6 + + .../devicetree/bindings/clock/st,stm32-rcc.txt | 20 + + .../bindings/clock/stericsson,abx500.txt | 20 + + .../devicetree/bindings/clock/sun9i-de.txt | 28 + + .../devicetree/bindings/clock/sun9i-usb.txt | 24 + + .../devicetree/bindings/clock/sunxi-ccu.txt | 2 + + .../devicetree/bindings/clock/ti,cdce925.txt | 15 +- + .../devicetree/bindings/clock/zx296718-clk.txt | 3 + + MAINTAINERS | 5 + + arch/arm/boot/dts/sun5i-a10s.dtsi | 85 +- + arch/arm/boot/dts/sun5i-a13.dtsi | 140 +-- + arch/arm/boot/dts/sun5i-gr8.dtsi | 520 +-------- + arch/arm/boot/dts/sun5i-r8.dtsi | 10 +- + arch/arm/boot/dts/sun5i.dtsi | 353 +----- + arch/arm/boot/dts/sun9i-a80.dtsi | 404 ++----- + arch/x86/Kconfig | 4 - + arch/x86/platform/atom/Makefile | 1 - + drivers/acpi/acpi_lpss.c | 2 +- + drivers/clk/Kconfig | 21 +- + drivers/clk/Makefile | 3 + + drivers/clk/axs10x/i2s_pll_clock.c | 1 + + drivers/clk/bcm/clk-bcm2835.c | 303 ++++- + drivers/clk/clk-cdce925.c | 108 +- + drivers/clk/clk-conf.c | 15 +- + drivers/clk/clk-cs2000-cp.c | 22 + + drivers/clk/clk-scpi.c | 14 +- + drivers/clk/clk-stm32f4.c | 872 +++++++++++++- + drivers/clk/clk-versaclock5.c | 791 +++++++++++++ + drivers/clk/clk-wm831x.c | 3 +- + drivers/clk/hisilicon/Kconfig | 7 + + drivers/clk/hisilicon/Makefile | 1 + + drivers/clk/hisilicon/clk-hi3660.c | 567 +++++++++ + drivers/clk/hisilicon/clkgate-separated.c | 1 + + drivers/clk/imx/clk-imx6q.c | 21 +- + drivers/clk/imx/clk-imx7d.c | 1 + + drivers/clk/imx/clk-pllv3.c | 99 ++ + drivers/clk/imx/clk-vf610.c | 4 +- + drivers/clk/imx/clk.h | 1 + + drivers/clk/mediatek/Kconfig | 19 +- + drivers/clk/meson/meson8b.c | 1 - + drivers/clk/mvebu/ap806-system-controller.c | 28 +- + drivers/clk/mvebu/armada-xp.c | 39 + + drivers/clk/mvebu/clk-corediv.c | 23 + + drivers/clk/mvebu/clk-cpu.c | 8 + + drivers/clk/qcom/clk-smd-rpm.c | 71 ++ + drivers/clk/qcom/gcc-ipq4019.c | 479 +++++++- + drivers/clk/qcom/gcc-mdm9615.c | 30 + + drivers/clk/qcom/gcc-msm8994.c | 18 + + drivers/clk/qcom/gcc-msm8996.c | 1 + + drivers/clk/qcom/gdsc.c | 58 +- + drivers/clk/renesas/clk-mstp.c | 11 +- + drivers/clk/renesas/r8a7795-cpg-mssr.c | 1 + + drivers/clk/renesas/r8a7796-cpg-mssr.c | 10 + + drivers/clk/renesas/renesas-cpg-mssr.c | 149 ++- + drivers/clk/samsung/Makefile | 1 - + drivers/clk/samsung/clk-exynos-audss.c | 24 +- + drivers/clk/samsung/clk-exynos4415.c | 1022 ---------------- + drivers/clk/samsung/clk-exynos5433.c | 36 +- + drivers/clk/samsung/clk-pll.c | 45 +- + drivers/clk/samsung/clk-s3c2410.c | 4 +- + drivers/clk/samsung/clk-s3c2412.c | 4 +- + drivers/clk/samsung/clk-s3c2443.c | 4 +- + drivers/clk/samsung/clk-s3c64xx.c | 4 +- + drivers/clk/sunxi-ng/Kconfig | 32 + + drivers/clk/sunxi-ng/Makefile | 5 + + drivers/clk/sunxi-ng/ccu-sun5i.c | 1022 ++++++++++++++++ + drivers/clk/sunxi-ng/ccu-sun5i.h | 67 ++ + drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 4 +- + drivers/clk/sunxi-ng/ccu-sun8i-a33.c | 16 +- + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 10 + + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 591 ++++++++++ + drivers/clk/sunxi-ng/ccu-sun8i-v3s.h | 63 + + drivers/clk/sunxi-ng/ccu-sun9i-a80-de.c | 283 +++++ + drivers/clk/sunxi-ng/ccu-sun9i-a80-de.h | 33 + + drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c | 144 +++ + drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.h | 25 + + drivers/clk/sunxi-ng/ccu-sun9i-a80.c | 1223 ++++++++++++++++++++ + drivers/clk/sunxi-ng/ccu-sun9i-a80.h | 57 + + drivers/clk/sunxi-ng/ccu_common.c | 24 +- + drivers/clk/sunxi-ng/ccu_common.h | 4 + + drivers/clk/sunxi-ng/ccu_div.c | 12 + + drivers/clk/sunxi-ng/ccu_div.h | 10 +- + drivers/clk/sunxi-ng/ccu_mp.c | 10 +- + drivers/clk/sunxi-ng/ccu_mult.c | 30 +- + drivers/clk/sunxi-ng/ccu_mult.h | 24 +- + drivers/clk/sunxi-ng/ccu_mux.c | 43 +- + drivers/clk/sunxi-ng/ccu_nk.c | 22 +- + drivers/clk/sunxi-ng/ccu_nkm.c | 26 +- + drivers/clk/sunxi-ng/ccu_nkmp.c | 25 +- + drivers/clk/sunxi-ng/ccu_nm.c | 17 +- + drivers/clk/ti/divider.c | 31 +- + drivers/clk/uniphier/clk-uniphier-core.c | 7 +- + drivers/clk/uniphier/clk-uniphier-cpugear.c | 1 - + drivers/clk/uniphier/clk-uniphier-sys.c | 21 + + drivers/clk/ux500/abx500-clk.c | 44 +- + drivers/clk/ux500/u8500_of_clk.c | 3 + + drivers/clk/x86/Makefile | 1 + + drivers/clk/x86/clk-pmc-atom.c | 371 ++++++ + drivers/clk/zte/clk-zx296718.c | 154 ++- + drivers/clk/zte/clk.c | 127 ++ + drivers/clk/zte/clk.h | 21 + + drivers/platform/x86/Kconfig | 5 + + drivers/platform/x86/Makefile | 1 + + .../atom => drivers/platform/x86}/pmc_atom.c | 88 +- + include/dt-bindings/clock/bcm2835.h | 2 + + include/dt-bindings/clock/exynos4415.h | 360 ------ + include/dt-bindings/clock/hi3660-clock.h | 194 ++++ + include/dt-bindings/clock/imx7d-clock.h | 3 +- + include/dt-bindings/clock/qcom,gcc-ipq4019.h | 11 + + include/dt-bindings/clock/qcom,gcc-mdm9615.h | 2 + + include/dt-bindings/clock/qcom,gcc-msm8994.h | 1 + + include/dt-bindings/clock/qcom,gcc-msm8996.h | 1 + + include/dt-bindings/clock/qcom,rpmcc.h | 40 +- + include/dt-bindings/clock/ste-ab8500.h | 11 + + include/dt-bindings/clock/stm32fx-clock.h | 20 + + include/dt-bindings/clock/sun5i-ccu.h | 103 ++ + include/dt-bindings/clock/sun8i-v3s-ccu.h | 107 ++ + include/dt-bindings/clock/sun9i-a80-ccu.h | 162 +++ + include/dt-bindings/clock/sun9i-a80-de.h | 80 ++ + include/dt-bindings/clock/sun9i-a80-usb.h | 59 + + include/dt-bindings/reset/sun5i-ccu.h | 32 + + include/dt-bindings/reset/sun8i-v3s-ccu.h | 78 ++ + include/dt-bindings/reset/sun9i-a80-ccu.h | 102 ++ + include/dt-bindings/reset/sun9i-a80-de.h | 58 + + include/dt-bindings/reset/sun9i-a80-usb.h | 56 + + include/linux/platform_data/x86/clk-pmc-atom.h | 44 + + .../linux/platform_data/x86}/pmc_atom.h | 2 +- + 134 files changed, 9932 insertions(+), 3043 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/exynos4415-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/hi3660-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/idt,versaclock5.txt + create mode 100644 Documentation/devicetree/bindings/clock/stericsson,abx500.txt + create mode 100644 Documentation/devicetree/bindings/clock/sun9i-de.txt + create mode 100644 Documentation/devicetree/bindings/clock/sun9i-usb.txt + create mode 100644 drivers/clk/clk-versaclock5.c + create mode 100644 drivers/clk/hisilicon/clk-hi3660.c + delete mode 100644 drivers/clk/samsung/clk-exynos4415.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun5i.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun5i.h + create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-v3s.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-v3s.h + create mode 100644 drivers/clk/sunxi-ng/ccu-sun9i-a80-de.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun9i-a80-de.h + create mode 100644 drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.h + create mode 100644 drivers/clk/sunxi-ng/ccu-sun9i-a80.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun9i-a80.h + create mode 100644 drivers/clk/x86/clk-pmc-atom.c + rename {arch/x86/platform/atom => drivers/platform/x86}/pmc_atom.c (87%) + delete mode 100644 include/dt-bindings/clock/exynos4415.h + create mode 100644 include/dt-bindings/clock/hi3660-clock.h + create mode 100644 include/dt-bindings/clock/ste-ab8500.h + create mode 100644 include/dt-bindings/clock/sun5i-ccu.h + create mode 100644 include/dt-bindings/clock/sun8i-v3s-ccu.h + create mode 100644 include/dt-bindings/clock/sun9i-a80-ccu.h + create mode 100644 include/dt-bindings/clock/sun9i-a80-de.h + create mode 100644 include/dt-bindings/clock/sun9i-a80-usb.h + create mode 100644 include/dt-bindings/reset/sun5i-ccu.h + create mode 100644 include/dt-bindings/reset/sun8i-v3s-ccu.h + create mode 100644 include/dt-bindings/reset/sun9i-a80-ccu.h + create mode 100644 include/dt-bindings/reset/sun9i-a80-de.h + create mode 100644 include/dt-bindings/reset/sun9i-a80-usb.h + create mode 100644 include/linux/platform_data/x86/clk-pmc-atom.h + rename {arch/x86/include/asm => include/linux/platform_data/x86}/pmc_atom.h (98%) +Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe) +$ git merge blackfin/for-linus +Resolved 'arch/blackfin/mach-common/pm.c' using previous resolution. +Auto-merging arch/blackfin/mach-common/pm.c +CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 24fc9a2c4400] Merge remote-tracking branch 'blackfin/for-linus' +$ git diff -M --stat --summary HEAD^.. +Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE)) +$ git merge cris/for-next +Already up-to-date. +Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h) +$ git merge h8300/h8300-next +Merge made by the 'recursive' strategy. +Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error") +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (ecdc35c45398 m68k: Delete an unnecessary variable assignment in sys_cacheflush()) +$ git merge m68k/for-next +Merge made by the 'recursive' strategy. + arch/m68k/configs/amiga_defconfig | 16 ++++++- + arch/m68k/configs/apollo_defconfig | 16 ++++++- + arch/m68k/configs/atari_defconfig | 16 ++++++- + arch/m68k/configs/bvme6000_defconfig | 16 ++++++- + arch/m68k/configs/hp300_defconfig | 16 ++++++- + arch/m68k/configs/mac_defconfig | 16 ++++++- + arch/m68k/configs/multi_defconfig | 16 ++++++- + arch/m68k/configs/mvme147_defconfig | 16 ++++++- + arch/m68k/configs/mvme16x_defconfig | 16 ++++++- + arch/m68k/configs/q40_defconfig | 16 ++++++- + arch/m68k/configs/sun3_defconfig | 16 ++++++- + arch/m68k/configs/sun3x_defconfig | 16 ++++++- + arch/m68k/include/asm/macints.h | 16 ------- + arch/m68k/kernel/sys_m68k.c | 1 - + arch/m68k/mac/baboon.c | 16 ------- + arch/m68k/mac/macints.c | 87 ++++-------------------------------- + arch/m68k/mac/misc.c | 1 - + arch/m68k/mac/oss.c | 20 --------- + arch/m68k/mac/psc.c | 11 ----- + arch/m68k/mac/via.c | 8 ---- + 20 files changed, 176 insertions(+), 176 deletions(-) +Merging m68knommu/for-next (dd51779bf9a6 m68k/defconfig: amcore board defconfig tuning) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/configs/amcore_defconfig | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) +Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (3400606d8ffd microblaze: Add new fpga families) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (b9564010df62 MIPS: Fix protected_cache(e)_op() for microMIPS) +$ git merge mips/mips-for-linux-next +Auto-merging drivers/of/base.c +Removing arch/mips/kernel/mips_ksyms.c +Removing arch/mips/include/asm/unaligned.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/mips/img/pistachio-marduk.txt | 10 + + MAINTAINERS | 8 +- + arch/mips/Kconfig | 41 +- + arch/mips/Makefile | 20 +- + arch/mips/Makefile.postlink | 35 + + arch/mips/alchemy/board-gpr.c | 1 - + arch/mips/ath79/clock.c | 9 +- + arch/mips/bcm47xx/board.c | 9 + + arch/mips/bcm47xx/buttons.c | 72 ++ + arch/mips/bcm47xx/leds.c | 81 ++ + arch/mips/boot/compressed/Makefile | 10 +- + arch/mips/boot/dts/brcm/bcm7125.dtsi | 49 +- + arch/mips/boot/dts/brcm/bcm7346.dtsi | 43 + + arch/mips/boot/dts/brcm/bcm7358.dtsi | 43 + + arch/mips/boot/dts/brcm/bcm7360.dtsi | 43 + + arch/mips/boot/dts/brcm/bcm7362.dtsi | 43 + + arch/mips/boot/dts/brcm/bcm7420.dtsi | 49 +- + arch/mips/boot/dts/brcm/bcm7425.dtsi | 43 + + arch/mips/boot/dts/brcm/bcm7435.dtsi | 43 + + arch/mips/boot/dts/brcm/bcm97125cbmb.dts | 4 + + arch/mips/boot/dts/brcm/bcm97346dbsmb.dts | 4 + + arch/mips/boot/dts/brcm/bcm97358svmb.dts | 36 + + arch/mips/boot/dts/brcm/bcm97360svmb.dts | 36 + + arch/mips/boot/dts/brcm/bcm97362svmb.dts | 4 + + arch/mips/boot/dts/brcm/bcm97420c.dts | 4 + + arch/mips/boot/dts/brcm/bcm97425svmb.dts | 36 + + arch/mips/boot/dts/brcm/bcm97435svmb.dts | 4 + + arch/mips/boot/dts/img/Makefile | 9 + + arch/mips/boot/dts/img/pistachio.dtsi | 924 +++++++++++++++++++++ + arch/mips/boot/dts/img/pistachio_marduk.dts | 163 ++++ + arch/mips/boot/dts/xilfpga/nexys4ddr.dts | 63 ++ + arch/mips/cavium-octeon/dma-octeon.c | 15 +- + .../cavium-octeon/executive/cvmx-helper-rgmii.c | 3 +- + .../cavium-octeon/executive/cvmx-helper-sgmii.c | 3 +- + .../mips/cavium-octeon/executive/cvmx-helper-spi.c | 3 +- + .../cavium-octeon/executive/cvmx-helper-xaui.c | 3 +- + arch/mips/cavium-octeon/executive/cvmx-helper.c | 47 +- + arch/mips/cavium-octeon/octeon-memcpy.S | 5 + + arch/mips/cavium-octeon/setup.c | 23 + + arch/mips/cavium-octeon/smp.c | 21 +- + arch/mips/configs/ip22_defconfig | 4 +- + arch/mips/configs/ip27_defconfig | 2 +- + arch/mips/configs/lemote2f_defconfig | 2 +- + arch/mips/configs/loongson1b_defconfig | 4 + + arch/mips/configs/loongson1c_defconfig | 4 + + arch/mips/configs/malta_defconfig | 4 +- + arch/mips/configs/malta_kvm_defconfig | 4 +- + arch/mips/configs/malta_kvm_guest_defconfig | 4 +- + arch/mips/configs/maltaup_xpa_defconfig | 4 +- + arch/mips/configs/nlm_xlp_defconfig | 2 +- + arch/mips/configs/nlm_xlr_defconfig | 2 +- + arch/mips/configs/xilfpga_defconfig | 37 +- + arch/mips/configs/xway_defconfig | 21 +- + arch/mips/emma/markeins/setup.c | 2 +- + arch/mips/generic/Makefile | 1 + + arch/mips/generic/init.c | 13 + + arch/mips/generic/kexec.c | 44 + + arch/mips/include/asm/Kbuild | 2 + + arch/mips/include/asm/asm-prototypes.h | 5 + + arch/mips/include/asm/asm.h | 10 +- + arch/mips/include/asm/bootinfo.h | 13 + + arch/mips/include/asm/checksum.h | 2 + + arch/mips/include/asm/elf.h | 9 + + arch/mips/include/asm/highmem.h | 3 - + arch/mips/include/asm/i8259.h | 1 - + arch/mips/include/asm/irq.h | 12 + + arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h | 9 + + .../asm/mach-cavium-octeon/kernel-entry-init.h | 15 +- + arch/mips/include/asm/mach-ip27/spaces.h | 6 +- + arch/mips/include/asm/mach-loongson32/loongson1.h | 9 +- + arch/mips/include/asm/mach-loongson32/platform.h | 9 +- + arch/mips/include/asm/mach-loongson32/regs-rtc.h | 23 + + arch/mips/include/asm/mach-ralink/mt7620.h | 7 +- + arch/mips/include/asm/mips-cm.h | 7 + + arch/mips/include/asm/octeon/cvmx-helper-rgmii.h | 3 +- + arch/mips/include/asm/octeon/cvmx-helper-sgmii.h | 3 +- + arch/mips/include/asm/octeon/cvmx-helper-spi.h | 3 +- + arch/mips/include/asm/octeon/cvmx-helper-xaui.h | 3 +- + arch/mips/include/asm/octeon/cvmx-helper.h | 14 +- + arch/mips/include/asm/pgalloc.h | 16 +- + arch/mips/include/asm/r4kcache.h | 61 +- + arch/mips/include/asm/smp.h | 10 +- + arch/mips/include/asm/stackframe.h | 19 +- + arch/mips/include/asm/switch_to.h | 18 +- + arch/mips/include/asm/thread_info.h | 1 - + arch/mips/include/asm/tlbex.h | 26 + + arch/mips/include/asm/uaccess.h | 18 + + arch/mips/include/asm/uasm.h | 5 + + arch/mips/include/asm/unaligned.h | 28 - + arch/mips/kernel/Makefile | 4 +- + arch/mips/kernel/asm-offsets.c | 2 +- + arch/mips/kernel/cacheinfo.c | 85 ++ + arch/mips/kernel/cpu-bugs64.c | 24 +- + arch/mips/kernel/crash.c | 2 +- + arch/mips/kernel/entry.S | 18 - + arch/mips/kernel/genex.S | 81 +- + arch/mips/kernel/irq.c | 11 + + arch/mips/kernel/linux32.c | 11 +- + arch/mips/kernel/machine_kexec.c | 22 + + arch/mips/kernel/mcount.S | 3 + + arch/mips/kernel/mips-mt-fpaff.c | 5 +- + arch/mips/kernel/mips-r2-to-r6-emul.c | 12 +- + arch/mips/kernel/mips_ksyms.c | 94 --- + arch/mips/kernel/process.c | 214 +++-- + arch/mips/kernel/prom.c | 7 + + arch/mips/kernel/ptrace.c | 34 +- + arch/mips/kernel/r2300_switch.S | 2 + + arch/mips/kernel/r4k_switch.S | 3 + + arch/mips/kernel/relocate.c | 56 +- + arch/mips/kernel/setup.c | 94 ++- + arch/mips/kernel/smp-bmips.c | 2 +- + arch/mips/kernel/smp-cps.c | 7 +- + arch/mips/kernel/smp.c | 34 +- + arch/mips/kernel/syscall.c | 11 +- + arch/mips/kernel/traps.c | 65 +- + arch/mips/kernel/uprobes.c | 2 +- + arch/mips/kernel/vmlinux.lds.S | 2 +- + arch/mips/lantiq/xway/dma.c | 38 +- + arch/mips/lantiq/xway/sysctrl.c | 4 +- + arch/mips/lib/csum_partial.S | 6 + + arch/mips/lib/memcpy.S | 9 + + arch/mips/lib/memset.S | 5 + + arch/mips/lib/strlen_user.S | 4 + + arch/mips/lib/strncpy_user.S | 7 + + arch/mips/lib/strnlen_user.S | 7 + + arch/mips/loongson32/common/platform.c | 45 +- + arch/mips/loongson32/ls1b/board.c | 7 +- + arch/mips/loongson32/ls1c/board.c | 7 +- + arch/mips/loongson64/common/dma-swiotlb.c | 20 +- + arch/mips/loongson64/loongson-3/smp.c | 1 - + arch/mips/mm/Makefile | 2 +- + arch/mips/mm/c-r4k.c | 6 +- + arch/mips/mm/init.c | 3 + + arch/mips/mm/mmap.c | 10 +- + arch/mips/mm/page-funcs.S | 3 + + arch/mips/mm/page.c | 2 + + arch/mips/mm/pgtable-64.c | 2 + + arch/mips/mm/pgtable.c | 25 + + arch/mips/mm/sc-ip22.c | 54 +- + arch/mips/mm/sc-mips.c | 1 + + arch/mips/mm/tlbex.c | 44 +- + arch/mips/netlogic/common/irq.c | 4 +- + arch/mips/netlogic/common/smpboot.S | 4 +- + arch/mips/netlogic/xlp/wakeup.c | 2 +- + arch/mips/pci/pci-tx4927.c | 22 +- + arch/mips/pci/pci-tx4938.c | 30 +- + arch/mips/pci/pci-tx4939.c | 10 +- + arch/mips/ralink/Kconfig | 1 + + arch/mips/ralink/clk.c | 6 + + arch/mips/ralink/irq.c | 4 +- + arch/mips/ralink/mt7620.c | 31 +- + arch/mips/ralink/mt7621.c | 2 +- + arch/mips/ralink/of.c | 16 +- + arch/mips/ralink/prom.c | 9 +- + arch/mips/ralink/rt288x.c | 11 +- + arch/mips/ralink/rt305x.c | 13 +- + arch/mips/ralink/rt3883.c | 14 +- + arch/mips/ralink/timer.c | 14 - + arch/mips/sgi-ip22/Platform | 2 +- + arch/mips/sgi-ip27/ip27-klnuma.c | 2 +- + arch/mips/sgi-ip32/ip32-irq.c | 4 +- + arch/mips/txx9/generic/7segled.c | 4 +- + arch/mips/txx9/generic/pci.c | 28 +- + arch/mips/txx9/generic/setup_tx3927.c | 6 +- + arch/mips/txx9/generic/setup_tx4927.c | 20 +- + arch/mips/txx9/generic/setup_tx4938.c | 28 +- + arch/mips/txx9/generic/setup_tx4939.c | 8 +- + arch/mips/txx9/generic/smsc_fdc37m81x.c | 17 +- + arch/mips/txx9/jmr3927/prom.c | 2 +- + arch/mips/txx9/jmr3927/setup.c | 11 +- + arch/mips/txx9/rbtx4938/setup.c | 14 +- + arch/mips/vdso/Makefile | 7 +- + arch/mips/xilfpga/intc.c | 7 +- + drivers/of/base.c | 2 +- + drivers/of/fdt.c | 9 +- + 175 files changed, 3321 insertions(+), 848 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mips/img/pistachio-marduk.txt + create mode 100644 arch/mips/Makefile.postlink + create mode 100644 arch/mips/boot/dts/img/Makefile + create mode 100644 arch/mips/boot/dts/img/pistachio.dtsi + create mode 100644 arch/mips/boot/dts/img/pistachio_marduk.dts + create mode 100644 arch/mips/generic/kexec.c + create mode 100644 arch/mips/include/asm/asm-prototypes.h + create mode 100644 arch/mips/include/asm/mach-loongson32/regs-rtc.h + create mode 100644 arch/mips/include/asm/tlbex.h + delete mode 100644 arch/mips/include/asm/unaligned.h + create mode 100644 arch/mips/kernel/cacheinfo.c + delete mode 100644 arch/mips/kernel/mips_ksyms.c + create mode 100644 arch/mips/mm/pgtable.c +Merging nios2/for-next (744606c76c4a nios2: add screen_info) +$ git merge nios2/for-next +Already up-to-date. +Merging openrisc/for-next (07d7c4560b7a openrisc: head: Init r0 to 0 on start) +$ git merge openrisc/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/openrisc/Kconfig | 1 + + arch/openrisc/TODO.openrisc | 1 - + arch/openrisc/include/asm/Kbuild | 5 +- + arch/openrisc/include/asm/atomic.h | 53 +++++++ + arch/openrisc/include/asm/bitops.h | 2 +- + arch/openrisc/include/asm/bitops/atomic.h | 123 +++++++++++++++ + arch/openrisc/include/asm/cmpxchg.h | 82 ++++++++++ + arch/openrisc/include/asm/cpuinfo.h | 2 + + arch/openrisc/include/asm/futex.h | 135 +++++++++++++++++ + arch/openrisc/include/asm/spinlock.h | 232 ++++++++++++++++++++++++++++- + arch/openrisc/include/asm/spinlock_types.h | 28 ++++ + arch/openrisc/include/asm/spr_defs.h | 4 +- + arch/openrisc/include/asm/string.h | 10 ++ + arch/openrisc/kernel/.gitignore | 1 + + arch/openrisc/kernel/entry.S | 60 +++++--- + arch/openrisc/kernel/head.S | 200 ++++++++++--------------- + arch/openrisc/kernel/or32_ksyms.c | 1 + + arch/openrisc/kernel/process.c | 17 +++ + arch/openrisc/kernel/ptrace.c | 1 - + arch/openrisc/kernel/setup.c | 67 +++++---- + arch/openrisc/kernel/traps.c | 183 +++++++++++++++++++++++ + arch/openrisc/lib/Makefile | 2 +- + arch/openrisc/lib/memcpy.c | 124 +++++++++++++++ + arch/openrisc/lib/memset.S | 98 ++++++++++++ + arch/openrisc/mm/ioremap.c | 2 + + scripts/checkstack.pl | 3 + + 27 files changed, 1250 insertions(+), 188 deletions(-) + create mode 100644 arch/openrisc/include/asm/atomic.h + create mode 100644 arch/openrisc/include/asm/bitops/atomic.h + create mode 100644 arch/openrisc/include/asm/cmpxchg.h + create mode 100644 arch/openrisc/include/asm/futex.h + create mode 100644 arch/openrisc/include/asm/spinlock_types.h + create mode 100644 arch/openrisc/include/asm/string.h + create mode 100644 arch/openrisc/kernel/.gitignore + create mode 100644 arch/openrisc/lib/memcpy.c + create mode 100644 arch/openrisc/lib/memset.S +Merging parisc-hd/for-next (69973b830859 Linux 4.9) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (de55ce0de94b Documentation: powerpc/fsl: Update compatible for l2cache binding) +$ git merge powerpc/next +Resolved 'arch/powerpc/Kconfig' using previous resolution. +Removing drivers/macintosh/via-maciisi.c +Auto-merging arch/powerpc/platforms/powernv/smp.c +Auto-merging arch/powerpc/mm/pgtable-radix.c +Auto-merging arch/powerpc/kernel/asm-offsets.c +Auto-merging arch/powerpc/kernel/Makefile +Auto-merging arch/powerpc/include/asm/reg.h +Auto-merging arch/powerpc/include/asm/mmu.h +Auto-merging arch/powerpc/Kconfig +CONFLICT (content): Merge conflict in arch/powerpc/Kconfig +Auto-merging arch/m68k/mac/misc.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 702725937b85] Merge remote-tracking branch 'powerpc/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/powerpc/fsl/l2cache.txt | 42 +- + .../devicetree/bindings/powerpc/opal/power-mgt.txt | 118 ++++ + arch/m68k/include/asm/macintosh.h | 2 +- + arch/m68k/mac/config.c | 18 +- + arch/m68k/mac/misc.c | 72 +-- + arch/powerpc/Kconfig | 4 +- + arch/powerpc/Kconfig.debug | 3 +- + arch/powerpc/boot/.gitignore | 4 + + arch/powerpc/configs/powernv_defconfig | 11 +- + arch/powerpc/configs/ppc64_defconfig | 7 + + arch/powerpc/configs/pseries_defconfig | 8 + + arch/powerpc/include/asm/book3s/64/hash.h | 4 +- + arch/powerpc/include/asm/book3s/64/mmu-hash.h | 7 +- + arch/powerpc/include/asm/book3s/64/pgtable-64k.h | 5 - + arch/powerpc/include/asm/book3s/64/radix.h | 5 + + arch/powerpc/include/asm/cache.h | 23 +- + arch/powerpc/include/asm/checksum.h | 21 +- + arch/powerpc/include/asm/cpuidle.h | 49 +- + arch/powerpc/include/asm/elf.h | 42 ++ + arch/powerpc/include/asm/head-64.h | 230 +++---- + arch/powerpc/include/asm/isa-bridge.h | 29 + + arch/powerpc/include/asm/mmu.h | 1 + + arch/powerpc/include/asm/opal-api.h | 3 +- + arch/powerpc/include/asm/opal.h | 1 + + arch/powerpc/include/asm/page_64.h | 4 +- + arch/powerpc/include/asm/pci-bridge.h | 18 - + arch/powerpc/include/asm/powernv.h | 19 + + arch/powerpc/include/asm/processor.h | 3 +- + arch/powerpc/include/asm/reg.h | 2 +- + arch/powerpc/include/asm/rtas.h | 1 + + arch/powerpc/include/asm/uaccess.h | 6 +- + arch/powerpc/include/uapi/asm/auxvec.h | 33 +- + arch/powerpc/include/uapi/asm/elf.h | 23 - + arch/powerpc/kernel/Makefile | 2 +- + arch/powerpc/kernel/align.c | 2 +- + arch/powerpc/kernel/asm-offsets.c | 12 +- + arch/powerpc/kernel/exceptions-64s.S | 203 +++--- + arch/powerpc/kernel/fadump.c | 25 +- + arch/powerpc/kernel/idle_book3s.S | 40 +- + arch/powerpc/kernel/iomap.c | 1 + + arch/powerpc/kernel/isa-bridge.c | 92 +++ + arch/powerpc/kernel/legacy_serial.c | 3 +- + arch/powerpc/kernel/misc_64.S | 28 +- + arch/powerpc/kernel/rtas.c | 32 +- + arch/powerpc/kernel/rtasd.c | 7 +- + arch/powerpc/kernel/setup-common.c | 9 + + arch/powerpc/kernel/setup_32.c | 8 - + arch/powerpc/kernel/setup_64.c | 196 +++--- + arch/powerpc/kernel/vdso.c | 18 +- + arch/powerpc/lib/Makefile | 2 - + arch/powerpc/lib/checksum_64.S | 12 +- + arch/powerpc/lib/copypage_64.S | 4 +- + arch/powerpc/lib/sstep.c | 6 +- + arch/powerpc/lib/string_64.S | 6 +- + arch/powerpc/mm/hugetlbpage-hash64.c | 21 - + arch/powerpc/mm/numa.c | 13 +- + arch/powerpc/mm/pgtable-book3s64.c | 4 +- + arch/powerpc/mm/pgtable-radix.c | 259 ++++++-- + arch/powerpc/mm/pgtable_64.c | 6 +- + arch/powerpc/mm/subpage-prot.c | 4 +- + arch/powerpc/net/bpf_jit_comp.c | 17 +- + arch/powerpc/net/bpf_jit_comp64.c | 16 +- + arch/powerpc/platforms/maple/pci.c | 1 + + arch/powerpc/platforms/powernv/idle.c | 142 ++++- + arch/powerpc/platforms/powernv/opal-hmi.c | 3 +- + arch/powerpc/platforms/powernv/opal-irqchip.c | 55 +- + arch/powerpc/platforms/powernv/opal-lpc.c | 22 +- + arch/powerpc/platforms/powernv/opal-msglog.c | 4 + + arch/powerpc/platforms/powernv/opal-wrappers.S | 1 + + arch/powerpc/platforms/powernv/opal.c | 11 + + arch/powerpc/platforms/powernv/pci-ioda.c | 18 +- + arch/powerpc/platforms/powernv/pci.c | 7 + + arch/powerpc/platforms/powernv/pci.h | 1 + + arch/powerpc/platforms/powernv/powernv.h | 3 +- + arch/powerpc/platforms/powernv/smp.c | 14 +- + arch/powerpc/platforms/pseries/Kconfig | 1 - + arch/powerpc/platforms/pseries/dlpar.c | 8 +- + arch/powerpc/platforms/pseries/hotplug-memory.c | 75 ++- + arch/powerpc/platforms/pseries/mobility.c | 34 ++ + arch/powerpc/platforms/pseries/setup.c | 1 + + arch/powerpc/xmon/xmon.c | 8 +- + drivers/cpuidle/cpuidle-powernv.c | 129 ++-- + drivers/macintosh/Kconfig | 24 +- + drivers/macintosh/Makefile | 1 - + drivers/macintosh/adb.c | 4 - + drivers/macintosh/via-cuda.c | 294 ++++++--- + drivers/macintosh/via-maciisi.c | 677 --------------------- + drivers/misc/cxl/Makefile | 3 +- + drivers/misc/cxl/api.c | 1 - + drivers/misc/cxl/cxl.h | 61 +- + drivers/misc/cxl/main.c | 3 +- + drivers/misc/cxl/pci.c | 5 + + drivers/misc/cxl/vphb.c | 51 +- + include/linux/cpuidle.h | 1 + + scripts/Makefile.gcc-plugins | 10 +- + 95 files changed, 2008 insertions(+), 1531 deletions(-) + create mode 100644 Documentation/devicetree/bindings/powerpc/opal/power-mgt.txt + create mode 100644 arch/powerpc/include/asm/isa-bridge.h + create mode 100644 arch/powerpc/include/asm/powernv.h + delete mode 100644 drivers/macintosh/via-maciisi.c +Merging fsl/next (75b824727680 powerpc/8xx: Perf events on PPC 8xx) +$ git merge fsl/next +Auto-merging arch/powerpc/kernel/process.c +Auto-merging arch/powerpc/kernel/entry_32.S +Auto-merging arch/powerpc/include/asm/reg.h +Auto-merging arch/powerpc/include/asm/processor.h +Removing arch/powerpc/configs/85xx/kmp204x_defconfig +Auto-merging arch/powerpc/Kconfig +Merge made by the 'recursive' strategy. + arch/powerpc/Kconfig | 2 +- + arch/powerpc/boot/dts/fsl/kmcent2.dts | 303 ++++++++++++++++++++++++++ + arch/powerpc/boot/dts/fsl/kmcoge4.dts | 4 + + arch/powerpc/configs/85xx/kmp204x_defconfig | 220 ------------------- + arch/powerpc/include/asm/ppc_asm.h | 1 - + arch/powerpc/include/asm/processor.h | 2 +- + arch/powerpc/include/asm/reg.h | 2 + + arch/powerpc/include/asm/reg_8xx.h | 11 + + arch/powerpc/kernel/entry_32.S | 19 +- + arch/powerpc/kernel/head_32.S | 3 - + arch/powerpc/kernel/head_8xx.S | 72 +++++- + arch/powerpc/kernel/hw_breakpoint.c | 6 +- + arch/powerpc/kernel/process.c | 22 ++ + arch/powerpc/perf/8xx-pmu.c | 173 +++++++++++++++ + arch/powerpc/perf/Makefile | 2 + + arch/powerpc/platforms/85xx/Makefile | 1 + + arch/powerpc/platforms/85xx/corenet_generic.c | 1 + + arch/powerpc/platforms/85xx/t1042rdb_diu.c | 152 +++++++++++++ + arch/powerpc/platforms/Kconfig.cputype | 7 + + 19 files changed, 771 insertions(+), 232 deletions(-) + create mode 100644 arch/powerpc/boot/dts/fsl/kmcent2.dts + delete mode 100644 arch/powerpc/configs/85xx/kmp204x_defconfig + create mode 100644 arch/powerpc/perf/8xx-pmu.c + create mode 100644 arch/powerpc/platforms/85xx/t1042rdb_diu.c +Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc) +$ git merge mpc5xxx/next +Already up-to-date. +Merging s390/features (57d7f939e7bd s390: add no-execute support) +$ git merge s390/features +Auto-merging drivers/s390/virtio/virtio_ccw.c +Auto-merging arch/s390/mm/pgtable.c +Removing arch/s390/kernel/sclp.c +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 5 +- + arch/s390/Kconfig.debug | 4 + + arch/s390/boot/compressed/Makefile | 3 +- + arch/s390/boot/compressed/misc.c | 2 +- + arch/s390/crypto/aes_s390.c | 7 + + arch/s390/crypto/des_s390.c | 14 ++ + arch/s390/crypto/prng.c | 40 ++-- + arch/s390/include/asm/cacheflush.h | 30 ++- + arch/s390/include/asm/cpu_mf.h | 5 +- + arch/s390/include/asm/ctl_reg.h | 4 +- + arch/s390/include/asm/elf.h | 2 + + arch/s390/include/asm/pci_clp.h | 2 +- + arch/s390/include/asm/pgtable.h | 95 +++++--- + arch/s390/include/asm/sclp.h | 12 +- + arch/s390/include/asm/setup.h | 2 + + arch/s390/include/asm/timex.h | 8 - + arch/s390/include/asm/uaccess.h | 4 +- + arch/s390/kernel/Makefile | 12 +- + arch/s390/kernel/als.c | 13 +- + arch/s390/kernel/debug.c | 13 +- + arch/s390/kernel/early.c | 31 +++ + arch/s390/kernel/early_printk.c | 35 +++ + arch/s390/kernel/entry.S | 62 ++--- + arch/s390/kernel/ipl.c | 5 +- + arch/s390/kernel/kprobes.c | 8 +- + arch/s390/kernel/module.c | 3 +- + arch/s390/kernel/os_info.c | 6 +- + arch/s390/kernel/perf_cpum_cf_events.c | 2 +- + arch/s390/kernel/processor.c | 4 +- + arch/s390/kernel/sclp.c | 196 ---------------- + arch/s390/kernel/setup.c | 18 +- + arch/s390/kernel/swsusp.S | 4 +- + arch/s390/kernel/time.c | 5 +- + arch/s390/kernel/topology.c | 21 +- + arch/s390/kernel/vmlinux.lds.S | 9 +- + arch/s390/kvm/priv.c | 2 +- + arch/s390/kvm/vsie.c | 2 +- + arch/s390/lib/mem.S | 28 ++- + arch/s390/mm/dump_pagetables.c | 15 +- + arch/s390/mm/extmem.c | 2 +- + arch/s390/mm/fault.c | 42 +++- + arch/s390/mm/hugetlbpage.c | 10 +- + arch/s390/mm/init.c | 3 + + arch/s390/mm/mem_detect.c | 6 +- + arch/s390/mm/pageattr.c | 117 +++++----- + arch/s390/mm/pgtable.c | 2 + + arch/s390/mm/vmem.c | 42 +++- + arch/s390/net/bpf_jit_comp.c | 11 +- + arch/s390/pci/pci.c | 8 +- + drivers/s390/block/dasd.c | 16 +- + drivers/s390/block/dasd_devmap.c | 294 ++++++++++++------------ + drivers/s390/block/dasd_eckd.c | 4 +- + drivers/s390/block/dasd_int.h | 2 +- + drivers/s390/block/dcssblk.c | 2 +- + drivers/s390/char/Makefile | 16 +- + drivers/s390/char/con3270.c | 2 +- + drivers/s390/char/raw3270.c | 2 +- + drivers/s390/char/sclp.c | 32 --- + drivers/s390/char/sclp.h | 40 +++- + drivers/s390/char/sclp_early.c | 201 ++++++---------- + drivers/s390/char/sclp_early_core.c | 208 +++++++++++++++++ + drivers/s390/char/zcore.c | 3 +- + drivers/s390/cio/chp.c | 13 +- + drivers/s390/cio/chp.h | 2 +- + drivers/s390/cio/chsc.c | 48 +++- + drivers/s390/cio/chsc.h | 2 + + drivers/s390/cio/cmf.c | 10 +- + drivers/s390/cio/css.c | 209 +++++++++-------- + drivers/s390/cio/css.h | 13 +- + drivers/s390/cio/qdio_main.c | 5 +- + drivers/s390/cio/qdio_thinint.c | 19 +- + drivers/s390/crypto/ap_asm.h | 10 +- + drivers/s390/crypto/ap_card.c | 2 +- + drivers/s390/crypto/ap_queue.c | 2 +- + drivers/s390/crypto/zcrypt_api.c | 12 +- + drivers/s390/virtio/virtio_ccw.c | 2 +- + 76 files changed, 1183 insertions(+), 964 deletions(-) + create mode 100644 arch/s390/kernel/early_printk.c + delete mode 100644 arch/s390/kernel/sclp.c + create mode 100644 drivers/s390/char/sclp_early_core.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 sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board) +$ git merge sh/for-next +Already up-to-date. +Merging tile/master (14e73e78ee98 tile: use __ro_after_init instead of tile-specific __write_once) +$ git merge tile/master +Already up-to-date. +Merging uml/linux-next (f88f0bdfc32f um: UBD Improvements) +$ git merge uml/linux-next +Already up-to-date. +Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface) +$ git merge unicore32/unicore32 +Merge made by the 'recursive' strategy. + arch/unicore32/Kconfig | 14 + + arch/unicore32/include/asm/Kbuild | 3 - + arch/unicore32/include/asm/signal.h | 21 + + arch/unicore32/include/asm/syscalls.h | 25 + + arch/unicore32/include/uapi/asm/sigcontext.h | 14 + + arch/unicore32/include/uapi/asm/stat-oldabi.h | 71 +++ + arch/unicore32/include/uapi/asm/stat.h | 19 + + arch/unicore32/include/uapi/asm/unistd-oldabi.h | 770 ++++++++++++++++++++++++ + arch/unicore32/include/uapi/asm/unistd.h | 8 + + arch/unicore32/kernel/entry.S | 17 + + arch/unicore32/kernel/signal.c | 41 ++ + 11 files changed, 1000 insertions(+), 3 deletions(-) + create mode 100644 arch/unicore32/include/asm/signal.h + create mode 100644 arch/unicore32/include/asm/syscalls.h + create mode 100644 arch/unicore32/include/uapi/asm/stat-oldabi.h + create mode 100644 arch/unicore32/include/uapi/asm/stat.h + create mode 100644 arch/unicore32/include/uapi/asm/unistd-oldabi.h +Merging xtensa/xtensa-for-next (6e72293ab0e9 xtensa: fix noMMU build on cores with MMU) +$ git merge xtensa/xtensa-for-next +Merge made by the 'recursive' strategy. +Merging fscrypt/master (b14c8e6afd87 fscrypt: properly declare on-stack completion) +$ git merge fscrypt/master +Removing include/linux/fscrypto.h +Auto-merging fs/f2fs/super.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + fs/crypto/Kconfig | 1 - + fs/crypto/Makefile | 1 + + fs/crypto/bio.c | 145 +++++++++++++++++ + fs/crypto/crypto.c | 157 ++---------------- + fs/crypto/fname.c | 4 +- + fs/crypto/fscrypt_private.h | 20 ++- + fs/crypto/keyinfo.c | 45 ++---- + fs/crypto/policy.c | 95 ++++------- + fs/ext4/ext4.h | 39 +---- + fs/ext4/ialloc.c | 2 +- + fs/ext4/namei.c | 16 +- + fs/ext4/page-io.c | 1 - + fs/ext4/super.c | 13 +- + fs/f2fs/dir.c | 5 +- + fs/f2fs/f2fs.h | 39 +---- + fs/f2fs/namei.c | 4 +- + fs/f2fs/super.c | 14 +- + fs/ubifs/crypto.c | 11 +- + fs/ubifs/ubifs.h | 28 +--- + include/linux/fscrypt_common.h | 146 +++++++++++++++++ + include/linux/fscrypt_notsupp.h | 168 +++++++++++++++++++ + include/linux/fscrypt_supp.h | 66 ++++++++ + include/linux/fscrypto.h | 345 ---------------------------------------- + 24 files changed, 652 insertions(+), 715 deletions(-) + create mode 100644 fs/crypto/bio.c + create mode 100644 include/linux/fscrypt_common.h + create mode 100644 include/linux/fscrypt_notsupp.h + create mode 100644 include/linux/fscrypt_supp.h + delete mode 100644 include/linux/fscrypto.h +Merging befs/for-next (f7b75aaed5ef befs: add NFS export support) +$ git merge befs/for-next +Merge made by the 'recursive' strategy. +Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults) +$ git merge btrfs/next +Already up-to-date. +Merging btrfs-kdave/for-next (d29384cee18a Merge branch 'for-next-current-v4.10-20170208' into for-next-20170208) +$ git merge btrfs-kdave/for-next +Merge made by the 'recursive' strategy. + fs/btrfs/backref.c | 2 +- + fs/btrfs/btrfs_inode.h | 26 +- + fs/btrfs/compression.c | 2 +- + fs/btrfs/ctree.c | 81 +++--- + fs/btrfs/ctree.h | 73 +++--- + fs/btrfs/delayed-inode.c | 57 +++-- + fs/btrfs/delayed-inode.h | 16 +- + fs/btrfs/delayed-ref.c | 11 +- + fs/btrfs/delayed-ref.h | 6 +- + fs/btrfs/dir-item.c | 5 +- + fs/btrfs/disk-io.c | 15 +- + fs/btrfs/export.c | 13 +- + fs/btrfs/extent-tree.c | 148 +++++------ + fs/btrfs/extent_io.c | 177 ++++++------- + fs/btrfs/extent_io.h | 3 +- + fs/btrfs/file-item.c | 36 ++- + fs/btrfs/file.c | 17 +- + fs/btrfs/free-space-cache.c | 2 +- + fs/btrfs/inode.c | 577 +++++++++++++++++++------------------------ + fs/btrfs/ioctl.c | 66 ++--- + fs/btrfs/ordered-data.c | 47 ++-- + fs/btrfs/ordered-data.h | 2 +- + fs/btrfs/props.c | 4 +- + fs/btrfs/qgroup.c | 64 +++-- + fs/btrfs/qgroup.h | 3 +- + fs/btrfs/raid56.c | 2 - + fs/btrfs/relocation.c | 18 +- + fs/btrfs/root-tree.c | 6 +- + fs/btrfs/send.c | 37 ++- + fs/btrfs/super.c | 2 +- + fs/btrfs/transaction.c | 48 ++-- + fs/btrfs/tree-log.c | 295 +++++++++++----------- + fs/btrfs/tree-log.h | 14 +- + fs/btrfs/xattr.c | 16 +- + include/trace/events/btrfs.h | 2 +- + 35 files changed, 957 insertions(+), 936 deletions(-) +Merging ceph/master (6df8c9d80a27 ceph: fix bad endianness handling in parse_reply_info_extra) +$ git merge ceph/master +Already up-to-date. +Merging cifs/for-next (ae6f8dd4d0c8 CIFS: Allow to switch on encryption with seal mount option) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/Kconfig | 12 +- + fs/cifs/cifsencrypt.c | 51 ++-- + fs/cifs/cifsfs.c | 14 + + fs/cifs/cifsglob.h | 28 +- + fs/cifs/cifsproto.h | 13 +- + fs/cifs/cifssmb.c | 135 +++++----- + fs/cifs/connect.c | 71 ++++-- + fs/cifs/file.c | 62 ++++- + fs/cifs/sess.c | 27 +- + fs/cifs/smb1ops.c | 4 +- + fs/cifs/smb2glob.h | 5 + + fs/cifs/smb2maperror.c | 5 +- + fs/cifs/smb2misc.c | 61 +++-- + fs/cifs/smb2ops.c | 663 +++++++++++++++++++++++++++++++++++++++++++++++- + fs/cifs/smb2pdu.c | 575 +++++++++++++++++++++++++++-------------- + fs/cifs/smb2pdu.h | 27 +- + fs/cifs/smb2proto.h | 5 + + fs/cifs/smb2transport.c | 132 ++++++---- + fs/cifs/transport.c | 171 ++++++++----- + 19 files changed, 1582 insertions(+), 479 deletions(-) +Merging configfs/for-next (e16769d4bca6 fs: configfs: don't return anything from drop_link) +$ git merge configfs/for-next +Already up-to-date. +Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/main.c +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 15 --------------- + fs/ecryptfs/ecryptfs_kernel.h | 9 ++++++++- + fs/ecryptfs/keystore.c | 2 +- + fs/ecryptfs/main.c | 2 +- + fs/ecryptfs/miscdev.c | 2 +- + 5 files changed, 11 insertions(+), 19 deletions(-) +Merging ext3/for_next (6c71100db53e fanotify: simplify the code of fanotify_merge) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/notify/fanotify/fanotify.c | 11 ++-- + fs/udf/ecma_167.h | 98 +++++++++++++++++------------------ + fs/udf/file.c | 46 +++++++--------- + fs/udf/inode.c | 118 ++++++++++++++++++------------------------ + fs/udf/lowlevel.c | 2 +- + fs/udf/misc.c | 2 - + fs/udf/namei.c | 2 +- + fs/udf/osta_udf.h | 34 ++++++------ + fs/udf/super.c | 53 ++++++++++++------- + fs/udf/symlink.c | 30 +++++++++++ + fs/udf/udfdecl.h | 2 +- + 11 files changed, 205 insertions(+), 193 deletions(-) +Merging ext4/dev (168316db3583 dax: assert that i_rwsem is held exclusive for writes) +$ git merge ext4/dev +Removing lib/halfmd4.c +Auto-merging fs/ext4/page-io.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/dax.c +Merge made by the 'recursive' strategy. + fs/dax.c | 6 ++- + fs/ext4/ext4.h | 28 +++++++++-- + fs/ext4/ext4_jbd2.c | 11 ++++ + fs/ext4/extents.c | 27 ++++++---- + fs/ext4/file.c | 22 ++++---- + fs/ext4/fsync.c | 3 ++ + fs/ext4/hash.c | 71 +++++++++++++++++++++++++- + fs/ext4/ialloc.c | 3 ++ + fs/ext4/inline.c | 123 ++++++++++++++++++++++++--------------------- + fs/ext4/inode.c | 75 ++++++++++++++++++++------- + fs/ext4/ioctl.c | 50 ++++++++++++++++++ + fs/ext4/mballoc.c | 19 ++++++- + fs/ext4/namei.c | 18 ++++++- + fs/ext4/page-io.c | 2 +- + fs/ext4/resize.c | 5 +- + fs/ext4/super.c | 41 ++++++++++++--- + fs/ext4/xattr.c | 33 ++++++------ + fs/ext4/xattr.h | 32 ++++++++++++ + fs/jbd2/journal.c | 2 +- + fs/jbd2/transaction.c | 4 +- + include/linux/cryptohash.h | 2 - + lib/Makefile | 2 +- + lib/halfmd4.c | 67 ------------------------ + 23 files changed, 445 insertions(+), 201 deletions(-) + delete mode 100644 lib/halfmd4.c +Merging f2fs/dev (cccc259d00f5 f2fs: fix a typo in f2fs.txt) +$ git merge f2fs/dev +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/namei.c +Auto-merging fs/f2fs/f2fs.h +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 6 - + Documentation/filesystems/f2fs.txt | 6 +- + fs/f2fs/checkpoint.c | 36 +- + fs/f2fs/data.c | 158 +++++++-- + fs/f2fs/debug.c | 28 +- + fs/f2fs/extent_cache.c | 22 +- + fs/f2fs/f2fs.h | 580 ++++++++++++++++++-------------- + fs/f2fs/file.c | 28 +- + fs/f2fs/gc.c | 6 + + fs/f2fs/namei.c | 18 +- + fs/f2fs/node.c | 206 +++++++----- + fs/f2fs/node.h | 17 +- + fs/f2fs/recovery.c | 9 +- + fs/f2fs/segment.c | 425 ++++++++++++++++------- + fs/f2fs/segment.h | 27 ++ + fs/f2fs/super.c | 50 ++- + fs/f2fs/xattr.c | 132 +++++++- + fs/f2fs/xattr.h | 7 +- + include/linux/f2fs_fs.h | 6 + + include/trace/events/f2fs.h | 87 +++-- + 20 files changed, 1257 insertions(+), 597 deletions(-) +Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information) +$ git merge freevxfs/for-next +Already up-to-date. +Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew)) +$ git merge fscache/fscache +Already up-to-date. +Merging fuse/for-next (210675270caa fuse: fix time_to_jiffies nsec sanity check) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/for-next (c548a1c17560 gfs2: Make gfs2_write_full_page static) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/ops_fstype.c +Auto-merging fs/gfs2/meta_io.c +Auto-merging fs/gfs2/log.c +Auto-merging fs/gfs2/glock.c +Auto-merging fs/gfs2/bmap.c +Auto-merging fs/gfs2/aops.c +Merge made by the 'recursive' strategy. + fs/gfs2/aops.c | 4 +-- + fs/gfs2/bmap.c | 29 +++++++++++++++++-- + fs/gfs2/glock.c | 12 ++++---- + fs/gfs2/incore.h | 11 +++++-- + fs/gfs2/log.c | 21 ++++++++++---- + fs/gfs2/meta_io.c | 6 ++-- + fs/gfs2/ops_fstype.c | 1 + + fs/gfs2/trans.c | 81 ++++++++++++++++++++++++++++------------------------ + 8 files changed, 105 insertions(+), 60 deletions(-) +Merging jfs/jfs-next (684666e51585 jfs: atomically read inode size) +$ git merge jfs/jfs-next +Merge made by the 'recursive' strategy. + fs/jfs/resize.c | 4 ++-- + fs/jfs/super.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging nfs/linux-next (d5adbfcd5f7b Linux 4.10-rc7) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (81fa3275f95a svcrdma: Poll CQs in "workqueue" mode) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/lockd/svc.c | 2 + + fs/nfsd/export.c | 1 + + fs/nfsd/nfs3proc.c | 8 +- + fs/nfsd/nfs4proc.c | 6 +- + fs/nfsd/nfs4xdr.c | 19 +- + fs/nfsd/nfsctl.c | 10 +- + fs/nfsd/nfsd.h | 6 +- + fs/nfsd/nfsproc.c | 8 +- + fs/nfsd/nfssvc.c | 2 + + fs/nfsd/vfs.c | 45 ++--- + fs/nfsd/vfs.h | 6 +- + include/linux/sunrpc/cache.h | 1 + + include/linux/sunrpc/rpc_rdma.h | 9 + + include/linux/sunrpc/svc_rdma.h | 13 +- + include/uapi/linux/nfsd/export.h | 5 +- + net/sunrpc/auth_gss/svcauth_gss.c | 4 +- + net/sunrpc/cache.c | 12 ++ + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 17 +- + net/sunrpc/xprtrdma/svc_rdma_marshal.c | 299 ++++++++++------------------- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 20 +- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 22 ++- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 61 +++--- + 22 files changed, 253 insertions(+), 323 deletions(-) +Merging orangefs/for-next (eb68d0324dc4 orangefs: fix buffer size mis-match between kernel space and user space.) +$ git merge orangefs/for-next +Auto-merging fs/orangefs/orangefs-debugfs.c +Auto-merging fs/orangefs/inode.c +Auto-merging fs/orangefs/devorangefs-req.c +Merge made by the 'recursive' strategy. + fs/orangefs/devorangefs-req.c | 5 +++-- + fs/orangefs/inode.c | 6 ------ + fs/orangefs/orangefs-bufmap.c | 5 +++++ + fs/orangefs/orangefs-debugfs.c | 15 ++++++++------- + fs/orangefs/orangefs-dev-proto.h | 3 +-- + fs/orangefs/orangefs-kernel.h | 1 - + fs/orangefs/orangefs-mod.c | 12 +----------- + fs/orangefs/orangefs-sysfs.c | 32 ++++++++++++++++++++++++++++++-- + fs/orangefs/upcall.h | 1 + + 9 files changed, 49 insertions(+), 31 deletions(-) +Merging overlayfs/overlayfs-next (51f8f3c4e225 ovl: drop CAP_SYS_RESOURCE from saved mounter's credentials) +$ git merge overlayfs/overlayfs-next +Merge made by the 'recursive' strategy. + fs/namei.c | 68 +++++++++++++++++++++++------------- + fs/open.c | 14 ++++---- + fs/overlayfs/copy_up.c | 91 +++++++++++++++++++++++++++++++++++------------- + fs/overlayfs/overlayfs.h | 11 ++++++ + fs/overlayfs/ovl_entry.h | 3 ++ + fs/overlayfs/super.c | 39 +++++++++++++++++++-- + fs/overlayfs/util.c | 30 ++++++++++++++++ + fs/read_write.c | 9 +++-- + include/linux/fs.h | 29 ++++++++------- + 9 files changed, 219 insertions(+), 75 deletions(-) +Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (1cb51a15b576 ubifs: Fix journal replay wrt. xattr nodes) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (4560e78f40cb xfs: don't block the log commit handler for discards) +$ git merge xfs/for-next +Auto-merging fs/iomap.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/dax.c +Merge made by the 'recursive' strategy. + fs/dax.c | 6 +- + fs/ext2/ext2.h | 2 +- + fs/ext2/inode.c | 4 +- + fs/ext4/ext4.h | 2 +- + fs/ext4/inode.c | 2 +- + fs/internal.h | 2 +- + fs/iomap.c | 18 +-- + fs/xfs/libxfs/xfs_alloc.c | 93 +++++++------- + fs/xfs/libxfs/xfs_bmap.c | 107 ++++++++-------- + fs/xfs/libxfs/xfs_bmap_btree.c | 10 +- + fs/xfs/libxfs/xfs_btree.c | 48 +++++--- + fs/xfs/libxfs/xfs_btree.h | 8 +- + fs/xfs/libxfs/xfs_da_btree.c | 6 +- + fs/xfs/libxfs/xfs_da_btree.h | 2 +- + fs/xfs/libxfs/xfs_dir2_node.c | 51 +++++++- + fs/xfs/libxfs/xfs_inode_fork.c | 9 +- + fs/xfs/libxfs/xfs_log_recover.h | 1 - + fs/xfs/xfs_aops.c | 6 + + fs/xfs/xfs_bmap_util.c | 48 +++----- + fs/xfs/xfs_bmap_util.h | 5 +- + fs/xfs/xfs_buf_item.c | 1 + + fs/xfs/xfs_discard.c | 29 ----- + fs/xfs/xfs_discard.h | 1 - + fs/xfs/xfs_extent_busy.c | 154 ++++++++++++++++------- + fs/xfs/xfs_extent_busy.h | 11 +- + fs/xfs/xfs_file.c | 34 +++--- + fs/xfs/xfs_fsops.c | 39 ++---- + fs/xfs/xfs_icache.c | 59 +++------ + fs/xfs/xfs_icache.h | 2 - + fs/xfs/xfs_inode.c | 51 ++++---- + fs/xfs/xfs_ioctl.c | 4 +- + fs/xfs/xfs_iomap.c | 58 +++------ + fs/xfs/xfs_iomap.h | 24 +++- + fs/xfs/xfs_log.h | 1 - + fs/xfs/xfs_log_cil.c | 84 +++++++++++-- + fs/xfs/xfs_log_priv.h | 1 + + fs/xfs/xfs_mount.c | 33 +++-- + fs/xfs/xfs_mount.h | 2 + + fs/xfs/xfs_reflink.c | 265 ++++++++++++++++++++++++++++------------ + fs/xfs/xfs_reflink.h | 6 +- + fs/xfs/xfs_super.c | 8 ++ + fs/xfs/xfs_super.h | 2 + + fs/xfs/xfs_trace.h | 13 +- + fs/xfs/xfs_trans.h | 1 - + include/linux/dax.h | 8 +- + include/linux/iomap.h | 14 +-- + 46 files changed, 807 insertions(+), 528 deletions(-) +Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2) +$ git merge file-locks/linux-next +Already up-to-date. +Merging vfs/for-next (59479ae85e43 Merge branches 'work.sendmsg' and 'work.splice-net' into for-next) +$ git merge vfs/for-next +Resolved 'drivers/block/nbd.c' using previous resolution. +Auto-merging net/unix/af_unix.c +Auto-merging net/socket.c +Auto-merging net/kcm/kcmsock.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/core/skbuff.c +Auto-merging include/net/tcp.h +Auto-merging include/linux/skbuff.h +Auto-merging include/linux/fs.h +Auto-merging drivers/block/nbd.c +CONFLICT (content): Merge conflict in drivers/block/nbd.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8cc67702d69f] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/block/drbd/drbd_main.c | 11 ++- + drivers/block/nbd.c | 76 +++++++++------------ + drivers/target/iscsi/iscsi_target_util.c | 64 +++++++---------- + drivers/usb/usbip/usbip_common.c | 32 +++------ + fs/afs/rxrpc.c | 15 ++-- + fs/ncpfs/sock.c | 111 +++++++++++------------------- + fs/splice.c | 22 +++--- + include/linux/fs.h | 1 + + include/linux/net.h | 2 +- + include/linux/skbuff.h | 3 +- + include/linux/splice.h | 4 +- + include/net/tcp.h | 2 +- + kernel/relay.c | 1 - + kernel/trace/trace.c | 2 - + net/ceph/messenger.c | 44 ++++++++---- + net/core/skbuff.c | 4 +- + net/ipv4/tcp.c | 7 +- + net/kcm/kcmsock.c | 5 +- + net/rds/page.c | 29 -------- + net/rds/rds.h | 7 -- + net/socket.c | 4 +- + net/unix/af_unix.c | 113 +++---------------------------- + 22 files changed, 186 insertions(+), 373 deletions(-) +Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities) +$ git merge vfs-jk/vfs +Already up-to-date. +Merging vfs-miklos/next (bfe219d373ca vfs: wrap write f_ops with file_{start,end}_write()) +$ git merge vfs-miklos/next +Already up-to-date. +Merging printk/for-next (d9c23523ed98 printk: drop call_console_drivers() unused param) +$ git merge printk/for-next +Auto-merging kernel/printk/printk_safe.c +Auto-merging kernel/panic.c +Auto-merging kernel/kexec_core.c +Auto-merging init/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 ++ + include/linux/printk.h | 21 ++- + init/Kconfig | 16 ++- + init/main.c | 2 +- + kernel/kexec_core.c | 2 +- + kernel/panic.c | 4 +- + kernel/printk/Makefile | 2 +- + kernel/printk/internal.h | 79 ++++++----- + kernel/printk/printk.c | 232 ++++++++++++++------------------ + kernel/printk/{nmi.c => printk_safe.c} | 234 +++++++++++++++++++++++---------- + lib/nmi_backtrace.c | 2 +- + 11 files changed, 347 insertions(+), 255 deletions(-) + rename kernel/printk/{nmi.c => printk_safe.c} (53%) +Merging pci/next (83a96ebd0efa Merge branch 'pci/host-thunder' into next) +$ git merge pci/next +Auto-merging drivers/pci/probe.c +Auto-merging drivers/pci/msi.c +Auto-merging drivers/net/ethernet/amd/xgbe/xgbe.h +Auto-merging drivers/net/ethernet/amd/xgbe/xgbe-pci.c +Merge made by the 'recursive' strategy. + Documentation/PCI/MSI-HOWTO.txt | 6 +- + Documentation/devicetree/bindings/pci/rcar-pci.txt | 1 + + .../devicetree/bindings/pci/rockchip-pcie.txt | 2 + + drivers/acpi/pci_mcfg.c | 5 +- + drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 128 ++++++--------------- + drivers/net/ethernet/amd/xgbe/xgbe.h | 8 +- + drivers/pci/host/pci-dra7xx.c | 81 +++++++------ + drivers/pci/host/pci-imx6.c | 4 +- + drivers/pci/host/pci-thunder-pem.c | 25 +++- + drivers/pci/host/pcie-rcar.c | 2 +- + drivers/pci/host/pcie-rockchip.c | 115 ++++++++++++++++++ + drivers/pci/hotplug/acpiphp_ibm.c | 2 +- + drivers/pci/hotplug/rpadlpar_core.c | 4 +- + drivers/pci/msi.c | 28 ++--- + drivers/pci/probe.c | 15 ++- + include/linux/pci.h | 16 +-- + 16 files changed, 259 insertions(+), 183 deletions(-) +Merging pstore/for-next/pstore (0c744ea4f77d Linux 4.10-rc2) +$ git merge pstore/for-next/pstore +Already up-to-date. +Merging hid/for-next (075b896bb38f Merge branch 'for-4.11/intel-ish' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/hid-over-i2c.txt | 5 + + drivers/hid/Kconfig | 5 + + drivers/hid/hid-core.c | 27 +- + drivers/hid/hid-ids.h | 11 +- + drivers/hid/hid-mf.c | 19 +- + drivers/hid/hid-microsoft.c | 12 - + drivers/hid/hid-multitouch.c | 44 + + drivers/hid/hid-rmi.c | 975 +++------------------ + drivers/hid/i2c-hid/i2c-hid.c | 45 +- + drivers/hid/intel-ish-hid/ipc/hw-ish-regs.h | 8 + + drivers/hid/intel-ish-hid/ipc/hw-ish.h | 12 + + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 38 +- + drivers/hid/intel-ish-hid/ishtp-hid.c | 2 +- + drivers/hid/intel-ish-hid/ishtp/hbm.c | 1 - + drivers/hid/intel-ish-hid/ishtp/init.c | 1 - + drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h | 3 +- + drivers/hid/usbhid/hid-core.c | 3 +- + drivers/hid/usbhid/hid-quirks.c | 12 +- + drivers/hid/usbhid/usbkbd.c | 3 +- + drivers/hid/usbhid/usbmouse.c | 3 +- + drivers/hid/wacom.h | 5 +- + drivers/hid/wacom_sys.c | 147 +++- + drivers/hid/wacom_wac.c | 284 +++++- + drivers/hid/wacom_wac.h | 37 +- + include/linux/i2c/i2c-hid.h | 6 + + 25 files changed, 745 insertions(+), 963 deletions(-) +Merging i2c/i2c/for-next (fc51222d5070 Merge branch 'i2c/for-current' into i2c/for-next) +$ git merge i2c/i2c/for-next +Auto-merging drivers/i2c/busses/Makefile +Auto-merging drivers/i2c/busses/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/i2c-sh_mobile.txt | 1 + + .../devicetree/bindings/i2c/i2c-stm32.txt | 33 + + Documentation/i2c/busses/i2c-i801 | 1 + + Documentation/i2c/muxes/i2c-mux-gpio | 20 +- + drivers/i2c/busses/Kconfig | 11 + + drivers/i2c/busses/Makefile | 1 + + drivers/i2c/busses/i2c-at91.c | 2 +- + drivers/i2c/busses/i2c-bfin-twi.c | 2 +- + drivers/i2c/busses/i2c-cros-ec-tunnel.c | 8 +- + drivers/i2c/busses/i2c-designware-core.c | 2 +- + drivers/i2c/busses/i2c-eg20t.c | 2 +- + drivers/i2c/busses/i2c-emev2.c | 2 +- + drivers/i2c/busses/i2c-i801.c | 3 + + drivers/i2c/busses/i2c-imx-lpi2c.c | 2 +- + drivers/i2c/busses/i2c-imx.c | 2 +- + drivers/i2c/busses/i2c-mv64xxx.c | 21 + + drivers/i2c/busses/i2c-nforce2.c | 2 +- + drivers/i2c/busses/i2c-omap.c | 2 +- + drivers/i2c/busses/i2c-piix4.c | 14 +- + drivers/i2c/busses/i2c-riic.c | 30 +- + drivers/i2c/busses/i2c-robotfuzz-osif.c | 2 +- + drivers/i2c/busses/i2c-sh_mobile.c | 2 +- + drivers/i2c/busses/i2c-st.c | 2 +- + drivers/i2c/busses/i2c-stm32f4.c | 897 +++++++++++++++++++++ + drivers/i2c/busses/i2c-xgene-slimpro.c | 2 +- + drivers/i2c/busses/i2c-xlp9xx.c | 2 +- + drivers/i2c/busses/i2c-xlr.c | 2 +- + drivers/i2c/i2c-core.c | 33 + + drivers/i2c/muxes/i2c-mux-mlxcpld.c | 1 - + drivers/i2c/muxes/i2c-mux-pca9541.c | 1 + + drivers/i2c/muxes/i2c-mux-pca954x.c | 1 + + include/linux/i2c.h | 1 + + 32 files changed, 1064 insertions(+), 43 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-stm32.txt + create mode 100644 drivers/i2c/busses/i2c-stm32f4.c +Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge jdelvare-hwmon/master +Already up-to-date. +Merging dmi/master (0c744ea4f77d Linux 4.10-rc2) +$ git merge dmi/master +Already up-to-date. +Merging hwmon-staging/hwmon-next (646933284e46 DT: add binding documentation for STTS751) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwmon/adc128d818.txt | 38 + + Documentation/devicetree/bindings/hwmon/lm70.txt | 1 + + .../devicetree/bindings/hwmon/stts751.txt | 15 + + Documentation/hwmon/hwmon-kernel-api.txt | 4 + + Documentation/hwmon/lm70 | 8 +- + Documentation/hwmon/sht21 | 5 +- + Documentation/hwmon/sysfs-interface | 5 +- + drivers/hwmon/Kconfig | 10 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/adc128d818.c | 147 +++- + drivers/hwmon/adm1021.c | 14 +- + drivers/hwmon/adm1025.c | 16 +- + drivers/hwmon/adm1026.c | 128 ++-- + drivers/hwmon/adm1031.c | 15 +- + drivers/hwmon/adm9240.c | 28 +- + drivers/hwmon/adt7411.c | 361 +++++++-- + drivers/hwmon/adt7470.c | 48 +- + drivers/hwmon/adt7475.c | 28 +- + drivers/hwmon/adt7x10.c | 7 +- + drivers/hwmon/asb100.c | 36 +- + drivers/hwmon/atxp1.c | 35 +- + drivers/hwmon/dme1737.c | 46 +- + drivers/hwmon/ds1621.c | 16 +- + drivers/hwmon/emc2103.c | 36 +- + drivers/hwmon/f71805f.c | 16 +- + drivers/hwmon/f71882fg.c | 6 +- + drivers/hwmon/fam15h_power.c | 34 +- + drivers/hwmon/fschmd.c | 6 +- + drivers/hwmon/g760a.c | 22 +- + drivers/hwmon/g762.c | 86 ++- + drivers/hwmon/gl518sm.c | 13 +- + drivers/hwmon/gl520sm.c | 73 +- + drivers/hwmon/gpio-fan.c | 54 +- + drivers/hwmon/hwmon.c | 20 +- + drivers/hwmon/i5500_temp.c | 6 +- + drivers/hwmon/i5k_amb.c | 4 +- + drivers/hwmon/it87.c | 20 +- + drivers/hwmon/jz4740-hwmon.c | 6 +- + drivers/hwmon/k10temp.c | 12 +- + drivers/hwmon/k8temp.c | 4 +- + drivers/hwmon/lm63.c | 48 +- + drivers/hwmon/lm70.c | 18 +- + drivers/hwmon/lm78.c | 38 +- + drivers/hwmon/lm80.c | 4 +- + drivers/hwmon/lm83.c | 4 +- + drivers/hwmon/lm85.c | 22 +- + drivers/hwmon/lm87.c | 43 +- + drivers/hwmon/lm90.c | 8 +- + drivers/hwmon/lm92.c | 10 +- + drivers/hwmon/lm93.c | 39 +- + drivers/hwmon/lm95234.c | 12 +- + drivers/hwmon/ltc4151.c | 1 + + drivers/hwmon/max1111.c | 4 +- + drivers/hwmon/max1619.c | 4 +- + drivers/hwmon/max197.c | 6 +- + drivers/hwmon/max6650.c | 44 +- + drivers/hwmon/mc13783-adc.c | 6 +- + drivers/hwmon/mcp3021.c | 6 +- + drivers/hwmon/nct6683.c | 17 +- + drivers/hwmon/nct6775.c | 4 +- + drivers/hwmon/nsa320-hwmon.c | 12 +- + drivers/hwmon/pc87360.c | 26 +- + drivers/hwmon/pc87427.c | 4 +- + drivers/hwmon/pcf8591.c | 24 +- + drivers/hwmon/sch5627.c | 4 +- + drivers/hwmon/sch56xx-common.c | 1 - + drivers/hwmon/sht15.c | 4 +- + drivers/hwmon/sht21.c | 92 ++- + drivers/hwmon/sis5595.c | 36 +- + drivers/hwmon/smsc47m1.c | 10 +- + drivers/hwmon/smsc47m192.c | 14 +- + drivers/hwmon/stts751.c | 834 +++++++++++++++++++++ + drivers/hwmon/tmp401.c | 60 +- + drivers/hwmon/via-cputemp.c | 6 +- + drivers/hwmon/via686a.c | 8 +- + drivers/hwmon/vt8231.c | 59 +- + drivers/hwmon/w83627ehf.c | 8 +- + drivers/hwmon/w83627hf.c | 53 +- + drivers/hwmon/w83781d.c | 34 +- + drivers/hwmon/w83791d.c | 23 +- + drivers/hwmon/w83792d.c | 15 +- + drivers/hwmon/w83793.c | 6 +- + 82 files changed, 2216 insertions(+), 885 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/adc128d818.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/stts751.txt + create mode 100644 drivers/hwmon/stts751.c +Merging jc_docs/docs-next (dc36143fba93 docs: Remove the copyright year from conf.py) +$ git merge jc_docs/docs-next +Removing Documentation/translations/zh_CN/CodingStyle +Removing Documentation/power/notifiers.txt +Auto-merging Documentation/driver-api/pm/devices.rst +Removing Documentation/cpu-hotplug.txt +Removing Documentation/DocBook/regulator.tmpl +Removing Documentation/DocBook/iio.tmpl +Removing Documentation/DocBook/deviceiobook.tmpl +Merge made by the 'recursive' strategy. + Documentation/DocBook/Makefile | 2 +- + Documentation/DocBook/deviceiobook.tmpl | 323 ------- + Documentation/DocBook/iio.tmpl | 697 --------------- + Documentation/DocBook/regulator.tmpl | 304 ------- + Documentation/Makefile.sphinx | 26 +- + Documentation/admin-guide/README.rst | 4 +- + Documentation/admin-guide/dynamic-debug-howto.rst | 4 +- + Documentation/block/pr.txt | 2 +- + Documentation/cgroup-v1/cpusets.txt | 2 +- + Documentation/conf.py | 2 +- + Documentation/core-api/cpu_hotplug.rst | 372 ++++++++ + Documentation/core-api/index.rst | 1 + + Documentation/cpu-freq/user-guide.txt | 4 +- + Documentation/cpu-hotplug.txt | 452 ---------- + Documentation/dontdiff | 7 +- + Documentation/driver-api/device-io.rst | 201 +++++ + Documentation/driver-api/iio/buffers.rst | 125 +++ + Documentation/driver-api/iio/core.rst | 182 ++++ + Documentation/driver-api/iio/index.rst | 17 + + Documentation/driver-api/iio/intro.rst | 33 + + Documentation/driver-api/iio/triggered-buffers.rst | 69 ++ + Documentation/driver-api/iio/triggers.rst | 80 ++ + Documentation/driver-api/index.rst | 4 + + Documentation/driver-api/pm/conf.py | 10 + + .../devices.txt => driver-api/pm/devices.rst} | 696 +++++++-------- + Documentation/driver-api/pm/index.rst | 16 + + Documentation/driver-api/pm/notifiers.rst | 70 ++ + Documentation/driver-api/pm/types.rst | 5 + + Documentation/driver-api/regulator.rst | 170 ++++ + Documentation/hwmon/ds1621 | 8 +- + Documentation/index.rst | 10 +- + Documentation/ioctl/botching-up-ioctls.txt | 2 +- + Documentation/livepatch/livepatch.txt | 2 +- + Documentation/media/Makefile | 2 +- + Documentation/networking/kcm.txt | 2 +- + Documentation/power/00-INDEX | 2 - + Documentation/power/freezing-of-tasks.txt | 3 +- + Documentation/power/notifiers.txt | 55 -- + Documentation/power/pci.txt | 2 +- + Documentation/pps/pps.txt | 18 +- + Documentation/thermal/nouveau_thermal | 2 +- + Documentation/translations/ko_KR/howto.rst | 4 +- + Documentation/translations/zh_CN/CodingStyle | 813 ------------------ + Documentation/translations/zh_CN/coding-style.rst | 950 +++++++++++++++++++++ + Documentation/translations/zh_CN/index.rst | 12 + + Documentation/usb/power-management.txt | 2 +- + Documentation/vm/transhuge.txt | 2 +- + include/linux/pm.h | 110 ++- + scripts/kernel-doc | 115 ++- + 49 files changed, 2876 insertions(+), 3120 deletions(-) + delete mode 100644 Documentation/DocBook/deviceiobook.tmpl + delete mode 100644 Documentation/DocBook/iio.tmpl + delete mode 100644 Documentation/DocBook/regulator.tmpl + create mode 100644 Documentation/core-api/cpu_hotplug.rst + delete mode 100644 Documentation/cpu-hotplug.txt + create mode 100644 Documentation/driver-api/device-io.rst + create mode 100644 Documentation/driver-api/iio/buffers.rst + create mode 100644 Documentation/driver-api/iio/core.rst + create mode 100644 Documentation/driver-api/iio/index.rst + create mode 100644 Documentation/driver-api/iio/intro.rst + create mode 100644 Documentation/driver-api/iio/triggered-buffers.rst + create mode 100644 Documentation/driver-api/iio/triggers.rst + create mode 100644 Documentation/driver-api/pm/conf.py + rename Documentation/{power/devices.txt => driver-api/pm/devices.rst} (50%) + create mode 100644 Documentation/driver-api/pm/index.rst + create mode 100644 Documentation/driver-api/pm/notifiers.rst + create mode 100644 Documentation/driver-api/pm/types.rst + create mode 100644 Documentation/driver-api/regulator.rst + delete mode 100644 Documentation/power/notifiers.txt + delete mode 100644 Documentation/translations/zh_CN/CodingStyle + create mode 100644 Documentation/translations/zh_CN/coding-style.rst + create mode 100644 Documentation/translations/zh_CN/index.rst +Merging v4l-dvb/master (9eeb0ed0f309 [media] mtk-vcodec: fix build warnings without DEBUG) +$ git merge v4l-dvb/master +Removing drivers/staging/media/lirc/lirc_parallel.h +Removing drivers/staging/media/lirc/lirc_parallel.c +Removing drivers/staging/media/lirc/lirc_imon.c +Removing drivers/staging/media/lirc/lirc_bt829.c +Removing drivers/media/dvb-frontends/hd29l2_priv.h +Removing drivers/media/dvb-frontends/hd29l2.h +Removing drivers/media/dvb-frontends/hd29l2.c +Auto-merging arch/arm/mach-omap2/pdata-quirks.c +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/stih407-family.dtsi +Auto-merging arch/arm/boot/dts/imx6qdl.dtsi +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-rc | 14 +- + .../devicetree/bindings/leds/irled/spi-ir-led.txt | 29 + + .../devicetree/bindings/media/fsl-vdoa.txt | 21 + + .../devicetree/bindings/media/gpio-ir-receiver.txt | 3 +- + .../devicetree/bindings/media/hix5hd2-ir.txt | 2 +- + .../bindings/media/i2c/toshiba,et8ek8.txt | 48 + + .../devicetree/bindings/media/meson-ir.txt | 3 + + .../devicetree/bindings/media/mtk-cir.txt | 24 + + Documentation/devicetree/bindings/media/rc.txt | 117 ++ + .../devicetree/bindings/media/st,st-delta.txt | 17 + + .../devicetree/bindings/media/sunxi-ir.txt | 2 +- + .../devicetree/bindings/media/ti,da850-vpif.txt | 83 + + Documentation/media/kapi/mc-core.rst | 18 +- + Documentation/media/uapi/gen-errors.rst | 10 +- + Documentation/media/uapi/rc/rc-sysfs-nodes.rst | 13 +- + MAINTAINERS | 52 +- + arch/arm/boot/dts/imx6qdl.dtsi | 2 + + arch/arm/boot/dts/stih407-family.dtsi | 10 + + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/mach-omap2/pdata-quirks.c | 10 +- + drivers/hid/hid-picolcd_cir.c | 5 +- + drivers/media/cec/cec-core.c | 3 +- + drivers/media/common/b2c2/flexcop-fe-tuner.c | 3 +- + drivers/media/common/b2c2/flexcop.c | 4 - + drivers/media/common/cx2341x.c | 4 - + drivers/media/common/siano/sms-cards.c | 4 - + drivers/media/common/siano/sms-cards.h | 4 - + drivers/media/common/siano/smscoreapi.c | 4 - + drivers/media/common/siano/smsir.c | 5 +- + drivers/media/common/tveeprom.c | 4 - + drivers/media/dvb-core/demux.h | 4 - + drivers/media/dvb-core/dmxdev.c | 16 +- + drivers/media/dvb-core/dmxdev.h | 4 - + drivers/media/dvb-core/dvb-usb-ids.h | 5 +- + drivers/media/dvb-core/dvb_ca_en50221.c | 7 +- + drivers/media/dvb-core/dvb_demux.c | 4 - + drivers/media/dvb-core/dvb_demux.h | 4 - + drivers/media/dvb-core/dvb_frontend.c | 31 +- + drivers/media/dvb-core/dvb_math.c | 4 - + drivers/media/dvb-core/dvb_math.h | 4 - + drivers/media/dvb-core/dvb_net.c | 7 +- + drivers/media/dvb-core/dvb_net.h | 4 - + drivers/media/dvb-core/dvb_ringbuffer.c | 4 - + drivers/media/dvb-core/dvbdev.c | 4 - + drivers/media/dvb-core/dvbdev.h | 4 - + drivers/media/dvb-frontends/Kconfig | 17 +- + drivers/media/dvb-frontends/Makefile | 2 +- + drivers/media/dvb-frontends/af9013.c | 4 - + drivers/media/dvb-frontends/af9013.h | 4 - + drivers/media/dvb-frontends/af9013_priv.h | 4 - + drivers/media/dvb-frontends/af9033.c | 837 ++++---- + drivers/media/dvb-frontends/af9033.h | 13 +- + drivers/media/dvb-frontends/af9033_priv.h | 185 +- + drivers/media/dvb-frontends/atbm8830.c | 4 - + drivers/media/dvb-frontends/atbm8830.h | 4 - + drivers/media/dvb-frontends/atbm8830_priv.h | 4 - + drivers/media/dvb-frontends/au8522_decoder.c | 5 - + drivers/media/dvb-frontends/bcm3510.h | 4 - + drivers/media/dvb-frontends/bcm3510_priv.h | 4 - + drivers/media/dvb-frontends/bsbe1-d01a.h | 7 +- + drivers/media/dvb-frontends/bsbe1.h | 7 +- + drivers/media/dvb-frontends/bsru6.h | 7 +- + drivers/media/dvb-frontends/cx24113.c | 4 - + drivers/media/dvb-frontends/cx24113.h | 4 - + drivers/media/dvb-frontends/cx24123.c | 6 +- + drivers/media/dvb-frontends/cxd2820r_core.c | 2 +- + drivers/media/dvb-frontends/dib0070.c | 4 - + drivers/media/dvb-frontends/dib0090.c | 4 - + drivers/media/dvb-frontends/dib7000p.c | 15 +- + drivers/media/dvb-frontends/drx39xyj/drx39xxj.h | 4 - + drivers/media/dvb-frontends/drxd.h | 8 +- + drivers/media/dvb-frontends/drxd_firm.c | 8 +- + drivers/media/dvb-frontends/drxd_firm.h | 8 +- + drivers/media/dvb-frontends/drxd_hard.c | 8 +- + drivers/media/dvb-frontends/drxd_map_firm.h | 8 +- + drivers/media/dvb-frontends/drxk_hard.c | 8 +- + drivers/media/dvb-frontends/dvb-pll.c | 4 - + drivers/media/dvb-frontends/dvb_dummy_fe.c | 4 - + drivers/media/dvb-frontends/dvb_dummy_fe.h | 4 - + drivers/media/dvb-frontends/ec100.c | 4 - + drivers/media/dvb-frontends/ec100.h | 4 - + drivers/media/dvb-frontends/hd29l2.c | 870 --------- + drivers/media/dvb-frontends/hd29l2.h | 65 - + drivers/media/dvb-frontends/hd29l2_priv.h | 301 --- + drivers/media/dvb-frontends/isl6405.c | 7 +- + drivers/media/dvb-frontends/isl6405.h | 7 +- + drivers/media/dvb-frontends/isl6421.c | 7 +- + drivers/media/dvb-frontends/isl6421.h | 7 +- + drivers/media/dvb-frontends/itd1000.c | 4 - + drivers/media/dvb-frontends/itd1000.h | 4 - + drivers/media/dvb-frontends/itd1000_priv.h | 4 - + drivers/media/dvb-frontends/ix2505v.c | 4 - + drivers/media/dvb-frontends/ix2505v.h | 4 - + drivers/media/dvb-frontends/lg2160.c | 4 - + drivers/media/dvb-frontends/lg2160.h | 4 - + drivers/media/dvb-frontends/lgdt3305.c | 4 - + drivers/media/dvb-frontends/lgdt3305.h | 4 - + drivers/media/dvb-frontends/lgdt3306a.c | 108 ++ + drivers/media/dvb-frontends/lgdt3306a.h | 4 + + drivers/media/dvb-frontends/lgdt330x.c | 4 - + drivers/media/dvb-frontends/lgdt330x.h | 4 - + drivers/media/dvb-frontends/lgdt330x_priv.h | 4 - + drivers/media/dvb-frontends/lgs8gxx.c | 4 - + drivers/media/dvb-frontends/lgs8gxx.h | 4 - + drivers/media/dvb-frontends/lgs8gxx_priv.h | 4 - + drivers/media/dvb-frontends/lnbh24.h | 4 - + drivers/media/dvb-frontends/lnbp21.c | 7 +- + drivers/media/dvb-frontends/lnbp21.h | 7 +- + drivers/media/dvb-frontends/lnbp22.c | 7 +- + drivers/media/dvb-frontends/lnbp22.h | 7 +- + drivers/media/dvb-frontends/mn88473.c | 10 +- + drivers/media/dvb-frontends/mt352.c | 4 - + drivers/media/dvb-frontends/mt352.h | 4 - + drivers/media/dvb-frontends/mt352_priv.h | 4 - + drivers/media/dvb-frontends/nxt200x.c | 4 - + drivers/media/dvb-frontends/nxt200x.h | 4 - + drivers/media/dvb-frontends/or51132.c | 4 - + drivers/media/dvb-frontends/or51132.h | 4 - + drivers/media/dvb-frontends/or51211.c | 4 - + drivers/media/dvb-frontends/or51211.h | 4 - + drivers/media/dvb-frontends/rtl2832_sdr.c | 2 +- + drivers/media/dvb-frontends/s5h1420.c | 4 - + drivers/media/dvb-frontends/s5h1420.h | 4 - + drivers/media/dvb-frontends/s5h1432.c | 4 - + drivers/media/dvb-frontends/s5h1432.h | 4 - + drivers/media/dvb-frontends/si2168.c | 70 +- + drivers/media/dvb-frontends/si2168_priv.h | 1 + + drivers/media/dvb-frontends/stv0367.c | 4 - + drivers/media/dvb-frontends/stv0367.h | 4 - + drivers/media/dvb-frontends/stv0367_priv.h | 4 - + drivers/media/dvb-frontends/stv0367_regs.h | 4 - + drivers/media/dvb-frontends/stv0900.h | 4 - + drivers/media/dvb-frontends/stv0900_core.c | 4 - + drivers/media/dvb-frontends/stv0900_init.h | 4 - + drivers/media/dvb-frontends/stv0900_priv.h | 4 - + drivers/media/dvb-frontends/stv0900_reg.h | 4 - + drivers/media/dvb-frontends/stv0900_sw.c | 4 - + drivers/media/dvb-frontends/stv6110.c | 4 - + drivers/media/dvb-frontends/stv6110.h | 4 - + drivers/media/dvb-frontends/tda18271c2dd.c | 8 +- + drivers/media/dvb-frontends/tdhd1.h | 7 +- + drivers/media/dvb-frontends/tua6100.c | 4 - + drivers/media/dvb-frontends/tua6100.h | 4 - + drivers/media/dvb-frontends/zd1301_demod.c | 551 ++++++ + drivers/media/dvb-frontends/zd1301_demod.h | 73 + + drivers/media/dvb-frontends/zl10036.c | 4 - + drivers/media/dvb-frontends/zl10036.h | 4 - + drivers/media/dvb-frontends/zl10039.c | 4 - + drivers/media/dvb-frontends/zl10353.c | 4 - + drivers/media/dvb-frontends/zl10353.h | 4 - + drivers/media/dvb-frontends/zl10353_priv.h | 4 - + drivers/media/i2c/Kconfig | 1 + + drivers/media/i2c/Makefile | 1 + + drivers/media/i2c/adp1653.c | 5 - + drivers/media/i2c/adv7170.c | 9 +- + drivers/media/i2c/adv7175.c | 4 - + drivers/media/i2c/adv7180.c | 4 - + drivers/media/i2c/adv7183.c | 4 - + drivers/media/i2c/adv7183_regs.h | 4 - + drivers/media/i2c/adv7604.c | 3 + + drivers/media/i2c/ak881x.c | 6 +- + drivers/media/i2c/aptina-pll.c | 5 - + drivers/media/i2c/aptina-pll.h | 5 - + drivers/media/i2c/as3645a.c | 5 - + drivers/media/i2c/bt819.c | 4 - + drivers/media/i2c/bt856.c | 4 - + drivers/media/i2c/cs5345.c | 4 - + drivers/media/i2c/cs53l32a.c | 4 - + drivers/media/i2c/cx25840/cx25840-audio.c | 4 - + drivers/media/i2c/cx25840/cx25840-core.c | 4 - + drivers/media/i2c/cx25840/cx25840-core.h | 4 - + drivers/media/i2c/cx25840/cx25840-firmware.c | 4 - + drivers/media/i2c/cx25840/cx25840-ir.c | 5 - + drivers/media/i2c/cx25840/cx25840-vbi.c | 4 - + drivers/media/i2c/et8ek8/Kconfig | 6 + + drivers/media/i2c/et8ek8/Makefile | 2 + + drivers/media/i2c/et8ek8/et8ek8_driver.c | 1514 +++++++++++++++ + drivers/media/i2c/et8ek8/et8ek8_mode.c | 587 ++++++ + drivers/media/i2c/et8ek8/et8ek8_reg.h | 96 + + drivers/media/i2c/ir-kbd-i2c.c | 6 +- + drivers/media/i2c/ks0127.c | 4 - + drivers/media/i2c/ks0127.h | 4 - + drivers/media/i2c/m52790.c | 4 - + drivers/media/i2c/m5mols/m5mols_core.c | 7 +- + drivers/media/i2c/ml86v7667.c | 6 +- + drivers/media/i2c/msp3400-driver.c | 5 - + drivers/media/i2c/msp3400-kthreads.c | 5 - + drivers/media/i2c/mt9m032.c | 5 - + drivers/media/i2c/mt9p031.c | 8 +- + drivers/media/i2c/mt9v032.c | 11 +- + drivers/media/i2c/noon010pc30.c | 4 +- + drivers/media/i2c/ov2659.c | 1 - + drivers/media/i2c/ov7640.c | 4 - + drivers/media/i2c/ov9650.c | 4 +- + drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c | 2 +- + drivers/media/i2c/s5k6a3.c | 6 +- + drivers/media/i2c/saa7110.c | 4 - + drivers/media/i2c/saa7115.c | 4 - + drivers/media/i2c/saa7127.c | 4 - + drivers/media/i2c/saa717x.c | 4 - + drivers/media/i2c/saa7185.c | 4 - + drivers/media/i2c/soc_camera/ov9640.c | 2 +- + drivers/media/i2c/sony-btf-mpx.c | 4 - + drivers/media/i2c/tc358743.c | 47 +- + drivers/media/i2c/tc358743_regs.h | 1 + + drivers/media/i2c/tlv320aic23b.c | 4 - + drivers/media/i2c/tvp514x.c | 4 - + drivers/media/i2c/tvp514x_regs.h | 4 - + drivers/media/i2c/tvp7002.c | 4 - + drivers/media/i2c/tvp7002_reg.h | 4 - + drivers/media/i2c/tw2804.c | 4 - + drivers/media/i2c/tw9903.c | 4 - + drivers/media/i2c/tw9906.c | 4 - + drivers/media/i2c/uda1342.c | 4 - + drivers/media/i2c/upd64031a.c | 4 - + drivers/media/i2c/upd64083.c | 5 - + drivers/media/i2c/vp27smpx.c | 4 - + drivers/media/i2c/vpx3220.c | 4 - + drivers/media/i2c/vs6624.c | 4 - + drivers/media/i2c/vs6624_regs.h | 4 - + drivers/media/i2c/wm8739.c | 4 - + drivers/media/i2c/wm8775.c | 4 - + drivers/media/media-device.c | 14 +- + drivers/media/media-devnode.c | 4 - + drivers/media/media-entity.c | 166 +- + drivers/media/pci/b2c2/flexcop-pci.c | 2 +- + drivers/media/pci/bt8xx/bttv-input.c | 6 +- + drivers/media/pci/bt8xx/dst_ca.c | 11 +- + drivers/media/pci/bt8xx/dvb-bt8xx.c | 5 +- + drivers/media/pci/bt8xx/dvb-bt8xx.h | 4 - + drivers/media/pci/cobalt/cobalt-cpld.c | 4 +- + drivers/media/pci/cx18/cx18-alsa-main.c | 5 - + drivers/media/pci/cx18/cx18-alsa-mixer.c | 5 - + drivers/media/pci/cx18/cx18-alsa-mixer.h | 5 - + drivers/media/pci/cx18/cx18-alsa-pcm.c | 5 - + drivers/media/pci/cx18/cx18-alsa-pcm.h | 5 - + drivers/media/pci/cx18/cx18-alsa.h | 5 - + drivers/media/pci/cx18/cx18-audio.c | 5 - + drivers/media/pci/cx18/cx18-audio.h | 5 - + drivers/media/pci/cx18/cx18-av-audio.c | 5 - + drivers/media/pci/cx18/cx18-av-core.c | 5 - + drivers/media/pci/cx18/cx18-av-core.h | 5 - + drivers/media/pci/cx18/cx18-av-firmware.c | 5 - + drivers/media/pci/cx18/cx18-av-vbi.c | 5 - + drivers/media/pci/cx18/cx18-cards.c | 5 - + drivers/media/pci/cx18/cx18-cards.h | 4 - + drivers/media/pci/cx18/cx18-controls.c | 5 - + drivers/media/pci/cx18/cx18-driver.c | 5 - + drivers/media/pci/cx18/cx18-driver.h | 5 - + drivers/media/pci/cx18/cx18-dvb.c | 4 - + drivers/media/pci/cx18/cx18-dvb.h | 4 - + drivers/media/pci/cx18/cx18-fileops.c | 5 - + drivers/media/pci/cx18/cx18-fileops.h | 5 - + drivers/media/pci/cx18/cx18-firmware.c | 5 - + drivers/media/pci/cx18/cx18-firmware.h | 5 - + drivers/media/pci/cx18/cx18-gpio.c | 5 - + drivers/media/pci/cx18/cx18-gpio.h | 4 - + drivers/media/pci/cx18/cx18-i2c.c | 5 - + drivers/media/pci/cx18/cx18-i2c.h | 5 - + drivers/media/pci/cx18/cx18-io.c | 5 - + drivers/media/pci/cx18/cx18-io.h | 5 - + drivers/media/pci/cx18/cx18-ioctl.c | 5 - + drivers/media/pci/cx18/cx18-ioctl.h | 5 - + drivers/media/pci/cx18/cx18-irq.c | 5 - + drivers/media/pci/cx18/cx18-irq.h | 5 - + drivers/media/pci/cx18/cx18-mailbox.c | 5 - + drivers/media/pci/cx18/cx18-mailbox.h | 5 - + drivers/media/pci/cx18/cx18-queue.c | 5 - + drivers/media/pci/cx18/cx18-queue.h | 5 - + drivers/media/pci/cx18/cx18-scb.c | 5 - + drivers/media/pci/cx18/cx18-scb.h | 5 - + drivers/media/pci/cx18/cx18-streams.c | 5 - + drivers/media/pci/cx18/cx18-streams.h | 5 - + drivers/media/pci/cx18/cx18-vbi.c | 5 - + drivers/media/pci/cx18/cx18-vbi.h | 5 - + drivers/media/pci/cx18/cx18-version.h | 5 - + drivers/media/pci/cx18/cx18-video.c | 5 - + drivers/media/pci/cx18/cx18-video.h | 5 - + drivers/media/pci/cx18/cx23418.h | 5 - + drivers/media/pci/cx23885/cx23885-dvb.c | 54 +- + drivers/media/pci/cx23885/cx23885-input.c | 25 +- + drivers/media/pci/cx25821/cx25821-alsa.c | 4 - + drivers/media/pci/cx25821/cx25821-audio-upstream.c | 4 - + drivers/media/pci/cx25821/cx25821-audio-upstream.h | 4 - + drivers/media/pci/cx25821/cx25821-audio.h | 4 - + drivers/media/pci/cx25821/cx25821-biffuncs.h | 4 - + drivers/media/pci/cx25821/cx25821-cards.c | 4 - + drivers/media/pci/cx25821/cx25821-core.c | 4 - + drivers/media/pci/cx25821/cx25821-gpio.c | 4 - + drivers/media/pci/cx25821/cx25821-i2c.c | 4 - + drivers/media/pci/cx25821/cx25821-medusa-defines.h | 4 - + drivers/media/pci/cx25821/cx25821-medusa-reg.h | 4 - + drivers/media/pci/cx25821/cx25821-medusa-video.c | 4 - + drivers/media/pci/cx25821/cx25821-medusa-video.h | 4 - + drivers/media/pci/cx25821/cx25821-reg.h | 4 - + drivers/media/pci/cx25821/cx25821-sram.h | 4 - + drivers/media/pci/cx25821/cx25821-video-upstream.c | 4 - + drivers/media/pci/cx25821/cx25821-video-upstream.h | 4 - + drivers/media/pci/cx25821/cx25821-video.c | 4 - + drivers/media/pci/cx25821/cx25821-video.h | 4 - + drivers/media/pci/cx25821/cx25821.h | 4 - + drivers/media/pci/cx88/cx88-input.c | 3 +- + drivers/media/pci/ddbridge/ddbridge-core.c | 8 +- + drivers/media/pci/ddbridge/ddbridge-regs.h | 8 +- + drivers/media/pci/ddbridge/ddbridge.h | 8 +- + drivers/media/pci/dm1105/Kconfig | 2 +- + drivers/media/pci/dm1105/dm1105.c | 7 +- + drivers/media/pci/ivtv/Kconfig | 13 + + drivers/media/pci/ivtv/ivtv-alsa-main.c | 31 +- + drivers/media/pci/ivtv/ivtv-alsa-mixer.c | 18 +- + drivers/media/pci/ivtv/ivtv-alsa-mixer.h | 5 - + drivers/media/pci/ivtv/ivtv-alsa-pcm.c | 21 +- + drivers/media/pci/ivtv/ivtv-alsa-pcm.h | 5 - + drivers/media/pci/ivtv/ivtv-alsa.h | 5 - + drivers/media/pci/ivtv/ivtv-driver.c | 12 +- + drivers/media/pci/ivtv/ivtv-driver.h | 37 +- + drivers/media/pci/ivtv/ivtv-ioctl.c | 49 +- + drivers/media/pci/ivtv/ivtv-mailbox.c | 4 +- + drivers/media/pci/ivtv/ivtvfb.c | 23 +- + drivers/media/pci/mantis/mantis_dvb.c | 5 +- + drivers/media/pci/mantis/mantis_input.c | 2 +- + drivers/media/pci/meye/meye.c | 5 +- + drivers/media/pci/meye/meye.h | 4 - + drivers/media/pci/ngene/ngene-cards.c | 15 +- + drivers/media/pci/ngene/ngene-core.c | 8 +- + drivers/media/pci/ngene/ngene-dvb.c | 8 +- + drivers/media/pci/ngene/ngene-i2c.c | 8 +- + drivers/media/pci/ngene/ngene.h | 8 +- + drivers/media/pci/pluto2/pluto2.c | 4 - + drivers/media/pci/pt1/pt1.c | 4 - + drivers/media/pci/pt1/va1j5jf8007s.c | 4 - + drivers/media/pci/pt1/va1j5jf8007s.h | 4 - + drivers/media/pci/pt1/va1j5jf8007t.c | 4 - + drivers/media/pci/pt1/va1j5jf8007t.h | 4 - + drivers/media/pci/saa7134/saa7134-alsa.c | 4 - + drivers/media/pci/saa7134/saa7134-cards.c | 4 - + drivers/media/pci/saa7134/saa7134-core.c | 4 - + drivers/media/pci/saa7134/saa7134-dvb.c | 4 - + drivers/media/pci/saa7134/saa7134-empress.c | 4 - + drivers/media/pci/saa7134/saa7134-i2c.c | 4 - + drivers/media/pci/saa7134/saa7134-input.c | 6 +- + drivers/media/pci/saa7134/saa7134-ts.c | 4 - + drivers/media/pci/saa7134/saa7134-tvaudio.c | 4 - + drivers/media/pci/saa7134/saa7134-vbi.c | 4 - + drivers/media/pci/saa7134/saa7134-video.c | 4 - + drivers/media/pci/saa7134/saa7134.h | 4 - + drivers/media/pci/saa7164/saa7164-api.c | 4 - + drivers/media/pci/saa7164/saa7164-buffer.c | 4 - + drivers/media/pci/saa7164/saa7164-bus.c | 4 - + drivers/media/pci/saa7164/saa7164-cards.c | 4 - + drivers/media/pci/saa7164/saa7164-cmd.c | 4 - + drivers/media/pci/saa7164/saa7164-core.c | 4 - + drivers/media/pci/saa7164/saa7164-dvb.c | 4 - + drivers/media/pci/saa7164/saa7164-encoder.c | 4 - + drivers/media/pci/saa7164/saa7164-fw.c | 6 +- + drivers/media/pci/saa7164/saa7164-i2c.c | 4 - + drivers/media/pci/saa7164/saa7164-reg.h | 4 - + drivers/media/pci/saa7164/saa7164-types.h | 4 - + drivers/media/pci/saa7164/saa7164-vbi.c | 4 - + drivers/media/pci/saa7164/saa7164.h | 4 - + drivers/media/pci/smipcie/smipcie-ir.c | 3 +- + drivers/media/pci/solo6x10/solo6x10-g723.c | 2 +- + drivers/media/pci/sta2x11/sta2x11_vip.c | 2 +- + drivers/media/pci/sta2x11/sta2x11_vip.h | 4 - + drivers/media/pci/ttpci/av7110.c | 7 +- + drivers/media/pci/ttpci/av7110_av.c | 7 +- + drivers/media/pci/ttpci/av7110_ca.c | 7 +- + drivers/media/pci/ttpci/av7110_hw.c | 15 +- + drivers/media/pci/ttpci/av7110_hw.h | 12 +- + drivers/media/pci/ttpci/av7110_ir.c | 7 +- + drivers/media/pci/ttpci/av7110_v4l.c | 7 +- + drivers/media/pci/ttpci/budget-av.c | 7 +- + drivers/media/pci/ttpci/budget-ci.c | 9 +- + drivers/media/pci/ttpci/budget-core.c | 7 +- + drivers/media/pci/ttpci/budget-patch.c | 7 +- + drivers/media/pci/ttpci/budget.c | 7 +- + drivers/media/pci/ttpci/dvb_filter.h | 4 - + drivers/media/pci/tw686x/tw686x-core.c | 2 +- + drivers/media/pci/zoran/videocodec.c | 4 - + drivers/media/pci/zoran/videocodec.h | 4 - + drivers/media/pci/zoran/zoran.h | 4 - + drivers/media/pci/zoran/zoran_card.c | 4 - + drivers/media/pci/zoran/zoran_card.h | 4 - + drivers/media/pci/zoran/zoran_device.c | 4 - + drivers/media/pci/zoran/zoran_device.h | 4 - + drivers/media/pci/zoran/zoran_driver.c | 5 +- + drivers/media/pci/zoran/zoran_procfs.c | 4 - + drivers/media/pci/zoran/zoran_procfs.h | 4 - + drivers/media/pci/zoran/zr36016.c | 4 - + drivers/media/pci/zoran/zr36016.h | 4 - + drivers/media/pci/zoran/zr36050.c | 4 - + drivers/media/pci/zoran/zr36050.h | 4 - + drivers/media/pci/zoran/zr36057.h | 4 - + drivers/media/pci/zoran/zr36060.c | 4 - + drivers/media/pci/zoran/zr36060.h | 4 - + drivers/media/platform/Kconfig | 53 + + drivers/media/platform/Makefile | 2 + + drivers/media/platform/am437x/am437x-vpfe.c | 2 +- + drivers/media/platform/blackfin/bfin_capture.c | 4 - + drivers/media/platform/blackfin/ppi.c | 4 - + drivers/media/platform/coda/Makefile | 1 + + drivers/media/platform/coda/coda-bit.c | 93 +- + drivers/media/platform/coda/coda-common.c | 181 +- + drivers/media/platform/coda/coda.h | 5 +- + drivers/media/platform/coda/imx-vdoa.c | 338 ++++ + drivers/media/platform/coda/imx-vdoa.h | 58 + + drivers/media/platform/davinci/ccdc_hw_device.h | 4 - + drivers/media/platform/davinci/dm355_ccdc.c | 4 - + drivers/media/platform/davinci/dm355_ccdc_regs.h | 4 - + drivers/media/platform/davinci/dm644x_ccdc.c | 4 - + drivers/media/platform/davinci/dm644x_ccdc_regs.h | 4 - + drivers/media/platform/davinci/isif.c | 4 - + drivers/media/platform/davinci/isif_regs.h | 4 - + drivers/media/platform/davinci/vpbe.c | 4 - + drivers/media/platform/davinci/vpbe_osd.c | 4 - + drivers/media/platform/davinci/vpbe_osd_regs.h | 4 - + drivers/media/platform/davinci/vpbe_venc.c | 4 - + drivers/media/platform/davinci/vpbe_venc_regs.h | 4 - + drivers/media/platform/davinci/vpfe_capture.c | 6 +- + drivers/media/platform/davinci/vpif.c | 14 +- + drivers/media/platform/davinci/vpif_capture.c | 28 +- + drivers/media/platform/davinci/vpif_capture.h | 6 +- + drivers/media/platform/davinci/vpif_display.c | 6 + + drivers/media/platform/davinci/vpss.c | 4 - + drivers/media/platform/exynos-gsc/gsc-core.c | 3 +- + drivers/media/platform/exynos-gsc/gsc-m2m.c | 2 +- + drivers/media/platform/exynos4-is/fimc-capture.c | 12 +- + drivers/media/platform/exynos4-is/fimc-is-i2c.c | 9 +- + drivers/media/platform/exynos4-is/fimc-is.c | 8 +- + drivers/media/platform/exynos4-is/fimc-isp-video.c | 8 +- + drivers/media/platform/exynos4-is/fimc-lite.c | 8 +- + drivers/media/platform/exynos4-is/fimc-m2m.c | 2 +- + drivers/media/platform/exynos4-is/media-dev.c | 20 +- + drivers/media/platform/exynos4-is/media-dev.h | 2 +- + drivers/media/platform/exynos4-is/mipi-csis.c | 8 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 160 +- + .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 14 + + drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 2 + + drivers/media/platform/mtk-vcodec/vdec_vpu_if.c | 5 +- + .../media/platform/mtk-vcodec/venc/venc_h264_if.c | 8 +- + .../media/platform/mtk-vcodec/venc/venc_vp8_if.c | 8 +- + drivers/media/platform/mtk-vcodec/venc_vpu_if.c | 4 +- + drivers/media/platform/omap3isp/ispvideo.c | 18 +- + drivers/media/platform/rcar_fdp1.c | 4 +- + drivers/media/platform/s3c-camif/camif-capture.c | 8 +- + .../platform/soc_camera/soc_camera_platform.c | 6 +- + drivers/media/platform/sti/bdisp/bdisp-debug.c | 2 +- + drivers/media/platform/sti/delta/Makefile | 6 + + drivers/media/platform/sti/delta/delta-cfg.h | 64 + + drivers/media/platform/sti/delta/delta-debug.c | 72 + + drivers/media/platform/sti/delta/delta-debug.h | 18 + + drivers/media/platform/sti/delta/delta-ipc.c | 594 ++++++ + drivers/media/platform/sti/delta/delta-ipc.h | 76 + + drivers/media/platform/sti/delta/delta-mem.c | 51 + + drivers/media/platform/sti/delta/delta-mem.h | 14 + + drivers/media/platform/sti/delta/delta-mjpeg-dec.c | 455 +++++ + drivers/media/platform/sti/delta/delta-mjpeg-fw.h | 225 +++ + drivers/media/platform/sti/delta/delta-mjpeg-hdr.c | 149 ++ + drivers/media/platform/sti/delta/delta-mjpeg.h | 35 + + drivers/media/platform/sti/delta/delta-v4l2.c | 1993 ++++++++++++++++++++ + drivers/media/platform/sti/delta/delta.h | 566 ++++++ + drivers/media/platform/sti/hva/Makefile | 1 + + drivers/media/platform/sti/hva/hva-debugfs.c | 422 +++++ + drivers/media/platform/sti/hva/hva-h264.c | 6 + + drivers/media/platform/sti/hva/hva-hw.c | 48 + + drivers/media/platform/sti/hva/hva-hw.h | 3 + + drivers/media/platform/sti/hva/hva-mem.c | 5 +- + drivers/media/platform/sti/hva/hva-v4l2.c | 78 +- + drivers/media/platform/sti/hva/hva.h | 96 +- + drivers/media/platform/ti-vpe/vpdma.c | 2 +- + drivers/media/platform/vim2m.c | 2 + + drivers/media/platform/vivid/vivid-vid-cap.c | 5 +- + drivers/media/platform/vsp1/vsp1_drm.c | 4 +- + drivers/media/platform/vsp1/vsp1_video.c | 17 +- + drivers/media/platform/xilinx/xilinx-dma.c | 16 +- + drivers/media/platform/xilinx/xilinx-tpg.c | 8 +- + drivers/media/radio/dsbr100.c | 4 - + drivers/media/radio/radio-cadet.c | 8 +- + drivers/media/radio/radio-isa.c | 5 - + drivers/media/radio/radio-isa.h | 5 - + drivers/media/radio/radio-keene.c | 4 - + drivers/media/radio/radio-ma901.c | 4 - + drivers/media/radio/radio-mr800.c | 4 - + drivers/media/radio/radio-shark.c | 4 - + drivers/media/radio/radio-shark2.c | 4 - + drivers/media/radio/radio-tea5764.c | 4 - + drivers/media/radio/radio-tea5777.c | 4 - + drivers/media/radio/radio-tea5777.h | 4 - + drivers/media/radio/radio-timb.c | 4 - + drivers/media/radio/radio-wl1273.c | 4 - + drivers/media/radio/saa7706h.c | 4 - + drivers/media/radio/si470x/radio-si470x-common.c | 4 - + drivers/media/radio/si470x/radio-si470x-i2c.c | 4 - + drivers/media/radio/si470x/radio-si470x-usb.c | 4 - + drivers/media/radio/si470x/radio-si470x.h | 4 - + drivers/media/radio/si4713/radio-platform-si4713.c | 4 - + drivers/media/radio/si4713/si4713.c | 4 - + drivers/media/radio/tef6862.c | 4 - + drivers/media/radio/wl128x/fmdrv.h | 4 - + drivers/media/radio/wl128x/fmdrv_common.c | 4 - + drivers/media/radio/wl128x/fmdrv_common.h | 4 - + drivers/media/radio/wl128x/fmdrv_rx.c | 4 - + drivers/media/radio/wl128x/fmdrv_rx.h | 4 - + drivers/media/radio/wl128x/fmdrv_tx.c | 4 - + drivers/media/radio/wl128x/fmdrv_tx.h | 4 - + drivers/media/radio/wl128x/fmdrv_v4l2.c | 4 - + drivers/media/radio/wl128x/fmdrv_v4l2.h | 4 - + drivers/media/rc/Kconfig | 22 +- + drivers/media/rc/Makefile | 2 + + drivers/media/rc/ati_remote.c | 7 +- + drivers/media/rc/ene_ir.c | 10 +- + drivers/media/rc/ene_ir.h | 5 - + drivers/media/rc/fintek-cir.c | 10 +- + drivers/media/rc/fintek-cir.h | 5 - + drivers/media/rc/gpio-ir-recv.c | 5 +- + drivers/media/rc/igorplugusb.c | 7 +- + drivers/media/rc/iguanair.c | 13 +- + drivers/media/rc/img-ir/img-ir-hw.c | 15 +- + drivers/media/rc/img-ir/img-ir-nec.c | 21 +- + drivers/media/rc/img-ir/img-ir-raw.c | 3 +- + drivers/media/rc/img-ir/img-ir-sony.c | 26 +- + drivers/media/rc/imon.c | 138 +- + drivers/media/rc/ir-hix5hd2.c | 5 +- + drivers/media/rc/ir-jvc-decoder.c | 39 + + drivers/media/rc/ir-lirc-codec.c | 17 +- + drivers/media/rc/ir-mce_kbd-decoder.c | 2 +- + drivers/media/rc/ir-nec-decoder.c | 86 +- + drivers/media/rc/ir-rc5-decoder.c | 105 +- + drivers/media/rc/ir-rc6-decoder.c | 117 ++ + drivers/media/rc/ir-rx51.c | 332 ++-- + drivers/media/rc/ir-sanyo-decoder.c | 43 + + drivers/media/rc/ir-sharp-decoder.c | 50 + + drivers/media/rc/ir-sony-decoder.c | 48 + + drivers/media/rc/ir-spi.c | 199 ++ + drivers/media/rc/ite-cir.c | 10 +- + drivers/media/rc/ite-cir.h | 5 - + drivers/media/rc/keymaps/Makefile | 4 + + drivers/media/rc/keymaps/rc-d680-dmb.c | 75 + + drivers/media/rc/keymaps/rc-dvico-mce.c | 85 + + drivers/media/rc/keymaps/rc-dvico-portable.c | 76 + + drivers/media/rc/keymaps/rc-geekbox.c | 55 + + drivers/media/rc/keymaps/rc-rc6-mce.c | 1 + + drivers/media/rc/keymaps/rc-technisat-usb2.c | 4 - + drivers/media/rc/keymaps/rc-tivo.c | 86 +- + drivers/media/rc/lirc_dev.c | 13 +- + drivers/media/rc/mceusb.c | 13 +- + drivers/media/rc/meson-ir.c | 5 +- + drivers/media/rc/mtk-cir.c | 335 ++++ + drivers/media/rc/nuvoton-cir.c | 130 +- + drivers/media/rc/nuvoton-cir.h | 5 - + drivers/media/rc/rc-core-priv.h | 109 +- + drivers/media/rc/rc-ir-raw.c | 308 ++- + drivers/media/rc/rc-loopback.c | 48 +- + drivers/media/rc/rc-main.c | 527 ++++-- + drivers/media/rc/redrat3.c | 9 +- + drivers/media/rc/serial_ir.c | 29 +- + drivers/media/rc/st_rc.c | 5 +- + drivers/media/rc/streamzap.c | 9 +- + drivers/media/rc/sunxi-cir.c | 5 +- + drivers/media/rc/ttusbir.c | 14 +- + drivers/media/rc/winbond-cir.c | 266 +-- + drivers/media/tuners/fc0011.c | 4 - + drivers/media/tuners/fc0012-priv.h | 4 - + drivers/media/tuners/fc0012.c | 4 - + drivers/media/tuners/fc0012.h | 4 - + drivers/media/tuners/fc0013-priv.h | 4 - + drivers/media/tuners/fc0013.c | 4 - + drivers/media/tuners/fc0013.h | 4 - + drivers/media/tuners/fc001x-common.h | 4 - + drivers/media/tuners/it913x.c | 96 +- + drivers/media/tuners/it913x.h | 30 +- + drivers/media/tuners/max2165.c | 4 - + drivers/media/tuners/max2165.h | 4 - + drivers/media/tuners/max2165_priv.h | 4 - + drivers/media/tuners/mc44s803.c | 4 - + drivers/media/tuners/mc44s803.h | 4 - + drivers/media/tuners/mc44s803_priv.h | 4 - + drivers/media/tuners/mt2060.c | 129 +- + drivers/media/tuners/mt2060.h | 27 +- + drivers/media/tuners/mt2060_priv.h | 15 +- + drivers/media/tuners/mt2131.c | 4 - + drivers/media/tuners/mt2131.h | 4 - + drivers/media/tuners/mt2131_priv.h | 4 - + drivers/media/tuners/mxl5007t.c | 4 - + drivers/media/tuners/mxl5007t.h | 4 - + drivers/media/tuners/qt1010.c | 4 - + drivers/media/tuners/qt1010.h | 4 - + drivers/media/tuners/qt1010_priv.h | 4 - + drivers/media/tuners/tda18218.c | 4 - + drivers/media/tuners/tda18218.h | 4 - + drivers/media/tuners/tda18218_priv.h | 4 - + drivers/media/tuners/tda827x.c | 4 - + drivers/media/tuners/xc4000.c | 4 - + drivers/media/tuners/xc4000.h | 4 - + drivers/media/tuners/xc5000.c | 4 - + drivers/media/tuners/xc5000.h | 4 - + drivers/media/usb/au0828/au0828-cards.c | 4 - + drivers/media/usb/au0828/au0828-cards.h | 4 - + drivers/media/usb/au0828/au0828-core.c | 29 +- + drivers/media/usb/au0828/au0828-dvb.c | 4 - + drivers/media/usb/au0828/au0828-i2c.c | 4 - + drivers/media/usb/au0828/au0828-input.c | 3 +- + drivers/media/usb/au0828/au0828-reg.h | 4 - + drivers/media/usb/au0828/au0828-video.c | 5 - + drivers/media/usb/au0828/au0828.h | 4 - + drivers/media/usb/cpia2/cpia2.h | 4 - + drivers/media/usb/cpia2/cpia2_core.c | 4 - + drivers/media/usb/cpia2/cpia2_registers.h | 4 - + drivers/media/usb/cpia2/cpia2_usb.c | 8 +- + drivers/media/usb/cpia2/cpia2_v4l.c | 4 - + drivers/media/usb/cx231xx/Kconfig | 1 + + drivers/media/usb/cx231xx/cx231xx-417.c | 4 - + drivers/media/usb/cx231xx/cx231xx-audio.c | 4 - + drivers/media/usb/cx231xx/cx231xx-cards.c | 29 + + drivers/media/usb/cx231xx/cx231xx-core.c | 7 +- + drivers/media/usb/cx231xx/cx231xx-dif.h | 4 - + drivers/media/usb/cx231xx/cx231xx-dvb.c | 70 + + drivers/media/usb/cx231xx/cx231xx-input.c | 2 +- + drivers/media/usb/cx231xx/cx231xx.h | 1 + + drivers/media/usb/dvb-usb-v2/Kconfig | 8 + + drivers/media/usb/dvb-usb-v2/Makefile | 3 + + drivers/media/usb/dvb-usb-v2/af9015.c | 4 - + drivers/media/usb/dvb-usb-v2/af9015.h | 4 - + drivers/media/usb/dvb-usb-v2/af9035.c | 267 ++- + drivers/media/usb/dvb-usb-v2/af9035.h | 7 +- + drivers/media/usb/dvb-usb-v2/anysee.c | 4 - + drivers/media/usb/dvb-usb-v2/anysee.h | 4 - + drivers/media/usb/dvb-usb-v2/au6610.c | 4 - + drivers/media/usb/dvb-usb-v2/au6610.h | 4 - + drivers/media/usb/dvb-usb-v2/ce6230.c | 4 - + drivers/media/usb/dvb-usb-v2/ce6230.h | 4 - + drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 12 +- + drivers/media/usb/dvb-usb-v2/dvbsky.c | 4 - + drivers/media/usb/dvb-usb-v2/ec168.c | 4 - + drivers/media/usb/dvb-usb-v2/ec168.h | 4 - + drivers/media/usb/dvb-usb-v2/lmedm04.c | 22 +- + drivers/media/usb/dvb-usb-v2/mxl111sf-demod.c | 4 - + drivers/media/usb/dvb-usb-v2/mxl111sf-demod.h | 4 - + drivers/media/usb/dvb-usb-v2/mxl111sf-gpio.c | 4 - + drivers/media/usb/dvb-usb-v2/mxl111sf-gpio.h | 4 - + drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.c | 4 - + drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.h | 4 - + drivers/media/usb/dvb-usb-v2/mxl111sf-phy.c | 4 - + drivers/media/usb/dvb-usb-v2/mxl111sf-phy.h | 4 - + drivers/media/usb/dvb-usb-v2/mxl111sf-reg.h | 4 - + drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c | 4 - + drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h | 4 - + drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 2 +- + drivers/media/usb/dvb-usb-v2/zd1301.c | 298 +++ + drivers/media/usb/dvb-usb/af9005-fe.c | 4 - + drivers/media/usb/dvb-usb/af9005-remote.c | 4 - + drivers/media/usb/dvb-usb/af9005.c | 4 - + drivers/media/usb/dvb-usb/af9005.h | 4 - + drivers/media/usb/dvb-usb/cinergyT2-core.c | 4 - + drivers/media/usb/dvb-usb/cinergyT2-fe.c | 4 - + drivers/media/usb/dvb-usb/cinergyT2.h | 4 - + drivers/media/usb/dvb-usb/cxusb.c | 327 +--- + drivers/media/usb/dvb-usb/dib0700_devices.c | 7 +- + drivers/media/usb/dvb-usb/dtv5100.c | 4 - + drivers/media/usb/dvb-usb/dtv5100.h | 4 - + drivers/media/usb/dvb-usb/dvb-usb-firmware.c | 19 +- + drivers/media/usb/dvb-usb/dvb-usb-remote.c | 3 +- + drivers/media/usb/dvb-usb/gp8psk.c | 4 +- + drivers/media/usb/dvb-usb/technisat-usb2.c | 6 +- + drivers/media/usb/em28xx/em28xx-audio.c | 4 - + drivers/media/usb/em28xx/em28xx-cards.c | 19 + + drivers/media/usb/em28xx/em28xx-dvb.c | 74 + + drivers/media/usb/em28xx/em28xx-input.c | 15 +- + drivers/media/usb/em28xx/em28xx.h | 1 + + drivers/media/usb/gspca/autogain_functions.c | 4 - + drivers/media/usb/gspca/benq.c | 4 - + drivers/media/usb/gspca/conex.c | 4 - + drivers/media/usb/gspca/cpia1.c | 4 - + drivers/media/usb/gspca/etoms.c | 4 - + drivers/media/usb/gspca/finepix.c | 4 - + drivers/media/usb/gspca/gspca.c | 4 - + drivers/media/usb/gspca/jeilinj.c | 4 - + drivers/media/usb/gspca/jl2005bcd.c | 4 - + drivers/media/usb/gspca/jpeg.h | 4 - + drivers/media/usb/gspca/kinect.c | 4 - + drivers/media/usb/gspca/konica.c | 4 - + drivers/media/usb/gspca/mars.c | 4 - + drivers/media/usb/gspca/mr97310a.c | 4 - + drivers/media/usb/gspca/nw80x.c | 4 - + drivers/media/usb/gspca/ov519.c | 4 - + drivers/media/usb/gspca/ov534.c | 4 - + drivers/media/usb/gspca/ov534_9.c | 4 - + drivers/media/usb/gspca/pac207.c | 4 - + drivers/media/usb/gspca/pac7302.c | 4 - + drivers/media/usb/gspca/pac7311.c | 4 - + drivers/media/usb/gspca/pac_common.h | 4 - + drivers/media/usb/gspca/se401.c | 4 - + drivers/media/usb/gspca/se401.h | 4 - + drivers/media/usb/gspca/sn9c2028.c | 4 - + drivers/media/usb/gspca/sn9c2028.h | 4 - + drivers/media/usb/gspca/sn9c20x.c | 4 - + drivers/media/usb/gspca/sonixb.c | 4 - + drivers/media/usb/gspca/sonixj.c | 4 - + drivers/media/usb/gspca/spca1528.c | 4 - + drivers/media/usb/gspca/spca500.c | 4 - + drivers/media/usb/gspca/spca501.c | 4 - + drivers/media/usb/gspca/spca505.c | 4 - + drivers/media/usb/gspca/spca506.c | 4 - + drivers/media/usb/gspca/spca508.c | 4 - + drivers/media/usb/gspca/spca561.c | 4 - + drivers/media/usb/gspca/sq905.c | 4 - + drivers/media/usb/gspca/sq905c.c | 4 - + drivers/media/usb/gspca/sq930x.c | 4 - + drivers/media/usb/gspca/stk014.c | 4 - + drivers/media/usb/gspca/stk1135.c | 4 - + drivers/media/usb/gspca/stk1135.h | 4 - + drivers/media/usb/gspca/stv0680.c | 4 - + drivers/media/usb/gspca/stv06xx/stv06xx.c | 4 - + drivers/media/usb/gspca/stv06xx/stv06xx.h | 4 - + drivers/media/usb/gspca/stv06xx/stv06xx_hdcs.c | 4 - + drivers/media/usb/gspca/stv06xx/stv06xx_hdcs.h | 4 - + drivers/media/usb/gspca/stv06xx/stv06xx_pb0100.c | 4 - + drivers/media/usb/gspca/stv06xx/stv06xx_pb0100.h | 4 - + drivers/media/usb/gspca/stv06xx/stv06xx_sensor.h | 4 - + drivers/media/usb/gspca/stv06xx/stv06xx_st6422.c | 4 - + drivers/media/usb/gspca/stv06xx/stv06xx_st6422.h | 4 - + drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c | 7 - + drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.h | 4 - + drivers/media/usb/gspca/sunplus.c | 4 - + drivers/media/usb/gspca/t613.c | 4 - + drivers/media/usb/gspca/tv8532.c | 4 - + drivers/media/usb/gspca/vc032x.c | 4 - + drivers/media/usb/gspca/vicam.c | 4 - + drivers/media/usb/gspca/w996Xcf.c | 4 - + drivers/media/usb/gspca/xirlink_cit.c | 4 - + drivers/media/usb/gspca/zc3xx.c | 4 - + drivers/media/usb/pvrusb2/pvrusb2-audio.c | 4 - + drivers/media/usb/pvrusb2/pvrusb2-audio.h | 4 - + drivers/media/usb/pvrusb2/pvrusb2-context.c | 4 - + drivers/media/usb/pvrusb2/pvrusb2-context.h | 4 - + drivers/media/usb/pvrusb2/pvrusb2-cs53l32a.c | 4 - + drivers/media/usb/pvrusb2/pvrusb2-cs53l32a.h | 4 - + drivers/media/usb/pvrusb2/pvrusb2-ctrl.c | 4 - + drivers/media/usb/pvrusb2/pvrusb2-ctrl.h | 4 - + drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c | 4 - + drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.h | 4 - + drivers/media/usb/pvrusb2/pvrusb2-debug.h | 4 - + drivers/media/usb/pvrusb2/pvrusb2-debugifc.c | 4 - + drivers/media/usb/pvrusb2/pvrusb2-debugifc.h | 4 - + drivers/media/usb/pvrusb2/pvrusb2-devattr.c | 4 - + drivers/media/usb/pvrusb2/pvrusb2-devattr.h | 4 - + drivers/media/usb/pvrusb2/pvrusb2-dvb.c | 4 - + drivers/media/usb/pvrusb2/pvrusb2-eeprom.c | 4 - + drivers/media/usb/pvrusb2/pvrusb2-eeprom.h | 4 - + drivers/media/usb/pvrusb2/pvrusb2-encoder.c | 4 - + drivers/media/usb/pvrusb2/pvrusb2-encoder.h | 4 - + drivers/media/usb/pvrusb2/pvrusb2-fx2-cmd.h | 4 - + drivers/media/usb/pvrusb2/pvrusb2-hdw-internal.h | 4 - + drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 4 - + drivers/media/usb/pvrusb2/pvrusb2-hdw.h | 4 - + drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c | 4 - + drivers/media/usb/pvrusb2/pvrusb2-i2c-core.h | 4 - + drivers/media/usb/pvrusb2/pvrusb2-io.c | 127 +- + drivers/media/usb/pvrusb2/pvrusb2-io.h | 4 - + drivers/media/usb/pvrusb2/pvrusb2-ioread.c | 4 - + drivers/media/usb/pvrusb2/pvrusb2-ioread.h | 4 - + drivers/media/usb/pvrusb2/pvrusb2-main.c | 4 - + drivers/media/usb/pvrusb2/pvrusb2-std.c | 4 - + drivers/media/usb/pvrusb2/pvrusb2-std.h | 4 - + drivers/media/usb/pvrusb2/pvrusb2-sysfs.c | 4 - + drivers/media/usb/pvrusb2/pvrusb2-sysfs.h | 4 - + drivers/media/usb/pvrusb2/pvrusb2-util.h | 4 - + drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 7 +- + drivers/media/usb/pvrusb2/pvrusb2-v4l2.h | 4 - + drivers/media/usb/pvrusb2/pvrusb2-video-v4l.c | 4 - + drivers/media/usb/pvrusb2/pvrusb2-video-v4l.h | 4 - + drivers/media/usb/pvrusb2/pvrusb2-wm8775.c | 4 - + drivers/media/usb/pvrusb2/pvrusb2-wm8775.h | 4 - + drivers/media/usb/pvrusb2/pvrusb2.h | 4 - + drivers/media/usb/s2255/s2255drv.c | 4 - + drivers/media/usb/stk1160/Kconfig | 10 +- + drivers/media/usb/stk1160/Makefile | 4 +- + drivers/media/usb/stk1160/stk1160-ac97.c | 183 +- + drivers/media/usb/stk1160/stk1160-core.c | 8 +- + drivers/media/usb/stk1160/stk1160-reg.h | 10 + + drivers/media/usb/stk1160/stk1160.h | 11 +- + drivers/media/usb/stkwebcam/stk-sensor.c | 4 - + drivers/media/usb/stkwebcam/stk-webcam.c | 4 - + drivers/media/usb/stkwebcam/stk-webcam.h | 4 - + drivers/media/usb/tm6000/tm6000-cards.c | 4 - + drivers/media/usb/tm6000/tm6000-core.c | 4 - + drivers/media/usb/tm6000/tm6000-dvb.c | 4 - + drivers/media/usb/tm6000/tm6000-i2c.c | 4 - + drivers/media/usb/tm6000/tm6000-input.c | 9 +- + drivers/media/usb/tm6000/tm6000-regs.h | 4 - + drivers/media/usb/tm6000/tm6000-stds.c | 4 - + drivers/media/usb/tm6000/tm6000-usb-isoc.h | 4 - + drivers/media/usb/tm6000/tm6000-video.c | 9 +- + drivers/media/usb/tm6000/tm6000.h | 4 - + drivers/media/usb/ttusb-dec/ttusb_dec.c | 4 - + drivers/media/usb/ttusb-dec/ttusbdecfe.c | 4 - + drivers/media/usb/ttusb-dec/ttusbdecfe.h | 4 - + drivers/media/usb/usbtv/usbtv-video.c | 8 + + drivers/media/usb/usbvision/usbvision-cards.c | 4 - + drivers/media/usb/usbvision/usbvision-core.c | 6 - + drivers/media/usb/usbvision/usbvision-i2c.c | 4 - + drivers/media/usb/usbvision/usbvision-video.c | 5 - + drivers/media/usb/usbvision/usbvision.h | 5 - + drivers/media/usb/uvc/uvc_debugfs.c | 15 +- + drivers/media/usb/uvc/uvc_queue.c | 13 +- + drivers/media/usb/uvc/uvc_video.c | 3 +- + drivers/media/usb/uvc/uvcvideo.h | 4 +- + drivers/media/usb/zr364xx/zr364xx.c | 4 - + drivers/media/v4l2-core/v4l2-async.c | 26 +- + drivers/media/v4l2-core/v4l2-ctrls.c | 3 + + drivers/media/v4l2-core/v4l2-device.c | 2 +- + drivers/media/v4l2-core/v4l2-event.c | 5 - + drivers/media/v4l2-core/v4l2-fh.c | 5 - + drivers/media/v4l2-core/v4l2-mc.c | 44 +- + drivers/media/v4l2-core/v4l2-of.c | 13 +- + drivers/media/v4l2-core/v4l2-subdev.c | 4 - + drivers/staging/media/davinci_vpfe/vpfe_video.c | 25 +- + drivers/staging/media/davinci_vpfe/vpfe_video.h | 2 +- + drivers/staging/media/lirc/Kconfig | 22 +- + drivers/staging/media/lirc/Makefile | 3 - + drivers/staging/media/lirc/lirc_bt829.c | 401 ---- + drivers/staging/media/lirc/lirc_imon.c | 979 ---------- + drivers/staging/media/lirc/lirc_parallel.c | 741 -------- + drivers/staging/media/lirc/lirc_parallel.h | 26 - + drivers/staging/media/lirc/lirc_sir.c | 296 +-- + drivers/staging/media/omap4iss/iss_video.c | 34 +- + drivers/staging/media/s5p-cec/Kconfig | 2 +- + drivers/staging/media/s5p-cec/exynos_hdmi_cec.h | 1 - + .../staging/media/s5p-cec/exynos_hdmi_cecctrl.c | 5 +- + include/linux/platform_data/media/ir-rx51.h | 6 +- + include/media/blackfin/ppi.h | 4 - + include/media/davinci/ccdc_types.h | 4 - + include/media/davinci/dm355_ccdc.h | 4 - + include/media/davinci/dm644x_ccdc.h | 4 - + include/media/davinci/isif.h | 4 - + include/media/davinci/vpbe.h | 4 - + include/media/davinci/vpbe_osd.h | 4 - + include/media/davinci/vpbe_types.h | 4 - + include/media/davinci/vpbe_venc.h | 4 - + include/media/davinci/vpfe_capture.h | 4 - + include/media/davinci/vpfe_types.h | 4 - + include/media/davinci/vpif_types.h | 5 +- + include/media/davinci/vpss.h | 4 - + include/media/drv-intf/tea575x.h | 4 - + include/media/i2c/adp1653.h | 5 - + include/media/i2c/adv7183.h | 4 - + include/media/i2c/as3645a.h | 5 - + include/media/i2c/lm3560.h | 5 - + include/media/i2c/mt9m032.h | 5 - + include/media/i2c/smiapp.h | 5 - + include/media/i2c/ths7303.h | 4 - + include/media/i2c/tvp514x.h | 4 - + include/media/i2c/tvp7002.h | 4 - + include/media/i2c/upd64031a.h | 4 - + include/media/i2c/upd64083.h | 4 - + include/media/media-device.h | 8 +- + include/media/media-devnode.h | 4 - + include/media/media-entity.h | 69 +- + include/media/rc-core.h | 32 +- + include/media/rc-map.h | 31 +- + include/media/v4l2-event.h | 5 - + include/media/v4l2-fh.h | 5 - + include/media/v4l2-subdev.h | 6 +- + 863 files changed, 14505 insertions(+), 9025 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/irled/spi-ir-led.txt + create mode 100644 Documentation/devicetree/bindings/media/fsl-vdoa.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/toshiba,et8ek8.txt + create mode 100644 Documentation/devicetree/bindings/media/mtk-cir.txt + create mode 100644 Documentation/devicetree/bindings/media/rc.txt + create mode 100644 Documentation/devicetree/bindings/media/st,st-delta.txt + create mode 100644 Documentation/devicetree/bindings/media/ti,da850-vpif.txt + delete mode 100644 drivers/media/dvb-frontends/hd29l2.c + delete mode 100644 drivers/media/dvb-frontends/hd29l2.h + delete mode 100644 drivers/media/dvb-frontends/hd29l2_priv.h + create mode 100644 drivers/media/dvb-frontends/zd1301_demod.c + create mode 100644 drivers/media/dvb-frontends/zd1301_demod.h + create mode 100644 drivers/media/i2c/et8ek8/Kconfig + create mode 100644 drivers/media/i2c/et8ek8/Makefile + create mode 100644 drivers/media/i2c/et8ek8/et8ek8_driver.c + create mode 100644 drivers/media/i2c/et8ek8/et8ek8_mode.c + create mode 100644 drivers/media/i2c/et8ek8/et8ek8_reg.h + create mode 100644 drivers/media/platform/coda/imx-vdoa.c + create mode 100644 drivers/media/platform/coda/imx-vdoa.h + create mode 100644 drivers/media/platform/sti/delta/Makefile + create mode 100644 drivers/media/platform/sti/delta/delta-cfg.h + create mode 100644 drivers/media/platform/sti/delta/delta-debug.c + create mode 100644 drivers/media/platform/sti/delta/delta-debug.h + create mode 100644 drivers/media/platform/sti/delta/delta-ipc.c + create mode 100644 drivers/media/platform/sti/delta/delta-ipc.h + create mode 100644 drivers/media/platform/sti/delta/delta-mem.c + create mode 100644 drivers/media/platform/sti/delta/delta-mem.h + create mode 100644 drivers/media/platform/sti/delta/delta-mjpeg-dec.c + create mode 100644 drivers/media/platform/sti/delta/delta-mjpeg-fw.h + create mode 100644 drivers/media/platform/sti/delta/delta-mjpeg-hdr.c + create mode 100644 drivers/media/platform/sti/delta/delta-mjpeg.h + create mode 100644 drivers/media/platform/sti/delta/delta-v4l2.c + create mode 100644 drivers/media/platform/sti/delta/delta.h + create mode 100644 drivers/media/platform/sti/hva/hva-debugfs.c + create mode 100644 drivers/media/rc/ir-spi.c + create mode 100644 drivers/media/rc/keymaps/rc-d680-dmb.c + create mode 100644 drivers/media/rc/keymaps/rc-dvico-mce.c + create mode 100644 drivers/media/rc/keymaps/rc-dvico-portable.c + create mode 100644 drivers/media/rc/keymaps/rc-geekbox.c + create mode 100644 drivers/media/rc/mtk-cir.c + create mode 100644 drivers/media/usb/dvb-usb-v2/zd1301.c + delete mode 100644 drivers/staging/media/lirc/lirc_bt829.c + delete mode 100644 drivers/staging/media/lirc/lirc_imon.c + delete mode 100644 drivers/staging/media/lirc/lirc_parallel.c + delete mode 100644 drivers/staging/media/lirc/lirc_parallel.h +Merging v4l-dvb-next/master (7b2a4ddd20ce Merge branch 'patchwork' into to_next) +$ git merge v4l-dvb-next/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging fbdev/fbdev-for-next (0704916a4b24 video: fbdev: fsl-diu-fb: remove impossible condition) +$ git merge fbdev/fbdev-for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/display/ssd1307fb.txt | 5 +- + drivers/video/console/fbcon.c | 75 +++++++++++++--------- + drivers/video/fbdev/amba-clcd-nomadik.c | 9 +-- + drivers/video/fbdev/amba-clcd-nomadik.h | 5 +- + drivers/video/fbdev/amba-clcd-versatile.c | 14 +--- + drivers/video/fbdev/amba-clcd-versatile.h | 5 +- + drivers/video/fbdev/amba-clcd.c | 51 ++++++--------- + drivers/video/fbdev/amifb.c | 8 +-- + drivers/video/fbdev/fsl-diu-fb.c | 9 +-- + drivers/video/fbdev/imxfb.c | 6 +- + drivers/video/fbdev/matrox/matroxfb_DAC1064.c | 10 ++- + drivers/video/fbdev/matrox/matroxfb_Ti3026.c | 5 +- + drivers/video/fbdev/maxinefb.c | 2 +- + drivers/video/fbdev/mbx/mbxdebugfs.c | 18 ++---- + drivers/video/fbdev/offb.c | 4 +- + drivers/video/fbdev/omap/lcd_ams_delta.c | 25 -------- + drivers/video/fbdev/omap/lcd_h3.c | 37 +---------- + drivers/video/fbdev/omap/lcd_htcherald.c | 51 +-------------- + drivers/video/fbdev/omap/lcd_inn1510.c | 39 +---------- + drivers/video/fbdev/omap/lcd_inn1610.c | 27 +------- + drivers/video/fbdev/omap/lcd_osk.c | 38 +---------- + drivers/video/fbdev/omap/lcd_palmte.c | 50 +-------------- + drivers/video/fbdev/omap/lcd_palmtt.c | 43 +------------ + drivers/video/fbdev/omap/lcd_palmz71.c | 45 +------------ + drivers/video/fbdev/omap/omapfb_main.c | 31 +++++---- + drivers/video/fbdev/pmag-ba-fb.c | 2 +- + drivers/video/fbdev/pmagb-b-fb.c | 2 +- + drivers/video/fbdev/sh_mobile_lcdcfb.c | 10 +-- + drivers/video/fbdev/simplefb.c | 56 +++++++++++----- + drivers/video/fbdev/ssd1307fb.c | 55 ++++++++++------ + drivers/video/fbdev/stifb.c | 4 ++ + drivers/video/fbdev/wm8505fb.c | 2 +- + include/linux/platform_data/video-imxfb.h | 4 -- + 33 files changed, 220 insertions(+), 527 deletions(-) +Merging pm/linux-next (a818559a1469 Merge branch 'pm-tools' into linux-next) +$ git merge pm/linux-next +Resolved 'arch/mips/configs/lemote2f_defconfig' using previous resolution. +Auto-merging include/linux/i2c.h +Auto-merging drivers/i2c/i2c-core.c +Auto-merging arch/mips/configs/lemote2f_defconfig +CONFLICT (content): Merge conflict in arch/mips/configs/lemote2f_defconfig +Auto-merging arch/mips/Kconfig +Auto-merging arch/arm/configs/shmobile_defconfig +Auto-merging arch/arm/configs/pxa_defconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/configs/exynos_defconfig +Auto-merging Documentation/cpu-freq/user-guide.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master aa7fea31ac59] Merge remote-tracking branch 'pm/linux-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-class-devfreq-event | 25 + + Documentation/acpi/acpi-lid.txt | 16 +- + Documentation/cpu-freq/core.txt | 24 +- + Documentation/cpu-freq/cpu-drivers.txt | 177 +- + Documentation/cpu-freq/cpufreq-stats.txt | 24 +- + Documentation/cpu-freq/governors.txt | 322 ++-- + Documentation/cpu-freq/index.txt | 23 +- + Documentation/cpu-freq/intel-pstate.txt | 15 + + Documentation/cpu-freq/user-guide.txt | 60 +- + .../devicetree/bindings/cpufreq/ti-cpufreq.txt | 128 ++ + .../devicetree/bindings/devfreq/exynos-bus.txt | 14 + + Documentation/power/opp.txt | 52 +- + arch/arm/configs/exynos_defconfig | 2 +- + arch/arm/configs/multi_v5_defconfig | 2 +- + arch/arm/configs/multi_v7_defconfig | 2 +- + arch/arm/configs/mvebu_v5_defconfig | 2 +- + arch/arm/configs/pxa_defconfig | 2 +- + arch/arm/configs/shmobile_defconfig | 2 +- + arch/arm/mach-omap2/pm.c | 5 +- + arch/ia64/kernel/acpi.c | 3 +- + arch/mips/Kconfig | 2 + + arch/mips/configs/bmips_stb_defconfig | 16 +- + arch/mips/configs/lemote2f_defconfig | 1 - + arch/powerpc/configs/ppc6xx_defconfig | 1 - + arch/sh/configs/sh7785lcr_32bit_defconfig | 2 +- + arch/x86/kernel/acpi/boot.c | 5 +- + arch/x86/kernel/acpi/cstate.c | 9 +- + drivers/acpi/acpi_processor.c | 4 +- + drivers/acpi/acpica/acapps.h | 14 +- + drivers/acpi/acpica/accommon.h | 2 +- + drivers/acpi/acpica/acdebug.h | 2 +- + drivers/acpi/acpica/acdispat.h | 2 +- + drivers/acpi/acpica/acevents.h | 2 +- + drivers/acpi/acpica/acglobal.h | 2 +- + drivers/acpi/acpica/achware.h | 2 +- + drivers/acpi/acpica/acinterp.h | 2 +- + drivers/acpi/acpica/aclocal.h | 9 +- + drivers/acpi/acpica/acmacros.h | 74 +- + drivers/acpi/acpica/acnamesp.h | 2 +- + drivers/acpi/acpica/acobject.h | 2 +- + drivers/acpi/acpica/acopcode.h | 24 +- + drivers/acpi/acpica/acparser.h | 2 +- + drivers/acpi/acpica/acpredef.h | 2 +- + drivers/acpi/acpica/acresrc.h | 2 +- + drivers/acpi/acpica/acstruct.h | 2 +- + drivers/acpi/acpica/actables.h | 2 +- + drivers/acpi/acpica/acutils.h | 2 +- + drivers/acpi/acpica/amlcode.h | 22 +- + drivers/acpi/acpica/amlresrc.h | 2 +- + drivers/acpi/acpica/dbcmds.c | 2 +- + drivers/acpi/acpica/dbconvert.c | 2 +- + drivers/acpi/acpica/dbdisply.c | 2 +- + drivers/acpi/acpica/dbexec.c | 2 +- + drivers/acpi/acpica/dbfileio.c | 2 +- + drivers/acpi/acpica/dbhistry.c | 2 +- + drivers/acpi/acpica/dbinput.c | 2 +- + drivers/acpi/acpica/dbmethod.c | 2 +- + drivers/acpi/acpica/dbnames.c | 2 +- + drivers/acpi/acpica/dbobject.c | 2 +- + drivers/acpi/acpica/dbstats.c | 2 +- + drivers/acpi/acpica/dbtest.c | 2 +- + drivers/acpi/acpica/dbutils.c | 2 +- + drivers/acpi/acpica/dbxface.c | 6 +- + drivers/acpi/acpica/dsargs.c | 2 +- + drivers/acpi/acpica/dscontrol.c | 2 +- + drivers/acpi/acpica/dsdebug.c | 2 +- + drivers/acpi/acpica/dsfield.c | 2 +- + drivers/acpi/acpica/dsinit.c | 2 +- + drivers/acpi/acpica/dsmethod.c | 2 +- + drivers/acpi/acpica/dsmthdat.c | 2 +- + drivers/acpi/acpica/dsobject.c | 2 +- + drivers/acpi/acpica/dsopcode.c | 2 +- + drivers/acpi/acpica/dsutils.c | 2 +- + drivers/acpi/acpica/dswexec.c | 2 +- + drivers/acpi/acpica/dswload.c | 2 +- + drivers/acpi/acpica/dswload2.c | 2 +- + drivers/acpi/acpica/dswscope.c | 2 +- + drivers/acpi/acpica/dswstate.c | 2 +- + drivers/acpi/acpica/evevent.c | 2 +- + drivers/acpi/acpica/evglock.c | 2 +- + drivers/acpi/acpica/evgpe.c | 2 +- + drivers/acpi/acpica/evgpeblk.c | 2 +- + drivers/acpi/acpica/evgpeinit.c | 2 +- + drivers/acpi/acpica/evgpeutil.c | 2 +- + drivers/acpi/acpica/evhandler.c | 2 +- + drivers/acpi/acpica/evmisc.c | 2 +- + drivers/acpi/acpica/evregion.c | 2 +- + drivers/acpi/acpica/evrgnini.c | 2 +- + drivers/acpi/acpica/evsci.c | 2 +- + drivers/acpi/acpica/evxface.c | 2 +- + drivers/acpi/acpica/evxfevnt.c | 2 +- + drivers/acpi/acpica/evxfgpe.c | 2 +- + drivers/acpi/acpica/evxfregn.c | 2 +- + drivers/acpi/acpica/exconcat.c | 2 +- + drivers/acpi/acpica/exconfig.c | 2 +- + drivers/acpi/acpica/exconvrt.c | 3 +- + drivers/acpi/acpica/excreate.c | 2 +- + drivers/acpi/acpica/exdebug.c | 2 +- + drivers/acpi/acpica/exdump.c | 2 +- + drivers/acpi/acpica/exfield.c | 2 +- + drivers/acpi/acpica/exfldio.c | 2 +- + drivers/acpi/acpica/exmisc.c | 2 +- + drivers/acpi/acpica/exmutex.c | 2 +- + drivers/acpi/acpica/exnames.c | 2 +- + drivers/acpi/acpica/exoparg1.c | 2 +- + drivers/acpi/acpica/exoparg2.c | 2 +- + drivers/acpi/acpica/exoparg3.c | 2 +- + drivers/acpi/acpica/exoparg6.c | 2 +- + drivers/acpi/acpica/exprep.c | 2 +- + drivers/acpi/acpica/exregion.c | 2 +- + drivers/acpi/acpica/exresnte.c | 2 +- + drivers/acpi/acpica/exresolv.c | 2 +- + drivers/acpi/acpica/exresop.c | 3 +- + drivers/acpi/acpica/exstore.c | 2 +- + drivers/acpi/acpica/exstoren.c | 2 +- + drivers/acpi/acpica/exstorob.c | 2 +- + drivers/acpi/acpica/exsystem.c | 2 +- + drivers/acpi/acpica/extrace.c | 2 +- + drivers/acpi/acpica/exutils.c | 2 +- + drivers/acpi/acpica/hwacpi.c | 2 +- + drivers/acpi/acpica/hwesleep.c | 37 +- + drivers/acpi/acpica/hwgpe.c | 2 +- + drivers/acpi/acpica/hwpci.c | 2 +- + drivers/acpi/acpica/hwregs.c | 155 +- + drivers/acpi/acpica/hwsleep.c | 13 +- + drivers/acpi/acpica/hwtimer.c | 2 +- + drivers/acpi/acpica/hwvalid.c | 2 +- + drivers/acpi/acpica/hwxface.c | 2 +- + drivers/acpi/acpica/hwxfsleep.c | 2 +- + drivers/acpi/acpica/nsaccess.c | 2 +- + drivers/acpi/acpica/nsalloc.c | 2 +- + drivers/acpi/acpica/nsarguments.c | 2 +- + drivers/acpi/acpica/nsconvert.c | 2 +- + drivers/acpi/acpica/nsdump.c | 2 +- + drivers/acpi/acpica/nsdumpdv.c | 2 +- + drivers/acpi/acpica/nseval.c | 2 +- + drivers/acpi/acpica/nsinit.c | 2 +- + drivers/acpi/acpica/nsload.c | 2 +- + drivers/acpi/acpica/nsnames.c | 2 +- + drivers/acpi/acpica/nsobject.c | 2 +- + drivers/acpi/acpica/nsparse.c | 2 +- + drivers/acpi/acpica/nspredef.c | 2 +- + drivers/acpi/acpica/nsprepkg.c | 2 +- + drivers/acpi/acpica/nsrepair.c | 2 +- + drivers/acpi/acpica/nsrepair2.c | 2 +- + drivers/acpi/acpica/nssearch.c | 2 +- + drivers/acpi/acpica/nsutils.c | 2 +- + drivers/acpi/acpica/nswalk.c | 2 +- + drivers/acpi/acpica/nsxfeval.c | 2 +- + drivers/acpi/acpica/nsxfname.c | 2 +- + drivers/acpi/acpica/nsxfobj.c | 2 +- + drivers/acpi/acpica/psargs.c | 99 +- + drivers/acpi/acpica/psloop.c | 6 +- + drivers/acpi/acpica/psobject.c | 12 +- + drivers/acpi/acpica/psopcode.c | 2 +- + drivers/acpi/acpica/psopinfo.c | 2 +- + drivers/acpi/acpica/psparse.c | 2 +- + drivers/acpi/acpica/psscope.c | 2 +- + drivers/acpi/acpica/pstree.c | 12 +- + drivers/acpi/acpica/psutils.c | 2 +- + drivers/acpi/acpica/pswalk.c | 2 +- + drivers/acpi/acpica/psxface.c | 2 +- + drivers/acpi/acpica/rsaddr.c | 2 +- + drivers/acpi/acpica/rscalc.c | 2 +- + drivers/acpi/acpica/rscreate.c | 2 +- + drivers/acpi/acpica/rsdump.c | 2 +- + drivers/acpi/acpica/rsdumpinfo.c | 2 +- + drivers/acpi/acpica/rsinfo.c | 2 +- + drivers/acpi/acpica/rsio.c | 2 +- + drivers/acpi/acpica/rsirq.c | 2 +- + drivers/acpi/acpica/rslist.c | 2 +- + drivers/acpi/acpica/rsmemory.c | 2 +- + drivers/acpi/acpica/rsmisc.c | 2 +- + drivers/acpi/acpica/rsserial.c | 2 +- + drivers/acpi/acpica/rsutils.c | 2 +- + drivers/acpi/acpica/rsxface.c | 2 +- + drivers/acpi/acpica/tbdata.c | 2 +- + drivers/acpi/acpica/tbfadt.c | 2 +- + drivers/acpi/acpica/tbfind.c | 2 +- + drivers/acpi/acpica/tbinstal.c | 2 +- + drivers/acpi/acpica/tbprint.c | 2 +- + drivers/acpi/acpica/tbutils.c | 2 +- + drivers/acpi/acpica/tbxface.c | 2 +- + drivers/acpi/acpica/tbxfload.c | 2 +- + drivers/acpi/acpica/tbxfroot.c | 2 +- + drivers/acpi/acpica/utaddress.c | 2 +- + drivers/acpi/acpica/utalloc.c | 2 +- + drivers/acpi/acpica/utascii.c | 2 +- + drivers/acpi/acpica/utbuffer.c | 2 +- + drivers/acpi/acpica/utcache.c | 2 +- + drivers/acpi/acpica/utcopy.c | 2 +- + drivers/acpi/acpica/utdebug.c | 2 +- + drivers/acpi/acpica/utdecode.c | 6 +- + drivers/acpi/acpica/utdelete.c | 8 +- + drivers/acpi/acpica/uterror.c | 2 +- + drivers/acpi/acpica/uteval.c | 2 +- + drivers/acpi/acpica/utexcep.c | 2 +- + drivers/acpi/acpica/utglobal.c | 2 +- + drivers/acpi/acpica/uthex.c | 2 +- + drivers/acpi/acpica/utids.c | 2 +- + drivers/acpi/acpica/utinit.c | 2 +- + drivers/acpi/acpica/utlock.c | 2 +- + drivers/acpi/acpica/utmath.c | 2 +- + drivers/acpi/acpica/utmisc.c | 2 +- + drivers/acpi/acpica/utmutex.c | 2 +- + drivers/acpi/acpica/utnonansi.c | 2 +- + drivers/acpi/acpica/utobject.c | 2 +- + drivers/acpi/acpica/utosi.c | 2 +- + drivers/acpi/acpica/utownerid.c | 2 +- + drivers/acpi/acpica/utpredef.c | 2 +- + drivers/acpi/acpica/utprint.c | 2 +- + drivers/acpi/acpica/utresrc.c | 19 +- + drivers/acpi/acpica/utstate.c | 2 +- + drivers/acpi/acpica/utstring.c | 2 +- + drivers/acpi/acpica/utstrtoul64.c | 2 +- + drivers/acpi/acpica/uttrack.c | 2 +- + drivers/acpi/acpica/utuuid.c | 2 +- + drivers/acpi/acpica/utxface.c | 2 +- + drivers/acpi/acpica/utxferror.c | 2 +- + drivers/acpi/acpica/utxfinit.c | 2 +- + drivers/acpi/acpica/utxfmutex.c | 2 +- + drivers/acpi/apei/einj.c | 2 +- + drivers/acpi/bus.c | 42 + + drivers/acpi/button.c | 11 +- + drivers/acpi/ec.c | 115 +- + drivers/acpi/internal.h | 4 +- + drivers/acpi/osl.c | 27 +- + drivers/acpi/processor_perflib.c | 4 +- + drivers/acpi/sleep.c | 19 + + drivers/base/cpu.c | 2 + + drivers/base/power/domain.c | 124 +- + drivers/base/power/opp/core.c | 1011 ++++------ + drivers/base/power/opp/cpu.c | 66 +- + drivers/base/power/opp/of.c | 154 +- + drivers/base/power/opp/opp.h | 40 +- + drivers/base/property.c | 229 ++- + drivers/clk/tegra/clk-dfll.c | 17 +- + drivers/cpufreq/Kconfig | 20 +- + drivers/cpufreq/Kconfig.arm | 11 + + drivers/cpufreq/Makefile | 2 + + drivers/cpufreq/bmips-cpufreq.c | 188 ++ + drivers/cpufreq/brcmstb-avs-cpufreq.c | 2 - + drivers/cpufreq/cpufreq-dt-platdev.c | 2 - + drivers/cpufreq/cpufreq-dt.c | 7 +- + drivers/cpufreq/cpufreq.c | 19 +- + drivers/cpufreq/cpufreq_stats.c | 14 - + drivers/cpufreq/exynos5440-cpufreq.c | 5 +- + drivers/cpufreq/imx6q-cpufreq.c | 10 +- + drivers/cpufreq/intel_pstate.c | 385 +++- + drivers/cpufreq/mt8173-cpufreq.c | 8 +- + drivers/cpufreq/omap-cpufreq.c | 4 +- + drivers/cpufreq/powernv-cpufreq.c | 50 +- + drivers/cpufreq/ppc_cbe_cpufreq_pmi.c | 3 - + drivers/cpufreq/qoriq-cpufreq.c | 148 +- + drivers/cpufreq/s3c2416-cpufreq.c | 1 - + drivers/cpufreq/sti-cpufreq.c | 13 +- + drivers/cpufreq/ti-cpufreq.c | 272 +++ + drivers/cpuidle/governors/menu.c | 11 +- + drivers/devfreq/devfreq-event.c | 4 +- + drivers/devfreq/devfreq.c | 114 +- + drivers/devfreq/event/exynos-ppmu.c | 329 +++- + drivers/devfreq/exynos-bus.c | 22 +- + drivers/devfreq/governor.h | 2 + + drivers/devfreq/governor_passive.c | 10 +- + drivers/devfreq/governor_userspace.c | 11 +- + drivers/devfreq/rk3399_dmc.c | 16 +- + drivers/devfreq/tegra-devfreq.c | 4 +- + drivers/i2c/i2c-core.c | 19 +- + drivers/spi/spi.c | 4 +- + drivers/thermal/cpu_cooling.c | 11 +- + drivers/thermal/devfreq_cooling.c | 15 +- + include/acpi/acbuffer.h | 2 +- + include/acpi/acconfig.h | 2 +- + include/acpi/acexcep.h | 11 +- + include/acpi/acnames.h | 2 +- + include/acpi/acoutput.h | 2 +- + include/acpi/acpi.h | 2 +- + include/acpi/acpi_bus.h | 2 + + include/acpi/acpiosxf.h | 14 +- + include/acpi/acpixf.h | 4 +- + include/acpi/acrestyp.h | 2 +- + include/acpi/actbl.h | 2 +- + include/acpi/actbl1.h | 2 +- + include/acpi/actbl2.h | 2 +- + include/acpi/actbl3.h | 2 +- + include/acpi/actypes.h | 2 +- + include/acpi/acuuid.h | 2 +- + include/acpi/platform/acenv.h | 9 +- + include/acpi/platform/acenvex.h | 2 +- + include/acpi/platform/acgcc.h | 2 +- + include/acpi/platform/acgccex.h | 2 +- + include/acpi/platform/acintel.h | 87 + + include/acpi/platform/aclinux.h | 9 +- + include/acpi/platform/aclinuxex.h | 6 +- + include/linux/acpi.h | 3 +- + include/linux/cpufreq.h | 7 +- + include/linux/devfreq.h | 3 + + include/linux/i2c.h | 3 + + include/linux/pm_domain.h | 3 + + include/linux/pm_opp.h | 72 +- + include/linux/pm_qos.h | 1 - + include/linux/property.h | 19 +- + scripts/analyze_suspend.py | 1933 ++++++++++++-------- + tools/power/acpi/common/cmfsize.c | 2 +- + tools/power/acpi/common/getopt.c | 2 +- + .../acpi/os_specific/service_layers/oslinuxtbl.c | 2 +- + .../acpi/os_specific/service_layers/osunixdir.c | 2 +- + .../acpi/os_specific/service_layers/osunixmap.c | 2 +- + .../acpi/os_specific/service_layers/osunixxf.c | 24 +- + tools/power/acpi/tools/acpidump/acpidump.h | 2 +- + tools/power/acpi/tools/acpidump/apdump.c | 2 +- + tools/power/acpi/tools/acpidump/apfiles.c | 2 +- + tools/power/acpi/tools/acpidump/apmain.c | 2 +- + .../x86/intel_pstate_tracer/intel_pstate_tracer.py | 287 +++ + 314 files changed, 4868 insertions(+), 3092 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-devfreq-event + create mode 100644 Documentation/devicetree/bindings/cpufreq/ti-cpufreq.txt + create mode 100644 drivers/cpufreq/bmips-cpufreq.c + create mode 100644 drivers/cpufreq/ti-cpufreq.c + create mode 100644 include/acpi/platform/acintel.h + create mode 100755 tools/power/x86/intel_pstate_tracer/intel_pstate_tracer.py +Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc()) +$ git merge idle/next +Merge made by the 'recursive' strategy. +Merging thermal/next (7b09ae6042cd Merge branches 'ida-conversion' and 'for-rc' into next) +$ git merge thermal/next +Auto-merging drivers/thermal/devfreq_cooling.c +Auto-merging drivers/thermal/cpu_cooling.c +Merge made by the 'recursive' strategy. + drivers/thermal/clock_cooling.c | 50 +++++--------------------- + drivers/thermal/cpu_cooling.c | 63 ++++++-------------------------- + drivers/thermal/devfreq_cooling.c | 53 +++++---------------------- + drivers/thermal/thermal_core.c | 75 ++++++++++++++------------------------- + include/linux/thermal.h | 4 +-- + 5 files changed, 56 insertions(+), 189 deletions(-) +Merging thermal-soc/next (4f47aff5201c Merge branch 'work-linus' into work-next) +$ git merge thermal-soc/next +Merge made by the 'recursive' strategy. + .../bindings/thermal/rcar-gen3-thermal.txt | 56 ++++ + drivers/thermal/Kconfig | 9 + + drivers/thermal/Makefile | 1 + + drivers/thermal/mtk_thermal.c | 16 +- + drivers/thermal/rcar_gen3_thermal.c | 335 +++++++++++++++++++++ + drivers/thermal/ti-soc-thermal/Kconfig | 1 - + drivers/thermal/ti-soc-thermal/dra752-bandgap.h | 19 -- + .../thermal/ti-soc-thermal/dra752-thermal-data.c | 28 +- + 8 files changed, 410 insertions(+), 55 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.txt + create mode 100644 drivers/thermal/rcar_gen3_thermal.c +Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one) +$ git merge ieee1394/for-next +Merge made by the 'recursive' strategy. + drivers/firewire/net.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) +Merging dlm/next (aa9f1012858b dlm: don't specify WQ_UNBOUND for the ast callback workqueue) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (f1225ee4c8fc swiotlb-xen: update dev_addr after swapping pages) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging net-next/master (c0e4dadb3494 net: dsa: mv88e6xxx: Move forward declaration to where it is needed) +$ git merge net-next/master +Auto-merging security/selinux/hooks.c +Auto-merging net/unix/af_unix.c +Auto-merging net/socket.c +Removing net/sctp/ssnmap.c +Auto-merging net/rds/rds.h +Auto-merging net/packet/af_packet.c +Removing net/netfilter/nf_nat_proto_udplite.c +Removing net/netfilter/nf_conntrack_proto_udplite.c +Auto-merging net/ipv6/addrconf.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/ipv4/ping.c +Auto-merging net/ethernet/eth.c +Auto-merging net/dsa/dsa2.c +Auto-merging net/core/skbuff.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging include/net/tcp.h +Auto-merging include/net/lwtunnel.h +Auto-merging include/linux/skbuff.h +Auto-merging include/linux/pci.h +Auto-merging include/linux/netdevice.h +Auto-merging fs/afs/rxrpc.c +Auto-merging drivers/net/xen-netfront.c +Auto-merging drivers/net/loopback.c +Removing drivers/net/ethernet/synopsys/dwc_eth_qos.c +Removing drivers/net/ethernet/synopsys/Makefile +Removing drivers/net/ethernet/synopsys/Kconfig +Auto-merging drivers/net/ethernet/cavium/thunder/thunder_bgx.c +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/dra7.dtsi +Auto-merging arch/arm/boot/dts/dm814x.dtsi +Auto-merging arch/arm/boot/dts/am33xx.dtsi +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/net/brcm,bcm7445-switch-v4.0.txt | 10 +- + .../devicetree/bindings/net/brcm,systemport.txt | 5 +- + Documentation/devicetree/bindings/net/cpsw.txt | 3 - + Documentation/devicetree/bindings/net/dsa/dsa.txt | 20 +- + .../devicetree/bindings/net/dsa/marvell.txt | 93 +- + Documentation/devicetree/bindings/net/ethernet.txt | 3 + + .../devicetree/bindings/net/meson-dwmac.txt | 16 + + .../devicetree/bindings/net/mscc-phy-vsc8531.txt | 10 + + Documentation/devicetree/bindings/net/phy.txt | 4 + + .../bindings/net/snps,dwc-qos-ethernet.txt | 3 + + Documentation/devicetree/bindings/net/stmmac.txt | 3 +- + .../devicetree/bindings/net/wireless/ieee80211.txt | 24 + + Documentation/driver-api/80211/cfg80211.rst | 3 + + Documentation/networking/dsa/dsa.txt | 24 - + Documentation/networking/ip-sysctl.txt | 47 +- + Documentation/networking/netfilter-sysctl.txt | 10 + + Documentation/networking/packet_mmap.txt | 9 +- + Documentation/networking/regulatory.txt | 8 +- + Documentation/networking/vrf.txt | 7 +- + Documentation/siphash.txt | 175 ++ + Documentation/sysctl/net.txt | 21 + + MAINTAINERS | 52 +- + arch/Kconfig | 3 + + arch/arm/boot/dts/am33xx.dtsi | 1 - + arch/arm/boot/dts/am4372.dtsi | 1 - + arch/arm/boot/dts/dm814x.dtsi | 1 - + arch/arm/boot/dts/dra7.dtsi | 1 - + arch/arm/configs/multi_v7_defconfig | 3 +- + arch/arm/mach-orion5x/common.c | 2 +- + arch/arm/mach-orion5x/common.h | 4 +- + arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 7 +- + arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 7 +- + arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 7 +- + arch/arm/mach-orion5x/wnr854t-setup.c | 7 +- + arch/arm/mach-orion5x/wrt350n-v2-setup.c | 7 +- + arch/arm/plat-orion/common.c | 25 +- + arch/arm/plat-orion/include/plat/common.h | 4 +- + arch/m68k/emu/nfeth.c | 1 - + arch/sparc/Kconfig | 1 + + drivers/atm/eni.c | 2 +- + drivers/atm/midway.h | 2 +- + drivers/bcma/main.c | 25 +- + drivers/infiniband/core/cma.c | 6 +- + drivers/infiniband/hw/mlx5/cq.c | 10 +- + drivers/infiniband/hw/mlx5/main.c | 339 ++- + drivers/infiniband/hw/mlx5/mem.c | 32 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 121 +- + drivers/infiniband/hw/mlx5/mr.c | 518 ++-- + drivers/infiniband/hw/mlx5/odp.c | 424 ++- + drivers/infiniband/hw/mlx5/qp.c | 450 ++- + drivers/infiniband/sw/rxe/rxe_net.c | 2 +- + drivers/isdn/hardware/eicon/message.c | 16 +- + drivers/net/Kconfig | 3 + + drivers/net/bonding/bond_main.c | 22 +- + drivers/net/can/Makefile | 3 +- + drivers/net/can/at91_can.c | 2 +- + drivers/net/can/c_can/c_can.c | 2 +- + drivers/net/can/dev.c | 136 +- + drivers/net/can/flexcan.c | 419 +-- + drivers/net/can/ifi_canfd/ifi_canfd.c | 2 +- + drivers/net/can/janz-ican3.c | 2 +- + drivers/net/can/m_can/m_can.c | 2 +- + drivers/net/can/rcar/rcar_can.c | 2 +- + drivers/net/can/rcar/rcar_canfd.c | 2 +- + drivers/net/can/rx-offload.c | 289 ++ + drivers/net/can/softing/softing_cs.c | 2 +- + drivers/net/can/xilinx_can.c | 2 +- + drivers/net/dsa/Makefile | 3 +- + drivers/net/dsa/b53/b53_common.c | 178 +- + drivers/net/dsa/b53/b53_mdio.c | 13 +- + drivers/net/dsa/b53/b53_priv.h | 66 +- + drivers/net/dsa/b53/b53_regs.h | 32 + + drivers/net/dsa/bcm_sf2.c | 247 +- + drivers/net/dsa/bcm_sf2.h | 58 +- + drivers/net/dsa/bcm_sf2_cfp.c | 613 ++++ + drivers/net/dsa/bcm_sf2_regs.h | 197 +- + drivers/net/dsa/mv88e6060.c | 10 +- + drivers/net/dsa/mv88e6xxx/chip.c | 555 ++-- + drivers/net/dsa/mv88e6xxx/global2.c | 215 +- + drivers/net/dsa/mv88e6xxx/global2.h | 33 +- + drivers/net/dsa/mv88e6xxx/mv88e6xxx.h | 95 +- + drivers/net/dsa/mv88e6xxx/port.c | 114 +- + drivers/net/dsa/mv88e6xxx/port.h | 9 +- + drivers/net/dsa/qca8k.c | 21 +- + drivers/net/dsa/qca8k.h | 1 - + drivers/net/dummy.c | 222 +- + drivers/net/ethernet/3com/typhoon.c | 27 +- + drivers/net/ethernet/Kconfig | 2 +- + drivers/net/ethernet/Makefile | 2 +- + drivers/net/ethernet/adi/bfin_mac.c | 2 +- + drivers/net/ethernet/aeroflex/greth.c | 2 +- + drivers/net/ethernet/agere/et131x.c | 2 +- + drivers/net/ethernet/alacritech/slicoss.c | 6 +- + drivers/net/ethernet/altera/altera_tse_main.c | 2 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 10 +- + drivers/net/ethernet/amd/amd8111e.c | 164 +- + drivers/net/ethernet/amd/pcnet32.c | 11 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 6 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 57 +- + drivers/net/ethernet/aquantia/Kconfig | 24 + + drivers/net/ethernet/aquantia/Makefile | 5 + + drivers/net/ethernet/aquantia/atlantic/Makefile | 42 + + drivers/net/ethernet/aquantia/atlantic/aq_cfg.h | 77 + + drivers/net/ethernet/aquantia/atlantic/aq_common.h | 23 + + .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 262 ++ + .../net/ethernet/aquantia/atlantic/aq_ethtool.h | 19 + + drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 177 ++ + .../net/ethernet/aquantia/atlantic/aq_hw_utils.c | 68 + + .../net/ethernet/aquantia/atlantic/aq_hw_utils.h | 47 + + drivers/net/ethernet/aquantia/atlantic/aq_main.c | 273 ++ + drivers/net/ethernet/aquantia/atlantic/aq_main.h | 17 + + drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 952 ++++++ + drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 110 + + .../ethernet/aquantia/atlantic/aq_nic_internal.h | 46 + + .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 343 +++ + .../net/ethernet/aquantia/atlantic/aq_pci_func.h | 34 + + drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 375 +++ + drivers/net/ethernet/aquantia/atlantic/aq_ring.h | 157 + + drivers/net/ethernet/aquantia/atlantic/aq_rss.h | 26 + + drivers/net/ethernet/aquantia/atlantic/aq_utils.h | 50 + + drivers/net/ethernet/aquantia/atlantic/aq_vec.c | 392 +++ + drivers/net/ethernet/aquantia/atlantic/aq_vec.h | 42 + + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 905 ++++++ + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.h | 34 + + .../aquantia/atlantic/hw_atl/hw_atl_a0_internal.h | 155 + + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 958 ++++++ + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h | 34 + + .../aquantia/atlantic/hw_atl/hw_atl_b0_internal.h | 207 ++ + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c | 1394 +++++++++ + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h | 677 +++++ + .../aquantia/atlantic/hw_atl/hw_atl_llh_internal.h | 2375 +++++++++++++++ + .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 570 ++++ + .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 210 ++ + drivers/net/ethernet/aquantia/atlantic/ver.h | 18 + + drivers/net/ethernet/arc/emac_main.c | 2 +- + drivers/net/ethernet/atheros/alx/main.c | 9 +- + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 4 +- + drivers/net/ethernet/atheros/atlx/atl1.c | 2 +- + drivers/net/ethernet/broadcom/b44.c | 7 +- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 2 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 334 ++- + drivers/net/ethernet/broadcom/bcmsysport.h | 80 +- + drivers/net/ethernet/broadcom/bgmac-bcma-mdio.c | 108 +- + drivers/net/ethernet/broadcom/bgmac-bcma.c | 6 +- + drivers/net/ethernet/broadcom/bgmac-platform.c | 2 +- + drivers/net/ethernet/broadcom/bgmac.c | 27 +- + drivers/net/ethernet/broadcom/bgmac.h | 5 +- + drivers/net/ethernet/broadcom/bnx2.c | 9 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 17 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 199 +- + drivers/net/ethernet/broadcom/bnxt/Makefile | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 827 ++++-- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 185 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 144 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h | 23 + + drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 295 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 20 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 240 ++ + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h | 19 + + drivers/net/ethernet/broadcom/cnic.c | 2 +- + drivers/net/ethernet/broadcom/sb1250-mac.c | 2 +- + drivers/net/ethernet/broadcom/tg3.c | 8 +- + drivers/net/ethernet/brocade/bna/bnad.c | 8 +- + drivers/net/ethernet/cadence/macb.c | 34 +- + drivers/net/ethernet/cadence/macb.h | 73 + + drivers/net/ethernet/calxeda/xgmac.c | 7 +- + drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 14 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 73 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 54 +- + .../net/ethernet/cavium/liquidio/liquidio_common.h | 3 + + .../net/ethernet/cavium/liquidio/octeon_config.h | 10 +- + .../net/ethernet/cavium/liquidio/octeon_console.c | 10 + + .../net/ethernet/cavium/liquidio/octeon_device.c | 4 + + .../net/ethernet/cavium/liquidio/octeon_device.h | 6 + + drivers/net/ethernet/cavium/liquidio/octeon_iq.h | 2 +- + .../net/ethernet/cavium/liquidio/octeon_mailbox.c | 5 +- + .../net/ethernet/cavium/liquidio/octeon_mailbox.h | 4 +- + .../net/ethernet/cavium/liquidio/octeon_mem_ops.c | 21 +- + drivers/net/ethernet/cavium/liquidio/octeon_nic.c | 4 +- + .../net/ethernet/cavium/liquidio/request_manager.c | 49 +- + drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 2 +- + .../net/ethernet/cavium/thunder/nicvf_ethtool.c | 41 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 10 +- + drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 19 +- + drivers/net/ethernet/cavium/thunder/nicvf_queues.h | 16 +- + drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 95 +- + drivers/net/ethernet/chelsio/cxgb/sge.c | 2 +- + drivers/net/ethernet/chelsio/cxgb3/l2t.c | 2 +- + drivers/net/ethernet/chelsio/cxgb3/sge.c | 4 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 127 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 104 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c | 12 +- + drivers/net/ethernet/chelsio/cxgb4/l2t.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/sched.c | 5 - + drivers/net/ethernet/chelsio/cxgb4/sge.c | 66 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 149 +- + drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 15 + + drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 29 + + drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h | 12 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 21 +- + drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 2 +- + drivers/net/ethernet/cirrus/ep93xx_eth.c | 29 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 78 +- + drivers/net/ethernet/cisco/enic/vnic_rq.h | 78 - + drivers/net/ethernet/dec/tulip/de2104x.c | 91 +- + drivers/net/ethernet/dec/tulip/interrupt.c | 6 +- + drivers/net/ethernet/dec/tulip/uli526x.c | 41 +- + drivers/net/ethernet/dec/tulip/winbond-840.c | 14 +- + drivers/net/ethernet/dlink/dl2k.c | 71 +- + drivers/net/ethernet/dlink/sundance.c | 14 +- + drivers/net/ethernet/dnet.c | 2 +- + drivers/net/ethernet/ec_bhf.c | 4 +- + drivers/net/ethernet/emulex/benet/be.h | 5 - + drivers/net/ethernet/emulex/benet/be_ethtool.c | 73 +- + drivers/net/ethernet/emulex/benet/be_main.c | 158 +- + drivers/net/ethernet/ethoc.c | 11 +- + drivers/net/ethernet/ezchip/nps_enet.c | 2 +- + drivers/net/ethernet/faraday/ftmac100.c | 14 +- + drivers/net/ethernet/fealnx.c | 14 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 8 +- + drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 18 +- + drivers/net/ethernet/freescale/fec_main.c | 2 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- + drivers/net/ethernet/freescale/gianfar.c | 4 +- + drivers/net/ethernet/freescale/ucc_geth.c | 2 +- + drivers/net/ethernet/hisilicon/hip04_eth.c | 2 +- + drivers/net/ethernet/hisilicon/hisi_femac.c | 2 +- + drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 32 +- + drivers/net/ethernet/ibm/ehea/ehea_ethtool.c | 51 +- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 5 +- + drivers/net/ethernet/ibm/emac/core.c | 70 +- + drivers/net/ethernet/ibm/emac/mal.c | 18 +- + drivers/net/ethernet/ibm/ibmveth.c | 32 +- + drivers/net/ethernet/ibm/ibmvnic.c | 33 +- + drivers/net/ethernet/intel/e100.c | 16 +- + drivers/net/ethernet/intel/e1000e/e1000.h | 4 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 14 +- + drivers/net/ethernet/intel/fm10k/fm10k.h | 4 +- + drivers/net/ethernet/intel/fm10k/fm10k_common.c | 6 +- + drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 21 +- + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 12 +- + drivers/net/ethernet/intel/fm10k/fm10k_mbx.c | 10 +- + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 6 +- + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 6 +- + drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 4 - + drivers/net/ethernet/intel/i40e/i40e.h | 30 +- + drivers/net/ethernet/intel/i40e/i40e_client.c | 35 - + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 15 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 84 +- + drivers/net/ethernet/intel/i40e/i40e_osdep.h | 4 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 47 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 15 +- + drivers/net/ethernet/intel/i40e/i40e_type.h | 1 - + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 23 +- + drivers/net/ethernet/intel/i40evf/i40e_common.c | 1 - + drivers/net/ethernet/intel/i40evf/i40e_devids.h | 1 - + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 47 +- + drivers/net/ethernet/intel/i40evf/i40e_type.h | 1 - + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 1 - + drivers/net/ethernet/intel/igb/e1000_82575.c | 11 + + drivers/net/ethernet/intel/igb/e1000_i210.c | 4 +- + drivers/net/ethernet/intel/igb/e1000_mac.c | 15 +- + drivers/net/ethernet/intel/igb/e1000_phy.c | 4 + + drivers/net/ethernet/intel/igb/e1000_regs.h | 2 +- + drivers/net/ethernet/intel/igb/igb_main.c | 46 +- + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 130 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 2 - + drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 2 - + drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 115 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 6 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 193 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 13 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 165 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h | 1 + + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 66 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 4 - + drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 12 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 50 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 90 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 10 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 594 +++- + drivers/net/ethernet/intel/ixgbevf/ethtool.c | 38 - + drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 114 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 136 +- + drivers/net/ethernet/intel/ixgbevf/mbx.h | 1 + + drivers/net/ethernet/intel/ixgbevf/vf.c | 24 +- + drivers/net/ethernet/jme.c | 34 +- + drivers/net/ethernet/jme.h | 6 +- + drivers/net/ethernet/korina.c | 16 +- + drivers/net/ethernet/lantiq_etop.c | 21 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 6 +- + drivers/net/ethernet/marvell/mvneta.c | 66 +- + drivers/net/ethernet/marvell/mvpp2.c | 6 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 22 +- + drivers/net/ethernet/marvell/skge.c | 71 +- + drivers/net/ethernet/marvell/sky2.c | 80 +- + drivers/net/ethernet/marvell/sky2.h | 1 + + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 6 +- + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 28 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 12 +- + drivers/net/ethernet/mellanox/mlx4/en_port.h | 1 - + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 6 +- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/fw.c | 6 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 6 +- + drivers/net/ethernet/mellanox/mlx4/mlx4.h | 11 +- + drivers/net/ethernet/mellanox/mlx4/port.c | 170 +- + .../net/ethernet/mellanox/mlx4/resource_tracker.c | 59 +- + drivers/net/ethernet/mellanox/mlx5/core/cq.c | 2 + + drivers/net/ethernet/mellanox/mlx5/core/dev.c | 33 + + drivers/net/ethernet/mellanox/mlx5/core/en.h | 39 +- + drivers/net/ethernet/mellanox/mlx5/core/en_clock.c | 225 +- + .../net/ethernet/mellanox/mlx5/core/en_common.c | 12 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 34 +- + drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 91 +- + .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 154 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 79 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 40 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 245 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 30 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 299 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 109 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 20 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 13 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 7 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/fw.c | 20 + + drivers/net/ethernet/mellanox/mlx5/core/health.c | 20 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 79 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 12 + + drivers/net/ethernet/mellanox/mlx5/core/port.c | 72 + + drivers/net/ethernet/mellanox/mlx5/core/qp.c | 114 - + drivers/net/ethernet/mellanox/mlx5/core/uar.c | 351 ++- + drivers/net/ethernet/mellanox/mlx5/core/vport.c | 17 + + drivers/net/ethernet/mellanox/mlxsw/Kconfig | 2 + + drivers/net/ethernet/mellanox/mlxsw/Makefile | 6 +- + drivers/net/ethernet/mellanox/mlxsw/cmd.h | 10 +- + drivers/net/ethernet/mellanox/mlxsw/core.c | 6 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 2 +- + .../mellanox/mlxsw/core_acl_flex_actions.c | 681 +++++ + .../mellanox/mlxsw/core_acl_flex_actions.h | 66 + + .../ethernet/mellanox/mlxsw/core_acl_flex_keys.c | 475 +++ + .../ethernet/mellanox/mlxsw/core_acl_flex_keys.h | 238 ++ + drivers/net/ethernet/mellanox/mlxsw/i2c.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/item.h | 98 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 554 +++- + drivers/net/ethernet/mellanox/mlxsw/resources.h | 20 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 248 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 127 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 572 ++++ + .../mellanox/mlxsw/spectrum_acl_flex_keys.h | 109 + + .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 1084 +++++++ + .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 309 ++ + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 819 +++-- + drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 50 +- + drivers/net/ethernet/mellanox/mlxsw/trap.h | 1 + + drivers/net/ethernet/micrel/ks8695net.c | 11 +- + drivers/net/ethernet/micrel/ks8851.c | 7 - + drivers/net/ethernet/moxa/moxart_ether.c | 4 +- + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 208 +- + drivers/net/ethernet/natsemi/natsemi.c | 2 +- + drivers/net/ethernet/neterion/s2io.c | 4 +- + drivers/net/ethernet/neterion/vxge/vxge-main.c | 10 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 21 +- + drivers/net/ethernet/nvidia/forcedeth.c | 6 +- + drivers/net/ethernet/nxp/lpc_eth.c | 2 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 2 +- + drivers/net/ethernet/pasemi/pasemi_mac.c | 2 +- + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 20 +- + drivers/net/ethernet/qlogic/qed/qed.h | 34 +- + drivers/net/ethernet/qlogic/qed/qed_cxt.c | 32 +- + drivers/net/ethernet/qlogic/qed/qed_cxt.h | 34 +- + drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 32 +- + drivers/net/ethernet/qlogic/qed/qed_dcbx.h | 32 +- + drivers/net/ethernet/qlogic/qed/qed_dev.c | 32 +- + drivers/net/ethernet/qlogic/qed/qed_dev_api.h | 34 +- + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 32 +- + drivers/net/ethernet/qlogic/qed/qed_hw.c | 32 +- + drivers/net/ethernet/qlogic/qed/qed_hw.h | 32 +- + .../net/ethernet/qlogic/qed/qed_init_fw_funcs.c | 32 +- + drivers/net/ethernet/qlogic/qed/qed_init_ops.c | 32 +- + drivers/net/ethernet/qlogic/qed/qed_init_ops.h | 34 +- + drivers/net/ethernet/qlogic/qed/qed_int.c | 32 +- + drivers/net/ethernet/qlogic/qed/qed_int.h | 34 +- + drivers/net/ethernet/qlogic/qed/qed_iscsi.c | 32 +- + drivers/net/ethernet/qlogic/qed/qed_iscsi.h | 32 +- + drivers/net/ethernet/qlogic/qed/qed_l2.c | 305 +- + drivers/net/ethernet/qlogic/qed/qed_l2.h | 60 +- + drivers/net/ethernet/qlogic/qed/qed_ll2.c | 31 +- + drivers/net/ethernet/qlogic/qed/qed_ll2.h | 31 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 43 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 36 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 34 +- + drivers/net/ethernet/qlogic/qed/qed_ooo.c | 32 +- + drivers/net/ethernet/qlogic/qed/qed_ooo.h | 32 +- + drivers/net/ethernet/qlogic/qed/qed_reg_addr.h | 32 +- + drivers/net/ethernet/qlogic/qed/qed_roce.c | 2 +- + drivers/net/ethernet/qlogic/qed/qed_roce.h | 2 +- + drivers/net/ethernet/qlogic/qed/qed_selftest.c | 32 + + drivers/net/ethernet/qlogic/qed/qed_sp.h | 34 +- + drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 32 +- + drivers/net/ethernet/qlogic/qed/qed_spq.c | 32 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 249 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.h | 41 +- + drivers/net/ethernet/qlogic/qed/qed_vf.c | 44 +- + drivers/net/ethernet/qlogic/qed/qed_vf.h | 32 +- + drivers/net/ethernet/qlogic/qede/Makefile | 2 +- + drivers/net/ethernet/qlogic/qede/qede.h | 83 +- + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 114 +- + drivers/net/ethernet/qlogic/qede/qede_filter.c | 759 +++++ + drivers/net/ethernet/qlogic/qede/qede_fp.c | 1695 +++++++++++ + drivers/net/ethernet/qlogic/qede/qede_main.c | 2622 ++--------------- + drivers/net/ethernet/qlogic/qede/qede_roce.c | 2 +- + drivers/net/ethernet/qlogic/qla3xxx.c | 31 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 10 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 4 +- + drivers/net/ethernet/qlogic/qlge/qlge_main.c | 2 +- + drivers/net/ethernet/qualcomm/emac/Makefile | 2 +- + drivers/net/ethernet/qualcomm/emac/emac-ethtool.c | 261 ++ + drivers/net/ethernet/qualcomm/emac/emac-mac.c | 114 +- + drivers/net/ethernet/qualcomm/emac/emac-mac.h | 1 - + drivers/net/ethernet/qualcomm/emac/emac-phy.c | 5 - + drivers/net/ethernet/qualcomm/emac/emac-phy.h | 13 - + .../ethernet/qualcomm/emac/emac-sgmii-fsm9900.c | 2 +- + .../ethernet/qualcomm/emac/emac-sgmii-qdf2400.c | 2 +- + .../ethernet/qualcomm/emac/emac-sgmii-qdf2432.c | 2 +- + drivers/net/ethernet/qualcomm/emac/emac-sgmii.c | 183 +- + drivers/net/ethernet/qualcomm/emac/emac-sgmii.h | 25 + + drivers/net/ethernet/qualcomm/emac/emac.c | 90 +- + drivers/net/ethernet/qualcomm/emac/emac.h | 126 +- + drivers/net/ethernet/realtek/8139cp.c | 11 +- + drivers/net/ethernet/realtek/8139too.c | 17 +- + drivers/net/ethernet/realtek/atp.c | 7 +- + drivers/net/ethernet/realtek/r8169.c | 6 +- + drivers/net/ethernet/renesas/ravb.h | 10 + + drivers/net/ethernet/renesas/ravb_main.c | 33 +- + drivers/net/ethernet/renesas/sh_eth.c | 334 ++- + drivers/net/ethernet/renesas/sh_eth.h | 52 +- + drivers/net/ethernet/rocker/rocker_main.c | 2 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 10 +- + drivers/net/ethernet/sfc/bitfield.h | 3 + + drivers/net/ethernet/sfc/ef10.c | 1153 ++++++-- + drivers/net/ethernet/sfc/ef10_sriov.c | 17 +- + drivers/net/ethernet/sfc/ef10_sriov.h | 3 - + drivers/net/ethernet/sfc/efx.c | 248 +- + drivers/net/ethernet/sfc/ethtool.c | 34 +- + drivers/net/ethernet/sfc/falcon/efx.c | 53 +- + drivers/net/ethernet/sfc/falcon/ethtool.c | 29 +- + drivers/net/ethernet/sfc/falcon/mdio_10g.c | 44 +- + drivers/net/ethernet/sfc/falcon/mdio_10g.h | 3 +- + drivers/net/ethernet/sfc/falcon/net_driver.h | 137 +- + drivers/net/ethernet/sfc/falcon/qt202x_phy.c | 9 +- + drivers/net/ethernet/sfc/falcon/rx.c | 3 +- + drivers/net/ethernet/sfc/falcon/tenxpress.c | 22 +- + drivers/net/ethernet/sfc/falcon/txc43128_phy.c | 9 +- + drivers/net/ethernet/sfc/farch.c | 16 + + drivers/net/ethernet/sfc/filter.h | 41 +- + drivers/net/ethernet/sfc/mcdi.c | 34 +- + drivers/net/ethernet/sfc/mcdi.h | 1 + + drivers/net/ethernet/sfc/mcdi_pcol.h | 21 + + drivers/net/ethernet/sfc/net_driver.h | 183 +- + drivers/net/ethernet/sfc/nic.h | 27 +- + drivers/net/ethernet/sfc/rx.c | 8 +- + drivers/net/ethernet/sfc/siena.c | 30 +- + drivers/net/ethernet/sfc/sriov.c | 11 - + drivers/net/ethernet/sfc/sriov.h | 3 - + drivers/net/ethernet/sfc/tx.c | 2 +- + drivers/net/ethernet/smsc/epic100.c | 31 +- + drivers/net/ethernet/smsc/smc91c92_cs.c | 6 +- + drivers/net/ethernet/smsc/smsc9420.c | 2 +- + drivers/net/ethernet/stmicro/Kconfig | 3 +- + drivers/net/ethernet/stmicro/stmmac/Kconfig | 24 +- + drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + + drivers/net/ethernet/stmicro/stmmac/chain_mode.c | 4 - + drivers/net/ethernet/stmicro/stmmac/common.h | 16 +- + drivers/net/ethernet/stmicro/stmmac/descs.h | 4 - + drivers/net/ethernet/stmicro/stmmac/descs_com.h | 4 - + .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 202 ++ + .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 24 +- + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac100.h | 4 - + drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 4 - + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 9 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_dma.c | 4 - + .../net/ethernet/stmicro/stmmac/dwmac100_core.c | 4 - + drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c | 4 - + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 21 + + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 75 + + drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 5 + + drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h | 4 - + drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c | 28 +- + drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/mmc.h | 4 - + drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 4 - + drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/ring_mode.c | 4 - + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 9 - + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 10 +- + .../net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 4 - + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 168 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 52 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 4 - + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 74 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 4 - + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h | 4 - + drivers/net/ethernet/sun/niu.c | 8 +- + drivers/net/ethernet/sun/sungem.c | 2 +- + drivers/net/ethernet/sun/sunvnet_common.c | 2 +- + drivers/net/ethernet/synopsys/Kconfig | 27 - + drivers/net/ethernet/synopsys/Makefile | 5 - + drivers/net/ethernet/synopsys/dwc_eth_qos.c | 2998 ------------------- + drivers/net/ethernet/tehuti/tehuti.c | 2 +- + drivers/net/ethernet/ti/cpsw.c | 213 +- + drivers/net/ethernet/ti/cpsw_ale.c | 180 +- + drivers/net/ethernet/ti/cpsw_ale.h | 17 +- + drivers/net/ethernet/ti/davinci_cpdma.c | 164 +- + drivers/net/ethernet/ti/davinci_cpdma.h | 5 + + drivers/net/ethernet/ti/davinci_emac.c | 2 +- + drivers/net/ethernet/ti/netcp.h | 21 + + drivers/net/ethernet/ti/netcp_core.c | 102 +- + drivers/net/ethernet/ti/netcp_ethss.c | 25 +- + drivers/net/ethernet/tile/tilegx.c | 2 +- + drivers/net/ethernet/tile/tilepro.c | 10 +- + drivers/net/ethernet/toshiba/ps3_gelic_net.c | 2 +- + drivers/net/ethernet/toshiba/spider_net.c | 2 +- + drivers/net/ethernet/toshiba/tc35815.c | 2 +- + drivers/net/ethernet/tundra/tsi108_eth.c | 2 +- + drivers/net/ethernet/via/via-rhine.c | 10 +- + 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/xilinx_emaclite.c | 22 +- + drivers/net/fddi/skfp/cfm.c | 22 +- + drivers/net/fddi/skfp/drvfbi.c | 4 +- + drivers/net/fddi/skfp/ecm.c | 34 +- + drivers/net/fddi/skfp/ess.c | 66 +- + drivers/net/fddi/skfp/fplustm.c | 24 +- + drivers/net/fddi/skfp/h/cmtdef.h | 67 +- + drivers/net/fddi/skfp/h/hwmtm.h | 24 +- + drivers/net/fddi/skfp/hwmtm.c | 178 +- + drivers/net/fddi/skfp/pcmplc.c | 83 +- + drivers/net/fddi/skfp/pmf.c | 4 +- + drivers/net/fddi/skfp/rmt.c | 40 +- + drivers/net/fddi/skfp/smt.c | 109 +- + drivers/net/fddi/skfp/srf.c | 14 +- + drivers/net/fjes/fjes_main.c | 9 +- + drivers/net/gtp.c | 24 +- + drivers/net/hyperv/hyperv_net.h | 216 +- + drivers/net/hyperv/netvsc.c | 322 +- + drivers/net/hyperv/netvsc_drv.c | 577 ++-- + drivers/net/hyperv/rndis_filter.c | 338 ++- + drivers/net/ifb.c | 22 +- + drivers/net/ipvlan/ipvlan.h | 2 + + drivers/net/ipvlan/ipvlan_core.c | 3 - + drivers/net/ipvlan/ipvlan_main.c | 108 +- + drivers/net/irda/bfin_sir.c | 5 +- + drivers/net/irda/sh_sir.c | 1 - + drivers/net/loopback.c | 5 +- + drivers/net/macsec.c | 8 +- + drivers/net/macvlan.c | 7 +- + drivers/net/mdio.c | 178 ++ + drivers/net/nlmon.c | 4 +- + drivers/net/phy/Makefile | 3 +- + drivers/net/phy/bcm7xxx.c | 38 + + drivers/net/phy/broadcom.c | 103 +- + drivers/net/phy/dp83867.c | 61 +- + drivers/net/phy/marvell.c | 465 ++- + drivers/net/phy/mdio-boardinfo.c | 86 + + drivers/net/phy/mdio-boardinfo.h | 19 + + drivers/net/phy/mdio-gpio.c | 60 +- + drivers/net/phy/mdio-xgene.c | 50 +- + drivers/net/phy/mdio-xgene.h | 4 - + drivers/net/phy/mdio_bus.c | 4 + + drivers/net/phy/mdio_device.c | 13 +- + drivers/net/phy/mscc.c | 85 +- + drivers/net/ppp/ppp_generic.c | 4 +- + drivers/net/slip/slip.c | 3 +- + drivers/net/team/team.c | 5 +- + drivers/net/tun.c | 79 +- + drivers/net/usb/cdc_ether.c | 2 +- + drivers/net/usb/r8152.c | 4 +- + drivers/net/veth.c | 6 +- + drivers/net/virtio_net.c | 403 +-- + drivers/net/vmxnet3/vmxnet3_drv.c | 4 +- + drivers/net/vmxnet3/vmxnet3_ethtool.c | 4 +- + drivers/net/vmxnet3/vmxnet3_int.h | 4 +- + drivers/net/vrf.c | 10 +- + drivers/net/vxlan.c | 198 +- + drivers/net/wan/fsl_ucc_hdlc.c | 2 +- + drivers/net/wan/hd64572.c | 2 +- + drivers/net/wan/slic_ds26522.c | 14 +- + drivers/net/wireless/admtek/adm8211.c | 27 +- + drivers/net/wireless/ath/ath10k/ce.c | 48 +- + drivers/net/wireless/ath/ath10k/ce.h | 4 +- + drivers/net/wireless/ath/ath10k/core.c | 95 +- + drivers/net/wireless/ath/ath10k/core.h | 38 +- + drivers/net/wireless/ath/ath10k/debug.c | 66 +- + drivers/net/wireless/ath/ath10k/debug.h | 8 + + drivers/net/wireless/ath/ath10k/htc.c | 35 +- + drivers/net/wireless/ath/ath10k/htc.h | 3 - + drivers/net/wireless/ath/ath10k/htt_rx.c | 14 +- + drivers/net/wireless/ath/ath10k/htt_tx.c | 2 + + drivers/net/wireless/ath/ath10k/hw.h | 5 +- + drivers/net/wireless/ath/ath10k/mac.c | 148 +- + drivers/net/wireless/ath/ath10k/pci.c | 12 +- + drivers/net/wireless/ath/ath10k/pci.h | 5 - + drivers/net/wireless/ath/ath10k/wmi-tlv.c | 13 +- + drivers/net/wireless/ath/ath10k/wmi-tlv.h | 1 + + drivers/net/wireless/ath/ath10k/wmi.c | 11 +- + drivers/net/wireless/ath/ath10k/wmi.h | 27 +- + drivers/net/wireless/ath/ath5k/mac80211-ops.c | 3 +- + drivers/net/wireless/ath/ath6kl/sdio.c | 2 +- + drivers/net/wireless/ath/ath9k/Kconfig | 9 +- + drivers/net/wireless/ath/ath9k/Makefile | 5 +- + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9002_hw.c | 6 +- + drivers/net/wireless/ath/ath9k/ar9002_mac.c | 64 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 21 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 4 +- + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 92 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 36 +- + drivers/net/wireless/ath/ath9k/channel.c | 14 +- + drivers/net/wireless/ath/ath9k/common-debug.h | 27 + + drivers/net/wireless/ath/ath9k/common-spectral.c | 2 +- + drivers/net/wireless/ath/ath9k/common-spectral.h | 23 + + drivers/net/wireless/ath/ath9k/debug.c | 3 + + drivers/net/wireless/ath/ath9k/debug.h | 13 + + drivers/net/wireless/ath/ath9k/debug_sta.c | 54 + + drivers/net/wireless/ath/ath9k/eeprom.c | 42 +- + drivers/net/wireless/ath/ath9k/eeprom.h | 85 +- + drivers/net/wireless/ath/ath9k/eeprom_4k.c | 139 +- + drivers/net/wireless/ath/ath9k/eeprom_9287.c | 131 +- + drivers/net/wireless/ath/ath9k/eeprom_def.c | 165 +- + drivers/net/wireless/ath/ath9k/hw.c | 2 +- + drivers/net/wireless/ath/ath9k/init.c | 2 + + drivers/net/wireless/ath/ath9k/main.c | 6 +- + drivers/net/wireless/ath/ath9k/recv.c | 65 + + drivers/net/wireless/ath/ath9k/xmit.c | 192 +- + drivers/net/wireless/ath/wcn36xx/Kconfig | 2 + + drivers/net/wireless/ath/wcn36xx/dxe.c | 16 +- + drivers/net/wireless/ath/wcn36xx/hal.h | 16 + + drivers/net/wireless/ath/wcn36xx/main.c | 146 +- + drivers/net/wireless/ath/wcn36xx/smd.c | 69 +- + drivers/net/wireless/ath/wcn36xx/smd.h | 9 +- + drivers/net/wireless/ath/wcn36xx/txrx.c | 19 +- + drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 30 +- + drivers/net/wireless/ath/wil6210/cfg80211.c | 174 +- + drivers/net/wireless/ath/wil6210/debugfs.c | 136 +- + drivers/net/wireless/ath/wil6210/ethtool.c | 10 +- + drivers/net/wireless/ath/wil6210/fw.c | 7 +- + drivers/net/wireless/ath/wil6210/fw_inc.c | 21 +- + drivers/net/wireless/ath/wil6210/interrupt.c | 30 +- + drivers/net/wireless/ath/wil6210/main.c | 87 +- + drivers/net/wireless/ath/wil6210/netdev.c | 19 +- + drivers/net/wireless/ath/wil6210/p2p.c | 36 +- + drivers/net/wireless/ath/wil6210/pcie_bus.c | 60 +- + drivers/net/wireless/ath/wil6210/pm.c | 17 +- + drivers/net/wireless/ath/wil6210/pmc.c | 79 +- + drivers/net/wireless/ath/wil6210/rx_reorder.c | 8 +- + drivers/net/wireless/ath/wil6210/txrx.c | 75 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 29 +- + drivers/net/wireless/ath/wil6210/wil_crash_dump.c | 18 +- + drivers/net/wireless/ath/wil6210/wmi.c | 131 +- + drivers/net/wireless/ath/wil6210/wmi.h | 67 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 1 + + .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 6 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 101 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.h | 2 - + .../wireless/broadcom/brcm80211/brcmfmac/common.c | 10 +- + .../wireless/broadcom/brcm80211/brcmfmac/common.h | 2 + + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 14 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.h | 1 - + .../net/wireless/broadcom/brcm80211/brcmfmac/of.c | 7 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/of.h | 6 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 3 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 4 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 2 +- + drivers/net/wireless/intel/iwlegacy/3945-mac.c | 20 +- + drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c | 2 +- + drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 2 +- + drivers/net/wireless/intel/iwlwifi/dvm/rs.c | 11 +- + drivers/net/wireless/intel/iwlwifi/dvm/ucode.c | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-6000.c | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-7000.c | 4 +- + drivers/net/wireless/intel/iwlwifi/iwl-8000.c | 4 +- + drivers/net/wireless/intel/iwlwifi/iwl-9000.c | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-a000.c | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 124 +- + drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h | 24 +- + drivers/net/wireless/intel/iwlwifi/iwl-fw.h | 7 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 13 +- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c | 123 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 69 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 9 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 10 +- + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 2 - + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 31 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 107 +- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 14 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 51 +- + drivers/net/wireless/marvell/libertas/cfg.c | 2 +- + drivers/net/wireless/marvell/libertas/cmd.c | 2 +- + drivers/net/wireless/marvell/mwifiex/11n_aggr.c | 19 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 +- + drivers/net/wireless/marvell/mwifiex/debugfs.c | 3 +- + drivers/net/wireless/marvell/mwifiex/fw.h | 20 +- + drivers/net/wireless/marvell/mwifiex/init.c | 41 +- + drivers/net/wireless/marvell/mwifiex/main.c | 137 +- + drivers/net/wireless/marvell/mwifiex/main.h | 17 +- + drivers/net/wireless/marvell/mwifiex/pcie.c | 332 +-- + drivers/net/wireless/marvell/mwifiex/pcie.h | 3 + + drivers/net/wireless/marvell/mwifiex/sdio.c | 508 ++-- + drivers/net/wireless/marvell/mwifiex/sdio.h | 4 +- + drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 8 +- + drivers/net/wireless/marvell/mwifiex/sta_event.c | 4 + + drivers/net/wireless/marvell/mwifiex/usb.c | 41 +- + drivers/net/wireless/marvell/mwifiex/util.c | 15 - + drivers/net/wireless/ralink/rt2x00/rt2800.h | 29 + + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 355 ++- + drivers/net/wireless/ralink/rt2x00/rt2800lib.h | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 49 +- + drivers/net/wireless/ralink/rt2x00/rt2x00.h | 13 +- + drivers/net/wireless/ralink/rt2x00/rt2x00config.c | 32 +- + drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 7 +- + drivers/net/wireless/ralink/rt2x00/rt2x00lib.h | 31 +- + drivers/net/wireless/ralink/rt2x00/rt2x00link.c | 132 +- + drivers/net/wireless/ralink/rt2x00/rt2x00mac.c | 11 +- + drivers/net/wireless/ralink/rt2x00/rt2x00mmio.c | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | 12 +- + drivers/net/wireless/ralink/rt2x00/rt2x00soc.c | 4 + + drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 2 +- + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 2 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c | 2 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 2 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c | 2 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 2 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 18 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h | 2 +- + drivers/net/wireless/realtek/rtlwifi/base.c | 74 +- + drivers/net/wireless/realtek/rtlwifi/base.h | 1 - + drivers/net/wireless/realtek/rtlwifi/cam.c | 14 +- + drivers/net/wireless/realtek/rtlwifi/core.c | 31 +- + drivers/net/wireless/realtek/rtlwifi/debug.c | 61 +- + drivers/net/wireless/realtek/rtlwifi/debug.h | 51 +- + drivers/net/wireless/realtek/rtlwifi/efuse.c | 48 +- + drivers/net/wireless/realtek/rtlwifi/efuse.h | 4 + + drivers/net/wireless/realtek/rtlwifi/pci.c | 64 +- + drivers/net/wireless/realtek/rtlwifi/ps.c | 3 +- + drivers/net/wireless/realtek/rtlwifi/rc.c | 3 +- + drivers/net/wireless/realtek/rtlwifi/regd.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/fw.c | 111 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/hw.c | 33 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/phy.c | 35 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/rf.c | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/sw.c | 17 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.c | 8 +- + .../wireless/realtek/rtlwifi/rtl8192c/fw_common.c | 116 +- + .../wireless/realtek/rtlwifi/rtl8192c/phy_common.c | 28 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/hw.c | 39 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/led.c | 7 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/phy.c | 15 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/rf.c | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/sw.c | 17 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/trx.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/hw.c | 35 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/led.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/mac.c | 12 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/phy.c | 15 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/rf.c | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/sw.c | 13 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/trx.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/trx.h | 272 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/fw.c | 105 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/hw.c | 35 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/led.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 45 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/rf.c | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/sw.c | 19 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.c | 108 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.c | 15 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/phy.c | 39 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/rf.c | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/sw.c | 17 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.c | 15 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/fw.c | 46 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/hw.c | 43 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/led.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/phy.c | 45 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/rf.c | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/sw.c | 17 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/trx.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/fw.c | 15 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.c | 21 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/led.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/phy.c | 31 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/rf.c | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/sw.c | 17 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/trx.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/fw.c | 15 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 18 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/led.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/phy.c | 33 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/rf.c | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/sw.c | 17 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/trx.c | 14 +- + .../realtek/rtlwifi/rtl8723com/fw_common.c | 95 +- + .../realtek/rtlwifi/rtl8723com/fw_common.h | 6 - + .../realtek/rtlwifi/rtl8723com/phy_common.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/dm.c | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.c | 95 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 33 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 54 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/rf.c | 5 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/sw.c | 23 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/trx.c | 20 +- + drivers/net/wireless/realtek/rtlwifi/usb.c | 67 +- + drivers/net/wireless/realtek/rtlwifi/wifi.h | 38 +- + drivers/net/wireless/ti/wlcore/debugfs.c | 2 +- + drivers/net/wireless/ti/wlcore/sdio.c | 14 +- + drivers/net/xen-netback/interface.c | 2 +- + drivers/net/xen-netfront.c | 8 +- + drivers/pci/pci-driver.c | 6 + + drivers/s390/net/qeth_core.h | 5 - + drivers/s390/net/qeth_core_main.c | 135 +- + drivers/s390/net/qeth_core_mpc.h | 17 + + drivers/s390/net/qeth_l2_main.c | 189 +- + drivers/s390/net/qeth_l3_main.c | 15 - + drivers/s390/net/qeth_l3_sys.c | 33 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 6 +- + drivers/scsi/cxgbi/libcxgbi.c | 6 +- + drivers/scsi/fcoe/fcoe.c | 13 +- + drivers/staging/ks7010/ks_hostif.c | 2 - + drivers/staging/netlogic/xlr_net.c | 11 +- + drivers/staging/octeon/ethernet-rx.c | 2 +- + drivers/staging/octeon/ethernet-tx.c | 5 +- + drivers/staging/rtl8192e/rtllib_rx.c | 1 - + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 4 - + drivers/staging/unisys/visornic/visornic_main.c | 2 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 1 - + drivers/staging/wlan-ng/p80211netdev.c | 2 - + drivers/vhost/net.c | 23 +- + drivers/vhost/vhost.c | 8 +- + drivers/virtio/virtio.c | 42 +- + fs/afs/callback.c | 2 +- + fs/afs/cmservice.c | 63 +- + fs/afs/file.c | 170 +- + fs/afs/fsclient.c | 195 +- + fs/afs/internal.h | 115 +- + fs/afs/main.c | 1 + + fs/afs/rxrpc.c | 208 +- + fs/afs/vlclient.c | 8 +- + fs/afs/vlocation.c | 4 +- + fs/afs/vnode.c | 30 +- + fs/afs/volume.c | 1 + + fs/afs/write.c | 19 +- + include/dt-bindings/net/mscc-phy-vsc8531.h | 29 + + include/linux/bpf.h | 19 +- + include/linux/bpf_trace.h | 7 + + include/linux/brcmphy.h | 19 +- + include/linux/can/dev.h | 8 + + include/linux/can/rx-offload.h | 59 + + include/linux/device.h | 11 + + include/linux/etherdevice.h | 65 + + include/linux/ieee80211.h | 2 + + include/linux/if_bridge.h | 2 + + include/linux/if_frad.h | 2 - + include/linux/ipv6.h | 1 + + include/linux/list.h | 13 + + include/linux/marvell_phy.h | 7 + + include/linux/mdio.h | 26 +- + include/linux/mlx4/device.h | 8 +- + include/linux/mlx5/cq.h | 5 +- + include/linux/mlx5/device.h | 111 +- + include/linux/mlx5/doorbell.h | 6 +- + include/linux/mlx5/driver.h | 198 +- + include/linux/mlx5/mlx5_ifc.h | 262 +- + include/linux/mlx5/qp.h | 92 +- + include/linux/mlx5/vport.h | 1 + + include/linux/mmc/sdio_ids.h | 1 + + include/linux/mod_devicetable.h | 1 + + include/linux/mroute.h | 59 +- + include/linux/mroute6.h | 2 +- + include/linux/netdev_features.h | 2 - + include/linux/netdevice.h | 57 +- + include/linux/netfilter/x_tables.h | 9 + + include/linux/parman.h | 76 + + include/linux/pci.h | 2 - + include/linux/phy.h | 36 +- + include/linux/qed/common_hsi.h | 33 +- + include/linux/qed/eth_common.h | 32 +- + include/linux/qed/iscsi_common.h | 32 +- + include/linux/qed/qed_chain.h | 34 +- + include/linux/qed/qed_eth_if.h | 34 +- + include/linux/qed/qed_if.h | 35 +- + include/linux/qed/qed_iov_if.h | 34 +- + include/linux/qed/qed_iscsi_if.h | 32 +- + include/linux/qed/qed_ll2_if.h | 31 +- + include/linux/qed/qed_roce_if.h | 2 +- + include/linux/qed/qede_roce.h | 2 +- + include/linux/qed/rdma_common.h | 32 +- + include/linux/qed/roce_common.h | 32 +- + include/linux/qed/storage_common.h | 32 +- + include/linux/qed/tcp_common.h | 32 +- + include/linux/sctp.h | 119 +- + include/linux/siphash.h | 140 + + include/linux/skbuff.h | 59 +- + include/linux/soc/qcom/smem_state.h | 2 +- + include/linux/soc/ti/knav_dma.h | 2 + + include/linux/socket.h | 13 +- + include/linux/stmmac.h | 8 +- + include/linux/tcp.h | 20 +- + include/linux/trace_events.h | 3 +- + include/linux/virtio.h | 4 + + include/net/act_api.h | 1 + + include/net/addrconf.h | 4 +- + include/net/arp.h | 16 + + include/net/cfg80211.h | 135 +- + include/net/checksum.h | 2 +- + include/net/dsa.h | 116 +- + include/net/dst.h | 21 +- + include/net/dst_ops.h | 11 +- + include/net/flow_dissector.h | 19 + + include/net/gro_cells.h | 86 +- + include/net/if_inet6.h | 1 - + include/net/ife.h | 51 + + include/net/inet6_connection_sock.h | 5 - + include/net/inet_common.h | 2 +- + include/net/inet_connection_sock.h | 10 +- + include/net/inet_frag.h | 8 +- + include/net/inet_hashtables.h | 15 +- + include/net/inet_sock.h | 6 +- + include/net/inet_timewait_sock.h | 13 +- + include/net/ip.h | 10 + + include/net/ip6_fib.h | 4 +- + include/net/ip_fib.h | 8 +- + include/net/ip_tunnels.h | 5 +- + include/net/ip_vs.h | 12 +- + include/net/iw_handler.h | 66 +- + include/net/lwtunnel.h | 6 +- + include/net/mac80211.h | 6 +- + include/net/ndisc.h | 17 + + include/net/netfilter/ipv4/nf_conntrack_ipv4.h | 1 + + include/net/netfilter/ipv6/nf_conntrack_ipv6.h | 1 + + include/net/netfilter/nf_conntrack.h | 17 +- + include/net/netfilter/nf_conntrack_core.h | 2 +- + include/net/netfilter/nf_conntrack_l4proto.h | 2 +- + include/net/netfilter/nf_log.h | 3 + + include/net/netlink.h | 1 + + include/net/netns/conntrack.h | 16 - + include/net/netns/ipv4.h | 17 + + include/net/netns/sctp.h | 3 + + include/net/pkt_cls.h | 9 + + include/net/psample.h | 36 + + include/net/request_sock.h | 4 +- + include/net/rtnetlink.h | 4 + + include/net/sch_generic.h | 20 +- + include/net/sctp/constants.h | 4 +- + include/net/sctp/sctp.h | 18 +- + include/net/sctp/sm.h | 13 +- + include/net/sctp/structs.h | 110 +- + include/net/smc.h | 20 + + include/net/sock.h | 35 +- + include/net/tc_act/tc_ife.h | 3 - + include/net/tc_act/tc_sample.h | 50 + + include/net/tcp.h | 44 +- + include/net/udp.h | 1 - + include/net/xfrm.h | 4 +- + include/rdma/ib_addr.h | 6 +- + include/trace/events/afs.h | 184 ++ + include/trace/events/bpf.h | 347 +++ + include/trace/events/rxrpc.h | 518 +++- + include/trace/events/xdp.h | 53 + + include/trace/trace_events.h | 8 +- + include/uapi/linux/Kbuild | 7 + + include/uapi/linux/batman_adv.h | 2 +- + include/uapi/linux/bpf.h | 23 +- + include/uapi/linux/can/netlink.h | 7 + + include/uapi/linux/if_bridge.h | 11 + + include/uapi/linux/if_link.h | 3 + + include/uapi/linux/ife.h | 18 + + include/uapi/linux/igmp.h | 4 +- + include/uapi/linux/ipv6.h | 1 + + include/uapi/linux/mpls.h | 30 + + include/uapi/linux/neighbour.h | 1 + + include/uapi/linux/netfilter/nf_tables.h | 5 + + include/uapi/linux/netlink.h | 1 + + include/uapi/linux/nl80211.h | 64 +- + include/uapi/linux/pkt_cls.h | 67 +- + include/uapi/linux/psample.h | 35 + + include/uapi/linux/rds.h | 33 + + include/uapi/linux/rtnetlink.h | 1 + + include/uapi/linux/sctp.h | 26 + + include/uapi/linux/seg6.h | 2 + + include/uapi/linux/seg6_hmac.h | 1 + + include/uapi/linux/seg6_iptunnel.h | 4 + + include/uapi/linux/smc.h | 35 + + include/uapi/linux/smc_diag.h | 85 + + include/uapi/linux/snmp.h | 1 + + include/uapi/linux/tc_act/Kbuild | 1 + + include/uapi/linux/tc_act/tc_csum.h | 3 +- + include/uapi/linux/tc_act/tc_ife.h | 10 +- + include/uapi/linux/tc_act/tc_sample.h | 26 + + include/uapi/linux/tcp.h | 3 + + include/uapi/linux/tipc.h | 6 +- + include/uapi/linux/un.h | 2 + + include/uapi/rdma/mlx5-abi.h | 33 +- + kernel/bpf/Makefile | 2 +- + kernel/bpf/bpf_lru_list.c | 20 +- + kernel/bpf/core.c | 9 + + kernel/bpf/helpers.c | 4 +- + kernel/bpf/inode.c | 17 +- + kernel/bpf/lpm_trie.c | 521 ++++ + kernel/bpf/syscall.c | 19 +- + kernel/bpf/verifier.c | 289 +- + kernel/trace/bpf_trace.c | 76 +- + kernel/trace/trace_output.c | 18 +- + lib/Kconfig | 3 + + lib/Kconfig.debug | 16 +- + lib/Makefile | 8 +- + lib/parman.c | 376 +++ + lib/siphash.c | 551 ++++ + lib/test_parman.c | 395 +++ + lib/test_siphash.c | 223 ++ + net/6lowpan/nhc.c | 8 +- + net/8021q/vlan_dev.c | 7 +- + net/Kconfig | 7 + + net/Makefile | 3 + + net/batman-adv/Makefile | 2 +- + net/batman-adv/bat_algo.c | 2 +- + net/batman-adv/bat_algo.h | 2 +- + net/batman-adv/bat_iv_ogm.c | 2 +- + net/batman-adv/bat_iv_ogm.h | 2 +- + net/batman-adv/bat_v.c | 2 +- + net/batman-adv/bat_v.h | 2 +- + net/batman-adv/bat_v_elp.c | 2 +- + net/batman-adv/bat_v_elp.h | 2 +- + net/batman-adv/bat_v_ogm.c | 2 +- + net/batman-adv/bat_v_ogm.h | 2 +- + net/batman-adv/bitarray.c | 2 +- + net/batman-adv/bitarray.h | 2 +- + net/batman-adv/bridge_loop_avoidance.c | 3 +- + net/batman-adv/bridge_loop_avoidance.h | 20 +- + net/batman-adv/debugfs.c | 4 +- + net/batman-adv/debugfs.h | 2 +- + net/batman-adv/distributed-arp-table.c | 3 +- + net/batman-adv/distributed-arp-table.h | 2 +- + net/batman-adv/fragmentation.c | 2 +- + net/batman-adv/fragmentation.h | 2 +- + net/batman-adv/gateway_client.c | 2 +- + net/batman-adv/gateway_client.h | 2 +- + net/batman-adv/gateway_common.c | 2 +- + net/batman-adv/gateway_common.h | 2 +- + net/batman-adv/hard-interface.c | 2 +- + net/batman-adv/hard-interface.h | 2 +- + net/batman-adv/hash.c | 2 +- + net/batman-adv/hash.h | 2 +- + net/batman-adv/icmp_socket.c | 2 +- + net/batman-adv/icmp_socket.h | 2 +- + net/batman-adv/log.c | 2 +- + net/batman-adv/log.h | 2 +- + net/batman-adv/main.c | 2 +- + net/batman-adv/main.h | 4 +- + net/batman-adv/multicast.c | 2 +- + net/batman-adv/multicast.h | 2 +- + net/batman-adv/netlink.c | 2 +- + net/batman-adv/netlink.h | 2 +- + net/batman-adv/network-coding.c | 2 +- + net/batman-adv/network-coding.h | 2 +- + net/batman-adv/originator.c | 2 +- + net/batman-adv/originator.h | 2 +- + net/batman-adv/packet.h | 2 +- + net/batman-adv/routing.c | 11 +- + net/batman-adv/routing.h | 2 +- + net/batman-adv/send.c | 6 +- + net/batman-adv/send.h | 2 +- + net/batman-adv/soft-interface.c | 7 +- + net/batman-adv/soft-interface.h | 2 +- + net/batman-adv/sysfs.c | 2 +- + net/batman-adv/sysfs.h | 2 +- + net/batman-adv/tp_meter.c | 4 +- + net/batman-adv/tp_meter.h | 2 +- + net/batman-adv/translation-table.c | 4 +- + net/batman-adv/translation-table.h | 2 +- + net/batman-adv/tvlv.c | 2 +- + net/batman-adv/tvlv.h | 2 +- + net/batman-adv/types.h | 2 +- + net/bridge/Makefile | 5 +- + net/bridge/br_device.c | 9 +- + net/bridge/br_fdb.c | 36 +- + net/bridge/br_forward.c | 41 +- + net/bridge/br_if.c | 2 +- + net/bridge/br_input.c | 13 +- + net/bridge/br_ioctl.c | 2 +- + net/bridge/br_mdb.c | 2 +- + net/bridge/br_multicast.c | 92 +- + net/bridge/br_netlink.c | 148 +- + net/bridge/br_netlink_tunnel.c | 294 ++ + net/bridge/br_private.h | 72 +- + net/bridge/br_private_tunnel.h | 83 + + net/bridge/br_stp.c | 2 +- + net/bridge/br_stp_if.c | 4 +- + net/bridge/br_stp_timer.c | 2 - + net/bridge/br_sysfs_br.c | 2 +- + net/bridge/br_sysfs_if.c | 2 + + net/bridge/br_vlan.c | 24 +- + net/bridge/br_vlan_tunnel.c | 203 ++ + net/bridge/netfilter/ebt_limit.c | 1 + + net/bridge/netfilter/ebt_log.c | 2 +- + net/bridge/netfilter/ebtables.c | 78 +- + net/caif/chnl_net.c | 1 - + net/compat.c | 17 +- + net/core/Makefile | 1 + + net/core/dev.c | 160 +- + net/core/dst.c | 1 - + net/core/ethtool.c | 40 +- + net/core/filter.c | 252 +- + net/core/flow_dissector.c | 57 + + net/core/gro_cells.c | 92 + + net/core/lwt_bpf.c | 4 +- + net/core/lwtunnel.c | 4 +- + net/core/pktgen.c | 4 +- + net/core/request_sock.c | 2 - + net/core/rtnetlink.c | 60 +- + net/core/scm.c | 2 +- + net/core/secure_seq.c | 147 +- + net/core/skbuff.c | 20 +- + net/core/sock.c | 15 +- + net/core/sysctl_net_core.c | 31 +- + net/dccp/ipv4.c | 1 - + net/dccp/ipv6.c | 2 - + net/dsa/Kconfig | 16 +- + net/dsa/Makefile | 2 +- + net/dsa/dsa.c | 262 +- + net/dsa/dsa2.c | 250 +- + net/dsa/dsa_priv.h | 25 +- + net/dsa/slave.c | 475 ++- + net/dsa/switch.c | 85 + + net/dsa/tag_brcm.c | 11 +- + net/dsa/tag_dsa.c | 10 +- + net/dsa/tag_edsa.c | 10 +- + net/dsa/tag_qca.c | 4 +- + net/dsa/tag_trailer.c | 6 +- + net/ethernet/eth.c | 28 + + net/hsr/hsr_slave.c | 3 +- + net/ife/Kconfig | 16 + + net/ife/Makefile | 5 + + net/ife/ife.c | 142 + + net/ipv4/Kconfig | 1 + + net/ipv4/af_inet.c | 42 +- + net/ipv4/ah4.c | 3 + + net/ipv4/devinet.c | 2 - + net/ipv4/esp4.c | 332 ++- + net/ipv4/fib_semantics.c | 62 +- + net/ipv4/icmp.c | 125 +- + net/ipv4/inet_connection_sock.c | 278 +- + net/ipv4/inet_diag.c | 2 +- + net/ipv4/inet_hashtables.c | 19 +- + net/ipv4/inet_timewait_sock.c | 3 +- + net/ipv4/ip_output.c | 11 +- + net/ipv4/ip_sockglue.c | 9 +- + net/ipv4/ip_tunnel_core.c | 10 +- + net/ipv4/ipmr.c | 266 +- + net/ipv4/netfilter/arp_tables.c | 15 +- + net/ipv4/netfilter/ip_tables.c | 21 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 1 + + net/ipv4/netfilter/ipt_SYNPROXY.c | 11 +- + net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 15 +- + net/ipv4/netfilter/nf_defrag_ipv4.c | 4 +- + net/ipv4/netfilter/nf_dup_ipv4.c | 7 +- + net/ipv4/netfilter/nf_log_arp.c | 2 +- + net/ipv4/netfilter/nf_log_ipv4.c | 2 +- + net/ipv4/ping.c | 9 +- + net/ipv4/proc.c | 5 +- + net/ipv4/raw.c | 6 +- + net/ipv4/route.c | 44 +- + net/ipv4/syncookies.c | 21 +- + net/ipv4/sysctl_net_ipv4.c | 110 +- + net/ipv4/tcp.c | 85 +- + net/ipv4/tcp_fastopen.c | 54 + + net/ipv4/tcp_input.c | 271 +- + net/ipv4/tcp_ipv4.c | 38 +- + net/ipv4/tcp_metrics.c | 8 +- + net/ipv4/tcp_minisocks.c | 22 +- + net/ipv4/tcp_output.c | 132 +- + net/ipv4/tcp_recovery.c | 148 +- + net/ipv4/tcp_timer.c | 5 +- + net/ipv4/udp.c | 117 +- + net/ipv4/xfrm4_state.c | 8 - + net/ipv6/Kconfig | 1 + + net/ipv6/addrconf.c | 116 +- + net/ipv6/af_inet6.c | 3 +- + net/ipv6/ah6.c | 3 + + net/ipv6/esp6.c | 318 +- + net/ipv6/icmp.c | 68 +- + net/ipv6/ila/ila_lwt.c | 2 +- + net/ipv6/inet6_connection_sock.c | 40 - + net/ipv6/inet6_hashtables.c | 46 +- + net/ipv6/ip6_fib.c | 22 +- + net/ipv6/ip6_gre.c | 8 +- + net/ipv6/ip6_output.c | 7 + + net/ipv6/ip6_vti.c | 4 + + net/ipv6/ip6mr.c | 13 +- + net/ipv6/ipv6_sockglue.c | 16 +- + net/ipv6/netfilter/ip6_tables.c | 21 +- + net/ipv6/netfilter/ip6t_NPT.c | 2 + + net/ipv6/netfilter/ip6t_SYNPROXY.c | 11 +- + net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 20 +- + net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 4 +- + net/ipv6/netfilter/nf_dup_ipv6.c | 7 +- + net/ipv6/netfilter/nf_log_ipv6.c | 2 +- + net/ipv6/ping.c | 7 - + net/ipv6/raw.c | 6 +- + net/ipv6/route.c | 337 ++- + net/ipv6/seg6_hmac.c | 46 +- + net/ipv6/seg6_iptunnel.c | 10 +- + net/ipv6/syncookies.c | 41 +- + net/ipv6/tcp_ipv6.c | 23 +- + net/ipv6/udp.c | 32 +- + net/l2tp/l2tp_eth.c | 6 +- + net/l2tp/l2tp_ip.c | 29 +- + net/l2tp/l2tp_ip6.c | 33 +- + net/mac80211/cfg.c | 12 + + net/mac80211/chan.c | 4 +- + net/mac80211/debugfs.c | 27 + + net/mac80211/debugfs_netdev.c | 3 + + net/mac80211/ieee80211_i.h | 6 +- + net/mac80211/iface.c | 4 +- + net/mac80211/mesh.c | 7 +- + net/mac80211/mesh.h | 2 +- + net/mac80211/mesh_plink.c | 14 +- + net/mac80211/mesh_sync.c | 27 +- + net/mac80211/mlme.c | 4 - + net/mac80211/rc80211_minstrel.c | 21 +- + net/mac80211/rc80211_minstrel.h | 33 +- + net/mac80211/rc80211_minstrel_debugfs.c | 24 +- + net/mac80211/rc80211_minstrel_ht.c | 68 +- + net/mac80211/rc80211_minstrel_ht.h | 6 +- + net/mac80211/rc80211_minstrel_ht_debugfs.c | 32 +- + net/mac80211/rx.c | 4 - + net/mac80211/scan.c | 8 +- + net/mac80211/sta_info.c | 18 +- + net/mac80211/status.c | 8 +- + net/mac80211/tx.c | 132 +- + net/mac80211/vht.c | 4 - + net/mac80211/wep.c | 3 +- + net/mac80211/wpa.c | 3 +- + net/mpls/af_mpls.c | 181 +- + net/mpls/internal.h | 58 +- + net/mpls/mpls_iptunnel.c | 13 +- + net/netfilter/Kconfig | 2 +- + net/netfilter/Makefile | 2 - + net/netfilter/core.c | 2 +- + net/netfilter/ipvs/ip_vs_ctl.c | 15 +- + net/netfilter/nf_conntrack_core.c | 73 +- + net/netfilter/nf_conntrack_proto_dccp.c | 1 - + net/netfilter/nf_conntrack_proto_sctp.c | 32 + + net/netfilter/nf_conntrack_proto_tcp.c | 1 - + net/netfilter/nf_conntrack_proto_udp.c | 124 +- + net/netfilter/nf_conntrack_proto_udplite.c | 324 -- + net/netfilter/nf_conntrack_standalone.c | 3 + + net/netfilter/nf_log.c | 24 + + net/netfilter/nf_nat_helper.c | 2 +- + net/netfilter/nf_nat_proto_udp.c | 78 +- + net/netfilter/nf_nat_proto_udplite.c | 73 - + net/netfilter/nf_tables_api.c | 63 +- + net/netfilter/nft_ct.c | 25 +- + net/netfilter/nft_meta.c | 31 +- + net/netfilter/x_tables.c | 68 +- + net/netfilter/xt_CT.c | 15 +- + net/netfilter/xt_RATEEST.c | 1 + + net/netfilter/xt_TEE.c | 2 + + net/netfilter/xt_bpf.c | 2 + + net/netfilter/xt_cgroup.c | 1 + + net/netfilter/xt_connlimit.c | 5 +- + net/netfilter/xt_hashlimit.c | 4 + + net/netfilter/xt_limit.c | 2 + + net/netfilter/xt_pkttype.c | 3 +- + net/netfilter/xt_quota.c | 1 + + net/netfilter/xt_rateest.c | 1 + + net/netfilter/xt_string.c | 1 + + net/netlink/af_netlink.c | 6 +- + net/openvswitch/actions.c | 42 +- + net/openvswitch/conntrack.c | 12 +- + net/openvswitch/vport-internal_dev.c | 4 +- + net/packet/af_packet.c | 42 +- + net/packet/diag.c | 3 +- + net/psample/Kconfig | 15 + + net/psample/Makefile | 5 + + net/psample/psample.c | 301 ++ + net/rds/af_rds.c | 31 + + net/rds/bind.c | 4 +- + net/rds/connection.c | 10 +- + net/rds/ib.c | 11 + + net/rds/ib.h | 22 +- + net/rds/ib_cm.c | 89 +- + net/rds/ib_frmr.c | 16 +- + net/rds/ib_recv.c | 14 +- + net/rds/ib_send.c | 29 +- + net/rds/ib_stats.c | 2 + + net/rds/rdma.c | 22 +- + net/rds/rdma_transport.c | 11 +- + net/rds/rds.h | 17 + + net/rds/recv.c | 36 +- + net/rds/send.c | 50 +- + net/rds/tcp_listen.c | 1 + + net/rds/tcp_recv.c | 5 + + net/rfkill/core.c | 100 +- + net/rxrpc/af_rxrpc.c | 8 + + net/rxrpc/ar-internal.h | 195 +- + net/rxrpc/call_accept.c | 3 +- + net/rxrpc/call_object.c | 18 - + net/rxrpc/conn_client.c | 8 - + net/rxrpc/conn_object.c | 1 + + net/rxrpc/input.c | 16 +- + net/rxrpc/misc.c | 151 - + net/rxrpc/proc.c | 9 +- + net/rxrpc/sendmsg.c | 2 +- + net/sched/Kconfig | 14 + + net/sched/Makefile | 1 + + net/sched/act_api.c | 56 +- + net/sched/act_csum.c | 30 + + net/sched/act_ife.c | 117 +- + net/sched/act_mirred.c | 23 +- + net/sched/act_sample.c | 276 ++ + net/sched/cls_flow.c | 2 +- + net/sched/cls_flower.c | 94 +- + net/sched/cls_matchall.c | 22 +- + net/sched/cls_u32.c | 1 - + net/sched/sch_api.c | 3 +- + net/sched/sch_fq_codel.c | 6 +- + net/sched/sch_generic.c | 2 +- + net/sched/sch_netem.c | 2 +- + net/sched/sch_teql.c | 5 +- + net/sctp/Makefile | 2 +- + net/sctp/associola.c | 28 +- + net/sctp/chunk.c | 107 +- + net/sctp/debug.c | 5 +- + net/sctp/endpointola.c | 1 + + net/sctp/input.c | 17 +- + net/sctp/ipv6.c | 16 +- + net/sctp/objcnt.c | 2 - + net/sctp/output.c | 24 +- + net/sctp/outqueue.c | 35 +- + net/sctp/primitive.c | 3 + + net/sctp/protocol.c | 21 +- + net/sctp/sm_make_chunk.c | 229 +- + net/sctp/sm_sideeffect.c | 34 +- + net/sctp/sm_statefuns.c | 172 +- + net/sctp/sm_statetable.c | 40 + + net/sctp/socket.c | 186 +- + net/sctp/ssnmap.c | 125 - + net/sctp/stream.c | 296 ++ + net/sctp/transport.c | 33 +- + net/sctp/ulpqueue.c | 36 +- + net/smc/Kconfig | 20 + + net/smc/Makefile | 4 + + net/smc/af_smc.c | 1407 +++++++++ + net/smc/smc.h | 274 ++ + net/smc/smc_cdc.c | 304 ++ + net/smc/smc_cdc.h | 218 ++ + net/smc/smc_clc.c | 280 ++ + net/smc/smc_clc.h | 116 + + net/smc/smc_close.c | 442 +++ + net/smc/smc_close.h | 28 + + net/smc/smc_core.c | 682 +++++ + net/smc/smc_core.h | 181 ++ + net/smc/smc_diag.c | 215 ++ + net/smc/smc_ib.c | 466 +++ + net/smc/smc_ib.h | 71 + + net/smc/smc_llc.c | 158 + + net/smc/smc_llc.h | 63 + + net/smc/smc_pnet.c | 534 ++++ + net/smc/smc_pnet.h | 23 + + net/smc/smc_rx.c | 217 ++ + net/smc/smc_rx.h | 23 + + net/smc/smc_tx.c | 483 +++ + net/smc/smc_tx.h | 35 + + net/smc/smc_wr.c | 614 ++++ + net/smc/smc_wr.h | 106 + + net/socket.c | 8 +- + net/tipc/bcast.c | 204 +- + net/tipc/bcast.h | 33 +- + net/tipc/bearer.c | 15 +- + net/tipc/bearer.h | 8 +- + net/tipc/link.c | 87 +- + net/tipc/msg.c | 17 + + net/tipc/msg.h | 11 +- + net/tipc/name_table.c | 128 +- + net/tipc/name_table.h | 24 +- + net/tipc/node.c | 42 +- + net/tipc/node.h | 4 +- + net/tipc/socket.c | 495 ++-- + net/tipc/udp_media.c | 8 +- + net/unix/af_unix.c | 41 + + net/wireless/Makefile | 1 + + net/wireless/core.c | 3 + + net/wireless/core.h | 8 +- + net/wireless/mlme.c | 29 +- + net/wireless/nl80211.c | 137 +- + net/wireless/nl80211.h | 10 +- + net/wireless/of.c | 138 + + net/wireless/reg.c | 27 +- + net/wireless/scan.c | 9 +- + net/wireless/sme.c | 72 +- + net/wireless/sysfs.c | 6 +- + net/wireless/util.c | 32 +- + net/wireless/wext-core.c | 67 + + net/wireless/wext-sme.c | 23 - + net/xfrm/Kconfig | 1 + + net/xfrm/xfrm_input.c | 12 +- + net/xfrm/xfrm_output.c | 8 +- + net/xfrm/xfrm_policy.c | 21 +- + net/xfrm/xfrm_state.c | 86 +- + samples/bpf/map_perf_test_kern.c | 30 + + samples/bpf/map_perf_test_user.c | 49 + + security/selinux/hooks.c | 3 +- + tools/lib/traceevent/event-parse.c | 34 +- + tools/lib/traceevent/event-parse.h | 1 + + .../perf/util/scripting-engines/trace-event-perl.c | 1 + + .../util/scripting-engines/trace-event-python.c | 1 + + tools/testing/selftests/bpf/.gitignore | 1 + + tools/testing/selftests/bpf/Makefile | 4 +- + tools/testing/selftests/bpf/test_lpm_map.c | 358 +++ + tools/testing/selftests/bpf/test_tag.c | 202 ++ + tools/testing/selftests/bpf/test_verifier.c | 3113 +++++++++++++++----- + tools/testing/selftests/net/psock_lib.h | 39 +- + tools/testing/selftests/net/psock_tpacket.c | 97 +- + 1438 files changed, 68162 insertions(+), 26071 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/wireless/ieee80211.txt + create mode 100644 Documentation/networking/netfilter-sysctl.txt + create mode 100644 Documentation/siphash.txt + create mode 100644 drivers/net/can/rx-offload.c + create mode 100644 drivers/net/dsa/bcm_sf2_cfp.c + create mode 100644 drivers/net/ethernet/aquantia/Kconfig + create mode 100644 drivers/net/ethernet/aquantia/Makefile + create mode 100644 drivers/net/ethernet/aquantia/atlantic/Makefile + create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_cfg.h + create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_common.h + create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c + create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_ethtool.h + create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_hw.h + create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.c + create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.h + create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_main.c + create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_main.h + create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_nic.c + create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_nic.h + create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_nic_internal.h + create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c + create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_pci_func.h + create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_ring.c + create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_ring.h + create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_rss.h + create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_utils.h + create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_vec.c + create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_vec.h + create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c + create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.h + create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0_internal.h + create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c + create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h + create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0_internal.h + create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c + create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h + create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh_internal.h + create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c + create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h + create mode 100644 drivers/net/ethernet/aquantia/atlantic/ver.h + create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c + create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.h + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.c + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.h + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_keys.h + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c + create mode 100644 drivers/net/ethernet/qlogic/qede/qede_filter.c + create mode 100644 drivers/net/ethernet/qlogic/qede/qede_fp.c + create mode 100644 drivers/net/ethernet/qualcomm/emac/emac-ethtool.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c + delete mode 100644 drivers/net/ethernet/synopsys/Kconfig + delete mode 100644 drivers/net/ethernet/synopsys/Makefile + delete mode 100644 drivers/net/ethernet/synopsys/dwc_eth_qos.c + create mode 100644 drivers/net/phy/mdio-boardinfo.c + create mode 100644 drivers/net/phy/mdio-boardinfo.h + create mode 100644 include/dt-bindings/net/mscc-phy-vsc8531.h + create mode 100644 include/linux/bpf_trace.h + create mode 100644 include/linux/can/rx-offload.h + create mode 100644 include/linux/parman.h + create mode 100644 include/linux/siphash.h + create mode 100644 include/net/ife.h + create mode 100644 include/net/psample.h + create mode 100644 include/net/smc.h + create mode 100644 include/net/tc_act/tc_sample.h + create mode 100644 include/trace/events/afs.h + create mode 100644 include/trace/events/bpf.h + create mode 100644 include/trace/events/xdp.h + create mode 100644 include/uapi/linux/ife.h + create mode 100644 include/uapi/linux/psample.h + create mode 100644 include/uapi/linux/smc.h + create mode 100644 include/uapi/linux/smc_diag.h + create mode 100644 include/uapi/linux/tc_act/tc_sample.h + create mode 100644 kernel/bpf/lpm_trie.c + create mode 100644 lib/parman.c + create mode 100644 lib/siphash.c + create mode 100644 lib/test_parman.c + create mode 100644 lib/test_siphash.c + create mode 100644 net/bridge/br_netlink_tunnel.c + create mode 100644 net/bridge/br_private_tunnel.h + create mode 100644 net/bridge/br_vlan_tunnel.c + create mode 100644 net/core/gro_cells.c + create mode 100644 net/dsa/switch.c + create mode 100644 net/ife/Kconfig + create mode 100644 net/ife/Makefile + create mode 100644 net/ife/ife.c + delete mode 100644 net/netfilter/nf_conntrack_proto_udplite.c + delete mode 100644 net/netfilter/nf_nat_proto_udplite.c + create mode 100644 net/psample/Kconfig + create mode 100644 net/psample/Makefile + create mode 100644 net/psample/psample.c + create mode 100644 net/sched/act_sample.c + delete mode 100644 net/sctp/ssnmap.c + create mode 100644 net/sctp/stream.c + create mode 100644 net/smc/Kconfig + create mode 100644 net/smc/Makefile + create mode 100644 net/smc/af_smc.c + create mode 100644 net/smc/smc.h + create mode 100644 net/smc/smc_cdc.c + create mode 100644 net/smc/smc_cdc.h + create mode 100644 net/smc/smc_clc.c + create mode 100644 net/smc/smc_clc.h + create mode 100644 net/smc/smc_close.c + create mode 100644 net/smc/smc_close.h + create mode 100644 net/smc/smc_core.c + create mode 100644 net/smc/smc_core.h + create mode 100644 net/smc/smc_diag.c + create mode 100644 net/smc/smc_ib.c + create mode 100644 net/smc/smc_ib.h + create mode 100644 net/smc/smc_llc.c + create mode 100644 net/smc/smc_llc.h + create mode 100644 net/smc/smc_pnet.c + create mode 100644 net/smc/smc_pnet.h + create mode 100644 net/smc/smc_rx.c + create mode 100644 net/smc/smc_rx.h + create mode 100644 net/smc/smc_tx.c + create mode 100644 net/smc/smc_tx.h + create mode 100644 net/smc/smc_wr.c + create mode 100644 net/smc/smc_wr.h + create mode 100644 net/wireless/of.c + create mode 100644 tools/testing/selftests/bpf/test_lpm_map.c + create mode 100644 tools/testing/selftests/bpf/test_tag.c +$ git am -3 ../patches/0001-smc-merge-fix-for-switch-socket-splice_read-to-struc.patch +Applying: smc: merge fix for "switch socket ->splice_read() to struct file *" +$ git reset HEAD^ +Unstaged changes after reset: +M net/smc/af_smc.c +$ git add -A . +$ git commit -v -a --amend +[master a6648d5d5540] Merge remote-tracking branch 'net-next/master' + Date: Fri Feb 10 11:55:39 2017 +1100 +Merging ipsec-next/master (152bff377653 Merge branch 'bridge-improve-cache-utilization') +$ git merge ipsec-next/master +Already up-to-date. +Merging netfilter-next/master (935b7f643018 netfilter: nft_exthdr: add TCP option matching) +$ git merge netfilter-next/master +Merge made by the 'recursive' strategy. + include/net/netfilter/nf_tables.h | 18 +- + include/uapi/linux/netfilter/nf_tables.h | 25 ++- + net/netfilter/Kconfig | 10 +- + net/netfilter/Makefile | 1 + + net/netfilter/nf_tables_api.c | 54 ++++-- + net/netfilter/nft_ct.c | 195 +++++++++++++++++-- + net/netfilter/nft_exthdr.c | 139 ++++++++++++-- + net/netfilter/nft_set_bitmap.c | 314 +++++++++++++++++++++++++++++++ + net/netfilter/nft_set_hash.c | 14 +- + net/netfilter/nft_set_rbtree.c | 14 +- + 10 files changed, 710 insertions(+), 74 deletions(-) + create mode 100644 net/netfilter/nft_set_bitmap.c +Merging ipvs-next/master (8d8e20e2d7bb ipvs: Decrement ttl) +$ git merge ipvs-next/master +Already up-to-date. +Merging wireless-drivers-next/master (cbda794cf1bb Merge tag 'iwlwifi-next-for-kalle-2017-02-08' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/sta.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath10k/Kconfig | 1 + + drivers/net/wireless/ath/ath10k/ahb.c | 23 + + drivers/net/wireless/ath/ath10k/ce.c | 6 +- + drivers/net/wireless/ath/ath10k/core.c | 14 +- + drivers/net/wireless/ath/ath10k/debugfs_sta.c | 65 ++ + drivers/net/wireless/ath/ath10k/htt.h | 6 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 2 +- + drivers/net/wireless/ath/ath10k/pci.c | 53 +- + drivers/net/wireless/ath/ath10k/pci.h | 5 + + drivers/net/wireless/ath/ath10k/wmi.h | 3 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 7 +- + drivers/net/wireless/ath/ath9k/hw.c | 4 + + drivers/net/wireless/ath/ath9k/init.c | 2 + + drivers/net/wireless/ath/ath9k/link.c | 46 +- + drivers/net/wireless/ath/ath9k/mac.c | 44 +- + drivers/net/wireless/ath/ath9k/mac.h | 1 + + drivers/net/wireless/ath/ath9k/main.c | 37 +- + drivers/net/wireless/ath/ath9k/xmit.c | 2 - + drivers/net/wireless/ath/wcn36xx/main.c | 25 +- + drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 1 + + drivers/net/wireless/ath/wil6210/cfg80211.c | 1 + + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 6 + + .../wireless/broadcom/brcm80211/brcmfmac/common.c | 16 + + .../wireless/broadcom/brcm80211/brcmfmac/debug.c | 35 +- + .../wireless/broadcom/brcm80211/brcmfmac/debug.h | 24 +- + drivers/net/wireless/intel/iwlwifi/Kconfig | 7 +- + drivers/net/wireless/intel/iwlwifi/dvm/rs.c | 5 +- + drivers/net/wireless/intel/iwlwifi/iwl-a000.c | 30 +- + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 3 +- + drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 1 + + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 25 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.h | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 4 +- + .../net/wireless/intel/iwlwifi/mvm/fw-api-mac.h | 7 +- + .../net/wireless/intel/iwlwifi/mvm/fw-api-scan.h | 106 +- + .../net/wireless/intel/iwlwifi/mvm/fw-api-stats.h | 29 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-api-tx.h | 29 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h | 90 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c | 4 + + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 338 +++--- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 105 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 39 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 18 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 24 +- + drivers/net/wireless/intel/iwlwifi/mvm/power.c | 44 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 70 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 14 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 230 +++-- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 234 +++-- + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 1 + + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 129 +-- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 16 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 17 +- + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 4 +- + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 12 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 251 +++-- + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 23 +- + drivers/net/wireless/marvell/mwifiex/decl.h | 2 +- + drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 2 - + drivers/net/wireless/ralink/rt2x00/rt2400pci.c | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2500pci.c | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2500usb.c | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2x00.h | 4 +- + drivers/net/wireless/ralink/rt2x00/rt2x00debug.c | 7 +- + drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 27 +- + drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | 5 +- + drivers/net/wireless/ralink/rt2x00/rt2x00queue.h | 2 - + drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 22 +- + drivers/net/wireless/ralink/rt2x00/rt61pci.c | 5 +- + drivers/net/wireless/ralink/rt2x00/rt73usb.c | 2 +- + drivers/net/wireless/realtek/rtlwifi/base.c | 93 ++ + drivers/net/wireless/realtek/rtlwifi/base.h | 3 + + .../wireless/realtek/rtlwifi/btcoexist/Makefile | 6 +- + .../realtek/rtlwifi/btcoexist/halbtc8192e2ant.c | 1082 ++++++++++---------- + .../realtek/rtlwifi/btcoexist/halbtc8723b1ant.c | 827 ++++++++------- + .../realtek/rtlwifi/btcoexist/halbtc8723b2ant.c | 993 +++++++++--------- + .../realtek/rtlwifi/btcoexist/halbtc8821a1ant.c | 898 ++++++++-------- + .../realtek/rtlwifi/btcoexist/halbtc8821a2ant.c | 1075 ++++++++++--------- + .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 36 +- + .../realtek/rtlwifi/btcoexist/halbtcoutsrc.h | 20 +- + .../wireless/realtek/rtlwifi/btcoexist/rtl_btc.c | 16 - + .../wireless/realtek/rtlwifi/btcoexist/rtl_btc.h | 5 +- + drivers/net/wireless/realtek/rtlwifi/cam.c | 6 +- + drivers/net/wireless/realtek/rtlwifi/core.c | 21 +- + drivers/net/wireless/realtek/rtlwifi/efuse.c | 5 +- + drivers/net/wireless/realtek/rtlwifi/efuse.h | 1 + + drivers/net/wireless/realtek/rtlwifi/pci.c | 7 + + drivers/net/wireless/realtek/rtlwifi/pci.h | 4 +- + drivers/net/wireless/realtek/rtlwifi/ps.c | 3 + + .../net/wireless/realtek/rtlwifi/rtl8188ee/hw.c | 14 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/led.c | 19 +- + .../wireless/realtek/rtlwifi/rtl8192c/dm_common.c | 143 ++- + .../net/wireless/realtek/rtlwifi/rtl8192ce/hw.c | 166 ++- + .../net/wireless/realtek/rtlwifi/rtl8192ce/led.c | 19 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/hw.c | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/led.c | 17 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/hw.c | 10 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/led.c | 19 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.c | 15 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.h | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/led.c | 14 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/sw.c | 1 + + .../net/wireless/realtek/rtlwifi/rtl8192se/hw.c | 12 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/led.c | 19 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/led.c | 19 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/fw.c | 18 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/fw.h | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 50 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/led.c | 15 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/sw.c | 1 + + .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.c | 18 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.h | 3 + + .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 10 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/led.c | 24 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 10 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/sw.c | 1 + + drivers/net/wireless/realtek/rtlwifi/usb.h | 2 +- + drivers/net/wireless/realtek/rtlwifi/wifi.h | 33 +- + 122 files changed, 4689 insertions(+), 3541 deletions(-) +Merging bluetooth/master (264e6777f958 Merge branch 'netvsc-enhancements') +$ git merge bluetooth/master +Already up-to-date. +Merging mac80211-next/master (f181d6a3bcc3 mac80211: fix CSA in IBSS mode) +$ git merge mac80211-next/master +Auto-merging net/wireless/nl80211.c +Removing net/rfkill/rfkill-regulator.c +Auto-merging net/mac80211/fils_aead.c +Removing include/linux/rfkill-regulator.h +Auto-merging drivers/net/wireless/marvell/mwifiex/sta_event.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/rx.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 2 + + drivers/net/wireless/marvell/mwifiex/sta_event.c | 4 +- + drivers/net/wireless/rndis_wlan.c | 2 +- + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 2 +- + drivers/net/wireless/st/cw1200/sta.c | 2 +- + drivers/net/wireless/ti/wl1251/event.c | 4 +- + drivers/net/wireless/ti/wlcore/event.c | 3 +- + include/linux/ieee80211.h | 49 +-- + include/linux/rfkill-regulator.h | 48 --- + include/net/cfg80211.h | 92 +++-- + include/net/ieee80211_radiotap.h | 455 ++++++++--------------- + include/net/mac80211.h | 76 ++-- + include/uapi/linux/nl80211.h | 60 ++- + net/mac80211/Kconfig | 1 + + net/mac80211/aes_cmac.c | 126 ++----- + net/mac80211/aes_cmac.h | 15 +- + net/mac80211/cfg.c | 4 +- + net/mac80211/debugfs.c | 12 +- + net/mac80211/debugfs_sta.c | 1 + + net/mac80211/fils_aead.c | 74 ++-- + net/mac80211/ibss.c | 4 +- + net/mac80211/key.h | 2 +- + net/mac80211/mlme.c | 9 +- + net/mac80211/rx.c | 2 +- + net/mac80211/status.c | 2 +- + net/mac80211/trace.h | 27 +- + net/mac80211/tx.c | 4 +- + net/rfkill/Kconfig | 11 - + net/rfkill/Makefile | 1 - + net/rfkill/rfkill-regulator.c | 154 -------- + net/wireless/core.c | 3 +- + net/wireless/debugfs.c | 10 +- + net/wireless/nl80211.c | 114 ++++-- + net/wireless/trace.h | 27 +- + 34 files changed, 559 insertions(+), 843 deletions(-) + delete mode 100644 include/linux/rfkill-regulator.h + delete mode 100644 net/rfkill/rfkill-regulator.c +Merging rdma/for-next (24dc831b77ec IB/core: Add inline function to validate port) +$ git merge rdma/for-next +Auto-merging include/uapi/rdma/Kbuild +Auto-merging include/target/target_core_base.h +Auto-merging include/rdma/ib_verbs.h +Auto-merging drivers/infiniband/sw/rxe/rxe_qp.c +Auto-merging drivers/infiniband/sw/rxe/rxe_net.c +Auto-merging drivers/infiniband/hw/qedr/verbs.c +Auto-merging drivers/infiniband/hw/qedr/qedr_cm.c +Auto-merging drivers/infiniband/hw/cxgb4/device.c +Auto-merging drivers/infiniband/hw/cxgb4/cm.c +Auto-merging drivers/infiniband/core/cma.c +Merge made by the 'recursive' strategy. + drivers/infiniband/core/cache.c | 162 +++--- + drivers/infiniband/core/cm.c | 2 + + drivers/infiniband/core/cma.c | 110 ++++- + drivers/infiniband/core/cq.c | 2 +- + drivers/infiniband/core/device.c | 4 +- + drivers/infiniband/core/mad.c | 4 +- + drivers/infiniband/core/verbs.c | 3 +- + drivers/infiniband/hw/cxgb4/cm.c | 6 +- + drivers/infiniband/hw/cxgb4/device.c | 133 +++-- + drivers/infiniband/hw/hfi1/pcie.c | 10 - + drivers/infiniband/hw/i40iw/i40iw_ctrl.c | 137 ++--- + drivers/infiniband/hw/i40iw/i40iw_uk.c | 34 +- + drivers/infiniband/hw/mlx4/qp.c | 6 +- + drivers/infiniband/hw/nes/nes_cm.c | 22 +- + drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 4 +- + drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 3 +- + drivers/infiniband/hw/ocrdma/ocrdma_sli.h | 5 - + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 15 +- + drivers/infiniband/hw/qedr/qedr_cm.c | 2 +- + drivers/infiniband/hw/qedr/qedr_cm.h | 1 - + drivers/infiniband/hw/qedr/verbs.c | 549 +++++++++------------ + drivers/infiniband/hw/qib/qib_iba7322.c | 1 - + drivers/infiniband/hw/qib/qib_pcie.c | 8 - + drivers/infiniband/hw/qib/qib_qsfp.c | 10 - + drivers/infiniband/hw/qib/qib_qsfp.h | 1 - + drivers/infiniband/hw/qib/qib_user_sdma.c | 6 +- + drivers/infiniband/hw/usnic/usnic_common_pkt_hdr.h | 1 - + drivers/infiniband/hw/usnic/usnic_fwd.h | 3 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c | 5 +- + drivers/infiniband/sw/rxe/rxe.c | 2 +- + drivers/infiniband/sw/rxe/rxe_comp.c | 91 ++-- + drivers/infiniband/sw/rxe/rxe_cq.c | 4 +- + drivers/infiniband/sw/rxe/rxe_hdr.h | 12 +- + drivers/infiniband/sw/rxe/rxe_loc.h | 29 +- + drivers/infiniband/sw/rxe/rxe_mcast.c | 8 +- + drivers/infiniband/sw/rxe/rxe_mr.c | 10 +- + drivers/infiniband/sw/rxe/rxe_net.c | 51 +- + drivers/infiniband/sw/rxe/rxe_pool.c | 14 +- + drivers/infiniband/sw/rxe/rxe_pool.h | 8 +- + drivers/infiniband/sw/rxe/rxe_qp.c | 4 +- + drivers/infiniband/sw/rxe/rxe_recv.c | 2 +- + drivers/infiniband/sw/rxe/rxe_req.c | 34 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 64 +-- + drivers/infiniband/sw/rxe/rxe_verbs.c | 10 +- + drivers/infiniband/sw/rxe/rxe_verbs.h | 24 +- + drivers/infiniband/ulp/ipoib/ipoib.h | 10 +- + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 30 +- + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 14 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 47 +- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 10 +- + drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 14 +- + drivers/infiniband/ulp/isert/ib_isert.c | 2 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 139 +++--- + drivers/infiniband/ulp/srpt/ib_srpt.h | 18 +- + drivers/target/target_core_tpg.c | 1 + + include/rdma/ib_cache.h | 13 + + include/rdma/ib_sa.h | 6 +- + include/rdma/ib_verbs.h | 18 +- + include/target/target_core_base.h | 1 + + include/uapi/linux/if_ether.h | 1 + + include/uapi/rdma/Kbuild | 1 + + include/uapi/rdma/hfi/Kbuild | 1 + + include/uapi/rdma/hfi/hfi1_ioctl.h | 173 +++++++ + include/uapi/rdma/hfi/hfi1_user.h | 175 +------ + include/uapi/rdma/ib_user_mad.h | 14 +- + include/uapi/rdma/rdma_user_ioctl.h | 87 ++++ + 66 files changed, 1252 insertions(+), 1139 deletions(-) + create mode 100644 include/uapi/rdma/hfi/hfi1_ioctl.h + create mode 100644 include/uapi/rdma/rdma_user_ioctl.h +Merging rdma-leon/rdma-next (37b93d66c8ad Merge branch 'topic/mlx5-fixes-for-4.11' into rdma-next) +$ git merge rdma-leon/rdma-next +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging include/linux/mlx5/driver.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +Auto-merging drivers/infiniband/hw/mlx5/qp.c +Auto-merging drivers/infiniband/hw/mlx5/main.c +Merge made by the 'recursive' strategy. + drivers/infiniband/core/roce_gid_mgmt.c | 28 +- + drivers/infiniband/core/umem.c | 3 - + drivers/infiniband/core/umem_odp.c | 92 +++- + drivers/infiniband/core/umem_rbtree.c | 21 +- + drivers/infiniband/core/uverbs.h | 1 + + drivers/infiniband/core/uverbs_cmd.c | 53 ++- + drivers/infiniband/hw/cxgb3/iwch_provider.c | 7 +- + drivers/infiniband/hw/cxgb4/provider.c | 8 +- + drivers/infiniband/hw/hfi1/verbs.c | 1 + + drivers/infiniband/hw/hns/hns_roce_main.c | 7 +- + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 8 +- + drivers/infiniband/hw/mlx4/alias_GUID.c | 1 + + drivers/infiniband/hw/mlx4/main.c | 23 +- + drivers/infiniband/hw/mlx4/sysfs.c | 1 + + drivers/infiniband/hw/mlx5/Makefile | 2 +- + drivers/infiniband/hw/mlx5/cmd.c | 48 ++ + drivers/infiniband/hw/mlx5/cmd.h | 40 ++ + drivers/infiniband/hw/mlx5/mad.c | 14 +- + drivers/infiniband/hw/mlx5/main.c | 302 ++++++++++--- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 46 +- + drivers/infiniband/hw/mlx5/mr.c | 128 ++++-- + drivers/infiniband/hw/mlx5/odp.c | 505 ++++++++++++++++++++-- + drivers/infiniband/hw/mlx5/qp.c | 89 +++- + drivers/infiniband/hw/mlx5/srq.c | 11 +- + drivers/infiniband/hw/mthca/mthca_provider.c | 9 +- + drivers/infiniband/hw/nes/nes_verbs.c | 5 +- + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 9 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 1 + + drivers/infiniband/hw/qedr/verbs.c | 9 +- + drivers/infiniband/hw/qib/qib_verbs.c | 1 + + drivers/infiniband/hw/usnic/usnic_ib_main.c | 4 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 2 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 5 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c | 4 +- + drivers/infiniband/sw/rdmavt/vt.c | 7 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 6 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 30 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 12 +- + include/linux/mlx5/driver.h | 6 +- + include/linux/mlx5/mlx5_ifc.h | 2 +- + include/rdma/ib_umem_odp.h | 21 +- + include/rdma/ib_verbs.h | 57 ++- + include/uapi/rdma/ib_user_verbs.h | 24 +- + 43 files changed, 1375 insertions(+), 278 deletions(-) + create mode 100644 drivers/infiniband/hw/mlx5/cmd.c + create mode 100644 drivers/infiniband/hw/mlx5/cmd.h +Merging rdma-leon-test/testing/rdma-next (a909d3e63699 Linux 4.9-rc3) +$ git merge rdma-leon-test/testing/rdma-next +Already up-to-date. +Merging mtd/master (7a308bb3016f Linux 4.10-rc5) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (ccc38234fdc7 mtd: bcm47xxsflash: support reading flash out of mapping window) +$ git merge l2-mtd/master +Removing include/linux/mtd/fsmc.h +Merge made by the 'recursive' strategy. + .../bindings/mtd/cortina,gemini-flash.txt | 24 ++++ + drivers/mtd/devices/bcm47xxsflash.c | 30 +++- + drivers/mtd/devices/bcm47xxsflash.h | 3 + + drivers/mtd/maps/Kconfig | 12 +- + drivers/mtd/maps/Makefile | 5 +- + drivers/mtd/maps/ichxrom.c | 6 +- + drivers/mtd/maps/lantiq-flash.c | 4 +- + drivers/mtd/maps/physmap_of.c | 9 +- + drivers/mtd/maps/physmap_of_gemini.c | 118 ++++++++++++++++ + drivers/mtd/maps/physmap_of_gemini.h | 16 +++ + drivers/mtd/maps/pmcmsp-flash.c | 4 +- + drivers/mtd/mtdchar.c | 2 +- + drivers/mtd/mtdcore.c | 6 +- + drivers/mtd/mtdpart.c | 10 ++ + drivers/mtd/nand/Kconfig | 2 + + drivers/mtd/nand/fsl_ifc_nand.c | 8 +- + drivers/mtd/nand/fsmc_nand.c | 153 +++++++++++++++++--- + drivers/mtd/nand/lpc32xx_slc.c | 9 +- + drivers/mtd/nand/mtk_nand.c | 1 - + drivers/mtd/nand/nand_base.c | 40 ++++++ + drivers/mtd/nand/nand_ids.c | 1 + + drivers/mtd/nand/sunxi_nand.c | 36 +++-- + drivers/mtd/nand/xway_nand.c | 2 +- + drivers/mtd/spi-nor/spi-nor.c | 4 +- + include/linux/bcma/bcma_driver_chipcommon.h | 3 - + include/linux/fsl_ifc.h | 8 +- + include/linux/mtd/fsmc.h | 156 --------------------- + include/linux/mtd/mtd.h | 13 ++ + include/linux/mtd/nand.h | 9 +- + 29 files changed, 465 insertions(+), 229 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/cortina,gemini-flash.txt + create mode 100644 drivers/mtd/maps/physmap_of_gemini.c + create mode 100644 drivers/mtd/maps/physmap_of_gemini.h + delete mode 100644 include/linux/mtd/fsmc.h +$ git reset --hard HEAD^ +HEAD is now at 914e9f5f19c4 Merge remote-tracking branch 'rdma-leon/rdma-next' +Merging next-20170208 version of l2-mtd +$ git merge -m next-20170208/l2-mtd 5bdee5496978c6738dd90869b54c0f30c0344ccf +Already up-to-date. +Merging nand/nand/next (a4077ce58713 mtd: nand: Add Winbond manufacturer id) +$ git merge nand/nand/next +Removing include/linux/mtd/fsmc.h +Merge made by the 'recursive' strategy. + drivers/mtd/nand/Kconfig | 2 + + drivers/mtd/nand/fsl_ifc_nand.c | 8 ++- + drivers/mtd/nand/fsmc_nand.c | 153 +++++++++++++++++++++++++++++++++------ + drivers/mtd/nand/lpc32xx_slc.c | 9 +-- + drivers/mtd/nand/mtk_nand.c | 1 - + drivers/mtd/nand/nand_ids.c | 1 + + drivers/mtd/nand/sunxi_nand.c | 36 +++++++--- + include/linux/fsl_ifc.h | 8 ++- + include/linux/mtd/fsmc.h | 156 ---------------------------------------- + include/linux/mtd/nand.h | 4 +- + 10 files changed, 179 insertions(+), 199 deletions(-) + delete mode 100644 include/linux/mtd/fsmc.h +Merging spi-nor/next (dc12bcccadaf mtd: spi-nor: cqspi: remove redundant dead code on error return check) +$ git merge spi-nor/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/aspeed-smc.txt | 51 ++ + .../devicetree/bindings/mtd/jedec,spi-nor.txt | 2 + + .../devicetree/bindings/mtd/mtk-quadspi.txt | 8 +- + Documentation/mtd/intel-spi.txt | 88 +++ + drivers/mfd/lpc_ich.c | 131 ++++ + drivers/mtd/devices/m25p80.c | 9 +- + drivers/mtd/devices/serial_flash_cmds.h | 7 - + drivers/mtd/devices/st_spi_fsm.c | 28 +- + drivers/mtd/spi-nor/Kconfig | 32 +- + drivers/mtd/spi-nor/Makefile | 3 + + drivers/mtd/spi-nor/aspeed-smc.c | 758 ++++++++++++++++++++ + drivers/mtd/spi-nor/cadence-quadspi.c | 10 +- + drivers/mtd/spi-nor/fsl-quadspi.c | 48 +- + drivers/mtd/spi-nor/intel-spi-platform.c | 57 ++ + drivers/mtd/spi-nor/intel-spi.c | 777 +++++++++++++++++++++ + drivers/mtd/spi-nor/intel-spi.h | 24 + + drivers/mtd/spi-nor/spi-nor.c | 271 ++++++- + drivers/spi/spi-bcm-qspi.c | 6 +- + include/linux/mfd/lpc_ich.h | 3 + + include/linux/mtd/spi-nor.h | 34 +- + include/linux/platform_data/intel-spi.h | 31 + + 21 files changed, 2278 insertions(+), 100 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/aspeed-smc.txt + create mode 100644 Documentation/mtd/intel-spi.txt + create mode 100644 drivers/mtd/spi-nor/aspeed-smc.c + create mode 100644 drivers/mtd/spi-nor/intel-spi-platform.c + create mode 100644 drivers/mtd/spi-nor/intel-spi.c + create mode 100644 drivers/mtd/spi-nor/intel-spi.h + create mode 100644 include/linux/platform_data/intel-spi.h +Merging crypto/master (1a20b9661265 crypto: arm/aes - don't use IV buffer to return final keystream block) +$ git merge crypto/master +Auto-merging drivers/char/hw_random/core.c +Removing arch/arm/crypto/bsaes-armv7.pl +Removing arch/arm/crypto/aesbs-glue.c +Removing arch/arm/crypto/aesbs-core.S_shipped +Removing arch/arm/crypto/aes_glue.h +Removing arch/arm/crypto/aes_glue.c +Removing arch/arm/crypto/aes-armv4.S +Merge made by the 'recursive' strategy. + Documentation/crypto/api-digest.rst | 2 +- + .../devicetree/bindings/crypto/mediatek-crypto.txt | 27 + + arch/arm/crypto/Kconfig | 27 +- + arch/arm/crypto/Makefile | 11 +- + arch/arm/crypto/aes-armv4.S | 1089 --------- + arch/arm/crypto/aes-ce-core.S | 84 +- + arch/arm/crypto/aes-ce-glue.c | 15 +- + arch/arm/crypto/aes-cipher-core.S | 179 ++ + arch/arm/crypto/aes-cipher-glue.c | 74 + + arch/arm/crypto/aes-neonbs-core.S | 1023 ++++++++ + arch/arm/crypto/aes-neonbs-glue.c | 406 ++++ + arch/arm/crypto/aes_glue.c | 98 - + arch/arm/crypto/aes_glue.h | 19 - + arch/arm/crypto/aesbs-core.S_shipped | 2548 -------------------- + arch/arm/crypto/aesbs-glue.c | 367 --- + arch/arm/crypto/bsaes-armv7.pl | 2471 ------------------- + arch/arm/crypto/chacha20-neon-core.S | 523 ++++ + arch/arm/crypto/chacha20-neon-glue.c | 127 + + arch/arm64/crypto/Kconfig | 17 + + arch/arm64/crypto/Makefile | 9 + + arch/arm64/crypto/aes-ce-ccm-glue.c | 1 - + arch/arm64/crypto/aes-cipher-core.S | 110 + + arch/arm64/crypto/aes-cipher-glue.c | 69 + + arch/arm64/crypto/aes-glue.c | 41 +- + arch/arm64/crypto/aes-modes.S | 8 +- + arch/arm64/crypto/aes-neon.S | 235 +- + arch/arm64/crypto/aes-neonbs-core.S | 972 ++++++++ + arch/arm64/crypto/aes-neonbs-glue.c | 439 ++++ + arch/arm64/crypto/chacha20-neon-core.S | 450 ++++ + arch/arm64/crypto/chacha20-neon-glue.c | 126 + + arch/x86/crypto/aesni-intel_asm.S | 37 +- + arch/x86/crypto/aesni-intel_avx-x86_64.S | 32 +- + arch/x86/crypto/aesni-intel_glue.c | 12 +- + arch/x86/crypto/camellia-aesni-avx-asm_64.S | 5 +- + arch/x86/crypto/camellia-aesni-avx2-asm_64.S | 12 +- + arch/x86/crypto/cast5-avx-x86_64-asm_64.S | 14 +- + arch/x86/crypto/cast6-avx-x86_64-asm_64.S | 12 +- + arch/x86/crypto/chacha20-avx2-x86_64.S | 9 +- + arch/x86/crypto/chacha20-ssse3-x86_64.S | 7 +- + arch/x86/crypto/chacha20_glue.c | 70 +- + arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 2 +- + arch/x86/crypto/crct10dif-pcl-asm_64.S | 14 +- + arch/x86/crypto/des3_ede-asm_64.S | 2 +- + arch/x86/crypto/ghash-clmulni-intel_asm.S | 3 +- + arch/x86/crypto/poly1305-avx2-x86_64.S | 6 +- + arch/x86/crypto/poly1305-sse2-x86_64.S | 6 +- + arch/x86/crypto/serpent-avx-x86_64-asm_64.S | 5 +- + arch/x86/crypto/serpent-avx2-asm_64.S | 9 +- + arch/x86/crypto/sha1-mb/sha1_mb_mgr_flush_avx2.S | 6 +- + arch/x86/crypto/sha1-mb/sha1_mb_mgr_submit_avx2.S | 3 +- + arch/x86/crypto/sha1-mb/sha1_x8_avx2.S | 15 +- + arch/x86/crypto/sha1_ni_asm.S | 8 +- + arch/x86/crypto/sha256-avx-asm.S | 9 +- + arch/x86/crypto/sha256-avx2-asm.S | 9 +- + .../crypto/sha256-mb/sha256_mb_mgr_flush_avx2.S | 6 +- + .../crypto/sha256-mb/sha256_mb_mgr_submit_avx2.S | 3 +- + arch/x86/crypto/sha256-mb/sha256_x8_avx2.S | 7 +- + arch/x86/crypto/sha256-ssse3-asm.S | 8 +- + arch/x86/crypto/sha256_ni_asm.S | 4 +- + arch/x86/crypto/sha512-avx-asm.S | 9 +- + arch/x86/crypto/sha512-avx2-asm.S | 10 +- + .../crypto/sha512-mb/sha512_mb_mgr_flush_avx2.S | 10 +- + .../crypto/sha512-mb/sha512_mb_mgr_submit_avx2.S | 4 +- + arch/x86/crypto/sha512-mb/sha512_x4_avx2.S | 4 +- + arch/x86/crypto/sha512-ssse3-asm.S | 9 +- + arch/x86/crypto/twofish-avx-x86_64-asm_64.S | 6 +- + crypto/ablkcipher.c | 5 +- + crypto/acompress.c | 3 +- + crypto/aead.c | 3 +- + crypto/ahash.c | 3 +- + crypto/akcipher.c | 3 +- + crypto/algif_hash.c | 2 +- + crypto/blkcipher.c | 7 +- + crypto/chacha20_generic.c | 73 +- + crypto/cts.c | 5 +- + crypto/kpp.c | 3 +- + crypto/pcbc.c | 3 +- + crypto/rng.c | 3 +- + crypto/scompress.c | 3 +- + crypto/shash.c | 9 +- + crypto/skcipher.c | 23 +- + crypto/tcrypt.c | 6 + + crypto/testmgr.c | 1048 ++------ + crypto/testmgr.h | 272 +-- + drivers/char/hw_random/core.c | 64 +- + drivers/char/hw_random/n2-drv.c | 204 +- + drivers/char/hw_random/n2rng.h | 51 +- + drivers/crypto/Kconfig | 30 +- + drivers/crypto/Makefile | 15 +- + drivers/crypto/atmel-aes-regs.h | 16 + + drivers/crypto/atmel-aes.c | 455 +++- + drivers/crypto/atmel-authenc.h | 64 + + drivers/crypto/atmel-sha-regs.h | 20 + + drivers/crypto/atmel-sha.c | 1438 ++++++++++- + drivers/crypto/bfin_crc.c | 6 +- + drivers/crypto/bfin_crc.h | 1 - + drivers/crypto/chelsio/chcr_algo.c | 49 +- + drivers/crypto/chelsio/chcr_algo.h | 9 +- + drivers/crypto/chelsio/chcr_core.c | 11 +- + drivers/crypto/chelsio/chcr_core.h | 1 + + drivers/crypto/chelsio/chcr_crypto.h | 2 +- + drivers/crypto/img-hash.c | 4 +- + drivers/crypto/mediatek/Makefile | 2 + + drivers/crypto/mediatek/mtk-aes.c | 1299 ++++++++++ + drivers/crypto/mediatek/mtk-platform.c | 604 +++++ + drivers/crypto/mediatek/mtk-platform.h | 231 ++ + drivers/crypto/mediatek/mtk-regs.h | 194 ++ + drivers/crypto/mediatek/mtk-sha.c | 1435 +++++++++++ + drivers/crypto/picoxcell_crypto.c | 28 +- + drivers/crypto/qat/qat_c3xxx/adf_drv.c | 2 +- + drivers/crypto/qat/qat_c3xxxvf/adf_drv.c | 2 +- + drivers/crypto/qat/qat_c62x/adf_drv.c | 2 +- + drivers/crypto/qat/qat_c62xvf/adf_drv.c | 2 +- + drivers/crypto/qat/qat_common/adf_cfg_common.h | 1 + + drivers/crypto/qat/qat_common/adf_common_drv.h | 4 +- + drivers/crypto/qat/qat_common/adf_dev_mgr.c | 2 +- + drivers/crypto/qat/qat_common/adf_init.c | 28 +- + drivers/crypto/qat/qat_common/adf_sriov.c | 4 +- + drivers/crypto/qat/qat_common/adf_vf_isr.c | 4 +- + drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 2 +- + drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | 2 +- + drivers/crypto/virtio/Kconfig | 1 + + drivers/crypto/virtio/virtio_crypto_algs.c | 54 +- + drivers/crypto/virtio/virtio_crypto_common.h | 16 + + drivers/crypto/virtio/virtio_crypto_core.c | 74 +- + drivers/crypto/vmx/aes_ctr.c | 6 + + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 8 + + include/crypto/chacha20.h | 6 +- + include/crypto/hash.h | 18 +- + include/crypto/internal/skcipher.h | 2 +- + include/crypto/skcipher.h | 34 + + include/linux/compiler-gcc.h | 1 + + include/linux/miscdevice.h | 1 + + 133 files changed, 11513 insertions(+), 8424 deletions(-) + create mode 100644 Documentation/devicetree/bindings/crypto/mediatek-crypto.txt + delete mode 100644 arch/arm/crypto/aes-armv4.S + create mode 100644 arch/arm/crypto/aes-cipher-core.S + create mode 100644 arch/arm/crypto/aes-cipher-glue.c + create mode 100644 arch/arm/crypto/aes-neonbs-core.S + create mode 100644 arch/arm/crypto/aes-neonbs-glue.c + delete mode 100644 arch/arm/crypto/aes_glue.c + delete mode 100644 arch/arm/crypto/aes_glue.h + delete mode 100644 arch/arm/crypto/aesbs-core.S_shipped + delete mode 100644 arch/arm/crypto/aesbs-glue.c + delete mode 100644 arch/arm/crypto/bsaes-armv7.pl + create mode 100644 arch/arm/crypto/chacha20-neon-core.S + create mode 100644 arch/arm/crypto/chacha20-neon-glue.c + create mode 100644 arch/arm64/crypto/aes-cipher-core.S + create mode 100644 arch/arm64/crypto/aes-cipher-glue.c + create mode 100644 arch/arm64/crypto/aes-neonbs-core.S + create mode 100644 arch/arm64/crypto/aes-neonbs-glue.c + create mode 100644 arch/arm64/crypto/chacha20-neon-core.S + create mode 100644 arch/arm64/crypto/chacha20-neon-glue.c + create mode 100644 drivers/crypto/atmel-authenc.h + mode change 100644 => 100755 drivers/crypto/chelsio/chcr_algo.c + create mode 100644 drivers/crypto/mediatek/Makefile + create mode 100644 drivers/crypto/mediatek/mtk-aes.c + create mode 100644 drivers/crypto/mediatek/mtk-platform.c + create mode 100644 drivers/crypto/mediatek/mtk-platform.h + create mode 100644 drivers/crypto/mediatek/mtk-regs.h + create mode 100644 drivers/crypto/mediatek/mtk-sha.c +Merging drm/drm-next (13f62f54d174 Merge branch 'drm-next-4.11' of git://people.freedesktop.org/~agd5f/linux into drm-next) +$ git merge drm/drm-next +Resolved 'drivers/gpu/drm/drm_connector.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_drv.h' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_display.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_fbc.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_sprite.c' using previous resolution. +Resolved 'include/drm/drm_atomic.h' using previous resolution. +Resolved 'include/drm/drm_connector.h' using previous resolution. +Resolved 'lib/Kconfig' using previous resolution. +Auto-merging sound/pci/hda/patch_hdmi.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig +CONFLICT (content): Merge conflict in lib/Kconfig +Auto-merging include/drm/drm_mode_config.h +Auto-merging include/drm/drm_connector.h +CONFLICT (content): Merge conflict in include/drm/drm_connector.h +Auto-merging include/drm/drm_atomic.h +CONFLICT (content): Merge conflict in include/drm/drm_atomic.h +Auto-merging include/drm/drmP.h +Auto-merging drivers/gpu/drm/vc4/vc4_plane.c +Auto-merging drivers/gpu/drm/vc4/vc4_crtc.c +Removing drivers/gpu/drm/sti/sti_vtac.c +Auto-merging drivers/gpu/drm/radeon/radeon_drv.c +Auto-merging drivers/gpu/drm/nouveau/nv50_display.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_fbcon.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_drm.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_display.c +Auto-merging drivers/gpu/drm/i915/intel_uc.h +Auto-merging drivers/gpu/drm/i915/intel_sprite.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_sprite.c +Auto-merging drivers/gpu/drm/i915/intel_fbdev.c +Auto-merging drivers/gpu/drm/i915/intel_fbc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_fbc.c +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_dpll_mgr.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/intel_crt.c +Auto-merging drivers/gpu/drm/i915/intel_atomic_plane.c +Auto-merging drivers/gpu/drm/i915/i915_vma.c +Auto-merging drivers/gpu/drm/i915/i915_gem_internal.c +Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/gvt/cmd_parser.c +Auto-merging drivers/gpu/drm/drm_drv.c +Auto-merging drivers/gpu/drm/drm_connector.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_connector.c +Auto-merging drivers/gpu/drm/drm_atomic_helper.c +Auto-merging drivers/gpu/drm/drm_atomic.c +Auto-merging drivers/gpu/drm/ast/ast_main.c +Auto-merging drivers/gpu/drm/ast/ast_drv.h +Removing drivers/gpu/drm/amd/include/asic_reg/si/si_reg.h +Removing drivers/gpu/drm/amd/amdgpu/smu_ucode_xfer_vi.h +Removing drivers/gpu/drm/amd/amdgpu/cz_smumgr.h +Removing drivers/gpu/drm/amd/amdgpu/cz_smc.c +Removing drivers/gpu/drm/amd/amdgpu/cz_dpm.h +Removing drivers/gpu/drm/amd/amdgpu/cz_dpm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging MAINTAINERS +Removing Documentation/dma-buf-sharing.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 14a20ed2f293] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/display/brcm,bcm-vc4.txt | 35 + + .../bindings/display/bridge/adi,adv7511.txt | 12 + + .../devicetree/bindings/display/bridge/dw_hdmi.txt | 85 +- + .../bindings/display/bridge/ti,ths8135.txt | 46 + + .../bindings/display/hisilicon/hisi-ade.txt | 2 +- + .../devicetree/bindings/display/imx/hdmi.txt | 51 +- + .../devicetree/bindings/display/msm/gpu.txt | 38 +- + .../bindings/display/rockchip/dw_hdmi-rockchip.txt | 43 +- + .../devicetree/bindings/display/zte,vou.txt | 15 + + Documentation/dma-buf-sharing.txt | 482 ---- + Documentation/driver-api/dma-buf.rst | 92 + + Documentation/gpu/drm-kms.rst | 8 +- + Documentation/gpu/drm-mm.rst | 61 +- + Documentation/gpu/drm-uapi.rst | 25 +- + Documentation/gpu/i915.rst | 103 + + Documentation/gpu/introduction.rst | 15 +- + Documentation/sound/hd-audio/dp-mst.rst | 17 + + MAINTAINERS | 3 +- + arch/blackfin/include/asm/vga.h | 1 + + drivers/char/agp/intel-gtt.c | 6 +- + drivers/dma-buf/dma-buf.c | 207 +- + drivers/dma-buf/dma-fence.c | 27 + + drivers/dma-buf/sync_debug.c | 17 +- + drivers/dma-buf/sync_file.c | 21 +- + drivers/gpu/drm/Kconfig | 34 +- + drivers/gpu/drm/Makefile | 5 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 69 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 227 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 139 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 96 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 149 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 - + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 70 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 46 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 16 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 55 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 111 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 116 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 81 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 12 - + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 221 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 50 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 23 +- + drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 6 - + drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 64 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 9 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 2 +- + .../asic_reg/si => amdgpu}/clearstate_si.h | 0 + drivers/gpu/drm/amd/amdgpu/cz_dpm.c | 2320 -------------------- + drivers/gpu/drm/amd/amdgpu/cz_dpm.h | 239 -- + drivers/gpu/drm/amd/amdgpu/cz_smc.c | 995 --------- + drivers/gpu/drm/amd/amdgpu/cz_smumgr.h | 94 - + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 227 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 890 +++++++- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 25 +- + drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 132 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 592 +++++ + drivers/gpu/drm/amd/amdgpu/mxgpu_vi.h | 55 + + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 19 +- + drivers/gpu/drm/amd/amdgpu/si.c | 1072 ++++----- + drivers/gpu/drm/amd/amdgpu/si_dma.c | 4 +- + drivers/gpu/drm/amd/amdgpu/si_dpm.c | 67 +- + drivers/gpu/drm/amd/amdgpu/si_enums.h | 4 +- + drivers/gpu/drm/amd/amdgpu/si_ih.c | 2 +- + drivers/gpu/drm/amd/amdgpu/si_smc.c | 2 +- + .../drm/amd/{include/asic_reg/si => amdgpu}/sid.h | 0 + drivers/gpu/drm/amd/amdgpu/smu_ucode_xfer_vi.h | 101 - + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 128 +- + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 57 +- + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 54 +- + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 451 ++-- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 68 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 156 +- + drivers/gpu/drm/amd/amdgpu/vi.h | 112 + + drivers/gpu/drm/amd/amdgpu/vi_dpm.h | 4 - + drivers/gpu/drm/amd/amdgpu/vid.h | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 4 +- + drivers/gpu/drm/amd/include/amd_shared.h | 14 + + .../gpu/drm/amd/include/asic_reg/dce/dce_10_0_d.h | 8 + + .../amd/include/asic_reg/dce/dce_10_0_sh_mask.h | 4 + + .../gpu/drm/amd/include/asic_reg/dce/dce_11_0_d.h | 9 + + .../amd/include/asic_reg/dce/dce_11_0_sh_mask.h | 6 + + .../gpu/drm/amd/include/asic_reg/dce/dce_11_2_d.h | 9 + + .../amd/include/asic_reg/dce/dce_11_2_sh_mask.h | 6 + + .../gpu/drm/amd/include/asic_reg/dce/dce_8_0_d.h | 8 + + .../drm/amd/include/asic_reg/dce/dce_8_0_sh_mask.h | 4 + + drivers/gpu/drm/amd/include/asic_reg/si/si_reg.h | 105 - + .../gpu/drm/amd/include/asic_reg/smu/smu_7_0_1_d.h | 1 + + drivers/gpu/drm/amd/include/cgs_common.h | 7 + + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 741 ++++--- + drivers/gpu/drm/amd/powerplay/eventmgr/eventinit.c | 2 +- + drivers/gpu/drm/amd/powerplay/eventmgr/eventmgr.c | 9 +- + .../gpu/drm/amd/powerplay/eventmgr/eventtasks.c | 5 +- + .../drm/amd/powerplay/hwmgr/cz_clockpowergating.c | 86 +- + drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 99 +- + drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.h | 1 - + .../gpu/drm/amd/powerplay/hwmgr/functiontables.c | 14 +- + .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 2 +- + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 175 +- + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c | 8 +- + .../amd/powerplay/hwmgr/process_pptables_v1_0.c | 6 +- + .../gpu/drm/amd/powerplay/hwmgr/processpptables.c | 2 +- + .../amd/powerplay/hwmgr/smu7_clockpowergating.c | 23 +- + .../amd/powerplay/hwmgr/smu7_clockpowergating.h | 2 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 232 +- + .../gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c | 228 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c | 28 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.h | 1 + + drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 20 +- + drivers/gpu/drm/amd/powerplay/inc/eventmgr.h | 3 +- + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 21 +- + drivers/gpu/drm/amd/powerplay/inc/pp_debug.h | 10 +- + drivers/gpu/drm/amd/powerplay/inc/pp_instance.h | 5 + + drivers/gpu/drm/amd/powerplay/inc/smu7_ppsmc.h | 3 + + drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 19 +- + drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 181 +- + drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.h | 4 - + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c | 6 +- + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 44 +- + drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c | 10 +- + .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 32 +- + .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.c | 6 +- + .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 36 +- + drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 14 +- + drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 43 +- + drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c | 16 +- + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 32 +- + drivers/gpu/drm/arc/arcpgu_crtc.c | 3 +- + drivers/gpu/drm/arc/arcpgu_drv.c | 3 +- + drivers/gpu/drm/arc/arcpgu_hdmi.c | 5 +- + drivers/gpu/drm/arm/hdlcd_crtc.c | 18 +- + drivers/gpu/drm/arm/hdlcd_drv.c | 9 +- + drivers/gpu/drm/arm/malidp_drv.c | 76 +- + drivers/gpu/drm/arm/malidp_drv.h | 2 +- + drivers/gpu/drm/arm/malidp_hw.c | 41 +- + drivers/gpu/drm/arm/malidp_hw.h | 13 +- + drivers/gpu/drm/arm/malidp_planes.c | 102 +- + drivers/gpu/drm/arm/malidp_regs.h | 8 + + drivers/gpu/drm/armada/Kconfig | 2 +- + drivers/gpu/drm/armada/Makefile | 2 + + drivers/gpu/drm/armada/armada_crtc.c | 9 +- + drivers/gpu/drm/armada/armada_debugfs.c | 6 +- + drivers/gpu/drm/armada/armada_drv.c | 6 - + drivers/gpu/drm/armada/armada_fb.c | 2 +- + drivers/gpu/drm/armada/armada_fbdev.c | 7 +- + drivers/gpu/drm/armada/armada_gem.c | 4 +- + drivers/gpu/drm/armada/armada_overlay.c | 4 +- + drivers/gpu/drm/ast/Kconfig | 2 +- + drivers/gpu/drm/ast/ast_drv.h | 3 +- + drivers/gpu/drm/ast/ast_fb.c | 7 +- + drivers/gpu/drm/ast/ast_main.c | 5 +- + drivers/gpu/drm/ast/ast_mode.c | 16 +- + drivers/gpu/drm/ast/ast_ttm.c | 2 - + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 17 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.c | 2 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 4 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 22 +- + drivers/gpu/drm/bochs/Kconfig | 2 +- + drivers/gpu/drm/bochs/bochs.h | 1 + + drivers/gpu/drm/bochs/bochs_drv.c | 13 +- + drivers/gpu/drm/bochs/bochs_fbdev.c | 5 +- + drivers/gpu/drm/bochs/bochs_mm.c | 4 +- + drivers/gpu/drm/bridge/adv7511/adv7511.h | 6 + + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 153 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 9 +- + drivers/gpu/drm/bridge/dumb-vga-dac.c | 1 + + drivers/gpu/drm/bridge/dw-hdmi.c | 441 ++-- + drivers/gpu/drm/bridge/dw-hdmi.h | 85 +- + drivers/gpu/drm/bridge/sil-sii8620.c | 949 ++++++-- + drivers/gpu/drm/bridge/sil-sii8620.h | 50 +- + drivers/gpu/drm/cirrus/Kconfig | 2 +- + drivers/gpu/drm/cirrus/cirrus_drv.h | 3 +- + drivers/gpu/drm/cirrus/cirrus_fbdev.c | 8 +- + drivers/gpu/drm/cirrus/cirrus_main.c | 7 +- + drivers/gpu/drm/cirrus/cirrus_mode.c | 9 +- + drivers/gpu/drm/cirrus/cirrus_ttm.c | 2 - + drivers/gpu/drm/drm_agpsupport.c | 2 + + drivers/gpu/drm/drm_atomic.c | 141 +- + drivers/gpu/drm/drm_atomic_helper.c | 362 +-- + drivers/gpu/drm/drm_auth.c | 12 +- + drivers/gpu/drm/drm_blend.c | 11 +- + drivers/gpu/drm/drm_bridge.c | 88 +- + drivers/gpu/drm/drm_cache.c | 27 +- + drivers/gpu/drm/drm_color_mgmt.c | 28 +- + drivers/gpu/drm/drm_connector.c | 228 +- + drivers/gpu/drm/drm_crtc.c | 83 +- + drivers/gpu/drm/drm_crtc_helper.c | 85 +- + drivers/gpu/drm/drm_crtc_internal.h | 11 + + drivers/gpu/drm/drm_debugfs.c | 30 +- + drivers/gpu/drm/drm_debugfs_crc.c | 34 +- + drivers/gpu/drm/drm_dp_helper.c | 2 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 6 +- + drivers/gpu/drm/drm_drv.c | 98 +- + drivers/gpu/drm/drm_dumb_buffers.c | 4 +- + drivers/gpu/drm/drm_edid.c | 80 +- + drivers/gpu/drm/drm_encoder.c | 23 +- + drivers/gpu/drm/drm_encoder_slave.c | 2 +- + drivers/gpu/drm/drm_fb_cma_helper.c | 135 +- + drivers/gpu/drm/drm_fb_helper.c | 96 +- + drivers/gpu/drm/drm_fops.c | 15 +- + drivers/gpu/drm/drm_framebuffer.c | 71 +- + drivers/gpu/drm/drm_gem.c | 24 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 93 +- + drivers/gpu/drm/drm_global.c | 23 + + drivers/gpu/drm/drm_internal.h | 9 +- + drivers/gpu/drm/drm_ioctl.c | 34 +- + drivers/gpu/drm/drm_irq.c | 75 +- + drivers/gpu/drm/drm_legacy.h | 7 + + drivers/gpu/drm/drm_mm.c | 1023 ++++----- + drivers/gpu/drm/drm_mode_config.c | 150 +- + drivers/gpu/drm/drm_mode_object.c | 3 +- + drivers/gpu/drm/drm_modes.c | 28 +- + drivers/gpu/drm/drm_modeset_helper.c | 25 +- + drivers/gpu/drm/drm_modeset_lock.c | 10 +- + drivers/gpu/drm/drm_of.c | 1 + + drivers/gpu/drm/drm_pci.c | 8 +- + drivers/gpu/drm/drm_plane.c | 20 +- + drivers/gpu/drm/drm_plane_helper.c | 17 +- + drivers/gpu/drm/drm_platform.c | 6 +- + drivers/gpu/drm/drm_prime.c | 19 +- + drivers/gpu/drm/drm_print.c | 6 + + drivers/gpu/drm/drm_probe_helper.c | 85 +- + drivers/gpu/drm/drm_property.c | 6 +- + drivers/gpu/drm/drm_rect.c | 6 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 23 +- + drivers/gpu/drm/drm_sysfs.c | 2 +- + drivers/gpu/drm/drm_vma_manager.c | 3 +- + drivers/gpu/drm/etnaviv/Kconfig | 3 +- + drivers/gpu/drm/etnaviv/Makefile | 1 + + drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 14 +- + drivers/gpu/drm/etnaviv/etnaviv_cmd_parser.c | 6 + + drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c | 153 ++ + drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.h | 58 + + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 24 +- + drivers/gpu/drm/etnaviv/etnaviv_dump.c | 6 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 8 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 95 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 28 +- + drivers/gpu/drm/etnaviv/etnaviv_iommu.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c | 6 +- + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 76 +- + drivers/gpu/drm/etnaviv/etnaviv_mmu.h | 10 +- + drivers/gpu/drm/exynos/Kconfig | 2 - + drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 100 +- + drivers/gpu/drm/exynos/exynos7_drm_decon.c | 8 +- + drivers/gpu/drm/exynos/exynos_dp.c | 5 +- + drivers/gpu/drm/exynos/exynos_drm_crtc.c | 34 +- + drivers/gpu/drm/exynos/exynos_drm_crtc.h | 4 - + drivers/gpu/drm/exynos/exynos_drm_drv.c | 118 +- + drivers/gpu/drm/exynos/exynos_drm_drv.h | 10 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 6 +- + drivers/gpu/drm/exynos/exynos_drm_fb.c | 34 +- + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 15 +- + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 6 +- + drivers/gpu/drm/exynos/exynos_drm_g2d.c | 19 +- + drivers/gpu/drm/exynos/exynos_drm_mic.c | 126 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 80 +- + drivers/gpu/drm/exynos/exynos_mixer.c | 14 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 13 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h | 2 + + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 4 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 5 +- + drivers/gpu/drm/fsl-dcu/fsl_tcon.c | 12 +- + drivers/gpu/drm/gma500/Kconfig | 2 +- + drivers/gpu/drm/gma500/accel_2d.c | 2 +- + drivers/gpu/drm/gma500/framebuffer.c | 8 +- + drivers/gpu/drm/gma500/gma_display.c | 13 +- + drivers/gpu/drm/gma500/mdfld_intel_display.c | 17 +- + drivers/gpu/drm/gma500/oaktrail_crtc.c | 13 +- + drivers/gpu/drm/gma500/psb_drv.c | 9 +- + drivers/gpu/drm/gma500/psb_intel_drv.h | 1 + + drivers/gpu/drm/hisilicon/hibmc/Kconfig | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 6 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 7 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 4 +- + drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 5 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 27 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 15 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 5 +- + drivers/gpu/drm/i810/i810_dma.c | 24 +- + drivers/gpu/drm/i810/i810_drv.c | 1 - + drivers/gpu/drm/i810/i810_drv.h | 1 - + drivers/gpu/drm/i915/Kconfig.debug | 15 + + drivers/gpu/drm/i915/Makefile | 11 +- + drivers/gpu/drm/i915/gvt/aperture_gm.c | 30 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 5 +- + drivers/gpu/drm/i915/gvt/handlers.c | 2 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 10 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 174 +- + drivers/gpu/drm/i915/i915_debugfs.c | 1150 ++-------- + drivers/gpu/drm/i915/i915_drv.c | 204 +- + drivers/gpu/drm/i915/i915_drv.h | 925 +++++--- + drivers/gpu/drm/i915/i915_gem.c | 521 ++--- + drivers/gpu/drm/i915/i915_gem.h | 4 +- + drivers/gpu/drm/i915/i915_gem_context.c | 297 ++- + drivers/gpu/drm/i915/i915_gem_context.h | 277 +++ + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 2 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 172 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 20 +- + drivers/gpu/drm/i915/i915_gem_fence_reg.c | 100 +- + drivers/gpu/drm/i915/i915_gem_fence_reg.h | 2 + + drivers/gpu/drm/i915/i915_gem_gtt.c | 614 ++++-- + drivers/gpu/drm/i915/i915_gem_gtt.h | 95 +- + drivers/gpu/drm/i915/i915_gem_internal.c | 12 +- + drivers/gpu/drm/i915/i915_gem_object.h | 23 + + drivers/gpu/drm/i915/i915_gem_render_state.c | 6 +- + drivers/gpu/drm/i915/i915_gem_request.c | 106 +- + drivers/gpu/drm/i915/i915_gem_request.h | 11 - + drivers/gpu/drm/i915/i915_gem_stolen.c | 141 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 347 +-- + drivers/gpu/drm/i915/i915_gem_timeline.c | 16 +- + drivers/gpu/drm/i915/i915_gem_timeline.h | 2 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 2 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 116 +- + drivers/gpu/drm/i915/i915_guc_reg.h | 13 +- + drivers/gpu/drm/i915/i915_guc_submission.c | 959 ++------ + drivers/gpu/drm/i915/i915_irq.c | 100 +- + drivers/gpu/drm/i915/i915_oa_hsw.c | 752 +++++++ + drivers/gpu/drm/i915/i915_oa_hsw.h | 38 + + drivers/gpu/drm/i915/i915_params.c | 6 +- + drivers/gpu/drm/i915/i915_params.h | 2 +- + drivers/gpu/drm/i915/i915_pci.c | 183 +- + drivers/gpu/drm/i915/i915_perf.c | 2096 ++++++++++++++++++ + drivers/gpu/drm/i915/i915_reg.h | 482 +++- + drivers/gpu/drm/i915/i915_suspend.c | 16 +- + drivers/gpu/drm/i915/i915_sw_fence.c | 141 +- + drivers/gpu/drm/i915/i915_sw_fence.h | 6 + + drivers/gpu/drm/i915/i915_sysfs.c | 6 +- + drivers/gpu/drm/i915/i915_trace.h | 34 +- + drivers/gpu/drm/i915/i915_utils.h | 64 + + drivers/gpu/drm/i915/i915_vgpu.c | 33 +- + drivers/gpu/drm/i915/i915_vma.c | 266 ++- + drivers/gpu/drm/i915/i915_vma.h | 59 +- + drivers/gpu/drm/i915/intel_atomic.c | 31 - + drivers/gpu/drm/i915/intel_atomic_plane.c | 51 +- + drivers/gpu/drm/i915/intel_audio.c | 39 +- + drivers/gpu/drm/i915/intel_bios.c | 27 +- + drivers/gpu/drm/i915/intel_breadcrumbs.c | 10 +- + drivers/gpu/drm/i915/intel_crt.c | 7 +- + drivers/gpu/drm/i915/intel_csr.c | 16 +- + drivers/gpu/drm/i915/intel_ddi.c | 70 +- + drivers/gpu/drm/i915/intel_device_info.c | 55 +- + drivers/gpu/drm/i915/intel_display.c | 827 ++++--- + drivers/gpu/drm/i915/intel_dp.c | 356 ++- + drivers/gpu/drm/i915/intel_dp_mst.c | 31 +- + drivers/gpu/drm/i915/intel_dpio_phy.c | 130 +- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 351 ++- + drivers/gpu/drm/i915/intel_dpll_mgr.h | 178 +- + drivers/gpu/drm/i915/intel_drv.h | 109 +- + drivers/gpu/drm/i915/intel_dsi.c | 46 +- + drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 38 +- + drivers/gpu/drm/i915/intel_dsi_pll.c | 18 +- + drivers/gpu/drm/i915/intel_dvo.c | 9 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 30 +- + drivers/gpu/drm/i915/intel_fbc.c | 20 +- + drivers/gpu/drm/i915/intel_fbdev.c | 19 +- + drivers/gpu/drm/i915/intel_guc_fwif.h | 79 +- + drivers/gpu/drm/i915/intel_guc_loader.c | 255 ++- + drivers/gpu/drm/i915/intel_guc_log.c | 658 ++++++ + drivers/gpu/drm/i915/intel_hangcheck.c | 256 ++- + drivers/gpu/drm/i915/intel_hdmi.c | 198 +- + drivers/gpu/drm/i915/intel_hotplug.c | 4 +- + drivers/gpu/drm/i915/intel_huc.c | 338 +++ + drivers/gpu/drm/i915/intel_i2c.c | 22 +- + drivers/gpu/drm/i915/intel_lrc.c | 240 +- + drivers/gpu/drm/i915/intel_lrc.h | 11 +- + drivers/gpu/drm/i915/intel_lspcon.c | 94 +- + drivers/gpu/drm/i915/intel_lvds.c | 8 +- + drivers/gpu/drm/i915/intel_mocs.c | 7 +- + drivers/gpu/drm/i915/intel_mocs.h | 2 +- + drivers/gpu/drm/i915/intel_overlay.c | 289 +-- + drivers/gpu/drm/i915/intel_panel.c | 32 +- + drivers/gpu/drm/i915/intel_pipe_crc.c | 1011 +++++++++ + drivers/gpu/drm/i915/intel_pm.c | 843 +++---- + drivers/gpu/drm/i915/intel_psr.c | 209 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 97 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 66 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 163 +- + drivers/gpu/drm/i915/intel_sdvo.c | 21 +- + drivers/gpu/drm/i915/intel_sprite.c | 131 +- + drivers/gpu/drm/i915/intel_tv.c | 4 +- + drivers/gpu/drm/i915/intel_uc.c | 116 + + drivers/gpu/drm/i915/{intel_guc.h => intel_uc.h} | 108 +- + drivers/gpu/drm/i915/intel_uncore.c | 14 +- + drivers/gpu/drm/i915/intel_vbt_defs.h | 12 +- + drivers/gpu/drm/imx/dw_hdmi-imx.c | 14 +- + drivers/gpu/drm/imx/imx-drm-core.c | 3 +- + drivers/gpu/drm/imx/imx-ldb.c | 8 +- + drivers/gpu/drm/imx/imx-tve.c | 11 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 40 +- + drivers/gpu/drm/imx/parallel-display.c | 6 +- + drivers/gpu/drm/lib/drm_random.c | 41 + + drivers/gpu/drm/lib/drm_random.h | 25 + + drivers/gpu/drm/mediatek/mtk_dpi.c | 8 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 9 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 3 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 - + drivers/gpu/drm/mediatek/mtk_drm_fb.c | 2 +- + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 4 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 24 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 11 +- + drivers/gpu/drm/meson/Makefile | 6 +- + drivers/gpu/drm/meson/meson_drv.c | 4 +- + drivers/gpu/drm/meson/meson_plane.c | 2 +- + drivers/gpu/drm/mga/mga_dma.c | 24 +- + drivers/gpu/drm/mga/mga_drv.c | 37 - + drivers/gpu/drm/mga/mga_drv.h | 2 +- + drivers/gpu/drm/mgag200/Kconfig | 2 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 1 + + drivers/gpu/drm/mgag200/mgag200_drv.h | 4 +- + drivers/gpu/drm/mgag200/mgag200_fb.c | 6 +- + drivers/gpu/drm/mgag200/mgag200_i2c.c | 1 + + drivers/gpu/drm/mgag200/mgag200_main.c | 9 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 100 +- + drivers/gpu/drm/mgag200/mgag200_ttm.c | 2 - + drivers/gpu/drm/msm/Kconfig | 8 + + drivers/gpu/drm/msm/Makefile | 2 + + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 21 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 62 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 1 - + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 4 +- + drivers/gpu/drm/msm/dsi/dsi.c | 18 +- + drivers/gpu/drm/msm/dsi/dsi.h | 51 +- + drivers/gpu/drm/msm/dsi/dsi.xml.h | 269 ++- + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 25 + + drivers/gpu/drm/msm/dsi/dsi_cfg.h | 1 + + drivers/gpu/drm/msm/dsi/dsi_host.c | 97 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 257 ++- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 239 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 20 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 169 ++ + drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c | 5 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 6 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 5 +- + drivers/gpu/drm/msm/dsi/pll/dsi_pll.c | 12 + + drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | 11 + + drivers/gpu/drm/msm/dsi/pll/dsi_pll_14nm.c | 1104 ++++++++++ + drivers/gpu/drm/msm/edp/edp_bridge.c | 2 +- + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 28 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h | 48 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c | 10 + + drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h | 3 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c | 135 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 73 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.c | 14 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.h | 4 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | 77 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 123 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 45 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.c | 8 + + drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 183 +- + drivers/gpu/drm/msm/mdp/mdp_kms.h | 1 + + drivers/gpu/drm/msm/msm_atomic.c | 26 +- + drivers/gpu/drm/msm/msm_debugfs.c | 6 +- + drivers/gpu/drm/msm/msm_drv.c | 20 + + drivers/gpu/drm/msm/msm_drv.h | 12 +- + drivers/gpu/drm/msm/msm_fb.c | 12 +- + drivers/gpu/drm/msm/msm_fbdev.c | 10 +- + drivers/gpu/drm/msm/msm_gem.c | 3 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 13 +- + drivers/gpu/drm/msm/msm_gem_vma.c | 3 +- + drivers/gpu/drm/msm/msm_gpu.c | 7 +- + drivers/gpu/drm/msm/msm_iommu.c | 7 +- + drivers/gpu/drm/msm/msm_kms.h | 3 + + drivers/gpu/drm/msm/msm_mmu.h | 9 + + drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 2 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 6 +- + drivers/gpu/drm/nouveau/Kconfig | 3 +- + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 17 +- + drivers/gpu/drm/nouveau/dispnv04/dfp.c | 3 +- + drivers/gpu/drm/nouveau/dispnv04/overlay.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_abi16.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_connector.h | 1 + + drivers/gpu/drm/nouveau/nouveau_display.c | 43 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 9 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 28 +- + drivers/gpu/drm/nouveau/nv50_display.c | 16 +- + drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 2 +- + .../drm/omapdrm/displays/panel-sony-acx565akm.c | 1 + + drivers/gpu/drm/omapdrm/dss/dispc.c | 27 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 18 +- + drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c | 3 +- + drivers/gpu/drm/omapdrm/dss/omapdss.h | 1 - + drivers/gpu/drm/omapdrm/omap_connector.c | 6 +- + drivers/gpu/drm/omapdrm/omap_crtc.c | 154 +- + drivers/gpu/drm/omapdrm/omap_debugfs.c | 15 +- + drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 4 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 219 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 52 +- + drivers/gpu/drm/omapdrm/omap_encoder.c | 2 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 176 +- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 13 +- + drivers/gpu/drm/omapdrm/omap_irq.c | 242 +- + drivers/gpu/drm/omapdrm/omap_plane.c | 24 - + drivers/gpu/drm/qxl/Kconfig | 2 +- + drivers/gpu/drm/qxl/qxl_debugfs.c | 16 +- + drivers/gpu/drm/qxl/qxl_display.c | 35 +- + drivers/gpu/drm/qxl/qxl_draw.c | 2 +- + drivers/gpu/drm/qxl/qxl_drv.c | 57 +- + drivers/gpu/drm/qxl/qxl_drv.h | 11 +- + drivers/gpu/drm/qxl/qxl_fb.c | 16 +- + drivers/gpu/drm/qxl/qxl_ioctl.c | 4 +- + drivers/gpu/drm/qxl/qxl_irq.c | 2 +- + drivers/gpu/drm/qxl/qxl_kms.c | 70 +- + drivers/gpu/drm/qxl/qxl_object.c | 18 +- + drivers/gpu/drm/qxl/qxl_object.h | 8 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 19 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 19 +- + drivers/gpu/drm/radeon/r100.c | 10 +- + drivers/gpu/drm/radeon/radeon_bios.c | 64 +- + drivers/gpu/drm/radeon/radeon_cs.c | 3 +- + drivers/gpu/drm/radeon/radeon_device.c | 16 - + drivers/gpu/drm/radeon/radeon_display.c | 8 +- + drivers/gpu/drm/radeon/radeon_dp_mst.c | 2 +- + drivers/gpu/drm/radeon/radeon_drv.c | 2 +- + drivers/gpu/drm/radeon/radeon_fb.c | 5 +- + drivers/gpu/drm/radeon/radeon_irq_kms.c | 12 +- + drivers/gpu/drm/radeon/radeon_kms.c | 7 +- + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 16 +- + drivers/gpu/drm/radeon/radeon_mode.h | 1 + + drivers/gpu/drm/radeon/radeon_object.c | 1 + + drivers/gpu/drm/radeon/radeon_object.h | 1 + + drivers/gpu/drm/radeon/radeon_ttm.c | 10 +- + drivers/gpu/drm/radeon/si_dpm.c | 47 +- + drivers/gpu/drm/radeon/vce_v1_0.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_encoder.h | 1 + + drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c | 5 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 4 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 4 +- + drivers/gpu/drm/rockchip/Kconfig | 10 + + drivers/gpu/drm/rockchip/Makefile | 2 + + drivers/gpu/drm/rockchip/cdn-dp-core.c | 1260 +++++++++++ + drivers/gpu/drm/rockchip/cdn-dp-core.h | 112 + + drivers/gpu/drm/rockchip/cdn-dp-reg.c | 979 +++++++++ + drivers/gpu/drm/rockchip/cdn-dp-reg.h | 483 ++++ + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 14 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 17 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 4 +- + drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 10 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 39 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 9 + + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 2 + + drivers/gpu/drm/savage/savage_bci.c | 4 +- + drivers/gpu/drm/savage/savage_drv.h | 2 +- + drivers/gpu/drm/selftests/Makefile | 1 + + drivers/gpu/drm/selftests/drm_mm_selftests.h | 24 + + drivers/gpu/drm/selftests/drm_selftest.c | 109 + + drivers/gpu/drm/selftests/drm_selftest.h | 41 + + drivers/gpu/drm/selftests/test-drm_mm.c | 2276 +++++++++++++++++++ + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 6 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.h | 1 + + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 4 +- + drivers/gpu/drm/shmobile/shmob_drm_plane.c | 4 +- + drivers/gpu/drm/sis/sis_drv.c | 4 +- + drivers/gpu/drm/sis/sis_mm.c | 6 +- + drivers/gpu/drm/sti/Makefile | 1 - + drivers/gpu/drm/sti/sti_drv.c | 76 +- + drivers/gpu/drm/sti/sti_drv.h | 1 - + drivers/gpu/drm/sti/sti_dvo.c | 13 +- + drivers/gpu/drm/sti/sti_gdp.c | 10 +- + drivers/gpu/drm/sti/sti_hda.c | 14 +- + drivers/gpu/drm/sti/sti_hdmi.c | 219 +- + drivers/gpu/drm/sti/sti_hqvdp.c | 25 +- + drivers/gpu/drm/sti/sti_plane.c | 17 +- + drivers/gpu/drm/sti/sti_plane.h | 2 +- + drivers/gpu/drm/sti/sti_tvout.c | 8 - + drivers/gpu/drm/sti/sti_vtac.c | 223 -- + drivers/gpu/drm/sti/sti_vtg.c | 4 + + drivers/gpu/drm/sun4i/sun4i_backend.c | 7 +- + drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 13 +- + drivers/gpu/drm/tegra/dc.c | 8 +- + drivers/gpu/drm/tegra/drm.c | 46 +- + drivers/gpu/drm/tegra/drm.h | 1 + + drivers/gpu/drm/tegra/fb.c | 15 +- + drivers/gpu/drm/tegra/gem.c | 4 +- + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 4 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 19 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.h | 2 - + drivers/gpu/drm/tilcdc/tilcdc_external.c | 4 +- + drivers/gpu/drm/tilcdc/tilcdc_plane.c | 4 +- + drivers/gpu/drm/ttm/ttm_bo.c | 127 +- + drivers/gpu/drm/ttm/ttm_bo_manager.c | 31 +- + drivers/gpu/drm/udl/udl_drv.h | 2 +- + drivers/gpu/drm/udl/udl_fb.c | 9 +- + drivers/gpu/drm/udl/udl_main.c | 3 +- + drivers/gpu/drm/vc4/Kconfig | 2 + + drivers/gpu/drm/vc4/Makefile | 1 + + drivers/gpu/drm/vc4/vc4_crtc.c | 52 +- + drivers/gpu/drm/vc4/vc4_debugfs.c | 7 +- + drivers/gpu/drm/vc4/vc4_drv.c | 2 +- + drivers/gpu/drm/vc4/vc4_drv.h | 9 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 1725 +++++++++++++++ + drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +- + drivers/gpu/drm/vc4/vc4_hvs.c | 17 +- + drivers/gpu/drm/vc4/vc4_kms.c | 1 - + drivers/gpu/drm/vc4/vc4_plane.c | 14 +- + drivers/gpu/drm/vc4/vc4_regs.h | 5 + + drivers/gpu/drm/vgem/vgem_drv.h | 1 + + drivers/gpu/drm/vgem/vgem_fence.c | 4 +- + drivers/gpu/drm/via/via_drv.h | 2 +- + drivers/gpu/drm/via/via_map.c | 4 +- + drivers/gpu/drm/via/via_mm.c | 4 +- + drivers/gpu/drm/virtio/Kconfig | 2 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 3 +- + drivers/gpu/drm/virtio/virtgpu_drm_bus.c | 4 - + drivers/gpu/drm/virtio/virtgpu_drv.h | 3 +- + drivers/gpu/drm/virtio/virtgpu_fb.c | 5 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 9 +- + drivers/gpu/drm/virtio/virtgpu_ttm.c | 13 +- + drivers/gpu/drm/vmwgfx/Kconfig | 2 +- + .../drm/vmwgfx/device_include/svga3d_surfacedefs.h | 2 + + drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 5 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 14 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 5 +- + drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 7 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 2 +- + drivers/gpu/drm/zte/Kconfig | 2 + + drivers/gpu/drm/zte/Makefile | 1 + + drivers/gpu/drm/zte/zx_drm_drv.c | 3 +- + drivers/gpu/drm/zte/zx_drm_drv.h | 1 + + drivers/gpu/drm/zte/zx_hdmi.c | 160 +- + drivers/gpu/drm/zte/zx_hdmi_regs.h | 14 + + drivers/gpu/drm/zte/zx_plane.c | 332 ++- + drivers/gpu/drm/zte/zx_plane.h | 12 +- + drivers/gpu/drm/zte/zx_plane_regs.h | 51 + + drivers/gpu/drm/zte/zx_tvenc.c | 407 ++++ + drivers/gpu/drm/zte/zx_tvenc_regs.h | 31 + + drivers/gpu/drm/zte/zx_vou.c | 371 +++- + drivers/gpu/drm/zte/zx_vou.h | 48 +- + drivers/gpu/drm/zte/zx_vou_regs.h | 51 + + drivers/video/fbdev/Kconfig | 8 + + drivers/video/fbdev/core/fbmem.c | 18 +- + include/drm/bridge/dw_hdmi.h | 19 +- + include/drm/bridge/mhl.h | 85 + + include/drm/drmP.h | 34 +- + include/drm/drm_atomic.h | 37 +- + include/drm/drm_atomic_helper.h | 22 +- + include/drm/drm_auth.h | 17 +- + include/drm/drm_bridge.h | 46 +- + include/drm/drm_cache.h | 4 + + include/drm/drm_color_mgmt.h | 27 +- + include/drm/drm_connector.h | 107 +- + include/drm/drm_crtc.h | 98 +- + include/drm/drm_crtc_helper.h | 1 - + include/drm/drm_dp_helper.h | 13 +- + include/drm/drm_dp_mst_helper.h | 14 +- + include/drm/drm_drv.h | 79 +- + include/drm/drm_edid.h | 10 +- + include/drm/drm_encoder.h | 9 +- + include/drm/drm_encoder_slave.h | 1 + + include/drm/drm_fb_cma_helper.h | 12 +- + include/drm/drm_fb_helper.h | 10 +- + include/drm/drm_flip_work.h | 2 +- + include/drm/drm_framebuffer.h | 46 +- + include/drm/drm_gem.h | 16 +- + include/drm/drm_gem_cma_helper.h | 17 + + include/drm/drm_irq.h | 8 +- + include/drm/drm_mm.h | 443 ++-- + include/drm/drm_mode_config.h | 30 +- + include/drm/drm_mode_object.h | 13 +- + include/drm/drm_modes.h | 2 + + include/drm/drm_modeset_helper.h | 3 +- + include/drm/drm_modeset_helper_vtables.h | 147 +- + include/drm/drm_modeset_lock.h | 2 +- + include/drm/drm_plane.h | 28 +- + include/drm/drm_print.h | 24 +- + include/drm/drm_property.h | 8 +- + include/drm/drm_simple_kms_helper.h | 18 +- + include/drm/i915_pciids.h | 21 +- + include/drm/intel-gtt.h | 6 +- + include/drm/ttm/ttm_bo_api.h | 2 + + include/drm/ttm/ttm_bo_driver.h | 31 +- + include/linux/dma-buf.h | 224 +- + include/linux/dma-fence.h | 52 +- + include/linux/kref.h | 2 +- + include/linux/prime_numbers.h | 37 + + include/linux/reservation.h | 34 + + include/uapi/drm/Kbuild | 1 + + include/uapi/drm/amdgpu_drm.h | 9 + + include/uapi/drm/drm_fourcc.h | 59 + + include/uapi/drm/i915_drm.h | 136 ++ + include/video/exynos5433_decon.h | 2 + + lib/Kconfig | 7 + + lib/Makefile | 2 + + lib/prime_numbers.c | 315 +++ + sound/pci/hda/hda_codec.c | 76 +- + sound/pci/hda/hda_codec.h | 3 + + sound/pci/hda/patch_hdmi.c | 245 ++- + tools/testing/selftests/drivers/gpu/drm_mm.sh | 15 + + tools/testing/selftests/lib/prime_numbers.sh | 15 + + 733 files changed, 37750 insertions(+), 18873 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/ti,ths8135.txt + delete mode 100644 Documentation/dma-buf-sharing.txt + create mode 100644 arch/blackfin/include/asm/vga.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c + rename drivers/gpu/drm/amd/{include/asic_reg/si => amdgpu}/clearstate_si.h (100%) + delete mode 100644 drivers/gpu/drm/amd/amdgpu/cz_dpm.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/cz_dpm.h + delete mode 100644 drivers/gpu/drm/amd/amdgpu/cz_smc.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/cz_smumgr.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mxgpu_vi.h + rename drivers/gpu/drm/amd/{include/asic_reg/si => amdgpu}/sid.h (100%) + delete mode 100644 drivers/gpu/drm/amd/amdgpu/smu_ucode_xfer_vi.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/si/si_reg.h + create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c + create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.h + create mode 100644 drivers/gpu/drm/i915/i915_gem_context.h + create mode 100644 drivers/gpu/drm/i915/i915_oa_hsw.c + create mode 100644 drivers/gpu/drm/i915/i915_oa_hsw.h + create mode 100644 drivers/gpu/drm/i915/i915_perf.c + create mode 100644 drivers/gpu/drm/i915/i915_utils.h + create mode 100644 drivers/gpu/drm/i915/intel_guc_log.c + create mode 100644 drivers/gpu/drm/i915/intel_huc.c + create mode 100644 drivers/gpu/drm/i915/intel_pipe_crc.c + create mode 100644 drivers/gpu/drm/i915/intel_uc.c + rename drivers/gpu/drm/i915/{intel_guc.h => intel_uc.h} (70%) + create mode 100644 drivers/gpu/drm/lib/drm_random.c + create mode 100644 drivers/gpu/drm/lib/drm_random.h + create mode 100644 drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c + create mode 100644 drivers/gpu/drm/msm/dsi/pll/dsi_pll_14nm.c + create mode 100644 drivers/gpu/drm/rockchip/cdn-dp-core.c + create mode 100644 drivers/gpu/drm/rockchip/cdn-dp-core.h + create mode 100644 drivers/gpu/drm/rockchip/cdn-dp-reg.c + create mode 100644 drivers/gpu/drm/rockchip/cdn-dp-reg.h + create mode 100644 drivers/gpu/drm/selftests/Makefile + create mode 100644 drivers/gpu/drm/selftests/drm_mm_selftests.h + create mode 100644 drivers/gpu/drm/selftests/drm_selftest.c + create mode 100644 drivers/gpu/drm/selftests/drm_selftest.h + create mode 100644 drivers/gpu/drm/selftests/test-drm_mm.c + delete mode 100644 drivers/gpu/drm/sti/sti_vtac.c + create mode 100644 drivers/gpu/drm/vc4/vc4_dsi.c + create mode 100644 drivers/gpu/drm/zte/zx_tvenc.c + create mode 100644 drivers/gpu/drm/zte/zx_tvenc_regs.h + create mode 100644 include/linux/prime_numbers.h + create mode 100644 lib/prime_numbers.c + create mode 100755 tools/testing/selftests/drivers/gpu/drm_mm.sh + create mode 100755 tools/testing/selftests/lib/prime_numbers.sh +Merging drm-panel/drm/panel/for-next (eaeebffa90f3 drm/panel: simple: Specify bus width and flags for EDT displays) +$ git merge drm-panel/drm/panel/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../bindings/display/panel/boe,nv101wxmn51.txt | 7 ++ + .../bindings/display/panel/netron-dy,e231732.txt | 7 ++ + .../bindings/display/panel/tianma,tm070jdhg30.txt | 7 ++ + .../devicetree/bindings/vendor-prefixes.txt | 2 + + drivers/gpu/drm/drm_panel.c | 2 +- + drivers/gpu/drm/panel/panel-simple.c | 102 +++++++++++++++++++++ + include/drm/drm_panel.h | 4 +- + 7 files changed, 128 insertions(+), 3 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/boe,nv101wxmn51.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/netron-dy,e231732.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/tianma,tm070jdhg30.txt +Merging drm-intel/for-linux-next (05e7866a174f Merge tag 'gvt-next-2017-02-07' of https://github.com/01org/gvt-linux into drm-intel-next-fixes) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/gvt/kvmgt.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/gvt/display.c | 19 +++++++++------ + drivers/gpu/drm/i915/gvt/firmware.c | 47 +++--------------------------------- + drivers/gpu/drm/i915/gvt/gvt.c | 14 +++++------ + drivers/gpu/drm/i915/gvt/hypercall.h | 1 - + drivers/gpu/drm/i915/gvt/kvmgt.c | 38 ----------------------------- + drivers/gpu/drm/i915/gvt/mpt.h | 12 --------- + drivers/gpu/drm/i915/gvt/vgpu.c | 13 +++++----- + drivers/gpu/drm/i915/i915_drv.c | 14 +++++------ + drivers/gpu/drm/i915/intel_gvt.c | 5 ++++ + 9 files changed, 42 insertions(+), 121 deletions(-) +Merging drm-tegra/drm/tegra/for-next (7b1d4185050d gpu: host1x: Set OF node for new host1x devices) +$ git merge drm-tegra/drm/tegra/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/host1x/bus.c | 1 + + 1 file changed, 1 insertion(+) +Merging drm-misc/for-linux-next (f9ad86e42d03 drm/atomic: fix an error code in mode_fixup()) +$ git merge drm-misc/for-linux-next +Already up-to-date. +Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux) +$ git merge drm-exynos/exynos-drm/for-next +Already up-to-date. +Merging drm-msm/msm-next (21c42da18ef1 drm/msm: return -EFAULT if copy_from_user() fails) +$ git merge drm-msm/msm-next +Already up-to-date. +Merging hdlcd/for-upstream/hdlcd (747e5a5ff2a2 drm: hdlcd: Fix cleanup order) +$ git merge hdlcd/for-upstream/hdlcd +Already up-to-date. +Merging mali-dp/for-upstream/mali-dp (83d642ee6dbe drm: mali-dp: fix stride setting for multi-plane formats) +$ git merge mali-dp/for-upstream/mali-dp +Already up-to-date. +Merging sunxi/sunxi/for-next (d5adbfcd5f7b Linux 4.10-rc7) +$ git merge sunxi/sunxi/for-next +Already up-to-date. +Merging kspp/for-next/kspp (59a84e1e32f6 Merge branch 'for-next/rename-debug_rodata' into for-next/kspp) +$ git merge kspp/for-next/kspp +Resolved 'arch/Kconfig' using previous resolution. +Resolved 'arch/arm/configs/aspeed_g5_defconfig' using previous resolution. +Resolved 'arch/s390/Kconfig.debug' using previous resolution. +Resolved 'include/asm-generic/asm-prototypes.h' using previous resolution. +Auto-merging scripts/Makefile.gcc-plugins +Auto-merging kernel/module.c +Auto-merging init/main.c +Auto-merging include/linux/printk.h +Auto-merging include/linux/module.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/filter.h +Auto-merging include/linux/compiler-gcc.h +Auto-merging include/drm/drm_drv.h +Auto-merging include/asm-generic/asm-prototypes.h +CONFLICT (content): Merge conflict in include/asm-generic/asm-prototypes.h +Auto-merging include/acpi/acpixf.h +Auto-merging drivers/acpi/acpica/acutils.h +Auto-merging arch/x86/kernel/hpet.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/Kconfig.debug +CONFLICT (content): Merge conflict in arch/s390/Kconfig.debug +Auto-merging arch/arm64/kernel/insn.c +Auto-merging arch/arm64/Kconfig.debug +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/mm/init.c +Auto-merging arch/arm/configs/aspeed_g5_defconfig +CONFLICT (content): Merge conflict in arch/arm/configs/aspeed_g5_defconfig +Auto-merging arch/arm/configs/aspeed_g4_defconfig +Auto-merging arch/arm/Kconfig +Auto-merging arch/Kconfig +CONFLICT (content): Merge conflict in arch/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d5e1e31c66d0] Merge remote-tracking branch 'kspp/for-next/kspp' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/kgdb.tmpl | 8 +- + Documentation/security/self-protection.txt | 10 +- + arch/Kconfig | 96 ++ + arch/arm/Kconfig | 4 + + arch/arm/Kconfig.debug | 11 - + arch/arm/configs/aspeed_g4_defconfig | 4 +- + arch/arm/configs/aspeed_g5_defconfig | 4 +- + arch/arm/include/asm/cacheflush.h | 2 +- + arch/arm/include/asm/string.h | 10 +- + arch/arm/kernel/patch.c | 4 +- + arch/arm/kernel/vmlinux.lds.S | 8 +- + arch/arm/mm/Kconfig | 14 +- + arch/arm/mm/init.c | 4 +- + arch/arm64/Kconfig | 6 +- + arch/arm64/Kconfig.debug | 13 +- + arch/arm64/include/asm/string.h | 25 +- + arch/arm64/kernel/insn.c | 2 +- + arch/parisc/Kconfig | 1 + + arch/parisc/Kconfig.debug | 11 - + arch/parisc/configs/712_defconfig | 1 - + arch/parisc/configs/c3000_defconfig | 1 - + arch/parisc/mm/init.c | 2 +- + arch/powerpc/include/asm/string.h | 19 +- + arch/s390/Kconfig | 5 +- + arch/s390/Kconfig.debug | 4 - + arch/x86/Kconfig | 6 +- + arch/x86/Kconfig.debug | 11 - + arch/x86/include/asm/string_32.h | 25 +- + arch/x86/include/asm/string_64.h | 23 +- + arch/x86/kernel/hpet.c | 2 +- + arch/x86/lib/Makefile | 4 + + drivers/acpi/acpica/acutils.h | 2 +- + fs/char_dev.c | 2 +- + fs/ntfs/debug.h | 6 +- + fs/ocfs2/cluster/masklog.h | 2 +- + include/acpi/acpixf.h | 2 +- + include/asm-generic/asm-prototypes.h | 8 +- + include/asm-generic/bug.h | 7 +- + include/asm-generic/vmlinux.lds.h | 2 + + include/drm/drm_drv.h | 2 +- + include/linux/audit.h | 5 +- + include/linux/compiler-gcc.h | 22 + + include/linux/compiler.h | 14 +- + include/linux/filter.h | 4 +- + include/linux/fs.h | 8 +- + include/linux/init.h | 4 +- + include/linux/module.h | 2 +- + include/linux/printk.h | 2 +- + include/linux/ratelimit.h | 3 +- + include/linux/string.h | 75 +- + init/main.c | 4 +- + kernel/configs/android-recommended.config | 2 +- + kernel/module.c | 6 +- + kernel/power/hibernate.c | 2 +- + kernel/power/power.h | 4 +- + kernel/power/snapshot.c | 4 +- + lib/string.c | 3 +- + lib/vsprintf.c | 6 +- + mm/kasan/kasan.c | 2 + + mm/util.c | 10 +- + scripts/Makefile.gcc-plugins | 18 + + scripts/gcc-plugins/cyc_complexity_plugin.c | 6 +- + scripts/gcc-plugins/gcc-common.h | 55 +- + scripts/gcc-plugins/initify_plugin.c | 1860 +++++++++++++++++++++++++++ + scripts/gcc-plugins/latent_entropy_plugin.c | 8 +- + scripts/gcc-plugins/sancov_plugin.c | 8 +- + scripts/gcc-plugins/structleak_plugin.c | 246 ++++ + security/integrity/integrity.h | 2 +- + 68 files changed, 2501 insertions(+), 257 deletions(-) + create mode 100644 scripts/gcc-plugins/initify_plugin.c + create mode 100644 scripts/gcc-plugins/structleak_plugin.c +Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate") +$ git merge kconfig/for-next +Already up-to-date. +Merging regmap/for-next (bbbed1951704 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/rbtree' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regcache-rbtree.c | 7 +- + drivers/base/regmap/regcache.c | 20 +++--- + drivers/base/regmap/regmap-irq.c | 62 ++++++++-------- + drivers/base/regmap/regmap.c | 129 +++++++++++++++++++--------------- + include/linux/regmap.h | 115 +++++++++++++++++------------- + 5 files changed, 184 insertions(+), 149 deletions(-) +Merging sound/for-next (8d8c9aec9ae3 ALSA: x86: Avoid unconditional call of snd_pcm_period_elapsed()) +$ git merge sound/for-next +Auto-merging drivers/gpu/drm/i915/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_audio.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_irq.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/Makefile +Auto-merging Documentation/gpu/i915.rst +Merge made by the 'recursive' strategy. + Documentation/gpu/i915.rst | 9 + + drivers/gpu/drm/i915/Makefile | 3 + + drivers/gpu/drm/i915/i915_drv.c | 4 +- + drivers/gpu/drm/i915/i915_drv.h | 14 + + drivers/gpu/drm/i915/i915_irq.c | 16 + + drivers/gpu/drm/i915/i915_reg.h | 16 + + drivers/gpu/drm/i915/intel_audio.c | 63 +- + drivers/gpu/drm/i915/intel_drv.h | 2 + + drivers/gpu/drm/i915/intel_hdmi.c | 1 + + drivers/gpu/drm/i915/intel_lpe_audio.c | 392 ++++++ + include/drm/intel_lpe_audio.h | 51 + + include/sound/pcm.h | 9 + + include/sound/rawmidi.h | 4 +- + include/sound/snd_wavefront.h | 4 +- + sound/Kconfig | 2 + + sound/Makefile | 2 +- + sound/core/rawmidi.c | 2 +- + sound/core/seq/seq_virmidi.c | 4 +- + sound/drivers/mpu401/mpu401_uart.c | 4 +- + sound/drivers/mtpav.c | 4 +- + sound/drivers/mts64.c | 4 +- + sound/drivers/portman2x4.c | 4 +- + sound/drivers/serial-u16550.c | 4 +- + sound/drivers/vx/vx_pcm.c | 8 +- + sound/firewire/Kconfig | 1 + + sound/firewire/bebob/bebob_hwdep.c | 17 +- + sound/firewire/bebob/bebob_midi.c | 26 +- + sound/firewire/bebob/bebob_pcm.c | 51 +- + sound/firewire/dice/dice-interface.h | 1 + + sound/firewire/dice/dice-midi.c | 22 +- + sound/firewire/dice/dice-stream.c | 12 +- + sound/firewire/digi00x/digi00x-hwdep.c | 17 +- + sound/firewire/digi00x/digi00x-midi.c | 52 +- + sound/firewire/digi00x/digi00x-pcm.c | 52 +- + sound/firewire/fireworks/fireworks_hwdep.c | 19 +- + sound/firewire/fireworks/fireworks_midi.c | 26 +- + sound/firewire/fireworks/fireworks_pcm.c | 52 +- + sound/firewire/oxfw/oxfw-midi.c | 26 +- + sound/firewire/oxfw/oxfw-scs1x.c | 14 +- + sound/firewire/oxfw/oxfw.c | 1 + + sound/firewire/tascam/tascam-hwdep.c | 17 +- + sound/firewire/tascam/tascam-midi.c | 26 +- + sound/firewire/tascam/tascam-pcm.c | 52 +- + sound/isa/gus/gus_uart.c | 4 +- + sound/isa/msnd/msnd_midi.c | 2 +- + sound/isa/sb/sb8_midi.c | 4 +- + sound/isa/wavefront/wavefront_midi.c | 4 +- + sound/mips/hal2.c | 4 + + sound/oss/ad1848.c | 7 +- + sound/pci/ca0106/ca_midi.c | 4 +- + sound/pci/cs4281.c | 4 +- + sound/pci/cs46xx/cs46xx_lib.c | 44 +- + sound/pci/cs5535audio/cs5535audio_pm.c | 4 +- + sound/pci/echoaudio/midi.c | 4 +- + sound/pci/emu10k1/emu10k1x.c | 4 +- + sound/pci/emu10k1/emumpu401.c | 4 +- + sound/pci/ens1370.c | 4 +- + sound/pci/hda/hda_controller.c | 4 + + sound/pci/hda/hda_controller.h | 1 + + sound/pci/hda/hda_intel.c | 23 +- + sound/pci/hda/patch_ca0132.c | 3 + + sound/pci/hda/patch_realtek.c | 37 +- + sound/pci/ice1712/ice1724.c | 4 +- + sound/pci/mixart/mixart.h | 2 +- + sound/pci/rme9652/hdsp.c | 4 +- + sound/pci/rme9652/hdspm.c | 4 +- + sound/pci/vx222/vx222_ops.c | 12 +- + sound/pcmcia/vx/vxp_ops.c | 12 +- + sound/synth/emux/emux_seq.c | 14 +- + sound/usb/6fire/midi.c | 4 +- + sound/usb/bcd2000/bcd2000.c | 4 +- + sound/usb/caiaq/midi.c | 4 +- + sound/usb/line6/driver.c | 48 +- + sound/usb/line6/midi.c | 4 +- + sound/usb/midi.c | 4 +- + sound/usb/quirks.c | 15 + + sound/x86/Kconfig | 15 + + sound/x86/Makefile | 4 + + sound/x86/intel_hdmi_audio.c | 1821 ++++++++++++++++++++++++++++ + sound/x86/intel_hdmi_audio.h | 135 +++ + sound/x86/intel_hdmi_lpe_audio.h | 328 +++++ + 81 files changed, 3321 insertions(+), 392 deletions(-) + create mode 100644 drivers/gpu/drm/i915/intel_lpe_audio.c + create mode 100644 include/drm/intel_lpe_audio.h + create mode 100644 sound/x86/Kconfig + create mode 100644 sound/x86/Makefile + create mode 100644 sound/x86/intel_hdmi_audio.c + create mode 100644 sound/x86/intel_hdmi_audio.h + create mode 100644 sound/x86/intel_hdmi_lpe_audio.h +Merging sound-asoc/for-next (71d7b89701f4 Merge remote-tracking branches 'asoc/topic/wm8753' and 'asoc/topic/zte' into asoc-next) +$ git merge sound-asoc/for-next +Removing sound/soc/pxa/pxa2xx-ac97.h +Removing sound/soc/fsl/mpc5200_psc_ac97.h +Auto-merging include/drm/drm_edid.h +Auto-merging arch/arm/mach-s3c64xx/dev-audio.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/misc/atmel-ssc.txt | 2 + + .../bindings/sound/axentia,tse850-pcm5142.txt | 11 +- + Documentation/devicetree/bindings/sound/es8328.txt | 2 +- + .../devicetree/bindings/sound/nau8540.txt | 16 + + .../bindings/sound/rockchip,rk3288-hdmi-analog.txt | 36 + + .../devicetree/bindings/sound/sun8i-a33-codec.txt | 63 ++ + .../bindings/sound/sunxi,sun4i-spdif.txt | 1 + + .../devicetree/bindings/sound/zte,zx-i2s.txt | 14 +- + arch/arm/mach-s3c64xx/dev-audio.c | 4 +- + drivers/misc/atmel-ssc.c | 50 ++ + include/drm/drm_edid.h | 13 + + include/linux/atmel-ssc.h | 1 + + include/linux/platform_data/asoc-s3c.h | 6 +- + include/sound/dmaengine_pcm.h | 6 + + include/sound/simple_card_utils.h | 11 +- + include/sound/soc-dai.h | 3 + + include/sound/soc.h | 52 +- + sound/hda/ext/hdac_ext_stream.c | 15 +- + sound/soc/amd/acp-pcm-dma.c | 3 - + sound/soc/atmel/tse850-pcm5142.c | 23 +- + sound/soc/codecs/Kconfig | 25 +- + sound/soc/codecs/Makefile | 6 +- + sound/soc/codecs/adau17x1.c | 3 +- + sound/soc/codecs/ak4642.c | 2 +- + sound/soc/codecs/arizona.h | 1 + + sound/soc/codecs/cs47l24.c | 8 +- + sound/soc/codecs/da7218.c | 3 +- + sound/soc/codecs/es8328-i2c.c | 2 + + sound/soc/codecs/es8328.c | 20 +- + sound/soc/codecs/hdac_hdmi.c | 956 +++++++++++---------- + sound/soc/codecs/hdmi-codec.c | 403 ++++++++- + sound/soc/codecs/max98090.c | 2 +- + sound/soc/codecs/max9867.c | 5 +- + sound/soc/codecs/nau8540.c | 835 ++++++++++++++++++ + sound/soc/codecs/nau8540.h | 222 +++++ + sound/soc/codecs/pcm3168a.c | 2 - + sound/soc/codecs/rt5514-spi.c | 1 - + sound/soc/codecs/rt5640.c | 13 +- + sound/soc/codecs/rt5645.c | 14 +- + sound/soc/codecs/rt5659.c | 91 +- + sound/soc/codecs/rt5660.c | 6 +- + sound/soc/codecs/rt5670.c | 1 + + sound/soc/codecs/rt5677-spi.c | 1 - + sound/soc/codecs/tlv320aic3x.c | 6 + + sound/soc/codecs/wm0010.c | 1 - + sound/soc/codecs/wm5102.c | 7 +- + sound/soc/codecs/wm5110.c | 10 +- + sound/soc/codecs/wm8731.h | 2 +- + sound/soc/codecs/wm8741.c | 2 - + sound/soc/codecs/wm8753.c | 3 +- + sound/soc/codecs/wm8997.c | 6 +- + sound/soc/codecs/wm8998.c | 6 +- + sound/soc/codecs/wm_adsp.c | 77 +- + sound/soc/codecs/wm_adsp.h | 11 + + sound/soc/davinci/davinci-evm.c | 13 +- + sound/soc/dwc/designware_i2s.c | 9 +- + sound/soc/dwc/designware_pcm.c | 99 ++- + sound/soc/dwc/local.h | 9 +- + sound/soc/fsl/Kconfig | 2 +- + sound/soc/fsl/efika-audio-fabric.c | 1 - + sound/soc/fsl/mpc5200_psc_ac97.c | 1 - + sound/soc/fsl/mpc5200_psc_ac97.h | 13 - + sound/soc/generic/simple-card-utils.c | 8 +- + sound/soc/generic/simple-card.c | 4 +- + sound/soc/generic/simple-scu-card.c | 4 +- + sound/soc/img/img-parallel-out.c | 2 - + sound/soc/intel/Kconfig | 51 +- + sound/soc/intel/Makefile | 2 +- + sound/soc/intel/atom/Makefile | 7 +- + sound/soc/intel/atom/sst-atom-controls.c | 10 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 5 +- + sound/soc/intel/atom/sst/sst_acpi.c | 52 +- + sound/soc/intel/atom/sst/sst_ipc.c | 2 - + sound/soc/intel/atom/sst/sst_stream.c | 2 - + sound/soc/intel/boards/broadwell.c | 2 + + sound/soc/intel/boards/bxt_da7219_max98357a.c | 56 +- + sound/soc/intel/boards/bxt_rt298.c | 58 +- + sound/soc/intel/boards/bytcr_rt5640.c | 15 +- + sound/soc/intel/boards/bytcr_rt5651.c | 3 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 397 +++++++-- + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 8 +- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 9 +- + sound/soc/intel/boards/skl_rt286.c | 6 +- + sound/soc/intel/common/sst-dsp.c | 52 +- + sound/soc/intel/skylake/bxt-sst.c | 64 +- + sound/soc/intel/skylake/skl-nhlt.c | 42 +- + sound/soc/intel/skylake/skl-pcm.c | 174 ++-- + sound/soc/intel/skylake/skl-sst-dsp.h | 4 +- + sound/soc/intel/skylake/skl-sst-ipc.h | 5 +- + sound/soc/intel/skylake/skl-topology.c | 65 +- + sound/soc/intel/skylake/skl-topology.h | 19 + + sound/soc/intel/skylake/skl-tplg-interface.h | 12 - + sound/soc/intel/skylake/skl.c | 5 + + sound/soc/intel/skylake/skl.h | 2 + + sound/soc/mediatek/mt8173/mt8173-max98090.c | 14 +- + sound/soc/mxs/mxs-saif.c | 34 +- + sound/soc/omap/mcbsp.h | 3 + + sound/soc/omap/omap-mcbsp.c | 48 +- + sound/soc/pxa/e740_wm9705.c | 3 - + sound/soc/pxa/e750_wm9705.c | 2 - + sound/soc/pxa/e800_wm9712.c | 2 - + sound/soc/pxa/em-x270.c | 2 - + sound/soc/pxa/mioa701_wm9713.c | 1 - + sound/soc/pxa/palm27x.c | 2 - + sound/soc/pxa/pxa2xx-ac97.c | 2 - + sound/soc/pxa/pxa2xx-ac97.h | 17 - + sound/soc/pxa/tosa.c | 2 - + sound/soc/pxa/zylonite.c | 1 - + sound/soc/qcom/lpass-apq8016.c | 15 +- + sound/soc/qcom/lpass-cpu.c | 107 +-- + sound/soc/qcom/lpass-platform.c | 106 ++- + sound/soc/qcom/storm.c | 22 +- + sound/soc/rockchip/Kconfig | 9 + + sound/soc/rockchip/Makefile | 2 + + sound/soc/rockchip/rk3288_hdmi_analog.c | 299 +++++++ + sound/soc/samsung/Kconfig | 2 + + sound/soc/samsung/dmaengine.c | 8 +- + sound/soc/samsung/i2s.c | 206 +++-- + sound/soc/samsung/s3c2412-i2s.c | 2 + + sound/soc/samsung/s3c24xx-i2s.c | 2 + + sound/soc/samsung/smdk_wm8580.c | 5 +- + sound/soc/samsung/tm2_wm5110.c | 1 + + sound/soc/sh/rcar/core.c | 2 - + sound/soc/sh/rcar/rsnd.h | 4 +- + sound/soc/sh/rcar/src.c | 6 +- + sound/soc/soc-ac97.c | 2 +- + sound/soc/soc-core.c | 225 ++++- + sound/soc/soc-dapm.c | 62 ++ + sound/soc/soc-generic-dmaengine-pcm.c | 12 +- + sound/soc/soc-ops.c | 2 +- + sound/soc/soc-pcm.c | 55 +- + sound/soc/soc-topology.c | 19 +- + sound/soc/sunxi/Kconfig | 13 +- + sound/soc/sunxi/Makefile | 1 + + sound/soc/sunxi/sun4i-codec.c | 1 + + sound/soc/sunxi/sun4i-i2s.c | 61 +- + sound/soc/sunxi/sun4i-spdif.c | 47 +- + sound/soc/sunxi/sun8i-codec-analog.c | 30 +- + sound/soc/sunxi/sun8i-codec.c | 498 +++++++++++ + sound/soc/zte/zx-i2s.c | 43 +- + 140 files changed, 4935 insertions(+), 1446 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/nau8540.txt + create mode 100644 Documentation/devicetree/bindings/sound/rockchip,rk3288-hdmi-analog.txt + create mode 100644 Documentation/devicetree/bindings/sound/sun8i-a33-codec.txt + create mode 100644 sound/soc/codecs/nau8540.c + create mode 100644 sound/soc/codecs/nau8540.h + delete mode 100644 sound/soc/fsl/mpc5200_psc_ac97.h + delete mode 100644 sound/soc/pxa/pxa2xx-ac97.h + create mode 100644 sound/soc/rockchip/rk3288_hdmi_analog.c + create mode 100644 sound/soc/sunxi/sun8i-codec.c +Merging modules/modules-next (1f318a8bafcf modules: mark __inittest/__exittest as __maybe_unused) +$ git merge modules/modules-next +Auto-merging kernel/module.c +Auto-merging include/linux/module.h +Merge made by the 'recursive' strategy. + include/linux/module.h | 6 ++---- + kernel/module.c | 2 ++ + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging input/next (83f66a6f08fa Input: add driver for Zeitec ZET6223) +$ git merge input/next +Resolved 'drivers/input/rmi4/Kconfig' using previous resolution. +Removing include/linux/input/tca8418_keypad.h +Removing include/linux/i2c/mpr121_touchkey.h +Removing drivers/input/touchscreen/intel-mid-touch.c +Auto-merging drivers/input/rmi4/rmi_driver.c +Auto-merging drivers/input/rmi4/Kconfig +CONFLICT (content): Merge conflict in drivers/input/rmi4/Kconfig +Removing drivers/input/misc/mpu3050.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master dcc89b8cd9b8] Merge remote-tracking branch 'input/next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/input/cypress,tm2-touchkey.txt | 27 + + .../devicetree/bindings/input/mpr121-touchkey.txt | 30 + + .../devicetree/bindings/input/pwm-beeper.txt | 16 + + .../bindings/input/touchscreen/zet6223.txt | 32 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + drivers/input/Kconfig | 3 - + drivers/input/input.c | 8 +- + drivers/input/joydev.c | 20 +- + drivers/input/joystick/maplecontrol.c | 1 - + drivers/input/joystick/xpad.c | 156 +++-- + drivers/input/keyboard/Kconfig | 11 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/adc-keys.c | 2 - + drivers/input/keyboard/adp5520-keys.c | 2 - + drivers/input/keyboard/bcm-keypad.c | 4 +- + drivers/input/keyboard/bf54x-keys.c | 2 - + drivers/input/keyboard/cap11xx.c | 1 - + drivers/input/keyboard/cros_ec_keyb.c | 6 +- + drivers/input/keyboard/davinci_keyscan.c | 4 +- + drivers/input/keyboard/gpio_keys.c | 66 ++- + drivers/input/keyboard/gpio_keys_polled.c | 7 +- + drivers/input/keyboard/jornada680_kbd.c | 2 - + drivers/input/keyboard/lpc32xx-keys.c | 2 +- + drivers/input/keyboard/maple_keyb.c | 1 - + drivers/input/keyboard/matrix_keypad.c | 2 - + drivers/input/keyboard/max7359_keypad.c | 1 - + drivers/input/keyboard/mpr121_touchkey.c | 176 ++++-- + drivers/input/keyboard/nspire-keypad.c | 2 - + drivers/input/keyboard/omap4-keypad.c | 7 +- + drivers/input/keyboard/opencores-kbd.c | 4 - + drivers/input/keyboard/pmic8xxx-keypad.c | 2 +- + drivers/input/keyboard/pxa27x_keypad.c | 2 +- + drivers/input/keyboard/samsung-keypad.c | 2 - + drivers/input/keyboard/spear-keyboard.c | 2 - + drivers/input/keyboard/st-keyscan.c | 4 +- + drivers/input/keyboard/stmpe-keypad.c | 2 +- + drivers/input/keyboard/sun4i-lradc-keys.c | 1 - + drivers/input/keyboard/tca8418_keypad.c | 92 +-- + drivers/input/keyboard/tm2-touchkey.c | 284 +++++++++ + drivers/input/keyboard/twl4030_keypad.c | 5 +- + drivers/input/matrix-keymap.c | 109 ++-- + drivers/input/misc/88pm80x_onkey.c | 1 - + drivers/input/misc/Kconfig | 10 - + drivers/input/misc/Makefile | 1 - + drivers/input/misc/ab8500-ponkey.c | 1 - + drivers/input/misc/arizona-haptics.c | 2 - + drivers/input/misc/atmel_captouch.c | 1 - + drivers/input/misc/bfin_rotary.c | 11 +- + drivers/input/misc/bma150.c | 4 +- + drivers/input/misc/da9063_onkey.c | 1 - + drivers/input/misc/dm355evm_keys.c | 2 - + drivers/input/misc/drv260x.c | 2 +- + drivers/input/misc/e3x0-button.c | 8 - + drivers/input/misc/gp2ap002a00f.c | 2 - + drivers/input/misc/gpio_decoder.c | 1 - + drivers/input/misc/gpio_tilt_polled.c | 2 +- + drivers/input/misc/hisi_powerkey.c | 17 +- + drivers/input/misc/mma8450.c | 2 - + drivers/input/misc/mpu3050.c | 481 --------------- + drivers/input/misc/pm8941-pwrkey.c | 1 - + drivers/input/misc/pmic8xxx-pwrkey.c | 8 - + drivers/input/misc/pwm-beeper.c | 156 +++-- + drivers/input/misc/retu-pwrbutton.c | 6 - + drivers/input/misc/sirfsoc-onkey.c | 8 - + drivers/input/misc/soc_button_array.c | 8 +- + drivers/input/misc/tps65218-pwrbutton.c | 8 +- + drivers/input/misc/twl4030-pwrbutton.c | 1 - + drivers/input/mouse/alps.c | 2 +- + drivers/input/mouse/bcm5974.c | 2 +- + drivers/input/mouse/cyapa.c | 6 +- + drivers/input/mouse/cyapa_gen3.c | 29 +- + drivers/input/mouse/cypress_ps2.c | 6 +- + drivers/input/mouse/elan_i2c_core.c | 46 +- + drivers/input/mouse/elantech.c | 2 +- + drivers/input/mouse/hgpk.c | 5 +- + drivers/input/mouse/logips2pp.c | 2 +- + drivers/input/mouse/maplemouse.c | 1 - + drivers/input/mouse/psmouse-base.c | 41 +- + drivers/input/mouse/psmouse.h | 5 + + drivers/input/mouse/synaptics.c | 26 +- + drivers/input/mouse/synaptics.h | 1 - + drivers/input/mouse/trackpoint.c | 4 +- + drivers/input/rmi4/Kconfig | 29 +- + drivers/input/rmi4/rmi_2d_sensor.c | 7 +- + drivers/input/rmi4/rmi_bus.c | 8 +- + drivers/input/rmi4/rmi_driver.c | 21 +- + drivers/input/rmi4/rmi_driver.h | 16 +- + drivers/input/rmi4/rmi_f01.c | 104 +++- + drivers/input/rmi4/rmi_f03.c | 41 +- + drivers/input/rmi4/rmi_f30.c | 352 ++++++----- + drivers/input/rmi4/rmi_f34.c | 142 ++++- + drivers/input/rmi4/rmi_f34.h | 4 + + drivers/input/rmi4/rmi_f34v7.c | 11 + + drivers/input/serio/at32psif.c | 12 +- + drivers/input/serio/hyperv-keyboard.c | 1 - + drivers/input/serio/i8042-x86ia64io.h | 8 + + drivers/input/serio/i8042.c | 6 +- + drivers/input/serio/xilinx_ps2.c | 7 +- + drivers/input/touchscreen/88pm860x-ts.c | 3 - + drivers/input/touchscreen/Kconfig | 23 +- + drivers/input/touchscreen/Makefile | 2 +- + drivers/input/touchscreen/ads7846.c | 2 - + drivers/input/touchscreen/ar1021_i2c.c | 1 - + drivers/input/touchscreen/atmel-wm97xx.c | 4 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 2 +- + drivers/input/touchscreen/bu21013_ts.c | 2 - + drivers/input/touchscreen/colibri-vf50-ts.c | 2 - + drivers/input/touchscreen/edt-ft5x06.c | 5 +- + drivers/input/touchscreen/eeti_ts.c | 5 +- + drivers/input/touchscreen/egalax_ts.c | 3 - + drivers/input/touchscreen/elants_i2c.c | 2 - + drivers/input/touchscreen/fsl-imx25-tcq.c | 2 +- + drivers/input/touchscreen/ili210x.c | 3 +- + drivers/input/touchscreen/intel-mid-touch.c | 654 --------------------- + drivers/input/touchscreen/lpc32xx_ts.c | 1 - + drivers/input/touchscreen/max11801_ts.c | 2 - + drivers/input/touchscreen/mcs5000_ts.c | 1 - + drivers/input/touchscreen/pixcir_i2c_ts.c | 4 +- + drivers/input/touchscreen/raydium_i2c_ts.c | 2 - + drivers/input/touchscreen/rohm_bu21023.c | 3 +- + drivers/input/touchscreen/s3c2410_ts.c | 2 +- + drivers/input/touchscreen/sis_i2c.c | 1 - + drivers/input/touchscreen/st1232.c | 1 - + drivers/input/touchscreen/sx8654.c | 1 - + drivers/input/touchscreen/zet6223.c | 267 +++++++++ + include/linux/i2c/mpr121_touchkey.h | 20 - + include/linux/input/matrix_keypad.h | 21 +- + include/linux/input/tca8418_keypad.h | 44 -- + include/uapi/linux/serio.h | 7 +- + 129 files changed, 1796 insertions(+), 2090 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/cypress,tm2-touchkey.txt + create mode 100644 Documentation/devicetree/bindings/input/mpr121-touchkey.txt + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/zet6223.txt + create mode 100644 drivers/input/keyboard/tm2-touchkey.c + delete mode 100644 drivers/input/misc/mpu3050.c + delete mode 100644 drivers/input/touchscreen/intel-mid-touch.c + create mode 100644 drivers/input/touchscreen/zet6223.c + delete mode 100644 include/linux/i2c/mpr121_touchkey.h + delete mode 100644 include/linux/input/tca8418_keypad.h +Merging block/for-next (8cf4433a8295 Merge branch 'for-4.11/next' into for-next) +$ git merge block/for-next +Resolved 'drivers/block/nbd.c' using previous resolution. +Auto-merging include/linux/fs.h +Auto-merging fs/gfs2/ops_fstype.c +Auto-merging fs/btrfs/disk-io.c +Removing drivers/lightnvm/sysblk.c +Removing drivers/lightnvm/gennvm.h +Removing drivers/lightnvm/gennvm.c +Auto-merging drivers/block/nbd.c +CONFLICT (content): Merge conflict in drivers/block/nbd.c +Auto-merging drivers/block/drbd/drbd_main.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 05bd47efeb7b] Merge remote-tracking branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 15 +- + block/Kconfig | 24 + + block/Kconfig.iosched | 50 + + block/Makefile | 10 +- + block/bio.c | 16 +- + block/blk-cgroup.c | 32 +- + block/blk-core.c | 355 ++-- + block/blk-exec.c | 22 +- + block/blk-flush.c | 18 +- + block/blk-integrity.c | 4 +- + block/blk-ioc.c | 12 +- + block/blk-map.c | 13 +- + block/blk-merge.c | 62 +- + block/blk-mq-debugfs.c | 772 +++++++++ + block/blk-mq-sched.c | 504 ++++++ + block/blk-mq-sched.h | 142 ++ + block/blk-mq-sysfs.c | 235 +-- + block/blk-mq-tag.c | 190 +-- + block/blk-mq-tag.h | 10 +- + block/blk-mq.c | 586 ++++--- + block/blk-mq.h | 72 + + block/blk-settings.c | 22 +- + block/blk-sysfs.c | 51 +- + block/blk-tag.c | 1 + + block/blk-throttle.c | 6 +- + block/blk-wbt.c | 8 +- + block/blk.h | 47 +- + block/bsg-lib.c | 49 +- + block/bsg.c | 64 +- + block/cfq-iosched.c | 14 +- + block/compat_ioctl.c | 7 +- + block/deadline-iosched.c | 14 +- + block/elevator.c | 258 ++- + block/genhd.c | 25 +- + block/ioctl.c | 7 +- + block/mq-deadline.c | 556 ++++++ + block/noop-iosched.c | 2 +- + block/opal_proto.h | 429 +++++ + block/partitions/efi.c | 17 +- + block/scsi_ioctl.c | 83 +- + block/sed-opal.c | 2448 +++++++++++++++++++++++++++ + drivers/ata/libata-scsi.c | 4 +- + drivers/block/Kconfig | 13 + + drivers/block/aoe/aoeblk.c | 4 +- + drivers/block/cciss.c | 77 +- + drivers/block/drbd/drbd_main.c | 6 +- + drivers/block/drbd/drbd_nl.c | 12 +- + drivers/block/drbd/drbd_proc.c | 2 +- + drivers/block/drbd/drbd_req.c | 2 +- + drivers/block/floppy.c | 6 +- + drivers/block/hd.c | 45 +- + drivers/block/mg_disk.c | 31 +- + drivers/block/nbd.c | 258 +-- + drivers/block/null_blk.c | 10 +- + drivers/block/osdblk.c | 6 - + drivers/block/paride/Kconfig | 1 + + drivers/block/paride/pd.c | 15 +- + drivers/block/pktcdvd.c | 12 +- + drivers/block/ps3disk.c | 15 +- + drivers/block/rbd.c | 24 +- + drivers/block/skd_main.c | 15 +- + drivers/block/sx8.c | 4 +- + drivers/block/virtio_blk.c | 205 ++- + drivers/block/xen-blkfront.c | 2 +- + drivers/block/xsysace.c | 2 +- + drivers/block/zram/zram_drv.c | 2 +- + drivers/cdrom/cdrom.c | 34 +- + drivers/cdrom/gdrom.c | 37 +- + drivers/ide/Kconfig | 1 + + drivers/ide/ide-atapi.c | 78 +- + drivers/ide/ide-cd.c | 190 ++- + drivers/ide/ide-cd_ioctl.c | 5 +- + drivers/ide/ide-cd_verbose.c | 6 +- + drivers/ide/ide-devsets.c | 13 +- + drivers/ide/ide-disk.c | 12 +- + drivers/ide/ide-eh.c | 8 +- + drivers/ide/ide-floppy.c | 37 +- + drivers/ide/ide-io.c | 13 +- + drivers/ide/ide-ioctls.c | 14 +- + drivers/ide/ide-park.c | 20 +- + drivers/ide/ide-pm.c | 20 +- + drivers/ide/ide-probe.c | 36 +- + drivers/ide/ide-tape.c | 41 +- + drivers/ide/ide-taskfile.c | 8 +- + drivers/ide/sis5513.c | 2 +- + drivers/lightnvm/Kconfig | 9 - + drivers/lightnvm/Makefile | 3 +- + drivers/lightnvm/core.c | 1018 ++++++----- + drivers/lightnvm/gennvm.c | 657 ------- + drivers/lightnvm/gennvm.h | 62 - + drivers/lightnvm/rrpc.c | 7 +- + drivers/lightnvm/rrpc.h | 3 - + drivers/lightnvm/sysblk.c | 733 -------- + drivers/md/bcache/request.c | 12 +- + drivers/md/bcache/super.c | 8 +- + drivers/md/dm-cache-target.c | 15 +- + drivers/md/dm-core.h | 1 - + drivers/md/dm-era-target.c | 2 +- + drivers/md/dm-mpath.c | 132 +- + drivers/md/dm-rq.c | 268 +-- + drivers/md/dm-rq.h | 2 +- + drivers/md/dm-table.c | 2 +- + drivers/md/dm-target.c | 7 - + drivers/md/dm-thin.c | 15 +- + drivers/md/dm.c | 49 +- + drivers/md/dm.h | 3 +- + drivers/md/linear.c | 2 +- + drivers/md/md.c | 6 +- + drivers/md/multipath.c | 2 +- + drivers/md/raid0.c | 6 +- + drivers/md/raid1.c | 11 +- + drivers/md/raid10.c | 10 +- + drivers/md/raid5.c | 12 +- + drivers/memstick/core/ms_block.c | 11 - + drivers/memstick/core/mspro_block.c | 13 - + drivers/message/fusion/mptsas.c | 8 +- + drivers/mmc/core/queue.c | 9 - + drivers/mtd/mtd_blkdevs.c | 13 +- + drivers/mtd/ubi/block.c | 15 +- + drivers/nvme/host/core.c | 85 +- + drivers/nvme/host/fc.c | 2 +- + drivers/nvme/host/lightnvm.c | 315 +++- + drivers/nvme/host/nvme.h | 20 + + drivers/nvme/host/pci.c | 15 +- + drivers/nvme/host/rdma.c | 6 +- + drivers/nvme/host/scsi.c | 7 +- + drivers/nvme/target/loop.c | 2 +- + drivers/s390/block/scm_blk.c | 7 - + drivers/scsi/Kconfig | 1 + + drivers/scsi/device_handler/scsi_dh_emc.c | 247 +-- + drivers/scsi/device_handler/scsi_dh_hp_sw.c | 222 +-- + drivers/scsi/device_handler/scsi_dh_rdac.c | 174 +- + drivers/scsi/hosts.c | 24 +- + drivers/scsi/hpsa.c | 4 +- + drivers/scsi/libfc/fc_lport.c | 2 +- + drivers/scsi/libsas/sas_expander.c | 8 +- + drivers/scsi/libsas/sas_host_smp.c | 38 +- + drivers/scsi/mpt3sas/mpt3sas_transport.c | 8 +- + drivers/scsi/osd/osd_initiator.c | 22 +- + drivers/scsi/osst.c | 18 +- + drivers/scsi/qla2xxx/qla_bsg.c | 2 +- + drivers/scsi/qla2xxx/qla_isr.c | 6 +- + drivers/scsi/qla2xxx/qla_mr.c | 2 +- + drivers/scsi/scsi.c | 354 +--- + drivers/scsi/scsi_error.c | 43 +- + drivers/scsi/scsi_lib.c | 264 ++- + drivers/scsi/scsi_priv.h | 5 +- + drivers/scsi/scsi_transport_fc.c | 34 +- + drivers/scsi/scsi_transport_iscsi.c | 14 +- + drivers/scsi/scsi_transport_sas.c | 5 + + drivers/scsi/sd.c | 48 +- + drivers/scsi/sg.c | 33 +- + drivers/scsi/smartpqi/smartpqi_init.c | 2 +- + drivers/scsi/sr.c | 9 +- + drivers/scsi/st.c | 28 +- + drivers/scsi/sun3_scsi.c | 2 +- + drivers/target/Kconfig | 1 + + drivers/target/target_core_pscsi.c | 14 +- + fs/block_dev.c | 22 + + fs/btrfs/disk-io.c | 2 +- + fs/btrfs/volumes.c | 2 +- + fs/debugfs/inode.c | 36 + + fs/gfs2/ops_fstype.c | 2 +- + fs/nfsd/Kconfig | 1 + + fs/nfsd/blocklayout.c | 19 +- + fs/nilfs2/super.c | 2 +- + fs/super.c | 2 +- + fs/xfs/xfs_buf.c | 3 +- + fs/xfs/xfs_buf.h | 1 - + include/linux/backing-dev-defs.h | 2 + + include/linux/backing-dev.h | 12 +- + include/linux/blk-mq.h | 9 +- + include/linux/blk_types.h | 38 +- + include/linux/blkdev.h | 124 +- + include/linux/blktrace_api.h | 18 +- + include/linux/bsg-lib.h | 5 +- + include/linux/debugfs.h | 8 + + include/linux/device-mapper.h | 3 - + include/linux/elevator.h | 63 +- + include/linux/fs.h | 2 + + include/linux/genhd.h | 8 + + include/linux/ide.h | 58 +- + include/linux/lightnvm.h | 138 +- + include/linux/nvme.h | 2 + + include/linux/sbitmap.h | 30 + + include/linux/sed-opal.h | 178 ++ + include/scsi/scsi_cmnd.h | 4 +- + include/scsi/scsi_host.h | 5 - + include/scsi/scsi_request.h | 30 + + include/scsi/scsi_transport.h | 2 + + include/trace/events/block.h | 27 +- + include/uapi/linux/lightnvm.h | 50 + + include/uapi/linux/sed-opal.h | 119 ++ + kernel/trace/blktrace.c | 78 +- + lib/sbitmap.c | 139 +- + mm/backing-dev.c | 43 +- + mm/page-writeback.c | 4 +- + 197 files changed, 9645 insertions(+), 5465 deletions(-) + create mode 100644 block/blk-mq-debugfs.c + create mode 100644 block/blk-mq-sched.c + create mode 100644 block/blk-mq-sched.h + create mode 100644 block/mq-deadline.c + create mode 100644 block/opal_proto.h + create mode 100644 block/sed-opal.c + delete mode 100644 drivers/lightnvm/gennvm.c + delete mode 100644 drivers/lightnvm/gennvm.h + delete mode 100644 drivers/lightnvm/sysblk.c + create mode 100644 include/linux/sed-opal.h + create mode 100644 include/scsi/scsi_request.h + create mode 100644 include/uapi/linux/sed-opal.h +Merging lightnvm/for-next (e57ef816cf77 Merge branch 'for-4.11/block' into for-next) +$ git merge lightnvm/for-next +Already up-to-date. +Merging device-mapper/for-next (f5b0cba8f239 dm crypt: replace RCU read-side section with rwsem) +$ git merge device-mapper/for-next +Already up-to-date. +Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) +$ git merge pcmcia/master +Already up-to-date. +Merging mmc/next (7c6e11f3c39a mmc: Adding AUTO_BKOPS_EN bit set for Auto BKOPS support) +$ git merge mmc/next +Removing include/linux/mmc/dw_mmc.h +Removing include/linux/mmc/boot.h +Removing drivers/mmc/host/sdhci-s3c-regs.h +Auto-merging drivers/mmc/core/queue.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/amlogic,meson-gx.txt | 2 +- + .../devicetree/bindings/mmc/mmc-pwrseq-sd8787.txt | 16 + + Documentation/devicetree/bindings/mmc/mmc.txt | 1 + + Documentation/devicetree/bindings/mmc/sdhci-st.txt | 2 +- + Documentation/devicetree/bindings/mmc/sdhci.txt | 2 +- + .../devicetree/bindings/mmc/sunxi-mmc.txt | 1 + + .../devicetree/bindings/mmc/synopsys-dw-mshc.txt | 15 +- + Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 13 + + .../devicetree/bindings/mmc/zx-dw-mshc.txt | 33 ++ + .../bindings/net/wireless/marvell-8xxx.txt | 7 +- + MAINTAINERS | 1 - + arch/arm/mach-davinci/board-da850-evm.c | 1 + + arch/arm/mach-davinci/board-dm644x-evm.c | 1 + + arch/arm/mach-davinci/board-neuros-osd2.c | 1 + + arch/arm/mach-davinci/board-omapl138-hawk.c | 1 + + arch/arm/mach-pxa/balloon3.c | 1 + + arch/arm/mach-pxa/colibri-pxa270-income.c | 1 + + arch/arm/mach-pxa/corgi.c | 1 + + arch/arm/mach-pxa/trizeps4.c | 1 + + arch/arm/mach-pxa/vpac270.c | 1 + + arch/arm/mach-pxa/zeus.c | 1 + + arch/arm/mach-pxa/zylonite.c | 1 + + arch/mips/alchemy/devboards/db1300.c | 1 + + arch/sh/boot/romimage/mmcif-sh7724.c | 16 +- + drivers/mmc/core/Kconfig | 10 + + drivers/mmc/core/Makefile | 1 + + drivers/mmc/core/block.c | 330 +++++++++--------- + drivers/mmc/core/block.h | 10 +- + drivers/mmc/core/bus.c | 2 + + drivers/mmc/core/bus.h | 16 +- + drivers/mmc/core/card.h | 223 ++++++++++++ + drivers/mmc/core/core.c | 116 ++++--- + drivers/mmc/core/core.h | 45 ++- + drivers/mmc/core/debugfs.c | 2 + + drivers/mmc/core/host.c | 24 +- + drivers/mmc/core/host.h | 48 +++ + drivers/mmc/core/mmc.c | 64 +++- + drivers/mmc/core/mmc_ops.c | 44 +-- + drivers/mmc/core/mmc_ops.h | 14 + + drivers/mmc/core/mmc_test.c | 116 ++++--- + drivers/mmc/core/pwrseq.h | 6 +- + drivers/mmc/core/pwrseq_sd8787.c | 117 +++++++ + drivers/mmc/core/queue.c | 16 +- + drivers/mmc/core/queue.h | 13 +- + drivers/mmc/core/quirks.c | 2 + + drivers/mmc/core/sd.c | 5 +- + drivers/mmc/core/sd.h | 5 +- + drivers/mmc/core/sd_ops.c | 30 +- + drivers/mmc/core/sd_ops.h | 9 + + drivers/mmc/core/sdio.c | 43 ++- + drivers/mmc/core/sdio_bus.c | 1 + + drivers/mmc/core/sdio_bus.h | 3 + + drivers/mmc/core/sdio_cis.h | 3 + + drivers/mmc/core/sdio_io.c | 2 + + drivers/mmc/core/sdio_irq.c | 2 + + drivers/mmc/core/sdio_ops.c | 10 +- + drivers/mmc/core/sdio_ops.h | 5 + + drivers/mmc/core/slot-gpio.c | 6 - + drivers/mmc/core/slot-gpio.h | 2 + + drivers/mmc/host/Kconfig | 9 + + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/davinci_mmc.c | 1 + + drivers/mmc/host/dw_mmc-exynos.c | 1 - + drivers/mmc/host/dw_mmc-k3.c | 1 - + drivers/mmc/host/dw_mmc-pci.c | 1 - + drivers/mmc/host/dw_mmc-pltfm.c | 1 - + drivers/mmc/host/dw_mmc-rockchip.c | 1 - + drivers/mmc/host/dw_mmc-zx.c | 241 +++++++++++++ + drivers/mmc/host/dw_mmc-zx.h | 31 ++ + drivers/mmc/host/dw_mmc.c | 30 +- + drivers/mmc/host/dw_mmc.h | 263 ++++++++++++++ + drivers/mmc/host/meson-gx-mmc.c | 118 +++---- + drivers/mmc/host/mmci.c | 39 ++- + drivers/mmc/host/mmci.h | 3 +- + drivers/mmc/host/mtk-sd.c | 8 +- + drivers/mmc/host/mxs-mmc.c | 16 +- + drivers/mmc/host/omap.c | 2 +- + drivers/mmc/host/omap_hsmmc.c | 29 +- + drivers/mmc/host/rtsx_pci_sdmmc.c | 2 +- + drivers/mmc/host/rtsx_usb_sdmmc.c | 2 +- + drivers/mmc/host/s3cmci.c | 1 + + drivers/mmc/host/sdhci-acpi.c | 5 +- + drivers/mmc/host/sdhci-cadence.c | 1 + + drivers/mmc/host/sdhci-esdhc.h | 44 +-- + drivers/mmc/host/sdhci-iproc.c | 11 +- + drivers/mmc/host/sdhci-msm.c | 377 ++++++++++++--------- + drivers/mmc/host/sdhci-of-esdhc.c | 39 ++- + drivers/mmc/host/sdhci-pci-core.c | 97 +++++- + drivers/mmc/host/sdhci-pci.h | 1 - + drivers/mmc/host/sdhci-s3c-regs.h | 87 ----- + drivers/mmc/host/sdhci-s3c.c | 71 +++- + drivers/mmc/host/sdhci.c | 10 +- + drivers/mmc/host/sdhci.h | 2 + + drivers/mmc/host/sh_mmcif.c | 28 +- + drivers/mmc/host/sh_mobile_sdhi.c | 95 +++--- + drivers/mmc/host/sunxi-mmc.c | 114 ++++--- + drivers/mmc/host/tmio_mmc.h | 3 + + drivers/mmc/host/tmio_mmc_pio.c | 61 ++-- + drivers/mmc/host/via-sdmmc.c | 1 + + drivers/mmc/host/vub300.c | 8 +- + drivers/mmc/host/wbsd.c | 7 +- + drivers/mmc/host/wmt-sdmmc.c | 1 + + include/linux/mfd/tmio.h | 6 +- + include/linux/mmc/boot.h | 7 - + include/linux/mmc/card.h | 246 +------------- + include/linux/mmc/core.h | 86 +---- + include/linux/mmc/dw_mmc.h | 274 --------------- + include/linux/mmc/host.h | 84 ++--- + include/linux/mmc/mmc.h | 63 +--- + include/linux/mmc/sh_mmcif.h | 5 - + include/linux/mmc/slot-gpio.h | 3 + + include/linux/platform_data/mmc-mxcmmc.h | 1 + + 112 files changed, 2458 insertions(+), 1647 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/mmc-pwrseq-sd8787.txt + create mode 100644 Documentation/devicetree/bindings/mmc/zx-dw-mshc.txt + create mode 100644 drivers/mmc/core/card.h + create mode 100644 drivers/mmc/core/pwrseq_sd8787.c + create mode 100644 drivers/mmc/host/dw_mmc-zx.c + create mode 100644 drivers/mmc/host/dw_mmc-zx.h + delete mode 100644 drivers/mmc/host/sdhci-s3c-regs.h + delete mode 100644 include/linux/mmc/boot.h + delete mode 100644 include/linux/mmc/dw_mmc.h +Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value) +$ git merge kgdb/kgdb-next +Auto-merging kernel/debug/kdb/kdb_io.c +Merge made by the 'recursive' strategy. + kernel/debug/kdb/kdb_io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging md/for-next (c457c0a1f034 md/raid10: don't abuse bio->bi_phys_segments) +$ git merge md/for-next +Auto-merging drivers/md/raid5.c +Auto-merging drivers/md/raid10.c +Auto-merging drivers/md/raid1.c +Auto-merging drivers/md/raid0.c +Auto-merging drivers/md/multipath.c +Auto-merging drivers/md/md.c +Auto-merging drivers/md/linear.c +Merge made by the 'recursive' strategy. + Documentation/00-INDEX | 4 +- + Documentation/admin-guide/md.rst | 5 + + Documentation/{ => md}/md-cluster.txt | 0 + Documentation/md/raid5-cache.txt | 109 ++++++++++++++++++ + drivers/md/linear.c | 41 ++++++- + drivers/md/linear.h | 1 + + drivers/md/md.c | 117 +++++++++++++++++++ + drivers/md/md.h | 20 ++++ + drivers/md/multipath.c | 4 + + drivers/md/raid0.c | 2 + + drivers/md/raid1.c | 45 ++++---- + drivers/md/raid10.c | 40 ++++--- + drivers/md/raid5-cache.c | 207 +++++++++++++++++++++++++++++----- + drivers/md/raid5.c | 138 ++++++++++++++++++----- + drivers/md/raid5.h | 44 +++++--- + lib/radix-tree.c | 1 + + 16 files changed, 661 insertions(+), 117 deletions(-) + rename Documentation/{ => md}/md-cluster.txt (100%) + create mode 100644 Documentation/md/raid5-cache.txt +Merging mfd/for-mfd-next (197ac6d28fce MAINTAINERS: Add include/dt-bindings/mfd to MFD entry) +$ git merge mfd/for-mfd-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-bus-iio-timer-stm32 | 29 ++ + .../bindings/iio/timer/stm32-timer-trigger.txt | 23 ++ + .../devicetree/bindings/mfd/aspeed-gfx.txt | 17 + + .../devicetree/bindings/mfd/aspeed-lpc.txt | 137 +++++++ + Documentation/devicetree/bindings/mfd/mfd.txt | 12 +- + .../devicetree/bindings/mfd/motorola-cpcap.txt | 31 ++ + Documentation/devicetree/bindings/mfd/mt6397.txt | 4 + + .../devicetree/bindings/mfd/stm32-timers.txt | 46 +++ + .../devicetree/bindings/pwm/pwm-stm32.txt | 35 ++ + MAINTAINERS | 1 + + drivers/iio/trigger/Kconfig | 9 + + drivers/iio/trigger/Makefile | 1 + + drivers/iio/trigger/stm32-timer-trigger.c | 342 +++++++++++++++++ + drivers/mfd/Kconfig | 23 ++ + drivers/mfd/Makefile | 3 + + drivers/mfd/ab8500-core.c | 4 +- + drivers/mfd/ab8500-sysctrl.c | 14 +- + drivers/mfd/arizona-irq.c | 86 +++-- + drivers/mfd/arizona.h | 2 - + drivers/mfd/axp20x.c | 78 +++- + drivers/mfd/cros_ec.c | 53 +++ + drivers/mfd/intel-lpss-pci.c | 17 +- + drivers/mfd/max77686.c | 25 +- + drivers/mfd/motorola-cpcap.c | 259 +++++++++++++ + drivers/mfd/mt6397-core.c | 4 + + drivers/mfd/stm32-timers.c | 80 ++++ + drivers/mfd/sun6i-prcm.c | 13 + + drivers/mfd/tps65912-i2c.c | 1 + + drivers/platform/chrome/cros_ec_proto.c | 5 + + drivers/power/supply/axp288_charger.c | 132 ++++--- + drivers/power/supply/axp288_fuel_gauge.c | 405 ++------------------- + drivers/pwm/Kconfig | 9 + + drivers/pwm/Makefile | 1 + + drivers/pwm/pwm-stm32.c | 397 ++++++++++++++++++++ + include/linux/iio/timer/stm32-timer-trigger.h | 62 ++++ + include/linux/mfd/abx500.h | 2 +- + include/linux/mfd/abx500/ab8500-bm.h | 4 +- + include/linux/mfd/axp20x.h | 49 +-- + include/linux/mfd/cros_ec.h | 2 + + include/linux/mfd/cros_ec_commands.h | 87 ++++- + include/linux/mfd/motorola-cpcap.h | 292 +++++++++++++++ + include/linux/mfd/stm32-timers.h | 71 ++++ + 42 files changed, 2316 insertions(+), 551 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-timer-stm32 + create mode 100644 Documentation/devicetree/bindings/iio/timer/stm32-timer-trigger.txt + create mode 100644 Documentation/devicetree/bindings/mfd/aspeed-gfx.txt + create mode 100644 Documentation/devicetree/bindings/mfd/aspeed-lpc.txt + create mode 100644 Documentation/devicetree/bindings/mfd/motorola-cpcap.txt + create mode 100644 Documentation/devicetree/bindings/mfd/stm32-timers.txt + create mode 100644 Documentation/devicetree/bindings/pwm/pwm-stm32.txt + create mode 100644 drivers/iio/trigger/stm32-timer-trigger.c + create mode 100644 drivers/mfd/motorola-cpcap.c + create mode 100644 drivers/mfd/stm32-timers.c + create mode 100644 drivers/pwm/pwm-stm32.c + create mode 100644 include/linux/iio/timer/stm32-timer-trigger.h + create mode 100644 include/linux/mfd/motorola-cpcap.h + create mode 100644 include/linux/mfd/stm32-timers.h +Merging backlight/for-backlight-next (80e5d455339a MAINTAINERS: Rework entry for Backlight) +$ git merge backlight/for-backlight-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 5 ++- + drivers/video/backlight/adp5520_bl.c | 12 ++++++-- + drivers/video/backlight/da9052_bl.c | 2 +- + drivers/video/backlight/lcd.c | 4 +-- + drivers/video/backlight/pwm_bl.c | 60 ++++++++++++++++++++++++------------ + 5 files changed, 58 insertions(+), 25 deletions(-) +Merging battery/for-next (744cc304a18f power: supply: add AC power supply driver for AXP20X and AXP22X PMICs) +$ git merge battery/for-next +Auto-merging include/linux/mfd/axp20x.h +Removing drivers/power/supply/intel_mid_battery.c +Merge made by the 'recursive' strategy. + .../bindings/power/supply/axp20x_ac_power.txt | 22 + + .../devicetree/bindings/power/supply/bq27xxx.txt | 36 + + .../devicetree/bindings/power/supply/qcom_smbb.txt | 19 + + .../bindings/power/supply/sbs_sbs-charger.txt | 23 + + .../bindings/power/supply/ti,bq24735.txt | 8 +- + .../bindings/power_supply/maxim,max14656.txt | 25 + + drivers/power/reset/Kconfig | 2 +- + drivers/power/reset/at91-poweroff.c | 54 +- + drivers/power/reset/at91-reset.c | 18 +- + drivers/power/reset/at91-sama5d2_shdwc.c | 49 +- + drivers/power/supply/Kconfig | 36 +- + drivers/power/supply/Makefile | 4 +- + drivers/power/supply/ab8500_btemp.c | 16 +- + drivers/power/supply/axp20x_ac_power.c | 253 +++++++ + drivers/power/supply/axp20x_usb_power.c | 187 ++++- + drivers/power/supply/axp288_charger.c | 277 +++---- + drivers/power/supply/axp288_fuel_gauge.c | 134 ++-- + drivers/power/supply/bq2415x_charger.c | 5 + + drivers/power/supply/bq24190_charger.c | 188 ++--- + drivers/power/supply/bq24735-charger.c | 108 ++- + drivers/power/supply/bq27xxx_battery.c | 356 ++++++++- + drivers/power/supply/bq27xxx_battery_i2c.c | 22 +- + drivers/power/supply/gpio-charger.c | 84 ++- + drivers/power/supply/intel_mid_battery.c | 795 --------------------- + drivers/power/supply/max14656_charger_detector.c | 327 +++++++++ + drivers/power/supply/max8997_charger.c | 15 +- + drivers/power/supply/pcf50633-charger.c | 13 +- + drivers/power/supply/qcom_smbb.c | 72 +- + drivers/power/supply/sbs-charger.c | 274 +++++++ + drivers/power/supply/tps65217_charger.c | 99 +-- + drivers/power/supply/wm97xx_battery.c | 5 - + include/linux/mfd/axp20x.h | 2 +- + include/linux/power/bq27xxx_battery.h | 12 +- + include/soc/at91/at91sam9_ddrsdr.h | 3 + + 34 files changed, 2184 insertions(+), 1359 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/supply/axp20x_ac_power.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/bq27xxx.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/sbs_sbs-charger.txt + create mode 100644 Documentation/devicetree/bindings/power_supply/maxim,max14656.txt + create mode 100644 drivers/power/supply/axp20x_ac_power.c + delete mode 100644 drivers/power/supply/intel_mid_battery.c + create mode 100644 drivers/power/supply/max14656_charger_detector.c + create mode 100644 drivers/power/supply/sbs-charger.c +Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (3761de31e8aa Merge remote-tracking branches 'regulator/topic/s2mpa01', 'regulator/topic/supplies' and 'regulator/topic/tps65217' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + .../bindings/regulator/anatop-regulator.txt | 1 + + .../bindings/regulator/cpcap-regulator.txt | 34 ++ + .../bindings/regulator/gpio-regulator.txt | 2 +- + .../bindings/regulator/qcom,smd-rpm-regulator.txt | 56 +++ + drivers/regulator/88pm800.c | 4 +- + drivers/regulator/88pm8607.c | 4 +- + drivers/regulator/Kconfig | 7 + + drivers/regulator/Makefile | 1 + + drivers/regulator/aat2870-regulator.c | 2 +- + drivers/regulator/act8945a-regulator.c | 2 +- + drivers/regulator/ad5398.c | 2 +- + drivers/regulator/anatop-regulator.c | 12 + + drivers/regulator/arizona-ldo1.c | 4 +- + drivers/regulator/arizona-micsupp.c | 8 +- + drivers/regulator/as3711-regulator.c | 6 +- + drivers/regulator/axp20x-regulator.c | 8 +- + drivers/regulator/bcm590xx-regulator.c | 6 +- + drivers/regulator/core.c | 158 +++---- + drivers/regulator/cpcap-regulator.c | 464 +++++++++++++++++++++ + drivers/regulator/devres.c | 66 ++- + drivers/regulator/fan53555.c | 2 +- + drivers/regulator/hi655x-regulator.c | 4 +- + drivers/regulator/internal.h | 10 + + drivers/regulator/lp8755.c | 2 +- + drivers/regulator/ltc3589.c | 8 +- + drivers/regulator/ltc3676.c | 6 +- + drivers/regulator/max14577-regulator.c | 6 +- + drivers/regulator/max77620-regulator.c | 2 +- + drivers/regulator/max77686-regulator.c | 8 +- + drivers/regulator/max77693-regulator.c | 2 +- + drivers/regulator/max77802-regulator.c | 10 +- + drivers/regulator/max8907-regulator.c | 10 +- + drivers/regulator/max8925-regulator.c | 4 +- + drivers/regulator/max8952.c | 2 +- + drivers/regulator/palmas-regulator.c | 24 +- + drivers/regulator/pbias-regulator.c | 2 +- + drivers/regulator/pcap-regulator.c | 2 +- + drivers/regulator/pcf50633-regulator.c | 2 +- + drivers/regulator/pfuze100-regulator.c | 8 +- + drivers/regulator/pv88060-regulator.c | 4 +- + drivers/regulator/pv88080-regulator.c | 4 +- + drivers/regulator/pv88090-regulator.c | 4 +- + drivers/regulator/qcom_smd-regulator.c | 102 +++++ + drivers/regulator/rc5t583-regulator.c | 2 +- + drivers/regulator/rn5t618-regulator.c | 2 +- + drivers/regulator/s2mpa01.c | 4 +- + drivers/regulator/tps65217-regulator.c | 6 +- + 47 files changed, 892 insertions(+), 197 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/cpcap-regulator.txt + create mode 100644 drivers/regulator/cpcap-regulator.c +Merging security/next (52176603795c KEYS: Use memzero_explicit() for secret data) +$ git merge security/next +Auto-merging security/selinux/hooks.c +Removing security/apparmor/sid.c +Auto-merging security/apparmor/include/secid.h +Auto-merging fs/proc/base.c +Auto-merging drivers/char/tpm/tpm1_eventlog.c +Merge made by the 'recursive' strategy. + Documentation/security/LSM.txt | 7 + + drivers/char/tpm/Kconfig | 1 + + drivers/char/tpm/Makefile | 2 +- + drivers/char/tpm/st33zp24/st33zp24.c | 1 - + drivers/char/tpm/tpm-chip.c | 8 +- + drivers/char/tpm/tpm-dev.c | 5 +- + drivers/char/tpm/tpm-interface.c | 173 +++-- + drivers/char/tpm/tpm-sysfs.c | 28 +- + drivers/char/tpm/tpm.h | 46 +- + .../char/tpm/{tpm_eventlog.c => tpm1_eventlog.c} | 35 +- + drivers/char/tpm/tpm2-cmd.c | 340 ++++++--- + drivers/char/tpm/tpm2_eventlog.c | 203 +++++ + drivers/char/tpm/tpm_acpi.c | 3 + + drivers/char/tpm/tpm_atmel.h | 6 + + drivers/char/tpm/tpm_crb.c | 8 +- + drivers/char/tpm/tpm_eventlog.h | 51 +- + drivers/char/tpm/tpm_ibmvtpm.c | 106 +-- + drivers/char/tpm/tpm_nsc.c | 12 + + drivers/char/tpm/tpm_of.c | 27 +- + drivers/char/tpm/tpm_tis.c | 2 +- + drivers/char/tpm/tpm_tis_core.c | 30 +- + drivers/char/tpm/tpm_tis_core.h | 2 +- + drivers/char/tpm/tpm_tis_spi.c | 1 - + drivers/char/tpm/tpm_vtpm_proxy.c | 48 +- + fs/proc/base.c | 13 +- + include/linux/lsm_hooks.h | 25 +- + include/linux/security.h | 10 +- + kernel/exit.c | 19 +- + kernel/seccomp.c | 29 +- + samples/seccomp/bpf-helper.h | 125 ++-- + scripts/sign-file.c | 4 +- + security/apparmor/Kconfig | 31 +- + security/apparmor/Makefile | 2 +- + security/apparmor/apparmorfs.c | 681 ++++++++++++++--- + security/apparmor/audit.c | 98 +-- + security/apparmor/capability.c | 26 +- + security/apparmor/context.c | 107 +-- + security/apparmor/crypto.c | 39 +- + security/apparmor/domain.c | 137 ++-- + security/apparmor/file.c | 80 +- + security/apparmor/include/apparmor.h | 82 +- + security/apparmor/include/apparmorfs.h | 21 +- + security/apparmor/include/audit.h | 152 ++-- + security/apparmor/include/context.h | 84 ++- + security/apparmor/include/crypto.h | 5 + + security/apparmor/include/domain.h | 4 +- + security/apparmor/include/file.h | 9 +- + security/apparmor/include/lib.h | 200 +++++ + security/apparmor/include/match.h | 26 +- + security/apparmor/include/path.h | 53 ++ + security/apparmor/include/policy.h | 199 ++--- + security/apparmor/include/policy_ns.h | 147 ++++ + security/apparmor/include/policy_unpack.h | 28 +- + security/apparmor/include/{sid.h => secid.h} | 18 +- + security/apparmor/ipc.c | 18 +- + security/apparmor/lib.c | 111 ++- + security/apparmor/lsm.c | 327 +++++--- + security/apparmor/match.c | 47 +- + security/apparmor/nulldfa.in | 1 + + security/apparmor/policy.c | 824 ++++++++------------- + security/apparmor/policy_ns.c | 346 +++++++++ + security/apparmor/policy_unpack.c | 257 +++++-- + security/apparmor/procattr.c | 38 +- + security/apparmor/resource.c | 19 +- + security/apparmor/secid.c | 55 ++ + security/apparmor/sid.c | 55 -- + security/commoncap.c | 3 +- + security/inode.c | 26 +- + security/integrity/ima/ima.h | 2 +- + security/integrity/ima/ima_api.c | 23 +- + security/integrity/ima/ima_main.c | 14 +- + security/keys/encrypted-keys/encrypted.c | 4 +- + security/loadpin/loadpin.c | 2 +- + security/security.c | 48 +- + security/selinux/hooks.c | 381 +++++----- + security/selinux/include/classmap.h | 62 ++ + security/selinux/include/objsec.h | 10 + + security/selinux/include/security.h | 3 +- + security/selinux/selinuxfs.c | 98 ++- + security/selinux/ss/services.c | 3 + + security/smack/smack.h | 3 + + security/smack/smack_lsm.c | 147 ++-- + security/smack/smackfs.c | 5 + + security/tomoyo/tomoyo.c | 2 +- + security/yama/yama_lsm.c | 2 +- + 85 files changed, 4284 insertions(+), 2251 deletions(-) + rename drivers/char/tpm/{tpm_eventlog.c => tpm1_eventlog.c} (95%) + create mode 100644 drivers/char/tpm/tpm2_eventlog.c + create mode 100644 security/apparmor/include/lib.h + create mode 100644 security/apparmor/include/policy_ns.h + rename security/apparmor/include/{sid.h => secid.h} (50%) + create mode 100644 security/apparmor/nulldfa.in + create mode 100644 security/apparmor/policy_ns.c + create mode 100644 security/apparmor/secid.c + delete mode 100644 security/apparmor/sid.c +$ git am -3 ../patches/0001-selinux-merge-fix-for-smc-establish-new-socket-famil.patch +Applying: selinux: merge fix for "smc: establish new socket family" +$ git reset HEAD^ +Unstaged changes after reset: +M security/selinux/hooks.c +M security/selinux/include/classmap.h +$ git add -A . +$ git commit -v -a --amend +[master 80fbaf92e0df] Merge remote-tracking branch 'security/next' + Date: Fri Feb 10 13:30:16 2017 +1100 +Merging integrity/next (20f482ab9e0f ima: allow to check MAY_APPEND) +$ git merge integrity/next +Already up-to-date. +Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next) +$ git merge keys/keys-next +Auto-merging security/keys/keyctl.c +Auto-merging crypto/asymmetric_keys/x509_cert_parser.c +Auto-merging crypto/asymmetric_keys/public_key.c +Merge made by the 'recursive' strategy. + Documentation/crypto/asymmetric-keys.txt | 26 ++- + Documentation/security/keys.txt | 217 ++++++++++++++++++++ + certs/Kconfig | 18 ++ + certs/Makefile | 6 + + certs/blacklist.c | 174 ++++++++++++++++ + certs/blacklist.h | 3 + + certs/blacklist_hashes.c | 6 + + certs/blacklist_nohashes.c | 5 + + crypto/asymmetric_keys/Kconfig | 10 + + crypto/asymmetric_keys/Makefile | 13 ++ + crypto/asymmetric_keys/asymmetric_keys.h | 3 + + crypto/asymmetric_keys/asymmetric_type.c | 59 +++++- + crypto/asymmetric_keys/pkcs7_parser.c | 1 + + crypto/asymmetric_keys/pkcs7_parser.h | 1 + + crypto/asymmetric_keys/pkcs7_verify.c | 32 ++- + crypto/asymmetric_keys/pkcs8.asn1 | 24 +++ + crypto/asymmetric_keys/pkcs8_parser.c | 184 +++++++++++++++++ + crypto/asymmetric_keys/public_key.c | 195 ++++++++++++++++-- + crypto/asymmetric_keys/signature.c | 95 +++++++++ + crypto/asymmetric_keys/x509_cert_parser.c | 21 +- + crypto/asymmetric_keys/x509_parser.h | 1 + + crypto/asymmetric_keys/x509_public_key.c | 15 ++ + include/crypto/public_key.h | 14 +- + include/keys/asymmetric-subtype.h | 9 + + include/keys/system_keyring.h | 12 ++ + include/linux/key-type.h | 11 + + include/linux/keyctl.h | 46 +++++ + include/uapi/linux/keyctl.h | 30 +++ + security/keys/Makefile | 1 + + security/keys/compat.c | 18 ++ + security/keys/internal.h | 39 ++++ + security/keys/keyctl.c | 24 +++ + security/keys/keyctl_pkey.c | 323 ++++++++++++++++++++++++++++++ + 33 files changed, 1584 insertions(+), 52 deletions(-) + create mode 100644 certs/blacklist.c + create mode 100644 certs/blacklist.h + create mode 100644 certs/blacklist_hashes.c + create mode 100644 certs/blacklist_nohashes.c + create mode 100644 crypto/asymmetric_keys/pkcs8.asn1 + create mode 100644 crypto/asymmetric_keys/pkcs8_parser.c + create mode 100644 include/linux/keyctl.h + create mode 100644 security/keys/keyctl_pkey.c +Merging selinux/next (1ea0ce40690d selinux: allow changing labels for cgroupfs) +$ git merge selinux/next +Already up-to-date. +Merging tpmdd/next (d554626be919 tpm xen: drop unneeded chip variable) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + drivers/char/tpm/tpm-interface.c | 2 +- + drivers/char/tpm/tpm_tis.c | 2 +- + drivers/char/tpm/xen-tpmfront.c | 2 -- + 3 files changed, 2 insertions(+), 4 deletions(-) +Merging watchdog/master (7ce7d89f4883 Linux 4.10-rc1) +$ git merge watchdog/master +Already up-to-date. +Merging iommu/next (0e4b8ec58c3d Merge branches 'iommu/fixes', 'arm/exynos', 'arm/renesas', 'arm/smmu', 'arm/mediatek', 'arm/core', 'x86/vt-d' and 'core' into next) +$ git merge iommu/next +Auto-merging arch/arm64/mm/dma-mapping.c +Auto-merging arch/arm/mm/dma-mapping.c +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-kernel-iommu_groups | 12 ++ + Documentation/DMA-attributes.txt | 10 + + arch/arm/mm/dma-mapping.c | 60 +++--- + arch/arm64/mm/dma-mapping.c | 7 +- + drivers/dma/pl330.c | 5 +- + drivers/iommu/Kconfig | 3 - + drivers/iommu/amd_iommu.c | 54 +++-- + drivers/iommu/amd_iommu_init.c | 2 +- + drivers/iommu/arm-smmu-v3.c | 68 ++++--- + drivers/iommu/arm-smmu.c | 104 +++++++--- + drivers/iommu/dma-iommu.c | 183 ++++++++++++----- + drivers/iommu/exynos-iommu.c | 41 +++- + drivers/iommu/intel-iommu.c | 97 +++++++-- + drivers/iommu/io-pgtable-arm-v7s.c | 6 +- + drivers/iommu/io-pgtable-arm.c | 5 +- + drivers/iommu/iommu.c | 217 ++++++++++++++++++--- + drivers/iommu/iova.c | 23 ++- + drivers/iommu/ipmmu-vmsa.c | 2 + + drivers/iommu/msm_iommu.c | 2 +- + drivers/iommu/mtk_iommu.c | 2 +- + drivers/iommu/of_iommu.c | 4 +- + drivers/irqchip/irq-gic-v3-its.c | 1 + + drivers/vfio/vfio_iommu_type1.c | 37 +++- + include/linux/dma-iommu.h | 10 +- + include/linux/dma-mapping.h | 7 + + include/linux/intel-iommu.h | 14 +- + include/linux/iommu.h | 53 +++-- + include/linux/irqdomain.h | 36 ++++ + include/linux/of_iommu.h | 11 -- + kernel/irq/irqdomain.c | 39 ++++ + kernel/irq/msi.c | 4 +- + 31 files changed, 855 insertions(+), 264 deletions(-) +Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (d88423f7844e vfio: Fix build break when SPAPR_TCE_IOMMU=n) +$ git merge vfio/next +Merge made by the 'recursive' strategy. + drivers/vfio/Kconfig | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) +Merging trivial/for-next (74dcba3589fc NTB: correct ntb_spad_count comment typo) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/next (62bc306e2083 audit: log 32-bit socketcalls) +$ git merge audit/next +Resolved 'include/uapi/linux/audit.h' using previous resolution. +Auto-merging net/compat.c +Auto-merging kernel/auditsc.c +Auto-merging kernel/audit.c +Auto-merging include/uapi/linux/audit.h +CONFLICT (content): Merge conflict in include/uapi/linux/audit.h +Auto-merging include/linux/audit.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2a9bcff7f0d3] Merge remote-tracking branch 'audit/next' +$ git diff -M --stat --summary HEAD^.. + include/linux/audit.h | 20 ++++++++++++++++++++ + include/uapi/linux/audit.h | 6 +++++- + kernel/audit.c | 12 ++++++++++-- + kernel/auditsc.c | 2 +- + net/compat.c | 17 ++++++++++++++--- + 5 files changed, 50 insertions(+), 7 deletions(-) +Merging devicetree/for-next (bd0096d7467f of: Add missing space at end of pr_fmt().) +$ git merge devicetree/for-next +Auto-merging drivers/of/fdt.c +Auto-merging drivers/of/base.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/devicetree/bindings/display/exynos/exynos7-decon.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/bus/qcom,ebi2.txt | 6 +- + .../bindings/clock/mvebu-gated-clock.txt | 2 +- + .../devicetree/bindings/display/arm,pl11x.txt | 2 +- + .../bindings/display/bridge/analogix_dp.txt | 2 +- + .../bindings/{video => display}/bridge/anx7814.txt | 0 + .../{video => display}/bridge/sil-sii8620.txt | 0 + .../bindings/display/cirrus,clps711x-fb.txt | 2 +- + .../bindings/display/exynos/exynos7-decon.txt | 2 +- + .../bindings/display/exynos/samsung-fimd.txt | 2 +- + .../devicetree/bindings/display/imx/fsl,imx-fb.txt | 2 +- + .../devicetree/bindings/display/imx/ldb.txt | 2 +- + .../bindings/display/mediatek/mediatek,disp.txt | 2 +- + .../devicetree/bindings/display/msm/dsi.txt | 2 +- + .../devicetree/bindings/display/msm/edp.txt | 2 +- + .../devicetree/bindings/display/msm/hdmi.txt | 2 +- + .../bindings/display/panel/panel-dpi.txt | 2 +- + .../bindings/display/panel/samsung,ld9040.txt | 2 +- + .../bindings/display/panel/samsung,s6e8aa0.txt | 2 +- + .../display/rockchip/analogix_dp-rockchip.txt | 2 +- + .../devicetree/bindings/display/tilcdc/panel.txt | 2 +- + .../devicetree/bindings/iommu/arm,smmu.txt | 10 +- + Documentation/devicetree/bindings/mfd/as3722.txt | 3 +- + .../devicetree/bindings/mfd/omap-usb-host.txt | 4 +- + .../devicetree/bindings/net/marvell-pp2.txt | 4 +- + .../devicetree/bindings/pci/pci-iommu.txt | 6 +- + .../bindings/power/reset/gpio-poweroff.txt | 10 +- + .../bindings/power/reset/qnap-poweroff.txt | 3 +- + .../devicetree/bindings/serial/fsl-imx-uart.txt | 4 +- + .../devicetree/bindings/soc/fsl/qman-portals.txt | 20 - + Documentation/devicetree/bindings/usb/dwc3-st.txt | 4 +- + .../devicetree/bindings/usb/ehci-omap.txt | 1 - + Documentation/devicetree/bindings/usb/ehci-st.txt | 2 +- + .../devicetree/bindings/usb/mt8173-mtu3.txt | 2 +- + .../devicetree/bindings/usb/mt8173-xhci.txt | 4 +- + .../devicetree/bindings/usb/qcom,dwc3.txt | 2 +- + .../devicetree/bindings/vendor-prefixes.txt | 1 + + drivers/of/base.c | 3 + + drivers/of/fdt.c | 2 +- + drivers/of/irq.c | 19 +- + drivers/of/of_pci_irq.c | 10 +- + drivers/of/of_reserved_mem.c | 4 + + drivers/of/overlay.c | 2 - + drivers/of/platform.c | 2 +- + drivers/of/resolver.c | 1 - + drivers/of/unittest.c | 5 +- + include/linux/of_device.h | 1 - + scripts/dtc/checks.c | 349 +++++----- + scripts/dtc/dtc-lexer.l | 21 +- + scripts/dtc/dtc-lexer.lex.c_shipped | 650 +++++++++--------- + scripts/dtc/dtc-parser.tab.c_shipped | 752 +++++++++++---------- + scripts/dtc/dtc-parser.tab.h_shipped | 54 +- + scripts/dtc/dtc-parser.y | 34 +- + scripts/dtc/dtc.c | 69 +- + scripts/dtc/dtc.h | 39 +- + scripts/dtc/flattree.c | 41 +- + scripts/dtc/fstree.c | 5 +- + scripts/dtc/libfdt/Makefile.libfdt | 2 +- + scripts/dtc/libfdt/fdt_ro.c | 30 +- + scripts/dtc/libfdt/fdt_rw.c | 6 +- + scripts/dtc/libfdt/fdt_strerror.c | 6 + + scripts/dtc/libfdt/fdt_wip.c | 29 +- + scripts/dtc/libfdt/libfdt.h | 210 +++++- + scripts/dtc/libfdt/libfdt_env.h | 1 + + scripts/dtc/livetree.c | 299 +++++++- + scripts/dtc/srcpos.c | 35 +- + scripts/dtc/srcpos.h | 1 - + scripts/dtc/treesource.c | 14 +- + scripts/dtc/util.c | 30 + + scripts/dtc/util.h | 1 + + scripts/dtc/version_gen.h | 2 +- + 70 files changed, 1742 insertions(+), 1107 deletions(-) + rename Documentation/devicetree/bindings/{video => display}/bridge/anx7814.txt (100%) + rename Documentation/devicetree/bindings/{video => display}/bridge/sil-sii8620.txt (100%) +Merging mailbox/mailbox-for-next (db4d22c07e3e mailbox: mailbox-test: allow reserved areas in SRAM) +$ git merge mailbox/mailbox-for-next +Already up-to-date. +Merging spi/for-next (6160be71baba Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/sh-msiof', 'spi/topic/slave' and 'spi/topic/topcliff-pch' into spi-next) +$ git merge spi/for-next +Auto-merging drivers/spi/spi.c +Auto-merging drivers/spi/spi-bcm-qspi.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/spi-rockchip.txt | 7 ++ + drivers/spi/Kconfig | 5 +- + drivers/spi/spi-armada-3700.c | 13 ++- + drivers/spi/spi-ath79.c | 23 ++-- + drivers/spi/spi-bcm-qspi.c | 116 +++++++++++++++------ + drivers/spi/spi-bcm53xx.c | 18 ++-- + drivers/spi/spi-dw.c | 8 +- + drivers/spi/spi-dw.h | 1 - + drivers/spi/spi-fsl-lpspi.c | 8 +- + drivers/spi/spi-fsl-spi.c | 17 +-- + drivers/spi/spi-imx.c | 16 +-- + drivers/spi/spi-mpc52xx.c | 12 +-- + drivers/spi/spi-mt65xx.c | 37 ++++++- + drivers/spi/spi-ppc4xx.c | 7 +- + drivers/spi/spi-pxa2xx-pci.c | 32 +++++- + drivers/spi/spi-pxa2xx.c | 36 ++++--- + drivers/spi/spi-rockchip.c | 5 + + drivers/spi/spi-rspi.c | 4 +- + drivers/spi/spi-s3c64xx.c | 57 +++++----- + drivers/spi/spi-sh-msiof.c | 4 +- + drivers/spi/spi-topcliff-pch.c | 31 +++--- + drivers/spi/spi.c | 78 ++++++++------ + include/linux/pxa2xx_ssp.h | 14 +-- + 23 files changed, 349 insertions(+), 200 deletions(-) +Merging tip/auto-latest (5bf728f02218 Merge branch 'x86/platform') +$ git merge tip/auto-latest +Resolved 'drivers/gpu/drm/ttm/ttm_bo.c' using previous resolution. +Resolved 'security/apparmor/include/apparmor.h' using previous resolution. +Auto-merging tools/perf/util/scripting-engines/trace-event-perl.c +Auto-merging security/apparmor/include/policy.h +Auto-merging security/apparmor/include/apparmor.h +CONFLICT (content): Merge conflict in security/apparmor/include/apparmor.h +Auto-merging net/sunrpc/xprtrdma/svc_rdma_transport.c +Auto-merging net/sunrpc/cache.c +Auto-merging net/ceph/messenger.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/exit.c +Auto-merging init/main.c +Auto-merging include/linux/sunrpc/cache.h +Auto-merging include/linux/kref.h +Removing include/linux/intel_pmic_gpio.h +Auto-merging include/drm/ttm/ttm_bo_driver.h +Auto-merging include/drm/ttm/ttm_bo_api.h +Auto-merging include/drm/drm_framebuffer.h +Auto-merging fs/proc/base.c +Auto-merging fs/jbd2/journal.c +Auto-merging drivers/usb/gadget/function/f_fs.c +Removing drivers/platform/x86/intel_pmic_gpio.c +Auto-merging drivers/platform/x86/Makefile +Auto-merging drivers/platform/x86/Kconfig +Auto-merging drivers/md/dm-crypt.c +Auto-merging drivers/infiniband/hw/usnic/usnic_ib_verbs.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_bo.c +Auto-merging drivers/gpu/drm/msm/msm_gem.c +Auto-merging drivers/gpu/drm/i915/i915_gem_object.h +Auto-merging drivers/gpu/drm/drm_mode_object.c +Auto-merging drivers/gpu/drm/drm_gem_cma_helper.c +Auto-merging drivers/block/virtio_blk.c +Auto-merging drivers/block/rbd.c +Auto-merging drivers/block/drbd/drbd_req.c +Auto-merging drivers/block/drbd/drbd_main.c +Removing arch/x86/platform/intel-mid/device_libs/platform_pmic_gpio.c +Removing arch/x86/platform/intel-mid/device_libs/platform_ipc.h +Removing arch/x86/platform/intel-mid/device_libs/platform_ipc.c +Auto-merging arch/x86/kernel/cpu/mcheck/mce.c +Auto-merging arch/x86/kernel/apic/io_apic.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/powerpc/xmon/xmon.c +Auto-merging arch/powerpc/kernel/asm-offsets.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6daee307c997] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/locking/ww-mutex-design.txt | 12 +- + Documentation/scheduler/sched-deadline.txt | 6 + + Documentation/scheduler/sched-rt-group.txt | 8 +- + Documentation/x86/intel_rdt_ui.txt | 114 ++++ + arch/ia64/include/asm/thread_info.h | 6 + + arch/ia64/kernel/setup.c | 2 + + arch/ia64/kernel/time.c | 66 ++- + arch/parisc/kernel/setup.c | 2 + + arch/powerpc/include/asm/accounting.h | 14 +- + arch/powerpc/include/asm/paca.h | 1 - + arch/powerpc/kernel/asm-offsets.c | 8 +- + arch/powerpc/kernel/time.c | 138 +++-- + arch/powerpc/xmon/xmon.c | 8 +- + arch/s390/include/asm/lowcore.h | 65 ++- + arch/s390/include/asm/processor.h | 3 + + arch/s390/kernel/vtime.c | 138 +++-- + arch/tile/include/asm/Kbuild | 1 - + arch/tile/include/asm/div64.h | 14 + + arch/um/drivers/random.c | 2 +- + arch/x86/Kconfig | 2 +- + arch/x86/boot/boot.h | 1 + + arch/x86/boot/compressed/kaslr.c | 140 ++++- + arch/x86/boot/string.c | 13 + + arch/x86/events/Makefile | 13 +- + arch/x86/events/amd/Makefile | 7 + + arch/x86/events/amd/uncore.c | 204 ++++--- + arch/x86/include/asm/apic.h | 2 +- + arch/x86/include/asm/cpufeatures.h | 4 +- + arch/x86/include/asm/div64.h | 11 + + arch/x86/include/asm/e820.h | 2 - + arch/x86/include/asm/fpu/internal.h | 10 + + arch/x86/include/asm/intel-mid.h | 5 +- + arch/x86/include/asm/io.h | 46 +- + arch/x86/include/asm/mce.h | 20 +- + arch/x86/include/asm/microcode.h | 9 +- + arch/x86/include/asm/microcode_amd.h | 2 - + arch/x86/include/asm/msr.h | 51 +- + arch/x86/include/asm/pgtable_32.h | 32 + + arch/x86/include/asm/spinlock.h | 3 - + arch/x86/kernel/apic/apic.c | 39 +- + arch/x86/kernel/apic/io_apic.c | 4 +- + arch/x86/kernel/apic/vector.c | 2 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 30 +- + arch/x86/kernel/cpu/amd.c | 6 +- + arch/x86/kernel/cpu/centaur.c | 6 +- + arch/x86/kernel/cpu/common.c | 37 +- + arch/x86/kernel/cpu/cyrix.c | 2 + + arch/x86/kernel/cpu/intel.c | 6 +- + arch/x86/kernel/cpu/mcheck/mce-apei.c | 5 +- + arch/x86/kernel/cpu/mcheck/mce-genpool.c | 2 +- + arch/x86/kernel/cpu/mcheck/mce-inject.c | 5 +- + arch/x86/kernel/cpu/mcheck/mce-internal.h | 2 +- + arch/x86/kernel/cpu/mcheck/mce.c | 57 +- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 13 +- + arch/x86/kernel/cpu/mcheck/therm_throt.c | 36 +- + arch/x86/kernel/cpu/mcheck/threshold.c | 4 +- + arch/x86/kernel/cpu/microcode/amd.c | 501 +++++----------- + arch/x86/kernel/cpu/microcode/core.c | 81 ++- + arch/x86/kernel/cpu/transmeta.c | 3 + + arch/x86/kernel/e820.c | 22 +- + arch/x86/kernel/fpu/core.c | 9 +- + arch/x86/kernel/fpu/init.c | 29 +- + arch/x86/kernel/fpu/xstate.c | 9 +- + arch/x86/kernel/head32.c | 62 ++ + arch/x86/kernel/head_32.S | 121 +--- + arch/x86/kernel/irq.c | 4 +- + arch/x86/kernel/irq_work.c | 5 +- + arch/x86/kernel/itmt.c | 6 +- + arch/x86/kernel/jump_label.c | 3 +- + arch/x86/kernel/kvm.c | 14 - + arch/x86/kernel/kvmclock.c | 2 +- + arch/x86/kernel/paravirt-spinlocks.c | 3 - + arch/x86/kernel/setup.c | 4 +- + arch/x86/kernel/smp.c | 15 +- + arch/x86/kernel/tsc.c | 11 + + arch/x86/lib/delay.c | 4 +- + arch/x86/platform/intel-mid/device_libs/Makefile | 3 +- + .../intel-mid/device_libs/platform_gpio_keys.c | 3 + + .../platform/intel-mid/device_libs/platform_ipc.c | 68 --- + .../platform/intel-mid/device_libs/platform_ipc.h | 18 - + .../intel-mid/device_libs/platform_mrfld_rtc.c | 48 ++ + .../intel-mid/device_libs/platform_mrfld_wdt.c | 12 +- + .../intel-mid/device_libs/platform_msic_audio.c | 3 +- + .../intel-mid/device_libs/platform_msic_battery.c | 3 +- + .../intel-mid/device_libs/platform_msic_gpio.c | 3 +- + .../intel-mid/device_libs/platform_msic_ocd.c | 3 +- + .../device_libs/platform_msic_power_btn.c | 3 +- + .../intel-mid/device_libs/platform_msic_thermal.c | 3 +- + .../intel-mid/device_libs/platform_pmic_gpio.c | 54 -- + arch/x86/platform/intel-mid/mrfld.c | 1 + + arch/x86/platform/intel-mid/sfi.c | 58 +- + arch/x86/ras/Kconfig | 2 +- + arch/x86/xen/spinlock.c | 19 - + drivers/acpi/acpi_extlog.c | 1 + + drivers/acpi/nfit/mce.c | 1 + + drivers/base/platform-msi.c | 2 +- + drivers/block/drbd/drbd_bitmap.c | 2 +- + drivers/block/drbd/drbd_main.c | 7 +- + drivers/block/drbd/drbd_req.c | 31 +- + drivers/block/rbd.c | 8 +- + drivers/block/virtio_blk.c | 2 +- + drivers/edac/i7core_edac.c | 1 + + drivers/edac/mce_amd.c | 8 +- + drivers/edac/mce_amd.h | 1 - + drivers/edac/sb_edac.c | 3 +- + drivers/edac/skx_edac.c | 3 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 2 +- + drivers/gpu/drm/drm_info.c | 2 +- + drivers/gpu/drm/drm_mode_object.c | 4 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 2 +- + drivers/gpu/drm/i915/i915_gem_object.h | 2 +- + drivers/gpu/drm/msm/msm_gem.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_fence.c | 2 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 63 +- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 4 +- + drivers/gpu/drm/ttm/ttm_object.c | 2 +- + drivers/infiniband/hw/cxgb3/iwch_cm.h | 6 +- + drivers/infiniband/hw/cxgb3/iwch_qp.c | 2 +- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 6 +- + drivers/infiniband/hw/cxgb4/qp.c | 2 +- + drivers/infiniband/hw/usnic/usnic_ib_sysfs.c | 6 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 4 +- + drivers/md/dm-bufio.c | 2 +- + drivers/md/dm-crypt.c | 4 +- + drivers/md/persistent-data/dm-block-manager.c | 4 +- + drivers/misc/genwqe/card_dev.c | 2 +- + drivers/misc/mei/debugfs.c | 2 +- + drivers/pci/hotplug/pnv_php.c | 2 +- + drivers/pci/slot.c | 2 +- + drivers/platform/x86/Kconfig | 7 - + drivers/platform/x86/Makefile | 1 - + drivers/platform/x86/intel_pmic_gpio.c | 326 ----------- + drivers/scsi/bnx2fc/bnx2fc_io.c | 8 +- + drivers/scsi/cxgbi/libcxgbi.h | 4 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 2 +- + drivers/scsi/lpfc/lpfc_els.c | 2 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 40 +- + drivers/scsi/lpfc/lpfc_init.c | 3 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 4 +- + drivers/staging/android/ion/ion.c | 2 +- + drivers/staging/comedi/comedi_buf.c | 2 +- + .../staging/lustre/lnet/libcfs/linux/linux-debug.c | 2 +- + drivers/target/target_core_pr.c | 10 +- + drivers/target/tcm_fc/tfc_sess.c | 2 +- + drivers/tty/tty_ldsem.c | 18 +- + drivers/usb/gadget/function/f_fs.c | 2 +- + drivers/usb/mon/mon_main.c | 2 +- + fs/exofs/sys.c | 2 +- + fs/fuse/fuse_i.h | 2 +- + fs/jbd2/commit.c | 2 +- + fs/jbd2/journal.c | 12 +- + fs/ocfs2/cluster/netdebug.c | 2 +- + fs/ocfs2/cluster/tcp.c | 2 +- + fs/ocfs2/dlm/dlmdebug.c | 12 +- + fs/ocfs2/dlm/dlmdomain.c | 2 +- + fs/ocfs2/dlm/dlmmaster.c | 8 +- + fs/ocfs2/dlm/dlmunlock.c | 2 +- + fs/proc/base.c | 4 +- + include/asm-generic/rwsem.h | 13 +- + include/drm/drm_framebuffer.h | 2 +- + include/drm/ttm/ttm_bo_api.h | 15 +- + include/drm/ttm/ttm_bo_driver.h | 4 +- + include/linux/clocksource.h | 3 + + include/linux/delay.h | 11 + + include/linux/init_task.h | 40 +- + include/linux/intel_pmic_gpio.h | 15 - + include/linux/jump_label.h | 4 +- + include/linux/kernel_stat.h | 5 +- + include/linux/kprobes.h | 30 +- + include/linux/kref.h | 61 +- + include/linux/math64.h | 26 +- + include/linux/mutex.h | 9 +- + include/linux/percpu-rwsem.h | 8 +- + include/linux/perf_event.h | 2 +- + include/linux/poison.h | 1 + + include/linux/rcuwait.h | 63 ++ + include/linux/sched.h | 60 +- + include/linux/spinlock.h | 8 - + include/linux/spinlock_api_smp.h | 2 - + include/linux/spinlock_api_up.h | 1 - + include/linux/sunrpc/cache.h | 2 +- + include/linux/vtime.h | 7 +- + include/linux/ww_mutex.h | 32 +- + include/net/bluetooth/hci_core.h | 4 +- + init/main.c | 1 - + init/version.c | 4 +- + kernel/events/core.c | 223 ++++--- + kernel/exit.c | 52 +- + kernel/extable.c | 9 +- + kernel/fork.c | 16 +- + kernel/kprobes.c | 73 ++- + kernel/locking/Makefile | 1 + + kernel/locking/locktorture.c | 73 +++ + kernel/locking/mutex-debug.h | 17 - + kernel/locking/mutex.c | 540 +++++++++++------ + kernel/locking/mutex.h | 4 - + kernel/locking/percpu-rwsem.c | 7 +- + kernel/locking/qspinlock_paravirt.h | 2 +- + kernel/locking/rtmutex.c | 2 +- + kernel/locking/rwsem-spinlock.c | 18 +- + kernel/locking/rwsem-xadd.c | 14 +- + kernel/locking/semaphore.c | 7 +- + kernel/locking/spinlock.c | 8 - + kernel/locking/test-ww_mutex.c | 646 +++++++++++++++++++++ + kernel/pid.c | 4 +- + kernel/sched/clock.c | 158 ++--- + kernel/sched/completion.c | 10 +- + kernel/sched/core.c | 223 +++++-- + kernel/sched/cputime.c | 16 +- + kernel/sched/deadline.c | 13 +- + kernel/sched/debug.c | 4 + + kernel/sched/fair.c | 94 ++- + kernel/sched/idle_task.c | 2 +- + kernel/sched/rt.c | 13 +- + kernel/sched/sched.h | 105 +++- + kernel/sched/stats.h | 32 +- + kernel/sched/stop_task.c | 2 +- + kernel/time/clocksource.c | 4 + + kernel/time/timekeeping.c | 39 +- + kernel/time/timekeeping.h | 2 - + lib/Kconfig.debug | 12 + + lib/timerqueue.c | 3 +- + net/bluetooth/6lowpan.c | 2 +- + net/bluetooth/a2mp.c | 4 +- + net/bluetooth/amp.c | 4 +- + net/bluetooth/l2cap_core.c | 4 +- + net/ceph/messenger.c | 4 +- + net/ceph/osd_client.c | 10 +- + net/sunrpc/cache.c | 2 +- + net/sunrpc/svc_xprt.c | 6 +- + net/sunrpc/svcauth.c | 15 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 4 +- + security/apparmor/include/policy.h | 4 +- + tools/arch/x86/include/asm/cpufeatures.h | 1 + + tools/arch/x86/include/uapi/asm/vmx.h | 5 + + tools/lib/bpf/libbpf.c | 69 ++- + tools/lib/bpf/libbpf.h | 14 +- + tools/lib/subcmd/parse-options.h | 19 +- + tools/perf/Build | 5 +- + tools/perf/Documentation/perf-c2c.txt | 2 +- + tools/perf/Documentation/perf-ftrace.txt | 36 ++ + tools/perf/Documentation/perf-kallsyms.txt | 24 + + tools/perf/Documentation/perf-record.txt | 14 +- + tools/perf/Documentation/perf-sched.txt | 2 + + tools/perf/Documentation/perf-script.txt | 4 +- + tools/perf/Documentation/perf-trace.txt | 8 +- + tools/perf/Makefile.config | 6 +- + tools/perf/Makefile.perf | 1 + + tools/perf/arch/arm64/include/dwarf-regs-table.h | 12 +- + tools/perf/builtin-c2c.c | 3 +- + tools/perf/builtin-ftrace.c | 243 ++++++++ + tools/perf/builtin-help.c | 2 +- + tools/perf/builtin-kallsyms.c | 67 +++ + tools/perf/builtin-record.c | 154 ++++- + tools/perf/builtin-sched.c | 130 ++++- + tools/perf/builtin-script.c | 3 +- + tools/perf/builtin-trace.c | 120 +++- + tools/perf/builtin.h | 2 + + tools/perf/command-list.txt | 2 + + tools/perf/perf.c | 5 +- + tools/perf/tests/Build | 1 + + tools/perf/tests/builtin-test.c | 4 + + tools/perf/tests/llvm.c | 2 +- + tools/perf/tests/tests.h | 1 + + tools/perf/tests/unit_number__scnprintf.c | 37 ++ + tools/perf/ui/browsers/hists.c | 60 +- + tools/perf/ui/setup.c | 1 + + tools/perf/util/Build | 1 + + tools/perf/util/dso.c | 48 +- + tools/perf/util/evlist.c | 12 +- + tools/perf/util/evlist.h | 2 + + tools/perf/util/header.c | 6 +- + tools/perf/util/machine.c | 19 + + tools/perf/util/machine.h | 1 + + tools/perf/util/pmu.c | 62 +- + tools/perf/util/probe-event.c | 11 +- + .../perf/util/scripting-engines/trace-event-perl.c | 6 +- + tools/perf/util/session.c | 2 +- + tools/perf/util/trace-event-info.c | 33 +- + tools/perf/util/trace-event-parse.c | 17 + + tools/perf/util/trace-event-read.c | 77 ++- + tools/perf/util/trace-event.h | 1 + + tools/perf/util/unwind-libunwind-local.c | 54 +- + tools/perf/util/util.c | 13 + + tools/perf/util/util.h | 1 + + tools/testing/selftests/locking/ww_mutex.sh | 10 + + .../selftests/rcutorture/configs/lock/CFLIST | 1 + + .../selftests/rcutorture/configs/lock/LOCK07 | 6 + + .../selftests/rcutorture/configs/lock/LOCK07.boot | 1 + + tools/testing/selftests/x86/Makefile | 2 +- + tools/testing/selftests/x86/sysret_rip.c | 195 +++++++ + 292 files changed, 5135 insertions(+), 2786 deletions(-) + create mode 100644 arch/tile/include/asm/div64.h + create mode 100644 arch/x86/events/amd/Makefile + delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_ipc.c + delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_ipc.h + create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_mrfld_rtc.c + delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_pmic_gpio.c + delete mode 100644 drivers/platform/x86/intel_pmic_gpio.c + delete mode 100644 include/linux/intel_pmic_gpio.h + create mode 100644 include/linux/rcuwait.h + create mode 100644 kernel/locking/test-ww_mutex.c + create mode 100644 tools/perf/Documentation/perf-ftrace.txt + create mode 100644 tools/perf/Documentation/perf-kallsyms.txt + create mode 100644 tools/perf/builtin-ftrace.c + create mode 100644 tools/perf/builtin-kallsyms.c + create mode 100644 tools/perf/tests/unit_number__scnprintf.c + create mode 100644 tools/testing/selftests/locking/ww_mutex.sh + create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK07 + create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK07.boot + create mode 100644 tools/testing/selftests/x86/sysret_rip.c +$ git am -3 ../patches/0001-locking-atomic-kref-merge-fixup-for-code-movement.patch +Applying: locking/atomic, kref: merge fixup for code movement +$ git reset HEAD^ +Unstaged changes after reset: +M security/apparmor/include/lib.h +$ git add -A . +$ git commit -v -a --amend +[master 6431424e2adf] Merge remote-tracking branch 'tip/auto-latest' + Date: Fri Feb 10 14:09:53 2017 +1100 +Merging clockevents/clockevents/next (f947ee147e08 clocksource/drivers/arm_arch_timer: Map frame with of_io_request_and_map()) +$ git merge clockevents/clockevents/next +Already up-to-date. +Merging edac/linux_next (9cae24b7b113 Merge commit 'daf34710a9e8849e04867d206692dc42d6d22263' into next) +$ git merge edac/linux_next +Resolved 'Documentation/00-INDEX' using previous resolution. +Resolved 'drivers/edac/edac_device.c' using previous resolution. +Resolved 'drivers/edac/edac_pci.c' using previous resolution. +Auto-merging drivers/edac/edac_pci.c +CONFLICT (content): Merge conflict in drivers/edac/edac_pci.c +Auto-merging drivers/edac/edac_device.c +CONFLICT (content): Merge conflict in drivers/edac/edac_device.c +Auto-merging Documentation/00-INDEX +CONFLICT (content): Merge conflict in Documentation/00-INDEX +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 03f9c468118b] Merge remote-tracking branch 'edac/linux_next' +$ git diff -M --stat --summary HEAD^.. +Merging edac-amd/for-next (279fa5803563 EDAC, fsl_ddr: Make locally used symbols static) +$ git merge edac-amd/for-next +Auto-merging drivers/edac/sb_edac.c +Auto-merging drivers/edac/mce_amd.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-devices-edac | 17 ++++++++ + Documentation/admin-guide/ras.rst | 20 +++++++++ + arch/powerpc/boot/dts/fsl/t2081si-post.dtsi | 1 + + drivers/edac/amd64_edac.c | 64 +++++++++++++++++----------- + drivers/edac/amd64_edac.h | 7 +-- + drivers/edac/edac_mc.c | 14 ++++++ + drivers/edac/edac_mc.h | 9 ++++ + drivers/edac/edac_mc_sysfs.c | 40 ++++++++++++++++- + drivers/edac/fsl_ddr_edac.c | 12 +++--- + drivers/edac/i7300_edac.c | 6 +-- + drivers/edac/i82975x_edac.c | 4 ++ + drivers/edac/mce_amd.c | 2 +- + drivers/edac/mpc85xx_edac.c | 1 + + drivers/edac/sb_edac.c | 44 +++++-------------- + include/linux/edac.h | 4 +- + 15 files changed, 167 insertions(+), 78 deletions(-) +Merging irqchip/irqchip/for-next (88e20c74ee02 irqchip/mxs: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND) +$ git merge irqchip/irqchip/for-next +Merge made by the 'recursive' strategy. + drivers/irqchip/irq-keystone.c | 28 +++++++++++++++++++--------- + drivers/irqchip/irq-mxs.c | 4 ++++ + 2 files changed, 23 insertions(+), 9 deletions(-) +Merging ftrace/for-next (e704eff3ff51 ftrace: Have set_graph_function handle multiple functions in one write) +$ git merge ftrace/for-next +Auto-merging kernel/trace/trace.c +Auto-merging include/linux/compiler.h +Merge made by the 'recursive' strategy. + include/linux/compiler.h | 27 ++-- + kernel/trace/ftrace.c | 372 +++++++++++++++++++++++++++++-------------- + kernel/trace/trace.c | 1 + + kernel/trace/trace.h | 80 ++++++---- + kernel/trace/trace_branch.c | 83 +++++++--- + kernel/trace/trace_entries.h | 6 +- + kernel/trace/trace_uprobe.c | 3 +- + 7 files changed, 386 insertions(+), 186 deletions(-) +Merging rcu/rcu/next (40b1f8f7b57f rcu: Default RCU_FANOUT_LEAF to 16 unless explicitly changed) +$ git merge rcu/rcu/next +Resolved 'arch/powerpc/Kconfig' using previous resolution. +Resolved 'net/netfilter/nf_conntrack_core.c' using previous resolution. +Auto-merging net/netfilter/nf_conntrack_core.c +CONFLICT (content): Merge conflict in net/netfilter/nf_conntrack_core.c +Auto-merging net/ipv6/tcp_ipv6.c +Auto-merging net/ipv4/tcp_ipv4.c +Auto-merging net/dccp/ipv6.c +Auto-merging net/dccp/ipv4.c +Auto-merging mm/slub.c +Auto-merging mm/slab.c +Auto-merging mm/kasan/kasan.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/signal.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/locking/locktorture.c +Auto-merging kernel/fork.c +Auto-merging init/Kconfig +Auto-merging include/net/sock.h +Auto-merging include/linux/slab.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/dma-fence.h +Auto-merging fs/jbd2/journal.c +Auto-merging drivers/gpu/drm/i915/i915_gem_request.h +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging arch/powerpc/Kconfig +CONFLICT (content): Merge conflict in arch/powerpc/Kconfig +Auto-merging arch/Kconfig +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 16b10ae0846e] Merge remote-tracking branch 'rcu/rcu/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/RCU/00-INDEX | 2 +- + .../Design/Data-Structures/Data-Structures.html | 31 +- + .../Design/Expedited-Grace-Periods/ExpRCUFlow.svg | 830 +++++++++++++++++++++ + .../Expedited-Grace-Periods/ExpSchedFlow.svg | 826 ++++++++++++++++++++ + .../Expedited-Grace-Periods.html | 667 +++++++++++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel0.svg | 275 +++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel1.svg | 275 +++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel2.svg | 287 +++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel3.svg | 323 ++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel4.svg | 323 ++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel5.svg | 335 +++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel6.svg | 335 +++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel7.svg | 347 +++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel8.svg | 311 ++++++++ + .../RCU/Design/Requirements/Requirements.html | 93 ++- + Documentation/RCU/rculist_nulls.txt | 6 +- + Documentation/RCU/trace.txt | 5 +- + Documentation/RCU/whatisRCU.txt | 3 +- + Documentation/admin-guide/kernel-parameters.txt | 7 + + Documentation/memory-barriers.txt | 70 +- + arch/Kconfig | 3 + + arch/powerpc/Kconfig | 1 + + drivers/gpu/drm/i915/i915_gem.c | 2 +- + drivers/gpu/drm/i915/i915_gem_request.h | 2 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 2 +- + fs/jbd2/journal.c | 2 +- + fs/signalfd.c | 2 +- + include/linux/dma-fence.h | 4 +- + include/linux/llist.h | 37 +- + include/linux/rcupdate.h | 12 + + include/linux/rcutiny.h | 11 + + include/linux/sched.h | 3 +- + include/linux/slab.h | 6 +- + include/linux/srcu.h | 10 +- + include/linux/types.h | 2 +- + include/net/sock.h | 2 +- + include/trace/events/rcu.h | 10 +- + init/Kconfig | 22 +- + kernel/fork.c | 4 +- + kernel/locking/lockdep.c | 80 +- + kernel/locking/locktorture.c | 6 + + kernel/locking/rtmutex-debug.c | 9 +- + kernel/membarrier.c | 4 + + kernel/rcu/rcu.h | 4 +- + kernel/rcu/rcutorture.c | 19 +- + kernel/rcu/srcu.c | 169 ++--- + kernel/rcu/tiny.c | 22 +- + kernel/rcu/tiny_plugin.h | 4 +- + kernel/rcu/tree.c | 429 +++++++---- + kernel/rcu/tree.h | 26 +- + kernel/rcu/tree_exp.h | 40 +- + kernel/rcu/tree_plugin.h | 23 +- + kernel/rcu/tree_trace.c | 9 +- + kernel/rcu/update.c | 6 +- + kernel/sched/core.c | 1 + + kernel/signal.c | 2 +- + lib/Kconfig.debug | 1 + + mm/kasan/kasan.c | 6 +- + mm/kmemcheck.c | 2 +- + mm/rmap.c | 4 +- + mm/slab.c | 6 +- + mm/slab.h | 4 +- + mm/slab_common.c | 4 +- + mm/slob.c | 6 +- + mm/slub.c | 12 +- + net/dccp/ipv4.c | 2 +- + net/dccp/ipv6.c | 2 +- + net/ipv4/tcp_ipv4.c | 2 +- + net/ipv6/tcp_ipv6.c | 2 +- + net/llc/af_llc.c | 2 +- + net/llc/llc_conn.c | 4 +- + net/llc/llc_sap.c | 2 +- + net/netfilter/nf_conntrack_core.c | 8 +- + .../selftests/rcutorture/configs/rcu/CFcommon | 3 - + .../selftests/rcutorture/configs/rcu/TINY01 | 1 + + .../selftests/rcutorture/configs/rcu/TINY02 | 3 +- + .../selftests/rcutorture/configs/rcu/TREE01 | 3 + + .../selftests/rcutorture/configs/rcu/TREE02 | 4 + + .../selftests/rcutorture/configs/rcu/TREE03 | 3 + + .../selftests/rcutorture/configs/rcu/TREE04 | 4 + + .../selftests/rcutorture/configs/rcu/TREE05 | 3 + + .../selftests/rcutorture/configs/rcu/TREE06 | 3 + + .../selftests/rcutorture/configs/rcu/TREE07 | 3 + + .../selftests/rcutorture/configs/rcu/TREE08 | 4 +- + .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 33 +- + .../rcutorture/formal/srcu-cbmc/.gitignore | 1 + + .../selftests/rcutorture/formal/srcu-cbmc/Makefile | 16 + + .../formal/srcu-cbmc/empty_includes/linux/delay.h | 0 + .../formal/srcu-cbmc/empty_includes/linux/export.h | 0 + .../formal/srcu-cbmc/empty_includes/linux/mutex.h | 0 + .../formal/srcu-cbmc/empty_includes/linux/percpu.h | 0 + .../srcu-cbmc/empty_includes/linux/preempt.h | 0 + .../srcu-cbmc/empty_includes/linux/rcupdate.h | 0 + .../formal/srcu-cbmc/empty_includes/linux/sched.h | 0 + .../formal/srcu-cbmc/empty_includes/linux/smp.h | 0 + .../srcu-cbmc/empty_includes/linux/workqueue.h | 0 + .../srcu-cbmc/empty_includes/uapi/linux/types.h | 0 + .../formal/srcu-cbmc/include/linux/.gitignore | 1 + + .../formal/srcu-cbmc/include/linux/kconfig.h | 1 + + .../formal/srcu-cbmc/include/linux/types.h | 155 ++++ + .../rcutorture/formal/srcu-cbmc/modify_srcu.awk | 375 ++++++++++ + .../rcutorture/formal/srcu-cbmc/src/assume.h | 16 + + .../rcutorture/formal/srcu-cbmc/src/barriers.h | 41 + + .../rcutorture/formal/srcu-cbmc/src/bug_on.h | 13 + + .../formal/srcu-cbmc/src/combined_source.c | 13 + + .../rcutorture/formal/srcu-cbmc/src/config.h | 27 + + .../rcutorture/formal/srcu-cbmc/src/include_srcu.c | 31 + + .../rcutorture/formal/srcu-cbmc/src/int_typedefs.h | 33 + + .../rcutorture/formal/srcu-cbmc/src/locks.h | 220 ++++++ + .../rcutorture/formal/srcu-cbmc/src/misc.c | 11 + + .../rcutorture/formal/srcu-cbmc/src/misc.h | 58 ++ + .../rcutorture/formal/srcu-cbmc/src/percpu.h | 92 +++ + .../rcutorture/formal/srcu-cbmc/src/preempt.c | 78 ++ + .../rcutorture/formal/srcu-cbmc/src/preempt.h | 58 ++ + .../formal/srcu-cbmc/src/simple_sync_srcu.c | 50 ++ + .../rcutorture/formal/srcu-cbmc/src/workqueues.h | 102 +++ + .../srcu-cbmc/tests/store_buffering/.gitignore | 1 + + .../srcu-cbmc/tests/store_buffering/Makefile | 11 + + .../tests/store_buffering/assert_end.fail | 1 + + .../srcu-cbmc/tests/store_buffering/force.fail | 1 + + .../srcu-cbmc/tests/store_buffering/force2.fail | 1 + + .../srcu-cbmc/tests/store_buffering/force3.fail | 1 + + .../srcu-cbmc/tests/store_buffering/main.pass | 0 + .../formal/srcu-cbmc/tests/store_buffering/test.c | 72 ++ + .../formal/srcu-cbmc/tests/test_script.sh | 102 +++ + 125 files changed, 7521 insertions(+), 538 deletions(-) + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/ExpRCUFlow.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/ExpSchedFlow.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel0.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel1.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel2.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel3.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel4.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel5.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel6.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel7.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel8.svg + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/.gitignore + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/Makefile + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/delay.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/export.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/mutex.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/percpu.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/preempt.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/rcupdate.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/sched.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/smp.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/workqueue.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/uapi/linux/types.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/.gitignore + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/kconfig.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/types.h + create mode 100755 tools/testing/selftests/rcutorture/formal/srcu-cbmc/modify_srcu.awk + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/assume.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/barriers.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/bug_on.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/combined_source.c + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/config.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/include_srcu.c + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/int_typedefs.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/locks.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/misc.c + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/misc.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/percpu.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/preempt.c + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/preempt.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/simple_sync_srcu.c + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/workqueues.h + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/.gitignore + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/Makefile + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/assert_end.fail + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/force.fail + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/force2.fail + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/force3.fail + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/main.pass + create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/test.c + create mode 100755 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/test_script.sh +$ git am -3 ../patches/0001-smc-merge-fix-for-mm-Rename-SLAB_DESTROY_BY_RCU-to-S.patch +Applying: smc: merge fix for "mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU" +$ git reset HEAD^ +Unstaged changes after reset: +M net/smc/af_smc.c +$ git add -A . +$ git commit -v -a --amend +[master 0572e0c3742e] Merge remote-tracking branch 'rcu/rcu/next' + Date: Fri Feb 10 14:31:58 2017 +1100 +Merging kvm/linux-next (8ef81a9a453f KVM: x86: hide KVM_HC_CLOCK_PAIRING on 32 bit) +$ git merge kvm/linux-next +Recorded preimage for 'arch/powerpc/include/asm/head-64.h' +Recorded preimage for 'arch/powerpc/kernel/exceptions-64s.S' +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kernel/kvmclock.c +Auto-merging arch/s390/mm/pgtable.c +Auto-merging arch/s390/kvm/vsie.c +Auto-merging arch/s390/kvm/priv.c +Auto-merging arch/powerpc/mm/pgtable_64.c +Auto-merging arch/powerpc/mm/pgtable-radix.c +Auto-merging arch/powerpc/kernel/prom_init.c +Auto-merging arch/powerpc/kernel/exceptions-64s.S +CONFLICT (content): Merge conflict in arch/powerpc/kernel/exceptions-64s.S +Auto-merging arch/powerpc/kernel/asm-offsets.c +Auto-merging arch/powerpc/include/asm/reg.h +Auto-merging arch/powerpc/include/asm/head-64.h +CONFLICT (content): Merge conflict in arch/powerpc/include/asm/head-64.h +Auto-merging arch/arm64/include/asm/kvm_mmu.h +Auto-merging arch/arm64/include/asm/kvm_host.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/powerpc/include/asm/head-64.h'. +Recorded resolution for 'arch/powerpc/kernel/exceptions-64s.S'. +[master 62bbe9c049b8] Merge remote-tracking branch 'kvm/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/virtual/kvm/api.txt | 204 +++- + Documentation/virtual/kvm/devices/arm-vgic-v3.txt | 11 +- + Documentation/virtual/kvm/hypercalls.txt | 35 + + Documentation/virtual/kvm/locking.txt | 31 +- + arch/arm/include/asm/kvm_host.h | 3 - + arch/arm/include/asm/kvm_mmu.h | 12 +- + arch/arm/include/uapi/asm/kvm.h | 13 + + arch/arm/kvm/Makefile | 5 +- + arch/arm/kvm/arm.c | 4 +- + arch/arm/kvm/mmu.c | 20 +- + arch/arm/kvm/reset.c | 9 +- + arch/arm/kvm/vgic-v3-coproc.c | 35 + + arch/arm64/include/asm/kvm_host.h | 3 - + arch/arm64/include/asm/kvm_mmu.h | 6 +- + arch/arm64/include/uapi/asm/kvm.h | 13 + + arch/arm64/kvm/Makefile | 4 +- + arch/arm64/kvm/reset.c | 9 +- + arch/arm64/kvm/sys_regs.c | 92 +- + arch/arm64/kvm/sys_regs.h | 4 + + arch/arm64/kvm/vgic-sys-reg-v3.c | 346 ++++++ + arch/mips/include/asm/kvm_host.h | 183 ++- + arch/mips/include/asm/mmu_context.h | 9 +- + arch/mips/include/uapi/asm/kvm.h | 2 + + arch/mips/kvm/Kconfig | 2 + + arch/mips/kvm/dyntrans.c | 52 +- + arch/mips/kvm/emulate.c | 432 +++---- + arch/mips/kvm/entry.c | 155 ++- + arch/mips/kvm/interrupt.c | 5 +- + arch/mips/kvm/mips.c | 496 +++----- + arch/mips/kvm/mmu.c | 1329 +++++++++++++++++---- + arch/mips/kvm/tlb.c | 291 +---- + arch/mips/kvm/trap_emul.c | 734 ++++++++++-- + arch/powerpc/include/asm/book3s/64/mmu.h | 18 +- + arch/powerpc/include/asm/exception-64s.h | 75 +- + arch/powerpc/include/asm/head-64.h | 2 +- + arch/powerpc/include/asm/hvcall.h | 11 + + arch/powerpc/include/asm/kvm_book3s.h | 26 +- + arch/powerpc/include/asm/kvm_book3s_64.h | 22 + + arch/powerpc/include/asm/kvm_host.h | 27 +- + arch/powerpc/include/asm/kvm_ppc.h | 17 +- + arch/powerpc/include/asm/prom.h | 17 +- + arch/powerpc/include/asm/reg.h | 4 + + arch/powerpc/include/uapi/asm/kvm.h | 22 + + arch/powerpc/kernel/asm-offsets.c | 2 + + arch/powerpc/kernel/exceptions-64s.S | 61 +- + arch/powerpc/kernel/prom_init.c | 18 +- + arch/powerpc/kvm/Makefile | 3 +- + arch/powerpc/kvm/book3s.c | 1 + + arch/powerpc/kvm/book3s_64_mmu_hv.c | 734 +++++++++--- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 716 +++++++++++ + arch/powerpc/kvm/book3s_hv.c | 268 ++++- + arch/powerpc/kvm/book3s_hv_builtin.c | 46 +- + arch/powerpc/kvm/book3s_hv_rm_mmu.c | 87 +- + arch/powerpc/kvm/book3s_hv_rm_xics.c | 146 ++- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 154 ++- + arch/powerpc/kvm/book3s_pr.c | 130 +- + arch/powerpc/kvm/book3s_segment.S | 32 +- + arch/powerpc/kvm/book3s_xics.c | 192 +-- + arch/powerpc/kvm/book3s_xics.h | 7 +- + arch/powerpc/kvm/powerpc.c | 35 + + arch/powerpc/mm/init-common.c | 3 +- + arch/powerpc/mm/init_64.c | 35 + + arch/powerpc/mm/pgtable-radix.c | 2 + + arch/powerpc/mm/pgtable_64.c | 16 +- + arch/powerpc/platforms/pseries/firmware.c | 2 +- + arch/powerpc/platforms/pseries/lpar.c | 29 + + arch/s390/kvm/gaccess.c | 26 +- + arch/s390/kvm/gaccess.h | 19 +- + arch/s390/kvm/guestdbg.c | 120 +- + arch/s390/kvm/intercept.c | 25 +- + arch/s390/kvm/kvm-s390.c | 42 +- + arch/s390/kvm/kvm-s390.h | 12 +- + arch/s390/kvm/priv.c | 30 +- + arch/s390/kvm/vsie.c | 3 + + arch/s390/mm/pgtable.c | 2 +- + arch/s390/tools/gen_facilities.c | 2 + + arch/x86/include/asm/kvm_emulate.h | 1 + + arch/x86/include/asm/kvm_host.h | 25 +- + arch/x86/include/asm/kvmclock.h | 6 + + arch/x86/include/asm/vmx.h | 28 +- + arch/x86/include/uapi/asm/kvm_para.h | 9 + + arch/x86/kernel/kvmclock.c | 5 +- + arch/x86/kvm/cpuid.c | 8 +- + arch/x86/kvm/emulate.c | 20 +- + arch/x86/kvm/hyperv.c | 4 +- + arch/x86/kvm/i8259.c | 16 +- + arch/x86/kvm/irq.h | 19 +- + arch/x86/kvm/irq_comm.c | 29 +- + arch/x86/kvm/lapic.c | 135 ++- + arch/x86/kvm/lapic.h | 12 +- + arch/x86/kvm/mmu.c | 509 +++++--- + arch/x86/kvm/svm.c | 2 + + arch/x86/kvm/vmx.c | 81 +- + arch/x86/kvm/x86.c | 165 ++- + drivers/ptp/Kconfig | 12 + + drivers/ptp/Makefile | 1 + + drivers/ptp/ptp_kvm.c | 200 ++++ + include/kvm/arm_arch_timer.h | 39 +- + include/kvm/arm_vgic.h | 18 +- + include/linux/irqchip/arm-gic-v3.h | 45 +- + include/linux/kvm_host.h | 1 - + include/uapi/linux/kvm.h | 17 + + include/uapi/linux/kvm_para.h | 2 + + virt/kvm/arm/arch_timer.c | 201 +++- + virt/kvm/arm/hyp/timer-sr.c | 13 +- + virt/kvm/arm/vgic/vgic-debug.c | 283 +++++ + virt/kvm/arm/vgic/vgic-init.c | 4 + + virt/kvm/arm/vgic/vgic-irqfd.c | 3 + + virt/kvm/arm/vgic/vgic-its.c | 6 +- + virt/kvm/arm/vgic/vgic-kvm-device.c | 231 +++- + virt/kvm/arm/vgic/vgic-mmio-v2.c | 87 +- + virt/kvm/arm/vgic/vgic-mmio-v3.c | 203 +++- + virt/kvm/arm/vgic/vgic-mmio.c | 167 ++- + virt/kvm/arm/vgic/vgic-mmio.h | 24 + + virt/kvm/arm/vgic/vgic-v2.c | 12 +- + virt/kvm/arm/vgic/vgic-v3.c | 40 +- + virt/kvm/arm/vgic/vgic.c | 66 +- + virt/kvm/arm/vgic/vgic.h | 83 +- + 118 files changed, 8124 insertions(+), 2498 deletions(-) + create mode 100644 arch/arm/kvm/vgic-v3-coproc.c + create mode 100644 arch/arm64/kvm/vgic-sys-reg-v3.c + create mode 100644 arch/powerpc/kvm/book3s_64_mmu_radix.c + create mode 100644 arch/x86/include/asm/kvmclock.h + create mode 100644 drivers/ptp/ptp_kvm.c + create mode 100644 virt/kvm/arm/vgic/vgic-debug.c +Merging kvm-arm/next (7b6b46311a85 KVM: arm/arm64: Emulate the EL1 phys timer registers) +$ git merge kvm-arm/next +Already up-to-date. +Merging kvm-mips/next (12ed1faece3f KVM: MIPS: Allow multiple VCPUs to be created) +$ git merge kvm-mips/next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (5982f0849e08 KVM: PPC: Book 3S: Fix error return in kvm_vm_ioctl_create_spapr_tce()) +$ git merge kvm-ppc/kvm-ppc-next +Resolved 'arch/powerpc/include/asm/opal.h' using previous resolution. +Resolved 'arch/powerpc/platforms/powernv/opal-wrappers.S' using previous resolution. +Auto-merging arch/powerpc/platforms/powernv/pci-ioda.c +Auto-merging arch/powerpc/platforms/powernv/opal-wrappers.S +CONFLICT (content): Merge conflict in arch/powerpc/platforms/powernv/opal-wrappers.S +Auto-merging arch/powerpc/kernel/idle_book3s.S +Auto-merging arch/powerpc/kernel/exceptions-64s.S +Auto-merging arch/powerpc/include/asm/opal.h +CONFLICT (content): Merge conflict in arch/powerpc/include/asm/opal.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f23febd01d66] Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/include/asm/exception-64s.h | 8 +++ + arch/powerpc/include/asm/opal.h | 7 --- + arch/powerpc/kernel/exceptions-64s.S | 2 +- + arch/powerpc/kernel/idle_book3s.S | 6 +-- + arch/powerpc/kvm/book3s_64_vio.c | 1 + + arch/powerpc/kvm/book3s_hv_builtin.c | 34 ++++--------- + arch/powerpc/kvm/book3s_hv_rm_xics.c | 10 ++-- + arch/powerpc/platforms/powernv/opal-wrappers.S | 70 +++++++++++--------------- + arch/powerpc/platforms/powernv/pci-ioda.c | 5 -- + 9 files changed, 56 insertions(+), 87 deletions(-) +Merging kvms390/next (fb7dc1d4ddce KVM: s390: detect some program check loops) +$ git merge kvms390/next +Already up-to-date. +Merging xen-tip/linux-next (c0d197d55e8e xenbus: Neaten xenbus_va_dev_error) +$ git merge xen-tip/linux-next +Auto-merging drivers/net/xen-netfront.c +Merge made by the 'recursive' strategy. + arch/x86/xen/Kconfig | 2 +- + arch/x86/xen/Makefile | 1 + + arch/x86/xen/apic.c | 2 +- + arch/x86/xen/enlighten.c | 279 +++++++++++++++++---------------- + arch/x86/xen/mmu.c | 21 +-- + arch/x86/xen/platform-pci-unplug.c | 4 +- + arch/x86/xen/setup.c | 37 +---- + arch/x86/xen/smp.c | 78 ++++----- + arch/x86/xen/smp.h | 8 - + arch/x86/xen/xen-head.S | 62 +------- + arch/x86/xen/xen-ops.h | 1 - + arch/x86/xen/xen-pvh.S | 161 +++++++++++++++++++ + drivers/net/xen-netback/netback.c | 6 +- + drivers/net/xen-netfront.c | 6 +- + drivers/xen/cpu_hotplug.c | 2 +- + drivers/xen/events/events_base.c | 1 - + drivers/xen/grant-table.c | 8 +- + drivers/xen/manage.c | 2 +- + drivers/xen/xenbus/xenbus_client.c | 39 ++--- + include/xen/interface/elfnote.h | 12 +- + include/xen/interface/hvm/hvm_vcpu.h | 143 +++++++++++++++++ + include/xen/interface/hvm/start_info.h | 98 ++++++++++++ + include/xen/xen.h | 12 +- + 23 files changed, 627 insertions(+), 358 deletions(-) + create mode 100644 arch/x86/xen/xen-pvh.S + create mode 100644 include/xen/interface/hvm/hvm_vcpu.h + create mode 100644 include/xen/interface/hvm/start_info.h +Merging percpu/for-next (966d2b04e070 percpu-refcount: fix reference leak during percpu-atomic transition) +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next (a45463cbf3f9 workqueue: avoid clang warning) +$ git merge workqueues/for-next +Merge made by the 'recursive' strategy. + include/linux/workqueue.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging drivers-x86/for-next (e3c1763c26c0 platform/x86: intel_mid_powerbtn: Unify IRQ acknowledegment) +$ git merge drivers-x86/for-next +Auto-merging drivers/platform/x86/Makefile +Auto-merging drivers/platform/x86/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 ++ + drivers/platform/x86/Kconfig | 31 ++++- + drivers/platform/x86/Makefile | 2 + + drivers/platform/x86/acer-wmi.c | 22 ++- + drivers/platform/x86/fujitsu-laptop.c | 220 ++++++++++++++++-------------- + drivers/platform/x86/hp_accel.c | 1 + + drivers/platform/x86/intel_mid_powerbtn.c | 187 ++++++++++++++++++------- + drivers/platform/x86/intel_mid_thermal.c | 2 +- + drivers/platform/x86/intel_pmc_core.c | 6 +- + drivers/platform/x86/intel_pmc_ipc.c | 2 - + drivers/platform/x86/intel_turbo_max_3.c | 152 +++++++++++++++++++++ + drivers/platform/x86/mlx-platform.c | 84 +++++++----- + drivers/platform/x86/silead_dmi.c | 136 ++++++++++++++++++ + drivers/platform/x86/thinkpad_acpi.c | 4 +- + 14 files changed, 650 insertions(+), 207 deletions(-) + create mode 100644 drivers/platform/x86/intel_turbo_max_3.c + create mode 100644 drivers/platform/x86/silead_dmi.c +Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch") +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. +Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (8bb1de680dac tools/leds: Add led_hw_brightness_mon program) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-led | 17 +++++ + Documentation/devicetree/bindings/leds/common.txt | 28 +++++--- + Documentation/leds/leds-class.txt | 15 ++++ + drivers/leds/Kconfig | 9 +++ + drivers/leds/led-class.c | 76 ++++++++++++++++++++ + drivers/leds/leds-ktd2692.c | 8 +-- + include/linux/leds.h | 16 +++++ + tools/leds/Makefile | 4 +- + tools/leds/led_hw_brightness_mon.c | 84 +++++++++++++++++++++++ + 9 files changed, 241 insertions(+), 16 deletions(-) + create mode 100644 tools/leds/led_hw_brightness_mon.c +Merging ipmi/for-next (db3b7e134185 char: ipmi: constify ipmi_smi_handlers structures) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + Documentation/IPMI.txt | 2 +- + drivers/acpi/acpi_ipmi.c | 2 +- + drivers/char/ipmi/ipmi_devintf.c | 2 +- + drivers/char/ipmi/ipmi_msghandler.c | 4 ++-- + drivers/char/ipmi/ipmi_powernv.c | 2 +- + drivers/char/ipmi/ipmi_watchdog.c | 2 +- + include/linux/ipmi.h | 2 +- + 7 files changed, 8 insertions(+), 8 deletions(-) +Merging driver-core/driver-core-next (64e90a8acb85 Introduce STATIC_USERMODEHELPER to mediate call_usermodehelper()) +$ git merge driver-core/driver-core-next +Auto-merging include/linux/debugfs.h +Auto-merging fs/nfsd/nfs4layouts.c +Removing Documentation/firmware_class/README +Auto-merging Documentation/driver-api/index.rst +Merge made by the 'recursive' strategy. + Documentation/driver-api/firmware/built-in-fw.rst | 38 ++++ + Documentation/driver-api/firmware/core.rst | 16 ++ + .../driver-api/firmware/direct-fs-lookup.rst | 30 ++++ + .../driver-api/firmware/fallback-mechanisms.rst | 195 +++++++++++++++++++++ + .../driver-api/firmware/firmware_cache.rst | 51 ++++++ + .../driver-api/firmware/fw_search_path.rst | 26 +++ + Documentation/driver-api/firmware/index.rst | 16 ++ + Documentation/driver-api/firmware/introduction.rst | 27 +++ + Documentation/driver-api/firmware/lookup-order.rst | 18 ++ + .../driver-api/firmware/request_firmware.rst | 56 ++++++ + Documentation/driver-api/index.rst | 1 + + Documentation/firmware_class/README | 128 -------------- + drivers/base/platform.c | 2 +- + drivers/macintosh/windfarm_core.c | 4 +- + drivers/net/hamradio/baycom_epp.c | 10 +- + drivers/pnp/pnpbios/core.c | 5 +- + drivers/staging/greybus/svc_watchdog.c | 4 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 8 +- + fs/nfsd/nfs4layouts.c | 6 +- + include/linux/debugfs.h | 3 +- + include/linux/kmod.h | 7 +- + kernel/kmod.c | 18 +- + security/Kconfig | 35 ++++ + security/keys/request_key.c | 7 +- + tools/testing/selftests/firmware/fw_filesystem.sh | 25 ++- + 25 files changed, 577 insertions(+), 159 deletions(-) + create mode 100644 Documentation/driver-api/firmware/built-in-fw.rst + create mode 100644 Documentation/driver-api/firmware/core.rst + create mode 100644 Documentation/driver-api/firmware/direct-fs-lookup.rst + create mode 100644 Documentation/driver-api/firmware/fallback-mechanisms.rst + create mode 100644 Documentation/driver-api/firmware/firmware_cache.rst + create mode 100644 Documentation/driver-api/firmware/fw_search_path.rst + create mode 100644 Documentation/driver-api/firmware/index.rst + create mode 100644 Documentation/driver-api/firmware/introduction.rst + create mode 100644 Documentation/driver-api/firmware/lookup-order.rst + create mode 100644 Documentation/driver-api/firmware/request_firmware.rst + delete mode 100644 Documentation/firmware_class/README +Merging usb/usb-next (f3c4c73704b2 usb: xhci-mtk: make the reference clock optional) +$ git merge usb/usb-next +Auto-merging include/linux/of_device.h +Auto-merging drivers/usb/gadget/function/f_fs.c +Auto-merging arch/arm64/boot/dts/mediatek/mt8173.dtsi +Auto-merging Documentation/devicetree/bindings/usb/mt8173-xhci.txt +Auto-merging Documentation/devicetree/bindings/usb/mt8173-mtu3.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/phy/brcm,nsp-usb3-phy.txt | 39 + + .../devicetree/bindings/phy/qcom,usb-hs-phy.txt | 84 ++ + .../devicetree/bindings/phy/qcom,usb-hsic-phy.txt | 65 + + .../devicetree/bindings/phy/sun4i-usb-phy.txt | 1 + + Documentation/devicetree/bindings/ufs/ufs-qcom.txt | 1 - + .../bindings/usb/allwinner,sun4i-a10-musb.txt | 4 +- + Documentation/devicetree/bindings/usb/dwc3.txt | 4 + + .../devicetree/bindings/usb/mt8173-mtu3.txt | 10 +- + .../devicetree/bindings/usb/mt8173-xhci.txt | 10 +- + Documentation/devicetree/bindings/usb/ulpi.txt | 20 + + Documentation/devicetree/bindings/usb/usb-xhci.txt | 1 + + Documentation/usb/gadget-testing.txt | 2 + + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 6 +- + drivers/of/device.c | 25 + + drivers/phy/Kconfig | 24 + + drivers/phy/Makefile | 3 + + drivers/phy/phy-bcm-cygnus-pcie.c | 2 +- + drivers/phy/phy-bcm-nsp-usb3.c | 177 +++ + drivers/phy/phy-hi6220-usb.c | 2 +- + drivers/phy/phy-mt65xx-usb3.c | 2 +- + drivers/phy/phy-qcom-ufs-i.h | 1 - + drivers/phy/phy-qcom-ufs-qmp-14nm.c | 15 +- + drivers/phy/phy-qcom-ufs-qmp-20nm.c | 12 +- + drivers/phy/phy-qcom-ufs.c | 37 +- + drivers/phy/phy-qcom-usb-hs.c | 296 ++++ + drivers/phy/phy-qcom-usb-hsic.c | 160 +++ + drivers/phy/phy-rcar-gen3-usb2.c | 10 +- + drivers/phy/phy-rockchip-inno-usb2.c | 7 +- + drivers/phy/phy-sun4i-usb.c | 18 +- + drivers/usb/chipidea/Kconfig | 8 + + drivers/usb/chipidea/Makefile | 1 + + drivers/usb/chipidea/ci.h | 22 +- + drivers/usb/chipidea/ci_hdrc_msm.c | 280 +++- + drivers/usb/chipidea/ci_hdrc_usb2.c | 4 - + drivers/usb/chipidea/core.c | 173 +-- + drivers/usb/chipidea/host.c | 10 + + drivers/usb/chipidea/otg.c | 99 +- + drivers/usb/chipidea/udc.c | 5 +- + drivers/usb/chipidea/ulpi.c | 113 ++ + drivers/usb/class/cdc-acm.c | 1 - + drivers/usb/common/ulpi.c | 79 +- + drivers/usb/core/devio.c | 43 +- + drivers/usb/core/hcd.c | 1 + + drivers/usb/core/message.c | 33 +- + drivers/usb/dwc2/core.c | 39 +- + drivers/usb/dwc2/core.h | 208 ++- + drivers/usb/dwc2/core_intr.c | 11 +- + drivers/usb/dwc2/debug.h | 4 +- + drivers/usb/dwc2/debugfs.c | 182 ++- + drivers/usb/dwc2/gadget.c | 313 +++-- + drivers/usb/dwc2/hcd.c | 263 ++-- + drivers/usb/dwc2/hcd.h | 76 +- + drivers/usb/dwc2/hcd_ddma.c | 23 +- + drivers/usb/dwc2/hcd_intr.c | 98 +- + drivers/usb/dwc2/hcd_queue.c | 40 +- + drivers/usb/dwc2/hw.h | 596 ++++---- + drivers/usb/dwc2/params.c | 1454 +++++--------------- + drivers/usb/dwc2/pci.c | 2 +- + drivers/usb/dwc2/platform.c | 16 +- + drivers/usb/dwc3/core.h | 5 + + drivers/usb/dwc3/dwc3-exynos.c | 5 +- + drivers/usb/dwc3/dwc3-omap.c | 20 +- + drivers/usb/dwc3/ep0.c | 14 + + drivers/usb/dwc3/gadget.c | 194 ++- + drivers/usb/dwc3/host.c | 21 +- + drivers/usb/early/ehci-dbgp.c | 1 - + drivers/usb/gadget/function/f_fs.c | 4 +- + drivers/usb/gadget/function/f_hid.c | 188 ++- + drivers/usb/gadget/function/f_printer.c | 57 +- + drivers/usb/gadget/function/f_uac2.c | 49 +- + drivers/usb/gadget/function/u_ether.c | 24 +- + drivers/usb/gadget/function/u_ether_configfs.h | 2 +- + drivers/usb/gadget/function/u_fs.h | 3 +- + drivers/usb/gadget/function/u_printer.h | 5 +- + drivers/usb/gadget/function/u_uac2.h | 2 + + drivers/usb/gadget/legacy/audio.c | 1 + + drivers/usb/gadget/legacy/printer.c | 28 +- + drivers/usb/gadget/udc/Kconfig | 14 + + drivers/usb/gadget/udc/atmel_usba_udc.c | 236 +++- + drivers/usb/gadget/udc/atmel_usba_udc.h | 10 +- + drivers/usb/gadget/udc/core.c | 45 +- + drivers/usb/gadget/udc/fotg210-udc.c | 4 +- + drivers/usb/gadget/udc/fsl_qe_udc.c | 2 +- + drivers/usb/gadget/udc/fsl_udc_core.c | 12 +- + drivers/usb/gadget/udc/fusb300_udc.c | 2 +- + drivers/usb/gadget/udc/goku_udc.c | 2 +- + drivers/usb/gadget/udc/gr_udc.c | 2 +- + drivers/usb/gadget/udc/m66592-udc.c | 2 +- + drivers/usb/gadget/udc/mv_u3d_core.c | 2 +- + drivers/usb/gadget/udc/mv_udc_core.c | 2 +- + drivers/usb/gadget/udc/net2272.c | 4 +- + drivers/usb/gadget/udc/omap_udc.c | 2 +- + drivers/usb/gadget/udc/pxa27x_udc.c | 2 +- + drivers/usb/gadget/udc/r8a66597-udc.c | 2 +- + drivers/usb/gadget/udc/s3c-hsudc.c | 2 +- + drivers/usb/host/Kconfig | 4 +- + drivers/usb/host/ehci-exynos.c | 2 + + drivers/usb/host/ehci-fsl.c | 2 +- + drivers/usb/host/ohci-exynos.c | 2 + + drivers/usb/host/ohci-omap.c | 3 +- + drivers/usb/host/oxu210hp-hcd.c | 2 - + drivers/usb/host/xhci-dbg.c | 22 +- + drivers/usb/host/xhci-ext-caps.h | 2 +- + drivers/usb/host/xhci-hub.c | 14 +- + drivers/usb/host/xhci-mem.c | 30 +- + drivers/usb/host/xhci-mtk.c | 22 + + drivers/usb/host/xhci-mtk.h | 1 + + drivers/usb/host/xhci-pci.c | 6 +- + drivers/usb/host/xhci-plat.c | 7 +- + drivers/usb/host/xhci-ring.c | 463 ++++--- + drivers/usb/host/xhci-trace.h | 184 ++- + drivers/usb/host/xhci.c | 212 ++- + drivers/usb/host/xhci.h | 528 ++++++- + drivers/usb/isp1760/isp1760-udc.c | 2 +- + drivers/usb/misc/adutux.c | 4 - + drivers/usb/misc/sisusbvga/sisusb.c | 6 - + drivers/usb/mtu3/mtu3.h | 1 + + drivers/usb/mtu3/mtu3_plat.c | 52 +- + drivers/usb/musb/am35x.c | 1 - + drivers/usb/musb/blackfin.c | 6 +- + drivers/usb/musb/da8xx.c | 36 +- + drivers/usb/musb/davinci.c | 1 - + drivers/usb/musb/jz4740.c | 2 +- + drivers/usb/musb/musb_core.c | 27 +- + drivers/usb/musb/musb_core.h | 1 + + drivers/usb/musb/musb_debugfs.c | 46 +- + drivers/usb/musb/musb_dsps.c | 123 +- + drivers/usb/musb/omap2430.c | 2 +- + drivers/usb/musb/sunxi.c | 49 +- + drivers/usb/musb/ux500.c | 2 +- + drivers/usb/phy/phy-ab8500-usb.c | 33 - + drivers/usb/phy/phy-fsl-usb.c | 12 - + drivers/usb/phy/phy-msm-usb.c | 51 +- + drivers/usb/phy/phy-omap-otg.c | 24 +- + drivers/usb/phy/phy-qcom-8x16-usb.c | 13 +- + drivers/usb/phy/phy-tahvo.c | 10 +- + drivers/usb/renesas_usbhs/common.c | 2 +- + drivers/usb/renesas_usbhs/mod_host.c | 2 +- + drivers/usb/storage/ene_ub6250.c | 2 - + drivers/usb/storage/sddr09.c | 4 +- + include/linux/of_device.h | 6 + + include/linux/usb/chipidea.h | 9 +- + tools/usb/ffs-test.c | 52 +- + tools/usb/usbip/README | 57 +- + tools/usb/usbip/vudc/vudc_server_example.sh | 107 ++ + 145 files changed, 5338 insertions(+), 3118 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/brcm,nsp-usb3-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/qcom,usb-hsic-phy.txt + create mode 100644 Documentation/devicetree/bindings/usb/ulpi.txt + create mode 100644 drivers/phy/phy-bcm-nsp-usb3.c + create mode 100644 drivers/phy/phy-qcom-usb-hs.c + create mode 100644 drivers/phy/phy-qcom-usb-hsic.c + create mode 100644 drivers/usb/chipidea/ulpi.c + create mode 100755 tools/usb/usbip/vudc/vudc_server_example.sh +Merging usb-gadget/next (e42a5dbb8a3d usb: dwc3: host: pass quirk-broken-port-ped property for known broken revisions) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (5182c2cf2a9b USB: serial: mos7840: fix another NULL-deref at open) +$ git merge usb-serial/usb-next +Auto-merging drivers/usb/serial/pl2303.c +Merge made by the 'recursive' strategy. + drivers/usb/serial/Kconfig | 9 + + drivers/usb/serial/Makefile | 1 + + drivers/usb/serial/ark3116.c | 74 +++--- + drivers/usb/serial/ch341.c | 118 +++++---- + drivers/usb/serial/console.c | 4 +- + drivers/usb/serial/cp210x.c | 2 + + drivers/usb/serial/cypress_m8.c | 5 - + drivers/usb/serial/digi_acceleport.c | 52 ++-- + drivers/usb/serial/ftdi_sio.c | 57 +++-- + drivers/usb/serial/io_edgeport.c | 49 ++-- + drivers/usb/serial/io_ti.c | 1 - + drivers/usb/serial/iuu_phoenix.c | 15 +- + drivers/usb/serial/keyspan_pda.c | 19 +- + drivers/usb/serial/kl5kusb105.c | 115 ++------- + drivers/usb/serial/mct_u232.c | 6 +- + drivers/usb/serial/metro-usb.c | 42 +--- + drivers/usb/serial/mos7720.c | 10 +- + drivers/usb/serial/mos7840.c | 24 +- + drivers/usb/serial/opticon.c | 3 +- + drivers/usb/serial/pl2303.c | 8 +- + drivers/usb/serial/quatech2.c | 25 +- + drivers/usb/serial/sierra.c | 28 +-- + drivers/usb/serial/spcp8x5.c | 8 +- + drivers/usb/serial/ssu100.c | 32 ++- + drivers/usb/serial/ti_usb_3410_5052.c | 12 +- + drivers/usb/serial/upd78f0730.c | 440 ++++++++++++++++++++++++++++++++++ + drivers/usb/serial/whiteheat.c | 1 - + 27 files changed, 772 insertions(+), 388 deletions(-) + create mode 100644 drivers/usb/serial/upd78f0730.c +Merging usb-chipidea-next/ci-for-usb-next (753dfd23612d usb: chipidea: msm: Fix return value check in ci_hdrc_msm_probe()) +$ git merge usb-chipidea-next/ci-for-usb-next +Already up-to-date. +Merging phy-next/next (0b10f64dbe60 phy: qcom-ufs: Fix misplaced jump label) +$ git merge phy-next/next +Already up-to-date. +Merging tty/tty-next (36523b6830fa ARM: dts: STiH410-b2260: Enable HW flow-control) +$ git merge tty/tty-next +Auto-merging lib/Kconfig.debug +Auto-merging arch/arm/boot/dts/stih407-family.dtsi +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 6 + + Documentation/devicetree/bindings/serial/8250.txt | 1 + + .../devicetree/bindings/serial/serial.txt | 3 +- + .../devicetree/bindings/serial/slave-device.txt | 36 + + MAINTAINERS | 8 + + arch/arm/boot/dts/stih407-family.dtsi | 3 +- + arch/arm/boot/dts/stih407-pinctrl.dtsi | 12 +- + arch/arm/boot/dts/stih410-b2260.dts | 5 + + arch/sh/kernel/cpu/sh2/setup-sh7619.c | 9 +- + arch/sh/kernel/cpu/sh2a/setup-mxg.c | 3 +- + arch/sh/kernel/cpu/sh2a/setup-sh7201.c | 24 +- + arch/sh/kernel/cpu/sh2a/setup-sh7203.c | 16 +- + arch/sh/kernel/cpu/sh2a/setup-sh7206.c | 12 +- + arch/sh/kernel/cpu/sh2a/setup-sh7264.c | 32 +- + arch/sh/kernel/cpu/sh2a/setup-sh7269.c | 32 +- + arch/sh/kernel/cpu/sh3/setup-sh7705.c | 6 +- + arch/sh/kernel/cpu/sh3/setup-sh770x.c | 10 - + arch/sh/kernel/cpu/sh3/setup-sh7710.c | 8 +- + arch/sh/kernel/cpu/sh3/setup-sh7720.c | 4 - + arch/sh/kernel/cpu/sh4/setup-sh4-202.c | 3 +- + arch/sh/kernel/cpu/sh4/setup-sh7750.c | 9 +- + arch/sh/kernel/cpu/sh4/setup-sh7760.c | 21 +- + arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 12 +- + arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 4 +- + arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 9 +- + arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 21 +- + arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 21 +- + arch/sh/kernel/cpu/sh4a/setup-sh7734.c | 18 +- + arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 9 +- + arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 9 +- + arch/sh/kernel/cpu/sh4a/setup-sh7770.c | 30 +- + arch/sh/kernel/cpu/sh4a/setup-sh7780.c | 6 +- + arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 18 +- + arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 18 +- + arch/sh/kernel/cpu/sh4a/setup-shx3.c | 9 +- + arch/sh/kernel/cpu/sh5/setup-sh5.c | 4 +- + drivers/char/Kconfig | 1 + + drivers/dma/hsu/pci.c | 17 +- + drivers/tty/Makefile | 1 + + drivers/tty/goldfish.c | 2 +- + drivers/tty/serdev/Kconfig | 16 + + drivers/tty/serdev/Makefile | 5 + + drivers/tty/serdev/core.c | 421 ++++++++ + drivers/tty/serdev/serdev-ttyport.c | 224 ++++ + drivers/tty/serial/8250/8250_dw.c | 5 +- + drivers/tty/serial/8250/8250_exar.c | 396 +++++++ + drivers/tty/serial/8250/8250_gsc.c | 4 + + drivers/tty/serial/8250/8250_hp300.c | 2 +- + drivers/tty/serial/8250/8250_lpss.c | 4 +- + drivers/tty/serial/8250/8250_mid.c | 45 +- + drivers/tty/serial/8250/8250_moxa.c | 1 + + drivers/tty/serial/8250/8250_of.c | 94 +- + drivers/tty/serial/8250/8250_omap.c | 33 +- + drivers/tty/serial/8250/8250_pci.c | 362 +------ + drivers/tty/serial/8250/8250_port.c | 26 +- + drivers/tty/serial/8250/Kconfig | 11 +- + drivers/tty/serial/8250/Makefile | 1 + + drivers/tty/serial/Kconfig | 1 + + drivers/tty/serial/amba-pl010.c | 2 +- + drivers/tty/serial/amba-pl011.c | 6 +- + drivers/tty/serial/ar933x_uart.c | 2 +- + drivers/tty/serial/bfin_sport_uart.c | 2 +- + drivers/tty/serial/cpm_uart/cpm_uart_core.c | 18 +- + drivers/tty/serial/dz.c | 2 +- + drivers/tty/serial/efm32-uart.c | 2 +- + drivers/tty/serial/fsl_lpuart.c | 35 +- + drivers/tty/serial/icom.c | 2 +- + drivers/tty/serial/imx.c | 32 +- + drivers/tty/serial/ioc3_serial.c | 2 +- + drivers/tty/serial/ioc4_serial.c | 2 +- + drivers/tty/serial/ip22zilog.c | 2 +- + drivers/tty/serial/lantiq.c | 42 +- + drivers/tty/serial/lpc32xx_hs.c | 2 +- + drivers/tty/serial/max310x.c | 2 +- + drivers/tty/serial/meson_uart.c | 2 +- + drivers/tty/serial/mpsc.c | 2 +- + drivers/tty/serial/msm_serial.c | 1 + + drivers/tty/serial/mxs-auart.c | 3 + + drivers/tty/serial/omap-serial.c | 57 +- + drivers/tty/serial/pic32_uart.c | 6 +- + drivers/tty/serial/pmac_zilog.c | 2 +- + drivers/tty/serial/pnx8xxx_uart.c | 2 +- + drivers/tty/serial/pxa.c | 2 +- + drivers/tty/serial/samsung.c | 20 +- + drivers/tty/serial/samsung.h | 4 - + drivers/tty/serial/serial-tegra.c | 2 +- + drivers/tty/serial/serial_txx9.c | 2 +- + drivers/tty/serial/sh-sci.c | 1085 ++++++++++---------- + drivers/tty/serial/sh-sci.h | 12 +- + drivers/tty/serial/sirfsoc_uart.c | 2 +- + drivers/tty/serial/sn_console.c | 2 +- + drivers/tty/serial/sprd_serial.c | 2 +- + drivers/tty/serial/st-asc.c | 101 +- + drivers/tty/serial/sunhv.c | 2 +- + drivers/tty/serial/sunzilog.c | 2 +- + drivers/tty/serial/vr41xx_siu.c | 2 +- + drivers/tty/serial/vt8500_serial.c | 2 +- + drivers/tty/serial/xilinx_uartps.c | 9 + + drivers/tty/serial/zs.c | 2 +- + drivers/tty/tty_buffer.c | 19 +- + drivers/tty/tty_io.c | 52 +- + drivers/tty/tty_port.c | 65 +- + drivers/tty/vt/vt.c | 9 + + drivers/video/console/Kconfig | 27 +- + drivers/video/console/vgacon.c | 164 ++- + include/linux/console.h | 4 + + include/linux/serdev.h | 262 +++++ + include/linux/serial_core.h | 2 +- + include/linux/serial_sci.h | 15 - + include/linux/tty.h | 12 +- + include/uapi/linux/serial_core.h | 3 +- + include/uapi/linux/serial_reg.h | 8 + + lib/Kconfig.debug | 10 + + 113 files changed, 2802 insertions(+), 1456 deletions(-) + create mode 100644 Documentation/devicetree/bindings/serial/slave-device.txt + create mode 100644 drivers/tty/serdev/Kconfig + create mode 100644 drivers/tty/serdev/Makefile + create mode 100644 drivers/tty/serdev/core.c + create mode 100644 drivers/tty/serdev/serdev-ttyport.c + create mode 100644 drivers/tty/serial/8250/8250_exar.c + create mode 100644 include/linux/serdev.h +Merging char-misc/char-misc-next (17fa87fe5a51 Merge 4.10-rc7 into char-misc-next) +$ git merge char-misc/char-misc-next +Resolved 'Documentation/driver-api/index.rst' using previous resolution. +Removing tools/testing/selftests/firmware/fw_userhelper.sh +Auto-merging init/Kconfig +Auto-merging include/linux/miscdevice.h +Auto-merging drivers/char/Kconfig +Auto-merging arch/arm/mach-davinci/da850.c +Auto-merging MAINTAINERS +Auto-merging Documentation/driver-api/index.rst +CONFLICT (content): Merge conflict in Documentation/driver-api/index.rst +Removing Documentation/DocBook/uio-howto.tmpl +Auto-merging Documentation/DocBook/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7f4582491d89] Merge remote-tracking branch 'char-misc/char-misc-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/Makefile | 2 +- + Documentation/DocBook/uio-howto.tmpl | 1112 -------------- + .../devicetree/bindings/misc/idt_89hpesx.txt | 44 + + .../devicetree/bindings/nvmem/imx-ocotp.txt | 6 +- + Documentation/devicetree/bindings/sram/sram.txt | 6 + + Documentation/driver-api/index.rst | 1 + + Documentation/driver-api/uio-howto.rst | 705 +++++++++ + Documentation/extcon/intel-int3496.txt | 22 + + MAINTAINERS | 3 +- + arch/arm/mach-davinci/da850.c | 10 +- + arch/arm/mach-davinci/da8xx-dt.c | 12 +- + arch/x86/Kbuild | 3 + + arch/x86/hyperv/Makefile | 1 + + arch/x86/hyperv/hv_init.c | 272 ++++ + arch/x86/include/asm/mshyperv.h | 148 ++ + arch/x86/include/uapi/asm/hyperv.h | 8 + + arch/x86/kernel/cpu/mshyperv.c | 50 +- + drivers/char/Kconfig | 5 +- + drivers/char/apm-emulation.c | 7 - + drivers/char/ds1302.c | 1 - + drivers/char/mmtimer.c | 6 +- + drivers/char/xilinx_hwicap/buffer_icap.c | 4 - + drivers/extcon/Kconfig | 10 + + drivers/extcon/Makefile | 1 + + drivers/extcon/devres.c | 2 +- + drivers/extcon/extcon-adc-jack.c | 2 +- + drivers/extcon/extcon-arizona.c | 20 +- + drivers/extcon/extcon-axp288.c | 110 +- + drivers/extcon/extcon-intel-int3496.c | 179 +++ + drivers/extcon/extcon-max14577.c | 6 +- + drivers/extcon/extcon-max77693.c | 12 +- + drivers/extcon/extcon-max77843.c | 24 +- + drivers/extcon/extcon-palmas.c | 21 +- + drivers/extcon/extcon-rt8973a.c | 6 +- + drivers/extcon/extcon-sm5502.c | 6 +- + drivers/extcon/extcon-usb-gpio.c | 7 + + drivers/extcon/extcon.c | 43 +- + drivers/extcon/extcon.h | 62 + + drivers/hv/channel.c | 35 +- + drivers/hv/channel_mgmt.c | 116 +- + drivers/hv/connection.c | 24 +- + drivers/hv/hv.c | 357 +---- + drivers/hv/hv_balloon.c | 1 + + drivers/hv/hv_fcopy.c | 29 +- + drivers/hv/hv_kvp.c | 47 +- + drivers/hv/hv_snapshot.c | 29 +- + drivers/hv/hv_util.c | 103 +- + drivers/hv/hyperv_vmbus.h | 299 +--- + drivers/hv/ring_buffer.c | 7 + + drivers/hv/vmbus_drv.c | 63 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 1 + + drivers/hwtracing/coresight/coresight-etm4x.c | 10 +- + drivers/hwtracing/coresight/coresight-etm4x.h | 1 + + drivers/hwtracing/coresight/coresight-stm.c | 2 +- + drivers/memory/ti-aemif.c | 8 +- + drivers/misc/Kconfig | 5 + + drivers/misc/Makefile | 1 + + drivers/misc/eeprom/Kconfig | 10 + + drivers/misc/eeprom/Makefile | 1 + + drivers/misc/eeprom/idt_89hpesx.c | 1581 ++++++++++++++++++++ + drivers/misc/genwqe/card_base.c | 1 - + drivers/misc/lkdtm_bugs.c | 7 +- + drivers/misc/lkdtm_core.c | 4 +- + drivers/misc/mei/amthif.c | 45 +- + drivers/misc/mei/bus.c | 63 +- + drivers/misc/mei/client.c | 145 +- + drivers/misc/mei/client.h | 24 +- + drivers/misc/mei/hbm.c | 2 +- + drivers/misc/mei/hw-me.c | 53 +- + drivers/misc/mei/hw-txe.c | 14 +- + drivers/misc/mei/hw-txe.h | 2 +- + drivers/misc/mei/init.c | 22 +- + drivers/misc/mei/interrupt.c | 36 +- + drivers/misc/mei/mei_dev.h | 22 +- + drivers/misc/mei/pci-me.c | 50 +- + drivers/misc/mei/pci-txe.c | 69 +- + drivers/misc/mic/vop/vop_vringh.c | 1 - + drivers/misc/sram-exec.c | 105 ++ + drivers/misc/sram.c | 55 +- + drivers/misc/sram.h | 58 + + drivers/misc/vmw_vmci/vmci_guest.c | 75 +- + drivers/nvmem/core.c | 45 +- + drivers/nvmem/imx-ocotp.c | 1 + + drivers/vme/vme.c | 15 + + drivers/w1/masters/ds2490.c | 142 +- + drivers/w1/masters/omap_hdq.c | 2 +- + drivers/w1/slaves/Kconfig | 8 + + drivers/w1/slaves/Makefile | 1 + + drivers/w1/slaves/w1_ds2405.c | 238 +++ + drivers/w1/w1.c | 8 +- + drivers/w1/w1.h | 7 - + drivers/w1/w1_family.c | 7 - + drivers/w1/w1_family.h | 8 +- + drivers/w1/w1_int.c | 7 - + drivers/w1/w1_int.h | 7 - + drivers/w1/w1_io.c | 8 +- + drivers/w1/w1_log.h | 7 - + drivers/w1/w1_netlink.c | 7 - + drivers/w1/w1_netlink.h | 7 - + include/linux/extcon.h | 71 +- + include/linux/extcon/extcon-adc-jack.h | 2 +- + include/linux/hyperv.h | 8 +- + include/linux/miscdevice.h | 1 + + include/linux/platform_data/ti-aemif.h | 23 + + include/linux/sram.h | 27 + + include/linux/vme.h | 1 - + include/linux/vmw_vmci_defs.h | 7 - + init/Kconfig | 7 + + lib/test_firmware.c | 92 +- + scripts/checkkconfigsymbols.py | 8 +- + tools/testing/selftests/firmware/Makefile | 2 +- + tools/testing/selftests/firmware/fw_fallback.sh | 224 +++ + tools/testing/selftests/firmware/fw_userhelper.sh | 99 -- + 113 files changed, 4829 insertions(+), 2790 deletions(-) + delete mode 100644 Documentation/DocBook/uio-howto.tmpl + create mode 100644 Documentation/devicetree/bindings/misc/idt_89hpesx.txt + create mode 100644 Documentation/driver-api/uio-howto.rst + create mode 100644 Documentation/extcon/intel-int3496.txt + create mode 100644 arch/x86/hyperv/Makefile + create mode 100644 arch/x86/hyperv/hv_init.c + create mode 100644 drivers/extcon/extcon-intel-int3496.c + create mode 100644 drivers/extcon/extcon.h + create mode 100644 drivers/misc/eeprom/idt_89hpesx.c + create mode 100644 drivers/misc/sram-exec.c + create mode 100644 drivers/misc/sram.h + create mode 100644 drivers/w1/slaves/w1_ds2405.c + create mode 100644 include/linux/platform_data/ti-aemif.h + create mode 100644 include/linux/sram.h + create mode 100755 tools/testing/selftests/firmware/fw_fallback.sh + delete mode 100755 tools/testing/selftests/firmware/fw_userhelper.sh +Merging extcon/extcon-next (8ea227886002 extcon: arizona: Wait for any running HPDETs to complete on jack removal) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-arizona.c | 46 +++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 46 insertions(+) +Merging staging/staging-next (a769f30c7bd7 Merge 4.10-rc7 into staging-next) +$ git merge staging/staging-next +Auto-merging include/linux/mfd/cros_ec_commands.h +Auto-merging drivers/staging/wlan-ng/p80211netdev.c +Removing drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835.h +Auto-merging drivers/staging/unisys/visornic/visornic_main.c +CONFLICT (modify/delete): drivers/staging/media/lirc/lirc_parallel.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/lirc/lirc_parallel.c left in tree. +Removing drivers/staging/i4l/pcbit/pcbit.h +Removing drivers/staging/i4l/pcbit/module.c +Removing drivers/staging/i4l/pcbit/layer2.h +Removing drivers/staging/i4l/pcbit/layer2.c +Removing drivers/staging/i4l/pcbit/edss1.h +Removing drivers/staging/i4l/pcbit/edss1.c +Removing drivers/staging/i4l/pcbit/drv.c +Removing drivers/staging/i4l/pcbit/capi.h +Removing drivers/staging/i4l/pcbit/capi.c +Removing drivers/staging/i4l/pcbit/callbacks.h +Removing drivers/staging/i4l/pcbit/callbacks.c +Removing drivers/staging/i4l/pcbit/Makefile +Removing drivers/staging/i4l/pcbit/Kconfig +Removing drivers/staging/i4l/icn/icn.h +Removing drivers/staging/i4l/icn/icn.c +Removing drivers/staging/i4l/icn/Makefile +Removing drivers/staging/i4l/icn/Kconfig +Removing drivers/staging/i4l/act2000/module.c +Removing drivers/staging/i4l/act2000/capi.h +Removing drivers/staging/i4l/act2000/capi.c +Removing drivers/staging/i4l/act2000/act2000_isa.h +Removing drivers/staging/i4l/act2000/act2000_isa.c +Removing drivers/staging/i4l/act2000/act2000.h +Removing drivers/staging/i4l/act2000/Makefile +Removing drivers/staging/i4l/act2000/Kconfig +Removing drivers/staging/i4l/TODO +Removing drivers/staging/i4l/Makefile +Removing drivers/staging/i4l/Kconfig +Removing drivers/staging/i4l/Documentation/README.sc +Removing drivers/staging/i4l/Documentation/README.pcbit +Removing drivers/staging/i4l/Documentation/README.icn +Removing drivers/staging/i4l/Documentation/README.act2000 +Removing drivers/staging/greybus/timesync_platform.c +Removing drivers/staging/greybus/timesync.h +Removing drivers/staging/greybus/timesync.c +Auto-merging drivers/staging/greybus/svc_watchdog.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/media/lirc/lirc_parallel.c +drivers/staging/media/lirc/lirc_parallel.c: needs merge +rm 'drivers/staging/media/lirc/lirc_parallel.c' +$ git commit -v -a +[master b7f9bc5076b2] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-iio | 15 +- + Documentation/ABI/testing/sysfs-bus-iio-adc-stm32 | 18 + + .../ABI/testing/sysfs-bus-iio-distance-srf08 | 22 + + .../devicetree/bindings/i2c/trivial-devices.txt | 1 + + .../devicetree/bindings/iio/accel/lis302.txt | 2 +- + .../bindings/iio/adc/amlogic,meson-saradc.txt | 32 + + .../devicetree/bindings/iio/adc/avia-hx711.txt | 18 + + .../devicetree/bindings/iio/adc/max11100.txt | 18 + + .../bindings/iio/adc/qcom,pm8xxx-xoadc.txt | 149 ++ + .../bindings/iio/adc/renesas,gyroadc.txt | 99 + + .../devicetree/bindings/iio/adc/st,stm32-adc.txt | 7 + + .../devicetree/bindings/iio/adc/ti-ads7950.txt | 23 + + .../devicetree/bindings/iio/imu/bmi160.txt | 36 + + .../devicetree/bindings/iio/imu/st_lsm6dsx.txt | 26 + + .../devicetree/bindings/iio/light/cm3605.txt | 41 + + .../bindings/iio/potentiometer/max5481.txt | 23 + + .../devicetree/bindings/iio/st-sensors.txt | 2 + + .../devicetree/bindings/iio/temperature/tmp007.txt | 35 + + .../devicetree/bindings/vendor-prefixes.txt | 3 + + MAINTAINERS | 6 + + drivers/iio/accel/Kconfig | 2 + + drivers/iio/accel/bmc150-accel-core.c | 3 +- + drivers/iio/accel/hid-sensor-accel-3d.c | 104 +- + drivers/iio/accel/mma8452.c | 4 +- + drivers/iio/accel/ssp_accel_sensor.c | 13 +- + drivers/iio/accel/st_accel.h | 18 + + drivers/iio/accel/st_accel_i2c.c | 78 +- + drivers/iio/accel/st_accel_spi.c | 9 + + drivers/iio/adc/Kconfig | 83 + + drivers/iio/adc/Makefile | 6 + + drivers/iio/adc/axp288_adc.c | 32 +- + drivers/iio/adc/exynos_adc.c | 2 +- + drivers/iio/adc/fsl-imx25-gcq.c | 1 + + drivers/iio/adc/hx711.c | 532 +++++ + drivers/iio/adc/ina2xx-adc.c | 2 + + drivers/iio/adc/max11100.c | 181 ++ + drivers/iio/adc/max1363.c | 1 + + drivers/iio/adc/meson_saradc.c | 922 +++++++++ + drivers/iio/adc/qcom-spmi-vadc.c | 481 +++-- + drivers/iio/adc/rcar-gyroadc.c | 631 ++++++ + drivers/iio/adc/stm32-adc-core.c | 1 + + drivers/iio/adc/stm32-adc-core.h | 2 + + drivers/iio/adc/stm32-adc.c | 633 +++++- + drivers/iio/adc/stx104.c | 72 +- + drivers/iio/adc/ti-ads1015.c | 4 +- + drivers/iio/adc/ti-ads7950.c | 490 +++++ + drivers/iio/adc/ti-tlc4541.c | 271 +++ + drivers/iio/buffer/industrialio-buffer-cb.c | 3 +- + drivers/iio/buffer/kfifo_buf.c | 3 + + .../iio/common/hid-sensors/hid-sensor-attributes.c | 36 +- + drivers/iio/common/ssp_sensors/ssp_iio.c | 1 + + drivers/iio/common/st_sensors/st_sensors_i2c.c | 20 + + drivers/iio/dac/ad5592r.c | 8 + + drivers/iio/dac/ad5593r.c | 8 + + drivers/iio/dummy/iio_simple_dummy.h | 8 +- + drivers/iio/dummy/iio_simple_dummy_buffer.c | 4 +- + drivers/iio/gyro/ssp_gyro_sensor.c | 13 +- + drivers/iio/health/max30100.c | 2 +- + drivers/iio/humidity/hts221_i2c.c | 8 + + drivers/iio/imu/Kconfig | 1 + + drivers/iio/imu/Makefile | 2 + + drivers/iio/imu/bmi160/bmi160_core.c | 8 +- + drivers/iio/imu/bmi160/bmi160_i2c.c | 14 +- + drivers/iio/imu/bmi160/bmi160_spi.c | 18 +- + drivers/iio/imu/st_lsm6dsx/Kconfig | 22 + + drivers/iio/imu/st_lsm6dsx/Makefile | 5 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 141 ++ + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 454 +++++ + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 720 +++++++ + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 101 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 118 ++ + drivers/iio/industrialio-buffer.c | 321 ++-- + drivers/iio/industrialio-core.c | 2 + + drivers/iio/industrialio-trigger.c | 92 +- + drivers/iio/inkern.c | 10 +- + drivers/iio/light/Kconfig | 10 + + drivers/iio/light/Makefile | 1 + + drivers/iio/light/cm3232.c | 2 +- + drivers/iio/light/cm3605.c | 330 ++++ + drivers/iio/light/hid-sensor-als.c | 24 +- + drivers/iio/light/opt3001.c | 1 + + drivers/iio/magnetometer/ak8974.c | 8 +- + drivers/iio/magnetometer/mag3110.c | 30 +- + drivers/iio/potentiometer/Kconfig | 11 + + drivers/iio/potentiometer/Makefile | 1 + + drivers/iio/potentiometer/max5481.c | 223 +++ + drivers/iio/potentiometer/mcp4531.c | 1 + + drivers/iio/pressure/Kconfig | 10 + + drivers/iio/pressure/Makefile | 1 + + drivers/iio/pressure/bmp280-core.c | 14 +- + drivers/iio/pressure/cros_ec_baro.c | 220 +++ + drivers/iio/pressure/ms5611_core.c | 12 +- + drivers/iio/pressure/st_pressure.h | 8 + + drivers/iio/pressure/st_pressure_core.c | 12 +- + drivers/iio/pressure/st_pressure_i2c.c | 51 +- + drivers/iio/proximity/Kconfig | 13 +- + drivers/iio/proximity/Makefile | 1 + + drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 2 + + drivers/iio/proximity/srf08.c | 398 ++++ + drivers/iio/proximity/sx9500.c | 10 +- + drivers/iio/temperature/Kconfig | 10 + + drivers/iio/temperature/Makefile | 1 + + drivers/iio/temperature/tmp007.c | 345 ++++ + drivers/iio/trigger/iio-trig-interrupt.c | 8 +- + drivers/iio/trigger/iio-trig-sysfs.c | 2 +- + drivers/platform/chrome/cros_ec_dev.c | 3 + + drivers/staging/Kconfig | 4 +- + drivers/staging/Makefile | 3 +- + drivers/staging/android/ion/ion-ioctl.c | 3 +- + drivers/staging/android/ion/ion_cma_heap.c | 6 +- + drivers/staging/android/ion/ion_of.c | 1 - + drivers/staging/android/ion/ion_priv.h | 40 +- + drivers/staging/bcm2835-audio/Kconfig | 7 + + drivers/staging/bcm2835-audio/Makefile | 5 + + drivers/staging/bcm2835-audio/TODO | 29 + + drivers/staging/bcm2835-audio/bcm2835-ctl.c | 346 ++++ + drivers/staging/bcm2835-audio/bcm2835-pcm.c | 553 ++++++ + drivers/staging/bcm2835-audio/bcm2835-vchiq.c | 891 +++++++++ + drivers/staging/bcm2835-audio/bcm2835.c | 252 +++ + drivers/staging/bcm2835-audio/bcm2835.h | 167 ++ + .../staging/bcm2835-audio/vc_vchi_audioserv_defs.h | 111 ++ + drivers/staging/comedi/Kconfig | 10 +- + drivers/staging/comedi/comedi_compat32.h | 3 +- + drivers/staging/comedi/comedi_fops.c | 10 +- + drivers/staging/comedi/comedi_internal.h | 9 +- + drivers/staging/comedi/comedi_pci.h | 18 +- + drivers/staging/comedi/comedi_pcmcia.c | 3 +- + drivers/staging/comedi/comedi_pcmcia.h | 22 +- + drivers/staging/comedi/comedi_usb.h | 16 +- + drivers/staging/comedi/comedidev.h | 55 +- + drivers/staging/comedi/drivers/addi_watchdog.h | 2 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 140 +- + drivers/staging/comedi/drivers/comedi_8254.h | 30 +- + drivers/staging/comedi/drivers/comedi_isadma.h | 10 +- + drivers/staging/comedi/drivers/daqboard2000.c | 401 ++-- + drivers/staging/comedi/drivers/mite.h | 37 +- + drivers/staging/comedi/drivers/ni_660x.c | 10 +- + drivers/staging/comedi/drivers/ni_670x.c | 2 +- + drivers/staging/comedi/drivers/ni_at_ao.c | 62 +- + drivers/staging/comedi/drivers/ni_labpc.h | 4 +- + drivers/staging/comedi/drivers/ni_pcimio.c | 173 +- + drivers/staging/comedi/drivers/ni_tio.h | 42 +- + drivers/staging/comedi/drivers/ni_tio_internal.h | 14 +- + drivers/staging/comedi/proc.c | 6 +- + drivers/staging/dgnc/TODO | 3 +- + drivers/staging/emxx_udc/emxx_udc.c | 30 +- + drivers/staging/fbtft/fb_agm1264k-fl.c | 18 +- + drivers/staging/fbtft/fb_hx8340bn.c | 4 +- + drivers/staging/fbtft/fb_hx8347d.c | 2 +- + drivers/staging/fbtft/fb_hx8353d.c | 2 +- + drivers/staging/fbtft/fb_ili9163.c | 2 +- + drivers/staging/fbtft/fb_ili9320.c | 2 +- + drivers/staging/fbtft/fb_ili9325.c | 2 +- + drivers/staging/fbtft/fb_ili9341.c | 2 +- + drivers/staging/fbtft/fb_pcd8544.c | 6 +- + drivers/staging/fbtft/fb_ra8875.c | 14 +- + drivers/staging/fbtft/fb_s6d1121.c | 2 +- + drivers/staging/fbtft/fb_ssd1289.c | 4 +- + drivers/staging/fbtft/fb_ssd1305.c | 2 +- + drivers/staging/fbtft/fb_ssd1306.c | 41 +- + drivers/staging/fbtft/fb_ssd1325.c | 2 +- + drivers/staging/fbtft/fb_ssd1331.c | 22 +- + drivers/staging/fbtft/fb_ssd1351.c | 6 +- + drivers/staging/fbtft/fb_st7735r.c | 2 +- + drivers/staging/fbtft/fb_st7789v.c | 2 +- + drivers/staging/fbtft/fb_tls8204.c | 4 +- + drivers/staging/fbtft/fb_uc1611.c | 12 +- + drivers/staging/fbtft/fb_watterott.c | 2 +- + drivers/staging/fbtft/fbtft-core.c | 34 +- + drivers/staging/fbtft/fbtft-io.c | 4 - + drivers/staging/fbtft/fbtft-sysfs.c | 15 +- + drivers/staging/fbtft/fbtft.h | 5 +- + drivers/staging/fbtft/fbtft_device.c | 38 +- + drivers/staging/fbtft/flexfb.c | 34 +- + drivers/staging/fbtft/internal.h | 2 +- + drivers/staging/gdm724x/gdm_endian.c | 24 +- + drivers/staging/gdm724x/gdm_endian.h | 15 +- + drivers/staging/gdm724x/gdm_lte.c | 27 +- + drivers/staging/gdm724x/hci_packet.h | 46 +- + drivers/staging/greybus/Makefile | 4 +- + drivers/staging/greybus/arche-apb-ctrl.c | 4 +- + drivers/staging/greybus/arche_platform.h | 2 - + drivers/staging/greybus/audio_codec.c | 46 +- + drivers/staging/greybus/audio_codec.h | 46 - + drivers/staging/greybus/audio_gb.c | 4 +- + drivers/staging/greybus/audio_module.c | 2 +- + drivers/staging/greybus/audio_topology.c | 104 +- + drivers/staging/greybus/authentication.c | 1 - + drivers/staging/greybus/camera.c | 10 +- + drivers/staging/greybus/connection.c | 6 + + drivers/staging/greybus/control.c | 50 - + drivers/staging/greybus/control.h | 7 - + drivers/staging/greybus/core.c | 11 - + drivers/staging/greybus/es2.c | 132 -- + drivers/staging/greybus/gpio.c | 24 +- + drivers/staging/greybus/greybus.h | 1 - + drivers/staging/greybus/greybus_protocols.h | 47 - + drivers/staging/greybus/greybus_trace.h | 28 - + drivers/staging/greybus/hd.h | 7 - + drivers/staging/greybus/interface.c | 56 +- + drivers/staging/greybus/interface.h | 5 - + drivers/staging/greybus/log.c | 6 +- + drivers/staging/greybus/loopback.c | 29 +- + drivers/staging/greybus/sdio.c | 2 +- + drivers/staging/greybus/svc.c | 87 - + drivers/staging/greybus/svc.h | 7 - + drivers/staging/greybus/svc_watchdog.c | 4 +- + drivers/staging/greybus/timesync.c | 1357 ------------- + drivers/staging/greybus/timesync.h | 45 - + drivers/staging/greybus/timesync_platform.c | 88 - + drivers/staging/greybus/tools/loopback_test.c | 5 +- + drivers/staging/greybus/uart.c | 1 - + drivers/staging/i4l/Documentation/README.act2000 | 104 - + drivers/staging/i4l/Documentation/README.icn | 148 -- + drivers/staging/i4l/Documentation/README.pcbit | 40 - + drivers/staging/i4l/Documentation/README.sc | 281 --- + drivers/staging/i4l/Kconfig | 13 - + drivers/staging/i4l/Makefile | 5 - + drivers/staging/i4l/TODO | 3 - + drivers/staging/i4l/act2000/Kconfig | 9 - + drivers/staging/i4l/act2000/Makefile | 9 - + drivers/staging/i4l/act2000/act2000.h | 202 -- + drivers/staging/i4l/act2000/act2000_isa.c | 444 ----- + drivers/staging/i4l/act2000/act2000_isa.h | 136 -- + drivers/staging/i4l/act2000/capi.c | 1187 ------------ + drivers/staging/i4l/act2000/capi.h | 357 ---- + drivers/staging/i4l/act2000/module.c | 816 -------- + drivers/staging/i4l/icn/Kconfig | 12 - + drivers/staging/i4l/icn/Makefile | 5 - + drivers/staging/i4l/icn/icn.c | 1696 ---------------- + drivers/staging/i4l/icn/icn.h | 252 --- + drivers/staging/i4l/pcbit/Kconfig | 10 - + drivers/staging/i4l/pcbit/Makefile | 9 - + drivers/staging/i4l/pcbit/callbacks.c | 345 ---- + drivers/staging/i4l/pcbit/callbacks.h | 44 - + drivers/staging/i4l/pcbit/capi.c | 646 ------- + drivers/staging/i4l/pcbit/capi.h | 81 - + drivers/staging/i4l/pcbit/drv.c | 1070 ----------- + drivers/staging/i4l/pcbit/edss1.c | 310 --- + drivers/staging/i4l/pcbit/edss1.h | 99 - + drivers/staging/i4l/pcbit/layer2.c | 710 ------- + drivers/staging/i4l/pcbit/layer2.h | 281 --- + drivers/staging/i4l/pcbit/module.c | 125 -- + drivers/staging/i4l/pcbit/pcbit.h | 177 -- + drivers/staging/iio/accel/adis16201_core.c | 4 +- + drivers/staging/iio/accel/adis16203_core.c | 6 +- + drivers/staging/iio/accel/adis16209_core.c | 4 +- + drivers/staging/iio/adc/ad7606.c | 79 +- + drivers/staging/iio/adc/ad7816.c | 10 +- + drivers/staging/iio/addac/adt7316-i2c.c | 2 +- + drivers/staging/iio/addac/adt7316.c | 3 +- + drivers/staging/iio/cdc/ad7150.c | 34 +- + drivers/staging/iio/impedance-analyzer/ad5933.c | 4 +- + drivers/staging/iio/light/isl29028.c | 415 ++-- + drivers/staging/iio/meter/ade7753.c | 2 +- + drivers/staging/iio/meter/ade7753.h | 2 +- + drivers/staging/iio/meter/ade7754.c | 2 +- + drivers/staging/iio/meter/ade7754.h | 2 +- + drivers/staging/iio/meter/ade7758.h | 2 +- + drivers/staging/iio/meter/ade7758_core.c | 2 +- + drivers/staging/iio/meter/ade7758_ring.c | 1 + + drivers/staging/iio/meter/ade7759.c | 2 +- + drivers/staging/iio/meter/ade7759.h | 2 +- + drivers/staging/iio/meter/ade7854.c | 2 +- + drivers/staging/iio/meter/ade7854.h | 2 +- + drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 6 +- + drivers/staging/ks7010/ks7010_sdio.h | 4 +- + drivers/staging/ks7010/ks_wlan_net.c | 5 +- + .../lustre/include/linux/libcfs/libcfs_crypto.h | 60 +- + .../lustre/include/linux/libcfs/libcfs_private.h | 16 - + .../lustre/include/linux/libcfs/linux/libcfs.h | 4 - + .../staging/lustre/include/linux/lnet/lib-lnet.h | 14 +- + .../staging/lustre/include/linux/lnet/lib-types.h | 10 +- + drivers/staging/lustre/include/linux/lnet/lnetst.h | 198 +- + .../staging/lustre/include/linux/lnet/socklnd.h | 11 +- + drivers/staging/lustre/include/linux/lnet/types.h | 70 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 16 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 6 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 4 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 16 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 2 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 43 +- + .../lustre/lnet/klnds/socklnd/socklnd_proto.c | 26 +- + drivers/staging/lustre/lnet/libcfs/debug.c | 2 +- + drivers/staging/lustre/lnet/libcfs/hash.c | 2 +- + .../staging/lustre/lnet/libcfs/linux/linux-cpu.c | 17 +- + .../lustre/lnet/libcfs/linux/linux-module.c | 15 +- + drivers/staging/lustre/lnet/libcfs/module.c | 4 +- + drivers/staging/lustre/lnet/libcfs/workitem.c | 2 +- + drivers/staging/lustre/lnet/lnet/acceptor.c | 14 +- + drivers/staging/lustre/lnet/lnet/api-ni.c | 186 +- + drivers/staging/lustre/lnet/lnet/lib-move.c | 20 +- + drivers/staging/lustre/lnet/lnet/lib-msg.c | 4 +- + drivers/staging/lustre/lnet/lnet/lib-ptl.c | 2 +- + drivers/staging/lustre/lnet/lnet/lib-socket.c | 2 +- + drivers/staging/lustre/lnet/lnet/net_fault.c | 12 +- + drivers/staging/lustre/lnet/lnet/router.c | 10 +- + drivers/staging/lustre/lnet/lnet/router_proc.c | 4 +- + drivers/staging/lustre/lnet/selftest/brw_test.c | 2 +- + drivers/staging/lustre/lnet/selftest/conctl.c | 76 +- + drivers/staging/lustre/lnet/selftest/conrpc.c | 36 +- + drivers/staging/lustre/lnet/selftest/conrpc.h | 4 +- + drivers/staging/lustre/lnet/selftest/console.c | 56 +- + drivers/staging/lustre/lnet/selftest/console.h | 24 +- + drivers/staging/lustre/lnet/selftest/framework.c | 18 +- + drivers/staging/lustre/lnet/selftest/module.c | 3 +- + drivers/staging/lustre/lnet/selftest/rpc.c | 6 +- + drivers/staging/lustre/lnet/selftest/rpc.h | 38 +- + drivers/staging/lustre/lnet/selftest/selftest.h | 10 +- + drivers/staging/lustre/lustre/fid/fid_lib.c | 7 +- + drivers/staging/lustre/lustre/fid/lproc_fid.c | 12 +- + drivers/staging/lustre/lustre/include/cl_object.h | 12 +- + .../staging/lustre/lustre/include/interval_tree.h | 12 +- + drivers/staging/lustre/lustre/include/lu_object.h | 19 +- + .../lustre/lustre/include/lustre/lustre_idl.h | 46 - + .../lustre/lustre/include/lustre/lustre_user.h | 18 +- + drivers/staging/lustre/lustre/include/lustre_net.h | 8 +- + .../staging/lustre/lustre/include/lustre_obdo.h | 54 + + .../lustre/lustre/include/lustre_req_layout.h | 10 +- + drivers/staging/lustre/lustre/include/obd.h | 23 +- + drivers/staging/lustre/lustre/include/obd_class.h | 5 +- + drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 6 +- + drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 3 +- + .../staging/lustre/lustre/ldlm/ldlm_inodebits.c | 1 - + drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 13 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 12 +- + drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 2 +- + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 2 +- + drivers/staging/lustre/lustre/llite/dcache.c | 13 +- + drivers/staging/lustre/lustre/llite/dir.c | 16 +- + drivers/staging/lustre/lustre/llite/file.c | 46 +- + drivers/staging/lustre/lustre/llite/lcommon_cl.c | 9 +- + drivers/staging/lustre/lustre/llite/lcommon_misc.c | 2 +- + .../staging/lustre/lustre/llite/llite_internal.h | 16 +- + drivers/staging/lustre/lustre/llite/llite_lib.c | 126 +- + drivers/staging/lustre/lustre/llite/lproc_llite.c | 27 +- + drivers/staging/lustre/lustre/llite/namei.c | 9 +- + drivers/staging/lustre/lustre/llite/range_lock.c | 10 +- + drivers/staging/lustre/lustre/llite/range_lock.h | 2 +- + drivers/staging/lustre/lustre/llite/rw.c | 199 +- + drivers/staging/lustre/lustre/llite/rw26.c | 4 + + drivers/staging/lustre/lustre/llite/statahead.c | 94 +- + drivers/staging/lustre/lustre/llite/super25.c | 2 +- + drivers/staging/lustre/lustre/llite/vvp_dev.c | 2 +- + drivers/staging/lustre/lustre/llite/vvp_internal.h | 2 - + drivers/staging/lustre/lustre/llite/vvp_io.c | 17 +- + drivers/staging/lustre/lustre/llite/vvp_page.c | 3 +- + drivers/staging/lustre/lustre/llite/xattr.c | 9 + + drivers/staging/lustre/lustre/lmv/lmv_intent.c | 16 +- + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 121 +- + drivers/staging/lustre/lustre/lmv/lproc_lmv.c | 85 +- + drivers/staging/lustre/lustre/lov/lov_io.c | 7 +- + drivers/staging/lustre/lustre/lov/lov_lock.c | 5 + + drivers/staging/lustre/lustre/lov/lov_obd.c | 2 - + drivers/staging/lustre/lustre/lov/lov_object.c | 33 +- + drivers/staging/lustre/lustre/lov/lov_pack.c | 9 +- + drivers/staging/lustre/lustre/lov/lov_request.c | 6 +- + drivers/staging/lustre/lustre/mdc/mdc_internal.h | 3 +- + drivers/staging/lustre/lustre/mdc/mdc_lib.c | 12 +- + drivers/staging/lustre/lustre/mdc/mdc_locks.c | 20 +- + drivers/staging/lustre/lustre/mdc/mdc_request.c | 11 +- + drivers/staging/lustre/lustre/mgc/mgc_request.c | 183 +- + drivers/staging/lustre/lustre/obdclass/cl_io.c | 4 +- + drivers/staging/lustre/lustre/obdclass/cl_object.c | 3 +- + drivers/staging/lustre/lustre/obdclass/lu_object.c | 106 +- + drivers/staging/lustre/lustre/obdclass/obd_mount.c | 3 +- + drivers/staging/lustre/lustre/obdclass/obdo.c | 54 + + drivers/staging/lustre/lustre/osc/osc_cache.c | 155 +- + .../staging/lustre/lustre/osc/osc_cl_internal.h | 11 +- + drivers/staging/lustre/lustre/osc/osc_internal.h | 19 +- + drivers/staging/lustre/lustre/osc/osc_io.c | 79 +- + drivers/staging/lustre/lustre/osc/osc_object.c | 19 + + drivers/staging/lustre/lustre/osc/osc_page.c | 98 +- + drivers/staging/lustre/lustre/osc/osc_request.c | 80 +- + drivers/staging/lustre/lustre/ptlrpc/client.c | 28 +- + drivers/staging/lustre/lustre/ptlrpc/events.c | 5 +- + drivers/staging/lustre/lustre/ptlrpc/import.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/layout.c | 26 +- + drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 5 +- + drivers/staging/lustre/lustre/ptlrpc/nrs.c | 3 - + .../staging/lustre/lustre/ptlrpc/pack_generic.c | 103 +- + drivers/staging/lustre/lustre/ptlrpc/pers.c | 2 +- + .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 3 + + drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 18 +- + drivers/staging/lustre/lustre/ptlrpc/recover.c | 24 +- + drivers/staging/lustre/lustre/ptlrpc/service.c | 21 +- + drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 194 +- + drivers/staging/media/Kconfig | 2 + + drivers/staging/media/Makefile | 1 + + .../staging/media/davinci_vpfe/vpfe_mc_capture.c | 2 +- + drivers/staging/media/platform/bcm2835/Kconfig | 10 + + drivers/staging/media/platform/bcm2835/Makefile | 10 + + drivers/staging/media/platform/bcm2835/TODO | 39 + + .../media/platform/bcm2835/bcm2835-camera.c | 2024 ++++++++++++++++++++ + .../media/platform/bcm2835/bcm2835-camera.h | 145 ++ + drivers/staging/media/platform/bcm2835/controls.c | 1335 +++++++++++++ + .../staging/media/platform/bcm2835/mmal-common.h | 53 + + .../media/platform/bcm2835/mmal-encodings.h | 127 ++ + .../media/platform/bcm2835/mmal-msg-common.h | 50 + + .../media/platform/bcm2835/mmal-msg-format.h | 81 + + .../staging/media/platform/bcm2835/mmal-msg-port.h | 107 ++ + drivers/staging/media/platform/bcm2835/mmal-msg.h | 404 ++++ + .../media/platform/bcm2835/mmal-parameters.h | 689 +++++++ + .../staging/media/platform/bcm2835/mmal-vchiq.c | 1913 ++++++++++++++++++ + .../staging/media/platform/bcm2835/mmal-vchiq.h | 178 ++ + drivers/staging/most/hdm-i2c/hdm_i2c.c | 2 +- + drivers/staging/most/hdm-usb/hdm_usb.c | 10 +- + drivers/staging/nvec/nvec_power.c | 2 +- + drivers/staging/octeon/ethernet.c | 3 +- + drivers/staging/olpc_dcon/olpc_dcon.c | 14 +- + drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_ap.c | 144 +- + drivers/staging/rtl8188eu/core/rtw_cmd.c | 3 - + drivers/staging/rtl8188eu/core/rtw_efuse.c | 8 +- + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 9 +- + drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 5 - + drivers/staging/rtl8188eu/core/rtw_led.c | 1 + + drivers/staging/rtl8188eu/core/rtw_mlme.c | 3 + + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 43 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 5 +- + drivers/staging/rtl8188eu/core/rtw_recv.c | 137 +- + drivers/staging/rtl8188eu/core/rtw_security.c | 146 +- + drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 1 + + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 3 + + drivers/staging/rtl8188eu/core/rtw_xmit.c | 8 +- + drivers/staging/rtl8188eu/hal/bb_cfg.c | 3 +- + drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 2 +- + drivers/staging/rtl8188eu/include/drv_types.h | 1 - + drivers/staging/rtl8188eu/include/osdep_service.h | 7 - + drivers/staging/rtl8188eu/include/rtw_debug.h | 2 +- + drivers/staging/rtl8188eu/include/rtw_mlme.h | 185 -- + drivers/staging/rtl8188eu/include/rtw_recv.h | 13 - + drivers/staging/rtl8188eu/include/rtw_security.h | 36 - + drivers/staging/rtl8188eu/include/wifi.h | 101 - + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 15 +- + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 2 - + drivers/staging/rtl8188eu/os_dep/osdep_service.c | 14 +- + drivers/staging/rtl8188eu/os_dep/recv_linux.c | 15 - + drivers/staging/rtl8188eu/os_dep/rtw_android.c | 1 + + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 1 + + drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 22 +- + drivers/staging/rtl8192e/dot11d.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 12 +- + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 1 + + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 18 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 8 +- + .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 5 +- + drivers/staging/rtl8192u/r8180_93cx6.h | 27 +- + drivers/staging/rtl8192u/r819xU_cmdpkt.c | 31 +- + drivers/staging/rtl8712/hal_init.c | 12 +- + drivers/staging/rtl8712/ieee80211.c | 18 +- + drivers/staging/rtl8712/mlme_linux.c | 6 +- + drivers/staging/rtl8712/rtl8712_cmd.c | 7 +- + drivers/staging/rtl8712/rtl8712_event.h | 2 +- + drivers/staging/rtl8712/rtl8712_recv.c | 14 +- + drivers/staging/rtl8712/rtl8712_recv.h | 28 +- + drivers/staging/rtl8712/rtl8712_xmit.c | 2 +- + drivers/staging/rtl8712/rtl8712_xmit.h | 16 +- + drivers/staging/rtl8712/rtl871x_cmd.h | 6 +- + drivers/staging/rtl8712/rtl871x_event.h | 2 +- + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 4 +- + drivers/staging/rtl8712/rtl871x_mlme.c | 15 +- + drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 4 +- + drivers/staging/rtl8712/rtl871x_recv.c | 9 +- + drivers/staging/rtl8712/rtl871x_security.c | 28 +- + drivers/staging/rtl8712/usb_ops.c | 18 +- + drivers/staging/rtl8712/usb_ops_linux.c | 5 +- + drivers/staging/rtl8712/wifi.h | 4 +- + drivers/staging/rtl8712/wlan_bssdef.h | 2 +- + drivers/staging/rts5208/ms.c | 6 - + drivers/staging/rts5208/rtsx.c | 6 +- + drivers/staging/rts5208/rtsx_transport.c | 4 +- + drivers/staging/skein/skein_base.c | 16 +- + drivers/staging/skein/skein_base.h | 112 +- + drivers/staging/skein/skein_block.c | 32 +- + drivers/staging/skein/skein_block.h | 20 +- + drivers/staging/skein/skein_iv.h | 24 +- + drivers/staging/sm750fb/ddk750_chip.c | 6 +- + drivers/staging/sm750fb/sm750.c | 7 +- + drivers/staging/speakup/kobjects.c | 54 +- + drivers/staging/speakup/main.c | 4 +- + drivers/staging/speakup/speakup.h | 4 +- + drivers/staging/speakup/speakup_acntpc.c | 26 +- + drivers/staging/speakup/speakup_acntsa.c | 26 +- + drivers/staging/speakup/speakup_apollo.c | 28 +- + drivers/staging/speakup/speakup_audptr.c | 28 +- + drivers/staging/speakup/speakup_bns.c | 28 +- + drivers/staging/speakup/speakup_decext.c | 28 +- + drivers/staging/speakup/speakup_decpc.c | 26 +- + drivers/staging/speakup/speakup_dectlk.c | 28 +- + drivers/staging/speakup/speakup_dtlk.c | 32 +- + drivers/staging/speakup/speakup_dummy.c | 26 +- + drivers/staging/speakup/speakup_keypc.c | 22 +- + drivers/staging/speakup/speakup_ltlk.c | 32 +- + drivers/staging/speakup/speakup_soft.c | 32 +- + drivers/staging/speakup/speakup_spkout.c | 28 +- + drivers/staging/speakup/speakup_txprt.c | 26 +- + drivers/staging/speakup/spk_priv.h | 4 +- + drivers/staging/unisys/include/channel.h | 134 +- + drivers/staging/unisys/visorbus/controlvmchannel.h | 87 +- + drivers/staging/unisys/visorbus/visorbus_main.c | 48 +- + drivers/staging/unisys/visorbus/visorchannel.c | 6 - + drivers/staging/unisys/visorbus/visorchipset.c | 465 ++--- + drivers/staging/unisys/visorbus/vmcallinterface.h | 8 +- + drivers/staging/unisys/visorhba/visorhba_main.c | 4 - + drivers/staging/unisys/visornic/visornic_main.c | 38 +- + .../interface/vchi/connections/connection.h | 3 +- + .../interface/vchi/message_drivers/message.h | 9 +- + .../staging/vc04_services/interface/vchi/vchi.h | 36 +- + .../vc04_services/interface/vchi/vchi_common.h | 9 +- + .../vc04_services/interface/vchiq_arm/vchiq_2835.h | 42 - + .../interface/vchiq_arm/vchiq_2835_arm.c | 49 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 132 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.h | 2 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 102 +- + .../interface/vchiq_arm/vchiq_debugfs.h | 3 +- + .../interface/vchiq_arm/vchiq_kern_lib.c | 14 +- + .../vc04_services/interface/vchiq_arm/vchiq_shim.c | 84 +- + .../vc04_services/interface/vchiq_arm/vchiq_util.c | 9 +- + drivers/staging/vme/devices/vme_user.c | 3 +- + drivers/staging/vt6656/card.h | 34 +- + drivers/staging/vt6656/channel.h | 2 +- + drivers/staging/vt6656/dpc.h | 2 +- + drivers/staging/vt6656/firmware.h | 6 +- + drivers/staging/vt6656/int.c | 2 +- + drivers/staging/vt6656/int.h | 4 +- + drivers/staging/vt6656/key.c | 14 +- + drivers/staging/vt6656/key.h | 2 +- + drivers/staging/vt6656/mac.c | 46 +- + drivers/staging/vt6656/mac.h | 31 +- + drivers/staging/vt6656/main_usb.c | 63 +- + drivers/staging/vt6656/power.h | 6 +- + drivers/staging/vt6656/rf.h | 10 +- + drivers/staging/vt6656/rxtx.h | 8 +- + drivers/staging/vt6656/usbpipe.h | 17 +- + drivers/staging/vt6656/wcmd.h | 4 +- + drivers/staging/wilc1000/host_interface.c | 3 +- + drivers/staging/wilc1000/linux_wlan.c | 4 +- + drivers/staging/wilc1000/wilc_debugfs.c | 4 +- + drivers/staging/wilc1000/wilc_sdio.c | 5 +- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 19 +- + drivers/staging/wlan-ng/cfg80211.c | 6 +- + drivers/staging/wlan-ng/hfa384x.h | 4 +- + drivers/staging/wlan-ng/p80211netdev.c | 2 +- + drivers/staging/wlan-ng/prism2mib.c | 2 - + drivers/staging/xgifb/XGI_main_26.c | 31 +- + drivers/staging/xgifb/vb_init.c | 3 +- + include/linux/hid-sensor-hub.h | 4 + + include/linux/hid-sensor-ids.h | 4 + + include/linux/iio/buffer.h | 160 +- + include/linux/iio/buffer_impl.h | 162 ++ + include/linux/iio/common/st_sensors_i2c.h | 9 + + include/linux/iio/kfifo_buf.h | 5 +- + include/linux/mfd/cros_ec_commands.h | 3 +- + include/uapi/linux/iio/types.h | 1 + + tools/iio/iio_event_monitor.c | 2 + + 556 files changed, 22964 insertions(+), 17125 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-stm32 + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-distance-srf08 + create mode 100644 Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/avia-hx711.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/max11100.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/qcom,pm8xxx-xoadc.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/renesas,gyroadc.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti-ads7950.txt + create mode 100644 Documentation/devicetree/bindings/iio/imu/bmi160.txt + create mode 100644 Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt + create mode 100644 Documentation/devicetree/bindings/iio/light/cm3605.txt + create mode 100644 Documentation/devicetree/bindings/iio/potentiometer/max5481.txt + create mode 100644 Documentation/devicetree/bindings/iio/temperature/tmp007.txt + create mode 100644 drivers/iio/adc/hx711.c + create mode 100644 drivers/iio/adc/max11100.c + create mode 100644 drivers/iio/adc/meson_saradc.c + create mode 100644 drivers/iio/adc/rcar-gyroadc.c + create mode 100644 drivers/iio/adc/ti-ads7950.c + create mode 100644 drivers/iio/adc/ti-tlc4541.c + create mode 100644 drivers/iio/imu/st_lsm6dsx/Kconfig + create mode 100644 drivers/iio/imu/st_lsm6dsx/Makefile + create mode 100644 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h + create mode 100644 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c + create mode 100644 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c + create mode 100644 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c + create mode 100644 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c + create mode 100644 drivers/iio/light/cm3605.c + create mode 100644 drivers/iio/potentiometer/max5481.c + create mode 100644 drivers/iio/pressure/cros_ec_baro.c + create mode 100644 drivers/iio/proximity/srf08.c + create mode 100644 drivers/iio/temperature/tmp007.c + create mode 100644 drivers/staging/bcm2835-audio/Kconfig + create mode 100644 drivers/staging/bcm2835-audio/Makefile + create mode 100644 drivers/staging/bcm2835-audio/TODO + create mode 100644 drivers/staging/bcm2835-audio/bcm2835-ctl.c + create mode 100644 drivers/staging/bcm2835-audio/bcm2835-pcm.c + create mode 100644 drivers/staging/bcm2835-audio/bcm2835-vchiq.c + create mode 100644 drivers/staging/bcm2835-audio/bcm2835.c + create mode 100644 drivers/staging/bcm2835-audio/bcm2835.h + create mode 100644 drivers/staging/bcm2835-audio/vc_vchi_audioserv_defs.h + delete mode 100644 drivers/staging/greybus/timesync.c + delete mode 100644 drivers/staging/greybus/timesync.h + delete mode 100644 drivers/staging/greybus/timesync_platform.c + delete mode 100644 drivers/staging/i4l/Documentation/README.act2000 + delete mode 100644 drivers/staging/i4l/Documentation/README.icn + delete mode 100644 drivers/staging/i4l/Documentation/README.pcbit + delete mode 100644 drivers/staging/i4l/Documentation/README.sc + delete mode 100644 drivers/staging/i4l/Kconfig + delete mode 100644 drivers/staging/i4l/Makefile + delete mode 100644 drivers/staging/i4l/TODO + delete mode 100644 drivers/staging/i4l/act2000/Kconfig + delete mode 100644 drivers/staging/i4l/act2000/Makefile + delete mode 100644 drivers/staging/i4l/act2000/act2000.h + delete mode 100644 drivers/staging/i4l/act2000/act2000_isa.c + delete mode 100644 drivers/staging/i4l/act2000/act2000_isa.h + delete mode 100644 drivers/staging/i4l/act2000/capi.c + delete mode 100644 drivers/staging/i4l/act2000/capi.h + delete mode 100644 drivers/staging/i4l/act2000/module.c + delete mode 100644 drivers/staging/i4l/icn/Kconfig + delete mode 100644 drivers/staging/i4l/icn/Makefile + delete mode 100644 drivers/staging/i4l/icn/icn.c + delete mode 100644 drivers/staging/i4l/icn/icn.h + delete mode 100644 drivers/staging/i4l/pcbit/Kconfig + delete mode 100644 drivers/staging/i4l/pcbit/Makefile + delete mode 100644 drivers/staging/i4l/pcbit/callbacks.c + delete mode 100644 drivers/staging/i4l/pcbit/callbacks.h + delete mode 100644 drivers/staging/i4l/pcbit/capi.c + delete mode 100644 drivers/staging/i4l/pcbit/capi.h + delete mode 100644 drivers/staging/i4l/pcbit/drv.c + delete mode 100644 drivers/staging/i4l/pcbit/edss1.c + delete mode 100644 drivers/staging/i4l/pcbit/edss1.h + delete mode 100644 drivers/staging/i4l/pcbit/layer2.c + delete mode 100644 drivers/staging/i4l/pcbit/layer2.h + delete mode 100644 drivers/staging/i4l/pcbit/module.c + delete mode 100644 drivers/staging/i4l/pcbit/pcbit.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_obdo.h + create mode 100644 drivers/staging/media/platform/bcm2835/Kconfig + create mode 100644 drivers/staging/media/platform/bcm2835/Makefile + create mode 100644 drivers/staging/media/platform/bcm2835/TODO + create mode 100644 drivers/staging/media/platform/bcm2835/bcm2835-camera.c + create mode 100644 drivers/staging/media/platform/bcm2835/bcm2835-camera.h + create mode 100644 drivers/staging/media/platform/bcm2835/controls.c + create mode 100644 drivers/staging/media/platform/bcm2835/mmal-common.h + create mode 100644 drivers/staging/media/platform/bcm2835/mmal-encodings.h + create mode 100644 drivers/staging/media/platform/bcm2835/mmal-msg-common.h + create mode 100644 drivers/staging/media/platform/bcm2835/mmal-msg-format.h + create mode 100644 drivers/staging/media/platform/bcm2835/mmal-msg-port.h + create mode 100644 drivers/staging/media/platform/bcm2835/mmal-msg.h + create mode 100644 drivers/staging/media/platform/bcm2835/mmal-parameters.h + create mode 100644 drivers/staging/media/platform/bcm2835/mmal-vchiq.c + create mode 100644 drivers/staging/media/platform/bcm2835/mmal-vchiq.h + delete mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835.h + create mode 100644 include/linux/iio/buffer_impl.h +Merging slave-dma/next (bd98fba52645 Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Auto-merging drivers/dma/zx_dma.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-platform-hidma | 2 +- + .../ABI/testing/sysfs-platform-hidma-mgmt | 20 +- + .../devicetree/bindings/dma/stm32-dma.txt | 5 +- + drivers/dma/Kconfig | 8 +- + drivers/dma/Makefile | 2 +- + drivers/dma/dmaengine.c | 21 +- + drivers/dma/dw/core.c | 211 +++++++++++++++------ + drivers/dma/dw/pci.c | 19 +- + drivers/dma/dw/platform.c | 1 + + drivers/dma/dw/regs.h | 59 +++++- + drivers/dma/ipu/ipu_irq.c | 2 +- + drivers/dma/ste_dma40.c | 7 +- + drivers/dma/stm32-dma.c | 88 ++++++--- + drivers/dma/{zx296702_dma.c => zx_dma.c} | 6 +- + include/linux/dma/dw.h | 2 + + include/linux/dmaengine.h | 11 ++ + include/linux/platform_data/dma-dw.h | 2 + + 17 files changed, 336 insertions(+), 130 deletions(-) + rename drivers/dma/{zx296702_dma.c => zx_dma.c} (99%) +Merging cgroup/for-next (63f1ca59453a Merge branch 'cgroup/for-4.11-rdmacg' into cgroup/for-4.11) +$ git merge cgroup/for-next +Auto-merging kernel/events/core.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging init/Kconfig +Auto-merging include/rdma/ib_verbs.h +Auto-merging drivers/infiniband/core/uverbs_cmd.c +Auto-merging drivers/infiniband/core/device.c +Merge made by the 'recursive' strategy. + Documentation/cgroup-v1/rdma.txt | 109 ++ + Documentation/cgroup-v2.txt | 103 +- + drivers/infiniband/core/Makefile | 1 + + drivers/infiniband/core/cgroup.c | 62 + + drivers/infiniband/core/core_priv.h | 30 + + drivers/infiniband/core/device.c | 10 + + drivers/infiniband/core/uverbs_cmd.c | 102 +- + drivers/infiniband/core/uverbs_main.c | 20 + + fs/kernfs/dir.c | 2 +- + fs/kernfs/file.c | 53 +- + fs/kernfs/kernfs-internal.h | 2 +- + include/linux/cgroup-defs.h | 57 +- + include/linux/cgroup.h | 2 +- + include/linux/cgroup_rdma.h | 53 + + include/linux/cgroup_subsys.h | 4 + + include/linux/kernfs.h | 12 +- + include/rdma/ib_verbs.h | 14 + + init/Kconfig | 10 + + kernel/Makefile | 5 +- + kernel/cgroup/Makefile | 6 + + kernel/cgroup/cgroup-internal.h | 214 +++ + kernel/cgroup/cgroup-v1.c | 1395 ++++++++++++++++ + kernel/{ => cgroup}/cgroup.c | 2165 ++++--------------------- + kernel/{ => cgroup}/cpuset.c | 0 + kernel/{cgroup_freezer.c => cgroup/freezer.c} | 0 + kernel/cgroup/namespace.c | 155 ++ + kernel/{cgroup_pids.c => cgroup/pids.c} | 0 + kernel/cgroup/rdma.c | 619 +++++++ + kernel/events/core.c | 6 + + tools/perf/util/cgroup.c | 26 +- + 30 files changed, 3297 insertions(+), 1940 deletions(-) + create mode 100644 Documentation/cgroup-v1/rdma.txt + create mode 100644 drivers/infiniband/core/cgroup.c + create mode 100644 include/linux/cgroup_rdma.h + create mode 100644 kernel/cgroup/Makefile + create mode 100644 kernel/cgroup/cgroup-internal.h + create mode 100644 kernel/cgroup/cgroup-v1.c + rename kernel/{ => cgroup}/cgroup.c (72%) + rename kernel/{ => cgroup}/cpuset.c (100%) + rename kernel/{cgroup_freezer.c => cgroup/freezer.c} (100%) + create mode 100644 kernel/cgroup/namespace.c + rename kernel/{cgroup_pids.c => cgroup/pids.c} (100%) + create mode 100644 kernel/cgroup/rdma.c +Merging scsi/for-next (dfc54176fb62 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging include/scsi/scsi_transport.h +Removing drivers/scsi/sun3_scsi.h +Auto-merging drivers/scsi/sun3_scsi.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/scsi/scsi_transport_fc.c +Auto-merging drivers/scsi/scsi_error.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/scsi/qla2xxx/qla_isr.c +Auto-merging drivers/scsi/qla2xxx/qla_def.h +Auto-merging drivers/scsi/lpfc/lpfc_els.c +Auto-merging drivers/scsi/hpsa.c +Removing drivers/scsi/g_NCR5380.h +Auto-merging drivers/scsi/fcoe/fcoe.c +Auto-merging drivers/scsi/bnx2fc/bnx2fc_fcoe.c +Auto-merging drivers/message/fusion/mptsas.c +Auto-merging drivers/infiniband/ulp/srp/ib_srp.c +Auto-merging drivers/infiniband/ulp/iser/iscsi_iser.c +Merge made by the 'recursive' strategy. + drivers/ata/libata-eh.c | 1 + + drivers/ata/libata-transport.c | 1 - + drivers/ata/libata.h | 1 - + drivers/block/cciss.h | 30 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 1 + + drivers/infiniband/ulp/srp/ib_srp.c | 1 + + drivers/message/fusion/mptfc.c | 1 + + drivers/message/fusion/mptlan.h | 1 - + drivers/message/fusion/mptsas.c | 2 +- + drivers/s390/scsi/zfcp_scsi.c | 1 + + drivers/scsi/NCR5380.c | 64 +- + drivers/scsi/NCR5380.h | 17 +- + drivers/scsi/aacraid/aachba.c | 1288 ++++++++++++++++------ + drivers/scsi/aacraid/aacraid.h | 644 +++++++++-- + drivers/scsi/aacraid/commctrl.c | 342 ++++-- + drivers/scsi/aacraid/comminit.c | 330 +++--- + drivers/scsi/aacraid/commsup.c | 964 +++++++++++----- + drivers/scsi/aacraid/dpcsup.c | 159 ++- + drivers/scsi/aacraid/linit.c | 562 +++++++--- + drivers/scsi/aacraid/nark.c | 3 +- + drivers/scsi/aacraid/rkt.c | 5 +- + drivers/scsi/aacraid/rx.c | 17 +- + drivers/scsi/aacraid/sa.c | 9 +- + drivers/scsi/aacraid/src.c | 336 ++++-- + drivers/scsi/atari_scsi.c | 36 +- + drivers/scsi/be2iscsi/be.h | 3 - + drivers/scsi/be2iscsi/be_cmds.c | 41 +- + drivers/scsi/be2iscsi/be_cmds.h | 17 +- + drivers/scsi/be2iscsi/be_iscsi.c | 165 +-- + drivers/scsi/be2iscsi/be_main.c | 345 +++--- + drivers/scsi/be2iscsi/be_main.h | 44 +- + drivers/scsi/be2iscsi/be_mgmt.c | 117 +- + drivers/scsi/be2iscsi/be_mgmt.h | 98 +- + drivers/scsi/bfa/bfa_fcs.c | 181 +-- + drivers/scsi/bfa/bfa_fcs.h | 4 - + drivers/scsi/bfa/bfad_im.c | 2 + + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 1 + + drivers/scsi/bnx2i/bnx2i_iscsi.c | 1 + + drivers/scsi/csiostor/csio_scsi.c | 2 + + drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 1 + + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 1 + + drivers/scsi/cxlflash/common.h | 32 +- + drivers/scsi/cxlflash/lunmgt.c | 31 +- + drivers/scsi/cxlflash/main.c | 465 ++++---- + drivers/scsi/cxlflash/sislite.h | 19 +- + drivers/scsi/cxlflash/superpipe.c | 183 ++-- + drivers/scsi/cxlflash/vlun.c | 169 +-- + drivers/scsi/dpt_i2o.c | 8 +- + drivers/scsi/esas2r/esas2r_init.c | 2 +- + drivers/scsi/esas2r/esas2r_ioctl.c | 2 +- + drivers/scsi/esas2r/esas2r_log.h | 4 +- + drivers/scsi/esas2r/esas2r_main.c | 4 +- + drivers/scsi/fcoe/fcoe.c | 1 + + drivers/scsi/fnic/fnic_main.c | 1 + + drivers/scsi/g_NCR5380.c | 45 +- + drivers/scsi/g_NCR5380.h | 56 - + drivers/scsi/hisi_sas/hisi_sas.h | 1 + + drivers/scsi/hisi_sas/hisi_sas_main.c | 23 +- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 2 + + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 135 ++- + drivers/scsi/hpsa.c | 8 +- + drivers/scsi/hpsa.h | 40 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 1 + + drivers/scsi/ibmvscsi/ibmvscsi.c | 1 + + drivers/scsi/iscsi_tcp.c | 1 + + drivers/scsi/libiscsi.c | 5 +- + drivers/scsi/libsas/sas_init.c | 1 - + drivers/scsi/libsas/sas_internal.h | 2 - + drivers/scsi/libsas/sas_scsi_host.c | 7 - + drivers/scsi/lpfc/lpfc.h | 1 - + drivers/scsi/lpfc/lpfc_attr.c | 61 +- + drivers/scsi/lpfc/lpfc_crtn.h | 7 +- + drivers/scsi/lpfc/lpfc_els.c | 9 +- + drivers/scsi/lpfc/lpfc_hw.h | 6 + + drivers/scsi/lpfc/lpfc_scsi.c | 20 +- + drivers/scsi/lpfc/lpfc_sli.c | 13 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/lpfc/lpfc_vport.c | 8 + + drivers/scsi/mac_scsi.c | 8 +- + drivers/scsi/megaraid/megaraid_sas.h | 139 ++- + drivers/scsi/megaraid/megaraid_sas_base.c | 240 +++- + drivers/scsi/megaraid/megaraid_sas_fp.c | 341 +++++- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 746 +++++++++++-- + drivers/scsi/megaraid/megaraid_sas_fusion.h | 364 +++++- + drivers/scsi/mpt3sas/mpi/mpi2_ioc.h | 2 + + drivers/scsi/mpt3sas/mpt3sas_base.c | 20 + + drivers/scsi/mpt3sas/mpt3sas_base.h | 7 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 4 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 71 +- + drivers/scsi/mvumi.c | 6 +- + drivers/scsi/pm8001/pm8001_init.c | 35 +- + drivers/scsi/pm8001/pm8001_sas.h | 2 - + drivers/scsi/pmcraid.c | 92 +- + drivers/scsi/pmcraid.h | 1 - + drivers/scsi/qedi/qedi_dbg.c | 9 +- + drivers/scsi/qedi/qedi_iscsi.c | 1 + + drivers/scsi/qla2xxx/qla_def.h | 4 +- + drivers/scsi/qla2xxx/qla_gs.c | 6 +- + drivers/scsi/qla2xxx/qla_isr.c | 13 +- + drivers/scsi/qla2xxx/qla_os.c | 3 +- + drivers/scsi/qla4xxx/ql4_def.h | 3 - + drivers/scsi/qla4xxx/ql4_os.c | 6 +- + drivers/scsi/scsi_debug.c | 10 +- + drivers/scsi/scsi_error.c | 4 +- + drivers/scsi/scsi_transport_fc.c | 26 +- + drivers/scsi/scsi_transport_srp.c | 21 +- + drivers/scsi/sd.c | 4 +- + drivers/scsi/storvsc_drv.c | 160 ++- + drivers/scsi/sun3_scsi.c | 83 +- + drivers/scsi/sun3_scsi.h | 102 -- + drivers/scsi/ufs/ufs-qcom.c | 49 +- + drivers/scsi/ufs/ufs-qcom.h | 1 + + drivers/scsi/ufs/ufs.h | 12 + + drivers/scsi/ufs/ufs_quirks.h | 28 +- + drivers/scsi/ufs/ufshcd.c | 1578 +++++++++++++++++++++++---- + drivers/scsi/ufs/ufshcd.h | 121 +- + drivers/scsi/ufs/ufshci.h | 3 + + drivers/scsi/vmw_pvscsi.c | 104 +- + drivers/scsi/vmw_pvscsi.h | 5 - + include/linux/libata.h | 2 + + include/scsi/libiscsi.h | 1 + + include/scsi/scsi.h | 10 - + include/scsi/scsi_transport.h | 23 - + include/scsi/scsi_transport_fc.h | 1 + + include/scsi/scsi_transport_srp.h | 8 +- + include/trace/events/ufs.h | 263 +++++ + include/uapi/scsi/cxlflash_ioctl.h | 1 + + 127 files changed, 8520 insertions(+), 3438 deletions(-) + delete mode 100644 drivers/scsi/g_NCR5380.h + delete mode 100644 drivers/scsi/sun3_scsi.h + create mode 100644 include/trace/events/ufs.h +$ git am -3 ../patches/0001-scsi-mpt3sas-fix-up-for-block-fold-cmd_type-into-the.patch +Applying: scsi: mpt3sas: fix up for "block: fold cmd_type into the REQ_OP_ space" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/scsi/mpt3sas/mpt3sas_scsih.c +$ git add -A . +$ git commit -v -a --amend +[master 7505bd5ec733] Merge remote-tracking branch 'scsi/for-next' + Date: Fri Feb 10 15:59:19 2017 +1100 +Merging scsi-mkp/for-next (8b9b22ba7590 scsi: qedi: Fix possible memory leak in qedi_iscsi_update_conn()) +$ git merge scsi-mkp/for-next +Merge made by the 'recursive' strategy. + drivers/scsi/qedi/qedi_iscsi.c | 4 ---- + 1 file changed, 4 deletions(-) +Merging target-updates/for-next (b2c9652eba6c target: Remove command flag CMD_T_DEV_ACTIVE) +$ git merge target-updates/for-next +Auto-merging include/target/target_core_base.h +Auto-merging drivers/scsi/qla2xxx/tcm_qla2xxx.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/scsi/qla2xxx/qla_mr.c +Auto-merging drivers/scsi/qla2xxx/qla_isr.c +Auto-merging drivers/scsi/qla2xxx/qla_gs.c +Auto-merging drivers/scsi/qla2xxx/qla_def.h +Auto-merging drivers/scsi/qla2xxx/qla_bsg.c +Auto-merging drivers/net/ethernet/chelsio/cxgb4/t4_msg.h +Merge made by the 'recursive' strategy. + drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 4 + + drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.h | 2 +- + drivers/scsi/qla2xxx/qla_attr.c | 3 + + drivers/scsi/qla2xxx/qla_bsg.c | 23 +- + drivers/scsi/qla2xxx/qla_def.h | 306 ++- + drivers/scsi/qla2xxx/qla_dfs.c | 11 +- + drivers/scsi/qla2xxx/qla_fw.h | 106 +- + drivers/scsi/qla2xxx/qla_gbl.h | 72 +- + drivers/scsi/qla2xxx/qla_gs.c | 726 +++++- + drivers/scsi/qla2xxx/qla_init.c | 1612 +++++++++---- + drivers/scsi/qla2xxx/qla_inline.h | 18 +- + drivers/scsi/qla2xxx/qla_iocb.c | 167 +- + drivers/scsi/qla2xxx/qla_isr.c | 317 ++- + drivers/scsi/qla2xxx/qla_mbx.c | 232 +- + drivers/scsi/qla2xxx/qla_mr.c | 48 +- + drivers/scsi/qla2xxx/qla_os.c | 330 ++- + drivers/scsi/qla2xxx/qla_target.c | 2392 +++++++++----------- + drivers/scsi/qla2xxx/qla_target.h | 252 +-- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 256 ++- + drivers/scsi/qla2xxx/tcm_qla2xxx.h | 4 +- + drivers/target/iscsi/cxgbit/cxgbit_cm.c | 11 +- + drivers/target/iscsi/cxgbit/cxgbit_main.c | 2 +- + drivers/target/iscsi/cxgbit/cxgbit_target.c | 6 +- + drivers/target/iscsi/iscsi_target.c | 73 +- + drivers/target/iscsi/iscsi_target_erl2.c | 6 +- + drivers/target/iscsi/iscsi_target_erl2.h | 2 +- + drivers/target/iscsi/iscsi_target_login.c | 2 +- + drivers/target/iscsi/iscsi_target_nego.c | 16 +- + drivers/target/iscsi/iscsi_target_tmr.c | 4 +- + drivers/target/target_core_device.c | 1 - + drivers/target/target_core_sbc.c | 2 +- + drivers/target/target_core_tmr.c | 8 +- + drivers/target/target_core_transport.c | 130 +- + drivers/target/tcm_fc/tfc_cmd.c | 2 - + include/target/target_core_base.h | 4 +- + include/target/target_core_fabric.h | 2 +- + 36 files changed, 4454 insertions(+), 2698 deletions(-) +Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging target-bva/for-next (3d88460dbd28 Merge tag 'drm-fixes-for-v4.10-rc8' of git://people.freedesktop.org/~airlied/linux) +$ git merge target-bva/for-next +Merge made by the 'recursive' strategy. +Merging libata/for-next (428d57c1683a Merge branch 'for-4.11' into for-next) +$ git merge libata/for-next +Auto-merging include/linux/libata.h +Auto-merging drivers/ata/libata.h +Auto-merging drivers/ata/libata-scsi.c +Auto-merging drivers/ata/libata-eh.c +Merge made by the 'recursive' strategy. + drivers/ata/Kconfig | 19 +++- + drivers/ata/Makefile | 1 + + drivers/ata/ahci_imx.c | 196 +++++++++++++++++++++++++++++++++++++++++ + drivers/ata/ahci_qoriq.c | 35 ++++++-- + drivers/ata/ahci_xgene.c | 6 +- + drivers/ata/libata-core.c | 61 +++++++------ + drivers/ata/libata-eh.c | 44 ++++++--- + drivers/ata/libata-scsi.c | 97 ++++++++------------ + drivers/ata/libata-sff.c | 45 ++++++---- + drivers/ata/libata.h | 8 -- + drivers/ata/pata_at91.c | 6 +- + drivers/ata/pata_atiixp.c | 5 ++ + drivers/ata/pata_bf54x.c | 7 +- + drivers/ata/pata_ep93xx.c | 4 +- + drivers/ata/pata_falcon.c | 184 ++++++++++++++++++++++++++++++++++++++ + drivers/ata/pata_ixp4xx_cf.c | 4 +- + drivers/ata/pata_legacy.c | 15 ++-- + drivers/ata/pata_octeon_cf.c | 20 ++--- + drivers/ata/pata_of_platform.c | 9 +- + drivers/ata/pata_pcmcia.c | 6 +- + drivers/ata/pata_samsung_cf.c | 4 +- + drivers/ata/sata_mv.c | 15 ++-- + drivers/ata/sata_rcar.c | 4 +- + include/linux/libata.h | 8 +- + 24 files changed, 612 insertions(+), 191 deletions(-) + create mode 100644 drivers/ata/pata_falcon.c +Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation) +$ git merge binfmt_misc/for-next +Already up-to-date. +Merging vhost/linux-next (80363894995b virtio_mmio: expose header to userspace) +$ git merge vhost/linux-next +Auto-merging include/uapi/linux/Kbuild +Merge made by the 'recursive' strategy. + drivers/virtio/virtio_mmio.c | 2 +- + include/uapi/linux/Kbuild | 1 + + include/{ => uapi}/linux/virtio_mmio.h | 0 + 3 files changed, 2 insertions(+), 1 deletion(-) + rename include/{ => uapi}/linux/virtio_mmio.h (100%) +Merging rpmsg/for-next (446521b2e8a2 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Removing drivers/remoteproc/qcom_mdt_loader.h +Removing drivers/remoteproc/qcom_mdt_loader.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/remoteproc/qcom,adsp.txt | 41 +- + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 4 +- + Documentation/ioctl/ioctl-number.txt | 1 + + MAINTAINERS | 1 + + drivers/remoteproc/Kconfig | 18 +- + drivers/remoteproc/Makefile | 2 +- + drivers/remoteproc/da8xx_remoteproc.c | 2 +- + drivers/remoteproc/omap_remoteproc.c | 2 +- + drivers/remoteproc/qcom_adsp_pil.c | 134 +++-- + drivers/remoteproc/qcom_common.c | 96 ++++ + drivers/remoteproc/qcom_common.h | 22 + + drivers/remoteproc/qcom_mdt_loader.c | 180 ------- + drivers/remoteproc/qcom_mdt_loader.h | 13 - + drivers/remoteproc/qcom_q6v5_pil.c | 531 ++++++++++++++----- + drivers/remoteproc/qcom_wcnss.c | 60 +-- + drivers/remoteproc/remoteproc_core.c | 52 +- + drivers/remoteproc/remoteproc_sysfs.c | 1 + + drivers/remoteproc/st_remoteproc.c | 119 ++++- + drivers/remoteproc/st_slim_rproc.c | 2 +- + drivers/remoteproc/wkup_m3_rproc.c | 2 +- + drivers/rpmsg/Kconfig | 9 + + drivers/rpmsg/Makefile | 1 + + drivers/rpmsg/qcom_smd.c | 58 ++ + drivers/rpmsg/rpmsg_char.c | 584 +++++++++++++++++++++ + drivers/rpmsg/rpmsg_core.c | 20 + + drivers/rpmsg/rpmsg_internal.h | 18 + + drivers/soc/qcom/Kconfig | 4 + + drivers/soc/qcom/Makefile | 1 + + drivers/soc/qcom/mdt_loader.c | 204 +++++++ + include/linux/remoteproc.h | 6 +- + include/linux/rpmsg.h | 13 + + include/linux/rpmsg/qcom_smd.h | 6 +- + include/linux/soc/qcom/mdt_loader.h | 18 + + include/uapi/linux/rpmsg.h | 35 ++ + 34 files changed, 1770 insertions(+), 490 deletions(-) + create mode 100644 drivers/remoteproc/qcom_common.c + create mode 100644 drivers/remoteproc/qcom_common.h + delete mode 100644 drivers/remoteproc/qcom_mdt_loader.c + delete mode 100644 drivers/remoteproc/qcom_mdt_loader.h + create mode 100644 drivers/rpmsg/rpmsg_char.c + create mode 100644 drivers/soc/qcom/mdt_loader.c + create mode 100644 include/linux/soc/qcom/mdt_loader.h + create mode 100644 include/uapi/linux/rpmsg.h +Merging gpio/for-next (e4df1ebdfeb4 Merge branch 'ib-gpiod-flags' into devel) +$ git merge gpio/for-next +Resolved 'drivers/staging/greybus/gpio.c' using previous resolution. +Auto-merging include/linux/gpio/driver.h +Auto-merging drivers/video/fbdev/amba-clcd-nomadik.c +Auto-merging drivers/usb/serial/cp210x.c +Auto-merging drivers/staging/greybus/gpio.c +CONFLICT (content): Merge conflict in drivers/staging/greybus/gpio.c +Auto-merging drivers/pinctrl/sunxi/pinctrl-sunxi.c +Auto-merging drivers/pinctrl/pinctrl-amd.c +Auto-merging drivers/pinctrl/meson/pinctrl-meson.c +Auto-merging drivers/input/keyboard/gpio_keys_polled.c +Auto-merging drivers/input/keyboard/gpio_keys.c +Auto-merging drivers/gpio/gpiolib.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b59a75d2b6e9] Merge remote-tracking branch 'gpio/for-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/gpio/cortina,gemini-gpio.txt | 24 ++ + .../devicetree/bindings/gpio/gpio-pca953x.txt | 4 + + Documentation/devicetree/bindings/gpio/gpio.txt | 8 +- + Documentation/gpio/driver.txt | 64 ++++- + drivers/gpio/Kconfig | 18 ++ + drivers/gpio/Makefile | 2 + + drivers/gpio/devres.c | 32 ++- + drivers/gpio/gpio-104-dio-48e.c | 91 ++++-- + drivers/gpio/gpio-104-idi-48.c | 45 ++- + drivers/gpio/gpio-104-idio-16.c | 60 ++-- + drivers/gpio/gpio-bcm-kona.c | 14 +- + drivers/gpio/gpio-davinci.c | 177 ++++++------ + drivers/gpio/gpio-dln2.c | 12 +- + drivers/gpio/gpio-dwapb.c | 14 +- + drivers/gpio/gpio-ep93xx.c | 11 +- + drivers/gpio/gpio-exar.c | 200 +++++++++++++ + drivers/gpio/gpio-f7188x.c | 19 +- + drivers/gpio/gpio-gemini.c | 236 +++++++++++++++ + drivers/gpio/gpio-gpio-mm.c | 68 ++++- + drivers/gpio/gpio-intel-mid.c | 2 +- + drivers/gpio/gpio-lp873x.c | 14 +- + drivers/gpio/gpio-max77620.c | 20 +- + drivers/gpio/gpio-mcp23s08.c | 320 +++++++++------------ + drivers/gpio/gpio-menz127.c | 34 ++- + drivers/gpio/gpio-merrifield.c | 14 +- + drivers/gpio/gpio-mm-lantiq.c | 2 +- + drivers/gpio/gpio-mockup.c | 23 +- + drivers/gpio/gpio-mvebu.c | 2 +- + drivers/gpio/gpio-omap.c | 14 +- + drivers/gpio/gpio-pca953x.c | 9 + + drivers/gpio/gpio-rcar.c | 21 +- + drivers/gpio/gpio-stp-xway.c | 2 +- + drivers/gpio/gpio-tc3589x.c | 15 +- + drivers/gpio/gpio-tegra.c | 14 +- + drivers/gpio/gpio-tps65218.c | 14 +- + drivers/gpio/gpio-vx855.c | 13 +- + drivers/gpio/gpio-wcove.c | 13 +- + drivers/gpio/gpio-wm831x.c | 21 +- + drivers/gpio/gpio-wm8994.c | 13 +- + drivers/gpio/gpio-ws16c48.c | 90 ++++-- + drivers/gpio/gpiolib-acpi.c | 5 +- + drivers/gpio/gpiolib-of.c | 31 +- + drivers/gpio/gpiolib.c | 111 ++++--- + drivers/gpio/gpiolib.h | 3 +- + drivers/input/keyboard/gpio_keys.c | 12 +- + drivers/input/keyboard/gpio_keys_polled.c | 14 +- + drivers/leds/leds-gpio.c | 14 +- + drivers/pinctrl/bcm/pinctrl-bcm281xx.c | 6 +- + drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 2 +- + drivers/pinctrl/bcm/pinctrl-ns2-mux.c | 6 +- + drivers/pinctrl/bcm/pinctrl-nsp-gpio.c | 6 +- + drivers/pinctrl/core.c | 29 ++ + drivers/pinctrl/intel/pinctrl-cherryview.c | 4 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 14 +- + drivers/pinctrl/meson/pinctrl-meson.c | 2 - + drivers/pinctrl/pinconf.c | 12 + + drivers/pinctrl/pinconf.h | 9 + + drivers/pinctrl/pinctrl-amd.c | 14 +- + drivers/pinctrl/pinctrl-da850-pupd.c | 2 - + drivers/pinctrl/pinctrl-lpc18xx.c | 10 +- + drivers/pinctrl/pinctrl-max77620.c | 2 +- + drivers/pinctrl/pinctrl-palmas.c | 2 +- + drivers/pinctrl/pinctrl-rockchip.c | 2 +- + drivers/pinctrl/pinctrl-single.c | 2 +- + drivers/pinctrl/pinctrl-sx150x.c | 55 +--- + drivers/pinctrl/sirf/pinctrl-atlas7.c | 3 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 2 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 4 +- + drivers/pinctrl/vt8500/pinctrl-wmt.c | 2 +- + drivers/rtc/rtc-omap.c | 2 +- + drivers/staging/greybus/gpio.c | 15 +- + drivers/usb/serial/cp210x.c | 13 +- + drivers/video/fbdev/amba-clcd-nomadik.c | 19 +- + include/linux/gpio/consumer.h | 38 ++- + include/linux/gpio/driver.h | 37 +-- + include/linux/pinctrl/consumer.h | 6 + + include/linux/pinctrl/pinconf-generic.h | 52 ++-- + include/linux/platform_data/gpio-davinci.h | 15 +- + tools/gpio/.gitignore | 4 + + tools/gpio/gpio-hammer.c | 2 +- + 80 files changed, 1561 insertions(+), 791 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/cortina,gemini-gpio.txt + create mode 100644 drivers/gpio/gpio-exar.c + create mode 100644 drivers/gpio/gpio-gemini.c + create mode 100644 tools/gpio/.gitignore +$ git am -3 ../patches/serial--st-asc--Use-new-GPIOD-API-to-obtain-RTS-pin.patch +Applying: serial: st-asc: Use new GPIOD API to obtain RTS pin +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/tty/serial/st-asc.c +$ git add -A . +$ git commit -v -a --amend +[master 779c4aee16df] Merge remote-tracking branch 'gpio/for-next' + Date: Fri Feb 10 16:07:59 2017 +1100 +Merging pinctrl/for-next (2039834c86f3 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Resolved 'arch/arm/mach-exynos/suspend.c' using previous resolution. +Auto-merging drivers/pinctrl/sunxi/pinctrl-sun5i.c +Removing drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c +Removing drivers/pinctrl/sunxi/pinctrl-gr8.c +Auto-merging arch/arm/mach-s5pv210/pm.c +Auto-merging arch/arm/mach-exynos/suspend.c +CONFLICT (content): Merge conflict in arch/arm/mach-exynos/suspend.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 458107ac92fa] Merge remote-tracking branch 'pinctrl/for-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 1 + + .../bindings/pinctrl/fsl,imx7d-pinctrl.txt | 2 +- + .../pinctrl/marvell,armada-98dx3236-pinctrl.txt | 46 + + .../bindings/pinctrl/marvell,kirkwood-pinctrl.txt | 20 +- + .../devicetree/bindings/pinctrl/pinctrl-aspeed.txt | 131 +- + .../bindings/pinctrl/samsung-pinctrl.txt | 1 + + .../devicetree/bindings/pinctrl/ti,iodelay.txt | 47 + + Documentation/pinctrl.txt | 4 +- + arch/arm/mach-exynos/suspend.c | 64 - + arch/arm/mach-s5pv210/pm.c | 7 - + arch/arm/mach-s5pv210/regs-clock.h | 4 - + drivers/gpio/gpio-aspeed.c | 188 +- + drivers/pinctrl/Kconfig | 12 +- + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c | 1115 +++++++++++- + drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 1524 +++++++++++++++- + drivers/pinctrl/aspeed/pinctrl-aspeed.c | 165 +- + drivers/pinctrl/aspeed/pinctrl-aspeed.h | 33 +- + drivers/pinctrl/core.c | 372 +++- + drivers/pinctrl/core.h | 55 + + drivers/pinctrl/devicetree.c | 31 +- + drivers/pinctrl/devicetree.h | 12 +- + drivers/pinctrl/freescale/Kconfig | 3 +- + drivers/pinctrl/freescale/pinctrl-imx.c | 300 ++- + drivers/pinctrl/freescale/pinctrl-imx.h | 34 +- + drivers/pinctrl/intel/Kconfig | 8 + + drivers/pinctrl/intel/Makefile | 1 + + drivers/pinctrl/intel/pinctrl-baytrail.c | 19 +- + drivers/pinctrl/intel/pinctrl-broxton.c | 5 +- + drivers/pinctrl/intel/pinctrl-geminilake.c | 512 ++++++ + drivers/pinctrl/intel/pinctrl-intel.c | 169 +- + drivers/pinctrl/intel/pinctrl-intel.h | 8 +- + drivers/pinctrl/intel/pinctrl-sunrisepoint.c | 1 - + drivers/pinctrl/mediatek/Kconfig | 15 +- + drivers/pinctrl/mediatek/pinctrl-mt7623.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-mtk-mt7623.h | 2 +- + drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 19 + + drivers/pinctrl/meson/pinctrl-meson-gxl.c | 27 + + drivers/pinctrl/mvebu/pinctrl-armada-370.c | 24 +- + drivers/pinctrl/mvebu/pinctrl-armada-375.c | 24 +- + drivers/pinctrl/mvebu/pinctrl-armada-38x.c | 24 +- + drivers/pinctrl/mvebu/pinctrl-armada-39x.c | 24 +- + drivers/pinctrl/mvebu/pinctrl-armada-xp.c | 191 +- + drivers/pinctrl/mvebu/pinctrl-dove.c | 96 +- + drivers/pinctrl/mvebu/pinctrl-kirkwood.c | 33 +- + drivers/pinctrl/mvebu/pinctrl-mvebu.c | 179 +- + drivers/pinctrl/mvebu/pinctrl-mvebu.h | 65 +- + drivers/pinctrl/mvebu/pinctrl-orion.c | 8 +- + drivers/pinctrl/pinctrl-amd.c | 37 +- + drivers/pinctrl/pinctrl-amd.h | 8 +- + drivers/pinctrl/pinctrl-da850-pupd.c | 1 + + drivers/pinctrl/pinctrl-falcon.c | 2 +- + drivers/pinctrl/pinctrl-lantiq.c | 2 +- + drivers/pinctrl/pinctrl-lantiq.h | 2 +- + drivers/pinctrl/pinctrl-single.c | 297 +-- + drivers/pinctrl/pinctrl-xway.c | 2 +- + drivers/pinctrl/pinmux.c | 216 ++- + drivers/pinctrl/pinmux.h | 56 + + drivers/pinctrl/qcom/pinctrl-msm.c | 48 +- + drivers/pinctrl/qcom/pinctrl-msm8660.c | 6 +- + drivers/pinctrl/samsung/pinctrl-exynos.c | 386 ++-- + drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 12 +- + drivers/pinctrl/samsung/pinctrl-samsung.c | 125 +- + drivers/pinctrl/samsung/pinctrl-samsung.h | 43 +- + drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 87 + + drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 450 +++-- + drivers/pinctrl/sh-pfc/pfc-r8a7796.c | 1920 +++++++++++++++++++- + drivers/pinctrl/sh-pfc/pinctrl.c | 4 +- + drivers/pinctrl/sirf/pinctrl-atlas7.c | 13 +- + drivers/pinctrl/stm32/pinctrl-stm32.c | 38 +- + drivers/pinctrl/sunxi/Kconfig | 18 +- + drivers/pinctrl/sunxi/Makefile | 6 +- + drivers/pinctrl/sunxi/pinctrl-gr8.c | 536 ------ + drivers/pinctrl/sunxi/pinctrl-sun50i-h5.c | 558 ++++++ + drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c | 403 ---- + .../{pinctrl-sun5i-a10s.c => pinctrl-sun5i.c} | 201 +- + drivers/pinctrl/sunxi/pinctrl-sun8i-v3s.c | 321 ++++ + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 77 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.h | 30 +- + drivers/pinctrl/ti/Kconfig | 10 + + drivers/pinctrl/ti/Makefile | 1 + + drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 937 ++++++++++ + include/linux/pinctrl/pinctrl.h | 15 + + 83 files changed, 9874 insertions(+), 2622 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,armada-98dx3236-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/ti,iodelay.txt + create mode 100644 drivers/pinctrl/intel/pinctrl-geminilake.c + delete mode 100644 drivers/pinctrl/sunxi/pinctrl-gr8.c + create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun50i-h5.c + delete mode 100644 drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c + rename drivers/pinctrl/sunxi/{pinctrl-sun5i-a10s.c => pinctrl-sun5i.c} (83%) + create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun8i-v3s.c + create mode 100644 drivers/pinctrl/ti/Kconfig + create mode 100644 drivers/pinctrl/ti/Makefile + create mode 100644 drivers/pinctrl/ti/pinctrl-ti-iodelay.c +Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (4651209c75d1 Merge branch 'for-4.11/drivers' into for-next) +$ git merge pwm/for-next +Auto-merging drivers/pwm/Kconfig +Auto-merging drivers/acpi/acpi_lpss.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/pwm/imx-pwm.txt | 6 +- + drivers/acpi/acpi_lpss.c | 14 ++ + drivers/leds/leds-pwm.c | 16 +- + drivers/pwm/Kconfig | 4 +- + drivers/pwm/core.c | 70 +++--- + drivers/pwm/pwm-atmel-hlcdc.c | 1 - + drivers/pwm/pwm-atmel.c | 1 - + drivers/pwm/pwm-bcm-kona.c | 1 - + drivers/pwm/pwm-berlin.c | 1 - + drivers/pwm/pwm-bfin.c | 2 +- + drivers/pwm/pwm-brcmstb.c | 1 - + drivers/pwm/pwm-fsl-ftm.c | 1 - + drivers/pwm/pwm-imx.c | 272 ++++++++++------------ + drivers/pwm/pwm-lp3943.c | 1 - + drivers/pwm/pwm-lpss-pci.c | 22 ++ + drivers/pwm/pwm-lpss-platform.c | 21 ++ + drivers/pwm/pwm-lpss.c | 132 +++++------ + drivers/pwm/pwm-lpss.h | 4 - + drivers/pwm/pwm-mxs.c | 2 +- + drivers/pwm/pwm-pca9685.c | 176 ++++++++++++-- + drivers/pwm/pwm-pxa.c | 2 +- + drivers/pwm/pwm-sti.c | 1 - + drivers/pwm/pwm-sun4i.c | 1 - + drivers/pwm/pwm-twl-led.c | 1 - + drivers/pwm/pwm-twl.c | 1 - + drivers/pwm/pwm-vt8500.c | 2 +- + drivers/staging/greybus/pwm.c | 1 - + include/linux/pwm.h | 33 ++- + 28 files changed, 480 insertions(+), 310 deletions(-) +Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files) +$ git merge dma-buf/for-next +Resolved 'drivers/dma-buf/Kconfig' using previous resolution. +Auto-merging drivers/dma-buf/Kconfig +CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 20fed3fe6be4] Merge remote-tracking branch 'dma-buf/for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 11 +++++++++++ + 1 file changed, 11 insertions(+) +Merging userns/for-next (1064f874abc0 mnt: Tuck mounts under others instead of creating shadow/side mounts.) +$ git merge userns/for-next +Resolved 'security/selinux/hooks.c' using previous resolution. +Auto-merging security/smack/smack_lsm.c +Auto-merging security/selinux/hooks.c +CONFLICT (content): Merge conflict in security/selinux/hooks.c +Auto-merging security/commoncap.c +Auto-merging security/apparmor/domain.c +Auto-merging kernel/ucount.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/fork.c +Auto-merging kernel/exit.c +Auto-merging include/linux/security.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/fsnotify_backend.h +Auto-merging include/linux/debugfs.h +Auto-merging fs/super.c +Auto-merging fs/proc/base.c +Auto-merging fs/namei.c +Auto-merging fs/debugfs/inode.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 348b2a4ec183] Merge remote-tracking branch 'userns/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/afs/mntpt.c | 2 +- + fs/autofs4/waitq.c | 4 +- + fs/cifs/cifs_dfs_ref.c | 7 +- + fs/debugfs/inode.c | 8 +-- + fs/exec.c | 8 +-- + fs/mount.h | 1 - + fs/namei.c | 9 ++- + fs/namespace.c | 127 +++++++++++++++++++++-------------- + fs/nfs/namespace.c | 2 +- + fs/nfs/nfs4namespace.c | 2 +- + fs/notify/inotify/inotify.h | 17 +++++ + fs/notify/inotify/inotify_fsnotify.c | 6 +- + fs/notify/inotify/inotify_user.c | 34 +++++----- + fs/nsfs.c | 13 ++++ + fs/pnode.c | 61 +++++++++++++---- + fs/pnode.h | 2 + + fs/proc/base.c | 102 ++++++++++++++++------------ + fs/proc/fd.c | 12 +--- + fs/proc/internal.h | 16 +---- + fs/super.c | 13 +++- + include/linux/debugfs.h | 3 +- + include/linux/fsnotify_backend.h | 3 +- + include/linux/mount.h | 3 + + include/linux/sched.h | 7 +- + include/linux/security.h | 3 +- + include/linux/user_namespace.h | 4 ++ + include/uapi/linux/fs.h | 1 + + include/uapi/linux/nsfs.h | 9 ++- + kernel/exit.c | 13 ++-- + kernel/fork.c | 42 +++++++++++- + kernel/sys.c | 22 ++++++ + kernel/trace/trace.c | 4 +- + kernel/ucount.c | 6 +- + security/apparmor/domain.c | 2 +- + security/commoncap.c | 5 +- + security/selinux/hooks.c | 3 +- + security/smack/smack_lsm.c | 2 +- + 37 files changed, 373 insertions(+), 205 deletions(-) +Merging ktest/for-next (2dcd0af568b0 Linux 4.6) +$ git merge ktest/for-next +Already up-to-date. +Merging random/dev (db61ffe3a71c random: move random_min_urandom_seed into CONFIG_SYSCTL ifdef block) +$ git merge random/dev +Auto-merging init/main.c +Merge made by the 'recursive' strategy. + drivers/char/random.c | 129 +++++++++++++++++++------------------------------ + include/linux/random.h | 18 +++++-- + init/main.c | 1 - + 3 files changed, 65 insertions(+), 83 deletions(-) +Merging aio/master (b562e44f507e Linux 4.5) +$ git merge aio/master +Already up-to-date. +Merging kselftest/next (2195bff04148 selftests, x86, protection_keys: fix wrong offset in siginfo) +$ git merge kselftest/next +Resolved 'tools/testing/selftests/bpf/Makefile' using previous resolution. +Auto-merging tools/testing/selftests/x86/protection_keys.c +Auto-merging tools/testing/selftests/x86/Makefile +Auto-merging tools/testing/selftests/bpf/Makefile +CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/Makefile +Auto-merging tools/testing/selftests/Makefile +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 840a7fb4c719] Merge remote-tracking branch 'kselftest/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/kselftest.txt | 12 + + MAINTAINERS | 1 + + tools/power/cpupower/utils/cpufreq-info.c | 21 +- + tools/testing/selftests/Makefile | 38 +++- + tools/testing/selftests/bpf/Makefile | 10 +- + tools/testing/selftests/breakpoints/Makefile | 10 +- + tools/testing/selftests/capabilities/Makefile | 11 +- + tools/testing/selftests/cpufreq/Makefile | 8 + + tools/testing/selftests/cpufreq/cpu.sh | 84 +++++++ + tools/testing/selftests/cpufreq/cpufreq.sh | 241 ++++++++++++++++++++ + tools/testing/selftests/cpufreq/governor.sh | 153 +++++++++++++ + tools/testing/selftests/cpufreq/main.sh | 194 ++++++++++++++++ + tools/testing/selftests/cpufreq/module.sh | 243 +++++++++++++++++++++ + tools/testing/selftests/cpufreq/special-tests.sh | 115 ++++++++++ + tools/testing/selftests/efivarfs/Makefile | 8 +- + tools/testing/selftests/exec/Makefile | 32 ++- + tools/testing/selftests/ftrace/Makefile | 6 +- + tools/testing/selftests/futex/Makefile | 21 +- + tools/testing/selftests/futex/functional/Makefile | 17 +- + tools/testing/selftests/futex/include/logging.h | 1 + + tools/testing/selftests/gpio/.gitignore | 1 + + tools/testing/selftests/intel_pstate/Makefile | 13 +- + tools/testing/selftests/intel_pstate/aperf.c | 2 +- + tools/testing/selftests/ipc/.gitignore | 1 + + tools/testing/selftests/ipc/Makefile | 7 +- + tools/testing/selftests/kcmp/Makefile | 6 +- + tools/testing/selftests/lib.mk | 36 ++- + tools/testing/selftests/membarrier/Makefile | 6 +- + tools/testing/selftests/memfd/Makefile | 15 +- + tools/testing/selftests/mount/Makefile | 7 +- + tools/testing/selftests/mqueue/Makefile | 6 +- + tools/testing/selftests/net/Makefile | 15 +- + tools/testing/selftests/nsfs/Makefile | 9 +- + tools/testing/selftests/powerpc/Makefile | 15 +- + tools/testing/selftests/powerpc/alignment/Makefile | 9 +- + .../testing/selftests/powerpc/benchmarks/Makefile | 15 +- + .../selftests/powerpc/context_switch/Makefile | 9 +- + tools/testing/selftests/powerpc/copyloops/Makefile | 19 +- + tools/testing/selftests/powerpc/dscr/Makefile | 13 +- + tools/testing/selftests/powerpc/math/Makefile | 25 +-- + tools/testing/selftests/powerpc/mm/Makefile | 18 +- + tools/testing/selftests/powerpc/pmu/Makefile | 26 +-- + tools/testing/selftests/powerpc/pmu/ebb/Makefile | 15 +- + .../testing/selftests/powerpc/primitives/Makefile | 9 +- + .../testing/selftests/powerpc/stringloops/Makefile | 9 +- + .../selftests/powerpc/switch_endian/Makefile | 17 +- + tools/testing/selftests/powerpc/syscalls/Makefile | 9 +- + tools/testing/selftests/powerpc/tm/Makefile | 17 +- + tools/testing/selftests/powerpc/vphn/Makefile | 10 +- + tools/testing/selftests/pstore/Makefile | 4 +- + tools/testing/selftests/ptrace/Makefile | 8 +- + tools/testing/selftests/seccomp/Makefile | 6 +- + tools/testing/selftests/sigaltstack/Makefile | 5 +- + tools/testing/selftests/size/Makefile | 10 +- + tools/testing/selftests/timers/Makefile | 10 +- + tools/testing/selftests/vm/Makefile | 41 ++-- + tools/testing/selftests/x86/Makefile | 17 +- + tools/testing/selftests/x86/protection_keys.c | 19 +- + tools/testing/selftests/zram/Makefile | 3 +- + 59 files changed, 1314 insertions(+), 394 deletions(-) + create mode 100644 tools/testing/selftests/cpufreq/Makefile + create mode 100755 tools/testing/selftests/cpufreq/cpu.sh + create mode 100755 tools/testing/selftests/cpufreq/cpufreq.sh + create mode 100755 tools/testing/selftests/cpufreq/governor.sh + create mode 100755 tools/testing/selftests/cpufreq/main.sh + create mode 100755 tools/testing/selftests/cpufreq/module.sh + create mode 100755 tools/testing/selftests/cpufreq/special-tests.sh + create mode 100644 tools/testing/selftests/gpio/.gitignore +Merging y2038/y2038 (69973b830859 Linux 4.9) +$ git merge y2038/y2038 +Already up-to-date. +Merging luto-misc/next (2dcd0af568b0 Linux 4.6) +$ git merge luto-misc/next +Already up-to-date. +Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge borntraeger/linux-next +Already up-to-date. +Merging livepatching/for-next (372e2db7210d livepatch: doc: remove the limitation for schedule() patching) +$ git merge livepatching/for-next +Auto-merging Documentation/livepatch/livepatch.txt +Merge made by the 'recursive' strategy. + Documentation/livepatch/livepatch.txt | 19 ------------------- + arch/powerpc/include/asm/livepatch.h | 7 ------- + 2 files changed, 26 deletions(-) +Merging coresight/next (7f12a0d4a674 coresight: STM: Balance enable/disable) +$ git merge coresight/next +Merge made by the 'recursive' strategy. +Merging rtc/rtc-next (4c6106406eb1 rtc: sun6i: Fix compatibility with old DT binding) +$ git merge rtc/rtc-next +Auto-merging drivers/rtc/Kconfig +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-bus-i2c-devices-bq32k | 7 + + .../devicetree/bindings/rtc/cortina,gemini.txt | 14 + + .../devicetree/bindings/rtc/imxdi-rtc.txt | 5 +- + .../devicetree/bindings/rtc/st,stm32-rtc.txt | 27 + + .../devicetree/bindings/rtc/sun6i-rtc.txt | 10 + + drivers/rtc/Kconfig | 13 +- + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-armada38x.c | 141 +++- + drivers/rtc/rtc-au1xxx.c | 2 +- + drivers/rtc/rtc-bfin.c | 2 +- + drivers/rtc/rtc-bq32k.c | 76 +++ + drivers/rtc/rtc-dm355evm.c | 2 +- + drivers/rtc/rtc-gemini.c | 7 + + drivers/rtc/rtc-imxdi.c | 33 +- + drivers/rtc/rtc-ls1x.c | 2 +- + drivers/rtc/rtc-mcp795.c | 183 +++++- + drivers/rtc/rtc-mxc.c | 2 +- + drivers/rtc/rtc-rx8010.c | 24 +- + drivers/rtc/rtc-sh.c | 2 +- + drivers/rtc/rtc-snvs.c | 1 + + drivers/rtc/rtc-stm32.c | 725 +++++++++++++++++++++ + drivers/rtc/rtc-sun6i.c | 182 +++++- + drivers/rtc/rtc-tegra.c | 41 +- + drivers/rtc/rtc-tps65910.c | 146 ++++- + include/linux/mfd/tps65910.h | 1 + + 25 files changed, 1536 insertions(+), 113 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-i2c-devices-bq32k + create mode 100644 Documentation/devicetree/bindings/rtc/cortina,gemini.txt + create mode 100644 Documentation/devicetree/bindings/rtc/st,stm32-rtc.txt + create mode 100644 drivers/rtc/rtc-stm32.c +Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field) +$ git merge hwspinlock/for-next +Already up-to-date. +Merging nvdimm/libnvdimm-for-next (bfb34527a32a libnvdimm, pfn: fix memmap reservation size versus 4K alignment) +$ git merge nvdimm/libnvdimm-for-next +Already up-to-date. +Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection) +$ git merge dax-misc/dax-misc +Already up-to-date. +Merging extable/extable (90858794c960 module.h: remove extable.h include now users have migrated) +$ git merge extable/extable +Auto-merging kernel/module.c +Auto-merging kernel/extable.c +Auto-merging init/main.c +Auto-merging include/linux/module.h +Auto-merging arch/openrisc/kernel/traps.c +Auto-merging arch/arm/mm/fault.c +Merge made by the 'recursive' strategy. + arch/alpha/kernel/traps.c | 2 +- + arch/alpha/mm/fault.c | 2 +- + arch/arc/mm/extable.c | 3 ++- + arch/arm/mm/extable.c | 2 +- + arch/arm/mm/fault.c | 2 +- + arch/cris/arch-v32/kernel/traps.c | 2 +- + arch/frv/mm/extable.c | 2 +- + arch/hexagon/mm/vm_fault.c | 2 +- + arch/ia64/include/asm/exception.h | 35 +++++++++++++++++++++++++++++++++++ + arch/ia64/include/asm/uaccess.h | 15 --------------- + arch/ia64/kernel/kprobes.c | 4 ++-- + arch/ia64/kernel/traps.c | 6 ++++-- + arch/ia64/kernel/unaligned.c | 4 +++- + arch/ia64/mm/fault.c | 2 ++ + arch/m32r/mm/extable.c | 2 +- + arch/m32r/mm/fault.c | 2 +- + arch/metag/mm/extable.c | 3 +-- + arch/microblaze/mm/fault.c | 2 +- + arch/mn10300/mm/extable.c | 2 +- + arch/mn10300/mm/misalignment.c | 2 +- + arch/nios2/mm/extable.c | 2 +- + arch/nios2/mm/fault.c | 2 +- + arch/openrisc/kernel/traps.c | 2 +- + arch/openrisc/mm/fault.c | 2 +- + arch/score/kernel/traps.c | 2 +- + arch/score/mm/extable.c | 2 +- + arch/score/mm/fault.c | 2 +- + arch/sh/include/asm/uaccess.h | 1 - + arch/sh/kernel/kprobes.c | 2 +- + arch/sh/kernel/traps.c | 3 ++- + arch/sh/mm/extable_32.c | 2 +- + arch/sh/mm/extable_64.c | 2 +- + arch/sparc/mm/extable.c | 1 + + arch/unicore32/mm/extable.c | 2 +- + arch/unicore32/mm/fault.c | 2 +- + arch/xtensa/mm/fault.c | 2 +- + include/linux/module.h | 1 - + init/main.c | 1 + + kernel/extable.c | 1 + + kernel/module.c | 1 + + 40 files changed, 80 insertions(+), 51 deletions(-) + create mode 100644 arch/ia64/include/asm/exception.h +Merging idr/idr-4.11 (12d3b9b904e8 radix tree test suite: Run iteration tests for longer) +$ git merge idr/idr-4.11 +Removing tools/testing/radix-tree/linux/types.h +Removing tools/testing/radix-tree/linux/mempool.h +Removing tools/testing/radix-tree/linux/export.h +Removing tools/testing/radix-tree/linux/bitops/non-atomic.h +Removing tools/testing/radix-tree/linux/bitops/le.h +Removing tools/testing/radix-tree/linux/bitops/hweight.h +Removing tools/testing/radix-tree/linux/bitops/fls64.h +Removing tools/testing/radix-tree/linux/bitops/fls.h +Removing tools/testing/radix-tree/linux/bitops/find.h +Removing tools/testing/radix-tree/linux/bitops/ffz.h +Removing tools/testing/radix-tree/linux/bitops/ffs.h +Removing tools/testing/radix-tree/linux/bitops/__ffs.h +Removing tools/testing/radix-tree/linux/bitops.h +Auto-merging net/mac80211/status.c +Auto-merging lib/radix-tree.c +Auto-merging init/main.c +Auto-merging drivers/block/drbd/drbd_main.c +Merge made by the 'recursive' strategy. + drivers/atm/nicstar.c | 5 +- + drivers/block/drbd/drbd_main.c | 6 +- + drivers/firewire/core-cdev.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 10 +- + drivers/net/wireless/marvell/mwifiex/txrx.c | 4 +- + drivers/target/target_core_user.c | 4 +- + include/linux/idr.h | 148 ++- + include/linux/radix-tree.h | 85 +- + init/main.c | 3 +- + lib/idr.c | 1241 +++++--------------- + lib/radix-tree.c | 645 +++++++--- + mm/workingset.c | 6 +- + net/mac80211/status.c | 4 +- + tools/include/asm-generic/bitops/atomic.h | 3 + + tools/include/asm/bug.h | 8 + + tools/include/linux/bitmap.h | 1 + + tools/include/linux/bitops.h | 1 - + tools/include/linux/compiler.h | 4 + + tools/include/linux/spinlock.h | 5 + + tools/testing/radix-tree/.gitignore | 3 + + tools/testing/radix-tree/Makefile | 30 +- + tools/testing/radix-tree/benchmark.c | 6 +- + tools/testing/radix-tree/generated/autoconf.h | 2 - + tools/testing/radix-tree/idr-test.c | 444 +++++++ + tools/testing/radix-tree/iteration_check.c | 2 +- + tools/testing/radix-tree/linux.c | 39 +- + tools/testing/radix-tree/linux/bitops.h | 160 --- + tools/testing/radix-tree/linux/bitops/__ffs.h | 43 - + tools/testing/radix-tree/linux/bitops/ffs.h | 41 - + tools/testing/radix-tree/linux/bitops/ffz.h | 12 - + tools/testing/radix-tree/linux/bitops/find.h | 13 - + tools/testing/radix-tree/linux/bitops/fls.h | 41 - + tools/testing/radix-tree/linux/bitops/fls64.h | 14 - + tools/testing/radix-tree/linux/bitops/hweight.h | 11 - + tools/testing/radix-tree/linux/bitops/le.h | 53 - + tools/testing/radix-tree/linux/bitops/non-atomic.h | 110 -- + tools/testing/radix-tree/linux/export.h | 2 - + tools/testing/radix-tree/linux/gfp.h | 10 +- + tools/testing/radix-tree/linux/idr.h | 1 + + tools/testing/radix-tree/linux/init.h | 2 +- + tools/testing/radix-tree/linux/kernel.h | 49 +- + tools/testing/radix-tree/linux/mempool.h | 16 - + tools/testing/radix-tree/linux/percpu.h | 5 +- + tools/testing/radix-tree/linux/preempt.h | 10 + + tools/testing/radix-tree/linux/radix-tree.h | 23 + + tools/testing/radix-tree/linux/types.h | 23 - + tools/testing/radix-tree/main.c | 53 +- + tools/testing/radix-tree/multiorder.c | 39 +- + tools/testing/radix-tree/regression1.c | 4 +- + tools/testing/radix-tree/regression2.c | 10 +- + tools/testing/radix-tree/regression3.c | 28 +- + tools/testing/radix-tree/tag_check.c | 22 +- + tools/testing/radix-tree/test.c | 28 +- + tools/testing/radix-tree/test.h | 2 + + 55 files changed, 1575 insertions(+), 1966 deletions(-) + create mode 100644 tools/include/linux/spinlock.h + create mode 100644 tools/testing/radix-tree/idr-test.c + delete mode 100644 tools/testing/radix-tree/linux/bitops.h + delete mode 100644 tools/testing/radix-tree/linux/bitops/__ffs.h + delete mode 100644 tools/testing/radix-tree/linux/bitops/ffs.h + delete mode 100644 tools/testing/radix-tree/linux/bitops/ffz.h + delete mode 100644 tools/testing/radix-tree/linux/bitops/find.h + delete mode 100644 tools/testing/radix-tree/linux/bitops/fls.h + delete mode 100644 tools/testing/radix-tree/linux/bitops/fls64.h + delete mode 100644 tools/testing/radix-tree/linux/bitops/hweight.h + delete mode 100644 tools/testing/radix-tree/linux/bitops/le.h + delete mode 100644 tools/testing/radix-tree/linux/bitops/non-atomic.h + delete mode 100644 tools/testing/radix-tree/linux/export.h + create mode 100644 tools/testing/radix-tree/linux/idr.h + delete mode 100644 tools/testing/radix-tree/linux/mempool.h + delete mode 100644 tools/testing/radix-tree/linux/types.h +Merging akpm-current/current (1224d22e9f1c scatterlist: do not disable IRQs in sg_copy_buffer) +$ git merge --no-ff akpm-current/current +Resolved 'drivers/gpu/drm/i915/i915_drv.h' using previous resolution. +Recorded preimage for 'fs/dax.c' +Recorded preimage for 'fs/iomap.c' +Recorded preimage for 'include/linux/dax.h' +Recorded preimage for 'include/linux/iomap.h' +Resolved 'include/linux/kprobes.h' using previous resolution. +Resolved 'mm/slab_common.c' using previous resolution. +Resolved 'tools/testing/selftests/vm/Makefile' using previous resolution. +Auto-merging tools/testing/selftests/vm/Makefile +CONFLICT (content): Merge conflict in tools/testing/selftests/vm/Makefile +Auto-merging security/selinux/selinuxfs.c +Auto-merging scripts/checkstack.pl +Auto-merging mm/workingset.c +Auto-merging mm/util.c +Auto-merging mm/slub.c +Auto-merging mm/slab_common.c +CONFLICT (content): Merge conflict in mm/slab_common.c +Auto-merging mm/slab.h +Auto-merging mm/slab.c +Auto-merging mm/rmap.c +Auto-merging mm/page-writeback.c +Auto-merging mm/kasan/kasan.c +Auto-merging mm/cma.c +Auto-merging mm/backing-dev.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging lib/Kconfig +Auto-merging kernel/trace/trace_output.c +Auto-merging kernel/signal.c +Auto-merging kernel/relay.c +Auto-merging kernel/fork.c +Auto-merging kernel/exit.c +Auto-merging kernel/events/core.c +Auto-merging kernel/configs/android-recommended.config +Auto-merging init/main.c +Auto-merging init/Kconfig +Auto-merging include/trace/trace_events.h +Auto-merging include/linux/trace_events.h +Auto-merging include/linux/slab.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/kprobes.h +CONFLICT (content): Merge conflict in include/linux/kprobes.h +Auto-merging include/linux/iomap.h +CONFLICT (content): Merge conflict in include/linux/iomap.h +Auto-merging include/linux/dax.h +CONFLICT (content): Merge conflict in include/linux/dax.h +Auto-merging include/linux/compiler.h +Auto-merging include/linux/compiler-gcc.h +Auto-merging fs/xfs/xfs_trace.h +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/proc/base.c +Auto-merging fs/ocfs2/dlm/dlmmaster.c +Auto-merging fs/kernfs/file.c +Auto-merging fs/iomap.c +CONFLICT (content): Merge conflict in fs/iomap.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/file.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/dax.c +CONFLICT (content): Merge conflict in fs/dax.c +Auto-merging fs/cifs/file.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/ctree.h +Auto-merging drivers/target/target_core_user.c +Auto-merging drivers/staging/lustre/lustre/llite/vvp_io.c +Auto-merging drivers/staging/android/ion/ion.c +Auto-merging drivers/scsi/sg.c +Auto-merging drivers/scsi/cxlflash/superpipe.c +Auto-merging drivers/iommu/intel-iommu.c +Auto-merging drivers/iommu/amd_iommu.c +Auto-merging drivers/gpu/drm/virtio/virtgpu_ttm.c +Auto-merging drivers/gpu/drm/udl/udl_drv.h +Auto-merging drivers/gpu/drm/tegra/gem.c +Auto-merging drivers/gpu/drm/radeon/radeon_ttm.c +Auto-merging drivers/gpu/drm/qxl/qxl_ttm.c +Auto-merging drivers/gpu/drm/omapdrm/omap_gem.c +Auto-merging drivers/gpu/drm/omapdrm/omap_drv.h +Auto-merging drivers/gpu/drm/msm/msm_gem.c +Auto-merging drivers/gpu/drm/msm/msm_drv.h +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/gma500/framebuffer.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem.c +Auto-merging drivers/gpu/drm/armada/armada_gem.c +Auto-merging drivers/block/zram/zram_drv.c +Auto-merging crypto/testmgr.h +Auto-merging block/genhd.c +Removing arch/x86/kernel/test_rodata.c +Auto-merging arch/x86/Kconfig.debug +Auto-merging arch/x86/Kconfig +Auto-merging arch/unicore32/include/asm/Kbuild +Removing arch/score/include/asm/current.h +Auto-merging arch/powerpc/xmon/xmon.c +Auto-merging arch/powerpc/kvm/book3s_hv_builtin.c +Auto-merging arch/powerpc/kvm/book3s_64_vio.c +Auto-merging arch/parisc/mm/init.c +Removing arch/parisc/include/asm/current.h +Auto-merging arch/openrisc/include/asm/Kbuild +Removing arch/m32r/include/asm/current.h +Removing arch/cris/include/asm/current.h +Auto-merging arch/arm64/mm/dma-mapping.c +Auto-merging arch/arm64/kernel/insn.c +Auto-merging arch/arm64/kernel/armv8_deprecated.c +Auto-merging arch/arm/mm/dma-mapping.c +Removing arch/alpha/include/asm/current.h +Auto-merging arch/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/vm/transhuge.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Removing Documentation/ABI/obsolete/sysfs-block-zram +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/dax.c'. +Recorded resolution for 'fs/iomap.c'. +Recorded resolution for 'include/linux/dax.h'. +Recorded resolution for 'include/linux/iomap.h'. +[master a7d8702f011f] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/obsolete/sysfs-block-zram | 119 --- + Documentation/ABI/testing/sysfs-block-zram | 101 +- + Documentation/admin-guide/kernel-parameters.txt | 8 + + Documentation/blockdev/zram.txt | 74 +- + .../filesystems/autofs4-mount-control.txt | 1 + + Documentation/filesystems/autofs4.txt | 39 +- + Documentation/sysctl/vm.txt | 4 +- + .../trace/postprocess/trace-vmscan-postprocess.pl | 26 +- + Documentation/vm/ksm.txt | 18 + + Documentation/vm/transhuge.txt | 8 +- + MAINTAINERS | 6 +- + arch/Kconfig | 3 + + arch/alpha/include/asm/Kbuild | 2 + + arch/alpha/include/asm/current.h | 9 - + arch/arc/include/asm/kprobes.h | 6 +- + arch/arm/include/asm/kprobes.h | 4 + + arch/arm/include/asm/page.h | 2 + + arch/arm/mm/dma-mapping.c | 16 +- + arch/arm/probes/decode.h | 1 + + arch/arm64/include/asm/kprobes.h | 4 + + arch/arm64/kernel/armv8_deprecated.c | 1 + + arch/arm64/kernel/insn.c | 1 + + arch/arm64/kernel/probes/decode-insn.h | 2 + + arch/arm64/mm/dma-mapping.c | 4 +- + arch/avr32/include/asm/kprobes.h | 7 +- + arch/blackfin/include/asm/Kbuild | 1 + + arch/c6x/include/asm/Kbuild | 1 + + arch/cris/include/asm/Kbuild | 2 + + arch/cris/include/asm/current.h | 15 - + arch/frv/include/asm/Kbuild | 1 + + arch/frv/mb93090-mb00/pci-frv.c | 11 +- + arch/h8300/include/asm/Kbuild | 1 + + arch/hexagon/include/asm/Kbuild | 1 + + arch/ia64/include/asm/kprobes.h | 12 +- + arch/ia64/mm/init.c | 48 - + arch/m32r/include/asm/Kbuild | 2 + + arch/m32r/include/asm/cmpxchg.h | 15 +- + arch/m32r/include/asm/current.h | 15 - + arch/m68k/68000/bootlogo-vz.h | 4 +- + arch/m68k/68000/bootlogo.h | 4 +- + arch/m68k/include/asm/Kbuild | 1 + + arch/m68k/include/asm/MC68328.h | 3 +- + arch/m68k/include/asm/MC68EZ328.h | 3 +- + arch/m68k/include/asm/MC68VZ328.h | 2 +- + arch/m68k/include/asm/natfeat.h | 3 +- + arch/m68k/lib/ashldi3.c | 8 +- + arch/m68k/lib/ashrdi3.c | 8 +- + arch/m68k/lib/lshrdi3.c | 8 +- + arch/m68k/lib/muldi3.c | 8 +- + arch/metag/include/asm/Kbuild | 1 + + arch/microblaze/include/asm/Kbuild | 1 + + arch/mips/include/asm/kprobes.h | 6 +- + arch/mips/kernel/vdso.c | 2 +- + arch/mips/mm/dma-default.c | 4 +- + arch/mn10300/include/asm/kprobes.h | 7 +- + arch/nios2/include/asm/Kbuild | 1 + + arch/openrisc/include/asm/Kbuild | 1 + + arch/parisc/include/asm/Kbuild | 2 + + arch/parisc/include/asm/current.h | 15 - + arch/parisc/mm/init.c | 49 - + arch/powerpc/include/asm/kprobes.h | 3 + + arch/powerpc/include/asm/page.h | 4 +- + arch/powerpc/kvm/book3s_64_vio.c | 4 +- + arch/powerpc/kvm/book3s_hv_builtin.c | 3 +- + arch/powerpc/platforms/cell/spufs/file.c | 39 +- + arch/powerpc/xmon/xmon.c | 2 +- + arch/s390/include/asm/kprobes.h | 7 +- + arch/s390/kernel/crash_dump.c | 1 + + arch/s390/mm/gmap.c | 2 +- + arch/score/include/asm/Kbuild | 2 + + arch/score/include/asm/current.h | 6 - + arch/sh/include/asm/kprobes.h | 5 +- + arch/sparc/include/asm/kprobes.h | 10 +- + arch/sparc/kernel/setup_32.c | 2 +- + arch/sparc/mm/init_32.c | 11 - + arch/tile/include/asm/kprobes.h | 6 +- + arch/tile/mm/elf.c | 2 +- + arch/tile/mm/pgtable.c | 45 - + arch/um/include/asm/Kbuild | 1 + + arch/unicore32/include/asm/Kbuild | 1 + + arch/unicore32/mm/init.c | 44 - + arch/x86/Kconfig | 1 + + arch/x86/Kconfig.debug | 10 +- + arch/x86/entry/vdso/vma.c | 2 +- + arch/x86/include/asm/cacheflush.h | 10 - + arch/x86/include/asm/kprobes.h | 9 +- + arch/x86/include/asm/paravirt.h | 11 + + arch/x86/include/asm/paravirt_types.h | 2 + + arch/x86/include/asm/pgtable-2level.h | 17 + + arch/x86/include/asm/pgtable-3level.h | 28 + + arch/x86/include/asm/pgtable.h | 140 +++ + arch/x86/include/asm/pgtable_64.h | 15 + + arch/x86/kernel/Makefile | 1 - + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/x86/kernel/paravirt.c | 1 + + arch/x86/kernel/pci-dma.c | 3 +- + arch/x86/kernel/test_rodata.c | 75 -- + arch/x86/mm/init_32.c | 4 - + arch/x86/mm/init_64.c | 22 +- + arch/x86/mm/mpx.c | 6 +- + arch/x86/mm/pgtable.c | 31 + + arch/xtensa/include/asm/Kbuild | 1 + + arch/xtensa/kernel/pci-dma.c | 3 +- + block/genhd.c | 2 +- + block/ioprio.c | 8 +- + crypto/lz4.c | 23 +- + crypto/lz4hc.c | 23 +- + crypto/testmgr.h | 142 ++- + drivers/android/binder.c | 4 +- + drivers/base/dma-contiguous.c | 5 +- + drivers/base/memory.c | 26 +- + drivers/block/zram/zram_drv.c | 228 ++-- + drivers/block/zram/zram_drv.h | 12 +- + drivers/char/agp/alpha-agp.c | 5 +- + drivers/char/mspec.c | 6 +- + drivers/dax/dax.c | 110 +- + drivers/gpu/drm/armada/armada_gem.c | 9 +- + drivers/gpu/drm/drm_vm.c | 36 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 3 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 3 +- + drivers/gpu/drm/exynos/exynos_drm_gem.h | 2 +- + drivers/gpu/drm/gma500/framebuffer.c | 3 +- + drivers/gpu/drm/gma500/gem.c | 3 +- + drivers/gpu/drm/gma500/psb_drv.h | 2 +- + drivers/gpu/drm/i915/i915_drv.h | 2 +- + drivers/gpu/drm/i915/i915_gem.c | 4 +- + drivers/gpu/drm/msm/msm_drv.h | 2 +- + drivers/gpu/drm/msm/msm_gem.c | 3 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 2 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 4 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 6 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 6 +- + drivers/gpu/drm/tegra/gem.c | 3 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 8 +- + drivers/gpu/drm/udl/udl_drv.h | 2 +- + drivers/gpu/drm/udl/udl_gem.c | 3 +- + drivers/gpu/drm/vgem/vgem_drv.c | 3 +- + drivers/gpu/drm/virtio/virtgpu_ttm.c | 7 +- + drivers/hsi/clients/cmt_speech.c | 4 +- + drivers/hwtracing/intel_th/msu.c | 6 +- + drivers/infiniband/hw/hfi1/file_ops.c | 4 +- + drivers/infiniband/hw/qib/qib_file_ops.c | 2 +- + drivers/iommu/amd_iommu.c | 2 +- + drivers/iommu/intel-iommu.c | 2 +- + drivers/media/v4l2-core/videobuf-dma-sg.c | 3 +- + drivers/misc/cxl/context.c | 3 +- + drivers/misc/sgi-gru/grumain.c | 3 +- + drivers/misc/sgi-gru/grutables.h | 2 +- + drivers/net/ethernet/sgi/ioc3-eth.c | 2 +- + drivers/nvdimm/pfn_devs.c | 42 +- + drivers/rapidio/devices/rio_mport_cdev.c | 11 +- + drivers/scsi/cxlflash/superpipe.c | 6 +- + drivers/scsi/sg.c | 3 +- + drivers/staging/android/ion/ion.c | 9 +- + drivers/staging/lustre/lustre/llite/llite_mmap.c | 7 +- + drivers/staging/lustre/lustre/llite/vvp_io.c | 2 +- + drivers/target/target_core_user.c | 6 +- + drivers/tty/sysrq.c | 2 +- + drivers/tty/vt/keyboard.c | 2 +- + drivers/uio/uio.c | 6 +- + drivers/usb/mon/mon_bin.c | 4 +- + drivers/video/fbdev/core/fb_defio.c | 16 +- + drivers/xen/privcmd.c | 4 +- + fs/9p/vfs_file.c | 4 +- + fs/affs/affs.h | 22 +- + fs/affs/amigaffs.c | 42 +- + fs/affs/inode.c | 9 +- + fs/affs/namei.c | 95 +- + fs/affs/super.c | 3 +- + fs/aio.c | 2 +- + fs/autofs4/dev-ioctl.c | 2 - + fs/autofs4/root.c | 17 +- + fs/binfmt_elf.c | 30 +- + fs/btrfs/ctree.h | 2 +- + fs/btrfs/inode.c | 6 +- + fs/ceph/addr.c | 8 +- + fs/cifs/file.c | 2 +- + fs/dax.c | 159 +-- + fs/ext2/file.c | 19 +- + fs/ext4/ext4.h | 4 +- + fs/ext4/file.c | 41 +- + fs/ext4/inode.c | 9 +- + fs/f2fs/file.c | 7 +- + fs/fuse/file.c | 6 +- + fs/gfs2/file.c | 8 +- + fs/hfs/dir.c | 2 +- + fs/hfs/mdb.c | 2 +- + fs/hfsplus/wrapper.c | 2 +- + fs/iomap.c | 5 +- + fs/kernfs/file.c | 13 +- + fs/ncpfs/mmap.c | 7 +- + fs/nfs/file.c | 4 +- + fs/nfs/write.c | 2 - + fs/nilfs2/file.c | 3 +- + fs/ocfs2/acl.c | 29 +- + fs/ocfs2/dlm/dlmmaster.c | 66 +- + fs/ocfs2/dlm/dlmrecovery.c | 40 +- + fs/ocfs2/dlmglue.c | 105 +- + fs/ocfs2/dlmglue.h | 18 + + fs/ocfs2/file.c | 58 +- + fs/ocfs2/mmap.c | 15 +- + fs/ocfs2/ocfs2.h | 1 + + fs/proc/base.c | 144 +-- + fs/proc/generic.c | 11 +- + fs/proc/kcore.c | 5 +- + fs/proc/vmcore.c | 8 +- + fs/pstore/platform.c | 22 +- + fs/reiserfs/super.c | 2 +- + fs/squashfs/lz4_wrapper.c | 12 +- + fs/ubifs/file.c | 5 +- + fs/userfaultfd.c | 556 +++++++++- + fs/xfs/xfs_file.c | 49 +- + fs/xfs/xfs_trace.h | 2 +- + include/asm-generic/kprobes.h | 25 + + include/asm-generic/pgtable.h | 80 +- + include/asm-generic/tlb.h | 14 + + include/linux/bug.h | 12 +- + include/linux/cma.h | 3 +- + include/linux/compat.h | 4 +- + include/linux/compiler-gcc.h | 1 + + include/linux/compiler.h | 8 - + include/linux/dax.h | 14 +- + include/linux/dma-contiguous.h | 4 +- + include/linux/gfp.h | 2 +- + include/linux/huge_mm.h | 84 +- + include/linux/hugetlb.h | 12 +- + include/linux/iomap.h | 3 +- + include/linux/iopoll.h | 2 +- + include/linux/kasan.h | 4 +- + include/linux/kernel.h | 10 +- + include/linux/kexec.h | 2 + + include/linux/kprobes.h | 19 +- + include/linux/lz4.h | 701 +++++++++++-- + include/linux/memblock.h | 2 + + include/linux/memcontrol.h | 2 + + include/linux/memory.h | 4 +- + include/linux/memory_hotplug.h | 6 +- + include/linux/migrate.h | 4 +- + include/linux/mm.h | 129 ++- + include/linux/mm_inline.h | 7 + + include/linux/mmu_notifier.h | 14 + + include/linux/mmzone.h | 38 +- + include/linux/pagemap.h | 13 +- + include/linux/pfn_t.h | 18 + + include/linux/pid.h | 4 +- + include/linux/rbtree_augmented.h | 4 +- + include/linux/rmap.h | 52 +- + include/linux/rodata_test.h | 24 + + include/linux/sem.h | 2 +- + include/linux/shmem_fs.h | 11 + + include/linux/slab.h | 45 +- + include/linux/slub_def.h | 4 +- + include/linux/swap.h | 30 +- + include/linux/swap_slots.h | 30 + + include/linux/trace_events.h | 4 + + include/linux/userfaultfd_k.h | 67 ++ + include/linux/vm_event_item.h | 1 + + include/linux/writeback.h | 2 +- + include/trace/events/compaction.h | 60 +- + include/trace/events/fs_dax.h | 156 +++ + include/trace/events/mmflags.h | 98 ++ + include/trace/events/oom.h | 81 ++ + include/trace/events/vmscan.h | 150 ++- + include/trace/events/writeback.h | 2 +- + include/trace/trace_events.h | 11 + + include/uapi/asm-generic/ioctl.h | 10 +- + include/uapi/linux/auto_dev-ioctl.h | 10 +- + include/uapi/linux/auto_fs.h | 25 +- + include/uapi/linux/auto_fs4.h | 16 +- + include/uapi/linux/mqueue.h | 2 + + include/uapi/linux/userfaultfd.h | 73 +- + init/Kconfig | 14 + + init/initramfs.c | 2 + + init/main.c | 9 +- + ipc/mqueue.c | 1 + + ipc/sem.c | 109 +- + ipc/shm.c | 27 +- + kernel/configs/android-base.config | 2 + + kernel/configs/android-recommended.config | 1 + + kernel/events/core.c | 6 +- + kernel/events/uprobes.c | 26 +- + kernel/exit.c | 2 + + kernel/fork.c | 10 +- + kernel/memremap.c | 74 +- + kernel/notifier.c | 2 +- + kernel/relay.c | 4 +- + kernel/signal.c | 11 +- + kernel/trace/trace_output.c | 38 + + kernel/watchdog_hld.c | 25 +- + lib/Kconfig | 6 +- + lib/Kconfig.debug | 13 +- + lib/Makefile | 3 + + lib/atomic64_test.c | 10 +- + lib/crc32.c | 824 --------------- + lib/crc32test.c | 856 +++++++++++++++ + lib/decompress_unlz4.c | 13 +- + lib/dma-debug.c | 5 + + lib/find_bit.c | 4 +- + lib/fonts/Kconfig | 16 +- + lib/glob.c | 164 --- + lib/globtest.c | 167 +++ + lib/list_debug.c | 45 +- + lib/lz4/lz4_compress.c | 1094 ++++++++++++++------ + lib/lz4/lz4_decompress.c | 656 +++++++----- + lib/lz4/lz4defs.h | 334 +++--- + lib/lz4/lz4hc_compress.c | 846 +++++++++------ + lib/rbtree.c | 4 +- + lib/scatterlist.c | 28 +- + lib/show_mem.c | 4 +- + lib/sort.c | 41 +- + lib/test_kasan.c | 34 + + lib/test_sort.c | 44 + + mm/Kconfig | 1 + + mm/Kconfig.debug | 7 + + mm/Makefile | 9 +- + mm/backing-dev.c | 4 +- + mm/bootmem.c | 2 +- + mm/cma.c | 40 +- + mm/cma_debug.c | 2 +- + mm/compaction.c | 31 +- + mm/filemap.c | 31 +- + mm/gup.c | 9 +- + mm/huge_memory.c | 420 ++++++-- + mm/hugetlb.c | 167 ++- + mm/internal.h | 20 +- + mm/kasan/kasan.c | 2 +- + mm/kasan/quarantine.c | 1 + + mm/ksm.c | 102 +- + mm/madvise.c | 60 +- + mm/memblock.c | 118 ++- + mm/memcontrol.c | 23 +- + mm/memory-failure.c | 26 +- + mm/memory.c | 231 +++-- + mm/memory_hotplug.c | 133 +-- + mm/migrate.c | 108 +- + mm/mmap.c | 90 +- + mm/mmzone.c | 2 +- + mm/mprotect.c | 44 +- + mm/mremap.c | 30 +- + mm/nommu.c | 17 +- + mm/oom_kill.c | 31 +- + mm/page-writeback.c | 2 +- + mm/page_alloc.c | 671 +++++++----- + mm/page_idle.c | 34 +- + mm/page_isolation.c | 10 +- + mm/page_owner.c | 4 +- + mm/page_vma_mapped.c | 218 ++++ + mm/pagewalk.c | 20 +- + mm/pgtable-generic.c | 14 + + mm/rmap.c | 574 ++++------ + mm/rodata_test.c | 56 + + mm/shmem.c | 154 ++- + mm/slab.c | 10 +- + mm/slab.h | 28 +- + mm/slab_common.c | 303 ++++-- + mm/slub.c | 85 +- + mm/sparse-vmemmap.c | 24 +- + mm/sparse.c | 466 ++++++--- + mm/swap.c | 15 +- + mm/swap_slots.c | 342 ++++++ + mm/swap_state.c | 80 +- + mm/swapfile.c | 521 ++++++++-- + mm/userfaultfd.c | 245 ++++- + mm/util.c | 5 +- + mm/vmalloc.c | 11 +- + mm/vmscan.c | 327 +++--- + mm/vmstat.c | 2 + + mm/workingset.c | 2 +- + mm/z3fold.c | 389 ++++--- + mm/zsmalloc.c | 6 +- + mm/zswap.c | 109 +- + scripts/Lindent | 14 +- + scripts/checkincludes.pl | 8 + + scripts/checkpatch.pl | 31 +- + scripts/checkstack.pl | 3 + + scripts/gdb/linux/constants.py.in | 7 + + scripts/gdb/linux/proc.py | 73 ++ + scripts/spelling.txt | 43 +- + scripts/tags.sh | 2 + + security/selinux/selinuxfs.c | 5 +- + sound/core/pcm_native.c | 15 +- + sound/usb/usx2y/us122l.c | 5 +- + sound/usb/usx2y/usX2Yhwdep.c | 7 +- + sound/usb/usx2y/usx2yhwdeppcm.c | 5 +- + tools/lib/find_bit.c | 2 +- + tools/testing/selftests/sigaltstack/sas.c | 7 +- + tools/testing/selftests/vm/Makefile | 4 + + tools/testing/selftests/vm/run_vmtests | 24 + + tools/testing/selftests/vm/userfaultfd.c | 484 ++++++++- + tools/vm/Makefile | 8 + + virt/kvm/kvm_main.c | 4 +- + 392 files changed, 12652 insertions(+), 6251 deletions(-) + delete mode 100644 Documentation/ABI/obsolete/sysfs-block-zram + delete mode 100644 arch/alpha/include/asm/current.h + delete mode 100644 arch/cris/include/asm/current.h + delete mode 100644 arch/m32r/include/asm/current.h + delete mode 100644 arch/parisc/include/asm/current.h + delete mode 100644 arch/score/include/asm/current.h + delete mode 100644 arch/x86/kernel/test_rodata.c + create mode 100644 include/asm-generic/kprobes.h + create mode 100644 include/linux/rodata_test.h + create mode 100644 include/linux/swap_slots.h + create mode 100644 include/trace/events/fs_dax.h + create mode 100644 lib/crc32test.c + create mode 100644 lib/globtest.c + create mode 100644 lib/test_sort.c + create mode 100644 mm/page_vma_mapped.c + create mode 100644 mm/rodata_test.c + create mode 100644 mm/swap_slots.c +$ 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: fs: add i_blocksize() +Using index info to reconstruct a base tree... +M fs/ext4/inode.c +M fs/iomap.c +M fs/jfs/super.c +M fs/xfs/xfs_aops.c +M fs/xfs/xfs_file.c +Falling back to patching base and 3-way merge... +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/xfs/xfs_aops.c +Auto-merging fs/jfs/super.c +Auto-merging fs/iomap.c +Auto-merging fs/ext4/inode.c +Applying: truncate: use i_blocksize() +Applying: nilfs2: use nilfs_btree_node_size() +Applying: nilfs2: use i_blocksize() +Applying: scripts/spelling.txt: add "swith" pattern and fix typo instances +Applying: scripts/spelling.txt: add "swithc" pattern and fix typo instances +Applying: scripts/spelling.txt: add "an user" pattern and fix typo instances +Applying: scripts/spelling.txt: add "an union" pattern and fix typo instances +Applying: scripts/spelling.txt: add "an one" pattern and fix typo instances +Applying: scripts/spelling.txt: add "partiton" pattern and fix typo instances +Applying: scripts/spelling.txt: add "aligment" pattern and fix typo instances +Applying: scripts/spelling.txt: add "algined" pattern and fix typo instances +Applying: scripts/spelling.txt: add "efective" pattern and fix typo instances +Applying: scripts/spelling.txt: add "varible" pattern and fix typo instances +Applying: scripts/spelling.txt: add "embeded" pattern and fix typo instances +Applying: scripts/spelling.txt: add "againt" pattern and fix typo instances +Applying: scripts/spelling.txt: add "neded" pattern and fix typo instances +Applying: scripts/spelling.txt: add "unneded" pattern and fix typo instances +Applying: scripts/spelling.txt: add "intialization" pattern and fix typo instances +Applying: scripts/spelling.txt: add "initialiazation" pattern and fix typo instances +Applying: scripts/spelling.txt: add "intialise(d)" pattern and fix typo instances +Applying: scripts/spelling.txt: add "comsume(r)" pattern and fix typo instances +Applying: scripts/spelling.txt: add "disble(d)" pattern and fix typo instances +Applying: scripts/spelling.txt: add "overide" pattern and fix typo instances +Applying: scripts/spelling.txt: add "overrided" pattern and fix typo instances +Applying: scripts/spelling.txt: add "configuartion" pattern and fix typo instances +Applying: scripts/spelling.txt: add "applys" pattern and fix typo instances +Applying: scripts/spelling.txt: add "explictely" pattern and fix typo instances +Applying: scripts/spelling.txt: add "omited" pattern and fix typo instances +Applying: scripts/spelling.txt: add "disassocation" pattern and fix typo instances +Applying: scripts/spelling.txt: add "deintialize(d)" pattern and fix typo instances +Applying: scripts/spelling.txt: add "overwritting" pattern and fix typo instances +Applying: scripts/spelling.txt: add "overwriten" pattern and fix typo instances +Applying: scripts/spelling.txt: add "therfore" pattern and fix typo instances +Applying: scripts/spelling.txt: add "followings" pattern and fix typo instances +Applying: scripts/spelling.txt: add some typo-words +Applying: lib/vsprintf.c: remove %Z support +Using index info to reconstruct a base tree... +M drivers/net/usb/sierra_net.c +error: Failed to merge in the changes. +Falling back to patching base and 3-way merge... +Auto-merging drivers/net/usb/sierra_net.c +CONFLICT (content): Merge conflict in drivers/net/usb/sierra_net.c +Patch failed at 0037 lib/vsprintf.c: remove %Z support +The copy of the patch that failed is found in: .git/rebase-apply/patch + +When you have resolved this problem, run "git rebase --continue". +If you prefer to skip this patch, run "git rebase --skip" instead. +To check out the original branch and stop rebasing, run "git rebase --abort". + +$ git rebase --continue +Applying: checkpatch: warn when formats use %Z and suggest %z +Applying: checkpatchpl-warn-against-using-%z-fix +Applying: mm: add new mmgrab() helper +Applying: mm: add new mmget() helper +Applying: mm: use mmget_not_zero() helper +Applying: mm: clarify mm_struct.mm_{users,count} documentation +Applying: debugobjects: track number of kmem_cache_alloc/kmem_cache_free done +Applying: debugobjects: scale thresholds with # of CPUs +Applying: debugobjects: reduce contention on the global pool_lock +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 1842d91b7b4c...abf6ab93577e akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (abf6ab93577e debugobjects: reduce contention on the global pool_lock) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + Documentation/DocBook/libata.tmpl | 2 +- + Documentation/acpi/method-customizing.txt | 2 +- + Documentation/acpi/method-tracing.txt | 2 +- + Documentation/admin-guide/ras.rst | 2 +- + Documentation/blockdev/mflash.txt | 2 +- + Documentation/dev-tools/kcov.rst | 2 +- + Documentation/device-mapper/dm-raid.txt | 2 +- + Documentation/devicetree/bindings/mfd/qcom-rpm.txt | 2 +- + .../bindings/net/marvell-armada-370-neta.txt | 2 +- + Documentation/devicetree/bindings/opp/opp.txt | 2 +- + .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 2 +- + .../devicetree/bindings/power/pd-samsung.txt | 2 +- + .../bindings/regulator/ti-abb-regulator.txt | 2 +- + .../devicetree/bindings/soc/rockchip/grf.txt | 4 +- + .../devicetree/bindings/sound/rockchip-i2s.txt | 4 +- + .../devicetree/bindings/sound/sun4i-codec.txt | 2 +- + .../devicetree/bindings/sound/sun4i-i2s.txt | 4 +- + Documentation/filesystems/quota.txt | 2 +- + Documentation/kselftest.txt | 4 +- + Documentation/media/dvb-drivers/ci.rst | 2 +- + .../media/uapi/dvb/dvb-frontend-parameters.rst | 4 +- + Documentation/memory-hotplug.txt | 4 +- + Documentation/networking/cdc_mbim.txt | 4 +- + Documentation/scsi/ChangeLog.megaraid_sas | 2 +- + Documentation/sound/hd-audio/notes.rst | 2 +- + Documentation/vm/userfaultfd.txt | 2 +- + arch/Kconfig | 2 +- + arch/alpha/kernel/smp.c | 2 +- + arch/arc/kernel/smp.c | 4 +- + arch/arc/kernel/unwind.c | 4 +- + arch/arm/boot/compressed/head.S | 2 +- + arch/arm/include/asm/mach/flash.h | 2 +- + arch/arm/kernel/smp.c | 2 +- + arch/arm/mach-omap2/omap_twl.c | 2 +- + arch/arm/mm/cache-v7.S | 2 +- + arch/arm/mm/cache-v7m.S | 2 +- + arch/arm64/kernel/smp.c | 2 +- + arch/arm64/lib/copy_template.S | 2 +- + arch/blackfin/mach-common/smp.c | 4 +- + arch/cris/arch-v32/drivers/cryptocop.c | 2 +- + arch/frv/mm/mmu-context.c | 2 +- + arch/hexagon/kernel/smp.c | 2 +- + arch/ia64/kernel/setup.c | 2 +- + arch/ia64/sn/kernel/sn2/sn_hwperf.c | 2 +- + arch/m32r/kernel/setup.c | 2 +- + arch/m68k/ifpsp060/src/isp.S | 2 +- + arch/metag/kernel/smp.c | 4 +- + arch/mips/kernel/traps.c | 2 +- + arch/mn10300/kernel/smp.c | 2 +- + arch/openrisc/kernel/entry.S | 6 +-- + arch/openrisc/kernel/head.S | 6 +-- + arch/openrisc/kernel/vmlinux.lds.S | 4 +- + arch/parisc/kernel/smp.c | 2 +- + arch/powerpc/boot/dts/fsl/mpc8569mds.dts | 2 +- + arch/powerpc/include/asm/book3s/64/mmu.h | 2 +- + arch/powerpc/include/asm/fsl_hcalls.h | 2 +- + arch/powerpc/kernel/smp.c | 2 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 2 +- + arch/powerpc/platforms/pseries/iommu.c | 2 +- + arch/powerpc/xmon/ppc-opc.c | 2 +- + arch/s390/kernel/processor.c | 2 +- + arch/s390/kernel/vtime.c | 2 +- + arch/score/kernel/traps.c | 2 +- + arch/sh/kernel/irq.c | 2 +- + arch/sh/kernel/smp.c | 4 +- + arch/sparc/include/asm/switch_to_32.h | 2 +- + arch/sparc/kernel/leon_smp.c | 2 +- + arch/sparc/kernel/smp_64.c | 2 +- + arch/sparc/kernel/sun4d_smp.c | 2 +- + arch/sparc/kernel/sun4m_smp.c | 2 +- + arch/sparc/kernel/traps_32.c | 2 +- + arch/sparc/kernel/traps_64.c | 2 +- + arch/sparc/kernel/visemul.c | 2 +- + arch/tile/kernel/smpboot.c | 2 +- + arch/x86/include/asm/desc_defs.h | 2 +- + arch/x86/kernel/cpu/common.c | 4 +- + arch/x86/kernel/ftrace.c | 2 +- + arch/x86/kvm/mmu.c | 2 +- + arch/xtensa/kernel/smp.c | 4 +- + block/blk-throttle.c | 2 +- + block/bsg.c | 6 +-- + certs/blacklist.c | 2 +- + drivers/acpi/acpica/dbconvert.c | 2 +- + drivers/acpi/acpica/nspredef.c | 2 +- + drivers/acpi/acpica/nsxfeval.c | 4 +- + drivers/acpi/resource.c | 2 +- + drivers/acpi/spcr.c | 2 +- + drivers/ata/libata-eh.c | 2 +- + drivers/atm/ambassador.c | 7 +-- + drivers/atm/eni.c | 6 +-- + drivers/atm/firestream.c | 12 ++--- + drivers/atm/horizon.c | 7 +-- + drivers/atm/iphase.c | 2 +- + drivers/atm/iphase.h | 2 +- + drivers/atm/lanai.c | 16 +++--- + drivers/block/loop.c | 2 +- + drivers/block/paride/pcd.c | 2 +- + drivers/block/paride/pd.c | 2 +- + drivers/block/paride/pf.c | 2 +- + drivers/block/paride/pg.c | 2 +- + drivers/block/paride/pt.c | 2 +- + drivers/char/pcmcia/cm4000_cs.c | 4 +- + drivers/char/pcmcia/cm4040_cs.c | 2 +- + drivers/char/sonypi.c | 2 +- + drivers/crypto/caam/ctrl.c | 2 +- + drivers/crypto/ux500/cryp/cryp.c | 2 +- + drivers/devfreq/devfreq.c | 2 +- + drivers/extcon/extcon-rt8973a.c | 2 +- + drivers/firewire/core-device.c | 4 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2 +- + drivers/gpu/drm/amd/include/atombios.h | 8 +-- + .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 2 +- + drivers/gpu/drm/drm_probe_helper.c | 4 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 2 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 4 +- + drivers/gpu/drm/mga/mga_drv.h | 4 +- + drivers/gpu/drm/radeon/atombios.h | 6 +-- + drivers/hid/hid-kye.c | 2 +- + drivers/hv/channel.c | 2 +- + drivers/hwmon/g762.c | 2 +- + drivers/ide/ide-acpi.c | 2 +- + drivers/ide/ide-tape.c | 4 +- + drivers/infiniband/hw/hfi1/file_ops.c | 2 +- + drivers/infiniband/hw/qib/qib_iba6120.c | 2 +- + drivers/infiniband/hw/qib/qib_iba7220.c | 2 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 2 +- + drivers/infiniband/sw/rdmavt/mad.c | 6 +-- + drivers/input/touchscreen/cyttsp4_core.c | 62 +++++++++++----------- + drivers/iommu/intel-svm.c | 2 +- + drivers/isdn/hardware/eicon/debug.c | 2 +- + drivers/isdn/hardware/mISDN/mISDNipac.c | 2 +- + drivers/isdn/hisax/st5481_b.c | 2 +- + drivers/isdn/mISDN/dsp_core.c | 2 +- + drivers/media/dvb-core/dvb_ringbuffer.h | 4 +- + drivers/media/dvb-frontends/drx39xyj/drx_driver.h | 12 ++--- + drivers/media/dvb-frontends/drx39xyj/drxj.c | 16 +++--- + drivers/media/dvb-frontends/drx39xyj/drxj.h | 4 +- + drivers/media/dvb-frontends/drxk_hard.c | 2 +- + drivers/media/dvb-frontends/helene.c | 2 +- + drivers/media/dvb-frontends/or51132.c | 2 +- + drivers/media/dvb-frontends/tda10048.c | 2 +- + drivers/media/i2c/adv7183_regs.h | 2 +- + drivers/media/pci/saa7164/saa7164-fw.c | 2 +- + drivers/media/platform/exynos4-is/fimc-core.h | 2 +- + drivers/media/tuners/xc5000.c | 2 +- + drivers/media/usb/dvb-usb/dib0700_devices.c | 4 +- + drivers/media/usb/gspca/t613.c | 6 +-- + drivers/media/usb/tm6000/tm6000-input.c | 2 +- + drivers/media/v4l2-core/tuner-core.c | 4 +- + drivers/misc/vmw_vmci/vmci_context.c | 2 +- + drivers/misc/vmw_vmci/vmci_queue_pair.c | 2 +- + drivers/mmc/host/mmci_qcom_dml.c | 2 +- + drivers/mtd/spi-nor/spi-nor.c | 2 +- + drivers/net/arcnet/arcnet.c | 2 +- + drivers/net/can/flexcan.c | 2 +- + drivers/net/ethernet/adi/bfin_mac.c | 2 +- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 2 +- + drivers/net/ethernet/cadence/macb.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 4 +- + drivers/net/ethernet/intel/igb/e1000_phy.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 2 +- + drivers/net/ethernet/micrel/ksz884x.c | 8 +-- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 2 +- + drivers/net/ethernet/qlogic/qlge/qlge.h | 4 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 8 +-- + drivers/net/ethernet/sfc/mcdi_pcol.h | 2 +- + drivers/net/ethernet/sis/sis900.c | 2 +- + drivers/net/gtp.c | 2 +- + drivers/net/usb/kalmia.c | 2 +- + drivers/net/usb/rndis_host.c | 2 +- + drivers/net/usb/sierra_net.c | 2 +- + drivers/net/wimax/i2400m/usb-fw.c | 2 +- + drivers/net/wireless/ath/ath9k/ani.c | 4 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 2 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 6 +-- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 4 +- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 30 +++++------ + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 16 +++--- + drivers/net/wireless/marvell/mwifiex/wmm.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/fw.c | 4 +- + drivers/net/wireless/rsi/rsi_91x_usb.c | 2 +- + drivers/net/wireless/ti/wl18xx/main.c | 2 +- + drivers/net/wireless/ti/wlcore/init.c | 2 +- + drivers/nfc/pn533/pn533.c | 2 +- + drivers/nvme/host/rdma.c | 2 +- + drivers/parport/ieee1284_ops.c | 2 +- + drivers/parport/parport_pc.c | 2 +- + drivers/pci/quirks.c | 2 +- + drivers/pinctrl/bcm/Kconfig | 2 +- + drivers/power/avs/smartreflex.c | 6 +-- + drivers/scsi/aacraid/linit.c | 2 +- + drivers/scsi/aic7xxx/aic79xx_core.c | 2 +- + drivers/scsi/bfa/bfi_ms.h | 2 +- + drivers/scsi/fcoe/fcoe_ctlr.c | 2 +- + drivers/scsi/ipr.c | 2 +- + drivers/scsi/lpfc/lpfc_attr.c | 2 +- + drivers/scsi/lpfc/lpfc_sli.c | 18 +++---- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 2 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.h | 2 +- + drivers/scsi/osd/osd_initiator.c | 4 +- + drivers/scsi/osst.c | 6 +-- + drivers/scsi/qla2xxx/qla_init.c | 10 ++-- + drivers/scsi/scsi_transport_sas.c | 2 +- + drivers/scsi/storvsc_drv.c | 2 +- + drivers/staging/gs_fpgaboot/gs_fpgaboot.h | 2 +- + .../lustre/lustre/include/lustre/lustre_idl.h | 2 +- + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 4 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 2 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 4 +- + drivers/staging/wilc1000/linux_wlan.c | 2 +- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 2 +- + drivers/tty/n_hdlc.c | 2 +- + drivers/tty/serial/ioc4_serial.c | 2 +- + drivers/usb/core/devio.c | 2 +- + drivers/usb/gadget/legacy/inode.c | 5 +- + drivers/usb/gadget/udc/fsl_udc_core.c | 4 +- + drivers/usb/gadget/udc/renesas_usb3.c | 4 +- + drivers/usb/host/ehci-hcd.c | 2 +- + drivers/usb/host/fotg210-hcd.c | 2 +- + drivers/usb/host/ohci-hcd.c | 2 +- + drivers/usb/host/xhci.c | 4 +- + drivers/usb/misc/adutux.c | 6 +-- + drivers/usb/misc/legousbtower.c | 2 +- + drivers/usb/misc/uss720.c | 8 +-- + drivers/usb/usbip/usbip_common.c | 2 +- + drivers/video/fbdev/aty/radeon_monitor.c | 2 +- + drivers/video/fbdev/intelfb/intelfbdrv.c | 2 +- + drivers/video/fbdev/metronomefb.c | 2 +- + drivers/watchdog/bcm2835_wdt.c | 6 +-- + fs/afs/dir.c | 14 ++--- + fs/block_dev.c | 2 +- + fs/btrfs/file.c | 2 +- + fs/buffer.c | 12 ++--- + fs/ceph/addr.c | 2 +- + fs/direct-io.c | 2 +- + fs/ecryptfs/kthread.c | 2 +- + fs/ext4/extents_status.c | 2 +- + fs/ext4/inode.c | 6 +-- + fs/ext4/mballoc.c | 2 +- + fs/ext4/move_extent.c | 2 +- + fs/inode.c | 2 +- + fs/iomap.c | 10 ++-- + fs/jfs/super.c | 4 +- + fs/mpage.c | 2 +- + fs/ncpfs/sock.c | 4 +- + fs/nfs/blocklayout/blocklayout.c | 2 +- + fs/nfs/filelayout/filelayout.c | 4 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 4 +- + fs/nfs/objlayout/objlayout.c | 2 +- + fs/nfsd/blocklayout.c | 6 +-- + fs/nfsd/nfscache.c | 2 +- + fs/nilfs2/alloc.c | 2 +- + fs/nilfs2/btnode.c | 2 +- + fs/nilfs2/btree.c | 4 +- + fs/nilfs2/inode.c | 4 +- + fs/nilfs2/mdt.c | 4 +- + fs/nilfs2/segment.c | 2 +- + fs/ocfs2/aops.c | 2 +- + fs/ocfs2/dlm/dlmmaster.c | 2 +- + fs/ocfs2/file.c | 2 +- + fs/orangefs/orangefs-utils.c | 4 +- + fs/proc/base.c | 8 +-- + fs/proc/task_mmu.c | 4 +- + fs/proc/task_nommu.c | 2 +- + fs/reiserfs/file.c | 2 +- + fs/reiserfs/inode.c | 2 +- + fs/stat.c | 2 +- + fs/udf/inode.c | 2 +- + fs/userfaultfd.c | 8 +-- + fs/xfs/xfs_aops.c | 16 +++--- + fs/xfs/xfs_file.c | 4 +- + fs/xfs/xfs_log_recover.c | 2 +- + include/dt-bindings/sound/cs42l42.h | 2 +- + include/linux/dcache.h | 4 +- + include/linux/fs.h | 5 ++ + include/linux/kconfig.h | 2 +- + include/linux/mm_types.h | 23 +++++++- + include/linux/mtd/qinfo.h | 2 +- + include/linux/regulator/machine.h | 2 +- + include/linux/sched.h | 43 +++++++++++++++ + include/linux/spi/flash.h | 2 +- + include/media/v4l2-ctrls.h | 4 +- + include/net/cfg80211.h | 2 +- + include/net/irda/timer.h | 2 +- + include/net/mac80211.h | 2 +- + include/xen/interface/grant_table.h | 2 +- + kernel/cgroup/cgroup.c | 2 +- + kernel/events/core.c | 2 +- + kernel/events/uprobes.c | 2 +- + kernel/exit.c | 2 +- + kernel/fork.c | 4 +- + kernel/futex.c | 2 +- + kernel/irq/manage.c | 2 +- + kernel/relay.c | 2 +- + kernel/sched/core.c | 4 +- + kernel/torture.c | 2 +- + kernel/trace/trace_stack.c | 2 +- + lib/debugobjects.c | 57 +++++++++++++++----- + lib/vsprintf.c | 8 +-- + mm/dmapool.c | 2 +- + mm/khugepaged.c | 2 +- + mm/ksm.c | 2 +- + mm/mmu_context.c | 2 +- + mm/mmu_notifier.c | 2 +- + mm/oom_kill.c | 4 +- + mm/page-writeback.c | 2 +- + mm/page_alloc.c | 2 +- + mm/percpu.c | 2 +- + mm/swapfile.c | 12 ++--- + mm/truncate.c | 2 +- + net/appletalk/ddp.c | 4 +- + net/atm/mpc.c | 2 +- + net/bluetooth/hci_sock.c | 6 +-- + net/bridge/netfilter/ebt_among.c | 2 +- + net/ieee802154/socket.c | 4 +- + net/ipv4/fib_trie.c | 2 +- + net/ipv4/ipmr.c | 2 +- + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 2 +- + net/ipv4/netfilter/nf_log_arp.c | 2 +- + net/ipv6/netfilter/nf_log_ipv6.c | 2 +- + net/irda/irnet/irnet_ppp.c | 12 ++--- + net/l2tp/l2tp_core.c | 4 +- + net/mac80211/mesh.c | 2 +- + net/netfilter/ipvs/ip_vs_conn.c | 2 +- + net/netfilter/ipvs/ip_vs_dh.c | 4 +- + net/netfilter/ipvs/ip_vs_lblc.c | 4 +- + net/netfilter/ipvs/ip_vs_lblcr.c | 4 +- + net/netfilter/ipvs/ip_vs_sh.c | 4 +- + net/netfilter/ipvs/ip_vs_sync.c | 2 +- + net/netfilter/nf_conntrack_ftp.c | 2 +- + net/netfilter/nfnetlink_cthelper.c | 2 +- + net/netfilter/x_tables.c | 2 +- + net/sctp/output.c | 2 +- + net/sctp/transport.c | 4 +- + net/sunrpc/auth_gss/auth_gss.c | 2 +- + net/sunrpc/svc.c | 2 +- + net/sunrpc/svcsock.c | 4 +- + net/sunrpc/xprtsock.c | 8 +-- + scripts/checkpatch.pl | 29 ++++++---- + scripts/recordmcount.pl | 2 +- + scripts/spelling.txt | 47 ++++++++++++++++ + security/selinux/ss/ebitmap.c | 2 +- + security/selinux/ss/policydb.c | 2 +- + sound/pci/ac97/ac97_patch.c | 2 +- + sound/pci/cs46xx/cs46xx_dsp_task_types.h | 2 +- + sound/pci/hda/patch_ca0132.c | 2 +- + sound/pci/ice1712/wm8766.c | 2 +- + sound/pci/ice1712/wm8776.c | 2 +- + sound/pci/korg1212/korg1212.c | 4 +- + sound/pci/pcxhr/pcxhr_hwdep.c | 2 +- + sound/pcmcia/vx/vxp_ops.c | 2 +- + sound/ppc/snd_ps3.c | 2 +- + sound/soc/amd/acp-pcm-dma.c | 4 +- + sound/soc/codecs/wm_hubs.c | 2 +- + sound/soc/fsl/fsl_asrc.c | 2 +- + sound/soc/qcom/lpass.h | 2 +- + sound/soc/soc-core.c | 2 +- + sound/soc/soc-topology.c | 4 +- + tools/lguest/lguest.c | 2 +- + tools/lib/bpf/Makefile | 2 +- + tools/lib/bpf/bpf.c | 2 +- + tools/lib/traceevent/Makefile | 2 +- + tools/lib/traceevent/event-parse.h | 2 +- + tools/perf/Documentation/tips.txt | 2 +- + tools/perf/util/dso.c | 2 +- + tools/perf/util/probe-finder.c | 4 +- + tools/perf/util/sort.h | 2 +- + virt/kvm/async_pf.c | 2 +- + virt/kvm/kvm_main.c | 2 +- + 372 files changed, 782 insertions(+), 645 deletions(-) |