path: root/Next/merge.log

$ date -R
Tue, 14 May 2019 07:53:56 +1000
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at d7a02fa0a8f9 Merge tag 'upstream-5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/rw/ubifs
Merging origin/master (a13f0655503a Merge tag 'iommu-updates-v5.2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/joro/iommu)
$ git merge origin/master
Updating d7a02fa0a8f9..a13f0655503a
Fast-forward
 .../bindings/watchdog/fsl-imx-sc-wdt.txt           |  24 +
 .../devicetree/bindings/watchdog/mtk-wdt.txt       |   1 +
 drivers/acpi/arm64/iort.c                          |  11 +
 drivers/iommu/Kconfig                              |  25 +
 drivers/iommu/amd_iommu.c                          |  52 +-
 drivers/iommu/amd_iommu_init.c                     |   8 -
 drivers/iommu/amd_iommu_types.h                    |   6 -
 drivers/iommu/arm-smmu-regs.h                      |   2 +
 drivers/iommu/arm-smmu-v3.c                        | 355 ++++++++++---
 drivers/iommu/arm-smmu.c                           |  11 +-
 drivers/iommu/dmar.c                               |   2 +-
 drivers/iommu/intel-iommu.c                        | 584 ++++++++++++++++-----
 drivers/iommu/intel-pasid.c                        |   4 +-
 drivers/iommu/intel-svm.c                          |  19 +-
 drivers/iommu/intel_irq_remapping.c                |   7 +-
 drivers/iommu/iommu.c                              | 211 +++++++-
 drivers/iommu/mtk_iommu.c                          |   8 +-
 drivers/iommu/tegra-smmu.c                         |  41 +-
 drivers/vfio/mdev/mdev_core.c                      |  18 +
 drivers/vfio/mdev/mdev_private.h                   |   1 +
 drivers/vfio/vfio_iommu_type1.c                    | 139 ++++-
 drivers/watchdog/Kconfig                           | 161 +++---
 drivers/watchdog/Makefile                          |   2 +
 drivers/watchdog/alim7101_wdt.c                    |   2 +-
 drivers/watchdog/armada_37xx_wdt.c                 |  43 +-
 drivers/watchdog/asm9260_wdt.c                     |  77 ++-
 drivers/watchdog/aspeed_wdt.c                      |  25 +-
 drivers/watchdog/at91sam9_wdt.c                    |   4 +-
 drivers/watchdog/ath79_wdt.c                       |   4 +-
 drivers/watchdog/atlas7_wdt.c                      |  65 +--
 drivers/watchdog/bcm2835_wdt.c                     |   1 -
 drivers/watchdog/bcm7038_wdt.c                     |  42 +-
 drivers/watchdog/bcm_kona_wdt.c                    |  18 +-
 drivers/watchdog/bd70528_wdt.c                     | 290 ++++++++++
 drivers/watchdog/cadence_wdt.c                     |  90 +---
 drivers/watchdog/coh901327_wdt.c                   |  28 +-
 drivers/watchdog/da9052_wdt.c                      |  13 +-
 drivers/watchdog/da9055_wdt.c                      |  12 +-
 drivers/watchdog/da9062_wdt.c                      |  20 +-
 drivers/watchdog/da9063_wdt.c                      |  21 +-
 drivers/watchdog/davinci_wdt.c                     |  45 +-
 drivers/watchdog/digicolor_wdt.c                   |   4 +-
 drivers/watchdog/dw_wdt.c                          |   4 +-
 drivers/watchdog/ebc-c384_wdt.c                    |   5 +-
 drivers/watchdog/ep93xx_wdt.c                      |  17 +-
 drivers/watchdog/f71808e_wdt.c                     |  18 +-
 drivers/watchdog/ftwdt010_wdt.c                    |   6 +-
 drivers/watchdog/gpio_wdt.c                        |  16 +-
 drivers/watchdog/hpwdt.c                           |   3 +-
 drivers/watchdog/i6300esb.c                        |   9 +-
 drivers/watchdog/iTCO_wdt.c                        |  13 +-
 drivers/watchdog/imgpdc_wdt.c                      |  95 ++--
 drivers/watchdog/imx2_wdt.c                        |   8 +-
 drivers/watchdog/imx_sc_wdt.c                      | 175 ++++++
 drivers/watchdog/intel-mid_wdt.c                   |  22 +-
 drivers/watchdog/intel_scu_watchdog.c              |  20 +-
 drivers/watchdog/jz4740_wdt.c                      |  17 +-
 drivers/watchdog/kempld_wdt.c                      |  28 +-
 drivers/watchdog/lantiq_wdt.c                      |   4 +-
 drivers/watchdog/loongson1_wdt.c                   |  52 +-
 drivers/watchdog/lpc18xx_wdt.c                     |  47 +-
 drivers/watchdog/machzwd.c                         |   3 +-
 drivers/watchdog/max63xx_wdt.c                     |  24 +-
 drivers/watchdog/max77620_wdt.c                    |  23 +-
 drivers/watchdog/mena21_wdt.c                      |  28 +-
 drivers/watchdog/menf21bmc_wdt.c                   |  33 +-
 drivers/watchdog/meson_gxbb_wdt.c                  |  49 +-
 drivers/watchdog/meson_wdt.c                       |  19 +-
 drivers/watchdog/mlx_wdt.c                         |  14 +-
 drivers/watchdog/moxart_wdt.c                      |  20 +-
 drivers/watchdog/mpc8xxx_wdt.c                     |  20 +-
 drivers/watchdog/mt7621_wdt.c                      |  12 +-
 drivers/watchdog/mtk_wdt.c                         |  37 +-
 drivers/watchdog/ni903x_wdt.c                      |   4 +-
 drivers/watchdog/nic7018_wdt.c                     |   5 +-
 drivers/watchdog/npcm_wdt.c                        |  10 +-
 drivers/watchdog/nuc900_wdt.c                      |   4 +-
 drivers/watchdog/of_xilinx_wdt.c                   |  62 +--
 drivers/watchdog/omap_wdt.c                        |   4 +-
 drivers/watchdog/orion_wdt.c                       |  14 +-
 drivers/watchdog/pic32-dmt.c                       |  50 +-
 drivers/watchdog/pic32-wdt.c                       |  62 +--
 drivers/watchdog/pm8916_wdt.c                      |  21 +-
 drivers/watchdog/pnx4008_wdt.c                     |  45 +-
 drivers/watchdog/qcom-wdt.c                        |  55 +-
 drivers/watchdog/renesas_wdt.c                     |   9 +-
 drivers/watchdog/rn5t618_wdt.c                     |   9 +-
 drivers/watchdog/rt2880_wdt.c                      |  32 +-
 drivers/watchdog/rtd119x_wdt.c                     |  47 +-
 drivers/watchdog/rza_wdt.c                         |  25 +-
 drivers/watchdog/s3c2410_wdt.c                     |   4 +-
 drivers/watchdog/sama5d4_wdt.c                     |  39 +-
 drivers/watchdog/sb_wdog.c                         |   4 +-
 drivers/watchdog/sbsa_gwdt.c                       |  28 +-
 drivers/watchdog/shwdt.c                           |   4 +-
 drivers/watchdog/sirfsoc_wdt.c                     |  28 +-
 drivers/watchdog/sp5100_tco.c                      |   4 +-
 drivers/watchdog/sprd_wdt.c                        |  42 +-
 drivers/watchdog/st_lpc_wdt.c                      |  53 +-
 drivers/watchdog/stm32_iwdg.c                      | 150 +++---
 drivers/watchdog/stmp3xxx_rtc_wdt.c                |  16 +-
 drivers/watchdog/stpmic1_wdt.c                     |  13 +-
 drivers/watchdog/sunxi_wdt.c                       |  19 +-
 drivers/watchdog/tangox_wdt.c                      |  41 +-
 drivers/watchdog/tegra_wdt.c                       |  30 +-
 drivers/watchdog/tqmx86_wdt.c                      |  14 +-
 drivers/watchdog/ts4800_wdt.c                      |  33 +-
 drivers/watchdog/ts72xx_wdt.c                      |  18 +-
 drivers/watchdog/twl4030_wdt.c                     |  22 +-
 drivers/watchdog/txx9wdt.c                         |   4 +-
 drivers/watchdog/uniphier_wdt.c                    |   2 -
 drivers/watchdog/ux500_wdt.c                       |  17 +-
 drivers/watchdog/watchdog_core.c                   |  42 +-
 drivers/watchdog/wdat_wdt.c                        |  29 +-
 drivers/watchdog/wm831x_wdt.c                      |  19 +-
 drivers/watchdog/xen_wdt.c                         |  18 +-
 drivers/watchdog/ziirave_wdt.c                     |   6 +-
 drivers/watchdog/zx2967_wdt.c                      |  37 +-
 include/linux/intel-iommu.h                        |  13 +-
 include/linux/iommu.h                              | 144 +++++
 include/linux/iova.h                               |  16 +-
 include/linux/mdev.h                               |  14 +
 include/linux/pci.h                                |  31 +-
 123 files changed, 2866 insertions(+), 1883 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/watchdog/fsl-imx-sc-wdt.txt
 create mode 100644 drivers/watchdog/bd70528_wdt.c
 create mode 100644 drivers/watchdog/imx_sc_wdt.c
Merging fixes/master (d15da9d3fb74 kernel/compat.c: mark expected switch fall-throughs)
$ git merge fixes/master
Merge made by the 'recursive' strategy.
 kernel/compat.c | 3 +++
 1 file changed, 3 insertions(+)
Merging kspp-gustavo/for-next/kspp (ccaa75187a5f memstick: mark expected switch fall-throughs)
$ git merge kspp-gustavo/for-next/kspp
Already up to date.
Merging kbuild-current/fixes (a2d635decbfa Merge tag 'drm-next-2019-05-09' of git://anongit.freedesktop.org/drm/drm)
$ git merge kbuild-current/fixes
Already up to date.
Merging arc-current/for-curr (ea4bb8f4c41b ARC: mm: SIGSEGV userspace trying to access kernel virtual memory)
$ git merge arc-current/for-curr
Merge made by the 'recursive' strategy.
 arch/arc/include/asm/cmpxchg.h | 14 ++++++++++----
 arch/arc/mm/fault.c            |  9 +++------
 arch/arc/mm/tlb.c              | 13 ++++++++-----
 3 files changed, 21 insertions(+), 15 deletions(-)
Merging arm-current/fixes (e17b1af96b2a ARM: 8857/1: efi: enable CP15 DMB instructions before cleaning the cache)
$ git merge arm-current/fixes
Already up to date.
Merging arm64-fixes/for-next/fixes (4e69ecf4da1e arm64/module: ftrace: deal with place relative nature of PLTs)
$ git merge arm64-fixes/for-next/fixes
Already up to date.
Merging m68k-current/for-linus (fdd20ec8786a Documentation/features/time: Mark m68k having modern-timekeeping)
$ git merge m68k-current/for-linus
Already up to date.
Merging powerpc-fixes/fixes (12f363511d47 powerpc/32s: Fix BATs setting with CONFIG_STRICT_KERNEL_RWX)
$ git merge powerpc-fixes/fixes
Already up to date.
Merging sparc/master (b970afcfcabd Merge tag 'powerpc-5.2-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/powerpc/linux)
$ git merge sparc/master
Already up to date.
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
$ git merge fscrypt-current/for-stable
Already up to date.
Merging net/master (d4c26eb6e721 net: ethernet: stmmac: dwmac-sun8i: enable support of unicast filtering)
$ git merge net/master
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/net/keystone-netcp.txt     |   6 +-
 .../bindings/net/wireless/mediatek,mt76.txt        |   4 +-
 arch/powerpc/sysdev/tsi108_dev.c                   |   3 +-
 drivers/net/bonding/bond_options.c                 |   7 -
 drivers/net/ethernet/allwinner/sun4i-emac.c        |   2 +-
 drivers/net/ethernet/arc/emac_main.c               |   2 +-
 drivers/net/ethernet/cavium/octeon/octeon_mgmt.c   |   2 +-
 drivers/net/ethernet/davicom/dm9000.c              |   2 +-
 drivers/net/ethernet/freescale/fec_mpc52xx.c       |   2 +-
 drivers/net/ethernet/freescale/fman/mac.c          |   2 +-
 .../net/ethernet/freescale/fs_enet/fs_enet-main.c  |   2 +-
 drivers/net/ethernet/freescale/gianfar.c           |   2 +-
 drivers/net/ethernet/freescale/ucc_geth.c          |   2 +-
 drivers/net/ethernet/ibm/ibmvnic.c                 |  62 +++----
 drivers/net/ethernet/ibm/ibmvnic.h                 |   2 -
 drivers/net/ethernet/marvell/mv643xx_eth.c         |   2 +-
 drivers/net/ethernet/marvell/mvneta.c              |   2 +-
 drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c    |   4 +-
 drivers/net/ethernet/marvell/sky2.c                |   2 +-
 drivers/net/ethernet/micrel/ks8851.c               |   2 +-
 drivers/net/ethernet/micrel/ks8851_mll.c           |   2 +-
 drivers/net/ethernet/nxp/lpc_eth.c                 |   2 +-
 drivers/net/ethernet/renesas/sh_eth.c              |   2 +-
 drivers/net/ethernet/seeq/sgiseeq.c                |   1 +
 drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c  |   2 +
 drivers/net/ethernet/ti/Makefile                   |   2 +-
 drivers/net/ethernet/ti/cpsw.c                     |   2 +-
 drivers/net/ethernet/xilinx/ll_temac_main.c        |   2 +-
 drivers/net/ethernet/xilinx/xilinx_emaclite.c      |   2 +-
 drivers/net/phy/mdio-mux-meson-g12a.c              |   2 +-
 drivers/net/phy/realtek.c                          |  16 +-
 drivers/net/wireless/mediatek/mt76/eeprom.c        |   2 +-
 drivers/of/of_net.c                                |  34 ++--
 include/net/dsa.h                                  |  15 --
 include/uapi/linux/bpf.h                           | 145 +++++++--------
 include/uapi/linux/netfilter/nf_tables.h           |   4 +-
 kernel/bpf/core.c                                  |   4 +-
 kernel/bpf/verifier.c                              |   2 +-
 net/bridge/br_if.c                                 |  13 +-
 net/bridge/netfilter/ebtables.c                    |   4 +-
 net/core/flow_dissector.c                          |   2 +
 net/dccp/proto.c                                   |   3 +-
 net/dsa/slave.c                                    |   2 +
 net/dsa/tag_brcm.c                                 |   2 +-
 net/netfilter/nf_conntrack_h323_asn1.c             |   2 +-
 net/netfilter/nf_conntrack_h323_main.c             |  11 +-
 net/netfilter/nf_conntrack_netlink.c               |   2 +-
 net/netfilter/nf_flow_table_core.c                 |  34 +++-
 net/netfilter/nf_flow_table_ip.c                   |   6 +
 net/netfilter/nf_tables_api.c                      |  59 +++++--
 net/netfilter/nft_flow_offload.c                   |   4 +-
 net/qrtr/qrtr.c                                    |   7 +-
 scripts/bpf_helpers_doc.py                         |   8 +-
 security/selinux/hooks.c                           |   8 +-
 tools/include/uapi/linux/bpf.h                     | 145 +++++++--------
 tools/lib/bpf/libbpf.c                             | 130 +++++++++++++-
 tools/lib/bpf/libbpf_internal.h                    |  27 +++
 tools/lib/bpf/libbpf_probes.c                      |  73 ++++----
 tools/testing/selftests/bpf/.gitignore             |   2 +
 tools/testing/selftests/bpf/verifier/jump.c        | 195 +++++++++++++++++++++
 60 files changed, 750 insertions(+), 344 deletions(-)
 create mode 100644 tools/lib/bpf/libbpf_internal.h
Merging bpf/master (69dda13fdaff Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf)
$ git merge bpf/master
Already up to date.
Merging ipsec/master (9b3040a6aafd ipv4: Define __ipv4_neigh_lookup_noref when CONFIG_INET is disabled)
$ git merge ipsec/master
Already up to date.
Merging netfilter/master (d4c26eb6e721 net: ethernet: stmmac: dwmac-sun8i: enable support of unicast filtering)
$ git merge netfilter/master
Already up to date.
Merging ipvs/master (b2e3d68d1251 netfilter: nft_compat: destroy function must not have side effects)
$ git merge ipvs/master
Already up to date.
Merging wireless-drivers/master (7a0f8ad5ff63 Merge ath-current from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
$ git merge wireless-drivers/master
Already up to date.
Merging mac80211/master (5f05836831f6 net/sched: avoid double free on matchall reoffload)
$ git merge mac80211/master
Already up to date.
Merging rdma-fixes/for-rc (2557fabd6e29 RDMA/hns: Bugfix for mapping user db)
$ git merge rdma-fixes/for-rc
Already up to date.
Merging sound-current/for-linus (ed180abba7f1 ALSA: hda: Fix race between creating and refreshing sysfs entries)
$ git merge sound-current/for-linus
Auto-merging include/sound/hdaudio.h
Merge made by the 'recursive' strategy.
 include/sound/hdaudio.h       |  1 +
 sound/hda/hdac_device.c       |  7 ++++
 sound/hda/hdac_sysfs.c        |  3 ++
 sound/pci/hda/patch_realtek.c | 94 +++++++++++++++++++++++++++++++------------
 4 files changed, 79 insertions(+), 26 deletions(-)
Merging sound-asoc-fixes/for-linus (28776b33e575 Merge branch 'asoc-5.1' into asoc-linus)
$ git merge sound-asoc-fixes/for-linus
Already up to date!
Merge made by the 'recursive' strategy.
Merging regmap-fixes/for-linus (1d6106cafb37 Merge branch 'regmap-5.1' into regmap-linus)
$ git merge regmap-fixes/for-linus
Already up to date!
Merge made by the 'recursive' strategy.
Merging regulator-fixes/for-linus (c7b5128f72ef Merge branch 'regulator-5.1' into regulator-linus)
$ git merge regulator-fixes/for-linus
Already up to date.
Merging spi-fixes/for-linus (3de0496378eb Merge branch 'spi-5.1' into spi-linus)
$ git merge spi-fixes/for-linus
Already up to date!
Merge made by the 'recursive' strategy.
Merging pci-current/for-linus (9c9c5fc89b09 PCI/LINK: Add Kconfig option (default off))
$ git merge pci-current/for-linus
Merge made by the 'recursive' strategy.
Merging driver-core.current/driver-core-linus (d7a02fa0a8f9 Merge tag 'upstream-5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/rw/ubifs)
$ git merge driver-core.current/driver-core-linus
Already up to date.
Merging tty.current/tty-linus (d7a02fa0a8f9 Merge tag 'upstream-5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/rw/ubifs)
$ git merge tty.current/tty-linus
Already up to date.
Merging usb.current/usb-linus (d7a02fa0a8f9 Merge tag 'upstream-5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/rw/ubifs)
$ git merge usb.current/usb-linus
Already up to date.
Merging usb-gadget-fixes/fixes (072684e8c58d USB: gadget: f_hid: fix deadlock in f_hidg_write())
$ git merge usb-gadget-fixes/fixes
Already up to date.
Merging usb-serial-fixes/usb-linus (79a3aaa7b82e Linux 5.1-rc3)
$ git merge usb-serial-fixes/usb-linus
Already up to date.
Merging usb-chipidea-fixes/ci-for-usb-stable (d6d768a0ec3c usb: chipidea: fix static checker warning for NULL pointer)
$ git merge usb-chipidea-fixes/ci-for-usb-stable
Auto-merging drivers/usb/chipidea/ci_hdrc_imx.c
Merge made by the 'recursive' strategy.
Merging phy/fixes (e6f32efb1b12 phy: sun4i-usb: Make sure to disable PHY0 passby for peripheral mode)
$ git merge phy/fixes
Already up to date.
Merging staging.current/staging-linus (d7a02fa0a8f9 Merge tag 'upstream-5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/rw/ubifs)
$ git merge staging.current/staging-linus
Already up to date.
Merging char-misc.current/char-misc-linus (d7a02fa0a8f9 Merge tag 'upstream-5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/rw/ubifs)
$ git merge char-misc.current/char-misc-linus
Already up to date.
Merging soundwire-fixes/fixes (bfeffd155283 Linux 5.0-rc1)
$ git merge soundwire-fixes/fixes
Already up to date.
Merging thunderbolt-fixes/fixes (e93c9c99a629 Linux 5.1)
$ git merge thunderbolt-fixes/fixes
Already up to date.
Merging input-current/for-linus (14e0c7317ed5 Merge branch 'next' into for-linus)
$ git merge input-current/for-linus
Auto-merging include/uapi/linux/input-event-codes.h
Auto-merging drivers/input/misc/Makefile
Auto-merging drivers/input/misc/Kconfig
Auto-merging drivers/input/evdev.c
Auto-merging drivers/hid/hid-input.c
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/input/gpio-vibrator.yaml   |   37 +
 .../devicetree/bindings/input/lpc32xx-key.txt      |    5 +-
 .../devicetree/bindings/input/microchip,qt1050.txt |   78 ++
 .../devicetree/bindings/input/sun4i-lradc-keys.txt |    6 +-
 .../bindings/input/touchscreen/goodix.txt          |    3 +
 .../bindings/input/touchscreen/iqs5xx.txt          |   80 ++
 .../devicetree/bindings/vendor-prefixes.txt        |    1 +
 drivers/hid/hid-input.c                            |    2 +
 drivers/input/evdev.c                              |    7 +-
 drivers/input/keyboard/Kconfig                     |   11 +
 drivers/input/keyboard/Makefile                    |    1 +
 drivers/input/keyboard/atkbd.c                     |    2 +
 drivers/input/keyboard/qt1050.c                    |  598 +++++++++++
 drivers/input/keyboard/snvs_pwrkey.c               |   30 +-
 drivers/input/keyboard/sun4i-lradc-keys.c          |   38 +-
 drivers/input/misc/Kconfig                         |   12 +
 drivers/input/misc/Makefile                        |    1 +
 drivers/input/misc/gpio-vibra.c                    |  207 ++++
 drivers/input/mouse/psmouse-base.c                 |    2 +
 drivers/input/rmi4/rmi_f54.c                       |   21 +-
 drivers/input/serio/Kconfig                        |    1 +
 drivers/input/serio/hyperv-keyboard.c              |    2 +
 drivers/input/serio/i8042.c                        |    3 -
 drivers/input/serio/libps2.c                       |    1 +
 drivers/input/touchscreen/Kconfig                  |   10 +
 drivers/input/touchscreen/Makefile                 |    1 +
 drivers/input/touchscreen/edt-ft5x06.c             |   23 +-
 drivers/input/touchscreen/goodix.c                 |   54 +
 drivers/input/touchscreen/iqs5xx.c                 | 1133 ++++++++++++++++++++
 include/uapi/linux/input-event-codes.h             |    1 +
 30 files changed, 2297 insertions(+), 74 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/input/gpio-vibrator.yaml
 create mode 100644 Documentation/devicetree/bindings/input/microchip,qt1050.txt
 create mode 100644 Documentation/devicetree/bindings/input/touchscreen/iqs5xx.txt
 create mode 100644 drivers/input/keyboard/qt1050.c
 create mode 100644 drivers/input/misc/gpio-vibra.c
 create mode 100644 drivers/input/touchscreen/iqs5xx.c
Merging crypto-current/master (cbc22b062106 Revert "crypto: caam/jr - Remove extra memory barrier during job ring dequeue")
$ git merge crypto-current/master
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                         |  2 +-
 drivers/crypto/caam/caamalg.c       |  9 +++++++--
 drivers/crypto/caam/caamalg_qi.c    |  7 +++++--
 drivers/crypto/caam/caamalg_qi2.c   |  8 +++++++-
 drivers/crypto/caam/error.c         |  2 +-
 drivers/crypto/caam/jr.c            |  2 +-
 drivers/crypto/caam/regs.h          |  8 --------
 drivers/crypto/chelsio/chcr_algo.c  | 17 +++++------------
 drivers/crypto/chelsio/chcr_core.c  |  4 ----
 drivers/crypto/chelsio/chcr_ipsec.c |  3 ++-
 10 files changed, 29 insertions(+), 33 deletions(-)
Merging ide/master (b970afcfcabd Merge tag 'powerpc-5.2-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/powerpc/linux)
$ git merge ide/master
Already up to date.
Merging vfio-fixes/for-linus (492855939bdb vfio/type1: Limit DMA mappings per container)
$ git merge vfio-fixes/for-linus
Already up to date.
Merging kselftest-fixes/fixes (15ade5d2e777 Linux 5.1-rc4)
$ git merge kselftest-fixes/fixes
Already up to date.
Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address)
$ git merge modules-fixes/modules-linus
Already up to date.
Merging slave-dma-fixes/fixes (37624b58542f Linux 5.1-rc7)
$ git merge slave-dma-fixes/fixes
Already up to date.
Merging backlight-fixes/for-backlight-fixes (651022382c7f Linux 4.20-rc1)
$ git merge backlight-fixes/for-backlight-fixes
Already up to date.
Merging mtd-fixes/mtd/fixes (9a8f612ca0d6 mtd: rawnand: marvell: Clean the controller state before each operation)
$ git merge mtd-fixes/mtd/fixes
Already up to date.
Merging mfd-fixes/for-mfd-fixes (a05a2e7998ab mfd: sun6i-prcm: Allow to compile with COMPILE_TEST)
$ git merge mfd-fixes/for-mfd-fixes
Already up to date.
Merging v4l-dvb-fixes/fixes (7afa8db323e3 media: vsp1: Add support for missing 16-bit RGB555 formats)
$ git merge v4l-dvb-fixes/fixes
Already up to date.
Merging reset-fixes/reset/fixes (d5d4218e1669 reset: remove redundant null check on pointer dev)
$ git merge reset-fixes/reset/fixes
Auto-merging drivers/reset/core.c
Merge made by the 'recursive' strategy.
 drivers/reset/core.c | 3 ---
 1 file changed, 3 deletions(-)
Merging mips-fixes/mips-fixes (a1e8783db8e0 MIPS: perf: ath79: Fix perfcount IRQ assignment)
$ git merge mips-fixes/mips-fixes
Already up to date.
Merging at91-fixes/at91-fixes (ba5e60c9b75d arm/mach-at91/pm : fix possible object reference leak)
$ git merge at91-fixes/at91-fixes
Already up to date.
Merging omap-fixes/fixes (1ba12322e2f0 Merge branch 'am5-sdio-fixes' into fixes)
$ git merge omap-fixes/fixes
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/am57xx-idk-common.dtsi        |  1 +
 arch/arm/boot/dts/dra76x-mmc-iodelay.dtsi       | 40 ++++++++++++-------------
 arch/arm/boot/dts/logicpd-som-lv-baseboard.dtsi |  2 +-
 arch/arm/mach-omap1/board-ams-delta.c           |  2 +-
 4 files changed, 23 insertions(+), 22 deletions(-)
Merging kvm-fixes/master (e8ab8d24b488 KVM: nVMX: Fix size checks in vmx_set_nested_state)
$ git merge kvm-fixes/master
Already up to date.
Merging kvms390-fixes/master (b10bd9a256ae s390: vsie: Use effective CRYCBD.31 to check CRYCBD validity)
$ git merge kvms390-fixes/master
Already up to date.
Merging hwmon-fixes/hwmon (b88c5049219a hwmon: (occ) Fix extended status bits)
$ git merge hwmon-fixes/hwmon
Already up to date.
Merging nvdimm-fixes/libnvdimm-fixes (c4703ce11c23 libnvdimm/namespace: Fix label tracking error)
$ git merge nvdimm-fixes/libnvdimm-fixes
Merge made by the 'recursive' strategy.
 drivers/dax/pmem/core.c                     |  6 +++---
 drivers/nvdimm/label.c                      | 29 ++++++++++++++++-------------
 drivers/nvdimm/namespace_devs.c             | 15 +++++++++++++++
 drivers/nvdimm/nd.h                         |  4 ++++
 tools/testing/nvdimm/Kbuild                 |  3 +++
 tools/testing/nvdimm/dax_pmem_compat_test.c |  8 ++++++++
 tools/testing/nvdimm/dax_pmem_core_test.c   |  8 ++++++++
 tools/testing/nvdimm/dax_pmem_test.c        |  8 ++++++++
 tools/testing/nvdimm/test/nfit.c            |  3 +++
 tools/testing/nvdimm/watermark.h            |  3 +++
 10 files changed, 71 insertions(+), 16 deletions(-)
 create mode 100644 tools/testing/nvdimm/dax_pmem_compat_test.c
 create mode 100644 tools/testing/nvdimm/dax_pmem_core_test.c
 create mode 100644 tools/testing/nvdimm/dax_pmem_test.c
Merging btrfs-fixes/next-fixes (0b341c8bfa6d Merge branch 'misc-next' into next-fixes)
$ git merge btrfs-fixes/next-fixes
Auto-merging fs/btrfs/compression.c
Merge made by the 'recursive' strategy.
 fs/btrfs/compression.c |  1 +
 fs/btrfs/file.c        |  4 +---
 fs/btrfs/props.c       | 30 ++++++++++++++++++++++--------
 3 files changed, 24 insertions(+), 11 deletions(-)
Merging vfs-fixes/fixes (05883eee857e do_move_mount(): fix an unsafe use of is_anon_ns())
$ git merge vfs-fixes/fixes
Already up to date.
Merging dma-mapping-fixes/for-linus (8c5165430c01 dma-debug: only skip one stackframe entry)
$ git merge dma-mapping-fixes/for-linus
Already up to date.
Merging i3c-fixes/master (709a53e19484 MAINTAINERS: Fix the I3C entry)
$ git merge i3c-fixes/master
Already up to date.
Merging drivers-x86-fixes/fixes (e93c9c99a629 Linux 5.1)
$ git merge drivers-x86-fixes/fixes
Already up to date.
Merging samsung-krzk-fixes/fixes (9e98c678c2d6 Linux 5.1-rc1)
$ git merge samsung-krzk-fixes/fixes
Already up to date.
Merging pinctrl-samsung-fixes/pinctrl-fixes (9e98c678c2d6 Linux 5.1-rc1)
$ git merge pinctrl-samsung-fixes/pinctrl-fixes
Already up to date.
Merging devicetree-fixes/dt/linus (5fa98c2eda35 dt-bindings: Fix dt_binding_check target for in tree builds)
$ git merge devicetree-fixes/dt/linus
Already up to date.
Merging scsi-fixes/fixes (144ec97493af scsi: aic7xxx: fix EISA support)
$ git merge scsi-fixes/fixes
Already up to date.
Merging drm-fixes/drm-fixes (e93c9c99a629 Linux 5.1)
$ git merge drm-fixes/drm-fixes
Already up to date.
Merging amdgpu-fixes/drm-fixes (f7b1844bacec drm/amdgpu: Update gc golden setting for vega family)
$ git merge amdgpu-fixes/drm-fixes
Already up to date.
Merging drm-intel-fixes/for-linux-next-fixes (f5c58ba18ab8 drm/i915: Restore correct bxt_ddi_phy_calc_lane_lat_optim_mask() calculation)
$ git merge drm-intel-fixes/for-linux-next-fixes
Already up to date.
Merging mmc-fixes/fixes (dc4060a5dc25 Linux 5.1-rc5)
$ git merge mmc-fixes/fixes
Already up to date.
Merging rtc-fixes/rtc-fixes (882c5e552ffd rtc: da9063: set uie_unsupported when relevant)
$ git merge rtc-fixes/rtc-fixes
Already up to date.
Merging gnss-fixes/gnss-linus (79a3aaa7b82e Linux 5.1-rc3)
$ git merge gnss-fixes/gnss-linus
Already up to date.
Merging hyperv-fixes/hyperv-fixes (69c8caafb72d hv: tools: fixed Python pep8/flake8 warnings for lsvmbus)
$ git merge hyperv-fixes/hyperv-fixes
Merge made by the 'recursive' strategy.
 drivers/hv/channel.c         |  2 +-
 tools/hv/hv_get_dhcp_info.sh |  2 +-
 tools/hv/hv_kvp_daemon.c     |  8 +++--
 tools/hv/hv_set_ifconfig.sh  |  2 +-
 tools/hv/hv_vss_daemon.c     |  4 ++-
 tools/hv/lsvmbus             | 75 +++++++++++++++++++++++++-------------------
 6 files changed, 53 insertions(+), 40 deletions(-)
Merging drm-misc-fixes/for-linux-next-fixes (ab042b824c11 Revert "drm/qxl: drop prime import/export callbacks")
$ git merge drm-misc-fixes/for-linux-next-fixes
Already up to date.
Merging kbuild/for-next (9562de4dcfaf Merge branch 'kconfig' into for-next)
$ git merge kbuild/for-next
Removing arch/csky/boot/dts/include/dt-bindings
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .gitignore                               |   8 +-
 MAINTAINERS                              |   1 +
 Makefile                                 |  18 ++---
 arch/csky/boot/dts/include/dt-bindings   |   1 -
 arch/ia64/kernel/Makefile.gate           |   2 +-
 arch/sh/boot/.gitignore                  |   1 +
 arch/sh/kernel/vsyscall/Makefile         |   3 +-
 samples/Makefile                         |  24 +++++-
 samples/seccomp/Makefile                 |   2 +-
 samples/vfs/Makefile                     |   2 +-
 scripts/Kconfig.include                  |   8 ++
 scripts/Makefile.extrawarn               |  25 ++++---
 scripts/kconfig/confdata.c               | 121 +++++++++++++++++++++----------
 scripts/kconfig/gconf.c                  |   2 +-
 scripts/kconfig/lexer.l                  |   3 +-
 scripts/kconfig/lkc.h                    |   1 -
 scripts/kconfig/lxdialog/BIG.FAT.WARNING |   2 +-
 scripts/kconfig/mconf.c                  |   2 +-
 scripts/kconfig/nconf-cfg.sh             |   0
 scripts/kconfig/nconf.c                  |   3 +-
 20 files changed, 149 insertions(+), 80 deletions(-)
 delete mode 120000 arch/csky/boot/dts/include/dt-bindings
 mode change 100644 => 100755 scripts/kconfig/nconf-cfg.sh
Merging compiler-attributes/compiler-attributes (a3b22b9f11d9 Linux 5.0-rc7)
$ git merge compiler-attributes/compiler-attributes
Already up to date.
Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1)
$ git merge leaks/leaks-next
Already up to date.
Merging dma-mapping/for-next (13bf5ced9377 dma-mapping: add a Kconfig symbol to indicate arch_dma_prep_coherent presence)
$ git merge dma-mapping/for-next
Already up to date.
Merging asm-generic/master (6edd1dbace0e asm-generic: optimize generic uaccess for 8-byte loads and stores)
$ git merge asm-generic/master
Auto-merging lib/Kconfig
Removing include/asm-generic/segment.h
Removing arch/xtensa/include/asm/segment.h
Auto-merging arch/unicore32/include/asm/Kbuild
Removing arch/s390/include/asm/segment.h
Auto-merging arch/parisc/include/asm/Kbuild
Auto-merging arch/openrisc/include/asm/Kbuild
Auto-merging arch/nios2/include/asm/Kbuild
Auto-merging arch/nds32/include/asm/Kbuild
Removing arch/ia64/include/asm/segment.h
Auto-merging arch/hexagon/include/asm/Kbuild
Removing arch/h8300/include/asm/uaccess.h
Auto-merging arch/h8300/include/asm/Kbuild
Auto-merging arch/h8300/Kconfig
Auto-merging arch/c6x/include/asm/Kbuild
Auto-merging arch/arm64/include/asm/Kbuild
CONFLICT (content): Merge conflict in arch/arm64/include/asm/Kbuild
Auto-merging arch/arm/include/asm/Kbuild
Removing arch/alpha/include/asm/segment.h
Resolved 'arch/arm64/include/asm/Kbuild' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master d038e24a4297] Merge remote-tracking branch 'asm-generic/master'
$ git diff -M --stat --summary HEAD^..
 arch/alpha/include/asm/segment.h   |  6 ----
 arch/alpha/kernel/smc37c669.c      |  1 -
 arch/alpha/kernel/smc37c93x.c      |  1 -
 arch/arc/include/asm/uaccess.h     |  1 +
 arch/arm/include/asm/Kbuild        |  1 -
 arch/arm64/include/asm/Kbuild      |  1 -
 arch/c6x/include/asm/Kbuild        |  1 -
 arch/h8300/Kconfig                 |  1 +
 arch/h8300/include/asm/Kbuild      |  1 +
 arch/h8300/include/asm/uaccess.h   | 55 ------------------------------------
 arch/hexagon/include/asm/Kbuild    |  1 -
 arch/hexagon/include/asm/uaccess.h |  1 -
 arch/ia64/include/asm/segment.h    |  6 ----
 arch/mips/include/asm/Kbuild       |  1 -
 arch/nds32/include/asm/Kbuild      |  1 -
 arch/nios2/include/asm/Kbuild      |  1 -
 arch/openrisc/include/asm/Kbuild   |  1 -
 arch/openrisc/kernel/ptrace.c      |  1 -
 arch/openrisc/kernel/setup.c       |  1 -
 arch/openrisc/kernel/traps.c       |  1 -
 arch/openrisc/mm/init.c            |  1 -
 arch/openrisc/mm/tlb.c             |  1 -
 arch/parisc/include/asm/Kbuild     |  1 -
 arch/s390/include/asm/segment.h    |  5 ----
 arch/s390/kernel/ptrace.c          |  1 -
 arch/unicore32/include/asm/Kbuild  |  1 -
 arch/xtensa/include/asm/segment.h  | 16 -----------
 include/asm-generic/segment.h      |  9 ------
 include/asm-generic/uaccess.h      | 58 +++++++++++++++++++++++++++++++++++++-
 lib/Kconfig                        |  4 +++
 30 files changed, 64 insertions(+), 117 deletions(-)
 delete mode 100644 arch/alpha/include/asm/segment.h
 delete mode 100644 arch/h8300/include/asm/uaccess.h
 delete mode 100644 arch/ia64/include/asm/segment.h
 delete mode 100644 arch/s390/include/asm/segment.h
 delete mode 100644 arch/xtensa/include/asm/segment.h
 delete mode 100644 include/asm-generic/segment.h
Merging arc/for-next (5908e6b738e3 Linux 5.0-rc8)
$ git merge arc/for-next
Already up to date.
Merging arm/for-next (3d3c616177cc Merge branches 'fixes' and 'misc' into for-next)
$ git merge arm/for-next
Removing arch/arm/include/asm/limits.h
Merge made by the 'recursive' strategy.
 arch/arm/Makefile                |  8 ++------
 arch/arm/include/asm/domain.h    |  6 ++++--
 arch/arm/include/asm/futex.h     |  3 ++-
 arch/arm/include/asm/limits.h    | 12 ------------
 arch/arm/include/asm/processor.h |  4 ++--
 arch/arm/include/asm/uaccess.h   |  3 ++-
 arch/arm/mm/init.c               | 17 +----------------
 arch/arm/vdso/Makefile           | 21 ++++++++-------------
 8 files changed, 21 insertions(+), 53 deletions(-)
 delete mode 100644 arch/arm/include/asm/limits.h
Merging arm64/for-next/core (6127bf372add Merge branch 'for-next/mmiowb' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux into for-next/core)
$ git merge arm64/for-next/core
Already up to date!
Merge made by the 'recursive' strategy.
Merging arm-perf/for-next/perf (9bcb929f969e perf/arm-ccn: Clean up CPU hotplug handling)
$ git merge arm-perf/for-next/perf
Already up to date.
Merging arm-soc/for-next (c19ddad91159 ARM: Document merges)
$ git merge arm-soc/for-next
Auto-merging drivers/watchdog/ixp4xx_wdt.c
Auto-merging drivers/rtc/rtc-omap.c
CONFLICT (content): Merge conflict in drivers/rtc/rtc-omap.c
Auto-merging drivers/misc/Makefile
CONFLICT (content): Merge conflict in drivers/misc/Makefile
Auto-merging drivers/misc/Kconfig
CONFLICT (content): Merge conflict in drivers/misc/Kconfig
Auto-merging drivers/input/keyboard/Kconfig
Auto-merging drivers/gpio/Makefile
Auto-merging drivers/gpio/Kconfig
Auto-merging drivers/firmware/Makefile
Auto-merging drivers/firmware/Kconfig
Auto-merging drivers/crypto/ixp4xx_crypto.c
Auto-merging drivers/clocksource/Kconfig
Auto-merging drivers/clk/zynqmp/clkc.c
Auto-merging arch/arm64/configs/defconfig
Auto-merging arch/arm/mach-omap2/omap_hwmod.c
Removing arch/arm/mach-ixp4xx/include/mach/qmgr.h
Removing arch/arm/mach-ixp4xx/include/mach/irqs.h
Removing arch/arm/mach-ixp4xx/include/mach/entry-macro.S
Auto-merging arch/arm/mach-imx/pm-imx6.c
Auto-merging arch/arm/mach-ep93xx/vision_ep9307.c
Auto-merging arch/arm/mach-ep93xx/ts72xx.c
Auto-merging arch/arm/mach-ep93xx/simone.c
Auto-merging arch/arm/mach-ep93xx/edb93xx.c
Removing arch/arm/firmware/Makefile
Removing arch/arm/firmware/Kconfig
Auto-merging arch/arm/configs/qcom_defconfig
Auto-merging arch/arm/configs/multi_v7_defconfig
Auto-merging arch/arm/boot/dts/rk3288.dtsi
Auto-merging arch/arm/boot/dts/ls1021a.dtsi
Auto-merging arch/arm/Makefile
Auto-merging arch/arm/Kconfig.debug
Auto-merging arch/arm/Kconfig
Auto-merging MAINTAINERS
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
Auto-merging Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt
Auto-merging Documentation/devicetree/bindings/hwmon/pwm-fan.txt
Removing Documentation/devicetree/bindings/arm/sunxi.txt
Resolved 'Documentation/devicetree/bindings/vendor-prefixes.txt' using previous resolution.
Resolved 'drivers/misc/Kconfig' using previous resolution.
Resolved 'drivers/misc/Makefile' using previous resolution.
Resolved 'drivers/rtc/rtc-omap.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 29e0244d5638] Merge remote-tracking branch 'arm-soc/for-next'
$ git diff -M --stat --summary HEAD^..
 Documentation/devicetree/bindings/arm/amlogic.txt  |    1 +
 .../devicetree/bindings/arm/freescale/fsl,scu.txt  |   29 +-
 Documentation/devicetree/bindings/arm/fsl.yaml     |   36 +
 .../devicetree/bindings/arm/intel-ixp4xx.yaml      |   22 +
 .../devicetree/bindings/arm/omap/omap.txt          |    6 +
 .../devicetree/bindings/arm/rockchip.yaml          |   25 +-
 Documentation/devicetree/bindings/arm/sunxi.txt    |   23 -
 Documentation/devicetree/bindings/arm/sunxi.yaml   |  807 ++++++++++++++
 Documentation/devicetree/bindings/bus/ti-sysc.txt  |    6 +-
 .../devicetree/bindings/clock/xlnx,zynqmp-clk.txt  |   63 ++
 .../devicetree/bindings/dma/fsl-imx-sdma.txt       |    1 +
 .../intel,ixp4xx-network-processing-engine.yaml    |   44 +
 .../firmware/xilinx/xlnx,zynqmp-firmware.txt       |   54 +-
 .../bindings/fpga/xlnx,zynqmp-pcap-fpga.txt        |   25 +
 .../devicetree/bindings/gpu/arm,mali-midgard.txt   |   14 +
 .../devicetree/bindings/hwmon/pwm-fan.txt          |    2 -
 .../devicetree/bindings/iio/adc/imx7d-adc.txt      |    2 +
 .../devicetree/bindings/iio/adc/qcom,spmi-vadc.txt |    1 +
 .../intel,ixp4xx-interrupt.yaml                    |   54 +
 .../interrupt-controller/mediatek,sysirq.txt       |    7 +-
 .../bindings/memory-controllers/fsl/mmdc.txt       |   35 +
 .../bindings/misc/intel,ixp4xx-queue-manager.yaml  |   49 +
 .../devicetree/bindings/mmc/k3-dw-mshc.txt         |    2 +
 .../bindings/power/amlogic,meson-gx-pwrc.txt       |    4 +-
 .../bindings/reset/hisilicon,hi3660-reset.txt      |    7 +-
 .../devicetree/bindings/serial/mtk-uart.txt        |    4 +-
 .../devicetree/bindings/soc/mediatek/pwrap.txt     |    1 +
 .../devicetree/bindings/soc/mediatek/scpsys.txt    |    5 +-
 .../bindings/timer/intel,ixp4xx-timer.yaml         |   42 +
 .../bindings/timer/mediatek,mtk-timer.txt          |    1 +
 .../devicetree/bindings/ufs/ufshcd-pltfrm.txt      |    1 +
 .../devicetree/bindings/vendor-prefixes.txt        |    7 +
 Documentation/xilinx/eemi.txt                      |    4 +-
 MAINTAINERS                                        |   21 +-
 arch/arm/Kconfig                                   |    7 +-
 arch/arm/Kconfig.debug                             |    2 +
 arch/arm/Makefile                                  |    1 -
 arch/arm/arm-soc-for-next-contents.txt             |  201 ++++
 arch/arm/boot/dts/Makefile                         |   16 +-
 arch/arm/boot/dts/am335x-baltos-ir2110.dts         |   16 +-
 arch/arm/boot/dts/am335x-baltos-ir3220.dts         |   38 +-
 arch/arm/boot/dts/am335x-baltos-ir5221.dts         |   42 +-
 arch/arm/boot/dts/am335x-baltos-leds.dtsi          |    6 +-
 arch/arm/boot/dts/am335x-baltos.dtsi               |  140 +--
 arch/arm/boot/dts/am335x-base0033.dts              |   48 +-
 arch/arm/boot/dts/am335x-bone-common.dtsi          |  116 +-
 arch/arm/boot/dts/am335x-boneblack-common.dtsi     |   54 +-
 arch/arm/boot/dts/am335x-boneblack-wireless.dts    |   28 +-
 arch/arm/boot/dts/am335x-boneblue.dts              |  104 +-
 arch/arm/boot/dts/am335x-bonegreen-common.dtsi     |    4 +-
 arch/arm/boot/dts/am335x-bonegreen-wireless.dts    |   28 +-
 arch/arm/boot/dts/am335x-chiliboard.dts            |   66 +-
 arch/arm/boot/dts/am335x-chilisom.dtsi             |   34 +-
 arch/arm/boot/dts/am335x-cm-t335.dts               |  190 ++--
 arch/arm/boot/dts/am335x-evm.dts                   |  234 ++--
 arch/arm/boot/dts/am335x-evmsk.dts                 |  292 ++---
 arch/arm/boot/dts/am335x-icev2.dts                 |  116 +-
 arch/arm/boot/dts/am335x-igep0033.dtsi             |   40 +-
 arch/arm/boot/dts/am335x-lxm.dts                   |  120 +--
 arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi  |   42 +-
 arch/arm/boot/dts/am335x-moxa-uc-2101.dts          |   24 +-
 arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts     |  116 +-
 arch/arm/boot/dts/am335x-nano.dts                  |  140 +--
 arch/arm/boot/dts/am335x-osd3358-sm-red.dts        |  168 +--
 arch/arm/boot/dts/am335x-osd335x-common.dtsi       |    4 +-
 arch/arm/boot/dts/am335x-pcm-953.dtsi              |   74 +-
 arch/arm/boot/dts/am335x-pdu001.dts                |  170 +--
 arch/arm/boot/dts/am335x-pepper.dts                |  200 ++--
 arch/arm/boot/dts/am335x-phycore-som.dtsi          |   60 +-
 arch/arm/boot/dts/am335x-pocketbeagle.dts          |   56 +-
 arch/arm/boot/dts/am335x-sancloud-bbe.dts          |   62 +-
 arch/arm/boot/dts/am335x-sbc-t335.dts              |  152 +--
 arch/arm/boot/dts/am335x-shc.dts                   |  226 ++--
 arch/arm/boot/dts/am335x-sl50.dts                  |  208 ++--
 arch/arm/boot/dts/am335x-wega.dtsi                 |   68 +-
 arch/arm/boot/dts/am43x-epos-evm.dts               |   11 +
 arch/arm/boot/dts/am5718.dtsi                      |   32 +
 arch/arm/boot/dts/am571x-idk.dts                   |    2 +-
 arch/arm/boot/dts/am5728.dtsi                      |   33 +
 arch/arm/boot/dts/am572x-idk.dts                   |    5 +-
 arch/arm/boot/dts/am5748.dtsi                      |   33 +
 arch/arm/boot/dts/am574x-idk.dts                   |    4 +-
 arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi    |    2 +-
 arch/arm/boot/dts/am57xx-cl-som-am57x.dts          |    2 +-
 arch/arm/boot/dts/armada-38x.dtsi                  |    2 +
 arch/arm/boot/dts/aspeed-ast2500-evb.dts           |   21 +-
 arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts      |    6 +
 .../arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts |    5 +
 arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts      |    4 +-
 arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts       |    8 +
 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts   |   52 +-
 arch/arm/boot/dts/aspeed-g4.dtsi                   |    6 +
 arch/arm/boot/dts/aspeed-g5.dtsi                   |   20 +
 arch/arm/boot/dts/at91-sama5d27_som1.dtsi          |   39 +-
 arch/arm/boot/dts/at91-sama5d27_som1_ek.dts        |   39 +-
 arch/arm/boot/dts/at91-sama5d2_xplained.dts        |   93 +-
 arch/arm/boot/dts/at91-sama5d4_xplained.dts        |   39 +-
 arch/arm/boot/dts/at91-sama5d4ek.dts               |   39 +-
 arch/arm/boot/dts/at91-vinco.dts                   |   39 +-
 arch/arm/boot/dts/at91sam9260ek.dts                |   39 +-
 arch/arm/boot/dts/at91sam9xe.dtsi                  |   39 +-
 arch/arm/boot/dts/axp81x.dtsi                      |    4 +
 arch/arm/boot/dts/dra7-l4.dtsi                     |    6 +-
 arch/arm/boot/dts/dra7.dtsi                        |    2 +
 arch/arm/boot/dts/emev2-kzm9d.dts                  |    2 +-
 arch/arm/boot/dts/exynos3250.dtsi                  |   72 +-
 arch/arm/boot/dts/exynos4.dtsi                     |   14 +-
 arch/arm/boot/dts/exynos4210-origen.dts            |    4 +-
 arch/arm/boot/dts/exynos4210-smdkv310.dts          |    4 +-
 arch/arm/boot/dts/exynos4210-trats.dts             |    4 +-
 arch/arm/boot/dts/exynos4210-universal_c210.dts    |   21 +-
 arch/arm/boot/dts/exynos4412-odroidu3.dts          |    7 +-
 arch/arm/boot/dts/exynos4412-origen.dts            |    3 +-
 arch/arm/boot/dts/exynos4412-smdk4412.dts          |    4 +-
 arch/arm/boot/dts/exynos4412-trats2.dts            |    3 +-
 arch/arm/boot/dts/exynos4412.dtsi                  |    2 +-
 arch/arm/boot/dts/exynos5250-smdk5250.dts          |    3 +-
 arch/arm/boot/dts/exynos5250.dtsi                  |   40 +-
 arch/arm/boot/dts/exynos5260-pinctrl.dtsi          |   16 +
 arch/arm/boot/dts/exynos5260-xyref5260.dts         |    2 +-
 arch/arm/boot/dts/exynos5260.dtsi                  |   82 +-
 arch/arm/boot/dts/exynos5410-odroidxu.dts          |    2 -
 arch/arm/boot/dts/exynos5410-smdk5410.dts          |    2 +-
 arch/arm/boot/dts/exynos5420-arndale-octa.dts      |  364 ++++++-
 arch/arm/boot/dts/exynos5420-smdk5420.dts          |    3 +-
 arch/arm/boot/dts/exynos5420.dtsi                  |    2 +-
 arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi  |    5 +-
 arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi |    2 -
 arch/arm/boot/dts/exynos54xx.dtsi                  |   38 +-
 arch/arm/boot/dts/gemini-dlink-dir-685.dts         |   82 +-
 arch/arm/boot/dts/imx35.dtsi                       |    6 +
 arch/arm/boot/dts/imx50-kobo-aura.dts              |  258 +++++
 arch/arm/boot/dts/imx50.dtsi                       |   23 +-
 arch/arm/boot/dts/imx51-zii-rdu1.dts               |   38 +-
 arch/arm/boot/dts/imx51.dtsi                       |    2 +-
 arch/arm/boot/dts/imx53-m53.dtsi                   |    2 +-
 arch/arm/boot/dts/imx53-m53menlo.dts               |  311 ++++++
 arch/arm/boot/dts/imx53.dtsi                       |    2 +-
 arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi      |    4 +-
 arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts      |  381 +++++++
 arch/arm/boot/dts/imx6dl-sabreauto.dts             |   15 +
 arch/arm/boot/dts/imx6q-gw54xx.dts                 |  105 ++
 arch/arm/boot/dts/imx6q-logicpd.dts                |    4 +-
 arch/arm/boot/dts/imx6q-zii-rdu2.dts               |   38 +-
 arch/arm/boot/dts/imx6qdl-emcon.dtsi               |    2 -
 arch/arm/boot/dts/imx6qdl-gw54xx.dtsi              |   29 +-
 arch/arm/boot/dts/imx6qdl-gw551x.dtsi              |  138 +++
 arch/arm/boot/dts/imx6qdl-gw5903.dtsi              |    2 +-
 arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi       |    4 +-
 arch/arm/boot/dts/imx6qdl-var-dart.dtsi            |    2 +-
 arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi            |   50 +-
 arch/arm/boot/dts/imx6qdl.dtsi                     |   18 +-
 arch/arm/boot/dts/imx6qp-zii-rdu2.dts              |   38 +-
 arch/arm/boot/dts/imx6sl.dtsi                      |   11 +-
 arch/arm/boot/dts/imx6sll.dtsi                     |    3 +-
 arch/arm/boot/dts/imx6sx.dtsi                      |    4 +-
 arch/arm/boot/dts/imx6ul.dtsi                      |    4 +-
 arch/arm/boot/dts/imx7-mba7.dtsi                   |  550 ++++++++++
 arch/arm/boot/dts/imx7-tqma7.dtsi                  |  249 +++++
 arch/arm/boot/dts/imx7d-mba7.dts                   |  119 +++
 arch/arm/boot/dts/imx7d-tqma7.dtsi                 |   11 +
 arch/arm/boot/dts/imx7d-zii-rpu2.dts               |  941 ++++++++++++++++
 arch/arm/boot/dts/imx7d.dtsi                       |    1 +
 arch/arm/boot/dts/imx7s-mba7.dts                   |   18 +
 arch/arm/boot/dts/imx7s-tqma7.dtsi                 |   11 +
 arch/arm/boot/dts/imx7s-warp.dts                   |   61 ++
 arch/arm/boot/dts/imx7s.dtsi                       |   98 +-
 arch/arm/boot/dts/imx7ulp.dtsi                     |   12 +
 arch/arm/boot/dts/intel-ixp42x-linksys-nslu2.dts   |  109 ++
 arch/arm/boot/dts/intel-ixp42x.dtsi                |   25 +
 .../arm/boot/dts/intel-ixp43x-gateworks-gw2358.dts |   94 ++
 arch/arm/boot/dts/intel-ixp43x.dtsi                |   15 +
 arch/arm/boot/dts/intel-ixp45x-ixp46x.dtsi         |   34 +
 arch/arm/boot/dts/intel-ixp4xx.dtsi                |   69 ++
 arch/arm/boot/dts/lpc3250-ea3250.dts               |    1 +
 arch/arm/boot/dts/lpc3250-phy3250.dts              |    3 +-
 arch/arm/boot/dts/lpc32xx.dtsi                     |   38 +-
 arch/arm/boot/dts/ls1021a-moxa-uc-8410a.dts        |    1 -
 arch/arm/boot/dts/ls1021a-qds.dts                  |    4 +
 arch/arm/boot/dts/ls1021a.dtsi                     |    1 -
 arch/arm/boot/dts/meson.dtsi                       |    9 +
 arch/arm/boot/dts/meson8.dtsi                      |   10 +
 arch/arm/boot/dts/meson8b-ec100.dts                |   14 +
 arch/arm/boot/dts/meson8b-odroidc1.dts             |   66 ++
 arch/arm/boot/dts/meson8b.dtsi                     |   10 +
 arch/arm/boot/dts/omap2420-n810.dts                |    2 +-
 arch/arm/boot/dts/omap4-duovero.dtsi               |   21 +-
 arch/arm/boot/dts/omap4-l4-abe.dtsi                |  501 +++++++++
 arch/arm/boot/dts/omap4-mcpdm.dtsi                 |   44 +
 arch/arm/boot/dts/omap4-panda-common.dtsi          |   21 +-
 arch/arm/boot/dts/omap4-sdp.dts                    |   21 +-
 arch/arm/boot/dts/omap4-var-som-om44.dtsi          |   21 +-
 arch/arm/boot/dts/omap4.dtsi                       |  192 +---
 arch/arm/boot/dts/omap5-board-common.dtsi          |    8 +-
 arch/arm/boot/dts/omap5-l4-abe.dtsi                |  447 ++++++++
 arch/arm/boot/dts/omap5.dtsi                       |  115 +-
 arch/arm/boot/dts/qcom-apq8064.dtsi                |    6 +-
 arch/arm/boot/dts/qcom-ipq4019.dtsi                |    4 +-
 arch/arm/boot/dts/qcom-mdm9615.dtsi                |    1 +
 arch/arm/boot/dts/qcom-msm8660.dtsi                |    1 +
 arch/arm/boot/dts/qcom-pma8084.dtsi                |    1 +
 arch/arm/boot/dts/r7s72100-rskrza1.dts             |   46 +-
 arch/arm/boot/dts/r8a73a4-ape6evm.dts              |   29 +-
 arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts          |  123 +++
 arch/arm/boot/dts/r8a77470.dtsi                    |  313 ++++++
 arch/arm/boot/dts/r8a7778-bockw.dts                |    2 +-
 arch/arm/boot/dts/r8a7779-marzen.dts               |    2 +-
 arch/arm/boot/dts/r8a7792-blanche.dts              |   20 +
 arch/arm/boot/dts/r8a7792.dtsi                     |   18 +
 arch/arm/boot/dts/r8a7794-alt.dts                  |   47 +
 arch/arm/boot/dts/rk3036-kylin.dts                 |   10 +-
 arch/arm/boot/dts/rk3036.dtsi                      |  136 +--
 arch/arm/boot/dts/rk3066a-marsboard.dts            |    2 +-
 arch/arm/boot/dts/rk3066a-mk808.dts                |   37 +-
 arch/arm/boot/dts/rk3066a-rayeager.dts             |   26 +-
 arch/arm/boot/dts/rk3066a.dtsi                     |  239 +++--
 arch/arm/boot/dts/rk3188-px3-evb.dts               |    4 +-
 arch/arm/boot/dts/rk3188-radxarock.dts             |   14 +-
 arch/arm/boot/dts/rk3188.dtsi                      |  210 ++--
 arch/arm/boot/dts/rk322x.dtsi                      |  170 +--
 arch/arm/boot/dts/rk3288-evb-act8846.dts           |    4 +-
 arch/arm/boot/dts/rk3288-evb.dtsi                  |   26 +-
 arch/arm/boot/dts/rk3288-fennec.dts                |   10 +-
 arch/arm/boot/dts/rk3288-firefly-beta.dts          |    4 +-
 arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi  |   10 +-
 arch/arm/boot/dts/rk3288-firefly-reload.dts        |   36 +-
 arch/arm/boot/dts/rk3288-firefly.dts               |    4 +-
 arch/arm/boot/dts/rk3288-firefly.dtsi              |   38 +-
 arch/arm/boot/dts/rk3288-miqi.dts                  |   28 +-
 arch/arm/boot/dts/rk3288-phycore-rdk.dts           |   28 +-
 arch/arm/boot/dts/rk3288-phycore-som.dtsi          |   30 +-
 arch/arm/boot/dts/rk3288-r89.dts                   |   14 +-
 arch/arm/boot/dts/rk3288-rock2-som.dtsi            |    4 +-
 arch/arm/boot/dts/rk3288-rock2-square.dts          |   18 +-
 arch/arm/boot/dts/rk3288-tinker-s.dts              |    5 +
 arch/arm/boot/dts/rk3288-tinker.dtsi               |   67 +-
 arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi  |    8 +-
 arch/arm/boot/dts/rk3288-veyron-brain.dts          |    8 +-
 arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi    |   25 +-
 arch/arm/boot/dts/rk3288-veyron-jaq.dts            |   14 +-
 arch/arm/boot/dts/rk3288-veyron-jerry.dts          |   23 +-
 arch/arm/boot/dts/rk3288-veyron-mickey.dts         |    6 +-
 arch/arm/boot/dts/rk3288-veyron-mighty.dts         |   34 +
 arch/arm/boot/dts/rk3288-veyron-minnie.dts         |   24 +-
 arch/arm/boot/dts/rk3288-veyron-pinky.dts          |    6 +-
 arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi         |   16 +-
 arch/arm/boot/dts/rk3288-veyron-speedy.dts         |   14 +-
 arch/arm/boot/dts/rk3288-veyron.dtsi               |   91 +-
 arch/arm/boot/dts/rk3288-vyasa.dts                 |    6 +-
 arch/arm/boot/dts/rk3288.dtsi                      |  317 +++---
 arch/arm/boot/dts/rv1108-elgin-r1.dts              |    1 -
 arch/arm/boot/dts/rv1108.dtsi                      |  138 +--
 arch/arm/boot/dts/s5pv210-goni.dts                 |    2 +-
 arch/arm/boot/dts/s5pv210.dtsi                     |    6 +-
 arch/arm/boot/dts/sama5d2.dtsi                     |   45 +-
 arch/arm/boot/dts/sama5d36ek_cmp.dts               |   39 +-
 arch/arm/boot/dts/sama5d3xcm_cmp.dtsi              |   39 +-
 arch/arm/boot/dts/sama5d3xmb_cmp.dtsi              |   39 +-
 arch/arm/boot/dts/sama5d4.dtsi                     |   39 +-
 arch/arm/boot/dts/socfpga_arria10_socdk_sdmmc.dts  |    1 +
 arch/arm/boot/dts/ste-dbx5x0.dtsi                  |   74 +-
 arch/arm/boot/dts/ste-href-stuib.dtsi              |   13 +
 arch/arm/boot/dts/ste-href-tvk1281618.dtsi         |   13 +
 arch/arm/boot/dts/stm32f429.dtsi                   |   13 +
 arch/arm/boot/dts/stm32f769-disco.dts              |    4 +
 arch/arm/boot/dts/stm32h743-pinctrl.dtsi           |   68 ++
 arch/arm/boot/dts/stm32h743.dtsi                   |   14 +
 arch/arm/boot/dts/stm32h743i-disco.dts             |   20 +
 arch/arm/boot/dts/stm32h743i-eval.dts              |   23 +-
 arch/arm/boot/dts/stm32mp157-pinctrl.dtsi          |  269 +++++
 arch/arm/boot/dts/stm32mp157a-dk1.dts              |  250 +++++
 arch/arm/boot/dts/stm32mp157c-dk2.dts              |   76 ++
 arch/arm/boot/dts/stm32mp157c-ed1.dts              |  175 ++-
 arch/arm/boot/dts/stm32mp157c.dtsi                 |   56 +
 arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts    |   20 +-
 arch/arm/boot/dts/sun4i-a10-cubieboard.dts         |   10 +-
 arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts   |   20 +-
 arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts       |   20 +-
 arch/arm/boot/dts/sun4i-a10-inet1.dts              |   20 +-
 arch/arm/boot/dts/sun4i-a10-inet97fv2.dts          |   20 +-
 arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts       |   72 +-
 arch/arm/boot/dts/sun4i-a10-marsboard.dts          |   12 +-
 arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts     |   18 +-
 arch/arm/boot/dts/sun4i-a10-pcduino.dts            |   12 +-
 arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts   |   20 +-
 arch/arm/boot/dts/sun4i-a10.dtsi                   |   11 +-
 arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts       |   10 +-
 arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts   |   10 +-
 .../boot/dts/sun5i-a13-empire-electronix-d709.dts  |   20 +-
 arch/arm/boot/dts/sun5i-a13-hsg-h702.dts           |   12 +-
 arch/arm/boot/dts/sun5i-a13-licheepi-one.dts       |    5 +-
 arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts    |   18 +-
 arch/arm/boot/dts/sun5i-a13-olinuxino.dts          |   20 +-
 arch/arm/boot/dts/sun5i-a13-q8-tablet.dts          |   11 +-
 arch/arm/boot/dts/sun5i-a13-utoo-p66.dts           |   16 +-
 arch/arm/boot/dts/sun5i-gr8-chip-pro.dts           |    4 +-
 arch/arm/boot/dts/sun5i-gr8-evb.dts                |    4 +-
 arch/arm/boot/dts/sun5i-r8-chip.dts                |   14 +-
 .../boot/dts/sun5i-reference-design-tablet.dtsi    |   20 +-
 arch/arm/boot/dts/sun5i.dtsi                       |   66 +-
 arch/arm/boot/dts/sun6i-a31-colombus.dts           |   14 +-
 arch/arm/boot/dts/sun6i-a31-hummingbird.dts        |   16 +-
 arch/arm/boot/dts/sun6i-a31-i7.dts                 |    1 -
 arch/arm/boot/dts/sun6i-a31.dtsi                   |   22 +-
 arch/arm/boot/dts/sun6i-a31s-primo81.dts           |    2 +-
 .../boot/dts/sun6i-reference-design-tablet.dtsi    |   12 +-
 arch/arm/boot/dts/sun7i-a20-bananapi.dts           |   10 +-
 arch/arm/boot/dts/sun7i-a20-cubieboard2.dts        |   12 +-
 arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts          |   12 +-
 arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts  |    4 +-
 arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts     |   18 +-
 arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts    |   24 +-
 arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts    |   18 +-
 arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts      |   12 +-
 arch/arm/boot/dts/sun7i-a20-orangepi.dts           |   12 +-
 arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts      |   12 +-
 arch/arm/boot/dts/sun7i-a20-pcduino3.dts           |   12 +-
 arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts     |   12 +-
 arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts   |   12 +-
 arch/arm/boot/dts/sun7i-a20.dtsi                   |  125 ++-
 arch/arm/boot/dts/sun8i-a23-a33.dtsi               |   74 +-
 arch/arm/boot/dts/sun8i-a23-q8-tablet.dts          |    6 +
 arch/arm/boot/dts/sun8i-a33-q8-tablet.dts          |    7 +
 arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts     |   11 +-
 arch/arm/boot/dts/sun8i-a33.dtsi                   |   20 +-
 arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts       |   12 +
 arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts   |   12 +
 arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts          |   73 +-
 arch/arm/boot/dts/sun8i-a83t.dtsi                  |  111 +-
 .../boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts    |   20 +-
 arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts  |    2 +-
 arch/arm/boot/dts/sun8i-h3-beelink-x2.dts          |    6 +-
 arch/arm/boot/dts/sun8i-h3-mapleboard-mp130.dts    |    7 +-
 arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts      |    3 +-
 arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts           |    2 +-
 arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts      |    2 +-
 arch/arm/boot/dts/sun8i-h3-nanopi.dtsi             |   25 +-
 arch/arm/boot/dts/sun8i-h3-orangepi-2.dts          |   34 +-
 arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts       |   27 +-
 arch/arm/boot/dts/sun8i-h3-orangepi-one.dts        |   25 +-
 arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts         |   27 +-
 arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts       |    9 -
 arch/arm/boot/dts/sun8i-h3-orangepi-zero-plus2.dts |    3 +-
 arch/arm/boot/dts/sun8i-h3-rervision-dvk.dts       |  114 ++
 arch/arm/boot/dts/sun8i-h3.dtsi                    |    4 +
 arch/arm/boot/dts/sun8i-q8-common.dtsi             |   18 +-
 .../boot/dts/sun8i-r16-nintendo-nes-classic.dts    |    2 -
 arch/arm/boot/dts/sun8i-r16-parrot.dts             |   12 +-
 arch/arm/boot/dts/sun8i-r40.dtsi                   |   13 +-
 .../boot/dts/sun8i-reference-design-tablet.dtsi    |   12 +-
 arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts      |    2 +-
 arch/arm/boot/dts/sun8i-v3s.dtsi                   |   13 +-
 arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts  |   36 +-
 arch/arm/boot/dts/sun9i-a80-cubieboard4.dts        |   15 +-
 arch/arm/boot/dts/sun9i-a80-optimus.dts            |    4 +-
 arch/arm/boot/dts/sun9i-a80.dtsi                   |   84 +-
 arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi      |    7 +-
 arch/arm/boot/dts/sunxi-h3-h5.dtsi                 |   50 +-
 arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi   |    4 +-
 arch/arm/boot/dts/tegra124-apalis-emc.dtsi         |   39 +-
 arch/arm/boot/dts/tegra124-apalis-eval.dts         |   40 +-
 arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts    |    2 +-
 arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi        |    9 +-
 arch/arm/boot/dts/tegra124-apalis.dtsi             |   45 +-
 arch/arm/boot/dts/tegra124-jetson-tk1.dts          |    5 +
 arch/arm/boot/dts/tegra124-nyan.dtsi               |    5 +
 arch/arm/boot/dts/tegra124-venice2.dts             |    5 +
 arch/arm/boot/dts/tegra30.dtsi                     |   11 +
 arch/arm/boot/dts/vf610-zii-cfu1.dts               |   26 +-
 arch/arm/boot/dts/vf610-zii-dev-rev-b.dts          |   57 +-
 arch/arm/boot/dts/vf610-zii-dev-rev-c.dts          |   49 +-
 arch/arm/boot/dts/vf610-zii-dev.dtsi               |    6 +-
 arch/arm/boot/dts/vf610-zii-scu4-aib.dts           |   14 +-
 arch/arm/boot/dts/vf610-zii-spb4.dts               |  359 +++++++
 arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts           |    5 +-
 arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts          |   17 +-
 arch/arm/configs/exynos_defconfig                  |    1 -
 arch/arm/configs/multi_v7_defconfig                |  151 +--
 arch/arm/configs/qcom_defconfig                    |   13 +-
 arch/arm/configs/shmobile_defconfig                |   13 +-
 arch/arm/configs/tegra_defconfig                   |   36 +-
 arch/arm/firmware/Kconfig                          |   29 -
 arch/arm/firmware/Makefile                         |    4 -
 arch/arm/include/asm/firmware.h                    |    2 +-
 arch/arm/mach-davinci/board-da830-evm.c            |   51 +-
 arch/arm/mach-davinci/board-da850-evm.c            |    1 +
 arch/arm/mach-davinci/board-dm355-evm.c            |    1 +
 arch/arm/mach-davinci/board-dm644x-evm.c           |    1 +
 arch/arm/mach-davinci/board-omapl138-hawk.c        |   50 +-
 arch/arm/mach-ep93xx/adssphere.c                   |    2 +-
 arch/arm/mach-ep93xx/clock.c                       |    3 +-
 arch/arm/mach-ep93xx/core.c                        |    8 +-
 arch/arm/mach-ep93xx/dma.c                         |    2 +-
 arch/arm/mach-ep93xx/edb93xx.c                     |    4 +-
 arch/arm/mach-ep93xx/gesbc9312.c                   |    2 +-
 .../mach-ep93xx/{include/mach => }/gpio-ep93xx.h   |    0
 arch/arm/mach-ep93xx/{include/mach => }/hardware.h |    2 +-
 arch/arm/mach-ep93xx/micro9.c                      |    2 +-
 arch/arm/mach-ep93xx/{include/mach => }/platform.h |   23 +-
 arch/arm/mach-ep93xx/simone.c                      |    4 +-
 arch/arm/mach-ep93xx/snappercl15.c                 |    4 +-
 arch/arm/mach-ep93xx/ts72xx.c                      |    4 +-
 arch/arm/mach-ep93xx/vision_ep9307.c               |    4 +-
 arch/arm/mach-exynos/Kconfig                       |   12 +-
 arch/arm/mach-exynos/Makefile                      |    2 +-
 arch/arm/mach-exynos/common.h                      |    1 +
 arch/arm/mach-exynos/exynos.c                      |    3 +
 arch/arm/mach-exynos/firmware.c                    |    1 +
 arch/arm/mach-exynos/mcpm-exynos.c                 |   13 +-
 arch/arm/mach-exynos/platsmp.c                     |    9 +-
 arch/arm/mach-exynos/smc.h                         |    7 +
 arch/arm/mach-exynos/suspend.c                     |   49 +-
 arch/arm/mach-imx/pm-imx6.c                        |    6 +-
 arch/arm/mach-ixp4xx/Kconfig                       |   27 +-
 arch/arm/mach-ixp4xx/Makefile                      |    5 +-
 arch/arm/mach-ixp4xx/avila-pci.c                   |    2 +
 arch/arm/mach-ixp4xx/avila-setup.c                 |    2 +
 arch/arm/mach-ixp4xx/common.c                      |  484 ++-------
 arch/arm/mach-ixp4xx/coyote-pci.c                  |    2 +
 arch/arm/mach-ixp4xx/coyote-setup.c                |    2 +
 arch/arm/mach-ixp4xx/dsmg600-pci.c                 |    2 +
 arch/arm/mach-ixp4xx/dsmg600-setup.c               |    5 +-
 arch/arm/mach-ixp4xx/fsg-pci.c                     |    2 +
 arch/arm/mach-ixp4xx/fsg-setup.c                   |    2 +
 arch/arm/mach-ixp4xx/gateway7001-pci.c             |    2 +
 arch/arm/mach-ixp4xx/gateway7001-setup.c           |    2 +
 arch/arm/mach-ixp4xx/gtwx5715-pci.c                |    2 +
 arch/arm/mach-ixp4xx/gtwx5715-setup.c              |    2 +
 arch/arm/mach-ixp4xx/include/mach/entry-macro.S    |   41 -
 arch/arm/mach-ixp4xx/include/mach/irqs.h           |   75 --
 arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h    |   94 --
 arch/arm/mach-ixp4xx/include/mach/qmgr.h           |  204 ----
 arch/arm/mach-ixp4xx/irqs.h                        |   68 ++
 arch/arm/mach-ixp4xx/ixdp425-pci.c                 |    2 +
 arch/arm/mach-ixp4xx/ixdp425-setup.c               |    2 +
 arch/arm/mach-ixp4xx/ixdpg425-pci.c                |    2 +
 arch/arm/mach-ixp4xx/ixp4xx-of.c                   |   60 ++
 arch/arm/mach-ixp4xx/nas100d-pci.c                 |    2 +
 arch/arm/mach-ixp4xx/nas100d-setup.c               |    5 +-
 arch/arm/mach-ixp4xx/nslu2-pci.c                   |    2 +
 arch/arm/mach-ixp4xx/nslu2-setup.c                 |   12 +-
 arch/arm/mach-ixp4xx/wg302v2-pci.c                 |    2 +
 arch/arm/mach-ixp4xx/wg302v2-setup.c               |    2 +
 arch/arm/mach-lpc32xx/phy3250.c                    |   42 +-
 arch/arm/mach-omap2/common.h                       |    9 +
 arch/arm/mach-omap2/i2c.c                          |   11 +-
 arch/arm/mach-omap2/io.c                           |    7 +-
 arch/arm/mach-omap2/mmc.h                          |    8 +
 arch/arm/mach-omap2/omap-wakeupgen.c               |    4 +-
 arch/arm/mach-omap2/omap_hwmod.c                   |  210 +++-
 arch/arm/mach-omap2/omap_hwmod.h                   |    8 +-
 arch/arm/mach-omap2/omap_hwmod_2420_data.c         |    1 -
 arch/arm/mach-omap2/omap_hwmod_2430_data.c         |    1 -
 arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c |    1 -
 .../mach-omap2/omap_hwmod_33xx_43xx_common_data.h  |   29 -
 .../omap_hwmod_33xx_43xx_interconnect_data.c       |  103 --
 .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c |  255 -----
 arch/arm/mach-omap2/omap_hwmod_33xx_data.c         |   64 --
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c         |    4 -
 arch/arm/mach-omap2/omap_hwmod_43xx_data.c         |  113 --
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c         |  740 -------------
 arch/arm/mach-omap2/omap_hwmod_54xx_data.c         |  748 -------------
 arch/arm/mach-omap2/omap_hwmod_7xx_data.c          |  848 +--------------
 arch/arm/mach-omap2/omap_hwmod_81xx_data.c         |    1 -
 arch/arm/mach-omap2/pm33xx-core.c                  |   84 +-
 arch/arm/mach-omap2/sleep43xx.S                    |    3 +
 arch/arm/mach-omap2/sr_device.c                    |    5 +-
 arch/arm/mach-rockchip/platsmp.c                   |    1 +
 arch/arm/mach-rockchip/pm.c                        |    4 +-
 arch/arm/mach-s3c64xx/mach-crag6410-module.c       |   14 +-
 arch/arm/mach-shmobile/pm-rcar-gen2.c              |    1 +
 arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c |    6 +-
 arch/arm/mach-stm32/Kconfig                        |    5 +-
 arch/arm/mach-sunxi/mc_smp.c                       |    5 +-
 arch/arm/mach-sunxi/platsmp.c                      |    4 +
 arch/arm/mach-tegra/Kconfig                        |    4 +-
 arch/arm/mach-tegra/cpuidle-tegra114.c             |    4 +-
 arch/arm/mach-tegra/cpuidle-tegra20.c              |   11 +-
 arch/arm/mach-tegra/cpuidle-tegra30.c              |    9 +-
 arch/arm/mach-tegra/iomap.h                        |    9 -
 arch/arm/mach-tegra/pm.c                           |   50 +
 arch/arm/mach-tegra/reset-handler.S                |   50 +-
 arch/arm/mach-tegra/reset.c                        |    4 +
 arch/arm/mach-tegra/reset.h                        |    9 +-
 arch/arm/mach-tegra/sleep-tegra20.S                |    4 +
 arch/arm/mach-tegra/sleep-tegra30.S                |   21 -
 arch/arm/mach-tegra/sleep.S                        |   14 +-
 arch/arm/mach-tegra/tegra.c                        |    5 +-
 arch/arm/mach-u300/regulator.c                     |    2 +
 arch/arm/plat-pxa/ssp.c                            |    6 -
 arch/arm64/Kconfig.platforms                       |    5 +
 arch/arm64/boot/dts/Makefile                       |    1 +
 arch/arm64/boot/dts/allwinner/Makefile             |    3 +
 .../dts/allwinner/sun50i-a64-amarula-relic.dts     |   65 ++
 .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts |    2 +-
 .../allwinner/sun50i-a64-oceanic-5205-5inmfd.dts   |   68 ++
 .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts |    2 +-
 .../boot/dts/allwinner/sun50i-a64-pinebook.dts     |    4 +-
 .../boot/dts/allwinner/sun50i-a64-sopine.dtsi      |    2 +-
 .../boot/dts/allwinner/sun50i-a64-teres-i.dts      |   13 +
 arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi      |   75 +-
 .../sun50i-h5-emlid-neutis-n5-devboard.dts         |    3 +-
 .../dts/allwinner/sun50i-h5-emlid-neutis-n5.dtsi   |    1 -
 .../dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts   |    5 +-
 .../boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts   |    2 +-
 .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts  |    4 +-
 .../dts/allwinner/sun50i-h5-orangepi-prime.dts     |    4 +-
 .../dts/allwinner/sun50i-h5-orangepi-zero-plus.dts |    2 +-
 .../allwinner/sun50i-h5-orangepi-zero-plus2.dts    |    3 +-
 arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi       |    4 +
 .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts   |  260 +++++
 .../boot/dts/allwinner/sun50i-h6-orangepi-3.dts    |  215 ++++
 .../boot/dts/allwinner/sun50i-h6-orangepi.dtsi     |    2 -
 .../boot/dts/allwinner/sun50i-h6-pine-h64.dts      |    4 -
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi       |   41 +-
 .../boot/dts/altera/socfpga_stratix10_socdk.dts    |    3 +-
 arch/arm64/boot/dts/amlogic/Makefile               |    1 +
 arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts  |  185 ++++
 arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts    |  147 +++
 arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts |  140 +++
 arch/arm64/boot/dts/amlogic/meson-g12a.dtsi        |  465 ++++++++
 .../dts/amlogic/meson-gxl-s905d-phicomm-n1.dts     |   10 +
 .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts |    4 +
 arch/arm64/boot/dts/amlogic/meson-gxm.dtsi         |   27 +
 arch/arm64/boot/dts/bitmain/bm1880-sophon-edge.dts |  143 +++
 arch/arm64/boot/dts/bitmain/bm1880.dtsi            |   68 ++
 .../boot/dts/exynos/exynos5433-tm2-common.dtsi     |    6 +
 arch/arm64/boot/dts/exynos/exynos5433-tm2.dts      |    6 +-
 arch/arm64/boot/dts/exynos/exynos5433.dtsi         |   83 +-
 arch/arm64/boot/dts/exynos/exynos7.dtsi            |   57 +-
 arch/arm64/boot/dts/freescale/Makefile             |    3 +
 .../boot/dts/freescale/fsl-ls1012a-oxalis.dts      |    4 +
 arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi     |    2 +-
 arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts  |   62 ++
 arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts  |   63 ++
 arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi     |   64 +-
 arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts  |    1 -
 arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi     |    2 +-
 arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi     |    2 -
 arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts  |   16 +
 arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts  |   16 +
 arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi     |   69 ++
 arch/arm64/boot/dts/freescale/imx8mm-evk.dts       |  235 ++++
 arch/arm64/boot/dts/freescale/imx8mm.dtsi          |  733 +++++++++++++
 arch/arm64/boot/dts/freescale/imx8mq-evk.dts       |  129 +++
 .../boot/dts/freescale/imx8mq-zii-ultra-rmb3.dts   |   95 ++
 .../boot/dts/freescale/imx8mq-zii-ultra-zest.dts   |   24 +
 .../arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi |  725 +++++++++++++
 arch/arm64/boot/dts/freescale/imx8mq.dtsi          |  309 +++++-
 arch/arm64/boot/dts/freescale/imx8qxp-mek.dts      |   95 ++
 arch/arm64/boot/dts/freescale/imx8qxp.dtsi         |   89 +-
 arch/arm64/boot/dts/hisilicon/hi3660.dtsi          |   20 +-
 arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts  |   75 ++
 arch/arm64/boot/dts/hisilicon/hi3670.dtsi          |   62 ++
 .../arm64/boot/dts/hisilicon/hikey970-pinctrl.dtsi |  115 ++
 arch/arm64/boot/dts/intel/Makefile                 |    1 +
 arch/arm64/boot/dts/intel/socfpga_agilex.dtsi      |  444 ++++++++
 arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts |   75 ++
 .../dts/marvell/armada-8040-clearfog-gt-8k.dts     |   13 +-
 arch/arm64/boot/dts/mediatek/mt8173.dtsi           |   35 +-
 arch/arm64/boot/dts/mediatek/mt8183-pinfunc.h      | 1120 ++++++++++++++++++++
 arch/arm64/boot/dts/nvidia/Makefile                |    1 +
 arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts |  115 ++
 arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi     |   42 +-
 arch/arm64/boot/dts/nvidia/tegra186.dtsi           |  140 ++-
 arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi     |    1 +
 arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts |    2 -
 arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi     |    6 +
 arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts |   12 +
 arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi     |    5 +
 arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi     |    6 +
 arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts |  650 ++++++++++++
 arch/arm64/boot/dts/nvidia/tegra210-smaug.dts      |   12 +
 arch/arm64/boot/dts/nvidia/tegra210.dtsi           |   41 +-
 arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi  |   52 +
 .../boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi    |    8 +
 arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi       |  121 +++
 arch/arm64/boot/dts/qcom/msm8916.dtsi              |   46 +-
 arch/arm64/boot/dts/qcom/msm8996-pins.dtsi         |   43 +
 arch/arm64/boot/dts/qcom/msm8996.dtsi              |  558 +++++++++-
 arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi          |   60 +-
 arch/arm64/boot/dts/qcom/msm8998.dtsi              |  315 +++++-
 arch/arm64/boot/dts/qcom/pm8005.dtsi               |    1 +
 arch/arm64/boot/dts/qcom/pm8998.dtsi               |    3 +
 arch/arm64/boot/dts/qcom/pmi8994.dtsi              |    1 +
 arch/arm64/boot/dts/qcom/pmi8998.dtsi              |    1 +
 arch/arm64/boot/dts/qcom/pms405.dtsi               |   11 +
 arch/arm64/boot/dts/qcom/qcs404-evb-1000.dts       |    3 +-
 arch/arm64/boot/dts/qcom/qcs404-evb-4000.dts       |   85 +-
 arch/arm64/boot/dts/qcom/qcs404-evb.dtsi           |   95 +-
 arch/arm64/boot/dts/qcom/qcs404.dtsi               |   23 +-
 arch/arm64/boot/dts/qcom/sdm845-mtp.dts            |    8 +
 arch/arm64/boot/dts/qcom/sdm845.dtsi               |  427 +++++++-
 arch/arm64/boot/dts/renesas/cat875.dtsi            |   22 +
 arch/arm64/boot/dts/renesas/r8a774a1.dtsi          |   12 +-
 arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts    |   62 ++
 arch/arm64/boot/dts/renesas/r8a774c0.dtsi          |   44 +-
 arch/arm64/boot/dts/renesas/r8a7795.dtsi           |   72 +-
 arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts |    1 +
 .../arm64/boot/dts/renesas/r8a7796-salvator-xs.dts |    1 +
 arch/arm64/boot/dts/renesas/r8a7796.dtsi           |   13 +-
 arch/arm64/boot/dts/renesas/r8a77965.dtsi          |  324 +++++-
 arch/arm64/boot/dts/renesas/r8a77980.dtsi          |   16 +
 arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts     |   53 +-
 arch/arm64/boot/dts/renesas/r8a77990.dtsi          |   74 +-
 arch/arm64/boot/dts/renesas/r8a77995-draak.dts     |   32 +-
 arch/arm64/boot/dts/renesas/salvator-common.dtsi   |   73 +-
 arch/arm64/boot/dts/rockchip/Makefile              |    2 +
 arch/arm64/boot/dts/rockchip/px30-evb.dts          |    4 +-
 arch/arm64/boot/dts/rockchip/rk3328-evb.dts        |    2 +-
 arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts     |   53 +
 arch/arm64/boot/dts/rockchip/rk3328-rock64.dts     |   33 +-
 arch/arm64/boot/dts/rockchip/rk3328.dtsi           |    7 +-
 arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi       |   34 +-
 arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts    |    8 +-
 .../arm64/boot/dts/rockchip/rk3368-lion-haikou.dts |   14 +-
 arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi      |   10 +-
 .../boot/dts/rockchip/rk3368-orion-r68-meta.dts    |   46 +-
 arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts    |    6 +-
 arch/arm64/boot/dts/rockchip/rk3368-r88.dts        |   36 +-
 arch/arm64/boot/dts/rockchip/rk3368.dtsi           |  240 ++---
 arch/arm64/boot/dts/rockchip/rk3399-evb.dts        |    6 +-
 arch/arm64/boot/dts/rockchip/rk3399-ficus.dts      |   18 +-
 arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts    |    2 +-
 .../boot/dts/rockchip/rk3399-gru-chromebook.dtsi   |   14 +-
 arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts  |    8 +-
 .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi      |   68 +-
 arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi       |   56 +-
 arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts  |   69 +-
 .../arm64/boot/dts/rockchip/rk3399-nanopi-neo4.dts |   50 +
 arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi   |   27 +-
 arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts   |  790 ++++++++++++++
 .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts |   12 +-
 arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi      |   21 +-
 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts  |    5 +
 arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi   |   77 +-
 arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts  |    6 +-
 arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi  |    4 +-
 arch/arm64/boot/dts/rockchip/rk3399.dtsi           |  314 +++---
 .../boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts    |    1 +
 arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts  |    1 +
 arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts  |    1 +
 arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts  |    1 +
 arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts  |    1 +
 arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts  |    1 +
 arch/arm64/configs/defconfig                       |  100 +-
 drivers/ata/pata_ep93xx.c                          |    2 +-
 drivers/bus/tegra-aconnect.c                       |   66 +-
 drivers/bus/ti-sysc.c                              |  661 ++++++++++--
 drivers/clk/zynqmp/clkc.c                          |    4 +-
 drivers/clocksource/Kconfig                        |    7 +
 drivers/clocksource/Makefile                       |    1 +
 drivers/clocksource/timer-ixp4xx.c                 |  284 +++++
 drivers/crypto/ixp4xx_crypto.c                     |    4 +-
 drivers/firmware/Kconfig                           |   16 +
 drivers/firmware/Makefile                          |    1 +
 drivers/firmware/arm_scmi/driver.c                 |    8 +-
 drivers/firmware/imx/Makefile                      |    2 +-
 drivers/firmware/imx/imx-scu-irq.c                 |  168 +++
 drivers/firmware/imx/imx-scu.c                     |    6 +
 drivers/firmware/imx/scu-pd.c                      |  121 ++-
 .../arm => drivers}/firmware/trusted_foundations.c |   79 +-
 drivers/firmware/xilinx/zynqmp-debug.c             |   18 +-
 drivers/firmware/xilinx/zynqmp.c                   |   56 +-
 drivers/fpga/Kconfig                               |    9 +
 drivers/fpga/Makefile                              |    1 +
 drivers/fpga/zynqmp-fpga.c                         |  159 +++
 drivers/gpio/Kconfig                               |   13 +
 drivers/gpio/Makefile                              |    1 +
 drivers/gpio/gpio-ixp4xx.c                         |  474 +++++++++
 drivers/input/keyboard/Kconfig                     |    2 +-
 drivers/input/keyboard/ep93xx_keypad.c             |    8 +-
 drivers/input/misc/ixp4xx-beeper.c                 |   20 +-
 drivers/irqchip/Kconfig                            |    6 +
 drivers/irqchip/Makefile                           |    1 +
 drivers/irqchip/irq-ixp4xx.c                       |  403 +++++++
 drivers/memory/emif.h                              |    4 +
 drivers/memory/tegra/mc.c                          |   34 +-
 drivers/memory/tegra/mc.h                          |    2 +-
 drivers/memory/tegra/tegra114.c                    |    4 +-
 drivers/memory/tegra/tegra124.c                    |    4 +-
 drivers/memory/tegra/tegra20.c                     |   28 +-
 drivers/memory/tegra/tegra210.c                    |    2 +-
 drivers/memory/tegra/tegra30.c                     |    4 +-
 drivers/memory/ti-emif-pm.c                        |    3 +
 drivers/memory/ti-emif-sram-pm.S                   |   41 +
 drivers/misc/Kconfig                               |   16 -
 drivers/misc/Makefile                              |    2 -
 drivers/net/ethernet/cirrus/Kconfig                |    2 +-
 drivers/net/ethernet/cirrus/ep93xx_eth.c           |    2 +-
 drivers/net/ethernet/xscale/ixp4xx_eth.c           |   14 +-
 drivers/net/wan/ixp4xx_hss.c                       |    4 +-
 drivers/nvmem/zynqmp_nvmem.c                       |   10 +-
 drivers/pwm/pwm-ep93xx.c                           |    2 +-
 drivers/reset/reset-zynqmp.c                       |    8 +-
 drivers/rtc/rtc-omap.c                             |   49 +-
 drivers/soc/Kconfig                                |    2 +
 drivers/soc/Makefile                               |    2 +
 drivers/soc/amlogic/meson-gx-pwrc-vpu.c            |  160 ++-
 drivers/soc/amlogic/meson-gx-socinfo.c             |   43 +-
 drivers/soc/aspeed/Kconfig                         |   20 +
 drivers/soc/aspeed/Makefile                        |    2 +
 drivers/{misc => soc/aspeed}/aspeed-lpc-ctrl.c     |    0
 drivers/{misc => soc/aspeed}/aspeed-lpc-snoop.c    |    0
 drivers/soc/imx/Makefile                           |    1 +
 drivers/soc/imx/gpc.c                              |    4 +-
 drivers/soc/imx/gpcv2.c                            |   43 +-
 drivers/soc/imx/soc-imx8.c                         |  115 ++
 drivers/soc/ixp4xx/Kconfig                         |   16 +
 drivers/soc/ixp4xx/Makefile                        |    2 +
 .../soc/ixp4xx/ixp4xx-npe.c                        |   66 +-
 .../soc/ixp4xx/ixp4xx-qmgr.c                       |  186 +++-
 drivers/soc/mediatek/mtk-pmic-wrap.c               |  111 +-
 drivers/soc/qcom/cmd-db.c                          |    4 +-
 drivers/soc/qcom/qmi_interface.c                   |    7 +-
 drivers/soc/qcom/rmtfs_mem.c                       |   21 +
 drivers/soc/qcom/rpmh-rsc.c                        |    2 +-
 drivers/soc/renesas/renesas-soc.c                  |    3 +
 drivers/soc/rockchip/grf.c                         |    2 +
 drivers/soc/tegra/pmc.c                            |  171 ++-
 drivers/soc/ti/Kconfig                             |    5 +-
 drivers/soc/ti/pm33xx.c                            |  273 ++++-
 drivers/soc/xilinx/zynqmp_pm_domains.c             |   18 +-
 drivers/soc/xilinx/zynqmp_power.c                  |   10 +-
 drivers/spi/spi-zynqmp-gqspi.c                     |    6 +
 drivers/tee/optee/core.c                           |   80 +-
 drivers/usb/host/ohci-da8xx.c                      |   42 +-
 drivers/watchdog/ixp4xx_wdt.c                      |    9 +
 .../clock/{xlnx,zynqmp-clk.h => xlnx-zynqmp-clk.h} |   26 +-
 include/dt-bindings/firmware/imx/rsrc.h            |   25 +-
 include/dt-bindings/pinctrl/am33xx.h               |  130 ++-
 include/dt-bindings/pinctrl/omap.h                 |    1 +
 include/dt-bindings/power/r8a77965-sysc.h          |    1 -
 include/linux/firmware/imx/sci.h                   |    5 +
 .../linux/firmware}/trusted_foundations.h          |   27 +-
 include/linux/firmware/xlnx-zynqmp.h               |   14 +-
 include/linux/irqchip/irq-ixp4xx.h                 |   12 +
 include/linux/platform_data/eth-ep93xx.h           |   10 +
 include/linux/platform_data/keypad-ep93xx.h        |    4 +-
 include/linux/platform_data/pm33xx.h               |    5 +
 include/linux/platform_data/ti-sysc.h              |    9 +-
 include/linux/platform_data/timer-ixp4xx.h         |   11 +
 include/linux/reset.h                              |    2 +
 include/linux/rtc/rtc-omap.h                       |    7 +
 include/linux/soc/cirrus/ep93xx.h                  |   37 +
 .../mach => include/linux/soc/ixp4xx}/npe.h        |    2 -
 include/linux/soc/ixp4xx/qmgr.h                    |   91 ++
 include/linux/ti-emif-sram.h                       |    3 +
 sound/soc/cirrus/edb93xx.c                         |    2 +-
 sound/soc/cirrus/ep93xx-ac97.c                     |    1 +
 sound/soc/cirrus/ep93xx-i2s.c                      |    3 +-
 sound/soc/cirrus/simone.c                          |    2 +-
 sound/soc/cirrus/snappercl15.c                     |    2 +-
 753 files changed, 29821 insertions(+), 10957 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/intel-ixp4xx.yaml
 delete mode 100644 Documentation/devicetree/bindings/arm/sunxi.txt
 create mode 100644 Documentation/devicetree/bindings/arm/sunxi.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/xlnx,zynqmp-clk.txt
 create mode 100644 Documentation/devicetree/bindings/firmware/intel,ixp4xx-network-processing-engine.yaml
 create mode 100644 Documentation/devicetree/bindings/fpga/xlnx,zynqmp-pcap-fpga.txt
 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/intel,ixp4xx-interrupt.yaml
 create mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/mmdc.txt
 create mode 100644 Documentation/devicetree/bindings/misc/intel,ixp4xx-queue-manager.yaml
 create mode 100644 Documentation/devicetree/bindings/timer/intel,ixp4xx-timer.yaml
 create mode 100644 arch/arm/arm-soc-for-next-contents.txt
 create mode 100644 arch/arm/boot/dts/am5718.dtsi
 create mode 100644 arch/arm/boot/dts/am5728.dtsi
 create mode 100644 arch/arm/boot/dts/am5748.dtsi
 create mode 100644 arch/arm/boot/dts/imx50-kobo-aura.dts
 create mode 100644 arch/arm/boot/dts/imx53-m53menlo.dts
 create mode 100644 arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts
 create mode 100644 arch/arm/boot/dts/imx7-mba7.dtsi
 create mode 100644 arch/arm/boot/dts/imx7-tqma7.dtsi
 create mode 100644 arch/arm/boot/dts/imx7d-mba7.dts
 create mode 100644 arch/arm/boot/dts/imx7d-tqma7.dtsi
 create mode 100644 arch/arm/boot/dts/imx7d-zii-rpu2.dts
 create mode 100644 arch/arm/boot/dts/imx7s-mba7.dts
 create mode 100644 arch/arm/boot/dts/imx7s-tqma7.dtsi
 create mode 100644 arch/arm/boot/dts/intel-ixp42x-linksys-nslu2.dts
 create mode 100644 arch/arm/boot/dts/intel-ixp42x.dtsi
 create mode 100644 arch/arm/boot/dts/intel-ixp43x-gateworks-gw2358.dts
 create mode 100644 arch/arm/boot/dts/intel-ixp43x.dtsi
 create mode 100644 arch/arm/boot/dts/intel-ixp45x-ixp46x.dtsi
 create mode 100644 arch/arm/boot/dts/intel-ixp4xx.dtsi
 create mode 100644 arch/arm/boot/dts/omap4-l4-abe.dtsi
 create mode 100644 arch/arm/boot/dts/omap4-mcpdm.dtsi
 create mode 100644 arch/arm/boot/dts/omap5-l4-abe.dtsi
 create mode 100644 arch/arm/boot/dts/rk3288-veyron-mighty.dts
 create mode 100644 arch/arm/boot/dts/stm32mp157a-dk1.dts
 create mode 100644 arch/arm/boot/dts/stm32mp157c-dk2.dts
 create mode 100644 arch/arm/boot/dts/sun8i-h3-rervision-dvk.dts
 create mode 100644 arch/arm/boot/dts/vf610-zii-spb4.dts
 delete mode 100644 arch/arm/firmware/Kconfig
 delete mode 100644 arch/arm/firmware/Makefile
 rename arch/arm/mach-ep93xx/{include/mach => }/gpio-ep93xx.h (100%)
 rename arch/arm/mach-ep93xx/{include/mach => }/hardware.h (96%)
 rename arch/arm/mach-ep93xx/{include/mach => }/platform.h (65%)
 delete mode 100644 arch/arm/mach-ixp4xx/include/mach/entry-macro.S
 delete mode 100644 arch/arm/mach-ixp4xx/include/mach/irqs.h
 delete mode 100644 arch/arm/mach-ixp4xx/include/mach/qmgr.h
 create mode 100644 arch/arm/mach-ixp4xx/irqs.h
 create mode 100644 arch/arm/mach-ixp4xx/ixp4xx-of.c
 create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-oceanic-5205-5inmfd.dts
 create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
 create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
 create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-evk.dts
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm.dtsi
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-zii-ultra-rmb3.dts
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-zii-ultra-zest.dts
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi
 create mode 100644 arch/arm64/boot/dts/intel/Makefile
 create mode 100644 arch/arm64/boot/dts/intel/socfpga_agilex.dtsi
 create mode 100644 arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts
 create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-pinfunc.h
 create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-nanopi-neo4.dts
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts
 create mode 100644 drivers/clocksource/timer-ixp4xx.c
 create mode 100644 drivers/firmware/imx/imx-scu-irq.c
 rename {arch/arm => drivers}/firmware/trusted_foundations.c (62%)
 create mode 100644 drivers/fpga/zynqmp-fpga.c
 create mode 100644 drivers/gpio/gpio-ixp4xx.c
 create mode 100644 drivers/irqchip/irq-ixp4xx.c
 create mode 100644 drivers/soc/aspeed/Kconfig
 create mode 100644 drivers/soc/aspeed/Makefile
 rename drivers/{misc => soc/aspeed}/aspeed-lpc-ctrl.c (100%)
 rename drivers/{misc => soc/aspeed}/aspeed-lpc-snoop.c (100%)
 create mode 100644 drivers/soc/imx/soc-imx8.c
 create mode 100644 drivers/soc/ixp4xx/Kconfig
 create mode 100644 drivers/soc/ixp4xx/Makefile
 rename arch/arm/mach-ixp4xx/ixp4xx_npe.c => drivers/soc/ixp4xx/ixp4xx-npe.c (94%)
 rename arch/arm/mach-ixp4xx/ixp4xx_qmgr.c => drivers/soc/ixp4xx/ixp4xx-qmgr.c (66%)
 rename include/dt-bindings/clock/{xlnx,zynqmp-clk.h => xlnx-zynqmp-clk.h} (85%)
 rename {arch/arm/include/asm => include/linux/firmware}/trusted_foundations.h (77%)
 create mode 100644 include/linux/irqchip/irq-ixp4xx.h
 create mode 100644 include/linux/platform_data/eth-ep93xx.h
 create mode 100644 include/linux/platform_data/timer-ixp4xx.h
 create mode 100644 include/linux/rtc/rtc-omap.h
 create mode 100644 include/linux/soc/cirrus/ep93xx.h
 rename {arch/arm/mach-ixp4xx/include/mach => include/linux/soc/ixp4xx}/npe.h (95%)
 create mode 100644 include/linux/soc/ixp4xx/qmgr.h
Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' into next)
$ git merge actions/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1)
$ git merge alpine/alpine/for-next
Already up to date.
Merging amlogic/for-next (64d04a7813d5 Merge branch 'v5.2/fixes' into tmp/aml-rebuild)
$ git merge amlogic/for-next
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/meson8.dtsi  | 5 ++---
 arch/arm/boot/dts/meson8b.dtsi | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)
Merging aspeed/for-next (e15425214990 ARM: dts: aspeed: quanta-q71l: enable uart1)
$ git merge aspeed/for-next
Already up to date.
Merging at91/at91-next (ac650130c227 Merge branches 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next)
$ git merge at91/at91-next
Auto-merging include/linux/clk/at91_pmc.h
Auto-merging arch/arm/mach-at91/pm.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/pm.c
Auto-merging arch/arm/configs/sama5_defconfig
Resolved 'arch/arm/mach-at91/pm.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 8d3e48794228] Merge remote-tracking branch 'at91/at91-next'
$ git diff -M --stat --summary HEAD^..
 .../devicetree/bindings/arm/atmel-at91.txt         |   1 +
 arch/arm/configs/sama5_defconfig                   |   2 +-
 arch/arm/mach-at91/Kconfig                         |   3 -
 arch/arm/mach-at91/at91sam9.c                      |  18 ++
 arch/arm/mach-at91/generic.h                       |   2 +
 arch/arm/mach-at91/pm.c                            | 193 ++++++++++++++-------
 arch/arm/mach-at91/pm_suspend.S                    | 111 ++++++++----
 include/linux/clk/at91_pmc.h                       |   1 +
 8 files changed, 233 insertions(+), 98 deletions(-)
Merging bcm2835/for-next (1ee128f4fff2 Merge branch 'bcm2835-drivers-next' into for-next)
$ git merge bcm2835/for-next
Auto-merging arch/arm/boot/dts/Makefile
Merge made by the 'recursive' strategy.
Merging imx-mxs/for-next (d9c3322a2906 Merge branch 'imx/defconfig' into for-next)
$ git merge imx-mxs/for-next
Auto-merging arch/arm64/configs/defconfig
CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig
Auto-merging arch/arm/configs/imx_v6_v7_defconfig
Auto-merging arch/arm/boot/dts/ls1021a.dtsi
Resolved 'arch/arm64/configs/defconfig' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 5b60f34298da] Merge remote-tracking branch 'imx-mxs/for-next'
$ git diff -M --stat --summary HEAD^..
 arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi |  4 +++-
 arch/arm/boot/dts/imx6dl-riotboard.dts        |  2 +-
 arch/arm/boot/dts/imx6q-ba16.dtsi             |  2 +-
 arch/arm/boot/dts/imx6q-marsboard.dts         |  2 +-
 arch/arm/boot/dts/imx6q-tbs2910.dts           |  2 +-
 arch/arm/boot/dts/imx6qdl-apf6.dtsi           |  2 +-
 arch/arm/boot/dts/imx6qdl-sabreauto.dtsi      |  2 +-
 arch/arm/boot/dts/imx6qdl-sabresd.dtsi        |  2 +-
 arch/arm/boot/dts/imx6qdl-sr-som.dtsi         |  2 +-
 arch/arm/boot/dts/imx6qdl-wandboard.dtsi      |  2 +-
 arch/arm/boot/dts/imx6sx-sabreauto.dts        |  2 +-
 arch/arm/boot/dts/imx6sx-sdb.dtsi             |  2 +-
 arch/arm/boot/dts/imx7d-pico.dtsi             |  2 +-
 arch/arm/boot/dts/ls1021a-twr.dts             |  9 ++++++++-
 arch/arm/boot/dts/ls1021a.dtsi                | 11 ++++++++++-
 arch/arm/configs/imx_v6_v7_defconfig          |  4 ++++
 arch/arm64/configs/defconfig                  | 12 ++++++++++++
 17 files changed, 49 insertions(+), 15 deletions(-)
Merging keystone/next (3c3a43c81bda Merge branch 'for_5.1/soc-drivers' into next)
$ git merge keystone/next
Already up to date!
Merge made by the 'recursive' strategy.
Merging mediatek/for-next (73ade6a62931 Merge branch 'v5.1-next/soc' into for-next)
$ git merge mediatek/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging mvebu/for-next (891f0f865c37 Merge branch 'mvebu/dt64' into mvebu/for-next)
$ git merge mvebu/for-next
Auto-merging arch/arm/mach-mvebu/kirkwood.c
Merge made by the 'recursive' strategy.
 arch/arm/mach-mvebu/board-v7.c     |  1 -
 arch/arm/mach-mvebu/coherency_ll.S |  2 +-
 arch/arm/mach-mvebu/kirkwood.c     |  2 --
 arch/arm/mach-mvebu/pm-board.c     | 11 ++++++++---
 arch/arm/mach-mvebu/pmsu_ll.S      |  3 +--
 5 files changed, 10 insertions(+), 9 deletions(-)
Merging omap/for-next (481df0abf8cf Merge branch 'omap-for-v5.2/ti-sysc' into for-next)
$ git merge omap/for-next
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/am33xx-l4.dtsi | 14 ++++++--------
 arch/arm/boot/dts/am437x-l4.dtsi |  4 ----
 drivers/bus/ti-sysc.c            | 23 +++++++++++------------
 3 files changed, 17 insertions(+), 24 deletions(-)
Merging reset/reset/next (21a5d26b8164 reset: Switch to SPDX license identifier for reset-simple)
$ git merge reset/reset/next
Merge made by the 'recursive' strategy.
 .../bindings/reset/bitmain,bm1880-reset.txt        | 18 ++++++++
 drivers/reset/Kconfig                              |  3 +-
 drivers/reset/reset-simple.c                       |  8 ++--
 include/dt-bindings/reset/bitmain,bm1880-reset.h   | 51 ++++++++++++++++++++++
 4 files changed, 74 insertions(+), 6 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/reset/bitmain,bm1880-reset.txt
 create mode 100644 include/dt-bindings/reset/bitmain,bm1880-reset.h
Merging qcom/for-next (1d31c0b1a28a Merge tag 'qcom-arm64-for-5.2-1' into really-done-for-5.2)
$ git merge qcom/for-next
Auto-merging arch/arm64/configs/defconfig
Merge made by the 'recursive' strategy.
 arch/arm64/configs/defconfig | 9 +++++++++
 1 file changed, 9 insertions(+)
Merging renesas/next (982700f80241 Merge branch 'arm-dt-for-v5.2' into next)
$ git merge renesas/next
Already up to date!
Merge made by the 'recursive' strategy.
Merging rockchip/for-next (9c539071723e Merge branch 'v5.2-clk/next' into for-next)
$ git merge rockchip/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging samsung/for-next (bebc6082da0a Linux 4.14)
$ git merge samsung/for-next
Already up to date.
Merging samsung-krzk/for-next (831c75782772 Merge branch 'next/dt64' into for-next)
$ git merge samsung-krzk/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging sunxi/sunxi/for-next (613c4ce8fddb Merge branch 'sunxi/dt-for-5.2' into sunxi/for-next)
$ git merge sunxi/sunxi/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging tegra/for-next (0c0ffecf65fd Merge branch for-5.2/arm64/defconfig into for-next)
$ git merge tegra/for-next
Auto-merging arch/arm64/Kconfig.platforms
Merge made by the 'recursive' strategy.
 arch/arm64/Kconfig.platforms                       | 1 +
 arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 4 ++--
 arch/arm64/boot/dts/nvidia/tegra186.dtsi           | 7 +++++++
 drivers/amba/tegra-ahb.c                           | 6 ++----
 4 files changed, 12 insertions(+), 6 deletions(-)
Merging clk/clk-next (c1157f60d72e Merge branch 'clk-parent-rewrite-1' into clk-next)
$ git merge clk/clk-next
Already up to date.
Merging clk-samsung/for-next (3c297d9e65d8 clk: samsung: exynos5410: Add gate clock for ADC)
$ git merge clk-samsung/for-next
Merge made by the 'recursive' strategy.
Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge c6x/for-linux-next
Already up to date.
Merging csky/linux-next (d2adb7b6249a csky: Select intc & timer drivers)
$ git merge csky/linux-next
Merge made by the 'recursive' strategy.
 arch/csky/Kconfig | 4 ++++
 1 file changed, 4 insertions(+)
Merging h8300/h8300-next (21c7acc439b5 h8300: pci: Remove local declaration of pcibios_penalize_isa_irq)
$ git merge h8300/h8300-next
Already up to date.
Merging ia64/next (c51836246f97 ia64: generate uapi header and system call table files)
$ git merge ia64/next
Already up to date.
Merging m68k/for-next (fdd20ec8786a Documentation/features/time: Mark m68k having modern-timekeeping)
$ git merge m68k/for-next
Already up to date.
Merging m68knommu/for-next (37624b58542f Linux 5.1-rc7)
$ git merge m68knommu/for-next
Already up to date.
Merging microblaze/next (226a893bbb1f microblaze: no need to check return value of debugfs_create functions)
$ git merge microblaze/next
Already up to date.
Merging mips/mips-next (81fca03ae741 MIPS: SGI-IP22: provide missing dma_mask/coherent_dma_mask)
$ git merge mips/mips-next
Auto-merging arch/mips/sgi-ip27/ip27-irq.c
CONFLICT (content): Merge conflict in arch/mips/sgi-ip27/ip27-irq.c
Removing arch/mips/pci/ops-bridge.c
Auto-merging arch/mips/Kconfig
Resolved 'arch/mips/sgi-ip27/ip27-irq.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 1db207b1e3f3] Merge remote-tracking branch 'mips/mips-next'
$ git diff -M --stat --summary HEAD^..
 arch/mips/Kconfig                          |   6 +
 arch/mips/generic/init.c                   |   4 +-
 arch/mips/include/asm/mach-ip27/topology.h |  11 +-
 arch/mips/include/asm/pci/bridge.h         |  14 +-
 arch/mips/include/asm/sn/irq_alloc.h       |  11 +
 arch/mips/include/asm/xtalk/xtalk.h        |   9 -
 arch/mips/kernel/cpu-probe.c               |   8 +
 arch/mips/kernel/perf_event_mipsxx.c       |  21 +-
 arch/mips/pci/Makefile                     |   3 +-
 arch/mips/pci/ops-bridge.c                 | 302 --------------
 arch/mips/pci/pci-ip27.c                   | 181 ---------
 arch/mips/pci/pci-xtalk-bridge.c           | 610 +++++++++++++++++++++++++++++
 arch/mips/sgi-ip22/ip22-platform.c         |  13 +
 arch/mips/sgi-ip27/ip27-init.c             |   2 +
 arch/mips/sgi-ip27/ip27-irq.c              | 190 ++++-----
 arch/mips/sgi-ip27/ip27-xtalk.c            |  61 ++-
 include/linux/platform_data/xtalk-bridge.h |  22 ++
 17 files changed, 817 insertions(+), 651 deletions(-)
 create mode 100644 arch/mips/include/asm/sn/irq_alloc.h
 delete mode 100644 arch/mips/pci/ops-bridge.c
 create mode 100644 arch/mips/pci/pci-xtalk-bridge.c
 create mode 100644 include/linux/platform_data/xtalk-bridge.h
Merging nds32/next (d4d45d2d7790 MAINTAINERS: update nds32 git repo path)
$ git merge nds32/next
Auto-merging arch/nds32/include/asm/tlbflush.h
Auto-merging arch/nds32/include/asm/tlb.h
Auto-merging arch/nds32/include/asm/syscall.h
Auto-merging arch/nds32/include/asm/io.h
Auto-merging arch/nds32/include/asm/elf.h
Auto-merging arch/nds32/include/asm/Kbuild
Auto-merging arch/nds32/Kconfig
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                              |  2 +-
 arch/nds32/Kconfig                       | 16 ++++++++--------
 arch/nds32/include/asm/Kbuild            |  1 -
 arch/nds32/include/asm/assembler.h       |  2 +-
 arch/nds32/include/asm/barrier.h         |  2 +-
 arch/nds32/include/asm/bitfield.h        |  2 +-
 arch/nds32/include/asm/cache.h           |  2 +-
 arch/nds32/include/asm/cache_info.h      |  2 +-
 arch/nds32/include/asm/cacheflush.h      |  2 +-
 arch/nds32/include/asm/current.h         |  2 +-
 arch/nds32/include/asm/delay.h           |  2 +-
 arch/nds32/include/asm/elf.h             |  2 +-
 arch/nds32/include/asm/fixmap.h          |  2 +-
 arch/nds32/include/asm/futex.h           |  2 +-
 arch/nds32/include/asm/highmem.h         |  2 +-
 arch/nds32/include/asm/io.h              |  2 +-
 arch/nds32/include/asm/irqflags.h        |  2 +-
 arch/nds32/include/asm/l2_cache.h        |  2 +-
 arch/nds32/include/asm/linkage.h         |  2 +-
 arch/nds32/include/asm/memory.h          | 10 +---------
 arch/nds32/include/asm/mmu.h             |  2 +-
 arch/nds32/include/asm/mmu_context.h     |  2 +-
 arch/nds32/include/asm/module.h          |  2 +-
 arch/nds32/include/asm/nds32.h           |  2 +-
 arch/nds32/include/asm/page.h            |  2 +-
 arch/nds32/include/asm/pgalloc.h         |  2 +-
 arch/nds32/include/asm/pgtable.h         |  2 +-
 arch/nds32/include/asm/proc-fns.h        |  2 +-
 arch/nds32/include/asm/processor.h       |  2 +-
 arch/nds32/include/asm/ptrace.h          |  2 +-
 arch/nds32/include/asm/shmparam.h        |  2 +-
 arch/nds32/include/asm/string.h          |  2 +-
 arch/nds32/include/asm/swab.h            |  2 +-
 arch/nds32/include/asm/syscall.h         | 29 ++++++++++++++++++-----------
 arch/nds32/include/asm/syscalls.h        |  2 +-
 arch/nds32/include/asm/thread_info.h     |  4 +---
 arch/nds32/include/asm/tlb.h             |  2 +-
 arch/nds32/include/asm/tlbflush.h        |  2 +-
 arch/nds32/include/asm/uaccess.h         |  2 +-
 arch/nds32/include/asm/unistd.h          |  2 +-
 arch/nds32/include/asm/vdso.h            |  2 +-
 arch/nds32/include/asm/vdso_datapage.h   |  2 +-
 arch/nds32/include/asm/vdso_timer_info.h |  2 +-
 arch/nds32/include/uapi/asm/auxvec.h     |  2 +-
 arch/nds32/include/uapi/asm/byteorder.h  |  2 +-
 arch/nds32/include/uapi/asm/cachectl.h   |  2 +-
 arch/nds32/include/uapi/asm/param.h      |  2 +-
 arch/nds32/include/uapi/asm/ptrace.h     |  2 +-
 arch/nds32/include/uapi/asm/sigcontext.h |  2 +-
 arch/nds32/include/uapi/asm/unistd.h     |  2 +-
 arch/nds32/kernel/.gitignore             |  1 +
 arch/nds32/kernel/cacheinfo.c            |  2 +-
 arch/nds32/kernel/ex-exit.S              |  4 ++--
 arch/nds32/kernel/nds32_ksyms.c          |  6 ------
 arch/nds32/kernel/vdso/.gitignore        |  1 +
 arch/nds32/kernel/vdso/Makefile          | 14 +++++---------
 arch/nds32/mm/init.c                     |  2 +-
 57 files changed, 84 insertions(+), 96 deletions(-)
 create mode 100644 arch/nds32/kernel/.gitignore
 create mode 100644 arch/nds32/kernel/vdso/.gitignore
Merging nios2/for-next (21e6bff5e0ef nios2: Fix update_mmu_cache preload the TLB with the new PTE)
$ git merge nios2/for-next
Already up to date.
Merging openrisc/for-next (57ce8ba0fd3a openrisc: Fix broken paths to arch/or32)
$ git merge openrisc/for-next
Already up to date.
Merging parisc-hd/for-next (4e617c86ba9b parisc: Use __ro_after_init in init.c)
$ git merge parisc-hd/for-next
Merge made by the 'recursive' strategy.
 arch/parisc/include/asm/cache.h  |  3 --
 arch/parisc/kernel/cache.c       | 16 ++++-----
 arch/parisc/kernel/drivers.c     |  2 +-
 arch/parisc/kernel/firmware.c    |  2 +-
 arch/parisc/kernel/head.S        |  2 +-
 arch/parisc/kernel/inventory.c   |  8 ++---
 arch/parisc/kernel/pci.c         |  8 ++---
 arch/parisc/kernel/perf_images.h |  4 +--
 arch/parisc/kernel/process.c     |  2 +-
 arch/parisc/kernel/processor.c   |  4 +--
 arch/parisc/kernel/syscall.S     | 12 ++++---
 arch/parisc/kernel/time.c        |  2 +-
 arch/parisc/kernel/unwind.c      |  2 +-
 arch/parisc/kernel/vmlinux.lds.S |  3 --
 arch/parisc/mm/init.c            | 75 +++++++++++++++++++++-------------------
 15 files changed, 73 insertions(+), 72 deletions(-)
Merging powerpc/next (8150a153c013 powerpc/64s: Use early_mmu_has_feature() in set_kuap())
$ git merge powerpc/next
Already up to date.
Merging fsl/next (63d86876f324 Revert "powerpc/fsl_pci: simplify fsl_pci_dma_set_mask")
$ git merge fsl/next
Already up to date.
Merging risc-v-pjw/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
$ git merge risc-v-pjw/for-next
Already up to date.
Merging risc-v/for-next (e23fc917f04f RISC-V: Avoid using invalid intermediate translations)
$ git merge risc-v/for-next
Auto-merging arch/riscv/kernel/stacktrace.c
Auto-merging arch/riscv/Kconfig
Merge made by the 'recursive' strategy.
 arch/riscv/Kconfig                   |   6 +-
 arch/riscv/Makefile                  |   5 +-
 arch/riscv/include/asm/Kbuild        |   1 +
 arch/riscv/include/asm/bug.h         |  35 ++++++----
 arch/riscv/include/asm/cacheflush.h  |   2 +-
 arch/riscv/include/asm/csr.h         | 123 ++++++++++++++++++++++-------------
 arch/riscv/include/asm/elf.h         |   6 --
 arch/riscv/include/asm/futex.h       |  13 ----
 arch/riscv/include/asm/irqflags.h    |  10 +--
 arch/riscv/include/asm/mmu_context.h |  59 +----------------
 arch/riscv/include/asm/ptrace.h      |  21 ++----
 arch/riscv/include/asm/sbi.h         |  19 ++++--
 arch/riscv/include/asm/thread_info.h |   4 +-
 arch/riscv/include/asm/uaccess.h     |  28 +++-----
 arch/riscv/kernel/asm-offsets.c      |   3 -
 arch/riscv/kernel/cpu.c              |   3 +-
 arch/riscv/kernel/entry.S            |  22 +++----
 arch/riscv/kernel/head.S             |  33 ++++++----
 arch/riscv/kernel/irq.c              |  19 ++----
 arch/riscv/kernel/perf_event.c       |   4 +-
 arch/riscv/kernel/reset.c            |  15 +++--
 arch/riscv/kernel/setup.c            |   6 +-
 arch/riscv/kernel/signal.c           |   6 ++
 arch/riscv/kernel/smp.c              |  61 +++--------------
 arch/riscv/kernel/smpboot.           |   0
 arch/riscv/kernel/smpboot.c          |  22 ++++++-
 arch/riscv/kernel/stacktrace.c       |  14 ++--
 arch/riscv/kernel/traps.c            |  30 ++++++---
 arch/riscv/kernel/vdso/Makefile      |   2 +-
 arch/riscv/mm/Makefile               |   1 +
 arch/riscv/mm/cacheflush.c           |  61 +++++++++++++++++
 arch/riscv/mm/context.c              |  69 ++++++++++++++++++++
 arch/riscv/mm/fault.c                |   6 +-
 drivers/tty/hvc/hvc_riscv_sbi.c      |   1 -
 34 files changed, 390 insertions(+), 320 deletions(-)
 create mode 100644 arch/riscv/kernel/smpboot.
 create mode 100644 arch/riscv/mm/context.c
Merging sifive/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
$ git merge sifive/for-next
Already up to date.
Merging s390/features (a698e1372800 s390/qdio: optimize state inspection of HW-owned SBALs)
$ git merge s390/features
Auto-merging include/linux/random.h
Merge made by the 'recursive' strategy.
 arch/s390/boot/Makefile                 |  1 -
 arch/s390/boot/compressed/vmlinux.lds.S |  2 ++
 arch/s390/mm/kasan_init.c               |  2 +-
 drivers/s390/cio/qdio_main.c            | 19 +++++++++++--------
 drivers/s390/cio/trace.c                |  1 -
 drivers/s390/cio/trace.h                | 23 -----------------------
 include/linux/random.h                  |  2 +-
 7 files changed, 15 insertions(+), 35 deletions(-)
Merging sparc-next/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
$ git merge sparc-next/master
Already up to date.
Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM)
$ git merge sh/for-next
Already up to date.
Merging uml/linux-next (1987b1b8f9f1 um: irq: don't set the chip for all irqs)
$ git merge uml/linux-next
Already up to date.
Merging xtensa/xtensa-for-next (0542593fff0f Merge branch 'xtensa-for-next' into xtensa-5.2-fixes)
$ git merge xtensa/xtensa-for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging fscrypt/master (2c58d548f570 fscrypt: cache decrypted symlink target in ->i_link)
$ git merge fscrypt/master
Already up to date.
Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues)
$ git merge befs/for-next
Merge made by the 'recursive' strategy.
 fs/befs/btree.c | 97 ++++++++++++++++++++++++++++++---------------------------
 1 file changed, 51 insertions(+), 46 deletions(-)
Merging btrfs/next (29dcea88779c Linux 4.17)
$ git merge btrfs/next
Already up to date.
Merging btrfs-kdave/for-next (6fc9f4e59957 Merge branch 'for-next-current-v5.1-20190509' into for-next-20190509)
$ git merge btrfs-kdave/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging ceph/master (00abf69dd24f ceph: flush dirty inodes before proceeding with remount)
$ git merge ceph/master
Auto-merging net/ceph/osd_client.c
Auto-merging fs/ceph/super.h
Auto-merging fs/ceph/super.c
Auto-merging fs/ceph/inode.c
Auto-merging fs/ceph/file.c
Merge made by the 'recursive' strategy.
 drivers/block/rbd.c            |  24 +--
 fs/ceph/caps.c                 |  93 +++++------
 fs/ceph/debugfs.c              |  40 ++++-
 fs/ceph/export.c               | 356 ++++++++++++++++++++++++++++++++++++++---
 fs/ceph/file.c                 |   2 +-
 fs/ceph/inode.c                |  85 ++++++----
 fs/ceph/locks.c                |  13 --
 fs/ceph/mds_client.c           | 205 ++++++++++--------------
 fs/ceph/mds_client.h           |  33 +++-
 fs/ceph/mdsmap.c               |   2 +-
 fs/ceph/quota.c                | 177 ++++++++++++++++++--
 fs/ceph/super.c                |   7 +
 fs/ceph/super.h                |   2 +
 include/linux/ceph/ceph_fs.h   |   6 +
 include/linux/ceph/messenger.h |   3 +-
 include/linux/ceph/osdmap.h    |  13 +-
 net/ceph/cls_lock_client.c     |   2 +-
 net/ceph/debugfs.c             |   4 +-
 net/ceph/messenger.c           | 121 +++++++-------
 net/ceph/mon_client.c          |   6 +-
 net/ceph/osd_client.c          |   2 +-
 21 files changed, 845 insertions(+), 351 deletions(-)
Merging cifs/for-next (14e25977f988 cifs: use the right include for signal_pending())
$ git merge cifs/for-next
Merge made by the 'recursive' strategy.
 fs/cifs/cifs_debug.c |  2 ++
 fs/cifs/smb2ops.c    | 46 +++++++++++++++++++++++-----------------------
 fs/cifs/transport.c  |  2 +-
 3 files changed, 26 insertions(+), 24 deletions(-)
Merging configfs/for-next (35399f87e271 configfs: fix possible use-after-free in configfs_register_group)
$ git merge configfs/for-next
Auto-merging fs/configfs/dir.c
Merge made by the 'recursive' strategy.
 fs/configfs/dir.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)
Merging ecryptfs/next (d43388dea04b eCryptfs: fix permission denied with ecryptfs_xattr mount option when create readonly file)
$ git merge ecryptfs/next
Auto-merging fs/ecryptfs/keystore.c
Auto-merging fs/ecryptfs/crypto.c
Merge made by the 'recursive' strategy.
 fs/ecryptfs/crypto.c   | 29 +++++++++++++++++++++++------
 fs/ecryptfs/keystore.c |  5 +++--
 2 files changed, 26 insertions(+), 8 deletions(-)
Merging ext3/for_next (91e9f2c1d861 Merge quota fix from Chengguang.)
$ git merge ext3/for_next
Auto-merging fs/udf/super.c
Merge made by the 'recursive' strategy.
 fs/ext2/inode.c       |  4 +++-
 fs/quota/dquot.c      | 41 ++++++++++++++++++++++-------------------
 fs/quota/quota_v1.c   |  2 +-
 fs/quota/quota_v2.c   |  2 +-
 fs/reiserfs/journal.c |  2 +-
 fs/udf/namei.c        | 15 ---------------
 fs/udf/super.c        |  5 +++++
 7 files changed, 33 insertions(+), 38 deletions(-)
Merging ext4/dev (15f0d8d0bafb unicode: add missing check for an error return from utf8lookup())
$ git merge ext4/dev
Auto-merging include/linux/jbd2.h
Auto-merging fs/ext4/super.c
Auto-merging fs/ext4/namei.c
Merge made by the 'recursive' strategy.
 fs/ext4/block_validity.c |  3 ++-
 fs/ext4/extents.c        | 17 +++++++++++++++--
 fs/ext4/file.c           |  7 +++++++
 fs/ext4/fsmap.c          |  2 +-
 fs/ext4/ioctl.c          |  2 +-
 fs/ext4/namei.c          |  5 ++++-
 fs/ext4/super.c          |  2 +-
 fs/jbd2/journal.c        | 49 ++++++++++++++++++++++++++++++------------------
 fs/jbd2/revoke.c         | 32 +++++++++++++++++++------------
 fs/jbd2/transaction.c    |  8 +++++---
 fs/unicode/utf8-norm.c   |  2 ++
 include/linux/jbd2.h     |  8 +++++---
 12 files changed, 94 insertions(+), 43 deletions(-)
Merging f2fs/dev (2777e654371d f2fs: fix to avoid accessing xattr across the boundary)
$ git merge f2fs/dev
Auto-merging fs/f2fs/super.c
Auto-merging fs/f2fs/node.c
Auto-merging fs/f2fs/namei.c
Auto-merging fs/f2fs/f2fs.h
Auto-merging fs/f2fs/data.c
Merge made by the 'recursive' strategy.
 fs/f2fs/acl.c               |   4 +-
 fs/f2fs/checkpoint.c        | 108 +++++++++++++----
 fs/f2fs/data.c              | 285 +++++++++++++++++++++++++-------------------
 fs/f2fs/f2fs.h              | 127 +++++++++++++++-----
 fs/f2fs/file.c              |  76 +++++++-----
 fs/f2fs/gc.c                |  16 ++-
 fs/f2fs/inline.c            |  17 +++
 fs/f2fs/inode.c             |  12 +-
 fs/f2fs/namei.c             |   2 +-
 fs/f2fs/node.c              |  43 +++++--
 fs/f2fs/recovery.c          |  37 +++++-
 fs/f2fs/segment.c           |  71 ++++++-----
 fs/f2fs/segment.h           |  16 +--
 fs/f2fs/super.c             |  70 ++++++++---
 fs/f2fs/xattr.c             |  36 ++++--
 fs/f2fs/xattr.h             |   2 +
 include/linux/f2fs_fs.h     |  11 +-
 include/trace/events/f2fs.h |  57 +++++++++
 18 files changed, 688 insertions(+), 302 deletions(-)
Merging fuse/for-next (9031a69cf9f0 fuse: clean up fuse_alloc_inode)
$ git merge fuse/for-next
Auto-merging fs/fuse/inode.c
Merge made by the 'recursive' strategy.
 fs/fuse/control.c         | 20 +++++++++++++++-----
 fs/fuse/cuse.c            | 13 +++++++------
 fs/fuse/dev.c             | 16 +++++++++++++---
 fs/fuse/file.c            | 22 ++++++++++++++++++----
 fs/fuse/fuse_i.h          |  7 +++++++
 fs/fuse/inode.c           | 23 ++++++++++++-----------
 include/uapi/linux/fuse.h | 22 ++++++++++++++++++++--
 7 files changed, 92 insertions(+), 31 deletions(-)
Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization)
$ git merge jfs/jfs-next
Already up to date.
Merging nfs/linux-next (d7a02fa0a8f9 Merge tag 'upstream-5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/rw/ubifs)
$ git merge nfs/linux-next
Already up to date.
Merging nfs-anna/linux-next (5940d1cf9f42 SUNRPC: Rebalance a kref in auth_gss.c)
$ git merge nfs-anna/linux-next
Already up to date.
Merging nfsd/nfsd-next (6f4f7839e924 auth_gss: fix deadlock that blocks rpcsec_gss_exit_net when use-gss-proxy==1)
$ git merge nfsd/nfsd-next
Auto-merging net/sunrpc/auth_gss/auth_gss.c
Auto-merging net/core/net_namespace.c
Auto-merging include/net/net_namespace.h
Auto-merging include/linux/lockd/bind.h
Auto-merging fs/nsfs.c
Auto-merging fs/nfsd/nfs4state.c
Auto-merging fs/nfsd/nfs4recover.c
Auto-merging fs/nfsd/nfs4proc.c
Auto-merging fs/nfsd/nfs4callback.c
Auto-merging fs/nfs/client.c
Auto-merging fs/locks.c
Auto-merging fs/lockd/clntlock.c
Merge made by the 'recursive' strategy.
 fs/lockd/clntlock.c               |   4 +-
 fs/lockd/svc.c                    |  33 +--
 fs/locks.c                        |  12 +-
 fs/nfs/callback.c                 |   9 +-
 fs/nfs/callback_xdr.c             |   2 +-
 fs/nfs/client.c                   |   1 +
 fs/nfsd/export.c                  |  18 +-
 fs/nfsd/netns.h                   |  11 +
 fs/nfsd/nfs3xdr.c                 |  21 +-
 fs/nfsd/nfs4callback.c            |   9 +-
 fs/nfsd/nfs4idmap.c               |   8 +-
 fs/nfsd/nfs4layouts.c             |   2 +-
 fs/nfsd/nfs4proc.c                |   3 +-
 fs/nfsd/nfs4recover.c             | 436 +++++++++++++++++++++++++++++++++++---
 fs/nfsd/nfs4state.c               |  68 ++++--
 fs/nfsd/nfs4xdr.c                 |   9 +-
 fs/nfsd/nfsctl.c                  |  42 ++--
 fs/nfsd/nfsd.h                    |  17 +-
 fs/nfsd/nfssvc.c                  | 271 ++++++++++++++++++-----
 fs/nfsd/nfsxdr.c                  |  17 +-
 fs/nfsd/state.h                   |   8 +-
 fs/nfsd/vfs.c                     |   8 +-
 fs/nfsd/vfs.h                     |   5 +-
 fs/nsfs.c                         |   2 +
 include/linux/lockd/bind.h        |   2 +-
 include/linux/proc_ns.h           |   1 +
 include/linux/sunrpc/svc.h        |  33 +++
 include/linux/sunrpc/svc_xprt.h   |   4 +-
 include/linux/sunrpc/svcsock.h    |   3 +-
 include/net/net_namespace.h       |   1 +
 include/uapi/linux/nfsd/cld.h     |   1 +
 net/core/net_namespace.c          |  12 ++
 net/sunrpc/auth_gss/auth_gss.c    |   9 +-
 net/sunrpc/auth_gss/svcauth_gss.c |   6 +-
 net/sunrpc/cache.c                |   4 +-
 net/sunrpc/svc.c                  | 298 +++++++++++++++++---------
 net/sunrpc/svc_xprt.c             |  17 +-
 net/sunrpc/svcauth_unix.c         |  15 +-
 net/sunrpc/svcsock.c              |   4 +-
 39 files changed, 1107 insertions(+), 319 deletions(-)
Merging orangefs/for-next (33713cd09ccd orangefs: truncate before updating size)
$ git merge orangefs/for-next
Already up to date.
Merging overlayfs/overlayfs-next (acf3062a7e1c ovl: relax WARN_ON() for overlapping layers use case)
$ git merge overlayfs/overlayfs-next
Merge made by the 'recursive' strategy.
 fs/overlayfs/copy_up.c   |   6 +--
 fs/overlayfs/dir.c       |   2 +-
 fs/overlayfs/file.c      | 133 +++++++++++++++++++++++++++++++++++++----------
 fs/overlayfs/inode.c     |   3 +-
 fs/overlayfs/overlayfs.h |   2 +-
 5 files changed, 113 insertions(+), 33 deletions(-)
Merging ubifs/linux-next (04d37e5a8b1f ubi: wl: Fix uninitialized variable)
$ git merge ubifs/linux-next
Already up to date.
Merging v9fs/9p-next (bb06c388fa20 9p/net: fix memory leak in p9_client_create)
$ git merge v9fs/9p-next
Already up to date.
Merging xfs/for-next (8869a2d297cb Merge remote-tracking branch 'korg/iomap-5.2-merge' into for-next)
$ git merge xfs/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging file-locks/locks-next (945ab8f6de94 locks: wake any locks blocked on request before deadlock check)
$ git merge file-locks/locks-next
Already up to date.
Merging vfs/for-next (6e14c3cf8bc4 Merge branch 'work.icache' into for-next)
$ git merge vfs/for-next
Auto-merging Documentation/filesystems/porting
CONFLICT (content): Merge conflict in Documentation/filesystems/porting
Resolved 'Documentation/filesystems/porting' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master a162b01f3a1e] Merge remote-tracking branch 'vfs/for-next'
$ git diff -M --stat --summary HEAD^..
Merging printk/for-next (967aa2217b6d Merge branch 'for-5.2-fixes' into for-next)
$ git merge printk/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging pci/next (747a14a7d6c7 Merge branch 'pci/trivial')
$ git merge pci/next
Auto-merging include/linux/pci.h
Auto-merging include/linux/acpi.h
Auto-merging drivers/pci/switch/switchtec.c
Auto-merging drivers/pci/quirks.c
Auto-merging drivers/pci/probe.c
Auto-merging drivers/pci/pcie/bw_notification.c
Auto-merging drivers/pci/pci.h
Auto-merging drivers/pci/pci.c
Auto-merging drivers/pci/hotplug/pciehp_ctrl.c
Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
Auto-merging drivers/net/ethernet/realtek/r8169.c
Auto-merging drivers/iommu/intel_irq_remapping.c
Auto-merging drivers/iommu/intel-iommu.c
Auto-merging drivers/iommu/amd_iommu.c
Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_topology.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/pci/designware-pcie.txt    |   7 +-
 .../devicetree/bindings/pci/pci-keystone.txt       |  58 +-
 Documentation/devicetree/bindings/pci/pci.txt      |  50 ++
 MAINTAINERS                                        |   9 +-
 arch/arm64/boot/dts/mediatek/mt2712e.dtsi          |   2 -
 arch/powerpc/platforms/powernv/npu-dma.c           |  14 +-
 arch/x86/pci/irq.c                                 |  10 +-
 drivers/acpi/pci_mcfg.c                            |  12 +
 drivers/acpi/pci_root.c                            |   2 +
 drivers/gpu/drm/amd/amdkfd/kfd_topology.c          |   3 +-
 drivers/iommu/amd_iommu.c                          |   2 +-
 drivers/iommu/dma-iommu.c                          |  35 +-
 drivers/iommu/intel-iommu.c                        |   2 +-
 drivers/iommu/intel_irq_remapping.c                |   2 +-
 drivers/misc/pci_endpoint_test.c                   |  18 +
 drivers/net/ethernet/realtek/r8169.c               |   3 +-
 drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c   |   2 +-
 drivers/pci/Makefile                               |   2 +-
 drivers/pci/bus.c                                  |   5 +-
 drivers/pci/controller/dwc/Kconfig                 |  29 +-
 drivers/pci/controller/dwc/Makefile                |   1 +
 drivers/pci/controller/dwc/pci-dra7xx.c            |   3 +-
 drivers/pci/controller/dwc/pci-imx6.c              | 144 ++--
 drivers/pci/controller/dwc/pci-keystone.c          | 926 +++++++++++++++------
 drivers/pci/controller/dwc/pci-layerscape-ep.c     |   2 +-
 drivers/pci/controller/dwc/pci-layerscape.c        |   1 +
 drivers/pci/controller/dwc/pcie-al.c               |  93 +++
 drivers/pci/controller/dwc/pcie-artpec6.c          |   2 +-
 drivers/pci/controller/dwc/pcie-designware-ep.c    |  55 +-
 drivers/pci/controller/dwc/pcie-designware-host.c  | 157 ++--
 drivers/pci/controller/dwc/pcie-designware-plat.c  |   2 +-
 drivers/pci/controller/dwc/pcie-designware.c       |  64 +-
 drivers/pci/controller/dwc/pcie-designware.h       |  26 +-
 drivers/pci/controller/dwc/pcie-qcom.c             |  23 +-
 drivers/pci/controller/dwc/pcie-uniphier.c         |  11 +-
 drivers/pci/controller/pci-aardvark.c              |  13 +-
 drivers/pci/controller/pci-host-generic.c          |   2 +-
 drivers/pci/controller/pci-hyperv.c                |  23 +
 drivers/pci/controller/pci-tegra.c                 |  37 +-
 drivers/pci/controller/pcie-iproc-msi.c            |   2 +-
 drivers/pci/controller/pcie-iproc.c                |  98 ++-
 drivers/pci/controller/pcie-mediatek.c             |  51 +-
 drivers/pci/controller/pcie-rcar.c                 |  85 +-
 drivers/pci/controller/pcie-rockchip-ep.c          |   2 +-
 drivers/pci/controller/pcie-rockchip-host.c        |   1 +
 drivers/pci/controller/pcie-xilinx-nwl.c           |   9 +-
 drivers/pci/controller/pcie-xilinx.c               |  12 +-
 drivers/pci/endpoint/functions/pci-epf-test.c      |  10 +-
 drivers/pci/endpoint/pci-epf-core.c                |  10 +-
 drivers/pci/hotplug/pciehp.h                       |  31 +-
 drivers/pci/hotplug/pciehp_core.c                  |  18 +-
 drivers/pci/hotplug/pciehp_ctrl.c                  |   2 +
 drivers/pci/hotplug/pciehp_hpc.c                   |  17 +-
 drivers/pci/hotplug/pciehp_pci.c                   |   2 +
 drivers/pci/hotplug/rpadlpar_core.c                |   4 +
 drivers/pci/hotplug/rpaphp_slot.c                  |   3 +-
 drivers/pci/msi.c                                  |   6 +-
 drivers/pci/of.c                                   |  58 +-
 drivers/pci/p2pdma.c                               |  38 +-
 drivers/pci/pci-acpi.c                             | 183 ++--
 drivers/pci/pci-stub.c                             |  10 +-
 drivers/pci/pci-sysfs.c                            |   3 +-
 drivers/pci/pci.c                                  | 344 ++++----
 drivers/pci/pci.h                                  |   2 +-
 drivers/pci/pcie/aer.c                             |  30 +-
 drivers/pci/pcie/aer_inject.c                      |  20 +-
 drivers/pci/pcie/aspm.c                            |  47 +-
 drivers/pci/pcie/bw_notification.c                 |  14 +
 drivers/pci/pcie/dpc.c                             |  37 +-
 drivers/pci/pcie/pme.c                             |  10 +-
 drivers/pci/probe.c                                | 230 ++++-
 drivers/pci/proc.c                                 |   1 +
 drivers/pci/quirks.c                               |  92 +-
 drivers/pci/search.c                               |  10 +-
 drivers/pci/setup-bus.c                            | 526 ++++++------
 drivers/pci/slot.c                                 |   2 +-
 drivers/pci/switch/switchtec.c                     |  42 +-
 drivers/pci/xen-pcifront.c                         |   9 +-
 drivers/platform/chrome/chromeos_laptop.c          |   2 +-
 include/linux/acpi.h                               |   3 +-
 include/linux/cper.h                               | 336 ++++----
 include/linux/msi.h                                |  18 -
 include/linux/pci-ecam.h                           |   1 +
 include/linux/pci-epc.h                            |   2 +
 include/linux/pci-epf.h                            |   3 +-
 include/linux/pci.h                                |   9 +-
 include/linux/pci_hotplug.h                        |  66 +-
 include/linux/switchtec.h                          |   2 +-
 include/uapi/linux/pci_regs.h                      | 138 +--
 include/uapi/linux/switchtec_ioctl.h               |  13 +-
 tools/pci/Makefile                                 |   8 +-
 tools/pci/pcitest.c                                |   8 +-
 92 files changed, 2911 insertions(+), 1621 deletions(-)
 create mode 100644 drivers/pci/controller/dwc/pcie-al.c
Merging pstore/for-next/pstore (0be6a6927254 pstore/ram: Improve backward compatibility with older Chromebooks)
$ git merge pstore/for-next/pstore
Merge made by the 'recursive' strategy.
 fs/pstore/ram.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
Merging hid/for-next (eb18d1215405 Merge branch 'for-5.2/logitech' into for-next)
$ git merge hid/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging i2c/i2c/for-next (8d1d950a6072 Merge branch 'i2c/for-5.2' into i2c/for-next)
$ git merge i2c/i2c/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging i3c/i3c/next (476c7e1d34f2 i3c: Fix a shift wrap bug in i3c_bus_set_addr_slot_status())
$ git merge i3c/i3c/next
Already up to date.
Merging dmi/master (57361846b52b Linux 4.19-rc2)
$ git merge dmi/master
Already up to date.
Merging hwmon-staging/hwmon-next (39abe9d88b30 hwmon: (lm75) Add support for TMP75B)
$ git merge hwmon-staging/hwmon-next
Already up to date.
Merging jc_docs/docs-next (afbd4d42470e Merge branch 'x86' into docs-next)
$ git merge jc_docs/docs-next
Already up to date.
Merging v4l-dvb/master (1199fa8c0ddd media: tegra-cec: fix cec_notifier_parse_hdmi_phandle return check)
$ git merge v4l-dvb/master
Auto-merging drivers/staging/media/imx/imx-media.h
Auto-merging drivers/staging/media/imx/imx-media-csi.c
Auto-merging drivers/staging/media/imx/imx-media-capture.c
Auto-merging drivers/staging/media/imx/imx-ic-prpencvf.c
Merge made by the 'recursive' strategy.
 Documentation/media/uapi/v4l/field-order.rst  | 16 +++----
 drivers/media/platform/atmel/atmel-isc-regs.h | 19 ++++++++
 drivers/media/platform/atmel/atmel-isc.c      | 46 ++++++++++++++++--
 drivers/media/platform/coda/coda-common.c     | 10 ++++
 drivers/media/platform/davinci/vpbe.c         |  2 +-
 drivers/media/platform/omap/omap_vout.c       | 15 +++---
 drivers/media/platform/rcar-vin/rcar-csi2.c   | 68 +++++++++++++++++++++++++--
 drivers/media/platform/tegra-cec/tegra_cec.c  |  4 +-
 drivers/staging/media/imx/imx-ic-prpencvf.c   |  2 +-
 drivers/staging/media/imx/imx-media-capture.c |  6 +--
 drivers/staging/media/imx/imx-media-csi.c     |  2 +-
 drivers/staging/media/imx/imx-media.h         |  3 +-
 drivers/staging/media/imx/imx7-media-csi.c    |  2 +-
 include/media/davinci/vpbe.h                  |  2 +-
 14 files changed, 160 insertions(+), 37 deletions(-)
Merging v4l-dvb-next/master (9e98c678c2d6 Linux 5.1-rc1)
$ git merge v4l-dvb-next/master
Already up to date.
Merging fbdev/fbdev-for-next (d4a5611743a6 video: fbdev: Use dev_get_drvdata())
$ git merge fbdev/fbdev-for-next
Already up to date.
Merging pm/linux-next (ee3fd765dc39 Merge branch 'pm-domains' into linux-next)
$ git merge pm/linux-next
Auto-merging drivers/soc/imx/gpc.c
Auto-merging drivers/cpufreq/cpufreq.c
Auto-merging drivers/base/power/domain.c
Auto-merging arch/x86/kvm/x86.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../acpi/dsd/data-node-references.rst              |   6 +-
 Documentation/firmware-guide/acpi/dsd/graph.rst    | 120 +++++++++---------
 MAINTAINERS                                        |   2 +
 arch/arm/kernel/smp.c                              |  24 ++--
 arch/sparc/kernel/time_64.c                        |  28 +++--
 arch/x86/kernel/cpu/intel_epb.c                    |  22 +++-
 arch/x86/kernel/tsc.c                              |   2 +-
 arch/x86/kvm/x86.c                                 |  31 +++--
 drivers/acpi/device_sysfs.c                        |   6 +-
 drivers/base/power/domain.c                        |   8 +-
 drivers/cpufreq/cpufreq.c                          | 140 ++++++++++++---------
 drivers/soc/imx/gpc.c                              |  13 +-
 include/acpi/acpi_bus.h                            |   2 +-
 include/acpi/acpixf.h                              |   2 +-
 include/acpi/platform/aclinux.h                    |  10 +-
 include/linux/cpufreq.h                            |  14 +--
 include/linux/pm_domain.h                          |   4 +
 17 files changed, 257 insertions(+), 177 deletions(-)
Merging cpufreq-arm/cpufreq/arm/linux-next (8db82563451f cpufreq: armada-37xx: fix frequency calculation for opp)
$ git merge cpufreq-arm/cpufreq/arm/linux-next
Already up to date.
Merging cpupower/cpupower (21027e78e7c1 cpupower: correct spelling of interval)
$ git merge cpupower/cpupower
Merge made by the 'recursive' strategy.
 tools/power/cpupower/man/cpupower-monitor.1 | 2 +-
 tools/power/cpupower/po/cs.po               | 2 +-
 tools/power/cpupower/po/de.po               | 2 +-
 tools/power/cpupower/po/fr.po               | 2 +-
 tools/power/cpupower/po/it.po               | 2 +-
 tools/power/cpupower/po/pt.po               | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
Merging opp/opp/linux-next (2f36bde0fc8f OPP: Introduce dev_pm_opp_find_freq_ceil_by_volt())
$ git merge opp/opp/linux-next
Already up to date.
Merging thermal/next (fc15b6af30c9 Merge branches 'thermal-core', 'thermal-built-it' and 'thermal-intel' into next)
$ git merge thermal/next
Auto-merging drivers/net/ethernet/mellanox/mlxsw/Kconfig
Auto-merging drivers/hwmon/hwmon.c
Auto-merging arch/arm/configs/pxa_defconfig
Auto-merging arch/arm/configs/mini2440_defconfig
Merge made by the 'recursive' strategy.
 arch/arm/configs/mini2440_defconfig                |  2 +-
 arch/arm/configs/pxa_defconfig                     |  2 +-
 arch/mips/configs/ip22_defconfig                   |  2 +-
 arch/mips/configs/ip27_defconfig                   |  2 +-
 arch/unicore32/configs/unicore32_defconfig         |  2 +-
 drivers/hwmon/hwmon.c                              |  4 +--
 drivers/net/ethernet/mellanox/mlxsw/Kconfig        |  1 -
 drivers/thermal/Kconfig                            |  8 +++---
 drivers/thermal/intel/Kconfig                      |  1 -
 .../intel/int340x_thermal/int3403_thermal.c        | 16 +++++------
 .../int340x_thermal/processor_thermal_device.c     | 13 ++-------
 drivers/thermal/qcom/Kconfig                       |  1 -
 drivers/thermal/thermal_core.c                     | 31 +++++++++-------------
 include/linux/thermal.h                            |  6 ++---
 14 files changed, 34 insertions(+), 57 deletions(-)
Merging thermal-soc/next (be827ffd38ea thermal: rcar_gen3_thermal: Fix to show correct trip points number)
$ git merge thermal-soc/next
Auto-merging include/linux/thermal.h
Auto-merging drivers/thermal/thermal_core.c
Removing drivers/thermal/qcom/tsens-8916.c
Auto-merging drivers/thermal/Kconfig
Auto-merging MAINTAINERS
CONFLICT (content): Merge conflict in MAINTAINERS
Resolved 'MAINTAINERS' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master c3ebd3aa0ab5] Merge remote-tracking branch 'thermal-soc/next'
$ git diff -M --stat --summary HEAD^..
 .../bindings/thermal/amazon,al-thermal.txt         |  33 +
 .../bindings/thermal/nvidia,tegra124-soctherm.txt  |  62 +-
 .../devicetree/bindings/thermal/qcom-tsens.txt     |  14 +
 .../bindings/thermal/rockchip-thermal.txt          |   1 +
 .../bindings/thermal/thermal-generic-adc.txt       |  10 +-
 MAINTAINERS                                        |   6 +
 drivers/thermal/Kconfig                            |  11 +
 drivers/thermal/Makefile                           |   1 +
 drivers/thermal/broadcom/sr-thermal.c              |   8 -
 drivers/thermal/cpu_cooling.c                      |  30 +-
 drivers/thermal/of-thermal.c                       |   3 +
 drivers/thermal/qcom/Makefile                      |   4 +-
 drivers/thermal/qcom/tsens-8916.c                  | 105 ---
 drivers/thermal/qcom/tsens-8960.c                  |  84 +-
 drivers/thermal/qcom/tsens-common.c                | 159 +++-
 .../thermal/qcom/{tsens-8974.c => tsens-v0_1.c}    | 166 +++-
 drivers/thermal/qcom/tsens-v1.c                    | 193 +++++
 drivers/thermal/qcom/tsens-v2.c                    | 111 +--
 drivers/thermal/qcom/tsens.c                       | 100 ++-
 drivers/thermal/qcom/tsens.h                       | 291 ++++++-
 drivers/thermal/qoriq_thermal.c                    |   5 -
 drivers/thermal/rcar_gen3_thermal.c                |  51 +-
 drivers/thermal/rcar_thermal.c                     |  11 +-
 drivers/thermal/rockchip_thermal.c                 |  74 +-
 drivers/thermal/st/Kconfig                         |  22 +-
 drivers/thermal/st/stm_thermal.c                   |   6 +-
 drivers/thermal/tegra/Kconfig                      |   4 +-
 drivers/thermal/tegra/soctherm.c                   | 961 +++++++++++++++++++--
 drivers/thermal/tegra/soctherm.h                   |  16 +
 drivers/thermal/tegra/tegra124-soctherm.c          |   7 +-
 drivers/thermal/tegra/tegra132-soctherm.c          |   7 +-
 drivers/thermal/tegra/tegra210-soctherm.c          |  15 +-
 drivers/thermal/thermal-generic-adc.c              |   9 +-
 drivers/thermal/thermal_core.c                     |  49 ++
 drivers/thermal/thermal_mmio.c                     | 129 +++
 include/dt-bindings/thermal/tegra124-soctherm.h    |   8 +-
 include/linux/thermal.h                            |  13 +
 37 files changed, 2278 insertions(+), 501 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/thermal/amazon,al-thermal.txt
 delete mode 100644 drivers/thermal/qcom/tsens-8916.c
 rename drivers/thermal/qcom/{tsens-8974.c => tsens-v0_1.c} (56%)
 create mode 100644 drivers/thermal/qcom/tsens-v1.c
 create mode 100644 drivers/thermal/thermal_mmio.c
$ git am -3 ../patches/0001-thermal-use-static-inline-for-stub-function.patch
Applying: thermal: use "static inline" for stub function
$ git reset HEAD^
Unstaged changes after reset:
M	include/linux/thermal.h
$ git add -A .
$ git commit -v -a --amend
[master b76c63f7ff31] Merge remote-tracking branch 'thermal-soc/next'
 Date: Tue May 14 10:27:29 2019 +1000
Merging ieee1394/for-next (812cd88749e0 firewire: mark expected switch fall-throughs)
$ git merge ieee1394/for-next
Merge made by the 'recursive' strategy.
 drivers/firewire/core-device.c   | 2 +-
 drivers/firewire/core-iso.c      | 2 +-
 drivers/firewire/core-topology.c | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)
Merging dlm/next (54cca4bad076 dlm: allow binding to all network interfaces)
$ git merge dlm/next
Merge made by the 'recursive' strategy.
 fs/dlm/config.c    | 42 ++++++++++++++++++++++++
 fs/dlm/config.h    |  3 +-
 fs/dlm/lockspace.c |  6 ++--
 fs/dlm/lowcomms.c  | 95 +++++++++++++++++++++++++++++++++++++++++++-----------
 fs/dlm/lowcomms.h  |  1 +
 5 files changed, 125 insertions(+), 22 deletions(-)
Merging swiotlb/linux-next (063b8271ec8f swiotlb-xen: ensure we have a single callsite for xen_dma_map_page)
$ git merge swiotlb/linux-next
Already up to date.
Merging rdma/for-next (b79656ed44c6 RDMA/ipoib: Allow user space differentiate between valid dev_port)
$ git merge rdma/for-next
Already up to date.
Merging net-next/master (63863ee8e2f6 Merge tag 'gcc-plugins-v5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/kees/linux)
$ git merge net-next/master
Merge made by the 'recursive' strategy.
 fs/gfs2/sys.c                                 |   8 +-
 fs/notify/fsnotify.c                          |  41 ++
 fs/notify/mark.c                              |   5 +
 include/linux/fsnotify.h                      |  33 --
 include/linux/fsnotify_backend.h              |   4 +
 include/linux/percpu.h                        |  12 +-
 mm/percpu-internal.h                          |  15 +-
 mm/percpu-km.c                                |   2 +-
 mm/percpu-stats.c                             |   5 +-
 mm/percpu.c                                   | 549 ++++++++++++++++++--------
 scripts/gcc-plugins/arm_ssp_per_task_plugin.c |   2 +-
 11 files changed, 457 insertions(+), 219 deletions(-)
$ git am -3 ../patches/0001-xfrm4-fix-up-for-moved-_decode_session4.patch
Applying: xfrm4: fix up for moved _decode_session4
$ git reset HEAD^
Unstaged changes after reset:
M	net/xfrm/xfrm_policy.c
$ git add -A .
$ git commit -v -a --amend
[master 53eda1d1eb0d] Merge remote-tracking branch 'net-next/master'
 Date: Tue May 14 10:33:07 2019 +1000
Merging bpf-next/master (80f232121b69 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next)
$ git merge bpf-next/master
Already up to date.
Merging ipsec-next/master (601e6bcc4ef0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge ipsec-next/master
Already up to date.
Merging mlx5-next/mlx5-next (91a40a48d52d net/mlx5: Fix broken hca cap offset)
$ git merge mlx5-next/mlx5-next
Already up to date.
Merging netfilter-next/master (601e6bcc4ef0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge netfilter-next/master
Already up to date.
Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings)
$ git merge nfc-next/master
Auto-merging net/nfc/netlink.c
Auto-merging drivers/nfc/st95hf/core.c
Auto-merging drivers/nfc/st21nfca/dep.c
Auto-merging drivers/nfc/fdp/i2c.c
Merge made by the 'recursive' strategy.
 drivers/nfc/fdp/fdp.c      | 35 +++++------------------------------
 drivers/nfc/fdp/i2c.c      | 26 +++++++++++++-------------
 drivers/nfc/st21nfca/dep.c |  3 ++-
 drivers/nfc/st21nfca/se.c  |  5 +++--
 drivers/nfc/st95hf/core.c  |  7 ++-----
 net/nfc/netlink.c          |  6 ++++--
 6 files changed, 29 insertions(+), 53 deletions(-)
Merging ipvs-next/master (e2f7cc72cbf4 netfilter: conntrack: fix bogus port values for other l4 protocols)
$ git merge ipvs-next/master
Already up to date.
Merging wireless-drivers-next/master (f9b628d61fae rtw88: add license for Makefile)
$ git merge wireless-drivers-next/master
Already up to date.
Merging bluetooth/master (62a91990f4c5 Bluetooth: hci_qca: Rename STATE_<flags> to QCA_<flags>)
$ git merge bluetooth/master
Already up to date.
Merging mac80211-next/master (80f232121b69 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next)
$ git merge mac80211-next/master
Already up to date.
Merging gfs2/for-next (fb19ccf017a4 gfs2: Fix error path kobject memory leak)
$ git merge gfs2/for-next
Merge made by the 'recursive' strategy.
Merging mtd/mtd/next (3008ba870938 mtd: part: fix incorrect format specifier for an unsigned long long)
$ git merge mtd/mtd/next
Already up to date.
Merging nand/nand/next (1c14fe2167ef mtd: nandsim: switch to exec_op interface)
$ git merge nand/nand/next
Already up to date.
Merging spi-nor/spi-nor/next (e43f53c22a93 spi-nor: intel-spi: Add support for Intel Comet Lake SPI serial flash)
$ git merge spi-nor/spi-nor/next
Already up to date.
Merging crypto/master (e59f755ceb6d crypto: ccree - use a proper le32 type for le32 val)
$ git merge crypto/master
Already up to date.
Merging drm/drm-next (c01ad0fe1d57 Merge branch 'drm-next-5.2' of git://people.freedesktop.org/~agd5f/linux into drm-next)
$ git merge drm/drm-next
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c          |  3 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c            | 10 ++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c           | 19 ++++----
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c            | 36 ++++++++++++--
 drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c             |  3 ++
 drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h             |  1 +
 drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c             | 16 +++---
 drivers/gpu/drm/amd/amdgpu/vce_v4_0.c             | 17 ++++---
 drivers/gpu/drm/amd/amdgpu/vega10_ih.c            | 37 +++++++++++++-
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c |  3 +-
 drivers/gpu/drm/i915/gvt/debugfs.c                |  4 +-
 drivers/gpu/drm/i915/gvt/dmabuf.c                 | 19 +++-----
 drivers/gpu/drm/i915/gvt/gtt.c                    | 15 +++---
 drivers/gpu/drm/i915/gvt/gtt.h                    | 16 +++---
 drivers/gpu/drm/i915/gvt/handlers.c               |  4 +-
 drivers/gpu/drm/i915/gvt/mmio_context.c           |  1 +
 drivers/gpu/drm/i915/gvt/reg.h                    |  3 --
 drivers/gpu/drm/i915/gvt/scheduler.c              |  2 +-
 drivers/gpu/drm/i915/i915_request.c               | 59 ++++++++++++++++++++++-
 drivers/gpu/drm/i915/intel_context.c              |  1 +
 drivers/gpu/drm/i915/intel_context_types.h        |  3 ++
 drivers/gpu/drm/radeon/radeon_display.c           |  4 +-
 22 files changed, 212 insertions(+), 64 deletions(-)
Merging amdgpu/drm-next (963040e6ae2d drm/amd/display: Make some functions static)
$ git merge amdgpu/drm-next
Auto-merging drivers/gpu/drm/amd/display/dc/dc.h
Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c
Auto-merging drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
Auto-merging drivers/gpu/drm/amd/amdgpu/Makefile
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/amd/amdgpu/Makefile                |   2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu.h                |  27 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c         |  29 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h         |   2 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c  |   2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c  |   2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c  |  30 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c   |  14 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c         |  57 ++-
 .../amdgpu/{amdgpu_prime.c => amdgpu_dma_buf.c}    | 131 +++----
 drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h        |  46 +++
 drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h            |  14 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c            |  83 +++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c          |  35 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h            |  16 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c             | 212 +++++++++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c            |  28 ++
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h            |  37 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c            |  70 +++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h            |   6 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c           |  44 +++
 drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h           |  13 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c           |  53 ++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h           |   3 +-
 drivers/gpu/drm/amd/amdgpu/cik.c                   |  13 +
 drivers/gpu/drm/amd/amdgpu/df_v3_6.c               | 431 +++++++++++++++++++++
 drivers/gpu/drm/amd/amdgpu/df_v3_6.h               |  17 +
 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c              | 369 +++++++++++++++---
 drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c           |  20 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c              |  14 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c              |  13 +-
 drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c            |  25 +-
 drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c              |  21 +-
 drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c             |  15 +-
 drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c             |  15 +-
 drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h            |   8 +
 drivers/gpu/drm/amd/amdgpu/psp_v3_1.c              | 131 +++++--
 drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c             |  24 +-
 drivers/gpu/drm/amd/amdgpu/si.c                    |  13 +
 drivers/gpu/drm/amd/amdgpu/soc15.c                 |  77 +++-
 drivers/gpu/drm/amd/amdgpu/soc15.h                 |  10 +
 drivers/gpu/drm/amd/amdgpu/soc15_common.h          |  57 ++-
 drivers/gpu/drm/amd/amdgpu/vega10_ih.c             |  91 ++++-
 drivers/gpu/drm/amd/amdgpu/vi.c                    |  13 +
 drivers/gpu/drm/amd/amdkfd/kfd_chardev.c           |   8 +-
 drivers/gpu/drm/amd/amdkfd/kfd_crat.c              |   7 +-
 drivers/gpu/drm/amd/amdkfd/kfd_crat.h              |   3 +-
 drivers/gpu/drm/amd/amdkfd/kfd_events.c            |   2 +-
 drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c       |   2 -
 drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c    |   2 +-
 drivers/gpu/drm/amd/amdkfd/kfd_priv.h              |   2 +-
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  |  16 +-
 drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c |   2 +
 drivers/gpu/drm/amd/display/dc/core/dc.c           |  25 +-
 .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c  |  29 +-
 drivers/gpu/drm/amd/display/dc/core/dc_link.c      |  28 +-
 drivers/gpu/drm/amd/display/dc/core/dc_resource.c  |  79 ++--
 drivers/gpu/drm/amd/display/dc/core/dc_stream.c    |  51 +--
 drivers/gpu/drm/amd/display/dc/dc.h                |   3 +-
 drivers/gpu/drm/amd/display/dc/dc_helper.c         |   2 +-
 drivers/gpu/drm/amd/display/dc/dc_hw_types.h       |   1 +
 drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c   |  78 +++-
 drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.h   |  23 ++
 drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c    |   7 +-
 drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.h    |   3 +
 .../drm/amd/display/dc/dce/dce_stream_encoder.c    |   1 +
 .../amd/display/dc/dce110/dce110_hw_sequencer.c    |   8 +
 .../drm/amd/display/dc/dce110/dce110_resource.c    |   5 +
 .../display/dc/dce110/dce110_timing_generator.c    |   5 +
 .../display/dc/dce110/dce110_timing_generator.h    |   5 +
 .../display/dc/dce110/dce110_timing_generator_v.c  |   5 +
 .../drm/amd/display/dc/dce120/dce120_resource.c    |   6 +-
 .../display/dc/dce120/dce120_timing_generator.c    |   7 +-
 .../amd/display/dc/dce80/dce80_timing_generator.c  |   7 +-
 .../gpu/drm/amd/display/dc/dcn10/dcn10_clk_mgr.c   |  78 +++-
 .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c    | 428 ++++++++++----------
 .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h    |  16 +
 .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c  |  39 +-
 .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c  |   2 +
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c  |  47 ++-
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h  |  17 +-
 .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c  |  37 +-
 .../amd/display/dc/dcn10/dcn10_stream_encoder.c    | 107 ++++-
 .../amd/display/dc/dcn10/dcn10_stream_encoder.h    |  22 ++
 drivers/gpu/drm/amd/display/dc/dm_pp_smu.h         |   2 +-
 drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h    |   8 +-
 .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h   |   1 +
 .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h |   7 +-
 .../drm/amd/display/dc/inc/hw/timing_generator.h   |  23 +-
 drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h  |   5 +
 .../drm/amd/display/include/bios_parser_types.h    |   3 +-
 drivers/gpu/drm/amd/display/include/dal_asic_id.h  |   3 +-
 .../gpu/drm/amd/display/include/set_mode_types.h   |   5 +-
 .../drm/amd/include/asic_reg/df/df_3_6_offset.h    |  18 +
 .../drm/amd/include/asic_reg/gc/gc_9_0_offset.h    |  31 ++
 .../drm/amd/include/asic_reg/nbio/nbio_6_1_smn.h   |   3 +
 .../drm/amd/include/asic_reg/nbio/nbio_7_0_smn.h   |   3 +
 .../drm/amd/include/asic_reg/nbio/nbio_7_4_0_smn.h |   3 +
 drivers/gpu/drm/amd/include/kgd_kfd_interface.h    |   1 +
 drivers/gpu/drm/amd/include/kgd_pp_interface.h     |  11 +
 drivers/gpu/drm/amd/powerplay/amdgpu_smu.c         |  30 ++
 .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c  |  18 +-
 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c   |   5 +-
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c |  28 +-
 drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 113 ++++--
 drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.h |   3 +
 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c |  53 ++-
 drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h     |   1 +
 drivers/gpu/drm/amd/powerplay/inc/power_state.h    |   7 +
 drivers/gpu/drm/amd/powerplay/inc/pp_thermal.h     |  12 +-
 drivers/gpu/drm/amd/powerplay/inc/smumgr.h         |   1 +
 drivers/gpu/drm/amd/powerplay/smu_v11_0.c          |  23 +-
 drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c   |   2 +
 drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c |   2 +
 .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c  |   2 +
 .../drm/amd/powerplay/smumgr/polaris10_smumgr.c    |   2 +
 .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c    |   2 +
 .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c   |  21 +
 .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c    |   2 +
 include/uapi/linux/kfd_ioctl.h                     |   8 +
 120 files changed, 3238 insertions(+), 772 deletions(-)
 rename drivers/gpu/drm/amd/amdgpu/{amdgpu_prime.c => amdgpu_dma_buf.c} (93%)
 create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h
Merging drm-intel/for-linux-next (c36beba6b296 drm/i915: Seal races between async GPU cancellation, retirement and signaling)
$ git merge drm-intel/for-linux-next
Merge made by the 'recursive' strategy.
 drivers/dma-buf/dma-fence.c                 |  1 +
 drivers/gpu/drm/i915/i915_request.c         |  1 +
 drivers/gpu/drm/i915/intel_breadcrumbs.c    | 78 +++++++++++++++++++++--------
 drivers/gpu/drm/i915/intel_display.c        |  9 ++++
 drivers/gpu/drm/i915/intel_fbc.c            |  4 ++
 drivers/gpu/drm/i915/intel_guc_submission.c |  1 -
 drivers/gpu/drm/i915/intel_pipe_crc.c       | 13 +++--
 7 files changed, 82 insertions(+), 25 deletions(-)
Merging drm-tegra/drm/tegra/for-next (61b51fb51c01 drm/tegra: gem: Fix CPU-cache maintenance for BO's allocated using get_pages())
$ git merge drm-tegra/drm/tegra/for-next
Already up to date.
Merging drm-misc/for-linux-next (197b23e9aeea drm/panfrost: Add missing _fini() calls in panfrost_device_fini())
$ git merge drm-misc/for-linux-next
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/panfrost/panfrost_device.c | 4 ++++
 drivers/gpu/drm/panfrost/panfrost_drv.c    | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)
Merging drm-msm/msm-next (b02872df58ac drm/msm/a6xx: Don't enable GPU state code if dependencies are missing)
$ git merge drm-msm/msm-next
Already up to date.
Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane)
$ git merge hdlcd/for-upstream/hdlcd
Already up to date.
Merging mali-dp/for-upstream/mali-dp (15e9122d9b5c drm/komeda: Mark the local functions as static)
$ git merge mali-dp/for-upstream/mali-dp
Already up to date.
Merging imx-drm/imx-drm/next (5d5fe9970c76 drm/imx: enable IDMAC watermark feature)
$ git merge imx-drm/imx-drm/next
Auto-merging drivers/gpu/drm/imx/ipuv3-crtc.c
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/imx/ipuv3-plane.c | 1 +
 1 file changed, 1 insertion(+)
Merging etnaviv/etnaviv/next (2b76f5be7c27 drm/etnaviv: initialize idle mask before querying the HW db)
$ git merge etnaviv/etnaviv/next
Already up to date.
Merging kconfig/for-next (bebc6082da0a Linux 4.14)
$ git merge kconfig/for-next
Already up to date.
Merging regmap/for-next (a136e5257f67 Merge branch 'regmap-5.2' into regmap-next)
$ git merge regmap/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging sound/for-next (ed180abba7f1 ALSA: hda: Fix race between creating and refreshing sysfs entries)
$ git merge sound/for-next
Already up to date.
Merging sound-asoc/for-next (7c64b35f0023 Merge branch 'asoc-5.2' into asoc-next)
$ git merge sound-asoc/for-next
Merge made by the 'recursive' strategy.
 sound/soc/codecs/ak4458.c | 18 +++++++++++-------
 sound/soc/codecs/cs4265.c |  2 +-
 sound/soc/soc-pcm.c       |  3 ++-
 sound/soc/sof/Kconfig     |  8 ++++++--
 sound/soc/sof/ipc.c       |  2 +-
 sound/soc/sof/loader.c    |  2 ++
 6 files changed, 23 insertions(+), 12 deletions(-)
Merging modules/modules-next (dadec066d8fa module: add stubs for within_module functions)
$ git merge modules/modules-next
Auto-merging kernel/module.c
Auto-merging include/linux/module.h
CONFLICT (content): Merge conflict in include/linux/module.h
Auto-merging include/asm-generic/vmlinux.lds.h
Resolved 'include/linux/module.h' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master dcd314b57e93] Merge remote-tracking branch 'modules/modules-next'
$ git diff -M --stat --summary HEAD^..
 include/asm-generic/vmlinux.lds.h |  1 -
 include/linux/module.h            | 12 ++++++++++++
 kernel/module-internal.h          |  2 +-
 kernel/module.c                   | 21 ++++++++++++++-------
 4 files changed, 27 insertions(+), 9 deletions(-)
Merging input/next (7f7a0208369f Merge tag 'ib-mfd-gpio-input-leds-power-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into next)
$ git merge input/next
Auto-merging drivers/leds/Makefile
Auto-merging drivers/leds/Kconfig
Auto-merging drivers/gpio/Makefile
Auto-merging drivers/gpio/Kconfig
Auto-merging MAINTAINERS
CONFLICT (content): Merge conflict in MAINTAINERS
Resolved 'MAINTAINERS' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 0e0b9cb7796a] Merge remote-tracking branch 'input/next'
$ git diff -M --stat --summary HEAD^..
 .../devicetree/bindings/input/max77650-onkey.txt   |  26 ++
 .../devicetree/bindings/leds/leds-max77650.txt     |  57 ++++
 Documentation/devicetree/bindings/mfd/max77650.txt |  46 +++
 .../bindings/power/supply/max77650-charger.txt     |  28 ++
 MAINTAINERS                                        |  14 +
 drivers/gpio/Kconfig                               |   7 +
 drivers/gpio/Makefile                              |   1 +
 drivers/gpio/gpio-max77650.c                       | 190 +++++++++++
 drivers/input/misc/Kconfig                         |   9 +
 drivers/input/misc/Makefile                        |   1 +
 drivers/input/misc/max77650-onkey.c                | 121 +++++++
 drivers/leds/Kconfig                               |   6 +
 drivers/leds/Makefile                              |   1 +
 drivers/leds/leds-max77650.c                       | 147 ++++++++
 drivers/mfd/Kconfig                                |  14 +
 drivers/mfd/Makefile                               |   1 +
 drivers/mfd/max77650.c                             | 232 +++++++++++++
 drivers/mfd/mfd-core.c                             |  13 +
 drivers/power/supply/Kconfig                       |   7 +
 drivers/power/supply/Makefile                      |   1 +
 drivers/power/supply/max77650-charger.c            | 368 +++++++++++++++++++++
 include/linux/mfd/max77650.h                       |  59 ++++
 22 files changed, 1349 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/input/max77650-onkey.txt
 create mode 100644 Documentation/devicetree/bindings/leds/leds-max77650.txt
 create mode 100644 Documentation/devicetree/bindings/mfd/max77650.txt
 create mode 100644 Documentation/devicetree/bindings/power/supply/max77650-charger.txt
 create mode 100644 drivers/gpio/gpio-max77650.c
 create mode 100644 drivers/input/misc/max77650-onkey.c
 create mode 100644 drivers/leds/leds-max77650.c
 create mode 100644 drivers/mfd/max77650.c
 create mode 100644 drivers/power/supply/max77650-charger.c
 create mode 100644 include/linux/mfd/max77650.h
Merging block/for-next (e35d0b782065 Merge branch 'for-5.2/block-post' into for-next)
$ git merge block/for-next
Merge made by the 'recursive' strategy.
 drivers/ata/sata_rcar.c          |   1 -
 drivers/block/brd.c              |   6 +
 drivers/lightnvm/core.c          |  82 +++++---
 drivers/lightnvm/pblk-cache.c    |   8 +-
 drivers/lightnvm/pblk-core.c     |  65 ++++---
 drivers/lightnvm/pblk-gc.c       |  52 +++---
 drivers/lightnvm/pblk-init.c     |  65 +++----
 drivers/lightnvm/pblk-map.c      |   1 +
 drivers/lightnvm/pblk-rb.c       |  13 +-
 drivers/lightnvm/pblk-read.c     | 394 +++++++++++----------------------------
 drivers/lightnvm/pblk-recovery.c |  74 +++++---
 drivers/lightnvm/pblk-write.c    |   1 +
 drivers/lightnvm/pblk.h          |  28 +--
 drivers/nvme/host/lightnvm.c     |   1 +
 drivers/s390/block/dasd_eckd.c   |   2 +-
 include/linux/lightnvm.h         |   2 +
 16 files changed, 333 insertions(+), 462 deletions(-)
Merging device-mapper/for-next (05d6909ea9d6 dm integrity: whitespace, coding style and dead code cleanup)
$ git merge device-mapper/for-next
Auto-merging drivers/md/dm-integrity.c
Auto-merging drivers/md/dm-exception-store.h
Auto-merging drivers/md/dm-crypt.c
Merge made by the 'recursive' strategy.
 Documentation/device-mapper/dm-dust.txt          | 272 +++++++++
 Documentation/device-mapper/dm-integrity.txt     |  32 +-
 drivers/md/Kconfig                               |   9 +
 drivers/md/Makefile                              |   1 +
 drivers/md/dm-cache-metadata.c                   |   9 +-
 drivers/md/dm-crypt.c                            |   8 +-
 drivers/md/dm-delay.c                            |   3 +-
 drivers/md/dm-dust.c                             | 515 ++++++++++++++++
 drivers/md/dm-exception-store.h                  |   3 +-
 drivers/md/dm-init.c                             |   8 +-
 drivers/md/dm-integrity.c                        | 717 ++++++++++++++++++++---
 drivers/md/dm-mpath.c                            |  19 +-
 drivers/md/dm-rq.c                               |   8 +-
 drivers/md/dm-snap.c                             | 359 ++++++++----
 drivers/md/dm-target.c                           |   3 +-
 drivers/md/dm-thin-metadata.c                    | 139 +++--
 drivers/md/dm-writecache.c                       |  29 +-
 drivers/md/dm-zoned-metadata.c                   |   5 +
 drivers/md/dm-zoned-target.c                     |   3 +-
 drivers/md/dm.c                                  |   6 +-
 drivers/md/persistent-data/dm-space-map-common.c |   2 +
 include/linux/device-mapper.h                    |   3 +-
 include/linux/list.h                             |   2 +-
 include/linux/list_bl.h                          |  26 +
 24 files changed, 1895 insertions(+), 286 deletions(-)
 create mode 100644 Documentation/device-mapper/dm-dust.txt
 create mode 100644 drivers/md/dm-dust.c
Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges)
$ git merge pcmcia/pcmcia-next
Already up to date.
Merging mmc/next (0a49a619e7e1 mmc: sdhci-pci: Fix BYT OCP setting)
$ git merge mmc/next
Already up to date.
Merging kgdb/kgdb-next (3bd67b37e350 kdb: print real address of pointers instead of hashed addresses)
$ git merge kgdb/kgdb-next
Auto-merging kernel/debug/kdb/kdb_support.c
Auto-merging kernel/debug/kdb/kdb_main.c
Auto-merging kernel/debug/kdb/kdb_bt.c
CONFLICT (content): Merge conflict in kernel/debug/kdb/kdb_bt.c
Resolved 'kernel/debug/kdb/kdb_bt.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 85ef6c3cd3f9] Merge remote-tracking branch 'kgdb/kgdb-next'
$ git diff -M --stat --summary HEAD^..
Merging md/for-next (e820d55cb99d md: fix raid10 hang issue caused by barrier)
$ git merge md/for-next
Already up to date.
Merging mfd/for-mfd-next (3834d6ed8892 mfd: Use dev_get_drvdata() directly)
$ git merge mfd/for-mfd-next
Auto-merging drivers/video/fbdev/Kconfig
Auto-merging drivers/staging/olpc_dcon/Kconfig
Auto-merging drivers/platform/chrome/cros_ec_proto.c
Auto-merging drivers/pinctrl/Makefile
Auto-merging drivers/pinctrl/Kconfig
Auto-merging drivers/mfd/intel-lpss.c
Auto-merging drivers/gpu/drm/nouveau/Kconfig
Auto-merging drivers/gpu/drm/Kconfig
Auto-merging arch/unicore32/Kconfig
Auto-merging arch/arm64/configs/defconfig
Auto-merging arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
Auto-merging arch/arm/configs/socfpga_defconfig
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../bindings/arm/altera/socfpga-system.txt         |  12 +
 .../devicetree/bindings/arm/stm32/stm32-syscon.txt |   2 +
 .../devicetree/bindings/mfd/atmel-hlcdc.txt        |   1 +
 .../devicetree/bindings/mfd/cirrus,lochnagar.txt   |  17 +
 Documentation/devicetree/bindings/mfd/max77620.txt |   9 +-
 Documentation/devicetree/bindings/mfd/stmfx.txt    |  28 +
 Documentation/devicetree/bindings/mfd/ti-lmu.txt   |   4 +-
 .../devicetree/bindings/pinctrl/pinctrl-stmfx.txt  | 116 +++
 MAINTAINERS                                        |   6 +
 arch/arm/configs/socfpga_defconfig                 |   1 +
 arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi  |   2 +-
 arch/arm64/configs/defconfig                       |   1 +
 arch/unicore32/Kconfig                             |   1 -
 drivers/gpu/drm/Kconfig                            |   2 -
 drivers/gpu/drm/bridge/Kconfig                     |   1 -
 drivers/gpu/drm/fsl-dcu/Kconfig                    |   1 -
 drivers/gpu/drm/i915/Kconfig                       |   1 -
 drivers/gpu/drm/nouveau/Kconfig                    |   2 -
 drivers/gpu/drm/shmobile/Kconfig                   |   1 -
 drivers/gpu/drm/tilcdc/Kconfig                     |   1 -
 drivers/mfd/Kconfig                                |  85 ++-
 drivers/mfd/Makefile                               |   3 +-
 drivers/mfd/ab8500-debugfs.c                       |   2 +-
 drivers/mfd/altera-sysmgr.c                        | 211 ++++++
 drivers/mfd/atmel-hlcdc.c                          |   1 +
 drivers/mfd/axp20x-i2c.c                           |   2 +
 drivers/mfd/axp20x.c                               |  16 +
 drivers/mfd/cros_ec.c                              |  39 +-
 drivers/mfd/cros_ec_dev.c                          |  36 +-
 drivers/mfd/cs47l35-tables.c                       |   2 +
 drivers/mfd/cs47l90-tables.c                       |   2 +
 drivers/mfd/da9063-core.c                          |  28 +-
 drivers/mfd/da9063-i2c.c                           |  10 +-
 drivers/mfd/da9063-irq.c                           |  10 +-
 drivers/mfd/intel-lpss-pci.c                       |  13 +
 drivers/mfd/intel-lpss.c                           |   3 +
 drivers/mfd/intel_quark_i2c_gpio.c                 |  10 -
 drivers/mfd/intel_soc_pmic_chtwc.c                 |   1 +
 drivers/mfd/max77620.c                             |  87 ++-
 drivers/mfd/rk808.c                                |   9 -
 drivers/mfd/sec-core.c                             |  59 +-
 drivers/mfd/sec-irq.c                              |   3 +
 drivers/mfd/ssbi.c                                 |   6 +-
 drivers/mfd/stmfx.c                                | 545 ++++++++++++++
 drivers/mfd/sun6i-prcm.c                           |   3 +-
 drivers/mfd/syscon.c                               |  19 +
 drivers/mfd/t7l66xb.c                              |  12 +-
 drivers/mfd/tc6387xb.c                             |  12 +-
 drivers/mfd/tc6393xb.c                             |  23 +-
 drivers/mfd/tps65912-spi.c                         |   1 +
 drivers/mfd/twl6040.c                              |  13 +-
 .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c    |   5 +-
 drivers/pinctrl/Kconfig                            |  14 +
 drivers/pinctrl/Makefile                           |   1 +
 drivers/pinctrl/pinctrl-stmfx.c                    | 819 +++++++++++++++++++++
 drivers/platform/chrome/cros_ec_proto.c            |   6 +
 drivers/staging/olpc_dcon/Kconfig                  |   1 -
 drivers/usb/misc/Kconfig                           |   1 -
 drivers/video/backlight/Kconfig                    |  10 +-
 drivers/video/fbdev/Kconfig                        |   5 -
 include/linux/mfd/altera-sysmgr.h                  |  29 +
 include/linux/mfd/cros_ec.h                        |   5 +
 include/linux/mfd/cros_ec_commands.h               |  91 ++-
 include/linux/mfd/da9063/core.h                    |   7 +-
 include/linux/mfd/da9063/registers.h               |  13 +-
 include/linux/mfd/max77620.h                       |   5 +-
 include/linux/mfd/stmfx.h                          | 123 ++++
 include/linux/mfd/syscon/atmel-matrix.h            |   6 +-
 include/linux/mfd/syscon/atmel-mc.h                |   6 +-
 include/linux/mfd/syscon/atmel-smc.h               |   5 +-
 include/linux/mfd/syscon/atmel-st.h                |   6 +-
 include/linux/mfd/syscon/imx6q-iomuxc-gpr.h        |   9 +
 72 files changed, 2398 insertions(+), 244 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mfd/stmfx.txt
 create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-stmfx.txt
 create mode 100644 drivers/mfd/altera-sysmgr.c
 create mode 100644 drivers/mfd/stmfx.c
 create mode 100644 drivers/pinctrl/pinctrl-stmfx.c
 create mode 100644 include/linux/mfd/altera-sysmgr.h
 create mode 100644 include/linux/mfd/stmfx.h
Merging backlight/for-backlight-next (53fa0f87177d backlight: lm3630a: Add firmware node support)
$ git merge backlight/for-backlight-next
Auto-merging drivers/video/backlight/Kconfig
Merge made by the 'recursive' strategy.
 .../bindings/leds/backlight/lm3630a-backlight.yaml | 129 +++++++++++++++++
 drivers/video/backlight/Kconfig                    |  25 ++--
 drivers/video/backlight/lm3630a_bl.c               | 153 ++++++++++++++++++++-
 include/linux/platform_data/lm3630a_bl.h           |   4 +
 4 files changed, 291 insertions(+), 20 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/leds/backlight/lm3630a-backlight.yaml
Merging battery/for-next (c8f3c9fe83ca power: supply: ucs1002: Fix build error without CONFIG_REGULATOR)
$ git merge battery/for-next
Auto-merging drivers/power/supply/power_supply_sysfs.c
Auto-merging drivers/power/supply/Makefile
Auto-merging drivers/power/supply/Kconfig
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-class-power        |  51 +-
 .../devicetree/bindings/arm/atmel-sysregs.txt      |   5 +-
 .../bindings/power/reset/syscon-reboot.txt         |  11 +-
 .../bindings/power/supply/axp20x_usb_power.txt     |   1 +
 .../bindings/power/supply/gpio-charger.txt         |   8 +-
 .../bindings/power/supply/ingenic,battery.txt      |  31 +
 .../{ltc3651-charger.txt => lt3651-charger.txt}    |  10 +-
 .../bindings/power/supply/microchip,ucs1002.txt    |  27 +
 .../bindings/power/supply/olpc_battery.txt         |   2 +-
 arch/x86/platform/olpc/olpc_dt.c                   | 101 +++-
 drivers/iio/inkern.c                               |  22 +-
 drivers/power/reset/at91-sama5d2_shdwc.c           |  25 +
 drivers/power/reset/syscon-reboot.c                |  19 +-
 drivers/power/supply/Kconfig                       |  29 +-
 drivers/power/supply/Makefile                      |   4 +-
 drivers/power/supply/ab8500_bmdata.c               |   1 +
 drivers/power/supply/axp20x_usb_power.c            | 179 +++++-
 drivers/power/supply/axp288_charger.c              |   4 +
 drivers/power/supply/axp288_fuel_gauge.c           |  20 +
 drivers/power/supply/bq27xxx_battery.c             |   3 +-
 drivers/power/supply/charger-manager.c             |   3 +
 drivers/power/supply/cpcap-battery.c               |  44 +-
 drivers/power/supply/cpcap-charger.c               |   5 +-
 drivers/power/supply/gpio-charger.c                |  57 +-
 drivers/power/supply/ingenic-battery.c             | 184 ++++++
 .../supply/{ltc3651-charger.c => lt3651-charger.c} | 123 ++--
 drivers/power/supply/max14656_charger_detector.c   |  27 +-
 drivers/power/supply/olpc_battery.c                | 169 ++++--
 drivers/power/supply/power_supply_core.c           |  38 +-
 drivers/power/supply/power_supply_sysfs.c          |   6 +-
 drivers/power/supply/ucs1002_power.c               | 646 +++++++++++++++++++++
 include/linux/iio/consumer.h                       |  14 +
 include/linux/power_supply.h                       |  11 +-
 33 files changed, 1610 insertions(+), 270 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/power/supply/ingenic,battery.txt
 rename Documentation/devicetree/bindings/power/supply/{ltc3651-charger.txt => lt3651-charger.txt} (71%)
 create mode 100644 Documentation/devicetree/bindings/power/supply/microchip,ucs1002.txt
 create mode 100644 drivers/power/supply/ingenic-battery.c
 rename drivers/power/supply/{ltc3651-charger.c => lt3651-charger.c} (50%)
 create mode 100644 drivers/power/supply/ucs1002_power.c
Merging regulator/for-next (e2a23affe6a6 Merge branch 'regulator-5.2' into regulator-next)
$ git merge regulator/for-next
Already up to date.
Merging security/next-testing (5664f5faac11 Merge branch 'next-smack' into next-testing)
$ git merge security/next-testing
Auto-merging security/keys/trusted.c
Merge made by the 'recursive' strategy.
Merging apparmor/apparmor-next (06c13f554a71 apparmor: re-introduce a variant of PROFILE_MEDIATES_SAFE)
$ git merge apparmor/apparmor-next
Auto-merging security/apparmor/apparmorfs.c
Merge made by the 'recursive' strategy.
 security/apparmor/Kconfig                 |   2 +
 security/apparmor/apparmorfs.c            | 132 ++++++++++++++++++++++++++++--
 security/apparmor/include/apparmor.h      |   1 +
 security/apparmor/include/policy.h        |   8 ++
 security/apparmor/include/policy_unpack.h |   8 +-
 security/apparmor/lsm.c                   |  47 +++++++++++
 security/apparmor/policy.c                |   5 +-
 security/apparmor/policy_unpack.c         | 116 +++++++++++++++++++++++++-
 8 files changed, 305 insertions(+), 14 deletions(-)
Merging integrity/next-integrity (a2ffe5774e8e selftests/kexec: update get_secureboot_mode)
$ git merge integrity/next-integrity
Auto-merging tools/testing/selftests/kexec/Makefile
Auto-merging tools/testing/selftests/Makefile
Merge made by the 'recursive' strategy.
Merging selinux/next (35a196bef449 proc: prevent changes to overridden credentials)
$ git merge selinux/next
Already up to date.
Merging tpmdd/next (ff89e2f4b34d tpm: Actually fail on TPM errors during "get random")
$ git merge tpmdd/next
Auto-merging security/keys/trusted.c
Merge made by the 'recursive' strategy.
 drivers/char/tpm/tpm1-cmd.c | 7 +++++--
 drivers/char/tpm/tpm2-cmd.c | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)
Merging watchdog/master (a9f0bda567e3 watchdog: Enforce that at least one pretimeout governor is enabled)
$ git merge watchdog/master
Already up to date.
Merging iommu/next (b5531563e8a0 Merge branches 'arm/tegra', 'arm/mediatek', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next)
$ git merge iommu/next
Already up to date.
Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15)
$ git merge dwmw2-iommu/master
Already up to date.
Merging vfio/next (15c80c1659f2 vfio: Add Cornelia Huck as reviewer)
$ git merge vfio/next
Already up to date.
Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment)
$ git merge trivial/for-next
Already up to date.
Merging audit/next (70c4cf17e445 audit: fix a memory leak bug)
$ git merge audit/next
Already up to date.
Merging devicetree/for-next (2a656cb5a4a3 of: unittest: Remove error printing on OOM)
$ git merge devicetree/for-next
Already up to date.
Merging mailbox/mailbox-for-next (8fbbfd966efa mailbox: Add support for Armada 37xx rWTM mailbox)
$ git merge mailbox/mailbox-for-next
Already up to date.
Merging spi/for-next (a815ae41f5fb Merge remote-tracking branch 'spi/topic/bpw-check' into spi-next)
$ git merge spi/for-next
Merge made by the 'recursive' strategy.
 drivers/spi/spi.c       |  4 ++--
 include/linux/spi/spi.h | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)
Merging tip/auto-latest (f8d6805068ad Merge branch 'WIP.x86/fpu' into auto-latest)
$ git merge tip/auto-latest
Auto-merging include/linux/overflow.h
Auto-merging include/linux/msi.h
Auto-merging drivers/soc/ti/Kconfig
Auto-merging drivers/irqchip/irq-gic-v3-its.c
Auto-merging drivers/irqchip/irq-gic-v2m.c
Auto-merging drivers/irqchip/Makefile
Auto-merging drivers/irqchip/Kconfig
Auto-merging drivers/iommu/dma-iommu.c
Auto-merging drivers/iommu/Kconfig
Auto-merging arch/arm64/Kconfig.platforms
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/arm/keystone/ti,sci.txt    |   3 +-
 .../bindings/interrupt-controller/ti,sci-inta.txt  |  66 +++
 .../bindings/interrupt-controller/ti,sci-intr.txt  |  82 +++
 MAINTAINERS                                        |   6 +
 arch/arm64/Kconfig.platforms                       |   5 +
 arch/x86/entry/vdso/vdso2c.c                       |   3 -
 arch/x86/include/asm/vdso.h                        |   1 -
 arch/x86/kernel/kprobes/core.c                     |   2 +-
 drivers/firmware/ti_sci.c                          | 651 +++++++++++++++++++++
 drivers/firmware/ti_sci.h                          | 102 ++++
 drivers/gpio/gpio-thunderx.c                       |  16 +-
 drivers/iommu/Kconfig                              |   1 +
 drivers/iommu/dma-iommu.c                          |  48 +-
 drivers/irqchip/Kconfig                            |  27 +-
 drivers/irqchip/Makefile                           |   2 +
 drivers/irqchip/irq-bcm7038-l1.c                   |   3 +
 drivers/irqchip/irq-bcm7120-l2.c                   |   3 +
 drivers/irqchip/irq-brcmstb-l2.c                   |   2 +
 drivers/irqchip/irq-gic-pm.c                       |  76 +--
 drivers/irqchip/irq-gic-v2m.c                      |   8 +-
 drivers/irqchip/irq-gic-v3-its.c                   |  84 +--
 drivers/irqchip/irq-gic-v3-mbi.c                   |  10 +-
 drivers/irqchip/irq-imx-irqsteer.c                 |   4 +-
 drivers/irqchip/irq-ls-scfg-msi.c                  |   7 +-
 drivers/irqchip/irq-renesas-intc-irqpin.c          |   4 +-
 drivers/irqchip/irq-stm32-exti.c                   | 233 +++++---
 drivers/irqchip/irq-ti-sci-inta.c                  | 615 +++++++++++++++++++
 drivers/irqchip/irq-ti-sci-intr.c                  | 275 +++++++++
 drivers/soc/ti/Kconfig                             |   6 +
 drivers/soc/ti/Makefile                            |   1 +
 drivers/soc/ti/ti_sci_inta_msi.c                   | 146 +++++
 include/linux/dma-iommu.h                          |  24 +-
 include/linux/irq.h                                |   2 +
 include/linux/irqchip/arm-gic-v3.h                 |  12 +-
 include/linux/irqdomain.h                          |   1 +
 include/linux/msi.h                                |  36 ++
 include/linux/overflow.h                           |   8 +-
 include/linux/soc/ti/ti_sci_inta_msi.h             |  23 +
 include/linux/soc/ti/ti_sci_protocol.h             | 124 ++++
 kernel/irq/Kconfig                                 |   3 +
 kernel/irq/chip.c                                  |  27 +
 kernel/irq/irqdomain.c                             |   2 +-
 kernel/locking/rwsem-xadd.c                        |  46 +-
 43 files changed, 2549 insertions(+), 251 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt
 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.txt
 create mode 100644 drivers/irqchip/irq-ti-sci-inta.c
 create mode 100644 drivers/irqchip/irq-ti-sci-intr.c
 create mode 100644 drivers/soc/ti/ti_sci_inta_msi.c
 create mode 100644 include/linux/soc/ti/ti_sci_inta_msi.h
Merging clockevents/clockevents/next (8c9374068ef6 misc: atmel_tclib: Do not probe already used TCBs)
$ git merge clockevents/clockevents/next
Auto-merging drivers/misc/Kconfig
Auto-merging drivers/clocksource/timer-atmel-tcb.c
Auto-merging drivers/clocksource/Makefile
Auto-merging drivers/clocksource/Kconfig
Auto-merging arch/arm/mach-at91/Kconfig
Merge made by the 'recursive' strategy.
 .../bindings/timer/allwinner,sun4i-timer.txt       |   4 +-
 arch/arm/mach-at91/Kconfig                         |  23 ++++
 drivers/clocksource/Kconfig                        |  14 ++-
 drivers/clocksource/Makefile                       |   2 +-
 .../{tcb_clksrc.c => timer-atmel-tcb.c}            | 126 ++++++++++++++-------
 drivers/clocksource/timer-milbeaut.c               |  66 +++++++----
 drivers/clocksource/timer-sun4i.c                  |   5 +-
 drivers/clocksource/timer-tegra20.c                |  63 ++++-------
 drivers/misc/Kconfig                               |  24 ----
 drivers/misc/atmel_tclib.c                         |   5 +-
 drivers/pwm/pwm-atmel-tcb.c                        |   2 +-
 include/{linux/atmel_tc.h => soc/at91/atmel_tcb.h} |   4 +-
 12 files changed, 202 insertions(+), 136 deletions(-)
 rename drivers/clocksource/{tcb_clksrc.c => timer-atmel-tcb.c} (80%)
 rename include/{linux/atmel_tc.h => soc/at91/atmel_tcb.h} (99%)
Merging edac-amd/for-next (8de9930a4618 Revert "EDAC/amd64: Support more than two controllers for chip select handling")
$ git merge edac-amd/for-next
Already up to date.
Merging irqchip/irq/irqchip-next (16e32c3cde77 iommu/dma-iommu: Remove iommu_dma_map_msi_msg())
$ git merge irqchip/irq/irqchip-next
Already up to date.
Merging ftrace/for-next (03197fc02b35 tracing: kdb: Allow ftdump to skip all but the last few entries)
$ git merge ftrace/for-next
Removing tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-extended-error-support.tc
Auto-merging kernel/trace/trace_events_hist.c
Auto-merging kernel/trace/trace.h
Auto-merging kernel/trace/trace.c
Auto-merging kernel/trace/ring_buffer.c
Auto-merging kernel/trace/ftrace.c
Auto-merging kernel/rcu/tree.c
Auto-merging kernel/rcu/rcu.h
Auto-merging include/trace/events/rcu.h
Auto-merging include/linux/ftrace.h
Auto-merging Documentation/trace/histogram.rst
Auto-merging Documentation/trace/ftrace.rst
Merge made by the 'recursive' strategy.
 Documentation/trace/ftrace.rst                     |  31 ++
 Documentation/trace/histogram.rst                  |  16 +-
 arch/nds32/kernel/ftrace.c                         |   1 -
 arch/parisc/kernel/ftrace.c                        |   1 -
 include/linux/ftrace.h                             |   2 +
 include/linux/tracepoint.h                         |  15 +
 include/trace/define_trace.h                       |   8 +
 include/trace/events/rcu.h                         |  81 ++---
 include/trace/events/sched.h                       |  21 +-
 kernel/rcu/rcu.h                                   |   9 +-
 kernel/rcu/tree.c                                  |   8 +-
 kernel/trace/ftrace.c                              |   7 +-
 kernel/trace/ring_buffer.c                         |   2 +-
 kernel/trace/trace.c                               | 377 ++++++++++++++++++---
 kernel/trace/trace.h                               |  13 +-
 kernel/trace/trace_events.c                        |   1 +
 kernel/trace/trace_events_filter.c                 |  36 +-
 kernel/trace/trace_events_hist.c                   | 268 +++++++++------
 kernel/trace/trace_events_trigger.c                |   3 +-
 kernel/trace/trace_kdb.c                           |  61 ++--
 kernel/trace/trace_kprobe.c                        |  77 +++--
 kernel/trace/trace_probe.c                         | 274 ++++++++++-----
 kernel/trace/trace_probe.h                         |  77 ++++-
 kernel/trace/trace_selftest.c                      |   5 +-
 kernel/trace/trace_uprobe.c                        |  44 ++-
 .../ftrace/test.d/ftrace/tracing-error-log.tc      |  19 ++
 tools/testing/selftests/ftrace/test.d/functions    |  12 +
 .../ftrace/test.d/kprobe/kprobe_syntax_errors.tc   |  85 +++++
 .../ftrace/test.d/kprobe/uprobe_syntax_errors.tc   |  23 ++
 .../inter-event/trigger-extended-error-support.tc  |  28 --
 30 files changed, 1168 insertions(+), 437 deletions(-)
 create mode 100644 tools/testing/selftests/ftrace/test.d/ftrace/tracing-error-log.tc
 create mode 100644 tools/testing/selftests/ftrace/test.d/kprobe/kprobe_syntax_errors.tc
 create mode 100644 tools/testing/selftests/ftrace/test.d/kprobe/uprobe_syntax_errors.tc
 delete mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-extended-error-support.tc
Merging rcu/rcu/next (91df49e187c1 Merge LKMM and RCU commits)
$ git merge rcu/rcu/next
Already up to date.
Merging kvm/linux-next (3a1e5e4a2c7a Revert "KVM: doc: Document the life cycle of a VM and its resources")
$ git merge kvm/linux-next
Auto-merging virt/kvm/kvm_main.c
Auto-merging virt/kvm/arm/arm.c
Auto-merging arch/x86/kvm/x86.h
Auto-merging arch/x86/kvm/x86.c
Auto-merging arch/x86/kvm/vmx/vmx.c
Auto-merging arch/x86/kvm/vmx/nested.c
Auto-merging arch/s390/kvm/interrupt.c
Auto-merging arch/s390/kvm/Kconfig
Auto-merging Documentation/virtual/kvm/api.txt
Merge made by the 'recursive' strategy.
 Documentation/virtual/kvm/api.txt        |  22 +-----
 Documentation/virtual/kvm/devices/vm.txt |   3 +-
 arch/powerpc/kvm/powerpc.c               |   3 -
 arch/s390/include/asm/cpacf.h            |   1 +
 arch/s390/include/asm/kvm_host.h         |   2 +
 arch/s390/include/uapi/asm/kvm.h         |   5 +-
 arch/s390/kvm/Kconfig                    |   1 +
 arch/s390/kvm/interrupt.c                |  11 ++-
 arch/s390/kvm/kvm-s390.c                 | 120 +++++++++++++++++++++++++++++--
 arch/s390/kvm/vsie.c                     |  13 ++--
 arch/s390/tools/gen_facilities.c         |   3 +
 arch/x86/kvm/mtrr.c                      |  10 +--
 arch/x86/kvm/vmx/nested.c                | 111 ++++++++++++++--------------
 arch/x86/kvm/vmx/vmx.c                   |  15 ++--
 arch/x86/kvm/x86.c                       |  47 +++++++-----
 arch/x86/kvm/x86.h                       |  10 +++
 include/linux/kvm_host.h                 |  10 +++
 tools/arch/s390/include/uapi/asm/kvm.h   |   3 +-
 virt/kvm/Kconfig                         |   3 +
 virt/kvm/arm/arm.c                       |   3 -
 virt/kvm/kvm_main.c                      |   4 +-
 21 files changed, 278 insertions(+), 122 deletions(-)
Merging kvm-arm/next (9eecfc22e0bf KVM: arm64: Fix ptrauth ID register masking logic)
$ git merge kvm-arm/next
Auto-merging virt/kvm/arm/arm.c
Auto-merging arch/arm64/kvm/reset.c
Auto-merging arch/arm64/kernel/perf_event.c
Auto-merging arch/arm64/kernel/fpsimd.c
Auto-merging arch/arm64/kernel/cpufeature.c
Auto-merging arch/arm64/kernel/asm-offsets.c
Auto-merging arch/arm64/include/asm/sysreg.h
Auto-merging arch/arm64/include/asm/kvm_hyp.h
Auto-merging arch/arm64/Kconfig
Auto-merging Documentation/virtual/kvm/api.txt
Merge made by the 'recursive' strategy.
 Documentation/arm64/perf.txt                   |  85 +++++
 Documentation/arm64/pointer-authentication.txt |  22 +-
 Documentation/virtual/kvm/api.txt              | 178 +++++++++++
 arch/arm/include/asm/kvm_emulate.h             |   2 +
 arch/arm/include/asm/kvm_host.h                |  26 +-
 arch/arm64/Kconfig                             |   6 +-
 arch/arm64/include/asm/fpsimd.h                |  29 +-
 arch/arm64/include/asm/kvm_asm.h               |   3 +-
 arch/arm64/include/asm/kvm_emulate.h           |  16 +
 arch/arm64/include/asm/kvm_host.h              | 101 +++++-
 arch/arm64/include/asm/kvm_hyp.h               |   1 -
 arch/arm64/include/asm/kvm_ptrauth.h           | 111 +++++++
 arch/arm64/include/asm/sysreg.h                |   3 +
 arch/arm64/include/uapi/asm/kvm.h              |  43 +++
 arch/arm64/kernel/asm-offsets.c                |   7 +
 arch/arm64/kernel/cpufeature.c                 |   2 +-
 arch/arm64/kernel/fpsimd.c                     | 179 +++++++----
 arch/arm64/kernel/perf_event.c                 |  50 ++-
 arch/arm64/kernel/signal.c                     |   5 -
 arch/arm64/kvm/Makefile                        |   2 +-
 arch/arm64/kvm/fpsimd.c                        |  17 +-
 arch/arm64/kvm/guest.c                         | 415 +++++++++++++++++++++++--
 arch/arm64/kvm/handle_exit.c                   |  36 ++-
 arch/arm64/kvm/hyp/entry.S                     |  15 +
 arch/arm64/kvm/hyp/switch.c                    |  80 ++++-
 arch/arm64/kvm/pmu.c                           | 239 ++++++++++++++
 arch/arm64/kvm/reset.c                         | 167 +++++++++-
 arch/arm64/kvm/sys_regs.c                      | 183 +++++++++--
 arch/arm64/kvm/sys_regs.h                      |  25 ++
 include/uapi/linux/kvm.h                       |   7 +
 virt/kvm/arm/arm.c                             |  40 ++-
 31 files changed, 1914 insertions(+), 181 deletions(-)
 create mode 100644 Documentation/arm64/perf.txt
 create mode 100644 arch/arm64/include/asm/kvm_ptrauth.h
 create mode 100644 arch/arm64/kvm/pmu.c
Merging kvm-ppc/kvm-ppc-next (0caecf5b0019 KVM: PPC: Book3S HV: XIVE: Clear escalation interrupt pointers on device close)
$ git merge kvm-ppc/kvm-ppc-next
Auto-merging virt/kvm/kvm_main.c
Auto-merging include/uapi/linux/kvm.h
CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h
Auto-merging include/linux/kvm_host.h
Auto-merging arch/powerpc/kvm/powerpc.c
Auto-merging arch/powerpc/kvm/book3s_hv_rmhandlers.S
Auto-merging Documentation/virtual/kvm/api.txt
Resolved 'include/uapi/linux/kvm.h' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 3d6568692cd3] Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
$ git diff -M --stat --summary HEAD^..
 Documentation/virtual/kvm/api.txt          |   10 +
 Documentation/virtual/kvm/devices/xive.txt |  197 +++++
 arch/powerpc/include/asm/kvm_host.h        |   11 +-
 arch/powerpc/include/asm/kvm_ppc.h         |   41 +-
 arch/powerpc/include/asm/xive.h            |    3 +
 arch/powerpc/include/uapi/asm/kvm.h        |   46 +
 arch/powerpc/kvm/Makefile                  |    2 +-
 arch/powerpc/kvm/book3s.c                  |   42 +-
 arch/powerpc/kvm/book3s_64_vio.c           |   96 ++-
 arch/powerpc/kvm/book3s_64_vio_hv.c        |  105 ++-
 arch/powerpc/kvm/book3s_hv.c               |  152 ++--
 arch/powerpc/kvm/book3s_hv_builtin.c       |   57 ++
 arch/powerpc/kvm/book3s_hv_rm_mmu.c        |  144 ++++
 arch/powerpc/kvm/book3s_hv_rmhandlers.S    |   80 +-
 arch/powerpc/kvm/book3s_xive.c             |  250 ++++--
 arch/powerpc/kvm/book3s_xive.h             |   37 +
 arch/powerpc/kvm/book3s_xive_native.c      | 1249 ++++++++++++++++++++++++++++
 arch/powerpc/kvm/book3s_xive_template.c    |   78 +-
 arch/powerpc/kvm/powerpc.c                 |   37 +
 arch/powerpc/sysdev/xive/native.c          |   11 +
 include/linux/kvm_host.h                   |   10 +
 include/uapi/linux/kvm.h                   |    3 +
 virt/kvm/kvm_main.c                        |   24 +
 23 files changed, 2420 insertions(+), 265 deletions(-)
 create mode 100644 Documentation/virtual/kvm/devices/xive.txt
 create mode 100644 arch/powerpc/kvm/book3s_xive_native.c
Merging kvms390/next (b2d0371d2e37 KVM: s390: vsie: Return correct values for Invalid CRYCB format)
$ git merge kvms390/next
Already up to date.
Merging xen-tip/linux-next (fe846979d305 xen/arm: Use p2m entry with lock protection)
$ git merge xen-tip/linux-next
Auto-merging drivers/net/xen-netfront.c
Auto-merging Documentation/admin-guide/kernel-parameters.txt
Merge made by the 'recursive' strategy.
 Documentation/admin-guide/kernel-parameters.txt |  7 +++++++
 arch/arm/xen/p2m.c                              |  4 +++-
 arch/x86/platform/pvh/enlighten.c               |  8 ++++----
 arch/x86/xen/efi.c                              | 12 ++++++------
 arch/x86/xen/enlighten_pv.c                     |  2 +-
 arch/x86/xen/enlighten_pvh.c                    |  7 ++++++-
 arch/x86/xen/time.c                             | 20 +++++++++++++++++---
 arch/x86/xen/xen-ops.h                          |  4 ++--
 drivers/xen/xen-pciback/xenbus.c                |  2 +-
 drivers/xen/xenbus/xenbus_dev_frontend.c        |  2 --
 10 files changed, 47 insertions(+), 21 deletions(-)
Merging percpu/for-next (558ac86039fc Merge branch 'for-5.3' into for-next)
$ git merge percpu/for-next
Auto-merging lib/percpu-refcount.c
Auto-merging fs/io_uring.c
Auto-merging drivers/md/md.c
Merge made by the 'recursive' strategy.
 drivers/md/md.c                 |  3 ++-
 fs/io_uring.c                   |  3 ++-
 include/linux/percpu-refcount.h | 10 +++++++++-
 lib/percpu-refcount.c           | 13 +++++++++++--
 4 files changed, 24 insertions(+), 5 deletions(-)
Merging workqueues/for-next (24acfb718225 workqueue: Use normal rcu)
$ git merge workqueues/for-next
Already up to date.
Merging drivers-x86/for-next (6456fd731517 platform/x86: Add support for Basin Cove power button)
$ git merge drivers-x86/for-next
Already up to date.
Merging chrome-platform/for-next (28f808702156 platform/chrome: cros_ec_spi: Always add of_match_table)
$ git merge chrome-platform/for-next
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/debugfs-wilco-ec        |  16 +-
 Documentation/ABI/testing/sysfs-platform-wilco-ec |   9 +
 drivers/platform/chrome/Kconfig                   |  13 +
 drivers/platform/chrome/Makefile                  |   1 +
 drivers/platform/chrome/cros_ec_ishtp.c           | 763 ++++++++++++++++++++++
 drivers/platform/chrome/cros_ec_spi.c             |   2 +-
 drivers/platform/chrome/wilco_ec/Makefile         |   2 +-
 drivers/platform/chrome/wilco_ec/core.c           |  13 +-
 drivers/platform/chrome/wilco_ec/debugfs.c        |  10 +-
 drivers/platform/chrome/wilco_ec/mailbox.c        |  21 +-
 drivers/platform/chrome/wilco_ec/properties.c     | 132 ++++
 drivers/platform/chrome/wilco_ec/sysfs.c          |  77 +++
 include/linux/platform_data/wilco-ec.h            |  92 ++-
 13 files changed, 1106 insertions(+), 45 deletions(-)
 create mode 100644 Documentation/ABI/testing/sysfs-platform-wilco-ec
 create mode 100644 drivers/platform/chrome/cros_ec_ishtp.c
 create mode 100644 drivers/platform/chrome/wilco_ec/properties.c
 create mode 100644 drivers/platform/chrome/wilco_ec/sysfs.c
Merging hsi/for-next (1ff85bfa1614 HSI: omap_ssi_port: fix debugfs_simple_attr.cocci warnings)
$ git merge hsi/for-next
Already up to date.
Merging leds/for-next (0db37915d912 leds: avoid races with workqueue)
$ git merge leds/for-next
Already up to date.
Merging ipmi/for-next (a2d635decbfa Merge tag 'drm-next-2019-05-09' of git://anongit.freedesktop.org/drm/drm)
$ git merge ipmi/for-next
Already up to date.
Merging driver-core/driver-core-next (d7a02fa0a8f9 Merge tag 'upstream-5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/rw/ubifs)
$ git merge driver-core/driver-core-next
Already up to date.
Merging usb/usb-next (d7a02fa0a8f9 Merge tag 'upstream-5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/rw/ubifs)
$ git merge usb/usb-next
Already up to date.
Merging usb-gadget/next (2e487d280525 usb: dwc3: Rename DWC3_DCTL_LPM_ERRATA)
$ git merge usb-gadget/next
Already up to date.
Merging usb-serial/usb-next (7f6fc50242d1 USB: serial: f81232: implement break control)
$ git merge usb-serial/usb-next
Already up to date.
Merging usb-chipidea-next/ci-for-usb-next (bc65fae4b1f0 usb: chipidea: imx: set power polarity)
$ git merge usb-chipidea-next/ci-for-usb-next
Auto-merging drivers/usb/chipidea/ci_hdrc_imx.c
Merge made by the 'recursive' strategy.
Merging phy-next/next (708310711e6c dt-bindings: phy-qcom-qmp: Tweak qcom,msm8998-qmp-ufs-phy)
$ git merge phy-next/next
Already up to date.
Merging tty/tty-next (d7a02fa0a8f9 Merge tag 'upstream-5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/rw/ubifs)
$ git merge tty/tty-next
Already up to date.
Merging char-misc/char-misc-next (d7a02fa0a8f9 Merge tag 'upstream-5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/rw/ubifs)
$ git merge char-misc/char-misc-next
Already up to date.
Merging extcon/extcon-next (00053de52231 extcon: arizona: Disable mic detect if running when driver is removed)
$ git merge extcon/extcon-next
Already up to date.
Merging soundwire/next (4abbd783d126 soundwire: intel: fix implicit header use of module.h/export.h)
$ git merge soundwire/next
Already up to date.
Merging thunderbolt/next (37209783c73a thunderbolt: Make priority unsigned in struct tb_path)
$ git merge thunderbolt/next
Already up to date.
Merging staging/staging-next (d7a02fa0a8f9 Merge tag 'upstream-5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/rw/ubifs)
$ git merge staging/staging-next
Already up to date.
Merging mux/for-next (561eb7335f13 Merge branch 'i2c-mux/for-next' into for-next)
$ git merge mux/for-next
Auto-merging drivers/i2c/muxes/i2c-demux-pinctrl.c
Removing Documentation/devicetree/bindings/mux/mmio-mux.txt
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/mux/mmio-mux.txt |  60 ----------
 Documentation/devicetree/bindings/mux/reg-mux.txt  | 129 +++++++++++++++++++++
 drivers/mux/Kconfig                                |  12 +-
 drivers/mux/mmio.c                                 |   6 +-
 4 files changed, 140 insertions(+), 67 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/mux/mmio-mux.txt
 create mode 100644 Documentation/devicetree/bindings/mux/reg-mux.txt
Merging icc/icc-next (83fdb2dfb0c2 interconnect: convert to DEFINE_SHOW_ATTRIBUTE)
$ git merge icc/icc-next
Already up to date.
Merging slave-dma/next (f33e7bb3eb92 dmaengine: tegra210-adma: restore channel status)
$ git merge slave-dma/next
Already up to date.
Merging cgroup/for-next (2781a652edd4 Merge branch 'for-5.2' into for-next)
$ git merge cgroup/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging scsi/for-next (7004db783df5 Merge branch 'misc' into for-next)
$ git merge scsi/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging scsi-mkp/for-next (d4023db71108 scsi: qla2xxx: Avoid that lockdep complains about unsafe locking in tcm_qla2xxx_close_session())
$ git merge scsi-mkp/for-next
Already up to date.
Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker)
$ git merge target-updates/for-next
Already up to date.
Merging target-bva/for-next (60cc43fc8884 Linux 4.17-rc1)
$ git merge target-bva/for-next
Already up to date.
Merging vhost/linux-next (aa32fb4804f7 iommu/virtio: Add event queue)
$ git merge vhost/linux-next
Auto-merging drivers/s390/virtio/virtio_ccw.c
Auto-merging drivers/pci/of.c
CONFLICT (content): Merge conflict in drivers/pci/of.c
Auto-merging drivers/of/base.c
Auto-merging drivers/iommu/Kconfig
Auto-merging MAINTAINERS
Resolved 'drivers/pci/of.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 3de5a15804dd] Merge remote-tracking branch 'vhost/linux-next'
$ git diff -M --stat --summary HEAD^..
 Documentation/devicetree/bindings/virtio/iommu.txt |   66 ++
 Documentation/devicetree/bindings/virtio/mmio.txt  |   30 +
 MAINTAINERS                                        |    7 +
 drivers/iommu/Kconfig                              |   11 +
 drivers/iommu/Makefile                             |    1 +
 drivers/iommu/virtio-iommu.c                       | 1158 ++++++++++++++++++++
 drivers/of/base.c                                  |   10 +-
 drivers/pci/of.c                                   |    6 +
 drivers/s390/virtio/virtio_ccw.c                   |   52 +-
 drivers/vhost/scsi.c                               |    1 -
 drivers/virtio/virtio_ring.c                       |   28 +-
 include/linux/virtio.h                             |   17 -
 include/uapi/linux/virtio_ids.h                    |    1 +
 include/uapi/linux/virtio_iommu.h                  |  161 +++
 tools/virtio/ringtest/ptr_ring.c                   |    1 -
 15 files changed, 1488 insertions(+), 62 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/virtio/iommu.txt
 create mode 100644 drivers/iommu/virtio-iommu.c
 create mode 100644 include/uapi/linux/virtio_iommu.h
Merging rpmsg/for-next (6e9b4f32f9fa Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
$ git merge rpmsg/for-next
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/soc/qcom/qcom,glink.txt | 5 +++++
 drivers/rpmsg/rpmsg_core.c                                | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)
Merging gpio/for-next (0fbee1df2078 gpio: Update documentation)
$ git merge gpio/for-next
Already up to date.
Merging gpio-brgl/gpio/for-next (b0d2569d8276 gpio: mlxbf: remove unused including <linux/version.h>)
$ git merge gpio-brgl/gpio/for-next
Already up to date.
Merging pinctrl/for-next (e0e31695b53b pinctrl: mcp23s08: Do not complain about unsupported params)
$ git merge pinctrl/for-next
Already up to date.
Merging pinctrl-samsung/for-next (9e98c678c2d6 Linux 5.1-rc1)
$ git merge pinctrl-samsung/for-next
Already up to date.
Merging pwm/for-next (f41efceb46e6 pwm: meson: Add clock source configuration for Meson G12A)
$ git merge pwm/for-next
Already up to date.
Merging userns/for-next (cf43a757fd49 signal: Restore the stop PTRACE_EVENT_EXIT)
$ git merge userns/for-next
Already up to date.
Merging ktest/for-next (37e1677330bd ktest: introduce REBOOT_RETURN_CODE to confirm the result of REBOOT)
$ git merge ktest/for-next
Already up to date.
Merging random/dev (b7d5dc21072c random: add a spinlock_t to struct batched_entropy)
$ git merge random/dev
Already up to date.
Merging kselftest/next (27d79a2b2bf0 selftests: fix bpf build/test workflow regression when KBUILD_OUTPUT is set)
$ git merge kselftest/next
Auto-merging tools/testing/selftests/rseq/rseq-s390.h
CONFLICT (content): Merge conflict in tools/testing/selftests/rseq/rseq-s390.h
Resolved 'tools/testing/selftests/rseq/rseq-s390.h' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master a4e359c24b63] Merge remote-tracking branch 'kselftest/next'
$ git diff -M --stat --summary HEAD^..
 tools/testing/selftests/.gitignore                 |   1 -
 tools/testing/selftests/Makefile                   |  34 ++-
 .../selftests/breakpoints/breakpoint_test.c        |  15 +-
 .../selftests/breakpoints/breakpoint_test_arm64.c  |   3 +-
 .../breakpoints/step_after_suspend_test.c          |   8 +
 tools/testing/selftests/capabilities/test_execve.c |   6 +-
 .../selftests/futex/functional/futex_requeue_pi.c  |   1 +
 .../functional/futex_requeue_pi_mismatched_ops.c   |   1 +
 .../functional/futex_requeue_pi_signal_restart.c   |   1 +
 .../functional/futex_wait_private_mapped_file.c    |   1 +
 .../futex/functional/futex_wait_timeout.c          |   1 +
 .../functional/futex_wait_uninitialized_heap.c     |   1 +
 .../futex/functional/futex_wait_wouldblock.c       |   1 +
 tools/testing/selftests/kselftest.h                |  17 +-
 tools/testing/selftests/kselftest/prefix.pl        |  23 ++
 tools/testing/selftests/kselftest/runner.sh        |  86 +++++++
 tools/testing/selftests/lib.mk                     |  76 ++----
 .../testing/selftests/membarrier/membarrier_test.c |   1 +
 tools/testing/selftests/pidfd/pidfd_test.c         |   1 +
 tools/testing/selftests/rseq/Makefile              |   8 +-
 tools/testing/selftests/rseq/rseq-arm.h            | 132 +++++++++--
 tools/testing/selftests/rseq/rseq-arm64.h          |  74 +++++-
 tools/testing/selftests/rseq/rseq-mips.h           | 115 ++++++++-
 tools/testing/selftests/rseq/rseq-ppc.h            |  90 ++++++-
 tools/testing/selftests/rseq/rseq-s390.h           |  69 +++++-
 tools/testing/selftests/rseq/rseq-x86.h            | 264 ++++++++++++++-------
 tools/testing/selftests/rseq/rseq.c                |  55 ++++-
 tools/testing/selftests/rseq/rseq.h                |   1 +
 tools/testing/selftests/sigaltstack/sas.c          |   1 +
 tools/testing/selftests/sync/sync_test.c           |   1 +
 30 files changed, 869 insertions(+), 219 deletions(-)
 create mode 100755 tools/testing/selftests/kselftest/prefix.pl
 create mode 100644 tools/testing/selftests/kselftest/runner.sh
Merging y2038/y2038 (a2318b6a16a8 riscv: Use latest system call ABI)
$ git merge y2038/y2038
Auto-merging arch/riscv/kernel/vdso/Makefile
Auto-merging arch/riscv/Kconfig
Merge made by the 'recursive' strategy.
Merging livepatching/for-next (591be2f7f7b5 Merge branch 'for-5.2/core' into for-next)
$ git merge livepatching/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging coresight/next (78e6427b4e7b coresight: funnel: Support static funnel)
$ git merge coresight/next
Already up to date.
Merging rtc/rtc-next (dacb6a4035a0 rtc: snvs: Use __maybe_unused instead of #if CONFIG_PM_SLEEP)
$ git merge rtc/rtc-next
Already up to date.
Merging nvdimm/libnvdimm-for-next (1ffc664f9b8c Merge branch 'for-5.1/dax' into libnvdimm-for-next)
$ git merge nvdimm/libnvdimm-for-next
Auto-merging fs/dax.c
CONFLICT (content): Merge conflict in fs/dax.c
Resolved 'fs/dax.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 22d3705d8473] Merge remote-tracking branch 'nvdimm/libnvdimm-for-next'
$ git diff -M --stat --summary HEAD^..
Merging at24/at24/for-next (d333bad1f6f3 dt-bindings: at24: add Renesas R1EX24016)
$ git merge at24/at24/for-next
Already up to date.
Merging ntb/ntb-next (6202b3c150bc NTB: ntb_test: Fix bug when counting remote files)
$ git merge ntb/ntb-next
Auto-merging drivers/ntb/test/ntb_perf.c
Auto-merging drivers/ntb/hw/idt/ntb_hw_idt.c
Merge made by the 'recursive' strategy.
 drivers/ntb/hw/amd/ntb_hw_amd.c         | 12 +++------
 drivers/ntb/hw/idt/ntb_hw_idt.c         |  6 -----
 drivers/ntb/hw/intel/ntb_hw_gen1.c      |  4 ---
 drivers/ntb/hw/intel/ntb_hw_gen3.c      |  6 ++---
 drivers/ntb/ntb.c                       |  9 ++-----
 drivers/ntb/ntb_transport.c             |  1 +
 drivers/ntb/test/ntb_perf.c             | 43 +++++++++++++++++++++++++--------
 drivers/ntb/test/ntb_pingpong.c         | 14 +++++------
 drivers/ntb/test/ntb_tool.c             |  9 +++----
 tools/testing/selftests/ntb/ntb_test.sh |  2 +-
 10 files changed, 54 insertions(+), 52 deletions(-)
Merging kspp/for-next/kspp (259799ea5a9a gcc-plugins: arm_ssp_per_task_plugin: Fix for older GCC < 6)
$ git merge kspp/for-next/kspp
Already up to date.
Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove)
$ git merge init_task/init_task
Already up to date.
Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
$ git merge cisco/for-next
Already up to date.
Merging gnss/gnss-next (7cc10c5cb143 gnss: ubx: add u-blox,neo-6m compatible)
$ git merge gnss/gnss-next
Already up to date.
Merging fsi/master (d20810530b71 fsi: fsi-scom.c: Remove duplicate header)
$ git merge fsi/master
Already up to date.
Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4)
$ git merge siox/siox/next
Already up to date.
Merging slimbus/for-next (80471330ec58 slimbus: fix a NULL pointer dereference in of_qcom_slim_ngd_register)
$ git merge slimbus/for-next
Merge made by the 'recursive' strategy.
Merging nvmem/for-next (889ba60c36ce nvmem: core: add NVMEM_SYSFS Kconfig)
$ git merge nvmem/for-next
Merge made by the 'recursive' strategy.
Merging xarray/xarray (dd12805ed1db XArray: Remove radix tree compatibility)
$ git merge xarray/xarray
Merge made by the 'recursive' strategy.
 include/linux/radix-tree.h | 13 +++++++++++--
 include/linux/xarray.h     | 29 ++++++++++++++---------------
 lib/radix-tree.c           |  2 +-
 lib/test_xarray.c          | 38 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 64 insertions(+), 18 deletions(-)
Merging hyperv/hyperv-next (a3fb7bf369ef drivers: input: serio: Add a module desription to the hyperv_keyboard driver)
$ git merge hyperv/hyperv-next
Auto-merging drivers/hv/vmbus_drv.c
Merge made by the 'recursive' strategy.
 drivers/hid/hid-hyperv.c | 2 ++
 drivers/hv/vmbus_drv.c   | 1 +
 2 files changed, 3 insertions(+)
Merging auxdisplay/auxdisplay (cc5d04d840d6 auxdisplay: charlcd: make backlight initial state configurable)
$ git merge auxdisplay/auxdisplay
Already up to date.
Merging kgdb-dt/kgdb/for-next (b586627e10f5 kdb: do a sanity check on the cpu in kdb_per_cpu())
$ git merge kgdb-dt/kgdb/for-next
Merge made by the 'recursive' strategy.
 kernel/debug/gdbstub.c         | 9 +++++----
 kernel/debug/kdb/Makefile      | 1 -
 kernel/debug/kdb/kdb_main.c    | 3 +--
 kernel/debug/kdb/kdb_support.c | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)
Merging pidfd/for-next (eb364bbe6791 samples: show race-free pidfd metadata access)
$ git merge pidfd/for-next
Auto-merging samples/Makefile
CONFLICT (content): Merge conflict in samples/Makefile
Auto-merging kernel/signal.c
Auto-merging kernel/fork.c
CONFLICT (content): Merge conflict in kernel/fork.c
Resolved 'kernel/fork.c' using previous resolution.
Resolved 'samples/Makefile' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master c372a7379a1c] Merge remote-tracking branch 'pidfd/for-next'
$ git diff -M --stat --summary HEAD^..
Merging devfreq/for-next (cf451adfa392 PM / devfreq: add tracing for scheduling work)
$ git merge devfreq/for-next
Already up to date.
Merging akpm-current/current (b78fc46079e4 ipc-do-cyclic-id-allocation-for-the-ipc-object-fix)
$ git merge --no-ff akpm-current/current
Auto-merging virt/kvm/kvm_main.c
Auto-merging scripts/checkpatch.pl
Auto-merging net/netfilter/core.c
Auto-merging mm/vmscan.c
Auto-merging mm/vmalloc.c
CONFLICT (content): Merge conflict in mm/vmalloc.c
Auto-merging mm/slub.c
Auto-merging mm/slab.c
Auto-merging mm/shmem.c
Auto-merging mm/page_alloc.c
Auto-merging mm/memory.c
Auto-merging mm/memblock.c
Auto-merging mm/madvise.c
Auto-merging mm/hugetlb.c
Auto-merging mm/huge_memory.c
Auto-merging lib/test_bitmap.c
Removing lib/rational.c
Auto-merging lib/dynamic_debug.c
CONFLICT (content): Merge conflict in lib/dynamic_debug.c
Auto-merging lib/Makefile
CONFLICT (content): Merge conflict in lib/Makefile
Auto-merging lib/Kconfig.debug
Auto-merging lib/Kconfig
Auto-merging kernel/sysctl.c
Auto-merging kernel/signal.c
Auto-merging kernel/panic.c
Auto-merging kernel/latencytop.c
Auto-merging kernel/kexec_file.c
Auto-merging kernel/futex.c
Auto-merging kernel/fork.c
CONFLICT (content): Merge conflict in kernel/fork.c
Auto-merging kernel/events/uprobes.c
Auto-merging kernel/debug/kdb/kdb_main.c
Auto-merging kernel/cgroup/cgroup.c
Auto-merging ipc/util.c
Auto-merging ipc/mqueue.c
Auto-merging init/main.c
Auto-merging init/Kconfig
Auto-merging include/trace/events/vmscan.h
Auto-merging include/linux/vmalloc.h
Auto-merging include/linux/uaccess.h
Auto-merging include/linux/sched.h
Auto-merging include/linux/printk.h
Auto-merging include/linux/pid.h
Auto-merging include/linux/net.h
Auto-merging include/linux/mm.h
Auto-merging include/linux/list.h
Auto-merging include/linux/kernel.h
Auto-merging include/linux/dynamic_debug.h
CONFLICT (content): Merge conflict in include/linux/dynamic_debug.h
Auto-merging include/linux/device.h
Auto-merging fs/sync.c
CONFLICT (content): Merge conflict in fs/sync.c
Auto-merging fs/proc/base.c
Auto-merging fs/orangefs/orangefs-bufmap.c
Auto-merging fs/io_uring.c
Auto-merging fs/hugetlbfs/inode.c
Auto-merging fs/buffer.c
Auto-merging drivers/video/fbdev/pvr2fb.c
Auto-merging drivers/vfio/vfio_iommu_type1.c
Auto-merging drivers/tty/sysrq.c
Auto-merging drivers/staging/gasket/gasket_page_table.c
Auto-merging drivers/sbus/char/oradax.c
Auto-merging drivers/mtd/nand/raw/vf610_nfc.c
Auto-merging drivers/media/common/videobuf2/videobuf2-core.c
Auto-merging drivers/iommu/dma-iommu.c
Auto-merging drivers/infiniband/hw/usnic/usnic_uiom.c
Auto-merging drivers/infiniband/hw/qib/qib_user_sdma.c
Auto-merging drivers/infiniband/core/umem_odp.c
Auto-merging drivers/infiniband/core/umem.c
CONFLICT (content): Merge conflict in drivers/infiniband/core/umem.c
Auto-merging drivers/gpu/drm/i915/i915_gem_userptr.c
Auto-merging drivers/firewire/core-iso.c
Auto-merging arch/x86/include/asm/Kbuild
Auto-merging arch/x86/Kconfig
Auto-merging arch/unicore32/Kconfig
Auto-merging arch/sparc/mm/init_64.c
Auto-merging arch/sparc/Kconfig
Auto-merging arch/sh/Kconfig
Auto-merging arch/s390/mm/init.c
CONFLICT (modify/delete): arch/s390/mm/gup.c deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of arch/s390/mm/gup.c left in tree.
Auto-merging arch/s390/kvm/interrupt.c
Auto-merging arch/s390/include/asm/cpacf.h
Auto-merging arch/s390/Kconfig
Auto-merging arch/powerpc/platforms/Kconfig.cputype
CONFLICT (content): Merge conflict in arch/powerpc/platforms/Kconfig.cputype
Auto-merging arch/powerpc/perf/core-book3s.c
Auto-merging arch/powerpc/mm/mem.c
CONFLICT (content): Merge conflict in arch/powerpc/mm/mem.c
Auto-merging arch/powerpc/mm/fault.c
Auto-merging arch/powerpc/mm/book3s64/iommu_api.c
CONFLICT (content): Merge conflict in arch/powerpc/mm/book3s64/iommu_api.c
Auto-merging arch/powerpc/kvm/book3s_64_vio.c
Auto-merging arch/powerpc/kernel/traps.c
Auto-merging arch/powerpc/kernel/prom_init.c
Auto-merging arch/powerpc/kernel/process.c
Auto-merging arch/powerpc/include/asm/book3s/64/hugetlb.h
Auto-merging arch/powerpc/include/asm/Kbuild
Auto-merging arch/powerpc/Kconfig
Auto-merging arch/parisc/mm/init.c
Auto-merging arch/openrisc/mm/init.c
Auto-merging arch/nios2/Kconfig
CONFLICT (content): Merge conflict in arch/nios2/Kconfig
Auto-merging arch/nds32/mm/init.c
Auto-merging arch/mips/kernel/setup.c
CONFLICT (content): Merge conflict in arch/mips/kernel/setup.c
Auto-merging arch/mips/Kconfig
Auto-merging arch/m68k/Kconfig
CONFLICT (content): Merge conflict in arch/m68k/Kconfig
Auto-merging arch/ia64/Kconfig
Auto-merging arch/hexagon/Kconfig
Auto-merging arch/arm64/mm/mmu.c
Auto-merging arch/arm64/mm/init.c
Auto-merging arch/arm64/include/asm/cpufeature.h
Auto-merging arch/arm64/include/asm/Kbuild
Auto-merging arch/arm64/Kconfig
Auto-merging arch/arm/mm/init.c
Auto-merging arch/arm/kernel/smp.c
Auto-merging arch/arm/Kconfig
Auto-merging arch/Kconfig
Auto-merging Documentation/admin-guide/kernel-parameters.txt
Auto-merging Documentation/admin-guide/cgroup-v2.rst
Resolved 'arch/m68k/Kconfig' using previous resolution.
Resolved 'arch/mips/kernel/setup.c' using previous resolution.
Resolved 'arch/nios2/Kconfig' using previous resolution.
Resolved 'arch/powerpc/mm/book3s64/iommu_api.c' using previous resolution.
Resolved 'arch/powerpc/mm/mem.c' using previous resolution.
Resolved 'arch/powerpc/platforms/Kconfig.cputype' using previous resolution.
Resolved 'drivers/infiniband/core/umem.c' using previous resolution.
Resolved 'fs/sync.c' using previous resolution.
Resolved 'include/linux/dynamic_debug.h' using previous resolution.
Resolved 'kernel/fork.c' using previous resolution.
Resolved 'lib/Makefile' using previous resolution.
Resolved 'lib/dynamic_debug.c' using previous resolution.
Resolved 'mm/vmalloc.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git rm -f arch/s390/mm/gup.c
arch/s390/mm/gup.c: needs merge
rm 'arch/s390/mm/gup.c'
$ git commit -v -a
[master c32d7d0b94c4] Merge branch 'akpm-current/current'
$ git diff -M --stat --summary HEAD^..
 Documentation/ABI/testing/sysfs-kernel-slab        |    9 +
 Documentation/accounting/psi.txt                   |  107 ++
 Documentation/admin-guide/cgroup-v2.rst            |   20 +-
 Documentation/admin-guide/kernel-parameters.txt    |   18 +-
 Documentation/core-api/genalloc.rst                |    2 +-
 Documentation/core-api/kernel-api.rst              |    4 +-
 Documentation/dev-tools/gcov.rst                   |   18 +-
 Documentation/devicetree/bindings/pps/pps-gpio.txt |    7 +
 Documentation/filesystems/autofs-mount-control.txt |    6 +-
 Documentation/filesystems/autofs.txt               |   66 +-
 Documentation/sysctl/vm.txt                        |   12 +
 .../trace/postprocess/trace-vmscan-postprocess.pl  |    7 +-
 Documentation/vm/hmm.rst                           |   94 +-
 arch/Kconfig                                       |    7 +
 arch/alpha/mm/init.c                               |   14 -
 arch/arc/mm/init.c                                 |   15 -
 arch/arm/Kconfig                                   |    3 +-
 arch/arm/include/asm/hardirq.h                     |    1 +
 arch/arm/kernel/atags.h                            |    2 +-
 arch/arm/kernel/smp.c                              |    6 +-
 arch/arm/mm/dma-mapping.c                          |   24 +-
 arch/arm/mm/init.c                                 |   25 +-
 arch/arm64/Kconfig                                 |    5 +-
 arch/arm64/include/asm/Kbuild                      |    1 +
 arch/arm64/include/asm/cpufeature.h                |    4 +-
 arch/arm64/include/asm/hugetlb.h                   |    4 -
 arch/arm64/mm/init.c                               |   17 +-
 arch/arm64/mm/mmu.c                                |    6 +-
 arch/c6x/mm/init.c                                 |   12 -
 arch/h8300/mm/init.c                               |   14 -
 arch/hexagon/Kconfig                               |    1 -
 arch/hexagon/mm/init.c                             |   10 -
 arch/ia64/Kconfig                                  |    1 -
 arch/ia64/mm/init.c                                |   17 +-
 arch/m68k/Kconfig                                  |    3 +-
 arch/m68k/mm/init.c                                |    7 -
 arch/microblaze/mm/init.c                          |   12 -
 arch/mips/Kconfig                                  |    1 -
 arch/mips/include/asm/bitops.h                     |    4 +-
 arch/mips/kernel/cpu-bugs64.c                      |    4 +-
 arch/mips/mm/gup.c                                 |   11 +-
 arch/mips/mm/init.c                                |    8 -
 arch/nds32/mm/init.c                               |   12 -
 arch/nios2/Kconfig                                 |    3 +-
 arch/nios2/mm/init.c                               |   12 -
 arch/openrisc/mm/init.c                            |   12 -
 arch/parisc/mm/init.c                              |    7 -
 arch/powerpc/Kconfig                               |    2 +
 arch/powerpc/include/asm/Kbuild                    |    1 +
 arch/powerpc/include/asm/book3s/64/hugetlb.h       |    5 +-
 arch/powerpc/kernel/process.c                      |   12 +-
 arch/powerpc/kernel/prom_init.c                    |    6 +-
 arch/powerpc/kernel/sysfs.c                        |    8 +-
 arch/powerpc/kernel/traps.c                        |    2 +-
 arch/powerpc/kvm/book3s_64_mmu_hv.c                |    4 +-
 arch/powerpc/kvm/book3s_64_vio.c                   |   34 +-
 arch/powerpc/kvm/e500_mmu.c                        |    2 +-
 arch/powerpc/mm/book3s64/iommu_api.c               |   33 +-
 arch/powerpc/mm/book3s64/radix_tlb.c               |   12 +-
 arch/powerpc/mm/fault.c                            |    6 +-
 arch/powerpc/mm/mem.c                              |   24 +-
 arch/powerpc/perf/callchain.c                      |   20 +-
 arch/powerpc/perf/core-book3s.c                    |    8 +-
 arch/powerpc/platforms/Kconfig.cputype             |    2 +-
 arch/powerpc/sysdev/fsl_pci.c                      |   10 +-
 arch/riscv/mm/init.c                               |    5 -
 arch/s390/Kconfig                                  |    3 +-
 arch/s390/include/asm/cpacf.h                      |    2 +-
 arch/s390/include/asm/hugetlb.h                    |    8 +-
 arch/s390/kvm/interrupt.c                          |    2 +-
 arch/s390/mm/init.c                                |   19 +-
 arch/sh/Kconfig                                    |    2 +-
 arch/sh/boards/mach-dreamcast/irq.c                |    1 -
 arch/sh/mm/gup.c                                   |   11 +-
 arch/sh/mm/init.c                                  |   29 +-
 arch/sparc/Kconfig                                 |    1 +
 arch/sparc/include/asm/pgtable_64.h                |   30 -
 arch/sparc/mm/gup.c                                |    9 +-
 arch/sparc/mm/init_32.c                            |   13 -
 arch/sparc/mm/init_64.c                            |    8 -
 arch/um/kernel/mem.c                               |    7 -
 arch/unicore32/Kconfig                             |    1 +
 arch/unicore32/mm/init.c                           |   24 -
 arch/x86/Kconfig                                   |    7 +-
 arch/x86/Kconfig.debug                             |   14 -
 arch/x86/entry/vdso/vdso32/vclock_gettime.c        |    1 +
 arch/x86/include/asm/Kbuild                        |    1 +
 arch/x86/include/asm/hugetlb.h                     |    4 -
 arch/x86/include/asm/hyperv-tlfs.h                 |    2 +-
 arch/x86/kvm/paging_tmpl.h                         |    2 +-
 arch/x86/kvm/svm.c                                 |    2 +-
 arch/x86/mm/hugetlbpage.c                          |    2 +-
 arch/x86/mm/init_32.c                              |   11 +-
 arch/x86/mm/init_64.c                              |   20 +-
 arch/x86/mm/numa.c                                 |   27 +-
 arch/xtensa/include/asm/irqflags.h                 |    2 +-
 arch/xtensa/kernel/smp.c                           |    2 +-
 arch/xtensa/mm/init.c                              |    5 -
 drivers/base/memory.c                              |   24 +-
 drivers/firewire/core-iso.c                        |   15 +-
 drivers/fpga/dfl-afu-dma-region.c                  |   42 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c             |    8 +-
 drivers/gpu/drm/i915/i915_gem_userptr.c            |    2 +-
 drivers/gpu/drm/radeon/radeon_mn.c                 |    4 +-
 drivers/gpu/drm/rockchip/rockchip_drm_gem.c        |   17 +-
 drivers/gpu/drm/via/via_dmablit.c                  |    3 +-
 drivers/gpu/drm/xen/xen_drm_front_gem.c            |   18 +-
 drivers/infiniband/core/umem.c                     |    5 +-
 drivers/infiniband/core/umem_odp.c                 |    5 +-
 drivers/infiniband/hw/hfi1/user_pages.c            |    3 +-
 drivers/infiniband/hw/mthca/mthca_memfree.c        |    3 +-
 drivers/infiniband/hw/qib/qib_user_pages.c         |    8 +-
 drivers/infiniband/hw/qib/qib_user_sdma.c          |    2 +-
 drivers/infiniband/hw/usnic/usnic_uiom.c           |    9 +-
 drivers/iommu/dma-iommu.c                          |   12 +-
 drivers/media/common/videobuf2/videobuf2-core.c    |    7 +
 .../media/common/videobuf2/videobuf2-dma-contig.c  |    6 -
 drivers/media/common/videobuf2/videobuf2-dma-sg.c  |   22 +-
 drivers/media/v4l2-core/videobuf-dma-sg.c          |    6 +-
 drivers/misc/genwqe/card_utils.c                   |    2 +-
 drivers/misc/sram-exec.c                           |    2 +-
 drivers/misc/vmw_vmci/vmci_host.c                  |    2 +-
 drivers/misc/vmw_vmci/vmci_queue_pair.c            |    6 +-
 drivers/mtd/nand/raw/vf610_nfc.c                   |    2 +-
 drivers/platform/goldfish/goldfish_pipe.c          |    3 +-
 drivers/pps/clients/pps-gpio.c                     |  153 ++-
 drivers/rapidio/devices/rio_mport_cdev.c           |    4 +-
 drivers/rapidio/rio_cm.c                           |    8 +
 drivers/sbus/char/oradax.c                         |    2 +-
 drivers/scsi/st.c                                  |    3 +-
 drivers/spi/spi-rockchip.c                         |    1 +
 drivers/staging/gasket/gasket_page_table.c         |    4 +-
 drivers/tee/tee_shm.c                              |    2 +-
 drivers/tty/sysrq.c                                |    6 +
 drivers/vfio/vfio_iommu_spapr_tce.c                |   40 +-
 drivers/vfio/vfio_iommu_type1.c                    |   34 +-
 drivers/vhost/vhost.c                              |    2 +-
 drivers/video/backlight/pwm_bl.c                   |   15 -
 drivers/video/fbdev/pvr2fb.c                       |    2 +-
 drivers/virt/fsl_hypervisor.c                      |    2 +-
 drivers/xen/gntdev.c                               |   19 +-
 drivers/xen/privcmd-buf.c                          |    8 +-
 fs/binfmt_elf.c                                    |  180 +--
 fs/buffer.c                                        |   56 +-
 fs/dax.c                                           |    2 +-
 fs/eventfd.c                                       |    8 +
 fs/exec.c                                          |    4 +-
 fs/fat/file.c                                      |   11 +-
 fs/hugetlbfs/inode.c                               |   18 +-
 fs/io_uring.c                                      |    5 +-
 fs/ocfs2/alloc.c                                   |   15 +
 fs/ocfs2/aops.c                                    |   22 +-
 fs/ocfs2/dir.c                                     |   20 +-
 fs/ocfs2/dlm/dlmunlock.c                           |   23 +-
 fs/ocfs2/dlmglue.c                                 |   21 +-
 fs/ocfs2/export.c                                  |   30 +-
 fs/ocfs2/ocfs2.h                                   |    1 +
 fs/ocfs2/ocfs2_fs.h                                |   28 +-
 fs/orangefs/orangefs-bufmap.c                      |    2 +-
 fs/proc/base.c                                     |    2 +-
 fs/proc/meminfo.c                                  |    2 +-
 fs/proc/task_mmu.c                                 |    5 +-
 fs/ramfs/inode.c                                   |   12 +
 fs/reiserfs/xattr.c                                |    9 +
 fs/sync.c                                          |   21 +-
 fs/userfaultfd.c                                   |    5 +
 include/asm-generic/dynamic_debug.h                |  116 ++
 include/asm-generic/hugetlb.h                      |    7 +
 include/asm-generic/shmparam.h                     |    2 +-
 include/linux/balloon_compaction.h                 |   15 -
 include/linux/binfmts.h                            |    3 +-
 include/linux/bitops.h                             |   16 +-
 include/linux/compiler_types.h                     |    3 +-
 include/linux/console.h                            |    7 +-
 include/linux/cpumask.h                            |    3 +-
 include/linux/device.h                             |    4 +-
 include/linux/dynamic_debug.h                      |   27 +-
 include/linux/genalloc.h                           |    2 +-
 include/linux/gfp.h                                |    4 +-
 include/linux/hmm.h                                |  310 ++++-
 include/linux/hugetlb.h                            |    4 +-
 include/linux/ipc_namespace.h                      |    1 +
 include/linux/jump_label.h                         |    2 +
 include/linux/kernel.h                             |    1 +
 include/linux/kthread.h                            |    3 +-
 include/linux/latencytop.h                         |    4 +-
 include/linux/list.h                               |   35 +
 include/linux/list_sort.h                          |    1 +
 include/linux/memblock.h                           |   44 +-
 include/linux/memcontrol.h                         |   54 +-
 include/linux/memory.h                             |    2 +-
 include/linux/memory_hotplug.h                     |   42 +-
 include/linux/mm.h                                 |  117 +-
 include/linux/mm_inline.h                          |    2 +-
 include/linux/mm_types.h                           |    7 +-
 include/linux/mmu_notifier.h                       |   63 +-
 include/linux/mmzone.h                             |   64 +-
 include/linux/net.h                                |    4 +-
 include/linux/pagemap.h                            |   13 +
 include/linux/pid.h                                |    5 +-
 include/linux/plist.h                              |    4 +-
 include/linux/poll.h                               |    4 +
 include/linux/pps-gpio.h                           |    5 +-
 include/linux/printk.h                             |    6 +-
 include/linux/psi.h                                |    8 +
 include/linux/psi_types.h                          |  105 +-
 include/linux/qcom-geni-se.h                       |    2 +-
 include/linux/reboot.h                             |    2 +
 include/linux/sched.h                              |   11 +-
 include/linux/uaccess.h                            |   34 +
 include/linux/userfaultfd_k.h                      |    2 +
 include/linux/vmalloc.h                            |    8 +-
 include/linux/vmstat.h                             |    2 +-
 include/trace/events/compaction.h                  |   10 +-
 include/trace/events/vmscan.h                      |   98 +-
 include/uapi/linux/byteorder/big_endian.h          |    4 +
 include/uapi/linux/byteorder/little_endian.h       |    4 +
 include/uapi/linux/fs.h                            |    3 +
 init/Kconfig                                       |   24 +
 init/initramfs.c                                   |  147 ++-
 init/main.c                                        |    5 +
 ipc/ipc_sysctl.c                                   |   14 +-
 ipc/mqueue.c                                       |   72 +-
 ipc/msgutil.c                                      |    6 +
 ipc/util.c                                         |   48 +-
 ipc/util.h                                         |   47 +-
 kernel/cgroup/cgroup.c                             |   71 +-
 kernel/dma/remap.c                                 |    2 +-
 kernel/events/uprobes.c                            |    3 +-
 kernel/exit.c                                      |    6 +-
 kernel/fork.c                                      |   39 +-
 kernel/futex.c                                     |    2 +-
 kernel/gcov/Kconfig                                |    3 +-
 kernel/gcov/Makefile                               |    5 +-
 kernel/gcov/base.c                                 |   86 +-
 kernel/gcov/clang.c                                |  581 ++++++++++
 kernel/gcov/gcc_3_4.c                              |   12 +
 kernel/gcov/gcc_4_7.c                              |   12 +
 kernel/gcov/gcc_base.c                             |   86 ++
 kernel/gcov/gcov.h                                 |    5 +
 kernel/kexec_file.c                                |   16 +-
 kernel/kthread.c                                   |    1 +
 kernel/latencytop.c                                |    8 +-
 kernel/memremap.c                                  |   12 +-
 kernel/notifier.c                                  |    1 +
 kernel/panic.c                                     |   11 +-
 kernel/pid.c                                       |   10 +-
 kernel/printk/printk.c                             |   18 +-
 kernel/reboot.c                                    |   20 +-
 kernel/sched/psi.c                                 |  615 +++++++++-
 kernel/signal.c                                    |    1 +
 kernel/sys.c                                       |    2 +-
 kernel/sysctl.c                                    |   53 +-
 kernel/user.c                                      |    7 +-
 lib/Kconfig                                        |   14 +-
 lib/Kconfig.debug                                  |   34 +-
 lib/Makefile                                       |   15 +-
 lib/bitmap.c                                       |  280 ++---
 lib/debugobjects.c                                 |   66 +-
 lib/dynamic_debug.c                                |  111 +-
 lib/genalloc.c                                     |    5 +-
 lib/iov_iter.c                                     |    7 +-
 lib/list_sort.c                                    |  242 ++--
 lib/math/Kconfig                                   |   11 +
 lib/math/Makefile                                  |    5 +
 lib/{ => math}/cordic.c                            |    0
 lib/{ => math}/div64.c                             |    2 +-
 lib/{ => math}/gcd.c                               |    0
 lib/math/int_pow.c                                 |   32 +
 lib/{ => math}/int_sqrt.c                          |    0
 lib/{ => math}/lcm.c                               |    0
 lib/{ => math}/prime_numbers.c                     |    0
 lib/math/rational.c                                |  102 ++
 lib/{ => math}/reciprocal_div.c                    |    0
 lib/plist.c                                        |    4 +-
 lib/rational.c                                     |   65 --
 lib/sort.c                                         |  254 ++++-
 lib/test_bitmap.c                                  |   67 +-
 lib/test_sysctl.c                                  |   18 +-
 lib/test_vmalloc.c                                 |    8 +-
 mm/Kconfig                                         |   82 +-
 mm/Kconfig.debug                                   |    1 -
 mm/Makefile                                        |    7 +-
 mm/cma.c                                           |   23 +-
 mm/cma_debug.c                                     |    2 +-
 mm/compaction.c                                    |    8 +-
 mm/debug.c                                         |    5 +-
 mm/filemap.c                                       |  163 ++-
 mm/gup.c                                           |  393 +++++--
 mm/gup_benchmark.c                                 |    5 +-
 mm/hmm.c                                           | 1086 ++++++++++++------
 mm/huge_memory.c                                   |   17 +-
 mm/hugetlb.c                                       |  177 ++-
 mm/khugepaged.c                                    |    7 +-
 mm/ksm.c                                           |    6 +-
 mm/madvise.c                                       |    3 +-
 mm/memblock.c                                      |   70 +-
 mm/memcontrol.c                                    |  112 +-
 mm/memfd.c                                         |    2 +
 mm/memory.c                                        |  108 +-
 mm/memory_hotplug.c                                |  132 +--
 mm/migrate.c                                       |    7 +-
 mm/mincore.c                                       |   23 +-
 mm/mlock.c                                         |    4 +-
 mm/mmap.c                                          |   18 +-
 mm/mmu_notifier.c                                  |   12 +-
 mm/mprotect.c                                      |    4 +-
 mm/mremap.c                                        |    9 +-
 mm/nommu.c                                         |   14 +
 mm/oom_kill.c                                      |    3 +-
 mm/page_alloc.c                                    |  372 +++---
 mm/page_isolation.c                                |    2 -
 mm/rmap.c                                          |   10 +-
 mm/shmem.c                                         |    2 +-
 mm/shuffle.c                                       |  207 ++++
 mm/shuffle.h                                       |   64 ++
 mm/slab.c                                          |   61 +-
 mm/slob.c                                          |   59 +-
 mm/slub.c                                          |   83 +-
 mm/sparse.c                                        |   16 +-
 mm/swap.c                                          |    2 +-
 mm/swap_state.c                                    |    4 +-
 mm/swapfile.c                                      |    4 +-
 mm/userfaultfd.c                                   |    3 +-
 mm/util.c                                          |   59 +-
 mm/vmalloc.c                                       | 1187 +++++++++++++++-----
 mm/vmscan.c                                        |  290 ++---
 mm/workingset.c                                    |    5 +-
 mm/z3fold.c                                        |  638 ++++++++---
 net/ceph/pagevec.c                                 |    2 +-
 net/netfilter/core.c                               |    2 +-
 net/rds/info.c                                     |    2 +-
 net/rds/rdma.c                                     |    3 +-
 net/xdp/xdp_umem.c                                 |    4 +-
 scripts/checkpatch.pl                              |   24 +-
 scripts/gdb/linux/clk.py                           |   69 ++
 scripts/gdb/linux/config.py                        |   44 +
 scripts/gdb/linux/constants.py.in                  |   13 +
 scripts/gdb/linux/cpus.py                          |    1 +
 scripts/gdb/linux/lists.py                         |   24 +
 scripts/gdb/linux/proc.py                          |   10 +-
 scripts/gdb/linux/rbtree.py                        |  177 +++
 scripts/gdb/linux/symbols.py                       |    6 +-
 scripts/gdb/linux/tasks.py                         |    2 +
 scripts/gdb/linux/timerlist.py                     |  219 ++++
 scripts/gdb/linux/utils.py                         |    7 +-
 scripts/gdb/vmlinux-gdb.py                         |    4 +
 scripts/spelling.txt                               |  579 ++++++++--
 tools/testing/selftests/exec/.gitignore            |    3 +-
 tools/testing/selftests/exec/Makefile              |    4 +
 tools/testing/selftests/exec/recursion-depth.c     |   67 ++
 tools/testing/selftests/sysctl/sysctl.sh           |  161 ++-
 tools/vm/slabinfo.c                                |    7 +-
 virt/kvm/kvm_main.c                                |    3 +-
 354 files changed, 10010 insertions(+), 3858 deletions(-)
 create mode 100644 include/asm-generic/dynamic_debug.h
 create mode 100644 kernel/gcov/clang.c
 create mode 100644 kernel/gcov/gcc_base.c
 create mode 100644 lib/math/Kconfig
 create mode 100644 lib/math/Makefile
 rename lib/{ => math}/cordic.c (100%)
 rename lib/{ => math}/div64.c (99%)
 rename lib/{ => math}/gcd.c (100%)
 create mode 100644 lib/math/int_pow.c
 rename lib/{ => math}/int_sqrt.c (100%)
 rename lib/{ => math}/lcm.c (100%)
 rename lib/{ => math}/prime_numbers.c (100%)
 create mode 100644 lib/math/rational.c
 rename lib/{ => math}/reciprocal_div.c (100%)
 delete mode 100644 lib/rational.c
 create mode 100644 mm/shuffle.c
 create mode 100644 mm/shuffle.h
 create mode 100644 scripts/gdb/linux/clk.py
 create mode 100644 scripts/gdb/linux/config.py
 create mode 100644 scripts/gdb/linux/rbtree.py
 create mode 100644 scripts/gdb/linux/timerlist.py
 create mode 100644 tools/testing/selftests/exec/recursion-depth.c
$ git clone -s -l -n -q . ../rebase-tmp
$ cd ../rebase-tmp
$ git checkout -b akpm remotes/origin/akpm/master
Switched to a new branch 'akpm'
$ git rebase --onto master remotes/origin/akpm/master-base
First, rewinding head to replay your work on top of it...
Applying: pinctrl: fix pxa2xx.c build warnings
Applying: fs/coda/psdev.c: remove duplicate header
Applying: include/linux/sched/signal.h: replace `tsk' with `task'
Applying: fs/cachefiles/namei.c: remove duplicate header
Applying: fs/block_dev.c: Remove duplicate header
Applying: treewide: replace #include <asm/sizes.h> with #include <linux/sizes.h>
Applying: arch: remove <asm/sizes.h> and <asm-generic/sizes.h>
Applying: mm, memcg: rename ambiguously named memory.stat counters and functions
Applying: mm-rename-ambiguously-named-memorystat-counters-and-functions-fix
Applying: mm, memcg: consider subtrees in memory.events
Applying: drivers/virt/fsl_hypervisor.c: dereferencing error pointers in ioctl
Applying: drivers/virt/fsl_hypervisor.c: prevent integer overflow in ioctl
Applying: mm: memcontrol: make cgroup stats and events query API explicitly local
Applying: mm-memcontrol-make-cgroup-stats-and-events-query-api-explicitly-local-fix
Applying: mm: memcontrol: move stat/event counting functions out-of-line
Applying: mm: memcontrol: fix recursive statistics correctness & scalabilty
Applying: mm: memcontrol: fix NUMA round-robin reclaim at intermediate level
Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
$ cd ../next
$ git fetch -f ../rebase-tmp akpm:akpm/master
From ../rebase-tmp
 + 6a013f596939...8510f4aaff81 akpm       -> akpm/master  (forced update)
$ rm -rf ../rebase-tmp
Merging akpm/master (8510f4aaff81 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)
$ git merge --no-ff akpm/master
Removing include/asm-generic/sizes.h
Merge made by the 'recursive' strategy.
 Documentation/admin-guide/cgroup-v2.rst            |   9 +
 arch/arm/common/sa1111.c                           |   2 +-
 arch/arm/include/asm/Kbuild                        |   1 -
 arch/arm/mach-imx/devices/platform-fec.c           |   2 +-
 arch/arm/mach-imx/devices/platform-gpio_keys.c     |   2 +-
 arch/arm/mach-imx/devices/platform-imx2-wdt.c      |   2 +-
 arch/arm/mach-imx/devices/platform-mxc_nand.c      |   2 +-
 arch/arm/mach-imx/hardware.h                       |   2 +-
 arch/arm/mach-integrator/impd1.c                   |   2 +-
 arch/arm/mach-iop13xx/pci.c                        |   2 +-
 arch/arm/mach-iop13xx/tpmi.c                       |   2 +-
 arch/arm/mach-ixp4xx/common-pci.c                  |   2 +-
 arch/arm/mach-ks8695/include/mach/hardware.h       |   2 +-
 arch/arm/mach-omap1/include/mach/hardware.h        |   2 +-
 .../mach-omap2/omap_hwmod_2xxx_interconnect_data.c |   2 +-
 arch/arm/mach-prima2/common.c                      |   2 +-
 arch/arm/mach-pxa/balloon3.c                       |   2 +-
 arch/arm/mach-pxa/colibri-pxa270.c                 |   2 +-
 arch/arm/mach-pxa/colibri-pxa300.c                 |   2 +-
 arch/arm/mach-pxa/colibri-pxa320.c                 |   2 +-
 arch/arm/mach-pxa/colibri-pxa3xx.c                 |   2 +-
 arch/arm/mach-pxa/gumstix.c                        |   2 +-
 arch/arm/mach-pxa/lpd270.c                         |   2 +-
 arch/arm/mach-pxa/lubbock.c                        |   2 +-
 arch/arm/mach-pxa/mainstone.c                      |   2 +-
 arch/arm/mach-pxa/trizeps4.c                       |   2 +-
 arch/arm/mach-pxa/viper.c                          |   2 +-
 arch/arm/mach-s3c24xx/include/mach/hardware.h      |   2 +-
 arch/arm/mach-sa1100/include/mach/memory.h         |   2 +-
 arch/arm/mach-sa1100/neponset.c                    |   2 +-
 arch/arm/mach-tegra/iomap.h                        |   2 +-
 arch/arm/mach-tegra/irammap.h                      |   2 +-
 arch/arm/mach-w90x900/include/mach/hardware.h      |   2 +-
 arch/arm64/include/asm/Kbuild                      |   1 -
 arch/arm64/include/asm/boot.h                      |   2 +-
 arch/arm64/include/asm/memory.h                    |   2 +-
 arch/arm64/mm/init.c                               |   2 +-
 arch/arm64/mm/mmu.c                                |   2 +-
 arch/h8300/include/asm/Kbuild                      |   1 -
 arch/hexagon/include/asm/Kbuild                    |   1 -
 arch/nds32/include/asm/Kbuild                      |   1 -
 arch/nds32/include/asm/pgtable.h                   |   2 +-
 arch/nds32/kernel/head.S                           |   2 +-
 arch/sh/boards/board-apsh4a3a.c                    |   2 +-
 arch/sh/boards/board-apsh4ad0a.c                   |   2 +-
 arch/sh/boards/board-edosk7705.c                   |   2 +-
 arch/sh/boards/board-edosk7760.c                   |   2 +-
 arch/sh/boards/board-espt.c                        |   2 +-
 arch/sh/boards/board-urquell.c                     |   2 +-
 arch/sh/boards/mach-microdev/setup.c               |   2 +-
 arch/sh/boards/mach-sdk7786/fpga.c                 |   2 +-
 arch/sh/boards/mach-sdk7786/setup.c                |   2 +-
 arch/sh/boards/mach-sdk7786/sram.c                 |   2 +-
 arch/sh/boards/mach-se/7343/irq.c                  |   2 +-
 arch/sh/boards/mach-se/7722/irq.c                  |   2 +-
 arch/sh/drivers/pci/pci-sh7751.c                   |   2 +-
 arch/sh/drivers/pci/pci-sh7780.c                   |   2 +-
 arch/sh/drivers/pci/pcie-sh7786.c                  |   2 +-
 arch/sh/include/asm/Kbuild                         |   1 -
 arch/sh/mm/init.c                                  |   2 +-
 arch/sh/mm/pmb.c                                   |   2 +-
 arch/sh/mm/uncached.c                              |   2 +-
 arch/unicore32/include/asm/Kbuild                  |   1 -
 arch/unicore32/include/asm/memory.h                |   2 +-
 arch/unicore32/mm/init.c                           |   2 +-
 arch/unicore32/mm/ioremap.c                        |   2 +-
 arch/unicore32/mm/mmu.c                            |   2 +-
 arch/x86/events/intel/bts.c                        |   2 +-
 drivers/gpu/drm/msm/msm_drv.h                      |   2 +-
 drivers/iommu/msm_iommu.c                          |   2 +-
 drivers/media/platform/sti/delta/delta-ipc.c       |   4 +-
 drivers/mmc/host/mvsdio.c                          |   2 +-
 drivers/mmc/host/pxamci.c                          |   2 +-
 drivers/mtd/maps/sa1100-flash.c                    |   2 +-
 drivers/pcmcia/omap_cf.c                           |   2 +-
 drivers/pinctrl/pxa/pinctrl-pxa2xx.c               |   1 +
 drivers/sh/intc/userimask.c                        |   2 +-
 drivers/video/fbdev/fb-puv3.c                      |   2 +-
 drivers/virt/fsl_hypervisor.c                      |  29 +-
 fs/block_dev.c                                     |   1 -
 fs/cachefiles/namei.c                              |   1 -
 fs/coda/psdev.c                                    |   1 -
 include/asm-generic/sizes.h                        |   2 -
 include/linux/cgroup-defs.h                        |   5 +
 include/linux/memcontrol.h                         | 118 ++++----
 include/linux/sched/signal.h                       |  51 ++--
 kernel/cgroup/cgroup.c                             |  16 +-
 mm/memcontrol.c                                    | 312 +++++++++++++--------
 mm/vmscan.c                                        |   6 +-
 mm/workingset.c                                    |   7 +-
 90 files changed, 403 insertions(+), 303 deletions(-)
 delete mode 100644 include/asm-generic/sizes.h