blob: b19c2381c687ede40d008e154faba5f3bb22aa8a [file] [log] [blame]
$ date -R
Fri, 30 Jun 2017 07:45:09 +1000
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at 3c2bfbaadff6 Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
Merging origin/master (4d8a991d460d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge origin/master
Updating 3c2bfbaadff6..4d8a991d460d
Fast-forward
arch/arc/include/asm/processor.h | 2 -
arch/blackfin/include/asm/processor.h | 5 --
arch/c6x/include/asm/processor.h | 5 --
arch/cris/arch-v10/kernel/process.c | 8 --
arch/cris/arch-v32/kernel/process.c | 8 --
arch/cris/include/asm/processor.h | 2 -
arch/frv/include/asm/processor.h | 5 --
arch/frv/kernel/process.c | 9 ---
arch/h8300/include/asm/processor.h | 4 -
arch/h8300/kernel/process.c | 5 --
arch/hexagon/include/asm/processor.h | 3 -
arch/hexagon/kernel/process.c | 8 --
arch/ia64/include/asm/processor.h | 17 -----
arch/m32r/include/asm/processor.h | 2 -
arch/m32r/kernel/process.c | 8 --
arch/m68k/include/asm/processor.h | 2 -
arch/m68k/kernel/process.c | 14 ----
arch/microblaze/include/asm/processor.h | 6 --
arch/microblaze/kernel/process.c | 17 -----
arch/mn10300/include/asm/processor.h | 5 --
arch/mn10300/kernel/process.c | 8 --
arch/nios2/include/asm/processor.h | 3 -
arch/openrisc/include/asm/processor.h | 5 --
arch/openrisc/kernel/process.c | 5 --
arch/parisc/include/asm/processor.h | 5 --
arch/parisc/kernel/process.c | 5 --
arch/powerpc/include/asm/processor.h | 6 --
arch/s390/include/asm/processor.h | 5 --
arch/s390/kernel/process.c | 25 -------
arch/score/include/asm/processor.h | 1 -
arch/score/kernel/process.c | 5 --
arch/sparc/include/asm/processor_32.h | 3 -
arch/sparc/include/asm/processor_64.h | 2 -
arch/sparc/kernel/process_32.c | 8 --
arch/sparc/kernel/process_64.c | 19 -----
arch/tile/include/asm/processor.h | 7 --
arch/um/include/asm/processor-generic.h | 2 -
arch/um/kernel/um_arch.c | 6 --
arch/x86/include/asm/processor.h | 2 -
arch/x86/kernel/process.c | 11 ---
arch/xtensa/include/asm/processor.h | 2 -
block/bio.c | 12 ++-
drivers/gpu/drm/etnaviv/etnaviv_gem.h | 3 +-
drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 2 +-
drivers/gpu/drm/i915/i915_debugfs.c | 6 +-
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 17 ++++-
drivers/gpu/drm/i915/i915_vma.c | 5 ++
drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 1 +
drivers/md/dm-raid.c | 17 ++++-
drivers/md/dm-thin.c | 26 +++----
drivers/net/arcnet/arcnet.c | 7 +-
drivers/net/arcnet/capmode.c | 2 +-
drivers/net/arcnet/com20020-pci.c | 6 +-
drivers/net/arcnet/com20020.c | 2 -
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +-
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 61 +++++++++++++---
drivers/net/ethernet/broadcom/bnxt/bnxt.h | 6 +-
drivers/net/ethernet/freescale/fman/Kconfig | 1 +
.../net/ethernet/mellanox/mlxsw/spectrum_router.c | 3 +
drivers/net/ethernet/rocker/rocker_ofdpa.c | 2 +-
drivers/net/ethernet/sfc/ef10.c | 15 ++--
drivers/net/ethernet/ti/cpsw-common.c | 2 +-
drivers/net/hyperv/netvsc_drv.c | 4 +-
drivers/net/macvlan.c | 85 ++++++++++++++++++----
drivers/net/phy/dp83640.c | 2 +-
drivers/net/phy/micrel.c | 2 +
drivers/net/usb/ax88179_178a.c | 16 ++++
drivers/net/veth.c | 4 +-
drivers/net/virtio_net.c | 1 +
drivers/net/xen-netback/common.h | 1 +
drivers/net/xen-netback/interface.c | 6 +-
drivers/net/xen-netback/netback.c | 6 +-
drivers/nvme/host/pci.c | 3 +-
fs/block_dev.c | 5 +-
fs/nfs/callback_xdr.c | 1 -
fs/nfs/dir.c | 51 ++++++-------
fs/nfs/nfs4proc.c | 5 +-
fs/nfs/nfs4state.c | 2 +
include/linux/bio.h | 1 +
include/net/xfrm.h | 7 +-
kernel/bpf/verifier.c | 5 ++
net/core/dev.c | 30 +++++---
net/ipv4/ip_output.c | 3 +-
net/ipv4/tcp.c | 2 +
net/ipv6/addrconf.c | 5 +-
net/ipv6/datagram.c | 8 +-
net/ipv6/esp6_offload.c | 25 +++++++
net/ipv6/ip6_output.c | 2 +-
net/ipv6/route.c | 6 +-
net/ipv6/sit.c | 2 +-
net/ipv6/udp.c | 3 +-
net/ipv6/xfrm6_input.c | 2 +-
net/key/af_key.c | 19 ++++-
net/sched/sch_api.c | 3 +-
net/xfrm/Makefile | 3 +-
net/xfrm/xfrm_device.c | 2 +
net/xfrm/xfrm_policy.c | 4 -
net/xfrm/xfrm_user.c | 1 +
tools/testing/selftests/bpf/test_verifier.c | 66 +++++++++++++++++
99 files changed, 450 insertions(+), 411 deletions(-)
Merging fixes/master (97da3854c526 Linux 4.11-rc3)
$ git merge fixes/master
Already up-to-date.
Merging kbuild-current/fixes (ad8181060788 kconfig: fix sparse warnings in nconfig)
$ git merge kbuild-current/fixes
Already up-to-date.
Merging arc-current/for-curr (c0bc126f97fb Linux 4.12-rc7)
$ git merge arc-current/for-curr
Already up-to-date.
Merging arm-current/fixes (d360a687d995 ARM: 8682/1: V7M: Set cacheid iff DminLine or IminLine is nonzero)
$ git merge arm-current/fixes
Already up-to-date.
Merging m68k-current/for-linus (f6ab4d59a5fe nubus: Add MVC and VSC video card definitions)
$ git merge m68k-current/for-linus
Already up-to-date.
Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups)
$ git merge metag-fixes/fixes
Already up-to-date.
Merging powerpc-fixes/fixes (d6bd8194e286 powerpc/32: Avoid miscompilation w/GCC 4.6.3 - don't inline copy_to/from_user())
$ git merge powerpc-fixes/fixes
Merge made by the 'recursive' strategy.
arch/powerpc/include/asm/uaccess.h | 8 +-------
drivers/misc/cxl/context.c | 6 +++---
drivers/misc/cxl/cxl.h | 18 +++++-------------
drivers/misc/cxl/fault.c | 23 +++++++++++++++--------
drivers/misc/cxl/main.c | 17 +++++++++++++----
drivers/misc/cxl/native.c | 29 +++++++++++++++++------------
drivers/misc/cxl/pci.c | 11 ++++-------
7 files changed, 58 insertions(+), 54 deletions(-)
Merging sparc/master (dbd2667a4fb9 sparc64: Fix gup_huge_pmd)
$ git merge sparc/master
Merge made by the 'recursive' strategy.
arch/sparc/include/asm/asm-prototypes.h | 24 ++++++++++++++++++
arch/sparc/lib/atomic_64.S | 44 +++++++++++++++++++--------------
arch/sparc/lib/checksum_64.S | 1 +
arch/sparc/lib/csum_copy.S | 1 +
arch/sparc/lib/memscan_64.S | 2 ++
arch/sparc/lib/memset.S | 1 +
arch/sparc/mm/gup.c | 4 +--
7 files changed, 57 insertions(+), 20 deletions(-)
create mode 100644 arch/sparc/include/asm/asm-prototypes.h
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 (d58299a478c4 sfc: fix attempt to translate invalid filter ID)
$ git merge net/master
Already up-to-date.
Merging ipsec/master (ca3a1b856636 esp6_offload: Fix IP6CB(skb)->nhoff for ESP GRO)
$ git merge ipsec/master
Already up-to-date.
Merging netfilter/master (91af6ba7ff16 netfilter: ebt_nflog: fix unexpected truncated packet)
$ git merge netfilter/master
Merge made by the 'recursive' strategy.
net/bridge/netfilter/ebt_nflog.c | 1 +
net/netfilter/nf_conntrack_proto_dccp.c | 7 +++++++
net/netfilter/nf_conntrack_proto_sctp.c | 7 +++++++
3 files changed, 15 insertions(+)
Merging ipvs/master (3c5ab3f395d6 ipvs: SNAT packet replies only for NATed connections)
$ git merge ipvs/master
Already up-to-date.
Merging wireless-drivers/master (35abcd4f9f30 brcmfmac: fix uninitialized warning in brcmf_usb_probe_phase2())
$ git merge wireless-drivers/master
Already up-to-date.
Merging mac80211/master (4b153ca989a9 Merge tag 'mac80211-for-davem-2017-06-16' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211)
$ git merge mac80211/master
Already up-to-date.
Merging sound-current/for-linus (d94815f917da ALSA: hda - Fix endless loop of codec configure)
$ git merge sound-current/for-linus
Merge made by the 'recursive' strategy.
sound/pci/hda/hda_codec.h | 2 ++
sound/pci/hda/hda_controller.c | 8 ++++++--
sound/pci/hda/hda_generic.c | 1 +
3 files changed, 9 insertions(+), 2 deletions(-)
Merging pci-current/for-linus (98dbf5af4fdd PCI: endpoint: Select CRC32 to fix test build error)
$ git merge pci-current/for-linus
Already up-to-date.
Merging driver-core.current/driver-core-linus (08332893e37a Linux 4.12-rc2)
$ git merge driver-core.current/driver-core-linus
Already up-to-date.
Merging tty.current/tty-linus (3c2993b8c614 Linux 4.12-rc4)
$ git merge tty.current/tty-linus
Already up-to-date.
Merging usb.current/usb-linus (dec08194ffec xhci: Limit USB2 port wake support for AMD Promontory hosts)
$ git merge usb.current/usb-linus
Merge made by the 'recursive' strategy.
drivers/usb/host/xhci-hub.c | 3 +++
drivers/usb/host/xhci-pci.c | 12 ++++++++++++
drivers/usb/host/xhci.h | 1 +
drivers/usb/serial/option.c | 4 ++++
drivers/usb/serial/qcserial.c | 1 +
5 files changed, 21 insertions(+)
Merging usb-gadget-fixes/fixes (f50b878fed33 USB: gadget: fix GPF in gadgetfs)
$ git merge usb-gadget-fixes/fixes
Already up-to-date.
Merging usb-serial-fixes/usb-linus (996fab55d864 USB: serial: qcserial: new Sierra Wireless EM7305 device ID)
$ git merge usb-serial-fixes/usb-linus
Already up-to-date.
Merging usb-chipidea-fixes/ci-for-usb-stable (cbb22ebcfb99 usb: chipidea: core: check before accessing ci_role in ci_role_show)
$ git merge usb-chipidea-fixes/ci-for-usb-stable
Already up-to-date.
Merging phy/fixes (9605bc46433d phy: qualcomm: phy-qcom-qmp: fix application of sizeof to pointer)
$ git merge phy/fixes
Already up-to-date.
Merging staging.current/staging-linus (41f1830f5a7a Linux 4.12-rc6)
$ git merge staging.current/staging-linus
Already up-to-date.
Merging char-misc.current/char-misc-linus (32c1431eea48 Linux 4.12-rc5)
$ git merge char-misc.current/char-misc-linus
Already up-to-date.
Merging input-current/for-linus (9768935264c4 Input: synaptics-rmi4 - only read the F54 query registers which are used)
$ git merge input-current/for-linus
Already up-to-date.
Merging crypto-current/master (019d62db5401 crypto: caam - fix gfp allocation flags (part II))
$ git merge crypto-current/master
Merge made by the 'recursive' strategy.
crypto/drbg.c | 1 +
drivers/crypto/caam/caamalg.c | 10 ++++------
drivers/crypto/caam/caamalg_qi.c | 10 ++++------
drivers/crypto/caam/caamhash.c | 32 ++++++++++++++++----------------
drivers/crypto/caam/caampkc.c | 4 ++--
5 files changed, 27 insertions(+), 30 deletions(-)
Merging ide/master (acfead32f3f9 ide: don't call memcpy with the same source and destination)
$ git merge ide/master
Already up-to-date.
Merging vfio-fixes/for-linus (39da7c509acf Linux 4.11-rc6)
$ git merge vfio-fixes/for-linus
Already up-to-date.
Merging kselftest-fixes/fixes (2ea659a9ef48 Linux 4.12-rc1)
$ 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 nand-fixes/nand/fixes (d4ed3b9015b5 mtd: nand: make nand_ooblayout_lp_hamming_ops static)
$ git merge nand-fixes/nand/fixes
Already up-to-date.
Merging spi-nor-fixes/spi-nor/fixes (2ea659a9ef48 Linux 4.12-rc1)
$ git merge spi-nor-fixes/spi-nor/fixes
Already up-to-date.
Merging mfd-fixes/for-mfd-fixes (9e69672e90cc dt-bindings: mfd: Update STM32 timers clock names)
$ git merge mfd-fixes/for-mfd-fixes
Already up-to-date.
Merging v4l-dvb-fixes/fixes (2a2599c66368 [media] media: entity: Catch unbalanced media_pipeline_stop calls)
$ git merge v4l-dvb-fixes/fixes
Auto-merging include/media/v4l2-fwnode.h
Removing drivers/staging/media/lirc/TODO.lirc_zilog
Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_irq.c
Removing drivers/media/v4l2-core/v4l2-of.c
Removing drivers/media/platform/vimc/vimc-sensor.h
Removing drivers/media/platform/vimc/vimc-core.h
Removing drivers/media/platform/vimc/vimc-capture.h
Auto-merging MAINTAINERS
Removing Documentation/media/kapi/v4l2-of.rst
Merge made by the 'recursive' strategy.
Documentation/devicetree/bindings/media/cec.txt | 8 +
.../devicetree/bindings/media/i2c/adv7180.txt | 15 +
.../devicetree/bindings/media/i2c/max2175.txt | 59 +
.../devicetree/bindings/media/i2c/ov5640.txt | 45 +
Documentation/devicetree/bindings/media/imx.txt | 53 +
.../devicetree/bindings/media/mediatek-mdp.txt | 12 +-
.../devicetree/bindings/media/qcom,venus.txt | 107 +
.../devicetree/bindings/media/rcar_vin.txt | 4 +-
.../devicetree/bindings/media/renesas,drif.txt | 176 ++
.../devicetree/bindings/media/s5p-cec.txt | 6 +-
.../devicetree/bindings/media/st,stm32-cec.txt | 19 +
.../devicetree/bindings/media/st,stm32-dcmi.txt | 45 +
.../devicetree/bindings/media/stih-cec.txt | 2 +-
.../devicetree/bindings/media/video-mux.txt | 60 +
.../devicetree/bindings/property-units.txt | 1 +
Documentation/media/kapi/cec-core.rst | 18 +
Documentation/media/kapi/v4l2-core.rst | 2 +-
Documentation/media/kapi/v4l2-fwnode.rst | 3 +
Documentation/media/kapi/v4l2-of.rst | 3 -
.../media/uapi/cec/cec-ioc-adap-g-caps.rst | 8 +
.../media/uapi/dvb/fe-diseqc-send-burst.rst | 4 +-
Documentation/media/uapi/dvb/fe-set-tone.rst | 4 +-
Documentation/media/uapi/dvb/fe-set-voltage.rst | 7 +-
.../media/uapi/mediactl/media-ioc-g-topology.rst | 8 +-
Documentation/media/uapi/mediactl/media-types.rst | 21 +
Documentation/media/uapi/v4l/control.rst | 6 +
Documentation/media/uapi/v4l/extended-controls.rst | 9 +-
.../media/uapi/v4l/pixfmt-sdr-pcu16be.rst | 55 +
.../media/uapi/v4l/pixfmt-sdr-pcu18be.rst | 55 +
.../media/uapi/v4l/pixfmt-sdr-pcu20be.rst | 54 +
Documentation/media/uapi/v4l/sdr-formats.rst | 3 +
Documentation/media/uapi/v4l/vidioc-cropcap.rst | 23 +-
Documentation/media/uapi/v4l/vidioc-g-crop.rst | 22 +-
.../media/uapi/v4l/vidioc-g-selection.rst | 22 +-
Documentation/media/v4l-drivers/imx.rst | 614 +++++
Documentation/media/v4l-drivers/index.rst | 1 +
Documentation/media/v4l-drivers/max2175.rst | 62 +
MAINTAINERS | 78 +-
drivers/leds/leds-aat1290.c | 5 +-
drivers/leds/leds-max77693.c | 5 +-
drivers/media/cec/cec-adap.c | 88 +-
drivers/media/cec/cec-api.c | 5 +-
drivers/media/cec/cec-core.c | 1 +
drivers/media/dvb-core/dvb_ca_en50221.c | 39 +-
drivers/media/dvb-frontends/Kconfig | 1 +
drivers/media/dvb-frontends/af9013.c | 1186 +++++-----
drivers/media/dvb-frontends/af9013.h | 86 +-
drivers/media/dvb-frontends/af9013_priv.h | 2 +
drivers/media/dvb-frontends/au8522_common.c | 1 +
drivers/media/dvb-frontends/au8522_decoder.c | 74 +-
drivers/media/dvb-frontends/au8522_dig.c | 215 +-
drivers/media/dvb-frontends/bcm3510.c | 4 +-
drivers/media/dvb-frontends/cxd2841er.c | 302 ++-
drivers/media/dvb-frontends/cxd2841er.h | 10 +
drivers/media/dvb-frontends/cxd2841er_priv.h | 3 +
drivers/media/dvb-frontends/dib7000p.c | 6 +-
drivers/media/dvb-frontends/drx39xyj/drxj.c | 20 +-
drivers/media/dvb-frontends/drxd_hard.c | 10 +-
drivers/media/dvb-frontends/drxk_hard.c | 20 +-
drivers/media/dvb-frontends/mt352.c | 1 +
drivers/media/dvb-frontends/or51132.c | 4 +-
drivers/media/dvb-frontends/s5h1411.c | 4 +-
drivers/media/dvb-frontends/stv0367.c | 1168 ++++------
drivers/media/dvb-frontends/stv0367.h | 13 +
drivers/media/dvb-frontends/stv0367_defs.h | 1301 +++++++++++
drivers/media/dvb-frontends/stv0367_regs.h | 4 -
drivers/media/dvb-frontends/zl10353.c | 3 +-
drivers/media/i2c/Kconfig | 51 +
drivers/media/i2c/Makefile | 5 +
drivers/media/i2c/ad5820.c | 2 +-
drivers/media/i2c/adv7180.c | 2 +
drivers/media/i2c/adv7604.c | 7 +-
drivers/media/i2c/as3645a.c | 12 +-
drivers/media/i2c/cx25840/cx25840-core.c | 36 +-
drivers/media/i2c/dw9714.c | 291 +++
drivers/media/i2c/max2175.c | 1453 ++++++++++++
drivers/media/i2c/max2175.h | 109 +
drivers/media/i2c/msp3400-kthreads.c | 1 +
drivers/media/i2c/mt9v032.c | 7 +-
drivers/media/i2c/ov13858.c | 1816 +++++++++++++++
drivers/media/i2c/ov2659.c | 11 +-
drivers/media/i2c/ov5640.c | 2344 ++++++++++++++++++++
drivers/media/i2c/ov5645.c | 7 +-
drivers/media/i2c/ov5647.c | 7 +-
drivers/media/i2c/s5c73m3/s5c73m3-core.c | 7 +-
drivers/media/i2c/s5k5baf.c | 6 +-
drivers/media/i2c/s5k6aa.c | 2 +-
drivers/media/i2c/smiapp/Kconfig | 1 +
drivers/media/i2c/smiapp/smiapp-core.c | 29 +-
drivers/media/i2c/soc_camera/ov6650.c | 2 +
drivers/media/i2c/soc_camera/ov772x.c | 6 +-
drivers/media/i2c/tc358743.c | 77 +-
drivers/media/i2c/tvp514x.c | 6 +-
drivers/media/i2c/tvp5150.c | 7 +-
drivers/media/i2c/tvp7002.c | 6 +-
drivers/media/media-entity.c | 43 +-
drivers/media/pci/bt8xx/dst_ca.c | 1 +
drivers/media/pci/cobalt/cobalt-driver.c | 2 +
drivers/media/pci/cx18/cx18-alsa-pcm.c | 4 +-
drivers/media/pci/cx18/cx18-dvb.c | 2 +-
drivers/media/pci/cx23885/cx23885-cards.c | 3 +-
drivers/media/pci/cx88/cx88-cards.c | 9 +-
drivers/media/pci/cx88/cx88-video.c | 4 +-
drivers/media/pci/ddbridge/Kconfig | 6 +
drivers/media/pci/ddbridge/ddbridge-core.c | 531 ++++-
drivers/media/pci/ddbridge/ddbridge-regs.h | 4 +
drivers/media/pci/ddbridge/ddbridge.h | 41 +-
drivers/media/pci/ivtv/ivtv-alsa-pcm.c | 4 +-
drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 3 +-
drivers/media/pci/saa7134/saa7134-cards.c | 4 +-
drivers/media/pci/saa7164/saa7164-bus.c | 13 +-
drivers/media/pci/saa7164/saa7164-cmd.c | 2 +
drivers/media/pci/solo6x10/solo6x10-core.c | 1 +
drivers/media/pci/solo6x10/solo6x10-i2c.c | 1 +
drivers/media/pci/ttpci/av7110.c | 5 +
drivers/media/pci/zoran/zoran_driver.c | 2 +
drivers/media/platform/Kconfig | 74 +
drivers/media/platform/Makefile | 13 +-
drivers/media/platform/am437x/Kconfig | 1 +
drivers/media/platform/am437x/am437x-vpfe.c | 15 +-
drivers/media/platform/atmel/Kconfig | 2 +
drivers/media/platform/atmel/atmel-isc.c | 36 +-
drivers/media/platform/atmel/atmel-isi.c | 35 +-
drivers/media/platform/coda/coda-bit.c | 49 +-
drivers/media/platform/coda/coda-common.c | 70 +-
drivers/media/platform/coda/coda.h | 5 +
drivers/media/platform/coda/imx-vdoa.c | 49 +-
drivers/media/platform/davinci/Kconfig | 1 +
drivers/media/platform/davinci/vpif.c | 57 +-
drivers/media/platform/davinci/vpif_capture.c | 232 +-
drivers/media/platform/davinci/vpif_display.c | 5 +
drivers/media/platform/exynos-gsc/gsc-core.c | 13 +-
drivers/media/platform/exynos-gsc/gsc-core.h | 1 +
drivers/media/platform/exynos-gsc/gsc-m2m.c | 8 +-
drivers/media/platform/exynos4-is/Kconfig | 2 +
drivers/media/platform/exynos4-is/fimc-capture.c | 7 +-
drivers/media/platform/exynos4-is/fimc-is.c | 7 +-
drivers/media/platform/exynos4-is/fimc-lite.c | 4 +-
drivers/media/platform/exynos4-is/media-dev.c | 13 +-
drivers/media/platform/exynos4-is/mipi-csis.c | 6 +-
drivers/media/platform/marvell-ccic/mcam-core.c | 1 +
drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 12 +-
drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 10 +-
.../media/platform/mtk-vcodec/mtk_vcodec_util.h | 20 +-
drivers/media/platform/omap3isp/isp.c | 49 +-
drivers/media/platform/pxa_camera.c | 77 +-
drivers/media/platform/qcom/venus/Makefile | 11 +
drivers/media/platform/qcom/venus/core.c | 390 ++++
drivers/media/platform/qcom/venus/core.h | 324 +++
drivers/media/platform/qcom/venus/firmware.c | 108 +
drivers/media/platform/qcom/venus/firmware.h | 23 +
drivers/media/platform/qcom/venus/helpers.c | 725 ++++++
drivers/media/platform/qcom/venus/helpers.h | 45 +
drivers/media/platform/qcom/venus/hfi.c | 522 +++++
drivers/media/platform/qcom/venus/hfi.h | 175 ++
drivers/media/platform/qcom/venus/hfi_cmds.c | 1259 +++++++++++
drivers/media/platform/qcom/venus/hfi_cmds.h | 304 +++
drivers/media/platform/qcom/venus/hfi_helper.h | 1050 +++++++++
drivers/media/platform/qcom/venus/hfi_msgs.c | 1052 +++++++++
drivers/media/platform/qcom/venus/hfi_msgs.h | 283 +++
drivers/media/platform/qcom/venus/hfi_venus.c | 1572 +++++++++++++
drivers/media/platform/qcom/venus/hfi_venus.h | 23 +
drivers/media/platform/qcom/venus/hfi_venus_io.h | 113 +
drivers/media/platform/qcom/venus/vdec.c | 1162 ++++++++++
drivers/media/platform/qcom/venus/vdec.h | 23 +
drivers/media/platform/qcom/venus/vdec_ctrls.c | 158 ++
drivers/media/platform/qcom/venus/venc.c | 1283 +++++++++++
drivers/media/platform/qcom/venus/venc.h | 23 +
drivers/media/platform/qcom/venus/venc_ctrls.c | 270 +++
drivers/media/platform/rcar-vin/Kconfig | 1 +
drivers/media/platform/rcar-vin/rcar-core.c | 66 +-
drivers/media/platform/rcar-vin/rcar-dma.c | 230 +-
drivers/media/platform/rcar-vin/rcar-v4l2.c | 97 +-
drivers/media/platform/rcar-vin/rcar-vin.h | 9 +-
drivers/media/platform/rcar_drif.c | 1498 +++++++++++++
drivers/media/platform/rcar_fdp1.c | 12 +-
drivers/media/platform/s3c-camif/camif-capture.c | 4 +-
drivers/media/platform/s5p-cec/s5p_cec.c | 6 +-
drivers/media/platform/s5p-cec/s5p_cec.h | 1 -
drivers/media/platform/s5p-jpeg/jpeg-core.c | 20 +-
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 2 +-
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 2 +-
drivers/media/platform/sh_vou.c | 2 +
drivers/media/platform/soc_camera/soc_camera.c | 7 +-
drivers/media/platform/soc_camera/soc_mediabus.c | 1 +
drivers/media/platform/sti/cec/stih-cec.c | 16 +-
drivers/media/platform/stm32/Makefile | 2 +
drivers/media/platform/stm32/stm32-cec.c | 362 +++
drivers/media/platform/stm32/stm32-dcmi.c | 1404 ++++++++++++
drivers/media/platform/ti-vpe/cal.c | 15 +-
drivers/media/platform/video-mux.c | 334 +++
drivers/media/platform/vimc/Kconfig | 1 +
drivers/media/platform/vimc/Makefile | 10 +-
drivers/media/platform/vimc/vimc-capture.c | 321 +--
drivers/media/platform/vimc/vimc-capture.h | 28 -
drivers/media/platform/vimc/vimc-common.c | 473 ++++
drivers/media/platform/vimc/vimc-common.h | 229 ++
drivers/media/platform/vimc/vimc-core.c | 610 ++---
drivers/media/platform/vimc/vimc-core.h | 112 -
drivers/media/platform/vimc/vimc-debayer.c | 601 +++++
drivers/media/platform/vimc/vimc-scaler.c | 455 ++++
drivers/media/platform/vimc/vimc-sensor.c | 321 ++-
drivers/media/platform/vimc/vimc-sensor.h | 28 -
drivers/media/platform/vivid/vivid-cec.c | 6 +-
drivers/media/platform/xilinx/Kconfig | 1 +
drivers/media/platform/xilinx/xilinx-vipp.c | 63 +-
drivers/media/rc/Kconfig | 8 +-
drivers/media/rc/ati_remote.c | 3 -
drivers/media/rc/iguanair.c | 1 +
drivers/media/rc/img-ir/img-ir-hw.c | 4 -
drivers/media/rc/imon.c | 2 +-
drivers/media/rc/ir-lirc-codec.c | 37 +-
drivers/media/rc/ir-spi.c | 11 +-
drivers/media/rc/lirc_dev.c | 254 +--
drivers/media/rc/mceusb.c | 158 +-
drivers/media/rc/meson-ir.c | 89 +-
drivers/media/rc/rc-core-priv.h | 2 +
drivers/media/rc/rc-ir-raw.c | 36 +-
drivers/media/rc/rc-main.c | 160 +-
drivers/media/rc/sir_ir.c | 94 +-
drivers/media/tuners/tda18271-fe.c | 2 +-
drivers/media/tuners/xc5000.c | 27 +-
drivers/media/usb/au0828/au0828-dvb.c | 30 +
drivers/media/usb/au0828/au0828.h | 2 +
drivers/media/usb/cpia2/cpia2_core.c | 51 +-
drivers/media/usb/cx231xx/Kconfig | 2 +
drivers/media/usb/cx231xx/cx231xx-cards.c | 34 +
drivers/media/usb/cx231xx/cx231xx-dvb.c | 49 +
drivers/media/usb/cx231xx/cx231xx-input.c | 5 +-
drivers/media/usb/cx231xx/cx231xx-video.c | 2 +-
drivers/media/usb/cx231xx/cx231xx.h | 1 +
drivers/media/usb/dvb-usb-v2/af9015.c | 199 +-
drivers/media/usb/dvb-usb-v2/af9015.h | 4 +-
drivers/media/usb/dvb-usb-v2/lmedm04.c | 1 +
drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.c | 4 +-
drivers/media/usb/dvb-usb-v2/mxl111sf.c | 32 +-
drivers/media/usb/dvb-usb-v2/mxl111sf.h | 8 +-
drivers/media/usb/dvb-usb/dib0700_devices.c | 1 +
drivers/media/usb/dvb-usb/dvb-usb-remote.c | 5 +
drivers/media/usb/dvb-usb/dw2102.c | 4 +-
drivers/media/usb/em28xx/em28xx-cards.c | 4 +-
drivers/media/usb/em28xx/em28xx-core.c | 35 +-
drivers/media/usb/gspca/m5602/m5602_s5k83a.c | 5 +
drivers/media/usb/gspca/ov519.c | 3 +-
drivers/media/usb/pulse8-cec/pulse8-cec.c | 9 +-
drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c | 2 +-
drivers/media/usb/pwc/pwc-v4l.c | 3 +-
drivers/media/usb/rainshadow-cec/rainshadow-cec.c | 14 +-
drivers/media/usb/s2255/s2255drv.c | 2 +
drivers/media/usb/tm6000/tm6000-input.c | 4 -
drivers/media/usb/usbvision/usbvision-i2c.c | 3 +
drivers/media/usb/usbvision/usbvision-video.c | 4 +-
drivers/media/usb/uvc/uvc_driver.c | 34 +-
drivers/media/usb/uvc/uvc_video.c | 4 +-
drivers/media/v4l2-core/Kconfig | 3 +
drivers/media/v4l2-core/Makefile | 4 +-
drivers/media/v4l2-core/v4l2-async.c | 29 +-
drivers/media/v4l2-core/v4l2-ctrls.c | 51 +-
drivers/media/v4l2-core/v4l2-event.c | 8 +-
drivers/media/v4l2-core/v4l2-flash-led-class.c | 12 +-
drivers/media/v4l2-core/v4l2-fwnode.c | 345 +++
drivers/media/v4l2-core/v4l2-ioctl.c | 94 +-
drivers/media/v4l2-core/v4l2-mem2mem.c | 37 +
drivers/media/v4l2-core/v4l2-of.c | 327 ---
drivers/media/v4l2-core/v4l2-subdev.c | 8 +-
drivers/media/v4l2-core/videobuf2-core.c | 40 +-
drivers/media/v4l2-core/videobuf2-dma-sg.c | 8 +-
drivers/staging/media/Kconfig | 2 +
drivers/staging/media/Makefile | 1 +
drivers/staging/media/atomisp/i2c/Makefile | 6 +
drivers/staging/media/atomisp/i2c/gc0310.c | 1 +
drivers/staging/media/atomisp/i2c/imx/Makefile | 7 +
drivers/staging/media/atomisp/i2c/lm3554.c | 4 +-
drivers/staging/media/atomisp/i2c/mt9m114.c | 2 +-
drivers/staging/media/atomisp/i2c/ov2680.c | 15 +-
drivers/staging/media/atomisp/i2c/ov5693/Makefile | 7 +
drivers/staging/media/atomisp/i2c/ov5693/ov5693.c | 2 +-
.../staging/media/atomisp/pci/atomisp2/Makefile | 7 +-
.../atomisp/pci/atomisp2/atomisp_compat_css20.c | 1 -
.../media/atomisp/pci/atomisp2/atomisp_fops.c | 14 +-
.../media/atomisp/pci/atomisp2/atomisp_ioctl.c | 2 +-
.../media/atomisp/pci/atomisp2/atomisp_tpg.c | 1 +
.../media/atomisp/pci/atomisp2/atomisp_v4l2.c | 6 +-
.../media/atomisp/pci/atomisp2/css2400/Makefile | 2 -
.../css2400/hive_isp_css_include/math_support.h | 6 +-
.../css2400/hive_isp_css_include/string_support.h | 9 +-
.../pci/atomisp2/css2400/ia_css_mmu_private.h | 2 -
.../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 6 +-
.../isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c | 2 +-
.../isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c | 2 +-
.../css2400/isp/modes/interface/isp_const.h | 16 -
.../css2400/isp/modes/interface/isp_exprs.h | 23 -
.../atomisp2/css2400/runtime/binary/src/binary.c | 36 +-
.../pci/atomisp2/css2400/runtime/bufq/src/bufq.c | 2 +-
.../css2400/runtime/debug/interface/ia_css_debug.h | 1 +
.../css2400/runtime/debug/src/ia_css_debug.c | 13 +-
.../atomisp2/css2400/runtime/spctrl/src/spctrl.c | 10 +-
.../media/atomisp/pci/atomisp2/css2400/sh_css.c | 297 +--
.../atomisp/pci/atomisp2/css2400/sh_css_firmware.c | 34 +-
.../atomisp/pci/atomisp2/css2400/sh_css_internal.h | 7 -
.../atomisp/pci/atomisp2/css2400/sh_css_irq.c | 16 -
.../atomisp/pci/atomisp2/css2400/sh_css_mipi.c | 2 +-
.../atomisp/pci/atomisp2/css2400/sh_css_mmu.c | 6 -
.../atomisp/pci/atomisp2/css2400/sh_css_params.c | 24 +-
.../staging/media/atomisp/pci/atomisp2/hmm/hmm.c | 8 +-
.../atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.c | 4 +-
.../platform/intel-mid/atomisp_gmin_platform.c | 227 +-
.../platform/intel-mid/intel_mid_pcihelpers.c | 12 +-
drivers/staging/media/cxd2099/cxd2099.c | 6 +-
drivers/staging/media/imx/Kconfig | 21 +
drivers/staging/media/imx/Makefile | 12 +
drivers/staging/media/imx/TODO | 23 +
drivers/staging/media/imx/imx-ic-common.c | 113 +
drivers/staging/media/imx/imx-ic-prp.c | 518 +++++
drivers/staging/media/imx/imx-ic-prpencvf.c | 1309 +++++++++++
drivers/staging/media/imx/imx-ic.h | 38 +
drivers/staging/media/imx/imx-media-capture.c | 775 +++++++
drivers/staging/media/imx/imx-media-csi.c | 1817 +++++++++++++++
drivers/staging/media/imx/imx-media-dev.c | 667 ++++++
drivers/staging/media/imx/imx-media-fim.c | 494 +++++
drivers/staging/media/imx/imx-media-internal-sd.c | 349 +++
drivers/staging/media/imx/imx-media-of.c | 270 +++
drivers/staging/media/imx/imx-media-utils.c | 896 ++++++++
drivers/staging/media/imx/imx-media-vdic.c | 1009 +++++++++
drivers/staging/media/imx/imx-media.h | 325 +++
drivers/staging/media/imx/imx6-mipi-csi2.c | 698 ++++++
drivers/staging/media/lirc/TODO | 47 +-
drivers/staging/media/lirc/TODO.lirc_zilog | 36 -
drivers/staging/media/lirc/lirc_zilog.c | 136 +-
include/linux/imx-media.h | 29 +
include/media/cec.h | 29 +
include/media/davinci/vpif_types.h | 9 +-
include/media/imx.h | 15 +
include/media/lirc_dev.h | 32 -
include/media/media-entity.h | 28 +
include/media/rc-core.h | 2 -
include/media/v4l2-async.h | 8 +-
include/media/v4l2-ctrls.h | 13 +
include/media/v4l2-flash-led-class.h | 6 +-
include/media/{v4l2-of.h => v4l2-fwnode.h} | 96 +-
include/media/v4l2-mem2mem.h | 92 +
include/media/v4l2-subdev.h | 16 +-
include/uapi/linux/cec.h | 2 +
include/uapi/linux/dvb/video.h | 3 +-
include/uapi/linux/max2175.h | 28 +
include/uapi/linux/media.h | 6 +
include/uapi/linux/v4l2-controls.h | 11 +-
include/uapi/linux/videodev2.h | 3 +
348 files changed, 40503 insertions(+), 5135 deletions(-)
create mode 100644 Documentation/devicetree/bindings/media/cec.txt
create mode 100644 Documentation/devicetree/bindings/media/i2c/max2175.txt
create mode 100644 Documentation/devicetree/bindings/media/i2c/ov5640.txt
create mode 100644 Documentation/devicetree/bindings/media/imx.txt
create mode 100644 Documentation/devicetree/bindings/media/qcom,venus.txt
create mode 100644 Documentation/devicetree/bindings/media/renesas,drif.txt
create mode 100644 Documentation/devicetree/bindings/media/st,stm32-cec.txt
create mode 100644 Documentation/devicetree/bindings/media/st,stm32-dcmi.txt
create mode 100644 Documentation/devicetree/bindings/media/video-mux.txt
create mode 100644 Documentation/media/kapi/v4l2-fwnode.rst
delete mode 100644 Documentation/media/kapi/v4l2-of.rst
create mode 100644 Documentation/media/uapi/v4l/pixfmt-sdr-pcu16be.rst
create mode 100644 Documentation/media/uapi/v4l/pixfmt-sdr-pcu18be.rst
create mode 100644 Documentation/media/uapi/v4l/pixfmt-sdr-pcu20be.rst
create mode 100644 Documentation/media/v4l-drivers/imx.rst
create mode 100644 Documentation/media/v4l-drivers/max2175.rst
create mode 100644 drivers/media/dvb-frontends/stv0367_defs.h
create mode 100644 drivers/media/i2c/dw9714.c
create mode 100644 drivers/media/i2c/max2175.c
create mode 100644 drivers/media/i2c/max2175.h
create mode 100644 drivers/media/i2c/ov13858.c
create mode 100644 drivers/media/i2c/ov5640.c
create mode 100644 drivers/media/platform/qcom/venus/Makefile
create mode 100644 drivers/media/platform/qcom/venus/core.c
create mode 100644 drivers/media/platform/qcom/venus/core.h
create mode 100644 drivers/media/platform/qcom/venus/firmware.c
create mode 100644 drivers/media/platform/qcom/venus/firmware.h
create mode 100644 drivers/media/platform/qcom/venus/helpers.c
create mode 100644 drivers/media/platform/qcom/venus/helpers.h
create mode 100644 drivers/media/platform/qcom/venus/hfi.c
create mode 100644 drivers/media/platform/qcom/venus/hfi.h
create mode 100644 drivers/media/platform/qcom/venus/hfi_cmds.c
create mode 100644 drivers/media/platform/qcom/venus/hfi_cmds.h
create mode 100644 drivers/media/platform/qcom/venus/hfi_helper.h
create mode 100644 drivers/media/platform/qcom/venus/hfi_msgs.c
create mode 100644 drivers/media/platform/qcom/venus/hfi_msgs.h
create mode 100644 drivers/media/platform/qcom/venus/hfi_venus.c
create mode 100644 drivers/media/platform/qcom/venus/hfi_venus.h
create mode 100644 drivers/media/platform/qcom/venus/hfi_venus_io.h
create mode 100644 drivers/media/platform/qcom/venus/vdec.c
create mode 100644 drivers/media/platform/qcom/venus/vdec.h
create mode 100644 drivers/media/platform/qcom/venus/vdec_ctrls.c
create mode 100644 drivers/media/platform/qcom/venus/venc.c
create mode 100644 drivers/media/platform/qcom/venus/venc.h
create mode 100644 drivers/media/platform/qcom/venus/venc_ctrls.c
create mode 100644 drivers/media/platform/rcar_drif.c
create mode 100644 drivers/media/platform/stm32/Makefile
create mode 100644 drivers/media/platform/stm32/stm32-cec.c
create mode 100644 drivers/media/platform/stm32/stm32-dcmi.c
create mode 100644 drivers/media/platform/video-mux.c
delete mode 100644 drivers/media/platform/vimc/vimc-capture.h
create mode 100644 drivers/media/platform/vimc/vimc-common.c
create mode 100644 drivers/media/platform/vimc/vimc-common.h
delete mode 100644 drivers/media/platform/vimc/vimc-core.h
create mode 100644 drivers/media/platform/vimc/vimc-debayer.c
create mode 100644 drivers/media/platform/vimc/vimc-scaler.c
delete mode 100644 drivers/media/platform/vimc/vimc-sensor.h
create mode 100644 drivers/media/v4l2-core/v4l2-fwnode.c
delete mode 100644 drivers/media/v4l2-core/v4l2-of.c
delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_irq.c
create mode 100644 drivers/staging/media/imx/Kconfig
create mode 100644 drivers/staging/media/imx/Makefile
create mode 100644 drivers/staging/media/imx/TODO
create mode 100644 drivers/staging/media/imx/imx-ic-common.c
create mode 100644 drivers/staging/media/imx/imx-ic-prp.c
create mode 100644 drivers/staging/media/imx/imx-ic-prpencvf.c
create mode 100644 drivers/staging/media/imx/imx-ic.h
create mode 100644 drivers/staging/media/imx/imx-media-capture.c
create mode 100644 drivers/staging/media/imx/imx-media-csi.c
create mode 100644 drivers/staging/media/imx/imx-media-dev.c
create mode 100644 drivers/staging/media/imx/imx-media-fim.c
create mode 100644 drivers/staging/media/imx/imx-media-internal-sd.c
create mode 100644 drivers/staging/media/imx/imx-media-of.c
create mode 100644 drivers/staging/media/imx/imx-media-utils.c
create mode 100644 drivers/staging/media/imx/imx-media-vdic.c
create mode 100644 drivers/staging/media/imx/imx-media.h
create mode 100644 drivers/staging/media/imx/imx6-mipi-csi2.c
delete mode 100644 drivers/staging/media/lirc/TODO.lirc_zilog
create mode 100644 include/linux/imx-media.h
create mode 100644 include/media/imx.h
rename include/media/{v4l2-of.h => v4l2-fwnode.h} (50%)
create mode 100644 include/uapi/linux/max2175.h
Merging reset-fixes/reset/fixes (4497a224f759 reset: hi6220: Set module license so that it can be loaded)
$ git merge reset-fixes/reset/fixes
Already up-to-date.
Merging drm-intel-fixes/for-linux-next-fixes (611cdf3695a3 drm/i915: Disable EXEC_OBJECT_ASYNC when doing relocations)
$ git merge drm-intel-fixes/for-linux-next-fixes
Already up-to-date.
Merging drm-misc-fixes/for-linux-next-fixes (e94ac3510b6a drm: Fix GETCONNECTOR regression)
$ git merge drm-misc-fixes/for-linux-next-fixes
Already up-to-date.
Merging kbuild/for-next (39be5eac380d Merge branches 'misc', 'kbuild' and 'thin-ar' into for-next)
$ git merge kbuild/for-next
Auto-merging arch/x86/Makefile
Auto-merging arch/powerpc/Kconfig
Auto-merging Makefile
Merge made by the 'recursive' strategy.
Documentation/kbuild/kbuild.txt | 8 ++++--
Documentation/kbuild/makefiles.txt | 41 +++++--------------------------
Documentation/process/changes.rst | 9 +++----
Makefile | 26 +++++++-------------
arch/Kconfig | 2 +-
arch/arm/include/uapi/asm/Kbuild | 6 ++---
arch/ia64/kernel/Makefile.gate | 18 +++++++++-----
arch/powerpc/Kconfig | 8 ------
arch/sh/kernel/vsyscall/Makefile | 18 ++++++++------
arch/sparc/lib/hweight.S | 16 ++++++------
arch/tile/kernel/vdso/Makefile | 27 +++++++++++----------
arch/x86/Makefile | 33 +++++++++++++++++++------
arch/x86/Makefile_32.cpu | 7 +++---
arch/x86/include/uapi/asm/Kbuild | 6 ++---
arch/x86/um/vdso/Makefile | 2 +-
scripts/Kbuild.include | 19 +++++++++------
scripts/Makefile.asm-generic | 2 +-
scripts/Makefile.build | 8 +++---
scripts/Makefile.host | 6 -----
scripts/bootgraph.pl | 2 +-
scripts/checkincludes.pl | 2 +-
scripts/checkpatch.pl | 3 ++-
scripts/checkstack.pl | 2 +-
scripts/checksyscalls.sh | 11 +++------
scripts/checkversion.pl | 2 +-
scripts/cleanfile | 3 ++-
scripts/cleanpatch | 3 ++-
scripts/dtc/dt_to_config | 2 +-
scripts/export_report.pl | 3 ++-
scripts/extract-module-sig.pl | 3 ++-
scripts/extract-sys-certs.pl | 3 ++-
scripts/extract_xc3028.pl | 2 +-
scripts/get_dvb_firmware | 2 +-
scripts/get_maintainer.pl | 3 ++-
scripts/headerdep.pl | 2 +-
scripts/headers_check.pl | 3 ++-
scripts/kconfig/streamline_config.pl | 3 ++-
scripts/kernel-doc | 3 ++-
scripts/kernel-doc-xml-ref | 3 ++-
scripts/link-vmlinux.sh | 47 ++++++++++++++++++++++++++++--------
scripts/markup_oops.pl | 2 +-
scripts/mkcompile_h | 2 +-
scripts/namespace.pl | 4 +--
scripts/profile2linkerlist.pl | 2 +-
scripts/recordmcount.pl | 3 ++-
scripts/stackdelta | 2 +-
tools/build/Makefile.build | 8 +-----
tools/scripts/Makefile.include | 8 +-----
48 files changed, 203 insertions(+), 197 deletions(-)
Merging uuid/for-next (b86a496a4206 ACPI: hns_dsaf_acpi_dsm_guid can be static)
$ git merge uuid/for-next
Auto-merging include/acpi/acpi_bus.h
Removing fs/xfs/uuid.h
Removing fs/xfs/uuid.c
Auto-merging fs/ext4/super.c
Auto-merging drivers/usb/host/xhci-pci.c
Auto-merging drivers/scsi/scsi_debug.c
Auto-merging drivers/nvme/host/fc.c
Auto-merging drivers/md/md.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
MAINTAINERS | 11 +++
arch/s390/include/asm/sysinfo.h | 4 +-
arch/s390/kernel/sysinfo.c | 2 +-
block/partitions/ldm.c | 10 +--
block/partitions/ldm.h | 6 +-
drivers/acpi/acpi_extlog.c | 20 ++---
drivers/acpi/apei/ghes.c | 8 +-
drivers/acpi/bus.c | 29 +------
drivers/acpi/nfit/core.c | 54 ++++++------
drivers/acpi/nfit/nfit.h | 3 +-
drivers/acpi/utils.c | 16 ++--
drivers/char/tpm/tpm_crb.c | 9 +-
drivers/char/tpm/tpm_ppi.c | 20 ++---
drivers/gpu/drm/i915/intel_acpi.c | 14 ++-
drivers/gpu/drm/nouveau/nouveau_acpi.c | 20 ++---
drivers/gpu/drm/nouveau/nvkm/subdev/mxm/base.c | 9 +-
drivers/hid/i2c-hid/i2c-hid.c | 9 +-
drivers/iommu/dmar.c | 11 ++-
drivers/md/md.c | 8 +-
drivers/mmc/host/sdhci-pci-core.c | 9 +-
drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 15 ++--
drivers/nvdimm/btt_devs.c | 9 +-
drivers/nvme/host/fabrics.c | 8 +-
drivers/nvme/host/fabrics.h | 2 +-
drivers/nvme/host/fc.c | 3 +-
drivers/nvme/target/nvmet.h | 1 +
drivers/pci/pci-acpi.c | 13 ++-
drivers/pci/pci-label.c | 4 +-
drivers/scsi/scsi_debug.c | 10 +--
drivers/thermal/int340x_thermal/int3400_thermal.c | 8 +-
drivers/usb/dwc3/dwc3-pci.c | 10 +--
drivers/usb/host/xhci-pci.c | 9 +-
drivers/usb/misc/ucsi.c | 6 +-
drivers/usb/typec/typec_wcove.c | 8 +-
drivers/xen/tmem.c | 6 +-
fs/afs/cmservice.c | 16 ++--
fs/afs/internal.h | 11 ++-
fs/afs/main.c | 2 +-
fs/ext4/super.c | 2 +-
fs/f2fs/super.c | 2 +-
fs/gfs2/ops_fstype.c | 2 +-
fs/gfs2/sys.c | 22 ++---
fs/nfsd/export.c | 4 +-
fs/ocfs2/super.c | 2 +-
fs/overlayfs/copy_up.c | 7 +-
fs/overlayfs/namei.c | 2 +-
fs/overlayfs/overlayfs.h | 2 +-
fs/xfs/Makefile | 3 +-
fs/xfs/uuid.c | 63 --------------
fs/xfs/uuid.h | 35 --------
fs/xfs/xfs_inode_item.c | 8 +-
fs/xfs/xfs_linux.h | 2 +-
fs/xfs/xfs_log_recover.c | 6 +-
fs/xfs/xfs_mount.c | 16 ++--
include/acpi/acpi_bus.h | 11 +--
include/linux/acpi.h | 4 +-
include/linux/cleancache.h | 2 +-
include/linux/fs.h | 5 +-
include/linux/genhd.h | 11 ---
include/linux/nvme-fc.h | 3 +-
include/linux/nvme.h | 3 +-
include/linux/pci-acpi.h | 2 +-
include/linux/uuid.h | 99 ++++++++++++++--------
include/uapi/linux/uuid.h | 28 ++----
kernel/sysctl_binary.c | 4 +-
lib/test_uuid.c | 36 ++++----
lib/uuid.c | 33 ++++----
lib/vsprintf.c | 4 +-
mm/cleancache.c | 2 +-
mm/shmem.c | 2 +
security/integrity/evm/evm_crypto.c | 2 +-
security/integrity/ima/ima_policy.c | 12 ++-
sound/soc/intel/skylake/skl-nhlt.c | 7 +-
tools/testing/nvdimm/test/iomap.c | 6 +-
tools/testing/nvdimm/test/nfit.c | 2 +-
tools/testing/nvdimm/test/nfit_test.h | 4 +-
76 files changed, 373 insertions(+), 500 deletions(-)
delete mode 100644 fs/xfs/uuid.c
delete mode 100644 fs/xfs/uuid.h
Merging dma-mapping/for-next (020278bbae01 ARM: dma-mapping: Remove traces of NOMMU code)
$ git merge dma-mapping/for-next
Auto-merging arch/arm/Kconfig
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
Documentation/DMA-API-HOWTO.txt | 31 +--
.../bindings/reserved-memory/reserved-memory.txt | 3 +
Documentation/driver-model/devres.txt | 3 +-
MAINTAINERS | 15 ++
arch/arm/Kconfig | 1 +
arch/arm/common/dmabounce.c | 19 +-
arch/arm/include/asm/dma-iommu.h | 4 +
arch/arm/include/asm/dma-mapping.h | 6 +-
arch/arm/mm/Kconfig | 8 +-
arch/arm/mm/Makefile | 5 +-
arch/arm/mm/dma-mapping-nommu.c | 246 +++++++++++++++++++++
arch/arm/mm/dma-mapping.c | 77 +++----
arch/arm/xen/mm.c | 17 --
arch/arm64/include/asm/dma-mapping.h | 1 -
arch/arm64/mm/dma-mapping.c | 3 +-
arch/c6x/include/asm/dma-mapping.h | 5 -
arch/hexagon/include/asm/dma-mapping.h | 5 -
arch/hexagon/kernel/dma.c | 21 +-
arch/hexagon/kernel/hexagon_ksyms.c | 1 -
arch/ia64/include/asm/dma-mapping.h | 2 -
arch/m32r/include/asm/dma-mapping.h | 2 -
arch/microblaze/include/asm/dma-mapping.h | 2 -
arch/mips/loongson64/common/dma-swiotlb.c | 19 +-
arch/openrisc/include/asm/dma-mapping.h | 9 -
arch/powerpc/include/asm/dma-mapping.h | 5 -
arch/powerpc/include/asm/iommu.h | 4 +
arch/powerpc/kernel/dma-iommu.c | 6 +
arch/powerpc/kernel/dma.c | 17 +-
arch/powerpc/kernel/iommu.c | 28 +--
arch/powerpc/platforms/cell/iommu.c | 53 ++---
arch/powerpc/platforms/pseries/vio.c | 3 +-
arch/s390/include/asm/dma-mapping.h | 2 -
arch/s390/pci/pci_dma.c | 18 +-
arch/sh/include/asm/dma-mapping.h | 2 -
arch/sparc/include/asm/dma-mapping.h | 8 +-
arch/sparc/kernel/iommu.c | 52 +++--
arch/sparc/kernel/iommu_common.h | 2 +
arch/sparc/kernel/ioport.c | 27 +--
arch/sparc/kernel/pci_sun4v.c | 31 ++-
arch/tile/kernel/pci-dma.c | 30 ---
arch/x86/include/asm/dma-mapping.h | 5 -
arch/x86/include/asm/iommu.h | 2 +
arch/x86/kernel/amd_gart_64.c | 1 +
arch/x86/kernel/pci-calgary_64.c | 25 ++-
arch/x86/kernel/pci-dma.c | 8 +-
arch/x86/kernel/pci-nommu.c | 11 +-
arch/x86/pci/sta2x11-fixup.c | 3 +-
arch/x86/xen/pci-swiotlb-xen.c | 14 --
arch/xtensa/include/asm/dma-mapping.h | 2 -
drivers/base/dma-coherent.c | 74 ++++++-
drivers/base/dma-mapping.c | 56 ++---
drivers/crypto/qat/qat_common/qat_algs.c | 40 ++--
drivers/dma/ioat/init.c | 24 +-
drivers/firmware/tegra/ivc.c | 4 +-
drivers/gpu/drm/armada/armada_fb.c | 2 +-
drivers/gpu/drm/armada/armada_gem.c | 5 +-
drivers/gpu/drm/armada/armada_gem.h | 1 +
drivers/gpu/drm/exynos/exynos_drm_fb.c | 4 +-
drivers/iommu/amd_iommu.c | 20 +-
drivers/iommu/dma-iommu.c | 18 +-
drivers/iommu/intel-iommu.c | 3 +
drivers/net/ethernet/ibm/ibmveth.c | 159 +++++++------
drivers/video/fbdev/au1100fb.c | 4 -
drivers/video/fbdev/au1200fb.c | 5 +-
drivers/xen/swiotlb-xen.c | 113 +++++-----
include/linux/dma-mapping.h | 20 +-
include/xen/swiotlb-xen.h | 62 +-----
lib/dma-noop.c | 21 +-
lib/dma-virt.c | 12 -
69 files changed, 788 insertions(+), 723 deletions(-)
create mode 100644 arch/arm/mm/dma-mapping-nommu.c
Merging asm-generic/master (a351e9b9fc24 Linux 4.11)
$ git merge asm-generic/master
Already up-to-date.
Merging arc/for-next (6f8119230ed0 ARC: set boot print log level to PR_INFO)
$ git merge arc/for-next
Merge made by the 'recursive' strategy.
arch/arc/configs/nps_defconfig | 1 -
arch/arc/configs/tb10x_defconfig | 1 -
arch/arc/include/asm/irqflags-arcv2.h | 3 ---
arch/arc/include/asm/irqflags-compact.h | 2 --
arch/arc/include/asm/spinlock.h | 12 ++++++++++++
arch/arc/kernel/entry-compact.S | 22 +++++++++++-----------
arch/arc/kernel/process.c | 29 +++++++++++++++++++++++++++--
arch/arc/kernel/setup.c | 6 +++---
arch/arc/kernel/traps.c | 2 +-
arch/arc/mm/cache.c | 2 +-
arch/arc/mm/fault.c | 2 +-
arch/arc/mm/tlb.c | 2 +-
arch/arc/mm/tlbex.S | 9 +++++++++
arch/arc/plat-eznps/Kconfig | 15 +++++++++++++--
arch/arc/plat-eznps/include/plat/ctop.h | 1 +
arch/arc/plat-eznps/mtm.c | 11 +++++++++--
16 files changed, 89 insertions(+), 31 deletions(-)
Merging arm/for-next (06dbb655be93 Merge branches 'fixes' and 'misc' into for-next)
$ git merge arm/for-next
Auto-merging mm/mmap.c
Auto-merging arch/arm/mm/Kconfig
Auto-merging arch/arm/Kconfig
Merge made by the 'recursive' strategy.
arch/arm/Kconfig | 1 +
arch/arm/include/asm/bitops.h | 8 +--
arch/arm/include/asm/ftrace.h | 4 ++
arch/arm/include/asm/page-nommu.h | 6 ---
arch/arm/kernel/entry-ftrace.S | 100 ++++++++++++++++++++++++++++++++++++++
arch/arm/kernel/ftrace.c | 37 ++++++++++++++
arch/arm/kernel/process.c | 16 ++++--
arch/arm/kernel/vdso.c | 18 +++++++
arch/arm/mm/Kconfig | 6 ++-
arch/x86/entry/vdso/vma.c | 3 --
mm/mmap.c | 4 ++
11 files changed, 185 insertions(+), 18 deletions(-)
Merging arm-perf/for-next/perf (c0f7f7acdecd perf: xgene: Add support for SoC PMU version 3)
$ git merge arm-perf/for-next/perf
Merge made by the 'recursive' strategy.
arch/arm/kernel/perf_event_v6.c | 2 +-
arch/arm64/kernel/perf_event.c | 2 +-
drivers/perf/Kconfig | 9 +-
drivers/perf/xgene_pmu.c | 684 ++++++++++++++++++++++++++++++++++++----
4 files changed, 635 insertions(+), 62 deletions(-)
Merging arm-soc/for-next (b0ebfd91e549 arm-soc: document merges)
$ git merge arm-soc/for-next
Removing arch/arm/mach-omap2/pmu.c
Removing arch/arm/mach-omap2/opp.c
Removing arch/arm/boot/dts/tegra20-whistler.dts
Auto-merging arch/arm/boot/dts/rv1108.dtsi
Auto-merging arch/arm/boot/dts/rv1108-evb.dts
Auto-merging arch/arm/Kconfig
Auto-merging MAINTAINERS
Auto-merging Documentation/devicetree/bindings/i2c/i2c-mtk.txt
Merge made by the 'recursive' strategy.
Documentation/arm/Atmel/README | 38 +-
Documentation/devicetree/bindings/arm/actions.txt | 39 ++
Documentation/devicetree/bindings/arm/amlogic.txt | 23 +-
.../devicetree/bindings/arm/atmel-at91.txt | 30 +
.../devicetree/bindings/arm/bcm/brcm,stingray.txt | 12 +
Documentation/devicetree/bindings/arm/ccn.txt | 1 +
Documentation/devicetree/bindings/arm/cpus.txt | 1 +
Documentation/devicetree/bindings/arm/gemini.txt | 24 +-
.../bindings/arm/hisilicon/hisilicon.txt | 4 +
.../devicetree/bindings/arm/keystone/keystone.txt | 3 +
Documentation/devicetree/bindings/arm/mediatek.txt | 8 +
Documentation/devicetree/bindings/arm/realtek.txt | 20 +
Documentation/devicetree/bindings/arm/rockchip.txt | 8 +-
Documentation/devicetree/bindings/arm/shmobile.txt | 13 +-
Documentation/devicetree/bindings/arm/tegra.txt | 1 -
.../devicetree/bindings/ata/ahci-fsl-qoriq.txt | 2 +-
.../devicetree/bindings/bus/brcm,gisb-arb.txt | 3 +-
.../bindings/clock/brcm,iproc-clocks.txt | 76 ++
.../devicetree/bindings/cpufreq/ti-cpufreq.txt | 20 +-
.../devicetree/bindings/gpio/gpio_atmel.txt | 10 +-
.../devicetree/bindings/gpu/arm,mali-midgard.txt | 86 +++
.../bindings/i2c/{i2c-mt6577.txt => i2c-mtk.txt} | 10 +-
.../interrupt-controller/mediatek,sysirq.txt | 28 +-
Documentation/devicetree/bindings/mfd/hi6421.txt | 4 +-
.../devicetree/bindings/mmc/fsl-esdhc.txt | 14 +
.../devicetree/bindings/mmc/k3-dw-mshc.txt | 1 +
.../devicetree/bindings/mtd/atmel-nand.txt | 14 +
.../devicetree/bindings/pci/kirin-pcie.txt | 50 ++
.../devicetree/bindings/power/actions,owl-sps.txt | 17 +
.../devicetree/bindings/reset/ti,sci-reset.txt | 62 ++
.../devicetree/bindings/serial/mtk-uart.txt | 2 +
.../devicetree/bindings/soc/mediatek/scpsys.txt | 6 +-
.../bindings/timer/actions,owl-timer.txt | 20 +
.../devicetree/bindings/vendor-prefixes.txt | 5 +
MAINTAINERS | 27 +-
arch/arm/Kconfig | 3 +
arch/arm/Kconfig.debug | 41 ++
arch/arm/Makefile | 1 +
arch/arm/arm-soc-for-next-contents.txt | 246 +++++++
arch/arm/boot/dts/Makefile | 27 +-
arch/arm/boot/dts/aks-cdu.dts | 56 +-
arch/arm/boot/dts/am335x-baltos.dtsi | 2 +-
arch/arm/boot/dts/am335x-base0033.dts | 2 +-
arch/arm/boot/dts/am335x-bone-common.dtsi | 10 +-
arch/arm/boot/dts/am335x-boneblack-wireless.dts | 5 +
arch/arm/boot/dts/am335x-boneblack.dts | 2 +-
arch/arm/boot/dts/am335x-boneblue.dts | 460 ++++++++++++
arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 5 +
arch/arm/boot/dts/am335x-nano.dts | 2 +-
arch/arm/boot/dts/am335x-pepper.dts | 2 +-
arch/arm/boot/dts/am335x-phycore-som.dtsi | 2 +-
arch/arm/boot/dts/am335x-shc.dts | 2 +-
arch/arm/boot/dts/am335x-sl50.dts | 2 +-
arch/arm/boot/dts/am33xx.dtsi | 26 +-
arch/arm/boot/dts/am4372.dtsi | 10 +-
arch/arm/boot/dts/am437x-gp-evm.dts | 2 -
arch/arm/boot/dts/am437x-idk-evm.dts | 2 +-
arch/arm/boot/dts/am437x-sk-evm.dts | 4 +-
arch/arm/boot/dts/am43x-epos-evm.dts | 4 +-
arch/arm/boot/dts/am43xx-clocks.dtsi | 36 +
arch/arm/boot/dts/am571x-idk.dts | 17 +
arch/arm/boot/dts/am572x-idk.dts | 20 +
arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 2 +-
arch/arm/boot/dts/animeo_ip.dts | 53 +-
arch/arm/boot/dts/armada-370.dtsi | 19 +-
arch/arm/boot/dts/armada-385-linksys-caiman.dts | 187 +++--
arch/arm/boot/dts/armada-385-linksys-cobra.dts | 187 +++--
arch/arm/boot/dts/armada-385-linksys-rango.dts | 203 ++++++
arch/arm/boot/dts/armada-385-linksys-shelby.dts | 187 +++--
arch/arm/boot/dts/armada-385-linksys.dtsi | 362 ++++------
arch/arm/boot/dts/armada-385-turris-omnia.dts | 2 +-
arch/arm/boot/dts/armada-38x.dtsi | 16 +-
arch/arm/boot/dts/armada-xp-98dx3236.dtsi | 4 +
arch/arm/boot/dts/armada-xp-98dx4251.dtsi | 1 +
arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 8 +-
arch/arm/boot/dts/armada-xp-mv78230.dtsi | 16 +-
arch/arm/boot/dts/armada-xp-mv78260.dtsi | 19 +-
arch/arm/boot/dts/armada-xp-mv78460.dtsi | 19 +-
arch/arm/boot/dts/aspeed-g4.dtsi | 7 +-
arch/arm/boot/dts/aspeed-g5.dtsi | 7 +-
arch/arm/boot/dts/at91-cosino.dtsi | 83 ++-
arch/arm/boot/dts/at91-kizbox.dts | 42 +-
arch/arm/boot/dts/at91-kizbox2.dts | 45 +-
arch/arm/boot/dts/at91-kizboxmini.dts | 52 +-
arch/arm/boot/dts/at91-linea.dtsi | 27 +-
arch/arm/boot/dts/at91-qil_a9260.dts | 103 +--
arch/arm/boot/dts/at91-sama5d2_xplained.dts | 32 +-
arch/arm/boot/dts/at91-sama5d3_xplained.dts | 97 +--
arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi | 4 +-
arch/arm/boot/dts/at91-sama5d4_xplained.dts | 83 ++-
arch/arm/boot/dts/at91-sama5d4ek.dts | 83 ++-
arch/arm/boot/dts/at91-tse850-3.dts | 72 +-
arch/arm/boot/dts/at91sam9260.dtsi | 65 +-
arch/arm/boot/dts/at91sam9261.dtsi | 48 +-
arch/arm/boot/dts/at91sam9261ek.dts | 83 ++-
arch/arm/boot/dts/at91sam9263.dtsi | 89 ++-
arch/arm/boot/dts/at91sam9263ek.dts | 103 +--
arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 103 +--
arch/arm/boot/dts/at91sam9g45.dtsi | 64 +-
arch/arm/boot/dts/at91sam9m10g45ek.dts | 49 +-
arch/arm/boot/dts/at91sam9n12.dtsi | 74 +-
arch/arm/boot/dts/at91sam9n12ek.dts | 26 +-
arch/arm/boot/dts/at91sam9rl.dtsi | 69 +-
arch/arm/boot/dts/at91sam9rlek.dts | 85 ++-
arch/arm/boot/dts/at91sam9x5.dtsi | 134 ++--
arch/arm/boot/dts/at91sam9x5cm.dtsi | 83 ++-
arch/arm/boot/dts/axp209.dtsi | 5 +
arch/arm/boot/dts/axp22x.dtsi | 5 +
arch/arm/boot/dts/bcm-cygnus.dtsi | 71 ++
arch/arm/boot/dts/bcm-nsp.dtsi | 26 +
arch/arm/boot/dts/bcm2835-rpi-zero.dts | 2 +-
arch/arm/boot/dts/bcm2835-rpi.dtsi | 2 +-
arch/arm/boot/dts/bcm2835.dtsi | 4 +
arch/arm/boot/dts/bcm2836.dtsi | 4 +
arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 1 +
arch/arm/boot/dts/bcm283x-rpi-usb-otg.dtsi | 10 +
arch/arm/boot/dts/bcm283x.dtsi | 27 +
arch/arm/boot/dts/bcm5301x.dtsi | 34 +
arch/arm/boot/dts/bcm911360_entphn.dts | 20 +
arch/arm/boot/dts/da850-evm.dts | 2 +
arch/arm/boot/dts/da850-lego-ev3.dts | 28 +
arch/arm/boot/dts/da850.dtsi | 29 +-
arch/arm/boot/dts/dra7-evm.dts | 3 +-
arch/arm/boot/dts/dra7.dtsi | 4 +-
arch/arm/boot/dts/dra72-evm-common.dtsi | 3 +-
arch/arm/boot/dts/dra7xx-clocks.dtsi | 20 +
arch/arm/boot/dts/emev2.dtsi | 2 +-
arch/arm/boot/dts/ethernut5.dts | 47 +-
arch/arm/boot/dts/exynos3250-monk.dts | 6 +-
arch/arm/boot/dts/exynos3250-rinato.dts | 8 +-
arch/arm/boot/dts/exynos4210-origen.dts | 2 +-
arch/arm/boot/dts/exynos4210-trats.dts | 4 +-
arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 6 +-
arch/arm/boot/dts/exynos4412-odroidu3.dts | 4 +
arch/arm/boot/dts/exynos4412-odroidx.dts | 2 +-
arch/arm/boot/dts/exynos4412-trats2.dts | 8 +-
arch/arm/boot/dts/exynos5.dtsi | 84 +--
arch/arm/boot/dts/exynos5250-arndale.dts | 1 -
arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 7 +
arch/arm/boot/dts/exynos5250-smdk5250.dts | 1 -
arch/arm/boot/dts/exynos5250-snow-common.dtsi | 4 +
arch/arm/boot/dts/exynos5250-spring.dts | 1 -
arch/arm/boot/dts/exynos5250.dtsi | 21 +-
arch/arm/boot/dts/exynos5420-arndale-octa.dts | 1 -
arch/arm/boot/dts/exynos5420-peach-pit.dts | 5 +-
arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 7 +
arch/arm/boot/dts/exynos5420-smdk5420.dts | 1 -
arch/arm/boot/dts/exynos5420.dtsi | 89 ++-
arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi | 2 +-
arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 5 +-
arch/arm/boot/dts/exynos5440.dtsi | 2 +-
arch/arm/boot/dts/exynos5800-peach-pi.dts | 5 +-
arch/arm/boot/dts/ge863-pro3.dtsi | 41 +-
arch/arm/boot/dts/gemini-nas4220b.dts | 10 +
arch/arm/boot/dts/gemini-sq201.dts | 10 +
arch/arm/boot/dts/gemini.dtsi | 81 ++-
arch/arm/boot/dts/imx23-sansa.dts | 7 +-
arch/arm/boot/dts/imx25-karo-tx25.dts | 2 +-
arch/arm/boot/dts/imx25-pdk.dts | 2 +-
arch/arm/boot/dts/imx25.dtsi | 1 +
arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi | 2 +-
arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi | 2 +-
arch/arm/boot/dts/imx28-cfa10037.dts | 2 +-
arch/arm/boot/dts/imx28-cfa10049.dts | 2 +-
arch/arm/boot/dts/imx28-cfa10057.dts | 2 +-
arch/arm/boot/dts/imx28-cfa10058.dts | 2 +-
arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts | 2 +-
arch/arm/boot/dts/imx28-evk.dts | 4 +-
arch/arm/boot/dts/imx28-m28cu3.dts | 2 +-
arch/arm/boot/dts/imx50-evk.dts | 2 +-
arch/arm/boot/dts/imx50.dtsi | 1 +
arch/arm/boot/dts/imx51-apf51.dts | 2 +-
arch/arm/boot/dts/imx53-mba53.dts | 2 +-
arch/arm/boot/dts/imx53-qsb-common.dtsi | 2 +-
arch/arm/boot/dts/imx53-smd.dts | 2 +-
arch/arm/boot/dts/imx53-tqma53.dtsi | 2 +-
arch/arm/boot/dts/imx53-tx53.dtsi | 2 +-
arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi | 2 +-
arch/arm/boot/dts/imx6dl-gw560x.dts | 55 ++
arch/arm/boot/dts/imx6dl-riotboard.dts | 2 +-
arch/arm/boot/dts/imx6dl-sabrelite.dts | 5 +
arch/arm/boot/dts/imx6dl-sabresd.dts | 5 +
arch/arm/boot/dts/imx6dl.dtsi | 189 +++++
arch/arm/boot/dts/imx6q-ba16.dtsi | 2 +-
arch/arm/boot/dts/imx6q-cm-fx6.dts | 43 +-
arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 4 +-
arch/arm/boot/dts/imx6q-evi.dts | 2 +-
arch/arm/boot/dts/imx6q-gw5400-a.dts | 7 +-
arch/arm/boot/dts/imx6q-gw560x.dts | 59 ++
arch/arm/boot/dts/imx6q-novena.dts | 4 +-
arch/arm/boot/dts/imx6q-sabrelite.dts | 5 +
arch/arm/boot/dts/imx6q-sabresd.dts | 5 +
arch/arm/boot/dts/imx6q-utilite-pro.dts | 2 +-
arch/arm/boot/dts/imx6q-zii-rdu2.dts | 4 +-
arch/arm/boot/dts/imx6q.dtsi | 127 +++-
arch/arm/boot/dts/imx6qdl-apf6dev.dtsi | 2 +-
arch/arm/boot/dts/imx6qdl-aristainetos.dtsi | 2 +-
arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi | 4 +-
arch/arm/boot/dts/imx6qdl-colibri.dtsi | 1 +
arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 5 -
arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 5 -
arch/arm/boot/dts/imx6qdl-gw560x.dtsi | 749 ++++++++++++++++++++
arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi | 2 +-
arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 2 +-
arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 2 +-
arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 2 +-
arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 2 +-
arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 131 +++-
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 152 +++-
arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 116 ++-
arch/arm/boot/dts/imx6qdl-tx6.dtsi | 5 +-
arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 3 +-
arch/arm/boot/dts/imx6qdl.dtsi | 60 +-
arch/arm/boot/dts/imx6qp-zii-rdu2.dts | 4 +-
arch/arm/boot/dts/imx6qp.dtsi | 4 +
arch/arm/boot/dts/imx6sl.dtsi | 3 +
arch/arm/boot/dts/imx6sx-nitrogen6sx.dts | 4 +-
arch/arm/boot/dts/imx6sx-sdb.dts | 8 +
arch/arm/boot/dts/imx6sx.dtsi | 3 +
arch/arm/boot/dts/imx6ul-opos6ul.dtsi | 2 +-
arch/arm/boot/dts/imx6ul-tx6ul-mainboard.dts | 2 +-
arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 7 +-
arch/arm/boot/dts/imx6ul.dtsi | 1 +
arch/arm/boot/dts/imx7-colibri.dtsi | 2 +-
arch/arm/boot/dts/imx7d-nitrogen7.dts | 6 +-
arch/arm/boot/dts/imx7d-pico.dts | 403 +++++++++++
arch/arm/boot/dts/imx7d-pinfunc.h | 6 +-
arch/arm/boot/dts/imx7d-sdb.dts | 133 +++-
arch/arm/boot/dts/imx7d.dtsi | 37 +
arch/arm/boot/dts/imx7s-warp.dts | 3 +-
arch/arm/boot/dts/imx7s.dtsi | 50 +-
arch/arm/boot/dts/keystone-k2g-evm.dts | 2 +-
arch/arm/boot/dts/keystone-k2g-ice.dts | 35 +
arch/arm/boot/dts/keystone-k2g.dtsi | 3 +-
arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 2 +-
arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 4 +
arch/arm/boot/dts/ls1021a.dtsi | 90 +--
arch/arm/boot/dts/meson.dtsi | 213 ++++--
arch/arm/boot/dts/meson6-atv1200.dts | 2 +-
arch/arm/boot/dts/meson6.dtsi | 4 +-
arch/arm/boot/dts/meson8.dtsi | 240 +++++--
arch/arm/boot/dts/meson8b.dtsi | 272 +++----
arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi | 16 +
arch/arm/boot/dts/moxart.dtsi | 3 +-
arch/arm/boot/dts/mt2701-evb.dts | 132 ++++
arch/arm/boot/dts/mt2701.dtsi | 179 ++++-
arch/arm/boot/dts/mt7623.dtsi | 546 ++++++++++++++-
arch/arm/boot/dts/omap3-cm-t3x.dtsi | 2 +-
arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 9 +-
arch/arm/boot/dts/omap3-evm-37xx.dts | 102 +++
arch/arm/boot/dts/omap3-evm-common.dtsi | 34 +-
arch/arm/boot/dts/omap3-gta04.dtsi | 2 +-
arch/arm/boot/dts/omap3-sb-t35.dtsi | 3 +-
arch/arm/boot/dts/omap3-tao3530.dtsi | 1 -
arch/arm/boot/dts/omap4-droid4-xt894.dts | 39 +-
arch/arm/boot/dts/omap4-duovero.dtsi | 4 +
arch/arm/boot/dts/omap4-var-som-om44.dtsi | 2 +-
arch/arm/boot/dts/omap4.dtsi | 22 +-
arch/arm/boot/dts/omap44xx-clocks.dtsi | 22 +-
arch/arm/boot/dts/omap5-cm-t54.dts | 2 +-
arch/arm/boot/dts/omap5-sbc-t54.dts | 2 +-
arch/arm/boot/dts/omap5-uevm.dts | 13 +
arch/arm/boot/dts/omap54xx-clocks.dtsi | 6 +
arch/arm/boot/dts/owl-s500-guitar-bb-rev-b.dts | 26 +
arch/arm/boot/dts/owl-s500-guitar.dtsi | 22 +
arch/arm/boot/dts/owl-s500.dtsi | 186 +++++
arch/arm/boot/dts/pm9g45.dts | 99 +--
arch/arm/boot/dts/pxa25x.dtsi | 8 +-
arch/arm/boot/dts/pxa27x.dtsi | 14 +-
arch/arm/boot/dts/qcom-apq8060-dragonboard.dts | 129 ++++
.../arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts | 48 +-
arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts | 20 +-
arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts | 53 +-
arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 53 +-
.../arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts | 16 +-
arch/arm/boot/dts/qcom-apq8064.dtsi | 154 ++--
arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 20 +
arch/arm/boot/dts/qcom-ipq4019.dtsi | 4 +-
arch/arm/boot/dts/qcom-ipq8064.dtsi | 23 +
arch/arm/boot/dts/qcom-msm8660.dtsi | 84 +++
.../boot/dts/qcom-msm8974-sony-xperia-honami.dts | 1 -
arch/arm/boot/dts/qcom-msm8974.dtsi | 54 +-
arch/arm/boot/dts/qcom-pm8941.dtsi | 36 +-
arch/arm/boot/dts/r7s72100-gr-peach.dts | 66 ++
arch/arm/boot/dts/r7s72100.dtsi | 6 +-
arch/arm/boot/dts/r8a73a4.dtsi | 2 +-
arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 +
arch/arm/boot/dts/r8a7740.dtsi | 2 +-
arch/arm/boot/dts/r8a7743-iwg20d-q7.dts | 25 +
arch/arm/boot/dts/r8a7743-iwg20m.dtsi | 29 +
arch/arm/boot/dts/r8a7778.dtsi | 2 +-
arch/arm/boot/dts/r8a7779.dtsi | 2 +-
arch/arm/boot/dts/r8a7790.dtsi | 18 +-
arch/arm/boot/dts/r8a7791.dtsi | 32 +-
arch/arm/boot/dts/r8a7793-gose.dts | 161 ++++-
arch/arm/boot/dts/r8a7793.dtsi | 5 +-
arch/arm/boot/dts/r8a7794.dtsi | 16 +-
arch/arm/boot/dts/r8a77xx-aa104xd12-panel.dtsi | 3 +-
arch/arm/boot/dts/r8a77xx-aa121td01-panel.dtsi | 3 +-
arch/arm/boot/dts/rk3229-evb.dts | 74 ++
arch/arm/boot/dts/rk322x.dtsi | 211 +++++-
arch/arm/boot/dts/rk3288-firefly-reload.dts | 17 +
arch/arm/boot/dts/rk3288-firefly.dtsi | 18 +
arch/arm/boot/dts/rk3288-rock2-som.dtsi | 5 +
arch/arm/boot/dts/rk3288-rock2-square.dts | 8 +-
arch/arm/boot/dts/rk3288-veyron.dtsi | 5 +
arch/arm/boot/dts/rk3288.dtsi | 43 ++
.../boot/dts/{rk1108-evb.dts => rv1108-evb.dts} | 6 +-
arch/arm/boot/dts/{rk1108.dtsi => rv1108.dtsi} | 20 +-
arch/arm/boot/dts/sama5d2.dtsi | 117 ++++
arch/arm/boot/dts/sama5d3.dtsi | 131 +++-
arch/arm/boot/dts/sama5d3xcm.dtsi | 97 ++-
arch/arm/boot/dts/sama5d3xcm_cmp.dtsi | 77 +-
arch/arm/boot/dts/sama5d4.dtsi | 177 ++++-
arch/arm/boot/dts/sh73a0.dtsi | 2 +-
arch/arm/boot/dts/socfpga.dtsi | 4 +-
arch/arm/boot/dts/socfpga_arria10_socdk.dtsi | 2 +-
arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts | 2 +-
arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts | 2 +-
arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts | 101 ++-
arch/arm/boot/dts/stm32429i-eval.dts | 88 +++
arch/arm/boot/dts/stm32f429-disco.dts | 4 +
arch/arm/boot/dts/stm32f429.dtsi | 121 +++-
arch/arm/boot/dts/stm32f746-disco.dts | 74 ++
arch/arm/boot/dts/stm32f746.dtsi | 36 +
arch/arm/boot/dts/stm32f769-disco.dts | 74 ++
arch/arm/boot/dts/stm32h743-pinctrl.dtsi | 13 +
arch/arm/boot/dts/stm32h743.dtsi | 8 +
arch/arm/boot/dts/stm32h743i-disco.dts | 73 ++
arch/arm/boot/dts/sun4i-a10-a1000.dts | 2 +-
arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 2 +-
arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 2 +-
arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 6 +-
arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts | 2 +-
arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 2 +-
arch/arm/boot/dts/sun4i-a10-hackberry.dts | 2 +-
arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts | 6 +-
arch/arm/boot/dts/sun4i-a10-inet1.dts | 2 +-
arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 2 +-
arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 2 +-
.../boot/dts/sun4i-a10-itead-iteaduino-plus.dts | 2 +-
arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 2 +-
arch/arm/boot/dts/sun4i-a10-marsboard.dts | 2 +-
arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 2 +-
arch/arm/boot/dts/sun4i-a10-mk802.dts | 2 +-
arch/arm/boot/dts/sun4i-a10-mk802ii.dts | 2 +-
arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 2 +-
arch/arm/boot/dts/sun4i-a10-pcduino.dts | 2 +-
arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 2 +-
arch/arm/boot/dts/sun4i-a10.dtsi | 6 -
arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts | 8 -
arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 4 -
arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 33 +-
arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 4 -
arch/arm/boot/dts/sun5i-a10s.dtsi | 47 ++
.../boot/dts/sun5i-a13-empire-electronix-d709.dts | 4 -
arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 5 -
arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 4 -
arch/arm/boot/dts/sun5i-r8-chip.dts | 4 +
arch/arm/boot/dts/sun5i.dtsi | 10 +
arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 10 +-
arch/arm/boot/dts/sun6i-a31.dtsi | 172 ++++-
arch/arm/boot/dts/sun6i-a31s-primo81.dts | 20 +-
arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 2 +-
arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 6 +-
arch/arm/boot/dts/sun7i-a20-bananapi.dts | 51 ++
arch/arm/boot/dts/sun7i-a20-bananapro.dts | 2 +-
arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 14 +-
arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 5 +-
arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 2 +-
arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 4 +-
arch/arm/boot/dts/sun7i-a20-icnova-swac.dts | 2 +-
arch/arm/boot/dts/sun7i-a20-itead-ibox.dts | 2 +-
arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 8 -
arch/arm/boot/dts/sun7i-a20-m3.dts | 2 +-
arch/arm/boot/dts/sun7i-a20-mk808c.dts | 2 +-
arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 2 +-
arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 2 +-
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 2 +-
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 2 +-
arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 2 +-
arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 6 +-
arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 2 +-
arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 4 +-
arch/arm/boot/dts/sun7i-a20.dtsi | 9 +-
arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 8 +-
arch/arm/boot/dts/sun8i-a33.dtsi | 30 +-
.../boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts | 2 +-
arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts | 50 +-
arch/arm/boot/dts/sun8i-a83t.dtsi | 111 ++-
arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 21 +
arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts | 53 +-
arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts | 64 ++
arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts | 7 +
arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 21 +-
arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 8 +
arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts | 5 +
arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 30 +-
arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 32 +
arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts | 26 +
arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts | 96 +++
arch/arm/boot/dts/sun8i-v3s.dtsi | 183 ++++-
arch/arm/boot/dts/sunxi-common-regulators.dtsi | 30 -
arch/arm/boot/dts/sunxi-h3-h5.dtsi | 48 +-
arch/arm/boot/dts/tegra124-apalis-eval.dts | 2 +-
arch/arm/boot/dts/tegra124-apalis.dtsi | 2 +-
arch/arm/boot/dts/tegra124-jetson-tk1.dts | 2 +-
arch/arm/boot/dts/tegra124.dtsi | 4 +-
arch/arm/boot/dts/tegra20-harmony.dts | 2 +-
arch/arm/boot/dts/tegra20-tamonten.dtsi | 2 +-
arch/arm/boot/dts/tegra20-tec.dts | 2 +-
arch/arm/boot/dts/tegra20-trimslice.dts | 2 +-
arch/arm/boot/dts/tegra20-whistler.dts | 636 -----------------
arch/arm/boot/dts/tegra20.dtsi | 4 +-
arch/arm/boot/dts/tegra30-apalis-eval.dts | 2 +-
arch/arm/boot/dts/tegra30-apalis.dtsi | 2 +-
arch/arm/boot/dts/tegra30-beaver.dts | 2 +-
arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 +-
arch/arm/boot/dts/tegra30.dtsi | 5 +-
arch/arm/boot/dts/tny_a9260_common.dtsi | 89 ++-
arch/arm/boot/dts/tny_a9263.dts | 103 +--
arch/arm/boot/dts/twl4030.dtsi | 2 +
arch/arm/boot/dts/uniphier-ld4-ref.dts | 38 +-
arch/arm/boot/dts/uniphier-ld4.dtsi | 40 +-
arch/arm/boot/dts/uniphier-ld6b-ref.dts | 38 +-
arch/arm/boot/dts/uniphier-ld6b.dtsi | 38 +-
arch/arm/boot/dts/uniphier-pro4-ace.dts | 40 +-
arch/arm/boot/dts/uniphier-pro4-ref.dts | 38 +-
arch/arm/boot/dts/uniphier-pro4-sanji.dts | 40 +-
arch/arm/boot/dts/uniphier-pro4.dtsi | 40 +-
arch/arm/boot/dts/uniphier-pro5.dtsi | 34 +-
arch/arm/boot/dts/uniphier-pxs2-gentil.dts | 40 +-
arch/arm/boot/dts/uniphier-pxs2-vodka.dts | 38 +-
arch/arm/boot/dts/uniphier-pxs2.dtsi | 56 +-
arch/arm/boot/dts/uniphier-ref-daughter.dtsi | 38 +-
arch/arm/boot/dts/uniphier-sld3-ref.dts | 38 +-
arch/arm/boot/dts/uniphier-sld3.dtsi | 40 +-
arch/arm/boot/dts/uniphier-sld8-ref.dts | 38 +-
arch/arm/boot/dts/uniphier-sld8.dtsi | 40 +-
arch/arm/boot/dts/uniphier-support-card.dtsi | 42 +-
arch/arm/boot/dts/usb_a9260_common.dtsi | 103 +--
arch/arm/boot/dts/usb_a9263.dts | 103 +--
arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 2 +
arch/arm/configs/acs5k_defconfig | 8 -
arch/arm/configs/acs5k_tiny_defconfig | 10 -
arch/arm/configs/am200epdkit_defconfig | 7 -
arch/arm/configs/assabet_defconfig | 3 -
arch/arm/configs/axm55xx_defconfig | 1 -
arch/arm/configs/badge4_defconfig | 5 -
arch/arm/configs/bcm2835_defconfig | 8 +
arch/arm/configs/cerfcube_defconfig | 4 -
arch/arm/configs/cm_x2xx_defconfig | 13 -
arch/arm/configs/cm_x300_defconfig | 10 -
arch/arm/configs/cns3420vb_defconfig | 7 -
arch/arm/configs/colibri_pxa270_defconfig | 13 -
arch/arm/configs/colibri_pxa300_defconfig | 9 -
arch/arm/configs/collie_defconfig | 4 -
arch/arm/configs/corgi_defconfig | 13 -
arch/arm/configs/davinci_all_defconfig | 12 +-
arch/arm/configs/dove_defconfig | 1 -
arch/arm/configs/ebsa110_defconfig | 1 -
arch/arm/configs/efm32_defconfig | 1 -
arch/arm/configs/em_x270_defconfig | 13 -
arch/arm/configs/ep93xx_defconfig | 1 -
arch/arm/configs/eseries_pxa_defconfig | 8 -
arch/arm/configs/exynos_defconfig | 12 +-
arch/arm/configs/ezx_defconfig | 18 -
arch/arm/configs/footbridge_defconfig | 1 -
arch/arm/configs/h5000_defconfig | 6 -
arch/arm/configs/hackkit_defconfig | 3 -
arch/arm/configs/imote2_defconfig | 16 -
arch/arm/configs/imx_v4_v5_defconfig | 1 -
arch/arm/configs/imx_v6_v7_defconfig | 6 +
arch/arm/configs/iop13xx_defconfig | 4 -
arch/arm/configs/iop32x_defconfig | 5 -
arch/arm/configs/iop33x_defconfig | 6 -
arch/arm/configs/ixp4xx_defconfig | 9 -
arch/arm/configs/jornada720_defconfig | 8 -
arch/arm/configs/ks8695_defconfig | 7 -
arch/arm/configs/lart_defconfig | 3 -
arch/arm/configs/lpc18xx_defconfig | 1 -
arch/arm/configs/lpd270_defconfig | 5 -
arch/arm/configs/lubbock_defconfig | 4 -
arch/arm/configs/magician_defconfig | 15 -
arch/arm/configs/mainstone_defconfig | 4 -
arch/arm/configs/mini2440_defconfig | 91 +--
arch/arm/configs/mmp2_defconfig | 9 -
arch/arm/configs/moxart_defconfig | 1 -
arch/arm/configs/mps2_defconfig | 1 -
arch/arm/configs/multi_v7_defconfig | 9 +
arch/arm/configs/mv78xx0_defconfig | 8 -
arch/arm/configs/mvebu_v7_defconfig | 2 +
arch/arm/configs/mxs_defconfig | 7 +-
arch/arm/configs/neponset_defconfig | 4 -
arch/arm/configs/netwinder_defconfig | 3 -
arch/arm/configs/netx_defconfig | 6 -
arch/arm/configs/nhk8815_defconfig | 1 -
arch/arm/configs/nuc910_defconfig | 7 -
arch/arm/configs/nuc950_defconfig | 7 -
arch/arm/configs/nuc960_defconfig | 7 -
arch/arm/configs/omap1_defconfig | 2 -
arch/arm/configs/orion5x_defconfig | 2 -
arch/arm/configs/palmz72_defconfig | 6 -
arch/arm/configs/pcm027_defconfig | 8 -
arch/arm/configs/pleb_defconfig | 3 -
arch/arm/configs/pxa168_defconfig | 9 -
arch/arm/configs/pxa255-idp_defconfig | 4 -
arch/arm/configs/pxa3xx_defconfig | 9 -
arch/arm/configs/pxa910_defconfig | 9 -
arch/arm/configs/pxa_defconfig | 2 -
arch/arm/configs/qcom_defconfig | 4 +-
arch/arm/configs/raumfeld_defconfig | 11 -
arch/arm/configs/realview_defconfig | 1 -
arch/arm/configs/rpc_defconfig | 6 -
arch/arm/configs/s3c2410_defconfig | 38 +-
arch/arm/configs/s3c6400_defconfig | 18 +-
arch/arm/configs/s5pv210_defconfig | 28 +-
arch/arm/configs/sama5_defconfig | 4 +-
arch/arm/configs/shannon_defconfig | 3 -
arch/arm/configs/simpad_defconfig | 7 -
arch/arm/configs/spear13xx_defconfig | 4 -
arch/arm/configs/spear3xx_defconfig | 4 -
arch/arm/configs/spear6xx_defconfig | 3 -
arch/arm/configs/spitz_defconfig | 13 -
arch/arm/configs/stm32_defconfig | 3 +
arch/arm/configs/sunxi_defconfig | 1 -
arch/arm/configs/tct_hammer_defconfig | 15 +-
arch/arm/configs/trizeps4_defconfig | 8 -
arch/arm/configs/u300_defconfig | 1 -
arch/arm/configs/vexpress_defconfig | 1 -
arch/arm/configs/viper_defconfig | 9 -
arch/arm/configs/xcep_defconfig | 8 -
arch/arm/configs/zeus_defconfig | 10 -
arch/arm/configs/zx_defconfig | 2 -
arch/arm/mach-actions/Kconfig | 16 +
arch/arm/mach-actions/Makefile | 4 +
arch/arm/mach-actions/headsmp.S | 68 ++
arch/arm/mach-actions/owl.c | 28 +
arch/arm/mach-actions/platsmp.c | 198 ++++++
arch/arm/mach-at91/Kconfig | 16 +-
arch/arm/mach-at91/Makefile | 4 +-
arch/arm/mach-at91/Makefile.boot | 3 +
arch/arm/mach-at91/generic.h | 2 +
arch/arm/mach-at91/pm.c | 206 +++++-
arch/arm/mach-at91/pm.h | 5 +
arch/arm/mach-at91/pm_data-offsets.c | 3 +
arch/arm/mach-at91/pm_suspend.S | 73 +-
arch/arm/mach-at91/sama5.c | 19 +-
arch/arm/mach-at91/samv7.c | 25 +
arch/arm/mach-bcm/Kconfig | 2 +
arch/arm/mach-davinci/board-dm646x-evm.c | 4 +-
arch/arm/mach-davinci/devices-da8xx.c | 30 +
arch/arm/mach-davinci/include/mach/da8xx.h | 5 +
arch/arm/mach-davinci/pdata-quirks.c | 4 +-
arch/arm/mach-imx/Kconfig | 1 +
arch/arm/mach-imx/cpu.c | 3 +
arch/arm/mach-imx/mxc.h | 6 +
arch/arm/mach-imx/pm-imx6.c | 6 +-
arch/arm/mach-meson/Kconfig | 1 +
arch/arm/mach-omap1/dma.c | 5 +-
arch/arm/mach-omap1/timer.c | 4 +-
arch/arm/mach-omap2/Makefile | 4 -
arch/arm/mach-omap2/board-n8x0.c | 14 +-
arch/arm/mach-omap2/clockdomain.c | 8 +
arch/arm/mach-omap2/clockdomain.h | 2 +
arch/arm/mach-omap2/cm.h | 7 +-
arch/arm/mach-omap2/cm2xxx_3xxx.h | 4 +-
arch/arm/mach-omap2/cm33xx.c | 4 +-
arch/arm/mach-omap2/cm3xxx.c | 3 +-
arch/arm/mach-omap2/cm_common.c | 31 +-
arch/arm/mach-omap2/cminst44xx.c | 29 +-
arch/arm/mach-omap2/devices.c | 175 -----
arch/arm/mach-omap2/hsmmc.c | 5 +-
arch/arm/mach-omap2/io.c | 59 +-
arch/arm/mach-omap2/mcbsp.c | 70 --
arch/arm/mach-omap2/omap-wakeupgen.c | 68 +-
arch/arm/mach-omap2/omap_device.c | 5 +-
arch/arm/mach-omap2/omap_hwmod.c | 168 ++++-
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 3 +-
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 146 +++-
arch/arm/mach-omap2/opp.c | 104 ---
arch/arm/mach-omap2/opp3xxx_data.c | 86 ---
arch/arm/mach-omap2/opp4xxx_data.c | 79 ---
arch/arm/mach-omap2/pm.c | 2 +-
arch/arm/mach-omap2/pmu.c | 97 ---
arch/arm/mach-omap2/prcm-common.h | 7 +
arch/arm/mach-omap2/prcm_mpu44xx.c | 4 +-
arch/arm/mach-omap2/prcm_mpu_44xx_54xx.h | 4 +-
arch/arm/mach-omap2/prm.h | 2 +-
arch/arm/mach-omap2/prm2xxx_3xxx.h | 4 +-
arch/arm/mach-omap2/prm33xx.c | 4 +-
arch/arm/mach-omap2/prm3xxx.c | 19 +-
arch/arm/mach-omap2/prm44xx.c | 63 +-
arch/arm/mach-omap2/prm_common.c | 32 +-
arch/arm/mach-omap2/prminst44xx.c | 16 +-
arch/arm/mach-omap2/sr_device.c | 15 +-
arch/arm/mach-omap2/timer.c | 200 ++----
arch/arm/mach-omap2/wd_timer.c | 28 -
arch/arm/mach-prima2/Kconfig | 1 -
arch/arm/mach-pxa/include/mach/magician.h | 1 +
arch/arm/mach-pxa/magician.c | 84 ++-
arch/arm/mach-pxa/pm.c | 4 +-
arch/arm/mach-pxa/pxa3xx-ulpi.c | 6 +-
arch/arm/mach-rockchip/rockchip.c | 1 +
arch/arm/mach-s3c64xx/Kconfig | 1 -
arch/arm/mach-shmobile/pm-rmobile.c | 19 +-
arch/arm/mach-stm32/Kconfig | 5 +
arch/arm64/Kconfig.platforms | 21 +-
arch/arm64/boot/dts/Makefile | 2 +
arch/arm64/boot/dts/actions/Makefile | 5 +
arch/arm64/boot/dts/actions/s900-bubblegum-96.dts | 35 +
arch/arm64/boot/dts/actions/s900.dtsi | 164 +++++
arch/arm64/boot/dts/allwinner/Makefile | 5 +
.../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 15 +
.../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 95 +++
.../boot/dts/allwinner/sun50i-a64-pine64-plus.dts | 17 +-
.../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 57 ++
.../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 126 ++++
.../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 65 ++
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 137 +++-
.../boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts | 161 +++++
.../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 27 +
.../dts/allwinner/sun50i-h5-orangepi-prime.dts | 232 ++++++
.../allwinner/sun50i-h5-orangepi-zero-plus2.dts | 92 +++
arch/arm64/boot/dts/amlogic/Makefile | 9 +-
.../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 60 +-
arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 11 +-
.../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 291 ++++++++
.../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 52 +-
.../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 108 +--
arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 66 +-
.../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 56 +-
.../boot/dts/amlogic/meson-gxbb-wetek-hub.dts | 6 +-
.../boot/dts/amlogic/meson-gxbb-wetek-play2.dts | 40 ++
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 220 +++---
.../boot/dts/amlogic/meson-gxl-s905d-p230.dts | 24 +
.../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 25 +-
.../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 92 +++
.../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 52 +-
.../boot/dts/amlogic/meson-gxl-s905x-p212.dts | 23 +
arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi | 2 +-
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 127 +++-
.../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 87 ++-
arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 240 +++++++
arch/arm64/boot/dts/arm/juno-base.dtsi | 58 +-
arch/arm64/boot/dts/arm/juno-r1.dts | 24 +
arch/arm64/boot/dts/arm/juno-r2.dts | 24 +
arch/arm64/boot/dts/arm/juno.dts | 24 +
arch/arm64/boot/dts/broadcom/Makefile | 1 +
arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts | 17 +
arch/arm64/boot/dts/broadcom/bcm2837.dtsi | 4 +
arch/arm64/boot/dts/broadcom/ns2.dtsi | 14 +
arch/arm64/boot/dts/broadcom/stingray/Makefile | 6 +
.../boot/dts/broadcom/stingray/bcm958742-base.dtsi | 131 ++++
.../boot/dts/broadcom/stingray/bcm958742k.dts | 78 +++
.../boot/dts/broadcom/stingray/bcm958742t.dts | 40 ++
.../boot/dts/broadcom/stingray/stingray-clock.dtsi | 170 +++++
.../dts/broadcom/stingray/stingray-pinctrl.dtsi | 345 +++++++++
.../arm64/boot/dts/broadcom/stingray/stingray.dtsi | 460 ++++++++++++
arch/arm64/boot/dts/exynos/exynos5433-tm2.dts | 1 -
arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts | 2 +-
arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts | 10 +-
arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts | 15 +-
arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 39 +-
arch/arm64/boot/dts/freescale/fsl-ls1043-post.dtsi | 45 ++
arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts | 4 +-
arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts | 79 ++-
arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 69 +-
arch/arm64/boot/dts/freescale/fsl-ls1046-post.dtsi | 48 ++
arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts | 4 +-
arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 70 +-
arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 75 +-
arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts | 28 +
arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts | 20 +
arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 111 ++-
arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts | 3 +-
arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts | 3 +-
arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts | 2 +-
arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 2 +-
arch/arm64/boot/dts/freescale/fsl-ls2088a-qds.dts | 3 +-
arch/arm64/boot/dts/freescale/fsl-ls2088a-rdb.dts | 3 +-
arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi | 3 +-
arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi | 4 +-
arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi | 3 +-
arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 5 +-
.../boot/dts/freescale/qoriq-bman-portals.dtsi | 71 ++
.../boot/dts/freescale/qoriq-fman3-0-10g-0.dtsi | 42 ++
.../boot/dts/freescale/qoriq-fman3-0-10g-1.dtsi | 42 ++
.../boot/dts/freescale/qoriq-fman3-0-1g-0.dtsi | 41 ++
.../boot/dts/freescale/qoriq-fman3-0-1g-1.dtsi | 41 ++
.../boot/dts/freescale/qoriq-fman3-0-1g-2.dtsi | 41 ++
.../boot/dts/freescale/qoriq-fman3-0-1g-3.dtsi | 41 ++
.../boot/dts/freescale/qoriq-fman3-0-1g-4.dtsi | 41 ++
.../boot/dts/freescale/qoriq-fman3-0-1g-5.dtsi | 41 ++
arch/arm64/boot/dts/freescale/qoriq-fman3-0.dtsi | 81 +++
.../boot/dts/freescale/qoriq-qman-portals.dtsi | 80 +++
arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 217 +++++-
arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 706 ++++++++++++++++++-
arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 34 +-
arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 26 +
.../arm64/boot/dts/hisilicon/hikey960-pinctrl.dtsi | 778 +++++++++++++++++++--
arch/arm64/boot/dts/marvell/armada-3720-db.dts | 120 ++--
arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 25 +-
arch/arm64/boot/dts/marvell/armada-7020.dtsi | 2 +-
arch/arm64/boot/dts/marvell/armada-7040-db.dts | 6 +-
arch/arm64/boot/dts/marvell/armada-7040.dtsi | 2 +-
arch/arm64/boot/dts/marvell/armada-70x0.dtsi | 68 ++
arch/arm64/boot/dts/marvell/armada-8020.dtsi | 3 +-
arch/arm64/boot/dts/marvell/armada-8040-db.dts | 24 +-
arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 42 ++
arch/arm64/boot/dts/marvell/armada-8040.dtsi | 3 +-
arch/arm64/boot/dts/marvell/armada-80x0.dtsi | 76 ++
arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 48 +-
.../boot/dts/marvell/armada-cp110-master.dtsi | 145 ++--
.../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 146 ++--
arch/arm64/boot/dts/mediatek/Makefile | 1 +
arch/arm64/boot/dts/mediatek/mt6797-evb.dts | 36 +
arch/arm64/boot/dts/mediatek/mt6797.dtsi | 244 +++++++
arch/arm64/boot/dts/mediatek/mt8173.dtsi | 153 ++--
arch/arm64/boot/dts/nvidia/tegra132.dtsi | 4 +-
arch/arm64/boot/dts/nvidia/tegra186.dtsi | 7 +
arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 2 +-
arch/arm64/boot/dts/nvidia/tegra210.dtsi | 4 +-
arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 36 +-
arch/arm64/boot/dts/qcom/msm8916.dtsi | 62 +-
arch/arm64/boot/dts/qcom/msm8992.dtsi | 53 ++
arch/arm64/boot/dts/qcom/msm8996.dtsi | 6 +
arch/arm64/boot/dts/realtek/Makefile | 5 +
arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts | 42 ++
arch/arm64/boot/dts/realtek/rtd1295.dtsi | 131 ++++
arch/arm64/boot/dts/renesas/Makefile | 2 +
arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts | 42 ++
.../boot/dts/renesas/r8a7795-es1-salvator-x.dts | 115 +++
arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 84 +++
arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts | 342 +--------
arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 565 ++-------------
.../arm64/boot/dts/renesas/r8a7795-salvator-xs.dts | 109 +++
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 133 ++--
arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts | 168 +----
arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 244 +------
arch/arm64/boot/dts/renesas/r8a7796.dtsi | 421 +++++++++++
arch/arm64/boot/dts/renesas/salvator-common.dtsi | 629 +++++++++++++++++
arch/arm64/boot/dts/renesas/salvator-x.dtsi | 30 +
arch/arm64/boot/dts/renesas/salvator-xs.dtsi | 20 +
arch/arm64/boot/dts/renesas/ulcb.dtsi | 367 ++++++++++
arch/arm64/boot/dts/rockchip/Makefile | 1 +
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 33 +
arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 718 +++++++++++++++++++
arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 2 +-
arch/arm64/boot/dts/rockchip/rk3399-op1-opp.dtsi | 145 ++++
arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi | 18 +-
arch/arm64/boot/dts/rockchip/rk3399.dtsi | 165 ++++-
arch/arm64/boot/dts/socionext/Makefile | 2 +
.../boot/dts/socionext/uniphier-ld11-global.dts | 70 ++
.../arm64/boot/dts/socionext/uniphier-ld11-ref.dts | 38 +-
arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 61 +-
.../boot/dts/socionext/uniphier-ld20-global.dts | 52 ++
.../arm64/boot/dts/socionext/uniphier-ld20-ref.dts | 38 +-
arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 79 +--
arch/arm64/boot/dts/zte/zx296718.dtsi | 10 +-
arch/arm64/configs/defconfig | 26 +-
drivers/base/power/domain.c | 8 +-
drivers/bus/Kconfig | 2 +-
drivers/bus/arm-ccn.c | 10 +-
drivers/bus/brcmstb_gisb.c | 121 ++--
drivers/clk/meson/gxbb.h | 20 +-
drivers/clk/meson/meson8b.h | 20 +-
drivers/clocksource/Kconfig | 7 +
drivers/clocksource/Makefile | 1 +
drivers/clocksource/owl-timer.c | 172 +++++
drivers/cpufreq/scpi-cpufreq.c | 38 +-
drivers/firmware/arm_scpi.c | 63 ++
drivers/firmware/tegra/bpmp.c | 32 +-
drivers/memory/omap-gpmc.c | 9 +-
drivers/reset/Kconfig | 17 +-
drivers/reset/Makefile | 4 +-
drivers/reset/core.c | 23 +-
drivers/reset/reset-gemini.c | 110 +++
drivers/reset/reset-ti-sci.c | 269 +++++++
drivers/reset/sti/reset-syscfg.c | 6 +-
drivers/soc/Kconfig | 2 +
drivers/soc/Makefile | 3 +-
drivers/soc/actions/Kconfig | 16 +
drivers/soc/actions/Makefile | 2 +
drivers/soc/actions/owl-sps-helper.c | 51 ++
drivers/soc/actions/owl-sps.c | 224 ++++++
drivers/soc/atmel/soc.c | 24 +
drivers/soc/atmel/soc.h | 26 +
drivers/soc/bcm/Kconfig | 2 +-
drivers/soc/imx/Makefile | 2 +-
drivers/soc/mediatek/mtk-pmic-wrap.c | 14 +-
drivers/soc/mediatek/mtk-scpsys.c | 149 +++-
drivers/soc/qcom/smsm.c | 9 +-
drivers/soc/renesas/Kconfig | 63 ++
drivers/soc/renesas/Makefile | 31 +-
drivers/soc/renesas/rcar-sysc.c | 52 +-
drivers/soc/renesas/rcar-sysc.h | 2 -
drivers/soc/tegra/Kconfig | 5 +
drivers/soc/tegra/Makefile | 1 +
drivers/soc/tegra/flowctrl.c | 2 +-
drivers/soc/tegra/powergate-bpmp.c | 359 ++++++++++
include/dt-bindings/clock/bcm-sr.h | 101 +++
include/dt-bindings/clock/gxbb-clkc.h | 10 +-
include/dt-bindings/clock/meson8b-clkc.h | 10 +
include/dt-bindings/clock/r7s72100-clock.h | 53 ++
include/dt-bindings/clock/r8a7791-clock.h | 1 +
include/dt-bindings/clock/rk3228-cru.h | 47 ++
include/dt-bindings/clock/rk3399-cru.h | 2 +
.../dt-bindings/pinctrl/brcm,pinctrl-stingray.h | 68 ++
include/dt-bindings/pinctrl/r7s72100-pinctrl.h | 16 +
include/dt-bindings/power/mt6797-power.h | 30 +
include/dt-bindings/power/owl-s500-powergate.h | 19 +
include/dt-bindings/reset/altr,rst-mgr-s10.h | 108 +++
include/dt-bindings/reset/cortina,gemini-reset.h | 36 +
include/linux/platform_data/atmel.h | 28 +-
include/linux/pm_domain.h | 4 +
include/linux/scpi_protocol.h | 3 +
include/linux/soc/actions/owl-sps.h | 11 +
include/linux/soc/renesas/rcar-rst.h | 3 +-
include/soc/tegra/bpmp-abi.h | 418 ++++++++++-
include/soc/tegra/bpmp.h | 12 +
821 files changed, 27285 insertions(+), 8444 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/actions.txt
create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,stingray.txt
create mode 100644 Documentation/devicetree/bindings/arm/realtek.txt
create mode 100644 Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt
rename Documentation/devicetree/bindings/i2c/{i2c-mt6577.txt => i2c-mtk.txt} (77%)
create mode 100644 Documentation/devicetree/bindings/pci/kirin-pcie.txt
create mode 100644 Documentation/devicetree/bindings/power/actions,owl-sps.txt
create mode 100644 Documentation/devicetree/bindings/reset/ti,sci-reset.txt
create mode 100644 Documentation/devicetree/bindings/timer/actions,owl-timer.txt
create mode 100644 arch/arm/arm-soc-for-next-contents.txt
create mode 100644 arch/arm/boot/dts/am335x-boneblue.dts
create mode 100644 arch/arm/boot/dts/armada-385-linksys-rango.dts
create mode 100644 arch/arm/boot/dts/bcm2837-rpi-3-b.dts
create mode 100644 arch/arm/boot/dts/bcm283x-rpi-usb-otg.dtsi
create mode 100644 arch/arm/boot/dts/imx6dl-gw560x.dts
create mode 100644 arch/arm/boot/dts/imx6q-gw560x.dts
create mode 100644 arch/arm/boot/dts/imx6qdl-gw560x.dtsi
create mode 100644 arch/arm/boot/dts/imx7d-pico.dts
create mode 100644 arch/arm/boot/dts/keystone-k2g-ice.dts
create mode 100644 arch/arm/boot/dts/owl-s500-guitar-bb-rev-b.dts
create mode 100644 arch/arm/boot/dts/owl-s500-guitar.dtsi
create mode 100644 arch/arm/boot/dts/owl-s500.dtsi
create mode 100644 arch/arm/boot/dts/r7s72100-gr-peach.dts
create mode 100644 arch/arm/boot/dts/r8a7743-iwg20d-q7.dts
create mode 100644 arch/arm/boot/dts/r8a7743-iwg20m.dtsi
rename arch/arm/boot/dts/{rk1108-evb.dts => rv1108-evb.dts} (94%)
rename arch/arm/boot/dts/{rk1108.dtsi => rv1108.dtsi} (95%)
create mode 100644 arch/arm/boot/dts/stm32f746-disco.dts
create mode 100644 arch/arm/boot/dts/stm32f769-disco.dts
create mode 100644 arch/arm/boot/dts/stm32h743i-disco.dts
create mode 100644 arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts
create mode 100644 arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts
delete mode 100644 arch/arm/boot/dts/tegra20-whistler.dts
create mode 100644 arch/arm/mach-actions/Kconfig
create mode 100644 arch/arm/mach-actions/Makefile
create mode 100644 arch/arm/mach-actions/headsmp.S
create mode 100644 arch/arm/mach-actions/owl.c
create mode 100644 arch/arm/mach-actions/platsmp.c
create mode 100644 arch/arm/mach-at91/Makefile.boot
create mode 100644 arch/arm/mach-at91/samv7.c
delete mode 100644 arch/arm/mach-omap2/opp.c
delete mode 100644 arch/arm/mach-omap2/pmu.c
create mode 100644 arch/arm64/boot/dts/actions/Makefile
create mode 100644 arch/arm64/boot/dts/actions/s900-bubblegum-96.dts
create mode 100644 arch/arm64/boot/dts/actions/s900.dtsi
create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts
create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi
create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts
create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts
create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
create mode 100644 arch/arm64/boot/dts/broadcom/stingray/Makefile
create mode 100644 arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi
create mode 100644 arch/arm64/boot/dts/broadcom/stingray/bcm958742k.dts
create mode 100644 arch/arm64/boot/dts/broadcom/stingray/bcm958742t.dts
create mode 100644 arch/arm64/boot/dts/broadcom/stingray/stingray-clock.dtsi
create mode 100644 arch/arm64/boot/dts/broadcom/stingray/stingray-pinctrl.dtsi
create mode 100644 arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi
create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1043-post.dtsi
create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1046-post.dtsi
create mode 100644 arch/arm64/boot/dts/freescale/qoriq-bman-portals.dtsi
create mode 100644 arch/arm64/boot/dts/freescale/qoriq-fman3-0-10g-0.dtsi
create mode 100644 arch/arm64/boot/dts/freescale/qoriq-fman3-0-10g-1.dtsi
create mode 100644 arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-0.dtsi
create mode 100644 arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-1.dtsi
create mode 100644 arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-2.dtsi
create mode 100644 arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-3.dtsi
create mode 100644 arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-4.dtsi
create mode 100644 arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-5.dtsi
create mode 100644 arch/arm64/boot/dts/freescale/qoriq-fman3-0.dtsi
create mode 100644 arch/arm64/boot/dts/freescale/qoriq-qman-portals.dtsi
create mode 100644 arch/arm64/boot/dts/marvell/armada-70x0.dtsi
create mode 100644 arch/arm64/boot/dts/marvell/armada-80x0.dtsi
create mode 100644 arch/arm64/boot/dts/mediatek/mt6797-evb.dts
create mode 100644 arch/arm64/boot/dts/mediatek/mt6797.dtsi
create mode 100644 arch/arm64/boot/dts/realtek/Makefile
create mode 100644 arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts
create mode 100644 arch/arm64/boot/dts/realtek/rtd1295.dtsi
create mode 100644 arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts
create mode 100644 arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts
create mode 100644 arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
create mode 100644 arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts
create mode 100644 arch/arm64/boot/dts/renesas/salvator-common.dtsi
create mode 100644 arch/arm64/boot/dts/renesas/salvator-x.dtsi
create mode 100644 arch/arm64/boot/dts/renesas/salvator-xs.dtsi
create mode 100644 arch/arm64/boot/dts/renesas/ulcb.dtsi
create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-op1-opp.dtsi
create mode 100644 arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts
create mode 100644 arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts
create mode 100644 drivers/clocksource/owl-timer.c
create mode 100644 drivers/reset/reset-gemini.c
create mode 100644 drivers/reset/reset-ti-sci.c
create mode 100644 drivers/soc/actions/Kconfig
create mode 100644 drivers/soc/actions/Makefile
create mode 100644 drivers/soc/actions/owl-sps-helper.c
create mode 100644 drivers/soc/actions/owl-sps.c
create mode 100644 drivers/soc/renesas/Kconfig
create mode 100644 drivers/soc/tegra/powergate-bpmp.c
create mode 100644 include/dt-bindings/clock/bcm-sr.h
create mode 100644 include/dt-bindings/pinctrl/brcm,pinctrl-stingray.h
create mode 100644 include/dt-bindings/pinctrl/r7s72100-pinctrl.h
create mode 100644 include/dt-bindings/power/mt6797-power.h
create mode 100644 include/dt-bindings/power/owl-s500-powergate.h
create mode 100644 include/dt-bindings/reset/altr,rst-mgr-s10.h
create mode 100644 include/dt-bindings/reset/cortina,gemini-reset.h
create mode 100644 include/linux/soc/actions/owl-sps.h
Merging actions/for-next (8ba75fbb148a Merge branch 'v4.13/arm+sps' into next)
$ git merge actions/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging alpine/alpine/for-next (a1144b2b1ec4 ARM: dts: alpine: add valid clock-frequency values)
$ git merge alpine/alpine/for-next
Merge made by the 'recursive' strategy.
Merging amlogic/for-next (f99503e956ae Merge branch 'v4.13/defconfig' into tmp/aml-rebuild)
$ git merge amlogic/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging aspeed/for-next (4944e5dbb215 Merge branches 'dt-for-v4.12' and 'defconfig-for-v4.12' into for-next)
$ git merge aspeed/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging at91/at91-next (630efea351f0 Merge branch 'at91-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
$ git merge at91/at91-next
Resolved 'arch/arm/mach-at91/Kconfig' using previous resolution.
Resolved 'arch/arm/mach-at91/samv7.c' using previous resolution.
Auto-merging arch/arm/mach-at91/samv7.c
CONFLICT (add/add): Merge conflict in arch/arm/mach-at91/samv7.c
Auto-merging arch/arm/mach-at91/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-at91/Kconfig
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master c9ff3a442b2a] Merge remote-tracking branch 'at91/at91-next'
$ git diff -M --stat --summary HEAD^..
Merging bcm2835/for-next (652fb0c6435c Merge branch anholt/bcm2835-defconfig-next into for-next)
$ git merge bcm2835/for-next
Already up-to-date!
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 (bf6e15ed7f86 Merge branch 'zte/dt64' into for-next)
$ git merge imx-mxs/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging keystone/next (b45371147f9d Merge branch 'for_4.13/keystone_dts' into next)
$ git merge keystone/next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging mvebu/for-next (cf79eb3aab84 Merge branch 'mvebu/dt64' into mvebu/for-next)
$ git merge mvebu/for-next
Merge made by the 'recursive' strategy.
Merging omap/for-next (eb0028987143 Merge branch 'omap-for-v4.13/dt' into for-next)
$ git merge omap/for-next
Merge made by the 'recursive' strategy.
arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts | 2 +-
arch/arm/boot/dts/dm8168-evm.dts | 34 ++++++++++++++++++++++++++-
arch/arm/boot/dts/dm816x.dtsi | 2 +-
arch/arm/boot/dts/dra7-evm.dts | 10 +++++++-
arch/arm/boot/dts/dra7.dtsi | 5 ++++
arch/arm/boot/dts/dra71-evm.dts | 18 ++++++++++++--
arch/arm/boot/dts/dra72-evm-common.dtsi | 2 --
arch/arm/boot/dts/dra72-evm-revc.dts | 18 ++++++++++++++
arch/arm/boot/dts/dra72-evm.dts | 18 ++++++++++++++
arch/arm/mach-omap2/pdata-quirks.c | 31 ++++++++++++++++++++++++
include/linux/platform_data/hsmmc-omap.h | 3 +++
11 files changed, 135 insertions(+), 8 deletions(-)
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 reset/reset/next (dfeac250c429 reset: zx2967: constify zx2967_reset_ops.)
$ git merge reset/reset/next
Merge made by the 'recursive' strategy.
drivers/reset/reset-zx2967.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging qcom/for-next (9c60544280d4 Merge tag 'qcom-drivers-for-4.13' into all-for-4.13-revised)
$ git merge qcom/for-next
Merge made by the 'recursive' strategy.
Merging realtek/for-next (007e6304223c Merge branch 'v4.13/dt64' into next)
$ git merge realtek/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging renesas/next (d75d45bfffd5 Merge branch 'fixes-for-v4.13' into next)
$ git merge renesas/next
Merge made by the 'recursive' strategy.
arch/arm64/boot/dts/renesas/salvator-common.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging rockchip/for-next (dd3f24b9ff88 Merge branch 'v4.13-clk/next' into for-next)
$ git merge rockchip/for-next
Merge made by the 'recursive' strategy.
.../bindings/clock/rockchip,rk3128-cru.txt | 56 ++
drivers/clk/rockchip/Makefile | 1 +
drivers/clk/rockchip/clk-rk3036.c | 1 +
drivers/clk/rockchip/clk-rk3128.c | 612 +++++++++++++++++++++
drivers/clk/rockchip/clk-rk3228.c | 164 ++++--
drivers/clk/rockchip/clk-rk3288.c | 14 +-
drivers/clk/rockchip/clk-rk3368.c | 5 +-
drivers/clk/rockchip/clk-rk3399.c | 4 +-
include/dt-bindings/clock/rk3128-cru.h | 282 ++++++++++
9 files changed, 1073 insertions(+), 66 deletions(-)
create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3128-cru.txt
create mode 100644 drivers/clk/rockchip/clk-rk3128.c
create mode 100644 include/dt-bindings/clock/rk3128-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 (2ea659a9ef48 Linux 4.12-rc1)
$ git merge samsung/for-next
Already up-to-date.
Merging samsung-krzk/for-next (005537e095a6 Merge branch 'fixes' into for-next)
$ git merge samsung-krzk/for-next
Merge made by the 'recursive' strategy.
arch/arm/boot/dts/exynos4.dtsi | 3 +++
1 file changed, 3 insertions(+)
Merging sunxi/sunxi/for-next (efb85d294c2a Merge branches 'sunxi/h3-for-4.13', 'sunxi/dt-for-4.13' and 'sunxi/dt64-for-4.13' into sunxi/for-next)
$ git merge sunxi/sunxi/for-next
Merge made by the 'recursive' strategy.
.../devicetree/bindings/clock/sun8i-de2.txt | 31 +
.../devicetree/bindings/clock/sunxi-ccu.txt | 5 +-
drivers/clk/clk-divider.c | 19 +-
drivers/clk/sunxi-ng/Kconfig | 116 +--
drivers/clk/sunxi-ng/Makefile | 37 +-
drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 10 +-
drivers/clk/sunxi-ng/ccu-sun5i.h | 6 +-
drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 10 +-
drivers/clk/sunxi-ng/ccu-sun8i-a23.c | 10 +-
drivers/clk/sunxi-ng/ccu-sun8i-a33.c | 10 +-
drivers/clk/sunxi-ng/ccu-sun8i-a83t.c | 922 +++++++++++++++++++++
drivers/clk/sunxi-ng/ccu-sun8i-a83t.h | 64 ++
drivers/clk/sunxi-ng/ccu-sun8i-de2.c | 260 ++++++
drivers/clk/sunxi-ng/ccu-sun8i-de2.h | 28 +
drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 10 +-
drivers/clk/sunxi-ng/ccu-sun8i-r.c | 117 ++-
drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 10 +-
drivers/clk/sunxi-ng/ccu_div.c | 38 +-
drivers/clk/sunxi-ng/ccu_mp.c | 15 +-
drivers/clk/sunxi-ng/ccu_mult.c | 19 +-
drivers/clk/sunxi-ng/ccu_mux.c | 108 ++-
drivers/clk/sunxi-ng/ccu_mux.h | 24 +-
drivers/clk/sunxi-ng/ccu_nkm.c | 7 +-
drivers/clk/sunxi-ng/ccu_reset.h | 1 +
include/dt-bindings/clock/sun5i-ccu.h | 3 +
include/dt-bindings/clock/sun8i-a83t-ccu.h | 140 ++++
include/dt-bindings/clock/sun8i-de2.h | 18 +
include/dt-bindings/reset/sun8i-a83t-ccu.h | 98 +++
include/dt-bindings/reset/sun8i-de2.h | 14 +
include/linux/clk-provider.h | 16 +-
30 files changed, 1893 insertions(+), 273 deletions(-)
create mode 100644 Documentation/devicetree/bindings/clock/sun8i-de2.txt
create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-a83t.c
create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-a83t.h
create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-de2.c
create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-de2.h
create mode 100644 include/dt-bindings/clock/sun8i-a83t-ccu.h
create mode 100644 include/dt-bindings/clock/sun8i-de2.h
create mode 100644 include/dt-bindings/reset/sun8i-a83t-ccu.h
create mode 100644 include/dt-bindings/reset/sun8i-de2.h
Merging tegra/for-next (07bb9460b188 Merge branch for-4.13/arm64/dt into for-next)
$ git merge tegra/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging arm64/for-next/core (5fbd5fc49fc3 arm64: ptrace: Fix incorrect get_user() use in compat_vfp_set())
$ git merge arm64/for-next/core
Auto-merging virt/kvm/arm/mmu.c
Auto-merging include/linux/uuid.h
Auto-merging drivers/acpi/arm64/iort.c
Auto-merging arch/arm64/mm/dma-mapping.c
Auto-merging arch/arm64/kernel/vdso.c
Auto-merging arch/arm64/include/asm/dma-mapping.h
Auto-merging arch/arm64/Kconfig
Merge made by the 'recursive' strategy.
arch/arm/include/asm/kvm_arm.h | 10 +
arch/arm/include/asm/system_misc.h | 5 +
arch/arm64/Kconfig | 9 +-
arch/arm64/Makefile | 7 +-
arch/arm64/include/asm/checksum.h | 2 +-
arch/arm64/include/asm/dma-mapping.h | 2 -
arch/arm64/include/asm/elf.h | 6 +
arch/arm64/include/asm/esr.h | 1 +
arch/arm64/include/asm/futex.h | 8 +-
arch/arm64/include/asm/kvm_arm.h | 10 +
arch/arm64/include/asm/module.h | 3 +
arch/arm64/include/asm/pgtable.h | 2 +-
arch/arm64/include/asm/processor.h | 3 +
arch/arm64/include/asm/stacktrace.h | 1 +
arch/arm64/include/asm/system_misc.h | 4 +-
arch/arm64/include/uapi/asm/sigcontext.h | 55 ++++
arch/arm64/kernel/Makefile | 3 +
arch/arm64/kernel/acpi_parking_protocol.c | 6 +-
arch/arm64/kernel/alternative.c | 8 +-
arch/arm64/kernel/cpufeature.c | 25 +-
arch/arm64/kernel/debug-monitors.c | 14 +-
arch/arm64/kernel/ftrace-mod.S | 18 ++
arch/arm64/kernel/ftrace.c | 103 +++++++-
arch/arm64/kernel/insn.c | 7 +-
arch/arm64/kernel/kaslr.c | 2 +-
arch/arm64/kernel/module.c | 20 +-
arch/arm64/kernel/pci.c | 3 +
arch/arm64/kernel/probes/kprobes.c | 4 +-
arch/arm64/kernel/process.c | 9 +-
arch/arm64/kernel/ptrace.c | 39 ++-
arch/arm64/kernel/setup.c | 3 +
arch/arm64/kernel/signal.c | 413 +++++++++++++++++++++++++++---
arch/arm64/kernel/stacktrace.c | 1 +
arch/arm64/kernel/traps.c | 18 +-
arch/arm64/kernel/vdso.c | 10 +-
arch/arm64/mm/dma-mapping.c | 9 -
arch/arm64/mm/fault.c | 215 +++++++++++-----
arch/arm64/mm/hugetlbpage.c | 29 +--
arch/arm64/mm/mmap.c | 19 +-
arch/arm64/mm/mmu.c | 1 +
drivers/acpi/apei/Kconfig | 15 ++
drivers/acpi/apei/ghes.c | 206 ++++++++++++---
drivers/acpi/apei/hest.c | 7 +-
drivers/acpi/arm64/iort.c | 15 --
drivers/char/Kconfig | 2 +
drivers/firmware/efi/cper.c | 204 +++++++++++++--
drivers/irqchip/Kconfig | 1 -
drivers/ras/ras.c | 16 +-
fs/proc/kcore.c | 2 +-
include/acpi/ghes.h | 48 +++-
include/linux/acpi_iort.h | 2 -
include/linux/cper.h | 54 ++++
include/linux/ras.h | 17 ++
include/linux/uuid.h | 4 +-
include/ras/ras_event.h | 90 +++++++
virt/kvm/arm/mmu.c | 36 ++-
56 files changed, 1551 insertions(+), 275 deletions(-)
create mode 100644 arch/arm64/kernel/ftrace-mod.S
Merging clk/clk-next (682430e87734 clk: keystone: TI_SCI_PROTOCOL is needed for clk driver)
$ git merge clk/clk-next
Resolved 'MAINTAINERS' using previous resolution.
Removing include/linux/platform_data/clk-realview.h
Removing drivers/clk/versatile/clk-realview.c
Auto-merging MAINTAINERS
CONFLICT (content): Merge conflict in MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master d3366b90945c] Merge remote-tracking branch 'clk/clk-next'
$ git diff -M --stat --summary HEAD^..
.../arm/marvell/ap806-system-controller.txt | 24 +-
.../bindings/clock/amlogic,meson8b-clkc.txt | 11 +-
.../devicetree/bindings/clock/hi6220-clock.txt | 1 +
.../devicetree/bindings/clock/qcom,gcc.txt | 1 +
.../devicetree/bindings/clock/qoriq-clock.txt | 6 +
.../devicetree/bindings/clock/renesas,cpg-mssr.txt | 10 +-
.../devicetree/bindings/clock/ti,sci-clk.txt | 37 +
.../devicetree/bindings/clock/ti-clkctrl.txt | 56 ++
MAINTAINERS | 2 +
arch/mips/lantiq/clk.c | 5 -
drivers/clk/Kconfig | 17 +-
drivers/clk/Makefile | 7 +-
drivers/clk/at91/clk-generated.c | 4 +-
drivers/clk/bcm/Kconfig | 8 +
drivers/clk/bcm/Makefile | 1 +
drivers/clk/bcm/clk-bcm2835.c | 65 +-
drivers/clk/bcm/clk-iproc-pll.c | 12 +-
drivers/clk/bcm/clk-sr.c | 327 +++++++
drivers/clk/clk-bulk.c | 157 +++
drivers/clk/clk-conf.c | 2 +-
drivers/clk/clk-devres.c | 36 +
drivers/clk/clk-gemini.c | 454 +++++++++
drivers/clk/clk-palmas.c | 1 +
drivers/clk/clk-qoriq.c | 91 +-
drivers/clk/clk-scpi.c | 6 +-
drivers/clk/hisilicon/clk-hi3660.c | 98 +-
drivers/clk/hisilicon/clk-hi6220.c | 22 +
drivers/clk/hisilicon/crg-hi3798cv200.c | 21 +
drivers/clk/imx/clk-imx7d.c | 8 +-
drivers/clk/imx/clk-pllv3.c | 5 +
drivers/clk/imx/clk.h | 1 +
drivers/clk/keystone/Kconfig | 16 +
drivers/clk/keystone/Makefile | 3 +-
drivers/clk/keystone/sci-clk.c | 724 ++++++++++++++
drivers/clk/mediatek/Makefile | 2 +-
drivers/clk/mediatek/clk-cpumux.c | 120 +++
drivers/clk/mediatek/clk-cpumux.h | 30 +
drivers/clk/mediatek/clk-mt2701.c | 8 +
drivers/clk/mediatek/clk-mt8173.c | 23 +
drivers/clk/meson/Kconfig | 6 +-
drivers/clk/meson/gxbb.c | 137 ++-
drivers/clk/meson/gxbb.h | 7 +-
drivers/clk/meson/meson8b.c | 7 +-
drivers/clk/mvebu/ap806-system-controller.c | 107 ++-
drivers/clk/mvebu/armada-38x.c | 7 +-
drivers/clk/mvebu/cp110-system-controller.c | 199 ++--
drivers/clk/qcom/Kconfig | 9 +
drivers/clk/qcom/Makefile | 1 +
drivers/clk/qcom/gcc-ipq8074.c | 1007 ++++++++++++++++++++
drivers/clk/qcom/gcc-msm8916.c | 1 +
drivers/clk/renesas/Kconfig | 139 ++-
drivers/clk/renesas/Makefile | 41 +-
drivers/clk/renesas/clk-mstp.c | 2 +-
drivers/clk/renesas/clk-rcar-gen2.c | 23 +-
drivers/clk/renesas/r8a7745-cpg-mssr.c | 17 +-
drivers/clk/renesas/r8a7790-cpg-mssr.c | 278 ++++++
drivers/clk/renesas/r8a7791-cpg-mssr.c | 286 ++++++
drivers/clk/renesas/r8a7792-cpg-mssr.c | 221 +++++
drivers/clk/renesas/r8a7794-cpg-mssr.c | 255 +++++
drivers/clk/renesas/r8a7795-cpg-mssr.c | 43 +-
drivers/clk/renesas/r8a7796-cpg-mssr.c | 39 +
drivers/clk/renesas/renesas-cpg-mssr.c | 43 +-
drivers/clk/renesas/renesas-cpg-mssr.h | 4 +
drivers/clk/samsung/clk-cpu.c | 17 +-
drivers/clk/samsung/clk-exynos-audss.c | 58 +-
drivers/clk/samsung/clk-exynos-clkout.c | 18 +-
drivers/clk/samsung/clk-exynos5420.c | 27 +-
drivers/clk/samsung/clk-pll.c | 101 +-
drivers/clk/samsung/clk-pll.h | 4 -
drivers/clk/samsung/clk-s3c2410-dclk.c | 75 +-
drivers/clk/samsung/clk-s5pv210-audss.c | 52 +-
drivers/clk/samsung/clk.c | 91 +-
drivers/clk/samsung/clk.h | 9 +-
drivers/clk/socfpga/clk-gate-a10.c | 2 +-
drivers/clk/socfpga/clk.h | 3 +
drivers/clk/sunxi-ng/ccu_mux.c | 2 +-
drivers/clk/ti/Makefile | 3 +-
drivers/clk/ti/clk-44xx.c | 663 +++++++++++++
drivers/clk/ti/clkctrl.c | 497 ++++++++++
drivers/clk/ti/clock.h | 31 +
drivers/clk/uniphier/clk-uniphier-sys.c | 15 +-
drivers/clk/versatile/Makefile | 1 -
drivers/clk/versatile/clk-realview.c | 97 --
drivers/clk/zte/clk-zx296718.c | 8 +-
include/dt-bindings/clock/cortina,gemini-clock.h | 29 +
include/dt-bindings/clock/exynos5420.h | 3 +
include/dt-bindings/clock/hi3660-clock.h | 17 +
include/dt-bindings/clock/hi6220-clock.h | 4 +
include/dt-bindings/clock/histb-clock.h | 9 +-
include/dt-bindings/clock/imx7d-clock.h | 4 +-
include/dt-bindings/clock/mt2701-clk.h | 3 +-
include/dt-bindings/clock/mt8173-clk.h | 4 +-
include/dt-bindings/clock/omap4.h | 146 +++
include/dt-bindings/clock/qcom,gcc-ipq8074.h | 152 +++
include/dt-bindings/clock/r8a7790-cpg-mssr.h | 52 +
include/dt-bindings/clock/r8a7791-cpg-mssr.h | 48 +
include/dt-bindings/clock/r8a7792-cpg-mssr.h | 43 +
include/dt-bindings/clock/r8a7793-cpg-mssr.h | 48 +
include/dt-bindings/clock/r8a7794-cpg-mssr.h | 47 +
include/dt-bindings/clock/zx296718-clock.h | 6 +-
include/linux/clk.h | 136 +++
include/linux/platform_data/clk-realview.h | 1 -
102 files changed, 7165 insertions(+), 662 deletions(-)
create mode 100644 Documentation/devicetree/bindings/clock/ti,sci-clk.txt
create mode 100644 Documentation/devicetree/bindings/clock/ti-clkctrl.txt
create mode 100644 drivers/clk/bcm/clk-sr.c
create mode 100644 drivers/clk/clk-bulk.c
create mode 100644 drivers/clk/clk-gemini.c
create mode 100644 drivers/clk/keystone/Kconfig
create mode 100644 drivers/clk/keystone/sci-clk.c
create mode 100644 drivers/clk/mediatek/clk-cpumux.c
create mode 100644 drivers/clk/mediatek/clk-cpumux.h
create mode 100644 drivers/clk/qcom/gcc-ipq8074.c
create mode 100644 drivers/clk/renesas/r8a7790-cpg-mssr.c
create mode 100644 drivers/clk/renesas/r8a7791-cpg-mssr.c
create mode 100644 drivers/clk/renesas/r8a7792-cpg-mssr.c
create mode 100644 drivers/clk/renesas/r8a7794-cpg-mssr.c
create mode 100644 drivers/clk/ti/clkctrl.c
delete mode 100644 drivers/clk/versatile/clk-realview.c
create mode 100644 include/dt-bindings/clock/cortina,gemini-clock.h
create mode 100644 include/dt-bindings/clock/omap4.h
create mode 100644 include/dt-bindings/clock/qcom,gcc-ipq8074.h
create mode 100644 include/dt-bindings/clock/r8a7790-cpg-mssr.h
create mode 100644 include/dt-bindings/clock/r8a7791-cpg-mssr.h
create mode 100644 include/dt-bindings/clock/r8a7792-cpg-mssr.h
create mode 100644 include/dt-bindings/clock/r8a7793-cpg-mssr.h
create mode 100644 include/dt-bindings/clock/r8a7794-cpg-mssr.h
delete mode 100644 include/linux/platform_data/clk-realview.h
Merging c6x/for-linux-next (91ebcd1b97ae MAINTAINERS: update email address for C6x maintainer)
$ 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 (204a2be30a7a m68k: Remove ptrace_signal_deliver)
$ git merge m68k/for-next
Auto-merging kernel/signal.c
Auto-merging include/linux/ptrace.h
Merge made by the 'recursive' strategy.
arch/m68k/configs/amiga_defconfig | 8 ++-
arch/m68k/configs/apollo_defconfig | 8 ++-
arch/m68k/configs/atari_defconfig | 8 ++-
arch/m68k/configs/bvme6000_defconfig | 8 ++-
arch/m68k/configs/hp300_defconfig | 8 ++-
arch/m68k/configs/mac_defconfig | 8 ++-
arch/m68k/configs/multi_defconfig | 8 ++-
arch/m68k/configs/mvme147_defconfig | 8 ++-
arch/m68k/configs/mvme16x_defconfig | 8 ++-
arch/m68k/configs/q40_defconfig | 8 ++-
arch/m68k/configs/sun3_defconfig | 8 ++-
arch/m68k/configs/sun3x_defconfig | 8 ++-
arch/m68k/include/asm/signal.h | 5 --
arch/m68k/kernel/signal.c | 16 -----
drivers/nubus/nubus.c | 125 +++--------------------------------
include/linux/ptrace.h | 4 --
kernel/signal.c | 1 -
17 files changed, 95 insertions(+), 152 deletions(-)
Merging m68knommu/for-next (354b6382847d m68k: defconfig: Cleanup from old Kconfig options)
$ git merge m68knommu/for-next
Merge made by the 'recursive' strategy.
arch/m68k/configs/m5208evb_defconfig | 1 -
arch/m68k/configs/m5249evb_defconfig | 1 -
arch/m68k/configs/m5272c3_defconfig | 1 -
arch/m68k/configs/m5275evb_defconfig | 1 -
arch/m68k/configs/m5307c3_defconfig | 1 -
arch/m68k/configs/m5407c3_defconfig | 1 -
6 files changed, 6 deletions(-)
Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment)
$ git merge metag/for-next
Already up-to-date.
Merging microblaze/next (14ef905bb2ee microblaze: Fix MSR flags when returning from exception)
$ git merge microblaze/next
Removing arch/microblaze/include/uapi/asm/termios.h
Removing arch/microblaze/include/uapi/asm/termbits.h
Removing arch/microblaze/include/uapi/asm/swab.h
Removing arch/microblaze/include/uapi/asm/statfs.h
Removing arch/microblaze/include/uapi/asm/stat.h
Removing arch/microblaze/include/uapi/asm/sockios.h
Removing arch/microblaze/include/uapi/asm/socket.h
Removing arch/microblaze/include/uapi/asm/signal.h
Removing arch/microblaze/include/uapi/asm/siginfo.h
Removing arch/microblaze/include/uapi/asm/shmbuf.h
Removing arch/microblaze/include/uapi/asm/sembuf.h
Removing arch/microblaze/include/uapi/asm/resource.h
Removing arch/microblaze/include/uapi/asm/poll.h
Removing arch/microblaze/include/uapi/asm/param.h
Removing arch/microblaze/include/uapi/asm/msgbuf.h
Removing arch/microblaze/include/uapi/asm/mman.h
Removing arch/microblaze/include/uapi/asm/kvm_para.h
Removing arch/microblaze/include/uapi/asm/ipcbuf.h
Removing arch/microblaze/include/uapi/asm/ioctls.h
Removing arch/microblaze/include/uapi/asm/ioctl.h
Removing arch/microblaze/include/uapi/asm/fcntl.h
Removing arch/microblaze/include/uapi/asm/errno.h
Removing arch/microblaze/include/uapi/asm/bitsperlong.h
Removing arch/microblaze/include/asm/xor.h
Removing arch/microblaze/include/asm/vga.h
Removing arch/microblaze/include/asm/ucontext.h
Removing arch/microblaze/include/asm/topology.h
Removing arch/microblaze/include/asm/shmparam.h
Removing arch/microblaze/include/asm/serial.h
Removing arch/microblaze/include/asm/percpu.h
Removing arch/microblaze/include/asm/parport.h
Removing arch/microblaze/include/asm/local64.h
Removing arch/microblaze/include/asm/local.h
Removing arch/microblaze/include/asm/linkage.h
Removing arch/microblaze/include/asm/kmap_types.h
Removing arch/microblaze/include/asm/kdebug.h
Removing arch/microblaze/include/asm/irq_regs.h
Removing arch/microblaze/include/asm/hardirq.h
Removing arch/microblaze/include/asm/fb.h
Removing arch/microblaze/include/asm/emergency-restart.h
Removing arch/microblaze/include/asm/div64.h
Removing arch/microblaze/include/asm/bugs.h
Removing arch/microblaze/include/asm/bug.h
Removing arch/microblaze/include/asm/bitops.h
Merge made by the 'recursive' strategy.
arch/microblaze/configs/mmu_defconfig | 16 ++++-----
arch/microblaze/configs/nommu_defconfig | 17 ++--------
arch/microblaze/include/asm/Kbuild | 45 ++++++++++++++++++++++++-
arch/microblaze/include/asm/bitops.h | 1 -
arch/microblaze/include/asm/bug.h | 1 -
arch/microblaze/include/asm/bugs.h | 1 -
arch/microblaze/include/asm/div64.h | 1 -
arch/microblaze/include/asm/emergency-restart.h | 1 -
arch/microblaze/include/asm/fb.h | 1 -
arch/microblaze/include/asm/hardirq.h | 1 -
arch/microblaze/include/asm/irq_regs.h | 1 -
arch/microblaze/include/asm/kdebug.h | 1 -
arch/microblaze/include/asm/kmap_types.h | 6 ----
arch/microblaze/include/asm/linkage.h | 1 -
arch/microblaze/include/asm/local.h | 1 -
arch/microblaze/include/asm/local64.h | 1 -
arch/microblaze/include/asm/parport.h | 1 -
arch/microblaze/include/asm/percpu.h | 1 -
arch/microblaze/include/asm/serial.h | 1 -
arch/microblaze/include/asm/shmparam.h | 1 -
arch/microblaze/include/asm/topology.h | 1 -
arch/microblaze/include/asm/ucontext.h | 1 -
arch/microblaze/include/asm/unistd.h | 2 +-
arch/microblaze/include/asm/vga.h | 1 -
arch/microblaze/include/asm/xor.h | 1 -
arch/microblaze/include/uapi/asm/bitsperlong.h | 1 -
arch/microblaze/include/uapi/asm/errno.h | 1 -
arch/microblaze/include/uapi/asm/fcntl.h | 1 -
arch/microblaze/include/uapi/asm/ioctl.h | 1 -
arch/microblaze/include/uapi/asm/ioctls.h | 1 -
arch/microblaze/include/uapi/asm/ipcbuf.h | 1 -
arch/microblaze/include/uapi/asm/kvm_para.h | 1 -
arch/microblaze/include/uapi/asm/mman.h | 1 -
arch/microblaze/include/uapi/asm/msgbuf.h | 1 -
arch/microblaze/include/uapi/asm/param.h | 1 -
arch/microblaze/include/uapi/asm/poll.h | 1 -
arch/microblaze/include/uapi/asm/resource.h | 1 -
arch/microblaze/include/uapi/asm/sembuf.h | 1 -
arch/microblaze/include/uapi/asm/shmbuf.h | 1 -
arch/microblaze/include/uapi/asm/siginfo.h | 1 -
arch/microblaze/include/uapi/asm/signal.h | 1 -
arch/microblaze/include/uapi/asm/socket.h | 1 -
arch/microblaze/include/uapi/asm/sockios.h | 1 -
arch/microblaze/include/uapi/asm/stat.h | 1 -
arch/microblaze/include/uapi/asm/statfs.h | 1 -
arch/microblaze/include/uapi/asm/swab.h | 1 -
arch/microblaze/include/uapi/asm/termbits.h | 1 -
arch/microblaze/include/uapi/asm/termios.h | 1 -
arch/microblaze/include/uapi/asm/unistd.h | 1 +
arch/microblaze/kernel/dma.c | 3 +-
arch/microblaze/kernel/entry.S | 28 ++++++++++-----
arch/microblaze/kernel/syscall_table.S | 1 +
arch/microblaze/kernel/timer.c | 2 ++
arch/microblaze/mm/highmem.c | 24 ++++++-------
54 files changed, 90 insertions(+), 98 deletions(-)
delete mode 100644 arch/microblaze/include/asm/bitops.h
delete mode 100644 arch/microblaze/include/asm/bug.h
delete mode 100644 arch/microblaze/include/asm/bugs.h
delete mode 100644 arch/microblaze/include/asm/div64.h
delete mode 100644 arch/microblaze/include/asm/emergency-restart.h
delete mode 100644 arch/microblaze/include/asm/fb.h
delete mode 100644 arch/microblaze/include/asm/hardirq.h
delete mode 100644 arch/microblaze/include/asm/irq_regs.h
delete mode 100644 arch/microblaze/include/asm/kdebug.h
delete mode 100644 arch/microblaze/include/asm/kmap_types.h
delete mode 100644 arch/microblaze/include/asm/linkage.h
delete mode 100644 arch/microblaze/include/asm/local.h
delete mode 100644 arch/microblaze/include/asm/local64.h
delete mode 100644 arch/microblaze/include/asm/parport.h
delete mode 100644 arch/microblaze/include/asm/percpu.h
delete mode 100644 arch/microblaze/include/asm/serial.h
delete mode 100644 arch/microblaze/include/asm/shmparam.h
delete mode 100644 arch/microblaze/include/asm/topology.h
delete mode 100644 arch/microblaze/include/asm/ucontext.h
delete mode 100644 arch/microblaze/include/asm/vga.h
delete mode 100644 arch/microblaze/include/asm/xor.h
delete mode 100644 arch/microblaze/include/uapi/asm/bitsperlong.h
delete mode 100644 arch/microblaze/include/uapi/asm/errno.h
delete mode 100644 arch/microblaze/include/uapi/asm/fcntl.h
delete mode 100644 arch/microblaze/include/uapi/asm/ioctl.h
delete mode 100644 arch/microblaze/include/uapi/asm/ioctls.h
delete mode 100644 arch/microblaze/include/uapi/asm/ipcbuf.h
delete mode 100644 arch/microblaze/include/uapi/asm/kvm_para.h
delete mode 100644 arch/microblaze/include/uapi/asm/mman.h
delete mode 100644 arch/microblaze/include/uapi/asm/msgbuf.h
delete mode 100644 arch/microblaze/include/uapi/asm/param.h
delete mode 100644 arch/microblaze/include/uapi/asm/poll.h
delete mode 100644 arch/microblaze/include/uapi/asm/resource.h
delete mode 100644 arch/microblaze/include/uapi/asm/sembuf.h
delete mode 100644 arch/microblaze/include/uapi/asm/shmbuf.h
delete mode 100644 arch/microblaze/include/uapi/asm/siginfo.h
delete mode 100644 arch/microblaze/include/uapi/asm/signal.h
delete mode 100644 arch/microblaze/include/uapi/asm/socket.h
delete mode 100644 arch/microblaze/include/uapi/asm/sockios.h
delete mode 100644 arch/microblaze/include/uapi/asm/stat.h
delete mode 100644 arch/microblaze/include/uapi/asm/statfs.h
delete mode 100644 arch/microblaze/include/uapi/asm/swab.h
delete mode 100644 arch/microblaze/include/uapi/asm/termbits.h
delete mode 100644 arch/microblaze/include/uapi/asm/termios.h
Merging mips/mips-for-linux-next (152e63e374cd Merge branch '4.12-fixes' into mips-for-linux-next)
$ git merge mips/mips-for-linux-next
Removing arch/mips/kernel/module-rela.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
MAINTAINERS | 6 +
arch/mips/Kconfig | 115 +++---
arch/mips/Makefile | 2 +-
arch/mips/boot/dts/mti/sead3.dts | 24 +-
arch/mips/configs/ar7_defconfig | 6 -
arch/mips/configs/ath79_defconfig | 2 -
arch/mips/configs/bcm63xx_defconfig | 7 -
arch/mips/configs/bigsur_defconfig | 4 -
arch/mips/configs/bmips_be_defconfig | 1 -
arch/mips/configs/capcella_defconfig | 4 -
arch/mips/configs/cavium_octeon_defconfig | 1 -
arch/mips/configs/ci20_defconfig | 1 -
arch/mips/configs/cobalt_defconfig | 8 -
arch/mips/configs/decstation_defconfig | 1 -
arch/mips/configs/e55_defconfig | 2 -
arch/mips/configs/fuloong2e_defconfig | 11 -
arch/mips/configs/gpr_defconfig | 8 -
arch/mips/configs/ip22_defconfig | 11 -
arch/mips/configs/ip27_defconfig | 5 -
arch/mips/configs/ip28_defconfig | 5 -
arch/mips/configs/ip32_defconfig | 8 -
arch/mips/configs/jazz_defconfig | 6 -
arch/mips/configs/jmr3927_defconfig | 7 -
arch/mips/configs/lasat_defconfig | 5 -
arch/mips/configs/lemote2f_defconfig | 12 -
arch/mips/configs/loongson3_defconfig | 3 -
arch/mips/configs/malta_kvm_defconfig | 1 -
arch/mips/configs/malta_kvm_guest_defconfig | 1 -
arch/mips/configs/malta_qemu_32r6_defconfig | 1 -
arch/mips/configs/maltaaprp_defconfig | 2 -
arch/mips/configs/maltasmvp_defconfig | 1 -
arch/mips/configs/maltasmvp_eva_defconfig | 2 -
arch/mips/configs/maltaup_defconfig | 2 -
arch/mips/configs/markeins_defconfig | 4 -
arch/mips/configs/mips_paravirt_defconfig | 1 -
arch/mips/configs/mpc30x_defconfig | 5 -
arch/mips/configs/msp71xx_defconfig | 2 -
arch/mips/configs/mtx1_defconfig | 11 -
arch/mips/configs/nlm_xlp_defconfig | 5 -
arch/mips/configs/nlm_xlr_defconfig | 9 -
arch/mips/configs/pnx8335_stb225_defconfig | 7 -
arch/mips/configs/qi_lb60_defconfig | 3 -
arch/mips/configs/rb532_defconfig | 6 -
arch/mips/configs/rbtx49xx_defconfig | 7 -
arch/mips/configs/rm200_defconfig | 8 -
arch/mips/configs/rt305x_defconfig | 2 -
arch/mips/configs/sb1250_swarm_defconfig | 1 -
arch/mips/configs/tb0219_defconfig | 6 -
arch/mips/configs/tb0226_defconfig | 7 -
arch/mips/configs/tb0287_defconfig | 5 -
arch/mips/configs/workpad_defconfig | 4 -
arch/mips/generic/Kconfig | 8 +
arch/mips/generic/Makefile | 1 +
arch/mips/generic/board-sead3.c | 234 ++---------
arch/mips/generic/init.c | 27 ++
arch/mips/generic/yamon-dt.c | 240 ++++++++++++
arch/mips/include/asm/Kbuild | 2 +
arch/mips/include/asm/branch.h | 5 +-
arch/mips/include/asm/cmpxchg.h | 280 ++++++--------
arch/mips/include/asm/cpu-features.h | 41 ++
arch/mips/include/asm/cpu-type.h | 1 +
arch/mips/include/asm/cpu.h | 8 +-
arch/mips/include/asm/mach-generic/mc146818rtc.h | 2 +-
arch/mips/include/asm/mach-loongson64/boot_param.h | 22 +-
arch/mips/include/asm/machine.h | 31 ++
arch/mips/include/asm/module.h | 8 +-
arch/mips/include/asm/spinlock.h | 426 +--------------------
arch/mips/include/asm/spinlock_types.h | 34 +-
arch/mips/include/asm/uasm.h | 30 ++
arch/mips/include/asm/vdso.h | 4 +-
arch/mips/include/asm/yamon-dt.h | 64 ++++
arch/mips/include/uapi/asm/inst.h | 20 +-
arch/mips/kernel/Makefile | 3 +-
arch/mips/kernel/branch.c | 73 ++--
arch/mips/kernel/cmpxchg.c | 109 ++++++
arch/mips/kernel/cps-vec.S | 7 +-
arch/mips/kernel/cpu-probe.c | 22 ++
arch/mips/kernel/head.S | 2 +-
arch/mips/kernel/mips-cm.c | 40 +-
arch/mips/kernel/module-rela.c | 202 ----------
arch/mips/kernel/module.c | 221 ++++++++---
arch/mips/kernel/perf_event_mipsxx.c | 14 +-
arch/mips/kernel/ptrace.c | 22 +-
arch/mips/kernel/scall32-o32.S | 2 +-
arch/mips/kernel/scall64-64.S | 2 +-
arch/mips/kernel/scall64-n32.S | 2 +-
arch/mips/kernel/scall64-o32.S | 2 +-
arch/mips/kernel/setup.c | 40 ++
arch/mips/kernel/smp-cps.c | 35 +-
arch/mips/kernel/smp.c | 3 +
arch/mips/kernel/syscall.c | 19 +-
arch/mips/kernel/unaligned.c | 174 +++++----
arch/mips/lib/memcpy.S | 3 +
arch/mips/loongson64/common/env.c | 12 +-
arch/mips/loongson64/common/init.c | 13 +
arch/mips/loongson64/loongson-3/irq.c | 58 ++-
arch/mips/loongson64/loongson-3/smp.c | 23 +-
arch/mips/math-emu/cp1emu.c | 43 ++-
arch/mips/math-emu/dp_maddf.c | 5 +-
arch/mips/math-emu/sp_maddf.c | 5 +-
arch/mips/mm/c-r4k.c | 2 +
arch/mips/mm/dma-default.c | 23 +-
arch/mips/mm/tlbex.c | 41 +-
arch/mips/mm/uasm-micromips.c | 188 +++++----
arch/mips/mm/uasm-mips.c | 238 ++++++------
arch/mips/mm/uasm.c | 61 ++-
arch/mips/net/Makefile | 3 +-
arch/mips/vdso/gettimeofday.c | 59 ++-
drivers/platform/mips/cpu_hwmon.c | 136 +++----
109 files changed, 1927 insertions(+), 1836 deletions(-)
create mode 100644 arch/mips/generic/yamon-dt.c
create mode 100644 arch/mips/include/asm/yamon-dt.h
create mode 100644 arch/mips/kernel/cmpxchg.c
delete mode 100644 arch/mips/kernel/module-rela.c
Merging nios2/for-next (e118c3fec9c0 nios2: remove custom early console implementation)
$ git merge nios2/for-next
Already up-to-date.
Merging openrisc/for-next (9d15eb228b10 openrisc: defconfig: Cleanup from old Kconfig options)
$ git merge openrisc/for-next
Auto-merging arch/openrisc/kernel/process.c
Merge made by the 'recursive' strategy.
arch/openrisc/configs/or1ksim_defconfig | 3 +--
arch/openrisc/include/asm/fixmap.h | 1 +
arch/openrisc/kernel/or32_ksyms.c | 2 +-
arch/openrisc/kernel/process.c | 2 +-
arch/openrisc/lib/delay.c | 3 ++-
5 files changed, 6 insertions(+), 5 deletions(-)
Merging parisc-hd/for-next (d6b1d990957c parisc: use compat_sys_keyctl())
$ git merge parisc-hd/for-next
Auto-merging arch/parisc/include/asm/processor.h
Merge made by the 'recursive' strategy.
arch/parisc/include/asm/io.h | 16 ++--
arch/parisc/include/asm/mmu_context.h | 15 +++-
arch/parisc/include/asm/pdc.h | 18 +++++
arch/parisc/include/asm/pdcpat.h | 35 ++++++---
arch/parisc/include/asm/pgtable.h | 3 +
arch/parisc/include/asm/processor.h | 2 +
arch/parisc/include/asm/uaccess.h | 11 ---
arch/parisc/include/uapi/asm/pdc.h | 12 +--
arch/parisc/kernel/Makefile | 2 +-
arch/parisc/kernel/asm-offsets.c | 5 --
arch/parisc/kernel/firmware.c | 108 +++++++++++++++++++++++++
arch/parisc/kernel/hpmc.S | 5 +-
arch/parisc/kernel/inventory.c | 9 +++
arch/parisc/kernel/pdt.c | 143 ++++++++++++++++++++++++++++++++++
arch/parisc/kernel/processor.c | 5 +-
arch/parisc/kernel/syscall_table.S | 2 +-
arch/parisc/kernel/time.c | 24 +++++-
arch/parisc/lib/lusercopy.S | 25 +++---
arch/parisc/mm/fault.c | 10 +--
arch/parisc/mm/init.c | 3 +
20 files changed, 378 insertions(+), 75 deletions(-)
create mode 100644 arch/parisc/kernel/pdt.c
Merging powerpc/next (4d0d7c02df68 powerpc/powernv/idle: Clear r12 on wakeup from stop lite)
$ git merge powerpc/next
Auto-merging arch/powerpc/sysdev/xive/common.c
Auto-merging arch/powerpc/platforms/pseries/hotplug-memory.c
Auto-merging arch/powerpc/platforms/powernv/subcore.c
Auto-merging arch/powerpc/perf/power9-pmu.c
Auto-merging arch/powerpc/mm/mmu_context_book3s64.c
Auto-merging arch/powerpc/kvm/book3s_hv_rmhandlers.S
Auto-merging arch/powerpc/kernel/setup-common.c
Auto-merging arch/powerpc/kernel/process.c
Auto-merging arch/powerpc/kernel/exceptions-64s.S
Removing arch/powerpc/include/uapi/asm/statfs.h
Removing arch/powerpc/include/uapi/asm/sockios.h
Removing arch/powerpc/include/uapi/asm/resource.h
Removing arch/powerpc/include/uapi/asm/poll.h
Removing arch/powerpc/include/uapi/asm/param.h
Auto-merging arch/powerpc/include/asm/processor.h
Auto-merging arch/powerpc/Kconfig
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
Documentation/powerpc/firmware-assisted-dump.txt | 4 +-
MAINTAINERS | 11 +-
arch/powerpc/Kconfig | 22 +-
arch/powerpc/Makefile | 11 +
arch/powerpc/Makefile.postlink | 17 +-
arch/powerpc/boot/Makefile | 5 +-
arch/powerpc/boot/crtsavres.S | 8 +-
arch/powerpc/boot/dts/digsy_mtc.dts | 2 +-
arch/powerpc/boot/dts/fsl/b4qds.dtsi | 8 +-
arch/powerpc/boot/dts/fsl/c293pcie.dts | 2 +-
arch/powerpc/boot/dts/fsl/p1010rdb.dtsi | 2 +-
arch/powerpc/boot/dts/fsl/p1023rdb.dts | 2 +-
arch/powerpc/boot/dts/fsl/p2041rdb.dts | 4 +-
arch/powerpc/boot/dts/fsl/p3041ds.dts | 4 +-
arch/powerpc/boot/dts/fsl/p4080ds.dts | 4 +-
arch/powerpc/boot/dts/fsl/p5020ds.dts | 4 +-
arch/powerpc/boot/dts/fsl/p5040ds.dts | 4 +-
arch/powerpc/boot/dts/fsl/t208xqds.dtsi | 8 +-
arch/powerpc/boot/dts/fsl/t4240qds.dts | 12 +-
arch/powerpc/boot/dts/fsl/t4240rdb.dts | 6 +-
arch/powerpc/boot/dts/fsp2.dts | 608 +++++++++++++++++++++
arch/powerpc/boot/dts/mpc5121ads.dts | 2 +-
arch/powerpc/boot/dts/mpc8308_p1m.dts | 2 +-
arch/powerpc/boot/dts/mpc8349emitx.dts | 4 +-
arch/powerpc/boot/dts/mpc8377_rdb.dts | 2 +-
arch/powerpc/boot/dts/mpc8377_wlan.dts | 2 +-
arch/powerpc/boot/dts/mpc8378_rdb.dts | 2 +-
arch/powerpc/boot/dts/mpc8379_rdb.dts | 2 +-
arch/powerpc/boot/dts/pcm030.dts | 2 +-
arch/powerpc/boot/dts/pcm032.dts | 2 +-
arch/powerpc/boot/dts/sequoia.dts | 2 +-
arch/powerpc/boot/dts/warp.dts | 2 +-
arch/powerpc/boot/ppc_asm.h | 12 +-
arch/powerpc/configs/44x/fsp2_defconfig | 126 +++++
arch/powerpc/include/asm/barrier.h | 5 +
arch/powerpc/include/asm/bitops.h | 87 +--
arch/powerpc/include/asm/book3s/32/pgalloc.h | 3 +-
arch/powerpc/include/asm/book3s/32/pgtable.h | 2 +
arch/powerpc/include/asm/book3s/64/pgalloc.h | 16 +-
arch/powerpc/include/asm/dbell.h | 13 +
arch/powerpc/include/asm/exception-64s.h | 49 +-
arch/powerpc/include/asm/fadump.h | 4 +
arch/powerpc/include/asm/head-64.h | 25 +-
arch/powerpc/include/asm/hw_irq.h | 4 +
arch/powerpc/include/asm/machdep.h | 1 +
arch/powerpc/include/asm/mce.h | 15 +-
arch/powerpc/include/asm/nohash/32/pgalloc.h | 3 +-
arch/powerpc/include/asm/nohash/32/pgtable.h | 2 +
arch/powerpc/include/asm/nohash/64/pgalloc.h | 11 +-
arch/powerpc/include/asm/opal-api.h | 75 ++-
arch/powerpc/include/asm/paca.h | 14 +-
arch/powerpc/include/asm/pgalloc.h | 14 +
arch/powerpc/include/asm/ppc-opcode.h | 11 +-
arch/powerpc/include/asm/ppc_asm.h | 11 +-
arch/powerpc/include/asm/processor.h | 10 +-
arch/powerpc/include/asm/trace.h | 33 ++
arch/powerpc/include/uapi/asm/Kbuild | 6 +
arch/powerpc/include/uapi/asm/param.h | 1 -
arch/powerpc/include/uapi/asm/poll.h | 1 -
arch/powerpc/include/uapi/asm/resource.h | 1 -
arch/powerpc/include/uapi/asm/sockios.h | 20 -
arch/powerpc/include/uapi/asm/statfs.h | 6 -
arch/powerpc/kernel/Makefile | 2 -
arch/powerpc/kernel/asm-offsets.c | 10 +-
arch/powerpc/kernel/entry_64.S | 113 ++--
arch/powerpc/kernel/exceptions-64s.S | 282 ++++++----
arch/powerpc/kernel/fadump.c | 196 ++++++-
arch/powerpc/kernel/idle_book3s.S | 188 +++----
arch/powerpc/kernel/irq.c | 62 ++-
arch/powerpc/kernel/mce.c | 1 +
arch/powerpc/kernel/mce_power.c | 3 +
arch/powerpc/kernel/misc_32.S | 6 +-
arch/powerpc/kernel/process.c | 45 +-
arch/powerpc/kernel/setup-common.c | 4 +
arch/powerpc/kernel/smp.c | 3 +-
arch/powerpc/kernel/time.c | 88 ++-
arch/powerpc/kernel/tm.S | 4 +-
arch/powerpc/kernel/vmlinux.lds.S | 51 +-
arch/powerpc/kvm/book3s_hv_rm_mmu.c | 11 +-
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 12 +-
arch/powerpc/lib/Makefile | 15 +-
arch/powerpc/lib/copyuser_power7.S | 4 +-
arch/powerpc/lib/crtsavres.S | 6 +-
arch/powerpc/lib/xor_vmx.c | 53 +-
arch/powerpc/lib/xor_vmx.h | 20 +
arch/powerpc/lib/xor_vmx_glue.c | 62 +++
arch/powerpc/mm/8xx_mmu.c | 2 +-
arch/powerpc/mm/dma-noncoherent.c | 2 +-
arch/powerpc/mm/dump_hashpagetable.c | 2 +-
arch/powerpc/mm/fault.c | 17 +-
arch/powerpc/mm/hash_native_64.c | 3 +
arch/powerpc/mm/hash_utils_64.c | 2 +
arch/powerpc/mm/hugetlbpage.c | 2 +-
arch/powerpc/mm/init_64.c | 21 +
arch/powerpc/mm/mem.c | 4 +-
arch/powerpc/mm/mmu_context_book3s64.c | 15 +-
arch/powerpc/mm/mmu_decl.h | 1 -
arch/powerpc/mm/pgtable-hash64.c | 75 +++
arch/powerpc/mm/pgtable-radix.c | 19 +-
arch/powerpc/mm/pgtable_32.c | 15 +-
arch/powerpc/mm/pgtable_64.c | 28 +-
arch/powerpc/mm/slb.c | 10 +-
arch/powerpc/mm/slb_low.S | 30 +-
arch/powerpc/mm/tlb-radix.c | 9 +
arch/powerpc/mm/tlb_hash64.c | 6 +-
arch/powerpc/perf/power9-events-list.h | 4 +-
arch/powerpc/perf/power9-pmu.c | 8 +-
arch/powerpc/platforms/44x/Kconfig | 12 +
arch/powerpc/platforms/44x/Makefile | 1 +
arch/powerpc/platforms/44x/fsp2.c | 62 +++
arch/powerpc/platforms/cell/smp.c | 3 +-
arch/powerpc/platforms/powernv/eeh-powernv.c | 16 +-
arch/powerpc/platforms/powernv/idle.c | 198 +++++--
arch/powerpc/platforms/powernv/opal-wrappers.S | 6 +-
arch/powerpc/platforms/powernv/pci-ioda.c | 133 ++++-
arch/powerpc/platforms/powernv/pci.c | 160 +++++-
arch/powerpc/platforms/powernv/pci.h | 13 +-
arch/powerpc/platforms/powernv/smp.c | 34 +-
arch/powerpc/platforms/powernv/subcore.c | 3 +-
arch/powerpc/platforms/pseries/hotplug-cpu.c | 2 +-
arch/powerpc/platforms/pseries/hotplug-memory.c | 7 +
arch/powerpc/platforms/pseries/smp.c | 3 +-
arch/powerpc/sysdev/mpc8xx_pic.c | 2 +-
arch/powerpc/sysdev/xive/common.c | 2 +-
arch/powerpc/sysdev/xive/native.c | 4 +-
arch/powerpc/tools/head_check.sh | 78 +++
arch/powerpc/tools/unrel_branch_check.sh | 57 ++
arch/powerpc/xmon/xmon.c | 8 +-
drivers/cpuidle/cpuidle-powernv.c | 53 +-
drivers/cpuidle/cpuidle-pseries.c | 22 +-
drivers/misc/cxl/flash.c | 8 +-
drivers/tty/hvc/hvcs.c | 3 +-
drivers/watchdog/Kconfig | 2 +-
include/asm-generic/vmlinux.lds.h | 12 +
.../selftests/powerpc/benchmarks/context_switch.c | 53 +-
135 files changed, 2957 insertions(+), 869 deletions(-)
create mode 100644 arch/powerpc/boot/dts/fsp2.dts
create mode 100644 arch/powerpc/configs/44x/fsp2_defconfig
delete mode 100644 arch/powerpc/include/uapi/asm/param.h
delete mode 100644 arch/powerpc/include/uapi/asm/poll.h
delete mode 100644 arch/powerpc/include/uapi/asm/resource.h
delete mode 100644 arch/powerpc/include/uapi/asm/sockios.h
delete mode 100644 arch/powerpc/include/uapi/asm/statfs.h
create mode 100644 arch/powerpc/lib/xor_vmx.h
create mode 100644 arch/powerpc/lib/xor_vmx_glue.c
create mode 100644 arch/powerpc/platforms/44x/fsp2.c
create mode 100644 arch/powerpc/tools/head_check.sh
create mode 100755 arch/powerpc/tools/unrel_branch_check.sh
Merging fsl/next (61baf1555512 powerpc/64e: Don't place the stack beyond TASK_SIZE)
$ git merge fsl/next
Already up-to-date.
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 (9e293b5a7062 Merge tag 'nmiforkvm' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into features)
$ git merge s390/features
Removing drivers/s390/block/scm_blk_cluster.c
Auto-merging arch/s390/pci/pci_dma.c
Auto-merging arch/s390/mm/mmap.c
Auto-merging arch/s390/kvm/kvm-s390.c
Auto-merging arch/s390/kvm/gaccess.c
Auto-merging arch/s390/include/asm/processor.h
Auto-merging arch/s390/include/asm/kvm_host.h
Removing arch/s390/include/asm/fb.h
Removing arch/s390/include/asm/device.h
Auto-merging arch/s390/Kconfig
Merge made by the 'recursive' strategy.
arch/s390/Kconfig | 3 +-
arch/s390/crypto/Makefile | 3 +-
arch/s390/crypto/arch_random.c | 1 +
arch/s390/include/asm/Kbuild | 2 +
arch/s390/include/asm/device.h | 10 --
arch/s390/include/asm/elf.h | 32 +++++
arch/s390/include/asm/fb.h | 12 --
arch/s390/include/asm/io.h | 4 +-
arch/s390/include/asm/kvm_host.h | 17 ++-
arch/s390/include/asm/mmu_context.h | 4 +-
arch/s390/include/asm/nmi.h | 7 +
arch/s390/include/asm/page.h | 3 +
arch/s390/include/asm/pci.h | 15 +-
arch/s390/include/asm/pci_insn.h | 2 +-
arch/s390/include/asm/pgalloc.h | 25 +++-
arch/s390/include/asm/pgtable.h | 105 +++++++++++---
arch/s390/include/asm/processor.h | 6 +-
arch/s390/include/asm/ptrace.h | 54 +++----
arch/s390/include/asm/sigp.h | 2 +-
arch/s390/include/asm/thread_info.h | 1 +
arch/s390/include/asm/tlb.h | 15 ++
arch/s390/kernel/asm-offsets.c | 3 +
arch/s390/kernel/dumpstack.c | 33 +----
arch/s390/kernel/entry.S | 30 +++-
arch/s390/kernel/nmi.c | 84 +++++++++--
arch/s390/kernel/perf_cpum_sf.c | 10 +-
arch/s390/kernel/perf_event.c | 3 +-
arch/s390/kernel/ptrace.c | 15 +-
arch/s390/kernel/smp.c | 3 +
arch/s390/kernel/traps.c | 1 +
arch/s390/kernel/uprobes.c | 12 +-
arch/s390/kernel/vdso.c | 91 ++++++++----
arch/s390/kernel/vtime.c | 14 +-
arch/s390/kvm/gaccess.c | 22 +--
arch/s390/kvm/gaccess.h | 4 +-
arch/s390/kvm/guestdbg.c | 6 +-
arch/s390/kvm/kvm-s390.c | 1 +
arch/s390/kvm/priv.c | 8 +-
arch/s390/mm/dump_pagetables.c | 23 ++-
arch/s390/mm/fault.c | 2 +-
arch/s390/mm/gmap.c | 11 +-
arch/s390/mm/gup.c | 33 ++++-
arch/s390/mm/hugetlbpage.c | 30 ++--
arch/s390/mm/init.c | 6 +-
arch/s390/mm/mmap.c | 4 +-
arch/s390/mm/pageattr.c | 30 +++-
arch/s390/mm/pgalloc.c | 57 +++++---
arch/s390/mm/pgtable.c | 6 +-
arch/s390/mm/vmem.c | 44 +++++-
arch/s390/pci/pci.c | 173 ++++++++++++----------
arch/s390/pci/pci_clp.c | 77 ++++++----
arch/s390/pci/pci_dma.c | 4 +-
arch/s390/pci/pci_event.c | 14 +-
arch/s390/pci/pci_insn.c | 10 +-
arch/s390/tools/gen_facilities.c | 2 -
drivers/crypto/Kconfig | 15 +-
drivers/s390/block/Kconfig | 7 -
drivers/s390/block/Makefile | 3 -
drivers/s390/block/dasd.c | 76 +++++-----
drivers/s390/block/dasd_devmap.c | 75 ++++++----
drivers/s390/block/scm_blk.c | 262 +++++++++++++++-------------------
drivers/s390/block/scm_blk.h | 60 +-------
drivers/s390/block/scm_blk_cluster.c | 255 ---------------------------------
drivers/s390/cio/css.c | 49 +++++++
drivers/s390/cio/device.c | 42 ------
drivers/s390/cio/vfio_ccw_drv.c | 58 +-------
drivers/s390/crypto/ap_bus.c | 21 ++-
drivers/s390/crypto/pkey_api.c | 6 +-
drivers/s390/crypto/zcrypt_api.c | 12 +-
drivers/s390/crypto/zcrypt_cca_key.h | 115 +--------------
drivers/s390/crypto/zcrypt_msgtype6.c | 4 +-
drivers/tty/hvc/Kconfig | 2 +-
72 files changed, 1135 insertions(+), 1116 deletions(-)
delete mode 100644 arch/s390/include/asm/device.h
delete mode 100644 arch/s390/include/asm/fb.h
delete mode 100644 drivers/s390/block/scm_blk_cluster.c
Merging sparc-next/master (a718d1392700 sparc64: fix typo in property)
$ git merge sparc-next/master
Auto-merging arch/sparc/Kconfig
Merge made by the 'recursive' strategy.
arch/sparc/Kconfig | 5 +
arch/sparc/include/asm/cmpxchg_64.h | 76 +++++++-
arch/sparc/include/asm/ldc.h | 8 +
arch/sparc/include/asm/mdesc.h | 24 ++-
arch/sparc/include/asm/qrwlock.h | 7 +
arch/sparc/include/asm/qspinlock.h | 7 +
arch/sparc/include/asm/setup.h | 2 +-
arch/sparc/include/asm/spinlock_64.h | 208 +-------------------
arch/sparc/include/asm/spinlock_types.h | 12 +-
arch/sparc/include/asm/timer_64.h | 67 +++++++
arch/sparc/include/asm/vio.h | 13 +-
arch/sparc/kernel/apc.c | 2 +-
arch/sparc/kernel/kernel.h | 3 +
arch/sparc/kernel/ldc.c | 151 ++++++++++-----
arch/sparc/kernel/mdesc.c | 331 +++++++++++++++++++++++++++-----
arch/sparc/kernel/prom_64.c | 2 +-
arch/sparc/kernel/setup_64.c | 7 +-
arch/sparc/kernel/time_32.c | 2 +-
arch/sparc/kernel/time_64.c | 179 +++++++++++------
arch/sparc/kernel/vio.c | 244 ++++++++++++-----------
arch/sparc/kernel/viohs.c | 24 ++-
arch/sparc/kernel/vmlinux.lds.S | 5 +
kernel/locking/qrwlock.c | 1 +
23 files changed, 889 insertions(+), 491 deletions(-)
create mode 100644 arch/sparc/include/asm/qrwlock.h
create mode 100644 arch/sparc/include/asm/qspinlock.h
Merging sh/for-next (6e2fbfdd585f sh: fix futex FUTEX_OP_SET op on userspace addresses)
$ git merge sh/for-next
Merge made by the 'recursive' strategy.
arch/sh/include/asm/futex.h | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
Merging tile/master (0af0bc38175d mm, tile: drop arch_{add,remove}_memory)
$ git merge tile/master
Merge made by the 'recursive' strategy.
arch/tile/include/uapi/arch/abi.h | 49 +++----------------------
arch/tile/include/uapi/arch/intreg.h | 70 ++++++++++++++++++++++++++++++++++++
arch/tile/mm/init.c | 30 ----------------
3 files changed, 74 insertions(+), 75 deletions(-)
create mode 100644 arch/tile/include/uapi/arch/intreg.h
Merging uml/linux-next (ce4586063f1a um: Add missing NR_CPUS include)
$ git merge uml/linux-next
Already up-to-date.
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
$ git merge unicore32/unicore32
Auto-merging arch/unicore32/include/asm/Kbuild
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 (bdf3b55fde37 Merge branch 'xtensa-fixes' into xtensa-for-next)
$ git merge xtensa/xtensa-for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging fscrypt/master (c250b7dd8e73 fscrypt: make ->dummy_context() return bool)
$ git merge fscrypt/master
Auto-merging fs/ext4/super.c
Merge made by the 'recursive' strategy.
fs/crypto/Kconfig | 1 +
fs/crypto/crypto.c | 23 ++++--
fs/crypto/fname.c | 9 ---
fs/crypto/fscrypt_private.h | 9 ++-
fs/crypto/keyinfo.c | 173 ++++++++++++++++++++++++++++++++---------
fs/crypto/policy.c | 8 +-
fs/ext4/super.c | 2 +-
include/linux/fscrypt_common.h | 18 +++--
include/linux/fscrypt_supp.h | 7 +-
include/uapi/linux/fs.h | 2 +
10 files changed, 182 insertions(+), 70 deletions(-)
Merging befs/for-next (0bbabf98dd76 befs: make export work with cold dcache)
$ 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 (4a240ddbe6b5 Merge branch 'for-next-current-v4.12-20170626' into for-next-20170626)
$ git merge btrfs-kdave/for-next
Merge made by the 'recursive' strategy.
fs/btrfs/backref.c | 10 +-
fs/btrfs/check-integrity.c | 53 ++---
fs/btrfs/compression.c | 94 ++------
fs/btrfs/compression.h | 44 +++-
fs/btrfs/ctree.c | 42 ++--
fs/btrfs/ctree.h | 84 ++++---
fs/btrfs/delayed-ref.c | 29 ++-
fs/btrfs/delayed-ref.h | 6 +-
fs/btrfs/dev-replace.c | 4 +-
fs/btrfs/dir-item.c | 94 +++++++-
fs/btrfs/disk-io.c | 179 +++++++-------
fs/btrfs/disk-io.h | 8 +-
fs/btrfs/export.c | 5 +
fs/btrfs/extent-tree.c | 493 +++++++++++++++++++++------------------
fs/btrfs/extent_io.c | 217 ++++++++---------
fs/btrfs/extent_io.h | 82 +++++--
fs/btrfs/file-item.c | 31 ++-
fs/btrfs/file.c | 46 ++--
fs/btrfs/free-space-tree.c | 38 ++-
fs/btrfs/inode-map.c | 4 +-
fs/btrfs/inode.c | 449 +++++++++++++++++++----------------
fs/btrfs/ioctl.c | 18 +-
fs/btrfs/lzo.c | 33 +--
fs/btrfs/ordered-data.c | 17 +-
fs/btrfs/ordered-data.h | 4 +-
fs/btrfs/print-tree.c | 7 +-
fs/btrfs/props.c | 7 +
fs/btrfs/qgroup.c | 225 +++++++++++++-----
fs/btrfs/qgroup.h | 9 +-
fs/btrfs/raid56.c | 16 +-
fs/btrfs/reada.c | 1 -
fs/btrfs/relocation.c | 17 +-
fs/btrfs/root-tree.c | 7 +
fs/btrfs/scrub.c | 211 +++++++----------
fs/btrfs/send.c | 112 ++++++---
fs/btrfs/super.c | 74 +-----
fs/btrfs/sysfs.c | 41 ++++
fs/btrfs/tests/extent-io-tests.c | 2 +-
fs/btrfs/transaction.c | 25 +-
fs/btrfs/tree-log.c | 44 +++-
fs/btrfs/volumes.c | 74 +++---
fs/btrfs/volumes.h | 7 +
fs/btrfs/xattr.c | 2 +-
fs/btrfs/zlib.c | 20 +-
include/trace/events/btrfs.h | 36 ---
include/uapi/linux/btrfs.h | 63 +++--
46 files changed, 1706 insertions(+), 1378 deletions(-)
Merging ceph/master (4ca2fea6f827 ceph: unify inode i_ctime update)
$ git merge ceph/master
Already up-to-date.
Merging cifs/for-next (bdda26555dd2 cifs: Do not modify mid entry after submitting I/O in cifs_call_async)
$ git merge cifs/for-next
Merge made by the 'recursive' strategy.
fs/cifs/Kconfig | 9 ++
fs/cifs/cifs_unicode.c | 8 ++
fs/cifs/cifsglob.h | 14 ++-
fs/cifs/connect.c | 8 +-
fs/cifs/file.c | 12 +--
fs/cifs/smb2ops.c | 234 ++++++++++++++++++++++++++++--------------------
fs/cifs/smb2pdu.c | 58 +++++++++---
fs/cifs/smb2proto.h | 3 +
fs/cifs/smb2transport.c | 28 +++++-
fs/cifs/transport.c | 7 +-
10 files changed, 258 insertions(+), 123 deletions(-)
Merging configfs/for-next (19e72d3abb63 configfs: Introduce config_item_get_unless_zero())
$ 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 (08db141b5313 reiserfs: fix race in prealloc discard)
$ git merge ext3/for_next
Merge made by the 'recursive' strategy.
fs/reiserfs/bitmap.c | 14 ++++++--
fs/udf/file.c | 12 +++++--
fs/udf/inode.c | 4 +--
fs/udf/super.c | 2 --
fs/udf/udftime.c | 98 +++++++---------------------------------------------
5 files changed, 35 insertions(+), 95 deletions(-)
Merging ext4/dev (037ee4110538 ext4: require key for truncate(2) of encrypted file)
$ git merge ext4/dev
Auto-merging fs/ext4/super.c
Merge made by the 'recursive' strategy.
fs/ext2/ext2.h | 2 +-
fs/ext2/super.c | 16 +-
fs/ext2/xattr.c | 48 +-
fs/ext4/acl.c | 10 +-
fs/ext4/ext4.h | 63 +-
fs/ext4/ext4_jbd2.h | 14 -
fs/ext4/extents.c | 3 +-
fs/ext4/file.c | 7 -
fs/ext4/fsmap.c | 4 +
fs/ext4/ialloc.c | 15 +-
fs/ext4/indirect.c | 3 +-
fs/ext4/inline.c | 2 +-
fs/ext4/inode.c | 72 +-
fs/ext4/ioctl.c | 10 +-
fs/ext4/mballoc.c | 143 ++--
fs/ext4/mballoc.h | 6 +-
fs/ext4/migrate.c | 2 +-
fs/ext4/move_extent.c | 2 +-
fs/ext4/namei.c | 131 ++--
fs/ext4/super.c | 108 ++-
fs/ext4/sysfs.c | 2 +-
fs/ext4/xattr.c | 1750 ++++++++++++++++++++++++++++++++++++++++-------
fs/ext4/xattr.h | 32 +-
fs/mbcache.c | 52 +-
fs/quota/dquot.c | 16 +-
include/linux/mbcache.h | 11 +-
include/linux/quota.h | 2 +
27 files changed, 2006 insertions(+), 520 deletions(-)
Merging f2fs/dev (01d42209996c f2fs: introduce reserved_blocks in sysfs)
$ git merge f2fs/dev
Auto-merging fs/f2fs/super.c
Auto-merging fs/f2fs/segment.h
Auto-merging fs/f2fs/segment.c
Auto-merging fs/f2fs/node.c
Auto-merging fs/f2fs/file.c
Auto-merging fs/f2fs/f2fs.h
Merge made by the 'recursive' strategy.
Documentation/ABI/testing/sysfs-fs-f2fs | 20 +-
Documentation/filesystems/f2fs.txt | 2 +
fs/f2fs/Makefile | 2 +-
fs/f2fs/acl.c | 2 +-
fs/f2fs/checkpoint.c | 19 +-
fs/f2fs/data.c | 170 +++++++++-----
fs/f2fs/extent_cache.c | 12 +-
fs/f2fs/f2fs.h | 93 ++++++--
fs/f2fs/file.c | 149 +++++++++---
fs/f2fs/gc.c | 40 +++-
fs/f2fs/inline.c | 22 +-
fs/f2fs/inode.c | 12 +-
fs/f2fs/node.c | 45 ++--
fs/f2fs/node.h | 6 +-
fs/f2fs/segment.c | 194 +++++++++------
fs/f2fs/segment.h | 4 +
fs/f2fs/super.c | 401 ++++++--------------------------
fs/f2fs/sysfs.c | 363 +++++++++++++++++++++++++++++
include/trace/events/f2fs.h | 16 +-
19 files changed, 989 insertions(+), 583 deletions(-)
create mode 100644 fs/f2fs/sysfs.c
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 (68227c03cba8 fuse: initialize the flock flag in fuse_file on allocation)
$ git merge fuse/for-next
Merge made by the 'recursive' strategy.
fs/fuse/file.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging jfs/jfs-next (684666e51585 jfs: atomically read inode size)
$ git merge jfs/jfs-next
Auto-merging fs/jfs/super.c
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 (2e31b4cb895a NFSv4.1: nfs4_callback_free_slot() cannot call nfs4_slot_tbl_drain_complete())
$ git merge nfs/linux-next
Already up-to-date.
Merging nfsd/nfsd-next (bb2a8b0cd116 nfsd4: const-ify nfsd4_ops)
$ git merge nfsd/nfsd-next
Auto-merging include/linux/sunrpc/svc.h
Auto-merging fs/nfsd/nfsxdr.c
Auto-merging fs/nfsd/nfs4proc.c
Auto-merging fs/nfsd/nfs3xdr.c
Auto-merging fs/nfs/internal.h
Auto-merging fs/nfs/callback_xdr.c
Merge made by the 'recursive' strategy.
fs/lockd/clnt4xdr.c | 34 ++-
fs/lockd/clntxdr.c | 58 +++--
fs/lockd/mon.c | 38 ++--
fs/lockd/svc.c | 38 ++--
fs/lockd/svc4proc.c | 124 +++++++----
fs/lockd/svcproc.c | 124 +++++++----
fs/lockd/xdr.c | 43 ++--
fs/lockd/xdr4.c | 43 ++--
fs/nfs/callback.c | 2 +-
fs/nfs/callback.h | 27 +--
fs/nfs/callback_proc.c | 33 ++-
fs/nfs/callback_xdr.c | 113 +++++-----
fs/nfs/internal.h | 10 +-
fs/nfs/mount_clnt.c | 29 ++-
fs/nfs/nfs2xdr.c | 70 ++++--
fs/nfs/nfs3xdr.c | 151 ++++++++-----
fs/nfs/nfs42xdr.c | 52 +++--
fs/nfs/nfs4_fs.h | 6 +-
fs/nfs/nfs4xdr.c | 331 ++++++++++++++++++----------
fs/nfsd/current_stateid.h | 36 ++-
fs/nfsd/nfs2acl.c | 116 +++++-----
fs/nfsd/nfs3acl.c | 75 ++++---
fs/nfsd/nfs3proc.c | 301 +++++++++++++------------
fs/nfsd/nfs3xdr.c | 164 ++++++++------
fs/nfsd/nfs4callback.c | 32 ++-
fs/nfsd/nfs4proc.c | 412 ++++++++++++++++++-----------------
fs/nfsd/nfs4state.c | 142 +++++++-----
fs/nfsd/nfs4xdr.c | 13 +-
fs/nfsd/nfsd.h | 6 +-
fs/nfsd/nfsproc.c | 206 +++++++++---------
fs/nfsd/nfssvc.c | 24 +-
fs/nfsd/nfsxdr.c | 92 ++++----
fs/nfsd/xdr.h | 50 ++---
fs/nfsd/xdr3.h | 100 +++------
fs/nfsd/xdr4.h | 78 +++----
include/linux/lockd/lockd.h | 4 +-
include/linux/lockd/xdr.h | 26 +--
include/linux/lockd/xdr4.h | 26 +--
include/linux/sunrpc/clnt.h | 6 +-
include/linux/sunrpc/sched.h | 2 +-
include/linux/sunrpc/svc.h | 21 +-
include/linux/sunrpc/xdr.h | 15 +-
net/sunrpc/auth_gss/gss_rpc_upcall.c | 9 +-
net/sunrpc/auth_gss/gss_rpc_xdr.c | 14 +-
net/sunrpc/auth_gss/gss_rpc_xdr.h | 4 +-
net/sunrpc/clnt.c | 16 +-
net/sunrpc/rpcb_clnt.c | 82 ++++---
net/sunrpc/stats.c | 16 +-
net/sunrpc/svc.c | 33 +--
49 files changed, 1956 insertions(+), 1491 deletions(-)
Merging orangefs/for-next (2f713b5c7d2a orangefs: count directory pieces correctly)
$ git merge orangefs/for-next
Already up-to-date.
Merging overlayfs/overlayfs-next (fbaf94ee3cd5 ovl: don't set origin on broken lower hardlink)
$ git merge overlayfs/overlayfs-next
Auto-merging fs/overlayfs/copy_up.c
Merge made by the 'recursive' strategy.
fs/overlayfs/copy_up.c | 33 +++++++++++++++++++--------------
1 file changed, 19 insertions(+), 14 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 (7bccd12d27b7 ubi: Add debugfs file for tracking PEB state)
$ git merge ubifs/linux-next
Already up-to-date.
Merging xfs/for-next (50e0bdbe9f48 xfs: grab dquots without taking the ilock)
$ git merge xfs/for-next
Auto-merging fs/xfs/xfs_mount.c
Auto-merging fs/xfs/xfs_log_recover.c
Auto-merging fs/xfs/xfs_linux.h
Auto-merging fs/xfs/xfs_aops.c
Merge made by the 'recursive' strategy.
fs/xfs/Kconfig | 13 ++
fs/xfs/libxfs/xfs_ag_resv.c | 3 +-
fs/xfs/libxfs/xfs_alloc.c | 8 +-
fs/xfs/libxfs/xfs_alloc.h | 2 +
fs/xfs/libxfs/xfs_alloc_btree.c | 26 ++-
fs/xfs/libxfs/xfs_attr.c | 26 ++-
fs/xfs/libxfs/xfs_attr_remote.c | 13 +-
fs/xfs/libxfs/xfs_attr_sf.h | 10 +-
fs/xfs/libxfs/xfs_bit.h | 24 +--
fs/xfs/libxfs/xfs_bmap.c | 51 ++++--
fs/xfs/libxfs/xfs_bmap.h | 2 +-
fs/xfs/libxfs/xfs_bmap_btree.c | 34 +++-
fs/xfs/libxfs/xfs_btree.c | 52 +++---
fs/xfs/libxfs/xfs_btree.h | 33 ++--
fs/xfs/libxfs/xfs_cksum.h | 16 +-
fs/xfs/libxfs/xfs_da_btree.c | 12 +-
fs/xfs/libxfs/xfs_da_btree.h | 8 +-
fs/xfs/libxfs/xfs_da_format.c | 28 +--
fs/xfs/libxfs/xfs_da_format.h | 64 +++----
fs/xfs/libxfs/xfs_dir2.c | 3 +-
fs/xfs/libxfs/xfs_dir2.h | 8 +-
fs/xfs/libxfs/xfs_dir2_leaf.c | 14 +-
fs/xfs/libxfs/xfs_dir2_node.c | 10 +-
fs/xfs/libxfs/xfs_dir2_priv.h | 10 +-
fs/xfs/libxfs/xfs_dir2_sf.c | 2 +-
fs/xfs/libxfs/xfs_format.h | 112 ++++++------
fs/xfs/libxfs/xfs_fs.h | 16 +-
fs/xfs/libxfs/xfs_ialloc.c | 53 +++---
fs/xfs/libxfs/xfs_ialloc.h | 5 +
fs/xfs/libxfs/xfs_ialloc_btree.c | 36 +++-
fs/xfs/libxfs/xfs_inode_buf.c | 7 +-
fs/xfs/libxfs/xfs_inode_buf.h | 31 ++--
fs/xfs/libxfs/xfs_log_format.h | 256 ++++++++++++++--------------
fs/xfs/libxfs/xfs_log_recover.h | 2 +-
fs/xfs/libxfs/xfs_quota_defs.h | 6 +-
fs/xfs/libxfs/xfs_refcount.c | 16 +-
fs/xfs/libxfs/xfs_refcount.h | 16 ++
fs/xfs/libxfs/xfs_refcount_btree.c | 12 +-
fs/xfs/libxfs/xfs_rmap.c | 14 +-
fs/xfs/libxfs/xfs_rmap.h | 11 +-
fs/xfs/libxfs/xfs_rmap_btree.c | 34 ++--
fs/xfs/libxfs/xfs_rtbitmap.c | 4 +-
fs/xfs/libxfs/xfs_sb.c | 4 +-
fs/xfs/libxfs/xfs_types.h | 46 ++---
fs/xfs/xfs.h | 4 +
fs/xfs/xfs_acl.c | 6 +-
fs/xfs/xfs_acl.h | 1 +
fs/xfs/xfs_aops.c | 4 +-
fs/xfs/xfs_attr.h | 3 +
fs/xfs/xfs_attr_list.c | 61 ++++---
fs/xfs/xfs_bmap_item.c | 17 +-
fs/xfs/xfs_bmap_util.c | 164 ++++++++++--------
fs/xfs/xfs_bmap_util.h | 4 +
fs/xfs/xfs_buf.c | 62 ++++++-
fs/xfs/xfs_buf.h | 1 +
fs/xfs/xfs_buf_item.c | 21 ++-
fs/xfs/xfs_dir2_readdir.c | 341 +++++++++++--------------------------
fs/xfs/xfs_discard.c | 4 +-
fs/xfs/xfs_dquot.c | 16 +-
fs/xfs/xfs_error.c | 308 +++++++++++++++++++++++++--------
fs/xfs/xfs_error.h | 44 +++--
fs/xfs/xfs_file.c | 3 +-
fs/xfs/xfs_fsops.c | 16 +-
fs/xfs/xfs_fsops.h | 4 +-
fs/xfs/xfs_globals.c | 5 +
fs/xfs/xfs_icache.c | 52 +++++-
fs/xfs/xfs_icache.h | 4 +
fs/xfs/xfs_inode.c | 17 +-
fs/xfs/xfs_inode.h | 4 +-
fs/xfs/xfs_ioctl.c | 27 ++-
fs/xfs/xfs_ioctl.h | 10 +-
fs/xfs/xfs_ioctl32.h | 6 +-
fs/xfs/xfs_iomap.c | 4 +-
fs/xfs/xfs_iops.c | 4 +-
fs/xfs/xfs_itable.c | 2 +-
fs/xfs/xfs_itable.h | 2 +
fs/xfs/xfs_linux.h | 20 +--
fs/xfs/xfs_log.c | 87 +++++++---
fs/xfs/xfs_log.h | 2 +-
fs/xfs/xfs_log_cil.c | 91 ++++++----
fs/xfs/xfs_log_priv.h | 3 +-
fs/xfs/xfs_log_recover.c | 49 ++++--
fs/xfs/xfs_message.c | 5 +-
fs/xfs/xfs_mount.c | 26 +--
fs/xfs/xfs_mount.h | 60 +++----
fs/xfs/xfs_qm.c | 28 ++-
fs/xfs/xfs_qm_bhv.c | 2 +-
fs/xfs/xfs_reflink.c | 101 ++++++-----
fs/xfs/xfs_reflink.h | 8 +-
fs/xfs/xfs_rtalloc.c | 8 +-
fs/xfs/xfs_rtalloc.h | 3 +
fs/xfs/xfs_stats.c | 8 +-
fs/xfs/xfs_stats.h | 190 ++++++++++-----------
fs/xfs/xfs_super.c | 26 +--
fs/xfs/xfs_symlink.c | 6 +-
fs/xfs/xfs_symlink.h | 1 +
fs/xfs/xfs_sysctl.h | 1 +
fs/xfs/xfs_sysfs.c | 81 ++-------
fs/xfs/xfs_trace.h | 40 ++---
fs/xfs/xfs_trans.h | 8 +-
fs/xfs/xfs_trans_bmap.c | 11 +-
fs/xfs/xfs_trans_buf.c | 21 ++-
fs/xfs/xfs_trans_rmap.c | 2 +-
103 files changed, 1828 insertions(+), 1434 deletions(-)
Merging file-locks/linux-next (3832ff35309d btrfs: minimal conversion to errseq_t writeback error reporting on fsync)
$ git merge file-locks/linux-next
Resolved 'include/linux/fs.h' using previous resolution.
Auto-merging mm/memory-failure.c
Auto-merging include/linux/mm.h
Auto-merging include/linux/fs.h
CONFLICT (content): Merge conflict in include/linux/fs.h
Auto-merging fs/xfs/xfs_file.c
Auto-merging fs/fuse/file.c
Auto-merging fs/dax.c
Auto-merging fs/btrfs/file.c
Auto-merging fs/block_dev.c
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 8b9ae1f7a9c8] Merge remote-tracking branch 'file-locks/linux-next'
$ git diff -M --stat --summary HEAD^..
Documentation/filesystems/vfs.txt | 44 ++++-
MAINTAINERS | 6 +
drivers/dax/device.c | 1 +
drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 2 +-
fs/9p/vfs_file.c | 2 +-
fs/block_dev.c | 3 +-
fs/btrfs/file.c | 13 +-
fs/buffer.c | 20 ++-
fs/ceph/locks.c | 2 +-
fs/cifs/cifssmb.c | 2 +-
fs/dax.c | 4 +-
fs/dlm/plock.c | 2 +-
fs/exofs/dir.c | 2 +-
fs/ext2/dir.c | 2 +-
fs/ext2/file.c | 5 +-
fs/ext4/fsync.c | 2 +-
fs/fcntl.c | 172 +++++++++++++-------
fs/file_table.c | 1 +
fs/fuse/file.c | 6 +-
fs/gfs2/lops.c | 2 +-
fs/jbd2/commit.c | 16 +-
fs/jfs/jfs_metapage.c | 7 +-
fs/jfs/jfs_metapage.h | 1 +
fs/libfs.c