path: root/Next/merge.log

$ date -R
Wed, 31 May 2017 09:23:32 +1000
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at 3f173bde7e43 Merge tag 'pinctrl-v4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Merging origin/master (f511c0b17b08 "Yes, people use FOLL_FORCE ;)")
$ git merge origin/master
Updating 3f173bde7e43..f511c0b17b08
Fast-forward
 fs/proc/base.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging fixes/master (97da3854c526 Linux 4.11-rc3)
$ git merge fixes/master
Already up-to-date.
Merging kbuild-current/fixes (05d8cba4a1e8 kbuild: skip install/check of headers right under uapi directories)
$ git merge kbuild-current/fixes
Already up-to-date.
Merging arc-current/for-curr (a4da5b17736d arc: Set IO-coherency aperture base to LINUX_LINK_BASE)
$ git merge arc-current/for-curr
Merge made by the 'recursive' strategy.
 arch/arc/mm/cache.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Merging arm-current/fixes (2ea659a9ef48 Linux 4.12-rc1)
$ 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 (a4700a261072 powerpc: Add PPC_FEATURE userspace bits for SCV and DARN instructions)
$ git merge powerpc-fixes/fixes
Already up-to-date.
Merging sparc/master (7485af89a6fd arch/sparc: increase CONFIG_NODES_SHIFT on SPARC64 to 5)
$ git merge sparc/master
Merge made by the 'recursive' strategy.
 arch/sparc/Kconfig | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
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 (b9565077ae6c Merge branch 'mlx4-mlx5-MAINTAINERS-update')
$ git merge net/master
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/net/dsa/marvell.txt        |   4 +
 Documentation/networking/dpaa.txt                  | 194 +++++++++++++++++++++
 MAINTAINERS                                        |   6 +-
 drivers/net/dsa/mv88e6xxx/global2.h                |   6 +-
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c    |  21 ++-
 drivers/net/ethernet/chelsio/cxgb4/t4_hw.c         |   9 +-
 drivers/net/ethernet/mellanox/mlx5/core/main.c     |   5 +-
 drivers/net/ethernet/qlogic/qed/qed_main.c         |   3 +-
 drivers/net/hamradio/hdlcdrv.c                     |   2 +
 net/netfilter/nf_conntrack_netlink.c               |   7 +-
 net/netfilter/nf_conntrack_proto_sctp.c            |   9 +-
 net/netfilter/nf_nat_core.c                        |   2 +-
 net/netfilter/nft_set_rbtree.c                     |  22 +--
 13 files changed, 254 insertions(+), 36 deletions(-)
 create mode 100644 Documentation/networking/dpaa.txt
Merging ipsec/master (a486cd23661c xfrm: fix state migration copy replay sequence numbers)
$ git merge ipsec/master
Already up-to-date.
Merging netfilter/master (468b0df61a51 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf)
$ git merge netfilter/master
Already up-to-date.
Merging ipvs/master (3c5ab3f395d6 ipvs: SNAT packet replies only for NATed connections)
$ git merge ipvs/master
Already up-to-date.
Merging wireless-drivers/master (6d18c732b95c bridge: start hello_timer when enabling KERNEL_STP in br_stp_start)
$ git merge wireless-drivers/master
Already up-to-date.
Merging mac80211/master (7a7c0a6438b8 mac80211: fix TX aggregation start/stop callback race)
$ git merge mac80211/master
Merge made by the 'recursive' strategy.
 net/mac80211/agg-tx.c      | 128 ++++++++++++++++++---------------------------
 net/mac80211/ht.c          |  16 ++++--
 net/mac80211/ieee80211_i.h |  14 ++---
 net/mac80211/iface.c       |  11 +---
 net/mac80211/sta_info.h    |   2 +
 5 files changed, 71 insertions(+), 100 deletions(-)
Merging sound-current/for-linus (1fc2e41f7af4 ALSA: hda - apply STAC_9200_DELL_M22 quirk for Dell Latitude D430)
$ git merge sound-current/for-linus
Already up-to-date.
Merging pci-current/for-linus (bd2df9b1e094 PCI: Make error code types consistent in pci_{read,write}_config_*)
$ git merge pci-current/for-linus
Merge made by the 'recursive' strategy.
 drivers/pci/access.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
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 (5ed02dbb4974 Linux 4.12-rc3)
$ git merge tty.current/tty-linus
Already up-to-date.
Merging usb.current/usb-linus (b3addcf0d1f0 usb: musb: dsps: keep VBUS on for host-only mode)
$ git merge usb.current/usb-linus
Merge made by the 'recursive' strategy.
 drivers/usb/chipidea/core.c        |  5 ++++-
 drivers/usb/chipidea/debug.c       |  3 ++-
 drivers/usb/chipidea/udc.c         |  8 ++++++--
 drivers/usb/chipidea/usbmisc_imx.c | 41 +++++++++++++++++++++++++++++---------
 drivers/usb/musb/musb_dsps.c       |  5 +++++
 5 files changed, 49 insertions(+), 13 deletions(-)
Merging usb-gadget-fixes/fixes (a351e9b9fc24 Linux 4.11)
$ git merge usb-gadget-fixes/fixes
Already up-to-date.
Merging usb-serial-fixes/usb-linus (5ed02dbb4974 Linux 4.12-rc3)
$ 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 (a380b78b799b phy: qualcomm: phy-qcom-qmp: fix application of sizeof to pointer)
$ git merge phy/fixes
Auto-merging drivers/phy/ti/phy-tusb1210.c
Auto-merging drivers/phy/qualcomm/phy-qcom-usb-hsic.c
Auto-merging drivers/phy/qualcomm/phy-qcom-usb-hs.c
Auto-merging drivers/phy/qualcomm/phy-qcom-qmp.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                                        |  18 +-
 drivers/phy/Kconfig                                | 491 +--------------------
 drivers/phy/Makefile                               |  70 +--
 drivers/phy/allwinner/Kconfig                      |  31 ++
 drivers/phy/allwinner/Makefile                     |   2 +
 drivers/phy/{ => allwinner}/phy-sun4i-usb.c        |   0
 drivers/phy/{ => allwinner}/phy-sun9i-usb.c        |   0
 drivers/phy/amlogic/Kconfig                        |  14 +
 drivers/phy/amlogic/Makefile                       |   1 +
 drivers/phy/{ => amlogic}/phy-meson8b-usb2.c       |   0
 drivers/phy/broadcom/Kconfig                       |  55 +++
 drivers/phy/broadcom/Makefile                      |   6 +
 drivers/phy/{ => broadcom}/phy-bcm-cygnus-pcie.c   |   0
 drivers/phy/{ => broadcom}/phy-bcm-kona-usb2.c     |   0
 drivers/phy/{ => broadcom}/phy-bcm-ns-usb2.c       |   0
 drivers/phy/{ => broadcom}/phy-bcm-ns-usb3.c       |   0
 drivers/phy/{ => broadcom}/phy-bcm-ns2-pcie.c      |   0
 drivers/phy/{ => broadcom}/phy-brcm-sata.c         |   0
 drivers/phy/hisilicon/Kconfig                      |  20 +
 drivers/phy/hisilicon/Makefile                     |   2 +
 drivers/phy/{ => hisilicon}/phy-hi6220-usb.c       |   0
 drivers/phy/{ => hisilicon}/phy-hix5hd2-sata.c     |   0
 drivers/phy/marvell/Kconfig                        |  50 +++
 drivers/phy/marvell/Makefile                       |   6 +
 drivers/phy/{ => marvell}/phy-armada375-usb2.c     |   0
 drivers/phy/{ => marvell}/phy-berlin-sata.c        |   0
 drivers/phy/{ => marvell}/phy-berlin-usb.c         |   0
 drivers/phy/{ => marvell}/phy-mvebu-sata.c         |   0
 drivers/phy/{ => marvell}/phy-pxa-28nm-hsic.c      |   0
 drivers/phy/{ => marvell}/phy-pxa-28nm-usb2.c      |   0
 drivers/phy/qualcomm/Kconfig                       |  58 +++
 drivers/phy/qualcomm/Makefile                      |   9 +
 drivers/phy/{ => qualcomm}/phy-qcom-apq8064-sata.c |   0
 drivers/phy/{ => qualcomm}/phy-qcom-ipq806x-sata.c |   0
 drivers/phy/{ => qualcomm}/phy-qcom-qmp.c          |  14 +-
 drivers/phy/{ => qualcomm}/phy-qcom-qusb2.c        |   0
 drivers/phy/{ => qualcomm}/phy-qcom-ufs-i.h        |   0
 drivers/phy/{ => qualcomm}/phy-qcom-ufs-qmp-14nm.c |   0
 drivers/phy/{ => qualcomm}/phy-qcom-ufs-qmp-14nm.h |   0
 drivers/phy/{ => qualcomm}/phy-qcom-ufs-qmp-20nm.c |   0
 drivers/phy/{ => qualcomm}/phy-qcom-ufs-qmp-20nm.h |   0
 drivers/phy/{ => qualcomm}/phy-qcom-ufs.c          |   0
 drivers/phy/{ => qualcomm}/phy-qcom-usb-hs.c       |   3 +-
 drivers/phy/{ => qualcomm}/phy-qcom-usb-hsic.c     |   3 +-
 drivers/phy/renesas/Kconfig                        |  17 +
 drivers/phy/renesas/Makefile                       |   2 +
 drivers/phy/{ => renesas}/phy-rcar-gen2.c          |   0
 drivers/phy/{ => renesas}/phy-rcar-gen3-usb2.c     |   0
 drivers/phy/rockchip/Kconfig                       |  51 +++
 drivers/phy/rockchip/Makefile                      |   6 +
 drivers/phy/{ => rockchip}/phy-rockchip-dp.c       |   0
 drivers/phy/{ => rockchip}/phy-rockchip-emmc.c     |   0
 .../phy/{ => rockchip}/phy-rockchip-inno-usb2.c    |   0
 drivers/phy/{ => rockchip}/phy-rockchip-pcie.c     |   0
 drivers/phy/{ => rockchip}/phy-rockchip-typec.c    |   0
 drivers/phy/{ => rockchip}/phy-rockchip-usb.c      |   0
 drivers/phy/samsung/Kconfig                        |  95 ++++
 drivers/phy/samsung/Makefile                       |  11 +
 drivers/phy/{ => samsung}/phy-exynos-dp-video.c    |   0
 drivers/phy/{ => samsung}/phy-exynos-mipi-video.c  |   0
 drivers/phy/{ => samsung}/phy-exynos-pcie.c        |   0
 drivers/phy/{ => samsung}/phy-exynos4210-usb2.c    |   0
 drivers/phy/{ => samsung}/phy-exynos4x12-usb2.c    |   0
 drivers/phy/{ => samsung}/phy-exynos5-usbdrd.c     |   0
 drivers/phy/{ => samsung}/phy-exynos5250-sata.c    |   0
 drivers/phy/{ => samsung}/phy-exynos5250-usb2.c    |   0
 drivers/phy/{ => samsung}/phy-s5pv210-usb2.c       |   0
 drivers/phy/{ => samsung}/phy-samsung-usb2.c       |   0
 drivers/phy/{ => samsung}/phy-samsung-usb2.h       |   0
 drivers/phy/st/Kconfig                             |  33 ++
 drivers/phy/st/Makefile                            |   4 +
 drivers/phy/{ => st}/phy-miphy28lp.c               |   0
 drivers/phy/{ => st}/phy-spear1310-miphy.c         |   0
 drivers/phy/{ => st}/phy-spear1340-miphy.c         |   0
 drivers/phy/{ => st}/phy-stih407-usb.c             |   0
 drivers/phy/ti/Kconfig                             |  78 ++++
 drivers/phy/ti/Makefile                            |   7 +
 drivers/phy/{ => ti}/phy-da8xx-usb.c               |   0
 drivers/phy/{ => ti}/phy-dm816x-usb.c              |   0
 drivers/phy/{ => ti}/phy-omap-control.c            |   0
 drivers/phy/{ => ti}/phy-omap-usb2.c               |   0
 drivers/phy/{ => ti}/phy-ti-pipe3.c                |   0
 drivers/phy/{ => ti}/phy-tusb1210.c                |   3 +-
 drivers/phy/{ => ti}/phy-twl4030-usb.c             |   0
 {drivers => include/linux}/phy/ulpi_phy.h          |   0
 85 files changed, 601 insertions(+), 559 deletions(-)
 create mode 100644 drivers/phy/allwinner/Kconfig
 create mode 100644 drivers/phy/allwinner/Makefile
 rename drivers/phy/{ => allwinner}/phy-sun4i-usb.c (100%)
 rename drivers/phy/{ => allwinner}/phy-sun9i-usb.c (100%)
 create mode 100644 drivers/phy/amlogic/Kconfig
 create mode 100644 drivers/phy/amlogic/Makefile
 rename drivers/phy/{ => amlogic}/phy-meson8b-usb2.c (100%)
 create mode 100644 drivers/phy/broadcom/Kconfig
 create mode 100644 drivers/phy/broadcom/Makefile
 rename drivers/phy/{ => broadcom}/phy-bcm-cygnus-pcie.c (100%)
 rename drivers/phy/{ => broadcom}/phy-bcm-kona-usb2.c (100%)
 rename drivers/phy/{ => broadcom}/phy-bcm-ns-usb2.c (100%)
 rename drivers/phy/{ => broadcom}/phy-bcm-ns-usb3.c (100%)
 rename drivers/phy/{ => broadcom}/phy-bcm-ns2-pcie.c (100%)
 rename drivers/phy/{ => broadcom}/phy-brcm-sata.c (100%)
 create mode 100644 drivers/phy/hisilicon/Kconfig
 create mode 100644 drivers/phy/hisilicon/Makefile
 rename drivers/phy/{ => hisilicon}/phy-hi6220-usb.c (100%)
 rename drivers/phy/{ => hisilicon}/phy-hix5hd2-sata.c (100%)
 create mode 100644 drivers/phy/marvell/Kconfig
 create mode 100644 drivers/phy/marvell/Makefile
 rename drivers/phy/{ => marvell}/phy-armada375-usb2.c (100%)
 rename drivers/phy/{ => marvell}/phy-berlin-sata.c (100%)
 rename drivers/phy/{ => marvell}/phy-berlin-usb.c (100%)
 rename drivers/phy/{ => marvell}/phy-mvebu-sata.c (100%)
 rename drivers/phy/{ => marvell}/phy-pxa-28nm-hsic.c (100%)
 rename drivers/phy/{ => marvell}/phy-pxa-28nm-usb2.c (100%)
 create mode 100644 drivers/phy/qualcomm/Kconfig
 create mode 100644 drivers/phy/qualcomm/Makefile
 rename drivers/phy/{ => qualcomm}/phy-qcom-apq8064-sata.c (100%)
 rename drivers/phy/{ => qualcomm}/phy-qcom-ipq806x-sata.c (100%)
 rename drivers/phy/{ => qualcomm}/phy-qcom-qmp.c (99%)
 rename drivers/phy/{ => qualcomm}/phy-qcom-qusb2.c (100%)
 rename drivers/phy/{ => qualcomm}/phy-qcom-ufs-i.h (100%)
 rename drivers/phy/{ => qualcomm}/phy-qcom-ufs-qmp-14nm.c (100%)
 rename drivers/phy/{ => qualcomm}/phy-qcom-ufs-qmp-14nm.h (100%)
 rename drivers/phy/{ => qualcomm}/phy-qcom-ufs-qmp-20nm.c (100%)
 rename drivers/phy/{ => qualcomm}/phy-qcom-ufs-qmp-20nm.h (100%)
 rename drivers/phy/{ => qualcomm}/phy-qcom-ufs.c (100%)
 rename drivers/phy/{ => qualcomm}/phy-qcom-usb-hs.c (99%)
 rename drivers/phy/{ => qualcomm}/phy-qcom-usb-hsic.c (99%)
 create mode 100644 drivers/phy/renesas/Kconfig
 create mode 100644 drivers/phy/renesas/Makefile
 rename drivers/phy/{ => renesas}/phy-rcar-gen2.c (100%)
 rename drivers/phy/{ => renesas}/phy-rcar-gen3-usb2.c (100%)
 create mode 100644 drivers/phy/rockchip/Kconfig
 create mode 100644 drivers/phy/rockchip/Makefile
 rename drivers/phy/{ => rockchip}/phy-rockchip-dp.c (100%)
 rename drivers/phy/{ => rockchip}/phy-rockchip-emmc.c (100%)
 rename drivers/phy/{ => rockchip}/phy-rockchip-inno-usb2.c (100%)
 rename drivers/phy/{ => rockchip}/phy-rockchip-pcie.c (100%)
 rename drivers/phy/{ => rockchip}/phy-rockchip-typec.c (100%)
 rename drivers/phy/{ => rockchip}/phy-rockchip-usb.c (100%)
 create mode 100644 drivers/phy/samsung/Kconfig
 create mode 100644 drivers/phy/samsung/Makefile
 rename drivers/phy/{ => samsung}/phy-exynos-dp-video.c (100%)
 rename drivers/phy/{ => samsung}/phy-exynos-mipi-video.c (100%)
 rename drivers/phy/{ => samsung}/phy-exynos-pcie.c (100%)
 rename drivers/phy/{ => samsung}/phy-exynos4210-usb2.c (100%)
 rename drivers/phy/{ => samsung}/phy-exynos4x12-usb2.c (100%)
 rename drivers/phy/{ => samsung}/phy-exynos5-usbdrd.c (100%)
 rename drivers/phy/{ => samsung}/phy-exynos5250-sata.c (100%)
 rename drivers/phy/{ => samsung}/phy-exynos5250-usb2.c (100%)
 rename drivers/phy/{ => samsung}/phy-s5pv210-usb2.c (100%)
 rename drivers/phy/{ => samsung}/phy-samsung-usb2.c (100%)
 rename drivers/phy/{ => samsung}/phy-samsung-usb2.h (100%)
 create mode 100644 drivers/phy/st/Kconfig
 create mode 100644 drivers/phy/st/Makefile
 rename drivers/phy/{ => st}/phy-miphy28lp.c (100%)
 rename drivers/phy/{ => st}/phy-spear1310-miphy.c (100%)
 rename drivers/phy/{ => st}/phy-spear1340-miphy.c (100%)
 rename drivers/phy/{ => st}/phy-stih407-usb.c (100%)
 create mode 100644 drivers/phy/ti/Kconfig
 create mode 100644 drivers/phy/ti/Makefile
 rename drivers/phy/{ => ti}/phy-da8xx-usb.c (100%)
 rename drivers/phy/{ => ti}/phy-dm816x-usb.c (100%)
 rename drivers/phy/{ => ti}/phy-omap-control.c (100%)
 rename drivers/phy/{ => ti}/phy-omap-usb2.c (100%)
 rename drivers/phy/{ => ti}/phy-ti-pipe3.c (100%)
 rename drivers/phy/{ => ti}/phy-tusb1210.c (99%)
 rename drivers/phy/{ => ti}/phy-twl4030-usb.c (100%)
 rename {drivers => include/linux}/phy/ulpi_phy.h (100%)
Merging staging.current/staging-linus (3d51b9562673 staging: ccree: add CRYPTO dependency)
$ git merge staging.current/staging-linus
Merge made by the 'recursive' strategy.
 drivers/iio/adc/bcm_iproc_adc.c    |  8 ++++----
 drivers/iio/adc/max9611.c          | 10 +++++-----
 drivers/iio/adc/sun4i-gpadc-iio.c  | 38 ++++++++++++++++++++++++--------------
 drivers/iio/adc/ti_am335x_adc.c    |  2 +-
 drivers/iio/industrialio-trigger.c |  3 ++-
 drivers/iio/light/ltr501.c         |  4 ++--
 drivers/iio/proximity/as3935.c     | 14 ++++++--------
 drivers/staging/ccree/Kconfig      |  2 +-
 8 files changed, 45 insertions(+), 36 deletions(-)
Merging char-misc.current/char-misc-linus (cdc1daca1b9b MAINTAINERS: Change maintainer of genwqe driver)
$ git merge char-misc.current/char-misc-linus
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                               | 2 +-
 drivers/firmware/google/vpd.c             | 8 ++++----
 drivers/platform/goldfish/goldfish_pipe.c | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
Merging input-current/for-linus (2fef826e45c6 Input: synaptics - tell users to report when they should be using rmi-smbus)
$ git merge input-current/for-linus
Merge made by the 'recursive' strategy.
 drivers/input/mouse/synaptics.c    | 37 ++++++++++++++++++++++++++++---------
 drivers/input/touchscreen/silead.c |  3 +++
 2 files changed, 31 insertions(+), 9 deletions(-)
Merging crypto-current/master (f3ad587070d6 crypto: gcm - wait for crypto op not signal safe)
$ git merge crypto-current/master
Merge made by the 'recursive' strategy.
 crypto/asymmetric_keys/public_key.c | 2 +-
 crypto/drbg.c                       | 5 ++---
 crypto/gcm.c                        | 6 ++----
 3 files changed, 5 insertions(+), 8 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
Merge made by the 'recursive' strategy.
 drivers/mtd/nand/nand_base.c    | 46 +++++++++++++++++++++++++++++++----------
 drivers/mtd/nand/nand_ids.c     |  1 -
 drivers/mtd/nand/nand_samsung.c |  3 +++
 drivers/mtd/nand/tango_nand.c   | 23 ++++++++++++++-------
 4 files changed, 54 insertions(+), 19 deletions(-)
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 (b2376407f989 mfd: cros-ec: Fix host command buffer size)
$ git merge mfd-fixes/for-mfd-fixes
Already up-to-date.
Merging v4l-dvb-fixes/fixes (dd8245f445f5 [media] atomisp: don't treat warnings as errors)
$ git merge v4l-dvb-fixes/fixes
Merge made by the 'recursive' strategy.
 drivers/staging/media/atomisp/i2c/Makefile          | 2 --
 drivers/staging/media/atomisp/i2c/imx/Makefile      | 2 --
 drivers/staging/media/atomisp/i2c/ov5693/Makefile   | 2 --
 drivers/staging/media/atomisp/pci/atomisp2/Makefile | 2 +-
 4 files changed, 1 insertion(+), 7 deletions(-)
Merging reset-fixes/reset/fixes (4497a224f759 reset: hi6220: Set module license so that it can be loaded)
$ git merge reset-fixes/reset/fixes
Merge made by the 'recursive' strategy.
 drivers/reset/hisilicon/hi6220_reset.c | 2 ++
 1 file changed, 2 insertions(+)
Merging drm-intel-fixes/for-linux-next-fixes (9bd9590997b9 drm/i915: Stop pretending to mask/unmask LPE audio interrupts)
$ git merge drm-intel-fixes/for-linux-next-fixes
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/i915/gvt/execlist.c               | 30 ++++++++++++-------
 drivers/gpu/drm/i915/gvt/handlers.c               | 30 +++++++++++++------
 drivers/gpu/drm/i915/i915_drv.c                   |  4 ---
 drivers/gpu/drm/i915/i915_gem_gtt.c               |  2 +-
 drivers/gpu/drm/i915/i915_gem_shrinker.c          |  5 ----
 drivers/gpu/drm/i915/i915_irq.c                   | 15 ++++------
 drivers/gpu/drm/i915/i915_reg.h                   |  2 +-
 drivers/gpu/drm/i915/intel_lpe_audio.c            | 36 -----------------------
 drivers/gpu/drm/i915/intel_lrc.c                  |  2 +-
 drivers/gpu/drm/i915/selftests/i915_gem_context.c |  8 +++--
 10 files changed, 55 insertions(+), 79 deletions(-)
Merging drm-misc-fixes/for-linux-next-fixes (82bc9a42cf85 drm/gma500/psb: Actually use VBT mode when it is found)
$ git merge drm-misc-fixes/for-linux-next-fixes
Already up-to-date.
Merging kbuild/for-next (547b9255cde5 Merge branch 'fixes' into for-next)
$ git merge kbuild/for-next
Merge made by the 'recursive' strategy.
 scripts/bootgraph.pl                 | 2 +-
 scripts/checkincludes.pl             | 2 +-
 scripts/checkpatch.pl                | 3 ++-
 scripts/checkstack.pl                | 2 +-
 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/markup_oops.pl               | 2 +-
 scripts/namespace.pl                 | 4 ++--
 scripts/profile2linkerlist.pl        | 2 +-
 scripts/recordmcount.pl              | 3 ++-
 scripts/stackdelta                   | 2 +-
 24 files changed, 37 insertions(+), 25 deletions(-)
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
$ git merge asm-generic/master
Resolved 'include/asm-generic/percpu.h' using previous resolution.
Auto-merging include/asm-generic/percpu.h
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master e20c739f4894] Merge remote-tracking branch 'asm-generic/master'
$ git diff -M --stat --summary HEAD^..
 include/asm-generic/page.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging arc/for-next (d5adbfcd5f7b Linux 4.10-rc7)
$ git merge arc/for-next
Already up-to-date.
Merging arm/for-next (e89c0dc7736d Merge branches 'fixes' (early part) and 'misc' into for-next)
$ git merge arm/for-next
Merge made by the 'recursive' strategy.
 arch/arm/common/mcpm_entry.c         | 6 +++---
 arch/arm/include/asm/pgtable-nommu.h | 1 +
 arch/arm/kernel/process.c            | 8 ++++----
 arch/arm/mm/Kconfig                  | 6 +++++-
 arch/arm/mm/dma-mapping.c            | 1 +
 arch/arm/mm/proc-v7.S                | 5 +----
 6 files changed, 15 insertions(+), 12 deletions(-)
Merging arm-perf/for-next/perf (2ea659a9ef48 Linux 4.12-rc1)
$ git merge arm-perf/for-next/perf
Already up-to-date.
Merging arm-soc/for-next (a8854d66fe2c arm-soc: document merges)
$ git merge arm-soc/for-next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                               |  1 -
 arch/arm/arm-soc-for-next-contents.txt    | 36 +++++++++++++++++++++++++++++++
 arch/arm/boot/dts/bcm283x.dtsi            |  5 +++++
 arch/arm/boot/dts/keystone-k2l-netcp.dtsi |  4 ++--
 arch/arm/boot/dts/keystone-k2l.dtsi       |  8 +++++++
 arch/arm/mach-davinci/pm.c                |  7 +++++-
 arch/arm64/configs/defconfig              | 10 +++++++++
 7 files changed, 67 insertions(+), 4 deletions(-)
 create mode 100644 arch/arm/arm-soc-for-next-contents.txt
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 (15e858ec0c62 Merge branch 'v4.13/defconfig' into tmp/aml-rebuild)
$ git merge amlogic/for-next
Auto-merging arch/arm64/configs/defconfig
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/arm/amlogic.txt  |  20 +-
 arch/arm/boot/dts/meson.dtsi                       | 178 ++++++++---------
 arch/arm/boot/dts/meson6.dtsi                      |   2 -
 arch/arm/boot/dts/meson8.dtsi                      | 130 +++++++++----
 arch/arm/boot/dts/meson8b.dtsi                     | 214 +++++++++------------
 arch/arm64/boot/dts/amlogic/Makefile               |   6 +-
 .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi |  60 +++---
 .../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 +-
 arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi        | 181 +++++++++--------
 .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts     |   2 +-
 .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts    |  52 ++---
 arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi   |   2 +-
 arch/arm64/boot/dts/amlogic/meson-gxl.dtsi         |  72 +++----
 .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts |  87 +++++----
 arch/arm64/configs/defconfig                       |   5 +
 19 files changed, 667 insertions(+), 632 deletions(-)
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 (7d9fb74454a7 Merge branch 'at91-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
$ git merge at91/at91-next
Auto-merging arch/arm/mach-at91/pm.c
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/at91-linea.dtsi           |   2 +-
 arch/arm/boot/dts/at91-sama5d2_xplained.dts |  24 ++++
 arch/arm/boot/dts/at91-tse850-3.dts         |   2 +-
 arch/arm/boot/dts/sama5d2.dtsi              |  56 ++++++++
 arch/arm/configs/sama5_defconfig            |   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 ++-
 drivers/memory/atmel-ebi.c                  |   2 +-
 12 files changed, 346 insertions(+), 51 deletions(-)
Merging bcm2835/for-next (c156bb73ae01 Merge branch anholt/bcm2835-dt-next into for-next)
$ git merge bcm2835/for-next
Auto-merging arch/arm/boot/dts/bcm283x.dtsi
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                           |  1 -
 arch/arm/boot/dts/Makefile            |  1 +
 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.dtsi        | 21 +++++++++++++++++++++
 7 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 arch/arm/boot/dts/bcm2837-rpi-3-b.dts
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 (428c917deaaf Merge branch 'imx/defconfig' into for-next)
$ git merge imx-mxs/for-next
Auto-merging arch/arm/boot/dts/Makefile
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/mmc/fsl-esdhc.txt          |  14 +
 arch/arm/boot/dts/Makefile                         |   3 +
 arch/arm/boot/dts/imx6dl-gw560x.dts                |  55 ++
 arch/arm/boot/dts/imx6q-gw5400-a.dts               |   5 -
 arch/arm/boot/dts/imx6q-gw560x.dts                 |  59 ++
 arch/arm/boot/dts/imx6q.dtsi                       |   2 +-
 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-nitrogen6_max.dtsi       |   2 +-
 arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi      |   2 +-
 arch/arm/boot/dts/imx6qdl-wandboard.dtsi           |   1 +
 arch/arm/boot/dts/imx6qdl.dtsi                     |  40 +-
 arch/arm/boot/dts/imx6qp.dtsi                      |   4 +
 arch/arm/boot/dts/imx6sl.dtsi                      |   3 +
 arch/arm/boot/dts/imx6sx-nitrogen6sx.dts           |   2 +-
 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.dtsi                      |   1 +
 arch/arm/boot/dts/imx7-colibri.dtsi                |   2 +-
 arch/arm/boot/dts/imx7d-nitrogen7.dts              |   4 +-
 arch/arm/boot/dts/imx7d-pico.dts                   | 387 +++++++++++
 arch/arm/boot/dts/imx7d-sdb.dts                    |  34 +
 arch/arm/boot/dts/imx7d.dtsi                       |  37 +
 arch/arm/boot/dts/imx7s-warp.dts                   |   1 +
 arch/arm/boot/dts/imx7s.dtsi                       |  50 +-
 arch/arm/configs/imx_v6_v7_defconfig               |   3 +
 arch/arm/configs/mxs_defconfig                     |   6 +-
 arch/arm/mach-imx/Kconfig                          |   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     |  27 +-
 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  |  75 ++-
 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     |  72 +-
 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     | 109 ++-
 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 |   7 +-
 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 +++
 drivers/soc/imx/Makefile                           |   2 +-
 68 files changed, 2609 insertions(+), 79 deletions(-)
 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/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
Merging keystone/next (b45371147f9d Merge branch 'for_4.13/keystone_dts' into next)
$ git merge keystone/next
Auto-merging arch/arm/boot/dts/Makefile
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/arm/keystone/keystone.txt  |  3 ++
 arch/arm/boot/dts/Makefile                         |  3 +-
 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 +-
 5 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 arch/arm/boot/dts/keystone-k2g-ice.dts
Merging mvebu/for-next (e629b4b1c763 Merge branch 'mvebu/dt64' into mvebu/for-next)
$ git merge mvebu/for-next
Auto-merging arch/arm/boot/dts/Makefile
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                                        |   8 +-
 arch/arm/boot/dts/Makefile                         |   1 +
 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-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/configs/mvebu_v7_defconfig                |   2 +
 arch/arm64/boot/dts/marvell/armada-8040-db.dts     |  16 +
 arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts  |  23 ++
 arch/arm64/boot/dts/marvell/armada-ap806.dtsi      |   4 +
 .../boot/dts/marvell/armada-cp110-master.dtsi      |   3 +-
 .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi |   3 +-
 20 files changed, 807 insertions(+), 465 deletions(-)
 create mode 100644 arch/arm/boot/dts/armada-385-linksys-rango.dts
Merging omap/for-next (25672c8bb173 Merge branch 'omap-for-v4.13/dt' into for-next)
$ git merge omap/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/cpufreq/ti-cpufreq.txt     |  20 ++--
 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-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                  |  10 +-
 arch/arm/boot/dts/am33xx.dtsi                      |  20 ++--
 arch/arm/boot/dts/am4372.dtsi                      |  10 +-
 arch/arm/boot/dts/am437x-idk-evm.dts               |   2 +-
 arch/arm/boot/dts/am437x-sk-evm.dts                |   2 +-
 arch/arm/boot/dts/am43x-epos-evm.dts               |   2 +-
 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/dra7-evm.dts                     |   3 +-
 arch/arm/boot/dts/dra7.dtsi                        |   4 +-
 arch/arm/boot/dts/dra72-evm-common.dtsi            |   3 +-
 arch/arm/boot/dts/logicpd-torpedo-som.dtsi         |   4 +
 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           |  20 ++++
 arch/arm/boot/dts/omap4-duovero.dtsi               |   4 +
 arch/arm/boot/dts/omap4-var-som-om44.dtsi          |   2 +-
 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/mach-omap2/omap-wakeupgen.c               |  68 ++++++++++++--
 arch/arm/mach-omap2/pm.c                           |   2 +-
 arch/arm/mach-omap2/timer.c                        |  28 ++++++
 39 files changed, 368 insertions(+), 74 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 (2acb037fc42b reset: Add a Gemini reset controller)
$ git merge reset/reset/next
Merge made by the 'recursive' strategy.
 drivers/reset/Kconfig                            |   9 +-
 drivers/reset/Makefile                           |   3 +-
 drivers/reset/reset-gemini.c                     | 110 +++++++++++++++++++++++
 drivers/reset/sti/reset-syscfg.c                 |   6 +-
 include/dt-bindings/reset/cortina,gemini-reset.h |  36 ++++++++
 5 files changed, 158 insertions(+), 6 deletions(-)
 create mode 100644 drivers/reset/reset-gemini.c
 create mode 100644 include/dt-bindings/reset/cortina,gemini-reset.h
Merging qcom/for-next (bca31d5e9dcb Merge branch 'arm64-for-4.13' into all-for-4.13)
$ git merge qcom/for-next
Merge made by the 'recursive' strategy.
 .../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 +++
 .../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/arm64/boot/dts/qcom/apq8016-sbc.dtsi          |  34 ++---
 arch/arm64/boot/dts/qcom/msm8916.dtsi              |  62 ++++-----
 12 files changed, 321 insertions(+), 230 deletions(-)
Merging realtek/realtek/for-next (af5f7bdb3c04 Merge branch 'realtek/v4.12/dt64' into next)
$ git merge realtek/realtek/for-next
Auto-merging arch/arm64/Kconfig.platforms
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/arm/realtek.txt  |  20 ++++
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +
 MAINTAINERS                                        |   7 ++
 arch/arm64/Kconfig.platforms                       |   6 +
 arch/arm64/boot/dts/Makefile                       |   1 +
 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 +++++++++++++++++++++
 8 files changed, 213 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/arm/realtek.txt
 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
Merging renesas/next (bfcadd8730e0 Merge branches 'arm64-dt-for-v4.13' and 'dt-for-v4.13' into next)
$ git merge renesas/next
Auto-merging arch/arm/boot/dts/Makefile
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/arm/shmobile.txt |   2 +
 arch/arm/boot/dts/Makefile                         |   1 +
 arch/arm/boot/dts/emev2.dtsi                       |   2 +-
 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.dtsi                     |   2 +-
 arch/arm/boot/dts/r8a7778.dtsi                     |   2 +-
 arch/arm/boot/dts/r8a7779.dtsi                     |   2 +-
 arch/arm/boot/dts/r8a7790.dtsi                     |   2 +-
 arch/arm/boot/dts/r8a7791.dtsi                     |  16 +-
 arch/arm/boot/dts/r8a7793-gose.dts                 | 102 +++-
 arch/arm/boot/dts/r8a7793.dtsi                     |   5 +-
 arch/arm/boot/dts/r8a77xx-aa104xd12-panel.dtsi     |   3 +-
 arch/arm/boot/dts/r8a77xx-aa121td01-panel.dtsi     |   3 +-
 arch/arm/boot/dts/sh73a0.dtsi                      |   2 +-
 arch/arm64/boot/dts/renesas/Makefile               |   1 +
 .../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     | 344 +----------
 arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 565 ++----------------
 arch/arm64/boot/dts/renesas/r8a7795.dtsi           | 121 ++--
 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           | 409 +++++++++++++
 arch/arm64/boot/dts/renesas/salvator-x.dtsi        | 644 +++++++++++++++++++++
 arch/arm64/boot/dts/renesas/ulcb.dtsi              | 367 ++++++++++++
 include/dt-bindings/clock/r7s72100-clock.h         |   2 +
 include/dt-bindings/clock/r8a7791-clock.h          |   1 +
 include/dt-bindings/pinctrl/r7s72100-pinctrl.h     |  16 +
 30 files changed, 1951 insertions(+), 1348 deletions(-)
 create mode 100644 arch/arm/boot/dts/r7s72100-gr-peach.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/salvator-x.dtsi
 create mode 100644 arch/arm64/boot/dts/renesas/ulcb.dtsi
 create mode 100644 include/dt-bindings/pinctrl/r7s72100-pinctrl.h
Merging rockchip/for-next (7de9be9b8bfa Merge branch 'v4.13-armsoc/dts64' into for-next)
$ git merge rockchip/for-next
Auto-merging arch/arm/boot/dts/rv1108.dtsi
Auto-merging arch/arm/boot/dts/rv1108-evb.dts
Auto-merging arch/arm/boot/dts/Makefile
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/arm/rockchip.txt |   8 +-
 .../devicetree/bindings/gpu/arm,mali-midgard.txt   |  86 +++
 arch/arm/Kconfig.debug                             |  30 +
 arch/arm/boot/dts/Makefile                         |   2 +-
 arch/arm/boot/dts/rk322x.dtsi                      |  73 ++-
 arch/arm/boot/dts/rk3288-firefly.dtsi              |   5 +
 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/mach-rockchip/rockchip.c                  |   1 +
 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 ++++-
 drivers/clk/Kconfig                                |   1 +
 drivers/clk/rockchip/Kconfig                       |  39 ++
 drivers/clk/rockchip/Makefile                      |  16 +-
 drivers/clk/rockchip/clk-rk3228.c                  | 134 ++--
 drivers/clk/rockchip/clk-rk3399.c                  |   4 +-
 include/dt-bindings/clock/rk3228-cru.h             |  47 ++
 include/dt-bindings/clock/rk3399-cru.h             |   2 +
 27 files changed, 1497 insertions(+), 120 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt
 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/arm64/boot/dts/rockchip/rk3399-firefly.dts
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-op1-opp.dtsi
 create mode 100644 drivers/clk/rockchip/Kconfig
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 (64eaeaf32bc5 Merge branch 'next/defconfig' into for-next)
$ git merge samsung-krzk/for-next
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/exynos5250-arndale.dts           | 1 -
 arch/arm/boot/dts/exynos5250-smdk5250.dts          | 1 -
 arch/arm/boot/dts/exynos5250-spring.dts            | 1 -
 arch/arm/boot/dts/exynos5420-arndale-octa.dts      | 1 -
 arch/arm/boot/dts/exynos5420-peach-pit.dts         | 1 -
 arch/arm/boot/dts/exynos5420-smdk5420.dts          | 1 -
 arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 1 -
 arch/arm/boot/dts/exynos5800-peach-pi.dts          | 1 -
 arch/arm/configs/exynos_defconfig                  | 6 ++++++
 arch/arm/configs/multi_v7_defconfig                | 6 ++++++
 arch/arm64/boot/dts/exynos/exynos5433-tm2.dts      | 1 -
 11 files changed, 12 insertions(+), 9 deletions(-)
Merging sunxi/sunxi/for-next (fa13b83964f0 Merge branches 'sunxi/dt-for-4.13' and 'sunxi/clk-for-4.13' into sunxi/for-next)
$ git merge sunxi/sunxi/for-next
Removing arch/arm64/boot/dts/allwinner/sunxi-h3-h5.dtsi
Auto-merging arch/arm/boot/dts/Makefile
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/clock/sun8i-de2.txt        |  31 +
 .../devicetree/bindings/clock/sunxi-ccu.txt        |   5 +-
 arch/arm/boot/dts/Makefile                         |   3 +-
 arch/arm/boot/dts/axp209.dtsi                      |   5 +
 arch/arm/boot/dts/axp22x.dtsi                      |   5 +
 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                       |   1 +
 arch/arm/boot/dts/sun6i-a31-hummingbird.dts        |  10 +-
 arch/arm/boot/dts/sun6i-a31.dtsi                   | 169 +++-
 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                   |   6 -
 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                  |  80 +-
 arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts  |  13 +
 arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts    |  24 +-
 arch/arm/boot/dts/sun8i-h3-orangepi-2.dts          |  13 +-
 arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts         |  22 +-
 arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts |  96 +++
 arch/arm/boot/dts/sun8i-v3s.dtsi                   | 100 ++-
 arch/arm/boot/dts/sunxi-common-regulators.dtsi     |  30 -
 arch/arm/boot/dts/sunxi-h3-h5.dtsi                 |   2 +-
 arch/arm64/boot/dts/allwinner/Makefile             |   2 +
 .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts |  41 +
 arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi      |  61 ++
 .../boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts   | 134 +++
 .../dts/allwinner/sun50i-h5-orangepi-prime.dts     | 205 +++++
 arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi       |   2 +-
 arch/arm64/boot/dts/allwinner/sunxi-h3-h5.dtsi     |   1 -
 drivers/clk/clk-divider.c                          |  19 +-
 drivers/clk/sunxi-ng/Kconfig                       |  18 +
 drivers/clk/sunxi-ng/Makefile                      |   2 +
 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               |  12 +-
 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               |  12 +-
 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 +-
 108 files changed, 3070 insertions(+), 373 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/clock/sun8i-de2.txt
 create mode 100644 arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts
 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
 delete mode 120000 arch/arm64/boot/dts/allwinner/sunxi-h3-h5.dtsi
 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 (29d04525797f Merge branch for-4.12/clk into for-next)
$ git merge tegra/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging arm64/for-next/core (db46a72b9713 ARM64/PCI: Set root bus NUMA node on ACPI systems)
$ git merge arm64/for-next/core
Merge made by the 'recursive' strategy.
 arch/arm64/include/asm/elf.h        | 6 ++++++
 arch/arm64/include/asm/futex.h      | 8 ++++----
 arch/arm64/include/asm/stacktrace.h | 1 +
 arch/arm64/kernel/cpufeature.c      | 4 ++--
 arch/arm64/kernel/pci.c             | 3 +++
 arch/arm64/kernel/probes/kprobes.c  | 4 ++--
 arch/arm64/kernel/process.c         | 1 +
 arch/arm64/kernel/setup.c           | 3 +++
 arch/arm64/kernel/traps.c           | 4 +---
 arch/arm64/mm/fault.c               | 2 +-
 arch/arm64/mm/mmu.c                 | 1 +
 11 files changed, 25 insertions(+), 12 deletions(-)
Merging clk/clk-next (658a7568030e Merge tag 'meson-clk-fixes-for-4.12-rc2' of git://github.com/baylibre/clk-meson into clk-fixes)
$ git merge clk/clk-next
Merge made by the 'recursive' strategy.
 drivers/clk/meson/Kconfig        | 1 +
 drivers/clk/sunxi-ng/ccu-sun5i.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
$ git merge c6x/for-linux-next
Already up-to-date.
Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE))
$ git merge cris/for-next
Already up-to-date.
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
$ git merge h8300/h8300-next
Merge made by the 'recursive' strategy.
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
$ git merge hexagon/linux-next
Already up-to-date.
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
$ git merge ia64/next
Already up-to-date.
Merging m68k/for-next (1072734a2c63 m68k/defconfig: Update defconfigs for v4.12-rc1)
$ git merge m68k/for-next
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 ++-
 drivers/nubus/nubus.c                | 125 +++--------------------------------
 13 files changed, 95 insertions(+), 126 deletions(-)
Merging m68knommu/for-next (5ed02dbb4974 Linux 4.12-rc3)
$ git merge m68knommu/for-next
Already up-to-date.
Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment)
$ git merge metag/for-next
Already up-to-date.
Merging microblaze/next (83f0124ad81e microblaze: remove asm-generic wrapper headers)
$ 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/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/syscall_table.S          |  1 +
 arch/microblaze/kernel/timer.c                  |  2 ++
 50 files changed, 50 insertions(+), 53 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 (bc53f9c58065 Merge branch '4.12-fixes' into mips-for-linux-next)
$ git merge mips/mips-for-linux-next
Merge made by the 'recursive' strategy.
 arch/mips/Kconfig                    | 98 ++++++++++++++++++------------------
 arch/mips/include/asm/highmem.h      |  5 ++
 arch/mips/include/asm/pgtable-32.h   |  7 ++-
 arch/mips/kernel/ftrace.c            | 24 ++-------
 arch/mips/kernel/perf_event_mipsxx.c |  6 ++-
 arch/mips/mm/pgtable-32.c            |  6 +--
 6 files changed, 73 insertions(+), 73 deletions(-)
Merging nios2/for-next (e118c3fec9c0 nios2: remove custom early console implementation)
$ git merge nios2/for-next
Already up-to-date.
Merging openrisc/for-next (8d797f3169d1 openrisc: explicitly include linux/bug.h in asm/fixmap.h)
$ git merge openrisc/for-next
Auto-merging arch/openrisc/kernel/process.c
Merge made by the 'recursive' strategy.
 arch/openrisc/configs/or1ksim_defconfig | 2 +-
 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(+), 4 deletions(-)
Merging parisc-hd/for-next (5aa2aabff1ce parisc: Stop CPUs via PAT firmware before system halt or reboot.)
$ git merge parisc-hd/for-next
Merge made by the 'recursive' strategy.
 arch/parisc/include/asm/pdc.h       |  18 +++++
 arch/parisc/include/asm/pdcpat.h    |  36 ++++++---
 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       | 130 ++++++++++++++++++++++++++++++++
 arch/parisc/kernel/inventory.c      |   9 +++
 arch/parisc/kernel/pdt.c            | 143 ++++++++++++++++++++++++++++++++++++
 arch/parisc/kernel/process.c        |  18 ++++-
 arch/parisc/kernel/processor.c      |   5 +-
 arch/parisc/kernel/smp.c            |   3 +
 arch/parisc/kernel/time.c           |  24 +++++-
 arch/parisc/lib/lusercopy.S         |  25 +++----
 arch/parisc/mm/fault.c              |   9 ---
 arch/parisc/mm/init.c               |   3 +
 18 files changed, 393 insertions(+), 65 deletions(-)
 create mode 100644 arch/parisc/kernel/pdt.c
Merging powerpc/next (83a092cf95f2 powerpc: Link warning for orphan sections)
$ git merge powerpc/next
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
Merge made by the 'recursive' strategy.
 arch/powerpc/Kconfig                           |  12 +
 arch/powerpc/Makefile                          |  11 +
 arch/powerpc/Makefile.postlink                 |  17 +-
 arch/powerpc/boot/Makefile                     |   5 +-
 arch/powerpc/boot/crtsavres.S                  |   8 +-
 arch/powerpc/boot/dts/fsp2.dts                 | 608 +++++++++++++++++++++++++
 arch/powerpc/boot/dts/sequoia.dts              |   2 +-
 arch/powerpc/boot/ppc_asm.h                    |  12 +-
 arch/powerpc/configs/44x/fsp2_defconfig        | 126 +++++
 arch/powerpc/include/asm/head-64.h             |  22 +-
 arch/powerpc/include/asm/paca.h                |   2 +
 arch/powerpc/include/asm/ppc_asm.h             |  11 +-
 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/asm-offsets.c              |   1 +
 arch/powerpc/kernel/idle_book3s.S              |  33 +-
 arch/powerpc/kernel/time.c                     |  14 +-
 arch/powerpc/kernel/vmlinux.lds.S              |  51 ++-
 arch/powerpc/lib/Makefile                      |  13 +-
 arch/powerpc/lib/copyuser_power7.S             |   4 +-
 arch/powerpc/lib/crtsavres.S                   |   6 +-
 arch/powerpc/platforms/44x/Kconfig             |  12 +
 arch/powerpc/platforms/44x/Makefile            |   1 +
 arch/powerpc/platforms/44x/fsp2.c              |  62 +++
 arch/powerpc/platforms/powernv/idle.c          | 114 +++--
 arch/powerpc/platforms/powernv/opal-wrappers.S |   6 +-
 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              |  16 +-
 include/asm-generic/vmlinux.lds.h              |  12 +
 35 files changed, 1214 insertions(+), 145 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/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 (5a4356351194 s390/facilities: remove stfle requirement)
$ git merge s390/features
Removing drivers/s390/block/scm_blk_cluster.c
Removing arch/s390/include/asm/fb.h
Removing arch/s390/include/asm/device.h
Merge made by the 'recursive' strategy.
 arch/s390/Kconfig                     |   2 +-
 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/fb.h            |  12 --
 arch/s390/include/asm/page.h          |   3 +
 arch/s390/include/asm/pgalloc.h       |  25 +++-
 arch/s390/include/asm/pgtable.h       |  80 +++++++++--
 arch/s390/include/asm/processor.h     |   4 +-
 arch/s390/include/asm/sigp.h          |   2 +-
 arch/s390/include/asm/tlb.h           |  15 ++
 arch/s390/kernel/entry.S              |  19 ++-
 arch/s390/kernel/smp.c                |   3 +
 arch/s390/kernel/traps.c              |   1 +
 arch/s390/kernel/vdso.c               |  91 ++++++++----
 arch/s390/kernel/vtime.c              |  14 +-
 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/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/tools/gen_facilities.c      |   2 -
 drivers/crypto/Kconfig                |  15 +-
 drivers/s390/block/Kconfig            |   7 -
 drivers/s390/block/Makefile           |   3 -
 drivers/s390/block/dasd_devmap.c      |  47 ++++---
 drivers/s390/block/scm_blk.c          | 252 +++++++++++++++------------------
 drivers/s390/block/scm_blk.h          |  60 +-------
 drivers/s390/block/scm_blk_cluster.c  | 255 ----------------------------------
 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 +-
 41 files changed, 581 insertions(+), 747 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 (60925ee97e2b Merge branch 'sparc64-queued-locks')
$ 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/qrwlock.h        |   7 ++
 arch/sparc/include/asm/qspinlock.h      |   7 ++
 arch/sparc/include/asm/spinlock_64.h    | 208 +-------------------------------
 arch/sparc/include/asm/spinlock_types.h |  12 +-
 kernel/locking/qrwlock.c                |   1 +
 7 files changed, 97 insertions(+), 219 deletions(-)
 create mode 100644 arch/sparc/include/asm/qrwlock.h
 create mode 100644 arch/sparc/include/asm/qspinlock.h
Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
$ git merge sh/for-next
Already up-to-date.
Merging tile/master (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 (6fad04b7585d 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 (6f9d696f016f fscrypt: correct collision claim for digested names)
$ git merge fscrypt/master
Already up-to-date.
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 (feb4f5b15cea Merge branch 'for-next-next-v4.13-20170529' into for-next-20170529)
$ git merge btrfs-kdave/for-next
Merge made by the 'recursive' strategy.
 fs/btrfs/check-integrity.c       |  35 ++--
 fs/btrfs/compression.c           |  61 +-----
 fs/btrfs/compression.h           |  44 +++-
 fs/btrfs/ctree.c                 |  40 ++--
 fs/btrfs/ctree.h                 |  33 +--
 fs/btrfs/dir-item.c              |   2 +-
 fs/btrfs/disk-io.c               | 133 ++++++++----
 fs/btrfs/disk-io.h               |   8 +-
 fs/btrfs/extent-tree.c           | 334 ++++++++++++++---------------
 fs/btrfs/extent_io.c             | 263 ++++++++++++++++-------
 fs/btrfs/extent_io.h             |  74 +++++--
 fs/btrfs/file-item.c             |  31 ++-
 fs/btrfs/file.c                  |  41 ++--
 fs/btrfs/free-space-tree.c       |  35 +---
 fs/btrfs/inode-map.c             |   4 +-
 fs/btrfs/inode.c                 | 438 +++++++++++++++++++++++----------------
 fs/btrfs/ioctl.c                 |  12 +-
 fs/btrfs/lzo.c                   |  13 +-
 fs/btrfs/print-tree.c            |   7 +-
 fs/btrfs/qgroup.c                | 220 ++++++++++++++------
 fs/btrfs/qgroup.h                |   8 +-
 fs/btrfs/reada.c                 |   1 -
 fs/btrfs/relocation.c            |  15 +-
 fs/btrfs/scrub.c                 | 163 ++++++---------
 fs/btrfs/send.c                  |   8 -
 fs/btrfs/super.c                 |   3 +-
 fs/btrfs/sysfs.c                 |  41 ++++
 fs/btrfs/tests/extent-io-tests.c |   2 +-
 fs/btrfs/transaction.c           |  20 +-
 fs/btrfs/volumes.c               |  31 +--
 fs/btrfs/volumes.h               |   2 +
 fs/btrfs/zlib.c                  |  10 +-
 include/trace/events/btrfs.h     |  36 ----
 33 files changed, 1239 insertions(+), 929 deletions(-)
Merging ceph/master (6ac56951dc10 rbd: implement REQ_OP_WRITE_ZEROES)
$ git merge ceph/master
Merge made by the 'recursive' strategy.
 drivers/block/rbd.c | 2 ++
 1 file changed, 2 insertions(+)
Merging cifs/for-next (a95cfad947d5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge cifs/for-next
Already up-to-date.
Merging configfs/for-next (e16769d4bca6 fs: configfs: don't return anything from drop_link)
$ git merge configfs/for-next
Already up-to-date.
Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
$ git merge ecryptfs/next
Auto-merging fs/ecryptfs/main.c
Auto-merging fs/ecryptfs/ecryptfs_kernel.h
Merge made by the 'recursive' strategy.
 fs/ecryptfs/crypto.c          | 15 ---------------
 fs/ecryptfs/ecryptfs_kernel.h |  9 ++++++++-
 fs/ecryptfs/keystore.c        |  2 +-
 fs/ecryptfs/main.c            |  2 +-
 fs/ecryptfs/miscdev.c         |  2 +-
 5 files changed, 11 insertions(+), 19 deletions(-)
Merging ext3/for_next (d8747d642ec4 reiserfs: Make flush bios explicitely sync)
$ git merge ext3/for_next
Merge made by the 'recursive' strategy.
 fs/gfs2/log.c         | 2 +-
 fs/reiserfs/journal.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
Merging ext4/dev (67a7d5f561f4 ext4: fix fdatasync(2) after extent manipulation operations)
$ git merge ext4/dev
Merge made by the 'recursive' strategy.
 fs/ext4/acl.c            |  4 +++
 fs/ext4/ext4.h           |  2 --
 fs/ext4/extents.c        | 85 ++++++++++++++++++++++++------------------------
 fs/ext4/file.c           | 54 +++++++++---------------------
 fs/ext4/inline.c         |  5 ++-
 fs/ext4/inode.c          | 30 ++++++++++++-----
 fs/ext4/mballoc.c        | 23 ++++++++-----
 fs/ext4/namei.c          | 13 +++-----
 fs/ext4/super.c          | 17 +++++-----
 fs/ext4/xattr.c          |  8 +++++
 fs/jbd2/transaction.c    |  6 ++++
 fs/quota/dquot.c         | 16 +++++++++
 include/linux/quotaops.h |  6 ++++
 13 files changed, 149 insertions(+), 120 deletions(-)
Merging f2fs/dev (2d3e4866dea9 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
$ git merge f2fs/dev
Already up-to-date.
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 (0b6e9ea041e6 fuse: Add support for pid namespaces)
$ git merge fuse/for-next
Already up-to-date.
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 (76b2a303384e pNFS/flexfiles: Always attempt to call layoutstats when flexfiles is enabled)
$ git merge nfs/linux-next
Already up-to-date.
Merging nfsd/nfsd-next (b26b78cb7260 nfsd: Fix up the "supattr_exclcreat" attributes)
$ git merge nfsd/nfsd-next
Already up-to-date.
Merging orangefs/for-next (2f713b5c7d2a orangefs: count directory pieces correctly)
$ git merge orangefs/for-next
Already up-to-date.
Merging overlayfs/overlayfs-next (a082c6f680da ovl: filter trusted xattr for non-admin)
$ git merge overlayfs/overlayfs-next
Merge made by the 'recursive' strategy.
 fs/overlayfs/Kconfig     |  1 +
 fs/overlayfs/copy_up.c   | 24 +++++++++++-----
 fs/overlayfs/dir.c       | 61 ++++++++++++++++++++++++++++++----------
 fs/overlayfs/inode.c     | 12 +++++++-
 fs/overlayfs/namei.c     | 16 ++++-------
 fs/overlayfs/overlayfs.h | 16 +++++++++--
 fs/overlayfs/ovl_entry.h |  2 ++
 fs/overlayfs/super.c     | 18 +++++++++++-
 fs/overlayfs/util.c      | 72 ++++++++++++++++++++++++++++++++++++++++++------
 9 files changed, 178 insertions(+), 44 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 (161f55efba5d xfs: fix use-after-free in xfs_finish_page_writeback)
$ git merge xfs/for-next
Already up-to-date.
Merging file-locks/linux-next (b0756441db3a fs/locks: don't mess with the address limit in compat_fcntl64)
$ git merge file-locks/linux-next
Merge made by the 'recursive' strategy.
 fs/fcntl.c         | 145 ++++++++++++++++++++++++++++++++---------------------
 fs/locks.c         |  97 +++++++++++------------------------
 include/linux/fs.h |   8 +--
 3 files changed, 123 insertions(+), 127 deletions(-)
Merging vfs/for-next (919bb328b020 Merge branch 'work.misc' into for-next)
$ git merge vfs/for-next
Auto-merging fs/stat.c
Auto-merging fs/namei.c
Merge made by the 'recursive' strategy.
 fs/namei.c                 | 56 ++++++++++++++++++++++++++++++++++------------
 fs/stat.c                  |  4 +++-
 include/linux/namei.h      |  2 ++
 include/uapi/linux/fcntl.h |  1 +
 4 files changed, 48 insertions(+), 15 deletions(-)
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
$ git merge vfs-jk/vfs
Already up-to-date.
Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync())
$ git merge vfs-miklos/next
Already up-to-date.
Merging printk/for-next (719f6a7040f1 printk: Use the main logbuf in NMI when logbuf_lock is available)
$ git merge printk/for-next
Auto-merging kernel/printk/printk.c
Merge made by the 'recursive' strategy.
 kernel/printk/internal.h    |  6 ++++--
 kernel/printk/printk.c      | 19 ++++++++++++++-----
 kernel/printk/printk_safe.c | 26 ++++++++++++++++++++++++--
 lib/nmi_backtrace.c         |  3 +++
 4 files changed, 45 insertions(+), 9 deletions(-)
Merging pci/next (c823e5b95885 Merge branch 'pci/host-xilinx' into next)
$ git merge pci/next
Auto-merging drivers/pci/pci.c
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/pci/faraday,ftpci100.txt   |   7 +
 .../bindings/pci/mediatek,mt7623-pcie.txt          | 130 +++++
 .../devicetree/bindings/pci/qcom,pcie.txt          |  20 +-
 .../asm/mach-loongson64/cs5536/cs5536_pci.h        |   1 -
 arch/mips/include/asm/pci.h                        |   1 -
 arch/mips/pci/pci-legacy.c                         |   3 +-
 arch/x86/pci/pcbios.c                              |   2 +-
 drivers/pci/dwc/Kconfig                            |   1 +
 drivers/pci/dwc/pcie-qcom.c                        | 422 +++++++++++++---
 drivers/pci/host/Kconfig                           |  11 +
 drivers/pci/host/Makefile                          |   1 +
 drivers/pci/host/pci-ftpci100.c                    |  56 +++
 drivers/pci/host/pci-tegra.c                       |  33 +-
 drivers/pci/host/pcie-mediatek.c                   | 552 +++++++++++++++++++++
 drivers/pci/host/pcie-xilinx-nwl.c                 |  45 +-
 drivers/pci/pci-label.c                            |   7 +-
 drivers/pci/pci.c                                  |   2 +-
 drivers/pci/pcie/pcie-dpc.c                        |   4 +-
 drivers/pci/quirks.c                               |   2 +-
 drivers/video/fbdev/efifb.c                        |   2 +-
 20 files changed, 1218 insertions(+), 84 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/pci/mediatek,mt7623-pcie.txt
 create mode 100644 drivers/pci/host/pcie-mediatek.c
Merging pstore/for-next/pstore (2f8771861d5f pstore: Don't warn if data is uncompressed and type is not PSTORE_TYPE_DMESG)
$ git merge pstore/for-next/pstore
Merge made by the 'recursive' strategy.
 fs/pstore/platform.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
Merging hid/for-next (698be82b960a Merge branch 'for-4.13/ish' into for-next)
$ git merge hid/for-next
Merge made by the 'recursive' strategy.
 drivers/hid/Kconfig                            |  13 +-
 drivers/hid/Makefile                           |   1 +
 drivers/hid/hid-asus.c                         |  10 ++
 drivers/hid/hid-core.c                         |   4 +
 drivers/hid/hid-elecom.c                       |  62 ++++++-
 drivers/hid/hid-ids.h                          |   4 +
 drivers/hid/hid-input.c                        |   9 +
 drivers/hid/hid-ite.c                          |  56 ++++++
 drivers/hid/hid-magicmouse.c                   |  15 +-
 drivers/hid/i2c-hid/i2c-hid.c                  |   2 +-
 drivers/hid/intel-ish-hid/Kconfig              |   2 +-
 drivers/hid/intel-ish-hid/ipc/ipc.c            |  15 +-
 drivers/hid/intel-ish-hid/ishtp-hid-client.c   |   5 +-
 drivers/hid/intel-ish-hid/ishtp/client.c       |  49 +++--
 drivers/hid/intel-ish-hid/ishtp/client.h       |   6 +-
 drivers/hid/intel-ish-hid/ishtp/hbm.c          |  11 +-
 drivers/hid/wacom.h                            |   1 +
 drivers/hid/wacom_sys.c                        |   4 +-
 drivers/hid/wacom_wac.c                        | 237 +++++++++++++++----------
 drivers/hid/wacom_wac.h                        |   7 +
 include/linux/hid.h                            |   9 +
 include/linux/{i2c => platform_data}/i2c-hid.h |   0
 22 files changed, 351 insertions(+), 171 deletions(-)
 create mode 100644 drivers/hid/hid-ite.c
 rename include/linux/{i2c => platform_data}/i2c-hid.h (100%)
Merging i2c/i2c/for-next (e2c824924cdb i2c: designware: Fix bogus sda_hold_time due to uninitialized vars)
$ git merge i2c/i2c/for-next
Already up-to-date.
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge jdelvare-hwmon/master
Already up-to-date.
Merging dmi/master (b3398adc0da6 firmware: dmi_scan: Look for SMBIOS 3 entry point first)
$ git merge dmi/master
Auto-merging drivers/firmware/dmi_scan.c
Merge made by the 'recursive' strategy.
 drivers/firmware/dmi_scan.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)
Merging hwmon-staging/hwmon-next (9a7967c91695 hwmon: (ibmpowernv) Add highest/lowest attributes to sensors)
$ git merge hwmon-staging/hwmon-next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 Documentation/hwmon/ads1015                    |   2 +-
 Documentation/hwmon/adt7475                    |   9 +
 Documentation/hwmon/ir35221                    |  87 +++++++
 Documentation/hwmon/ltc4245                    |   2 +-
 Documentation/hwmon/pmbus-core                 |   2 +-
 MAINTAINERS                                    |   4 +-
 drivers/hwmon/Kconfig                          |   1 +
 drivers/hwmon/ads1015.c                        |   2 +-
 drivers/hwmon/adt7475.c                        | 184 +++++++++++---
 drivers/hwmon/aspeed-pwm-tacho.c               |  12 +-
 drivers/hwmon/ds620.c                          |   2 +-
 drivers/hwmon/ibmpowernv.c                     |  68 ++++-
 drivers/hwmon/ltc4245.c                        |   2 +-
 drivers/hwmon/max6639.c                        |   2 +-
 drivers/hwmon/nct6775.c                        | 325 ++++++++++++++++--------
 drivers/hwmon/pmbus/Kconfig                    |  10 +
 drivers/hwmon/pmbus/Makefile                   |   1 +
 drivers/hwmon/pmbus/ir35221.c                  | 337 +++++++++++++++++++++++++
 drivers/hwmon/pmbus/pmbus.c                    |   2 +-
 drivers/hwmon/pmbus/pmbus_core.c               |   2 +-
 drivers/hwmon/pmbus/ucd9000.c                  |   2 +-
 drivers/hwmon/pmbus/ucd9200.c                  |   2 +-
 drivers/iio/adc/ti-ads1015.c                   |   2 +-
 include/linux/{i2c => platform_data}/ads1015.h |   0
 include/linux/{i2c => platform_data}/ds620.h   |   0
 include/linux/{i2c => platform_data}/ltc4245.h |   0
 include/linux/{i2c => platform_data}/max6639.h |   0
 include/linux/{i2c => }/pmbus.h                |   0
 28 files changed, 901 insertions(+), 161 deletions(-)
 create mode 100644 Documentation/hwmon/ir35221
 create mode 100644 drivers/hwmon/pmbus/ir35221.c
 rename include/linux/{i2c => platform_data}/ads1015.h (100%)
 rename include/linux/{i2c => platform_data}/ds620.h (100%)
 rename include/linux/{i2c => platform_data}/ltc4245.h (100%)
 rename include/linux/{i2c => platform_data}/max6639.h (100%)
 rename include/linux/{i2c => }/pmbus.h (100%)
Merging jc_docs/docs-next (6312811be26f Merge remote-tracking branch 'mauro-exp/docbook3' into death-to-docbook)
$ git merge jc_docs/docs-next
Removing scripts/check-lc_ctype.c
Auto-merging net/core/sock.c
Auto-merging kernel/irq/chip.c
Auto-merging include/linux/netdevice.h
Auto-merging fs/namei.c
Auto-merging fs/jbd2/transaction.c
Auto-merging drivers/mtd/nand/nand_base.c
Auto-merging Makefile
Auto-merging MAINTAINERS
Auto-merging Documentation/userspace-api/seccomp_filter.rst
Auto-merging Documentation/userspace-api/no_new_privs.rst
Removing Documentation/sphinx/tmplcvt
Auto-merging Documentation/security/self-protection.rst
Auto-merging Documentation/security/keys/trusted-encrypted.rst
Auto-merging Documentation/security/keys/request-key.rst
Auto-merging Documentation/security/keys/ecryptfs.rst
Auto-merging Documentation/security/keys/core.rst
Auto-merging Documentation/security/credentials.rst
Removing Documentation/security/conf.py
Auto-merging Documentation/security/IMA-templates.rst
Removing Documentation/security/00-INDEX
Removing Documentation/doc-guide/docbook.rst
Auto-merging Documentation/admin-guide/LSM/tomoyo.rst
Auto-merging Documentation/admin-guide/LSM/index.rst
Auto-merging Documentation/admin-guide/LSM/apparmor.rst
Auto-merging Documentation/admin-guide/LSM/Yama.rst
Auto-merging Documentation/admin-guide/LSM/Smack.rst
Auto-merging Documentation/admin-guide/LSM/SELinux.rst
Auto-merging Documentation/admin-guide/LSM/LoadPin.rst
Removing Documentation/Makefile.sphinx
Removing Documentation/DocBook/z8530book.tmpl
Removing Documentation/DocBook/w1.tmpl
Removing Documentation/DocBook/stylesheet.xsl
Removing Documentation/DocBook/sh.tmpl
Removing Documentation/DocBook/scsi.tmpl
Removing Documentation/DocBook/s390-drivers.tmpl
Removing Documentation/DocBook/rapidio.tmpl
Removing Documentation/DocBook/networking.tmpl
Removing Documentation/DocBook/mtdnand.tmpl
Removing Documentation/DocBook/lsm.tmpl
Removing Documentation/DocBook/librs.tmpl
Removing Documentation/DocBook/libata.tmpl
Removing Documentation/DocBook/kgdb.tmpl
Removing Documentation/DocBook/kernel-locking.tmpl
Removing Documentation/DocBook/kernel-hacking.tmpl
Removing Documentation/DocBook/filesystems.tmpl
Removing Documentation/DocBook/Makefile
Removing Documentation/DocBook/.gitignore
Merge made by the 'recursive' strategy.
 Documentation/00-INDEX                             |    6 +-
 Documentation/DocBook/.gitignore                   |   17 -
 Documentation/DocBook/Makefile                     |  282 ---
 Documentation/DocBook/filesystems.tmpl             |  381 ----
 Documentation/DocBook/kernel-hacking.tmpl          | 1312 ------------
 Documentation/DocBook/kernel-locking.tmpl          | 2151 --------------------
 Documentation/DocBook/kgdb.tmpl                    |  918 ---------
 Documentation/DocBook/libata.tmpl                  | 1625 ---------------
 Documentation/DocBook/librs.tmpl                   |  289 ---
 Documentation/DocBook/lsm.tmpl                     |  265 ---
 Documentation/DocBook/mtdnand.tmpl                 | 1291 ------------
 Documentation/DocBook/networking.tmpl              |  111 -
 Documentation/DocBook/rapidio.tmpl                 |  155 --
 Documentation/DocBook/s390-drivers.tmpl            |  161 --
 Documentation/DocBook/scsi.tmpl                    |  409 ----
 Documentation/DocBook/sh.tmpl                      |  105 -
 Documentation/DocBook/stylesheet.xsl               |   11 -
 Documentation/DocBook/w1.tmpl                      |  101 -
 Documentation/DocBook/z8530book.tmpl               |  371 ----
 Documentation/Makefile                             |  125 ++
 Documentation/Makefile.sphinx                      |  130 --
 Documentation/PCI/MSI-HOWTO.txt                    |    2 +-
 .../LoadPin.txt => admin-guide/LSM/LoadPin.rst}    |   12 +-
 .../SELinux.txt => admin-guide/LSM/SELinux.rst}    |   18 +-
 .../Smack.txt => admin-guide/LSM/Smack.rst}        |  273 ++-
 .../Yama.txt => admin-guide/LSM/Yama.rst}          |   55 +-
 .../apparmor.txt => admin-guide/LSM/apparmor.rst}  |   36 +-
 .../LSM.txt => admin-guide/LSM/index.rst}          |   28 +-
 .../tomoyo.txt => admin-guide/LSM/tomoyo.rst}      |   22 +-
 Documentation/admin-guide/README.rst               |    6 -
 Documentation/admin-guide/index.rst                |    1 +
 Documentation/conf.py                              |   35 +-
 Documentation/core-api/assoc_array.rst             |    5 +-
 Documentation/core-api/index.rst                   |    1 +
 Documentation/core-api/librs.rst                   |  212 ++
 Documentation/crypto/asymmetric-keys.txt           |    2 +-
 Documentation/crypto/conf.py                       |   10 +
 Documentation/dev-tools/index.rst                  |    1 +
 Documentation/dev-tools/kgdb.rst                   |  907 +++++++++
 Documentation/doc-guide/docbook.rst                |   90 -
 Documentation/doc-guide/index.rst                  |    1 -
 Documentation/doc-guide/kernel-doc.rst             |   10 +
 Documentation/doc-guide/sphinx.rst                 |    5 -
 Documentation/driver-api/index.rst                 |    6 +
 Documentation/driver-api/libata.rst                | 1031 ++++++++++
 Documentation/driver-api/mtdnand.rst               | 1007 +++++++++
 Documentation/driver-api/rapidio.rst               |  107 +
 Documentation/driver-api/s390-drivers.rst          |  111 +
 Documentation/driver-api/scsi.rst                  |  344 ++++
 Documentation/driver-api/w1.rst                    |   70 +
 Documentation/fb/api.txt                           |    4 +-
 Documentation/filesystems/conf.py                  |   10 +
 Documentation/filesystems/index.rst                |  317 +++
 Documentation/filesystems/nfs/idmapper.txt         |    2 +-
 Documentation/gpu/todo.rst                         |    2 +-
 Documentation/index.rst                            |   14 +
 Documentation/kbuild/makefiles.txt                 |    2 +-
 Documentation/kernel-doc-nano-HOWTO.txt            |   65 +-
 Documentation/kernel-hacking/conf.py               |   10 +
 Documentation/kernel-hacking/hacking.rst           |  811 ++++++++
 Documentation/kernel-hacking/index.rst             |    9 +
 Documentation/kernel-hacking/locking.rst           | 1446 +++++++++++++
 Documentation/lsm.txt                              |  201 ++
 Documentation/networking/conf.py                   |   10 +
 Documentation/networking/dns_resolver.txt          |    2 +-
 Documentation/networking/index.rst                 |   18 +
 Documentation/networking/kapi.rst                  |  147 ++
 Documentation/networking/z8530book.rst             |  256 +++
 Documentation/process/changes.rst                  |   26 +-
 Documentation/process/howto.rst                    |    8 -
 Documentation/process/kernel-docs.rst              |   34 +-
 Documentation/security/00-INDEX                    |   26 -
 .../{IMA-templates.txt => IMA-templates.rst}       |   46 +-
 Documentation/security/LSM.rst                     |   14 +
 Documentation/security/conf.py                     |    8 -
 .../security/{credentials.txt => credentials.rst}  |  275 ++-
 Documentation/security/index.rst                   |    8 +-
 Documentation/security/{keys.txt => keys/core.rst} |  314 ++-
 .../{keys-ecryptfs.txt => keys/ecryptfs.rst}       |   19 +-
 Documentation/security/keys/index.rst              |   11 +
 .../{keys-request-key.txt => keys/request-key.rst} |   73 +-
 .../trusted-encrypted.rst}                         |   32 +-
 .../{self-protection.txt => self-protection.rst}   |   99 +-
 Documentation/sh/conf.py                           |   10 +
 Documentation/sh/index.rst                         |   59 +
 Documentation/sound/conf.py                        |   10 +
 Documentation/sphinx/tmplcvt                       |   28 -
 Documentation/translations/ja_JP/howto.rst         |    7 -
 Documentation/translations/ko_KR/howto.rst         |    7 -
 Documentation/userspace-api/index.rst              |    2 +
 .../no_new_privs.rst}                              |   44 +-
 .../seccomp_filter.rst}                            |  116 +-
 Documentation/userspace-api/unshare.rst            |    2 +-
 MAINTAINERS                                        |   18 +-
 Makefile                                           |   11 +-
 arch/ia64/include/asm/io.h                         |    2 +-
 arch/ia64/sn/kernel/iomv.c                         |    2 +-
 drivers/ata/acard-ahci.c                           |    2 +-
 drivers/ata/ahci.c                                 |    2 +-
 drivers/ata/ahci.h                                 |    2 +-
 drivers/ata/ata_piix.c                             |    2 +-
 drivers/ata/libahci.c                              |    2 +-
 drivers/ata/libata-core.c                          |    2 +-
 drivers/ata/libata-eh.c                            |    2 +-
 drivers/ata/libata-scsi.c                          |    9 +-
 drivers/ata/libata-sff.c                           |    2 +-
 drivers/ata/libata.h                               |    2 +-
 drivers/ata/pata_pdc2027x.c                        |    2 +-
 drivers/ata/pdc_adma.c                             |    2 +-
 drivers/ata/sata_nv.c                              |    2 +-
 drivers/ata/sata_promise.c                         |    2 +-
 drivers/ata/sata_promise.h                         |    2 +-
 drivers/ata/sata_qstor.c                           |    2 +-
 drivers/ata/sata_sil.c                             |    2 +-
 drivers/ata/sata_sis.c                             |    2 +-
 drivers/ata/sata_svw.c                             |    2 +-
 drivers/ata/sata_sx4.c                             |    2 +-
 drivers/ata/sata_uli.c                             |    2 +-
 drivers/ata/sata_via.c                             |    2 +-
 drivers/ata/sata_vsc.c                             |    2 +-
 drivers/mtd/nand/nand_base.c                       |    7 +-
 drivers/net/phy/phy.c                              |    1 +
 drivers/scsi/qla1280.c                             |    2 +-
 drivers/scsi/scsi_scan.c                           |    7 +-
 drivers/scsi/scsi_transport_fc.c                   |   18 +-
 drivers/scsi/scsicam.c                             |    4 +-
 drivers/usb/gadget/Kconfig                         |    2 +-
 fs/debugfs/file.c                                  |    2 +-
 fs/debugfs/inode.c                                 |    2 +-
 fs/eventfd.c                                       |    4 +-
 fs/fs-writeback.c                                  |   12 +-
 fs/jbd2/transaction.c                              |   42 +-
 fs/mpage.c                                         |    1 +
 fs/namei.c                                         |    1 +
 include/linux/ata.h                                |    2 +-
 include/linux/cred.h                               |    2 +-
 include/linux/debugfs.h                            |    2 +-
 include/linux/key.h                                |    2 +-
 include/linux/libata.h                             |    2 +-
 include/linux/lsm_hooks.h                          |   25 +-
 include/linux/mtd/nand.h                           |    2 +-
 include/linux/mutex.h                              |    6 +-
 include/linux/netdevice.h                          |    9 +-
 include/linux/skbuff.h                             |    2 +-
 include/net/sock.h                                 |    9 +-
 kernel/cred.c                                      |    2 +-
 kernel/futex.c                                     |   40 +-
 kernel/irq/chip.c                                  |    2 +-
 kernel/irq/handle.c                                |    2 +-
 kernel/irq/irqdesc.c                               |    2 +-
 kernel/locking/mutex.c                             |    6 +-
 lib/Kconfig.debug                                  |    2 +-
 lib/Kconfig.kgdb                                   |    2 +-
 net/core/datagram.c                                |    2 +-
 net/core/sock.c                                    |    7 +-
 scripts/Makefile                                   |    9 +-
 scripts/check-lc_ctype.c                           |   11 -
 scripts/selinux/README                             |    2 +-
 security/apparmor/match.c                          |    2 +-
 security/apparmor/policy_unpack.c                  |    2 +-
 security/keys/encrypted-keys/encrypted.c           |    2 +-
 security/keys/encrypted-keys/masterkey_trusted.c   |    2 +-
 security/keys/request_key.c                        |    2 +-
 security/keys/request_key_auth.c                   |    2 +-
 security/keys/trusted.c                            |    2 +-
 security/yama/Kconfig                              |    3 +-
 166 files changed, 8354 insertions(+), 11234 deletions(-)
 delete mode 100644 Documentation/DocBook/.gitignore
 delete mode 100644 Documentation/DocBook/Makefile
 delete mode 100644 Documentation/DocBook/filesystems.tmpl
 delete mode 100644 Documentation/DocBook/kernel-hacking.tmpl
 delete mode 100644 Documentation/DocBook/kernel-locking.tmpl
 delete mode 100644 Documentation/DocBook/kgdb.tmpl
 delete mode 100644 Documentation/DocBook/libata.tmpl
 delete mode 100644 Documentation/DocBook/librs.tmpl
 delete mode 100644 Documentation/DocBook/lsm.tmpl
 delete mode 100644 Documentation/DocBook/mtdnand.tmpl
 delete mode 100644 Documentation/DocBook/networking.tmpl
 delete mode 100644 Documentation/DocBook/rapidio.tmpl
 delete mode 100644 Documentation/DocBook/s390-drivers.tmpl
 delete mode 100644 Documentation/DocBook/scsi.tmpl
 delete mode 100644 Documentation/DocBook/sh.tmpl
 delete mode 100644 Documentation/DocBook/stylesheet.xsl
 delete mode 100644 Documentation/DocBook/w1.tmpl
 delete mode 100644 Documentation/DocBook/z8530book.tmpl
 delete mode 100644 Documentation/Makefile.sphinx
 rename Documentation/{security/LoadPin.txt => admin-guide/LSM/LoadPin.rst} (73%)
 rename Documentation/{security/SELinux.txt => admin-guide/LSM/SELinux.rst} (71%)
 rename Documentation/{security/Smack.txt => admin-guide/LSM/Smack.rst} (85%)
 rename Documentation/{security/Yama.txt => admin-guide/LSM/Yama.rst} (60%)
 rename Documentation/{security/apparmor.txt => admin-guide/LSM/apparmor.rst} (65%)
 rename Documentation/{security/LSM.txt => admin-guide/LSM/index.rst} (62%)
 rename Documentation/{security/tomoyo.txt => admin-guide/LSM/tomoyo.rst} (85%)
 create mode 100644 Documentation/core-api/librs.rst
 create mode 100644 Documentation/crypto/conf.py
 create mode 100644 Documentation/dev-tools/kgdb.rst
 delete mode 100644 Documentation/doc-guide/docbook.rst
 create mode 100644 Documentation/driver-api/libata.rst
 create mode 100644 Documentation/driver-api/mtdnand.rst
 create mode 100644 Documentation/driver-api/rapidio.rst
 create mode 100644 Documentation/driver-api/s390-drivers.rst
 create mode 100644 Documentation/driver-api/scsi.rst
 create mode 100644 Documentation/driver-api/w1.rst
 create mode 100644 Documentation/filesystems/conf.py
 create mode 100644 Documentation/filesystems/index.rst
 create mode 100644 Documentation/kernel-hacking/conf.py
 create mode 100644 Documentation/kernel-hacking/hacking.rst
 create mode 100644 Documentation/kernel-hacking/index.rst
 create mode 100644 Documentation/kernel-hacking/locking.rst
 create mode 100644 Documentation/lsm.txt
 create mode 100644 Documentation/networking/conf.py
 create mode 100644 Documentation/networking/index.rst
 create mode 100644 Documentation/networking/kapi.rst
 create mode 100644 Documentation/networking/z8530book.rst
 delete mode 100644 Documentation/security/00-INDEX
 rename Documentation/security/{IMA-templates.txt => IMA-templates.rst} (72%)
 create mode 100644 Documentation/security/LSM.rst
 delete mode 100644 Documentation/security/conf.py
 rename Documentation/security/{credentials.txt => credentials.rst} (72%)
 rename Documentation/security/{keys.txt => keys/core.rst} (89%)
 rename Documentation/security/{keys-ecryptfs.txt => keys/ecryptfs.rst} (91%)
 create mode 100644 Documentation/security/keys/index.rst
 rename Documentation/security/{keys-request-key.txt => keys/request-key.rst} (77%)
 rename Documentation/security/{keys-trusted-encrypted.txt => keys/trusted-encrypted.rst} (93%)
 rename Documentation/security/{self-protection.txt => self-protection.rst} (83%)
 create mode 100644 Documentation/sh/conf.py
 create mode 100644 Documentation/sh/index.rst
 create mode 100644 Documentation/sound/conf.py
 delete mode 100755 Documentation/sphinx/tmplcvt
 rename Documentation/{prctl/no_new_privs.txt => userspace-api/no_new_privs.rst} (54%)
 rename Documentation/{prctl/seccomp_filter.txt => userspace-api/seccomp_filter.rst} (71%)
 delete mode 100644 scripts/check-lc_ctype.c
Merging v4l-dvb/master (36bcba973ad4 [media] mtk_vcodec_dec: return error at mtk_vdec_pic_info_update())
$ git merge v4l-dvb/master
Merge made by the 'recursive' strategy.
 drivers/media/cec/Kconfig                          |   1 +
 drivers/media/dvb-frontends/af9013.c               |   1 +
 drivers/media/dvb-frontends/bcm3510.c              |   4 +-
 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/zl10353.c              |   3 +-
 drivers/media/i2c/msp3400-kthreads.c               |   1 +
 drivers/media/i2c/soc_camera/ov6650.c              |   2 +
 drivers/media/i2c/tc358743.c                       |   2 +-
 drivers/media/pci/bt8xx/dst_ca.c                   |   1 +
 drivers/media/pci/cx23885/cx23885-cards.c          |   3 +-
 drivers/media/pci/cx88/cx88-video.c                |   2 +-
 drivers/media/pci/ddbridge/ddbridge-core.c         |   7 +-
 drivers/media/pci/saa7134/saa7134-cards.c          |   4 +-
 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/platform/exynos4-is/fimc-capture.c   |   3 +
 drivers/media/platform/marvell-ccic/mcam-core.c    |   1 +
 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c |  10 +-
 drivers/media/platform/pxa_camera.c                |  15 +-
 drivers/media/platform/s5p-cec/s5p_cec.h           |   1 -
 drivers/media/platform/s5p-jpeg/jpeg-core.c        |   8 +-
 drivers/media/platform/sh_vou.c                    |   2 +
 drivers/media/rc/iguanair.c                        |   1 +
 drivers/media/rc/imon.c                            |   2 +-
 drivers/media/rc/ir-lirc-codec.c                   |  25 +--
 drivers/media/rc/lirc_dev.c                        |  13 +-
 drivers/media/rc/rc-main.c                         |  20 +-
 drivers/media/rc/sir_ir.c                          |   6 +
 drivers/media/tuners/tda18271-fe.c                 |   2 +-
 drivers/media/tuners/xc5000.c                      |   1 +
 drivers/media/usb/cpia2/cpia2_core.c               |  51 +++--
 drivers/media/usb/cx231xx/cx231xx-video.c          |   2 +-
 drivers/media/usb/dvb-usb-v2/af9015.c              |   1 +
 drivers/media/usb/dvb-usb-v2/lmedm04.c             |   1 +
 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/gspca/ov519.c                    |   3 +-
 drivers/media/usb/pwc/pwc-v4l.c                    |   3 +-
 drivers/media/usb/rainshadow-cec/rainshadow-cec.c  |   6 +-
 drivers/media/usb/usbvision/usbvision-i2c.c        |   3 +
 drivers/media/usb/uvc/uvc_video.c                  |   2 +-
 drivers/media/v4l2-core/videobuf2-core.c           |   2 +-
 .../atomisp/pci/atomisp2/atomisp_compat_css20.c    |   1 -
 .../media/atomisp/pci/atomisp2/atomisp_fops.c      |  14 +-
 .../media/atomisp/pci/atomisp2/atomisp_tpg.c       |   1 +
 .../media/atomisp/pci/atomisp2/atomisp_v4l2.c      |   2 +-
 .../css2400/hive_isp_css_include/math_support.h    |   6 +-
 .../css2400/hive_isp_css_include/string_support.h  |   9 +-
 .../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 +-
 .../atomisp2/css2400/runtime/binary/src/binary.c   |   2 +-
 .../css2400/runtime/debug/interface/ia_css_debug.h |   1 +
 .../css2400/runtime/debug/src/ia_css_debug.c       |   6 +-
 .../media/atomisp/pci/atomisp2/css2400/sh_css.c    |  19 +-
 .../atomisp/pci/atomisp2/css2400/sh_css_mipi.c     |   2 +-
 .../atomisp/pci/atomisp2/css2400/sh_css_params.c   |  10 +-
 .../platform/intel-mid/atomisp_gmin_platform.c     | 210 +++++++++++----------
 .../platform/intel-mid/intel_mid_pcihelpers.c      |  12 +-
 include/media/cec-notifier.h                       |  12 +-
 68 files changed, 364 insertions(+), 247 deletions(-)
Merging v4l-dvb-next/master (791a9a666d1a Merge tag 'kbuild-uapi-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
$ git merge v4l-dvb-next/master
Already up-to-date.
Merging fbdev/fbdev-for-next (34bf129a7f06 fbdev: sti: don't select CONFIG_VT)
$ git merge fbdev/fbdev-for-next
Already up-to-date.
Merging pm/linux-next (0ab35512dd7c Merge branch 'pm-cpufreq' into linux-next)
$ git merge pm/linux-next
Merge made by the 'recursive' strategy.
 arch/x86/include/asm/msr-index.h                   |   18 +-
 drivers/acpi/acpica/tbutils.c                      |    4 -
 drivers/acpi/button.c                              |    2 +-
 drivers/acpi/sysfs.c                               |    7 +-
 drivers/cpufreq/cpufreq.c                          |    1 +
 drivers/cpufreq/intel_pstate.c                     |   34 +-
 drivers/cpufreq/kirkwood-cpufreq.c                 |   19 +-
 tools/power/x86/x86_energy_perf_policy/Makefile    |   27 +-
 .../x86_energy_perf_policy.8                       |  241 +++-
 .../x86_energy_perf_policy.c                       | 1504 +++++++++++++++++---
 10 files changed, 1550 insertions(+), 307 deletions(-)
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
$ git merge idle/next
Merge made by the 'recursive' strategy.
Merging thermal/next (cb15c81a0c1c Merge branch 'thermal-soc' into next)
$ git merge thermal/next
Already up-to-date.
Merging thermal-soc/next (33011c583fcc Merge branch 'work-linus' into work-next)
$ git merge thermal-soc/next
Merge made by the 'recursive' strategy.
 drivers/cpufreq/arm_big_little.c                   |   2 +-
 drivers/cpufreq/cpufreq-dt.c                       |   2 +-
 drivers/cpufreq/cpufreq_stats.c                    |  13 +-
 drivers/cpufreq/dbx500-cpufreq.c                   |   2 +-
 drivers/cpufreq/mt8173-cpufreq.c                   |   4 +-
 drivers/cpufreq/qoriq-cpufreq.c                    |   3 +-
 drivers/thermal/cpu_cooling.c                      | 609 +++++++++------------
 drivers/thermal/imx_thermal.c                      |  22 +-
 drivers/thermal/ti-soc-thermal/ti-thermal-common.c |  22 +-
 include/linux/cpu_cooling.h                        |  32 +-
 include/linux/cpufreq.h                            |  14 +
 11 files changed, 317 insertions(+), 408 deletions(-)
Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
$ git merge ieee1394/for-next
Merge made by the 'recursive' strategy.
 drivers/firewire/net.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
Merging dlm/next (591c3beb86c4 dlm: Delete an unnecessary variable initialisation in dlm_ls_start())
$ git merge dlm/next
Merge made by the 'recursive' strategy.
 fs/dlm/debug_fs.c  | 25 ++++++++++++-------------
 fs/dlm/lock.c      |  8 +++-----
 fs/dlm/lockspace.c |  3 ++-
 fs/dlm/member.c    | 15 ++++++---------
 fs/dlm/user.c      |  2 ++
 5 files changed, 25 insertions(+), 28 deletions(-)
Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback)
$ git merge swiotlb/linux-next
Already up-to-date.
Merging net-next/master (a5c66b5726a9 Merge branch 'bnxt_en-Misc-updates-for-net-next')
$ git merge net-next/master
Auto-merging net/core/sock.c
Auto-merging net/core/datagram.c
Auto-merging include/net/sock.h
Auto-merging include/linux/skbuff.h
Auto-merging include/linux/netdevice.h
Auto-merging drivers/net/ethernet/qualcomm/qca_7k_common.h
Auto-merging drivers/net/ethernet/qualcomm/qca_7k_common.c
Auto-merging drivers/net/ethernet/qlogic/qed/qed_main.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c
Auto-merging drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
Auto-merging MAINTAINERS
Removing Documentation/devicetree/bindings/net/qca-qca7000-spi.txt
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-class-net          |    8 +
 Documentation/ABI/testing/sysfs-class-net-phydev   |   36 +
 Documentation/devicetree/bindings/net/cortina.txt  |   21 +
 Documentation/devicetree/bindings/net/dsa/b53.txt  |    3 +
 .../devicetree/bindings/net/qca,qca7000.txt        |   88 +
 .../devicetree/bindings/net/qca-qca7000-spi.txt    |   47 -
 .../devicetree/bindings/serial/slave-device.txt    |    9 +
 Documentation/networking/checksum-offloads.txt     |   11 +-
 Documentation/networking/timestamping.txt          |   26 +-
 MAINTAINERS                                        |   22 +-
 arch/alpha/include/uapi/asm/socket.h               |    2 +
 arch/frv/include/uapi/asm/socket.h                 |    2 +
 arch/ia64/include/uapi/asm/socket.h                |    2 +
 arch/m32r/include/uapi/asm/socket.h                |    2 +
 arch/mips/include/uapi/asm/socket.h                |    2 +
 arch/mn10300/include/uapi/asm/socket.h             |    2 +
 arch/parisc/include/uapi/asm/socket.h              |    2 +
 arch/powerpc/boot/dts/fsl/kmcent2.dts              |    4 +-
 arch/powerpc/include/uapi/asm/socket.h             |    2 +
 arch/s390/include/uapi/asm/socket.h                |    2 +
 arch/sparc/include/uapi/asm/socket.h               |    2 +
 arch/xtensa/include/uapi/asm/socket.h              |    2 +
 drivers/bluetooth/Kconfig                          |    3 +-
 drivers/bluetooth/btintel.c                        |    2 +
 drivers/bluetooth/btusb.c                          |    4 +
 drivers/bluetooth/btwilink.c                       |    1 -
 drivers/bluetooth/hci_ldisc.c                      |   40 +-
 drivers/bluetooth/hci_ll.c                         |    1 +
 drivers/bluetooth/hci_uart.h                       |    1 +
 drivers/infiniband/hw/mlx5/cq.c                    |    6 +-
 drivers/infiniband/hw/mlx5/mad.c                   |    4 +-
 drivers/infiniband/hw/mlx5/main.c                  |   11 +-
 drivers/infiniband/hw/mlx5/mr.c                    |    2 +-
 drivers/infiniband/hw/mlx5/qp.c                    |   32 +-
 drivers/infiniband/hw/mlx5/srq.c                   |    4 +-
 drivers/net/bonding/bond_main.c                    |    3 +-
 drivers/net/bonding/bond_options.c                 |   27 +-
 drivers/net/can/m_can/m_can.c                      |   87 +-
 drivers/net/dsa/Kconfig                            |   40 +-
 drivers/net/dsa/Makefile                           |    6 +-
 drivers/net/dsa/b53/b53_common.c                   |   19 +-
 drivers/net/dsa/b53/b53_priv.h                     |    4 +-
 drivers/net/dsa/b53/b53_srab.c                     |    2 +
 drivers/net/dsa/bcm_sf2.c                          |    5 +-
 drivers/net/dsa/dsa_loop.c                         |    3 +-
 drivers/net/dsa/mt7530.c                           |    3 +-
 drivers/net/dsa/mv88e6060.c                        |    2 +-
 drivers/net/dsa/mv88e6xxx/Makefile                 |    2 +
 drivers/net/dsa/mv88e6xxx/chip.c                   |  337 +-
 drivers/net/dsa/mv88e6xxx/mv88e6xxx.h              |   31 +-
 drivers/net/dsa/mv88e6xxx/phy.c                    |  243 ++
 drivers/net/dsa/mv88e6xxx/phy.h                    |   37 +
 drivers/net/dsa/mv88e6xxx/serdes.c                 |  229 ++
 drivers/net/dsa/mv88e6xxx/serdes.h                 |   48 +
 drivers/net/dsa/qca8k.c                            |    5 +-
 drivers/net/ethernet/8390/ax88796.c                |    6 +
 drivers/net/ethernet/amd/xgbe/xgbe-drv.c           |    4 +-
 .../net/ethernet/apm/xgene/xgene_enet_ethtool.c    |  138 +-
 drivers/net/ethernet/apm/xgene/xgene_enet_hw.c     |  188 +-
 drivers/net/ethernet/apm/xgene/xgene_enet_hw.h     |   70 +-
 drivers/net/ethernet/apm/xgene/xgene_enet_main.c   |   74 +-
 drivers/net/ethernet/apm/xgene/xgene_enet_main.h   |   12 +-
 drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c  |  110 +-
 drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c  |   77 +-
 drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h  |    5 +
 drivers/net/ethernet/aquantia/atlantic/aq_ring.c   |    2 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c   |    3 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt.c          |  170 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt.h          |   42 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c  |    3 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c      |   19 +
 drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h      |    2 +
 drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c      |    2 +-
 drivers/net/ethernet/cavium/liquidio/lio_main.c    |   25 +-
 drivers/net/ethernet/cavium/liquidio/lio_vf_main.c |   18 +-
 .../net/ethernet/cavium/liquidio/octeon_device.c   |   93 +-
 .../net/ethernet/cavium/liquidio/octeon_device.h   |   25 +
 drivers/net/ethernet/cavium/liquidio/octeon_iq.h   |    2 +-
 .../net/ethernet/cavium/liquidio/octeon_mailbox.c  |    5 +-
 .../net/ethernet/cavium/liquidio/octeon_mailbox.h  |   12 +-
 drivers/net/ethernet/cavium/octeon/octeon_mgmt.c   |    1 +
 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h         |    1 +
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c |   34 +-
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c    |   32 +-
 drivers/net/ethernet/chelsio/cxgb4/t4_hw.c         |   51 +-
 drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h |    2 +
 drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h      |    1 +
 drivers/net/ethernet/cisco/enic/enic_main.c        |    6 +-
 drivers/net/ethernet/emulex/benet/be.h             |    2 +-
 drivers/net/ethernet/emulex/benet/be_hw.h          |    3 +
 drivers/net/ethernet/emulex/benet/be_main.c        |   27 +-
 drivers/net/ethernet/ibm/ibmveth.c                 |  107 +-
 drivers/net/ethernet/ibm/ibmveth.h                 |    1 +
 drivers/net/ethernet/ibm/ibmvnic.c                 |  260 +-
 drivers/net/ethernet/ibm/ibmvnic.h                 |    2 +
 drivers/net/ethernet/intel/e1000e/netdev.c         |    5 +-
 drivers/net/ethernet/intel/i40e/i40e_ptp.c         |    1 +
 drivers/net/ethernet/intel/igb/igb_ptp.c           |    1 +
 drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c       |    1 +
 drivers/net/ethernet/jme.c                         |   42 -
 drivers/net/ethernet/mellanox/Kconfig              |    1 +
 drivers/net/ethernet/mellanox/Makefile             |    1 +
 drivers/net/ethernet/mellanox/mlx4/en_netdev.c     |    1 +
 drivers/net/ethernet/mellanox/mlx5/core/Kconfig    |   10 +
 drivers/net/ethernet/mellanox/mlx5/core/Makefile   |    3 +
 drivers/net/ethernet/mellanox/mlx5/core/debugfs.c  |    2 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c  |    8 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_clock.c |    1 +
 .../net/ethernet/mellanox/mlx5/core/en_common.c    |    4 +-
 .../net/ethernet/mellanox/mlx5/core/en_ethtool.c   |    4 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_fs.c    |   24 +-
 .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c    |    2 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_main.c  |   33 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_tc.c    |   10 +-
 drivers/net/ethernet/mellanox/mlx5/core/eq.c       |   13 +-
 drivers/net/ethernet/mellanox/mlx5/core/eswitch.c  |   24 +-
 .../ethernet/mellanox/mlx5/core/eswitch_offloads.c |   13 +-
 drivers/net/ethernet/mellanox/mlx5/core/fpga/cmd.c |   64 +
 drivers/net/ethernet/mellanox/mlx5/core/fpga/cmd.h |   59 +
 .../net/ethernet/mellanox/mlx5/core/fpga/core.c    |  202 ++
 .../net/ethernet/mellanox/mlx5/core/fpga/core.h    |   99 +
 drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c   |    6 +-
 drivers/net/ethernet/mellanox/mlx5/core/fs_core.c  |   10 +-
 drivers/net/ethernet/mellanox/mlx5/core/health.c   |   32 +-
 drivers/net/ethernet/mellanox/mlx5/core/ipoib.c    |    2 +-
 drivers/net/ethernet/mellanox/mlx5/core/main.c     |   21 +-
 .../net/ethernet/mellanox/mlx5/core/mlx5_core.h    |    3 +-
 .../net/ethernet/mellanox/mlx5/core/pagealloc.c    |    4 +-
 drivers/net/ethernet/mellanox/mlx5/core/port.c     |    6 +-
 drivers/net/ethernet/mellanox/mlx5/core/qp.c       |    2 +-
 drivers/net/ethernet/mellanox/mlx5/core/srq.c      |   14 +-
 drivers/net/ethernet/mellanox/mlx5/core/transobj.c |    2 +-
 drivers/net/ethernet/mellanox/mlx5/core/vport.c    |   34 +-
 drivers/net/ethernet/mellanox/mlxfw/Kconfig        |    6 +
 drivers/net/ethernet/mellanox/mlxfw/Makefile       |    2 +
 drivers/net/ethernet/mellanox/mlxfw/mlxfw.h        |  102 +
 drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c    |  273 ++
 drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c   |  620 ++++
 drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.h   |   66 +
 .../net/ethernet/mellanox/mlxfw/mlxfw_mfa2_file.h  |   60 +
 .../ethernet/mellanox/mlxfw/mlxfw_mfa2_format.h    |  103 +
 .../net/ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv.h   |   98 +
 .../ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv_multi.c |  126 +
 .../ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv_multi.h |   71 +
 drivers/net/ethernet/mellanox/mlxsw/Kconfig        |    1 +
 drivers/net/ethernet/mellanox/mlxsw/Makefile       |    3 +-
 drivers/net/ethernet/mellanox/mlxsw/core.h         |   12 +-
 .../ethernet/mellanox/mlxsw/core_acl_flex_keys.h   |    2 +
 drivers/net/ethernet/mellanox/mlxsw/reg.h          |  219 ++
 drivers/net/ethernet/mellanox/mlxsw/spectrum.c     | 1291 +++----
 drivers/net/ethernet/mellanox/mlxsw/spectrum.h     |  369 +-
 drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c |   17 +
 .../mellanox/mlxsw/spectrum_acl_flex_keys.h        |    6 +
 .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c    |    1 +
 .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c |   73 +-
 .../net/ethernet/mellanox/mlxsw/spectrum_dpipe.c   |   22 +-
 drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c |  992 ++++++
 .../net/ethernet/mellanox/mlxsw/spectrum_flower.c  |   36 +-
 .../net/ethernet/mellanox/mlxsw/spectrum_router.c  | 1023 +++---
 .../net/ethernet/mellanox/mlxsw/spectrum_router.h  |    2 +
 .../ethernet/mellanox/mlxsw/spectrum_switchdev.c   | 1901 ++++++----
 drivers/net/ethernet/neterion/vxge/vxge-main.c     |    1 +
 drivers/net/ethernet/netronome/Kconfig             |    1 +
 drivers/net/ethernet/netronome/nfp/Makefile        |    6 +-
 drivers/net/ethernet/netronome/nfp/nfp_app.c       |   57 +
 drivers/net/ethernet/netronome/nfp/nfp_app.h       |   56 +
 drivers/net/ethernet/netronome/nfp/nfp_devlink.c   |  181 +
 drivers/net/ethernet/netronome/nfp/nfp_hwmon.c     |  192 +
 drivers/net/ethernet/netronome/nfp/nfp_main.c      |   73 +-
 drivers/net/ethernet/netronome/nfp/nfp_main.h      |   38 +-
 drivers/net/ethernet/netronome/nfp/nfp_net.h       |   66 +-
 .../net/ethernet/netronome/nfp/nfp_net_common.c    |  302 +-
 drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h  |   20 +-
 .../net/ethernet/netronome/nfp/nfp_net_debugfs.c   |    8 +-
 .../net/ethernet/netronome/nfp/nfp_net_ethtool.c   |   74 +-
 drivers/net/ethernet/netronome/nfp/nfp_net_main.c  |  391 +-
 .../net/ethernet/netronome/nfp/nfp_netvf_main.c    |   14 +-
 drivers/net/ethernet/netronome/nfp/nfp_port.c      |  140 +
 drivers/net/ethernet/netronome/nfp/nfp_port.h      |  114 +
 drivers/net/ethernet/netronome/nfp/nfpcore/nfp.h   |    2 +
 .../ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c  |   49 +-
 .../net/ethernet/netronome/nfp/nfpcore/nfp_cpp.h   |   19 +
 .../ethernet/netronome/nfp/nfpcore/nfp_cppcore.c   |   87 +-
 .../net/ethernet/netronome/nfp/nfpcore/nfp_mutex.c |    9 +-
 .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c   |   16 +
 .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h   |   15 +
 .../ethernet/netronome/nfp/nfpcore/nfp_nsp_cmds.c  |   47 +-
 .../ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c   |   11 +-
 .../ethernet/netronome/nfp/nfpcore/nfp_resource.c  |   10 +-
 drivers/net/ethernet/qlogic/qed/qed.h              |   13 +-
 drivers/net/ethernet/qlogic/qed/qed_dcbx.c         |   42 +-
 drivers/net/ethernet/qlogic/qed/qed_dcbx.h         |    2 +-
 drivers/net/ethernet/qlogic/qed/qed_debug.c        | 3582 +++++++++++--------
 drivers/net/ethernet/qlogic/qed/qed_debug.h        |    3 +
 drivers/net/ethernet/qlogic/qed/qed_dev.c          |  151 +-
 drivers/net/ethernet/qlogic/qed/qed_fcoe.c         |   24 +-
 drivers/net/ethernet/qlogic/qed/qed_fcoe.h         |   22 +-
 drivers/net/ethernet/qlogic/qed/qed_hsi.h          | 3717 +++++++++++++-------
 .../net/ethernet/qlogic/qed/qed_init_fw_funcs.c    |  267 +-
 drivers/net/ethernet/qlogic/qed/qed_init_ops.c     |    4 +
 drivers/net/ethernet/qlogic/qed/qed_int.c          | 1469 +-------
 drivers/net/ethernet/qlogic/qed/qed_iscsi.c        |   28 +-
 drivers/net/ethernet/qlogic/qed/qed_iscsi.h        |   23 +-
 drivers/net/ethernet/qlogic/qed/qed_l2.c           |   18 +-
 drivers/net/ethernet/qlogic/qed/qed_ll2.c          |   22 +-
 drivers/net/ethernet/qlogic/qed/qed_ll2.h          |   13 +-
 drivers/net/ethernet/qlogic/qed/qed_main.c         |   27 +-
 drivers/net/ethernet/qlogic/qed/qed_mcp.c          |   92 +-
 drivers/net/ethernet/qlogic/qed/qed_mcp.h          |   14 +-
 drivers/net/ethernet/qlogic/qed/qed_ooo.c          |   30 +-
 drivers/net/ethernet/qlogic/qed/qed_ooo.h          |   26 +-
 drivers/net/ethernet/qlogic/qed/qed_ptp.c          |    4 +-
 drivers/net/ethernet/qlogic/qed/qed_reg_addr.h     |  189 +-
 drivers/net/ethernet/qlogic/qed/qed_roce.c         |    4 -
 drivers/net/ethernet/qlogic/qed/qed_sp.h           |   44 +-
 drivers/net/ethernet/qlogic/qed/qed_sp_commands.c  |   61 +-
 drivers/net/ethernet/qlogic/qed/qed_spq.c          |   54 +-
 drivers/net/ethernet/qlogic/qed/qed_sriov.c        |   34 +-
 drivers/net/ethernet/qlogic/qede/qede.h            |    1 -
 drivers/net/ethernet/qlogic/qede/qede_dcbnl.c      |    1 -
 drivers/net/ethernet/qlogic/qede/qede_ethtool.c    |   24 +-
 drivers/net/ethernet/qlogic/qede/qede_filter.c     |   62 +-
 drivers/net/ethernet/qlogic/qede/qede_fp.c         |   43 +-
 drivers/net/ethernet/qlogic/qede/qede_main.c       |   73 +-
 drivers/net/ethernet/qlogic/qede/qede_ptp.c        |    1 +
 drivers/net/ethernet/qlogic/qede/qede_roce.c       |    4 +-
 drivers/net/ethernet/qualcomm/Kconfig              |   24 +-
 drivers/net/ethernet/qualcomm/Makefile             |    7 +-
 drivers/net/ethernet/qualcomm/qca_7k.c             |   30 +-
 drivers/net/ethernet/qualcomm/qca_7k.h             |   15 +-
 .../qualcomm/{qca_framing.c => qca_7k_common.c}    |   26 +-
 .../qualcomm/{qca_framing.h => qca_7k_common.h}    |   24 +-
 drivers/net/ethernet/qualcomm/qca_debug.c          |    5 +-
 drivers/net/ethernet/qualcomm/qca_spi.c            |   48 +-
 drivers/net/ethernet/qualcomm/qca_spi.h            |    5 +-
 drivers/net/ethernet/qualcomm/qca_uart.c           |  423 +++
 drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c    |    3 +-
 drivers/net/ethernet/sfc/ef10.c                    |    1 +
 drivers/net/ethernet/stmicro/stmmac/common.h       |    8 +-
 .../net/ethernet/stmicro/stmmac/dwmac1000_core.c   |   26 +-
 .../net/ethernet/stmicro/stmmac/dwmac100_core.c    |    6 +-
 drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c  |   26 +-
 drivers/net/ethernet/stmicro/stmmac/stmmac.h       |    2 +-
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  |   54 +-
 drivers/net/ethernet/ti/cpsw.c                     |    1 +
 drivers/net/ethernet/tile/tilegx.c                 |    1 +
 drivers/net/ieee802154/ca8210.c                    |   12 +-
 drivers/net/macsec.c                               |   15 +-
 drivers/net/phy/Kconfig                            |    5 +
 drivers/net/phy/Makefile                           |    1 +
 drivers/net/phy/broadcom.c                         |   30 +-
 drivers/net/phy/cortina.c                          |  118 +
 drivers/net/phy/marvell.c                          |  730 ++--
 drivers/net/phy/mdio-xgene.c                       |   74 +-
 drivers/net/phy/mdio-xgene.h                       |    3 +
 drivers/net/phy/micrel.c                           |   27 +-
 drivers/net/phy/microchip.c                        |    2 +-
 drivers/net/phy/phy_device.c                       |   27 +-
 drivers/net/phy/smsc.c                             |   12 +-
 drivers/net/tap.c                                  |   25 +-
 drivers/net/tun.c                                  |   31 +-
 drivers/net/usb/net1080.c                          |    9 -
 drivers/net/usb/r8152.c                            |    6 -
 drivers/net/wan/fsl_ucc_hdlc.c                     |   92 +-
 drivers/net/wan/fsl_ucc_hdlc.h                     |    1 +
 drivers/net/wan/hdlc_raw_eth.c                     |    3 +-
 drivers/scsi/qedf/qedf_main.c                      |    2 +-
 drivers/scsi/qedi/qedi_fw.c                        |   20 +-
 drivers/scsi/qedi/qedi_fw_api.c                    |    3 +-
 drivers/scsi/qedi/qedi_iscsi.c                     |    3 -
 drivers/scsi/qedi/qedi_main.c                      |    2 +-
 drivers/vhost/net.c                                |  128 +-
 include/linux/if_bridge.h                          |   14 +
 include/linux/if_tap.h                             |    5 +
 include/linux/if_tun.h                             |    5 +
 include/linux/mlx5/device.h                        |    6 +
 include/linux/mlx5/driver.h                        |   11 +-
 include/linux/mlx5/mlx5_ifc.h                      |   11 +-
 include/linux/mlx5/mlx5_ifc_fpga.h                 |  144 +
 include/linux/netdevice.h                          |   11 +-
 include/linux/netlink.h                            |   15 +
 include/linux/phy.h                                |   19 +-
 include/linux/ptr_ring.h                           |  120 +
 include/linux/qed/common_hsi.h                     |  209 +-
 include/linux/qed/eth_common.h                     |    3 +-
 include/linux/qed/fcoe_common.h                    |    1 -
 include/linux/qed/iscsi_common.h                   |   91 +-
 include/linux/qed/qed_if.h                         |   33 +-
 include/linux/qed/rdma_common.h                    |    2 +-
 include/linux/qed/roce_common.h                    |    2 +
 include/linux/qed/tcp_common.h                     |    5 +-
 include/linux/rtnetlink.h                          |    3 +-
 include/linux/skb_array.h                          |   31 +
 include/linux/skbuff.h                             |  146 +-
 include/linux/tcp.h                                |   24 +-
 include/linux/udp.h                                |    3 +
 include/net/act_api.h                              |   13 +-
 include/net/bluetooth/hci.h                        |    8 +
 include/net/bond_options.h                         |    2 +
 include/net/dsa.h                                  |   44 +-
 include/net/dst.h                                  |    2 +-
 include/net/flow_dissector.h                       |    9 +
 include/net/inet_frag.h                            |    2 +-
 include/net/ip6_fib.h                              |    3 +-
 include/net/ip6_route.h                            |    2 +-
 include/net/ip_fib.h                               |    7 +-
 include/net/lwtunnel.h                             |   22 +-
 include/net/pkt_cls.h                              |   25 +-
 include/net/pkt_sched.h                            |    3 -
 include/net/request_sock.h                         |    2 +-
 include/net/route.h                                |   12 +-
 include/net/sch_generic.h                          |   26 +-
 include/net/sock.h                                 |   13 +-
 include/net/tcp.h                                  |   77 +-
 include/net/udp.h                                  |    9 +-
 include/net/udplite.h                              |    2 +-
 include/soc/fsl/qe/qe.h                            |    9 +
 include/uapi/asm-generic/socket.h                  |    2 +
 include/uapi/linux/if_link.h                       |   11 +
 include/uapi/linux/net_tstamp.h                    |   15 +-
 include/uapi/linux/pkt_cls.h                       |    4 +
 include/uapi/linux/rtnetlink.h                     |    2 +
 net/bluetooth/af_bluetooth.c                       |    2 +-
 net/bluetooth/ecdh_helper.c                        |   11 +-
 net/bluetooth/hci_core.c                           |   46 +-
 net/bridge/br_if.c                                 |    2 +-
 net/bridge/br_mdb.c                                |    4 +-
 net/bridge/br_multicast.c                          |    8 +
 net/bridge/br_netlink.c                            |    2 +-
 net/bridge/br_private.h                            |    9 -
 net/bridge/br_stp_if.c                             |   11 -
 net/bridge/br_vlan.c                               |    8 +
 net/bridge/netfilter/nft_reject_bridge.c           |    5 +-
 net/caif/caif_socket.c                             |    2 +-
 net/core/datagram.c                                |   92 +-
 net/core/dev.c                                     |   92 +-
 net/core/dev_ioctl.c                               |    1 +
 net/core/flow_dissector.c                          |   29 +
 net/core/lwt_bpf.c                                 |    5 +-
 net/core/lwtunnel.c                                |   38 +-
 net/core/net-sysfs.c                               |    8 +-
 net/core/rtnetlink.c                               |   69 +-
 net/core/skbuff.c                                  |   30 +
 net/core/sock.c                                    |    4 +
 net/dcb/dcbnl.c                                    |   11 +-
 net/dccp/ccids/ccid2.c                             |    8 +-
 net/dccp/ccids/ccid2.h                             |    2 +-
 net/dsa/Kconfig                                    |    8 +-
 net/dsa/Makefile                                   |    8 +-
 net/dsa/dsa.c                                      |   20 +-
 net/dsa/dsa2.c                                     |   16 +-
 net/dsa/dsa_priv.h                                 |  101 +-
 net/dsa/legacy.c                                   |   12 +-
 net/dsa/port.c                                     |  259 ++
 net/dsa/slave.c                                    |  378 +-
 net/dsa/switch.c                                   |  174 +-
 net/dsa/tag_brcm.c                                 |    4 +-
 net/dsa/tag_dsa.c                                  |    2 +-
 net/dsa/tag_edsa.c                                 |    2 +-
 net/dsa/tag_lan9303.c                              |    2 +-
 net/dsa/tag_mtk.c                                  |    2 +-
 net/dsa/tag_qca.c                                  |    4 +-
 net/dsa/tag_trailer.c                              |    4 +-
 net/ieee802154/socket.c                            |   10 +-
 net/ipv4/fib_frontend.c                            |   31 +-
 net/ipv4/fib_lookup.h                              |    6 +-
 net/ipv4/fib_semantics.c                           |  153 +-
 net/ipv4/fib_trie.c                                |   39 +-
 net/ipv4/fou.c                                     |   82 +-
 net/ipv4/icmp.c                                    |    2 +-
 net/ipv4/inet_connection_sock.c                    |    1 +
 net/ipv4/ip_tunnel_core.c                          |   11 +-
 net/ipv4/netfilter/nf_reject_ipv4.c                |    2 +-
 net/ipv4/route.c                                   |  154 +-
 net/ipv4/syncookies.c                              |    8 +-
 net/ipv4/tcp.c                                     |   15 +-
 net/ipv4/tcp_bbr.c                                 |   43 +-
 net/ipv4/tcp_bic.c                                 |    6 +-
 net/ipv4/tcp_cubic.c                               |   14 +-
 net/ipv4/tcp_htcp.c                                |    2 +-
 net/ipv4/tcp_input.c                               |  163 +-
 net/ipv4/tcp_ipv4.c                                |   16 +-
 net/ipv4/tcp_lp.c                                  |   17 +-
 net/ipv4/tcp_metrics.c                             |    2 +-
 net/ipv4/tcp_minisocks.c                           |    8 +-
 net/ipv4/tcp_nv.c                                  |    5 +-
 net/ipv4/tcp_output.c                              |  131 +-
 net/ipv4/tcp_rate.c                                |   16 +-
 net/ipv4/tcp_recovery.c                            |   24 +-
 net/ipv4/tcp_timer.c                               |   45 +-
 net/ipv4/tcp_westwood.c                            |    6 +-
 net/ipv4/udp.c                                     |  156 +-
 net/ipv6/addrconf.c                                |    4 +-
 net/ipv6/fou6.c                                    |   14 +-
 net/ipv6/ila/ila_lwt.c                             |    7 +-
 net/ipv6/ip6_fib.c                                 |   18 +-
 net/ipv6/netfilter/nf_reject_ipv6.c                |    3 -
 net/ipv6/route.c                                   |  137 +-
 net/ipv6/seg6.c                                    |    4 -
 net/ipv6/seg6_iptunnel.c                           |    5 +-
 net/ipv6/syncookies.c                              |    2 +-
 net/ipv6/tcp_ipv6.c                                |    4 +-
 net/ipv6/udp.c                                     |    3 +-
 net/kcm/kcmsock.c                                  |    2 +-
 net/mpls/af_mpls.c                                 |  266 +-
 net/mpls/internal.h                                |    4 +-
 net/mpls/mpls_iptunnel.c                           |   17 +-
 net/netfilter/nf_synproxy_core.c                   |    2 +-
 net/nfc/af_nfc.c                                   |    2 +-
 net/openvswitch/datapath.c                         |    2 +-
 net/packet/af_packet.c                             |   10 +-
 net/rxrpc/Makefile                                 |    1 +
 net/rxrpc/af_rxrpc.c                               |   35 +-
 net/rxrpc/ar-internal.h                            |   65 +-
 net/rxrpc/call_accept.c                            |   14 +-
 net/rxrpc/call_object.c                            |   39 +-
 net/rxrpc/conn_client.c                            |  153 +-
 net/rxrpc/conn_object.c                            |   55 +-
 net/rxrpc/conn_service.c                           |   11 +-
 net/rxrpc/local_object.c                           |   48 +-
 net/rxrpc/net_ns.c                                 |   85 +
 net/rxrpc/peer_object.c                            |   26 +-
 net/rxrpc/proc.c                                   |   40 +-
 net/sched/act_api.c                                |   55 +-
 net/sched/act_csum.c                               |    1 +
 net/sched/cls_api.c                                |  425 ++-
 net/sched/cls_flower.c                             |   13 +-
 net/sched/sch_api.c                                |   50 +-
 net/sched/sch_atm.c                                |   29 +-
 net/sched/sch_cbq.c                                |   21 +-
 net/sched/sch_drr.c                                |   15 +-
 net/sched/sch_dsmark.c                             |   17 +-
 net/sched/sch_fq.c                                 |    8 +
 net/sched/sch_fq_codel.c                           |   17 +-
 net/sched/sch_hfsc.c                               |   21 +-
 net/sched/sch_htb.c                                |   28 +-
 net/sched/sch_ingress.c                            |   61 +-
 net/sched/sch_multiq.c                             |   16 +-
 net/sched/sch_prio.c                               |   19 +-
 net/sched/sch_qfq.c                                |   16 +-
 net/sched/sch_sfb.c                                |   17 +-
 net/sched/sch_sfq.c                                |   17 +-
 net/sctp/offload.c                                 |    7 +
 net/sctp/output.c                                  |    1 +
 net/socket.c                                       |   49 +-
 tools/hv/bondvf.sh                                 |   21 +-
 446 files changed, 20676 insertions(+), 10971 deletions(-)
 create mode 100644 Documentation/ABI/testing/sysfs-class-net-phydev
 create mode 100644 Documentation/devicetree/bindings/net/cortina.txt
 create mode 100644 Documentation/devicetree/bindings/net/qca,qca7000.txt
 delete mode 100644 Documentation/devicetree/bindings/net/qca-qca7000-spi.txt
 create mode 100644 drivers/net/dsa/mv88e6xxx/phy.c
 create mode 100644 drivers/net/dsa/mv88e6xxx/phy.h
 create mode 100644 drivers/net/dsa/mv88e6xxx/serdes.c
 create mode 100644 drivers/net/dsa/mv88e6xxx/serdes.h
 create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/cmd.c
 create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/cmd.h
 create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/core.c
 create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/core.h
 create mode 100644 drivers/net/ethernet/mellanox/mlxfw/Kconfig
 create mode 100644 drivers/net/ethernet/mellanox/mlxfw/Makefile
 create mode 100644 drivers/net/ethernet/mellanox/mlxfw/mlxfw.h
 create mode 100644 drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c
 create mode 100644 drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c
 create mode 100644 drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.h
 create mode 100644 drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_file.h
 create mode 100644 drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_format.h
 create mode 100644 drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv.h
 create mode 100644 drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv_multi.c
 create mode 100644 drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv_multi.h
 create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c
 create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_app.c
 create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_app.h
 create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_devlink.c
 create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_hwmon.c
 create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_port.c
 create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_port.h
 rename drivers/net/ethernet/qualcomm/{qca_framing.c => qca_7k_common.c} (85%)
 rename drivers/net/ethernet/qualcomm/{qca_framing.h => qca_7k_common.h} (86%)
 create mode 100644 drivers/net/ethernet/qualcomm/qca_uart.c
 create mode 100644 drivers/net/phy/cortina.c
 create mode 100644 include/linux/mlx5/mlx5_ifc_fpga.h
 create mode 100644 net/dsa/port.c
 create mode 100644 net/rxrpc/net_ns.c
Merging ipsec-next/master (d49c9dc1c848 ipv6: remove unused variables in esp6)
$ git merge ipsec-next/master
Auto-merging net/xfrm/xfrm_state.c
Auto-merging net/xfrm/xfrm_device.c
Merge made by the 'recursive' strategy.
 net/ipv4/ah4.c         |  5 +++--
 net/ipv6/ah6.c         |  5 +++--
 net/ipv6/esp6.c        |  5 -----
 net/xfrm/xfrm_device.c |  2 +-
 net/xfrm/xfrm_state.c  | 11 +++--------
 5 files changed, 10 insertions(+), 18 deletions(-)
Merging netfilter-next/master (34158151d2aa netfilter: cttimeout: use nf_ct_iterate_cleanup_net to unlink timeout objs)
$ git merge netfilter-next/master
Auto-merging net/netfilter/nft_set_rbtree.c
Auto-merging net/netfilter/nf_nat_core.c
Auto-merging net/netfilter/nf_conntrack_netlink.c
Merge made by the 'recursive' strategy.
 include/net/netfilter/nf_conntrack.h        |  10 +-
 include/net/netfilter/nf_tables.h           |  29 +-
 net/ipv4/netfilter/ipt_CLUSTERIP.c          |  14 +-
 net/ipv4/netfilter/nf_nat_masquerade_ipv4.c |   4 +-
 net/ipv6/netfilter/nf_nat_masquerade_ipv6.c |  10 +-
 net/netfilter/nf_conntrack_core.c           | 140 +++++++--
 net/netfilter/nf_conntrack_helper.c         |  50 +--
 net/netfilter/nf_conntrack_netlink.c        |   8 +-
 net/netfilter/nf_conntrack_proto.c          |   4 +-
 net/netfilter/nf_dup_netdev.c               |   1 +
 net/netfilter/nf_nat_core.c                 |  37 +--
 net/netfilter/nf_tables_api.c               |  73 +++--
 net/netfilter/nfnetlink_cttimeout.c         |  39 +--
 net/netfilter/nft_rt.c                      |  16 +-
 net/netfilter/nft_set_bitmap.c              |  13 +-
 net/netfilter/nft_set_hash.c                | 471 +++++++++++++++++++++-------
 net/netfilter/nft_set_rbtree.c              |  21 +-
 17 files changed, 614 insertions(+), 326 deletions(-)
Merging ipvs-next/master (fb90e8dedb46 ipvs: change comparison on sync_refresh_period)
$ git merge ipvs-next/master
Already up-to-date.
Merging wireless-drivers-next/master (98f44cb0655c qtnfmac: introduce new FullMAC driver for Quantenna chipsets)
$ git merge wireless-drivers-next/master
Removing drivers/net/wireless/rsi/rsi_91x_pkt.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                                        |    8 +
 drivers/net/wireless/Kconfig                       |    1 +
 drivers/net/wireless/Makefile                      |    1 +
 drivers/net/wireless/ath/ath10k/Kconfig            |    7 +
 drivers/net/wireless/ath/ath10k/Makefile           |    3 +
 drivers/net/wireless/ath/ath10k/bmi.c              |   71 +
 drivers/net/wireless/ath/ath10k/bmi.h              |    2 +
 drivers/net/wireless/ath/ath10k/core.c             |   36 +-
 drivers/net/wireless/ath/ath10k/core.h             |    3 +
 drivers/net/wireless/ath/ath10k/debug.c            |   16 +-
 drivers/net/wireless/ath/ath10k/debug.h            |    2 +
 drivers/net/wireless/ath/ath10k/htc.c              |  244 ++-
 drivers/net/wireless/ath/ath10k/htc.h              |   39 +-
 drivers/net/wireless/ath/ath10k/hw.h               |   53 +
 drivers/net/wireless/ath/ath10k/sdio.c             | 2113 ++++++++++++++++++++
 drivers/net/wireless/ath/ath10k/sdio.h             |  229 +++
 drivers/net/wireless/ath/ath10k/targaddrs.h        |   24 +
 drivers/net/wireless/ath/ath10k/testmode.c         |    7 +
 drivers/net/wireless/ath/ath10k/testmode_i.h       |    1 +
 drivers/net/wireless/ath/ath5k/debug.c             |    5 +-
 drivers/net/wireless/ath/ath6kl/txrx.c             |   13 +-
 drivers/net/wireless/ath/ath9k/common.c            |    2 +-
 drivers/net/wireless/ath/ath9k/eeprom.c            |    2 +-
 drivers/net/wireless/ath/ath9k/tx99.c              |    2 +-
 drivers/net/wireless/ath/wil6210/debugfs.c         |   12 +-
 drivers/net/wireless/broadcom/b43/main.c           |   10 +
 .../wireless/broadcom/brcm80211/brcmfmac/btcoex.c  |    4 +-
 .../broadcom/brcm80211/brcmfmac/cfg80211.c         |   21 +-
 .../broadcom/brcm80211/brcmfmac/cfg80211.h         |    2 +
 .../wireless/broadcom/brcm80211/brcmfmac/feature.c |   22 +-
 .../wireless/broadcom/brcm80211/brcmfmac/feature.h |    4 +-
 .../broadcom/brcm80211/brcmfmac/fwil_types.h       |   59 +
 .../net/wireless/broadcom/brcm80211/brcmfmac/pno.c |   10 +
 .../net/wireless/broadcom/brcm80211/brcmfmac/pno.h |    8 +
 drivers/net/wireless/intel/iwlegacy/common.c       |    2 +
 drivers/net/wireless/intel/iwlegacy/common.h       |    1 +
 drivers/net/wireless/intersil/hostap/hostap_hw.c   |   12 +-
 drivers/net/wireless/intersil/hostap/hostap_wlan.h |    3 +-
 .../net/wireless/intersil/orinoco/orinoco_usb.c    |   15 +-
 drivers/net/wireless/intersil/p54/fwio.c           |    5 +-
 drivers/net/wireless/marvell/libertas/cfg.c        |  104 +-
 drivers/net/wireless/marvell/libertas/cmd.c        |  116 +-
 drivers/net/wireless/marvell/libertas/cmdresp.c    |    9 -
 drivers/net/wireless/marvell/libertas/defs.h       |    9 -
 drivers/net/wireless/marvell/libertas/ethtool.c    |    3 -
 drivers/net/wireless/marvell/libertas/if_cs.c      |   36 -
 drivers/net/wireless/marvell/libertas/if_sdio.c    |   66 +-
 drivers/net/wireless/marvell/libertas/if_spi.c     |   38 +-
 drivers/net/wireless/marvell/libertas/if_usb.c     |   27 +-
 drivers/net/wireless/marvell/libertas/main.c       |   81 +-
 drivers/net/wireless/marvell/libertas/mesh.c       |   54 +-
 drivers/net/wireless/marvell/libertas/rx.c         |    6 -
 drivers/net/wireless/marvell/libertas/tx.c         |    3 -
 drivers/net/wireless/marvell/mwifiex/11h.c         |    6 -
 drivers/net/wireless/marvell/mwifiex/11n.c         |   17 +-
 drivers/net/wireless/marvell/mwifiex/cfg80211.c    |   71 +-
 drivers/net/wireless/marvell/mwifiex/cmdevt.c      |    7 +-
 drivers/net/wireless/marvell/mwifiex/init.c        |   12 +-
 drivers/net/wireless/marvell/mwifiex/main.h        |    5 +-
 drivers/net/wireless/marvell/mwifiex/pcie.c        |  188 +-
 drivers/net/wireless/marvell/mwifiex/sdio.c        |   16 +-
 drivers/net/wireless/marvell/mwifiex/usb.c         |    3 +-
 drivers/net/wireless/quantenna/Kconfig             |   16 +
 drivers/net/wireless/quantenna/Makefile            |    6 +
 drivers/net/wireless/quantenna/qtnfmac/Kconfig     |   19 +
 drivers/net/wireless/quantenna/qtnfmac/Makefile    |   31 +
 drivers/net/wireless/quantenna/qtnfmac/bus.h       |  139 ++
 drivers/net/wireless/quantenna/qtnfmac/cfg80211.c  |  995 +++++++++
 drivers/net/wireless/quantenna/qtnfmac/cfg80211.h  |   43 +
 drivers/net/wireless/quantenna/qtnfmac/commands.c  | 1982 ++++++++++++++++++
 drivers/net/wireless/quantenna/qtnfmac/commands.h  |   74 +
 drivers/net/wireless/quantenna/qtnfmac/core.c      |  618 ++++++
 drivers/net/wireless/quantenna/qtnfmac/core.h      |  173 ++
 drivers/net/wireless/quantenna/qtnfmac/debug.c     |   46 +
 drivers/net/wireless/quantenna/qtnfmac/debug.h     |   50 +
 drivers/net/wireless/quantenna/qtnfmac/event.c     |  452 +++++
 drivers/net/wireless/quantenna/qtnfmac/event.h     |   27 +
 .../net/wireless/quantenna/qtnfmac/pearl/pcie.c    | 1378 +++++++++++++
 .../quantenna/qtnfmac/pearl/pcie_bus_priv.h        |   89 +
 .../wireless/quantenna/qtnfmac/pearl/pcie_ipc.h    |  158 ++
 .../quantenna/qtnfmac/pearl/pcie_regs_pearl.h      |  353 ++++
 drivers/net/wireless/quantenna/qtnfmac/qlink.h     |  901 +++++++++
 .../net/wireless/quantenna/qtnfmac/qlink_util.c    |   71 +
 .../net/wireless/quantenna/qtnfmac/qlink_util.h    |   80 +
 .../net/wireless/quantenna/qtnfmac/qtn_hw_ids.h    |   32 +
 drivers/net/wireless/quantenna/qtnfmac/shm_ipc.c   |  176 ++
 drivers/net/wireless/quantenna/qtnfmac/shm_ipc.h   |   80 +
 .../net/wireless/quantenna/qtnfmac/shm_ipc_defs.h  |   46 +
 drivers/net/wireless/quantenna/qtnfmac/trans.c     |  224 +++
 drivers/net/wireless/quantenna/qtnfmac/trans.h     |   57 +
 drivers/net/wireless/quantenna/qtnfmac/util.c      |  114 ++
 drivers/net/wireless/quantenna/qtnfmac/util.h      |   45 +
 drivers/net/wireless/ralink/rt2x00/rt2400pci.c     |  181 +-
 drivers/net/wireless/ralink/rt2x00/rt2500pci.c     |  195 +-
 drivers/net/wireless/ralink/rt2x00/rt2500usb.c     |  173 +-
 drivers/net/wireless/ralink/rt2x00/rt2800lib.c     |  911 ++++-----
 drivers/net/wireless/ralink/rt2x00/rt2800lib.h     |   22 +-
 drivers/net/wireless/ralink/rt2x00/rt2800mmio.c    |   44 +-
 drivers/net/wireless/ralink/rt2x00/rt2800pci.c     |    6 +-
 drivers/net/wireless/ralink/rt2x00/rt2800usb.c     |   20 +-
 drivers/net/wireless/ralink/rt2x00/rt2x00.h        |   12 +-
 drivers/net/wireless/ralink/rt2x00/rt2x00debug.c   |    2 +-
 drivers/net/wireless/ralink/rt2x00/rt2x00debug.h   |    4 +-
 drivers/net/wireless/ralink/rt2x00/rt2x00mmio.c    |    2 +-
 drivers/net/wireless/ralink/rt2x00/rt2x00mmio.h    |    7 +-
 drivers/net/wireless/ralink/rt2x00/rt2x00queue.h   |   12 +-
 drivers/net/wireless/ralink/rt2x00/rt2x00usb.c     |    2 +-
 drivers/net/wireless/ralink/rt2x00/rt2x00usb.h     |   16 +-
 drivers/net/wireless/ralink/rt2x00/rt61pci.c       |  285 +--
 drivers/net/wireless/ralink/rt2x00/rt73usb.c       |  189 +-
 drivers/net/wireless/ray_cs.c                      |    7 +-
 .../realtek/rtlwifi/btcoexist/halbtc8192e2ant.c    |   68 +-
 .../realtek/rtlwifi/btcoexist/halbtc8192e2ant.h    |    2 -
 .../realtek/rtlwifi/btcoexist/halbtc8723b1ant.c    | 2043 ++++++++++++++-----
 .../realtek/rtlwifi/btcoexist/halbtc8723b1ant.h    |   47 +-
 .../realtek/rtlwifi/btcoexist/halbtc8723b2ant.c    |   80 +-
 .../realtek/rtlwifi/btcoexist/halbtc8723b2ant.h    |    2 -
 .../realtek/rtlwifi/btcoexist/halbtc8821a1ant.c    |  275 ++-
 .../realtek/rtlwifi/btcoexist/halbtc8821a1ant.h    |    4 +-
 .../realtek/rtlwifi/btcoexist/halbtc8821a2ant.c    |  515 +++--
 .../realtek/rtlwifi/btcoexist/halbtc8821a2ant.h    |   10 +-
 .../realtek/rtlwifi/btcoexist/halbtcoutsrc.h       |   28 +
 .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.c    |    2 +-
 .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.c    |    4 +-
 .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c    |    2 +-
 drivers/net/wireless/rsi/Makefile                  |    2 +-
 drivers/net/wireless/rsi/rsi_91x_core.c            |    2 +-
 drivers/net/wireless/rsi/rsi_91x_hal.c             |  740 +++++++
 drivers/net/wireless/rsi/rsi_91x_pkt.c             |  215 --
 drivers/net/wireless/rsi/rsi_91x_sdio.c            |  211 +-
 drivers/net/wireless/rsi/rsi_91x_sdio_ops.c        |  190 +-
 drivers/net/wireless/rsi/rsi_91x_usb.c             |  166 +-
 drivers/net/wireless/rsi/rsi_91x_usb_ops.c         |  125 --
 drivers/net/wireless/rsi/rsi_common.h              |    3 +-
 drivers/net/wireless/rsi/rsi_hal.h                 |   81 +
 drivers/net/wireless/rsi/rsi_main.h                |   36 +-
 drivers/net/wireless/rsi/rsi_sdio.h                |    6 +-
 drivers/net/wireless/rsi/rsi_usb.h                 |    5 +-
 drivers/net/wireless/ti/wlcore/debugfs.c           |   13 +-
 drivers/net/wireless/ti/wlcore/spi.c               |    6 +-
 drivers/ssb/main.c                                 |    1 -
 141 files changed, 16067 insertions(+), 3333 deletions(-)
 create mode 100644 drivers/net/wireless/ath/ath10k/sdio.c
 create mode 100644 drivers/net/wireless/ath/ath10k/sdio.h
 create mode 100644 drivers/net/wireless/quantenna/Kconfig
 create mode 100644 drivers/net/wireless/quantenna/Makefile
 create mode 100644 drivers/net/wireless/quantenna/qtnfmac/Kconfig
 create mode 100644 drivers/net/wireless/quantenna/qtnfmac/Makefile
 create mode 100644 drivers/net/wireless/quantenna/qtnfmac/bus.h
 create mode 100644 drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
 create mode 100644 drivers/net/wireless/quantenna/qtnfmac/cfg80211.h
 create mode 100644 drivers/net/wireless/quantenna/qtnfmac/commands.c
 create mode 100644 drivers/net/wireless/quantenna/qtnfmac/commands.h
 create mode 100644 drivers/net/wireless/quantenna/qtnfmac/core.c
 create mode 100644 drivers/net/wireless/quantenna/qtnfmac/core.h
 create mode 100644 drivers/net/wireless/quantenna/qtnfmac/debug.c
 create mode 100644 drivers/net/wireless/quantenna/qtnfmac/debug.h
 create mode 100644 drivers/net/wireless/quantenna/qtnfmac/event.c
 create mode 100644 drivers/net/wireless/quantenna/qtnfmac/event.h
 create mode 100644 drivers/net/wireless/quantenna/qtnfmac/pearl/pcie.c
 create mode 100644 drivers/net/wireless/quantenna/qtnfmac/pearl/pcie_bus_priv.h
 create mode 100644 drivers/net/wireless/quantenna/qtnfmac/pearl/pcie_ipc.h
 create mode 100644 drivers/net/wireless/quantenna/qtnfmac/pearl/pcie_regs_pearl.h
 create mode 100644 drivers/net/wireless/quantenna/qtnfmac/qlink.h
 create mode 100644 drivers/net/wireless/quantenna/qtnfmac/qlink_util.c
 create mode 100644 drivers/net/wireless/quantenna/qtnfmac/qlink_util.h
 create mode 100644 drivers/net/wireless/quantenna/qtnfmac/qtn_hw_ids.h
 create mode 100644 drivers/net/wireless/quantenna/qtnfmac/shm_ipc.c
 create mode 100644 drivers/net/wireless/quantenna/qtnfmac/shm_ipc.h
 create mode 100644 drivers/net/wireless/quantenna/qtnfmac/shm_ipc_defs.h
 create mode 100644 drivers/net/wireless/quantenna/qtnfmac/trans.c
 create mode 100644 drivers/net/wireless/quantenna/qtnfmac/trans.h
 create mode 100644 drivers/net/wireless/quantenna/qtnfmac/util.c
 create mode 100644 drivers/net/wireless/quantenna/qtnfmac/util.h
 create mode 100644 drivers/net/wireless/rsi/rsi_91x_hal.c
 delete mode 100644 drivers/net/wireless/rsi/rsi_91x_pkt.c
 create mode 100644 drivers/net/wireless/rsi/rsi_hal.h
Merging bluetooth/master (a3995460491d net: phy: Relax error checking on sysfs_create_link())
$ git merge bluetooth/master
Already up-to-date.
Merging mac80211-next/master (5d473fedd17a mac80211: Invoke TX LED in more code paths)
$ git merge mac80211-next/master
Auto-merging net/wireless/util.c
Auto-merging net/mac80211/sta_info.h
Auto-merging net/mac80211/ieee80211_i.h
Auto-merging include/linux/skbuff.h
Merge made by the 'recursive' strategy.
 include/linux/skbuff.h     |  9 +++++
 include/net/cfg80211.h     |  4 +++
 include/net/mac80211.h     | 16 +++++++++
 net/mac80211/cfg.c         |  1 +
 net/mac80211/debugfs_sta.c |  6 ++++
 net/mac80211/ibss.c        |  1 -
 net/mac80211/ieee80211_i.h |  5 +++
 net/mac80211/mesh.c        | 85 +++++++++++++++++++++++++++++++++++++++++-----
 net/mac80211/mesh_plink.c  |  3 +-
 net/mac80211/mlme.c        |  1 -
 net/mac80211/rate.c        |  3 +-
 net/mac80211/spectmgmt.c   |  7 ++++
 net/mac80211/sta_info.c    | 30 ++++++++++++++++
 net/mac80211/sta_info.h    | 11 ++++++
 net/mac80211/status.c      |  4 +--
 net/mac80211/tx.c          |  9 ++++-
 net/mac80211/util.c        | 37 ++++++++++++++++++++
 net/wireless/mesh.c        |  8 +++++
 net/wireless/nl80211.c     | 17 +++++++++-
 net/wireless/util.c        | 11 +++---
 20 files changed, 247 insertions(+), 21 deletions(-)
Merging rdma/for-next (67cf3623e097 rxe: expose num_possible_cpus() cnum_comp_vectors)
$ git merge rdma/for-next
Already up-to-date.
Merging gfs2/for-next (3ef2bc099d1c Merge tag 'devicetree-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux)
$ git merge gfs2/for-next
Already up-to-date.
Merging mtd/master (2ea659a9ef48 Linux 4.12-rc1)
$ git merge mtd/master
Already up-to-date.
Merging l2-mtd/master (c316cf670491 Merge 'v4.12-rc1' into MTD)
$ git merge l2-mtd/master
Merge made by the 'recursive' strategy.
 drivers/mtd/chips/cfi_cmdset_0020.c  |   2 +-
 drivers/mtd/devices/Kconfig          |  10 ++
 drivers/mtd/devices/Makefile         |   1 +
 drivers/mtd/devices/mchp23k256.c     | 182 +++++++++++++++++++++++++++++++
 drivers/mtd/devices/mtd_dataflash.c  | 200 ++++++++++++++++++++---------------
 drivers/mtd/maps/physmap_of_gemini.c |   2 +-
 6 files changed, 307 insertions(+), 90 deletions(-)
 create mode 100644 drivers/mtd/devices/mchp23k256.c
Merging nand/nand/next (45793dc5bc6c mtd: nand: check ecc->total sanity in nand_scan_tail)
$ git merge nand/nand/next
Auto-merging include/linux/mtd/nand.h
Auto-merging drivers/mtd/nand/tango_nand.c
Auto-merging drivers/mtd/nand/nand_base.c
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/mtd/gpmi-nand.txt          |  14 +-
 Documentation/devicetree/bindings/mtd/nand.txt     |   2 +-
 drivers/mtd/nand/Kconfig                           |   3 +
 drivers/mtd/nand/atmel/nand-controller.c           | 353 ++++++++++++++++++++-
 drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c       |   2 +
 drivers/mtd/nand/cafe_nand.c                       |   2 +
 drivers/mtd/nand/davinci_nand.c                    |   3 +
 drivers/mtd/nand/denali.c                          |   2 +
 drivers/mtd/nand/docg4.c                           |   2 +
 drivers/mtd/nand/fsl_elbc_nand.c                   |   2 +
 drivers/mtd/nand/fsl_ifc_nand.c                    |   2 +
 drivers/mtd/nand/fsmc_nand.c                       | 122 +++++--
 drivers/mtd/nand/gpmi-nand/gpmi-nand.c             |  75 +++--
 drivers/mtd/nand/gpmi-nand/gpmi-nand.h             |   9 +-
 drivers/mtd/nand/hisi504_nand.c                    |   2 +
 drivers/mtd/nand/jz4780_nand.c                     |   2 +-
 drivers/mtd/nand/mpc5121_nfc.c                     |   2 +
 drivers/mtd/nand/mxc_nand.c                        |  12 +-
 drivers/mtd/nand/nand_base.c                       | 129 +++++---
 drivers/mtd/nand/nand_micron.c                     | 221 +++++++++++++
 drivers/mtd/nand/pxa3xx_nand.c                     |   2 +
 drivers/mtd/nand/qcom_nandc.c                      |   2 +
 drivers/mtd/nand/s3c2410.c                         |   5 +-
 drivers/mtd/nand/sh_flctl.c                        |   2 +
 drivers/mtd/nand/sunxi_nand.c                      |   9 +-
 drivers/mtd/nand/tango_nand.c                      |  22 +-
 drivers/mtd/nand/vf610_nfc.c                       |   2 +
 drivers/staging/mt29f_spinand/mt29f_spinand.c      |   2 +
 include/linux/mtd/nand.h                           |  33 +-
 29 files changed, 895 insertions(+), 145 deletions(-)
Merging spi-nor/spi-nor/next (05d090f00203 mtd: spi-nor: Potential oops on error path in quad_enable())
$ git merge spi-nor/spi-nor/next
Merge made by the 'recursive' strategy.
 drivers/mtd/devices/m25p80.c          | 121 ++++++---
 drivers/mtd/spi-nor/Kconfig           |   2 +-
 drivers/mtd/spi-nor/aspeed-smc.c      |  23 +-
 drivers/mtd/spi-nor/atmel-quadspi.c   |  83 ++++--
 drivers/mtd/spi-nor/cadence-quadspi.c |  18 +-
 drivers/mtd/spi-nor/fsl-quadspi.c     |   6 +-
 drivers/mtd/spi-nor/hisi-sfc.c        |  31 ++-
 drivers/mtd/spi-nor/intel-spi.c       |   7 +-
 drivers/mtd/spi-nor/mtk-quadspi.c     |  15 +-
 drivers/mtd/spi-nor/nxp-spifi.c       |  22 +-
 drivers/mtd/spi-nor/spi-nor.c         | 475 +++++++++++++++++++++++++++-------
 drivers/mtd/spi-nor/stm32-quadspi.c   |  32 ++-
 include/linux/mtd/spi-nor.h           | 161 +++++++++++-
 13 files changed, 770 insertions(+), 226 deletions(-)
Merging crypto/master (6507c57bb013 crypto: ccp - Use IPAD/OPAD constant)
$ git merge crypto/master
Merge made by the 'recursive' strategy.
 arch/arm64/crypto/sha1-ce-core.S         |   6 +-
 arch/arm64/crypto/sha1-ce-glue.c         |  11 +-
 arch/arm64/crypto/sha2-ce-core.S         |   6 +-
 arch/arm64/crypto/sha2-ce-glue.c         |  13 +-
 arch/x86/crypto/aes-x86_64-asm_64.S      |  47 ++--
 arch/x86/crypto/aesni-intel_asm.S        | 231 +++++++++++----
 arch/x86/crypto/aesni-intel_avx-x86_64.S | 283 +++++++++++++------
 arch/x86/crypto/aesni-intel_glue.c       | 208 ++++++++++----
 arch/x86/crypto/sha512-mb/sha512_mb.c    |   7 +-
 crypto/hmac.c                            |   5 +-
 crypto/tcrypt.c                          |   4 -
 drivers/char/hw_random/omap3-rom-rng.c   |  11 +-
 drivers/crypto/bcm/cipher.c              |   5 +-
 drivers/crypto/caam/caampkc.c            | 463 +++++++++++++++++++++++++++++--
 drivers/crypto/caam/caampkc.h            |  58 ++++
 drivers/crypto/caam/pdb.h                |  62 +++++
 drivers/crypto/caam/pkc_desc.c           |  36 +++
 drivers/crypto/ccp/ccp-crypto-sha.c      |   5 +-
 drivers/crypto/ccp/ccp-dev.c             |   1 +
 drivers/crypto/img-hash.c                |  12 +-
 drivers/crypto/ixp4xx_crypto.c           |   3 +-
 drivers/crypto/marvell/hash.c            |   5 +-
 drivers/crypto/mediatek/mtk-sha.c        |   5 +-
 drivers/crypto/mv_cesa.c                 |   5 +-
 drivers/crypto/omap-sham.c               |   5 +-
 drivers/crypto/qat/qat_common/adf_aer.c  |  15 +-
 drivers/crypto/qat/qat_common/qat_algs.c |   5 +-
 include/crypto/hmac.h                    |   7 +
 28 files changed, 1232 insertions(+), 292 deletions(-)
 create mode 100644 include/crypto/hmac.h
Merging drm/drm-next (2a1720376add Backmerge tag 'v4.12-rc3' into drm-next)
$ git merge drm/drm-next
Resolved 'drivers/gpu/drm/i915/i915_gem_shrinker.c' using previous resolution.
Removing include/drm/drm_mem_util.h
Auto-merging drivers/gpu/drm/i915/intel_lrc.c
Auto-merging drivers/gpu/drm/i915/intel_lpe_audio.c
Auto-merging drivers/gpu/drm/i915/i915_reg.h
Auto-merging drivers/gpu/drm/i915/i915_irq.c
Auto-merging drivers/gpu/drm/i915/i915_gem_shrinker.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_shrinker.c
Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c
Auto-merging drivers/gpu/drm/i915/i915_drv.c
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 1da7ce364971] Merge remote-tracking branch 'drm/drm-next'
$ git diff -M --stat --summary HEAD^..
 .../devicetree/bindings/display/brcm,bcm-vc4.txt   |    7 +-
 .../devicetree/bindings/display/st,stm32-ltdc.txt  |   36 +
 .../devicetree/bindings/display/zte,vou.txt        |   21 +
 Documentation/gpu/index.rst                        |    1 +
 Documentation/gpu/pl111.rst                        |    6 +
 Documentation/sync_file.txt                        |   23 +-
 MAINTAINERS                                        |   19 +
 drivers/dma-buf/dma-buf.c                          |    8 +-
 drivers/dma-buf/dma-fence.c                        |    5 +
 drivers/dma-buf/sync_debug.c                       |   10 +-
 drivers/dma-buf/sync_file.c                        |   52 +-
 drivers/gpu/drm/Kconfig                            |    4 +
 drivers/gpu/drm/Makefile                           |    2 +
 drivers/gpu/drm/amd/amdgpu/Makefile                |    2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu.h                |   14 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c        |   16 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c             |   19 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c            |    2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c            |   16 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c            |   41 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h           |    3 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c            |    2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c            |   10 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c             |    7 +-
 drivers/gpu/drm/amd/amdgpu/ci_dpm.c                |    2 +-
 drivers/gpu/drm/amd/amdgpu/ci_smc.c                |    2 +-
 drivers/gpu/drm/amd/amdgpu/cik.c                   |    2 +-
 drivers/gpu/drm/amd/amdgpu/cik_ih.c                |    2 +-
 drivers/gpu/drm/amd/amdgpu/cz_ih.c                 |    2 +-
 drivers/gpu/drm/amd/amdgpu/dce_v10_0.c             |    2 +-
 drivers/gpu/drm/amd/amdgpu/dce_v11_0.c             |    2 +-
 drivers/gpu/drm/amd/amdgpu/dce_v6_0.c              |    2 +-
 drivers/gpu/drm/amd/amdgpu/dce_v8_0.c              |    2 +-
 drivers/gpu/drm/amd/amdgpu/dce_virtual.c           |    2 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c              |    2 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c              |    2 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c              |    2 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c              |    2 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c              |    2 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c              |    2 +-
 drivers/gpu/drm/amd/amdgpu/iceland_ih.c            |    2 +-
 drivers/gpu/drm/amd/amdgpu/kv_dpm.c                |    2 +-
 drivers/gpu/drm/amd/amdgpu/kv_smc.c                |    2 +-
 drivers/gpu/drm/amd/amdgpu/psp_v3_1.c              |    2 +-
 drivers/gpu/drm/amd/amdgpu/si.c                    |    2 +-
 drivers/gpu/drm/amd/amdgpu/si_dpm.c                |    2 +-
 drivers/gpu/drm/amd/amdgpu/si_ih.c                 |    2 +-
 drivers/gpu/drm/amd/amdgpu/si_smc.c                |    2 +-
 drivers/gpu/drm/amd/amdgpu/soc15.c                 |    2 +-
 drivers/gpu/drm/amd/amdgpu/tonga_ih.c              |    2 +-
 drivers/gpu/drm/amd/amdgpu/vega10_ih.c             |    2 +-
 drivers/gpu/drm/amd/amdgpu/vi.c                    |    2 +-
 drivers/gpu/drm/amd/amdkfd/Makefile                |    2 +-
 drivers/gpu/drm/amd/powerplay/Makefile             |    2 +-
 drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c        |    4 +-
 drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c      |    2 +-
 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c   |    4 +-
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c |    5 +-
 drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c   |    8 +-
 drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c      |    5 +-
 drivers/gpu/drm/arm/malidp_drv.h                   |    2 +-
 drivers/gpu/drm/arm/malidp_planes.c                |   18 +-
 drivers/gpu/drm/armada/armada_overlay.c            |    2 +-
 drivers/gpu/drm/ast/Makefile                       |    2 -
 drivers/gpu/drm/ast/ast_ttm.c                      |    3 +-
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c    |   20 +-
 drivers/gpu/drm/bochs/Makefile                     |    1 -
 drivers/gpu/drm/bochs/bochs.h                      |    4 +-
 drivers/gpu/drm/bridge/Makefile                    |    2 -
 drivers/gpu/drm/bridge/nxp-ptn3460.c               |   12 +-
 drivers/gpu/drm/bridge/parade-ps8622.c             |   10 +-
 drivers/gpu/drm/bridge/sii902x.c                   |    6 +-
 drivers/gpu/drm/bridge/synopsys/dw-hdmi.c          |   46 +-
 drivers/gpu/drm/cirrus/Makefile                    |    1 -
 drivers/gpu/drm/cirrus/cirrus_ttm.c                |    3 +-
 drivers/gpu/drm/drm_atomic.c                       |   89 +-
 drivers/gpu/drm/drm_atomic_helper.c                |   14 +-
 drivers/gpu/drm/drm_blend.c                        |   45 +-
 drivers/gpu/drm/drm_color_mgmt.c                   |    9 +-
 drivers/gpu/drm/drm_connector.c                    |   64 +
 drivers/gpu/drm/drm_dp_mst_topology.c              |  164 ++-
 drivers/gpu/drm/drm_fb_cma_helper.c                |   29 +-
 drivers/gpu/drm/drm_fb_helper.c                    |    4 +-
 drivers/gpu/drm/drm_file.c                         |    8 +-
 drivers/gpu/drm/drm_gem.c                          |    6 +-
 drivers/gpu/drm/drm_irq.c                          |  129 +-
 drivers/gpu/drm/drm_plane_helper.c                 |   13 +-
 drivers/gpu/drm/drm_prime.c                        |   30 +-
 drivers/gpu/drm/drm_rect.c                         |   36 +-
 drivers/gpu/drm/etnaviv/etnaviv_gem.c              |   12 +-
 drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c        |    4 +-
 drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c       |   12 +-
 drivers/gpu/drm/exynos/exynos_drm_drv.c            |    8 +-
 drivers/gpu/drm/exynos/exynos_drm_gem.c            |   11 +-
 drivers/gpu/drm/gma500/Makefile                    |    1 -
 drivers/gpu/drm/gma500/mdfld_tpo_vid.c             |   53 +-
 drivers/gpu/drm/hisilicon/hibmc/Makefile           |    1 -
 drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c        |    2 +-
 drivers/gpu/drm/i2c/Makefile                       |    2 -
 drivers/gpu/drm/i810/Makefile                      |    1 -
 drivers/gpu/drm/i915/Kconfig.debug                 |   12 +
 drivers/gpu/drm/i915/Makefile                      |    2 +
 drivers/gpu/drm/i915/dvo_ch7017.c                  |    4 +-
 drivers/gpu/drm/i915/gvt/scheduler.c               |   12 +-
 drivers/gpu/drm/i915/i915_cmd_parser.c             |   10 +-
 drivers/gpu/drm/i915/i915_debugfs.c                |  273 ++--
 drivers/gpu/drm/i915/i915_drv.c                    |   27 +-
 drivers/gpu/drm/i915/i915_drv.h                    |  347 +++--
 drivers/gpu/drm/i915/i915_gem.c                    |  268 ++--
 drivers/gpu/drm/i915/i915_gem.h                    |    2 +
 drivers/gpu/drm/i915/i915_gem_clflush.c            |    8 +-
 drivers/gpu/drm/i915/i915_gem_clflush.h            |    1 -
 drivers/gpu/drm/i915/i915_gem_context.c            |  116 +-
 drivers/gpu/drm/i915/i915_gem_dmabuf.c             |   24 +
 drivers/gpu/drm/i915/i915_gem_execbuffer.c         |   46 +-
 drivers/gpu/drm/i915/i915_gem_gtt.c                |  153 +-
 drivers/gpu/drm/i915/i915_gem_object.h             |    4 +-
 drivers/gpu/drm/i915/i915_gem_request.c            |  185 ++-
 drivers/gpu/drm/i915/i915_gem_request.h            |   14 +-
 drivers/gpu/drm/i915/i915_gem_shrinker.c           |   66 +-
 drivers/gpu/drm/i915/i915_gem_stolen.c             |    4 +-
 drivers/gpu/drm/i915/i915_gem_timeline.c           |   95 +-
 drivers/gpu/drm/i915/i915_gem_timeline.h           |   47 +-
 drivers/gpu/drm/i915/i915_gem_userptr.c            |    8 +-
 drivers/gpu/drm/i915/i915_gpu_error.c              |   59 +-
 drivers/gpu/drm/i915/i915_guc_submission.c         |   96 +-
 drivers/gpu/drm/i915/i915_irq.c                    |   90 +-
 drivers/gpu/drm/i915/i915_pci.c                    |    5 -
 drivers/gpu/drm/i915/i915_perf.c                   |  395 ++++--
 drivers/gpu/drm/i915/i915_reg.h                    |   30 +-
 drivers/gpu/drm/i915/i915_sw_fence.c               |   62 +-
 drivers/gpu/drm/i915/i915_sw_fence.h               |    1 -
 drivers/gpu/drm/i915/i915_syncmap.c                |  412 ++++++
 drivers/gpu/drm/i915/i915_syncmap.h                |   38 +
 drivers/gpu/drm/i915/i915_sysfs.c                  |   26 +-
 drivers/gpu/drm/i915/i915_trace.h                  |   49 +
 drivers/gpu/drm/i915/i915_utils.h                  |   34 +-
 drivers/gpu/drm/i915/intel_atomic_plane.c          |   30 +-
 drivers/gpu/drm/i915/intel_audio.c                 |   19 +-
 drivers/gpu/drm/i915/intel_breadcrumbs.c           |   13 +-
 drivers/gpu/drm/i915/intel_cdclk.c                 |   16 +-
 drivers/gpu/drm/i915/intel_crt.c                   |   10 +-
 drivers/gpu/drm/i915/intel_device_info.c           |    2 +-
 drivers/gpu/drm/i915/intel_display.c               |  804 ++++++-----
 drivers/gpu/drm/i915/intel_dp.c                    |  360 +++--
 drivers/gpu/drm/i915/intel_dp_aux_backlight.c      |   45 +-
 drivers/gpu/drm/i915/intel_dp_link_training.c      |   25 +-
 drivers/gpu/drm/i915/intel_dp_mst.c                |   63 +-
 drivers/gpu/drm/i915/intel_drv.h                   |   87 +-
 drivers/gpu/drm/i915/intel_dsi_vbt.c               |    8 +-
 drivers/gpu/drm/i915/intel_dvo.c                   |    2 +-
 drivers/gpu/drm/i915/intel_engine_cs.c             |  231 ++-
 drivers/gpu/drm/i915/intel_fbc.c                   |    6 +-
 drivers/gpu/drm/i915/intel_fbdev.c                 |    2 +-
 drivers/gpu/drm/i915/intel_guc_ct.c                |  461 ++++++
 drivers/gpu/drm/i915/intel_guc_ct.h                |   86 ++
 drivers/gpu/drm/i915/intel_guc_fwif.h              |   47 +-
 drivers/gpu/drm/i915/intel_guc_loader.c            |   19 +-
 drivers/gpu/drm/i915/intel_guc_log.c               |    6 +-
 drivers/gpu/drm/i915/intel_hangcheck.c             |    2 +-
 drivers/gpu/drm/i915/intel_hdmi.c                  |   25 +-
 drivers/gpu/drm/i915/intel_huc.c                   |   64 +-
 drivers/gpu/drm/i915/intel_lpe_audio.c             |   58 +-
 drivers/gpu/drm/i915/intel_lrc.c                   |  413 +++---
 drivers/gpu/drm/i915/intel_lrc.h                   |    2 -
 drivers/gpu/drm/i915/intel_panel.c                 |   17 +-
 drivers/gpu/drm/i915/intel_pipe_crc.c              |   30 +-
 drivers/gpu/drm/i915/intel_pm.c                    | 1483 ++++++++++++++------
 drivers/gpu/drm/i915/intel_ringbuffer.c            |  329 +++--
 drivers/gpu/drm/i915/intel_ringbuffer.h            |  105 +-
 drivers/gpu/drm/i915/intel_sdvo.c                  |   32 +-
 drivers/gpu/drm/i915/intel_sprite.c                |  144 +-
 drivers/gpu/drm/i915/intel_tv.c                    |  208 +--
 drivers/gpu/drm/i915/intel_uc.c                    |  155 +-
 drivers/gpu/drm/i915/intel_uc.h                    |   41 +-
 drivers/gpu/drm/i915/intel_uncore.c                |  384 +++--
 drivers/gpu/drm/i915/intel_uncore.h                |  170 +++
 .../gpu/drm/i915/selftests/i915_gem_coherency.c    |   10 +-
 drivers/gpu/drm/i915/selftests/i915_gem_dmabuf.c   |  100 ++
 drivers/gpu/drm/i915/selftests/i915_gem_object.c   |    4 +-
 drivers/gpu/drm/i915/selftests/i915_gem_request.c  |    2 +-
 drivers/gpu/drm/i915/selftests/i915_gem_timeline.c |  299 ++++
 .../gpu/drm/i915/selftests/i915_mock_selftests.h   |    3 +
 drivers/gpu/drm/i915/selftests/i915_random.c       |   11 +
 drivers/gpu/drm/i915/selftests/i915_random.h       |    2 +
 drivers/gpu/drm/i915/selftests/i915_sw_fence.c     |  582 ++++++++
 drivers/gpu/drm/i915/selftests/i915_syncmap.c      |  616 ++++++++
 drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c |   12 +-
 drivers/gpu/drm/i915/selftests/mock_engine.c       |   11 +-
 drivers/gpu/drm/i915/selftests/mock_gem_device.c   |   12 +-
 drivers/gpu/drm/i915/selftests/mock_timeline.c     |   45 +
 drivers/gpu/drm/i915/selftests/mock_timeline.h     |   33 +
 drivers/gpu/drm/i915/selftests/mock_uncore.c       |   46 +
 drivers/gpu/drm/i915/selftests/mock_uncore.h       |   30 +
 drivers/gpu/drm/imx/ipuv3-plane.c                  |    2 +-
 drivers/gpu/drm/mga/Makefile                       |    1 -
 drivers/gpu/drm/mgag200/Makefile                   |    1 -
 drivers/gpu/drm/mgag200/mgag200_ttm.c              |    3 +-
 drivers/gpu/drm/msm/Makefile                       |    2 +-
 drivers/gpu/drm/msm/dsi/dsi.h                      |    6 +-
 drivers/gpu/drm/msm/edp/edp.h                      |    4 +-
 drivers/gpu/drm/msm/edp/edp_ctrl.c                 |    6 +-
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c           |   10 +-
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c    |    6 +-
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c    |    7 +-
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h            |    4 +-
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c   |    6 +-
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c    |    6 +-
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c           |   10 +-
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c        |    6 +-
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c            |   45 +-
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c          |   30 +-
 drivers/gpu/drm/msm/msm_fb.c                       |    6 +-
 drivers/gpu/drm/msm/msm_fbdev.c                    |    6 +-
 drivers/gpu/drm/msm/msm_gem.c                      |   10 +-
 drivers/gpu/drm/nouveau/Kbuild                     |    1 -
 drivers/gpu/drm/nouveau/nouveau_display.c          |   39 +-
 drivers/gpu/drm/nouveau/nouveau_display.h          |    8 +-
 drivers/gpu/drm/nouveau/nouveau_drm.c              |   15 +-
 drivers/gpu/drm/nouveau/nouveau_drv.h              |    2 +-
 drivers/gpu/drm/nouveau/nouveau_ttm.c              |    2 +-
 drivers/gpu/drm/nouveau/nv50_display.c             |    2 +-
 drivers/gpu/drm/omapdrm/Makefile                   |    1 -
 drivers/gpu/drm/omapdrm/omap_drv.c                 |    4 +-
 drivers/gpu/drm/omapdrm/omap_fb.c                  |   18 +-
 drivers/gpu/drm/omapdrm/omap_plane.c               |   16 +-
 drivers/gpu/drm/pl111/Kconfig                      |   13 +
 drivers/gpu/drm/pl111/Makefile                     |    7 +
 drivers/gpu/drm/pl111/pl111_connector.c            |  127 ++
 drivers/gpu/drm/pl111/pl111_debugfs.c              |   55 +
 drivers/gpu/drm/pl111/pl111_display.c              |  476 +++++++
 drivers/gpu/drm/pl111/pl111_drm.h                  |   67 +
 drivers/gpu/drm/pl111/pl111_drv.c                  |  269 ++++
 drivers/gpu/drm/qxl/Makefile                       |    2 -
 drivers/gpu/drm/qxl/qxl_debugfs.c                  |    2 +-
 drivers/gpu/drm/qxl/qxl_display.c                  |    9 +-
 drivers/gpu/drm/qxl/qxl_drv.c                      |    6 +-
 drivers/gpu/drm/qxl/qxl_drv.h                      |   18 +-
 drivers/gpu/drm/qxl/qxl_fb.c                       |   11 +-
 drivers/gpu/drm/qxl/qxl_gem.c                      |    5 +-
 drivers/gpu/drm/qxl/qxl_ttm.c                      |   10 +-
 drivers/gpu/drm/r128/Makefile                      |    1 -
 drivers/gpu/drm/radeon/Makefile                    |    2 +-
 drivers/gpu/drm/radeon/btc_dpm.c                   |    2 +-
 drivers/gpu/drm/radeon/ci_dpm.c                    |    2 +-
 drivers/gpu/drm/radeon/ci_smc.c                    |    2 +-
 drivers/gpu/drm/radeon/cik.c                       |    2 +-
 drivers/gpu/drm/radeon/cypress_dpm.c               |    2 +-
 drivers/gpu/drm/radeon/kv_dpm.c                    |    2 +-
 drivers/gpu/drm/radeon/kv_smc.c                    |    2 +-
 drivers/gpu/drm/radeon/ni_dpm.c                    |    2 +-
 drivers/gpu/drm/radeon/r600_dpm.c                  |    2 +-
 drivers/gpu/drm/radeon/radeon.h                    |   10 +-
 drivers/gpu/drm/radeon/radeon_cs.c                 |   11 +-
 drivers/gpu/drm/radeon/radeon_drv.c                |   20 +-
 drivers/gpu/drm/radeon/radeon_gem.c                |    2 +-
 drivers/gpu/drm/radeon/radeon_kms.c                |   37 -
 drivers/gpu/drm/radeon/radeon_mode.h               |    3 +
 drivers/gpu/drm/radeon/radeon_ring.c               |    4 +-
 drivers/gpu/drm/radeon/radeon_ttm.c                |   10 +-
 drivers/gpu/drm/radeon/radeon_vm.c                 |    4 +-
 drivers/gpu/drm/radeon/rs780_dpm.c                 |    2 +-
 drivers/gpu/drm/radeon/rv6xx_dpm.c                 |    2 +-
 drivers/gpu/drm/radeon/rv730_dpm.c                 |    2 +-
 drivers/gpu/drm/radeon/rv740_dpm.c                 |    2 +-
 drivers/gpu/drm/radeon/rv770_dpm.c                 |    2 +-
 drivers/gpu/drm/radeon/rv770_smc.c                 |    2 +-
 drivers/gpu/drm/radeon/si_dpm.c                    |    2 +-
 drivers/gpu/drm/radeon/si_smc.c                    |    2 +-
 drivers/gpu/drm/radeon/sumo_dpm.c                  |    2 +-
 drivers/gpu/drm/radeon/sumo_smc.c                  |    2 +-
 drivers/gpu/drm/radeon/trinity_dpm.c               |    2 +-
 drivers/gpu/drm/radeon/trinity_smc.c               |    2 +-
 drivers/gpu/drm/rockchip/analogix_dp-rockchip.c    |   14 +-
 drivers/gpu/drm/rockchip/rockchip_drm_drv.h        |    3 +-
 drivers/gpu/drm/rockchip/rockchip_drm_vop.c        |   20 +-
 drivers/gpu/drm/savage/Makefile                    |    1 -
 drivers/gpu/drm/selftests/test-drm_mm.c            |   28 +
 drivers/gpu/drm/sis/Makefile                       |    1 -
 drivers/gpu/drm/sti/sti_compositor.c               |    2 +-
 drivers/gpu/drm/sti/sti_cursor.c                   |    5 +-
 drivers/gpu/drm/sti/sti_dvo.c                      |    3 +-
 drivers/gpu/drm/sti/sti_gdp.c                      |    5 +-
 drivers/gpu/drm/sti/sti_hda.c                      |    9 +-
 drivers/gpu/drm/sti/sti_hdmi.c                     |   23 +-
 drivers/gpu/drm/sti/sti_hqvdp.c                    |    7 +-
 drivers/gpu/drm/sti/sti_mixer.c                    |    3 +-
 drivers/gpu/drm/sti/sti_tvout.c                    |    7 +-
 drivers/gpu/drm/sti/sti_vid.c                      |    5 +-
 drivers/gpu/drm/stm/Kconfig                        |   16 +
 drivers/gpu/drm/stm/Makefile                       |    5 +
 drivers/gpu/drm/stm/drv.c                          |  221 +++
 drivers/gpu/drm/stm/ltdc.c                         | 1160 +++++++++++++++
 drivers/gpu/drm/stm/ltdc.h                         |   40 +
 drivers/gpu/drm/tdfx/Makefile                      |    1 -
 drivers/gpu/drm/tegra/drm.c                        |    4 +-
 drivers/gpu/drm/tilcdc/Makefile                    |    1 -
 drivers/gpu/drm/tilcdc/tilcdc_drv.c                |    3 +-
 drivers/gpu/drm/ttm/Makefile                       |    1 -
 drivers/gpu/drm/ttm/ttm_bo_vm.c                    |    6 +-
 drivers/gpu/drm/ttm/ttm_tt.c                       |   13 +-
 drivers/gpu/drm/udl/Makefile                       |    3 -
 drivers/gpu/drm/udl/udl_dmabuf.c                   |    2 +-
 drivers/gpu/drm/udl/udl_gem.c                      |    2 +-
 drivers/gpu/drm/vc4/Kconfig                        |    2 +-
 drivers/gpu/drm/vc4/Makefile                       |    3 +-
 drivers/gpu/drm/vc4/vc4_bo.c                       |   37 +-
 drivers/gpu/drm/vc4/vc4_crtc.c                     |   48 +-
 drivers/gpu/drm/vc4/vc4_dpi.c                      |   16 +-
 drivers/gpu/drm/vc4/vc4_drv.c                      |    8 +-
 drivers/gpu/drm/vc4/vc4_drv.h                      |   74 +-
 drivers/gpu/drm/vc4/vc4_dsi.c                      |  140 +-
 drivers/gpu/drm/vc4/vc4_fence.c                    |   56 +
 drivers/gpu/drm/vc4/vc4_gem.c                      |  176 ++-
 drivers/gpu/drm/vc4/vc4_hdmi.c                     |  202 +--
 drivers/gpu/drm/vc4/vc4_hvs.c                      |    2 +-
 drivers/gpu/drm/vc4/vc4_irq.c                      |   65 +-
 drivers/gpu/drm/vc4/vc4_kms.c                      |   22 +-
 drivers/gpu/drm/vc4/vc4_plane.c                    |    9 +-
 drivers/gpu/drm/vc4/vc4_render_cl.c                |    3 +-
 drivers/gpu/drm/vc4/vc4_v3d.c                      |  184 ++-
 drivers/gpu/drm/vc4/vc4_validate.c                 |   57 +-
 drivers/gpu/drm/vgem/Makefile                      |    1 -
 drivers/gpu/drm/vgem/vgem_drv.c                    |  194 ++-
 drivers/gpu/drm/vgem/vgem_drv.h                    |    2 +
 drivers/gpu/drm/via/Makefile                       |    1 -
 drivers/gpu/drm/virtio/Makefile                    |    2 -
 drivers/gpu/drm/virtio/virtgpu_debugfs.c           |    2 +-
 drivers/gpu/drm/virtio/virtgpu_drv.c               |    4 +-
 drivers/gpu/drm/virtio/virtgpu_drv.h               |    8 +-
 drivers/gpu/drm/virtio/virtgpu_ioctl.c             |   32 +-
 drivers/gpu/drm/virtio/virtgpu_ttm.c               |   10 +-
 drivers/gpu/drm/vmwgfx/Makefile                    |    3 -
 drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c             |    3 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_context.c            |    3 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c            |    3 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c                |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_msg.c                |    2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_shader.c             |    3 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_surface.c            |    3 +-
 drivers/gpu/drm/zte/Makefile                       |    1 +
 drivers/gpu/drm/zte/zx_common_regs.h               |   31 +
 drivers/gpu/drm/zte/zx_drm_drv.c                   |    1 +
 drivers/gpu/drm/zte/zx_drm_drv.h                   |    1 +
 drivers/gpu/drm/zte/zx_plane.c                     |    1 +
 drivers/gpu/drm/zte/zx_plane_regs.h                |   18 -
 drivers/gpu/drm/zte/zx_vga.c                       |  531 +++++++
 drivers/gpu/drm/zte/zx_vga_regs.h                  |   36 +
 drivers/gpu/drm/zte/zx_vou.c                       |   36 +-
 drivers/gpu/drm/zte/zx_vou_regs.h                  |   12 +-
 include/drm/drmP.h                                 |   10 -
 include/drm/drm_atomic.h                           |   95 ++
 include/drm/drm_blend.h                            |   22 +-
 include/drm/drm_bridge.h                           |   42 +-
 include/drm/drm_color_mgmt.h                       |    2 +
 include/drm/drm_connector.h                        |   23 +-
 include/drm/drm_crtc.h                             |   62 +-
 include/drm/drm_dp_helper.h                        |  168 +++
 include/drm/drm_dp_mst_helper.h                    |   26 +
 include/drm/drm_drv.h                              |   75 +-
 include/drm/drm_fb_cma_helper.h                    |    4 +
 include/drm/drm_gem_cma_helper.h                   |   17 +-
 include/drm/drm_irq.h                              |   21 +-
 include/drm/drm_mem_util.h                         |   78 -
 include/drm/drm_modeset_helper_vtables.h           |  159 ++-
 include/drm/drm_panel.h                            |    2 +
 include/drm/drm_prime.h                            |    7 +
 include/drm/intel_lpe_audio.h                      |   22 +-
 include/drm/ttm/ttm_bo_driver.h                    |    9 +-
 include/drm/ttm/ttm_execbuf_util.h                 |    3 +-
 include/drm/ttm/ttm_lock.h                         |    3 +-
 include/drm/ttm/ttm_object.h                       |    3 +-
 include/linux/amba/clcd-regs.h                     |   86 ++
 include/linux/amba/clcd.h                          |   68 +-
 include/linux/sync_file.h                          |   14 +-
 include/uapi/drm/drm_mode.h                        |   49 +-
 include/uapi/drm/i915_drm.h                        |   17 +-
 sound/x86/intel_hdmi_audio.c                       |  324 +++--
 sound/x86/intel_hdmi_audio.h                       |   20 +-
 379 files changed, 14026 insertions(+), 4719 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/display/st,stm32-ltdc.txt
 create mode 100644 Documentation/gpu/pl111.rst
 create mode 100644 drivers/gpu/drm/i915/i915_syncmap.c
 create mode 100644 drivers/gpu/drm/i915/i915_syncmap.h
 create mode 100644 drivers/gpu/drm/i915/intel_guc_ct.c
 create mode 100644 drivers/gpu/drm/i915/intel_guc_ct.h
 create mode 100644 drivers/gpu/drm/i915/intel_uncore.h
 create mode 100644 drivers/gpu/drm/i915/selftests/i915_gem_timeline.c
 create mode 100644 drivers/gpu/drm/i915/selftests/i915_sw_fence.c
 create mode 100644 drivers/gpu/drm/i915/selftests/i915_syncmap.c
 create mode 100644 drivers/gpu/drm/i915/selftests/mock_timeline.c
 create mode 100644 drivers/gpu/drm/i915/selftests/mock_timeline.h
 create mode 100644 drivers/gpu/drm/i915/selftests/mock_uncore.c
 create mode 100644 drivers/gpu/drm/i915/selftests/mock_uncore.h
 create mode 100644 drivers/gpu/drm/pl111/Kconfig
 create mode 100644 drivers/gpu/drm/pl111/Makefile
 create mode 100644 drivers/gpu/drm/pl111/pl111_connector.c
 create mode 100644 drivers/gpu/drm/pl111/pl111_debugfs.c
 create mode 100644 drivers/gpu/drm/pl111/pl111_display.c
 create mode 100644 drivers/gpu/drm/pl111/pl111_drm.h
 create mode 100644 drivers/gpu/drm/pl111/pl111_drv.c
 create mode 100644 drivers/gpu/drm/stm/Kconfig
 create mode 100644 drivers/gpu/drm/stm/Makefile
 create mode 100644 drivers/gpu/drm/stm/drv.c
 create mode 100644 drivers/gpu/drm/stm/ltdc.c
 create mode 100644 drivers/gpu/drm/stm/ltdc.h
 create mode 100644 drivers/gpu/drm/vc4/vc4_fence.c
 create mode 100644 drivers/gpu/drm/zte/zx_common_regs.h
 create mode 100644 drivers/gpu/drm/zte/zx_vga.c
 create mode 100644 drivers/gpu/drm/zte/zx_vga_regs.h
 delete mode 100644 include/drm/drm_mem_util.h
 create mode 100644 include/linux/amba/clcd-regs.h
Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD)
$ git merge drm-panel/drm/panel/for-next
Already up-to-date.
Merging drm-intel/for-linux-next (bef8c056fba0 drm/i915/psr: disable psr2 for resolution greater than 32X20)
$ git merge drm-intel/for-linux-next
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/i915/i915_debugfs.c    |  30 +-
 drivers/gpu/drm/i915/i915_drv.c        |   2 +
 drivers/gpu/drm/i915/i915_drv.h        |   3 -
 drivers/gpu/drm/i915/i915_gem.c        |   4 +
 drivers/gpu/drm/i915/i915_gem_object.h |  17 +-
 drivers/gpu/drm/i915/i915_pci.c        |   1 -
 drivers/gpu/drm/i915/i915_reg.h        |   7 -
 drivers/gpu/drm/i915/intel_atomic.c    | 135 ++++++--
 drivers/gpu/drm/i915/intel_display.c   |  51 +---
 drivers/gpu/drm/i915/intel_dp.c        | 155 ++--------
 drivers/gpu/drm/i915/intel_drv.h       |  34 ++-
 drivers/gpu/drm/i915/intel_dsi.c       |  71 ++---
 drivers/gpu/drm/i915/intel_engine_cs.c |  18 +-
 drivers/gpu/drm/i915/intel_gvt.c       |  43 ++-
 drivers/gpu/drm/i915/intel_gvt.h       |   5 +
 drivers/gpu/drm/i915/intel_hdmi.c      | 149 ++-------
 drivers/gpu/drm/i915/intel_lvds.c      |  57 +---
 drivers/gpu/drm/i915/intel_psr.c       |   5 +-
 drivers/gpu/drm/i915/intel_sdvo.c      | 541 +++++++++++++++++----------------
 drivers/gpu/drm/i915/intel_uncore.c    | 126 --------
 20 files changed, 610 insertions(+), 844 deletions(-)
Merging drm-tegra/drm/tegra/for-next (b0d36daa0ab5 gpu: host1x: Fix host1x driver shutdown)
$ git merge drm-tegra/drm/tegra/for-next
Already up-to-date.
Merging drm-misc/for-linux-next (7dbcbce9f551 drm/bridge: analogix-anx78xx: Use bridge->mode_valid() callback)
$ git merge drm-misc/for-linux-next
Auto-merging drivers/gpu/drm/i915/intel_display.c
Auto-merging Documentation/gpu/todo.rst
Merge made by the 'recursive' strategy.
 Documentation/gpu/todo.rst                  |  13 ----
 drivers/gpu/drm/bridge/analogix-anx78xx.c   |  14 ++--
 drivers/gpu/drm/drm_atomic_helper.c         |  76 +++++++++++++++++++-
 drivers/gpu/drm/drm_bridge.c                |  33 +++++++++
 drivers/gpu/drm/drm_crtc_helper_internal.h  |  12 ++++
 drivers/gpu/drm/drm_probe_helper.c          | 105 ++++++++++++++++++++++++++--
 drivers/gpu/drm/exynos/exynos_drm_drv.c     |  14 ++--
 drivers/gpu/drm/i915/intel_display.c        |   5 +-
 drivers/gpu/drm/mediatek/mtk_drm_crtc.c     |   5 +-
 drivers/gpu/drm/nouveau/nv50_display.c      |   5 +-
 drivers/gpu/drm/rockchip/rockchip_drm_vop.c |  11 +--
 drivers/gpu/drm/vc4/vc4_crtc.c              |   6 +-
 drivers/gpu/drm/virtio/virtgpu_drm_bus.c    |   1 -
 drivers/gpu/drm/virtio/virtgpu_kms.c        |   4 +-
 include/drm/drmP.h                          |   2 -
 include/drm/drm_bridge.h                    |   2 +
 include/drm/drm_connector.h                 |  15 ----
 17 files changed, 261 insertions(+), 62 deletions(-)
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
$ git merge drm-exynos/exynos-drm/for-next
Already up-to-date.
Merging drm-msm/msm-next (98db803f6413 msm/drm: gpu: Dynamically locate the clocks from the device tree)
$ git merge drm-msm/msm-next
Already up-to-date.
Merging hdlcd/for-upstream/hdlcd (1de3cd4fb49f drm: hdlcd: Fix the calculation of the scanout start address)
$ git merge hdlcd/for-upstream/hdlcd
Already up-to-date.
Merging mali-dp/for-upstream/mali-dp (763656d30b3d drm: mali-dp: use div_u64 for expensive 64-bit divisions)
$ git merge mali-dp/for-upstream/mali-dp
Already up-to-date.
Merging sunxi-drm/sunxi-drm/for-next (a7047675206a drm/sun4i: Add compatible for the A10s pipeline)
$ git merge sunxi-drm/sunxi-drm/for-next
Merge made by the 'recursive' strategy.
 .../bindings/display/sunxi/sun4i-drm.txt           | 127 +++++-
 drivers/gpu/drm/sun4i/Kconfig                      |  28 ++
 drivers/gpu/drm/sun4i/Makefile                     |  14 +-
 drivers/gpu/drm/sun4i/sun4i_backend.c              | 122 +++--
 drivers/gpu/drm/sun4i/sun4i_backend.h              |  15 +-
 drivers/gpu/drm/sun4i/sun4i_crtc.c                 |  32 +-
 drivers/gpu/drm/sun4i/sun4i_crtc.h                 |   5 +-
 drivers/gpu/drm/sun4i/sun4i_drv.c                  |  19 +-
 drivers/gpu/drm/sun4i/sun4i_drv.h                  |   5 +-
 drivers/gpu/drm/sun4i/sun4i_hdmi.h                 | 157 +++++++
 drivers/gpu/drm/sun4i/sun4i_hdmi_ddc_clk.c         | 127 ++++++
 drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c             | 501 +++++++++++++++++++++
 drivers/gpu/drm/sun4i/sun4i_hdmi_tmds_clk.c        | 225 +++++++++
 drivers/gpu/drm/sun4i/sun4i_layer.c                |  21 +-
 drivers/gpu/drm/sun4i/sun4i_layer.h                |   6 +-
 drivers/gpu/drm/sun4i/sun4i_rgb.c                  |   3 +-
 drivers/gpu/drm/sun4i/sun4i_tcon.c                 | 142 +++++-
 drivers/gpu/drm/sun4i/sun4i_tcon.h                 |  10 +-
 drivers/gpu/drm/sun4i/sun4i_tv.c                   |  12 +-
 drivers/gpu/drm/sun4i/sun8i_layer.c                | 134 ++++++
 drivers/gpu/drm/sun4i/sun8i_layer.h                |  36 ++
 drivers/gpu/drm/sun4i/sun8i_mixer.c                | 414 +++++++++++++++++
 drivers/gpu/drm/sun4i/sun8i_mixer.h                | 137 ++++++
 drivers/gpu/drm/sun4i/sunxi_engine.h               |  98 ++++
 24 files changed, 2285 insertions(+), 105 deletions(-)
 create mode 100644 drivers/gpu/drm/sun4i/sun4i_hdmi.h
 create mode 100644 drivers/gpu/drm/sun4i/sun4i_hdmi_ddc_clk.c
 create mode 100644 drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
 create mode 100644 drivers/gpu/drm/sun4i/sun4i_hdmi_tmds_clk.c
 create mode 100644 drivers/gpu/drm/sun4i/sun8i_layer.c
 create mode 100644 drivers/gpu/drm/sun4i/sun8i_layer.h
 create mode 100644 drivers/gpu/drm/sun4i/sun8i_mixer.c
 create mode 100644 drivers/gpu/drm/sun4i/sun8i_mixer.h
 create mode 100644 drivers/gpu/drm/sun4i/sunxi_engine.h
Merging imx-drm/imx-drm/next (b8f0951de854 gpu: ipu-v3: prg: remove counter load enable)
$ git merge imx-drm/imx-drm/next
Merge made by the 'recursive' strategy.
 drivers/gpu/ipu-v3/ipu-prg.c | 2 --
 1 file changed, 2 deletions(-)
Merging etnaviv/etnaviv/next (d79fd1ccf2cd drm/etnaviv: implement cooling support for new GPU cores)
$ git merge etnaviv/etnaviv/next
Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/etnaviv/common.xml.h        | 150 +++++++++++++++++-----------
 drivers/gpu/drm/etnaviv/etnaviv_drv.c       |   1 +
 drivers/gpu/drm/etnaviv/etnaviv_drv.h       |   1 +
 drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c |   7 ++
 drivers/gpu/drm/etnaviv/etnaviv_gpu.c       |  30 ++++--
 drivers/gpu/drm/etnaviv/etnaviv_gpu.h       |   2 +
 6 files changed, 122 insertions(+), 69 deletions(-)
Merging kspp/for-next/kspp (4b49d6a66b06 Merge branch 'for-next/gcc-plugin/randstruct' into for-next/kspp)
$ git merge kspp/for-next/kspp
Merge made by the 'recursive' strategy.
 Documentation/dontdiff                             |    2 +
 arch/Kconfig                                       |   41 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c       |   10 +-
 .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c   |   20 +-
 .../media/platform/mtk-vcodec/vdec/vdec_h264_if.c  |    8 +-
 .../media/platform/mtk-vcodec/vdec/vdec_vp8_if.c   |    8 +-
 .../media/platform/mtk-vcodec/vdec/vdec_vp9_if.c   |    8 +-
 drivers/misc/sgi-xp/xp.h                           |   12 +-
 drivers/misc/sgi-xp/xp_main.c                      |   36 +-
 fs/nfs/namespace.c                                 |    2 +-
 fs/ntfs/namei.c                                    |    2 +-
 fs/ocfs2/export.c                                  |    2 +-
 include/linux/compiler-gcc.h                       |   13 +
 include/linux/compiler.h                           |   12 +
 include/linux/vermagic.h                           |    9 +-
 scripts/Makefile.gcc-plugins                       |    4 +
 scripts/gcc-plugins/.gitignore                     |    1 +
 scripts/gcc-plugins/Makefile                       |    8 +
 scripts/gcc-plugins/gcc-common.h                   |   12 +
 scripts/gcc-plugins/gen-random-seed.sh             |    8 +
 scripts/gcc-plugins/randomize_layout_plugin.c      | 1017 ++++++++++++++++++++
 21 files changed, 1173 insertions(+), 62 deletions(-)
 create mode 100644 scripts/gcc-plugins/.gitignore
 create mode 100644 scripts/gcc-plugins/gen-random-seed.sh
 create mode 100644 scripts/gcc-plugins/randomize_layout_plugin.c
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
$ git merge kconfig/for-next
Already up-to-date.
Merging regmap/for-next (bbbed1951704 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/rbtree' into regmap-next)
$ git merge regmap/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging sound/for-next (7421a1671abe ALSA: pcm: include pcm_local.h and remove some extraneous tabs)
$ git merge sound/for-next
Auto-merging sound/pci/hda/patch_realtek.c
Removing sound/atmel/abdac.c
Merge made by the 'recursive' strategy.
 drivers/dma/dw/Kconfig                             |   7 +-
 drivers/dma/dw/core.c                              | 332 +----------
 drivers/dma/dw/regs.h                              |  50 +-
 .../vc04_services/bcm2835-audio/bcm2835-pcm.c      |   5 +-
 include/linux/dma/dw.h                             |  21 -
 include/sound/ak4113.h                             |  13 +-
 include/sound/ak4114.h                             |  13 +-
 include/sound/ak4117.h                             |  13 +-
 include/sound/core.h                               |   6 +-
 include/sound/mixer_oss.h                          |   2 +-
 include/sound/opl3.h                               |   4 +-
 include/sound/pcm-indirect.h                       |  10 +-
 include/sound/pcm.h                                |  59 +-
 include/sound/rawmidi.h                            |   4 +-
 sound/Kconfig                                      |   4 +-
 sound/aoa/codecs/tas.c                             |  14 +-
 sound/aoa/fabrics/layout.c                         |   8 +-
 sound/atmel/Kconfig                                |  13 +-
 sound/atmel/Makefile                               |   2 -
 sound/atmel/abdac.c                                | 610 ---------------------
 sound/atmel/ac97c.c                                | 447 +++------------
 sound/core/control.c                               |  70 +--
 sound/core/ctljack.c                               |   2 +-
 sound/core/info.c                                  |   6 +-
 sound/core/oss/pcm_oss.c                           |  20 +-
 sound/core/oss/pcm_plugin.c                        |   5 +-
 sound/core/oss/pcm_plugin.h                        |   4 +-
 sound/core/pcm.c                                   |  35 +-
 sound/core/pcm_compat.c                            |  12 +-
 sound/core/pcm_drm_eld.c                           |   8 +-
 sound/core/pcm_lib.c                               |  10 +-
 sound/core/pcm_local.h                             |  51 ++
 sound/core/pcm_misc.c                              |   3 +
 sound/core/pcm_native.c                            | 408 ++++++--------
 sound/core/pcm_timer.c                             |  14 +-
 sound/drivers/opl3/opl3_oss.c                      |  14 -
 sound/drivers/opl4/opl4_lib.c                      |   4 +-
 sound/drivers/opl4/opl4_local.h                    |   2 +-
 sound/drivers/vx/vx_mixer.c                        |  24 +-
 sound/firewire/amdtp-am824.c                       |  71 +--
 sound/firewire/amdtp-am824.h                       |   6 +-
 sound/firewire/bebob/bebob_maudio.c                |   8 +-
 sound/firewire/bebob/bebob_pcm.c                   |   4 -
 sound/firewire/dice/dice-pcm.c                     |   6 -
 sound/firewire/digi00x/amdtp-dot.c                 |  63 +--
 sound/firewire/digi00x/digi00x-pcm.c               |   7 +-
 sound/firewire/digi00x/digi00x.h                   |   1 -
 sound/firewire/fireworks/fireworks_pcm.c           |   4 -
 sound/firewire/oxfw/oxfw-pcm.c                     |   4 -
 sound/firewire/tascam/amdtp-tascam.c               |  62 +--
 sound/firewire/tascam/tascam-pcm.c                 |   7 +-
 sound/firewire/tascam/tascam.h                     |   1 -
 sound/i2c/other/ak4113.c                           |  23 +-
 sound/i2c/other/ak4114.c                           |  23 +-
 sound/i2c/other/ak4117.c                           |  23 +-
 sound/isa/cmi8328.c                                |   2 +-
 sound/isa/gus/gus_main.c                           |   2 +-
 sound/isa/gus/gus_pcm.c                            |  53 +-
 sound/isa/sb/emu8000.c                             |   2 +-
 sound/isa/sb/emu8000_pcm.c                         |  28 +-
 sound/isa/sb/sb16.c                                |   2 +-
 sound/isa/sb/sb16_csp.c                            |   4 +-
 sound/isa/sb/sb16_main.c                           |   2 +-
 sound/isa/sscape.c                                 |   2 +-
 sound/mips/hal2.c                                  |  18 +-
 sound/mips/sgio2audio.c                            |  14 +-
 sound/pci/cs4281.c                                 |   2 +-
 sound/pci/cs46xx/cs46xx_lib.c                      |  10 +-
 sound/pci/emu10k1/emufx.c                          | 127 +++--
 sound/pci/emu10k1/emupcm.c                         |   4 +-
 sound/pci/hda/hda_codec.c                          | 251 ++-------
 sound/pci/hda/hda_generic.c                        |  46 +-
 sound/pci/hda/hda_local.h                          |  61 ---
 sound/pci/hda/patch_realtek.c                      |  37 +-
 sound/pci/ice1712/ice1712.c                        |   6 +-
 sound/pci/ice1712/ice1724.c                        |   2 +-
 sound/pci/mixart/mixart_mixer.c                    |   6 +-
 sound/pci/rme32.c                                  |  10 +-
 sound/pci/vx222/vx222.c                            |   4 +-
 sound/pci/vx222/vx222.h                            |   2 +
 sound/pci/vx222/vx222_ops.c                        |  26 +-
 sound/pcmcia/vx/vxp_mixer.c                        |  14 +-
 sound/pcmcia/vx/vxp_ops.c                          |  28 +-
 sound/pcmcia/vx/vxpocket.c                         |   4 +-
 sound/pcmcia/vx/vxpocket.h                         |   2 +
 sound/ppc/awacs.c                                  |   4 +-
 sound/ppc/beep.c                                   |   2 +-
 sound/ppc/tumbler.c                                |   8 +-
 sound/sh/aica.c                                    |   4 +-
 sound/soc/sh/siu_dai.c                             |   4 +-
 sound/usb/Kconfig                                  |   2 +-
 sound/usb/mixer_quirks.c                           |   2 +-
 sound/usb/usx2y/us122l.c                           |  36 +-
 sound/usb/usx2y/us122l.h                           |   2 +
 94 files changed, 866 insertions(+), 2611 deletions(-)
 delete mode 100644 sound/atmel/abdac.c
 create mode 100644 sound/core/pcm_local.h
Merging sound-asoc/for-next (aed323d42578 Merge remote-tracking branches 'asoc/topic/stm32', 'asoc/topic/sunxi', 'asoc/topic/tlv320dac31xx' and 'asoc/topic/wm-adsp' into asoc-next)
$ git merge sound-asoc/for-next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/sound/audio-graph-card.txt | 124 +++
 .../bindings/sound/audio-graph-scu-card.txt        |  72 ++
 .../devicetree/bindings/sound/cs35l35.txt          |   3 +
 .../devicetree/bindings/sound/renesas,rsnd.txt     |  34 +-
 .../devicetree/bindings/sound/simple-scu-card.txt  |  65 +-
 .../devicetree/bindings/sound/st,stm32-i2s.txt     |  62 ++
 MAINTAINERS                                        |   2 +-
 drivers/of/base.c                                  |  62 +-
 include/linux/of_graph.h                           |  21 +
 include/sound/cs35l35.h                            |   2 +
 include/sound/hdmi-codec.h                         |   9 +
 include/sound/simple_card_utils.h                  |  10 +
 include/sound/soc.h                                |   3 +
 include/uapi/sound/snd_sst_tokens.h                |   5 +-
 sound/soc/atmel/atmel-classd.c                     |   9 +
 sound/soc/atmel/atmel-pcm.h                        |   6 +-
 sound/soc/codecs/ak4613.c                          |  18 +-
 sound/soc/codecs/cs35l35.c                         |  84 +-
 sound/soc/codecs/cs35l35.h                         |   6 +
 sound/soc/codecs/cs4271.c                          |   2 -
 sound/soc/codecs/da7213.c                          |  39 +-
 sound/soc/codecs/da7218.c                          |   2 +-
 sound/soc/codecs/hdmi-codec.c                      |  91 +-
 sound/soc/codecs/msm8916-wcd-analog.c              |   6 +-
 sound/soc/codecs/nau8824.c                         |  52 ++
 sound/soc/codecs/nau8824.h                         |  12 +
 sound/soc/codecs/rt286.c                           |   7 +
 sound/soc/codecs/rt5514.c                          |  37 +-
 sound/soc/codecs/rt5514.h                          |   6 +
 sound/soc/codecs/rt5665.c                          | 151 ++--
 sound/soc/codecs/tlv320aic31xx.c                   |   2 +-
 sound/soc/codecs/wm_adsp.c                         |   6 +-
 sound/soc/davinci/davinci-mcasp.c                  |  12 +-
 sound/soc/generic/Kconfig                          |  17 +
 sound/soc/generic/Makefile                         |   4 +
 sound/soc/generic/audio-graph-card.c               | 310 +++++++
 sound/soc/generic/audio-graph-scu-card.c           | 418 +++++++++
 sound/soc/generic/simple-card-utils.c              |  85 +-
 sound/soc/generic/simple-card.c                    |  16 +-
 sound/soc/generic/simple-scu-card.c                |   6 +-
 sound/soc/hisilicon/hi6210-i2s.c                   |  11 +-
 sound/soc/intel/Kconfig                            |  15 +
 sound/soc/intel/atom/sst-mfld-platform-pcm.c       |   2 +-
 sound/soc/intel/atom/sst/sst.c                     |  18 +-
 sound/soc/intel/atom/sst/sst_acpi.c                | 211 +++--
 sound/soc/intel/boards/Makefile                    |   2 +
 sound/soc/intel/boards/cht_bsw_max98090_ti.c       |  12 -
 sound/soc/intel/boards/kbl_rt5663_max98927.c       | 687 +++++++++++++++
 sound/soc/intel/common/sst-acpi.h                  |  23 +
 sound/soc/intel/common/sst-match-acpi.c            |  47 +-
 sound/soc/intel/skylake/skl-sst-ipc.c              |   5 +
 sound/soc/intel/skylake/skl-topology.c             |  23 +-
 sound/soc/intel/skylake/skl.c                      | 246 ++++--
 sound/soc/intel/skylake/skl.h                      |   4 +-
 sound/soc/sh/Kconfig                               |   2 +-
 sound/soc/sh/fsi.c                                 |  13 +-
 sound/soc/sh/rcar/adg.c                            |  14 +-
 sound/soc/sh/rcar/cmd.c                            |   4 +
 sound/soc/sh/rcar/core.c                           | 255 ++++--
 sound/soc/sh/rcar/gen.c                            |   3 +
 sound/soc/sh/rcar/rsnd.h                           |  13 +-
 sound/soc/sh/rcar/src.c                            |  30 +-
 sound/soc/sh/rcar/ssi.c                            |  76 +-
 sound/soc/sh/rcar/ssiu.c                           |  40 +-
 sound/soc/soc-core.c                               |  52 +-
 sound/soc/stm/Kconfig                              |   2 +-
 sound/soc/stm/Makefile                             |   4 +
 sound/soc/stm/stm32_i2s.c                          | 946 +++++++++++++++++++++
 sound/soc/sunxi/sun8i-codec-analog.c               |  35 +-
 sound/soc/zte/zx-i2s.c                             |   5 +-
 70 files changed, 4076 insertions(+), 602 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/sound/audio-graph-card.txt
 create mode 100644 Documentation/devicetree/bindings/sound/audio-graph-scu-card.txt
 create mode 100644 Documentation/devicetree/bindings/sound/st,stm32-i2s.txt
 create mode 100644 sound/soc/generic/audio-graph-card.c
 create mode 100644 sound/soc/generic/audio-graph-scu-card.c
 create mode 100644 sound/soc/intel/boards/kbl_rt5663_max98927.c
 create mode 100644 sound/soc/stm/stm32_i2s.c
Merging modules/modules-next (3e2e857f9c3a module: Add module name to modinfo)
$ git merge modules/modules-next
Merge made by the 'recursive' strategy.
 kernel/module.c       | 51 ++++++++++++++++++++++++++++++++-------------------
 scripts/mod/modpost.c |  1 +
 2 files changed, 33 insertions(+), 19 deletions(-)
Merging input/next (32a62b9441d8 Input: synaptics-rmi4 - change a char type to u8)
$ git merge input/next
Auto-merging include/linux/platform_data/tsc2007.h
Merge made by the 'recursive' strategy.
 arch/sh/boards/mach-ecovec24/setup.c           |  2 +-
 drivers/input/input.c                          | 12 ++---
 drivers/input/keyboard/lm8323.c                |  2 +-
 drivers/input/keyboard/mcs_touchkey.c          |  2 +-
 drivers/input/mouse/elan_i2c.h                 |  3 +-
 drivers/input/mouse/elan_i2c_core.c            | 40 ++++++++++++---
 drivers/input/mouse/elan_i2c_i2c.c             | 71 +++++++++++++++++++++++---
 drivers/input/mouse/elan_i2c_smbus.c           |  9 +++-
 drivers/input/mouse/elantech.c                 | 11 ++++
 drivers/input/rmi4/rmi_f34v7.c                 |  2 +-
 drivers/input/sparse-keymap.c                  | 14 -----
 drivers/input/touchscreen/mcs5000_ts.c         |  2 +-
 drivers/input/touchscreen/mms114.c             |  2 +-
 drivers/input/touchscreen/tsc2007_core.c       |  2 +-
 drivers/mfd/timberdale.c                       |  2 +-
 include/linux/input/sparse-keymap.h            |  1 -
 include/linux/{i2c => platform_data}/lm8323.h  |  0
 include/linux/{i2c => platform_data}/mcs.h     |  0
 include/linux/{i2c => platform_data}/mms114.h  |  0
 include/linux/{i2c => platform_data}/tsc2007.h |  2 +-
 20 files changed, 132 insertions(+), 47 deletions(-)
 rename include/linux/{i2c => platform_data}/lm8323.h (100%)
 rename include/linux/{i2c => platform_data}/mcs.h (100%)
 rename include/linux/{i2c => platform_data}/mms114.h (100%)
 rename include/linux/{i2c => platform_data}/tsc2007.h (94%)
Merging block/for-next (9c2c43e3c155 Merge branch 'for-4.13/block' into for-next)
$ git merge block/for-next
Merge made by the 'recursive' strategy.
 block/blk-mq-sched.c     | 62 ++++++++++++++++++++++++++++++++++---
 block/blk-mq-sched.h     |  4 +--
 block/blk-mq.c           | 80 ++++++------------------------------------------
 block/cfq-iosched.c      |  9 ------
 drivers/block/nbd.c      | 16 ++++++++--
 include/uapi/linux/nbd.h |  4 +++
 6 files changed, 85 insertions(+), 90 deletions(-)
Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c)
$ git merge lightnvm/for-next
Already up-to-date.
Merging device-mapper/for-next (8c4d04184254 dm kcopyd: add sequential write feature)
$ git merge device-mapper/for-next
Merge made by the 'recursive' strategy.
 drivers/md/dm-bio-prison-v1.c |   2 +-
 drivers/md/dm-bio-prison-v2.c |   2 +-
 drivers/md/dm-core.h          |   3 +
 drivers/md/dm-flakey.c        |  21 +++++-
 drivers/md/dm-integrity.c     |  27 ++-----
 drivers/md/dm-ioctl.c         | 114 ++++++++++++++++++++++-------
 drivers/md/dm-kcopyd.c        |  65 ++++++++++++++++-
 drivers/md/dm-linear.c        |  17 ++++-
 drivers/md/dm-table.c         | 162 ++++++++++++++++++++++++++++++++++++++++++
 drivers/md/dm-verity-target.c |   4 +-
 drivers/md/dm.c               |  97 ++++++++++++++++++++++++-
 include/linux/device-mapper.h |   8 +++
 include/linux/dm-kcopyd.h     |   1 +
 include/uapi/linux/dm-ioctl.h |   6 +-
 14 files changed, 469 insertions(+), 60 deletions(-)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
$ git merge pcmcia/master
Already up-to-date.
Merging mmc/next (6e75316c15df mmc: tmio: make sure SDIO gets reinitialized after resume)
$ git merge mmc/next
Auto-merging drivers/mmc/host/tmio_mmc_core.c
Auto-merging drivers/mmc/host/renesas_sdhi_sys_dmac.c
Auto-merging drivers/mmc/host/renesas_sdhi_core.c
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/mmc/rockchip-dw-mshc.txt   |   1 +
 drivers/mmc/core/Kconfig                           |  18 -
 drivers/mmc/core/block.c                           | 253 +++++----
 drivers/mmc/core/core.c                            |   2 +
 drivers/mmc/core/host.c                            |  74 +--
 drivers/mmc/core/mmc.c                             |   2 +
 drivers/mmc/core/mmc_ops.c                         |  10 +-
 drivers/mmc/core/mmc_ops.h                         |   1 +
 drivers/mmc/core/mmc_test.c                        |   2 -
 drivers/mmc/core/pwrseq.c                          |   8 +
 drivers/mmc/core/pwrseq.h                          |   3 +
 drivers/mmc/core/pwrseq_emmc.c                     |   2 +-
 drivers/mmc/core/queue.c                           | 243 ++------
 drivers/mmc/core/queue.h                           |  47 +-
 drivers/mmc/core/sd.c                              |  16 +-
 drivers/mmc/core/sdio_irq.c                        |  22 +-
 drivers/mmc/core/sdio_ops.h                        |   2 +
 drivers/mmc/host/Kconfig                           |  12 +-
 drivers/mmc/host/Makefile                          |   4 +-
 drivers/mmc/host/atmel-mci.c                       |  28 +-
 drivers/mmc/host/bcm2835.c                         |  12 +-
 drivers/mmc/host/cavium.c                          |   4 +-
 drivers/mmc/host/dw_mmc.c                          |  66 ++-
 drivers/mmc/host/mtk-sd.c                          |   2 +-
 drivers/mmc/host/pxamci.c                          |   6 +-
 drivers/mmc/host/renesas_sdhi.h                    |  39 ++
 .../host/{sh_mobile_sdhi.c => renesas_sdhi_core.c} | 233 ++------
 .../{tmio_mmc_dma.c => renesas_sdhi_sys_dmac.c}    | 166 +++++-
 drivers/mmc/host/sdhci-esdhc-imx.c                 | 192 ++++---
 drivers/mmc/host/sdhci-esdhc.h                     |   1 +
 drivers/mmc/host/sdhci-of-arasan.c                 |   2 +-
 drivers/mmc/host/sdhci-pci-core.c                  | 618 +++------------------
 drivers/mmc/host/sdhci-pci.h                       |  43 +-
 drivers/mmc/host/sdricoh_cs.c                      |   3 -
 drivers/mmc/host/tmio_mmc.c                        |  10 +-
 drivers/mmc/host/tmio_mmc.h                        |  53 +-
 .../mmc/host/{tmio_mmc_pio.c => tmio_mmc_core.c}   | 203 ++++---
 drivers/mmc/host/vub300.c                          |   3 +-
 include/linux/mfd/tmio.h                           |   2 +-
 include/linux/mmc/card.h                           |   2 -
 include/linux/mmc/host.h                           |   4 +
 41 files changed, 1032 insertions(+), 1382 deletions(-)
 create mode 100644 drivers/mmc/host/renesas_sdhi.h
 rename drivers/mmc/host/{sh_mobile_sdhi.c => renesas_sdhi_core.c} (67%)
 rename drivers/mmc/host/{tmio_mmc_dma.c => renesas_sdhi_sys_dmac.c} (58%)
 rename drivers/mmc/host/{tmio_mmc_pio.c => tmio_mmc_core.c} (93%)
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
$ git merge kgdb/kgdb-next
Auto-merging kernel/debug/kdb/kdb_io.c
Merge made by the 'recursive' strategy.
 kernel/debug/kdb/kdb_io.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging md/for-next (e153903686de md: report sector of stripes with check mismatches)
$ git merge md/for-next
Merge made by the 'recursive' strategy.
 drivers/md/bitmap.c     |  8 ++++----
 drivers/md/md-cluster.c |  4 +++-
 drivers/md/raid5.c      | 18 ++++++++++++++----
 3 files changed, 21 insertions(+), 9 deletions(-)
Merging mfd/for-mfd-next (60194d283dcf mfd: intel_quark_i2c_gpio: Add support for SIMATIC IOT2000 platform)
$ git merge mfd/for-mfd-next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/mfd/arizona.txt |   3 +-
 MAINTAINERS                                       |   4 +
 drivers/gpio/gpio-wcove.c                         |  14 +-
 drivers/mfd/Kconfig                               |  11 +-
 drivers/mfd/atmel-flexcom.c                       |   2 +-
 drivers/mfd/axp20x.c                              |   3 +-
 drivers/mfd/cros_ec.c                             |   2 +-
 drivers/mfd/exynos-lpass.c                        |   2 +-
 drivers/mfd/fsl-imx25-tsadc.c                     |   7 +-
 drivers/mfd/intel-lpss-pci.c                      |  24 +++
 drivers/mfd/intel_quark_i2c_gpio.c                |  49 +++--
 drivers/mfd/intel_soc_pmic_bxtwc.c                | 234 ++++++++++++++--------
 drivers/mfd/ipaq-micro.c                          |   5 -
 drivers/mfd/motorola-cpcap.c                      |  13 +-
 drivers/mfd/palmas.c                              |   2 +-
 drivers/mfd/qcom-spmi-pmic.c                      |   9 +-
 drivers/mfd/rn5t618.c                             |   2 +
 drivers/mfd/rtsx_pcr.c                            |  17 +-
 drivers/mfd/smsc-ece1099.c                        |   3 +-
 drivers/mfd/stm32-timers.c                        |  10 +-
 drivers/mfd/twl4030-irq.c                         |   4 +-
 drivers/mfd/wm831x-core.c                         |  26 ++-
 drivers/mfd/wm831x-i2c.c                          |   4 +
 drivers/mfd/wm831x-spi.c                          |   4 +
 drivers/platform/x86/intel_bxtwc_tmu.c            |   4 -
 drivers/thermal/intel_bxt_pmic_thermal.c          |   2 +-
 include/linux/mfd/intel_soc_pmic.h                |   5 +-
 include/linux/mfd/rtsx_pci.h                      |   5 +
 28 files changed, 299 insertions(+), 171 deletions(-)
$ git reset --hard HEAD^
HEAD is now at 2562a743be9b Merge remote-tracking branch 'md/for-next'
Merging next-20170530 version of mfd
$ git merge -m next-20170530/mfd 798e7538b1b9131c012d84e6bd7dfc7e868ec5ed
Merge made by the 'recursive' strategy.
 drivers/mfd/axp20x.c         |  3 ++-
 drivers/mfd/intel-lpss-pci.c | 24 ++++++++++++++++++++++++
 drivers/mfd/ipaq-micro.c     |  5 -----
 drivers/mfd/rn5t618.c        |  2 ++
 drivers/mfd/rtsx_pcr.c       | 17 +++++++++++++++--
 drivers/mfd/wm831x-core.c    | 26 ++++++++++++--------------
 include/linux/mfd/rtsx_pci.h |  5 +++++
 7 files changed, 60 insertions(+), 22 deletions(-)
Merging backlight/for-backlight-next (e739c5bb20be backlight: Add support for Arctic Sand LED backlight driver chips)
$ git merge backlight/for-backlight-next
Already up-to-date.
Merging battery/for-next (b5910897b2ee power_supply: Add Apple Brick ID power supply type)
$ git merge battery/for-next
Merge made by the 'recursive' strategy.
 .../bindings/power/supply/ltc3651-charger.txt      |  27 +++
 drivers/power/supply/Kconfig                       |   7 +
 drivers/power/supply/Makefile                      |   1 +
 drivers/power/supply/axp20x_usb_power.c            |   2 +-
 drivers/power/supply/cpcap-charger.c               |  83 ++++----
 drivers/power/supply/ltc3651-charger.c             | 210 +++++++++++++++++++++
 drivers/power/supply/power_supply_core.c           |  24 ++-
 drivers/power/supply/power_supply_sysfs.c          |   2 +-
 include/linux/power_supply.h                       |  15 +-
 9 files changed, 327 insertions(+), 44 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/power/supply/ltc3651-charger.txt
 create mode 100644 drivers/power/supply/ltc3651-charger.c
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
$ git merge omap_dss2/for-next
Already up-to-date.
Merging regulator/for-next (af7a73de20f9 Merge remote-tracking branches 'regulator/topic/settle' and 'regulator/topic/tps65917' into regulator-next)
$ git merge regulator/for-next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/regulator/regulator.txt    |   8 +
 MAINTAINERS                                        |   6 +-
 drivers/regulator/Kconfig                          |   8 +
 drivers/regulator/Makefile                         |   1 +
 drivers/regulator/axp20x-regulator.c               | 153 +++++++++++--
 drivers/regulator/core.c                           |   6 +
 drivers/regulator/lp8755.c                         |  14 +-
 drivers/regulator/lp87565-regulator.c              | 237 +++++++++++++++++++++
 drivers/regulator/max8997-regulator.c              |   9 +-
 drivers/regulator/of_regulator.c                   |  19 ++
 drivers/regulator/palmas-regulator.c               |  20 +-
 include/linux/mfd/axp20x.h                         |  37 ++++
 include/linux/mfd/palmas.h                         |   2 +
 include/linux/regulator/machine.h                  |   6 +
 14 files changed, 484 insertions(+), 42 deletions(-)
 create mode 100644 drivers/regulator/lp87565-regulator.c
Merging security/next (d68c51e0b377 Sync to mainline for security submaintainers to work against)
$ git merge security/next
Merge made by the 'recursive' strategy.
 security/Kconfig    |  2 +-
 security/security.c | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
Merging integrity/next (3dd0c8d06511 ima: provide ">" and "<" operators for fowner/uid/euid rules.)
$ git merge integrity/next
Already up-to-date.
Merging keys/keys-next (e36484b5ac31 crypto : asymmetric_keys : verify_pefile:zero memory content before freeing)
$ git merge keys/keys-next
Auto-merging security/keys/trusted.c
Auto-merging security/keys/keyctl.c
Auto-merging security/keys/gc.c
Auto-merging security/keys/encrypted-keys/encrypted.c
Auto-merging include/linux/key.h
Merge made by the 'recursive' strategy.
 crypto/asymmetric_keys/verify_pefile.c   |  4 +--
 include/linux/key.h                      |  1 -
 include/linux/mpi.h                      |  2 +-
 include/uapi/linux/keyctl.h              |  4 +--
 lib/mpi/mpicoder.c                       | 10 ++++---
 security/keys/dh.c                       | 34 +++++++++++-----------
 security/keys/encrypted-keys/encrypted.c | 31 +++++++++-----------
 security/keys/gc.c                       |  4 +--
 security/keys/keyctl.c                   |  4 ++-
 security/keys/trusted.c                  | 50 ++++++++++++++------------------
 security/keys/user_defined.c             | 16 +++++++---
 11 files changed, 79 insertions(+), 81 deletions(-)
Merging selinux/next (409dcf31538a selinux: Add a cache for quicker retreival of PKey SIDs)
$ git merge selinux/next
Auto-merging include/linux/lsm_hooks.h
Merge made by the 'recursive' strategy.
 drivers/infiniband/core/Makefile     |   3 +-
 drivers/infiniband/core/cache.c      |  43 ++-
 drivers/infiniband/core/core_priv.h  | 115 ++++++
 drivers/infiniband/core/device.c     |  86 +++++
 drivers/infiniband/core/mad.c        |  52 ++-
 drivers/infiniband/core/security.c   | 705 +++++++++++++++++++++++++++++++++++
 drivers/infiniband/core/uverbs_cmd.c |  15 +-
 drivers/infiniband/core/verbs.c      |  27 +-
 include/linux/lsm_audit.h            |  15 +
 include/linux/lsm_hooks.h            |  35 ++
 include/linux/security.h             |  50 +++
 include/rdma/ib_mad.h                |   4 +
 include/rdma/ib_verbs.h              |  49 +++
 security/Kconfig                     |   9 +
 security/lsm_audit.c                 |  16 +
 security/security.c                  |  48 +++
 security/selinux/Makefile            |   2 +-
 security/selinux/hooks.c             | 152 ++++++--
 security/selinux/ibpkey.c            | 245 ++++++++++++
 security/selinux/include/classmap.h  |   6 +-
 security/selinux/include/ibpkey.h    |  31 ++
 security/selinux/include/objsec.h    |  11 +
 security/selinux/include/security.h  |   9 +-
 security/selinux/selinuxfs.c         |  15 +-
 security/selinux/ss/policydb.c       | 127 +++++--
 security/selinux/ss/policydb.h       |  27 +-
 security/selinux/ss/services.c       | 104 ++++++
 security/selinux/ss/sidtab.c         |  27 +-
 28 files changed, 1917 insertions(+), 111 deletions(-)
 create mode 100644 drivers/infiniband/core/security.c
 create mode 100644 security/selinux/ibpkey.c
 create mode 100644 security/selinux/include/ibpkey.h
Merging tpmdd/next (f175275bfd53 tpm, tpmrm: Mark tpmrm_write as static)
$ git merge tpmdd/next
Merge made by the 'recursive' strategy.
 drivers/char/tpm/tpm-interface.c    | 109 +++++++++++-----------
 drivers/char/tpm/tpm-sysfs.c        |   6 +-
 drivers/char/tpm/tpm.h              |  21 +----
 drivers/char/tpm/tpm_i2c_infineon.c |  76 +++++++++++-----
 drivers/char/tpm/tpm_infineon.c     |   8 +-
 drivers/char/tpm/tpm_tis.c          | 175 ++++++++++++------------------------
 drivers/char/tpm/tpmrm-dev.c        |   2 +-
 7 files changed, 181 insertions(+), 216 deletions(-)
Merging watchdog/master (08332893e37a Linux 4.12-rc2)
$ git merge watchdog/master
Already up-to-date.
Merging iommu/next (752b80575ea4 Merge branches 'iommu/fixes', 'arm/rockchip', 'arm/renesas', 'arm/core', 'x86/vt-d' and 'x86/amd' into next)
$ git merge iommu/next
Auto-merging arch/arm/mm/dma-mapping.c
Merge made by the 'recursive' strategy.
 arch/arm/include/asm/device.h       |   3 +-
 arch/arm/mm/dma-mapping.c           |  29 ++-
 drivers/acpi/arm64/iort.c           |  22 ++-
 drivers/acpi/scan.c                 |   4 +-
 drivers/iommu/Kconfig               |   4 +-
 drivers/iommu/amd_iommu.c           |  42 ++++-
 drivers/iommu/dma-iommu.c           |   2 +-
 drivers/iommu/intel-iommu.c         |  16 +-
 drivers/iommu/intel-svm.c           |  30 +++
 drivers/iommu/intel_irq_remapping.c |   4 +-
 drivers/iommu/iova.c                |  21 +--
 drivers/iommu/ipmmu-vmsa.c          | 353 ++++++++++++++++++++++++++++++------
 drivers/iommu/of_iommu.c            |   7 +
 drivers/of/device.c                 |   4 +-
 include/linux/dma-iommu.h           |   1 +
 include/linux/intel-svm.h           |  20 ++
 16 files changed, 438 insertions(+), 124 deletions(-)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
$ git merge dwmw2-iommu/master
Already up-to-date.
Merging vfio/next (7cb671e7a34d vfio/type1: Reduce repetitive calls in vfio_pin_pages_remote())
$ git merge vfio/next
Already up-to-date.
Merging trivial/for-next (6fbc8798d946 tty: fix comment for __tty_alloc_driver())
$ git merge trivial/for-next
Already up-to-date.
Merging audit/next (7786f6b6dfc1 audit: add ambient capabilities to CAPSET and BPRM_FCAPS records)
$ git merge audit/next
Auto-merging kernel/auditsc.c
Auto-merging kernel/audit.c
Merge made by the 'recursive' strategy.
 kernel/audit.c   | 20 ++++----------------
 kernel/audit.h   |  1 +
 kernel/auditsc.c | 12 +++++++++---
 3 files changed, 14 insertions(+), 19 deletions(-)
Merging devicetree/for-next (49e67dd17649 of: fdt: add missing allocation-failure check)
$ git merge devicetree/for-next
Already up-to-date.
Merging mailbox/mailbox-for-next (cb710ab1d8a2 mailbox: handle empty message in tx_tick)
$ git merge mailbox/mailbox-for-next
Already up-to-date.
Merging spi/for-next (b8076f1a1d44 Merge remote-tracking branches 'spi/topic/sh-msiof', 'spi/topic/slave', 'spi/topic/spidev' and 'spi/topic/st-ssc4' into spi-next)
$ git merge spi/for-next
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/spi/sh-msiof.txt |   2 +
 Documentation/devicetree/bindings/spi/spi-bus.txt  |  76 +--
 .../devicetree/bindings/spi/spi-meson.txt          |  31 ++
 Documentation/spi/spi-summary                      |  27 +-
 drivers/spi/Kconfig                                |  34 +-
 drivers/spi/Makefile                               |   5 +
 drivers/spi/spi-bcm63xx-hsspi.c                    |   1 +
 drivers/spi/spi-fsl-dspi.c                         |   3 +-
 drivers/spi/spi-meson-spicc.c                      | 619 +++++++++++++++++++++
 drivers/spi/spi-omap2-mcspi.c                      |   3 -
 drivers/spi/spi-orion.c                            |  10 +-
 drivers/spi/spi-sh-msiof.c                         | 111 ++--
 drivers/spi/spi-slave-system-control.c             | 154 +++++
 drivers/spi/spi-slave-time.c                       | 129 +++++
 drivers/spi/spi-st-ssc4.c                          |  38 +-
 drivers/spi/spi.c                                  | 185 +++++-
 drivers/spi/spidev.c                               |  11 +-
 include/linux/spi/sh_msiof.h                       |   6 +
 include/linux/spi/spi.h                            |  35 +-
 19 files changed, 1343 insertions(+), 137 deletions(-)
 create mode 100644 drivers/spi/spi-meson-spicc.c
 create mode 100644 drivers/spi/spi-slave-system-control.c
 create mode 100644 drivers/spi/spi-slave-time.c
Merging tip/auto-latest (8e3c0499d0c9 Merge branch 'x86/urgent')
$ git merge tip/auto-latest
Auto-merging kernel/printk/printk.c
Auto-merging kernel/irq/irqdesc.c
Auto-merging drivers/iommu/of_iommu.c
Auto-merging drivers/iommu/intel-iommu.c
Auto-merging drivers/cpufreq/cpufreq.c
Removing drivers/char/mmtimer.c
Auto-merging arch/x86/include/asm/msr-index.h
Merge made by the 'recursive' strategy.
 Documentation/IRQ-domain.txt                    |  41 +-
 Documentation/admin-guide/kernel-parameters.txt |   9 +
 arch/arm/kernel/hw_breakpoint.c                 |  11 +-
 arch/arm/kernel/patch.c                         |   2 +-
 arch/arm/kernel/smp.c                           |   3 +-
 arch/arm/probes/kprobes/core.c                  |   3 +-
 arch/arm64/include/asm/insn.h                   |   1 -
 arch/arm64/kernel/insn.c                        |   5 +-
 arch/arm64/kernel/smp.c                         |   3 +-
 arch/metag/kernel/smp.c                         |   3 +-
 arch/mips/kernel/jump_label.c                   |   2 -
 arch/powerpc/kernel/smp.c                       |   2 +-
 arch/powerpc/kvm/book3s_hv.c                    |  14 +-
 arch/powerpc/platforms/powernv/subcore.c        |   7 +-
 arch/s390/kernel/jump_label.c                   |   2 +-
 arch/s390/kernel/kprobes.c                      |   4 +-
 arch/s390/kernel/time.c                         |   6 +-
 arch/sparc/kernel/jump_label.c                  |   2 -
 arch/tile/kernel/jump_label.c                   |   2 -
 arch/x86/boot/compressed/cmdline.c              |   2 +-
 arch/x86/boot/compressed/kaslr.c                | 190 ++++--
 arch/x86/boot/string.c                          |   8 +
 arch/x86/events/core.c                          |  23 +-
 arch/x86/events/intel/core.c                    |  74 +-
 arch/x86/events/intel/cqm.c                     |  16 +-
 arch/x86/events/perf_event.h                    |   3 +
 arch/x86/include/asm/amd_nb.h                   |   3 +-
 arch/x86/include/asm/msr-index.h                |   2 +
 arch/x86/include/asm/timer.h                    |   8 +-
 arch/x86/include/asm/tlbbatch.h                 |  16 +
 arch/x86/include/asm/tlbflush.h                 |  14 +-
 arch/x86/kernel/apic/io_apic.c                  |  22 -
 arch/x86/kernel/cpu/mcheck/mce_amd.c            | 229 +++----
 arch/x86/kernel/cpu/microcode/amd.c             |  16 +-
 arch/x86/kernel/cpu/mtrr/main.c                 |   2 -
 arch/x86/kernel/jump_label.c                    |   2 -
 arch/x86/kernel/process_32.c                    |   2 +-
 arch/x86/kernel/smpboot.c                       |   2 +-
 arch/x86/kernel/tsc.c                           | 206 ++----
 arch/x86/mm/tlb.c                               |  78 +--
 arch/x86/platform/efi/efi.c                     |   6 +-
 arch/x86/platform/efi/efi_64.c                  |  79 ++-
 arch/x86/platform/efi/quirks.c                  |   3 +
 arch/x86/platform/uv/tlb_uv.c                   |  14 +-
 drivers/acpi/apei/ghes.c                        |  39 +-
 drivers/acpi/pci_root.c                         |   2 +-
 drivers/acpi/processor_driver.c                 |   4 +-
 drivers/acpi/processor_throttling.c             |  16 +-
 drivers/base/node.c                             |   2 +-
 drivers/char/Kconfig                            |   9 -
 drivers/char/Makefile                           |   1 -
 drivers/char/mmtimer.c                          | 858 ------------------------
 drivers/cpufreq/cpufreq.c                       |  21 +-
 drivers/cpufreq/pasemi-cpufreq.c                |   2 +-
 drivers/cpuidle/cpuidle.c                       |   1 +
 drivers/firmware/efi/efi-bgrt.c                 |   3 +
 drivers/firmware/efi/libstub/secureboot.c       |   4 +-
 drivers/hwtracing/coresight/coresight-etm3x.c   |  20 +-
 drivers/hwtracing/coresight/coresight-etm4x.c   |  20 +-
 drivers/iommu/intel-iommu.c                     |   4 +-
 drivers/iommu/of_iommu.c                        |   2 +-
 drivers/pci/pci-driver.c                        |  47 +-
 drivers/ras/ras.c                               |   2 +-
 drivers/xen/manage.c                            |   1 +
 include/linux/clocksource.h                     |   1 +
 include/linux/cpu.h                             |  36 +-
 include/linux/cpuhotplug.h                      |  38 ++
 include/linux/cpumask.h                         |  28 +
 include/linux/kernel.h                          |   6 +-
 include/linux/llist.h                           |  19 +
 include/linux/mm_types_task.h                   |  15 +-
 include/linux/padata.h                          |   3 -
 include/linux/pci.h                             |   1 +
 include/linux/perf_event.h                      |   2 +
 include/linux/posix-timers.h                    |  15 +-
 include/linux/sched.h                           |  10 +
 include/linux/sched/clock.h                     |  11 +-
 include/linux/stop_machine.h                    |  26 +-
 include/uapi/linux/time.h                       |   6 +-
 init/main.c                                     |  27 +-
 kernel/async.c                                  |   8 +-
 kernel/cpu.c                                    | 213 +++---
 kernel/events/core.c                            | 116 +++-
 kernel/extable.c                                |   2 +-
 kernel/irq/irqdesc.c                            |   5 +-
 kernel/irq/irqdomain.c                          |  81 ++-
 kernel/irq/msi.c                                |  10 +-
 kernel/jump_label.c                             |  20 +-
 kernel/kprobes.c                                |  59 +-
 kernel/padata.c                                 |  43 +-
 kernel/printk/printk.c                          |   2 +-
 kernel/sched/clock.c                            | 128 +++-
 kernel/sched/core.c                             |  29 +-
 kernel/sched/deadline.c                         |   2 +-
 kernel/sched/fair.c                             | 153 +++--
 kernel/sched/features.h                         |   1 -
 kernel/sched/rt.c                               |  13 +-
 kernel/sched/sched.h                            |  19 +-
 kernel/sched/topology.c                         | 430 +++++++++---
 kernel/smp.c                                    |  16 +-
 kernel/stop_machine.c                           |  11 +-
 kernel/time/alarmtimer.c                        |  91 ++-
 kernel/time/clocksource.c                       |   3 +
 kernel/time/posix-clock.c                       |   2 +-
 kernel/time/posix-cpu-timers.c                  |  34 +-
 kernel/time/posix-timers.c                      | 191 +++---
 kernel/time/tick-sched.c                        |  40 +-
 kernel/time/tick-sched.h                        |   2 +
 lib/cpumask.c                                   |  32 +
 lib/smp_processor_id.c                          |   2 +-
 mm/rmap.c                                       |  16 +-
 mm/vmscan.c                                     |   2 +-
 112 files changed, 2053 insertions(+), 2167 deletions(-)
 create mode 100644 arch/x86/include/asm/tlbbatch.h
 delete mode 100644 drivers/char/mmtimer.c
Merging clockevents/clockevents/next (6f9c89000c3f Merge tag 'arch-timer-errata' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into clockevents/4.12)
$ git merge clockevents/clockevents/next
Already up-to-date.
Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp)
$ git merge edac/linux_next
Already up-to-date.
Merging edac-amd/for-next (7d2fdaa694c5 EDAC, mv64x60: Check driver registration success)
$ git merge edac-amd/for-next
Merge made by the 'recursive' strategy.
 drivers/edac/altera_edac.c  |   2 +-
 drivers/edac/ie31200_edac.c |  13 +-
 drivers/edac/mv64x60_edac.c |  95 ++++---
 drivers/edac/sb_edac.c      | 677 ++++++++++++++++++++------------------------
 4 files changed, 372 insertions(+), 415 deletions(-)
Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1)
$ git merge irqchip/irqchip/for-next
Already up-to-date.
Merging ftrace/for-next (6ee98ffeea0b x86/ftrace: Make sure that ftrace trampolines are not RWX)
$ git merge ftrace/for-next
Already up-to-date.
Merging rcu/rcu/next (8d7bc0e4318f rcutorture: Select CONFIG_PROVE_LOCKING for Tiny SRCU scenario)
$ git merge rcu/rcu/next
Auto-merging tools/testing/selftests/rcutorture/configs/rcuperf/TINY
Removing tools/testing/selftests/rcutorture/configs/rcu/TREE08-T
Auto-merging scripts/checkpatch.pl
Auto-merging lib/Kconfig.debug
Auto-merging kernel/sched/core.c
Removing kernel/rcu/tree_trace.c
Removing kernel/rcu/srcu.c
Removing include/linux/srcuclassic.h
Auto-merging include/linux/sched.h
Auto-merging include/linux/compiler.h
Auto-merging Documentation/admin-guide/kernel-parameters.txt
Removing Documentation/RCU/trace.txt
Merge made by the 'recursive' strategy.
 Documentation/RCU/00-INDEX                         |   2 -
 .../RCU/Design/Requirements/Requirements.html      |  34 +-
 Documentation/RCU/checklist.txt                    |   8 +-
 Documentation/RCU/trace.txt                        | 535 -----------------
 Documentation/admin-guide/kernel-parameters.txt    |  41 +-
 Documentation/core-api/atomic_ops.rst              |   5 +
 Documentation/dev-tools/sparse.rst                 |   6 -
 Documentation/kernel-per-CPU-kthreads.txt          |  31 +-
 Documentation/memory-barriers.txt                  |   2 +-
 Documentation/timers/NO_HZ.txt                     |  29 +-
 include/linux/compiler.h                           |   4 -
 include/linux/rcu_node_tree.h                      |   4 +
 include/linux/rcu_segcblist.h                      |   4 +
 include/linux/rcupdate.h                           | 331 +----------
 include/linux/rcutiny.h                            | 167 +-----
 include/linux/rcutree.h                            |  21 +-
 include/linux/sched.h                              |   8 +-
 include/linux/spinlock.h                           |  20 +
 include/linux/srcu.h                               |  25 +-
 include/linux/srcuclassic.h                        | 115 ----
 include/linux/srcutiny.h                           |  51 +-
 include/linux/srcutree.h                           |  14 +-
 include/trace/events/rcu.h                         |   1 +
 init/Kconfig                                       | 349 +----------
 kernel/exit.c                                      |   7 +-
 kernel/locking/lockdep.c                           | 176 +++---
 kernel/rcu/Kconfig                                 | 241 ++++++++
 kernel/rcu/Kconfig.debug                           |  82 +++
 kernel/rcu/Makefile                                |   2 -
 kernel/rcu/rcu.h                                   | 277 +++++++++
 kernel/rcu/rcuperf.c                               | 146 +++--
 kernel/rcu/rcutorture.c                            |  75 +--
 kernel/rcu/srcu.c                                  | 662 ---------------------
 kernel/rcu/srcutiny.c                              |  85 +--
 kernel/rcu/srcutree.c                              | 224 +++++--
 kernel/rcu/tiny.c                                  |  54 +-
 kernel/rcu/tiny_plugin.h                           | 123 ----
 kernel/rcu/tree.c                                  | 216 ++++---
 kernel/rcu/tree.h                                  | 111 +---
 kernel/rcu/tree_exp.h                              |   2 +-
 kernel/rcu/tree_plugin.h                           | 653 +++++---------------
 kernel/rcu/tree_trace.c                            | 494 ---------------
 kernel/rcu/update.c                                |  95 ++-
 kernel/sched/core.c                                |   9 +-
 kernel/time/Kconfig                                |  50 --
 lib/Kconfig.debug                                  | 184 +-----
 lib/Makefile                                       |   3 -
 scripts/checkpatch.pl                              |  17 -
 .../selftests/rcutorture/bin/config_override.sh    |  61 ++
 .../selftests/rcutorture/bin/configcheck.sh        |   2 +-
 .../testing/selftests/rcutorture/bin/kvm-build.sh  |  11 +-
 .../selftests/rcutorture/bin/kvm-test-1-run.sh     |  62 +-
 tools/testing/selftests/rcutorture/bin/kvm.sh      |  38 +-
 .../selftests/rcutorture/configs/rcu/CFLIST        |   2 +
 .../selftests/rcutorture/configs/rcu/SRCU-C.boot   |   1 +
 .../selftests/rcutorture/configs/rcu/SRCU-N        |   2 +-
 .../selftests/rcutorture/configs/rcu/SRCU-P        |   6 +-
 .../selftests/rcutorture/configs/rcu/SRCU-t        |  10 +
 .../selftests/rcutorture/configs/rcu/SRCU-t.boot   |   1 +
 .../selftests/rcutorture/configs/rcu/SRCU-u        |  10 +
 .../selftests/rcutorture/configs/rcu/SRCU-u.boot   |   1 +
 .../selftests/rcutorture/configs/rcu/TINY02        |   5 +-
 .../selftests/rcutorture/configs/rcu/TREE01        |   5 +-
 .../selftests/rcutorture/configs/rcu/TREE01.boot   |   4 +
 .../selftests/rcutorture/configs/rcu/TREE02        |   5 +-
 .../selftests/rcutorture/configs/rcu/TREE03        |   4 -
 .../selftests/rcutorture/configs/rcu/TREE03.boot   |   4 +
 .../selftests/rcutorture/configs/rcu/TREE04        |   4 -
 .../selftests/rcutorture/configs/rcu/TREE05        |   4 -
 .../selftests/rcutorture/configs/rcu/TREE05.boot   |   3 +
 .../selftests/rcutorture/configs/rcu/TREE06        |   4 +-
 .../selftests/rcutorture/configs/rcu/TREE06.boot   |   3 +
 .../selftests/rcutorture/configs/rcu/TREE07        |   6 -
 .../selftests/rcutorture/configs/rcu/TREE08        |   1 -
 .../selftests/rcutorture/configs/rcu/TREE08-T      |  21 -
 .../selftests/rcutorture/configs/rcu/TREE08.boot   |   1 +
 .../configs/{rcu/TREE02-T => rcuperf/TINY}         |  19 +-
 .../selftests/rcutorture/configs/rcuperf/TREE      |   1 -
 .../selftests/rcutorture/configs/rcuperf/TREE54    |   1 -
 .../testing/selftests/rcutorture/doc/TINY_RCU.txt  |   1 -
 .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt  |  36 +-
 .../rcutorture/formal/srcu-cbmc/modify_srcu.awk    |   2 +-
 82 files changed, 1768 insertions(+), 4368 deletions(-)
 delete mode 100644 Documentation/RCU/trace.txt
 delete mode 100644 include/linux/srcuclassic.h
 create mode 100644 kernel/rcu/Kconfig
 create mode 100644 kernel/rcu/Kconfig.debug
 delete mode 100644 kernel/rcu/srcu.c
 delete mode 100644 kernel/rcu/tree_trace.c
 create mode 100755 tools/testing/selftests/rcutorture/bin/config_override.sh
 create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/SRCU-C.boot
 create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/SRCU-t
 create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/SRCU-t.boot
 create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/SRCU-u
 create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/SRCU-u.boot
 delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE08-T
 rename tools/testing/selftests/rcutorture/configs/{rcu/TREE02-T => rcuperf/TINY} (50%)
$ git am -3 ../patches/linux-next-build-failure-after-merge-of-the-rcu-tree.patch
Applying: module: Fix pr_fmt() bug for header use of printk
$ git reset HEAD^
Unstaged changes after reset:
M	arch/blackfin/kernel/module.c
$ git add -A .
$ git commit -v -a --amend
[master 6186a999240c] Merge remote-tracking branch 'rcu/rcu/next'
 Date: Wed May 31 13:01:53 2017 +1000
Merging kvm/linux-next (08332893e37a Linux 4.12-rc2)
$ git merge kvm/linux-next
Already up-to-date.
Merging kvm-arm/next (a2b19e6e2d4b KVM: arm/arm64: vgic-its: Cleanup after failed ITT restore)
$ git merge kvm-arm/next
Already up-to-date.
Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E)
$ git merge kvm-mips/next
Already up-to-date.
Merging kvm-ppc/kvm-ppc-next (76d837a4c0f9 KVM: PPC: Book3S PR: Don't include SPAPR TCE code on non-pseries platforms)
$ git merge kvm-ppc/kvm-ppc-next
Already up-to-date.
Merging kvms390/next (a2bdbb2c7e70 KVM: s390: ioctls to get and set guest storage attributes)
$ git merge kvms390/next
Merge made by the 'recursive' strategy.
 Documentation/virtual/kvm/api.txt        | 135 ++++++++++++
 Documentation/virtual/kvm/devices/vm.txt |  33 +++
 arch/s390/include/asm/kvm_host.h         |   9 +
 arch/s390/include/uapi/asm/kvm.h         |   6 +
 arch/s390/kvm/kvm-s390.c                 | 361 ++++++++++++++++++++++++++++++-
 arch/s390/kvm/priv.c                     | 103 ++++++++-
 include/uapi/linux/kvm.h                 |  33 +++
 7 files changed, 674 insertions(+), 6 deletions(-)
Merging xen-tip/linux-next (c71e6d804c88 xen: make xen_flush_tlb_all() static)
$ git merge xen-tip/linux-next
Already up-to-date.
Merging percpu/for-next (1328710b8ec3 mark most percpu globals as __ro_after_init)
$ git merge percpu/for-next
Merge made by the 'recursive' strategy.
 mm/percpu.c | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)
Merging workqueues/for-next (bacb71fc9187 Merge branch 'for-4.12' into for-next)
$ git merge workqueues/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging drivers-x86/for-next (8f8eea643a9c Merge tag 'ib-mfd-gpio-thermal-x86-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into for-next)
$ git merge drivers-x86/for-next
Merge made by the 'recursive' strategy.
 .../ABI/testing/sysfs-platform-ideapad-laptop      |   8 +
 drivers/gpio/gpio-wcove.c                          |  14 +-
 drivers/mfd/intel_soc_pmic_bxtwc.c                 | 234 ++++++++++++++-------
 drivers/platform/x86/Kconfig                       |   7 +
 drivers/platform/x86/Makefile                      |   1 +
 drivers/platform/x86/ideapad-laptop.c              |  42 +++-
 drivers/platform/x86/intel_bxtwc_tmu.c             |   4 -
 drivers/platform/x86/intel_pmc_ipc.c               |   2 +-
 drivers/platform/x86/peaq-wmi.c                    | 100 +++++++++
 drivers/platform/x86/silead_dmi.c                  |  22 ++
 drivers/platform/x86/thinkpad_acpi.c               | 183 ++++++----------
 drivers/platform/x86/topstar-laptop.c              |   1 +
 drivers/platform/x86/toshiba_acpi.c                |  11 +-
 drivers/thermal/intel_bxt_pmic_thermal.c           |   2 +-
 include/linux/mfd/intel_soc_pmic.h                 |   5 +-
 15 files changed, 424 insertions(+), 212 deletions(-)
 create mode 100644 drivers/platform/x86/peaq-wmi.c
$ git reset --hard HEAD^
HEAD is now at 39ef885f641d Merge remote-tracking branch 'workqueues/for-next'
Merging next-20170530 version of drivers-x86
$ git merge -m next-20170530/drivers-x86 3cfd956b02ac7a9fb5f2414171f834871931fbd0
Merge made by the 'recursive' strategy.
 .../ABI/testing/sysfs-platform-ideapad-laptop      |   8 +
 drivers/platform/x86/Kconfig                       |   7 +
 drivers/platform/x86/Makefile                      |   1 +
 drivers/platform/x86/ideapad-laptop.c              |  42 ++++-
 drivers/platform/x86/peaq-wmi.c                    | 100 +++++++++++
 drivers/platform/x86/silead_dmi.c                  |  22 +++
 drivers/platform/x86/thinkpad_acpi.c               | 183 ++++++++-------------
 drivers/platform/x86/topstar-laptop.c              |   1 +
 drivers/platform/x86/toshiba_acpi.c                |  11 +-
 9 files changed, 249 insertions(+), 126 deletions(-)
 create mode 100644 drivers/platform/x86/peaq-wmi.c
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
$ git merge chrome-platform/for-next
Merge made by the 'recursive' strategy.
Merging hsi/for-next (3026050179a3 HSI: ssi_protocol: double free in ssip_pn_xmit())
$ git merge hsi/for-next
Already up-to-date.
Merging leds/for-next (71c17b06ef7d leds: trigger: gpio: Use threaded IRQ)
$ git merge leds/for-next
Removing drivers/leds/leds-versatile.c
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/leds/pca963x.txt |   1 +
 drivers/leds/Kconfig                               |   8 --
 drivers/leds/Makefile                              |   1 -
 drivers/leds/leds-pca963x.c                        |  17 +++-
 drivers/leds/leds-versatile.c                      | 110 ---------------------
 drivers/leds/trigger/ledtrig-gpio.c                |  29 ++----
 include/linux/platform_data/leds-pca963x.h         |   6 ++
 7 files changed, 29 insertions(+), 143 deletions(-)
 delete mode 100644 drivers/leds/leds-versatile.c
Merging ipmi/for-next (bf10ff69dd6e ipmi_ssif: remove redundant null check on array client->adapter->name)
$ git merge ipmi/for-next
Merge made by the 'recursive' strategy.
 drivers/char/ipmi/ipmi_ssif.c     | 5 +++--
 drivers/char/ipmi/ipmi_watchdog.c | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)
Merging driver-core/driver-core-next (e622ec579b9a doc: update kernel version in sysfs-uevent ABI doc)
$ git merge driver-core/driver-core-next
Auto-merging kernel/module.c
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-uevent |  47 ++++++++++
 drivers/base/bus.c                     |  10 +-
 drivers/base/core.c                    |   7 +-
 drivers/base/platform.c                |  11 ++-
 include/linux/kobject.h                |   4 +-
 include/linux/sysfs.h                  |   2 +-
 kernel/module.c                        |   5 +-
 lib/kobject_uevent.c                   | 167 ++++++++++++++++++++++++++++++---
 8 files changed, 217 insertions(+), 36 deletions(-)
 create mode 100644 Documentation/ABI/testing/sysfs-uevent
Merging usb/usb-next (7f7c3cde613d uwb: i1480: add missing goto)
$ git merge usb/usb-next
Merge made by the 'recursive' strategy.
 drivers/usb/class/cdc-wdm.c      | 17 ++------
 drivers/usb/core/hcd.c           | 12 ++++++
 drivers/usb/gadget/udc/core.c    |  9 +++++
 drivers/usb/host/Kconfig         |  6 ++-
 drivers/usb/host/ehci-sched.c    |  2 +-
 drivers/usb/host/uhci-hcd.c      | 17 ++++++--
 drivers/usb/host/uhci-hcd.h      | 51 +++++++++++++++++++++++
 drivers/usb/host/uhci-platform.c | 22 +++++++++-
 drivers/usb/misc/iowarrior.c     | 11 ++---
 drivers/usb/mtu3/mtu3.h          |  8 +---
 drivers/usb/storage/ene_ub6250.c | 87 +++++++++++++++++++++++-----------------
 drivers/usb/typec/typec.c        | 11 ++---
 drivers/uwb/i1480/dfu/phy.c      |  1 +
 include/linux/usb/typec.h        |  6 +--
 14 files changed, 183 insertions(+), 77 deletions(-)
Merging usb-gadget/next (2868b2513aa7 Merge tag 'linux-kselftest-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest)
$ git merge usb-gadget/next
Already up-to-date.
Merging usb-serial/usb-next (5ed02dbb4974 Linux 4.12-rc3)
$ git merge usb-serial/usb-next
Already up-to-date.
Merging usb-chipidea-next/ci-for-usb-next (c4a0bbbdb7f6 usb: chipidea: properly handle host or gadget initialization failure)
$ git merge usb-chipidea-next/ci-for-usb-next
Auto-merging drivers/usb/chipidea/core.c
Merge made by the 'recursive' strategy.
 drivers/usb/chipidea/core.c | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)
Merging phy-next/next (2ea659a9ef48 Linux 4.12-rc1)
$ git merge phy-next/next
Already up-to-date.
Merging tty/tty-next (aa668632ae8c Merge 4.12-rc3 into tty-next)
$ git merge tty/tty-next
Merge made by the 'recursive' strategy.
 Documentation/ABI/stable/sysfs-driver-aspeed-vuart |  15 +
 Documentation/devicetree/bindings/serial/8250.txt  |   2 +
 drivers/tty/hvc/hvcs.c                             |   3 +-
 drivers/tty/serdev/serdev-ttyport.c                |   2 +-
 drivers/tty/serial/8250/8250.h                     |   3 +
 drivers/tty/serial/8250/8250_aspeed_vuart.c        | 323 +++++++++++++++++++++
 drivers/tty/serial/8250/8250_bcm2835aux.c          |   2 +-
 drivers/tty/serial/8250/8250_exar.c                |   5 +-
 drivers/tty/serial/8250/8250_omap.c                |   4 +
 drivers/tty/serial/8250/8250_port.c                |   8 +-
 drivers/tty/serial/8250/Kconfig                    |  10 +
 drivers/tty/serial/8250/Makefile                   |   1 +
 drivers/tty/serial/amba-pl010.c                    |  31 +-
 drivers/tty/serial/atmel_serial.c                  |   5 +-
 drivers/tty/serial/imx.c                           |  26 +-
 drivers/tty/serial/meson_uart.c                    |  63 ++--
 drivers/tty/serial/pch_uart.c                      |   3 +-
 drivers/tty/serial/sh-sci.c                        |  45 ++-
 drivers/tty/serial/xilinx_uartps.c                 |   9 +-
 drivers/tty/vt/keyboard.c                          |   3 +-
 include/linux/serial_core.h                        |   1 +
 include/uapi/linux/serial.h                        |   3 +
 22 files changed, 463 insertions(+), 104 deletions(-)
 create mode 100644 Documentation/ABI/stable/sysfs-driver-aspeed-vuart
 create mode 100644 drivers/tty/serial/8250/8250_aspeed_vuart.c
Merging char-misc/char-misc-next (46505c802a55 Revert "firmware: vpd: remove platform driver")
$ git merge char-misc/char-misc-next
Auto-merging drivers/platform/goldfish/goldfish_pipe.c
Auto-merging drivers/firmware/google/vpd.c
Merge made by the 'recursive' strategy.
 Documentation/admin-guide/devices.txt            |   4 +-
 arch/x86/include/asm/mshyperv.h                  |   1 -
 drivers/auxdisplay/panel.c                       |   5 +-
 drivers/firmware/google/memconsole-coreboot.c    |  54 +++++++-
 drivers/firmware/google/memconsole-x86-legacy.c  |  18 ++-
 drivers/firmware/google/memconsole.c             |  14 +-
 drivers/firmware/google/memconsole.h             |   7 +-
 drivers/firmware/google/vpd.c                    |  39 +++---
 drivers/hv/channel.c                             |   8 +-
 drivers/hv/channel_mgmt.c                        |  69 +++++++---
 drivers/hv/connection.c                          |  11 +-
 drivers/hv/hv.c                                  |   9 +-
 drivers/hv/hv_kvp.c                              |  14 +-
 drivers/hv/hv_util.c                             | 164 ++++++++---------------
 drivers/hv/hyperv_vmbus.h                        |  11 ++
 drivers/hv/vmbus_drv.c                           |  80 ++++++-----
 drivers/ipack/ipack.c                            |   3 +-
 drivers/misc/apds990x.c                          |   2 +-
 drivers/misc/bh1770glc.c                         |   2 +-
 drivers/misc/mei/bus.c                           |   2 +-
 drivers/misc/mei/hw.h                            |   2 +-
 drivers/misc/mei/mei_dev.h                       |   1 -
 drivers/misc/sram-exec.c                         |  27 +++-
 drivers/platform/goldfish/goldfish_pipe.c        |   2 +-
 drivers/pps/Kconfig                              |  12 +-
 drivers/pps/clients/Kconfig                      |   6 +-
 drivers/pps/generators/Kconfig                   |   3 +-
 drivers/uio/uio_pci_generic.c                    |  20 ++-
 drivers/vhost/vsock.c                            |   4 +-
 drivers/w1/masters/ds2482.c                      |  45 +++----
 drivers/w1/masters/ds2490.c                      |  33 ++---
 drivers/w1/masters/matrox_w1.c                   |  40 +++---
 drivers/w1/masters/omap_hdq.c                    |  57 ++++----
 drivers/w1/slaves/w1_bq27000.c                   |   9 +-
 drivers/w1/slaves/w1_ds2406.c                    |   8 +-
 drivers/w1/slaves/w1_ds2408.c                    |  11 +-
 drivers/w1/slaves/w1_ds2413.c                    |  10 +-
 drivers/w1/slaves/w1_ds2423.c                    |   2 +-
 drivers/w1/slaves/w1_ds2431.c                    |   2 +-
 drivers/w1/slaves/w1_ds2433.c                    |  10 +-
 drivers/w1/slaves/w1_ds2760.c                    |  11 +-
 drivers/w1/slaves/w1_ds2780.c                    |   2 +-
 drivers/w1/slaves/w1_ds2781.c                    |   2 +-
 drivers/w1/slaves/w1_ds28e04.c                   |  10 +-
 drivers/w1/slaves/w1_smem.c                      |  12 +-
 drivers/w1/slaves/w1_therm.c                     |  18 +--
 drivers/w1/w1.c                                  |  18 +--
 drivers/w1/w1_family.c                           |   5 +-
 drivers/w1/w1_int.c                              |   3 +-
 include/linux/miscdevice.h                       |   1 +
 include/linux/{i2c => platform_data}/apds990x.h  |   0
 include/linux/{i2c => platform_data}/bh1770glc.h |   0
 include/linux/sram.h                             |   8 +-
 tools/hv/hv_kvp_daemon.c                         |  44 +++---
 tools/hv/hv_vss_daemon.c                         |   4 +-
 55 files changed, 486 insertions(+), 473 deletions(-)
 rename include/linux/{i2c => platform_data}/apds990x.h (100%)
 rename include/linux/{i2c => platform_data}/bh1770glc.h (100%)
Merging extcon/extcon-next (a781a7d646ad extcon: qcom-spmi-misc: add dependency on ARCH_QCOM)
$ git merge extcon/extcon-next
Merge made by the 'recursive' strategy.
 drivers/extcon/Kconfig          |  1 +
 drivers/extcon/extcon-arizona.c |  4 +---
 drivers/extcon/extcon.c         | 11 +++++------
 3 files changed, 7 insertions(+), 9 deletions(-)
Merging staging/staging-next (ca9280d1f82a Merge tag 'iio-for-4.13a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next)
$ git merge staging/staging-next
Auto-merging include/linux/tty.h
Removing drivers/staging/most/aim-network/networking.h
Auto-merging drivers/staging/iio/light/tsl2x7x.c
Removing drivers/staging/ccree/hw_queue_defs_plat.h
Removing drivers/staging/ccree/dx_env.h
Removing drivers/staging/ccree/cc_pal_types_plat.h
Removing drivers/staging/ccree/cc_pal_types.h
Removing drivers/staging/ccree/cc_pal_log_plat.h
Removing drivers/staging/ccree/cc_pal_log.h
Auto-merging drivers/iio/proximity/as3935.c
Auto-merging drivers/iio/light/isl29028.c
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-bus-iio            |  11 +
 Documentation/ABI/testing/sysfs-bus-iio-meas-spec  |   1 -
 .../ABI/testing/sysfs-bus-iio-timer-stm32          |  48 +++
 .../bindings/iio/adc/amlogic,meson-saradc.txt      |   2 +
 .../bindings/iio/adc/renesas,gyroadc.txt           |   7 +-
 .../devicetree/bindings/iio/adc/ti-adc084s021.txt  |  19 +
 .../devicetree/bindings/iio/adc/ti-adc108s102.txt  |  18 +
 .../devicetree/bindings/trivial-devices.txt        |   1 +
 drivers/iio/accel/bma180.c                         |  45 ++-
 drivers/iio/accel/hid-sensor-accel-3d.c            |   2 +-
 drivers/iio/accel/st_accel_core.c                  |   7 +-
 drivers/iio/adc/Kconfig                            |  24 ++
 drivers/iio/adc/Makefile                           |   2 +
 drivers/iio/adc/hi8435.c                           |  50 ++-
 drivers/iio/adc/ina2xx-adc.c                       |  12 +-
 drivers/iio/adc/meson_saradc.c                     |  86 ++--
 drivers/iio/adc/rcar-gyroadc.c                     |  16 +-
 drivers/iio/adc/ti-adc084s021.c                    | 275 +++++++++++++
 drivers/iio/adc/ti-adc108s102.c                    | 348 +++++++++++++++++
 .../iio/common/hid-sensors/hid-sensor-attributes.c |  54 ++-
 .../iio/common/hid-sensors/hid-sensor-trigger.c    |  80 ++++
 drivers/iio/dac/Kconfig                            |   3 +-
 drivers/iio/dac/ad5064.c                           |  71 +++-
 drivers/iio/humidity/hts221.h                      |   3 +
 drivers/iio/humidity/hts221_core.c                 |  54 ++-
 drivers/iio/humidity/hts221_i2c.c                  |   1 +
 drivers/iio/humidity/hts221_spi.c                  |   1 +
 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h            |   5 +
 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c     |   6 +-
 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c       |  52 +++
 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c        |   1 +
 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c        |   1 +
 drivers/iio/industrialio-core.c                    |   4 +-
 drivers/iio/inkern.c                               |   4 +-
 drivers/iio/light/Kconfig                          |  10 +
 drivers/iio/light/Makefile                         |   1 +
 drivers/iio/light/isl29018.c                       |   2 +
 drivers/{staging => }/iio/light/isl29028.c         |  76 +++-
 drivers/iio/light/rpr0521.c                        | 307 ++++++++++++---
 drivers/iio/light/tsl2583.c                        | 106 +++--
 drivers/iio/orientation/hid-sensor-rotation.c      |  55 ++-
 drivers/iio/pressure/Kconfig                       |   2 +-
 drivers/iio/pressure/st_pressure_core.c            |   8 +-
 drivers/iio/pressure/zpa2326.c                     |  18 +-
 drivers/iio/proximity/as3935.c                     |   6 +-
 drivers/iio/temperature/maxim_thermocouple.c       |   1 +
 drivers/iio/trigger/stm32-timer-trigger.c          | 113 +++++-
 drivers/staging/android/ion/ion-ioctl.c            |   4 +-
 drivers/staging/android/ion/ion.c                  |  24 +-
 drivers/staging/android/ion/ion.h                  |  14 -
 drivers/staging/android/ion/ion_carveout_heap.c    |   2 +-
 drivers/staging/android/uapi/ion.h                 |   6 -
 drivers/staging/ccree/cc_bitops.h                  |  33 +-
 drivers/staging/ccree/cc_crypto_ctx.h              | 107 +++--
 drivers/staging/ccree/cc_hal.h                     |  15 +-
 drivers/staging/ccree/cc_hw_queue_defs.h           | 322 +++++++--------
 drivers/staging/ccree/cc_lli_defs.h                |  46 ++-
 drivers/staging/ccree/cc_pal_log.h                 | 188 ---------
 drivers/staging/ccree/cc_pal_log_plat.h            |  33 --
 drivers/staging/ccree/cc_pal_types.h               |  97 -----
 drivers/staging/ccree/cc_pal_types_plat.h          |  29 --
 drivers/staging/ccree/cc_regs.h                    |  25 +-
 drivers/staging/ccree/dx_crys_kernel.h             |  46 +--
 drivers/staging/ccree/dx_env.h                     | 224 -----------
 drivers/staging/ccree/dx_host.h                    |  38 +-
 drivers/staging/ccree/dx_reg_base_host.h           |  15 +-
 drivers/staging/ccree/dx_reg_common.h              |   8 +-
 drivers/staging/ccree/hash_defs.h                  |  24 +-
 drivers/staging/ccree/hw_queue_defs_plat.h         |  43 --
 drivers/staging/ccree/ssi_aead.c                   | 363 +++++++++--------
 drivers/staging/ccree/ssi_aead.h                   |  44 +--
 drivers/staging/ccree/ssi_buffer_mgr.c             | 347 ++++++++--------
 drivers/staging/ccree/ssi_buffer_mgr.h             |  18 +-
 drivers/staging/ccree/ssi_cipher.c                 | 141 +++----
 drivers/staging/ccree/ssi_cipher.h                 |  18 +-
 drivers/staging/ccree/ssi_config.h                 |   8 +-
 drivers/staging/ccree/ssi_driver.c                 |  40 +-
 drivers/staging/ccree/ssi_driver.h                 |  27 +-
 drivers/staging/ccree/ssi_fips.c                   |  18 +-
 drivers/staging/ccree/ssi_fips.h                   |  18 +-
 drivers/staging/ccree/ssi_fips_data.h              |  36 +-
 drivers/staging/ccree/ssi_fips_ext.c               |  32 +-
 drivers/staging/ccree/ssi_fips_ll.c                | 224 +++++------
 drivers/staging/ccree/ssi_fips_local.c             |  32 +-
 drivers/staging/ccree/ssi_fips_local.h             |   8 +-
 drivers/staging/ccree/ssi_hash.c                   | 434 ++++++++++-----------
 drivers/staging/ccree/ssi_hash.h                   |  54 +--
 drivers/staging/ccree/ssi_ivgen.c                  |  58 +--
 drivers/staging/ccree/ssi_ivgen.h                  |  40 +-
 drivers/staging/ccree/ssi_pm.c                     |   8 +-
 drivers/staging/ccree/ssi_pm.h                     |   6 +-
 drivers/staging/ccree/ssi_pm_ext.c                 |  16 +-
 drivers/staging/ccree/ssi_pm_ext.h                 |   6 +-
 drivers/staging/ccree/ssi_request_mgr.c            | 144 +++----
 drivers/staging/ccree/ssi_request_mgr.h            |  18 +-
 drivers/staging/ccree/ssi_sram_mgr.c               |  42 +-
 drivers/staging/ccree/ssi_sram_mgr.h               |  46 +--
 drivers/staging/ccree/ssi_sysfs.c                  |  52 +--
 drivers/staging/ccree/ssi_sysfs.h                  |   6 +-
 drivers/staging/dgnc/dgnc_driver.c                 |   2 -
 drivers/staging/dgnc/dgnc_driver.h                 |  13 -
 drivers/staging/dgnc/dgnc_tty.c                    | 150 +++----
 drivers/staging/emxx_udc/emxx_udc.c                | 398 +++++++++----------
 drivers/staging/emxx_udc/emxx_udc.h                | 226 +++++------
 drivers/staging/fbtft/fb_agm1264k-fl.c             |   4 +-
 drivers/staging/fbtft/fbtft-io.c                   |   2 +-
 drivers/staging/fsl-mc/bus/dprc-driver.c           |   4 +-
 drivers/staging/fsl-mc/bus/fsl-mc-bus.c            |   8 +-
 drivers/staging/greybus/Kconfig                    |  10 +
 drivers/staging/greybus/Makefile                   |   2 +-
 drivers/staging/greybus/arche-apb-ctrl.c           |  11 +-
 drivers/staging/greybus/arche-platform.c           | 154 +-------
 drivers/staging/greybus/arche_platform.h           |   8 -
 drivers/staging/greybus/light.c                    |   4 +-
 drivers/staging/greybus/power_supply.c             |   2 +-
 drivers/staging/iio/frequency/ad9834.c             |  22 +-
 drivers/staging/iio/frequency/dds.h                |   2 +-
 drivers/staging/iio/light/Kconfig                  |  10 -
 drivers/staging/iio/light/Makefile                 |   3 +-
 .../iio/light/{tsl2x7x_core.c => tsl2x7x.c}        |  66 ++--
 drivers/staging/iio/meter/ade7753.c                | 101 +++--
 drivers/staging/iio/meter/ade7754.c                |  56 +--
 drivers/staging/iio/meter/ade7758_core.c           |  50 +--
 drivers/staging/iio/meter/ade7854.c                |  88 ++---
 drivers/staging/ks7010/eap_packet.h                |   4 +-
 drivers/staging/ks7010/ks7010_sdio.c               |  10 +-
 drivers/staging/ks7010/ks_hostif.c                 |  81 ++--
 drivers/staging/ks7010/ks_hostif.h                 | 192 ++++-----
 drivers/staging/ks7010/ks_wlan.h                   |   8 +-
 drivers/staging/ks7010/ks_wlan_net.c               |  20 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_lib.c      |  11 +-
 drivers/staging/lustre/lustre/lmv/lmv_obd.c        |   6 +-
 drivers/staging/lustre/lustre/mdc/mdc_locks.c      |   8 +-
 drivers/staging/lustre/lustre/obdclass/lu_object.c |   3 +-
 .../staging/lustre/lustre/obdecho/echo_client.c    |   3 +-
 drivers/staging/lustre/lustre/osc/osc_cache.c      |   3 +-
 drivers/staging/lustre/lustre/ptlrpc/import.c      |  15 +-
 drivers/staging/lustre/lustre/ptlrpc/layout.c      |   2 +-
 drivers/staging/most/aim-network/networking.c      | 172 +++-----
 drivers/staging/most/aim-network/networking.h      |  21 -
 drivers/staging/most/hdm-dim2/Kconfig              |   1 -
 drivers/staging/most/hdm-dim2/dim2_hal.c           |  17 +-
 drivers/staging/most/hdm-dim2/dim2_hdm.c           |  18 +-
 drivers/staging/most/hdm-dim2/dim2_reg.h           |   1 +
 drivers/staging/most/hdm-i2c/hdm_i2c.c             |   7 -
 drivers/staging/most/hdm-usb/Kconfig               |   2 +-
 drivers/staging/most/hdm-usb/hdm_usb.c             |  15 +-
 drivers/staging/most/mostcore/mostcore.h           |   7 +-
 drivers/staging/octeon-usb/octeon-hcd.c            |   6 +-
 drivers/staging/octeon/ethernet-util.h             |   2 +-
 drivers/staging/rtl8188eu/core/rtw_ap.c            |  10 +-
 drivers/staging/rtl8188eu/core/rtw_ieee80211.c     |  44 ---
 drivers/staging/rtl8188eu/core/rtw_mlme.c          |   4 +-
 drivers/staging/rtl8188eu/core/rtw_recv.c          |  83 ++--
 drivers/staging/rtl8188eu/hal/phy.c                |   4 +-
 drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c    |   2 +-
 drivers/staging/rtl8188eu/include/ieee80211.h      | 107 -----
 drivers/staging/rtl8188eu/os_dep/mon.c             |  34 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c         |  16 -
 drivers/staging/rtl8192e/rtl819x_HTProc.c          |   4 +-
 drivers/staging/rtl8192e/rtllib_rx.c               |   3 -
 drivers/staging/rtl8192e/rtllib_softmac.c          |   3 +-
 drivers/staging/rtl8192e/rtllib_wx.c               |   2 +-
 .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c      |  27 +-
 .../staging/rtl8192u/ieee80211/ieee80211_module.c  |   3 +-
 .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c    | 171 +++-----
 drivers/staging/rtl8192u/r8192U.h                  |   2 +-
 drivers/staging/rtl8192u/r8192U_dm.c               |  77 ++--
 drivers/staging/rtl8712/ieee80211.c                |  13 +-
 drivers/staging/rtl8712/os_intfs.c                 |   2 +-
 drivers/staging/rtl8723bs/core/rtw_mlme.c          |  32 +-
 drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c    |   8 +-
 drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c    |   4 +-
 drivers/staging/rtl8723bs/hal/hal_btcoex.c         |   2 +-
 drivers/staging/rtl8723bs/hal/odm.h                |   5 +-
 drivers/staging/rtl8723bs/hal/odm_DIG.c            |   2 +-
 drivers/staging/rtl8723bs/hal/odm_debug.h          |  81 ++--
 drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c    |  18 +-
 drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c    |  12 +-
 drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c     |  20 +-
 drivers/staging/rtl8723bs/include/rtl8192c_rf.h    |  23 +-
 drivers/staging/rtl8723bs/include/rtl8723b_spec.h  |  49 ++-
 drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c  |  24 +-
 drivers/staging/sm750fb/ddk750_chip.c              |   7 +-
 drivers/staging/sm750fb/ddk750_dvi.c               |  35 +-
 drivers/staging/sm750fb/ddk750_dvi.h               |  43 +-
 drivers/staging/sm750fb/ddk750_hwi2c.c             |  33 +-
 drivers/staging/sm750fb/ddk750_sii164.c            |  49 +--
 drivers/staging/sm750fb/ddk750_sii164.h            |  22 +-
 drivers/staging/sm750fb/ddk750_swi2c.c             |  21 +-
 drivers/staging/sm750fb/ddk750_swi2c.h             |  18 +-
 drivers/staging/sm750fb/sm750.c                    |  26 +-
 drivers/staging/sm750fb/sm750_accel.c              |  15 +-
 drivers/staging/sm750fb/sm750_cursor.c             |  17 +-
 drivers/staging/speakup/Makefile                   |   1 +
 drivers/staging/speakup/serialio.c                 |  17 +-
 drivers/staging/speakup/serialio.h                 |   4 +-
 drivers/staging/speakup/speakup_acntsa.c           |   8 +-
 drivers/staging/speakup/speakup_apollo.c           |  10 +-
 drivers/staging/speakup/speakup_audptr.c           |  14 +-
 drivers/staging/speakup/speakup_decext.c           |  25 +-
 drivers/staging/speakup/speakup_decpc.c            |   2 +-
 drivers/staging/speakup/speakup_dectlk.c           |  14 +-
 drivers/staging/speakup/speakup_dtlk.c             |   2 +-
 drivers/staging/speakup/speakup_dtlk.h             |  10 +-
 drivers/staging/speakup/speakup_dummy.c            |   8 +-
 drivers/staging/speakup/speakup_ltlk.c             |  13 +-
 drivers/staging/speakup/speakup_soft.c             |   4 +-
 drivers/staging/speakup/speakup_spkout.c           |  12 +-
 drivers/staging/speakup/speakup_txprt.c            |   8 +-
 drivers/staging/speakup/spk_priv.h                 |   8 +-
 drivers/staging/speakup/spk_ttyio.c                | 279 +++++++++++++
 drivers/staging/speakup/spk_types.h                |   5 +-
 drivers/staging/speakup/synth.c                    |  11 +-
 drivers/staging/unisys/Documentation/overview.txt  |  14 +-
 drivers/staging/unisys/include/channel.h           |  60 ++-
 drivers/staging/unisys/include/iochannel.h         |  39 +-
 drivers/staging/unisys/visorbus/controlvmchannel.h |  56 ++-
 drivers/staging/unisys/visorbus/vbuschannel.h      |  25 +-
 drivers/staging/unisys/visorbus/visorbus_main.c    | 125 +++---
 drivers/staging/unisys/visorbus/visorbus_private.h |  24 +-
 drivers/staging/unisys/visorbus/visorchannel.c     |   8 +-
 drivers/staging/unisys/visorbus/visorchipset.c     | 226 ++++++-----
 drivers/staging/unisys/visorhba/visorhba_main.c    |  17 +-
 .../staging/unisys/visorinput/ultrainputreport.h   |  49 ++-
 drivers/staging/unisys/visorinput/visorinput.c     |  51 ++-
 drivers/staging/unisys/visornic/visornic_main.c    |  23 +-
 drivers/staging/vme/devices/vme_pio2.h             |  80 ++--
 drivers/staging/vt6655/card.c                      |   2 +-
 drivers/staging/vt6655/card.h                      |   2 +-
 drivers/staging/vt6655/device_main.c               |  19 +-
 drivers/staging/vt6655/key.c                       |   4 +-
 drivers/staging/vt6656/card.c                      |  29 +-
 drivers/staging/vt6656/main_usb.c                  |  17 +-
 drivers/staging/vt6656/rxtx.c                      |  90 +++--
 drivers/staging/wilc1000/host_interface.c          |  20 +-
 drivers/staging/wilc1000/host_interface.h          |  10 +-
 drivers/staging/wilc1000/wilc_debugfs.c            |  28 +-
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c  |  18 +-
 drivers/staging/wlan-ng/prism2fw.c                 |  24 +-
 drivers/staging/wlan-ng/prism2mgmt.c               |   2 +-
 drivers/staging/wlan-ng/prism2sta.c                | 100 ++---
 drivers/tty/tty_io.c                               |  10 +-
 drivers/tty/tty_ldisc.c                            |   2 +
 include/linux/hid-sensor-hub.h                     |   5 +
 include/linux/hid-sensor-ids.h                     |   5 +
 include/linux/iio/timer/stm32-timer-trigger.h      |   2 +
 include/linux/mfd/stm32-timers.h                   |   2 +
 include/linux/tty.h                                |   2 +
 include/uapi/linux/tty.h                           |   1 +
 tools/iio/Makefile                                 |   2 +-
 tools/iio/iio_utils.h                              |   2 +-
 252 files changed, 5533 insertions(+), 4991 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/iio/adc/ti-adc084s021.txt
 create mode 100644 Documentation/devicetree/bindings/iio/adc/ti-adc108s102.txt
 create mode 100644 drivers/iio/adc/ti-adc084s021.c
 create mode 100644 drivers/iio/adc/ti-adc108s102.c
 rename drivers/{staging => }/iio/light/isl29028.c (89%)
 delete mode 100644 drivers/staging/ccree/cc_pal_log.h
 delete mode 100644 drivers/staging/ccree/cc_pal_log_plat.h
 delete mode 100644 drivers/staging/ccree/cc_pal_types.h
 delete mode 100644 drivers/staging/ccree/cc_pal_types_plat.h
 delete mode 100644 drivers/staging/ccree/dx_env.h
 delete mode 100644 drivers/staging/ccree/hw_queue_defs_plat.h
 rename drivers/staging/iio/light/{tsl2x7x_core.c => tsl2x7x.c} (95%)
 delete mode 100644 drivers/staging/most/aim-network/networking.h
 create mode 100644 drivers/staging/speakup/spk_ttyio.c
Merging mux/for-next (a351e9b9fc24 Linux 4.11)
$ git merge mux/for-next
Already up-to-date.
Merging slave-dma/next (2f12f9eac2ae Merge branch 'topic/pl330' into next)
$ git merge slave-dma/next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/dma/arm-pl08x.txt          |    9 +-
 .../devicetree/bindings/dma/brcm,iproc-sba.txt     |   29 +
 .../devicetree/bindings/dma/renesas,rcar-dmac.txt  |    5 +-
 arch/arm/mach-lpc32xx/phy3250.c                    |    3 +
 arch/arm/mach-s3c64xx/pl080.c                      |   28 +-
 arch/arm/mach-spear/spear3xx.c                     |   14 +-
 arch/arm/mach-spear/spear6xx.c                     |   14 +-
 crypto/async_tx/async_pq.c                         |    5 +-
 drivers/dma/Kconfig                                |   21 +-
 drivers/dma/Makefile                               |    1 +
 drivers/dma/amba-pl08x.c                           |  970 ++++++++---
 drivers/dma/bcm-sba-raid.c                         | 1785 ++++++++++++++++++++
 drivers/dma/dw/platform.c                          |    6 +-
 drivers/dma/ep93xx_dma.c                           |   39 +-
 drivers/dma/imx-sdma.c                             |   27 +-
 drivers/dma/mv_xor_v2.c                            |  147 +-
 drivers/dma/pl330.c                                |   75 +-
 drivers/dma/sh/rcar-dmac.c                         |   30 +-
 drivers/dma/sh/usb-dmac.c                          |    2 +-
 include/linux/amba/pl080.h                         |  107 +-
 include/linux/amba/pl08x.h                         |   30 +-
 include/linux/raid/pq.h                            |    1 +
 lib/raid6/mktables.c                               |   20 +
 23 files changed, 3003 insertions(+), 365 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/dma/brcm,iproc-sba.txt
 create mode 100644 drivers/dma/bcm-sba-raid.c
Merging cgroup/for-next (41c25707d217 cpuset: consider dying css as offline)
$ git merge cgroup/for-next
Merge made by the 'recursive' strategy.
 include/linux/cgroup-defs.h |  1 +
 include/linux/cgroup.h      | 20 ++++++++++++++++++++
 kernel/cgroup/cgroup.c      |  5 +++++
 kernel/cgroup/cpuset.c      |  4 ++--
 4 files changed, 28 insertions(+), 2 deletions(-)
Merging scsi/for-next (35f07119477d Merge branch 'misc' into for-next)
$ git merge scsi/for-next
Auto-merging drivers/scsi/qedi/qedi_main.c
Auto-merging drivers/scsi/qedi/qedi_iscsi.c
Auto-merging drivers/scsi/qedi/qedi_fw.c
Auto-merging drivers/hv/channel_mgmt.c
Merge made by the 'recursive' strategy.
 drivers/hv/channel_mgmt.c                      |    1 -
 drivers/scsi/aacraid/aachba.c                  |   17 +-
 drivers/scsi/aacraid/aacraid.h                 |   22 +-
 drivers/scsi/aacraid/commctrl.c                |   15 +-
 drivers/scsi/aacraid/comminit.c                |   18 +-
 drivers/scsi/aacraid/commsup.c                 |   78 +-
 drivers/scsi/aacraid/linit.c                   |  232 ++-
 drivers/scsi/aacraid/src.c                     |  136 +-
 drivers/scsi/csiostor/csio_hw.c                |   79 +-
 drivers/scsi/csiostor/csio_hw_chip.h           |   14 +
 drivers/scsi/csiostor/csio_hw_t5.c             |   29 +-
 drivers/scsi/csiostor/csio_init.c              |    6 +-
 drivers/scsi/csiostor/csio_lnode.c             |   43 +-
 drivers/scsi/csiostor/csio_wr.c                |    4 +-
 drivers/scsi/cxgbi/libcxgbi.c                  |   25 +-
 drivers/scsi/cxgbi/libcxgbi.h                  |   16 +-
 drivers/scsi/device_handler/scsi_dh_rdac.c     |   10 +-
 drivers/scsi/hisi_sas/hisi_sas_main.c          |    2 +-
 drivers/scsi/hpsa.c                            |  849 ++-------
 drivers/scsi/hpsa.h                            |    4 +-
 drivers/scsi/hpsa_cmd.h                        |   20 +-
 drivers/scsi/libiscsi.c                        |    4 +-
 drivers/scsi/qedi/qedi.h                       |    3 +-
 drivers/scsi/qedi/qedi_fw.c                    |    2 +
 drivers/scsi/qedi/qedi_iscsi.c                 |    7 +-
 drivers/scsi/qedi/qedi_main.c                  |   25 +-
 drivers/scsi/qla2xxx/qla_target.h              |    1 -
 drivers/scsi/smartpqi/smartpqi.h               |  194 +-
 drivers/scsi/smartpqi/smartpqi_init.c          | 2419 ++++++++++++++++++------
 drivers/scsi/smartpqi/smartpqi_sas_transport.c |    2 +-
 drivers/scsi/smartpqi/smartpqi_sis.c           |  100 +-
 drivers/scsi/smartpqi/smartpqi_sis.h           |    7 +-
 drivers/scsi/storvsc_drv.c                     |   52 +-
 include/linux/hyperv.h                         |    1 -
 34 files changed, 2725 insertions(+), 1712 deletions(-)
Merging scsi-mkp/for-next (deaeaca22654 scsi: qla2xxx: Remove an unused structure member)
$ git merge scsi-mkp/for-next
Already up-to-date.
Merging target-updates/for-next (cae4e246117d ibmvscsis: Enable Logical Partition Migration Support)
$ git merge target-updates/for-next
Merge made by the 'recursive' strategy.
 drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 175 ++++++++++++++++++++++++++++---
 drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.h |  25 ++++-
 drivers/scsi/ibmvscsi_tgt/libsrp.h       |   5 +-
 drivers/target/target_core_rd.c          |   4 +-
 drivers/target/target_core_transport.c   |  23 +++-
 drivers/target/target_core_user.c        |  46 +++++---
 drivers/vhost/scsi.c                     |  11 +-
 7 files changed, 241 insertions(+), 48 deletions(-)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
$ git merge target-merge/for-next-merge
Already up-to-date.
Merging target-bva/for-next (a351e9b9fc24 Linux 4.11)
$ git merge target-bva/for-next
Already up-to-date.
Merging libata/for-next (b8d267c7426a Merge branch 'for-4.13' into for-next)
$ git merge libata/for-next
Auto-merging drivers/ata/libata-sff.c
Auto-merging drivers/ata/ahci.c
Merge made by the 'recursive' strategy.
 drivers/ata/ahci.c             | 38 ++++++++++++++++++++++++++++++++++++
 drivers/ata/libahci_platform.c |  5 +++--
 drivers/ata/libata-sff.c       | 44 ++++++++----------------------------------
 drivers/ata/pata_bf54x.c       |  2 --
 drivers/ata/pata_ep93xx.c      |  1 -
 drivers/ata/pata_rb532_cf.c    |  2 --
 drivers/ata/pata_samsung_cf.c  |  2 --
 drivers/ata/sata_dwc_460ex.c   |  1 -
 drivers/ata/sata_fsl.c         |  2 --
 drivers/ata/sata_mv.c          | 13 ++++++++-----
 drivers/ata/sata_rcar.c        | 15 +++++++++++---
 11 files changed, 69 insertions(+), 56 deletions(-)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
$ git merge binfmt_misc/for-next
Already up-to-date.
Merging vhost/linux-next (c8b0d7290657 s390/virtio: change maintainership)
$ git merge vhost/linux-next
Already up-to-date.
Merging rpmsg/for-next (0696d197bda1 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
$ git merge rpmsg/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/hwlock/sprd-hwspinlock.txt |   23 +
 .../devicetree/bindings/soc/qcom/qcom,glink.txt    |   73 ++
 drivers/hwspinlock/Kconfig                         |   26 +-
 drivers/hwspinlock/Makefile                        |    1 +
 drivers/hwspinlock/sprd_hwspinlock.c               |  183 +++
 drivers/remoteproc/remoteproc_core.c               |  178 +--
 drivers/rpmsg/Kconfig                              |   10 +
 drivers/rpmsg/Makefile                             |    1 +
 drivers/rpmsg/qcom_glink_rpm.c                     | 1233 ++++++++++++++++++++
 drivers/rpmsg/qcom_smd.c                           |   11 +
 drivers/rpmsg/virtio_rpmsg_bus.c                   |    9 +
 11 files changed, 1672 insertions(+), 76 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/hwlock/sprd-hwspinlock.txt
 create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,glink.txt
 create mode 100644 drivers/hwspinlock/sprd_hwspinlock.c
 create mode 100644 drivers/rpmsg/qcom_glink_rpm.c
Merging gpio/for-next (d46c4e22d34b Merge branch 'devel' into for-next)
$ git merge gpio/for-next
Auto-merging include/linux/gpio/machine.h
Auto-merging drivers/pinctrl/pinctrl-mcp23s08.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 Documentation/acpi/gpio-properties.txt             |  65 +++
 Documentation/devicetree/bindings/gpio/gpio.txt    |  13 +-
 MAINTAINERS                                        |   9 +-
 arch/arm/configs/lpc32xx_defconfig                 |   2 +-
 arch/arm/mach-davinci/board-da830-evm.c            |   2 +-
 arch/arm/mach-davinci/board-dm644x-evm.c           |   2 +-
 arch/arm/mach-davinci/board-dm646x-evm.c           |   2 +-
 arch/arm/mach-pxa/balloon3.c                       |   2 +-
 arch/arm/mach-pxa/littleton.c                      |   2 +-
 arch/arm/mach-pxa/stargate2.c                      |   2 +-
 arch/blackfin/configs/BF609-EZKIT_defconfig        |   2 +-
 arch/blackfin/mach-bf527/boards/tll6527m.c         |   8 +-
 arch/blackfin/mach-bf537/boards/stamp.c            |   2 +-
 arch/blackfin/mach-bf609/boards/ezkit.c            |   4 +-
 arch/mips/ath79/mach-pb44.c                        |   2 +-
 drivers/gpio/Kconfig                               |  26 +-
 drivers/gpio/Makefile                              |   2 +-
 drivers/gpio/gpio-adp5588.c                        |   2 +-
 drivers/gpio/gpio-arizona.c                        |  35 +-
 drivers/gpio/gpio-aspeed.c                         |   3 +
 drivers/gpio/gpio-crystalcove.c                    |  54 +-
 drivers/gpio/gpio-davinci.c                        |  11 +-
 drivers/gpio/gpio-max732x.c                        |   2 +-
 drivers/gpio/gpio-ml-ioh.c                         |  16 +-
 drivers/gpio/gpio-mockup.c                         |  37 +-
 drivers/gpio/gpio-mvebu.c                          | 452 +++++++-------
 drivers/gpio/gpio-pcf857x.c                        |   2 +-
 drivers/gpio/gpio-pch.c                            |  15 +-
 drivers/gpio/gpio-sta2x11.c                        |  12 +-
 drivers/gpio/gpio-xra1403.c                        | 237 ++++++++
 drivers/gpio/gpio-zynq.c                           |   5 +-
 drivers/gpio/gpiolib-acpi.c                        | 185 +++---
 drivers/gpio/gpiolib-of.c                          |   3 +
 drivers/gpio/gpiolib.c                             |  29 +-
 drivers/gpio/gpiolib.h                             |  18 +-
 drivers/input/keyboard/adp5588-keys.c              |   2 +-
 drivers/pinctrl/Kconfig                            |  13 +
 drivers/pinctrl/Makefile                           |   1 +
 .../gpio-mcp23s08.c => pinctrl/pinctrl-mcp23s08.c} | 647 +++++++++++++--------
 drivers/pnp/pnpacpi/rsparser.c                     |  38 +-
 include/dt-bindings/gpio/gpio.h                    |   4 +
 include/linux/acpi.h                               |   7 +
 include/linux/gpio/driver.h                        |   3 +
 include/linux/gpio/machine.h                       |   2 +
 include/linux/of_gpio.h                            |   1 +
 include/linux/{i2c => platform_data}/adp5588.h     |   0
 include/linux/{i2c => platform_data}/max732x.h     |   0
 include/linux/{i2c => platform_data}/pcf857x.h     |   0
 include/linux/spi/mcp23s08.h                       |  38 +-
 49 files changed, 1355 insertions(+), 666 deletions(-)
 create mode 100644 drivers/gpio/gpio-xra1403.c
 rename drivers/{gpio/gpio-mcp23s08.c => pinctrl/pinctrl-mcp23s08.c} (64%)
 rename include/linux/{i2c => platform_data}/adp5588.h (100%)
 rename include/linux/{i2c => platform_data}/max732x.h (100%)
 rename include/linux/{i2c => platform_data}/pcf857x.h (100%)
Merging pinctrl/for-next (80e91c89a76f Merge branch 'devel' into for-next)
$ git merge pinctrl/for-next
Resolved 'MAINTAINERS' using previous resolution.
Removing drivers/pinctrl/mediatek/pinctrl-mtk-mt7623.h
Removing drivers/pinctrl/mediatek/pinctrl-mt7623.c
Auto-merging drivers/gpio/Makefile
Auto-merging drivers/gpio/Kconfig
Removing arch/mips/jz4740/gpio.c
Auto-merging arch/mips/Kconfig
Auto-merging MAINTAINERS
CONFLICT (content): Merge conflict in MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 06867893048b] Merge remote-tracking branch 'pinctrl/for-next'
$ git diff -M --stat --summary HEAD^..
 .../devicetree/bindings/gpio/ingenic,gpio.txt      |   46 +
 .../bindings/pinctrl/ingenic,pinctrl.txt           |   41 +
 .../devicetree/bindings/pinctrl/pinctrl-zx.txt     |   85 +
 Documentation/pinctrl.txt                          | 1124 ++++++------
 MAINTAINERS                                        |    1 +
 arch/mips/Kconfig                                  |    1 +
 arch/mips/boot/dts/ingenic/ci20.dts                |   60 +
 arch/mips/boot/dts/ingenic/jz4740.dtsi             |   68 +
 arch/mips/boot/dts/ingenic/jz4780.dtsi             |   98 +
 arch/mips/boot/dts/ingenic/qi_lb60.dts             |   13 +
 arch/mips/include/asm/mach-jz4740/gpio.h           |  371 ----
 arch/mips/jz4740/Makefile                          |    2 -
 arch/mips/jz4740/board-qi_lb60.c                   |   48 +-
 arch/mips/jz4740/gpio.c                            |  519 ------
 drivers/gpio/Kconfig                               |   11 +
 drivers/gpio/Makefile                              |    1 +
 drivers/gpio/gpio-ingenic.c                        |  394 ++++
 drivers/mmc/host/jz4740_mmc.c                      |   44 +-
 drivers/mtd/nand/jz4740_nand.c                     |   23 +-
 drivers/pinctrl/Kconfig                            |   11 +
 drivers/pinctrl/Makefile                           |    2 +
 drivers/pinctrl/bcm/pinctrl-bcm281xx.c             |   16 +-
 drivers/pinctrl/bcm/pinctrl-bcm2835.c              |   20 +-
 drivers/pinctrl/bcm/pinctrl-cygnus-mux.c           |   11 +-
 drivers/pinctrl/core.c                             |   30 +-
 drivers/pinctrl/freescale/Kconfig                  |    2 +-
 drivers/pinctrl/freescale/pinctrl-imx.c            |  135 +-
 drivers/pinctrl/freescale/pinctrl-imx.h            |   29 +
 drivers/pinctrl/freescale/pinctrl-vf610.c          |    2 +
 drivers/pinctrl/mediatek/Kconfig                   |    9 +-
 drivers/pinctrl/mediatek/Makefile                  |    1 -
 drivers/pinctrl/mediatek/pinctrl-mt2701.c          |    1 +
 drivers/pinctrl/mediatek/pinctrl-mt7623.c          |  379 ----
 drivers/pinctrl/mediatek/pinctrl-mtk-mt7623.h      | 1936 --------------------
 drivers/pinctrl/meson/pinctrl-meson-gxbb.c         |   25 +
 drivers/pinctrl/meson/pinctrl-meson-gxl.c          |   43 +-
 drivers/pinctrl/meson/pinctrl-meson8.c             |  127 +-
 drivers/pinctrl/mvebu/pinctrl-armada-37xx.c        |  229 +++
 drivers/pinctrl/pinconf.c                          |   35 +-
 drivers/pinctrl/pinctrl-amd.c                      |   95 +-
 drivers/pinctrl/pinctrl-ingenic.c                  |  852 +++++++++
 drivers/pinctrl/pinctrl-rockchip.c                 |  343 +++-
 drivers/pinctrl/pinctrl-single.c                   |    8 +-
 drivers/pinctrl/tegra/pinctrl-tegra.c              |    1 -
 drivers/pinctrl/tegra/pinctrl-tegra114.c           |   11 +-
 drivers/pinctrl/tegra/pinctrl-tegra124.c           |   11 +-
 drivers/pinctrl/tegra/pinctrl-tegra20.c            |   11 +-
 drivers/pinctrl/tegra/pinctrl-tegra210.c           |    9 +-
 drivers/pinctrl/tegra/pinctrl-tegra30.c            |   11 +-
 drivers/pinctrl/zte/Kconfig                        |   13 +
 drivers/pinctrl/zte/Makefile                       |    2 +
 drivers/pinctrl/zte/pinctrl-zx.c                   |  445 +++++
 drivers/pinctrl/zte/pinctrl-zx.h                   |  105 ++
 drivers/pinctrl/zte/pinctrl-zx296718.c             | 1027 +++++++++++
 drivers/pwm/pwm-jz4740.c                           |   29 -
 drivers/video/fbdev/jz4740_fb.c                    |  104 +-
 56 files changed, 4906 insertions(+), 4164 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/gpio/ingenic,gpio.txt
 create mode 100644 Documentation/devicetree/bindings/pinctrl/ingenic,pinctrl.txt
 create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-zx.txt
 delete mode 100644 arch/mips/jz4740/gpio.c
 create mode 100644 drivers/gpio/gpio-ingenic.c
 delete mode 100644 drivers/pinctrl/mediatek/pinctrl-mt7623.c
 delete mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt7623.h
 create mode 100644 drivers/pinctrl/pinctrl-ingenic.c
 create mode 100644 drivers/pinctrl/zte/Kconfig
 create mode 100644 drivers/pinctrl/zte/Makefile
 create mode 100644 drivers/pinctrl/zte/pinctrl-zx.c
 create mode 100644 drivers/pinctrl/zte/pinctrl-zx.h
 create mode 100644 drivers/pinctrl/zte/pinctrl-zx296718.c
Merging pinctrl-samsung/for-next (16340fd6dbc1 pinctrl: samsung: Split Exynos drivers per ARMv7 and ARMv8)
$ git merge pinctrl-samsung/for-next
Merge made by the 'recursive' strategy.
 drivers/pinctrl/samsung/Kconfig                |   10 +
 drivers/pinctrl/samsung/Makefile               |    2 +
 drivers/pinctrl/samsung/pinctrl-exynos-arm.c   |  815 +++++++++++++++++
 drivers/pinctrl/samsung/pinctrl-exynos-arm64.c |  399 ++++++++
 drivers/pinctrl/samsung/pinctrl-exynos.c       | 1163 +-----------------------
 drivers/pinctrl/samsung/pinctrl-exynos.h       |   13 +
 drivers/pinctrl/samsung/pinctrl-exynos5440.c   |   15 +-
 drivers/pinctrl/samsung/pinctrl-s3c24xx.c      |    2 +-
 drivers/pinctrl/samsung/pinctrl-s3c64xx.c      |    2 +-
 drivers/pinctrl/samsung/pinctrl-samsung.c      |   39 +-
 10 files changed, 1265 insertions(+), 1195 deletions(-)
 create mode 100644 drivers/pinctrl/samsung/pinctrl-exynos-arm.c
 create mode 100644 drivers/pinctrl/samsung/pinctrl-exynos-arm64.c
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
$ git merge dma-mapping/dma-mapping-next
Already up-to-date.
Merging pwm/for-next (97512ceafaac Merge branch 'for-4.12/drivers' into for-next)
$ git merge pwm/for-next
Already up-to-date.
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
$ git merge dma-buf/for-next
Resolved 'drivers/dma-buf/Kconfig' using previous resolution.
Auto-merging drivers/dma-buf/Kconfig
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 59d5d1168ecb] Merge remote-tracking branch 'dma-buf/for-next'
$ git diff -M --stat --summary HEAD^..
 MAINTAINERS | 11 +++++++++++
 1 file changed, 11 insertions(+)
Merging userns/for-next (296990deb389 mnt: Make propagate_umount less slow for overlapping mount propagation trees)
$ git merge userns/for-next
Merge made by the 'recursive' strategy.
 fs/mount.h     |   1 +
 fs/namespace.c |   1 +
 fs/pnode.c     | 212 ++++++++++++++++++++++++++++++++++++++++++++-------------
 3 files changed, 165 insertions(+), 49 deletions(-)
Merging ktest/for-next (f7c6401ff84a ktest: Make sure wait_for_input does honor the timeout)
$ git merge ktest/for-next
Already up-to-date.
Merging random/dev (9dfa7bba35ac fix race in drivers/char/random.c:get_reg())
$ git merge random/dev
Merge made by the 'recursive' strategy.
 drivers/char/random.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
Merging aio/master (b562e44f507e Linux 4.5)
$ git merge aio/master
Already up-to-date.
Merging kselftest/next (2ea659a9ef48 Linux 4.12-rc1)
$ git merge kselftest/next
Already up-to-date.
Merging y2038/y2038 (69973b830859 Linux 4.9)
$ git merge y2038/y2038
Already up-to-date.
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
$ git merge luto-misc/next
Already up-to-date.
Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge borntraeger/linux-next
Already up-to-date.
Merging livepatching/for-next (c87a040fb6c5 Merge branch 'for-4.12/upstream-fixes' into for-next)
$ git merge livepatching/for-next
Merge made by the 'recursive' strategy.
 kernel/livepatch/Kconfig | 1 +
 1 file changed, 1 insertion(+)
Merging coresight/next (44389a7d12ec coresight: add support for CPU debug module)
$ git merge coresight/next
Auto-merging MAINTAINERS
Auto-merging Documentation/admin-guide/kernel-parameters.txt
Merge made by the 'recursive' strategy.
 Documentation/admin-guide/kernel-parameters.txt    |   7 +
 .../bindings/arm/coresight-cpu-debug.txt           |  49 ++
 Documentation/trace/coresight-cpu-debug.txt        | 175 ++++++
 MAINTAINERS                                        |   2 +
 drivers/hwtracing/coresight/Kconfig                |  14 +
 drivers/hwtracing/coresight/Makefile               |   1 +
 drivers/hwtracing/coresight/coresight-cpu-debug.c  | 700 +++++++++++++++++++++
 drivers/hwtracing/coresight/coresight-etb10.c      |   7 +-
 drivers/hwtracing/coresight/coresight-etm-perf.c   |   3 +-
 drivers/hwtracing/coresight/coresight-tmc-etf.c    |  25 +-
 drivers/hwtracing/coresight/coresight-tmc.c        |   7 +
 drivers/hwtracing/coresight/coresight.c            |  34 +-
 drivers/hwtracing/coresight/of_coresight.c         |  47 +-
 include/linux/coresight.h                          |  10 +-
 14 files changed, 1040 insertions(+), 41 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt
 create mode 100644 Documentation/trace/coresight-cpu-debug.txt
 create mode 100644 drivers/hwtracing/coresight/coresight-cpu-debug.c
Merging rtc/rtc-next (7562e54bbd90 rtc: m41t80: add clock provider support)
$ git merge rtc/rtc-next
Merge made by the 'recursive' strategy.
 drivers/rtc/rtc-ds1307.c | 604 +++++++++++++++++------------------------------
 drivers/rtc/rtc-m41t80.c | 251 ++++++++++++++------
 2 files changed, 397 insertions(+), 458 deletions(-)
$ git reset --hard HEAD^
HEAD is now at 321d42c80415 Merge remote-tracking branch 'coresight/next'
Merging next-20170530 version of rtc
$ git merge -m next-20170530/rtc 11e5890b5342c82eefbaa39aec4767ae21ae8803
Merge made by the 'recursive' strategy.
 drivers/rtc/rtc-ds1307.c | 603 +++++++++++++++++------------------------------
 1 file changed, 221 insertions(+), 382 deletions(-)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
$ git merge hwspinlock/for-next
Already up-to-date.
Merging nvdimm/libnvdimm-for-next (f5705aa8cfed dax, xfs, ext4: compile out iomap-dax paths in the FS_DAX=n case)
$ git merge nvdimm/libnvdimm-for-next
Already up-to-date.
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
$ git merge dax-misc/dax-misc
Already up-to-date.
Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too)
$ git merge idr/idr-4.11
Already up-to-date.
Merging akpm-current/current (efe4e421f00f ipc/util.h: update documentation for ipc_getref() and ipc_putref())
$ git merge --no-ff akpm-current/current
Auto-merging mm/vmscan.c
Auto-merging mm/rmap.c
Auto-merging lib/Kconfig.debug
Auto-merging kernel/exit.c
Auto-merging kernel/cgroup/cpuset.c
Auto-merging include/linux/sched.h
Auto-merging include/linux/kernel.h
Auto-merging fs/proc/base.c
Auto-merging fs/namespace.c
Auto-merging drivers/base/node.c
Auto-merging arch/s390/mm/hugetlbpage.c
Auto-merging arch/s390/Kconfig
Removing arch/mn10300/include/asm/fb.h
Removing arch/mn10300/include/asm/device.h
Removing arch/frv/include/asm/fb.h
Removing arch/frv/include/asm/device.h
Auto-merging MAINTAINERS
Auto-merging Documentation/admin-guide/kernel-parameters.txt
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-block-zram        |  10 +
 Documentation/admin-guide/kernel-parameters.txt   |   7 +-
 Documentation/blockdev/zram.txt                   |   3 +
 Documentation/cgroup-v2.txt                       |  48 +-
 Documentation/dev-tools/kmemleak.rst              |   1 +
 Documentation/fault-injection/fault-injection.txt |  79 +++
 Documentation/filesystems/proc.txt                |   6 +-
 Documentation/kdump/kdump.txt                     |  12 +-
 Documentation/vm/ksm.txt                          |  63 ++
 MAINTAINERS                                       |  11 +
 arch/arm/include/asm/page.h                       |   2 +
 arch/arm64/Kconfig                                |   2 +-
 arch/arm64/include/asm/hugetlb.h                  |   4 +
 arch/arm64/include/asm/stackprotector.h           |   1 +
 arch/arm64/mm/hugetlbpage.c                       |  53 +-
 arch/frv/include/asm/Kbuild                       |   2 +
 arch/frv/include/asm/device.h                     |   7 -
 arch/frv/include/asm/fb.h                         |  12 -
 arch/frv/include/asm/timex.h                      |   6 +
 arch/ia64/kernel/machine_kexec.c                  |   5 -
 arch/ia64/mm/hugetlbpage.c                        |   4 +-
 arch/ia64/mm/init.c                               |  11 +-
 arch/metag/mm/hugetlbpage.c                       |   3 +-
 arch/mips/mm/hugetlbpage.c                        |   3 +-
 arch/mn10300/include/asm/Kbuild                   |   2 +
 arch/mn10300/include/asm/device.h                 |   1 -
 arch/mn10300/include/asm/fb.h                     |  23 -
 arch/parisc/mm/hugetlbpage.c                      |   3 +-
 arch/powerpc/include/asm/book3s/64/hugetlb.h      |  10 +
 arch/powerpc/kernel/fadump.c                      |   3 +-
 arch/powerpc/mm/hugetlbpage.c                     |  90 +--
 arch/powerpc/mm/mem.c                             |  12 +-
 arch/powerpc/platforms/Kconfig.cputype            |   6 +
 arch/s390/Kconfig                                 |   2 +-
 arch/s390/include/asm/hugetlb.h                   |   5 +-
 arch/s390/kernel/machine_kexec.c                  |   1 +
 arch/s390/kernel/setup.c                          |   6 -
 arch/s390/mm/hugetlbpage.c                        |   3 +-
 arch/s390/mm/init.c                               |  32 +-
 arch/sh/include/asm/stackprotector.h              |   1 +
 arch/sh/mm/hugetlbpage.c                          |   3 +-
 arch/sh/mm/init.c                                 |  10 +-
 arch/sparc/mm/hugetlbpage.c                       |   3 +-
 arch/tile/mm/hugetlbpage.c                        |   3 +-
 arch/tile/mm/pgtable.c                            |  11 +
 arch/x86/Kconfig                                  |   3 +-
 arch/x86/include/asm/hugetlb.h                    |   4 +
 arch/x86/include/asm/stackprotector.h             |   1 +
 arch/x86/kernel/crash.c                           |   2 +-
 arch/x86/kernel/machine_kexec_64.c                |   1 +
 arch/x86/mm/hugetlbpage.c                         |   2 +-
 arch/x86/mm/init_32.c                             |   7 +-
 arch/x86/mm/init_64.c                             |  11 +-
 arch/x86/xen/mmu_pv.c                             |   4 +-
 block/genhd.c                                     |   2 +-
 drivers/base/memory.c                             |  83 ++-
 drivers/base/node.c                               |  72 +-
 drivers/block/zram/Kconfig                        |  14 +
 drivers/block/zram/Makefile                       |   3 +-
 drivers/block/zram/zram_dedup.c                   | 250 +++++++
 drivers/block/zram/zram_dedup.h                   |  45 ++
 drivers/block/zram/zram_drv.c                     | 238 +++++--
 drivers/block/zram/zram_drv.h                     |  33 +-
 drivers/char/pcmcia/cm4040_cs.c                   |   6 +-
 drivers/sh/intc/virq.c                            |   4 +-
 fs/Kconfig                                        |   1 -
 fs/bfs/inode.c                                    |   2 +-
 fs/dax.c                                          |  22 +-
 fs/dcache.c                                       |  18 +-
 fs/eventpoll.c                                    |  62 +-
 fs/exofs/dir.c                                    |   2 +-
 fs/ext2/dir.c                                     |   2 +-
 fs/inode.c                                        |  14 +-
 fs/jfs/jfs_metapage.c                             |   7 +-
 fs/jfs/jfs_metapage.h                             |   1 +
 fs/minix/dir.c                                    |   2 +-
 fs/namespace.c                                    |  10 +-
 fs/ncpfs/mmap.c                                   |   2 +-
 fs/ocfs2/dlm/dlmmaster.c                          |  66 +-
 fs/ocfs2/dlm/dlmrecovery.c                        |  40 +-
 fs/ocfs2/dlmglue.c                                |   2 +-
 fs/ocfs2/filecheck.c                              | 357 ++++------
 fs/ocfs2/filecheck.h                              |  29 +-
 fs/ocfs2/inode.c                                  |   2 +-
 fs/ocfs2/ocfs2.h                                  |   8 +
 fs/ocfs2/ocfs2_fs.h                               |   5 +-
 fs/ocfs2/stackglue.c                              |   6 -
 fs/ocfs2/stackglue.h                              |   3 -
 fs/ocfs2/super.c                                  |  35 +-
 fs/proc/base.c                                    |  44 ++
 fs/proc/proc_sysctl.c                             |  26 +-
 fs/seq_file.c                                     |  10 -
 fs/sysv/dir.c                                     |   2 +-
 fs/ufs/dir.c                                      |   2 +-
 fs/userfaultfd.c                                  |  12 +-
 include/asm-generic/bug.h                         |   1 +
 include/asm-generic/hugetlb.h                     |   4 +-
 include/linux/bootmem.h                           |   1 +
 include/linux/bug.h                               |  72 +-
 include/linux/build_bug.h                         |  84 +++
 include/linux/crash_core.h                        |   9 +-
 include/linux/eventpoll.h                         |   5 +
 include/linux/gfp.h                               |  13 +-
 include/linux/huge_mm.h                           |   7 +
 include/linux/hugetlb.h                           |  85 ++-
 include/linux/ipc.h                               |   3 +
 include/linux/jiffies.h                           |   6 +-
 include/linux/kernel.h                            |   9 +-
 include/linux/kexec.h                             |   2 +
 include/linux/kmemleak.h                          |   7 +
 include/linux/memblock.h                          |  25 -
 include/linux/memcontrol.h                        | 310 ++++++--
 include/linux/memory_hotplug.h                    |  51 +-
 include/linux/mempolicy.h                         |  12 +-
 include/linux/mm.h                                |  13 +-
 include/linux/mmzone.h                            |  63 +-
 include/linux/node.h                              |  35 +-
 include/linux/nodemask.h                          |   4 -
 include/linux/page-flags.h                        |   7 +-
 include/linux/random.h                            |  21 +
 include/linux/reboot.h                            |   4 +
 include/linux/sched.h                             |   3 +-
 include/linux/sem.h                               |  24 +-
 include/linux/slub_def.h                          |  34 +-
 include/linux/swap.h                              |  24 +-
 include/linux/swap_cgroup.h                       |   6 +-
 include/linux/sysctl.h                            |   3 +
 include/linux/vm_event_item.h                     |   1 +
 include/linux/vmstat.h                            |   1 -
 include/uapi/linux/kcmp.h                         |  10 +
 include/uapi/linux/magic.h                        |   1 +
 include/uapi/linux/mempolicy.h                    |   8 -
 include/uapi/linux/sem.h                          |   2 +-
 include/uapi/linux/sysctl.h                       |   4 +
 ipc/msg.c                                         |  28 +-
 ipc/sem.c                                         | 155 ++--
 ipc/shm.c                                         |  26 +-
 ipc/util.c                                        |  65 +-
 ipc/util.h                                        |  23 +-
 kernel/cgroup/cpuset.c                            |  33 +-
 kernel/crash_core.c                               |  44 +-
 kernel/exit.c                                     |   1 -
 kernel/fork.c                                     |  30 +-
 kernel/kcmp.c                                     |  57 ++
 kernel/kexec.c                                    |   8 +
 kernel/kexec_core.c                               |  39 +
 kernel/kexec_file.c                               |   8 +
 kernel/ksysfs.c                                   |   2 +-
 kernel/locking/qspinlock_paravirt.h               |   3 +-
 kernel/memremap.c                                 |   6 +-
 kernel/pid.c                                      |   7 +-
 kernel/reboot.c                                   |  27 +
 kernel/sysctl.c                                   | 304 +++++++-
 kernel/sysctl_binary.c                            |   2 +-
 lib/Kconfig.debug                                 |   2 +-
 lib/fault-inject.c                                |   7 +
 lib/interval_tree_test.c                          |  93 ++-
 lib/kstrtox.c                                     |  12 +-
 mm/Kconfig                                        |  38 +-
 mm/compaction.c                                   |   5 +-
 mm/filemap.c                                      |   2 +-
 mm/gup.c                                          | 221 ++++--
 mm/huge_memory.c                                  |  29 +-
 mm/hugetlb.c                                      | 103 ++-
 mm/kasan/kasan.c                                  |  14 +-
 mm/kasan/kasan_init.c                             |  12 +
 mm/kmemleak.c                                     | 136 +++-
 mm/ksm.c                                          | 823 ++++++++++++++++++++--
 mm/madvise.c                                      |   4 +-
 mm/memblock.c                                     |   3 -
 mm/memcontrol.c                                   |  76 +-
 mm/memory-failure.c                               |  23 +-
 mm/memory.c                                       |  50 +-
 mm/memory_hotplug.c                               | 520 +++++---------
 mm/mempolicy.c                                    | 181 ++---
 mm/migrate.c                                      |  21 +-
 mm/mlock.c                                        |   5 +-
 mm/mmap.c                                         |   2 +-
 mm/mprotect.c                                     |   2 -
 mm/nobootmem.c                                    |   2 +-
 mm/oom_kill.c                                     |   5 +
 mm/page-writeback.c                               |  29 +-
 mm/page_alloc.c                                   | 193 +++--
 mm/page_io.c                                      |  23 +-
 mm/page_isolation.c                               |  26 +-
 mm/page_owner.c                                   |   4 +-
 mm/page_vma_mapped.c                              |   3 +-
 mm/pagewalk.c                                     |   3 +-
 mm/rmap.c                                         |  15 +-
 mm/shmem.c                                        |   7 +-
 mm/slab.c                                         |  12 +-
 mm/slab.h                                         |  18 +-
 mm/slub.c                                         | 119 ++--
 mm/sparse.c                                       | 104 ++-
 mm/swap.c                                         |   1 +
 mm/swap_cgroup.c                                  |  40 +-
 mm/swap_slots.c                                   |  16 +-
 mm/swap_state.c                                   | 108 +--
 mm/swapfile.c                                     | 291 ++++++--
 mm/util.c                                         |   7 +-
 mm/vmalloc.c                                      |   7 +-
 mm/vmscan.c                                       | 284 ++++++--
 mm/vmstat.c                                       |  26 +-
 mm/workingset.c                                   |   9 +-
 mm/zswap.c                                        |  11 +-
 scripts/gdb/linux/constants.py.in                 |   7 +
 scripts/gdb/linux/proc.py                         |  73 ++
 scripts/gen_initramfs_list.sh                     |   2 +
 usr/Kconfig                                       |  25 +-
 209 files changed, 5320 insertions(+), 2540 deletions(-)
 delete mode 100644 arch/frv/include/asm/device.h
 delete mode 100644 arch/frv/include/asm/fb.h
 delete mode 100644 arch/mn10300/include/asm/device.h
 delete mode 100644 arch/mn10300/include/asm/fb.h
 create mode 100644 drivers/block/zram/zram_dedup.c
 create mode 100644 drivers/block/zram/zram_dedup.h
 create mode 100644 include/linux/build_bug.h
$ git clone -s -l -n -q . ../rebase-tmp
$ cd ../rebase-tmp
$ git checkout -b akpm remotes/origin/akpm/master
Switched to a new branch 'akpm'
$ git rebase --onto master remotes/origin/akpm/master-base
First, rewinding head to replay your work on top of it...
Applying: sparc64: NG4 memset 32 bits overflow
Applying: xtensa: use generic fb.h
Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant
$ cd ../next
$ git fetch -f ../rebase-tmp akpm:akpm/master
From ../rebase-tmp
 + e55f5f75d23b...a7e75ca7307f akpm       -> akpm/master  (forced update)
$ rm -rf ../rebase-tmp
Merging akpm/master (a7e75ca7307f lib/crc-ccitt: add CCITT-FALSE CRC16 variant)
$ git merge --no-ff akpm/master
Removing arch/xtensa/include/asm/fb.h
Merge made by the 'recursive' strategy.
 arch/sparc/lib/NG4memset.S     | 26 +++++++++----------
 arch/xtensa/include/asm/Kbuild |  1 +
 arch/xtensa/include/asm/fb.h   | 12 ---------
 include/linux/crc-ccitt.h      |  7 +++++
 lib/crc-ccitt.c                | 58 +++++++++++++++++++++++++++++++++++++++++-
 5 files changed, 78 insertions(+), 26 deletions(-)
 delete mode 100644 arch/xtensa/include/asm/fb.h