path: root/Next/merge.log

$ date -R
Tue, 09 Apr 2019 08:07:41 +1000
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at 3b0468914708 Merge tag 'for-linus-5.1b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Merging origin/master (fd008d1a7a20 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
$ git merge origin/master
Updating 3b0468914708..fd008d1a7a20
Fast-forward
 Documentation/devicetree/bindings/arm/cpus.yaml    |   2 +-
 Makefile                                           |   2 +-
 arch/arm/boot/dts/am335x-evm.dts                   |  26 ++++-
 arch/arm/boot/dts/am335x-evmsk.dts                 |  26 ++++-
 arch/arm/boot/dts/am33xx-l4.dtsi                   |   4 +-
 arch/arm/boot/dts/rk3288-tinker.dtsi               |   3 +-
 arch/arm/boot/dts/rk3288-veyron.dtsi               |   2 -
 arch/arm/boot/dts/rk3288.dtsi                      |  20 ++--
 arch/arm/boot/dts/sama5d2-pinfunc.h                |   2 +-
 arch/arm/boot/dts/ste-nomadik-nhk15.dts            |   9 +-
 arch/arm/mach-at91/pm.c                            |   6 +-
 arch/arm/mach-iop13xx/setup.c                      |   8 +-
 arch/arm/mach-iop13xx/tpmi.c                       |  10 +-
 arch/arm/mach-milbeaut/platsmp.c                   |   4 +
 arch/arm/mach-omap1/board-ams-delta.c              |   2 +
 arch/arm/mach-omap2/display.c                      |   4 +-
 arch/arm/plat-iop/adma.c                           |   6 +-
 arch/arm/plat-orion/common.c                       |   4 +-
 arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi  |   3 +
 arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts     |   4 +-
 arch/arm64/boot/dts/rockchip/rk3328-rock64.dts     |   3 +-
 arch/arm64/boot/dts/rockchip/rk3328.dtsi           |  58 ++++-----
 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts  |   1 +
 block/bfq-iosched.c                                |   2 +-
 block/bfq-wf2q.c                                   |   2 +-
 block/blk-core.c                                   |   4 +-
 block/blk-mq-sched.c                               |   8 +-
 block/blk-mq.c                                     | 129 +++++++++++----------
 block/blk-mq.h                                     |   6 +-
 drivers/block/null_blk_main.c                      |   5 +
 drivers/block/paride/pcd.c                         |  14 ++-
 drivers/block/paride/pf.c                          |  12 +-
 drivers/block/xsysace.c                            |   2 +
 drivers/crypto/caam/caamhash.c                     |  13 +--
 drivers/reset/reset-meson-audio-arb.c              |   1 +
 fs/io_uring.c                                      |   1 +
 .../dt-bindings/reset/amlogic,meson-g12a-reset.h   |   5 +-
 mm/slab.c                                          |   3 +-
 38 files changed, 250 insertions(+), 166 deletions(-)
Merging fixes/master (b352face4ca9 adfs: mark expected switch fall-throughs)
$ git merge fixes/master
Merge made by the 'recursive' strategy.
 fs/adfs/dir_f.c | 6 ++++++
 1 file changed, 6 insertions(+)
Merging kspp-gustavo/for-next/kspp (2d212a1bac7e NFC: st21nfca: Fix fall-through warnings)
$ git merge kspp-gustavo/for-next/kspp
Auto-merging fs/locks.c
Auto-merging fs/afs/yfsclient.c
Auto-merging fs/afs/fsclient.c
Auto-merging drivers/scsi/lpfc/lpfc_scsi.c
Auto-merging arch/x86/include/asm/syscall.h
CONFLICT (content): Merge conflict in arch/x86/include/asm/syscall.h
Resolved 'arch/x86/include/asm/syscall.h' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 479a60d478a0] Merge remote-tracking branch 'kspp-gustavo/for-next/kspp'
$ git diff -M --stat --summary HEAD^..
 drivers/block/drbd/drbd_int.h                      |  2 +-
 drivers/block/drbd/drbd_receiver.c                 |  4 +--
 drivers/block/drbd/drbd_req.c                      |  2 +-
 drivers/block/rsxx/core.c                          |  1 +
 drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c    | 17 +++++++++++
 drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv04.c |  1 +
 drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c    |  2 ++
 drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c    |  1 +
 drivers/gpu/drm/nouveau/nvkm/subdev/bios/perf.c    |  1 +
 drivers/gpu/drm/nouveau/nvkm/subdev/bios/pll.c     |  1 +
 drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c     |  1 +
 drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c    |  1 +
 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c   |  2 ++
 drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c     |  1 +
 drivers/nfc/pn533/pn533.c                          |  2 ++
 drivers/nfc/st21nfca/dep.c                         |  2 ++
 drivers/scsi/aic7xxx/aic7xxx_core.c                | 12 ++++++--
 drivers/scsi/be2iscsi/be_iscsi.c                   |  1 +
 drivers/scsi/be2iscsi/be_main.c                    |  1 +
 drivers/scsi/bfa/bfa_fcpim.c                       |  6 ++--
 drivers/scsi/csiostor/csio_wr.c                    |  1 +
 drivers/scsi/imm.c                                 | 33 +++++++++++-----------
 drivers/scsi/lpfc/lpfc_ct.c                        |  2 ++
 drivers/scsi/lpfc/lpfc_els.c                       |  1 +
 drivers/scsi/lpfc/lpfc_hbadisc.c                   |  4 ++-
 drivers/scsi/lpfc/lpfc_nportdisc.c                 |  1 +
 drivers/scsi/lpfc/lpfc_nvme.c                      |  1 +
 drivers/scsi/lpfc/lpfc_scsi.c                      |  8 +++---
 drivers/scsi/osst.c                                |  6 ++++
 drivers/scsi/ppa.c                                 |  1 +
 drivers/scsi/sym53c8xx_2/sym_hipd.c                |  2 ++
 drivers/scsi/sym53c8xx_2/sym_nvram.c               |  1 +
 fs/affs/super.c                                    |  3 +-
 fs/afs/cmservice.c                                 |  8 ++++++
 fs/afs/file.c                                      |  2 ++
 fs/afs/flock.c                                     |  1 +
 fs/afs/fsclient.c                                  | 31 ++++++++++++--------
 fs/afs/misc.c                                      |  9 ++++++
 fs/afs/rxrpc.c                                     |  1 +
 fs/afs/vlclient.c                                  | 18 +++++++-----
 fs/afs/yfsclient.c                                 | 30 +++++++++++++-------
 fs/btrfs/ref-verify.c                              |  1 +
 fs/btrfs/volumes.h                                 |  1 +
 fs/ceph/file.c                                     |  1 +
 fs/configfs/dir.c                                  |  2 ++
 fs/f2fs/node.c                                     |  2 ++
 fs/fcntl.c                                         |  2 +-
 fs/gfs2/bmap.c                                     |  4 +--
 fs/jffs2/fs.c                                      |  1 +
 fs/libfs.c                                         |  2 ++
 fs/locks.c                                         |  2 +-
 fs/nfsd/nfs4proc.c                                 |  1 +
 fs/nfsd/nfs4state.c                                |  1 +
 fs/ocfs2/cluster/quorum.c                          |  1 +
 fs/seq_file.c                                      |  1 +
 fs/signalfd.c                                      |  1 +
 fs/ufs/util.h                                      |  4 +--
 lib/asn1_decoder.c                                 |  4 +++
 lib/cmdline.c                                      |  5 ++++
 lib/zstd/bitstream.h                               |  5 ++++
 lib/zstd/compress.c                                |  1 +
 lib/zstd/decompress.c                              |  5 +++-
 lib/zstd/huf_compress.c                            |  2 ++
 63 files changed, 206 insertions(+), 68 deletions(-)
Merging kbuild-current/fixes (79a3aaa7b82e Linux 5.1-rc3)
$ git merge kbuild-current/fixes
Already up to date.
Merging arc-current/for-curr (831e90bd606e ARC: PAE40: don't panic and instead turn off hw ioc)
$ git merge arc-current/for-curr
Merge made by the 'recursive' strategy.
 arch/arc/mm/cache.c | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)
Merging arm-current/fixes (d410a8a49e3e ARM: 8849/1: NOMMU: Fix encodings for PMSAv8's PRBAR4/PRLAR4)
$ git merge arm-current/fixes
Already up to date.
Merging arm64-fixes/for-next/fixes (5a3ae7b314a2 arm64/ftrace: fix inadvertent BUG() in trampoline check)
$ git merge arm64-fixes/for-next/fixes
Merge made by the 'recursive' strategy.
 arch/arm64/include/asm/module.h | 5 +++++
 arch/arm64/kernel/ftrace.c      | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)
Merging m68k-current/for-linus (28713169d879 m68k: Add -ffreestanding to CFLAGS)
$ git merge m68k-current/for-linus
Already up to date.
Merging powerpc-fixes/fixes (dd9a994fc68d powerpc/vdso32: fix CLOCK_MONOTONIC on PPC64)
$ git merge powerpc-fixes/fixes
Merge made by the 'recursive' strategy.
 arch/powerpc/kernel/head_32.S             | 8 --------
 arch/powerpc/kernel/vdso32/gettimeofday.S | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)
Merging sparc/master (7d762d69145a afs: Fix manually set volume location server list)
$ 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 (b1a6e8f91313 MAINTAINERS: ieee802154: update documentation file pattern)
$ git merge net/master
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                                          |  2 +-
 drivers/net/vrf.c                                    |  8 ++++++--
 include/net/nfc/nci_core.h                           |  2 +-
 net/nfc/nci/hci.c                                    |  8 ++++++++
 .../selftests/tc-testing/tc-tests/filters/tests.json | 20 ++++++++++++++++++++
 5 files changed, 36 insertions(+), 4 deletions(-)
Merging bpf/master (bbd669a868bb ibmvnic: Fix completion structure initialization)
$ git merge bpf/master
Already up to date.
Merging ipsec/master (8742dc86d0c7 xfrm4: Fix uninitialized memory read in _decode_session4)
$ git merge ipsec/master
Merge made by the 'recursive' strategy.
 include/net/xfrm.h        | 20 +++++++++++++++++++-
 net/ipv4/esp4.c           | 20 +++++++++++++++-----
 net/ipv4/esp4_offload.c   |  8 +++++---
 net/ipv4/ip_vti.c         |  9 ++++-----
 net/ipv4/xfrm4_policy.c   | 24 +++++++++++++-----------
 net/ipv6/esp6_offload.c   |  8 +++++---
 net/ipv6/xfrm6_tunnel.c   |  6 +++++-
 net/key/af_key.c          |  4 +++-
 net/xfrm/xfrm_interface.c | 17 ++++++++++++++---
 net/xfrm/xfrm_policy.c    |  2 +-
 net/xfrm/xfrm_state.c     |  2 +-
 net/xfrm/xfrm_user.c      | 16 ++--------------
 12 files changed, 87 insertions(+), 49 deletions(-)
Merging netfilter/master (b1a6e8f91313 MAINTAINERS: ieee802154: update documentation file pattern)
$ 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 (4837696f6b54 Merge tag 'iwlwifi-for-kalle-2019-03-22' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
$ git merge wireless-drivers/master
Merge made by the 'recursive' strategy.
 drivers/net/wireless/intel/iwlwifi/cfg/22000.c     | 12 ++--
 drivers/net/wireless/intel/iwlwifi/fw/dbg.c        | 34 +++---------
 drivers/net/wireless/intel/iwlwifi/fw/init.c       |  1 -
 drivers/net/wireless/intel/iwlwifi/iwl-config.h    |  2 +-
 drivers/net/wireless/intel/iwlwifi/iwl-trans.h     | 12 ++--
 drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c  | 64 +++++-----------------
 drivers/net/wireless/intel/iwlwifi/mvm/mvm.h       |  1 -
 drivers/net/wireless/intel/iwlwifi/mvm/sta.c       | 41 +-------------
 drivers/net/wireless/intel/iwlwifi/mvm/sta.h       |  7 +--
 drivers/net/wireless/intel/iwlwifi/pcie/drv.c      | 13 +++--
 drivers/net/wireless/intel/iwlwifi/pcie/internal.h |  2 +-
 drivers/net/wireless/intel/iwlwifi/pcie/trans.c    |  7 ++-
 drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c  |  2 +-
 drivers/net/wireless/intel/iwlwifi/pcie/tx.c       |  2 +-
 14 files changed, 54 insertions(+), 146 deletions(-)
Merging mac80211/master (2b4a66980217 mac80211: make ieee80211_schedule_txq schedule empty TXQs)
$ git merge mac80211/master
Merge made by the 'recursive' strategy.
 drivers/net/wireless/ath/ath10k/htt_rx.c |  2 +-
 drivers/net/wireless/ath/ath10k/mac.c    |  4 +-
 drivers/net/wireless/ath/ath9k/xmit.c    |  5 ++-
 drivers/net/wireless/mac80211_hwsim.c    | 19 ++++++++--
 include/net/cfg80211.h                   |  5 +++
 include/net/mac80211.h                   | 63 +++++++++++++++++---------------
 net/mac80211/driver-ops.h                |  3 ++
 net/mac80211/mesh_pathtbl.c              |  2 +-
 net/mac80211/rx.c                        | 10 ++++-
 net/mac80211/trace_msg.h                 |  7 +++-
 net/mac80211/tx.c                        | 53 ++++++++++++---------------
 net/wireless/nl80211.c                   | 18 ++++++---
 net/wireless/reg.c                       | 39 ++++++++++++++++++++
 net/wireless/scan.c                      |  3 +-
 net/wireless/util.c                      |  6 ++-
 15 files changed, 159 insertions(+), 80 deletions(-)
Merging rdma-fixes/for-rc (1abe186ed8a6 IB/mlx5: Reset access mask when looping inside page fault handler)
$ git merge rdma-fixes/for-rc
Merge made by the 'recursive' strategy.
 drivers/infiniband/hw/hfi1/chip.c | 26 +++++++++++++++++++-------
 drivers/infiniband/hw/hfi1/qp.c   |  4 +++-
 drivers/infiniband/hw/hfi1/rc.c   |  4 ++--
 drivers/infiniband/hw/mlx5/odp.c  |  3 ++-
 4 files changed, 26 insertions(+), 11 deletions(-)
Merging sound-current/for-linus (cae30527901d ALSA: hda - Add two more machines to the power_save_blacklist)
$ git merge sound-current/for-linus
Merge made by the 'recursive' strategy.
 include/uapi/sound/asound.h    |  1 +
 sound/core/seq/seq_clientmgr.c |  6 ++--
 sound/pci/hda/hda_intel.c      |  4 +++
 sound/pci/hda/patch_realtek.c  | 72 ++++++++++++++++++++++++++++++------------
 sound/xen/xen_snd_front_alsa.c |  2 +-
 5 files changed, 60 insertions(+), 25 deletions(-)
Merging sound-asoc-fixes/for-linus (f94d9457b2ea Merge branch 'asoc-5.1' into asoc-linus)
$ git merge sound-asoc-fixes/for-linus
Merge made by the 'recursive' strategy.
 include/sound/soc.h                          |  11 ++-
 sound/soc/codecs/ab8500-codec.c              |   1 +
 sound/soc/codecs/cs35l35.c                   |  11 +++
 sound/soc/codecs/cs4270.c                    |   1 +
 sound/soc/codecs/hdac_hda.c                  |  53 ++++++++----
 sound/soc/codecs/hdac_hda.h                  |   1 +
 sound/soc/codecs/hdmi-codec.c                | 121 +++++++++++++--------------
 sound/soc/codecs/nau8810.c                   |   4 +-
 sound/soc/codecs/nau8824.c                   |  46 ++++++++--
 sound/soc/codecs/rt5682.c                    |  56 ++++++-------
 sound/soc/codecs/tlv320aic32x4-i2c.c         |   4 +-
 sound/soc/codecs/tlv320aic32x4-spi.c         |   4 +-
 sound/soc/codecs/tlv320aic32x4.c             |   2 +
 sound/soc/codecs/tlv320aic3x.c               |   4 +-
 sound/soc/codecs/wm_adsp.c                   |  40 +++++++--
 sound/soc/codecs/wm_adsp.h                   |   1 +
 sound/soc/fsl/fsl_asrc.c                     |  14 ++++
 sound/soc/fsl/fsl_esai.c                     |  47 ++++++++---
 sound/soc/generic/audio-graph-card.c         |  11 ++-
 sound/soc/generic/simple-card.c              |  12 ++-
 sound/soc/intel/atom/sst-mfld-platform-pcm.c |   8 ++
 sound/soc/intel/boards/cht_bsw_max98090_ti.c |  47 +++++++++--
 sound/soc/intel/skylake/skl-messages.c       |   1 +
 sound/soc/intel/skylake/skl-pcm.c            |  28 +++++--
 sound/soc/mediatek/common/mtk-btcvsd.c       |  69 ++++++++++++++-
 sound/soc/mediatek/mt8183/mt8183-afe-clk.c   |   4 +
 sound/soc/rockchip/rockchip_pdm.c            |   4 +-
 sound/soc/samsung/i2s.c                      |  10 ++-
 sound/soc/samsung/odroid.c                   |   4 +-
 sound/soc/sh/rcar/core.c                     |   2 +
 sound/soc/sh/rcar/rsnd.h                     |   5 ++
 sound/soc/sh/rcar/src.c                      |  21 ++---
 sound/soc/soc-core.c                         |   6 +-
 sound/soc/soc-dapm.c                         |  11 +++
 sound/soc/soc-pcm.c                          |  62 +++++++++++---
 sound/soc/soc-topology.c                     |   7 +-
 sound/soc/stm/stm32_adfsdm.c                 |  38 ++++++++-
 sound/soc/stm/stm32_i2s.c                    |   3 +-
 sound/soc/stm/stm32_sai.c                    |   8 +-
 sound/soc/stm/stm32_sai_sub.c                |  50 ++++++++---
 40 files changed, 616 insertions(+), 216 deletions(-)
Merging regmap-fixes/for-linus (34fd5ecd01f0 Merge branch 'regmap-5.1' into regmap-linus)
$ git merge regmap-fixes/for-linus
Merge made by the 'recursive' strategy.
 drivers/base/regmap/regmap-irq.c | 3 ---
 1 file changed, 3 deletions(-)
Merging regulator-fixes/for-linus (37654b55d953 Merge branch 'regulator-5.1' into regulator-linus)
$ git merge regulator-fixes/for-linus
Merge made by the 'recursive' strategy.
 drivers/regulator/core.c               | 14 ++++++--------
 drivers/regulator/tps65217-regulator.c |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)
Merging spi-fixes/for-linus (ee284f8d2c31 Merge branch 'spi-5.1' into spi-linus)
$ git merge spi-fixes/for-linus
Merge made by the 'recursive' strategy.
 drivers/spi/spi-fsl-lpspi.c     |   4 +-
 drivers/spi/spi-gpio.c          |   1 -
 drivers/spi/spi-imx.c           |   2 +-
 drivers/spi/spi-pic32.c         |   2 +-
 drivers/spi/spi-rspi.c          |  48 +++++-----
 drivers/spi/spi-stm32-qspi.c    |   4 +-
 drivers/spi/spi-tegra114.c      | 208 ++++++++++++++++++++++++++++------------
 drivers/spi/spi-tegra20-slink.c |  12 ++-
 drivers/spi/spi-topcliff-pch.c  |  15 ++-
 drivers/spi/spi.c               |   4 +
 10 files changed, 199 insertions(+), 101 deletions(-)
Merging pci-current/for-linus (9cde402a5977 PCI: Add function 1 DMA alias quirk for Marvell 9170 SATA controller)
$ git merge pci-current/for-linus
Merge made by the 'recursive' strategy.
 drivers/pci/quirks.c | 2 ++
 1 file changed, 2 insertions(+)
Merging driver-core.current/driver-core-linus (79a3aaa7b82e Linux 5.1-rc3)
$ git merge driver-core.current/driver-core-linus
Already up to date.
Merging tty.current/tty-linus (79a3aaa7b82e Linux 5.1-rc3)
$ git merge tty.current/tty-linus
Already up to date.
Merging usb.current/usb-linus (79a3aaa7b82e Linux 5.1-rc3)
$ 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 (d5d60c3f25ab phy: fix platform_no_drv_owner.cocci warnings)
$ git merge phy/fixes
Merge made by the 'recursive' strategy.
 drivers/phy/allwinner/Kconfig              |   9 +-
 drivers/phy/marvell/phy-mvebu-a3700-utmi.c |   1 -
 drivers/phy/motorola/Kconfig               |   2 +-
 drivers/phy/qualcomm/phy-qcom-ufs.c        |   2 +-
 drivers/phy/renesas/phy-rcar-gen3-usb2.c   |  27 +--
 drivers/phy/rockchip/phy-rockchip-typec.c  |   4 +-
 drivers/phy/ti/Kconfig                     |   2 +-
 drivers/phy/ti/phy-ti-pipe3.c              | 362 +++++++++++++++++++++--------
 drivers/phy/ti/phy-twl4030-usb.c           |  35 ++-
 9 files changed, 303 insertions(+), 141 deletions(-)
Merging staging.current/staging-linus (131ac62253db staging: most: core: use device description as name)
$ git merge staging.current/staging-linus
Merge made by the 'recursive' strategy.
 drivers/iio/accel/kxcjk-1013.c                     |   2 +
 drivers/iio/adc/ad_sigma_delta.c                   |   1 +
 drivers/iio/adc/at91_adc.c                         |  28 +++--
 drivers/iio/adc/xilinx-xadc-core.c                 |   3 +-
 drivers/iio/chemical/Kconfig                       |  14 +++
 drivers/iio/chemical/bme680.h                      |   6 +-
 drivers/iio/chemical/bme680_core.c                 |  54 ++++++++--
 drivers/iio/chemical/bme680_i2c.c                  |  21 ----
 drivers/iio/chemical/bme680_spi.c                  | 115 ++++++++++++++-------
 .../iio/common/cros_ec_sensors/cros_ec_sensors.c   |   7 +-
 drivers/iio/dac/mcp4725.c                          |   1 +
 drivers/iio/gyro/bmg160_core.c                     |   6 +-
 drivers/iio/gyro/mpu3050-core.c                    |   8 +-
 drivers/iio/industrialio-buffer.c                  |   5 +-
 drivers/iio/industrialio-core.c                    |   4 +-
 drivers/staging/iio/adc/ad7192.c                   |   8 +-
 drivers/staging/iio/meter/ade7854.c                |   2 +-
 drivers/staging/most/core.c                        |   2 +-
 18 files changed, 184 insertions(+), 103 deletions(-)
Merging char-misc.current/char-misc-linus (01b76c32e3f3 misc: fastrpc: add checked value for dma_set_mask)
$ git merge char-misc.current/char-misc-linus
Merge made by the 'recursive' strategy.
 drivers/misc/fastrpc.c              | 7 ++++++-
 drivers/misc/habanalabs/goya/goya.c | 9 ++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)
Merging soundwire-fixes/fixes (bfeffd155283 Linux 5.0-rc1)
$ git merge soundwire-fixes/fixes
Already up to date.
Merging thunderbolt-fixes/fixes (15ade5d2e777 Linux 5.1-rc4)
$ git merge thunderbolt-fixes/fixes
Already up to date.
Merging input-current/for-linus (bf2a7ca39fd3 Input: snvs_pwrkey - initialize necessary driver data before enabling IRQ)
$ git merge input-current/for-linus
Auto-merging include/uapi/linux/input-event-codes.h
Auto-merging drivers/hid/hid-input.c
Auto-merging Documentation/media/uapi/rc/rc-tables.rst
Merge made by the 'recursive' strategy.
 Documentation/media/uapi/rc/rc-tables.rst |  4 ++--
 drivers/hid/hid-input.c                   | 17 ++++++++++++++++-
 drivers/input/keyboard/snvs_pwrkey.c      |  6 +++---
 drivers/input/mouse/elan_i2c_core.c       | 25 +++++++++++++++++++++++++
 include/uapi/linux/input-event-codes.h    |  6 ++++--
 5 files changed, 50 insertions(+), 8 deletions(-)
Merging crypto-current/master (678cce4019d7 crypto: x86/poly1305 - fix overflow during partial reduction)
$ git merge crypto-current/master
Merge made by the 'recursive' strategy.
 arch/x86/crypto/poly1305-avx2-x86_64.S | 14 +++++++----
 arch/x86/crypto/poly1305-sse2-x86_64.S | 22 ++++++++++-------
 crypto/testmgr.h                       | 44 +++++++++++++++++++++++++++++++++-
 3 files changed, 67 insertions(+), 13 deletions(-)
Merging ide/master (dc5c37736d16 drivers: ide: Kconfig: pedantic formatting)
$ 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 (76d252fecf58 selftests: efivarfs: remove the test_create_read file if it was exist)
$ git merge kselftest-fixes/fixes
Merge made by the 'recursive' strategy.
 tools/testing/selftests/efivarfs/efivarfs.sh   | 4 ++++
 tools/testing/selftests/rseq/run_param_test.sh | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)
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 (79a3aaa7b82e Linux 5.1-rc3)
$ 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 (d9b8a67b3b95 mtd: cfi: fix deadloop in cfi_cmdset_0002.c do_write_buffer)
$ 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 (9e98c678c2d6 Linux 5.1-rc1)
$ git merge v4l-dvb-fixes/fixes
Already up to date.
Merging reset-fixes/reset/fixes (13e8a05b9224 reset: meson-audio-arb: Fix missing .owner setting of reset_controller_dev)
$ git merge reset-fixes/reset/fixes
Already up to date.
Merging mips-fixes/mips-fixes (6e3572e83dc3 MIPS: generic: Add switchdev, pinctrl and fit to ocelot_defconfig)
$ git merge mips-fixes/mips-fixes
Merge made by the 'recursive' strategy.
 arch/mips/configs/generic/board-ocelot.config | 8 ++++++++
 arch/mips/kernel/kgdb.c                       | 3 ++-
 arch/mips/sgi-ip27/ip27-irq.c                 | 3 +--
 3 files changed, 11 insertions(+), 3 deletions(-)
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 (81717283cf2c Merge commit '7d56bedb2730dc2ea8abf0fd7240ee99ecfee3c9' into omap-for-v5.1/fixes)
$ git merge omap-fixes/fixes
Already up to date.
Merging kvm-fixes/master (c73f4c998e1f KVM: x86: nVMX: fix x2APIC VTPR read intercept)
$ 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 (34fdbe5544c7 hwmon: (pwm-fan) Disable PWM if fetching cooling data fails)
$ git merge hwmon-fixes/hwmon
Merge made by the 'recursive' strategy.
 drivers/hwmon/pwm-fan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging nvdimm-fixes/libnvdimm-fixes (7c33bd4e3e97 libnvdimm/pmem: fix a possible OOB access when read and write pmem)
$ git merge nvdimm-fixes/libnvdimm-fixes
Merge made by the 'recursive' strategy.
 drivers/acpi/nfit/core.c         |  12 ++--
 drivers/acpi/nfit/intel.c        |  10 ++--
 drivers/nvdimm/btt_devs.c        |  18 ++++--
 drivers/nvdimm/namespace_devs.c  |   5 +-
 drivers/nvdimm/pmem.c            |   8 +--
 drivers/nvdimm/security.c        | 118 ++++++++++++++++++++++++---------------
 tools/testing/nvdimm/test/nfit.c |  11 +++-
 7 files changed, 113 insertions(+), 69 deletions(-)
Merging btrfs-fixes/next-fixes (55a74492ebf1 Merge branch 'misc-5.1' into next-fixes)
$ git merge btrfs-fixes/next-fixes
Merge made by the 'recursive' strategy.
 fs/btrfs/ioctl.c | 10 ++++++++++
 fs/btrfs/props.c |  8 ++++----
 2 files changed, 14 insertions(+), 4 deletions(-)
Merging vfs-fixes/fixes (6af1c849dfb1 aio: use kmem_cache_free() instead of kfree())
$ git merge vfs-fixes/fixes
Merge made by the 'recursive' strategy.
 fs/aio.c       | 4 ++--
 lib/iov_iter.c | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)
Merging dma-mapping-fixes/for-linus (60d8cd572f65 arm64/xen: fix xen-swiotlb cache flushing)
$ git merge dma-mapping-fixes/for-linus
Already up to date.
Merging i3c-fixes/master (f36c1f9a8dfd i3c: master: dw: fix deadlock)
$ git merge i3c-fixes/master
Already up to date.
Merging drivers-x86-fixes/fixes (9e98c678c2d6 Linux 5.1-rc1)
$ 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 (4eb015358866 scsi: lpfc: Fix missing wakeups on abort threads)
$ git merge scsi-fixes/fixes
Already up to date.
Merging drm-fixes/drm-fixes (9b39b013037f drm/udl: add a release method and delay modeset teardown)
$ git merge drm-fixes/drm-fixes
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/udl/udl_drv.c  | 1 +
 drivers/gpu/drm/udl/udl_drv.h  | 1 +
 drivers/gpu/drm/udl/udl_main.c | 8 +++++++-
 3 files changed, 9 insertions(+), 1 deletion(-)
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 (e1b7058ece71 drm/i915: Fix pipe_bpp readout for BXT/GLK DSI)
$ git merge drm-intel-fixes/for-linux-next-fixes
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/i915/vlv_dsi.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
Merging mmc-fixes/fixes (157c99c5a295 mmc: alcor: don't write data before command has completed)
$ git merge mmc-fixes/fixes
Merge made by the 'recursive' strategy.
 drivers/mmc/host/alcor.c | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)
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 (46fc15487d02 Drivers: hv: vmbus: Expose monitor data only when monitor pages are used)
$ git merge hyperv-fixes/hyperv-fixes
Merge made by the 'recursive' strategy.
 Documentation/ABI/stable/sysfs-bus-vmbus | 12 +++--
 drivers/hv/channel_mgmt.c                |  1 +
 drivers/hv/hyperv_vmbus.h                |  2 +
 drivers/hv/vmbus_drv.c                   | 77 +++++++++++++++++++++++++++++++-
 4 files changed, 87 insertions(+), 5 deletions(-)
Merging drm-misc-fixes/for-linux-next-fixes (1a07a94b47b1 drm/sun4i: tcon top: Fix NULL/invalid pointer dereference in sun8i_tcon_top_un/bind)
$ git merge drm-misc-fixes/for-linux-next-fixes
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 34 +++++++++++++++++++++++++++----
 drivers/gpu/drm/drm_atomic_helper.c       |  5 ++---
 drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c   | 26 ++++++++++++++++-------
 drivers/gpu/drm/omapdrm/dss/hdmi4_core.c  |  2 +-
 drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c     |  9 ++++++--
 drivers/gpu/drm/sun4i/sun8i_tcon_top.c    |  5 +++--
 include/drm/drm_modeset_helper_vtables.h  |  4 ++++
 7 files changed, 66 insertions(+), 19 deletions(-)
Merging kbuild/for-next (823a548d2da6 memory: squash drivers/memory/Makefile.asm-offsets)
$ git merge kbuild/for-next
Removing drivers/memory/Makefile.asm-offsets
Auto-merging Makefile
Merge made by the 'recursive' strategy.
 Makefile                            | 113 ++++++++++++++++++++----------------
 drivers/memory/Makefile             |   5 +-
 drivers/memory/Makefile.asm-offsets |   4 --
 scripts/Makefile.build              |   2 +-
 scripts/Makefile.host               |   2 +-
 scripts/Makefile.lib                |   2 +-
 scripts/Makefile.modbuiltin         |   2 +-
 scripts/gdb/linux/Makefile          |   2 +-
 scripts/mkmakefile                  |  26 +--------
 scripts/tags.sh                     |   2 +-
 10 files changed, 75 insertions(+), 85 deletions(-)
 delete mode 100644 drivers/memory/Makefile.asm-offsets
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 (e43e2657fe77 x86/dma: Remove the x86_dma_fallback_dev hack)
$ git merge dma-mapping/for-next
Merge made by the 'recursive' strategy.
 Documentation/DMA-API-HOWTO.txt    | 13 ++++++-------
 arch/arm/kernel/dma-isa.c          |  8 +++++++-
 arch/arm/mach-rpc/dma.c            |  8 +++++++-
 arch/x86/include/asm/dma-mapping.h | 10 ----------
 arch/x86/kernel/amd_gart_64.c      |  6 ------
 arch/x86/kernel/pci-dma.c          | 20 --------------------
 drivers/parport/parport_ip32.c     | 18 ++++++++++--------
 drivers/video/fbdev/da8xx-fb.c     | 13 +++++++------
 drivers/video/fbdev/gbefb.c        | 24 ++++++++----------------
 drivers/video/fbdev/pxa3xx-gcu.c   |  4 +++-
 include/linux/dma-mapping.h        |  6 +++---
 kernel/dma/Kconfig                 |  1 +
 kernel/dma/direct.c                |  2 +-
 kernel/dma/mapping.c               |  7 -------
 14 files changed, 53 insertions(+), 87 deletions(-)
Merging asm-generic/master (d724444ab97d asm-generic/page.h: fix typo in #error text requiring a real asm/page.h)
$ git merge asm-generic/master
Already up to date.
Merging arc/for-next (5908e6b738e3 Linux 5.0-rc8)
$ git merge arc/for-next
Already up to date.
Merging arm/for-next (4c2741ac5e10 Merge branches 'fixes', 'misc' and 'smp-hotplug' into for-next)
$ git merge arm/for-next
Already up to date.
Merging arm64/for-next/core (f6e564354a01 arm64: Use defines instead of magic numbers)
$ git merge arm64/for-next/core
Merge made by the 'recursive' strategy.
 arch/arm64/include/asm/assembler.h   |  4 ++--
 arch/arm64/include/asm/system_misc.h |  1 -
 arch/arm64/kernel/cpu_ops.c          |  1 +
 arch/arm64/kernel/head.S             | 10 +++++-----
 arch/arm64/kernel/vdso.c             |  2 --
 arch/arm64/kernel/vdso/Makefile      |  8 +++-----
 arch/arm64/mm/fault.c                |  2 +-
 arch/arm64/mm/init.c                 |  5 +++--
 arch/arm64/mm/numa.c                 | 25 ++++++++++++-------------
 9 files changed, 27 insertions(+), 31 deletions(-)
Merging arm-perf/for-next/perf (24062fe85860 perf/smmuv3: Enable HiSilicon Erratum 162001800 quirk)
$ git merge arm-perf/for-next/perf
Merge made by the 'recursive' strategy.
 Documentation/arm64/silicon-errata.txt |   1 +
 drivers/acpi/arm64/iort.c              | 131 ++++-
 drivers/perf/Kconfig                   |   9 +
 drivers/perf/Makefile                  |   1 +
 drivers/perf/arm_smmuv3_pmu.c          | 865 +++++++++++++++++++++++++++++++++
 include/linux/acpi_iort.h              |   8 +
 6 files changed, 991 insertions(+), 24 deletions(-)
 create mode 100644 drivers/perf/arm_smmuv3_pmu.c
Merging arm-soc/for-next (81b901d9009a ARM: Document merges)
$ git merge arm-soc/for-next
Merge made by the 'recursive' strategy.
 arch/arm/arm-soc-for-next-contents.txt | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 arch/arm/arm-soc-for-next-contents.txt
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 (09466d997703 Merge branch 'v5.2/drivers' into tmp/aml-rebuild)
$ git merge amlogic/for-next
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/arm/amlogic.txt  |   1 +
 .../devicetree/bindings/gpu/arm,mali-midgard.txt   |  14 ++
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +
 arch/arm/boot/dts/meson8.dtsi                      |   5 +
 arch/arm/boot/dts/meson8b-odroidc1.dts             |  52 ++++++
 arch/arm/boot/dts/meson8b.dtsi                     |   5 +
 arch/arm/configs/multi_v7_defconfig                |   2 +
 arch/arm64/boot/dts/amlogic/Makefile               |   1 +
 arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts  |  97 +++++++++++
 arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts    |   2 +
 arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts |  81 +++++++++
 arch/arm64/boot/dts/amlogic/meson-g12a.dtsi        | 183 +++++++++++++++++++++
 .../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 +++
 drivers/soc/amlogic/meson-gx-socinfo.c             |  43 +++--
 16 files changed, 512 insertions(+), 16 deletions(-)
 create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts
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 (11c0dbdbf11b Merge branches 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next)
$ git merge at91/at91-next
Auto-merging arch/arm/mach-at91/pm.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/pm.c
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 d801e763a55f] Merge remote-tracking branch 'at91/at91-next'
$ git diff -M --stat --summary HEAD^..
 .../devicetree/bindings/arm/atmel-at91.txt         |   1 +
 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/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/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 +
 20 files changed, 302 insertions(+), 594 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 (ac8ffad29938 Merge branch 'imx/defconfig' into for-next)
$ git merge imx-mxs/for-next
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/arm/fsl.yaml     |  20 +
 .../devicetree/bindings/dma/fsl-imx-sdma.txt       |   1 +
 .../bindings/memory-controllers/fsl/mmdc.txt       |  35 +
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +
 arch/arm/boot/dts/Makefile                         |   2 +
 arch/arm/boot/dts/imx35.dtsi                       |   6 +
 arch/arm/boot/dts/imx50.dtsi                       |  21 +-
 arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts      | 381 +++++++++++
 arch/arm/boot/dts/imx6q-gw54xx.dts                 | 105 +++
 arch/arm/boot/dts/imx6qdl-gw54xx.dtsi              |  29 +-
 arch/arm/boot/dts/imx6qdl-gw551x.dtsi              | 138 ++++
 arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi       |   4 +-
 arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi            |   8 +-
 arch/arm/boot/dts/imx6qdl.dtsi                     |  15 +-
 arch/arm/boot/dts/imx6sl.dtsi                      |   9 +-
 arch/arm/boot/dts/imx6sx.dtsi                      |   2 +-
 arch/arm/boot/dts/imx6ul.dtsi                      |   2 +-
 arch/arm/boot/dts/imx7s-warp.dts                   |   2 +
 arch/arm/boot/dts/imx7ulp.dtsi                     |  12 +
 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/vf610-zii-cfu1.dts               |  16 +-
 arch/arm/boot/dts/vf610-zii-scu4-aib.dts           |   4 +
 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          |   9 +-
 arch/arm/configs/imx_v6_v7_defconfig               |   4 +
 arch/arm/mach-imx/pm-imx6.c                        |   6 +-
 arch/arm64/boot/dts/freescale/Makefile             |   1 +
 .../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     |  62 ++
 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/imx8mm-evk.dts       | 235 +++++++
 arch/arm64/boot/dts/freescale/imx8mm.dtsi          | 703 +++++++++++++++++++++
 arch/arm64/boot/dts/freescale/imx8mq-evk.dts       |  83 +++
 arch/arm64/boot/dts/freescale/imx8mq.dtsi          | 198 ++++++
 arch/arm64/boot/dts/freescale/imx8qxp.dtsi         |  44 +-
 arch/arm64/configs/defconfig                       |   1 +
 drivers/clk/imx/clk-imx7ulp.c                      |   1 -
 drivers/clk/imx/clk.h                              |   5 -
 drivers/firmware/imx/scu-pd.c                      | 121 ++--
 drivers/soc/imx/gpcv2.c                            |  39 +-
 include/dt-bindings/clock/imx7ulp-clock.h          |   1 -
 include/dt-bindings/firmware/imx/rsrc.h            |  25 +-
 50 files changed, 2719 insertions(+), 138 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/mmdc.txt
 create mode 100644 arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts
 create mode 100644 arch/arm/boot/dts/vf610-zii-spb4.dts
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-evk.dts
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm.dtsi
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 (d542127adb0c Merge branch 'v5.0-next/soc' into for-next)
$ git merge mediatek/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging mvebu/for-next (c51f7f863552 Merge branch 'mvebu/dt64' into mvebu/for-next)
$ git merge mvebu/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging omap/for-next (b923dcabe111 Merge branch 'omap-for-v5.2/am4-pm-v2' into for-next)
$ git merge omap/for-next
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/bus/ti-sysc.txt  |   6 +-
 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-pocketbeagle.dts          |  56 +-
 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_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                  |  76 +-
 arch/arm/mach-omap2/sr_device.c                    |   5 +-
 drivers/bus/ti-sysc.c                              | 536 ++++++++++---
 drivers/rtc/rtc-omap.c                             |  51 +-
 drivers/soc/ti/Kconfig                             |   5 +-
 drivers/soc/ti/pm33xx.c                            | 273 +++++--
 include/dt-bindings/pinctrl/am33xx.h               | 130 +++-
 include/dt-bindings/pinctrl/omap.h                 |   1 +
 include/linux/platform_data/pm33xx.h               |   5 +
 include/linux/platform_data/ti-sysc.h              |   9 +-
 include/linux/rtc/rtc-omap.h                       |   7 +
 35 files changed, 1260 insertions(+), 3259 deletions(-)
 create mode 100644 include/linux/rtc/rtc-omap.h
Merging reset/reset/next (d005aa750c9b reset: fix linux/reset.h errors)
$ git merge reset/reset/next
Merge made by the 'recursive' strategy.
 drivers/reset/core.c              | 180 +++++++++++++++++++++++++++++++++++---
 drivers/usb/dwc3/dwc3-of-simple.c |   3 +-
 include/linux/reset.h             | 115 ++++++++++++++++++------
 3 files changed, 257 insertions(+), 41 deletions(-)
Merging qcom/for-next (b9c7d1e25e51 Merge branch 'arm64-for-5.2' into all-for-5.2)
$ git merge qcom/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/iio/adc/qcom,spmi-vadc.txt |  1 +
 .../devicetree/bindings/ufs/ufshcd-pltfrm.txt      |  1 +
 arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi          | 22 +++++
 arch/arm64/boot/dts/qcom/msm8998.dtsi              | 65 +++++++++++++++
 arch/arm64/boot/dts/qcom/pms405.dtsi               | 11 +++
 arch/arm64/boot/dts/qcom/qcs404-evb-4000.dts       | 82 +++++++++++++++++++
 arch/arm64/boot/dts/qcom/qcs404-evb.dtsi           | 95 ++++++++++++++++++----
 arch/arm64/boot/dts/qcom/qcs404.dtsi               | 23 +++++-
 arch/arm64/boot/dts/qcom/sdm845.dtsi               | 22 ++---
 drivers/soc/qcom/cmd-db.c                          |  4 +-
 drivers/soc/qcom/qmi_interface.c                   |  7 +-
 drivers/soc/qcom/rmtfs_mem.c                       | 21 +++++
 12 files changed, 320 insertions(+), 34 deletions(-)
Merging renesas/next (86f046b8eca1 Merge branch 'arm64-dt-for-v5.2' into next)
$ git merge renesas/next
Auto-merging arch/arm64/configs/defconfig
Auto-merging arch/arm/configs/multi_v7_defconfig
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +
 arch/arm/boot/dts/r7s72100-rskrza1.dts             |  46 +++-
 arch/arm/boot/dts/r8a73a4-ape6evm.dts              |  27 +++
 arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts          |  79 +++++++
 arch/arm/boot/dts/r8a77470.dtsi                    |  32 +++
 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/configs/multi_v7_defconfig                |   4 +
 arch/arm/configs/shmobile_defconfig                |  10 +-
 arch/arm/mach-shmobile/pm-rcar-gen2.c              |   1 +
 arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c |   6 +-
 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           |   2 +-
 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          | 253 +++++++++++++++++++--
 arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts     |  53 ++++-
 arch/arm64/boot/dts/renesas/r8a77990.dtsi          |   4 +-
 arch/arm64/boot/dts/renesas/r8a77995-draak.dts     |  32 ++-
 arch/arm64/boot/dts/renesas/salvator-common.dtsi   |  73 +++++-
 arch/arm64/configs/defconfig                       |   1 +
 drivers/soc/renesas/renesas-soc.c                  |   3 +
 include/dt-bindings/power/r8a77965-sysc.h          |   1 -
 28 files changed, 802 insertions(+), 66 deletions(-)
Merging rockchip/for-next (a1dcc8301796 Merge branch 'v5.2-armsoc/dts32' into for-next)
$ git merge rockchip/for-next
Auto-merging arch/arm/boot/dts/Makefile
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/arm/rockchip.yaml          |  25 +-
 arch/arm/boot/dts/Makefile                         |   1 +
 arch/arm/boot/dts/rk3066a-mk808.dts                |  29 +
 arch/arm/boot/dts/rk3066a.dtsi                     |  59 ++
 arch/arm/boot/dts/rk3288-tinker-s.dts              |   5 +
 arch/arm/boot/dts/rk3288-tinker.dtsi               |  37 +
 arch/arm/boot/dts/rk3288-veyron-jerry.dts          |   9 +-
 arch/arm/boot/dts/rk3288-veyron-mighty.dts         |  34 +
 arch/arm/boot/dts/rk3288-veyron.dtsi               |  17 +
 arch/arm/boot/dts/rk3288.dtsi                      |  27 +-
 arch/arm/boot/dts/rv1108-elgin-r1.dts              |   1 -
 arch/arm64/boot/dts/rockchip/Makefile              |   2 +
 arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts     |  32 +
 arch/arm64/boot/dts/rockchip/rk3328-rock64.dts     |  33 +-
 arch/arm64/boot/dts/rockchip/rk3328.dtsi           |   7 +-
 arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts  |  67 ++
 .../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 +++++++++++++++++++++
 arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi      |   1 +
 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts  |   5 +
 arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi   |  45 +-
 arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts  |   4 +
 arch/arm64/boot/dts/rockchip/rk3399.dtsi           |   8 +
 drivers/clk/rockchip/clk-rk3328.c                  |  18 +-
 25 files changed, 1286 insertions(+), 47 deletions(-)
 create mode 100644 arch/arm/boot/dts/rk3288-veyron-mighty.dts
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-nanopi-neo4.dts
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts
Merging samsung/for-next (bebc6082da0a Linux 4.14)
$ git merge samsung/for-next
Already up to date.
Merging samsung-krzk/for-next (377e1eb1008a Merge branch 'next/soc' into for-next)
$ git merge samsung-krzk/for-next
Auto-merging arch/arm/configs/multi_v7_defconfig
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/exynos4412-odroidu3.dts          |   5 +
 arch/arm/boot/dts/exynos4412.dtsi                  |   2 +-
 arch/arm/boot/dts/exynos5260-pinctrl.dtsi          |  16 +
 arch/arm/boot/dts/exynos5260.dtsi                  |  82 ++++-
 arch/arm/boot/dts/exynos5420-arndale-octa.dts      | 364 ++++++++++++++++++++-
 arch/arm/boot/dts/exynos5420.dtsi                  |   2 +-
 arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi  |   5 +-
 arch/arm/configs/exynos_defconfig                  |   1 -
 arch/arm/configs/multi_v7_defconfig                |   1 -
 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                     |  55 +++-
 .../boot/dts/exynos/exynos5433-tm2-common.dtsi     |   6 +
 arch/arm64/boot/dts/exynos/exynos5433-tm2.dts      |   6 +-
 arch/arm64/boot/dts/exynos/exynos5433.dtsi         |  34 +-
 21 files changed, 571 insertions(+), 56 deletions(-)
Merging sunxi/sunxi/for-next (5a61fc012996 Merge branch 'sunxi/dt-for-5.2' into sunxi/for-next)
$ git merge sunxi/sunxi/for-next
Auto-merging arch/arm/boot/dts/Makefile
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Removing Documentation/devicetree/bindings/arm/sunxi.txt
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/arm/sunxi.txt    |  23 -
 Documentation/devicetree/bindings/arm/sunxi.yaml   | 797 +++++++++++++++++++++
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +
 arch/arm/boot/dts/Makefile                         |   1 +
 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   |  19 +-
 arch/arm/boot/dts/sun4i-a10.dtsi                   |   7 +-
 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                       |  31 +-
 arch/arm/boot/dts/sun6i-a31-colombus.dts           |  14 +-
 arch/arm/boot/dts/sun6i-a31-hummingbird.dts        |  16 +-
 arch/arm/boot/dts/sun6i-a31.dtsi                   |  18 +-
 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                   | 121 +++-
 arch/arm/boot/dts/sun8i-a23-a33.dtsi               |  72 +-
 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-tbs-a711.dts          |  53 +-
 arch/arm/boot/dts/sun8i-a83t.dtsi                  |  95 ++-
 .../boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts    |   5 +-
 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    |   4 +-
 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                   |   9 +-
 .../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/sun9i-a80-cubieboard4.dts        |  15 +-
 arch/arm/boot/dts/sun9i-a80-optimus.dts            |   4 +-
 arch/arm/boot/dts/sun9i-a80.dtsi                   |  79 +-
 arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi      |   7 +-
 arch/arm/boot/dts/sunxi-h3-h5.dtsi                 |  44 +-
 arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi   |   4 +-
 arch/arm/mach-sunxi/mc_smp.c                       |   5 +-
 arch/arm/mach-sunxi/platsmp.c                      |   4 +
 arch/arm64/boot/dts/allwinner/Makefile             |   1 +
 .../dts/allwinner/sun50i-a64-amarula-relic.dts     |  15 +
 .../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     |   2 +-
 .../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      |  65 +-
 .../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 +
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi       |  22 +-
 drivers/clk/Kconfig                                |   1 +
 drivers/clk/sunxi-ng/ccu-sun50i-a64.c              |   3 +-
 drivers/clk/sunxi-ng/ccu-sun50i-h6.c               |  19 +-
 drivers/clk/sunxi-ng/ccu-sun8i-v3s.c               |   3 +-
 drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c           |   2 +-
 drivers/clk/sunxi-ng/ccu_nkmp.c                    |  24 +-
 drivers/clk/sunxi/Kconfig                          |  43 ++
 drivers/clk/sunxi/Makefile                         |  49 +-
 114 files changed, 1727 insertions(+), 1043 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/arm/sunxi.txt
 create mode 100644 Documentation/devicetree/bindings/arm/sunxi.yaml
 create mode 100644 arch/arm/boot/dts/sun8i-h3-rervision-dvk.dts
 create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-oceanic-5205-5inmfd.dts
 create mode 100644 drivers/clk/sunxi/Kconfig
Merging tegra/for-next (8b2072d950fc Merge branch for-5.2/arm64/defconfig into for-next)
$ git merge tegra/for-next
Auto-merging arch/arm64/configs/defconfig
Merge made by the 'recursive' strategy.
 arch/arm/mach-tegra/Kconfig                        |  1 +
 arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi     |  1 +
 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-p2894.dtsi     |  6 ++
 arch/arm64/boot/dts/nvidia/tegra210-smaug.dts      |  7 +++
 arch/arm64/boot/dts/nvidia/tegra210.dtsi           | 41 +++++++++++++-
 arch/arm64/configs/defconfig                       |  3 +
 drivers/bus/tegra-aconnect.c                       | 66 +++++++++++++++-------
 drivers/soc/tegra/pmc.c                            | 39 +++++++++++--
 10 files changed, 153 insertions(+), 29 deletions(-)
Merging clk/clk-next (4ec3d901fbd2 Merge branch 'clk-fixes' into clk-next)
$ git merge clk/clk-next
Merge made by the 'recursive' strategy.
 drivers/clk/at91/clk-programmable.c | 57 ++++++++++++++++++++++++++++---------
 drivers/clk/at91/pmc.h              |  2 ++
 drivers/clk/at91/sama5d2.c          | 10 ++++++-
 drivers/clk/meson/clk-pll.c         |  2 +-
 drivers/clk/meson/g12a.c            |  6 ++--
 drivers/clk/meson/gxbb.c            |  2 ++
 drivers/clk/meson/vid-pll-div.c     |  4 +--
 7 files changed, 62 insertions(+), 21 deletions(-)
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.
 drivers/clk/samsung/clk-exynos5410.c   | 1 +
 include/dt-bindings/clock/exynos5410.h | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
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 (1f08b1f3625c csky: Support dynamic start physical address)
$ git merge csky/linux-next
Merge made by the 'recursive' strategy.
 arch/csky/Kconfig                   |   5 +-
 arch/csky/Makefile                  |   2 +-
 arch/csky/abiv1/inc/abi/ckmmu.h     |  20 +++
 arch/csky/abiv1/inc/abi/entry.h     |  52 +++---
 arch/csky/abiv1/inc/abi/regdef.h    |   4 +-
 arch/csky/abiv2/inc/abi/ckmmu.h     |  20 +++
 arch/csky/abiv2/inc/abi/entry.h     |  56 +++---
 arch/csky/abiv2/inc/abi/regdef.h    |   4 +-
 arch/csky/abiv2/mcount.S            |  39 +++-
 arch/csky/abiv2/memmove.S           |   6 +-
 arch/csky/include/asm/Kbuild        |   1 -
 arch/csky/include/asm/ftrace.h      |  18 +-
 arch/csky/include/asm/mmu_context.h |   4 +-
 arch/csky/include/asm/page.h        |  39 ++--
 arch/csky/include/asm/pgtable.h     |  10 +-
 arch/csky/include/asm/ptrace.h      |  41 +++++
 arch/csky/include/asm/syscall.h     |   2 +
 arch/csky/include/asm/thread_info.h |  27 ++-
 arch/csky/include/asm/traps.h       |   5 +
 arch/csky/include/asm/unistd.h      |   2 +
 arch/csky/include/uapi/asm/ptrace.h |  15 --
 arch/csky/kernel/Makefile           |   1 +
 arch/csky/kernel/atomic.S           |  26 +--
 arch/csky/kernel/entry.S            | 268 ++++++++++-----------------
 arch/csky/kernel/ftrace.c           | 148 ++++++++++++++-
 arch/csky/kernel/perf_callchain.c   | 129 +++++++++++++
 arch/csky/kernel/ptrace.c           |  50 +++---
 arch/csky/kernel/setup.c            |   5 +
 arch/csky/kernel/signal.c           | 348 ++++++++++++++----------------------
 arch/csky/mm/fault.c                |  14 +-
 scripts/recordmcount.pl             |   3 +
 31 files changed, 783 insertions(+), 581 deletions(-)
 create mode 100644 arch/csky/include/asm/ptrace.h
 create mode 100644 arch/csky/kernel/perf_callchain.c
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 (733df11cfc36 m68k: defconfig: Update defconfigs for v5.1-rc1)
$ git merge m68k/for-next
Merge made by the 'recursive' strategy.
 arch/m68k/Kconfig                    |   1 -
 arch/m68k/amiga/cia.c                |   9 +++
 arch/m68k/amiga/config.c             |  49 +++++++++---
 arch/m68k/apollo/config.c            |   7 --
 arch/m68k/atari/ataints.c            |   4 +-
 arch/m68k/atari/config.c             |   2 -
 arch/m68k/atari/time.c               |  70 ++++++++++++-----
 arch/m68k/bvme6000/config.c          |  77 +++++++++++-------
 arch/m68k/configs/amiga_defconfig    |  14 ++--
 arch/m68k/configs/apollo_defconfig   |  14 ++--
 arch/m68k/configs/atari_defconfig    |  14 ++--
 arch/m68k/configs/bvme6000_defconfig |  14 ++--
 arch/m68k/configs/hp300_defconfig    |  14 ++--
 arch/m68k/configs/mac_defconfig      |  14 ++--
 arch/m68k/configs/multi_defconfig    |  14 ++--
 arch/m68k/configs/mvme147_defconfig  |  14 ++--
 arch/m68k/configs/mvme16x_defconfig  |  14 ++--
 arch/m68k/configs/q40_defconfig      |  14 ++--
 arch/m68k/configs/sun3_defconfig     |  14 ++--
 arch/m68k/configs/sun3x_defconfig    |  14 ++--
 arch/m68k/hp300/config.c             |   1 -
 arch/m68k/hp300/time.c               |  73 +++++++++++++-----
 arch/m68k/hp300/time.h               |   1 -
 arch/m68k/include/asm/mvme147hw.h    |   2 +-
 arch/m68k/mac/config.c               |   3 -
 arch/m68k/mac/via.c                  | 146 +++++++++++++++++++++++------------
 arch/m68k/mvme147/config.c           |  73 ++++++++++++------
 arch/m68k/mvme16x/config.c           |  97 ++++++++++++++++-------
 arch/m68k/q40/config.c               |   9 ---
 arch/m68k/q40/q40ints.c              |  19 +++--
 arch/m68k/sun3/config.c              |   2 -
 arch/m68k/sun3/intersil.c            |   7 --
 arch/m68k/sun3/sun3ints.c            |   3 +
 arch/m68k/sun3x/config.c             |   1 -
 arch/m68k/sun3x/time.c               |  21 +++--
 arch/m68k/sun3x/time.h               |   1 -
 36 files changed, 517 insertions(+), 329 deletions(-)
Merging m68knommu/for-next (15ade5d2e777 Linux 5.1-rc4)
$ 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 (e6046b5e69a0 MIPS: ralink: fix cpu clock of mt7621 and add dt clk devices)
$ git merge mips/mips-next
Removing arch/mips/net/bpf_jit_asm.S
Removing arch/mips/net/bpf_jit.c
Merge made by the 'recursive' strategy.
 arch/mips/Kconfig                          |   64 +-
 arch/mips/bcm47xx/Kconfig                  |    8 +-
 arch/mips/bcm63xx/boards/Kconfig           |    2 +-
 arch/mips/include/asm/mach-ralink/mt7621.h |   20 +
 arch/mips/include/asm/uasm.h               |    8 +
 arch/mips/include/uapi/asm/inst.h          |    6 +-
 arch/mips/kernel/entry.S                   |    5 +-
 arch/mips/kvm/emulate.c                    |    4 +-
 arch/mips/mm/uasm-mips.c                   |   14 +
 arch/mips/mm/uasm.c                        |   39 +-
 arch/mips/net/Makefile                     |    1 -
 arch/mips/net/bpf_jit.c                    | 1270 ----------------------------
 arch/mips/net/bpf_jit_asm.S                |  285 -------
 arch/mips/net/ebpf_jit.c                   |  191 +++--
 arch/mips/pic32/Kconfig                    |    8 +-
 arch/mips/ralink/mt7621.c                  |  102 ++-
 arch/mips/ralink/timer-gic.c               |    4 +-
 17 files changed, 323 insertions(+), 1708 deletions(-)
 delete mode 100644 arch/mips/net/bpf_jit.c
 delete mode 100644 arch/mips/net/bpf_jit_asm.S
Merging nds32/next (4e8fa54d3d99 nds32: fix semicolon code style issue)
$ git merge nds32/next
Auto-merging arch/nds32/mm/init.c
Merge made by the 'recursive' strategy.
 arch/nds32/kernel/cacheinfo.c | 2 +-
 arch/nds32/mm/init.c          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
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 (dcc7eda13006 parisc: Implement kprobes)
$ git merge parisc-hd/for-next
Auto-merging arch/parisc/kernel/process.c
Auto-merging arch/parisc/include/asm/ptrace.h
Merge made by the 'recursive' strategy.
 arch/parisc/Kconfig                      |   2 +
 arch/parisc/boot/compressed/misc.c       |  31 +++--
 arch/parisc/include/asm/fixmap.h         |  19 ++-
 arch/parisc/include/asm/kgdb.h           |  68 ++++++++++
 arch/parisc/include/asm/kprobes.h        |  55 ++++++++
 arch/parisc/include/asm/patch.h          |  11 ++
 arch/parisc/include/asm/ptrace.h         |  13 ++
 arch/parisc/kernel/Makefile              |   5 +-
 arch/parisc/kernel/kgdb.c                | 209 +++++++++++++++++++++++++++++++
 arch/parisc/kernel/kprobes.c             | 183 +++++++++++++++++++++++++++
 arch/parisc/kernel/patch.c               |  78 ++++++++++++
 arch/parisc/kernel/process.c             |   1 +
 arch/parisc/kernel/ptrace.c              |  35 ++++++
 arch/parisc/kernel/sys_parisc.c          |   3 +-
 arch/parisc/kernel/traps.c               |  31 +++++
 arch/parisc/mm/Makefile                  |   2 +-
 arch/parisc/mm/fixmap.c                  |  41 ++++++
 arch/parisc/mm/init.c                    |  14 ++-
 drivers/net/ethernet/i825xx/lasi_82596.c |   5 +-
 drivers/parisc/led.c                     |   3 +
 20 files changed, 787 insertions(+), 22 deletions(-)
 create mode 100644 arch/parisc/include/asm/kgdb.h
 create mode 100644 arch/parisc/include/asm/kprobes.h
 create mode 100644 arch/parisc/include/asm/patch.h
 create mode 100644 arch/parisc/kernel/kgdb.c
 create mode 100644 arch/parisc/kernel/kprobes.c
 create mode 100644 arch/parisc/kernel/patch.c
 create mode 100644 arch/parisc/mm/fixmap.c
Merging powerpc/next (8c2ffd917477 Linux 5.1-rc2)
$ 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 (15ade5d2e777 Linux 5.1-rc4)
$ git merge risc-v/for-next
Already up to date.
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 (46a984ffb86c s390/cpum_cf: Add support for CPU-MF SVN 6)
$ git merge s390/features
Merge made by the 'recursive' strategy.
 arch/s390/boot/mem_detect.c            |   2 +-
 arch/s390/kernel/perf_cpum_cf.c        |  15 +++--
 arch/s390/kernel/perf_cpum_cf_events.c | 107 ++++++++++++++++++++++-----------
 drivers/s390/block/dasd_eckd.c         |   6 +-
 drivers/s390/cio/qdio.h                |   3 +-
 drivers/s390/cio/qdio_main.c           |  28 ++++-----
 drivers/s390/cio/qdio_setup.c          |   2 +-
 7 files changed, 102 insertions(+), 61 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 (aea05eb56e47 um: Fix for a possible OOPS in ubd initialization)
$ git merge uml/linux-next
Already up to date.
Merging xtensa/xtensa-for-next (a26a70426e9b Merge branch 'xtensa-5.1-fixes' into xtensa-for-next)
$ git merge xtensa/xtensa-for-next
Merge made by the 'recursive' strategy.
 arch/xtensa/include/asm/processor.h | 21 ++++++++++++---------
 arch/xtensa/kernel/entry.S          |  6 ++++++
 arch/xtensa/kernel/stacktrace.c     |  6 +++++-
 arch/xtensa/mm/mmu.c                |  2 +-
 4 files changed, 24 insertions(+), 11 deletions(-)
Merging fscrypt/master (129ca2d2a83f MAINTAINERS: add Eric Biggers as an fscrypt maintainer)
$ 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 (d0d85ba55d62 Merge branch 'for-next-stale-20190328' into for-next-20190328)
$ git merge btrfs-kdave/for-next
Auto-merging fs/btrfs/volumes.h
Auto-merging fs/btrfs/props.c
CONFLICT (content): Merge conflict in fs/btrfs/props.c
Resolved 'fs/btrfs/props.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master bcc70665898e] Merge remote-tracking branch 'btrfs-kdave/for-next'
$ git diff -M --stat --summary HEAD^..
 fs/btrfs/acl.c                         |  48 +++-
 fs/btrfs/backref.c                     |   4 +-
 fs/btrfs/btrfs_inode.h                 |   2 -
 fs/btrfs/compression.c                 |   2 +-
 fs/btrfs/ctree.c                       | 151 +++++-----
 fs/btrfs/ctree.h                       |  35 ++-
 fs/btrfs/delayed-inode.c               |   5 +-
 fs/btrfs/disk-io.c                     | 164 +++++------
 fs/btrfs/disk-io.h                     |   6 +-
 fs/btrfs/extent-tree.c                 |  16 +-
 fs/btrfs/extent_io.c                   | 228 ++++++++-------
 fs/btrfs/extent_io.h                   |  66 +++--
 fs/btrfs/file-item.c                   |  12 +-
 fs/btrfs/file.c                        |   7 +-
 fs/btrfs/free-space-tree.c             |   2 +-
 fs/btrfs/inode.c                       | 326 +++++++++++++---------
 fs/btrfs/ioctl.c                       |  71 +++--
 fs/btrfs/locking.c                     | 135 ++++++---
 fs/btrfs/print-tree.c                  |   2 +-
 fs/btrfs/props.c                       | 208 +++++++-------
 fs/btrfs/props.h                       |   7 +-
 fs/btrfs/qgroup.c                      |   2 +-
 fs/btrfs/relocation.c                  |  52 ++--
 fs/btrfs/root-tree.c                   |  13 +-
 fs/btrfs/scrub.c                       |   2 +-
 fs/btrfs/tests/btrfs-tests.c           |  17 +-
 fs/btrfs/tests/btrfs-tests.h           |  17 +-
 fs/btrfs/tests/extent-buffer-tests.c   |   8 +-
 fs/btrfs/tests/extent-io-tests.c       |  35 ++-
 fs/btrfs/tests/extent-map-tests.c      | 213 +++++++++-----
 fs/btrfs/tests/free-space-tests.c      |  11 +-
 fs/btrfs/tests/free-space-tree-tests.c |  10 +-
 fs/btrfs/tests/inode-tests.c           |  34 ++-
 fs/btrfs/tests/qgroup-tests.c          |  20 +-
 fs/btrfs/transaction.c                 |   4 +-
 fs/btrfs/transaction.h                 |   1 -
 fs/btrfs/tree-checker.c                | 493 ++++++++++++++++++++++++++++-----
 fs/btrfs/tree-checker.h                |   6 +
 fs/btrfs/tree-log.c                    |  19 +-
 fs/btrfs/uuid-tree.c                   |   2 +-
 fs/btrfs/volumes.c                     | 123 +-------
 fs/btrfs/volumes.h                     |   9 +
 fs/btrfs/xattr.c                       |  76 +++--
 fs/btrfs/zstd.c                        |  11 +-
 include/trace/events/btrfs.h           | 157 ++++++++++-
 include/uapi/linux/btrfs_tree.h        |   2 +
 46 files changed, 1826 insertions(+), 1008 deletions(-)
Merging ceph/master (daf5cc27eed9 ceph: fix use-after-free on symlink traversal)
$ git merge ceph/master
Already up to date.
Merging cifs/for-next (fd7aedc1bddd cifs: remove superfluous inode_lock in cifs_{strict_}fsync)
$ git merge cifs/for-next
Merge made by the 'recursive' strategy.
 fs/cifs/cifs_debug.c |   27 +-
 fs/cifs/cifsfs.c     |    2 +
 fs/cifs/cifsglob.h   |   17 +-
 fs/cifs/cifsproto.h  |    9 +
 fs/cifs/connect.c    |   63 +-
 fs/cifs/dfs_cache.c  |  140 +-
 fs/cifs/dfs_cache.h  |    5 +-
 fs/cifs/file.c       |   35 +-
 fs/cifs/misc.c       |   25 +-
 fs/cifs/smb2misc.c   |    6 +-
 fs/cifs/smb2ops.c    |    8 +
 fs/cifs/smb2pdu.c    |   15 +-
 fs/cifs/smb2status.h | 3480 +++++++++++++++++++++++++-------------------------
 fs/cifs/smbdirect.c  |  237 ++--
 fs/cifs/smbdirect.h  |   14 +-
 fs/cifs/transport.c  |   27 +-
 16 files changed, 2147 insertions(+), 1963 deletions(-)
Merging configfs/for-next (cc57c07343bd configfs: fix registered group removal)
$ git merge configfs/for-next
Already up to date.
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/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 (b98177978014 Pull quota limit handling fix.)
$ git merge ext3/for_next
Merge made by the 'recursive' strategy.
 fs/ext2/inode.c     |  4 +++-
 fs/quota/dquot.c    | 18 +++++++++---------
 fs/quota/quota_v1.c |  2 +-
 fs/quota/quota_v2.c |  2 +-
 fs/udf/super.c      |  5 +++++
 5 files changed, 19 insertions(+), 12 deletions(-)
Merging ext4/dev (742b06b5628f jbd2: check superblock mapped prior to committing)
$ git merge ext4/dev
Merge made by the 'recursive' strategy.
 fs/ext4/ext4.h       | 3 ---
 fs/ext4/mballoc.c    | 2 +-
 fs/jbd2/checkpoint.c | 1 -
 fs/jbd2/journal.c    | 4 ++++
 4 files changed, 5 insertions(+), 5 deletions(-)
Merging f2fs/dev (b00c19ab29b6 f2fs: add tracepoint for f2fs_file_write_iter())
$ git merge f2fs/dev
Merge made by the 'recursive' strategy.
 fs/f2fs/checkpoint.c        |  6 ++---
 fs/f2fs/data.c              | 20 ++++++++++------
 fs/f2fs/f2fs.h              | 45 +++++++++++++++++++++++++----------
 fs/f2fs/file.c              | 32 +++++++++++++++++--------
 fs/f2fs/gc.c                |  2 +-
 fs/f2fs/segment.c           | 53 ++++++++++++++++++++---------------------
 fs/f2fs/super.c             | 13 +++++++----
 include/trace/events/f2fs.h | 57 +++++++++++++++++++++++++++++++++++++++++++++
 8 files changed, 161 insertions(+), 67 deletions(-)
Merging fuse/for-next (fabf7e0262d0 fuse: cache readdir calls if filesystem opts out of opendir)
$ git merge fuse/for-next
Already up to date.
Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization)
$ git merge jfs/jfs-next
Merge made by the 'recursive' strategy.
 fs/jfs/acl.c            |  3 ++-
 fs/jfs/jfs_incore.h     |  6 ++++--
 fs/jfs/jfs_logmgr.c     | 18 +++++++++---------
 fs/jfs/jfs_logmgr.h     | 10 +++++-----
 fs/jfs/jfs_mount.c      |  4 ++--
 fs/jfs/jfs_superblock.h |  8 ++++----
 fs/jfs/jfs_txnmgr.c     |  3 +--
 fs/jfs/namei.c          |  2 +-
 fs/jfs/super.c          |  8 +++++---
 9 files changed, 33 insertions(+), 29 deletions(-)
Merging nfs/linux-next (15ade5d2e777 Linux 5.1-rc4)
$ git merge nfs/linux-next
Already up to date.
Merging nfs-anna/linux-next (0789f833b857 NFS: Forbid setting AF_INET6 to "struct sockaddr_in"->sin_family.)
$ git merge nfs-anna/linux-next
Merge made by the 'recursive' strategy.
 fs/nfs/super.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Merging nfsd/nfsd-next (dbcc11a90722 nfsd: knfsd must use the container user namespace)
$ git merge nfsd/nfsd-next
Auto-merging fs/nfsd/nfs4state.c
Auto-merging fs/nfsd/nfs4proc.c
Merge made by the 'recursive' strategy.
 fs/lockd/clntlock.c               |   4 +-
 fs/lockd/svc.c                    |  33 +--
 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/nfs3proc.c                |  17 +-
 fs/nfsd/nfs3xdr.c                 |  32 +--
 fs/nfsd/nfs4callback.c            |   8 +-
 fs/nfsd/nfs4idmap.c               |   8 +-
 fs/nfsd/nfs4proc.c                |   3 +-
 fs/nfsd/nfs4recover.c             | 436 +++++++++++++++++++++++++++++++++++---
 fs/nfsd/nfs4state.c               |  63 ++++--
 fs/nfsd/nfs4xdr.c                 |   9 +-
 fs/nfsd/nfsctl.c                  |  42 ++--
 fs/nfsd/nfsd.h                    |  17 +-
 fs/nfsd/nfssvc.c                  | 267 ++++++++++++++++++-----
 fs/nfsd/nfsxdr.c                  |  17 +-
 fs/nfsd/state.h                   |   9 +-
 include/linux/lockd/bind.h        |   3 +-
 include/linux/sunrpc/svc.h        |  33 +++
 include/linux/sunrpc/svc_xprt.h   |   4 +-
 include/linux/sunrpc/svcsock.h    |   3 +-
 include/uapi/linux/nfsd/cld.h     |   1 +
 net/sunrpc/auth_gss/svcauth_gss.c |   6 +-
 net/sunrpc/cache.c                |   7 +-
 net/sunrpc/svc.c                  | 310 ++++++++++++++++++---------
 net/sunrpc/svc_xprt.c             |  12 +-
 net/sunrpc/svcauth_unix.c         |  15 +-
 net/sunrpc/svcsock.c              |   4 +-
 31 files changed, 1095 insertions(+), 309 deletions(-)
Merging orangefs/for-next (6e356d45950e orangefs: remove two un-needed BUG_ONs...)
$ git merge orangefs/for-next
Already up to date.
Merging overlayfs/overlayfs-next (993a0b2aec52 ovl: Do not lose security.capability xattr over metadata file copy-up)
$ git merge overlayfs/overlayfs-next
Already up to date.
Merging ubifs/linux-next (5578e48e5c0b ubi: wl: Silence uninitialized variable warning)
$ 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 (2032a8a27b5c xfs: serialize unaligned dio writes against all other dio writes)
$ git merge xfs/for-next
Already up to date.
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 (8d91362cc9ba Merge branches 'work.misc' and 'work.dcache' into for-next)
$ git merge vfs/for-next
Merge made by the 'recursive' strategy.
 Documentation/filesystems/porting | 10 ++++++++++
 fs/autofs/autofs_i.h              |  1 +
 fs/autofs/inode.c                 |  2 +-
 fs/dcache.c                       | 28 ++++++++++++++++------------
 fs/internal.h                     |  3 +--
 fs/nsfs.c                         | 26 +++++++++++---------------
 fs/sysv/namei.c                   | 15 ---------------
 fs/sysv/super.c                   |  3 ---
 fs/sysv/sysv.h                    |  3 ---
 include/linux/dcache.h            |  3 +--
 include/linux/mount.h             |  2 ++
 kernel/acct.c                     |  4 ++--
 12 files changed, 45 insertions(+), 55 deletions(-)
Merging printk/for-next (2821fd0c2be0 lib/test_printf: Switch to bitmap_zalloc())
$ git merge printk/for-next
Merge made by the 'recursive' strategy.
 lib/test_printf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Merging pci/next (e3a5de7be7a5 Merge branch 'pci/trivial')
$ git merge pci/next
Merge made by the 'recursive' strategy.
 drivers/pci/controller/dwc/pci-keystone.c |   2 +-
 drivers/pci/controller/pci-host-generic.c |   2 +-
 drivers/pci/controller/pci-hyperv.c       |  23 ++
 drivers/pci/controller/pcie-iproc-msi.c   |   2 +-
 drivers/pci/controller/pcie-rcar.c        |  21 ++
 drivers/pci/controller/pcie-xilinx-nwl.c  |   9 +-
 drivers/pci/pci.c                         | 328 +++++++++++++++--------------
 drivers/pci/proc.c                        |   1 +
 drivers/pci/xen-pcifront.c                |   2 +-
 include/linux/cper.h                      | 336 +++++++++++++++---------------
 include/linux/msi.h                       |  18 --
 include/uapi/linux/pci_regs.h             | 132 ++++++------
 tools/pci/pcitest.c                       |   4 +-
 13 files changed, 457 insertions(+), 423 deletions(-)
Merging pstore/for-next/pstore (93ee4b7d9f06 pstore/ram: Avoid needless alloc during header write)
$ git merge pstore/for-next/pstore
Already up to date.
Merging hid/for-next (c569255abd6e Merge branch 'for-5.2/core' into for-next)
$ git merge hid/for-next
Merge made by the 'recursive' strategy.
 drivers/hid/Kconfig                          |   10 +
 drivers/hid/Makefile                         |    2 +
 drivers/hid/hid-core.c                       |   46 +-
 drivers/hid/hid-ids.h                        |    1 +
 drivers/hid/hid-logitech-hidpp.c             |   33 +-
 drivers/hid/hid-macally.c                    |   45 ++
 drivers/hid/hid-picolcd_core.c               |   18 +-
 drivers/hid/hid-sensor-custom.c              |   12 +-
 drivers/hid/intel-ish-hid/Kconfig            |   15 +
 drivers/hid/intel-ish-hid/Makefile           |    3 +
 drivers/hid/intel-ish-hid/ishtp-fw-loader.c  | 1085 ++++++++++++++++++++++++++
 drivers/hid/intel-ish-hid/ishtp-hid-client.c |  168 ++--
 drivers/hid/intel-ish-hid/ishtp-hid.c        |   49 +-
 drivers/hid/intel-ish-hid/ishtp-hid.h        |   14 +-
 drivers/hid/intel-ish-hid/ishtp/bus.c        |   96 ++-
 drivers/hid/intel-ish-hid/ishtp/bus.h        |   37 +-
 drivers/hid/intel-ish-hid/ishtp/client.c     |   60 +-
 drivers/hid/intel-ish-hid/ishtp/client.h     |   24 -
 drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h  |   31 -
 include/linux/hid.h                          |    1 +
 include/linux/intel-ish-client-if.h          |  112 +++
 21 files changed, 1617 insertions(+), 245 deletions(-)
 create mode 100644 drivers/hid/hid-macally.c
 create mode 100644 drivers/hid/intel-ish-hid/ishtp-fw-loader.c
 create mode 100644 include/linux/intel-ish-client-if.h
Merging i2c/i2c/for-next (88d609a3ad7a Merge branch 'i2c/for-current-fixed' into i2c/for-next)
$ git merge i2c/i2c/for-next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/i2c/brcm,iproc-i2c.txt     |  17 +-
 .../devicetree/bindings/i2c/i2c-designware.txt     |   9 +
 .../devicetree/bindings/i2c/i2c-stm32.txt          |  37 +-
 Documentation/i2c/busses/i2c-amd-mp2               |  23 +
 MAINTAINERS                                        |  11 +-
 drivers/i2c/busses/Kconfig                         |  24 +
 drivers/i2c/busses/Makefile                        |   5 +
 drivers/i2c/busses/i2c-amd-mp2-pci.c               | 483 +++++++++++++
 drivers/i2c/busses/i2c-amd-mp2-plat.c              | 367 ++++++++++
 drivers/i2c/busses/i2c-amd-mp2.h                   | 219 ++++++
 drivers/i2c/busses/i2c-at91-core.c                 | 376 ++++++++++
 .../i2c/busses/{i2c-at91.c => i2c-at91-master.c}   | 480 +------------
 drivers/i2c/busses/i2c-at91-slave.c                | 143 ++++
 drivers/i2c/busses/i2c-at91.h                      | 174 +++++
 drivers/i2c/busses/i2c-bcm-iproc.c                 | 758 +++++++++++++++++----
 drivers/i2c/busses/i2c-designware-common.c         |  18 +-
 drivers/i2c/busses/i2c-designware-core.h           |   2 +
 drivers/i2c/busses/i2c-designware-platdrv.c        |   5 +
 drivers/i2c/busses/i2c-isch.c                      |   1 -
 drivers/i2c/busses/i2c-nomadik.c                   |   3 +-
 drivers/i2c/busses/i2c-rcar.c                      |  30 +-
 drivers/i2c/busses/i2c-stm32f7.c                   |   4 +
 include/linux/i2c.h                                |  23 +-
 23 files changed, 2567 insertions(+), 645 deletions(-)
 create mode 100644 Documentation/i2c/busses/i2c-amd-mp2
 create mode 100644 drivers/i2c/busses/i2c-amd-mp2-pci.c
 create mode 100644 drivers/i2c/busses/i2c-amd-mp2-plat.c
 create mode 100644 drivers/i2c/busses/i2c-amd-mp2.h
 create mode 100644 drivers/i2c/busses/i2c-at91-core.c
 rename drivers/i2c/busses/{i2c-at91.c => i2c-at91-master.c} (65%)
 create mode 100644 drivers/i2c/busses/i2c-at91-slave.c
 create mode 100644 drivers/i2c/busses/i2c-at91.h
Merging i3c/i3c/next (124dbd750da4 i3c: master: dw: remove dead code from dw_i3c_master_*_xfers())
$ git merge i3c/i3c/next
Merge made by the 'recursive' strategy.
 drivers/i3c/master/dw-i3c-master.c | 10 ----------
 1 file changed, 10 deletions(-)
Merging dmi/master (57361846b52b Linux 4.19-rc2)
$ git merge dmi/master
Already up to date.
Merging hwmon-staging/hwmon-next (9c0f3df00266 hwmon: (vt1211) Use request_muxed_region for Super-IO accesses)
$ git merge hwmon-staging/hwmon-next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/hwmon/cirrus,lochnagar.txt |  26 ++
 Documentation/hwmon/hwmon-kernel-api.txt           |  13 +
 Documentation/hwmon/lochnagar                      |  80 ++++
 MAINTAINERS                                        |   3 +
 drivers/hwmon/Kconfig                              |  10 +
 drivers/hwmon/Makefile                             |   1 +
 drivers/hwmon/ad7414.c                             |   2 +-
 drivers/hwmon/adc128d818.c                         |   2 +-
 drivers/hwmon/adm1025.c                            |  98 ++---
 drivers/hwmon/adm1026.c                            | 416 +++++++++++----------
 drivers/hwmon/adm1029.c                            |  41 +-
 drivers/hwmon/adm1031.c                            | 201 +++++-----
 drivers/hwmon/adm9240.c                            | 135 ++++---
 drivers/hwmon/ads1015.c                            |   2 +-
 drivers/hwmon/ads7828.c                            |   2 +-
 drivers/hwmon/adt7411.c                            |  48 +--
 drivers/hwmon/adt7475.c                            |   2 +-
 drivers/hwmon/f71805f.c                            |  15 +-
 drivers/hwmon/hih6130.c                            |   2 +-
 drivers/hwmon/iio_hwmon.c                          |  27 +-
 drivers/hwmon/ina209.c                             |   2 +-
 drivers/hwmon/ina2xx.c                             |   2 +-
 drivers/hwmon/ina3221.c                            |  48 +--
 drivers/hwmon/jc42.c                               |  18 +-
 drivers/hwmon/jz4740-hwmon.c                       |   4 +-
 drivers/hwmon/lm63.c                               |   2 +-
 drivers/hwmon/lm75.c                               |  34 +-
 drivers/hwmon/lm78.c                               | 114 +++---
 drivers/hwmon/lm85.c                               | 342 ++++++++---------
 drivers/hwmon/lm87.c                               | 165 ++++----
 drivers/hwmon/lm90.c                               |  15 +-
 drivers/hwmon/lm95241.c                            |  34 +-
 drivers/hwmon/lm95245.c                            |  49 +--
 drivers/hwmon/lochnagar-hwmon.c                    | 412 ++++++++++++++++++++
 drivers/hwmon/ltc4151.c                            |   2 +-
 drivers/hwmon/ltc4245.c                            |  73 ++--
 drivers/hwmon/ltq-cputemp.c                        |  26 +-
 drivers/hwmon/max31790.c                           |  58 +--
 drivers/hwmon/max6621.c                            |  44 +--
 drivers/hwmon/max6650.c                            |   2 +-
 drivers/hwmon/max6697.c                            |   2 +-
 drivers/hwmon/menf21bmc_hwmon.c                    |  43 ++-
 drivers/hwmon/mlxreg-fan.c                         | 121 ++++--
 drivers/hwmon/nct7904.c                            | 128 +++----
 drivers/hwmon/npcm750-pwm-fan.c                    |  70 ++--
 drivers/hwmon/ntc_thermistor.c                     |  24 +-
 drivers/hwmon/pc87427.c                            |  14 +-
 drivers/hwmon/pmbus/tps53679.c                     |   2 +-
 drivers/hwmon/pmbus/ucd9000.c                      |   2 +-
 drivers/hwmon/pmbus/ucd9200.c                      |   2 +-
 drivers/hwmon/raspberrypi-hwmon.c                  |  13 +-
 drivers/hwmon/sis5595.c                            |  92 +++--
 drivers/hwmon/smsc47b397.c                         |  13 +-
 drivers/hwmon/smsc47m1.c                           | 106 +++---
 drivers/hwmon/smsc47m192.c                         | 146 ++++----
 drivers/hwmon/stts751.c                            |   2 +-
 drivers/hwmon/thmc50.c                             |  83 ++--
 drivers/hwmon/tmp102.c                             |  28 +-
 drivers/hwmon/tmp103.c                             |   2 +-
 drivers/hwmon/tmp108.c                             |  29 +-
 drivers/hwmon/tmp421.c                             |   2 +-
 drivers/hwmon/via686a.c                            | 148 ++++----
 drivers/hwmon/vt1211.c                             |  15 +-
 drivers/hwmon/vt8231.c                             | 166 ++++----
 drivers/hwmon/w83627hf.c                           | 299 +++++++--------
 drivers/hwmon/w83773g.c                            |  32 +-
 include/linux/hwmon.h                              |   8 +
 67 files changed, 2259 insertions(+), 1905 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/hwmon/cirrus,lochnagar.txt
 create mode 100644 Documentation/hwmon/lochnagar
 create mode 100644 drivers/hwmon/lochnagar-hwmon.c
Merging jc_docs/docs-next (583b3845915d docs/zh_CN: correct a word in managment-style.)
$ git merge jc_docs/docs-next
Auto-merging scripts/checkpatch.pl
Auto-merging MAINTAINERS
Removing Documentation/translations/zh_CN/magic-number.txt
Removing Documentation/translations/zh_CN/SubmittingPatches
Auto-merging .mailmap
Merge made by the 'recursive' strategy.
 .mailmap                                           |   6 +
 Documentation/Makefile                             |   9 +-
 Documentation/core-api/index.rst                   |   1 -
 Documentation/driver-api/soundwire/stream.rst      |  16 +-
 Documentation/process/5.Posting.rst                |  10 +-
 Documentation/process/coding-style.rst             |   6 +-
 Documentation/process/deprecated.rst               |   2 +
 Documentation/process/kernel-docs.rst              |  12 -
 Documentation/process/submitting-patches.rst       |  46 +-
 Documentation/rtc.txt                              |   2 +-
 Documentation/sysctl/kernel.txt                    |   2 +-
 Documentation/translations/index.rst               |  40 +
 .../translations/it_IT/disclaimer-ita.rst          |  13 +-
 Documentation/translations/it_IT/index.rst         |  65 +-
 .../translations/it_IT/networking/netdev-FAQ.rst   |  13 +
 .../translations/it_IT/process/5.Posting.rst       |  10 +-
 .../translations/it_IT/process/deprecated.rst      | 129 +++
 .../it_IT/process/kernel-enforcement-statement.rst | 168 +++-
 .../translations/it_IT/process/license-rules.rst   | 452 ++++++++++
 .../it_IT/process/maintainer-pgp-guide.rst         | 939 ++++++++++++++++++++-
 .../it_IT/process/stable-kernel-rules.rst          | 194 ++++-
 .../it_IT/process/submitting-patches.rst           |  47 +-
 Documentation/translations/ja_JP/SubmittingPatches |   6 +-
 Documentation/translations/zh_CN/SubmittingPatches | 412 ---------
 .../translations/zh_CN/disclaimer-zh_CN.rst        |   9 +
 Documentation/translations/zh_CN/index.rst         |  17 +-
 Documentation/translations/zh_CN/magic-number.txt  | 153 ----
 Documentation/translations/zh_CN/oops-tracing.txt  |   2 +-
 .../translations/zh_CN/process/1.Intro.rst         | 186 ++++
 .../translations/zh_CN/process/2.Process.rst       | 360 ++++++++
 .../translations/zh_CN/process/3.Early-stage.rst   | 161 ++++
 .../translations/zh_CN/process/4.Coding.rst        | 290 +++++++
 .../translations/zh_CN/process/5.Posting.rst       | 240 ++++++
 .../translations/zh_CN/process/6.Followthrough.rst | 145 ++++
 .../zh_CN/process/7.AdvancedTopics.rst             | 124 +++
 .../translations/zh_CN/process/8.Conclusion.rst    |  64 ++
 .../process/code-of-conduct-interpretation.rst     | 108 +++
 .../translations/zh_CN/process/code-of-conduct.rst |  72 ++
 .../zh_CN/{ => process}/coding-style.rst           |  21 +-
 .../zh_CN/process/development-process.rst          |  26 +
 .../email-clients.rst}                             | 104 ++-
 .../zh_CN/{HOWTO => process/howto.rst}             | 265 +++---
 Documentation/translations/zh_CN/process/index.rst |  60 ++
 .../translations/zh_CN/process/license-rules.rst   | 370 ++++++++
 .../translations/zh_CN/process/magic-number.rst    | 151 ++++
 .../zh_CN/process/management-style.rst             | 207 +++++
 .../zh_CN/process/programming-language.rst         |  41 +
 .../stable-api-nonsense.rst}                       |  68 +-
 .../stable-kernel-rules.rst}                       |  34 +-
 .../zh_CN/process/submit-checklist.rst             | 107 +++
 .../submitting-drivers.rst}                        |  36 +-
 .../zh_CN/process/submitting-patches.rst           | 682 +++++++++++++++
 .../volatile-considered-harmful.rst}               |  35 +-
 Documentation/translations/zh_CN/sparse.txt        |   6 +-
 Documentation/userspace-api/seccomp_filter.rst     |   8 +-
 Documentation/x86/boot.txt                         |   4 +
 MAINTAINERS                                        |   2 +-
 scripts/checkpatch.pl                              |  18 +
 scripts/sphinx-pre-install                         |   1 +
 59 files changed, 5811 insertions(+), 966 deletions(-)
 create mode 100644 Documentation/translations/it_IT/networking/netdev-FAQ.rst
 create mode 100644 Documentation/translations/it_IT/process/deprecated.rst
 create mode 100644 Documentation/translations/it_IT/process/license-rules.rst
 delete mode 100644 Documentation/translations/zh_CN/SubmittingPatches
 create mode 100644 Documentation/translations/zh_CN/disclaimer-zh_CN.rst
 delete mode 100644 Documentation/translations/zh_CN/magic-number.txt
 create mode 100644 Documentation/translations/zh_CN/process/1.Intro.rst
 create mode 100644 Documentation/translations/zh_CN/process/2.Process.rst
 create mode 100644 Documentation/translations/zh_CN/process/3.Early-stage.rst
 create mode 100644 Documentation/translations/zh_CN/process/4.Coding.rst
 create mode 100644 Documentation/translations/zh_CN/process/5.Posting.rst
 create mode 100644 Documentation/translations/zh_CN/process/6.Followthrough.rst
 create mode 100644 Documentation/translations/zh_CN/process/7.AdvancedTopics.rst
 create mode 100644 Documentation/translations/zh_CN/process/8.Conclusion.rst
 create mode 100644 Documentation/translations/zh_CN/process/code-of-conduct-interpretation.rst
 create mode 100644 Documentation/translations/zh_CN/process/code-of-conduct.rst
 rename Documentation/translations/zh_CN/{ => process}/coding-style.rst (97%)
 create mode 100644 Documentation/translations/zh_CN/process/development-process.rst
 rename Documentation/translations/zh_CN/{email-clients.txt => process/email-clients.rst} (74%)
 rename Documentation/translations/zh_CN/{HOWTO => process/howto.rst} (70%)
 create mode 100644 Documentation/translations/zh_CN/process/index.rst
 create mode 100644 Documentation/translations/zh_CN/process/license-rules.rst
 create mode 100644 Documentation/translations/zh_CN/process/magic-number.rst
 create mode 100644 Documentation/translations/zh_CN/process/management-style.rst
 create mode 100644 Documentation/translations/zh_CN/process/programming-language.rst
 rename Documentation/translations/zh_CN/{stable_api_nonsense.txt => process/stable-api-nonsense.rst} (78%)
 rename Documentation/translations/zh_CN/{stable_kernel_rules.txt => process/stable-kernel-rules.rst} (74%)
 create mode 100644 Documentation/translations/zh_CN/process/submit-checklist.rst
 rename Documentation/translations/zh_CN/{SubmittingDrivers => process/submitting-drivers.rst} (85%)
 create mode 100644 Documentation/translations/zh_CN/process/submitting-patches.rst
 rename Documentation/translations/zh_CN/{volatile-considered-harmful.txt => process/volatile-considered-harmful.rst} (81%)
Merging v4l-dvb/master (1c3ec30bb230 media: index.rst: exclude Indexes section from latex/pdf output)
$ git merge v4l-dvb/master
Removing drivers/staging/media/mt9t031/TODO
Removing drivers/staging/media/mt9t031/Makefile
Removing drivers/staging/media/mt9t031/Kconfig
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/media/cedrus.txt |   1 +
 .../devicetree/bindings/media/rcar_vin.txt         |   1 +
 .../bindings/media/renesas,rcar-csi2.txt           |   1 +
 Documentation/media/index.rst                      |   2 +-
 Documentation/media/uapi/mediactl/request-api.rst  |   2 +-
 Documentation/media/uapi/v4l/buffer.rst            |  21 +-
 Documentation/media/uapi/v4l/colorspaces-defs.rst  |   4 +-
 Documentation/media/uapi/v4l/colorspaces.rst       |   4 +-
 Documentation/media/uapi/v4l/dev-raw-vbi.rst       |   4 +-
 Documentation/media/uapi/v4l/dev-rds.rst           |   2 +-
 Documentation/media/uapi/v4l/dev-sliced-vbi.rst    |  22 +-
 Documentation/media/uapi/v4l/dev-subdev.rst        |  82 ++-
 Documentation/media/uapi/v4l/ext-ctrls-camera.rst  |  17 +-
 Documentation/media/uapi/v4l/ext-ctrls-codec.rst   | 211 +++++-
 Documentation/media/uapi/v4l/ext-ctrls-detect.rst  |   2 +-
 Documentation/media/uapi/v4l/ext-ctrls-dv.rst      |   2 +-
 Documentation/media/uapi/v4l/ext-ctrls-flash.rst   |   4 +-
 Documentation/media/uapi/v4l/ext-ctrls-jpeg.rst    |   2 +-
 Documentation/media/uapi/v4l/field-order.rst       |   4 +-
 Documentation/media/uapi/v4l/pixfmt-compressed.rst |   6 +
 Documentation/media/uapi/v4l/pixfmt-meta-d4xx.rst  |   9 +-
 .../media/uapi/v4l/pixfmt-meta-vsp1-hgt.rst        |   9 +
 Documentation/media/uapi/v4l/pixfmt-packed-hsv.rst |   2 +-
 Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst |   4 +-
 Documentation/media/uapi/v4l/pixfmt-packed-yuv.rst |  23 +-
 Documentation/media/uapi/v4l/pixfmt-srggb10p.rst   |   2 +-
 Documentation/media/uapi/v4l/pixfmt-srggb12p.rst   |   3 +-
 Documentation/media/uapi/v4l/pixfmt-srggb14p.rst   |  24 +-
 .../media/uapi/v4l/pixfmt-v4l2-mplane.rst          |  17 +-
 Documentation/media/uapi/v4l/pixfmt-y10p.rst       |  10 +
 Documentation/media/uapi/v4l/subdev-formats.rst    |   6 +-
 Documentation/media/uapi/v4l/vidioc-qbuf.rst       |  10 +-
 MAINTAINERS                                        |   5 +-
 drivers/media/Kconfig                              |  20 +-
 drivers/media/cec/Kconfig                          |   4 +-
 drivers/media/cec/cec-core.c                       |   1 +
 drivers/media/common/cx2341x.c                     | 151 ++--
 drivers/media/common/siano/Kconfig                 |   4 +-
 drivers/media/common/videobuf2/videobuf2-core.c    |  24 +-
 drivers/media/common/videobuf2/videobuf2-v4l2.c    |   7 +-
 drivers/media/common/videobuf2/videobuf2-vmalloc.c |  10 +-
 drivers/media/dvb-core/dvbdev.c                    |   1 -
 drivers/media/dvb-frontends/as102_fe.c             |   2 +-
 drivers/media/dvb-frontends/dib7000p.c             |   3 +-
 drivers/media/dvb-frontends/dib8000.c              |   4 +-
 drivers/media/dvb-frontends/dib9000.c              |   6 +-
 drivers/media/dvb-frontends/dvb-pll.c              |   2 +-
 drivers/media/dvb-frontends/m88ds3103.c            |  11 +-
 drivers/media/dvb-frontends/si2165.c               |   8 +-
 drivers/media/i2c/Kconfig                          | 258 +++----
 drivers/media/i2c/cx25840/Kconfig                  |   2 +-
 drivers/media/i2c/et8ek8/Kconfig                   |   2 +-
 drivers/media/i2c/imx214.c                         |  10 +-
 drivers/media/i2c/m5mols/Kconfig                   |   2 +-
 drivers/media/i2c/ov7670.c                         |  32 +-
 drivers/media/i2c/ov7740.c                         |  28 +-
 drivers/media/i2c/smiapp/Kconfig                   |   2 +-
 drivers/media/media-devnode.c                      |   1 +
 drivers/media/media-entity.c                       |  33 +-
 drivers/media/media-request.c                      |   4 +-
 drivers/media/mmc/siano/Kconfig                    |   2 +-
 drivers/media/pci/bt8xx/Kconfig                    |   2 +-
 drivers/media/pci/bt8xx/dst.c                      |   3 +-
 drivers/media/pci/bt8xx/dst_common.h               |   2 +-
 drivers/media/pci/cobalt/Kconfig                   |   2 +-
 drivers/media/pci/cobalt/cobalt-irq.c              |   2 +-
 drivers/media/pci/cx18/Kconfig                     |   4 +-
 drivers/media/pci/cx18/cx18-fileops.c              |   2 +-
 drivers/media/pci/cx23885/Kconfig                  |   4 +-
 drivers/media/pci/cx23885/cx23885-dvb.c            |   5 +-
 drivers/media/pci/cx25821/Kconfig                  |   4 +-
 drivers/media/pci/cx88/Kconfig                     |  10 +-
 drivers/media/pci/ddbridge/Kconfig                 |   4 +-
 drivers/media/pci/dt3155/Kconfig                   |   2 +-
 drivers/media/pci/intel/ipu3/Kconfig               |   2 +-
 drivers/media/pci/intel/ipu3/ipu3-cio2.c           |   1 +
 drivers/media/pci/ivtv/Kconfig                     |  10 +-
 drivers/media/pci/ivtv/ivtv-fileops.c              |   2 +-
 drivers/media/pci/mantis/mantis_i2c.c              |   2 +-
 drivers/media/pci/meye/Kconfig                     |   2 +-
 drivers/media/pci/netup_unidvb/Kconfig             |   2 +-
 drivers/media/pci/ngene/Kconfig                    |   2 +-
 drivers/media/pci/saa7134/Kconfig                  |  10 +-
 drivers/media/pci/saa7134/saa7134-go7007.c         |   2 +-
 drivers/media/pci/saa7146/Kconfig                  |   6 +-
 drivers/media/pci/saa7146/hexium_gemini.c          |   5 +-
 drivers/media/pci/saa7146/hexium_orion.c           |   5 +-
 drivers/media/pci/saa7164/Kconfig                  |   2 +-
 drivers/media/pci/solo6x10/Kconfig                 |   2 +-
 drivers/media/pci/tw5864/Kconfig                   |   2 +-
 drivers/media/pci/tw5864/tw5864-video.c            |   4 +-
 drivers/media/pci/tw68/Kconfig                     |   2 +-
 drivers/media/platform/Kconfig                     |  72 +-
 drivers/media/platform/am437x/am437x-vpfe.c        |   2 +-
 drivers/media/platform/atmel/Kconfig               |   2 +-
 drivers/media/platform/atmel/atmel-isc-regs.h      |   2 +
 drivers/media/platform/atmel/atmel-isc.c           |   7 +-
 drivers/media/platform/davinci/isif.c              |   9 -
 drivers/media/platform/davinci/vpfe_capture.c      |   2 +-
 drivers/media/platform/davinci/vpif_capture.c      |   3 +-
 drivers/media/platform/davinci/vpif_display.c      |   4 +-
 drivers/media/platform/exynos4-is/fimc-capture.c   |   2 +-
 drivers/media/platform/exynos4-is/fimc-m2m.c       |   2 +-
 drivers/media/platform/imx-pxp.c                   |   4 +-
 drivers/media/platform/marvell-ccic/Kconfig        |   4 +-
 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c |  13 +-
 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h |   2 -
 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c |  10 +-
 drivers/media/platform/mtk-vpu/mtk_vpu.c           |   2 +-
 drivers/media/platform/mx2_emmaprp.c               |   4 +-
 drivers/media/platform/omap/Kconfig                |   2 +-
 drivers/media/platform/pxa_camera.c                |   2 +-
 drivers/media/platform/qcom/venus/hfi_helper.h     |   4 +-
 drivers/media/platform/rcar-vin/Kconfig            |   2 +-
 drivers/media/platform/rcar-vin/rcar-core.c        |  47 +-
 drivers/media/platform/rcar-vin/rcar-csi2.c        |   4 +
 drivers/media/platform/rcar-vin/rcar-dma.c         |   2 +-
 drivers/media/platform/rcar_drif.c                 |   8 +-
 drivers/media/platform/rcar_fdp1.c                 |  28 +-
 drivers/media/platform/s5p-g2d/g2d.c               |   6 +-
 drivers/media/platform/sh_veu.c                    |   6 -
 drivers/media/platform/sti/c8sectpfe/Kconfig       |   2 +-
 drivers/media/platform/sti/delta/delta-ipc.c       |   6 +-
 drivers/media/platform/stm32/stm32-dcmi.c          |  23 +-
 .../media/platform/sunxi/sun6i-csi/sun6i_video.c   |   4 +-
 drivers/media/platform/ti-vpe/cal.c                |  12 +-
 drivers/media/platform/ti-vpe/vpe.c                |   6 +-
 drivers/media/platform/vicodec/codec-fwht.c        | 121 ++--
 drivers/media/platform/vicodec/codec-fwht.h        |  12 +-
 drivers/media/platform/vicodec/codec-v4l2-fwht.c   | 431 ++++--------
 drivers/media/platform/vicodec/codec-v4l2-fwht.h   |   7 +-
 drivers/media/platform/vicodec/vicodec-core.c      | 762 +++++++++++++++------
 drivers/media/platform/video-mux.c                 |   5 +
 drivers/media/platform/vim2m.c                     |  69 +-
 drivers/media/platform/vimc/Kconfig                |   2 +-
 drivers/media/platform/vimc/vimc-capture.c         |  17 +-
 drivers/media/platform/vimc/vimc-common.c          |   4 +-
 drivers/media/platform/vimc/vimc-common.h          |   2 +
 drivers/media/platform/vimc/vimc-core.c            |   2 +
 drivers/media/platform/vimc/vimc-debayer.c         |  17 +-
 drivers/media/platform/vimc/vimc-scaler.c          |  15 +-
 drivers/media/platform/vimc/vimc-sensor.c          |  19 +-
 drivers/media/platform/vimc/vimc-streamer.c        |  38 +-
 drivers/media/platform/vimc/vimc-streamer.h        |  16 +-
 drivers/media/platform/vivid/Kconfig               |   6 +-
 drivers/media/platform/vivid/vivid-core.c          |   2 +-
 drivers/media/platform/vivid/vivid-vid-out.c       |  14 +-
 drivers/media/platform/xilinx/Kconfig              |   6 +-
 drivers/media/radio/Kconfig                        |  54 +-
 drivers/media/radio/si470x/Kconfig                 |   6 +-
 drivers/media/radio/si4713/Kconfig                 |   6 +-
 drivers/media/radio/si4713/si4713.c                |   2 +-
 drivers/media/radio/wl128x/fmdrv_common.c          |  14 +-
 drivers/media/rc/Kconfig                           |  80 +--
 drivers/media/rc/ir-rcmm-decoder.c                 |   1 -
 drivers/media/rc/keymaps/Kconfig                   |   2 +-
 drivers/media/rc/serial_ir.c                       |   9 +-
 drivers/media/spi/Kconfig                          |   2 +-
 drivers/media/usb/airspy/Kconfig                   |   2 +-
 drivers/media/usb/au0828/Kconfig                   |   6 +-
 drivers/media/usb/au0828/au0828-video.c            |   4 +-
 drivers/media/usb/cpia2/Kconfig                    |   2 +-
 drivers/media/usb/cpia2/cpia2_v4l.c                |   3 +-
 drivers/media/usb/cx231xx/Kconfig                  |   8 +-
 drivers/media/usb/dvb-usb-v2/af9035.c              | 104 +--
 drivers/media/usb/dvb-usb-v2/af9035.h              |  12 +
 drivers/media/usb/dvb-usb-v2/dvbsky.c              |  18 +-
 drivers/media/usb/em28xx/Kconfig                   |   8 +-
 drivers/media/usb/em28xx/em28xx-input.c            |   2 +-
 drivers/media/usb/go7007/Kconfig                   |   8 +-
 drivers/media/usb/go7007/go7007-fw.c               |   4 +-
 drivers/media/usb/go7007/go7007-usb.c              |  16 +-
 drivers/media/usb/go7007/go7007-v4l2.c             |   2 +-
 drivers/media/usb/gspca/Kconfig                    |   2 +-
 drivers/media/usb/gspca/gspca.c                    |  12 +-
 drivers/media/usb/hackrf/Kconfig                   |   2 +-
 drivers/media/usb/hdpvr/Kconfig                    |   2 +-
 drivers/media/usb/hdpvr/hdpvr-video.c              |  10 +-
 drivers/media/usb/pulse8-cec/Kconfig               |   2 +-
 drivers/media/usb/pulse8-cec/pulse8-cec.c          |   4 +-
 drivers/media/usb/pvrusb2/Kconfig                  |   8 +-
 drivers/media/usb/pvrusb2/pvrusb2-hdw.c            |   5 +-
 drivers/media/usb/pvrusb2/pvrusb2-v4l2.c           |   4 +-
 drivers/media/usb/pwc/Kconfig                      |   4 +-
 drivers/media/usb/pwc/pwc-ctrl.c                   |  17 +-
 drivers/media/usb/rainshadow-cec/Kconfig           |   2 +-
 drivers/media/usb/siano/Kconfig                    |   2 +-
 drivers/media/usb/stk1160/Kconfig                  |   2 +-
 drivers/media/usb/stkwebcam/Kconfig                |   2 +-
 drivers/media/usb/tm6000/Kconfig                   |   4 +-
 drivers/media/usb/usbtv/Kconfig                    |   2 +-
 drivers/media/usb/usbvision/Kconfig                |   2 +-
 drivers/media/usb/usbvision/usbvision-core.c       |   3 +
 drivers/media/usb/uvc/Kconfig                      |   4 +-
 drivers/media/usb/zr364xx/Kconfig                  |   2 +-
 drivers/media/v4l2-core/Kconfig                    |   8 +-
 drivers/media/v4l2-core/v4l2-ctrls.c               |  34 +-
 drivers/media/v4l2-core/v4l2-device.c              |  19 +-
 drivers/media/v4l2-core/v4l2-fwnode.c              |  17 +-
 drivers/media/v4l2-core/v4l2-ioctl.c               |   3 +-
 drivers/media/v4l2-core/v4l2-subdev.c              |  22 +-
 drivers/staging/media/Kconfig                      |   2 +-
 drivers/staging/media/bcm2048/Kconfig              |   2 +-
 drivers/staging/media/bcm2048/radio-bcm2048.c      |   4 +-
 drivers/staging/media/davinci_vpfe/Kconfig         |   2 +-
 drivers/staging/media/davinci_vpfe/dm365_isif.c    |  20 +-
 drivers/staging/media/davinci_vpfe/dm365_resizer.c |   2 +-
 drivers/staging/media/imx/Kconfig                  |   4 +-
 drivers/staging/media/imx/imx-ic-common.c          |   4 +-
 drivers/staging/media/imx/imx-media-csi.c          |  18 +-
 drivers/staging/media/imx/imx-media-dev-common.c   |   4 +-
 drivers/staging/media/imx/imx-media-dev.c          |  28 +-
 drivers/staging/media/imx/imx-media-internal-sd.c  |  32 +-
 drivers/staging/media/imx/imx-media-of.c           |  73 +-
 drivers/staging/media/imx/imx-media-vdic.c         |  12 +-
 drivers/staging/media/imx/imx-media.h              |   7 +-
 drivers/staging/media/imx/imx7-media-csi.c         |   6 +-
 drivers/staging/media/imx/imx7-mipi-csis.c         |  20 +-
 drivers/staging/media/ipu3/Kconfig                 |   2 +-
 drivers/staging/media/ipu3/ipu3-css.c              |  35 +-
 drivers/staging/media/ipu3/ipu3-v4l2.c             |  40 +-
 drivers/staging/media/ipu3/ipu3.c                  |   2 +-
 drivers/staging/media/mt9t031/Kconfig              |   5 -
 drivers/staging/media/mt9t031/Makefile             |   1 -
 drivers/staging/media/mt9t031/TODO                 |   5 -
 drivers/staging/media/omap4iss/Kconfig             |   2 +-
 .../staging/media/rockchip/vpu/rockchip_vpu_drv.c  |   3 +-
 drivers/staging/media/soc_camera/TODO              |   4 +
 drivers/staging/media/sunxi/cedrus/cedrus.c        |   9 +
 drivers/staging/media/sunxi/cedrus/cedrus.h        |   3 +
 drivers/staging/media/sunxi/cedrus/cedrus_hw.c     |   3 +-
 drivers/staging/media/sunxi/cedrus/cedrus_video.c  |   1 +
 drivers/staging/media/zoran/videocodec.c           |   2 +-
 drivers/staging/media/zoran/zoran_driver.c         |  10 +-
 include/media/dvb-usb-ids.h                        |   1 +
 include/media/fwht-ctrls.h                         |  31 +
 include/media/media-entity.h                       |  24 -
 include/media/media-request.h                      |   4 +-
 include/media/v4l2-ctrls.h                         |   7 +-
 include/media/v4l2-subdev.h                        |  15 +-
 include/media/videobuf2-core.h                     |  24 +-
 include/uapi/linux/v4l2-controls.h                 |   4 +
 include/uapi/linux/videodev2.h                     |   1 +
 243 files changed, 2490 insertions(+), 1701 deletions(-)
 delete mode 100644 drivers/staging/media/mt9t031/Kconfig
 delete mode 100644 drivers/staging/media/mt9t031/Makefile
 delete mode 100644 drivers/staging/media/mt9t031/TODO
 create mode 100644 drivers/staging/media/soc_camera/TODO
 create mode 100644 include/media/fwht-ctrls.h
Merging v4l-dvb-next/master (81527254e151 media: seco: depend on CONFIG_RC_CORE=y when not a module)
$ git merge v4l-dvb-next/master
Auto-merging drivers/media/platform/Kconfig
Merge made by the 'recursive' strategy.
 drivers/media/platform/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging fbdev/fbdev-for-next (9dc20113988b fbdev: sm712fb: fix memory frequency by avoiding a switch/case fallthrough)
$ git merge fbdev/fbdev-for-next
Merge made by the 'recursive' strategy.
 drivers/video/fbdev/Kconfig                        | 296 ++++++++++-----------
 drivers/video/fbdev/atafb.c                        |  67 +++--
 drivers/video/fbdev/atafb_iplan2p2.c               |  23 --
 drivers/video/fbdev/atafb_iplan2p4.c               |  23 --
 drivers/video/fbdev/atafb_iplan2p8.c               |  23 --
 drivers/video/fbdev/atafb_mfb.c                    |  23 --
 drivers/video/fbdev/atmel_lcdfb.c                  | 114 +-------
 drivers/video/fbdev/core/fbmem.c                   |  29 +-
 drivers/video/fbdev/core/modedb.c                  |   3 +
 drivers/video/fbdev/hgafb.c                        |   2 +
 drivers/video/fbdev/imsttfb.c                      |   5 +
 drivers/video/fbdev/macfb.c                        |  29 +-
 drivers/video/fbdev/mmp/Kconfig                    |   6 +-
 drivers/video/fbdev/mxsfb.c                        |  12 +
 drivers/video/fbdev/omap/Kconfig                   |  20 +-
 drivers/video/fbdev/omap2/omapfb/Kconfig           |  18 +-
 drivers/video/fbdev/omap2/omapfb/displays/Kconfig  |  40 +--
 drivers/video/fbdev/omap2/omapfb/dss/Kconfig       |   6 +-
 .../fbdev/omap2/omapfb/dss/omapdss-boot-init.c     |   6 +-
 drivers/video/fbdev/savage/savagefb_driver.c       |   6 +-
 drivers/video/fbdev/sm712.h                        |  12 +-
 drivers/video/fbdev/sm712fb.c                      | 243 +++++++++++++----
 drivers/video/fbdev/udlfb.c                        | 114 ++++++--
 drivers/video/fbdev/vesafb.c                       |   4 +-
 drivers/video/fbdev/xen-fbfront.c                  |   2 +-
 include/video/udlfb.h                              |   7 +
 26 files changed, 593 insertions(+), 540 deletions(-)
Merging pm/linux-next (10be187a52e6 Merge branches 'pm-cpuidle' and 'pm-sleep' into linux-next)
$ git merge pm/linux-next
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-devices-system-cpu |  18 ++
 Documentation/acpi/enumeration.txt                 |  26 +++
 Documentation/admin-guide/pm/intel_epb.rst         |  33 ++++
 Documentation/admin-guide/pm/working-state.rst     |   1 +
 arch/x86/kernel/cpu/Makefile                       |   2 +-
 arch/x86/kernel/cpu/common.c                       |  17 --
 arch/x86/kernel/cpu/cpu.h                          |   1 -
 arch/x86/kernel/cpu/intel.c                        |  34 ----
 arch/x86/kernel/cpu/intel_epb.c                    | 216 +++++++++++++++++++++
 drivers/acpi/acpi_dbg.c                            |   2 +-
 drivers/acpi/acpi_lpat.c                           |   2 +-
 drivers/acpi/cppc_acpi.c                           |  34 ++--
 drivers/acpi/power.c                               |   4 +-
 drivers/acpi/pptt.c                                |  48 ++---
 drivers/acpi/processor_perflib.c                   |   2 +-
 drivers/acpi/scan.c                                |  19 +-
 drivers/acpi/spcr.c                                |   2 +-
 drivers/acpi/tables.c                              |  18 +-
 drivers/acpi/utils.c                               |  16 +-
 drivers/acpi/video_detect.c                        |  10 +-
 drivers/base/power/wakeup.c                        |   6 +-
 drivers/cpufreq/amd_freq_sensitivity.c             |   2 +-
 drivers/cpufreq/cpufreq.c                          |  84 ++++++--
 drivers/cpufreq/intel_pstate.c                     |  65 ++++++-
 drivers/cpufreq/powernow-k8.c                      |   2 +-
 drivers/cpuidle/cpuidle-exynos.c                   |   2 +-
 drivers/extcon/extcon-axp288.c                     |   9 +-
 drivers/gpio/gpio-merrifield.c                     |  18 +-
 include/acpi/acpi_bus.h                            |   4 +-
 include/linux/acpi.h                               |   4 +-
 include/linux/cpufreq.h                            |  14 ++
 include/linux/cpuhotplug.h                         |   1 +
 include/linux/suspend.h                            |   3 +
 kernel/power/hibernate.c                           |   5 +-
 kernel/power/main.c                                |  14 ++
 kernel/power/suspend.c                             |  13 +-
 kernel/power/user.c                                |   5 +-
 kernel/sched/cpufreq_schedutil.c                   |  21 +-
 sound/soc/intel/boards/bytcht_da7213.c             |   9 +-
 sound/soc/intel/boards/bytcht_es8316.c             |   9 +-
 sound/soc/intel/boards/bytcr_rt5640.c              |  10 +-
 sound/soc/intel/boards/bytcr_rt5651.c              |  14 +-
 sound/soc/intel/boards/cht_bsw_rt5645.c            |   9 +-
 sound/soc/intel/boards/cht_bsw_rt5672.c            |   9 +-
 44 files changed, 606 insertions(+), 231 deletions(-)
 create mode 100644 Documentation/admin-guide/pm/intel_epb.rst
 create mode 100644 arch/x86/kernel/cpu/intel_epb.c
Merging cpufreq-arm/cpufreq/arm/linux-next (c1d1090c3c76 cpufreq: maple: Remove redundant code from maple_cpufreq_init())
$ git merge cpufreq-arm/cpufreq/arm/linux-next
Merge made by the 'recursive' strategy.
 drivers/cpufreq/armada-8k-cpufreq.c |  1 +
 drivers/cpufreq/imx6q-cpufreq.c     |  4 ++--
 drivers/cpufreq/kirkwood-cpufreq.c  | 19 +++++++++++--------
 drivers/cpufreq/maple-cpufreq.c     |  6 +-----
 drivers/cpufreq/pasemi-cpufreq.c    |  1 +
 drivers/cpufreq/pmac32-cpufreq.c    |  2 ++
 drivers/cpufreq/ppc_cbe_cpufreq.c   |  1 +
 7 files changed, 19 insertions(+), 15 deletions(-)
Merging cpupower/cpupower (8c2ffd917477 Linux 5.1-rc2)
$ git merge cpupower/cpupower
Already up to date.
Merging opp/opp/linux-next (9e98c678c2d6 Linux 5.1-rc1)
$ git merge opp/opp/linux-next
Already up to date.
Merging thermal/next (2d7c4e17811f Merge branches 'fixes' and 'thermal-intel' into next)
$ git merge thermal/next
Already up to date.
Merging thermal-soc/next (8834f5600cf3 Linux 5.0-rc5)
$ git merge thermal-soc/next
Already up to date.
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 (22cb45d7692a swiotlb: drop pointless static qualifier in swiotlb_create_debugfs())
$ git merge swiotlb/linux-next
Already up to date.
Merging rdma/for-next (061ccb52d23c RDMA/cma: Set proper port number as index)
$ git merge rdma/for-next
Auto-merging drivers/infiniband/hw/mlx5/odp.c
Auto-merging drivers/infiniband/hw/hfi1/qp.c
Auto-merging drivers/infiniband/hw/hfi1/chip.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                                        |   8 +-
 drivers/infiniband/core/cm.c                       |  42 +-
 drivers/infiniband/core/cm_msgs.h                  |  22 +-
 drivers/infiniband/core/cma.c                      |  46 ++-
 drivers/infiniband/core/core_priv.h                |  10 +-
 drivers/infiniband/core/cq.c                       |  21 +-
 drivers/infiniband/core/device.c                   | 422 ++++++++++++++++++++-
 drivers/infiniband/core/mad.c                      |  87 +++--
 drivers/infiniband/core/mad_priv.h                 |   4 +-
 drivers/infiniband/core/nldev.c                    |  75 +++-
 drivers/infiniband/core/rdma_core.c                | 118 +++---
 drivers/infiniband/core/rdma_core.h                |  11 +-
 drivers/infiniband/core/sa_query.c                 |  44 +--
 drivers/infiniband/core/sysfs.c                    |  34 +-
 drivers/infiniband/core/ucm.c                      |  35 +-
 drivers/infiniband/core/umem.c                     |   5 +
 drivers/infiniband/core/umem_odp.c                 |  13 +-
 drivers/infiniband/core/user_mad.c                 |  22 ++
 drivers/infiniband/core/uverbs.h                   |   3 +-
 drivers/infiniband/core/uverbs_cmd.c               |  84 ++--
 drivers/infiniband/core/uverbs_ioctl.c             |  27 +-
 drivers/infiniband/core/uverbs_main.c              |   7 +-
 drivers/infiniband/core/uverbs_std_types.c         |  52 ++-
 .../infiniband/core/uverbs_std_types_counters.c    |   4 +-
 drivers/infiniband/core/uverbs_std_types_cq.c      |  10 +-
 drivers/infiniband/core/uverbs_std_types_dm.c      |   6 +-
 .../infiniband/core/uverbs_std_types_flow_action.c |   4 +-
 drivers/infiniband/core/uverbs_std_types_mr.c      |   9 +-
 drivers/infiniband/core/verbs.c                    |  81 ++--
 drivers/infiniband/hw/bnxt_re/Kconfig              |  12 +-
 drivers/infiniband/hw/bnxt_re/ib_verbs.c           |  60 ++-
 drivers/infiniband/hw/bnxt_re/ib_verbs.h           |  18 +-
 drivers/infiniband/hw/bnxt_re/qplib_fp.c           |  27 +-
 drivers/infiniband/hw/bnxt_re/qplib_fp.h           |   9 +-
 drivers/infiniband/hw/bnxt_re/qplib_rcfw.c         |   4 +-
 drivers/infiniband/hw/bnxt_re/qplib_res.c          |  43 ++-
 drivers/infiniband/hw/bnxt_re/qplib_res.h          |   8 +-
 drivers/infiniband/hw/bnxt_re/qplib_sp.c           |   4 +-
 drivers/infiniband/hw/cxgb3/cxio_wr.h              |  10 +-
 drivers/infiniband/hw/cxgb3/iwch.c                 |  56 ++-
 drivers/infiniband/hw/cxgb3/iwch.h                 |  38 +-
 drivers/infiniband/hw/cxgb3/iwch_ev.c              |  18 +-
 drivers/infiniband/hw/cxgb3/iwch_mem.c             |   2 +-
 drivers/infiniband/hw/cxgb3/iwch_provider.c        |  65 ++--
 drivers/infiniband/hw/cxgb4/cm.c                   |  67 ++--
 drivers/infiniband/hw/cxgb4/cq.c                   |  23 +-
 drivers/infiniband/hw/cxgb4/device.c               | 210 +++++-----
 drivers/infiniband/hw/cxgb4/ev.c                   |  18 +-
 drivers/infiniband/hw/cxgb4/iw_cxgb4.h             |  91 +----
 drivers/infiniband/hw/cxgb4/mem.c                  |  25 +-
 drivers/infiniband/hw/cxgb4/provider.c             |   9 +-
 drivers/infiniband/hw/cxgb4/qp.c                   |  41 +-
 drivers/infiniband/hw/hfi1/chip.c                  |  16 +-
 drivers/infiniband/hw/hfi1/debugfs.c               |   8 +-
 drivers/infiniband/hw/hfi1/driver.c                |  10 +-
 drivers/infiniband/hw/hfi1/hfi.h                   |   8 +-
 drivers/infiniband/hw/hfi1/init.c                  |  56 +--
 drivers/infiniband/hw/hfi1/qp.c                    |   2 +
 drivers/infiniband/hw/hfi1/trace_dbg.h             |   4 +-
 drivers/infiniband/hw/hfi1/verbs.c                 |  15 +-
 drivers/infiniband/hw/hfi1/verbs.h                 |   1 +
 drivers/infiniband/hw/hfi1/vnic_main.c             |  16 +-
 drivers/infiniband/hw/hns/hns_roce_ah.c            |   4 +-
 drivers/infiniband/hw/hns/hns_roce_cq.c            |  68 ++--
 drivers/infiniband/hw/hns/hns_roce_device.h        |  32 +-
 drivers/infiniband/hw/hns/hns_roce_hw_v1.c         |  22 +-
 drivers/infiniband/hw/hns/hns_roce_hw_v1.h         |   2 +-
 drivers/infiniband/hw/hns/hns_roce_hw_v2.c         | 306 ++++++++-------
 drivers/infiniband/hw/hns/hns_roce_hw_v2.h         |   4 +-
 drivers/infiniband/hw/hns/hns_roce_mr.c            |   6 +-
 drivers/infiniband/hw/hns/hns_roce_pd.c            |   7 +-
 drivers/infiniband/hw/hns/hns_roce_qp.c            |  50 +--
 drivers/infiniband/hw/hns/hns_roce_srq.c           |   2 +-
 drivers/infiniband/hw/i40iw/i40iw.h                |   2 +-
 drivers/infiniband/hw/i40iw/i40iw_cm.c             |  21 +-
 drivers/infiniband/hw/i40iw/i40iw_main.c           |   5 +-
 drivers/infiniband/hw/i40iw/i40iw_verbs.c          |  47 +--
 drivers/infiniband/hw/mlx4/ah.c                    |   2 +-
 drivers/infiniband/hw/mlx4/cm.c                    |  36 +-
 drivers/infiniband/hw/mlx4/cq.c                    |  40 +-
 drivers/infiniband/hw/mlx4/doorbell.c              |   6 +-
 drivers/infiniband/hw/mlx4/mad.c                   |  10 +-
 drivers/infiniband/hw/mlx4/main.c                  |  10 +-
 drivers/infiniband/hw/mlx4/mlx4_ib.h               |  26 +-
 drivers/infiniband/hw/mlx4/mr.c                    |   7 +-
 drivers/infiniband/hw/mlx4/qp.c                    |  44 ++-
 drivers/infiniband/hw/mlx4/srq.c                   |  14 +-
 drivers/infiniband/hw/mlx5/ah.c                    |   2 +-
 drivers/infiniband/hw/mlx5/cq.c                    |  47 ++-
 drivers/infiniband/hw/mlx5/devx.c                  |   8 +-
 drivers/infiniband/hw/mlx5/flow.c                  |   3 +-
 drivers/infiniband/hw/mlx5/main.c                  |  52 +--
 drivers/infiniband/hw/mlx5/mlx5_ib.h               |  25 +-
 drivers/infiniband/hw/mlx5/mr.c                    |   7 +-
 drivers/infiniband/hw/mlx5/odp.c                   |  11 +-
 drivers/infiniband/hw/mlx5/qp.c                    |  46 ++-
 drivers/infiniband/hw/mlx5/srq.c                   |  21 +-
 drivers/infiniband/hw/mlx5/srq.h                   |   5 +-
 drivers/infiniband/hw/mlx5/srq_cmd.c               |  27 +-
 drivers/infiniband/hw/mthca/mthca_cq.c             |   2 +-
 drivers/infiniband/hw/mthca/mthca_eq.c             |  16 +-
 drivers/infiniband/hw/mthca/mthca_mr.c             |   2 +-
 drivers/infiniband/hw/mthca/mthca_provider.c       | 101 ++---
 drivers/infiniband/hw/mthca/mthca_qp.c             |   6 +-
 drivers/infiniband/hw/nes/nes_cm.c                 |   3 +-
 drivers/infiniband/hw/nes/nes_verbs.c              | 141 +++----
 drivers/infiniband/hw/ocrdma/ocrdma_ah.c           |   2 +-
 drivers/infiniband/hw/ocrdma/ocrdma_ah.h           |   2 +-
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c        |  65 ++--
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.h        |  19 +-
 drivers/infiniband/hw/qedr/main.c                  |  10 +-
 drivers/infiniband/hw/qedr/qedr.h                  |  11 +-
 drivers/infiniband/hw/qedr/qedr_iw_cm.c            |  10 +-
 drivers/infiniband/hw/qedr/verbs.c                 |  80 ++--
 drivers/infiniband/hw/qedr/verbs.h                 |  18 +-
 drivers/infiniband/hw/qib/qib.h                    |   4 +-
 drivers/infiniband/hw/qib/qib_driver.c             |  20 +-
 drivers/infiniband/hw/qib/qib_fs.c                 |  12 +-
 drivers/infiniband/hw/qib/qib_iba7322.c            |   4 +-
 drivers/infiniband/hw/qib/qib_init.c               |  56 +--
 drivers/infiniband/hw/qib/qib_user_sdma.c          |   5 +-
 drivers/infiniband/hw/usnic/usnic_ib_verbs.c       |  15 +-
 drivers/infiniband/hw/usnic/usnic_ib_verbs.h       |  12 +-
 drivers/infiniband/hw/usnic/usnic_uiom.c           |   3 +-
 drivers/infiniband/hw/usnic/usnic_uiom.h           |   3 +-
 drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c       |  17 +-
 drivers/infiniband/hw/vmw_pvrdma/pvrdma_mr.c       |   4 +-
 drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c       |   3 +-
 drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c      |   5 +-
 drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c    |  22 +-
 drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h    |  18 +-
 drivers/infiniband/sw/rdmavt/ah.c                  |   4 +-
 drivers/infiniband/sw/rdmavt/ah.h                  |   3 +-
 drivers/infiniband/sw/rdmavt/cq.c                  |   7 +-
 drivers/infiniband/sw/rdmavt/cq.h                  |   3 +-
 drivers/infiniband/sw/rdmavt/mmap.c                |  16 +-
 drivers/infiniband/sw/rdmavt/mmap.h                |   6 +-
 drivers/infiniband/sw/rdmavt/mr.c                  |   9 +-
 drivers/infiniband/sw/rdmavt/mr.h                  |   7 +-
 drivers/infiniband/sw/rdmavt/pd.c                  |   7 +-
 drivers/infiniband/sw/rdmavt/pd.h                  |   5 +-
 drivers/infiniband/sw/rdmavt/qp.c                  |   7 +-
 drivers/infiniband/sw/rdmavt/qp.h                  |   2 +-
 drivers/infiniband/sw/rdmavt/srq.c                 |   8 +-
 drivers/infiniband/sw/rdmavt/srq.h                 |   2 +-
 drivers/infiniband/sw/rxe/rxe_cq.c                 |  10 +-
 drivers/infiniband/sw/rxe/rxe_hdr.h                |   2 +-
 drivers/infiniband/sw/rxe/rxe_loc.h                |  16 +-
 drivers/infiniband/sw/rxe/rxe_mmap.c               |  14 +-
 drivers/infiniband/sw/rxe/rxe_mr.c                 |  13 +-
 drivers/infiniband/sw/rxe/rxe_net.c                |  28 +-
 drivers/infiniband/sw/rxe/rxe_qp.c                 |  15 +-
 drivers/infiniband/sw/rxe/rxe_queue.c              |  22 +-
 drivers/infiniband/sw/rxe/rxe_queue.h              |  15 +-
 drivers/infiniband/sw/rxe/rxe_srq.c                |  14 +-
 drivers/infiniband/sw/rxe/rxe_verbs.c              |  33 +-
 drivers/infiniband/ulp/iser/Kconfig                |   4 +-
 drivers/infiniband/ulp/iser/iscsi_iser.c           |   7 +-
 drivers/infiniband/ulp/iser/iscsi_iser.h           |   2 +-
 drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c    |  60 ++-
 include/linux/overflow.h                           |  12 +-
 include/rdma/ib_mad.h                              |   4 +-
 include/rdma/ib_smi.h                              |   2 +-
 include/rdma/ib_verbs.h                            | 271 ++++++++++---
 include/rdma/opa_port_info.h                       |   2 +-
 include/rdma/opa_smi.h                             |   4 +-
 include/rdma/uverbs_std_types.h                    |  40 +-
 include/rdma/uverbs_types.h                        |  18 +-
 include/trace/events/ib_mad.h                      | 390 +++++++++++++++++++
 include/trace/events/ib_umad.h                     | 126 ++++++
 include/uapi/rdma/rdma_netlink.h                   |  22 +-
 samples/bpf/Makefile                               |   3 +
 samples/bpf/ibumad_kern.c                          | 144 +++++++
 samples/bpf/ibumad_user.c                          | 122 ++++++
 174 files changed, 3398 insertions(+), 2121 deletions(-)
 create mode 100644 include/trace/events/ib_mad.h
 create mode 100644 include/trace/events/ib_umad.h
 create mode 100644 samples/bpf/ibumad_kern.c
 create mode 100644 samples/bpf/ibumad_user.c
Merging net-next/master (7f301cff1fc2 ethtool: thunder_bgx: use ethtool.h constants for speed and duplex)
$ git merge net-next/master
Auto-merging net/wireless/nl80211.c
Auto-merging net/ipv4/xfrm4_policy.c
Auto-merging drivers/net/wireless/mac80211_hwsim.c
Auto-merging drivers/net/vrf.c
Auto-merging drivers/infiniband/hw/nes/nes_cm.c
Auto-merging drivers/infiniband/hw/mlx5/qp.c
Auto-merging drivers/infiniband/hw/mlx5/mr.c
Auto-merging drivers/infiniband/hw/mlx5/main.c
Auto-merging drivers/infiniband/hw/hfi1/vnic_main.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .clang-format                                      |   8 +-
 .../sysfs-class-net-batman-adv                     |   2 +
 .../ABI/{testing => obsolete}/sysfs-class-net-mesh |   2 +
 .../bindings/net/mdio-mux-meson-g12a.txt           |  48 +
 Documentation/networking/batman-adv.rst            | 110 +--
 Documentation/networking/devlink-info-versions.rst |   5 +
 Documentation/networking/ip-sysctl.txt             |  15 +
 MAINTAINERS                                        |  16 +-
 drivers/block/nbd.c                                |   5 +-
 drivers/infiniband/core/addr.c                     |   4 +-
 drivers/infiniband/hw/hfi1/vnic_main.c             |   3 +-
 drivers/infiniband/hw/mlx5/cmd.c                   |   4 +-
 drivers/infiniband/hw/mlx5/main.c                  |   8 +-
 drivers/infiniband/hw/mlx5/mr.c                    |   3 +-
 drivers/infiniband/hw/mlx5/qp.c                    |   2 +-
 drivers/infiniband/hw/nes/nes_cm.c                 |   2 +-
 drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c  |   6 +-
 drivers/isdn/i4l/isdn_ppp.c                        |   9 +-
 drivers/net/Kconfig                                |   1 +
 drivers/net/appletalk/ipddp.c                      |   6 +-
 drivers/net/bonding/bond_main.c                    |   3 +-
 drivers/net/dsa/bcm_sf2.c                          |   9 +-
 drivers/net/dsa/microchip/ksz9477.c                |   1 +
 drivers/net/dsa/mv88e6xxx/chip.c                   |  11 -
 drivers/net/dsa/mv88e6xxx/port.h                   |   1 -
 drivers/net/ethernet/amazon/ena/ena_netdev.c       |   7 +-
 drivers/net/ethernet/amd/xgbe/xgbe-dev.c           |   2 +-
 drivers/net/ethernet/aquantia/Kconfig              |   3 +-
 drivers/net/ethernet/aquantia/atlantic/aq_cfg.h    |  10 +-
 drivers/net/ethernet/aquantia/atlantic/aq_nic.c    |   1 +
 drivers/net/ethernet/aquantia/atlantic/aq_nic.h    |   1 +
 drivers/net/ethernet/aquantia/atlantic/aq_ring.c   | 187 +++-
 drivers/net/ethernet/aquantia/atlantic/aq_ring.h   |  34 +-
 drivers/net/ethernet/aquantia/atlantic/aq_vec.c    |   3 +
 .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c  |   4 -
 .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c  |  16 +-
 .../aquantia/atlantic/hw_atl/hw_atl_b0_internal.h  |   2 +-
 .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c |  15 +
 .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h |   6 +
 .../aquantia/atlantic/hw_atl/hw_atl_llh_internal.h |  13 +
 drivers/net/ethernet/aurora/nb8800.c               |   8 +-
 drivers/net/ethernet/broadcom/Kconfig              |   1 +
 drivers/net/ethernet/broadcom/bcmsysport.c         |  13 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c    |   5 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h    |   3 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h    |  21 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt.c          |  56 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c  |   4 +
 drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c      |  25 -
 drivers/net/ethernet/broadcom/genet/bcmgenet.c     |   2 +-
 drivers/net/ethernet/broadcom/tg3.c                |   5 +-
 drivers/net/ethernet/cadence/macb_main.c           |   6 +-
 drivers/net/ethernet/cavium/Kconfig                |   1 +
 drivers/net/ethernet/cavium/liquidio/lio_main.c    |   2 +-
 drivers/net/ethernet/cavium/liquidio/lio_vf_main.c |   2 +-
 drivers/net/ethernet/cavium/thunder/thunder_bgx.c  |  16 +-
 drivers/net/ethernet/chelsio/cxgb3/l2t.c           |   4 +-
 drivers/net/ethernet/chelsio/cxgb3/l2t.h           |   2 +-
 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h         |   4 +-
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c |  23 +-
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c  |   7 +-
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c    |   5 +-
 .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c   |   5 +-
 drivers/net/ethernet/chelsio/cxgb4/t4_hw.c         | 107 ++-
 drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h  |  12 +-
 .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c    |  16 -
 drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c     |  10 +
 drivers/net/ethernet/cisco/enic/enic_main.c        |   2 +-
 drivers/net/ethernet/emulex/benet/be_main.c        |   2 +-
 drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c   |   8 +-
 drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h   |   1 +
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c |   2 +-
 drivers/net/ethernet/hisilicon/hns/hns_enet.c      |   5 +-
 drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h    |   1 +
 drivers/net/ethernet/hisilicon/hns3/hnae3.c        |  40 +-
 drivers/net/ethernet/hisilicon/hns3/hns3_enet.c    |  57 +-
 drivers/net/ethernet/hisilicon/hns3/hns3_enet.h    |  15 +-
 drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c |   9 +
 .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c |  13 +-
 .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c    |  52 +-
 .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c |  23 +-
 .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c   |  46 +-
 .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c  |  42 +-
 .../ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c   |   1 -
 drivers/net/ethernet/huawei/hinic/hinic_tx.c       |   2 +-
 drivers/net/ethernet/ibm/ehea/ehea_main.c          |   2 +-
 drivers/net/ethernet/ibm/ehea/ehea_qmr.c           |   6 +-
 drivers/net/ethernet/ibm/ibmveth.c                 |   2 +-
 drivers/net/ethernet/ibm/ibmvnic.c                 |  95 +-
 drivers/net/ethernet/ibm/ibmvnic.h                 |  18 +-
 drivers/net/ethernet/intel/e100.c                  |   2 +-
 drivers/net/ethernet/intel/e1000/e1000_main.c      |   4 +-
 drivers/net/ethernet/intel/e1000e/netdev.c         |   6 +-
 drivers/net/ethernet/intel/fm10k/fm10k_main.c      |   2 +-
 drivers/net/ethernet/intel/i40e/i40e_txrx.c        |   2 +-
 drivers/net/ethernet/intel/iavf/iavf_txrx.c        |   2 +-
 drivers/net/ethernet/intel/ice/ice.h               |  59 +-
 drivers/net/ethernet/intel/ice/ice_adminq_cmd.h    |   5 +-
 drivers/net/ethernet/intel/ice/ice_common.c        | 117 ++-
 drivers/net/ethernet/intel/ice/ice_common.h        |  24 +-
 drivers/net/ethernet/intel/ice/ice_ethtool.c       |  28 +-
 drivers/net/ethernet/intel/ice/ice_hw_autogen.h    |  12 +
 drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h     |  46 +-
 drivers/net/ethernet/intel/ice/ice_lib.c           | 180 +++-
 drivers/net/ethernet/intel/ice/ice_lib.h           |   4 +-
 drivers/net/ethernet/intel/ice/ice_main.c          | 450 ++++++++--
 drivers/net/ethernet/intel/ice/ice_sched.c         |  96 +-
 drivers/net/ethernet/intel/ice/ice_switch.c        | 339 ++++++-
 drivers/net/ethernet/intel/ice/ice_switch.h        |  25 +-
 drivers/net/ethernet/intel/ice/ice_txrx.c          | 696 ++++++++++-----
 drivers/net/ethernet/intel/ice/ice_txrx.h          |  23 +-
 drivers/net/ethernet/intel/ice/ice_type.h          |   5 +-
 drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c   | 612 +++++++++----
 drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h   |  20 +-
 drivers/net/ethernet/intel/igb/igb_ethtool.c       |   4 +-
 drivers/net/ethernet/intel/igb/igb_main.c          |   7 +-
 drivers/net/ethernet/intel/igc/igc.h               |  68 +-
 drivers/net/ethernet/intel/igc/igc_base.h          |   4 +-
 drivers/net/ethernet/intel/igc/igc_defines.h       |  17 +
 drivers/net/ethernet/intel/igc/igc_ethtool.c       | 839 +++++++++++++++++-
 drivers/net/ethernet/intel/igc/igc_main.c          | 449 +++++++++-
 drivers/net/ethernet/intel/igc/igc_regs.h          |  16 +
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c      |   9 +-
 drivers/net/ethernet/marvell/mvneta.c              |   3 +-
 drivers/net/ethernet/marvell/mvpp2/mvpp2.h         |  10 +
 drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c     | 212 +++--
 drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.h     |  92 +-
 drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c | 253 +++---
 drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c    |   8 +-
 drivers/net/ethernet/mediatek/mtk_eth_soc.c        |   3 +-
 drivers/net/ethernet/mellanox/mlx4/Kconfig         |   1 +
 drivers/net/ethernet/mellanox/mlx4/en_tx.c         |   9 +-
 drivers/net/ethernet/mellanox/mlx4/mlx4_en.h       |   3 +-
 drivers/net/ethernet/mellanox/mlx5/core/Kconfig    |   1 +
 drivers/net/ethernet/mellanox/mlx5/core/cmd.c      |  22 +-
 .../mellanox/mlx5/core/diag/fw_tracer_tracepoint.h |   4 +-
 drivers/net/ethernet/mellanox/mlx5/core/en.h       |  56 +-
 .../ethernet/mellanox/mlx5/core/en/port_buffer.c   |  30 +-
 .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c    |  10 +-
 .../mellanox/mlx5/core/en_accel/en_accel.h         |  51 ++
 .../mellanox/mlx5/core/en_accel/ipsec_rxtx.c       |  36 +-
 .../mellanox/mlx5/core/en_accel/tls_rxtx.c         |   3 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_main.c  |  42 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_rep.c   |  11 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_tc.c    | 361 ++++++--
 drivers/net/ethernet/mellanox/mlx5/core/en_tx.c    |  27 +-
 drivers/net/ethernet/mellanox/mlx5/core/eq.c       |   8 +-
 drivers/net/ethernet/mellanox/mlx5/core/eswitch.h  |   3 +
 .../ethernet/mellanox/mlx5/core/eswitch_offloads.c |   8 +-
 drivers/net/ethernet/mellanox/mlx5/core/events.c   |  75 ++
 .../net/ethernet/mellanox/mlx5/core/fpga/conn.c    |   2 +-
 .../net/ethernet/mellanox/mlx5/core/fpga/core.h    |  21 +-
 drivers/net/ethernet/mellanox/mlx5/core/fs_core.c  |   2 +-
 drivers/net/ethernet/mellanox/mlx5/core/health.c   |  44 +-
 .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c  |   5 +-
 drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c   |  12 +-
 .../net/ethernet/mellanox/mlx5/core/lib/port_tun.c |   6 +-
 .../net/ethernet/mellanox/mlx5/core/lib/vxlan.c    |   5 +-
 drivers/net/ethernet/mellanox/mlx5/core/main.c     | 473 +++++-----
 .../net/ethernet/mellanox/mlx5/core/mlx5_core.h    |  35 +-
 drivers/net/ethernet/mellanox/mlx5/core/sriov.c    |  51 +-
 drivers/net/ethernet/mellanox/mlx5/core/uar.c      |   2 +-
 drivers/net/ethernet/mellanox/mlxsw/Kconfig        |   1 +
 drivers/net/ethernet/mellanox/mlxsw/core.c         |  66 +-
 drivers/net/ethernet/mellanox/mlxsw/core.h         |  15 +-
 drivers/net/ethernet/mellanox/mlxsw/minimal.c      |  30 +-
 drivers/net/ethernet/mellanox/mlxsw/reg.h          |  55 ++
 drivers/net/ethernet/mellanox/mlxsw/spectrum.c     |  31 +-
 .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c    |  36 +-
 .../net/ethernet/mellanox/mlxsw/spectrum_router.c  |  68 +-
 .../net/ethernet/mellanox/mlxsw/spectrum_span.c    |   6 +-
 drivers/net/ethernet/mellanox/mlxsw/switchib.c     |  23 +-
 drivers/net/ethernet/mellanox/mlxsw/switchx2.c     |  29 +-
 drivers/net/ethernet/microchip/enc28j60.c          | 541 ++++++------
 drivers/net/ethernet/netronome/Kconfig             |   1 +
 drivers/net/ethernet/netronome/nfp/flower/action.c | 203 +++--
 drivers/net/ethernet/netronome/nfp/flower/main.h   |   3 -
 .../net/ethernet/netronome/nfp/flower/offload.c    |   4 +-
 drivers/net/ethernet/netronome/nfp/nfp_app.h       |   2 +-
 drivers/net/ethernet/netronome/nfp/nfp_devlink.c   |  26 +-
 .../net/ethernet/netronome/nfp/nfp_net_common.c    |  13 +-
 drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h  |   3 -
 .../net/ethernet/netronome/nfp/nfp_net_ethtool.c   | 131 +++
 drivers/net/ethernet/netronome/nfp/nfp_net_main.c  |  29 +-
 drivers/net/ethernet/netronome/nfp/nfp_net_repr.c  |   3 +-
 drivers/net/ethernet/netronome/nfp/nfp_port.c      |  16 -
 drivers/net/ethernet/netronome/nfp/nfp_port.h      |   2 +
 .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c   |  62 ++
 .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h   |   8 +
 drivers/net/ethernet/pasemi/pasemi_mac.c           |   5 +-
 drivers/net/ethernet/qlogic/qed/qed.h              |   3 +
 drivers/net/ethernet/qlogic/qed/qed_dcbx.c         |   4 +-
 drivers/net/ethernet/qlogic/qed/qed_dev.c          |   6 +-
 drivers/net/ethernet/qlogic/qede/qede.h            |   3 +-
 drivers/net/ethernet/qlogic/qede/qede_ethtool.c    |  24 +-
 drivers/net/ethernet/qlogic/qede/qede_fp.c         |   9 +-
 drivers/net/ethernet/rdc/r6040.c                   |   2 +-
 drivers/net/ethernet/realtek/r8169.c               |  22 +-
 drivers/net/ethernet/renesas/ravb_main.c           |   3 +-
 drivers/net/ethernet/rocker/rocker_main.c          |   9 +
 drivers/net/ethernet/rocker/rocker_ofdpa.c         |  10 +-
 drivers/net/ethernet/sfc/falcon/tx.c               |   4 +-
 drivers/net/ethernet/sfc/tx.c                      |  12 +-
 drivers/net/ethernet/sun/ldmvsw.c                  |   3 +-
 drivers/net/ethernet/sun/sunvnet.c                 |   3 +-
 drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c      |   2 +-
 drivers/net/ethernet/ti/davinci_mdio.c             |  22 +-
 drivers/net/ethernet/xilinx/xilinx_emaclite.c      |  40 +
 drivers/net/geneve.c                               |   3 +-
 drivers/net/gtp.c                                  |   4 +-
 drivers/net/hyperv/netvsc.c                        |   2 +-
 drivers/net/hyperv/netvsc_drv.c                    |  10 +-
 drivers/net/ieee802154/mac802154_hwsim.c           |   7 +-
 drivers/net/macsec.c                               |  33 +-
 drivers/net/macvlan.c                              |  48 +
 drivers/net/net_failover.c                         |   8 +-
 drivers/net/phy/Kconfig                            |  17 +-
 drivers/net/phy/Makefile                           |   1 +
 drivers/net/phy/aquantia_main.c                    | 512 ++++++++++-
 drivers/net/phy/at803x.c                           |  26 +-
 drivers/net/phy/bcm-cygnus.c                       | 147 ++-
 drivers/net/phy/bcm-phy-lib.c                      |  52 ++
 drivers/net/phy/bcm-phy-lib.h                      |  20 +
 drivers/net/phy/bcm7xxx.c                          |  76 +-
 drivers/net/phy/marvell.c                          | 108 +++
 drivers/net/phy/marvell10g.c                       |  14 +-
 drivers/net/phy/mdio-bcm-unimac.c                  |   7 +-
 drivers/net/phy/mdio-mux-meson-g12a.c              | 380 ++++++++
 drivers/net/phy/meson-gxl.c                        |  17 +-
 drivers/net/phy/phy-c45.c                          |  37 +-
 drivers/net/phy/phy.c                              |   8 +-
 drivers/net/phy/phy_device.c                       | 137 ++-
 drivers/net/phy/realtek.c                          |  26 +-
 drivers/net/phy/rockchip.c                         |  31 +-
 drivers/net/team/team.c                            |  14 +-
 drivers/net/tun.c                                  |  20 +-
 drivers/net/usb/cdc_mbim.c                         |   1 +
 drivers/net/usb/qmi_wwan.c                         |  65 +-
 drivers/net/usb/r8152.c                            |  51 +-
 drivers/net/virtio_net.c                           |  21 +-
 drivers/net/vrf.c                                  |  12 +-
 drivers/net/vxlan.c                                |   1 +
 drivers/net/wireless/mac80211_hwsim.c              |   7 +-
 drivers/net/wireless/marvell/mwifiex/main.c        |   3 +-
 drivers/net/xen-netback/interface.c                |   6 +-
 drivers/net/xen-netfront.c                         |   3 +-
 drivers/s390/net/qeth_core.h                       |  21 +-
 drivers/s390/net/qeth_core_main.c                  | 567 ++++++------
 drivers/s390/net/qeth_l2_main.c                    |  36 +-
 drivers/s390/net/qeth_l3_main.c                    | 167 ++--
 drivers/s390/net/qeth_l3_sys.c                     |  20 +-
 drivers/staging/rtl8188eu/os_dep/os_intfs.c        |   3 +-
 drivers/staging/rtl8723bs/os_dep/os_intfs.c        |   3 +-
 drivers/target/target_core_user.c                  |   5 +-
 include/linux/bpf.h                                |   1 +
 include/linux/genl_magic_func.h                    |   4 +-
 include/linux/inetdevice.h                         |  14 +
 include/linux/mlx5/cq.h                            |   2 +-
 include/linux/mlx5/device.h                        |   1 +
 include/linux/mlx5/doorbell.h                      |  39 +-
 include/linux/mlx5/driver.h                        |   3 +
 include/linux/mlx5/mlx5_ifc.h                      |  52 +-
 include/linux/netdevice.h                          |  72 +-
 include/linux/phy.h                                |   4 +
 include/linux/rhashtable-types.h                   |   2 -
 include/linux/rhashtable.h                         | 308 ++++---
 include/linux/siphash.h                            |   5 +
 include/linux/skbuff.h                             |   8 +-
 include/net/addrconf.h                             |  55 +-
 include/net/devlink.h                              | 525 +----------
 include/net/dsa.h                                  |   1 +
 include/net/dst.h                                  |  11 -
 include/net/genetlink.h                            |   4 +-
 include/net/geneve.h                               |   2 +
 include/net/ip.h                                   |   4 +
 include/net/ip6_fib.h                              |  21 +-
 include/net/ip6_route.h                            |  12 +-
 include/net/ip_fib.h                               | 114 ++-
 include/net/ipv6_stubs.h                           |  69 ++
 include/net/ndisc.h                                |  40 +
 include/net/neighbour.h                            |   5 +-
 include/net/netfilter/nf_conntrack_timeout.h       |  15 +
 include/net/netns/ipv4.h                           |   2 +
 include/net/netns/ipv6.h                           |   2 +
 include/net/request_sock.h                         |  10 +-
 include/net/route.h                                |  43 +-
 include/net/sch_generic.h                          |  11 +
 include/net/sock.h                                 |  18 +-
 include/net/tls.h                                  |  15 +-
 include/net/udp.h                                  |   6 +-
 include/net/udp_tunnel.h                           |   2 +-
 include/net/vxlan.h                                |   2 +
 include/trace/events/fib.h                         |  44 +-
 include/trace/events/fib6.h                        |   6 +-
 include/trace/events/mlxsw.h                       |   2 +-
 include/uapi/linux/batadv_packet.h                 |  12 -
 include/uapi/linux/batman_adv.h                    |  25 +-
 include/uapi/linux/bpf.h                           |  65 +-
 include/uapi/linux/ethtool.h                       |   8 +
 include/uapi/linux/fou.h                           |   6 +
 include/uapi/linux/if_tun.h                        |   1 +
 include/uapi/linux/openvswitch.h                   |  46 +
 include/uapi/linux/tcp.h                           |  27 +
 include/uapi/linux/tipc_netlink.h                  |   2 +
 include/uapi/linux/tls.h                           |  15 +
 ipc/util.c                                         |   1 -
 kernel/bpf/verifier.c                              |  33 +-
 kernel/taskstats.c                                 |  28 +-
 lib/rhashtable.c                                   | 207 +++--
 lib/test_rhashtable.c                              |   2 +-
 net/Kconfig                                        |   7 +-
 net/atm/clip.c                                     |   4 +-
 net/batman-adv/Kconfig                             |  24 +-
 net/batman-adv/Makefile                            |  15 +-
 net/batman-adv/bat_algo.c                          |  12 -
 net/batman-adv/bat_algo.h                          |  12 -
 net/batman-adv/bat_iv_ogm.c                        |  12 -
 net/batman-adv/bat_iv_ogm.h                        |  12 -
 net/batman-adv/bat_v.c                             |  12 -
 net/batman-adv/bat_v.h                             |  12 -
 net/batman-adv/bat_v_elp.c                         |  12 -
 net/batman-adv/bat_v_elp.h                         |  12 -
 net/batman-adv/bat_v_ogm.c                         |  12 -
 net/batman-adv/bat_v_ogm.h                         |  12 -
 net/batman-adv/bitarray.c                          |  12 -
 net/batman-adv/bitarray.h                          |  12 -
 net/batman-adv/bridge_loop_avoidance.c             |  13 -
 net/batman-adv/bridge_loop_avoidance.h             |  12 -
 net/batman-adv/debugfs.c                           |  12 -
 net/batman-adv/debugfs.h                           |  12 -
 net/batman-adv/distributed-arp-table.c             |  40 +-
 net/batman-adv/distributed-arp-table.h             |  12 -
 net/batman-adv/fragmentation.c                     |  12 -
 net/batman-adv/fragmentation.h                     |  12 -
 net/batman-adv/gateway_client.c                    |  13 -
 net/batman-adv/gateway_client.h                    |  12 -
 net/batman-adv/gateway_common.c                    |  12 -
 net/batman-adv/gateway_common.h                    |  12 -
 net/batman-adv/hard-interface.c                    |  12 -
 net/batman-adv/hard-interface.h                    |  12 -
 net/batman-adv/hash.c                              |  12 -
 net/batman-adv/hash.h                              |  12 -
 net/batman-adv/icmp_socket.c                       |  12 -
 net/batman-adv/icmp_socket.h                       |  12 -
 net/batman-adv/log.c                               |  12 -
 net/batman-adv/log.h                               |  12 -
 net/batman-adv/main.c                              |  85 +-
 net/batman-adv/main.h                              |  14 +-
 net/batman-adv/multicast.c                         | 211 ++++-
 net/batman-adv/multicast.h                         |  30 +-
 net/batman-adv/netlink.c                           |  42 +-
 net/batman-adv/netlink.h                           |  12 -
 net/batman-adv/network-coding.c                    |  12 -
 net/batman-adv/network-coding.h                    |  12 -
 net/batman-adv/originator.c                        |  12 -
 net/batman-adv/originator.h                        |  12 -
 net/batman-adv/routing.c                           |  12 -
 net/batman-adv/routing.h                           |  12 -
 net/batman-adv/send.c                              |  12 -
 net/batman-adv/send.h                              |  12 -
 net/batman-adv/soft-interface.c                    |  20 +-
 net/batman-adv/soft-interface.h                    |  12 -
 net/batman-adv/sysfs.c                             | 128 +--
 net/batman-adv/sysfs.h                             |  50 +-
 net/batman-adv/tp_meter.c                          |  12 -
 net/batman-adv/tp_meter.h                          |  12 -
 net/batman-adv/trace.c                             |  12 -
 net/batman-adv/trace.h                             |  12 -
 net/batman-adv/translation-table.c                 |  17 +-
 net/batman-adv/translation-table.h                 |  16 +-
 net/batman-adv/tvlv.c                              |  12 -
 net/batman-adv/tvlv.h                              |  12 -
 net/batman-adv/types.h                             |  18 +-
 net/bridge/br_arp_nd_proxy.c                       |   1 +
 net/bridge/br_fdb.c                                |   1 -
 net/bridge/br_forward.c                            |  15 +-
 net/bridge/br_if.c                                 |   2 +-
 net/bridge/br_multicast.c                          |  26 +-
 net/bridge/br_netlink.c                            |   2 +-
 net/bridge/br_private.h                            |   6 +-
 net/bridge/br_stp_if.c                             |   3 +-
 net/bridge/br_vlan.c                               |   1 -
 net/bridge/br_vlan_tunnel.c                        |   1 -
 net/core/datagram.c                                |  29 +-
 net/core/datagram.h                                |  15 +
 net/core/dev.c                                     |  82 +-
 net/core/dev_ioctl.c                               |   3 +-
 net/core/devlink.c                                 | 184 ++--
 net/core/dst.c                                     |  17 -
 net/core/ethtool.c                                 |   2 +
 net/core/filter.c                                  | 396 +++++++--
 net/core/flow_dissector.c                          |   2 +
 net/core/lwt_bpf.c                                 |   1 +
 net/core/net-sysfs.c                               |   4 +-
 net/core/netpoll.c                                 |   2 +-
 net/core/rtnetlink.c                               |   9 +-
 net/core/skbuff.c                                  |   5 +-
 net/core/sock_reuseport.c                          |   2 +
 net/core/sysctl_net_core.c                         |   8 +-
 net/decnet/af_decnet.c                             |   2 +-
 net/dsa/Kconfig                                    |   1 +
 net/dsa/dsa2.c                                     |  51 +-
 net/dsa/slave.c                                    |  35 +-
 net/hsr/Makefile                                   |   1 +
 net/hsr/hsr_device.c                               |  66 +-
 net/hsr/hsr_device.h                               |   6 +-
 net/hsr/hsr_forward.c                              |  90 +-
 net/hsr/hsr_forward.h                              |   6 +-
 net/hsr/hsr_framereg.c                             | 127 ++-
 net/hsr/hsr_framereg.h                             |  18 +-
 net/hsr/hsr_main.c                                 |  16 +-
 net/hsr/hsr_main.h                                 |  63 +-
 net/hsr/hsr_netlink.c                              |  62 +-
 net/hsr/hsr_netlink.h                              |   6 +-
 net/hsr/hsr_prp_debugfs.c                          | 120 +++
 net/hsr/hsr_slave.c                                |  19 +-
 net/hsr/hsr_slave.h                                |   7 +-
 net/ieee802154/ieee802154.h                        |   2 -
 net/ieee802154/netlink.c                           |   1 +
 net/ieee802154/nl802154.c                          |  30 +-
 net/ipv4/af_inet.c                                 |   6 +-
 net/ipv4/fib_frontend.c                            |  80 +-
 net/ipv4/fib_lookup.h                              |   1 +
 net/ipv4/fib_semantics.c                           | 982 +++++++++++++--------
 net/ipv4/fib_trie.c                                |  33 +-
 net/ipv4/fou.c                                     | 142 ++-
 net/ipv4/inet_connection_sock.c                    |   4 +-
 net/ipv4/ip_forward.c                              |   2 +-
 net/ipv4/ip_output.c                               |  20 +-
 net/ipv4/ipmr.c                                    |   1 -
 net/ipv4/route.c                                   | 186 ++--
 net/ipv4/syncookies.c                              |  17 +-
 net/ipv4/sysctl_net_ipv4.c                         |   9 +
 net/ipv4/tcp.c                                     |  49 +-
 net/ipv4/tcp_input.c                               |  12 +-
 net/ipv4/tcp_ipv4.c                                |  11 +-
 net/ipv4/tcp_metrics.c                             |   3 +-
 net/ipv4/tcp_output.c                              |  15 +-
 net/ipv4/udp.c                                     |  19 +-
 net/ipv4/xfrm4_policy.c                            |   7 +-
 net/ipv6/addrconf.c                                |  27 +-
 net/ipv6/addrconf_core.c                           |  11 +-
 net/ipv6/af_inet6.c                                |   5 +
 net/ipv6/icmp.c                                    |  28 +-
 net/ipv6/ila/ila_main.c                            |   5 +-
 net/ipv6/ip6_fib.c                                 |  18 +-
 net/ipv6/ip6_output.c                              |   2 +-
 net/ipv6/ip6mr.c                                   |   1 -
 net/ipv6/ndisc.c                                   |   8 +-
 net/ipv6/output_core.c                             |  30 +-
 net/ipv6/route.c                                   | 554 ++++++------
 net/ipv6/seg6.c                                    |   5 +-
 net/ipv6/tcp_ipv6.c                                |  57 +-
 net/ipv6/udp.c                                     |  10 +-
 net/l2tp/l2tp_netlink.c                            |  10 +-
 net/mac80211/iface.c                               |   6 +-
 net/mpls/af_mpls.c                                 |   2 +-
 net/mpls/mpls_iptunnel.c                           |  12 +-
 net/ncsi/ncsi-netlink.c                            |   7 +-
 net/netfilter/ipvs/ip_vs_ctl.c                     |  13 +-
 net/netfilter/nf_conntrack_timeout.c               |  89 ++
 net/netfilter/nf_tables_api.c                      |   1 -
 net/netfilter/xt_CT.c                              |  93 +-
 net/netlabel/netlabel_calipso.c                    |   5 +-
 net/netlabel/netlabel_cipso_v4.c                   |   5 +-
 net/netlabel/netlabel_mgmt.c                       |   9 +-
 net/netlabel/netlabel_unlabeled.c                  |   9 +-
 net/netlink/genetlink.c                            |   6 +-
 net/nfc/netlink.c                                  |  20 +-
 net/openvswitch/actions.c                          |  48 +
 net/openvswitch/conntrack.c                        |  40 +-
 net/openvswitch/datapath.c                         |  17 +-
 net/openvswitch/flow_netlink.c                     | 217 ++++-
 net/openvswitch/meter.c                            |   5 +-
 net/packet/af_packet.c                             |  16 +-
 net/rxrpc/local_object.c                           |   2 +-
 net/sched/cls_api.c                                |   1 -
 net/sched/cls_flower.c                             | 539 ++++++++---
 net/sched/sch_generic.c                            |   3 +
 net/smc/smc_pnet.c                                 |   5 +-
 net/tipc/bcast.c                                   | 275 +++++-
 net/tipc/bcast.h                                   |  12 +
 net/tipc/core.c                                    |   2 +
 net/tipc/core.h                                    |   3 +
 net/tipc/link.c                                    | 274 +++++-
 net/tipc/msg.h                                     |  62 ++
 net/tipc/netlink.c                                 |  26 +-
 net/tipc/node.c                                    |  18 +
 net/tipc/node.h                                    |   8 +-
 net/tipc/socket.c                                  |   6 +
 net/tipc/udp_media.c                               |   2 +-
 net/tls/tls_main.c                                 |  31 +-
 net/tls/tls_sw.c                                   |  73 +-
 net/unix/af_unix.c                                 |   6 +-
 net/wimax/stack.c                                  |   5 +-
 net/wireless/nl80211.c                             | 105 +--
 net/xfrm/xfrm_device.c                             |   2 +-
 samples/bpf/.gitignore                             |   1 +
 tools/include/uapi/linux/bpf.h                     |  65 +-
 tools/testing/selftests/bpf/.gitignore             |   1 +
 tools/testing/selftests/bpf/Makefile               |   9 +-
 tools/testing/selftests/bpf/bpf_helpers.h          |  26 +
 tools/testing/selftests/bpf/config                 |   2 +
 .../bpf/prog_tests/stacktrace_build_id_nmi.c       |  16 +-
 tools/testing/selftests/bpf/progs/test_tc_edt.c    | 109 +++
 tools/testing/selftests/bpf/progs/test_tc_tunnel.c | 261 ++++++
 .../bpf/progs/test_tcp_check_syncookie_kern.c      | 129 +++
 tools/testing/selftests/bpf/test_tc_edt.sh         |  99 +++
 tools/testing/selftests/bpf/test_tc_tunnel.sh      | 186 ++++
 .../selftests/bpf/test_tcp_check_syncookie.sh      |  81 ++
 .../selftests/bpf/test_tcp_check_syncookie_user.c  | 212 +++++
 tools/testing/selftests/bpf/test_verifier.c        |   6 +-
 tools/testing/selftests/bpf/urandom_read.c         |  15 +-
 .../testing/selftests/bpf/verifier/ref_tracking.c  | 126 ++-
 tools/testing/selftests/bpf/verifier/unpriv.c      |   8 +-
 .../selftests/drivers/net/mlxsw/qos_ets_strict.sh  | 311 +++++++
 .../testing/selftests/drivers/net/mlxsw/qos_lib.sh |  98 ++
 .../selftests/drivers/net/mlxsw/qos_mc_aware.sh    | 122 +--
 .../drivers/net/mlxsw/spectrum-2/tc_flower.sh      |   1 +
 .../net/mlxsw/spectrum/devlink_resources.sh        |   3 +
 .../drivers/net/mlxsw/spectrum/resource_scale.sh   |   5 +-
 tools/testing/selftests/net/fib_tests.sh           |  70 +-
 .../selftests/net/forwarding/bridge_igmp.sh        | 152 ++++
 .../selftests/net/forwarding/devlink_lib.sh        | 110 ++-
 .../selftests/net/forwarding/router_multicast.sh   | 107 ++-
 .../testing/selftests/net/forwarding/tc_flower.sh  |  59 +-
 .../selftests/net/forwarding/tc_vlan_modify.sh     | 164 ++++
 .../tc-testing/tc-tests/actions/pedit.json         | 903 +++++++++++++++++++
 528 files changed, 17199 insertions(+), 7496 deletions(-)
 rename Documentation/ABI/{testing => obsolete}/sysfs-class-net-batman-adv (92%)
 rename Documentation/ABI/{testing => obsolete}/sysfs-class-net-mesh (97%)
 create mode 100644 Documentation/devicetree/bindings/net/mdio-mux-meson-g12a.txt
 create mode 100644 drivers/net/phy/mdio-mux-meson-g12a.c
 create mode 100644 include/net/ipv6_stubs.h
 create mode 100644 net/core/datagram.h
 create mode 100644 net/hsr/hsr_prp_debugfs.c
 create mode 100644 tools/testing/selftests/bpf/progs/test_tc_edt.c
 create mode 100644 tools/testing/selftests/bpf/progs/test_tc_tunnel.c
 create mode 100644 tools/testing/selftests/bpf/progs/test_tcp_check_syncookie_kern.c
 create mode 100755 tools/testing/selftests/bpf/test_tc_edt.sh
 create mode 100755 tools/testing/selftests/bpf/test_tc_tunnel.sh
 create mode 100755 tools/testing/selftests/bpf/test_tcp_check_syncookie.sh
 create mode 100644 tools/testing/selftests/bpf/test_tcp_check_syncookie_user.c
 create mode 100755 tools/testing/selftests/drivers/net/mlxsw/qos_ets_strict.sh
 create mode 100644 tools/testing/selftests/drivers/net/mlxsw/qos_lib.sh
 create mode 100755 tools/testing/selftests/net/forwarding/bridge_igmp.sh
 create mode 100755 tools/testing/selftests/net/forwarding/tc_vlan_modify.sh
Merging bpf-next/master (ff466b58055f libbpf: Ignore -Wformat-nonliteral warning)
$ git merge bpf-next/master
Auto-merging tools/testing/selftests/bpf/test_btf.c
Auto-merging tools/lib/bpf/Makefile
Auto-merging kernel/bpf/verifier.c
Auto-merging Makefile
Merge made by the 'recursive' strategy.
 Makefile                                           |   3 +-
 include/linux/bpf.h                                |   1 +
 include/linux/bpf_verifier.h                       |  23 ++
 kernel/bpf/core.c                                  |  11 +-
 kernel/bpf/syscall.c                               |   3 +-
 kernel/bpf/verifier.c                              | 265 ++++++++++++++++-----
 lib/Kconfig.debug                                  |   8 +
 samples/bpf/asm_goto_workaround.h                  |   1 +
 samples/bpf/offwaketime_user.c                     |   5 +
 samples/bpf/sampleip_user.c                        |   5 +
 samples/bpf/spintest_user.c                        |   7 +-
 samples/bpf/trace_event_user.c                     |   5 +
 scripts/link-vmlinux.sh                            |  20 +-
 tools/lib/bpf/.gitignore                           |   1 +
 tools/lib/bpf/Makefile                             |  18 +-
 tools/lib/bpf/bpf.c                                |   2 +-
 tools/lib/bpf/bpf.h                                |   2 +-
 tools/lib/bpf/libbpf.c                             |  21 +-
 tools/lib/bpf/libbpf.h                             |   1 +
 tools/lib/bpf/libbpf.pc.template                   |  12 +
 tools/testing/selftests/bpf/Makefile               |   4 +-
 tools/testing/selftests/bpf/flow_dissector_load.c  |   2 +-
 .../testing/selftests/bpf/prog_tests/bpf_obj_id.c  |   8 +-
 .../selftests/bpf/prog_tests/bpf_verif_scale.c     |  49 ++++
 .../selftests/bpf/prog_tests/get_stack_raw_tp.c    |   4 +-
 tools/testing/selftests/bpf/progs/test_jhash.h     |  70 ++++++
 .../selftests/bpf/progs/test_verif_scale1.c        |  30 +++
 .../selftests/bpf/progs/test_verif_scale2.c        |  30 +++
 .../selftests/bpf/progs/test_verif_scale3.c        |  30 +++
 tools/testing/selftests/bpf/test_btf.c             |  32 ++-
 tools/testing/selftests/bpf/test_progs.c           |   6 +-
 tools/testing/selftests/bpf/test_progs.h           |   1 +
 tools/testing/selftests/bpf/test_verifier.c        |  35 ++-
 tools/testing/selftests/bpf/trace_helpers.c        |   4 +
 tools/testing/selftests/bpf/verifier/ctx_skb.c     |   1 -
 tools/testing/selftests/bpf/verifier/ld_dw.c       |   9 +
 tools/testing/selftests/bpf/verifier/var_off.c     | 186 ++++++++++++++-
 37 files changed, 811 insertions(+), 104 deletions(-)
 create mode 100644 tools/lib/bpf/libbpf.pc.template
 create mode 100644 tools/testing/selftests/bpf/prog_tests/bpf_verif_scale.c
 create mode 100644 tools/testing/selftests/bpf/progs/test_jhash.h
 create mode 100644 tools/testing/selftests/bpf/progs/test_verif_scale1.c
 create mode 100644 tools/testing/selftests/bpf/progs/test_verif_scale2.c
 create mode 100644 tools/testing/selftests/bpf/progs/test_verif_scale3.c
Merging ipsec-next/master (f981c57ffd2d vti4: eliminated some duplicate code.)
$ git merge ipsec-next/master
Auto-merging net/ipv4/ip_vti.c
Auto-merging net/ipv4/esp4_offload.c
Merge made by the 'recursive' strategy.
 net/ipv4/esp4_offload.c | 10 ++++++---
 net/ipv4/ip_vti.c       | 60 ++++++++++++++++++-------------------------------
 net/xfrm/xfrm_device.c  |  3 +++
 3 files changed, 32 insertions(+), 41 deletions(-)
Merging mlx5-next/mlx5-next (aef6c443fe84 net/mlx5: Fix false compilation warning)
$ git merge mlx5-next/mlx5-next
Already up to date.
Merging netfilter-next/master (3b0a081db1f7 netfilter: make two functions static)
$ git merge netfilter-next/master
Removing net/ipv6/netfilter/nft_chain_route_ipv6.c
Removing net/ipv4/netfilter/nft_chain_route_ipv4.c
Merge made by the 'recursive' strategy.
 include/linux/jiffies.h                      |   1 +
 include/linux/netfilter.h                    |   9 +-
 include/linux/netfilter/nfnetlink_osf.h      |  11 +-
 include/linux/netfilter/x_tables.h           |   1 -
 include/linux/netfilter_ipv6.h               |  15 +++
 include/net/ip_vs.h                          |   5 +
 include/net/netfilter/nf_conntrack_expect.h  |   2 +-
 include/net/netfilter/nf_nat.h               |   7 +-
 include/net/netfilter/nf_tables.h            |   4 +-
 include/uapi/linux/ip_vs.h                   |  11 ++
 include/uapi/linux/netfilter/nf_tables.h     |   6 +
 kernel/time/time.c                           |  10 ++
 net/ipv4/netfilter/Kconfig                   |   8 --
 net/ipv4/netfilter/Makefile                  |   1 -
 net/ipv4/netfilter/nft_chain_route_ipv4.c    |  89 --------------
 net/ipv6/netfilter/Kconfig                   |   8 --
 net/ipv6/netfilter/Makefile                  |   1 -
 net/ipv6/netfilter/nft_chain_route_ipv6.c    |  91 ---------------
 net/netfilter/Kconfig                        |   5 -
 net/netfilter/Makefile                       |   3 +-
 net/netfilter/ipvs/ip_vs_ctl.c               |  35 +++++-
 net/netfilter/ipvs/ip_vs_xmit.c              |  84 ++++++++++++-
 net/netfilter/nf_conntrack_expect.c          |   2 +-
 net/netfilter/nf_conntrack_netlink.c         |  16 +--
 net/netfilter/nf_conntrack_sip.c             |   2 +-
 net/netfilter/nf_flow_table_ip.c             |  10 +-
 net/netfilter/nf_nat_core.c                  |  16 ++-
 net/netfilter/nf_nat_proto.c                 |  59 ++++++----
 net/netfilter/nf_tables_api.c                |  16 ++-
 net/netfilter/nfnetlink_osf.c                |  14 +--
 net/netfilter/nft_chain_nat.c                |  36 ++++++
 net/netfilter/nft_chain_route.c              | 169 +++++++++++++++++++++++++++
 net/netfilter/nft_masq.c                     |  64 ++++++++++
 net/netfilter/nft_nat.c                      |  58 ++++++++-
 net/netfilter/nft_osf.c                      |  30 ++++-
 net/netfilter/nft_redir.c                    |  63 +++++++++-
 net/netfilter/x_tables.c                     |   3 +-
 net/openvswitch/conntrack.c                  |  18 +--
 tools/testing/selftests/netfilter/nft_nat.sh | 130 +++++++++++++++------
 39 files changed, 775 insertions(+), 338 deletions(-)
 delete mode 100644 net/ipv4/netfilter/nft_chain_route_ipv4.c
 delete mode 100644 net/ipv6/netfilter/nft_chain_route_ipv6.c
 create mode 100644 net/netfilter/nft_chain_route.c
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/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 (95336d4cb588 qtnfmac: replace qtnf_cmd_acl_data_size() with struct_size())
$ git merge wireless-drivers-next/master
Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/trans.c
Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/internal.h
Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-trans.h
Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-config.h
Auto-merging drivers/net/wireless/intel/iwlwifi/fw/dbg.c
Auto-merging drivers/net/wireless/intel/iwlwifi/cfg/22000.c
Merge made by the 'recursive' strategy.
 drivers/net/wireless/broadcom/b43/phy_lp.c         |   6 +-
 .../wireless/broadcom/brcm80211/brcmfmac/bcdc.c    |  11 +-
 .../wireless/broadcom/brcm80211/brcmfmac/bcdc.h    |   6 +-
 .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h |  12 +
 .../broadcom/brcm80211/brcmfmac/cfg80211.c         |   4 +
 .../wireless/broadcom/brcm80211/brcmfmac/core.c    |  36 +-
 .../wireless/broadcom/brcm80211/brcmfmac/core.h    |   2 +
 .../broadcom/brcm80211/brcmfmac/firmware.c         |   1 +
 .../broadcom/brcm80211/brcmfmac/fwsignal.c         |  58 ++--
 .../broadcom/brcm80211/brcmfmac/fwsignal.h         |   3 +-
 .../wireless/broadcom/brcm80211/brcmfmac/pcie.c    |  37 +-
 .../wireless/broadcom/brcm80211/brcmfmac/proto.c   |  10 +-
 .../wireless/broadcom/brcm80211/brcmfmac/proto.h   |   3 +-
 .../wireless/broadcom/brcm80211/brcmfmac/sdio.c    |   4 +-
 .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c |  44 +--
 drivers/net/wireless/intel/iwlegacy/4965.c         |   1 -
 drivers/net/wireless/intel/iwlwifi/cfg/22000.c     |   9 +
 .../net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h    | 177 ++++++----
 .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h    |  39 ++-
 drivers/net/wireless/intel/iwlwifi/fw/api/rx.h     |  67 +---
 drivers/net/wireless/intel/iwlwifi/fw/api/scan.h   |  54 ++-
 drivers/net/wireless/intel/iwlwifi/fw/dbg.c        | 189 ++++++-----
 drivers/net/wireless/intel/iwlwifi/fw/dbg.h        |  17 +-
 drivers/net/wireless/intel/iwlwifi/fw/error-dump.h |   6 +-
 drivers/net/wireless/intel/iwlwifi/fw/file.h       |   9 +
 drivers/net/wireless/intel/iwlwifi/fw/runtime.h    |   1 +
 drivers/net/wireless/intel/iwlwifi/iwl-config.h    |   5 +-
 drivers/net/wireless/intel/iwlwifi/iwl-csr.h       |   5 +-
 drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c   |  10 +-
 drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 139 ++++----
 drivers/net/wireless/intel/iwlwifi/iwl-prph.h      |   6 +
 drivers/net/wireless/intel/iwlwifi/iwl-trans.h     |   1 -
 drivers/net/wireless/intel/iwlwifi/mvm/d3.c        |  90 ++++-
 drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c   |   2 +-
 drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c  |   7 +-
 drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c  | 202 ++++++++---
 drivers/net/wireless/intel/iwlwifi/mvm/mvm.h       |  24 +-
 drivers/net/wireless/intel/iwlwifi/mvm/ops.c       |   8 +-
 drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c     |  44 ++-
 drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c      |  31 +-
 drivers/net/wireless/intel/iwlwifi/mvm/scan.c      |  25 +-
 .../net/wireless/intel/iwlwifi/mvm/time-event.c    |   5 +-
 drivers/net/wireless/intel/iwlwifi/pcie/internal.h |  30 +-
 drivers/net/wireless/intel/iwlwifi/pcie/rx.c       |  13 +-
 drivers/net/wireless/intel/iwlwifi/pcie/trans.c    |  38 ++-
 drivers/net/wireless/marvell/mwifiex/cfg80211.c    |   6 +-
 drivers/net/wireless/marvell/mwifiex/cmdevt.c      |   6 +
 drivers/net/wireless/marvell/mwifiex/sta_rx.c      |   3 +-
 drivers/net/wireless/quantenna/qtnfmac/bus.h       |  25 +-
 drivers/net/wireless/quantenna/qtnfmac/cfg80211.c  |  86 +++--
 drivers/net/wireless/quantenna/qtnfmac/commands.c  | 377 ++++++++++-----------
 drivers/net/wireless/quantenna/qtnfmac/commands.h  |   6 +-
 drivers/net/wireless/quantenna/qtnfmac/core.c      |  56 ++-
 drivers/net/wireless/quantenna/qtnfmac/core.h      |   5 +-
 drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c |  32 +-
 .../wireless/quantenna/qtnfmac/pcie/pcie_priv.h    |   3 +-
 .../wireless/quantenna/qtnfmac/pcie/pearl_pcie.c   |  23 +-
 .../wireless/quantenna/qtnfmac/pcie/topaz_pcie.c   |  31 +-
 drivers/net/wireless/quantenna/qtnfmac/qlink.h     |  85 +++--
 .../net/wireless/quantenna/qtnfmac/qlink_util.c    | 117 +++++++
 .../net/wireless/quantenna/qtnfmac/qlink_util.h    |   5 +
 drivers/net/wireless/realtek/rtlwifi/base.c        |   5 +
 drivers/net/wireless/realtek/rtlwifi/pci.c         |   6 +-
 .../net/wireless/realtek/rtlwifi/rtl8188ee/fw.c    |   2 +
 .../wireless/realtek/rtlwifi/rtl8192c/fw_common.c  |   2 +
 .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.c    |   2 +
 .../net/wireless/realtek/rtlwifi/rtl8723ae/fw.c    |   2 +
 .../net/wireless/realtek/rtlwifi/rtl8723be/fw.c    |   2 +
 .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.c    |   4 +
 69 files changed, 1540 insertions(+), 842 deletions(-)
Merging bluetooth/master (bbcece3d418c Bluetooth: mediatek: Fixed incorrect type in assignment)
$ git merge bluetooth/master
Merge made by the 'recursive' strategy.
 drivers/bluetooth/Kconfig     |  11 +
 drivers/bluetooth/Makefile    |   1 +
 drivers/bluetooth/btmtksdio.c | 956 ++++++++++++++++++++++++++++++++++++++++++
 drivers/bluetooth/btmtkuart.c |   2 +-
 drivers/bluetooth/btqca.h     |   2 +-
 drivers/bluetooth/btsdio.c    |  15 +-
 drivers/bluetooth/hci_qca.c   |  45 +-
 include/linux/mmc/sdio_func.h |  12 +
 include/linux/mmc/sdio_ids.h  |   2 +
 net/bluetooth/l2cap_core.c    |   9 +-
 net/bluetooth/l2cap_sock.c    |   7 +-
 11 files changed, 1020 insertions(+), 42 deletions(-)
 create mode 100644 drivers/bluetooth/btmtksdio.c
Merging mac80211-next/master (e3190a97ca8b mac80211: only allocate one queue when using iTXQs)
$ git merge mac80211-next/master
Auto-merging net/wireless/util.c
Auto-merging net/wireless/scan.c
Auto-merging net/wireless/reg.c
Auto-merging net/wireless/nl80211.c
Auto-merging net/mac80211/tx.c
CONFLICT (content): Merge conflict in net/mac80211/tx.c
Auto-merging net/mac80211/rx.c
Auto-merging net/mac80211/mesh_pathtbl.c
Auto-merging include/net/mac80211.h
Auto-merging include/net/cfg80211.h
Auto-merging drivers/net/wireless/mac80211_hwsim.c
Recorded preimage for 'net/mac80211/tx.c'
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
Recorded resolution for 'net/mac80211/tx.c'.
[master ae002b1a5988] Merge remote-tracking branch 'mac80211-next/master'
$ git diff -M --stat --summary HEAD^..
 drivers/net/wireless/mac80211_hwsim.c |   2 +
 include/linux/ieee80211.h             |  14 +-
 include/net/cfg80211.h                |  77 +++++++++++
 include/net/fq_impl.h                 |  18 +--
 include/net/mac80211.h                |   6 +
 include/uapi/linux/nl80211.h          |  54 +++++++-
 net/mac80211/cfg.c                    |  36 +++++
 net/mac80211/debugfs.c                |  54 ++++++++
 net/mac80211/ieee80211_i.h            |   5 +-
 net/mac80211/iface.c                  |  11 +-
 net/mac80211/key.c                    |  87 ++++++++----
 net/mac80211/key.h                    |   2 +
 net/mac80211/main.c                   |   5 +
 net/mac80211/mesh.h                   |   2 +
 net/mac80211/mesh_hwmp.c              |  30 ++---
 net/mac80211/mesh_pathtbl.c           |   2 +-
 net/mac80211/mlme.c                   |   3 -
 net/mac80211/rc80211_minstrel_ht.c    | 124 ++++++++++-------
 net/mac80211/rc80211_minstrel_ht.h    |   2 +-
 net/mac80211/rx.c                     |  74 ++++++-----
 net/mac80211/sta_info.c               |  15 +++
 net/mac80211/tx.c                     |  58 +++++---
 net/mac80211/util.c                   | 167 ++++++++++++++---------
 net/mac80211/wep.c                    |  11 +-
 net/mac80211/wep.h                    |   1 +
 net/mac80211/wpa.c                    |  13 +-
 net/wireless/nl80211.c                | 241 ++++++++++++++++++++++++++++------
 net/wireless/rdev-ops.h               |  16 ++-
 net/wireless/reg.c                    |  23 +---
 net/wireless/scan.c                   | 173 ++++++++++++++++++++++--
 net/wireless/trace.h                  |  69 +++++++++-
 net/wireless/util.c                   |  21 ++-
 net/wireless/wext-compat.c            |   3 -
 33 files changed, 1089 insertions(+), 330 deletions(-)
Merging gfs2/for-next (3e4815fd93fa gfs2: clean_journal improperly set sd_log_flush_head)
$ git merge gfs2/for-next
Auto-merging fs/gfs2/bmap.c
Merge made by the 'recursive' strategy.
 fs/gfs2/bmap.c     | 26 ++++++++++++++++++++++++++
 fs/gfs2/bmap.h     |  1 +
 fs/gfs2/glock.c    | 22 +++++++++++++---------
 fs/gfs2/incore.h   |  2 +-
 fs/gfs2/log.c      | 24 ++++++++++++++++--------
 fs/gfs2/log.h      |  3 ++-
 fs/gfs2/lops.c     |  6 +++---
 fs/gfs2/lops.h     |  2 +-
 fs/gfs2/recovery.c | 10 ++++++----
 fs/gfs2/recovery.h |  2 +-
 fs/gfs2/rgrp.c     | 54 +++++++++++++++++++++++++-----------------------------
 11 files changed, 95 insertions(+), 57 deletions(-)
Merging mtd/mtd/next (9e98c678c2d6 Linux 5.1-rc1)
$ git merge mtd/mtd/next
Already up to date.
Merging nand/nand/next (e6a35ef45a03 mtd: nand: Remove useless line in Kconfig)
$ git merge nand/nand/next
Removing drivers/mtd/nand/raw/jz4780_nand.c
Removing drivers/mtd/nand/raw/jz4780_bch.h
Auto-merging arch/mips/configs/generic/board-ocelot.config
Auto-merging arch/arm64/configs/defconfig
Auto-merging arch/arm/configs/multi_v7_defconfig
Auto-merging arch/arm/configs/imx_v6_v7_defconfig
Auto-merging arch/arm/configs/imx_v4_v5_defconfig
Merge made by the 'recursive' strategy.
 .../bindings/memory-controllers/atmel,ebi.txt      |   1 +
 .../devicetree/bindings/mtd/atmel-nand.txt         |   1 +
 .../bindings/mtd/ingenic,jz4780-nand.txt           |  32 +-
 arch/arm/configs/at91_dt_defconfig                 |   2 +-
 arch/arm/configs/clps711x_defconfig                |   2 +-
 arch/arm/configs/cm_x2xx_defconfig                 |   2 +-
 arch/arm/configs/cm_x300_defconfig                 |   2 +-
 arch/arm/configs/colibri_pxa270_defconfig          |   2 +-
 arch/arm/configs/corgi_defconfig                   |   2 +-
 arch/arm/configs/davinci_all_defconfig             |   2 +-
 arch/arm/configs/em_x270_defconfig                 |   2 +-
 arch/arm/configs/ep93xx_defconfig                  |   2 +-
 arch/arm/configs/eseries_pxa_defconfig             |   2 +-
 arch/arm/configs/imx_v4_v5_defconfig               |   2 +-
 arch/arm/configs/imx_v6_v7_defconfig               |   2 +-
 arch/arm/configs/ixp4xx_defconfig                  |   2 +-
 arch/arm/configs/keystone_defconfig                |   2 +-
 arch/arm/configs/lpc32xx_defconfig                 |   2 +-
 arch/arm/configs/mini2440_defconfig                |   2 +-
 arch/arm/configs/mmp2_defconfig                    |   2 +-
 arch/arm/configs/multi_v4t_defconfig               |   2 +-
 arch/arm/configs/multi_v5_defconfig                |   2 +-
 arch/arm/configs/multi_v7_defconfig                |   2 +-
 arch/arm/configs/mv78xx0_defconfig                 |   2 +-
 arch/arm/configs/mvebu_v5_defconfig                |   2 +-
 arch/arm/configs/mvebu_v7_defconfig                |   2 +-
 arch/arm/configs/mxs_defconfig                     |   2 +-
 arch/arm/configs/nhk8815_defconfig                 |   4 +-
 arch/arm/configs/omap1_defconfig                   |   2 +-
 arch/arm/configs/omap2plus_defconfig               |   4 +-
 arch/arm/configs/orion5x_defconfig                 |   2 +-
 arch/arm/configs/oxnas_v6_defconfig                |   2 +-
 arch/arm/configs/pxa3xx_defconfig                  |   2 +-
 arch/arm/configs/pxa_defconfig                     |   4 +-
 arch/arm/configs/qcom_defconfig                    |   2 +-
 arch/arm/configs/s3c2410_defconfig                 |   2 +-
 arch/arm/configs/s3c6400_defconfig                 |   2 +-
 arch/arm/configs/sama5_defconfig                   |   2 +-
 arch/arm/configs/socfpga_defconfig                 |   2 +-
 arch/arm/configs/spear13xx_defconfig               |   2 +-
 arch/arm/configs/spear3xx_defconfig                |   2 +-
 arch/arm/configs/spear6xx_defconfig                |   2 +-
 arch/arm/configs/spitz_defconfig                   |   2 +-
 arch/arm/configs/tango4_defconfig                  |   2 +-
 arch/arm/configs/trizeps4_defconfig                |   2 +-
 arch/arm/configs/u300_defconfig                    |   2 +-
 arch/arm64/configs/defconfig                       |   2 +-
 arch/mips/configs/bcm47xx_defconfig                |   2 +-
 arch/mips/configs/ci20_defconfig                   |   2 +-
 arch/mips/configs/db1xxx_defconfig                 |   4 +-
 arch/mips/configs/generic/board-ni169445.config    |   6 +-
 arch/mips/configs/generic/board-ocelot.config      |   2 +-
 arch/mips/configs/loongson1b_defconfig             |   2 +-
 arch/mips/configs/loongson1c_defconfig             |   2 +-
 arch/mips/configs/qi_lb60_defconfig                |   2 +-
 arch/mips/configs/rb532_defconfig                  |   2 +-
 arch/mips/configs/rbtx49xx_defconfig               |   2 +-
 arch/mips/configs/xway_defconfig                   |   2 +-
 arch/powerpc/configs/40x/kilauea_defconfig         |   2 +-
 arch/powerpc/configs/40x/obs600_defconfig          |   2 +-
 arch/powerpc/configs/44x/canyonlands_defconfig     |   2 +-
 arch/powerpc/configs/44x/eiger_defconfig           |   2 +-
 arch/powerpc/configs/44x/sequoia_defconfig         |   2 +-
 arch/powerpc/configs/44x/warp_defconfig            |   2 +-
 arch/powerpc/configs/83xx/mpc8313_rdb_defconfig    |   2 +-
 arch/powerpc/configs/83xx/mpc8315_rdb_defconfig    |   2 +-
 arch/powerpc/configs/85xx-hw.config                |   2 +-
 arch/powerpc/configs/85xx/ge_imp3a_defconfig       |   2 +-
 arch/powerpc/configs/85xx/socrates_defconfig       |   2 +-
 arch/powerpc/configs/85xx/tqm8548_defconfig        |   4 +-
 arch/powerpc/configs/85xx/xes_mpc85xx_defconfig    |   2 +-
 arch/powerpc/configs/86xx-hw.config                |   2 +-
 arch/powerpc/configs/mpc512x_defconfig             |   2 +-
 arch/powerpc/configs/mpc83xx_defconfig             |   2 +-
 arch/powerpc/configs/pasemi_defconfig              |   2 +-
 arch/powerpc/configs/ppc44x_defconfig              |   2 +-
 arch/sh/configs/ap325rxa_defconfig                 |   2 +-
 arch/sh/configs/ecovec24_defconfig                 |   2 +-
 arch/sh/configs/migor_defconfig                    |   2 +-
 arch/sh/configs/sdk7786_defconfig                  |   2 +-
 arch/sh/configs/se7724_defconfig                   |   2 +-
 arch/sh/configs/titan_defconfig                    |   2 +-
 drivers/memory/atmel-ebi.c                         |  37 +-
 drivers/mtd/Kconfig                                |   3 +-
 drivers/mtd/devices/Kconfig                        |   2 +-
 drivers/mtd/nand/Kconfig                           |   1 -
 drivers/mtd/nand/core.c                            |  34 ++
 drivers/mtd/nand/raw/Kconfig                       | 393 ++++++++-------
 drivers/mtd/nand/raw/Makefile                      |   9 +-
 drivers/mtd/nand/raw/atmel/nand-controller.c       | 125 +++--
 drivers/mtd/nand/raw/atmel/pmecc.c                 |   5 +-
 drivers/mtd/nand/raw/atmel/pmecc.h                 |   6 +-
 drivers/mtd/nand/raw/bcm47xxnflash/ops_bcm4706.c   |   2 +-
 drivers/mtd/nand/raw/brcmnand/brcmnand.c           |   7 +-
 drivers/mtd/nand/raw/denali.c                      |   6 +-
 drivers/mtd/nand/raw/diskonchip.c                  |   7 +-
 drivers/mtd/nand/raw/fsl_elbc_nand.c               |   4 +-
 drivers/mtd/nand/raw/fsl_ifc_nand.c                |   4 +-
 drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c          |   6 +-
 drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c         |  19 +-
 drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h         |   1 +
 drivers/mtd/nand/raw/hisi504_nand.c                |   2 +-
 drivers/mtd/nand/raw/ingenic/Kconfig               |  50 ++
 drivers/mtd/nand/raw/ingenic/Makefile              |   7 +
 drivers/mtd/nand/raw/ingenic/ingenic_ecc.c         | 163 +++++++
 drivers/mtd/nand/raw/ingenic/ingenic_ecc.h         |  83 ++++
 drivers/mtd/nand/raw/ingenic/ingenic_nand.c        | 530 +++++++++++++++++++++
 drivers/mtd/nand/raw/ingenic/jz4725b_bch.c         | 295 ++++++++++++
 drivers/mtd/nand/raw/ingenic/jz4740_ecc.c          | 197 ++++++++
 drivers/mtd/nand/raw/{ => ingenic}/jz4740_nand.c   |   7 +-
 drivers/mtd/nand/raw/{ => ingenic}/jz4780_bch.c    | 182 ++-----
 drivers/mtd/nand/raw/internals.h                   |   2 +-
 drivers/mtd/nand/raw/jz4780_bch.h                  |  43 --
 drivers/mtd/nand/raw/jz4780_nand.c                 | 415 ----------------
 drivers/mtd/nand/raw/marvell_nand.c                |  49 +-
 drivers/mtd/nand/raw/meson_nand.c                  |   9 +-
 drivers/mtd/nand/raw/mtk_nand.c                    |   4 +-
 drivers/mtd/nand/raw/nand_amd.c                    |  11 +-
 drivers/mtd/nand/raw/nand_base.c                   | 259 ++++++----
 drivers/mtd/nand/raw/nand_bbt.c                    |  45 +-
 drivers/mtd/nand/raw/nand_esmt.c                   |  10 +-
 drivers/mtd/nand/raw/nand_hynix.c                  |  90 ++--
 drivers/mtd/nand/raw/nand_jedec.c                  |  27 +-
 drivers/mtd/nand/raw/nand_micron.c                 |  14 +-
 drivers/mtd/nand/raw/nand_onfi.c                   |  35 +-
 drivers/mtd/nand/raw/nand_samsung.c                |  42 +-
 drivers/mtd/nand/raw/nand_toshiba.c                |  19 +-
 drivers/mtd/nand/raw/nandsim.c                     |  17 +-
 drivers/mtd/nand/raw/nuc900_nand.c                 |   3 +-
 drivers/mtd/nand/raw/omap2.c                       |   4 +-
 drivers/mtd/nand/raw/omap_elm.c                    |   4 +
 drivers/mtd/nand/raw/qcom_nandc.c                  |   8 +-
 drivers/mtd/nand/raw/sh_flctl.c                    |   9 +-
 drivers/mtd/nand/raw/sunxi_nand.c                  |  15 +-
 drivers/mtd/nand/raw/tegra_nand.c                  |   8 +-
 drivers/mtd/nand/raw/vf610_nfc.c                   |   3 +
 drivers/mtd/nand/spi/core.c                        | 169 +++----
 drivers/mtd/nand/spi/gigadevice.c                  |   8 +-
 drivers/mtd/nand/spi/macronix.c                    |   4 +-
 drivers/mtd/nand/spi/micron.c                      |   2 +-
 drivers/mtd/nand/spi/toshiba.c                     |  12 +-
 drivers/mtd/nand/spi/winbond.c                     |   4 +-
 drivers/mtd/sm_ftl.c                               |  12 +-
 drivers/mtd/tests/mtd_nandecctest.c                |  16 +-
 include/linux/mtd/nand.h                           |  32 +-
 include/linux/mtd/nand_bch.h                       |   6 +-
 include/linux/mtd/rawnand.h                        |  97 ++--
 include/linux/mtd/spinand.h                        |   7 +
 include/linux/platform_data/elm.h                  |   2 +-
 include/soc/at91/atmel-sfr.h                       |  34 +-
 150 files changed, 2505 insertions(+), 1438 deletions(-)
 create mode 100644 drivers/mtd/nand/raw/ingenic/Kconfig
 create mode 100644 drivers/mtd/nand/raw/ingenic/Makefile
 create mode 100644 drivers/mtd/nand/raw/ingenic/ingenic_ecc.c
 create mode 100644 drivers/mtd/nand/raw/ingenic/ingenic_ecc.h
 create mode 100644 drivers/mtd/nand/raw/ingenic/ingenic_nand.c
 create mode 100644 drivers/mtd/nand/raw/ingenic/jz4725b_bch.c
 create mode 100644 drivers/mtd/nand/raw/ingenic/jz4740_ecc.c
 rename drivers/mtd/nand/raw/{ => ingenic}/jz4740_nand.c (98%)
 rename drivers/mtd/nand/raw/{ => ingenic}/jz4780_bch.c (57%)
 delete mode 100644 drivers/mtd/nand/raw/jz4780_bch.h
 delete mode 100644 drivers/mtd/nand/raw/jz4780_nand.c
Merging spi-nor/spi-nor/next (dcb4b22eeaf4 spi-nor: s25fl512s supports region locking)
$ git merge spi-nor/spi-nor/next
Merge made by the 'recursive' strategy.
 drivers/mtd/spi-nor/intel-spi.c |  8 ++++++++
 drivers/mtd/spi-nor/spi-nor.c   | 10 ++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)
Merging crypto/master (eda69b0c06bc crypto: testmgr - add panic_on_fail module parameter)
$ git merge crypto/master
Merge made by the 'recursive' strategy.
 arch/arm/crypto/chacha-neon-glue.c           |   5 +-
 arch/arm/crypto/crc32-ce-glue.c              |   5 +-
 arch/arm/crypto/crct10dif-ce-glue.c          |   3 +-
 arch/arm/crypto/ghash-ce-glue.c              |   7 +-
 arch/arm/crypto/nhpoly1305-neon-glue.c       |   3 +-
 arch/arm/crypto/sha1-ce-glue.c               |   5 +-
 arch/arm/crypto/sha1_neon_glue.c             |   5 +-
 arch/arm/crypto/sha2-ce-glue.c               |   5 +-
 arch/arm/crypto/sha256_neon_glue.c           |   5 +-
 arch/arm/crypto/sha512-neon-glue.c           |   5 +-
 arch/arm64/crypto/aes-ce-ccm-glue.c          |   7 +-
 arch/arm64/crypto/aes-ce-glue.c              |   5 +-
 arch/arm64/crypto/aes-glue.c                 |   6 +-
 arch/arm64/crypto/aes-neonbs-glue.c          |   2 +-
 arch/arm64/crypto/chacha-neon-glue.c         |   5 +-
 arch/arm64/crypto/crct10dif-ce-glue.c        |   5 +-
 arch/arm64/crypto/ghash-ce-glue.c            |  17 +-
 arch/arm64/crypto/nhpoly1305-neon-glue.c     |   3 +-
 arch/arm64/crypto/sha1-ce-glue.c             |   7 +-
 arch/arm64/crypto/sha2-ce-glue.c             |   7 +-
 arch/arm64/crypto/sha256-glue.c              |   5 +-
 arch/arm64/crypto/sha3-ce-glue.c             |   5 +-
 arch/arm64/crypto/sha512-ce-glue.c           |   7 +-
 arch/arm64/crypto/sm3-ce-glue.c              |   7 +-
 arch/arm64/crypto/sm4-ce-glue.c              |   5 +-
 arch/x86/crypto/aegis128-aesni-glue.c        | 157 +++----------
 arch/x86/crypto/aegis128l-aesni-glue.c       | 157 +++----------
 arch/x86/crypto/aegis256-aesni-glue.c        | 157 +++----------
 arch/x86/crypto/aesni-intel_glue.c           | 212 +++--------------
 arch/x86/crypto/chacha_glue.c                |   6 +-
 arch/x86/crypto/crc32-pclmul_glue.c          |   5 +-
 arch/x86/crypto/crc32c-intel_glue.c          |   7 +-
 arch/x86/crypto/crct10dif-pclmul_glue.c      |  20 +-
 arch/x86/crypto/ghash-clmulni-intel_glue.c   |   9 +-
 arch/x86/crypto/morus1280-avx2-glue.c        |  12 +-
 arch/x86/crypto/morus1280-sse2-glue.c        |  12 +-
 arch/x86/crypto/morus1280_glue.c             |  85 -------
 arch/x86/crypto/morus640-sse2-glue.c         |  12 +-
 arch/x86/crypto/morus640_glue.c              |  85 -------
 arch/x86/crypto/nhpoly1305-avx2-glue.c       |   5 +-
 arch/x86/crypto/nhpoly1305-sse2-glue.c       |   5 +-
 arch/x86/crypto/poly1305_glue.c              |   4 +-
 arch/x86/crypto/sha1_ssse3_glue.c            |   7 +-
 arch/x86/crypto/sha256_ssse3_glue.c          |   7 +-
 arch/x86/crypto/sha512_ssse3_glue.c          |  10 +-
 crypto/Kconfig                               |  20 +-
 crypto/aes_generic.c                         |   8 +-
 crypto/chacha20poly1305.c                    |   4 +-
 crypto/chacha_generic.c                      |  10 +-
 crypto/crct10dif_generic.c                   |  11 +-
 crypto/cts.c                                 |  18 +-
 crypto/salsa20_generic.c                     |   9 +-
 crypto/scompress.c                           | 129 +++++-----
 crypto/simd.c                                | 273 +++++++++++++++++++++-
 crypto/skcipher.c                            |   9 +-
 crypto/streebog_generic.c                    |  25 +-
 crypto/testmgr.c                             | 153 +++++++++---
 drivers/char/hw_random/omap-rng.c            |   1 +
 drivers/crypto/bcm/spu.c                     |   3 -
 drivers/crypto/caam/ctrl.c                   |  20 ++
 drivers/crypto/caam/intern.h                 |   4 +-
 drivers/crypto/caam/jr.c                     |  31 +--
 drivers/crypto/caam/qi.c                     |   4 +-
 drivers/crypto/cavium/cpt/cptvf_main.c       |   2 +-
 drivers/crypto/cavium/cpt/cptvf_mbox.c       |  17 --
 drivers/crypto/cavium/cpt/cptvf_reqmanager.c |   6 +-
 drivers/crypto/cavium/nitrox/nitrox_aead.c   | 337 ++++++++++++++++++++-------
 drivers/crypto/cavium/nitrox/nitrox_req.h    |  46 +++-
 drivers/crypto/cavium/zip/zip_crypto.c       |   8 +-
 drivers/crypto/ccp/ccp-crypto-rsa.c          |   6 +-
 drivers/crypto/ccp/psp-dev.c                 |  67 ++++++
 drivers/crypto/ccree/cc_cipher.c             |   2 +-
 drivers/crypto/marvell/hash.c                |   3 +-
 drivers/crypto/mxs-dcp.c                     |   4 +-
 drivers/crypto/nx/nx-842-pseries.c           |   6 +-
 drivers/crypto/nx/nx-842.c                   |   3 +-
 drivers/crypto/vmx/aesp8-ppc.pl              |   4 +-
 drivers/crypto/vmx/vmx.c                     |   4 +-
 include/crypto/aes.h                         |   8 +-
 include/crypto/internal/simd.h               |  44 ++++
 include/crypto/morus1280_glue.h              |  79 ++-----
 include/crypto/morus640_glue.h               |  79 ++-----
 include/crypto/streebog.h                    |   5 +-
 include/linux/psp-sev.h                      |   3 +-
 include/uapi/linux/psp-sev.h                 |  18 +-
 85 files changed, 1315 insertions(+), 1283 deletions(-)
Merging drm/drm-next (14d2bd53a47a Merge tag 'drm-misc-next-2019-04-04' of git://anongit.freedesktop.org/drm/drm-misc into drm-next)
$ git merge drm/drm-next
Removing include/drm/tinydrm/tinydrm.h
Auto-merging include/drm/drm_modeset_helper_vtables.h
Removing drivers/staging/vboxvideo/TODO
Auto-merging drivers/staging/Makefile
Auto-merging drivers/staging/Kconfig
Auto-merging drivers/gpu/drm/udl/udl_drv.c
Removing drivers/gpu/drm/tinydrm/core/tinydrm-core.c
Auto-merging drivers/gpu/drm/rockchip/rockchip_drm_vop.c
Removing drivers/gpu/drm/omapdrm/displays/panel-dpi.c
Removing drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
Removing drivers/gpu/drm/omapdrm/displays/connector-dvi.c
Auto-merging drivers/gpu/drm/meson/meson_drv.c
Removing drivers/gpu/drm/meson/meson_canvas.h
Removing drivers/gpu/drm/meson/meson_canvas.c
Auto-merging drivers/gpu/drm/i915/vlv_dsi.c
Auto-merging drivers/gpu/drm/i915/selftests/i915_gem_evict.c
Auto-merging drivers/gpu/drm/i915/i915_reg.h
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Auto-merging drivers/gpu/drm/i915/i915_debugfs.c
Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c
Auto-merging drivers/gpu/drm/i915/gvt/mmio_context.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gvt/mmio_context.c
Auto-merging drivers/gpu/drm/i915/gvt/dmabuf.c
Auto-merging drivers/gpu/drm/i915/gvt/cmd_parser.c
Auto-merging drivers/gpu/drm/drm_file.c
Auto-merging drivers/gpu/drm/drm_fb_helper.c
Auto-merging drivers/gpu/drm/drm_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_drv.c
Auto-merging drivers/gpu/drm/drm_atomic_helper.c
Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c
Removing drivers/gpu/drm/amd/lib/chash.c
Removing drivers/gpu/drm/amd/lib/Makefile
Removing drivers/gpu/drm/amd/lib/Kconfig
Removing drivers/gpu/drm/amd/include/linux/chash.h
Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link.c
Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
Auto-merging MAINTAINERS
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Resolved 'drivers/gpu/drm/drm_drv.c' using previous resolution.
Resolved 'drivers/gpu/drm/i915/gvt/mmio_context.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master ecf9029fd733] Merge remote-tracking branch 'drm/drm-next'
$ git diff -M --stat --summary HEAD^..
 .../bindings/display/amlogic,meson-vpu.txt         |    5 +-
 .../bindings/display/bridge/ti,tfp410.txt          |   24 +-
 .../display/panel/feiyang,fy07024di26a30d.txt      |   20 +
 .../bindings/display/panel/innolux,p079zca.txt     |    2 +-
 .../bindings/display/panel/innolux,p097pfg.txt     |    2 +-
 .../display/panel/kingdisplay,kd097d04.txt         |    2 +-
 .../display/panel/osddisplays,osd070t1718-19ts.txt |   12 +
 .../display/panel/rocktech,jh057n00900.txt         |   18 +
 .../bindings/display/panel/ronbo,rb070d30.yaml     |   51 +
 .../bindings/display/panel/tpo,td028ttec1.txt      |    2 +
 .../display/rockchip/rockchip,rk3066-hdmi.txt      |   72 +
 .../devicetree/bindings/gpu/aspeed-gfx.txt         |   41 +
 .../devicetree/bindings/gpu/brcm,bcm-v3d.txt       |   11 +-
 .../devicetree/bindings/vendor-prefixes.txt        |    3 +
 Documentation/driver-api/component.rst             |    2 +
 Documentation/driver-model/devres.txt              |    3 +
 Documentation/gpu/drm-internals.rst                |    5 +
 Documentation/gpu/drm-kms-helpers.rst              |   12 +
 Documentation/gpu/kms-properties.csv               |    1 -
 Documentation/gpu/tinydrm.rst                      |   30 +-
 Documentation/gpu/todo.rst                         |   12 +-
 MAINTAINERS                                        |   38 +-
 drivers/dma-buf/Makefile                           |    3 +-
 drivers/dma-buf/dma-fence-chain.c                  |  241 ++
 drivers/dma-buf/reservation.c                      |    8 +
 drivers/gpu/drm/Kconfig                            |   14 +-
 drivers/gpu/drm/Makefile                           |    5 +-
 drivers/gpu/drm/amd/amdgpu/Makefile                |    3 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu.h                |    9 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c         |    4 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h         |    1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c   |   21 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c   |   73 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h   |    4 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c            |    9 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c            |   33 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h            |    4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c        |    7 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c         |   48 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c            |   16 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h            |   24 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c            |   32 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c             |   25 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c            |   22 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c            |    2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h            |    3 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c            |   82 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h            |   46 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c        |   59 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c             |    3 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h             |    3 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c            |   34 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.h         |    2 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c             |  505 ++--
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c            |  293 ++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h            |   32 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c            | 1449 ++++++++++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h            |  291 +++
 drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c           |    2 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h           |    4 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c            |   19 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c             |  914 ++------
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h             |   82 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c         |  127 ++
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c        |  270 +++
 drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c       |  109 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c           |  161 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h           |   16 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c              |   19 +
 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c              |    1 +
 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c              |  199 ++
 drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c           |    4 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c              |   19 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c              |   30 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c              |   65 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c              |  646 +++---
 drivers/gpu/drm/amd/amdgpu/kv_dpm.c                |    2 +-
 drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c            |    4 +-
 drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c             |    3 +-
 drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h            |    1 +
 drivers/gpu/drm/amd/amdgpu/psp_v11_0.c             |   93 +
 drivers/gpu/drm/amd/amdgpu/psp_v3_1.c              |   36 +
 drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c             |  212 +-
 drivers/gpu/drm/amd/amdgpu/si_dpm.c                |    3 +-
 drivers/gpu/drm/amd/amdgpu/soc15.c                 |   21 +-
 drivers/gpu/drm/amd/amdgpu/ta_ras_if.h             |  108 +
 drivers/gpu/drm/amd/amdgpu/vega10_ih.c             |   80 +-
 drivers/gpu/drm/amd/amdkfd/kfd_device.c            |   11 +
 drivers/gpu/drm/amd/amdkfd/kfd_events.c            |   18 +-
 drivers/gpu/drm/amd/amdkfd/kfd_priv.h              |    3 +
 drivers/gpu/drm/amd/amdkfd/kfd_topology.c          |   16 +
 drivers/gpu/drm/amd/amdkfd/kfd_topology.h          |    4 +
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  |  654 +++---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h  |    6 +-
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c    |   53 +-
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c  |  155 +-
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c  |    2 +-
 .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c    |   21 +-
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c   |  126 +-
 drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c |    5 +
 drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c   |   98 +-
 drivers/gpu/drm/amd/display/dc/core/dc.c           |   53 +-
 drivers/gpu/drm/amd/display/dc/core/dc_link.c      |   64 +-
 drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c  |   22 +-
 drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c   |  256 ++-
 drivers/gpu/drm/amd/display/dc/core/dc_resource.c  |  192 +-
 drivers/gpu/drm/amd/display/dc/core/dc_stream.c    |   97 +
 drivers/gpu/drm/amd/display/dc/core/dc_surface.c   |   13 +
 drivers/gpu/drm/amd/display/dc/dc.h                |   49 +-
 drivers/gpu/drm/amd/display/dc/dc_ddc_types.h      |    2 +
 drivers/gpu/drm/amd/display/dc/dc_dp_types.h       |   18 +-
 drivers/gpu/drm/amd/display/dc/dc_helper.c         |   76 +-
 drivers/gpu/drm/amd/display/dc/dc_stream.h         |    8 +
 drivers/gpu/drm/amd/display/dc/dc_types.h          |    5 +-
 drivers/gpu/drm/amd/display/dc/dce/dce_aux.c       |  146 +-
 drivers/gpu/drm/amd/display/dc/dce/dce_aux.h       |    5 +-
 .../gpu/drm/amd/display/dc/dce/dce_clock_source.c  |    2 +-
 drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c      |    7 +-
 drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h      |   22 +-
 drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c    |   12 +-
 drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.h    |    8 +-
 .../drm/amd/display/dc/dce/dce_stream_encoder.c    |    5 +-
 .../drm/amd/display/dc/dce100/dce100_resource.c    |    8 +
 .../amd/display/dc/dce110/dce110_hw_sequencer.c    |   60 +-
 .../drm/amd/display/dc/dce110/dce110_resource.c    |   20 +
 .../drm/amd/display/dc/dce112/dce112_resource.c    |   10 +-
 .../drm/amd/display/dc/dce120/dce120_resource.c    |    8 +
 .../gpu/drm/amd/display/dc/dce80/dce80_resource.c  |   17 +
 .../gpu/drm/amd/display/dc/dcn10/dcn10_clk_mgr.c   |   36 +-
 .../gpu/drm/amd/display/dc/dcn10/dcn10_clk_mgr.h   |    4 -
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c   |    7 -
 .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c    |    7 -
 .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c  |   20 +-
 .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c    |    5 +-
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h  |    3 +
 .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c  |   89 +-
 .../display/dc/dcn10/dcn10_hw_sequencer_debug.c    |    4 +-
 .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c  |    2 -
 .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c  |   34 +-
 .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.h  |    2 +-
 .../amd/display/dc/dcn10/dcn10_stream_encoder.c    |   31 +-
 .../amd/display/dc/dcn10/dcn10_stream_encoder.h    |    3 +-
 drivers/gpu/drm/amd/display/dc/dm_helpers.h        |    2 +-
 drivers/gpu/drm/amd/display/dc/dm_pp_smu.h         |    8 +-
 drivers/gpu/drm/amd/display/dc/dm_services.h       |   36 +-
 drivers/gpu/drm/amd/display/dc/dm_services_types.h |    2 +-
 .../gpu/drm/amd/display/dc/dml/display_mode_lib.c  |   40 +-
 .../gpu/drm/amd/display/dc/dml/display_mode_lib.h  |    5 +-
 .../drm/amd/display/dc/dml/display_mode_structs.h  |    5 +-
 .../amd/display/dc/dml/display_rq_dlg_helpers.c    |    3 +
 drivers/gpu/drm/amd/display/dc/inc/clock_source.h  |    2 +-
 drivers/gpu/drm/amd/display/dc/inc/core_types.h    |   14 +-
 drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h   |    5 +-
 drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h     |    2 +
 drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h    |    2 +
 drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h       |    4 +
 drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h   |    4 +
 drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h  |    6 +
 .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h |    7 +-
 .../drm/amd/display/dc/inc/hw/timing_generator.h   |    2 +
 drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h  |    4 +
 drivers/gpu/drm/amd/display/dc/inc/reg_helper.h    |   12 +-
 drivers/gpu/drm/amd/display/dc/inc/resource.h      |   14 +-
 .../display/dc/virtual/virtual_stream_encoder.c    |    3 +-
 drivers/gpu/drm/amd/display/include/fixed31_32.h   |    2 +
 drivers/gpu/drm/amd/display/include/signal_types.h |    5 +
 .../drm/amd/display/modules/color/color_gamma.c    |    2 +
 .../drm/amd/display/modules/freesync/freesync.c    |  168 +-
 .../drm/amd/display/modules/power/power_helpers.c  |   15 +-
 drivers/gpu/drm/amd/include/amd_shared.h           |    3 +
 .../drm/amd/include/asic_reg/vcn/vcn_1_0_offset.h  |    2 +
 .../drm/amd/include/asic_reg/vcn/vcn_1_0_sh_mask.h |    5 +
 drivers/gpu/drm/amd/include/atomfirmware.h         |   97 +-
 drivers/gpu/drm/amd/include/linux/chash.h          |  366 ---
 drivers/gpu/drm/amd/lib/Kconfig                    |   28 -
 drivers/gpu/drm/amd/lib/Makefile                   |   32 -
 drivers/gpu/drm/amd/lib/chash.c                    |  638 ------
 drivers/gpu/drm/amd/powerplay/Makefile             |    2 +-
 drivers/gpu/drm/amd/powerplay/amd_powerplay.c      |   10 +-
 drivers/gpu/drm/amd/powerplay/amdgpu_smu.c         | 1250 ++++++++++
 drivers/gpu/drm/amd/powerplay/hwmgr/Makefile       |    3 +-
 .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c  |    2 +-
 drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c  |   13 +-
 drivers/gpu/drm/amd/powerplay/hwmgr/smu9_baco.c    |   66 +
 drivers/gpu/drm/amd/powerplay/hwmgr/smu9_baco.h    |   31 +
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_baco.c  |   39 +-
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_baco.h  |    5 +-
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c |   13 +-
 drivers/gpu/drm/amd/powerplay/hwmgr/vega12_baco.c  |  119 +
 drivers/gpu/drm/amd/powerplay/hwmgr/vega12_baco.h  |   29 +
 drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c |    5 +
 drivers/gpu/drm/amd/powerplay/hwmgr/vega12_inc.h   |    2 +
 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.c  |   12 +
 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.h  |    1 +
 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c |   24 +-
 drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h     |  769 +++++++
 drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h      |   89 +
 .../gpu/drm/amd/powerplay/inc/smu_v11_0_ppsmc.h    |  128 ++
 .../gpu/drm/amd/powerplay/inc/smu_v11_0_pptable.h  |  147 ++
 drivers/gpu/drm/amd/powerplay/inc/vega20_ppsmc.h   |    3 +-
 drivers/gpu/drm/amd/powerplay/smu_v11_0.c          | 2026 ++++++++++++++++
 .../gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c    |    4 +
 .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c   |   20 +
 .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.h   |    1 +
 drivers/gpu/drm/amd/powerplay/vega20_ppt.c         | 2413 ++++++++++++++++++++
 drivers/gpu/drm/amd/powerplay/vega20_ppt.h         |  129 ++
 drivers/gpu/drm/arm/display/include/malidp_utils.h |   31 +
 drivers/gpu/drm/arm/display/komeda/Makefile        |    3 +-
 .../gpu/drm/arm/display/komeda/d71/d71_component.c |  684 ++++++
 drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c   |  377 ++-
 drivers/gpu/drm/arm/display/komeda/d71/d71_dev.h   |   50 +
 drivers/gpu/drm/arm/display/komeda/d71/d71_regs.h  |  530 +++++
 drivers/gpu/drm/arm/display/komeda/komeda_crtc.c   |   18 +
 drivers/gpu/drm/arm/display/komeda/komeda_dev.c    |   66 +
 drivers/gpu/drm/arm/display/komeda/komeda_dev.h    |   51 +
 drivers/gpu/drm/arm/display/komeda/komeda_kms.c    |   38 +-
 drivers/gpu/drm/arm/display/komeda/komeda_kms.h    |    5 +
 .../gpu/drm/arm/display/komeda/komeda_pipeline.c   |  111 +-
 .../gpu/drm/arm/display/komeda/komeda_pipeline.h   |   48 +-
 drivers/gpu/drm/arm/malidp_drv.c                   |   48 +-
 drivers/gpu/drm/arm/malidp_drv.h                   |    6 +
 drivers/gpu/drm/arm/malidp_hw.c                    |  249 +-
 drivers/gpu/drm/arm/malidp_hw.h                    |   31 +-
 drivers/gpu/drm/arm/malidp_mw.c                    |   10 +-
 drivers/gpu/drm/arm/malidp_planes.c                |  271 ++-
 drivers/gpu/drm/arm/malidp_regs.h                  |   20 +
 drivers/gpu/drm/armada/armada_fbdev.c              |    6 +-
 drivers/gpu/drm/aspeed/Kconfig                     |   14 +
 drivers/gpu/drm/aspeed/Makefile                    |    3 +
 drivers/gpu/drm/aspeed/aspeed_gfx.h                |  104 +
 drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c           |  241 ++
 drivers/gpu/drm/aspeed/aspeed_gfx_drv.c            |  269 +++
 drivers/gpu/drm/aspeed/aspeed_gfx_out.c            |   42 +
 drivers/gpu/drm/ast/ast_drv.h                      |    4 +-
 drivers/gpu/drm/ast/ast_fb.c                       |    7 +-
 drivers/gpu/drm/ast/ast_ttm.c                      |   10 +-
 drivers/gpu/drm/bochs/bochs.h                      |    3 -
 drivers/gpu/drm/bochs/bochs_kms.c                  |   18 +-
 drivers/gpu/drm/bochs/bochs_mm.c                   |   10 +-
 drivers/gpu/drm/bridge/dumb-vga-dac.c              |    6 +-
 drivers/gpu/drm/bridge/tc358767.c                  |    4 +-
 drivers/gpu/drm/bridge/ti-tfp410.c                 |  109 +-
 drivers/gpu/drm/cirrus/cirrus_drv.h                |    4 +-
 drivers/gpu/drm/cirrus/cirrus_fbdev.c              |    8 +-
 drivers/gpu/drm/cirrus/cirrus_mode.c               |    8 +-
 drivers/gpu/drm/cirrus/cirrus_ttm.c                |   10 +-
 drivers/gpu/drm/drm_atomic_helper.c                |   19 +-
 drivers/gpu/drm/drm_atomic_state_helper.c          |    4 +
 drivers/gpu/drm/drm_atomic_uapi.c                  |   35 +-
 drivers/gpu/drm/drm_connector.c                    |   91 +-
 drivers/gpu/drm/drm_dp_mst_topology.c              |    1 -
 drivers/gpu/drm/drm_drv.c                          |  202 +-
 drivers/gpu/drm/drm_dsc.c                          |  269 ++-
 drivers/gpu/drm/drm_edid.c                         |   86 +-
 drivers/gpu/drm/drm_fb_helper.c                    |  107 +-
 drivers/gpu/drm/drm_file.c                         |    1 +
 drivers/gpu/drm/drm_fourcc.c                       |   27 +
 drivers/gpu/drm/drm_gem.c                          |  138 +-
 drivers/gpu/drm/drm_gem_shmem_helper.c             |  625 +++++
 drivers/gpu/drm/drm_internal.h                     |    8 +
 drivers/gpu/drm/drm_ioctl.c                        |    8 +
 drivers/gpu/drm/drm_kms_helper_common.c            |    2 +-
 drivers/gpu/drm/drm_memory.c                       |   26 +-
 drivers/gpu/drm/drm_modes.c                        |   12 +-
 drivers/gpu/drm/drm_panel_orientation_quirks.c     |   13 +
 drivers/gpu/drm/drm_prime.c                        |    1 +
 drivers/gpu/drm/drm_print.c                        |   28 +
 drivers/gpu/drm/drm_syncobj.c                      |  449 +++-
 drivers/gpu/drm/drm_vm.c                           |    4 +-
 drivers/gpu/drm/drm_writeback.c                    |   73 +-
 drivers/gpu/drm/etnaviv/etnaviv_drv.c              |    1 -
 drivers/gpu/drm/etnaviv/etnaviv_drv.h              |    1 -
 drivers/gpu/drm/etnaviv/etnaviv_gem.c              |   16 +-
 drivers/gpu/drm/etnaviv/etnaviv_gem.h              |    4 -
 drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c        |    7 -
 drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c       |   22 +-
 drivers/gpu/drm/exynos/exynos_drm_fbdev.c          |    4 +-
 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c         |    2 +-
 drivers/gpu/drm/gma500/framebuffer.c               |    7 +-
 drivers/gpu/drm/gma500/framebuffer.h               |    2 +-
 drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h    |    2 +-
 drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c  |    9 +-
 drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c   |    7 -
 drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c        |   12 +-
 drivers/gpu/drm/i915/Makefile                      |   12 +
 drivers/gpu/drm/i915/gvt/cmd_parser.c              |   44 +-
 drivers/gpu/drm/i915/gvt/dmabuf.c                  |    2 +-
 drivers/gpu/drm/i915/gvt/execlist.c                |   17 +-
 drivers/gpu/drm/i915/gvt/handlers.c                |   28 +-
 drivers/gpu/drm/i915/gvt/interrupt.c               |    2 +-
 drivers/gpu/drm/i915/gvt/mmio_context.c            |  248 +-
 drivers/gpu/drm/i915/gvt/scheduler.c               |   31 +-
 drivers/gpu/drm/i915/gvt/vgpu.c                    |    2 +-
 drivers/gpu/drm/i915/i915_active.c                 |   23 +-
 drivers/gpu/drm/i915/i915_active.h                 |   16 -
 drivers/gpu/drm/i915/i915_cmd_parser.c             |   12 +-
 drivers/gpu/drm/i915/i915_debugfs.c                |  146 +-
 drivers/gpu/drm/i915/i915_drv.c                    |  553 +++--
 drivers/gpu/drm/i915/i915_drv.h                    |  248 +-
 drivers/gpu/drm/i915/i915_gem.c                    |  726 ++----
 drivers/gpu/drm/i915/i915_gem.h                    |    9 +-
 drivers/gpu/drm/i915/i915_gem_context.c            | 1078 ++++++---
 drivers/gpu/drm/i915/i915_gem_context.h            |  260 +--
 drivers/gpu/drm/i915/i915_gem_context_types.h      |  175 ++
 drivers/gpu/drm/i915/i915_gem_dmabuf.c             |    3 +-
 drivers/gpu/drm/i915/i915_gem_evict.c              |   18 +-
 drivers/gpu/drm/i915/i915_gem_execbuffer.c         |   42 +-
 drivers/gpu/drm/i915/i915_gem_fence_reg.c          |  156 +-
 drivers/gpu/drm/i915/i915_gem_gtt.c                |  130 +-
 drivers/gpu/drm/i915/i915_gem_gtt.h                |   26 +-
 drivers/gpu/drm/i915/i915_gem_internal.c           |    2 +-
 drivers/gpu/drm/i915/i915_gem_object.c             |   42 +
 drivers/gpu/drm/i915/i915_gem_object.h             |    4 +-
 drivers/gpu/drm/i915/i915_gem_render_state.c       |    4 +-
 drivers/gpu/drm/i915/i915_gem_stolen.c             |    2 +-
 drivers/gpu/drm/i915/i915_gem_tiling.c             |    6 +-
 drivers/gpu/drm/i915/i915_gem_userptr.c            |    2 +-
 drivers/gpu/drm/i915/i915_globals.c                |  135 ++
 drivers/gpu/drm/i915/i915_globals.h                |   35 +
 drivers/gpu/drm/i915/i915_gpu_error.c              |  154 +-
 drivers/gpu/drm/i915/i915_gpu_error.h              |   49 +-
 drivers/gpu/drm/i915/i915_irq.c                    |  271 ++-
 drivers/gpu/drm/i915/i915_pci.c                    |  226 +-
 drivers/gpu/drm/i915/i915_perf.c                   |  114 +-
 drivers/gpu/drm/i915/i915_pmu.c                    |   67 +-
 drivers/gpu/drm/i915/i915_pvinfo.h                 |    2 +-
 drivers/gpu/drm/i915/i915_query.c                  |   39 +-
 drivers/gpu/drm/i915/i915_reg.h                    |  491 ++--
 drivers/gpu/drm/i915/i915_request.c                |  433 +++-
 drivers/gpu/drm/i915/i915_request.h                |   76 +-
 drivers/gpu/drm/i915/i915_reset.c                  |  437 ++--
 drivers/gpu/drm/i915/i915_reset.h                  |    6 +
 drivers/gpu/drm/i915/i915_scheduler.c              |   90 +-
 drivers/gpu/drm/i915/i915_scheduler.h              |   43 +-
 drivers/gpu/drm/i915/i915_sw_fence.c               |   43 +-
 drivers/gpu/drm/i915/i915_sw_fence.h               |   16 +-
 drivers/gpu/drm/i915/i915_timeline.c               |  299 ++-
 drivers/gpu/drm/i915/i915_timeline.h               |   75 +-
 drivers/gpu/drm/i915/i915_timeline_types.h         |   79 +
 drivers/gpu/drm/i915/i915_trace.h                  |  106 +-
 drivers/gpu/drm/i915/i915_user_extensions.c        |   61 +
 drivers/gpu/drm/i915/i915_user_extensions.h        |   20 +
 drivers/gpu/drm/i915/i915_utils.h                  |   31 +
 drivers/gpu/drm/i915/i915_vgpu.c                   |   11 +-
 drivers/gpu/drm/i915/i915_vgpu.h                   |    2 +-
 drivers/gpu/drm/i915/i915_vma.c                    |   51 +-
 drivers/gpu/drm/i915/i915_vma.h                    |    3 +
 drivers/gpu/drm/i915/icl_dsi.c                     |   33 +-
 drivers/gpu/drm/i915/intel_atomic.c                |    4 +-
 drivers/gpu/drm/i915/intel_atomic_plane.c          |   56 +-
 drivers/gpu/drm/i915/intel_audio.c                 |   23 +-
 drivers/gpu/drm/i915/intel_bios.c                  |  133 +-
 drivers/gpu/drm/i915/intel_cdclk.c                 |   75 +-
 drivers/gpu/drm/i915/intel_color.c                 |  591 +++--
 drivers/gpu/drm/i915/intel_connector.c             |   10 +
 drivers/gpu/drm/i915/intel_context.c               |  269 +++
 drivers/gpu/drm/i915/intel_context.h               |   87 +
 drivers/gpu/drm/i915/intel_context_types.h         |   73 +
 drivers/gpu/drm/i915/intel_crt.c                   |    6 +-
 drivers/gpu/drm/i915/intel_csr.c                   |    2 +-
 drivers/gpu/drm/i915/intel_ddi.c                   |  295 ++-
 drivers/gpu/drm/i915/intel_device_info.c           |   43 +-
 drivers/gpu/drm/i915/intel_device_info.h           |   18 +-
 drivers/gpu/drm/i915/intel_display.c               |  602 +++--
 drivers/gpu/drm/i915/intel_dp.c                    |  526 ++++-
 drivers/gpu/drm/i915/intel_dp_mst.c                |  145 +-
 drivers/gpu/drm/i915/intel_dpio_phy.c              |    5 +-
 drivers/gpu/drm/i915/intel_dpll_mgr.c              |  770 ++++---
 drivers/gpu/drm/i915/intel_dpll_mgr.h              |    5 +-
 drivers/gpu/drm/i915/intel_drv.h                   |  204 +-
 drivers/gpu/drm/i915/intel_dsi.h                   |    1 -
 drivers/gpu/drm/i915/intel_dsi_vbt.c               |   24 +-
 drivers/gpu/drm/i915/intel_engine_cs.c             |  454 ++--
 drivers/gpu/drm/i915/intel_engine_types.h          |  527 +++++
 drivers/gpu/drm/i915/intel_fbc.c                   |    2 +-
 drivers/gpu/drm/i915/intel_fbdev.c                 |   10 +-
 drivers/gpu/drm/i915/intel_gpu_commands.h          |    9 +-
 drivers/gpu/drm/i915/intel_guc.c                   |   45 +-
 drivers/gpu/drm/i915/intel_guc.h                   |    4 +-
 drivers/gpu/drm/i915/intel_guc_ads.c               |    3 +-
 drivers/gpu/drm/i915/intel_guc_ct.c                |   99 +-
 drivers/gpu/drm/i915/intel_guc_ct.h                |    3 +
 drivers/gpu/drm/i915/intel_guc_fw.c                |    4 +-
 drivers/gpu/drm/i915/intel_guc_log.c               |    5 +
 drivers/gpu/drm/i915/intel_guc_submission.c        |   22 +-
 drivers/gpu/drm/i915/intel_hangcheck.c             |   24 +-
 drivers/gpu/drm/i915/intel_hdcp.c                  | 1255 +++++++++-
 drivers/gpu/drm/i915/intel_hdmi.c                  |  783 ++++++-
 drivers/gpu/drm/i915/intel_huc.c                   |    2 +-
 drivers/gpu/drm/i915/intel_huc_fw.c                |   27 +-
 drivers/gpu/drm/i915/intel_i2c.c                   |    2 +-
 drivers/gpu/drm/i915/intel_lrc.c                   |  509 +++--
 drivers/gpu/drm/i915/intel_lrc.h                   |   22 +-
 drivers/gpu/drm/i915/intel_lspcon.c                |   13 +-
 drivers/gpu/drm/i915/intel_lvds.c                  |   92 +-
 drivers/gpu/drm/i915/intel_mocs.c                  |   14 +-
 drivers/gpu/drm/i915/intel_overlay.c               |    2 +-
 drivers/gpu/drm/i915/intel_panel.c                 |  147 +-
 drivers/gpu/drm/i915/intel_pipe_crc.c              |  228 +-
 drivers/gpu/drm/i915/intel_pm.c                    |  464 ++--
 drivers/gpu/drm/i915/intel_psr.c                   |  303 ++-
 drivers/gpu/drm/i915/intel_ringbuffer.c            |  416 ++--
 drivers/gpu/drm/i915/intel_ringbuffer.h            |  641 +-----
 drivers/gpu/drm/i915/intel_runtime_pm.c            |   65 +-
 drivers/gpu/drm/i915/intel_sdvo.c                  |  156 +-
 drivers/gpu/drm/i915/intel_sideband.c              |   12 +-
 drivers/gpu/drm/i915/intel_sprite.c                |  244 +-
 drivers/gpu/drm/i915/intel_uc.c                    |   23 +-
 drivers/gpu/drm/i915/intel_uc.h                    |    1 +
 drivers/gpu/drm/i915/intel_uncore.c                |  943 ++++----
 drivers/gpu/drm/i915/intel_uncore.h                |  267 ++-
 drivers/gpu/drm/i915/intel_vbt_defs.h              |    3 +
 drivers/gpu/drm/i915/intel_vdsc.c                  |  133 +-
 drivers/gpu/drm/i915/intel_workarounds.c           |  119 +-
 drivers/gpu/drm/i915/intel_workarounds.h           |   13 +-
 drivers/gpu/drm/i915/intel_workarounds_types.h     |   27 +
 drivers/gpu/drm/i915/selftests/huge_gem_object.c   |    2 +-
 drivers/gpu/drm/i915/selftests/huge_pages.c        |   25 +-
 drivers/gpu/drm/i915/selftests/i915_active.c       |    2 +-
 drivers/gpu/drm/i915/selftests/i915_gem.c          |    9 +-
 .../gpu/drm/i915/selftests/i915_gem_coherency.c    |    8 +-
 drivers/gpu/drm/i915/selftests/i915_gem_context.c  |  449 +++-
 drivers/gpu/drm/i915/selftests/i915_gem_dmabuf.c   |    1 +
 drivers/gpu/drm/i915/selftests/i915_gem_evict.c    |    6 +-
 drivers/gpu/drm/i915/selftests/i915_gem_gtt.c      |   21 +-
 drivers/gpu/drm/i915/selftests/i915_gem_object.c   |    4 +-
 drivers/gpu/drm/i915/selftests/i915_request.c      |   37 +-
 drivers/gpu/drm/i915/selftests/i915_selftest.c     |    4 +-
 drivers/gpu/drm/i915/selftests/i915_sw_fence.c     |    9 +-
 drivers/gpu/drm/i915/selftests/i915_timeline.c     |  117 +-
 drivers/gpu/drm/i915/selftests/i915_vma.c          |   16 +-
 drivers/gpu/drm/i915/selftests/igt_flush_test.c    |    4 +-
 drivers/gpu/drm/i915/selftests/igt_spinner.c       |    9 +-
 drivers/gpu/drm/i915/selftests/intel_guc.c         |    4 +-
 drivers/gpu/drm/i915/selftests/intel_hangcheck.c   |  298 ++-
 drivers/gpu/drm/i915/selftests/intel_lrc.c         |  266 ++-
 drivers/gpu/drm/i915/selftests/intel_uncore.c      |  155 +-
 drivers/gpu/drm/i915/selftests/intel_workarounds.c |  418 +++-
 drivers/gpu/drm/i915/selftests/mock_context.c      |   34 +-
 drivers/gpu/drm/i915/selftests/mock_engine.c       |  145 +-
 drivers/gpu/drm/i915/selftests/mock_gem_device.c   |   54 +-
 drivers/gpu/drm/i915/selftests/mock_request.c      |   12 +-
 drivers/gpu/drm/i915/selftests/mock_request.h      |    7 -
 drivers/gpu/drm/i915/selftests/mock_timeline.c     |    1 +
 drivers/gpu/drm/i915/selftests/mock_uncore.c       |   10 +-
 drivers/gpu/drm/i915/selftests/mock_uncore.h       |    2 +-
 .../drm/i915/test_i915_active_types_standalone.c   |    7 +
 .../i915/test_i915_gem_context_types_standalone.c  |    7 +
 .../drm/i915/test_i915_timeline_types_standalone.c |    7 +
 .../drm/i915/test_intel_context_types_standalone.c |    7 +
 .../drm/i915/test_intel_engine_types_standalone.c  |    7 +
 .../i915/test_intel_workarounds_types_standalone.c |    7 +
 drivers/gpu/drm/i915/vlv_dsi.c                     |   74 +-
 drivers/gpu/drm/i915/vlv_dsi_pll.c                 |    4 +-
 drivers/gpu/drm/imx/imx-drm-core.c                 |    2 +-
 drivers/gpu/drm/imx/ipuv3-crtc.c                   |    2 +-
 drivers/gpu/drm/lima/Kconfig                       |   10 +
 drivers/gpu/drm/lima/Makefile                      |   21 +
 drivers/gpu/drm/lima/lima_bcast.c                  |   47 +
 drivers/gpu/drm/lima/lima_bcast.h                  |   14 +
 drivers/gpu/drm/lima/lima_ctx.c                    |   98 +
 drivers/gpu/drm/lima/lima_ctx.h                    |   30 +
 drivers/gpu/drm/lima/lima_device.c                 |  385 ++++
 drivers/gpu/drm/lima/lima_device.h                 |  131 ++
 drivers/gpu/drm/lima/lima_dlbu.c                   |   58 +
 drivers/gpu/drm/lima/lima_dlbu.h                   |   18 +
 drivers/gpu/drm/lima/lima_drv.c                    |  376 +++
 drivers/gpu/drm/lima/lima_drv.h                    |   45 +
 drivers/gpu/drm/lima/lima_gem.c                    |  381 ++++
 drivers/gpu/drm/lima/lima_gem.h                    |   25 +
 drivers/gpu/drm/lima/lima_gem_prime.c              |   47 +
 drivers/gpu/drm/lima/lima_gem_prime.h              |   13 +
 drivers/gpu/drm/lima/lima_gp.c                     |  283 +++
 drivers/gpu/drm/lima/lima_gp.h                     |   16 +
 drivers/gpu/drm/lima/lima_l2_cache.c               |   80 +
 drivers/gpu/drm/lima/lima_l2_cache.h               |   14 +
 drivers/gpu/drm/lima/lima_mmu.c                    |  142 ++
 drivers/gpu/drm/lima/lima_mmu.h                    |   16 +
 drivers/gpu/drm/lima/lima_object.c                 |  122 +
 drivers/gpu/drm/lima/lima_object.h                 |   36 +
 drivers/gpu/drm/lima/lima_pmu.c                    |   60 +
 drivers/gpu/drm/lima/lima_pmu.h                    |   12 +
 drivers/gpu/drm/lima/lima_pp.c                     |  427 ++++
 drivers/gpu/drm/lima/lima_pp.h                     |   19 +
 drivers/gpu/drm/lima/lima_regs.h                   |  298 +++
 drivers/gpu/drm/lima/lima_sched.c                  |  404 ++++
 drivers/gpu/drm/lima/lima_sched.h                  |  104 +
 drivers/gpu/drm/lima/lima_vm.c                     |  282 +++
 drivers/gpu/drm/lima/lima_vm.h                     |   62 +
 drivers/gpu/drm/meson/Makefile                     |    2 +-
 drivers/gpu/drm/meson/meson_canvas.c               |   73 -
 drivers/gpu/drm/meson/meson_canvas.h               |   51 -
 drivers/gpu/drm/meson/meson_crtc.c                 |   84 +-
 drivers/gpu/drm/meson/meson_drv.c                  |   68 +-
 drivers/gpu/drm/meson/meson_drv.h                  |    1 -
 drivers/gpu/drm/meson/meson_overlay.c              |    8 -
 drivers/gpu/drm/meson/meson_plane.c                |    6 +-
 drivers/gpu/drm/meson/meson_viu.c                  |    1 -
 drivers/gpu/drm/mgag200/mgag200_drv.h              |    3 +-
 drivers/gpu/drm/mgag200/mgag200_fb.c               |    8 +-
 drivers/gpu/drm/mgag200/mgag200_ttm.c              |   10 +-
 drivers/gpu/drm/msm/msm_drv.c                      |    1 -
 drivers/gpu/drm/msm/msm_drv.h                      |    1 -
 drivers/gpu/drm/msm/msm_fbdev.c                    |    6 +-
 drivers/gpu/drm/msm/msm_gem.c                      |   27 +-
 drivers/gpu/drm/msm/msm_gem_prime.c                |    7 -
 drivers/gpu/drm/msm/msm_gem_submit.c               |    8 +-
 drivers/gpu/drm/mxsfb/mxsfb_crtc.c                 |    6 +-
 drivers/gpu/drm/nouveau/nouveau_drv.h              |    2 -
 drivers/gpu/drm/nouveau/nouveau_fbcon.c            |    8 +-
 drivers/gpu/drm/nouveau/nouveau_fbcon.h            |    2 +-
 drivers/gpu/drm/nouveau/nouveau_ttm.c              |    4 -
 drivers/gpu/drm/omapdrm/displays/Kconfig           |   17 -
 drivers/gpu/drm/omapdrm/displays/Makefile          |    3 -
 .../gpu/drm/omapdrm/displays/connector-analog-tv.c |   45 +-
 drivers/gpu/drm/omapdrm/displays/connector-dvi.c   |  330 ---
 drivers/gpu/drm/omapdrm/displays/connector-hdmi.c  |   45 +-
 drivers/gpu/drm/omapdrm/displays/encoder-opa362.c  |   39 +-
 drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c  |  170 --
 .../gpu/drm/omapdrm/displays/encoder-tpd12s015.c   |   40 -
 drivers/gpu/drm/omapdrm/displays/panel-dpi.c       |  221 --
 drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c    |  140 +-
 .../omapdrm/displays/panel-lgphilips-lb035q02.c    |   41 +-
 .../drm/omapdrm/displays/panel-nec-nl8048hl11.c    |   41 +-
 .../drm/omapdrm/displays/panel-sharp-ls037v7dw01.c |   61 +-
 .../drm/omapdrm/displays/panel-sony-acx565akm.c    |   55 +-
 .../drm/omapdrm/displays/panel-tpo-td028ttec1.c    |   58 +-
 .../drm/omapdrm/displays/panel-tpo-td043mtea1.c    |   48 +-
 drivers/gpu/drm/omapdrm/dss/base.c                 |  144 +-
 drivers/gpu/drm/omapdrm/dss/display.c              |   24 +-
 drivers/gpu/drm/omapdrm/dss/dpi.c                  |   64 +-
 drivers/gpu/drm/omapdrm/dss/dsi.c                  |  110 +-
 drivers/gpu/drm/omapdrm/dss/dss-of.c               |   60 +-
 drivers/gpu/drm/omapdrm/dss/dss.c                  |    2 +-
 drivers/gpu/drm/omapdrm/dss/hdmi4.c                |   54 +-
 drivers/gpu/drm/omapdrm/dss/hdmi5.c                |   54 +-
 drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c    |   18 +-
 drivers/gpu/drm/omapdrm/dss/omapdss.h              |   76 +-
 drivers/gpu/drm/omapdrm/dss/output.c               |   36 +-
 drivers/gpu/drm/omapdrm/dss/sdi.c                  |   68 +-
 drivers/gpu/drm/omapdrm/dss/venc.c                 |  229 +-
 drivers/gpu/drm/omapdrm/omap_connector.c           |  181 +-
 drivers/gpu/drm/omapdrm/omap_connector.h           |    8 +-
 drivers/gpu/drm/omapdrm/omap_crtc.c                |   13 +-
 drivers/gpu/drm/omapdrm/omap_drv.c                 |  236 +-
 drivers/gpu/drm/omapdrm/omap_drv.h                 |    2 +-
 drivers/gpu/drm/omapdrm/omap_encoder.c             |  211 +-
 drivers/gpu/drm/omapdrm/omap_encoder.h             |    3 +-
 drivers/gpu/drm/omapdrm/omap_fbdev.c               |    6 +-
 drivers/gpu/drm/panel/Kconfig                      |   31 +
 drivers/gpu/drm/panel/Makefile                     |    3 +
 drivers/gpu/drm/panel/panel-arm-versatile.c        |    6 +-
 .../gpu/drm/panel/panel-feiyang-fy07024di26a30d.c  |  272 +++
 drivers/gpu/drm/panel/panel-ilitek-ili9322.c       |    6 +-
 drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c |    1 -
 drivers/gpu/drm/panel/panel-orisetech-otm8009a.c   |   20 +-
 drivers/gpu/drm/panel/panel-raydium-rm68200.c      |    3 +-
 drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c |  386 ++++
 drivers/gpu/drm/panel/panel-ronbo-rb070d30.c       |  258 +++
 drivers/gpu/drm/panel/panel-samsung-s6d16d0.c      |    3 -
 drivers/gpu/drm/panel/panel-seiko-43wvf1g.c        |    2 +-
 drivers/gpu/drm/panel/panel-simple.c               |   53 +-
 drivers/gpu/drm/panel/panel-tpo-tpg110.c           |   12 +-
 drivers/gpu/drm/pl111/pl111_display.c              |    2 +-
 drivers/gpu/drm/qxl/qxl_display.c                  |    8 +-
 drivers/gpu/drm/qxl/qxl_drv.h                      |    3 -
 drivers/gpu/drm/qxl/qxl_ttm.c                      |   11 +-
 drivers/gpu/drm/radeon/radeon_device.c             |    2 +-
 drivers/gpu/drm/radeon/radeon_fb.c                 |   11 +-
 drivers/gpu/drm/radeon/radeon_ttm.c                |   17 +-
 drivers/gpu/drm/rcar-du/Kconfig                    |    4 +
 drivers/gpu/drm/rcar-du/Makefile                   |    3 +-
 drivers/gpu/drm/rcar-du/rcar_du_crtc.c             |   64 +-
 drivers/gpu/drm/rcar-du/rcar_du_crtc.h             |   13 +-
 drivers/gpu/drm/rcar-du/rcar_du_encoder.c          |   54 +-
 drivers/gpu/drm/rcar-du/rcar_du_kms.c              |   37 +
 drivers/gpu/drm/rcar-du/rcar_du_kms.h              |    1 +
 drivers/gpu/drm/rcar-du/rcar_du_vsp.c              |  122 +-
 drivers/gpu/drm/rcar-du/rcar_du_vsp.h              |   17 +
 drivers/gpu/drm/rcar-du/rcar_du_writeback.c        |  243 ++
 drivers/gpu/drm/rcar-du/rcar_du_writeback.h        |   39 +
 drivers/gpu/drm/rcar-du/rcar_lvds.c                |   19 +-
 drivers/gpu/drm/rockchip/Kconfig                   |    8 +
 drivers/gpu/drm/rockchip/Makefile                  |    1 +
 drivers/gpu/drm/rockchip/rk3066_hdmi.c             |  876 +++++++
 drivers/gpu/drm/rockchip/rk3066_hdmi.h             |  229 ++
 drivers/gpu/drm/rockchip/rockchip_drm_drv.c        |    2 +
 drivers/gpu/drm/rockchip/rockchip_drm_drv.h        |    1 +
 drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c      |    6 +-
 drivers/gpu/drm/rockchip/rockchip_drm_vop.c        |   11 +-
 drivers/gpu/drm/rockchip/rockchip_drm_vop.h        |   14 +-
 drivers/gpu/drm/rockchip/rockchip_vop_reg.c        |   20 +-
 drivers/gpu/drm/selftests/test-drm_mm.c            |   12 +-
 drivers/gpu/drm/stm/Kconfig                        |    2 +-
 drivers/gpu/drm/stm/drv.c                          |   35 +
 drivers/gpu/drm/stm/dw_mipi_dsi-stm.c              |   28 +
 drivers/gpu/drm/stm/ltdc.c                         |   24 +
 drivers/gpu/drm/stm/ltdc.h                         |    3 +
 drivers/gpu/drm/sun4i/sun4i_backend.c              |   35 +-
 drivers/gpu/drm/sun4i/sun4i_hdmi.h                 |    1 +
 drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c             |   40 +-
 drivers/gpu/drm/sun4i/sun4i_lvds.c                 |   29 +-
 drivers/gpu/drm/sun4i/sun4i_rgb.c                  |   74 +-
 drivers/gpu/drm/sun4i/sun4i_tcon.c                 |    8 +-
 drivers/gpu/drm/sun4i/sun4i_tcon.h                 |    2 -
 drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c             |  179 +-
 drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h             |    2 +
 drivers/gpu/drm/sun4i/sun8i_mixer.c                |   49 +-
 drivers/gpu/drm/sun4i/sun8i_mixer.h                |    2 +
 drivers/gpu/drm/sun4i/sun8i_vi_layer.c             |   54 +-
 drivers/gpu/drm/sun4i/sun8i_vi_layer.h             |   11 +
 drivers/gpu/drm/tegra/fb.c                         |    4 +-
 drivers/gpu/drm/tinydrm/core/Makefile              |    2 +-
 drivers/gpu/drm/tinydrm/core/tinydrm-core.c        |  183 --
 drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c     |    2 +
 drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c        |   24 +-
 drivers/gpu/drm/tinydrm/hx8357d.c                  |   59 +-
 drivers/gpu/drm/tinydrm/ili9225.c                  |   87 +-
 drivers/gpu/drm/tinydrm/ili9341.c                  |   59 +-
 drivers/gpu/drm/tinydrm/mi0283qt.c                 |   67 +-
 drivers/gpu/drm/tinydrm/mipi-dbi.c                 |  178 +-
 drivers/gpu/drm/tinydrm/repaper.c                  |  144 +-
 drivers/gpu/drm/tinydrm/st7586.c                   |  145 +-
 drivers/gpu/drm/tinydrm/st7735r.c                  |   59 +-
 drivers/gpu/drm/ttm/ttm_bo.c                       |    6 +-
 drivers/gpu/drm/ttm/ttm_bo_vm.c                    |    3 +
 drivers/gpu/drm/ttm/ttm_execbuf_util.c             |    2 -
 drivers/gpu/drm/ttm/ttm_memory.c                   |   10 +-
 drivers/gpu/drm/tve200/tve200_display.c            |    3 +-
 drivers/gpu/drm/udl/udl_drv.c                      |    1 +
 drivers/gpu/drm/udl/udl_fb.c                       |    8 +-
 drivers/gpu/drm/v3d/Kconfig                        |    1 +
 drivers/gpu/drm/v3d/v3d_bo.c                       |  314 +--
 drivers/gpu/drm/v3d/v3d_debugfs.c                  |    8 +
 drivers/gpu/drm/v3d/v3d_drv.c                      |   65 +-
 drivers/gpu/drm/v3d/v3d_drv.h                      |   37 +-
 drivers/gpu/drm/v3d/v3d_gem.c                      |  110 +-
 drivers/gpu/drm/v3d/v3d_irq.c                      |   67 +-
 drivers/gpu/drm/v3d/v3d_mmu.c                      |   11 +-
 drivers/gpu/drm/v3d/v3d_regs.h                     |    2 +
 drivers/gpu/drm/v3d/v3d_sched.c                    |   25 +-
 drivers/{staging => gpu/drm}/vboxvideo/Kconfig     |    0
 drivers/{staging => gpu/drm}/vboxvideo/Makefile    |    0
 .../{staging => gpu/drm}/vboxvideo/hgsmi_base.c    |    0
 .../drm}/vboxvideo/hgsmi_ch_setup.h                |    0
 .../drm}/vboxvideo/hgsmi_channels.h                |    0
 .../{staging => gpu/drm}/vboxvideo/hgsmi_defs.h    |    0
 .../{staging => gpu/drm}/vboxvideo/modesetting.c   |    0
 drivers/{staging => gpu/drm}/vboxvideo/vbox_drv.c  |   25 -
 drivers/{staging => gpu/drm}/vboxvideo/vbox_drv.h  |    9 -
 drivers/{staging => gpu/drm}/vboxvideo/vbox_fb.c   |    8 +-
 .../{staging => gpu/drm}/vboxvideo/vbox_hgsmi.c    |    0
 drivers/{staging => gpu/drm}/vboxvideo/vbox_irq.c  |   10 +-
 drivers/{staging => gpu/drm}/vboxvideo/vbox_main.c |    6 +-
 drivers/{staging => gpu/drm}/vboxvideo/vbox_mode.c |   21 +-
 .../{staging => gpu/drm}/vboxvideo/vbox_prime.c    |    0
 drivers/{staging => gpu/drm}/vboxvideo/vbox_ttm.c  |   12 +-
 drivers/{staging => gpu/drm}/vboxvideo/vboxvideo.h |    0
 .../drm}/vboxvideo/vboxvideo_guest.h               |    0
 .../{staging => gpu/drm}/vboxvideo/vboxvideo_vbe.h |    0
 drivers/{staging => gpu/drm}/vboxvideo/vbva_base.c |    0
 drivers/gpu/drm/vc4/vc4_bo.c                       |   69 +-
 drivers/gpu/drm/vc4/vc4_crtc.c                     |  105 +-
 drivers/gpu/drm/vc4/vc4_debugfs.c                  |   90 +-
 drivers/gpu/drm/vc4/vc4_dpi.c                      |   39 +-
 drivers/gpu/drm/vc4/vc4_drv.c                      |   42 +-
 drivers/gpu/drm/vc4/vc4_drv.h                      |   77 +-
 drivers/gpu/drm/vc4/vc4_dsi.c                      |  175 +-
 drivers/gpu/drm/vc4/vc4_gem.c                      |   49 +-
 drivers/gpu/drm/vc4/vc4_hdmi.c                     |  162 +-
 drivers/gpu/drm/vc4/vc4_hvs.c                      |  180 +-
 drivers/gpu/drm/vc4/vc4_irq.c                      |    9 +
 drivers/gpu/drm/vc4/vc4_kms.c                      |  123 +-
 drivers/gpu/drm/vc4/vc4_perfmon.c                  |   18 +
 drivers/gpu/drm/vc4/vc4_plane.c                    |   59 +-
 drivers/gpu/drm/vc4/vc4_regs.h                     |   51 +-
 drivers/gpu/drm/vc4/vc4_render_cl.c                |   23 +-
 drivers/gpu/drm/vc4/vc4_txp.c                      |   49 +-
 drivers/gpu/drm/vc4/vc4_v3d.c                      |  240 +-
 drivers/gpu/drm/vc4/vc4_vec.c                      |   83 +-
 drivers/gpu/drm/virtio/virtgpu_debugfs.c           |   27 +-
 drivers/gpu/drm/virtio/virtgpu_display.c           |    1 +
 drivers/gpu/drm/virtio/virtgpu_drv.c               |    4 +-
 drivers/gpu/drm/virtio/virtgpu_drv.h               |   46 +-
 drivers/gpu/drm/virtio/virtgpu_fence.c             |    4 +-
 drivers/gpu/drm/virtio/virtgpu_gem.c               |   35 +-
 drivers/gpu/drm/virtio/virtgpu_ioctl.c             |  107 +-
 drivers/gpu/drm/virtio/virtgpu_object.c            |   74 +-
 drivers/gpu/drm/virtio/virtgpu_prime.c             |   22 +-
 drivers/gpu/drm/virtio/virtgpu_ttm.c               |  102 +-
 drivers/gpu/drm/virtio/virtgpu_vq.c                |   36 +-
 drivers/gpu/drm/vkms/vkms_crtc.c                   |    2 +
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c                |    1 -
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.h                |    1 -
 drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c           |   11 +-
 drivers/gpu/drm/xen/xen_drm_front.c                |    1 +
 drivers/media/platform/vsp1/vsp1_brx.c             |    1 +
 drivers/media/platform/vsp1/vsp1_clu.c             |    1 +
 drivers/media/platform/vsp1/vsp1_dl.c              |   84 +-
 drivers/media/platform/vsp1/vsp1_dl.h              |    6 +-
 drivers/media/platform/vsp1/vsp1_drm.c             |   94 +-
 drivers/media/platform/vsp1/vsp1_drm.h             |    2 +-
 drivers/media/platform/vsp1/vsp1_entity.c          |    3 +-
 drivers/media/platform/vsp1/vsp1_entity.h          |    7 +-
 drivers/media/platform/vsp1/vsp1_hgo.c             |    1 +
 drivers/media/platform/vsp1/vsp1_hgt.c             |    1 +
 drivers/media/platform/vsp1/vsp1_hsit.c            |    1 +
 drivers/media/platform/vsp1/vsp1_lif.c             |    1 +
 drivers/media/platform/vsp1/vsp1_lut.c             |    1 +
 drivers/media/platform/vsp1/vsp1_regs.h            |    6 +-
 drivers/media/platform/vsp1/vsp1_rpf.c             |    1 +
 drivers/media/platform/vsp1/vsp1_rwpf.h            |    1 +
 drivers/media/platform/vsp1/vsp1_sru.c             |    1 +
 drivers/media/platform/vsp1/vsp1_uds.c             |    1 +
 drivers/media/platform/vsp1/vsp1_uif.c             |    1 +
 drivers/media/platform/vsp1/vsp1_video.c           |   16 +-
 drivers/media/platform/vsp1/vsp1_wpf.c             |   83 +-
 drivers/staging/Kconfig                            |    2 -
 drivers/staging/Makefile                           |    1 -
 drivers/staging/vboxvideo/TODO                     |   10 -
 include/drm/drm_audio_component.h                  |    7 +-
 include/drm/drm_bridge.h                           |   11 +-
 include/drm/drm_cache.h                            |    2 +-
 include/drm/drm_connector.h                        |  136 +-
 include/drm/drm_crtc.h                             |    4 +-
 include/drm/drm_drv.h                              |    9 +-
 include/drm/drm_dsc.h                              |    9 +-
 include/drm/drm_edid.h                             |    6 +
 include/drm/drm_fb_helper.h                        |   25 +-
 include/drm/drm_framebuffer.h                      |    1 +
 include/drm/drm_gem.h                              |   25 +
 include/drm/drm_gem_shmem_helper.h                 |  159 ++
 include/drm/drm_hdcp.h                             |    7 +-
 include/drm/drm_modes.h                            |   17 +
 include/drm/drm_modeset_helper_vtables.h           |    7 +
 include/drm/drm_print.h                            |    2 +
 include/drm/drm_syncobj.h                          |    5 +
 include/drm/drm_utils.h                            |    4 +
 include/drm/drm_vma_manager.h                      |   12 +
 include/drm/drm_writeback.h                        |   30 +-
 include/drm/i915_pciids.h                          |   38 +-
 include/drm/tinydrm/mipi-dbi.h                     |   32 +-
 include/drm/tinydrm/tinydrm-helpers.h              |   13 +
 include/drm/tinydrm/tinydrm.h                      |   75 -
 include/drm/ttm/ttm_bo_driver.h                    |    2 +-
 include/linux/dma-fence-chain.h                    |   81 +
 include/linux/reservation.h                        |    3 +-
 include/media/vsp1.h                               |   19 +-
 include/sound/hdaudio.h                            |    2 +-
 include/uapi/drm/amdgpu_drm.h                      |   35 +
 include/uapi/drm/drm.h                             |   36 +
 include/uapi/drm/drm_fourcc.h                      |   51 +-
 include/uapi/drm/drm_mode.h                        |    4 +-
 include/uapi/drm/i915_drm.h                        |  239 +-
 include/uapi/drm/lima_drm.h                        |  169 ++
 include/uapi/linux/kfd_ioctl.h                     |   12 +-
 sound/hda/hdac_component.c                         |   18 +-
 757 files changed, 46216 insertions(+), 16519 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/display/panel/feiyang,fy07024di26a30d.txt
 create mode 100644 Documentation/devicetree/bindings/display/panel/osddisplays,osd070t1718-19ts.txt
 create mode 100644 Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.txt
 create mode 100644 Documentation/devicetree/bindings/display/panel/ronbo,rb070d30.yaml
 create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip,rk3066-hdmi.txt
 create mode 100644 Documentation/devicetree/bindings/gpu/aspeed-gfx.txt
 create mode 100644 drivers/dma-buf/dma-fence-chain.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
 create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/ta_ras_if.h
 delete mode 100644 drivers/gpu/drm/amd/include/linux/chash.h
 delete mode 100644 drivers/gpu/drm/amd/lib/Kconfig
 delete mode 100644 drivers/gpu/drm/amd/lib/Makefile
 delete mode 100644 drivers/gpu/drm/amd/lib/chash.c
 create mode 100644 drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
 create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/smu9_baco.c
 create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/smu9_baco.h
 create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega12_baco.c
 create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega12_baco.h
 create mode 100644 drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
 create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h
 create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu_v11_0_ppsmc.h
 create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu_v11_0_pptable.h
 create mode 100644 drivers/gpu/drm/amd/powerplay/smu_v11_0.c
 create mode 100644 drivers/gpu/drm/amd/powerplay/vega20_ppt.c
 create mode 100644 drivers/gpu/drm/amd/powerplay/vega20_ppt.h
 create mode 100644 drivers/gpu/drm/arm/display/komeda/d71/d71_component.c
 create mode 100644 drivers/gpu/drm/arm/display/komeda/d71/d71_dev.h
 create mode 100644 drivers/gpu/drm/arm/display/komeda/d71/d71_regs.h
 create mode 100644 drivers/gpu/drm/aspeed/Kconfig
 create mode 100644 drivers/gpu/drm/aspeed/Makefile
 create mode 100644 drivers/gpu/drm/aspeed/aspeed_gfx.h
 create mode 100644 drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c
 create mode 100644 drivers/gpu/drm/aspeed/aspeed_gfx_drv.c
 create mode 100644 drivers/gpu/drm/aspeed/aspeed_gfx_out.c
 create mode 100644 drivers/gpu/drm/drm_gem_shmem_helper.c
 create mode 100644 drivers/gpu/drm/i915/i915_gem_context_types.h
 create mode 100644 drivers/gpu/drm/i915/i915_globals.c
 create mode 100644 drivers/gpu/drm/i915/i915_globals.h
 create mode 100644 drivers/gpu/drm/i915/i915_timeline_types.h
 create mode 100644 drivers/gpu/drm/i915/i915_user_extensions.c
 create mode 100644 drivers/gpu/drm/i915/i915_user_extensions.h
 create mode 100644 drivers/gpu/drm/i915/intel_context.c
 create mode 100644 drivers/gpu/drm/i915/intel_context.h
 create mode 100644 drivers/gpu/drm/i915/intel_context_types.h
 create mode 100644 drivers/gpu/drm/i915/intel_engine_types.h
 create mode 100644 drivers/gpu/drm/i915/intel_workarounds_types.h
 create mode 100644 drivers/gpu/drm/i915/test_i915_active_types_standalone.c
 create mode 100644 drivers/gpu/drm/i915/test_i915_gem_context_types_standalone.c
 create mode 100644 drivers/gpu/drm/i915/test_i915_timeline_types_standalone.c
 create mode 100644 drivers/gpu/drm/i915/test_intel_context_types_standalone.c
 create mode 100644 drivers/gpu/drm/i915/test_intel_engine_types_standalone.c
 create mode 100644 drivers/gpu/drm/i915/test_intel_workarounds_types_standalone.c
 create mode 100644 drivers/gpu/drm/lima/Kconfig
 create mode 100644 drivers/gpu/drm/lima/Makefile
 create mode 100644 drivers/gpu/drm/lima/lima_bcast.c
 create mode 100644 drivers/gpu/drm/lima/lima_bcast.h
 create mode 100644 drivers/gpu/drm/lima/lima_ctx.c
 create mode 100644 drivers/gpu/drm/lima/lima_ctx.h
 create mode 100644 drivers/gpu/drm/lima/lima_device.c
 create mode 100644 drivers/gpu/drm/lima/lima_device.h
 create mode 100644 drivers/gpu/drm/lima/lima_dlbu.c
 create mode 100644 drivers/gpu/drm/lima/lima_dlbu.h
 create mode 100644 drivers/gpu/drm/lima/lima_drv.c
 create mode 100644 drivers/gpu/drm/lima/lima_drv.h
 create mode 100644 drivers/gpu/drm/lima/lima_gem.c
 create mode 100644 drivers/gpu/drm/lima/lima_gem.h
 create mode 100644 drivers/gpu/drm/lima/lima_gem_prime.c
 create mode 100644 drivers/gpu/drm/lima/lima_gem_prime.h
 create mode 100644 drivers/gpu/drm/lima/lima_gp.c
 create mode 100644 drivers/gpu/drm/lima/lima_gp.h
 create mode 100644 drivers/gpu/drm/lima/lima_l2_cache.c
 create mode 100644 drivers/gpu/drm/lima/lima_l2_cache.h
 create mode 100644 drivers/gpu/drm/lima/lima_mmu.c
 create mode 100644 drivers/gpu/drm/lima/lima_mmu.h
 create mode 100644 drivers/gpu/drm/lima/lima_object.c
 create mode 100644 drivers/gpu/drm/lima/lima_object.h
 create mode 100644 drivers/gpu/drm/lima/lima_pmu.c
 create mode 100644 drivers/gpu/drm/lima/lima_pmu.h
 create mode 100644 drivers/gpu/drm/lima/lima_pp.c
 create mode 100644 drivers/gpu/drm/lima/lima_pp.h
 create mode 100644 drivers/gpu/drm/lima/lima_regs.h
 create mode 100644 drivers/gpu/drm/lima/lima_sched.c
 create mode 100644 drivers/gpu/drm/lima/lima_sched.h
 create mode 100644 drivers/gpu/drm/lima/lima_vm.c
 create mode 100644 drivers/gpu/drm/lima/lima_vm.h
 delete mode 100644 drivers/gpu/drm/meson/meson_canvas.c
 delete mode 100644 drivers/gpu/drm/meson/meson_canvas.h
 delete mode 100644 drivers/gpu/drm/omapdrm/displays/connector-dvi.c
 delete mode 100644 drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
 delete mode 100644 drivers/gpu/drm/omapdrm/displays/panel-dpi.c
 create mode 100644 drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c
 create mode 100644 drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c
 create mode 100644 drivers/gpu/drm/panel/panel-ronbo-rb070d30.c
 create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_writeback.c
 create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_writeback.h
 create mode 100644 drivers/gpu/drm/rockchip/rk3066_hdmi.c
 create mode 100644 drivers/gpu/drm/rockchip/rk3066_hdmi.h
 delete mode 100644 drivers/gpu/drm/tinydrm/core/tinydrm-core.c
 rename drivers/{staging => gpu/drm}/vboxvideo/Kconfig (100%)
 rename drivers/{staging => gpu/drm}/vboxvideo/Makefile (100%)
 rename drivers/{staging => gpu/drm}/vboxvideo/hgsmi_base.c (100%)
 rename drivers/{staging => gpu/drm}/vboxvideo/hgsmi_ch_setup.h (100%)
 rename drivers/{staging => gpu/drm}/vboxvideo/hgsmi_channels.h (100%)
 rename drivers/{staging => gpu/drm}/vboxvideo/hgsmi_defs.h (100%)
 rename drivers/{staging => gpu/drm}/vboxvideo/modesetting.c (100%)
 rename drivers/{staging => gpu/drm}/vboxvideo/vbox_drv.c (89%)
 rename drivers/{staging => gpu/drm}/vboxvideo/vbox_drv.h (96%)
 rename drivers/{staging => gpu/drm}/vboxvideo/vbox_fb.c (94%)
 rename drivers/{staging => gpu/drm}/vboxvideo/vbox_hgsmi.c (100%)
 rename drivers/{staging => gpu/drm}/vboxvideo/vbox_irq.c (93%)
 rename drivers/{staging => gpu/drm}/vboxvideo/vbox_main.c (98%)
 rename drivers/{staging => gpu/drm}/vboxvideo/vbox_mode.c (97%)
 rename drivers/{staging => gpu/drm}/vboxvideo/vbox_prime.c (100%)
 rename drivers/{staging => gpu/drm}/vboxvideo/vbox_ttm.c (97%)
 rename drivers/{staging => gpu/drm}/vboxvideo/vboxvideo.h (100%)
 rename drivers/{staging => gpu/drm}/vboxvideo/vboxvideo_guest.h (100%)
 rename drivers/{staging => gpu/drm}/vboxvideo/vboxvideo_vbe.h (100%)
 rename drivers/{staging => gpu/drm}/vboxvideo/vbva_base.c (100%)
 delete mode 100644 drivers/staging/vboxvideo/TODO
 create mode 100644 include/drm/drm_gem_shmem_helper.h
 delete mode 100644 include/drm/tinydrm/tinydrm.h
 create mode 100644 include/linux/dma-fence-chain.h
 create mode 100644 include/uapi/drm/lima_drm.h
$ git am -3 ../patches/0001-disable-the-ASPEED-GFX-driver-due-to-powerpc-build-f.patch
Applying: disable the ASPEED GFX driver due to powerpc build failure
$ git reset HEAD^
Unstaged changes after reset:
M	drivers/gpu/drm/aspeed/Kconfig
$ git add -A .
$ git commit -v -a --amend
[master 19634f3540c7] Merge remote-tracking branch 'drm/drm-next'
 Date: Tue Apr 9 11:14:48 2019 +1000
Merging amdgpu/drm-next (7cdd4dc58d28 drm/amd/powerplay: check for invalid profile mode before switching)
$ git merge amdgpu/drm-next
Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.h
Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c
Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/amd/amdgpu/amdgpu.h                |   1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c            |  11 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h           |   2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c            |   6 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h           |   7 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c             |  37 ++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h             |   1 +
 drivers/gpu/drm/amd/amdgpu/cik_sdma.c              |   8 +-
 drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c             |   8 +-
 drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c             |   8 +-
 drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c             |  26 +-
 drivers/gpu/drm/amd/amdgpu/si_dma.c                |   8 +-
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  | 328 ++++++++++++++++++---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h  |   9 +
 .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c  |  22 ++
 drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c   |  98 +++---
 drivers/gpu/drm/amd/display/dc/core/dc.c           |  85 ++++--
 drivers/gpu/drm/amd/display/dc/core/dc_debug.c     |  24 +-
 drivers/gpu/drm/amd/display/dc/dc.h                |   3 +-
 drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c   |  30 +-
 .../drm/amd/display/dc/dce100/dce100_resource.c    |   8 +-
 .../amd/display/dc/dce110/dce110_hw_sequencer.c    |  14 +-
 .../drm/amd/display/dc/dce110/dce110_resource.c    |  62 ++--
 .../drm/amd/display/dc/dce112/dce112_resource.c    |  62 ++--
 .../gpu/drm/amd/display/dc/dce80/dce80_resource.c  |   8 +-
 .../gpu/drm/amd/display/dc/dcn10/dcn10_clk_mgr.c   |   2 +-
 .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c  |  36 ++-
 .../display/dc/dcn10/dcn10_hw_sequencer_debug.c    |  12 +-
 drivers/gpu/drm/amd/display/dc/inc/core_types.h    |  10 +-
 .../amd/display/dc/irq/dce110/irq_service_dce110.c |   7 +-
 .../amd/display/dc/irq/dce120/irq_service_dce120.c |   7 +-
 .../amd/display/dc/irq/dce80/irq_service_dce80.c   |   6 +-
 .../amd/display/dc/irq/dcn10/irq_service_dcn10.c   |  40 ++-
 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c   |  32 +-
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c |  28 +-
 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c |  16 +-
 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.h |   2 +
 37 files changed, 748 insertions(+), 326 deletions(-)
Merging drm-intel/for-linux-next (6484775766e3 drm/i915/selftests: Mark live_forcewake_ops as unreliable)
$ git merge drm-intel/for-linux-next
Auto-merging drivers/gpu/drm/i915/vlv_dsi.c
Removing drivers/gpu/drm/i915/test_intel_workarounds_types_standalone.c
Removing drivers/gpu/drm/i915/test_intel_engine_types_standalone.c
Removing drivers/gpu/drm/i915/test_intel_context_types_standalone.c
Removing drivers/gpu/drm/i915/test_i915_timeline_types_standalone.c
Removing drivers/gpu/drm/i915/test_i915_gem_context_types_standalone.c
Removing drivers/gpu/drm/i915/test_i915_active_types_standalone.c
Auto-merging drivers/gpu/drm/i915/intel_fbdev.c
Auto-merging drivers/gpu/drm/i915/i915_debugfs.c
Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c
Merge made by the 'recursive' strategy.
 arch/x86/kernel/early-quirks.c                     |   4 +-
 drivers/gpu/drm/i915/.gitignore                    |   1 +
 drivers/gpu/drm/i915/Makefile                      |  14 +-
 drivers/gpu/drm/i915/Makefile.header-test          |  47 ++
 drivers/gpu/drm/i915/gvt/execlist.c                |  11 +-
 drivers/gpu/drm/i915/gvt/execlist.h                |   2 +-
 drivers/gpu/drm/i915/gvt/gvt.h                     |   8 +-
 drivers/gpu/drm/i915/gvt/handlers.c                |   2 +-
 drivers/gpu/drm/i915/gvt/scheduler.c               |   8 +-
 drivers/gpu/drm/i915/gvt/scheduler.h               |   6 +-
 drivers/gpu/drm/i915/gvt/vgpu.c                    |   4 +-
 drivers/gpu/drm/i915/i915_debugfs.c                |  19 +-
 drivers/gpu/drm/i915/i915_drv.c                    |  79 ++-
 drivers/gpu/drm/i915/i915_drv.h                    | 165 +++--
 drivers/gpu/drm/i915/i915_gem.c                    |  53 +-
 drivers/gpu/drm/i915/i915_gem.h                    |   2 -
 drivers/gpu/drm/i915/i915_gem_context.c            |  49 +-
 drivers/gpu/drm/i915/i915_gem_context.h            |   2 +-
 drivers/gpu/drm/i915/i915_gem_gtt.h                |   2 +-
 drivers/gpu/drm/i915/i915_gem_object.h             |   4 +
 drivers/gpu/drm/i915/i915_gem_userptr.c            |   4 +-
 drivers/gpu/drm/i915/i915_globals.c                |  74 +--
 drivers/gpu/drm/i915/i915_gpu_error.c              |  27 +-
 drivers/gpu/drm/i915/i915_gpu_error.h              |   2 +-
 drivers/gpu/drm/i915/i915_irq.c                    |  13 +-
 drivers/gpu/drm/i915/i915_pci.c                    |  38 +-
 drivers/gpu/drm/i915/i915_priolist_types.h         |  42 ++
 drivers/gpu/drm/i915/i915_reg.h                    |  56 +-
 drivers/gpu/drm/i915/i915_request.c                |  28 +-
 drivers/gpu/drm/i915/i915_request.h                |  10 +
 drivers/gpu/drm/i915/i915_reset.c                  | 189 +++---
 drivers/gpu/drm/i915/i915_reset.h                  |  10 +-
 drivers/gpu/drm/i915/i915_scheduler.c              |   5 +-
 drivers/gpu/drm/i915/i915_scheduler.h              |  86 +--
 drivers/gpu/drm/i915/i915_scheduler_types.h        |  72 ++
 drivers/gpu/drm/i915/i915_suspend.c                |   4 +-
 drivers/gpu/drm/i915/i915_timeline.c               |   2 -
 drivers/gpu/drm/i915/i915_timeline.h               |  16 +-
 drivers/gpu/drm/i915/i915_timeline_types.h         |  13 +-
 drivers/gpu/drm/i915/icl_dsi.c                     |  58 +-
 drivers/gpu/drm/i915/intel_atomic.c                |   2 +
 drivers/gpu/drm/i915/intel_atomic_plane.c          |   3 +
 drivers/gpu/drm/i915/intel_atomic_plane.h          |  40 ++
 drivers/gpu/drm/i915/intel_audio.c                 |  76 ++-
 drivers/gpu/drm/i915/intel_audio.h                 |  24 +
 drivers/gpu/drm/i915/intel_cdclk.c                 | 307 +++++----
 drivers/gpu/drm/i915/intel_cdclk.h                 |  46 ++
 drivers/gpu/drm/i915/intel_color.c                 | 734 ++++++++++++++++-----
 drivers/gpu/drm/i915/intel_color.h                 |  17 +
 drivers/gpu/drm/i915/intel_connector.c             |   9 +-
 drivers/gpu/drm/i915/intel_connector.h             |  35 +
 drivers/gpu/drm/i915/intel_crt.c                   |   7 +-
 drivers/gpu/drm/i915/intel_crt.h                   |  21 +
 drivers/gpu/drm/i915/intel_csr.c                   |   3 +
 drivers/gpu/drm/i915/intel_csr.h                   |  17 +
 drivers/gpu/drm/i915/intel_ddi.c                   |  27 +-
 drivers/gpu/drm/i915/intel_ddi.h                   |  53 ++
 drivers/gpu/drm/i915/intel_device_info.c           |  93 +++
 drivers/gpu/drm/i915/intel_device_info.h           |  30 +-
 drivers/gpu/drm/i915/intel_display.c               | 142 +++-
 drivers/gpu/drm/i915/intel_dp.c                    |  20 +-
 drivers/gpu/drm/i915/intel_dp.h                    | 121 ++++
 drivers/gpu/drm/i915/intel_dp_link_training.c      |   1 +
 drivers/gpu/drm/i915/intel_dp_mst.c                |   9 +-
 drivers/gpu/drm/i915/intel_dpio_phy.c              |   1 +
 drivers/gpu/drm/i915/intel_drv.h                   | 584 +---------------
 drivers/gpu/drm/i915/intel_dvo.c                   |  10 +-
 drivers/gpu/drm/i915/intel_dvo.h                   |  13 +
 drivers/gpu/drm/i915/intel_engine_types.h          |  18 +-
 drivers/gpu/drm/i915/intel_fbc.c                   |   4 +-
 drivers/gpu/drm/i915/intel_fbc.h                   |  42 ++
 drivers/gpu/drm/i915/intel_fbdev.c                 |  17 +-
 drivers/gpu/drm/i915/intel_fbdev.h                 |  53 ++
 drivers/gpu/drm/i915/intel_fifo_underrun.c         |   1 +
 drivers/gpu/drm/i915/intel_frontbuffer.c           |   5 +-
 drivers/gpu/drm/i915/intel_frontbuffer.h           |  10 +
 drivers/gpu/drm/i915/intel_guc_submission.c        |   9 +-
 drivers/gpu/drm/i915/intel_guc_submission.h        |   1 +
 drivers/gpu/drm/i915/intel_hangcheck.c             |   2 +-
 drivers/gpu/drm/i915/intel_hdcp.c                  |  10 +-
 drivers/gpu/drm/i915/intel_hdcp.h                  |  33 +
 drivers/gpu/drm/i915/intel_hdmi.c                  |  17 +-
 drivers/gpu/drm/i915/intel_hdmi.h                  |  51 ++
 drivers/gpu/drm/i915/intel_lrc.c                   |  71 +-
 drivers/gpu/drm/i915/intel_lspcon.c                |   6 +-
 drivers/gpu/drm/i915/intel_lspcon.h                |  38 ++
 drivers/gpu/drm/i915/intel_lvds.c                  |   9 +-
 drivers/gpu/drm/i915/intel_lvds.h                  |  22 +
 drivers/gpu/drm/i915/intel_opregion.c              |   3 +-
 drivers/gpu/drm/i915/intel_panel.c                 |   3 +
 drivers/gpu/drm/i915/intel_panel.h                 |  65 ++
 drivers/gpu/drm/i915/intel_pipe_crc.c              |   4 +-
 drivers/gpu/drm/i915/intel_pipe_crc.h              |  35 +
 drivers/gpu/drm/i915/intel_pm.c                    |   9 +-
 drivers/gpu/drm/i915/intel_pm.h                    |  71 ++
 drivers/gpu/drm/i915/intel_psr.c                   |  25 +-
 drivers/gpu/drm/i915/intel_psr.h                   |  40 ++
 drivers/gpu/drm/i915/intel_ringbuffer.c            |  10 +-
 drivers/gpu/drm/i915/intel_runtime_pm.c            |  20 +-
 drivers/gpu/drm/i915/intel_sdvo.c                  |  13 +-
 drivers/gpu/drm/i915/intel_sdvo.h                  |  23 +
 drivers/gpu/drm/i915/intel_sprite.c                |  16 +-
 drivers/gpu/drm/i915/intel_sprite.h                |  55 ++
 drivers/gpu/drm/i915/intel_tv.c                    |   5 +-
 drivers/gpu/drm/i915/intel_tv.h                    |  13 +
 drivers/gpu/drm/i915/intel_uc.c                    |   2 +-
 drivers/gpu/drm/i915/intel_uncore.c                |  65 +-
 drivers/gpu/drm/i915/intel_uncore.h                |  31 +-
 drivers/gpu/drm/i915/selftests/i915_gem_context.c  |   8 +-
 drivers/gpu/drm/i915/selftests/intel_hangcheck.c   |   3 +-
 drivers/gpu/drm/i915/selftests/intel_lrc.c         | 180 +++++
 drivers/gpu/drm/i915/selftests/intel_uncore.c      |  11 +
 drivers/gpu/drm/i915/selftests/mock_timeline.c     |   1 -
 .../drm/i915/test_i915_active_types_standalone.c   |   7 -
 .../i915/test_i915_gem_context_types_standalone.c  |   7 -
 .../drm/i915/test_i915_timeline_types_standalone.c |   7 -
 .../drm/i915/test_intel_context_types_standalone.c |   7 -
 .../drm/i915/test_intel_engine_types_standalone.c  |   7 -
 .../i915/test_intel_workarounds_types_standalone.c |   7 -
 drivers/gpu/drm/i915/vlv_dsi.c                     |  10 +-
 include/drm/i915_pciids.h                          | 179 +++--
 121 files changed, 3351 insertions(+), 1686 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/.gitignore
 create mode 100644 drivers/gpu/drm/i915/Makefile.header-test
 create mode 100644 drivers/gpu/drm/i915/i915_priolist_types.h
 create mode 100644 drivers/gpu/drm/i915/i915_scheduler_types.h
 create mode 100644 drivers/gpu/drm/i915/intel_atomic_plane.h
 create mode 100644 drivers/gpu/drm/i915/intel_audio.h
 create mode 100644 drivers/gpu/drm/i915/intel_cdclk.h
 create mode 100644 drivers/gpu/drm/i915/intel_color.h
 create mode 100644 drivers/gpu/drm/i915/intel_connector.h
 create mode 100644 drivers/gpu/drm/i915/intel_crt.h
 create mode 100644 drivers/gpu/drm/i915/intel_csr.h
 create mode 100644 drivers/gpu/drm/i915/intel_ddi.h
 create mode 100644 drivers/gpu/drm/i915/intel_dp.h
 create mode 100644 drivers/gpu/drm/i915/intel_dvo.h
 create mode 100644 drivers/gpu/drm/i915/intel_fbc.h
 create mode 100644 drivers/gpu/drm/i915/intel_fbdev.h
 create mode 100644 drivers/gpu/drm/i915/intel_hdcp.h
 create mode 100644 drivers/gpu/drm/i915/intel_hdmi.h
 create mode 100644 drivers/gpu/drm/i915/intel_lspcon.h
 create mode 100644 drivers/gpu/drm/i915/intel_lvds.h
 create mode 100644 drivers/gpu/drm/i915/intel_panel.h
 create mode 100644 drivers/gpu/drm/i915/intel_pipe_crc.h
 create mode 100644 drivers/gpu/drm/i915/intel_pm.h
 create mode 100644 drivers/gpu/drm/i915/intel_psr.h
 create mode 100644 drivers/gpu/drm/i915/intel_sdvo.h
 create mode 100644 drivers/gpu/drm/i915/intel_sprite.h
 create mode 100644 drivers/gpu/drm/i915/intel_tv.h
 delete mode 100644 drivers/gpu/drm/i915/test_i915_active_types_standalone.c
 delete mode 100644 drivers/gpu/drm/i915/test_i915_gem_context_types_standalone.c
 delete mode 100644 drivers/gpu/drm/i915/test_i915_timeline_types_standalone.c
 delete mode 100644 drivers/gpu/drm/i915/test_intel_context_types_standalone.c
 delete mode 100644 drivers/gpu/drm/i915/test_intel_engine_types_standalone.c
 delete mode 100644 drivers/gpu/drm/i915/test_intel_workarounds_types_standalone.c
Merging drm-tegra/drm/tegra/for-next (11c632e1cfd3 drm/tegra: sor: Implement acquire/release for reset)
$ git merge drm-tegra/drm/tegra/for-next
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/tegra/sor.c | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)
Merging drm-misc/for-linux-next (6f61a82507c9 MAINTAINERS: mark lima mailing list as moderated)
$ git merge drm-misc/for-linux-next
CONFLICT (modify/delete): drivers/gpu/drm/cirrus/cirrus_ttm.c deleted in drm-misc/for-linux-next and modified in HEAD. Version HEAD of drivers/gpu/drm/cirrus/cirrus_ttm.c left in tree.
Removing drivers/gpu/drm/cirrus/cirrus_mode.c
Removing drivers/gpu/drm/cirrus/cirrus_main.c
Removing drivers/gpu/drm/cirrus/cirrus_fbdev.c
CONFLICT (modify/delete): drivers/gpu/drm/cirrus/cirrus_drv.h deleted in drm-misc/for-linux-next and modified in HEAD. Version HEAD of drivers/gpu/drm/cirrus/cirrus_drv.h left in tree.
Removing drivers/gpu/drm/cirrus/cirrus_drv.c
Auto-merging drivers/gpu/drm/Makefile
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git rm -f drivers/gpu/drm/cirrus/cirrus_drv.h drivers/gpu/drm/cirrus/cirrus_ttm.c
drivers/gpu/drm/cirrus/cirrus_drv.h: needs merge
drivers/gpu/drm/cirrus/cirrus_ttm.c: needs merge
rm 'drivers/gpu/drm/cirrus/cirrus_drv.h'
rm 'drivers/gpu/drm/cirrus/cirrus_ttm.c'
$ git commit -v -a
[master 2aec4e749723] Merge remote-tracking branch 'drm-misc/for-linux-next'
$ git diff -M --stat --summary HEAD^..
 Documentation/gpu/meson.rst                        |   6 -
 MAINTAINERS                                        |   2 +-
 drivers/gpu/drm/Makefile                           |   3 +-
 drivers/gpu/drm/cirrus/Kconfig                     |   2 +-
 drivers/gpu/drm/cirrus/Makefile                    |   3 -
 drivers/gpu/drm/cirrus/cirrus.c                    | 657 +++++++++++++++++++++
 drivers/gpu/drm/cirrus/cirrus_drv.c                | 161 -----
 drivers/gpu/drm/cirrus/cirrus_drv.h                | 250 --------
 drivers/gpu/drm/cirrus/cirrus_fbdev.c              | 309 ----------
 drivers/gpu/drm/cirrus/cirrus_main.c               | 328 ----------
 drivers/gpu/drm/cirrus/cirrus_mode.c               | 617 -------------------
 drivers/gpu/drm/cirrus/cirrus_ttm.c                | 337 -----------
 drivers/gpu/drm/drm_format_helper.c                | 326 ++++++++++
 drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c |  19 +-
 drivers/gpu/drm/pl111/pl111_versatile.c            |   4 +
 drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c     | 158 -----
 drivers/gpu/drm/tinydrm/mipi-dbi.c                 |   7 +-
 drivers/gpu/drm/tinydrm/repaper.c                  |   3 +-
 drivers/gpu/drm/tinydrm/st7586.c                   |   3 +-
 drivers/gpu/drm/vc4/vc4_debugfs.c                  |   2 +-
 include/drm/drm_format_helper.h                    |  34 ++
 include/drm/tinydrm/tinydrm-helpers.h              |  10 -
 22 files changed, 1044 insertions(+), 2197 deletions(-)
 create mode 100644 drivers/gpu/drm/cirrus/cirrus.c
 delete mode 100644 drivers/gpu/drm/cirrus/cirrus_drv.c
 delete mode 100644 drivers/gpu/drm/cirrus/cirrus_drv.h
 delete mode 100644 drivers/gpu/drm/cirrus/cirrus_fbdev.c
 delete mode 100644 drivers/gpu/drm/cirrus/cirrus_main.c
 delete mode 100644 drivers/gpu/drm/cirrus/cirrus_mode.c
 delete mode 100644 drivers/gpu/drm/cirrus/cirrus_ttm.c
 create mode 100644 drivers/gpu/drm/drm_format_helper.c
 create mode 100644 include/drm/drm_format_helper.h
Merging drm-msm/msm-next (745b19d74716 drm/msm/dpu: check split role for single flush)
$ git merge drm-msm/msm-next
Auto-merging drivers/gpu/drm/msm/msm_gem.c
Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c
Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c           |  69 +-------
 drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c        | 119 +++++++++++---
 drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h   |  15 +-
 .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c   |   5 +-
 .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c   | 177 ++++++---------------
 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h            |   3 -
 drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c          |   2 +-
 drivers/gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c   |   4 +-
 drivers/gpu/drm/msm/msm_gem.c                      |   7 +
 drivers/gpu/drm/msm/msm_gem_vma.c                  |   2 +-
 drivers/gpu/drm/msm/msm_iommu.c                    |  13 +-
 11 files changed, 169 insertions(+), 247 deletions(-)
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 (e8e3cc7d39ff MAINTAINERS: Fix pattern for Documentation path for Arm Mali Komeda)
$ git merge mali-dp/for-upstream/mali-dp
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
Merging imx-drm/imx-drm/next (a0ea4ffff266 drm/imx: only send commit done event when all state has been applied)
$ git merge imx-drm/imx-drm/next
Already up to date.
Merging etnaviv/etnaviv/next (9e05352340d3 drm/etnaviv: potential NULL dereference)
$ 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 (c55296ebb4f2 Merge branch 'regmap-5.2' into regmap-next)
$ git merge regmap/for-next
Merge made by the 'recursive' strategy.
 drivers/base/regmap/regmap-debugfs.c | 30 ++++++++++++++++++++++++------
 drivers/base/regmap/regmap.c         |  9 ++++-----
 2 files changed, 28 insertions(+), 11 deletions(-)
Merging sound/for-next (4b81dad109ad ALSA: doc: my_chip has no element ioport)
$ git merge sound/for-next
Merge made by the 'recursive' strategy.
 .../sound/kernel-api/writing-an-alsa-driver.rst    |   4 +-
 include/sound/memalloc.h                           |   4 -
 include/sound/timer.h                              |   1 -
 sound/core/memalloc.c                              |  53 +--------
 sound/core/pcm.c                                   |  14 +--
 sound/core/timer.c                                 | 123 +++++++++++++--------
 sound/drivers/aloop.c                              |   4 +-
 sound/firewire/amdtp-stream.c                      |  44 ++++----
 sound/firewire/motu/amdtp-motu.c                   |   6 +
 sound/firewire/motu/motu-protocol-v2.c             |  43 +++++--
 sound/firewire/motu/motu.c                         |  15 +++
 sound/firewire/motu/motu.h                         |   1 +
 sound/synth/emux/emux_hwdep.c                      |   5 +
 sound/usb/usx2y/usX2Yhwdep.c                       |   3 +-
 sound/usb/usx2y/usb_stream.c                       |  20 ++--
 sound/usb/usx2y/usbusx2y.c                         |   3 +-
 sound/usb/usx2y/usx2yhwdeppcm.c                    |   6 +-
 17 files changed, 182 insertions(+), 167 deletions(-)
Merging sound-asoc/for-next (5f2ab35fe853 Merge branch 'asoc-5.2' into asoc-next)
$ git merge sound-asoc/for-next
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 e5fba2153103] Merge remote-tracking branch 'sound-asoc/for-next'
$ git diff -M --stat --summary HEAD^..
 .../devicetree/bindings/sound/adi,axi-i2s.txt      |    7 +-
 .../devicetree/bindings/sound/amlogic,axg-fifo.txt |    4 +-
 .../devicetree/bindings/sound/amlogic,axg-pdm.txt  |    3 +-
 .../bindings/sound/amlogic,axg-spdifin.txt         |    3 +-
 .../bindings/sound/amlogic,axg-spdifout.txt        |    3 +-
 .../bindings/sound/amlogic,axg-tdm-formatters.txt  |    4 +-
 .../devicetree/bindings/sound/cirrus,lochnagar.txt |   39 +
 .../devicetree/bindings/sound/cs42l51.txt          |   16 +
 Documentation/devicetree/bindings/sound/da7219.txt |    8 +-
 .../devicetree/bindings/sound/fsl,audmix.txt       |   54 +
 .../devicetree/bindings/sound/mchp-i2s-mcc.txt     |   43 +
 .../bindings/sound/mt8183-da7219-max98357.txt      |   15 +
 .../sound/mt8183-mt6358-ts3a227-max98357.txt       |   15 +
 .../devicetree/bindings/sound/renesas,rsnd.txt     |    7 +-
 .../devicetree/bindings/sound/rockchip,pdm.txt     |    5 +
 Documentation/devicetree/bindings/sound/rt5651.txt |    5 +
 .../devicetree/bindings/sound/simple-amplifier.txt |    2 +-
 MAINTAINERS                                        |    2 +
 include/sound/da7219.h                             |    8 +-
 include/sound/simple_card_utils.h                  |  236 +++--
 sound/soc/adi/axi-i2s.c                            |   68 +-
 sound/soc/amd/acp-da7219-max98357a.c               |    4 +-
 sound/soc/atmel/Kconfig                            |   14 +
 sound/soc/atmel/Makefile                           |    2 +
 sound/soc/atmel/mchp-i2s-mcc.c                     |  974 ++++++++++++++++++
 sound/soc/codecs/Kconfig                           |   15 +-
 sound/soc/codecs/Makefile                          |    4 +-
 sound/soc/codecs/cs42l51-i2c.c                     |   13 +-
 sound/soc/codecs/cs42l51.c                         |  225 ++++-
 sound/soc/codecs/cs42l51.h                         |    3 +
 sound/soc/codecs/cs47l24.c                         |    4 +-
 sound/soc/codecs/da7219.c                          |  523 +++++++---
 sound/soc/codecs/da7219.h                          |    6 +-
 sound/soc/codecs/es8316.c                          |   14 +
 sound/soc/codecs/lochnagar-sc.c                    |  266 +++++
 sound/soc/codecs/max98357a.c                       |    3 +
 sound/soc/codecs/nau8810.c                         |   25 +-
 sound/soc/codecs/rt5651.c                          |   47 +-
 sound/soc/codecs/rt5651.h                          |    1 +
 sound/soc/codecs/rt5677-spi.c                      |    8 +
 sound/soc/codecs/simple-amplifier.c                |    3 +-
 sound/soc/codecs/sirf-audio-codec.c                |    3 -
 sound/soc/codecs/tlv320aic31xx.c                   |   61 +-
 sound/soc/codecs/tlv320aic31xx.h                   |   12 +
 sound/soc/codecs/tlv320aic32x4-clk.c               |  483 +++++++++
 sound/soc/codecs/tlv320aic32x4-i2c.c               |   14 +-
 sound/soc/codecs/tlv320aic32x4-spi.c               |   14 +-
 sound/soc/codecs/tlv320aic32x4.c                   |  445 ++++-----
 sound/soc/codecs/tlv320aic32x4.h                   |   13 +
 sound/soc/codecs/wcd9335.c                         |    1 +
 sound/soc/codecs/wm5102.c                          |    4 +-
 sound/soc/codecs/wm5110.c                          |    4 +-
 sound/soc/codecs/wm_adsp.c                         | 1030 ++++++++++++++------
 sound/soc/codecs/wm_adsp.h                         |   50 +-
 sound/soc/codecs/wmfw.h                            |   30 +
 sound/soc/fsl/Kconfig                              |   16 +
 sound/soc/fsl/Makefile                             |    5 +
 sound/soc/fsl/eukrea-tlv320.c                      |   30 +-
 sound/soc/fsl/fsl_audmix.c                         |  576 +++++++++++
 sound/soc/fsl/fsl_audmix.h                         |  102 ++
 sound/soc/fsl/fsl_dma.c                            |   26 +-
 sound/soc/fsl/fsl_dma.h                            |    5 +-
 sound/soc/fsl/fsl_esai.c                           |   21 +-
 sound/soc/fsl/fsl_utils.c                          |    1 +
 sound/soc/fsl/imx-audmix.c                         |  327 +++++++
 sound/soc/fsl/imx-audmux.c                         |   26 +-
 sound/soc/fsl/imx-es8328.c                         |   15 +-
 sound/soc/fsl/imx-mc13783.c                        |   22 +-
 sound/soc/fsl/imx-pcm-fiq.c                        |   21 +-
 sound/soc/fsl/imx-pcm.h                            |    6 +-
 sound/soc/fsl/imx-spdif.c                          |   13 +-
 sound/soc/fsl/imx-ssi.c                            |   57 +-
 sound/soc/fsl/imx-ssi.h                            |    6 +-
 sound/soc/fsl/mpc5200_dma.c                        |   14 +-
 sound/soc/fsl/mpc5200_psc_ac97.c                   |   16 +-
 sound/soc/fsl/mpc5200_psc_i2s.c                    |   14 +-
 sound/soc/fsl/mpc8610_hpcd.c                       |   18 +-
 sound/soc/fsl/mx27vis-aic32x4.c                    |   29 +-
 sound/soc/fsl/p1022_ds.c                           |   18 +-
 sound/soc/fsl/p1022_rdk.c                          |   32 +-
 sound/soc/fsl/pcm030-audio-fabric.c                |   18 +-
 sound/soc/fsl/phycore-ac97.c                       |   16 +-
 sound/soc/fsl/wm1133-ev1.c                         |   21 +-
 sound/soc/generic/audio-graph-card.c               |  429 ++++----
 sound/soc/generic/simple-card-utils.c              |  383 ++++----
 sound/soc/generic/simple-card.c                    |  379 +++----
 sound/soc/intel/boards/bytcht_es8316.c             |   37 +-
 sound/soc/intel/boards/bytcr_rt5651.c              |   22 +-
 sound/soc/intel/boards/kbl_da7219_max98927.c       |   52 +-
 sound/soc/jz4740/Kconfig                           |    2 +-
 sound/soc/mediatek/Kconfig                         |   26 +
 sound/soc/mediatek/common/mtk-afe-fe-dai.c         |   51 +-
 sound/soc/mediatek/mt2701/mt2701-afe-pcm.c         |   13 -
 sound/soc/mediatek/mt6797/mt6797-afe-pcm.c         |   16 -
 sound/soc/mediatek/mt8173/mt8173-afe-pcm.c         |   16 -
 sound/soc/mediatek/mt8183/Makefile                 |    2 +
 sound/soc/mediatek/mt8183/mt8183-afe-pcm.c         |   20 -
 sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c |  471 +++++++++
 .../mt8183/mt8183-mt6358-ts3a227-max98357.c        |  381 ++++++++
 sound/soc/meson/axg-fifo.c                         |   34 +-
 sound/soc/meson/axg-fifo.h                         |    2 +
 sound/soc/meson/axg-frddr.c                        |  143 ++-
 sound/soc/meson/axg-tdm-formatter.c                |    6 +-
 sound/soc/meson/axg-tdm-formatter.h                |   11 +-
 sound/soc/meson/axg-tdmin.c                        |   16 +-
 sound/soc/meson/axg-tdmout.c                       |   29 +-
 sound/soc/meson/axg-toddr.c                        |   53 +
 sound/soc/qcom/Kconfig                             |    2 +-
 sound/soc/rockchip/rockchip_pdm.c                  |  205 +++-
 sound/soc/rockchip/rockchip_pdm.h                  |   12 +
 sound/soc/samsung/i2s.c                            |   27 +-
 sound/soc/soc-core.c                               |   18 +-
 sound/soc/soc-dapm.c                               |    2 +-
 sound/soc/soc-topology.c                           |  330 ++++---
 sound/soc/sprd/Kconfig                             |    1 +
 sound/soc/sprd/Makefile                            |    4 +-
 sound/soc/sprd/sprd-pcm-compress.c                 |  674 +++++++++++++
 sound/soc/sprd/sprd-pcm-dma.c                      |    2 +-
 sound/soc/sprd/sprd-pcm-dma.h                      |   43 +
 sound/soc/stm/stm32_adfsdm.c                       |    2 +-
 sound/soc/stm/stm32_i2s.c                          |   25 +-
 sound/soc/stm/stm32_sai.c                          |   80 +-
 sound/soc/stm/stm32_sai.h                          |    2 +
 sound/soc/stm/stm32_sai_sub.c                      |   45 +-
 sound/soc/stm/stm32_spdifrx.c                      |   42 +-
 sound/soc/ti/Kconfig                               |    4 +-
 sound/soc/ti/ams-delta.c                           |    2 +-
 sound/soc/ti/davinci-mcasp.c                       |    2 +
 sound/soc/ti/edma-pcm.c                            |    5 +-
 sound/soc/ti/sdma-pcm.c                            |    9 +-
 130 files changed, 8328 insertions(+), 2140 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/sound/cirrus,lochnagar.txt
 create mode 100644 Documentation/devicetree/bindings/sound/fsl,audmix.txt
 create mode 100644 Documentation/devicetree/bindings/sound/mchp-i2s-mcc.txt
 create mode 100644 Documentation/devicetree/bindings/sound/mt8183-da7219-max98357.txt
 create mode 100644 Documentation/devicetree/bindings/sound/mt8183-mt6358-ts3a227-max98357.txt
 create mode 100644 sound/soc/atmel/mchp-i2s-mcc.c
 create mode 100644 sound/soc/codecs/lochnagar-sc.c
 create mode 100644 sound/soc/codecs/tlv320aic32x4-clk.c
 create mode 100644 sound/soc/fsl/fsl_audmix.c
 create mode 100644 sound/soc/fsl/fsl_audmix.h
 create mode 100644 sound/soc/fsl/imx-audmix.c
 create mode 100644 sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
 create mode 100644 sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c
 create mode 100644 sound/soc/sprd/sprd-pcm-compress.c
Merging modules/modules-next (1c7651f43777 kallsyms: store type information in its own array)
$ git merge modules/modules-next
Merge made by the 'recursive' strategy.
 include/asm-generic/vmlinux.lds.h |  1 -
 include/linux/module.h            |  1 +
 kernel/module-internal.h          |  2 +-
 kernel/module.c                   | 21 ++++++++++++++-------
 4 files changed, 16 insertions(+), 9 deletions(-)
Merging input/next (a5f50c501321 Input: goodix - add GT5663 CTP support)
$ git merge input/next
Merge made by the 'recursive' strategy.
 .../bindings/input/touchscreen/goodix.txt          |  3 ++
 drivers/input/evdev.c                              |  7 ++-
 drivers/input/touchscreen/edt-ft5x06.c             | 23 ++-------
 drivers/input/touchscreen/goodix.c                 | 54 ++++++++++++++++++++++
 4 files changed, 64 insertions(+), 23 deletions(-)
Merging block/for-next (d4ecdcd118f3 Merge branch 'for-5.2/block' into for-next)
$ git merge block/for-next
Auto-merging lib/Kconfig.debug
Auto-merging drivers/md/dm-integrity.c
Auto-merging drivers/block/drbd/drbd_int.h
Auto-merging arch/mips/configs/rbtx49xx_defconfig
Auto-merging arch/mips/configs/rb532_defconfig
Auto-merging arch/mips/configs/loongson1c_defconfig
Auto-merging arch/mips/configs/loongson1b_defconfig
Auto-merging arch/arm/configs/u300_defconfig
Auto-merging arch/arm/configs/omap1_defconfig
Auto-merging arch/arm/configs/multi_v4t_defconfig
Auto-merging arch/arm/configs/clps711x_defconfig
Auto-merging arch/arm/configs/at91_dt_defconfig
Merge made by the 'recursive' strategy.
 Documentation/block/bfq-iosched.txt                |  29 +-
 Documentation/process/submit-checklist.rst         |  27 +-
 Documentation/translations/ja_JP/SubmitChecklist   |  22 +-
 arch/arc/configs/haps_hs_defconfig                 |   1 -
 arch/arc/configs/haps_hs_smp_defconfig             |   1 -
 arch/arc/configs/nsim_700_defconfig                |   1 -
 arch/arc/configs/nsim_hs_defconfig                 |   1 -
 arch/arc/configs/nsim_hs_smp_defconfig             |   1 -
 arch/arc/configs/nsimosci_defconfig                |   1 -
 arch/arc/configs/nsimosci_hs_defconfig             |   1 -
 arch/arc/configs/nsimosci_hs_smp_defconfig         |   1 -
 arch/arm/configs/aspeed_g4_defconfig               |   1 -
 arch/arm/configs/aspeed_g5_defconfig               |   1 -
 arch/arm/configs/at91_dt_defconfig                 |   1 -
 arch/arm/configs/clps711x_defconfig                |   1 -
 arch/arm/configs/efm32_defconfig                   |   1 -
 arch/arm/configs/ezx_defconfig                     |   1 -
 arch/arm/configs/h3600_defconfig                   |   1 -
 arch/arm/configs/imote2_defconfig                  |   1 -
 arch/arm/configs/moxart_defconfig                  |   1 -
 arch/arm/configs/multi_v4t_defconfig               |   1 -
 arch/arm/configs/omap1_defconfig                   |   1 -
 arch/arm/configs/stm32_defconfig                   |   1 -
 arch/arm/configs/u300_defconfig                    |   1 -
 arch/arm/configs/vexpress_defconfig                |   1 -
 arch/m68k/configs/amcore_defconfig                 |   1 -
 arch/m68k/configs/m5475evb_defconfig               |   1 -
 arch/m68k/configs/stmark2_defconfig                |   1 -
 arch/mips/configs/ar7_defconfig                    |   1 -
 arch/mips/configs/decstation_defconfig             |   1 -
 arch/mips/configs/decstation_r4k_defconfig         |   1 -
 arch/mips/configs/loongson1b_defconfig             |   1 -
 arch/mips/configs/loongson1c_defconfig             |   1 -
 arch/mips/configs/rb532_defconfig                  |   1 -
 arch/mips/configs/rbtx49xx_defconfig               |   1 -
 arch/parisc/configs/generic-32bit_defconfig        |   1 -
 arch/sh/configs/apsh4ad0a_defconfig                |   1 -
 arch/sh/configs/ecovec24-romimage_defconfig        |   1 -
 arch/sh/configs/rsk7264_defconfig                  |   1 -
 arch/sh/configs/rsk7269_defconfig                  |   1 -
 arch/sh/configs/sh7785lcr_32bit_defconfig          |   1 -
 block/Kconfig                                      |  24 -
 block/bfq-cgroup.c                                 |   5 +-
 block/bfq-iosched.c                                | 802 +++++++++++++++++----
 block/bfq-iosched.h                                |  96 ++-
 block/bfq-wf2q.c                                   |  12 +-
 block/bio.c                                        | 137 ++--
 block/blk-merge.c                                  | 106 ++-
 block/blk.h                                        |   2 +-
 block/elevator.c                                   |   6 +-
 block/opal_proto.h                                 |   2 +
 block/sed-opal.c                                   | 716 ++++++++----------
 drivers/block/drbd/drbd_int.h                      |   5 -
 drivers/block/loop.c                               |  35 +-
 drivers/block/ps3disk.c                            |   4 +-
 drivers/block/virtio_blk.c                         |   3 +-
 drivers/md/dm-exception-store.h                    |  28 +-
 drivers/md/dm-integrity.c                          |   8 +-
 drivers/md/md.c                                    | 178 ++---
 drivers/md/md.h                                    |  25 +-
 drivers/md/raid5.c                                 |  19 +-
 drivers/nvdimm/pfn_devs.c                          |   4 +-
 drivers/nvme/host/core.c                           |   6 +-
 drivers/nvme/host/pci.c                            | 263 ++++---
 drivers/nvme/target/core.c                         |   9 +-
 drivers/nvme/target/fc.c                           |   7 +-
 drivers/nvme/target/io-cmd-bdev.c                  |   6 +-
 drivers/nvme/target/tcp.c                          |  24 +-
 drivers/scsi/sd.c                                  |  32 -
 drivers/xen/biomerge.c                             |   5 +-
 fs/ext4/resize.c                                   |   2 -
 fs/ext4/super.c                                    |  32 +-
 fs/gfs2/Kconfig                                    |   1 -
 fs/nfs/Kconfig                                     |   1 -
 fs/ocfs2/super.c                                   |  10 -
 fs/stack.c                                         |  15 +-
 fs/xfs/Kconfig                                     |   1 -
 fs/xfs/xfs_super.c                                 |  10 +-
 include/linux/bio.h                                |   3 +
 include/linux/blk_types.h                          |  29 +-
 include/linux/blkdev.h                             |  34 +
 include/linux/genhd.h                              |   8 +-
 include/linux/kernel.h                             |  14 +-
 include/linux/types.h                              |   5 -
 include/uapi/linux/sed-opal.h                      |   2 +-
 include/xen/xen.h                                  |   4 +-
 lib/Kconfig.debug                                  |   1 -
 .../formal/srcu-cbmc/include/linux/types.h         |   4 -
 88 files changed, 1557 insertions(+), 1304 deletions(-)
Merging device-mapper/for-next (4ed319c6ac08 dm integrity: fix deadlock with overlapping I/O)
$ git merge device-mapper/for-next
Already up to date.
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 (8e3c818111de mmc: mmc_spi: Convert to use SPDX identifier)
$ git merge mmc/next
Removing drivers/mmc/host/mmci_qcom_dml.h
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/mmc/mmc.txt      |   2 +
 .../bindings/mmc/nvidia,tegra20-sdhci.txt          |   1 +
 drivers/mmc/host/Kconfig                           |  43 +--
 drivers/mmc/host/alcor.c                           |   3 +-
 drivers/mmc/host/cqhci.c                           |   2 +
 drivers/mmc/host/cqhci.h                           |   4 +
 drivers/mmc/host/mmc_spi.c                         |  98 +++----
 drivers/mmc/host/mmci.c                            |  69 ++---
 drivers/mmc/host/mmci.h                            |  32 ++-
 drivers/mmc/host/mmci_qcom_dml.c                   |  17 +-
 drivers/mmc/host/mmci_qcom_dml.h                   |  30 --
 drivers/mmc/host/mmci_stm32_sdmmc.c                |  18 ++
 drivers/mmc/host/mtk-sd.c                          |  11 +
 drivers/mmc/host/mxs-mmc.c                         |   3 +-
 drivers/mmc/host/of_mmc_spi.c                      |   6 +-
 drivers/mmc/host/renesas_sdhi.h                    |   2 +-
 drivers/mmc/host/renesas_sdhi_core.c               |  12 +-
 drivers/mmc/host/renesas_sdhi_internal_dmac.c      |  11 +-
 drivers/mmc/host/renesas_sdhi_sys_dmac.c           |   6 +-
 drivers/mmc/host/sdhci-of-arasan.c                 |   5 +-
 drivers/mmc/host/sdhci-of-esdhc.c                  |  47 ++++
 drivers/mmc/host/sdhci-omap.c                      |   2 +-
 drivers/mmc/host/sdhci-tegra.c                     | 304 ++++++++++++++++++++-
 drivers/mmc/host/sdhci.c                           |   5 +-
 drivers/mmc/host/sdhci.h                           |   1 +
 drivers/mmc/host/tmio_mmc.h                        |   6 +-
 drivers/mmc/host/tmio_mmc_core.c                   |   6 +-
 27 files changed, 540 insertions(+), 206 deletions(-)
 delete mode 100644 drivers/mmc/host/mmci_qcom_dml.h
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 196dabc509c4] 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 (7f042743306c mfd: cros_ec: Instantiate the CrOS USB PD logger driver)
$ git merge mfd/for-mfd-next
Auto-merging drivers/mfd/Kconfig
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/arm/stm32/stm32-syscon.txt |  2 +
 .../devicetree/bindings/mfd/atmel-hlcdc.txt        |  1 +
 drivers/mfd/Kconfig                                | 62 +++++++++++-----------
 drivers/mfd/atmel-hlcdc.c                          |  1 +
 drivers/mfd/axp20x-i2c.c                           |  2 +
 drivers/mfd/axp20x.c                               | 11 ++++
 drivers/mfd/cros_ec_dev.c                          | 16 +++++-
 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_soc_pmic_chtwc.c                 |  1 +
 drivers/mfd/rk808.c                                |  9 ----
 drivers/mfd/sec-core.c                             | 59 +++++++-------------
 drivers/mfd/sec-irq.c                              |  3 ++
 drivers/mfd/syscon.c                               | 19 +++++++
 drivers/mfd/twl6040.c                              | 13 ++++-
 include/linux/mfd/cros_ec.h                        |  1 +
 include/linux/mfd/cros_ec_commands.h               |  2 +
 include/linux/mfd/da9063/core.h                    |  7 +--
 include/linux/mfd/da9063/registers.h               |  7 +--
 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 +--
 26 files changed, 139 insertions(+), 152 deletions(-)
Merging backlight/for-backlight-next (a6d6a589cb09 video: lcd: Remove useless BACKLIGHT_CLASS_DEVICE dependencies)
$ git merge backlight/for-backlight-next
Merge made by the 'recursive' strategy.
 drivers/video/backlight/Kconfig | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)
Merging battery/for-next (252fbeb86cef power: supply: max14656: fix potential use-after-free)
$ git merge battery/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/arm/atmel-sysregs.txt      |  5 +++-
 .../bindings/power/reset/syscon-reboot.txt         | 11 +++++++--
 .../bindings/power/supply/gpio-charger.txt         |  2 +-
 drivers/power/reset/at91-sama5d2_shdwc.c           | 25 ++++++++++++++++++++
 drivers/power/reset/syscon-reboot.c                | 19 +++++++++++++--
 drivers/power/supply/axp288_charger.c              |  4 ++++
 drivers/power/supply/charger-manager.c             |  3 +++
 drivers/power/supply/max14656_charger_detector.c   | 27 ++++++++++++++++------
 drivers/power/supply/power_supply_core.c           |  4 ++--
 9 files changed, 85 insertions(+), 15 deletions(-)
Merging regulator/for-next (bc6e8e43e614 Merge branch 'regulator-5.2' into regulator-next)
$ git merge regulator/for-next
Auto-merging sound/soc/codecs/ab8500-codec.c
Merge made by the 'recursive' strategy.
 .../bindings/regulator/gpio-regulator.txt          |  30 ++-
 drivers/mfd/wm831x-core.c                          |   2 +-
 drivers/mfd/wm8400-core.c                          |   6 -
 drivers/regulator/88pm800.c                        |  18 +-
 drivers/regulator/88pm8607.c                       |  43 +--
 drivers/regulator/Kconfig                          |   4 +-
 drivers/regulator/ab3100.c                         |  24 +-
 drivers/regulator/act8865-regulator.c              | 147 ++---------
 drivers/regulator/as3711-regulator.c               |  37 +--
 drivers/regulator/as3722-regulator.c               | 287 ++++++---------------
 drivers/regulator/axp20x-regulator.c               |  23 +-
 drivers/regulator/bcm590xx-regulator.c             | 105 +-------
 drivers/regulator/bd718x7-regulator.c              |   4 +-
 drivers/regulator/core.c                           |   2 -
 drivers/regulator/cpcap-regulator.c                |  15 +-
 drivers/regulator/da9052-regulator.c               |  35 +--
 drivers/regulator/da9055-regulator.c               |  69 +----
 drivers/regulator/da9062-regulator.c               | 127 +++------
 drivers/regulator/da9063-regulator.c               | 134 +++-------
 drivers/regulator/da9211-regulator.c               |   4 +
 drivers/regulator/gpio-regulator.c                 |  22 +-
 drivers/regulator/lm363x-regulator.c               |   8 +-
 drivers/regulator/lp8755.c                         |  15 +-
 drivers/regulator/lp87565-regulator.c              |  49 +---
 drivers/regulator/ltc3589.c                        |  10 +-
 drivers/regulator/ltc3676.c                        |  10 +-
 drivers/regulator/max14577-regulator.c             |  55 ----
 drivers/regulator/max77650-regulator.c             |   2 +-
 drivers/regulator/max8925-regulator.c              |  76 +-----
 drivers/regulator/mt6323-regulator.c               |  20 +-
 drivers/regulator/mt6380-regulator.c               |   8 +-
 drivers/regulator/mt6397-regulator.c               |  16 +-
 drivers/regulator/of_regulator.c                   |   5 +-
 drivers/regulator/palmas-regulator.c               |  12 -
 drivers/regulator/pv88060-regulator.c              |   4 +
 drivers/regulator/pv88080-regulator.c              |   4 +
 drivers/regulator/pv88090-regulator.c              |   4 +
 drivers/regulator/rc5t583-regulator.c              |  25 +-
 drivers/regulator/rn5t618-regulator.c              |   8 +-
 drivers/regulator/s2mpa01.c                        |  39 +--
 drivers/regulator/sc2731-regulator.c               |   2 +-
 drivers/regulator/tps6507x-regulator.c             | 113 ++------
 drivers/regulator/tps65086-regulator.c             |   4 +-
 drivers/regulator/tps65132-regulator.c             |  29 +--
 drivers/regulator/tps65217-regulator.c             |   7 +-
 drivers/regulator/tps65218-regulator.c             |   8 +-
 drivers/regulator/twl-regulator.c                  |   6 +-
 drivers/regulator/vctrl-regulator.c                |   4 +-
 drivers/regulator/wm831x-dcdc.c                    |   4 +
 drivers/regulator/wm831x-isink.c                   |  47 +---
 drivers/regulator/wm831x-ldo.c                     |   2 +
 drivers/regulator/wm8350-regulator.c               |  81 +-----
 drivers/regulator/wm8400-regulator.c               |  19 +-
 include/linux/mfd/palmas.h                         |   1 -
 include/linux/mfd/wm831x/regulator.h               |   2 +-
 include/linux/mfd/wm8400-private.h                 |   8 -
 include/linux/regulator/consumer.h                 |   5 +
 sound/soc/codecs/ab8500-codec.c                    |   4 +-
 58 files changed, 460 insertions(+), 1394 deletions(-)
Merging security/next-testing (4c5d789ce175 Merge branch 'next-general' into next-testing)
$ git merge security/next-testing
Merge made by the 'recursive' strategy.
 include/linux/lsm_hooks.h | 170 ++++++++++++++++++++++------------------------
 1 file changed, 81 insertions(+), 89 deletions(-)
Merging apparmor/apparmor-next (6c07c1c74394 apparmor: fix blob compression when ns is forced on a policy load)
$ git merge apparmor/apparmor-next
Auto-merging security/apparmor/policy_unpack.c
Auto-merging security/apparmor/lsm.c
Auto-merging security/apparmor/apparmorfs.c
Auto-merging security/apparmor/Kconfig
Merge made by the 'recursive' strategy.
 security/apparmor/Kconfig                 |   2 +
 security/apparmor/apparmorfs.c            | 130 ++++++++++++++++++++++++++++--
 security/apparmor/include/apparmor.h      |   1 +
 security/apparmor/include/policy_unpack.h |   8 +-
 security/apparmor/lsm.c                   |  47 +++++++++++
 security/apparmor/policy.c                |   3 +-
 security/apparmor/policy_unpack.c         | 112 ++++++++++++++++++++++++-
 7 files changed, 291 insertions(+), 12 deletions(-)
Merging integrity/next-integrity (95e7c586bcb5 doc/kernel-parameters.txt: Deprecate ima_appraise_tcb)
$ git merge integrity/next-integrity
Removing tools/testing/selftests/ima/test_kexec_load.sh
Removing tools/testing/selftests/ima/config
Auto-merging kernel/module.c
Auto-merging include/linux/module.h
Merge made by the 'recursive' strategy.
 Documentation/admin-guide/kernel-parameters.txt    |   5 +-
 arch/x86/kernel/ima_arch.c                         |  10 +-
 include/linux/module.h                             |   5 +
 kernel/module.c                                    |   5 +
 tools/testing/selftests/Makefile                   |   2 +-
 tools/testing/selftests/ima/config                 |   4 -
 tools/testing/selftests/ima/test_kexec_load.sh     |  54 -----
 tools/testing/selftests/{ima => kexec}/Makefile    |   5 +-
 tools/testing/selftests/kexec/config               |   3 +
 tools/testing/selftests/kexec/kexec_common_lib.sh  | 220 +++++++++++++++++++++
 .../selftests/kexec/test_kexec_file_load.sh        | 208 +++++++++++++++++++
 tools/testing/selftests/kexec/test_kexec_load.sh   |  47 +++++
 12 files changed, 503 insertions(+), 65 deletions(-)
 delete mode 100644 tools/testing/selftests/ima/config
 delete mode 100755 tools/testing/selftests/ima/test_kexec_load.sh
 rename tools/testing/selftests/{ima => kexec}/Makefile (59%)
 create mode 100644 tools/testing/selftests/kexec/config
 create mode 100755 tools/testing/selftests/kexec/kexec_common_lib.sh
 create mode 100755 tools/testing/selftests/kexec/test_kexec_file_load.sh
 create mode 100755 tools/testing/selftests/kexec/test_kexec_load.sh
Merging selinux/next (1537ad15c9c5 kernfs: fix xattr name handling in LSM helpers)
$ git merge selinux/next
Auto-merging include/linux/lsm_hooks.h
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                             |   2 +-
 fs/kernfs/dir.c                         |  24 ++--
 fs/kernfs/inode.c                       | 162 +++++++++--------------
 fs/kernfs/kernfs-internal.h             |   8 +-
 fs/kernfs/symlink.c                     |   4 +-
 include/linux/kernfs.h                  |  13 ++
 include/linux/lsm_hooks.h               |  13 ++
 include/linux/security.h                |   9 ++
 scripts/selinux/genheaders/genheaders.c |   1 -
 scripts/selinux/install_policy.sh       |  92 +++++++------
 scripts/selinux/mdp/Makefile            |   2 +-
 scripts/selinux/mdp/mdp.c               | 166 ++++++++++++++++++++----
 security/security.c                     |   6 +
 security/selinux/hooks.c                | 222 +++++++++++++++++++++-----------
 security/selinux/include/classmap.h     |   1 +
 security/selinux/include/security.h     |   1 +
 security/selinux/netlabel.c             |  14 +-
 security/selinux/ss/services.c          |   7 +-
 18 files changed, 477 insertions(+), 270 deletions(-)
Merging tpmdd/next (5812f97c0a22 tpm: Fix the type of the return value in calc_tpm2_event_size())
$ git merge tpmdd/next
Merge made by the 'recursive' strategy.
 drivers/char/tpm/eventlog/tpm2.c           |  4 +-
 include/keys/trusted.h                     |  2 +-
 security/keys/trusted.c                    |  4 +-
 tools/testing/selftests/tpm2/tpm2.py       |  5 ++-
 tools/testing/selftests/tpm2/tpm2_tests.py | 63 ++++++++++++++++++++++++++++++
 5 files changed, 71 insertions(+), 7 deletions(-)
Merging watchdog/master (458c8961c194 watchdog: w83877f_wdt: Mark expected switch fall-through)
$ git merge watchdog/master
Already up to date.
Merging iommu/next (abc8cad6822d Merge branches 'iommu/fixes', 'x86/vt-d' and 'core' into next)
$ git merge iommu/next
Merge made by the 'recursive' strategy.
 drivers/iommu/intel_irq_remapping.c |  7 +++----
 drivers/iommu/iommu.c               | 11 ++---------
 2 files changed, 5 insertions(+), 13 deletions(-)
Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15)
$ git merge dwmw2-iommu/master
Already up to date.
Merging vfio/next (0cfd027be1d6 vfio_pci: Enable memory accesses before calling pci_map_rom)
$ 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 (699c1868a743 audit: purge unnecessary list_empty calls)
$ git merge audit/next
Auto-merging kernel/seccomp.c
CONFLICT (content): Merge conflict in kernel/seccomp.c
Auto-merging include/asm-generic/syscall.h
Auto-merging arch/xtensa/include/asm/syscall.h
Auto-merging arch/x86/include/asm/syscall.h
Auto-merging arch/sparc/include/asm/syscall.h
Auto-merging arch/sh/include/asm/syscall_64.h
Auto-merging arch/sh/include/asm/syscall_32.h
Auto-merging arch/s390/include/asm/syscall.h
Auto-merging arch/riscv/include/asm/syscall.h
Auto-merging arch/powerpc/include/asm/syscall.h
Auto-merging arch/parisc/include/asm/syscall.h
Auto-merging arch/openrisc/include/asm/syscall.h
Auto-merging arch/nios2/include/asm/syscall.h
Auto-merging arch/nds32/include/asm/syscall.h
Auto-merging arch/mips/kernel/ptrace.c
CONFLICT (content): Merge conflict in arch/mips/kernel/ptrace.c
Auto-merging arch/mips/include/asm/syscall.h
Auto-merging arch/microblaze/include/asm/syscall.h
Auto-merging arch/ia64/include/asm/syscall.h
Auto-merging arch/hexagon/include/asm/syscall.h
Auto-merging arch/h8300/include/asm/syscall.h
Auto-merging arch/csky/include/asm/syscall.h
Auto-merging arch/c6x/include/asm/syscall.h
Auto-merging arch/arm64/include/asm/syscall.h
Auto-merging arch/arm/include/asm/syscall.h
Auto-merging arch/arc/include/asm/syscall.h
Resolved 'arch/mips/kernel/ptrace.c' using previous resolution.
Resolved 'kernel/seccomp.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master acc20349f101] Merge remote-tracking branch 'audit/next'
$ git diff -M --stat --summary HEAD^..
 arch/alpha/include/asm/syscall.h      |  2 +-
 arch/arc/include/asm/elf.h            |  6 +--
 arch/arc/include/asm/syscall.h        | 11 +++++
 arch/arm/include/asm/syscall.h        |  2 +-
 arch/arm64/include/asm/syscall.h      |  4 +-
 arch/c6x/include/asm/syscall.h        |  7 +++
 arch/csky/include/asm/syscall.h       |  2 +-
 arch/h8300/include/asm/syscall.h      |  6 +++
 arch/hexagon/include/asm/elf.h        |  6 +--
 arch/hexagon/include/asm/syscall.h    |  8 ++++
 arch/ia64/include/asm/syscall.h       |  2 +-
 arch/m68k/include/asm/syscall.h       | 12 +++++
 arch/microblaze/include/asm/syscall.h |  2 +-
 arch/mips/include/asm/syscall.h       |  6 +--
 arch/mips/kernel/ptrace.c             |  2 +-
 arch/nds32/include/asm/elf.h          |  3 +-
 arch/nds32/include/asm/syscall.h      |  9 ++++
 arch/nios2/include/asm/syscall.h      |  6 +++
 arch/openrisc/include/asm/syscall.h   |  2 +-
 arch/parisc/include/asm/syscall.h     |  4 +-
 arch/powerpc/include/asm/syscall.h    | 10 +++-
 arch/riscv/include/asm/syscall.h      |  2 +-
 arch/s390/include/asm/syscall.h       |  4 +-
 arch/sh/include/asm/syscall_32.h      |  2 +-
 arch/sh/include/asm/syscall_64.h      |  2 +-
 arch/sparc/include/asm/syscall.h      |  5 +-
 arch/unicore32/include/asm/elf.h      |  3 +-
 arch/unicore32/include/asm/syscall.h  | 12 +++++
 arch/x86/include/asm/syscall.h        |  8 ++--
 arch/x86/um/asm/syscall.h             |  2 +-
 arch/xtensa/include/asm/syscall.h     |  2 +-
 include/asm-generic/syscall.h         |  5 +-
 include/uapi/linux/audit.h            | 12 +++++
 include/uapi/linux/elf-em.h           |  6 +++
 kernel/audit.c                        |  2 +-
 kernel/auditfilter.c                  |  2 -
 kernel/auditsc.c                      | 86 +++++++++++++++++------------------
 kernel/seccomp.c                      |  4 +-
 security/integrity/evm/evm_secfs.c    | 10 ++--
 39 files changed, 184 insertions(+), 97 deletions(-)
 create mode 100644 arch/m68k/include/asm/syscall.h
 create mode 100644 arch/unicore32/include/asm/syscall.h
Merging devicetree/for-next (1d9bb69a454a of: property: Document that of_graph_get_endpoint_by_regs needs of_node_put)
$ git merge devicetree/for-next
Auto-merging drivers/of/property.c
Auto-merging Documentation/devicetree/bindings/arm/cpus.yaml
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/arm/cpus.yaml    |  1 +
 .../bindings/interrupt-controller/arm,gic.yaml     |  1 +
 .../bindings/timer/arm,arch_timer_mmio.yaml        |  1 +
 .../devicetree/bindings/writing-bindings.txt       | 60 ++++++++++++++++++++++
 drivers/of/property.c                              |  2 +-
 5 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/devicetree/bindings/writing-bindings.txt
Merging mailbox/mailbox-for-next (17b860bbfc84 mailbox: imx: keep MU irq working during suspend/resume)
$ git merge mailbox/mailbox-for-next
Already up to date.
Merging spi/for-next (61defc77495a Merge branch 'spi-5.2' into spi-next)
$ git merge spi/for-next
Removing drivers/staging/mt7621-spi/TODO
Removing drivers/staging/mt7621-spi/Makefile
Removing drivers/staging/mt7621-spi/Kconfig
Auto-merging drivers/staging/Makefile
Auto-merging drivers/staging/Kconfig
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/spi/fsl-spi.txt  |   4 +
 .../bindings/spi/nvidia,tegra114-spi.txt           |  20 +
 .../devicetree/bindings/spi/snps,dw-apb-ssi.txt    |  10 +-
 .../devicetree/bindings/spi/spi-fsl-lpspi.txt      |  10 +-
 .../devicetree/bindings/spi/spi-mt7621.txt         |  26 +
 .../devicetree/bindings/spi/spi-zynq-qspi.txt      |  25 +
 Documentation/spi/spi-summary                      |   6 +
 arch/sh/boards/mach-ecovec24/setup.c               |  12 +-
 drivers/spi/Kconfig                                |  16 +-
 drivers/spi/Makefile                               |   2 +
 drivers/spi/atmel-quadspi.c                        |   2 +-
 drivers/spi/spi-at91-usart.c                       |   8 +-
 drivers/spi/spi-bcm2835aux.c                       | 205 ++++--
 drivers/spi/spi-bitbang.c                          |  66 +-
 drivers/spi/spi-dw-mmio.c                          |  12 +
 drivers/spi/spi-fsl-lib.h                          |   2 +
 drivers/spi/spi-fsl-lpspi.c                        | 569 +++++++++++++--
 drivers/spi/spi-fsl-qspi.c                         |   2 +-
 drivers/spi/spi-fsl-spi.c                          |  81 ++-
 drivers/spi/spi-gpio.c                             | 226 +++---
 drivers/spi/spi-imx.c                              |   7 +
 drivers/spi/spi-mem.c                              |   8 +-
 drivers/{staging/mt7621-spi => spi}/spi-mt7621.c   |  83 ++-
 drivers/spi/spi-mxic.c                             |   6 +-
 drivers/spi/spi-orion.c                            |   4 +
 drivers/spi/spi-pxa2xx-dma.c                       |   4 +-
 drivers/spi/spi-pxa2xx-pci.c                       |   5 +-
 drivers/spi/spi-pxa2xx.c                           |  24 +-
 drivers/spi/spi-sh-msiof.c                         | 224 +++---
 drivers/spi/spi-stm32-qspi.c                       | 221 +++++-
 drivers/spi/spi-tegra114.c                         |  97 ++-
 drivers/spi/spi-zynq-qspi.c                        | 761 +++++++++++++++++++++
 drivers/spi/spi.c                                  |  56 +-
 drivers/spi/spidev.c                               |   4 +-
 drivers/staging/Kconfig                            |   2 -
 drivers/staging/Makefile                           |   1 -
 drivers/staging/mt7621-spi/Kconfig                 |   6 -
 drivers/staging/mt7621-spi/Makefile                |   1 -
 drivers/staging/mt7621-spi/TODO                    |   5 -
 include/linux/spi/pxa2xx_spi.h                     |   1 +
 include/linux/spi/spi-mem.h                        |   3 +
 include/linux/spi/spi.h                            |  18 +-
 include/linux/spi/spi_bitbang.h                    |   1 +
 include/uapi/linux/spi/spidev.h                    |   6 +-
 44 files changed, 2299 insertions(+), 553 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/spi/spi-mt7621.txt
 create mode 100644 Documentation/devicetree/bindings/spi/spi-zynq-qspi.txt
 rename drivers/{staging/mt7621-spi => spi}/spi-mt7621.c (88%)
 create mode 100644 drivers/spi/spi-zynq-qspi.c
 delete mode 100644 drivers/staging/mt7621-spi/Kconfig
 delete mode 100644 drivers/staging/mt7621-spi/Makefile
 delete mode 100644 drivers/staging/mt7621-spi/TODO
Merging tip/auto-latest (2ecdfd10d440 Merge branch 'linus')
$ git merge tip/auto-latest
Auto-merging net/xfrm/xfrm_state.c
Auto-merging kernel/time/time.c
Auto-merging include/net/xfrm.h
Auto-merging drivers/net/wireless/mac80211_hwsim.c
Auto-merging MAINTAINERS
Auto-merging Documentation/admin-guide/kernel-parameters.txt
Merge made by the 'recursive' strategy.
 Documentation/admin-guide/kernel-parameters.txt |  4 ++
 MAINTAINERS                                     |  2 +-
 arch/ia64/kernel/setup.c                        |  4 +-
 arch/x86/include/asm/cpufeature.h               |  2 +-
 arch/x86/include/asm/mce.h                      | 25 ++++---
 arch/x86/include/asm/tlbflush.h                 |  2 +-
 arch/x86/kernel/cpu/hygon.c                     |  5 ++
 arch/x86/kernel/cpu/mce/core.c                  | 86 +++++++++++++------------
 arch/x86/kernel/cpu/mce/inject.c                | 14 ++--
 arch/x86/kernel/setup.c                         |  6 +-
 arch/x86/kernel/tsc.c                           |  5 +-
 arch/x86/platform/uv/tlb_uv.c                   |  7 +-
 drivers/firmware/dmi_scan.c                     | 28 ++++----
 drivers/firmware/efi/arm-runtime.c              |  6 +-
 drivers/firmware/efi/libstub/Makefile           | 14 ++--
 drivers/net/wireless/mac80211_hwsim.c           | 46 ++++++-------
 drivers/video/fbdev/efifb.c                     |  3 +-
 include/linux/dmi.h                             |  8 +--
 include/linux/interrupt.h                       | 25 -------
 include/linux/tick.h                            |  6 ++
 include/linux/time64.h                          | 21 ++++++
 include/net/xfrm.h                              |  2 +-
 include/trace/events/timer.h                    | 17 +++--
 kernel/cpu.c                                    |  2 +
 kernel/irq/manage.c                             |  4 +-
 kernel/softirq.c                                | 51 ---------------
 kernel/time/clockevents.c                       | 18 +++++-
 kernel/time/jiffies.c                           |  2 +-
 kernel/time/sched_clock.c                       |  4 +-
 kernel/time/tick-broadcast.c                    | 44 +++++++------
 kernel/time/tick-common.c                       |  2 +-
 kernel/time/tick-internal.h                     | 10 +--
 kernel/time/tick-sched.c                        |  3 +-
 kernel/time/tick-sched.h                        | 13 +++-
 kernel/time/time.c                              |  2 +-
 kernel/time/timekeeping.c                       | 24 +++----
 kernel/time/timer.c                             | 30 +++++----
 net/xfrm/xfrm_state.c                           | 30 +++++----
 38 files changed, 291 insertions(+), 286 deletions(-)
Merging clockevents/clockevents/next (dbfc6db7ba46 soc/tegra: default select TEGRA_TIMER for Tegra210)
$ git merge clockevents/clockevents/next
Auto-merging include/linux/cpuhotplug.h
Auto-merging drivers/clocksource/timer-riscv.c
Auto-merging drivers/clocksource/arm_arch_timer.c
Auto-merging drivers/clocksource/Makefile
Auto-merging drivers/clocksource/Kconfig
Auto-merging Documentation/arm64/silicon-errata.txt
Merge made by the 'recursive' strategy.
Merging edac-amd/for-next (fad9fab975cb EDAC/altera, firmware/intel: Add Stratix10 ECC DBE SMC call)
$ git merge edac-amd/for-next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                                  |   8 +-
 drivers/edac/altera_edac.c                   | 262 ++++++++++++++++-----------
 drivers/edac/altera_edac.h                   |  69 +------
 drivers/edac/amd64_edac.c                    | 248 +++++++++++++++----------
 drivers/edac/amd64_edac.h                    |  16 +-
 drivers/edac/i10nm_base.c                    |  52 +++++-
 drivers/edac/skx_base.c                      |  50 ++++-
 drivers/edac/skx_common.c                    |  57 +-----
 drivers/edac/skx_common.h                    |   8 -
 include/linux/firmware/intel/stratix10-smc.h |  19 ++
 10 files changed, 461 insertions(+), 328 deletions(-)
Merging irqchip/irq/irqchip-next (fca269f201a8 irqchip/mbigen: Don't clear eventid when freeing an MSI)
$ git merge irqchip/irq/irqchip-next
Already up to date.
Merging ftrace/for-next (4f5fbd78a7b4 rcu: validate arguments for rcu tracepoints)
$ git merge ftrace/for-next
Removing tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-extended-error-support.tc
Merge made by the 'recursive' strategy.
 Documentation/trace/ftrace.rst                     |  31 ++
 Documentation/trace/histogram.rst                  |  16 +-
 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/ring_buffer.c                         |   2 +-
 kernel/trace/trace.c                               | 312 +++++++++++++++++++--
 kernel/trace/trace.h                               |  10 +-
 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_kprobe.c                        |  77 +++--
 kernel/trace/trace_probe.c                         | 274 ++++++++++++------
 kernel/trace/trace_probe.h                         |  77 ++++-
 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 --
 24 files changed, 1067 insertions(+), 393 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 (41e1c2c6379f Merge LKMM and RCU branches)
$ git merge rcu/rcu/next
Auto-merging kernel/rcu/tree.c
Auto-merging kernel/rcu/rcu.h
Auto-merging drivers/nvme/host/core.c
Auto-merging MAINTAINERS
Auto-merging Documentation/admin-guide/kernel-parameters.txt
Merge made by the 'recursive' strategy.
 .../Design/Data-Structures/Data-Structures.html    |   3 +-
 .../Expedited-Grace-Periods.html                   |   4 +-
 .../Memory-Ordering/Tree-RCU-Memory-Ordering.html  |   5 +-
 Documentation/RCU/NMI-RCU.txt                      |  13 +-
 Documentation/RCU/UP.txt                           |   6 +-
 Documentation/RCU/checklist.txt                    |  91 ++-
 Documentation/RCU/rcu.txt                          |   8 +-
 Documentation/RCU/rcu_dereference.txt              | 103 +++
 Documentation/RCU/rcubarrier.txt                   |  27 +-
 Documentation/RCU/whatisRCU.txt                    |  10 +-
 Documentation/admin-guide/kernel-parameters.txt    |   4 +-
 Documentation/atomic_t.txt                         |  17 +
 Documentation/kprobes.txt                          |   6 +-
 Documentation/memory-barriers.txt                  | 115 ++--
 .../translations/ko_KR/memory-barriers.txt         |  49 +-
 MAINTAINERS                                        |  16 +-
 drivers/nvme/host/core.c                           |   2 +-
 include/linux/rcupdate.h                           |   6 +-
 include/linux/srcu.h                               |  36 +-
 kernel/locking/locktorture.c                       |   2 +
 kernel/rcu/rcu.h                                   |   1 +
 kernel/rcu/rcuperf.c                               |   5 +
 kernel/rcu/rcutorture.c                            |  21 +-
 kernel/rcu/srcutiny.c                              |   9 +-
 kernel/rcu/srcutree.c                              |  32 +-
 kernel/rcu/tiny.c                                  |   2 +-
 kernel/rcu/tree.c                                  | 508 +--------------
 kernel/rcu/tree.h                                  |  14 +-
 kernel/rcu/tree_exp.h                              |  36 +-
 kernel/rcu/tree_plugin.h                           | 257 +-------
 kernel/rcu/tree_stall.h                            | 709 +++++++++++++++++++++
 kernel/rcu/update.c                                |  59 +-
 kernel/torture.c                                   |   2 +
 net/ipv4/netfilter/ipt_CLUSTERIP.c                 |   2 +-
 tools/memory-model/Documentation/explanation.txt   | 289 +++++----
 tools/memory-model/README                          |  33 +-
 tools/memory-model/linux-kernel.bell               |  35 +-
 tools/memory-model/linux-kernel.cat                |  39 +-
 tools/memory-model/linux-kernel.def                |   6 +
 tools/memory-model/litmus-tests/.gitignore         |   2 +-
 .../litmus-tests/MP+poonceonces.litmus             |   2 +-
 tools/memory-model/litmus-tests/README             |   2 +-
 tools/memory-model/lock.cat                        |   5 +-
 tools/memory-model/scripts/README                  |  10 +-
 tools/memory-model/scripts/checkalllitmus.sh       |  29 +-
 tools/memory-model/scripts/checkghlitmus.sh        |   0
 tools/memory-model/scripts/checklitmus.sh          |  23 +-
 tools/memory-model/scripts/checklitmushist.sh      |   0
 tools/memory-model/scripts/cmplitmushist.sh        |  49 +-
 tools/memory-model/scripts/initlitmushist.sh       |   0
 tools/memory-model/scripts/judgelitmus.sh          |  90 ++-
 tools/memory-model/scripts/newlitmushist.sh        |   0
 tools/memory-model/scripts/parseargs.sh            |  11 +-
 tools/memory-model/scripts/runlitmus.sh            |  79 +++
 tools/memory-model/scripts/runlitmushist.sh        |   2 +-
 tools/memory-model/scripts/simpletest.sh           |  35 +
 .../selftests/rcutorture/bin/configNR_CPUS.sh      |  17 +-
 .../selftests/rcutorture/bin/config_override.sh    |  17 +-
 .../selftests/rcutorture/bin/configcheck.sh        |  19 +-
 .../testing/selftests/rcutorture/bin/configinit.sh |  17 +-
 tools/testing/selftests/rcutorture/bin/cpus2use.sh |  17 +-
 .../testing/selftests/rcutorture/bin/functions.sh  |  17 +-
 tools/testing/selftests/rcutorture/bin/jitter.sh   |  17 +-
 .../testing/selftests/rcutorture/bin/kvm-build.sh  |  17 +-
 .../selftests/rcutorture/bin/kvm-find-errors.sh    |   5 +
 .../selftests/rcutorture/bin/kvm-recheck-lock.sh   |  17 +-
 .../selftests/rcutorture/bin/kvm-recheck-rcu.sh    |  17 +-
 .../rcutorture/bin/kvm-recheck-rcuperf-ftrace.sh   |  17 +-
 .../rcutorture/bin/kvm-recheck-rcuperf.sh          |  17 +-
 .../selftests/rcutorture/bin/kvm-recheck.sh        |  17 +-
 .../selftests/rcutorture/bin/kvm-test-1-run.sh     |  17 +-
 tools/testing/selftests/rcutorture/bin/kvm.sh      |  17 +-
 tools/testing/selftests/rcutorture/bin/mkinitrd.sh |  15 +-
 .../selftests/rcutorture/bin/parse-build.sh        |  17 +-
 .../selftests/rcutorture/bin/parse-console.sh      |  17 +-
 .../rcutorture/configs/lock/ver_functions.sh       |  17 +-
 .../rcutorture/configs/rcu/ver_functions.sh        |  17 +-
 .../rcutorture/configs/rcuperf/ver_functions.sh    |  17 +-
 78 files changed, 1714 insertions(+), 1569 deletions(-)
 create mode 100644 kernel/rcu/tree_stall.h
 mode change 100644 => 100755 tools/memory-model/scripts/checkghlitmus.sh
 mode change 100644 => 100755 tools/memory-model/scripts/checklitmushist.sh
 mode change 100644 => 100755 tools/memory-model/scripts/cmplitmushist.sh
 mode change 100644 => 100755 tools/memory-model/scripts/initlitmushist.sh
 mode change 100644 => 100755 tools/memory-model/scripts/judgelitmus.sh
 mode change 100644 => 100755 tools/memory-model/scripts/newlitmushist.sh
 mode change 100644 => 100755 tools/memory-model/scripts/parseargs.sh
 create mode 100755 tools/memory-model/scripts/runlitmus.sh
 mode change 100644 => 100755 tools/memory-model/scripts/runlitmushist.sh
 create mode 100755 tools/memory-model/scripts/simpletest.sh
Merging kvm/linux-next (c73f4c998e1f KVM: x86: nVMX: fix x2APIC VTPR read intercept)
$ git merge kvm/linux-next
Already up to date.
Merging kvm-arm/next (5d8d4af24460 arm64: KVM: Fix system register enumeration)
$ git merge kvm-arm/next
Auto-merging arch/arm64/kvm/reset.c
Auto-merging Documentation/virtual/kvm/api.txt
Merge made by the 'recursive' strategy.
 Documentation/virtual/kvm/api.txt | 156 +++++++++++++++
 arch/arm/include/asm/kvm_host.h   |   6 +
 arch/arm64/include/asm/fpsimd.h   |  33 +++-
 arch/arm64/include/asm/kvm_host.h |  43 +++-
 arch/arm64/include/asm/kvm_hyp.h  |   1 -
 arch/arm64/include/asm/sysreg.h   |   3 +
 arch/arm64/include/uapi/asm/kvm.h |  22 +++
 arch/arm64/kernel/cpufeature.c    |   2 +-
 arch/arm64/kernel/fpsimd.c        | 172 +++++++++++-----
 arch/arm64/kernel/signal.c        |   5 -
 arch/arm64/kvm/fpsimd.c           |  17 +-
 arch/arm64/kvm/guest.c            | 398 +++++++++++++++++++++++++++++++++++---
 arch/arm64/kvm/hyp/switch.c       |  74 +++++--
 arch/arm64/kvm/reset.c            | 135 ++++++++++++-
 arch/arm64/kvm/sys_regs.c         | 130 +++++++++++--
 arch/arm64/kvm/sys_regs.h         |  25 +++
 include/uapi/linux/kvm.h          |   5 +
 virt/kvm/arm/arm.c                |  22 +++
 18 files changed, 1117 insertions(+), 132 deletions(-)
Merging kvm-ppc/kvm-ppc-next (2b57ecd0208f KVM: PPC: Book3S: Add count cache flush parameters to kvmppc_get_cpu_char())
$ git merge kvm-ppc/kvm-ppc-next
Already up to date.
Merging kvms390/next (11ba5961a215 KVM: s390: add debug logging for cpu model subfunctions)
$ git merge kvms390/next
Already up to date.
Merging xen-tip/linux-next (42d8644bd77d xen: Prevent buffer overflow in privcmd ioctl)
$ git merge xen-tip/linux-next
Already up to date.
Merging percpu/for-next (cb453ce4846b Merge branch 'for-5.2' into for-next)
$ git merge percpu/for-next
Merge made by the 'recursive' strategy.
 include/linux/percpu.h |  12 +-
 mm/percpu-internal.h   |  15 +-
 mm/percpu-km.c         |   2 +-
 mm/percpu-stats.c      |   5 +-
 mm/percpu.c            | 551 ++++++++++++++++++++++++++++++++++---------------
 5 files changed, 404 insertions(+), 181 deletions(-)
Merging workqueues/for-next (24acfb718225 workqueue: Use normal rcu)
$ git merge workqueues/for-next
Auto-merging kernel/workqueue.c
Merge made by the 'recursive' strategy.
 kernel/workqueue.c | 95 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 53 insertions(+), 42 deletions(-)
Merging drivers-x86/for-next (9ae11e237d95 platform/x86: intel_pmc_core: Mark local function static)
$ git merge drivers-x86/for-next
Merge made by the 'recursive' strategy.
 drivers/platform/x86/dell-rbtn.c       |   2 +
 drivers/platform/x86/intel_pmc_core.c  |   2 +-
 drivers/platform/x86/intel_pmc_ipc.c   |   6 +-
 drivers/platform/x86/thinkpad_acpi.c   | 134 +++++++++++++++++++++++++++++----
 drivers/platform/x86/touchscreen_dmi.c |  25 ++++++
 5 files changed, 152 insertions(+), 17 deletions(-)
Merging chrome-platform/for-next (399eeb610d63 platform/chrome: cros_ec_proto: check for NULL transfer function)
$ git merge chrome-platform/for-next
Merge made by the 'recursive' strategy.
 drivers/platform/chrome/Kconfig             |  12 ++
 drivers/platform/chrome/Makefile            |   1 +
 drivers/platform/chrome/cros_ec_debugfs.c   |   9 +-
 drivers/platform/chrome/cros_ec_proto.c     |  26 +++
 drivers/platform/chrome/cros_ec_spi.c       |  79 ++++++++-
 drivers/platform/chrome/cros_usbpd_logger.c | 262 ++++++++++++++++++++++++++++
 drivers/platform/chrome/wilco_ec/debugfs.c  |  43 +++--
 drivers/platform/chrome/wilco_ec/mailbox.c  |  53 +++---
 drivers/rtc/rtc-wilco-ec.c                  |  63 ++++---
 include/linux/platform_data/wilco-ec.h      |  22 +--
 10 files changed, 462 insertions(+), 108 deletions(-)
 create mode 100644 drivers/platform/chrome/cros_usbpd_logger.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 (174c9526ac89 Merge tag 'lm3532-driver-improvements' into for-next)
$ git merge leds/for-next
Merge made by the 'recursive' strategy.
 Documentation/acpi/dsd/leds.txt                    |  99 +++
 .../devicetree/bindings/leds/leds-lm3532.txt       | 101 +++
 Documentation/devicetree/bindings/mfd/ti-lmu.txt   |  20 -
 arch/arm/boot/dts/omap4-droid4-xt894.dts           |  27 +-
 drivers/leds/Kconfig                               |  33 +-
 drivers/leds/Makefile                              |   1 +
 drivers/leds/leds-as3645a.c                        |  93 +--
 drivers/leds/leds-blinkm.c                         |   1 -
 drivers/leds/leds-lm3532.c                         | 683 +++++++++++++++++++++
 drivers/leds/leds-lt3593.c                         |  64 +-
 drivers/leds/leds-pca955x.c                        |  57 +-
 drivers/leds/leds-pca963x.c                        |  66 +-
 drivers/mfd/ti-lmu.c                               |  11 -
 include/linux/mfd/ti-lmu-register.h                |  44 --
 include/linux/mfd/ti-lmu.h                         |   1 -
 15 files changed, 1013 insertions(+), 288 deletions(-)
 create mode 100644 Documentation/acpi/dsd/leds.txt
 create mode 100644 Documentation/devicetree/bindings/leds/leds-lm3532.txt
 create mode 100644 drivers/leds/leds-lm3532.c
Merging ipmi/for-next (c16fec806b4b ipmi: fix sleep-in-atomic in free_user at cleanup SRCU user->release_barrier)
$ git merge ipmi/for-next
Merge made by the 'recursive' strategy.
 drivers/char/ipmi/ipmi_msghandler.c | 21 ++++++++++++++++++---
 drivers/char/ipmi/ipmi_si_intf.c    |  2 --
 2 files changed, 18 insertions(+), 5 deletions(-)
Merging driver-core/driver-core-next (5de363b66a37 drivers: base: power: add proper SPDX identifiers on files that did not have them.)
$ git merge driver-core/driver-core-next
Auto-merging include/linux/acpi.h
Auto-merging drivers/base/power/wakeup.c
Auto-merging drivers/acpi/tables.c
Auto-merging drivers/acpi/scan.c
Merge made by the 'recursive' strategy.
 Documentation/ABI/stable/sysfs-devices-node     |  87 +++-
 Documentation/admin-guide/mm/numaperf.rst       | 169 ++++++
 arch/arm64/kernel/acpi_numa.c                   |   2 +-
 arch/arm64/kernel/smp.c                         |   4 +-
 arch/ia64/kernel/acpi.c                         |  14 +-
 arch/x86/kernel/acpi/boot.c                     |  36 +-
 drivers/acpi/Kconfig                            |   1 +
 drivers/acpi/Makefile                           |   1 +
 drivers/acpi/hmat/Kconfig                       |  11 +
 drivers/acpi/hmat/Makefile                      |   1 +
 drivers/acpi/hmat/hmat.c                        | 666 ++++++++++++++++++++++++
 drivers/acpi/numa.c                             |  16 +-
 drivers/acpi/scan.c                             |   4 +-
 drivers/acpi/tables.c                           |  76 ++-
 drivers/base/Kconfig                            |   9 +-
 drivers/base/arch_topology.c                    |  36 +-
 drivers/base/firmware_loader/Kconfig            |   1 +
 drivers/base/firmware_loader/builtin/.gitignore |   1 +
 drivers/base/node.c                             | 352 ++++++++++++-
 drivers/base/power/clock_ops.c                  |   3 +-
 drivers/base/power/common.c                     |   4 +-
 drivers/base/power/domain.c                     |   4 +-
 drivers/base/power/domain_governor.c            |   4 +-
 drivers/base/power/generic_ops.c                |   4 +-
 drivers/base/power/main.c                       |   4 +-
 drivers/base/power/qos.c                        |   6 +-
 drivers/base/power/runtime.c                    |   4 +-
 drivers/base/power/sysfs.c                      |   6 +-
 drivers/base/power/trace.c                      |   2 +-
 drivers/base/power/wakeirq.c                    |  15 +-
 drivers/base/power/wakeup.c                     |   4 +-
 drivers/base/test/Makefile                      |   1 +
 drivers/irqchip/irq-gic-v2m.c                   |   2 +-
 drivers/irqchip/irq-gic-v3-its-pci-msi.c        |   2 +-
 drivers/irqchip/irq-gic-v3-its-platform-msi.c   |   2 +-
 drivers/irqchip/irq-gic-v3-its.c                |   6 +-
 drivers/irqchip/irq-gic-v3.c                    |  10 +-
 drivers/irqchip/irq-gic.c                       |   4 +-
 drivers/mailbox/pcc.c                           |   2 +-
 include/linux/acpi.h                            |   6 +-
 include/linux/device.h                          |  16 +-
 include/linux/node.h                            |  71 +++
 lib/kobject_uevent.c                            |  11 +-
 43 files changed, 1521 insertions(+), 159 deletions(-)
 create mode 100644 Documentation/admin-guide/mm/numaperf.rst
 create mode 100644 drivers/acpi/hmat/Kconfig
 create mode 100644 drivers/acpi/hmat/Makefile
 create mode 100644 drivers/acpi/hmat/hmat.c
Merging usb/usb-next (8cdfd068c1ea Merge 5.1-rc3 into usb-next)
$ git merge usb/usb-next
Merge made by the 'recursive' strategy.
 drivers/usb/common/common.c              |  16 +
 drivers/usb/core/hcd.c                   |  20 +-
 drivers/usb/gadget/udc/aspeed-vhub/epn.c |   6 +-
 drivers/usb/gadget/udc/dummy_hcd.c       |  16 +-
 drivers/usb/host/u132-hcd.c              |   2 +
 drivers/usb/mtu3/Makefile                |  11 +
 drivers/usb/mtu3/mtu3.h                  |  57 ++--
 drivers/usb/mtu3/mtu3_core.c             |  27 +-
 drivers/usb/mtu3/mtu3_debug.h            |  50 +++
 drivers/usb/mtu3/mtu3_debugfs.c          | 539 +++++++++++++++++++++++++++++++
 drivers/usb/mtu3/mtu3_dr.c               | 156 ++-------
 drivers/usb/mtu3/mtu3_dr.h               |   4 +
 drivers/usb/mtu3/mtu3_gadget.c           |  20 +-
 drivers/usb/mtu3/mtu3_gadget_ep0.c       |   4 +
 drivers/usb/mtu3/mtu3_hw_regs.h          |  48 ++-
 drivers/usb/mtu3/mtu3_plat.c             |  28 +-
 drivers/usb/mtu3/mtu3_qmu.c              | 118 ++++---
 drivers/usb/mtu3/mtu3_qmu.h              |   1 +
 drivers/usb/mtu3/mtu3_trace.c            |  23 ++
 drivers/usb/mtu3/mtu3_trace.h            | 279 ++++++++++++++++
 drivers/usb/storage/sierra_ms.c          |   4 +-
 drivers/usb/typec/altmodes/displayport.c |   2 +-
 drivers/usb/typec/mux/pi3usb30532.c      |   3 +-
 drivers/usb/typec/tcpm/fusb302.c         | 447 +++++++++++--------------
 drivers/usb/typec/tcpm/wcove.c           |  29 +-
 drivers/usb/usbip/vhci_hcd.c             |   8 +-
 include/linux/usb.h                      |   2 +-
 include/linux/usb/ch9.h                  |   8 +
 28 files changed, 1392 insertions(+), 536 deletions(-)
 create mode 100644 drivers/usb/mtu3/mtu3_debug.h
 create mode 100644 drivers/usb/mtu3/mtu3_debugfs.c
 create mode 100644 drivers/usb/mtu3/mtu3_trace.c
 create mode 100644 drivers/usb/mtu3/mtu3_trace.h
Merging usb-gadget/next (5895d311d28f usb: phy: twl6030-usb: fix possible use-after-free on remove)
$ git merge usb-gadget/next
Already up to date.
Merging usb-serial/usb-next (f64c3ab23068 USB: serial: pl2303: fix tranceiver suspend mode)
$ git merge usb-serial/usb-next
Merge made by the 'recursive' strategy.
 drivers/usb/serial/pl2303.c | 58 ++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 49 insertions(+), 9 deletions(-)
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 (46c12f846a2a dt-bindings: phy: Add a new property drive-impedance-ohm for RK's emmc PHY)
$ git merge phy-next/next
Auto-merging drivers/phy/qualcomm/phy-qcom-ufs.c
Auto-merging MAINTAINERS
Auto-merging Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt
Merge made by the 'recursive' strategy.
 .../bindings/phy/brcm,stingray-usb-phy.txt         |  32 +
 .../bindings/phy/meson-g12a-usb2-phy.txt           |  22 +
 .../bindings/phy/meson-g12a-usb3-pcie-phy.txt      |  22 +
 .../bindings/phy/nvidia,tegra124-xusb-padctl.txt   |   9 +
 .../devicetree/bindings/phy/qcom-qmp-phy.txt       |   6 +-
 .../devicetree/bindings/phy/rockchip-emmc-phy.txt  |   8 +-
 Documentation/devicetree/bindings/ufs/ufs-qcom.txt |   5 +-
 .../devicetree/bindings/ufs/ufshcd-pltfrm.txt      |   3 +
 MAINTAINERS                                        |   5 +
 drivers/phy/amlogic/Kconfig                        |  22 +
 drivers/phy/amlogic/Makefile                       |   2 +
 drivers/phy/amlogic/phy-meson-g12a-usb2.c          | 341 ++++++++
 drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c     | 413 ++++++++++
 drivers/phy/broadcom/Kconfig                       |  11 +
 drivers/phy/broadcom/Makefile                      |   1 +
 drivers/phy/broadcom/phy-bcm-sr-usb.c              | 394 +++++++++
 drivers/phy/qualcomm/phy-qcom-qmp.c                | 112 ++-
 drivers/phy/qualcomm/phy-qcom-ufs-i.h              |   5 +-
 drivers/phy/qualcomm/phy-qcom-ufs-qmp-14nm.c       |  25 +-
 drivers/phy/qualcomm/phy-qcom-ufs-qmp-20nm.c       |  25 +-
 drivers/phy/qualcomm/phy-qcom-ufs.c                |  57 +-
 drivers/phy/rockchip/phy-rockchip-emmc.c           |  30 +-
 drivers/phy/tegra/Makefile                         |   1 +
 drivers/phy/tegra/xusb-tegra186.c                  | 899 +++++++++++++++++++++
 drivers/phy/tegra/xusb.c                           |  67 +-
 drivers/phy/tegra/xusb.h                           |  35 +
 drivers/scsi/ufs/Kconfig                           |   1 +
 drivers/scsi/ufs/ufs-qcom.c                        | 114 ++-
 drivers/scsi/ufs/ufs-qcom.h                        |   4 +
 29 files changed, 2495 insertions(+), 176 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/phy/brcm,stingray-usb-phy.txt
 create mode 100644 Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.txt
 create mode 100644 Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.txt
 create mode 100644 drivers/phy/amlogic/phy-meson-g12a-usb2.c
 create mode 100644 drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c
 create mode 100644 drivers/phy/broadcom/phy-bcm-sr-usb.c
 create mode 100644 drivers/phy/tegra/xusb-tegra186.c
Merging tty/tty-next (f16aa97d3f57 tty: fix up a few remaining files without SPDX identifiers)
$ git merge tty/tty-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/serial/nxp,sc16is7xx.txt   |   2 +
 .../devicetree/bindings/serial/sprd-uart.txt       |  17 +-
 drivers/char/virtio_console.c                      |   3 +-
 drivers/tty/Kconfig                                |   1 +
 drivers/tty/hvc/Kconfig                            |   1 +
 drivers/tty/ipwireless/Makefile                    |   1 +
 drivers/tty/ipwireless/main.c                      |   8 +
 drivers/tty/serdev/Kconfig                         |   1 +
 drivers/tty/serdev/Makefile                        |   1 +
 drivers/tty/serial/8250/8250_fintek.c              |   5 +-
 drivers/tty/serial/8250/8250_men_mcb.c             |   1 +
 drivers/tty/serial/8250/Kconfig                    |   1 +
 drivers/tty/serial/Kconfig                         |   1 +
 drivers/tty/serial/cpm_uart/Makefile               |   1 +
 drivers/tty/serial/jsm/Makefile                    |   1 +
 drivers/tty/serial/sc16is7xx.c                     |  34 +-
 drivers/tty/serial/sn_console.c                    |   1 +
 drivers/tty/serial/sprd_serial.c                   | 501 ++++++++++++++++++++-
 drivers/tty/sysrq.c                                |   6 +-
 drivers/tty/tty_jobctrl.c                          |   4 +-
 drivers/tty/vcc.c                                  |   1 +
 drivers/tty/vt/.gitignore                          |   1 +
 drivers/tty/vt/cp437.uni                           |   1 +
 drivers/tty/vt/defkeymap.c_shipped                 |   1 +
 drivers/tty/vt/defkeymap.map                       |   1 +
 drivers/tty/vt/keyboard.c                          |  33 +-
 drivers/tty/vt/vc_screen.c                         |   2 +-
 drivers/tty/vt/vt.c                                |   2 -
 28 files changed, 579 insertions(+), 54 deletions(-)
Merging char-misc/char-misc-next (d358b1733fc3 chardev: update comment based on the code)
$ git merge char-misc/char-misc-next
Auto-merging drivers/misc/fastrpc.c
CONFLICT (content): Merge conflict in drivers/misc/fastrpc.c
Resolved 'drivers/misc/fastrpc.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master a97c6f295b90] Merge remote-tracking branch 'char-misc/char-misc-next'
$ git diff -M --stat --summary HEAD^..
 drivers/char/hpet.c               |   2 +
 drivers/firmware/google/vpd.c     |   4 +-
 drivers/misc/cardreader/rts5260.c |   4 +-
 drivers/misc/fastrpc.c            | 235 ++++++++++++++++++++++++++++++--------
 drivers/misc/mei/Kconfig          |   2 +
 drivers/misc/mei/Makefile         |   2 +-
 drivers/misc/mei/bus-fixup.c      |  14 +--
 drivers/misc/mei/bus.c            |  13 +--
 drivers/misc/mei/client.c         |  14 +--
 drivers/misc/mei/client.h         |  14 +--
 drivers/misc/mei/debugfs.c        |  15 +--
 drivers/misc/mei/dma-ring.c       |   2 +-
 drivers/misc/mei/hbm.c            |  15 +--
 drivers/misc/mei/hbm.h            |  14 +--
 drivers/misc/mei/hdcp/Makefile    |   2 +-
 drivers/misc/mei/hdcp/mei_hdcp.c  |   2 +-
 drivers/misc/mei/hdcp/mei_hdcp.h  |   2 +-
 drivers/misc/mei/hw-me-regs.h     |  68 +----------
 drivers/misc/mei/hw-me.c          |  14 +--
 drivers/misc/mei/hw-me.h          |  16 +--
 drivers/misc/mei/hw-txe-regs.h    |  63 +---------
 drivers/misc/mei/hw-txe.c         |  14 +--
 drivers/misc/mei/hw-txe.h         |  14 +--
 drivers/misc/mei/hw.h             |  14 +--
 drivers/misc/mei/init.c           |  14 +--
 drivers/misc/mei/interrupt.c      |  15 +--
 drivers/misc/mei/main.c           |  15 +--
 drivers/misc/mei/mei-trace.c      |  14 +--
 drivers/misc/mei/mei-trace.h      |  14 +--
 drivers/misc/mei/mei_dev.h        |  14 +--
 drivers/misc/mei/pci-me.c         |  15 +--
 drivers/misc/mei/pci-txe.c        |  14 +--
 drivers/misc/sgi-xp/xpc_uv.c      |   1 +
 drivers/nfc/mei_phy.c             |  18 +--
 drivers/nfc/microread/mei.c       |  17 +--
 drivers/nfc/pn544/mei.c           |  15 +--
 drivers/parport/parport_cs.c      |   5 +-
 drivers/uio/uio_fsl_elbc_gpcm.c   |   4 +-
 drivers/w1/masters/ds2482.c       |  18 +--
 fs/char_dev.c                     |  78 ++++++-------
 include/linux/mei_cl_bus.h        |   3 +
 include/linux/vmw_vmci_defs.h     |  35 +++---
 include/uapi/linux/mei.h          |  67 +----------
 43 files changed, 337 insertions(+), 598 deletions(-)
Merging extcon/extcon-next (492929c54791 extcon: mrfld: Introduce extcon driver for Basin Cove PMIC)
$ git merge extcon/extcon-next
Merge made by the 'recursive' strategy.
 drivers/extcon/Kconfig               |   9 +-
 drivers/extcon/Makefile              |   1 +
 drivers/extcon/devres.c              |   2 +-
 drivers/extcon/extcon-intel-cht-wc.c |  81 ++++++++--
 drivers/extcon/extcon-intel-mrfld.c  | 284 +++++++++++++++++++++++++++++++++++
 drivers/extcon/extcon-intel.h        |  20 +++
 6 files changed, 379 insertions(+), 18 deletions(-)
 create mode 100644 drivers/extcon/extcon-intel-mrfld.c
 create mode 100644 drivers/extcon/extcon-intel.h
Merging soundwire/next (bfeffd155283 Linux 5.0-rc1)
$ git merge soundwire/next
Already up to date.
Merging thunderbolt/next (fd21b79e541e thunderbolt: Fix to check the return value of kmemdup)
$ git merge thunderbolt/next
Merge made by the 'recursive' strategy.
 drivers/thunderbolt/icm.c      |  5 +++++
 drivers/thunderbolt/property.c | 16 +++++++++++++++-
 drivers/thunderbolt/switch.c   | 22 ++++++++++++++++------
 drivers/thunderbolt/xdomain.c  | 23 ++++++++++++++++-------
 4 files changed, 52 insertions(+), 14 deletions(-)
Merging staging/staging-next (932f98922f6f Merge tag 'iio-for-5.2a-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next)
$ git merge staging/staging-next
Auto-merging drivers/staging/rtl8723bs/os_dep/os_intfs.c
Removing drivers/staging/rtl8192e/license
CONFLICT (modify/delete): drivers/staging/mt7621-spi/Makefile deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/mt7621-spi/Makefile left in tree.
CONFLICT (modify/delete): drivers/staging/mt7621-spi/Kconfig deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/mt7621-spi/Kconfig left in tree.
Removing drivers/staging/mt7621-mmc/sd.c
Removing drivers/staging/mt7621-mmc/mt6575_sd.h
Removing drivers/staging/mt7621-mmc/dbg.h
Removing drivers/staging/mt7621-mmc/dbg.c
Removing drivers/staging/mt7621-mmc/board.h
Removing drivers/staging/mt7621-mmc/TODO
Removing drivers/staging/mt7621-mmc/Makefile
Removing drivers/staging/mt7621-mmc/Kconfig
Auto-merging drivers/staging/media/zoran/zoran_driver.c
Auto-merging drivers/staging/media/zoran/videocodec.c
CONFLICT (modify/delete): drivers/staging/media/mt9t031/Makefile deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/mt9t031/Makefile left in tree.
CONFLICT (modify/delete): drivers/staging/media/mt9t031/Kconfig deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/mt9t031/Kconfig left in tree.
Auto-merging drivers/staging/media/ipu3/ipu3.c
Auto-merging drivers/staging/media/ipu3/Kconfig
Auto-merging drivers/staging/media/imx/imx-media.h
Auto-merging drivers/staging/media/imx/imx-media-vdic.c
Auto-merging drivers/staging/media/imx/imx-media-of.c
Auto-merging drivers/staging/media/imx/imx-media-internal-sd.c
Auto-merging drivers/staging/media/imx/imx-media-dev.c
Auto-merging drivers/staging/media/imx/imx-media-csi.c
Auto-merging drivers/staging/media/imx/imx-ic-common.c
Auto-merging drivers/staging/media/imx/Kconfig
Auto-merging drivers/staging/media/davinci_vpfe/dm365_resizer.c
Auto-merging drivers/staging/media/davinci_vpfe/Kconfig
Auto-merging drivers/staging/media/bcm2048/Kconfig
Auto-merging drivers/staging/media/Kconfig
Auto-merging drivers/staging/iio/meter/ade7854.c
Auto-merging drivers/staging/iio/adc/ad7192.c
Auto-merging drivers/staging/Makefile
Auto-merging drivers/staging/Kconfig
Auto-merging drivers/spi/spi-mt7621.c
CONFLICT (content): Merge conflict in drivers/spi/spi-mt7621.c
Auto-merging drivers/iio/industrialio-core.c
Auto-merging drivers/iio/industrialio-buffer.c
CONFLICT (content): Merge conflict in drivers/iio/industrialio-buffer.c
Removing drivers/iio/imu/adis16400_buffer.c
Removing drivers/iio/imu/adis16400.h
Auto-merging drivers/iio/gyro/mpu3050-core.c
Auto-merging drivers/iio/gyro/bmg160_core.c
Auto-merging drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
Auto-merging drivers/iio/chemical/Kconfig
Auto-merging drivers/iio/adc/ad_sigma_delta.c
Auto-merging drivers/iio/accel/kxcjk-1013.c
Auto-merging drivers/gpu/drm/vboxvideo/vbox_mode.c
Auto-merging MAINTAINERS
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Removing Documentation/devicetree/bindings/iio/proximity/devantech-srf04.txt
Auto-merging .mailmap
Resolved 'drivers/iio/industrialio-buffer.c' using previous resolution.
Resolved 'drivers/spi/spi-mt7621.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git rm -f drivers/staging/media/mt9t031/Kconfig drivers/staging/media/mt9t031/Makefile drivers/staging/mt7621-spi/Kconfig drivers/staging/mt7621-spi/Makefile
drivers/staging/media/mt9t031/Kconfig: needs merge
drivers/staging/media/mt9t031/Makefile: needs merge
drivers/staging/mt7621-spi/Kconfig: needs merge
drivers/staging/mt7621-spi/Makefile: needs merge
rm 'drivers/staging/media/mt9t031/Kconfig'
rm 'drivers/staging/media/mt9t031/Makefile'
rm 'drivers/staging/mt7621-spi/Kconfig'
rm 'drivers/staging/mt7621-spi/Makefile'
$ git commit -v -a
[master ac2350b26431] Merge remote-tracking branch 'staging/staging-next'
$ git diff -M --stat --summary HEAD^..
 .mailmap                                           |    1 +
 .../sysfs-bus-iio-impedance-analyzer-ad5933        |   19 +-
 Documentation/ABI/testing/sysfs-bus-iio-sps30      |    2 +-
 .../ABI/testing/sysfs-bus-iio-temperature-max31856 |   24 +
 .../bindings/iio/accel/kionix,kxcjk1013.txt        |   17 +
 .../devicetree/bindings/iio/adc/adi,ad7780.txt     |   48 +
 .../bindings/iio/adc/amlogic,meson-saradc.txt      |    1 +
 .../devicetree/bindings/iio/adc/lpc32xx-adc.txt    |    5 +
 .../bindings/iio/chemical/plantower,pms7003.txt    |    8 +-
 .../bindings/iio/counter/stm32-lptimer-cnt.txt     |    8 +-
 .../devicetree/bindings/iio/gyroscope/bmg160.txt   |   20 +
 .../devicetree/bindings/iio/imu/adi,adis16480.txt  |   85 +
 .../devicetree/bindings/iio/imu/st_lsm6dsx.txt     |    2 +
 .../devicetree/bindings/iio/light/vcnl4000.txt     |   24 +
 .../bindings/iio/proximity/devantech-srf04.txt     |   28 -
 .../bindings/iio/proximity/devantech-srf04.yaml    |   59 +
 .../bindings/iio/proximity/maxbotix,mb1232.txt     |   29 +
 .../bindings/iio/temperature/max31856.txt          |   24 +
 .../iio/temperature/temperature-bindings.txt       |    7 +
 .../devicetree/bindings/vendor-prefixes.txt        |    2 +
 MAINTAINERS                                        |   10 +-
 drivers/gpu/drm/vboxvideo/Kconfig                  |    1 +
 drivers/gpu/drm/vboxvideo/vbox_mode.c              |    3 +-
 drivers/gpu/drm/vboxvideo/vbox_prime.c             |   10 +-
 drivers/iio/Kconfig                                |   24 +-
 drivers/iio/accel/Kconfig                          |   48 +-
 drivers/iio/accel/bma180.c                         |   18 +-
 drivers/iio/accel/bmc150-accel-core.c              |   21 +
 drivers/iio/accel/cros_ec_accel_legacy.c           |   40 +-
 drivers/iio/accel/kxcjk-1013.c                     |   10 +
 drivers/iio/accel/kxsd9.c                          |    4 +-
 drivers/iio/accel/mma8452.c                        |    2 +-
 drivers/iio/accel/st_accel_core.c                  |    2 +-
 drivers/iio/adc/Kconfig                            |   32 +-
 drivers/iio/adc/Makefile                           |    1 +
 drivers/iio/adc/ad7124.c                           |    2 +-
 drivers/{staging => }/iio/adc/ad7780.c             |  179 +-
 drivers/iio/adc/ad7923.c                           |   24 +-
 drivers/iio/adc/ad_sigma_delta.c                   |   16 +-
 drivers/iio/adc/ingenic-adc.c                      |    4 +-
 drivers/iio/adc/lpc32xx_adc.c                      |   60 +-
 drivers/iio/adc/meson_saradc.c                     |    8 +
 drivers/iio/adc/mxs-lradc-adc.c                    |    2 +
 drivers/iio/adc/stm32-dfsdm-adc.c                  |  628 +++++--
 drivers/iio/adc/stm32-dfsdm-core.c                 |  180 +-
 drivers/iio/adc/stmpe-adc.c                        |    5 +-
 drivers/iio/adc/ti-ads7950.c                       |  219 ++-
 drivers/iio/adc/ti-ads8688.c                       |    2 +-
 drivers/iio/buffer/industrialio-buffer-cb.c        |   10 +-
 drivers/iio/chemical/Kconfig                       |   12 +-
 drivers/iio/chemical/pms7003.c                     |    5 +
 .../iio/common/cros_ec_sensors/cros_ec_sensors.c   |   12 +-
 .../common/cros_ec_sensors/cros_ec_sensors_core.c  |   22 +-
 drivers/iio/common/ms_sensors/Kconfig              |    2 +-
 drivers/iio/common/ssp_sensors/ssp_iio.c           |    2 +-
 drivers/iio/counter/stm32-lptimer-cnt.c            |   55 +
 drivers/iio/dac/ad5064.c                           |   15 +-
 drivers/iio/dac/ti-dac5571.c                       |    2 +-
 drivers/iio/frequency/ad9523.c                     |   16 +-
 drivers/iio/gyro/bmg160_core.c                     |   21 +
 drivers/iio/gyro/bmg160_i2c.c                      |    9 +
 drivers/iio/gyro/itg3200_core.c                    |   20 +
 drivers/iio/gyro/mpu3050-core.c                    |    3 +-
 drivers/iio/humidity/Kconfig                       |   20 +-
 drivers/iio/imu/Makefile                           |    2 -
 drivers/iio/imu/{adis16400_core.c => adis16400.c}  |  232 ++-
 drivers/iio/imu/adis16400.h                        |  215 ---
 drivers/iio/imu/adis16400_buffer.c                 |  101 --
 drivers/iio/imu/adis16480.c                        |  435 ++++-
 drivers/iio/imu/adis_buffer.c                      |   40 +
 drivers/iio/imu/inv_mpu6050/inv_mpu_core.c         |   10 +-
 drivers/iio/imu/st_lsm6dsx/Kconfig                 |    2 +-
 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h            |    4 +
 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c     |    8 +-
 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c       |   42 +-
 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c        |   10 +
 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c        |   10 +
 drivers/iio/industrialio-buffer.c                  |   23 +-
 drivers/iio/industrialio-core.c                    |   46 +-
 drivers/iio/industrialio-trigger.c                 |    5 +-
 drivers/iio/light/Kconfig                          |  274 +--
 drivers/iio/light/cros_ec_light_prox.c             |   12 +-
 drivers/iio/light/vcnl4000.c                       |   77 +-
 drivers/iio/magnetometer/ak8974.c                  |    5 +-
 drivers/iio/magnetometer/ak8975.c                  |   13 +-
 drivers/iio/magnetometer/bmc150_magn.c             |   21 +
 drivers/iio/magnetometer/hmc5843.h                 |    1 +
 drivers/iio/magnetometer/hmc5843_core.c            |   20 +-
 drivers/iio/magnetometer/hmc5843_i2c.c             |    7 +-
 drivers/iio/magnetometer/hmc5843_spi.c             |    7 +-
 drivers/iio/potentiometer/Kconfig                  |   34 +-
 drivers/iio/potentiostat/lmp91000.c                |   14 +-
 drivers/iio/pressure/bmp280-core.c                 |    6 +
 drivers/iio/pressure/cros_ec_baro.c                |   11 +-
 drivers/iio/proximity/Kconfig                      |   12 +
 drivers/iio/proximity/Makefile                     |    1 +
 drivers/iio/proximity/as3935.c                     |   50 +-
 drivers/iio/proximity/mb1232.c                     |  272 +++
 drivers/iio/temperature/Kconfig                    |   24 +-
 drivers/iio/temperature/Makefile                   |    1 +
 drivers/iio/temperature/max31856.c                 |  353 ++++
 drivers/iio/trigger/iio-trig-loop.c                |    2 +-
 drivers/spi/spi-mt7621.c                           |    7 +-
 drivers/staging/Kconfig                            |    3 +-
 drivers/staging/Makefile                           |    1 -
 drivers/staging/android/Kconfig                    |    1 +
 drivers/staging/android/Makefile                   |    1 +
 drivers/staging/android/ion/Kconfig                |    1 +
 drivers/staging/axis-fifo/Kconfig                  |    1 +
 drivers/staging/axis-fifo/Makefile                 |    1 +
 drivers/staging/board/Kconfig                      |    1 +
 drivers/staging/board/Makefile                     |    1 +
 drivers/staging/clocking-wizard/Kconfig            |    1 +
 drivers/staging/clocking-wizard/Makefile           |    1 +
 drivers/staging/comedi/Kconfig                     |    1 +
 drivers/staging/comedi/drivers/amplc_pci230.c      |    2 +-
 drivers/staging/comedi/drivers/das08.c             |    4 +-
 drivers/staging/comedi/drivers/dyna_pci10xx.c      |    2 +-
 drivers/staging/comedi/drivers/ni_at_ao.c          |    2 +-
 drivers/staging/comedi/drivers/ni_daq_700.c        |    2 +-
 drivers/staging/comedi/drivers/ni_mio_common.c     |   36 +-
 .../comedi/drivers/ni_routing/tools/Makefile       |    1 +
 drivers/staging/comedi/drivers/ni_tio.c            |   14 +-
 drivers/staging/comedi/drivers/quatech_daqp_cs.c   |    1 +
 .../staging/comedi/drivers/tests/ni_routes_test.c  |    2 +-
 drivers/staging/comedi/kcomedilib/Makefile         |    1 +
 drivers/staging/emxx_udc/Kconfig                   |    1 +
 drivers/staging/emxx_udc/Makefile                  |    1 +
 drivers/staging/emxx_udc/emxx_udc.c                |   57 +-
 .../erofs/Documentation/filesystems/erofs.txt      |    1 +
 drivers/staging/erofs/data.c                       |   18 +-
 drivers/staging/erofs/inode.c                      |   18 +-
 drivers/staging/erofs/internal.h                   |   19 +-
 drivers/staging/erofs/namei.c                      |    3 +-
 drivers/staging/erofs/super.c                      |   46 +-
 drivers/staging/erofs/unzip_pagevec.h              |    6 +-
 drivers/staging/erofs/unzip_vle.c                  |   96 +-
 drivers/staging/erofs/utils.c                      |    4 +-
 drivers/staging/erofs/xattr.c                      |   50 +-
 drivers/staging/fbtft/Kconfig                      |    1 +
 drivers/staging/fbtft/fb_agm1264k-fl.c             |    4 +-
 drivers/staging/fbtft/fb_ra8875.c                  |    2 +-
 drivers/staging/fbtft/fb_ssd1306.c                 |    3 +-
 drivers/staging/fbtft/fb_ssd1331.c                 |    3 +-
 drivers/staging/fbtft/fb_ssd1351.c                 |    4 +-
 drivers/staging/fbtft/fb_watterott.c               |   15 +-
 drivers/staging/fbtft/fbtft-io.c                   |   12 +-
 drivers/staging/fbtft/fbtft.h                      |    1 +
 drivers/staging/fbtft/fbtft_device.c               |    2 +-
 drivers/staging/fbtft/flexfb.c                     |    7 +-
 drivers/staging/fsl-dpaa2/Kconfig                  |    1 +
 drivers/staging/fsl-dpaa2/Makefile                 |    1 +
 drivers/staging/fsl-dpaa2/ethsw/ethsw.c            |    4 +-
 drivers/staging/fwserial/Kconfig                   |    1 +
 drivers/staging/fwserial/Makefile                  |    1 +
 drivers/staging/fwserial/fwserial.c                |    5 +-
 drivers/staging/gasket/Kconfig                     |    1 +
 drivers/staging/gasket/Makefile                    |    1 +
 drivers/staging/gasket/apex_driver.c               |    8 +-
 drivers/staging/gasket/gasket_interrupt.c          |    6 +-
 drivers/staging/gasket/gasket_sysfs.c              |    9 +-
 drivers/staging/gasket/gasket_sysfs.h              |    4 +-
 drivers/staging/gdm724x/Kconfig                    |    1 +
 drivers/staging/gdm724x/gdm_lte.c                  |    1 -
 drivers/staging/gdm724x/gdm_mux.c                  |    7 +-
 drivers/staging/gdm724x/hci_packet.h               |    2 +-
 drivers/staging/goldfish/Kconfig                   |    1 +
 drivers/staging/goldfish/Makefile                  |    1 +
 drivers/staging/greybus/Kconfig                    |    1 +
 drivers/staging/greybus/audio_codec.h              |  122 +-
 drivers/staging/greybus/audio_manager.c            |    3 +
 drivers/staging/greybus/bundle.c                   |    2 +-
 drivers/staging/greybus/hid.c                      |    1 -
 drivers/staging/greybus/sdio.c                     |    8 +-
 drivers/staging/gs_fpgaboot/Kconfig                |    1 +
 drivers/staging/gs_fpgaboot/Makefile               |    1 +
 drivers/staging/iio/Kconfig                        |    1 +
 drivers/staging/iio/accel/Kconfig                  |    1 +
 drivers/staging/iio/accel/Makefile                 |    1 +
 drivers/staging/iio/accel/adis16203.c              |    3 +-
 drivers/staging/iio/accel/adis16240.c              |    3 +-
 drivers/staging/iio/adc/Kconfig                    |   14 +-
 drivers/staging/iio/adc/Makefile                   |    1 -
 drivers/staging/iio/adc/ad7192.c                   |  236 ++-
 drivers/staging/iio/adc/ad7192.h                   |   12 +-
 drivers/staging/iio/adc/ad7280a.c                  |  112 +-
 drivers/staging/iio/adc/ad7280a.h                  |    3 +-
 drivers/staging/iio/adc/ad7816.c                   |    5 +-
 drivers/staging/iio/addac/Kconfig                  |    1 +
 drivers/staging/iio/addac/Makefile                 |    1 +
 drivers/staging/iio/addac/adt7316-i2c.c            |    3 +-
 drivers/staging/iio/addac/adt7316-spi.c            |    3 +-
 drivers/staging/iio/addac/adt7316.c                |    7 +-
 drivers/staging/iio/addac/adt7316.h                |    3 +-
 drivers/staging/iio/cdc/Kconfig                    |    1 +
 drivers/staging/iio/cdc/Makefile                   |    1 +
 drivers/staging/iio/cdc/ad7150.c                   |    3 +-
 drivers/staging/iio/cdc/ad7746.c                   |    3 +-
 drivers/staging/iio/cdc/ad7746.h                   |    3 +-
 drivers/staging/iio/frequency/Kconfig              |    1 +
 drivers/staging/iio/frequency/Makefile             |    1 +
 drivers/staging/iio/frequency/ad9832.c             |    3 +-
 drivers/staging/iio/frequency/ad9832.h             |    3 +-
 drivers/staging/iio/frequency/ad9834.c             |    3 +-
 drivers/staging/iio/frequency/ad9834.h             |    3 +-
 drivers/staging/iio/frequency/dds.h                |    3 +-
 drivers/staging/iio/impedance-analyzer/Kconfig     |    3 +-
 drivers/staging/iio/impedance-analyzer/Makefile    |    1 +
 drivers/staging/iio/impedance-analyzer/ad5933.c    |   58 +-
 drivers/staging/iio/meter/Kconfig                  |    1 +
 drivers/staging/iio/meter/ade7854-i2c.c            |    3 +-
 drivers/staging/iio/meter/ade7854-spi.c            |    3 +-
 drivers/staging/iio/meter/ade7854.c                |    3 +-
 drivers/staging/iio/resolver/Kconfig               |    1 +
 drivers/staging/iio/resolver/Makefile              |    1 +
 drivers/staging/iio/resolver/ad2s1210.c            |    6 +-
 drivers/staging/ks7010/Kconfig                     |    1 +
 drivers/staging/ks7010/Makefile                    |    1 +
 drivers/staging/ks7010/ks_hostif.c                 |   16 +-
 drivers/staging/media/Kconfig                      |    1 +
 drivers/staging/media/bcm2048/Kconfig              |    1 +
 drivers/staging/media/bcm2048/Makefile             |    1 +
 drivers/staging/media/davinci_vpfe/Kconfig         |    1 +
 drivers/staging/media/davinci_vpfe/Makefile        |    1 +
 drivers/staging/media/davinci_vpfe/dm365_ipipe.c   |    6 +-
 drivers/staging/media/davinci_vpfe/dm365_ipipe.h   |    2 -
 .../staging/media/davinci_vpfe/dm365_ipipe_hw.c    |   24 +-
 drivers/staging/media/davinci_vpfe/dm365_ipipeif.c |   41 +-
 drivers/staging/media/davinci_vpfe/dm365_ipipeif.h |    2 -
 drivers/staging/media/davinci_vpfe/dm365_resizer.c |    4 +-
 drivers/staging/media/imx/Kconfig                  |    1 +
 drivers/staging/media/imx/imx-ic-common.c          |    6 +-
 drivers/staging/media/imx/imx-ic-prp.c             |    6 +-
 drivers/staging/media/imx/imx-ic-prpencvf.c        |    6 +-
 drivers/staging/media/imx/imx-ic.h                 |    6 +-
 drivers/staging/media/imx/imx-media-capture.c      |   11 +-
 drivers/staging/media/imx/imx-media-csi.c          |    6 +-
 drivers/staging/media/imx/imx-media-dev.c          |    6 +-
 drivers/staging/media/imx/imx-media-fim.c          |    6 +-
 drivers/staging/media/imx/imx-media-internal-sd.c  |    6 +-
 drivers/staging/media/imx/imx-media-of.c           |    6 +-
 drivers/staging/media/imx/imx-media-utils.c        |    6 +-
 drivers/staging/media/imx/imx-media-vdic.c         |    6 +-
 drivers/staging/media/imx/imx-media.h              |    6 +-
 drivers/staging/media/imx/imx6-mipi-csi2.c         |   10 +-
 drivers/staging/media/ipu3/Kconfig                 |    1 +
 drivers/staging/media/ipu3/Makefile                |    1 +
 drivers/staging/media/ipu3/ipu3.c                  |    1 -
 drivers/staging/media/rockchip/vpu/Kconfig         |    1 +
 drivers/staging/media/rockchip/vpu/Makefile        |    1 +
 drivers/staging/media/soc_camera/Kconfig           |    1 +
 drivers/staging/media/soc_camera/imx074.c          |    6 +-
 drivers/staging/media/soc_camera/mt9t031.c         |    6 +-
 drivers/staging/media/soc_camera/soc_camera.c      |    6 +-
 drivers/staging/media/soc_camera/soc_mediabus.c    |    6 +-
 drivers/staging/media/soc_camera/soc_mt9v022.c     |    6 +-
 drivers/staging/media/soc_camera/soc_ov5642.c      |    6 +-
 drivers/staging/media/soc_camera/soc_ov9740.c      |    6 +-
 drivers/staging/media/sunxi/Kconfig                |    1 +
 drivers/staging/media/sunxi/Makefile               |    1 +
 drivers/staging/media/sunxi/cedrus/Kconfig         |    1 +
 drivers/staging/media/sunxi/cedrus/Makefile        |    1 +
 drivers/staging/media/tegra-vde/Kconfig            |    1 +
 drivers/staging/media/tegra-vde/Makefile           |    1 +
 drivers/staging/media/tegra-vde/tegra-vde.c        |    5 +-
 drivers/staging/media/tegra-vde/uapi.h             |   11 +-
 drivers/staging/media/zoran/Kconfig                |    1 +
 drivers/staging/media/zoran/videocodec.c           |   14 +-
 drivers/staging/media/zoran/videocodec.h           |   17 +-
 drivers/staging/media/zoran/zoran.h                |   12 +-
 drivers/staging/media/zoran/zoran_card.c           |   17 +-
 drivers/staging/media/zoran/zoran_card.h           |   12 +-
 drivers/staging/media/zoran/zoran_device.c         |   16 +-
 drivers/staging/media/zoran/zoran_device.h         |   22 +-
 drivers/staging/media/zoran/zoran_driver.c         |  114 +-
 drivers/staging/media/zoran/zoran_procfs.c         |   12 +-
 drivers/staging/media/zoran/zoran_procfs.h         |   12 +-
 drivers/staging/media/zoran/zr36016.c              |   18 +-
 drivers/staging/media/zoran/zr36016.h              |   18 +-
 drivers/staging/media/zoran/zr36050.c              |   18 +-
 drivers/staging/media/zoran/zr36050.h              |   18 +-
 drivers/staging/media/zoran/zr36057.h              |   12 +-
 drivers/staging/media/zoran/zr36060.c              |   30 +-
 drivers/staging/media/zoran/zr36060.h              |   18 +-
 drivers/staging/most/Kconfig                       |    1 +
 drivers/staging/most/cdev/Kconfig                  |    1 +
 drivers/staging/most/cdev/Makefile                 |    1 +
 drivers/staging/most/dim2/Kconfig                  |    1 +
 drivers/staging/most/dim2/Makefile                 |    1 +
 drivers/staging/most/dim2/errors.h                 |    2 +-
 drivers/staging/most/dim2/hal.h                    |    2 +-
 drivers/staging/most/dim2/reg.h                    |    2 +-
 drivers/staging/most/dim2/sysfs.h                  |    2 +-
 drivers/staging/most/i2c/Kconfig                   |    3 +-
 drivers/staging/most/i2c/Makefile                  |    1 +
 drivers/staging/most/net/Kconfig                   |    3 +-
 drivers/staging/most/net/Makefile                  |    1 +
 drivers/staging/most/sound/Kconfig                 |    3 +-
 drivers/staging/most/sound/Makefile                |    1 +
 drivers/staging/most/usb/Kconfig                   |    3 +-
 drivers/staging/most/usb/Makefile                  |    1 +
 drivers/staging/most/video/Kconfig                 |    3 +-
 drivers/staging/most/video/Makefile                |    1 +
 drivers/staging/mt7621-dma/Kconfig                 |    1 +
 drivers/staging/mt7621-dma/Makefile                |    1 +
 drivers/staging/mt7621-dma/mtk-hsdma.c             |    7 +-
 drivers/staging/mt7621-dts/Kconfig                 |    1 +
 drivers/staging/mt7621-dts/Makefile                |    1 +
 drivers/staging/mt7621-dts/mt7621.dtsi             |   23 +-
 drivers/staging/mt7621-mmc/Kconfig                 |   16 -
 drivers/staging/mt7621-mmc/Makefile                |   42 -
 drivers/staging/mt7621-mmc/TODO                    |    8 -
 drivers/staging/mt7621-mmc/board.h                 |   63 -
 drivers/staging/mt7621-mmc/dbg.c                   |  304 ----
 drivers/staging/mt7621-mmc/dbg.h                   |  101 --
 drivers/staging/mt7621-mmc/mt6575_sd.h             |  488 -----
 drivers/staging/mt7621-mmc/sd.c                    | 1855 --------------------
 drivers/staging/mt7621-pci-phy/Kconfig             |    1 +
 drivers/staging/mt7621-pci-phy/Makefile            |    1 +
 .../mt7621-pci-phy/mediatek,mt7621-pci-phy.txt     |   44 +-
 drivers/staging/mt7621-pci-phy/pci-mt7621-phy.c    |  152 +-
 drivers/staging/mt7621-pci/Kconfig                 |    1 +
 drivers/staging/mt7621-pci/Makefile                |    1 +
 drivers/staging/mt7621-pci/pci-mt7621.c            |    2 +-
 drivers/staging/mt7621-pinctrl/Kconfig             |    1 +
 drivers/staging/mt7621-pinctrl/Makefile            |    1 +
 drivers/staging/netlogic/Kconfig                   |    1 +
 drivers/staging/netlogic/Makefile                  |    1 +
 drivers/staging/netlogic/xlr_net.c                 |   11 +-
 drivers/staging/nvec/Kconfig                       |    1 +
 drivers/staging/octeon-usb/Kconfig                 |    1 +
 drivers/staging/octeon-usb/octeon-hcd.c            |    4 +-
 drivers/staging/octeon-usb/octeon-hcd.h            |    8 +-
 drivers/staging/octeon/Kconfig                     |    1 +
 drivers/staging/octeon/ethernet-tx.c               |   20 +-
 drivers/staging/olpc_dcon/Kconfig                  |    1 +
 drivers/staging/olpc_dcon/Makefile                 |    1 +
 drivers/staging/pi433/Kconfig                      |    1 +
 drivers/staging/pi433/Makefile                     |    1 +
 drivers/staging/pi433/pi433_if.c                   |   38 +-
 drivers/staging/pi433/rf69.c                       |    4 +-
 drivers/staging/ralink-gdma/Kconfig                |    1 +
 drivers/staging/ralink-gdma/Makefile               |    1 +
 drivers/staging/ralink-gdma/ralink-gdma.c          |   93 +-
 drivers/staging/rtl8188eu/Kconfig                  |    1 +
 drivers/staging/rtl8188eu/core/rtw_ap.c            |    7 +-
 drivers/staging/rtl8188eu/core/rtw_ieee80211.c     |    6 +-
 drivers/staging/rtl8188eu/core/rtw_mlme.c          |    5 +-
 drivers/staging/rtl8188eu/core/rtw_pwrctrl.c       |    2 +-
 drivers/staging/rtl8188eu/core/rtw_recv.c          |   59 +-
 drivers/staging/rtl8188eu/core/rtw_wlan_util.c     |    6 +-
 drivers/staging/rtl8188eu/hal/odm.c                |    2 +-
 drivers/staging/rtl8188eu/hal/odm_hwconfig.c       |    6 +-
 drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c     |   10 +-
 drivers/staging/rtl8188eu/include/wifi.h           |  130 --
 drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c   |    1 -
 drivers/staging/rtl8192e/Kconfig                   |    9 +-
 drivers/staging/rtl8192e/dot11d.c                  |    9 +-
 drivers/staging/rtl8192e/license                   |  339 ----
 drivers/staging/rtl8192e/rtl8192e/Kconfig          |    1 +
 drivers/staging/rtl8192e/rtl8192e/r8190P_def.h     |   18 +-
 drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c |   17 +-
 drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.h |   17 +-
 drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c  |   17 +-
 drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h  |   16 +-
 drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c     |   40 +-
 drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h     |   22 +-
 .../staging/rtl8192e/rtl8192e/r8192E_firmware.c    |   17 +-
 .../staging/rtl8192e/rtl8192e/r8192E_firmware.h    |   16 +-
 drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h      |   18 +-
 drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c   |   18 +-
 drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h   |   16 +-
 drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c     |   36 +-
 drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h     |   16 +-
 drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h  |   16 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_cam.c        |   19 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_cam.h        |   19 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_core.c       |   19 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_core.h       |   20 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c         |   16 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_dm.h         |   16 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c     |   19 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.h     |   21 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c    |   18 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_pci.c        |   19 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_pci.h        |   19 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_pm.c         |   17 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_pm.h         |   17 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_ps.c         |   19 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_ps.h         |   19 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_wx.c         |   17 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_wx.h         |   17 +-
 drivers/staging/rtl8192e/rtl819x_BA.h              |   16 +-
 drivers/staging/rtl8192e/rtl819x_BAProc.c          |   16 +-
 drivers/staging/rtl8192e/rtl819x_HT.h              |   16 +-
 drivers/staging/rtl8192e/rtl819x_HTProc.c          |   16 +-
 drivers/staging/rtl8192e/rtl819x_Qos.h             |   16 +-
 drivers/staging/rtl8192e/rtl819x_TS.h              |   16 +-
 drivers/staging/rtl8192e/rtl819x_TSProc.c          |   16 +-
 drivers/staging/rtl8192e/rtllib.h                  |    6 +-
 drivers/staging/rtl8192e/rtllib_crypt_tkip.c       |    6 +-
 drivers/staging/rtl8192e/rtllib_crypt_wep.c        |    6 +-
 drivers/staging/rtl8192e/rtllib_debug.h            |   22 +-
 drivers/staging/rtl8192e/rtllib_module.c           |   21 +-
 drivers/staging/rtl8192e/rtllib_rx.c               |   20 +-
 drivers/staging/rtl8192e/rtllib_softmac.c          |    5 +-
 drivers/staging/rtl8192e/rtllib_softmac_wx.c       |    5 +-
 drivers/staging/rtl8192e/rtllib_tx.c               |   22 +-
 drivers/staging/rtl8192e/rtllib_wx.c               |   19 +-
 drivers/staging/rtl8192u/Kconfig                   |    1 +
 drivers/staging/rtl8192u/ieee80211/ieee80211.h     |   40 +-
 .../staging/rtl8192u/ieee80211/ieee80211_crypt.c   |    7 +-
 .../staging/rtl8192u/ieee80211/ieee80211_crypt.h   |    6 +-
 .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c      |   10 +-
 .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c      |   10 +-
 .../rtl8192u/ieee80211/ieee80211_crypt_wep.c       |    6 +-
 drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c  |   76 +-
 .../staging/rtl8192u/ieee80211/ieee80211_softmac.c |    3 +-
 .../rtl8192u/ieee80211/ieee80211_softmac_wx.c      |    3 +-
 drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c  |   41 +-
 drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c  |   29 +-
 .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c    |    8 +-
 .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c    |   78 +-
 drivers/staging/rtl8192u/r8180_93cx6.c             |   26 +-
 drivers/staging/rtl8192u/r8190_rtl8256.c           |    2 +-
 drivers/staging/rtl8192u/r8192U_core.c             |   16 +-
 drivers/staging/rtl8192u/r8192U_dm.c               |   38 +-
 drivers/staging/rtl8192u/r8192U_hw.h               |    2 +-
 drivers/staging/rtl8192u/r8192U_wx.c               |    2 +-
 drivers/staging/rtl8192u/r8192U_wx.h               |    2 +-
 drivers/staging/rtl8712/Kconfig                    |   11 +-
 drivers/staging/rtl8712/drv_types.h                |    6 +-
 drivers/staging/rtl8712/hal_init.c                 |    3 +-
 drivers/staging/rtl8712/ieee80211.c                |    3 +-
 drivers/staging/rtl8712/ieee80211.h                |    3 +-
 drivers/staging/rtl8712/os_intfs.c                 |    8 +-
 drivers/staging/rtl8712/rtl8712_cmd.c              |    6 +-
 drivers/staging/rtl8712/rtl8712_cmd.h              |    1 -
 drivers/staging/rtl8712/rtl8712_efuse.c            |    6 +-
 drivers/staging/rtl8712/rtl8712_efuse.h            |    3 +-
 drivers/staging/rtl8712/rtl8712_io.c               |    4 +-
 drivers/staging/rtl8712/rtl8712_led.c              |   13 +-
 drivers/staging/rtl8712/rtl8712_recv.c             |   28 +-
 drivers/staging/rtl8712/rtl8712_xmit.c             |   12 +-
 drivers/staging/rtl8712/rtl871x_eeprom.c           |   23 +-
 drivers/staging/rtl8712/rtl871x_ioctl_linux.c      |   18 +-
 drivers/staging/rtl8712/rtl871x_mlme.c             |   14 +-
 drivers/staging/rtl8712/rtl871x_mp.c               |    5 +-
 drivers/staging/rtl8712/rtl871x_pwrctrl.c          |    4 +-
 drivers/staging/rtl8712/rtl871x_xmit.c             |    8 +-
 drivers/staging/rtl8712/usb_intf.c                 |   12 +-
 drivers/staging/rtl8712/usb_ops_linux.c            |   26 +-
 drivers/staging/rtl8723bs/Kconfig                  |    1 +
 drivers/staging/rtl8723bs/core/rtw_ap.c            |   12 +-
 drivers/staging/rtl8723bs/core/rtw_cmd.c           |   51 +-
 drivers/staging/rtl8723bs/core/rtw_debug.c         |    8 +-
 drivers/staging/rtl8723bs/core/rtw_efuse.c         |   33 +-
 drivers/staging/rtl8723bs/core/rtw_ieee80211.c     |    6 +-
 drivers/staging/rtl8723bs/core/rtw_mlme.c          |   79 +-
 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c      |   46 +-
 drivers/staging/rtl8723bs/core/rtw_wlan_util.c     |    2 +-
 drivers/staging/rtl8723bs/hal/hal_btcoex.c         |   11 +-
 drivers/staging/rtl8723bs/hal/hal_com.c            |   14 +-
 drivers/staging/rtl8723bs/hal/hal_com_phycfg.c     |   16 +-
 drivers/staging/rtl8723bs/hal/odm.c                |    2 +-
 drivers/staging/rtl8723bs/hal/odm.h                |    8 +-
 drivers/staging/rtl8723bs/hal/odm_HWConfig.c       |    2 +-
 drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c       |   12 +-
 drivers/staging/rtl8723bs/hal/rtl8723b_dm.c        |    2 +-
 drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c  |    8 +-
 drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c    |   13 +-
 drivers/staging/rtl8723bs/hal/rtl8723b_rxdesc.c    |    2 +-
 drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c     |    8 +-
 drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c     |    9 +-
 drivers/staging/rtl8723bs/hal/sdio_ops.c           |   16 +-
 drivers/staging/rtl8723bs/include/cmd_osdep.h      |    6 +-
 drivers/staging/rtl8723bs/include/drv_types.h      |    4 -
 drivers/staging/rtl8723bs/include/rtw_cmd.h        |    6 +-
 drivers/staging/rtl8723bs/include/rtw_mlme.h       |   31 +-
 drivers/staging/rtl8723bs/include/rtw_pwrctrl.h    |   30 +-
 drivers/staging/rtl8723bs/include/rtw_recv.h       |    2 +-
 drivers/staging/rtl8723bs/include/wifi.h           |   86 +-
 drivers/staging/rtl8723bs/include/wlan_bssdef.h    |   56 +-
 drivers/staging/rtl8723bs/os_dep/ioctl_linux.c     |   57 +-
 drivers/staging/rtl8723bs/os_dep/os_intfs.c        |   19 +-
 drivers/staging/rtl8723bs/os_dep/osdep_service.c   |   29 +-
 drivers/staging/rtlwifi/Kconfig                    |    1 +
 drivers/staging/rtlwifi/Makefile                   |    1 +
 drivers/staging/rtlwifi/base.c                     |    2 +-
 drivers/staging/rtlwifi/btcoexist/Makefile         |    1 +
 drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c   |    9 +-
 .../halmac/halmac_88xx/halmac_api_88xx_sdio.c      |    5 +-
 .../halmac/halmac_88xx/halmac_api_88xx_usb.c       |    5 +-
 drivers/staging/rtlwifi/halmac/halmac_api.c        |    7 +-
 drivers/staging/rtlwifi/phydm/phydm.c              |   20 +-
 drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c |    4 +-
 drivers/staging/rtlwifi/phydm/phydm_debug.c        |   12 +-
 drivers/staging/rtlwifi/phydm/phydm_hwconfig.c     |   18 +-
 drivers/staging/rtlwifi/phydm/phydm_rainfo.c       |    5 +-
 drivers/staging/rtlwifi/rtl8822be/Makefile         |    1 +
 drivers/staging/rtlwifi/rtl8822be/hw.c             |   15 -
 drivers/staging/rtlwifi/rtl8822be/hw.h             |    1 -
 drivers/staging/rtlwifi/rtl8822be/phy.c            |   15 +-
 drivers/staging/rts5208/Kconfig                    |    1 +
 drivers/staging/rts5208/Makefile                   |    1 +
 drivers/staging/rts5208/rtsx_chip.h                |    2 +-
 drivers/staging/sm750fb/Kconfig                    |    1 +
 drivers/staging/sm750fb/Makefile                   |    1 +
 drivers/staging/sm750fb/ddk750.h                   |    1 +
 drivers/staging/sm750fb/ddk750_chip.c              |   27 +-
 drivers/staging/sm750fb/ddk750_chip.h              |    2 +-
 drivers/staging/sm750fb/ddk750_display.c           |   10 +-
 drivers/staging/sm750fb/ddk750_display.h           |    2 +-
 drivers/staging/sm750fb/ddk750_dvi.c               |   40 +-
 drivers/staging/sm750fb/ddk750_power.h             |    2 +-
 drivers/staging/sm750fb/ddk750_sii164.c            |  114 +-
 drivers/staging/sm750fb/ddk750_swi2c.c             |    1 +
 drivers/staging/sm750fb/ddk750_swi2c.h             |    1 +
 drivers/staging/sm750fb/sm750.c                    |    5 +-
 drivers/staging/sm750fb/sm750_accel.c              |   32 +-
 drivers/staging/sm750fb/sm750_hw.c                 |    2 +-
 drivers/staging/speakup/Kconfig                    |    1 +
 drivers/staging/speakup/kobjects.c                 |   14 +-
 drivers/staging/speakup/speakup_decpc.c            |    2 +-
 drivers/staging/speakup/speakup_keypc.c            |    6 +-
 drivers/staging/speakup/spk_ttyio.c                |    2 +-
 drivers/staging/unisys/Kconfig                     |    1 +
 drivers/staging/unisys/Makefile                    |    1 +
 drivers/staging/unisys/include/iochannel.h         |    2 +-
 drivers/staging/unisys/visorhba/Kconfig            |   13 +-
 drivers/staging/unisys/visorhba/Makefile           |    1 +
 drivers/staging/unisys/visorinput/Kconfig          |   15 +-
 drivers/staging/unisys/visorinput/Makefile         |    1 +
 drivers/staging/unisys/visornic/Kconfig            |   15 +-
 drivers/staging/unisys/visornic/Makefile           |    1 +
 drivers/staging/vc04_services/Kconfig              |    1 +
 .../staging/vc04_services/bcm2835-audio/Kconfig    |    1 +
 .../staging/vc04_services/bcm2835-audio/Makefile   |    1 +
 .../vc04_services/bcm2835-audio/bcm2835-ctl.c      |   12 +-
 .../staging/vc04_services/bcm2835-camera/Kconfig   |    1 +
 .../vc04_services/bcm2835-camera/bcm2835-camera.c  |   51 +-
 .../staging/vc04_services/interface/vchi/vchi.h    |   38 +-
 .../vc04_services/interface/vchi/vchi_cfg.h        |   34 +-
 .../vc04_services/interface/vchi/vchi_common.h     |  176 +-
 .../vc04_services/interface/vchiq_arm/vchiq.h      |   34 +-
 .../interface/vchiq_arm/vchiq_2835_arm.c           |   34 +-
 .../vc04_services/interface/vchiq_arm/vchiq_arm.c  |   48 +-
 .../vc04_services/interface/vchiq_arm/vchiq_arm.h  |   32 +-
 .../vc04_services/interface/vchiq_arm/vchiq_cfg.h  |   34 +-
 .../interface/vchiq_arm/vchiq_connected.c          |   34 +-
 .../interface/vchiq_arm/vchiq_connected.h          |   34 +-
 .../vc04_services/interface/vchiq_arm/vchiq_core.c |   48 +-
 .../vc04_services/interface/vchiq_arm/vchiq_core.h |   34 +-
 .../interface/vchiq_arm/vchiq_debugfs.c            |   32 +-
 .../interface/vchiq_arm/vchiq_debugfs.h            |   34 +-
 .../vc04_services/interface/vchiq_arm/vchiq_if.h   |   34 +-
 .../interface/vchiq_arm/vchiq_ioctl.h              |   34 +-
 .../interface/vchiq_arm/vchiq_pagelist.h           |   34 +-
 .../vc04_services/interface/vchiq_arm/vchiq_shim.c |   34 +-
 .../vc04_services/interface/vchiq_arm/vchiq_util.c |   34 +-
 .../vc04_services/interface/vchiq_arm/vchiq_util.h |   34 +-
 drivers/staging/vme/Makefile                       |    1 +
 drivers/staging/vme/devices/Kconfig                |    1 +
 drivers/staging/vme/devices/Makefile               |    1 +
 drivers/staging/vt6655/Kconfig                     |    1 +
 drivers/staging/vt6655/card.h                      |    6 +-
 drivers/staging/vt6655/channel.h                   |    2 +-
 drivers/staging/vt6655/desc.h                      |    2 +-
 drivers/staging/vt6655/device.h                    |    2 +-
 drivers/staging/vt6655/device_cfg.h                |    2 +-
 drivers/staging/vt6655/dpc.h                       |    2 +-
 drivers/staging/vt6655/key.h                       |    2 +-
 drivers/staging/vt6655/mac.c                       |   25 -
 drivers/staging/vt6655/mac.h                       |    9 +-
 drivers/staging/vt6655/power.c                     |    7 +-
 drivers/staging/vt6655/power.h                     |    2 +-
 drivers/staging/vt6655/rf.c                        |   35 +-
 drivers/staging/vt6655/rf.h                        |    2 +-
 drivers/staging/vt6655/rxtx.c                      |   18 +-
 drivers/staging/vt6655/rxtx.h                      |    2 +-
 drivers/staging/vt6655/srom.h                      |    2 +-
 drivers/staging/vt6655/tmacro.h                    |    2 +-
 drivers/staging/vt6655/upc.h                       |    2 +-
 drivers/staging/vt6656/Kconfig                     |    1 +
 drivers/staging/vt6656/baseband.h                  |    2 +-
 drivers/staging/vt6656/card.h                      |    2 +-
 drivers/staging/vt6656/channel.h                   |    2 +-
 drivers/staging/vt6656/desc.h                      |    2 +-
 drivers/staging/vt6656/device.h                    |    2 +-
 drivers/staging/vt6656/dpc.h                       |    2 +-
 drivers/staging/vt6656/firmware.h                  |    2 +-
 drivers/staging/vt6656/int.h                       |    2 +-
 drivers/staging/vt6656/key.h                       |    2 +-
 drivers/staging/vt6656/power.h                     |    2 +-
 drivers/staging/vt6656/rf.h                        |    2 +-
 drivers/staging/vt6656/rxtx.h                      |    2 +-
 drivers/staging/vt6656/usbpipe.h                   |    2 +-
 drivers/staging/vt6656/wcmd.h                      |    2 +-
 drivers/staging/wilc1000/Kconfig                   |    1 +
 drivers/staging/wilc1000/host_interface.c          |   69 +-
 drivers/staging/wilc1000/host_interface.h          |   14 +-
 drivers/staging/wilc1000/wilc_spi.c                |   13 +-
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c  |   72 +-
 drivers/staging/wlan-ng/Kconfig                    |    1 +
 drivers/staging/wlan-ng/hfa384x.h                  |    4 +-
 drivers/staging/wlan-ng/hfa384x_usb.c              |    4 +-
 include/dt-bindings/iio/temperature/thermocouple.h |   16 +
 include/linux/iio/adc/ad_sigma_delta.h             |    1 +
 include/linux/iio/driver.h                         |    1 +
 include/linux/iio/frequency/ad9523.h               |    8 +-
 include/linux/iio/gyro/itg3200.h                   |    1 +
 include/linux/iio/iio.h                            |    4 +-
 include/linux/iio/imu/adis.h                       |   14 +
 613 files changed, 5771 insertions(+), 8480 deletions(-)
 rename {drivers/staging/iio/Documentation => Documentation/ABI/testing}/sysfs-bus-iio-impedance-analyzer-ad5933 (56%)
 create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-temperature-max31856
 create mode 100644 Documentation/devicetree/bindings/iio/accel/kionix,kxcjk1013.txt
 create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7780.txt
 create mode 100644 Documentation/devicetree/bindings/iio/gyroscope/bmg160.txt
 create mode 100644 Documentation/devicetree/bindings/iio/imu/adi,adis16480.txt
 create mode 100644 Documentation/devicetree/bindings/iio/light/vcnl4000.txt
 delete mode 100644 Documentation/devicetree/bindings/iio/proximity/devantech-srf04.txt
 create mode 100644 Documentation/devicetree/bindings/iio/proximity/devantech-srf04.yaml
 create mode 100644 Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.txt
 create mode 100644 Documentation/devicetree/bindings/iio/temperature/max31856.txt
 create mode 100644 Documentation/devicetree/bindings/iio/temperature/temperature-bindings.txt
 rename drivers/{staging => }/iio/adc/ad7780.c (63%)
 rename drivers/iio/imu/{adis16400_core.c => adis16400.c} (77%)
 delete mode 100644 drivers/iio/imu/adis16400.h
 delete mode 100644 drivers/iio/imu/adis16400_buffer.c
 create mode 100644 drivers/iio/proximity/mb1232.c
 create mode 100644 drivers/iio/temperature/max31856.c
 delete mode 100644 drivers/staging/mt7621-mmc/Kconfig
 delete mode 100644 drivers/staging/mt7621-mmc/Makefile
 delete mode 100644 drivers/staging/mt7621-mmc/TODO
 delete mode 100644 drivers/staging/mt7621-mmc/board.h
 delete mode 100644 drivers/staging/mt7621-mmc/dbg.c
 delete mode 100644 drivers/staging/mt7621-mmc/dbg.h
 delete mode 100644 drivers/staging/mt7621-mmc/mt6575_sd.h
 delete mode 100644 drivers/staging/mt7621-mmc/sd.c
 delete mode 100644 drivers/staging/rtl8192e/license
 create mode 100644 include/dt-bindings/iio/temperature/thermocouple.h
Merging mux/for-next (a1ad5ff63944 Merge branch 'i2c-mux/for-next' into for-next)
$ git merge mux/for-next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
Merging icc/icc-next (3901460f7782 Merge branch 'icc-qcs404' into icc-next)
$ git merge icc/icc-next
Auto-merging arch/arm64/boot/dts/qcom/qcs404.dtsi
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../bindings/interconnect/qcom,qcs404.txt          |  45 ++
 MAINTAINERS                                        |   1 +
 arch/arm64/boot/dts/qcom/qcs404.dtsi               |  25 ++
 drivers/interconnect/core.c                        |  13 +-
 drivers/interconnect/qcom/Kconfig                  |   8 +
 drivers/interconnect/qcom/Makefile                 |   2 +
 drivers/interconnect/qcom/qcs404.c                 | 488 +++++++++++++++++++++
 drivers/interconnect/qcom/qcs404_ids.h             |  86 ++++
 include/dt-bindings/interconnect/qcom,qcs404.h     |  88 ++++
 9 files changed, 744 insertions(+), 12 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,qcs404.txt
 create mode 100644 drivers/interconnect/qcom/qcs404.c
 create mode 100644 drivers/interconnect/qcom/qcs404_ids.h
 create mode 100644 include/dt-bindings/interconnect/qcom,qcs404.h
Merging slave-dma/next (23b846396b95 dmaengine: axi-dmac: extend support for ZynqMP arch)
$ git merge slave-dma/next
Auto-merging drivers/spi/spi-pxa2xx.c
Merge made by the 'recursive' strategy.
 drivers/dma/Kconfig               |  2 +-
 drivers/dma/amba-pl08x.c          | 22 ++++++++---
 drivers/dma/dma-axi-dmac.c        | 81 +++++++++++++++++++++++++++++----------
 drivers/dma/idma64.c              |  6 ++-
 drivers/dma/idma64.h              |  2 +
 drivers/dma/pl330.c               | 51 ++++++++++++++++++++++++
 drivers/dma/tegra210-adma.c       | 37 +++++++-----------
 drivers/dma/xgene-dma.c           |  4 +-
 drivers/spi/spi-pxa2xx.c          |  7 +---
 drivers/tty/serial/8250/8250_dw.c |  4 +-
 10 files changed, 154 insertions(+), 62 deletions(-)
Merging cgroup/for-next (4c38f5ca8455 Merge branch 'for-5.2' into for-next)
$ git merge cgroup/for-next
Merge made by the 'recursive' strategy.
 kernel/cgroup/cgroup.c   | 5 +----
 security/device_cgroup.c | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)
Merging scsi/for-next (6402eced3fa2 Merge branch 'misc' into for-next)
$ git merge scsi/for-next
Removing include/scsi/osd_types.h
Removing include/scsi/osd_sense.h
Removing include/scsi/osd_sec.h
Removing include/scsi/osd_protocol.h
Removing include/scsi/osd_attributes.h
Auto-merging drivers/scsi/ufs/ufs-qcom.c
Auto-merging drivers/scsi/ufs/Kconfig
Auto-merging drivers/scsi/sd.c
Auto-merging drivers/scsi/lpfc/lpfc_scsi.c
Auto-merging drivers/scsi/lpfc/lpfc_nvme.c
Auto-merging drivers/scsi/lpfc/lpfc_nportdisc.c
Auto-merging drivers/scsi/lpfc/lpfc_hbadisc.c
Auto-merging drivers/scsi/lpfc/lpfc_els.c
CONFLICT (content): Merge conflict in drivers/scsi/lpfc/lpfc_els.c
Auto-merging drivers/scsi/lpfc/lpfc_ct.c
Auto-merging MAINTAINERS
Auto-merging Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt
Resolved 'drivers/scsi/lpfc/lpfc_els.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 868548ba56c9] Merge remote-tracking branch 'scsi/for-next'
$ git diff -M --stat --summary HEAD^..
 .../devicetree/bindings/phy/phy-mtk-ufs.txt        |   38 +
 .../devicetree/bindings/ufs/cdns,ufshc.txt         |    5 +-
 .../devicetree/bindings/ufs/ufs-mediatek.txt       |   43 +
 .../devicetree/bindings/ufs/ufshcd-pltfrm.txt      |    2 -
 MAINTAINERS                                        |    7 +
 drivers/message/fusion/mptbase.c                   |    2 +-
 drivers/message/fusion/mptctl.c                    |    2 +-
 drivers/message/fusion/mptsas.c                    |   36 +-
 drivers/message/fusion/mptscsih.c                  |    4 +-
 drivers/message/fusion/mptspi.c                    |    5 -
 drivers/phy/mediatek/Kconfig                       |   10 +
 drivers/phy/mediatek/Makefile                      |    1 +
 drivers/phy/mediatek/phy-mtk-ufs.c                 |  245 +++++
 drivers/scsi/NCR5380.c                             |   11 +-
 drivers/scsi/atp870u.c                             |    7 +-
 drivers/scsi/be2iscsi/be_cmds.c                    |    2 +-
 drivers/scsi/bnx2fc/bnx2fc_io.c                    |    3 +-
 drivers/scsi/cxgbi/libcxgbi.c                      |    5 +-
 drivers/scsi/dpt_i2o.c                             |   12 +-
 drivers/scsi/gdth.c                                |    5 +-
 drivers/scsi/hpsa.c                                |   27 +-
 drivers/scsi/lpfc/lpfc.h                           |    1 +
 drivers/scsi/lpfc/lpfc_attr.c                      |  243 +++--
 drivers/scsi/lpfc/lpfc_bsg.c                       |  123 ++-
 drivers/scsi/lpfc/lpfc_bsg.h                       |    4 +-
 drivers/scsi/lpfc/lpfc_ct.c                        |   41 +-
 drivers/scsi/lpfc/lpfc_debugfs.c                   |  486 ++++-----
 drivers/scsi/lpfc/lpfc_debugfs.h                   |    8 +-
 drivers/scsi/lpfc/lpfc_els.c                       |   24 +-
 drivers/scsi/lpfc/lpfc_hbadisc.c                   |   26 +-
 drivers/scsi/lpfc/lpfc_hw4.h                       |   42 +-
 drivers/scsi/lpfc/lpfc_init.c                      |  135 ++-
 drivers/scsi/lpfc/lpfc_nportdisc.c                 |    7 +-
 drivers/scsi/lpfc/lpfc_nvme.c                      |   24 +-
 drivers/scsi/lpfc/lpfc_nvmet.c                     |   64 +-
 drivers/scsi/lpfc/lpfc_nvmet.h                     |    3 +-
 drivers/scsi/lpfc/lpfc_scsi.c                      |   15 +-
 drivers/scsi/lpfc/lpfc_sli.c                       |  350 +++---
 drivers/scsi/lpfc/lpfc_sli.h                       |   19 +-
 drivers/scsi/lpfc/lpfc_sli4.h                      |   54 +-
 drivers/scsi/lpfc/lpfc_version.h                   |    4 +-
 drivers/scsi/mpt3sas/Kconfig                       |    1 +
 drivers/scsi/mpt3sas/mpt3sas_base.c                |  178 +++-
 drivers/scsi/mpt3sas/mpt3sas_base.h                |   22 +-
 drivers/scsi/mvsas/mv_64xx.c                       |    3 +-
 drivers/scsi/mvsas/mv_94xx.c                       |    3 +-
 drivers/scsi/mvsas/mv_sas.c                        |    2 +-
 drivers/scsi/mvumi.c                               |    6 +-
 drivers/scsi/pm8001/pm8001_hwi.c                   |   37 +-
 drivers/scsi/pm8001/pm8001_init.c                  |    4 +-
 drivers/scsi/pm8001/pm8001_sas.c                   |    4 +-
 drivers/scsi/pm8001/pm8001_sas.h                   |    2 +-
 drivers/scsi/pm8001/pm80xx_hwi.c                   |   55 +-
 drivers/scsi/qedf/qedf.h                           |   51 +-
 drivers/scsi/qedf/qedf_debugfs.c                   |    2 -
 drivers/scsi/qedf/qedf_els.c                       |   72 +-
 drivers/scsi/qedf/qedf_fip.c                       |   78 +-
 drivers/scsi/qedf/qedf_io.c                        |  736 ++++++++++---
 drivers/scsi/qedf/qedf_main.c                      |  249 +++--
 drivers/scsi/qedf/qedf_version.h                   |    8 +-
 drivers/scsi/qedi/qedi_fw.c                        |    4 -
 drivers/scsi/qla2xxx/qla_attr.c                    |  309 ++++--
 drivers/scsi/qla2xxx/qla_bsg.c                     |   67 +-
 drivers/scsi/qla2xxx/qla_bsg.h                     |   11 +
 drivers/scsi/qla2xxx/qla_dbg.c                     |  190 ++--
 drivers/scsi/qla2xxx/qla_dbg.h                     |   10 +-
 drivers/scsi/qla2xxx/qla_def.h                     |  187 +++-
 drivers/scsi/qla2xxx/qla_dfs.c                     |    6 +-
 drivers/scsi/qla2xxx/qla_fw.h                      |   31 +-
 drivers/scsi/qla2xxx/qla_gbl.h                     |   91 +-
 drivers/scsi/qla2xxx/qla_gs.c                      |   88 +-
 drivers/scsi/qla2xxx/qla_init.c                    | 1116 ++++++++++++--------
 drivers/scsi/qla2xxx/qla_inline.h                  |    1 +
 drivers/scsi/qla2xxx/qla_iocb.c                    |    5 +-
 drivers/scsi/qla2xxx/qla_isr.c                     |   30 +-
 drivers/scsi/qla2xxx/qla_mbx.c                     |  319 ++++--
 drivers/scsi/qla2xxx/qla_mr.c                      |   46 +-
 drivers/scsi/qla2xxx/qla_nvme.c                    |   50 +-
 drivers/scsi/qla2xxx/qla_nx.c                      |   13 +-
 drivers/scsi/qla2xxx/qla_nx2.c                     |    8 +-
 drivers/scsi/qla2xxx/qla_os.c                      |  228 ++--
 drivers/scsi/qla2xxx/qla_sup.c                     |  971 +++++++++++------
 drivers/scsi/qla2xxx/qla_target.c                  |    7 +-
 drivers/scsi/qla2xxx/qla_tmpl.c                    |  447 ++++----
 drivers/scsi/qla2xxx/qla_tmpl.h                    |   76 +-
 drivers/scsi/qla2xxx/qla_version.h                 |    4 +-
 drivers/scsi/qla4xxx/ql4_os.c                      |    2 +-
 drivers/scsi/qlogicfas408.c                        |    4 +-
 drivers/scsi/scsi.c                                |   14 -
 drivers/scsi/scsi_error.c                          |    1 -
 drivers/scsi/scsi_lib.c                            |    2 +-
 drivers/scsi/scsi_pm.c                             |   22 +-
 drivers/scsi/scsi_priv.h                           |    3 -
 drivers/scsi/sd.c                                  |  110 +-
 drivers/scsi/smartpqi/Makefile                     |    1 +
 drivers/scsi/smartpqi/smartpqi.h                   |   15 +-
 drivers/scsi/smartpqi/smartpqi_init.c              |   51 +-
 drivers/scsi/smartpqi/smartpqi_sas_transport.c     |   15 +-
 drivers/scsi/smartpqi/smartpqi_sis.c               |   15 +-
 drivers/scsi/smartpqi/smartpqi_sis.h               |   15 +-
 drivers/scsi/ufs/Kconfig                           |   14 +
 drivers/scsi/ufs/Makefile                          |    1 +
 drivers/scsi/ufs/cdns-pltfrm.c                     |   74 +-
 drivers/scsi/ufs/ufs-hisi.c                        |  113 +-
 drivers/scsi/ufs/ufs-mediatek.c                    |  368 +++++++
 drivers/scsi/ufs/ufs-mediatek.h                    |   53 +
 drivers/scsi/ufs/ufs-qcom.c                        |  106 +-
 drivers/scsi/ufs/ufs.h                             |    1 -
 drivers/scsi/ufs/ufshcd-pltfrm.c                   |  112 +-
 drivers/scsi/ufs/ufshcd-pltfrm.h                   |   21 +
 drivers/scsi/ufs/ufshcd.c                          |   39 +-
 drivers/scsi/virtio_scsi.c                         |    2 +-
 drivers/target/iscsi/iscsi_target_login.c          |    9 +-
 drivers/target/target_core_alua.c                  |    6 +-
 drivers/target/target_core_configfs.c              |  158 ++-
 include/scsi/osd_attributes.h                      |  398 -------
 include/scsi/osd_protocol.h                        |  676 ------------
 include/scsi/osd_sec.h                             |   45 -
 include/scsi/osd_sense.h                           |  263 -----
 include/scsi/osd_types.h                           |   45 -
 include/scsi/scsi_host.h                           |    6 +-
 121 files changed, 6034 insertions(+), 4719 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/phy/phy-mtk-ufs.txt
 create mode 100644 Documentation/devicetree/bindings/ufs/ufs-mediatek.txt
 create mode 100644 drivers/phy/mediatek/phy-mtk-ufs.c
 create mode 100644 drivers/scsi/ufs/ufs-mediatek.c
 create mode 100644 drivers/scsi/ufs/ufs-mediatek.h
 delete mode 100644 include/scsi/osd_attributes.h
 delete mode 100644 include/scsi/osd_protocol.h
 delete mode 100644 include/scsi/osd_sec.h
 delete mode 100644 include/scsi/osd_sense.h
 delete mode 100644 include/scsi/osd_types.h
Merging scsi-mkp/for-next (523c106ad4b1 scsi: tcm_qla2xxx: Minimize #include directives)
$ git merge scsi-mkp/for-next
Auto-merging drivers/scsi/qla2xxx/qla_os.c
Auto-merging drivers/scsi/lpfc/lpfc_els.c
Merge made by the 'recursive' strategy.
 drivers/scsi/lpfc/lpfc_els.c       |   8 +++
 drivers/scsi/lpfc/lpfc_hw.h        |   4 ++
 drivers/scsi/lpfc/lpfc_nvme.c      |   4 +-
 drivers/scsi/qla2xxx/qla_attr.c    |   5 +-
 drivers/scsi/qla2xxx/qla_bsg.c     |   2 +-
 drivers/scsi/qla2xxx/qla_iocb.c    |  21 +++---
 drivers/scsi/qla2xxx/qla_isr.c     |  87 +++++++++++++------------
 drivers/scsi/qla2xxx/qla_nvme.c    |   6 +-
 drivers/scsi/qla2xxx/qla_os.c      | 127 +++++++++++++++++--------------------
 drivers/scsi/qla2xxx/tcm_qla2xxx.c |   7 --
 drivers/scsi/scsi_transport_fc.c   | 116 ++++++++++++++++-----------------
 include/scsi/scsi_transport_fc.h   |  15 +++--
 include/uapi/scsi/fc/fc_els.h      |  33 ++++++++++
 13 files changed, 239 insertions(+), 196 deletions(-)
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 (4e76105b74c1 virtio: use dependent_ptr_mb)
$ git merge vhost/linux-next
Auto-merging drivers/net/virtio_net.c
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
Auto-merging MAINTAINERS
Auto-merging Documentation/memory-barriers.txt
Resolved 'drivers/net/virtio_net.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 6706af2d79ad] 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 +
 Documentation/memory-barriers.txt                  |   20 +
 MAINTAINERS                                        |   22 +-
 arch/alpha/include/asm/barrier.h                   |    1 +
 drivers/iommu/Kconfig                              |   11 +
 drivers/iommu/Makefile                             |    1 +
 drivers/iommu/virtio-iommu.c                       | 1158 ++++++++++++++++++++
 drivers/net/virtio_net.c                           |   27 +-
 drivers/of/base.c                                  |   10 +-
 drivers/pci/of.c                                   |    7 +
 drivers/virtio/virtio_pci_common.c                 |    8 +-
 drivers/virtio/virtio_ring.c                       |   15 +-
 include/asm-generic/barrier.h                      |   18 +
 include/linux/compiler.h                           |    6 +-
 include/linux/virtio_ring.h                        |    2 +-
 include/uapi/linux/virtio_ids.h                    |    1 +
 include/uapi/linux/virtio_iommu.h                  |  161 +++
 18 files changed, 1543 insertions(+), 21 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 (0dcdbc0cfeb0 gpio: mmio: Fix bgpio_get_set & bgpio_get_set_multiple)
$ git merge gpio/for-next
Auto-merging drivers/gpio/gpiolib.c
Auto-merging drivers/gpio/gpio-aspeed.c
Merge made by the 'recursive' strategy.
 drivers/gpio/Kconfig               |  50 ++--
 drivers/gpio/gpio-74xx-mmio.c      |   4 +-
 drivers/gpio/gpio-amdpt.c          |   8 +-
 drivers/gpio/gpio-aspeed.c         |   4 +-
 drivers/gpio/gpio-bcm-kona.c       |   4 +-
 drivers/gpio/gpio-cadence.c        |   4 +-
 drivers/gpio/gpio-clps711x.c       |   7 +-
 drivers/gpio/gpio-dwapb.c          |   4 +-
 drivers/gpio/gpio-ftgpio010.c      |   4 +-
 drivers/gpio/gpio-hlwd.c           |   4 +-
 drivers/gpio/gpio-iop.c            |   4 +-
 drivers/gpio/gpio-janz-ttl.c       |   4 +-
 drivers/gpio/gpio-loongson1.c      |   4 +-
 drivers/gpio/gpio-lpc18xx.c        |   5 +-
 drivers/gpio/gpio-mb86s7x.c        |   4 +-
 drivers/gpio/gpio-mmio.c           | 106 +++----
 drivers/gpio/gpio-mt7621.c         |   3 +-
 drivers/gpio/gpio-mvebu.c          |   7 +-
 drivers/gpio/gpio-mxc.c            |   4 +-
 drivers/gpio/gpio-octeon.c         |   4 +-
 drivers/gpio/gpio-omap.c           | 547 ++++++++++++++++++-------------------
 drivers/gpio/gpio-pxa.c            |   8 +-
 drivers/gpio/gpio-rcar.c           |   5 +-
 drivers/gpio/gpio-spear-spics.c    |   4 +-
 drivers/gpio/gpio-sprd.c           |   4 +-
 drivers/gpio/gpio-sta2x11.c        |   5 +-
 drivers/gpio/gpio-stp-xway.c       |   4 +-
 drivers/gpio/gpio-tb10x.c          |   4 +-
 drivers/gpio/gpio-tegra.c          |   4 +-
 drivers/gpio/gpio-timberdale.c     |   4 +-
 drivers/gpio/gpio-ts4800.c         |   4 +-
 drivers/gpio/gpio-uniphier.c       |   4 +-
 drivers/gpio/gpio-vf610.c          |   7 +-
 drivers/gpio/gpio-xgene-sb.c       |   4 +-
 drivers/gpio/gpio-xlp.c            |   7 +-
 drivers/gpio/gpio-zx.c             |   4 +-
 drivers/gpio/gpio-zynq.c           |   4 +-
 drivers/gpio/gpiolib.c             |  16 +-
 drivers/pinctrl/pinctrl-mcp23s08.c | 110 --------
 include/linux/gpio/driver.h        |  15 +-
 40 files changed, 411 insertions(+), 591 deletions(-)
Merging gpio-brgl/gpio/for-next (b0d2569d8276 gpio: mlxbf: remove unused including <linux/version.h>)
$ git merge gpio-brgl/gpio/for-next
Auto-merging drivers/gpio/gpiolib.c
Auto-merging drivers/gpio/gpio-vf610.c
Auto-merging drivers/gpio/gpio-omap.c
Auto-merging drivers/gpio/Kconfig
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/gpio/gpio-pca953x.txt      |   1 +
 drivers/gpio/Kconfig                               |  33 +++--
 drivers/gpio/Makefile                              |   1 +
 drivers/gpio/gpio-74x164.c                         |  22 ++-
 drivers/gpio/gpio-mlxbf.c                          | 152 +++++++++++++++++++++
 drivers/gpio/gpio-omap.c                           |  61 +++++----
 drivers/gpio/gpio-pca953x.c                        |   1 +
 drivers/gpio/gpio-vf610.c                          |  85 +++++-------
 drivers/gpio/gpiolib-acpi.c                        |  45 +++---
 drivers/gpio/gpiolib.c                             |   3 +-
 10 files changed, 279 insertions(+), 125 deletions(-)
 create mode 100644 drivers/gpio/gpio-mlxbf.c
Merging pinctrl/for-next (96900dd31306 Merge branch 'devel' into for-next)
$ git merge pinctrl/for-next
Auto-merging include/linux/gpio/driver.h
Auto-merging drivers/pinctrl/pinctrl-mcp23s08.c
Merge made by the 'recursive' strategy.
 .../bindings/pinctrl/cirrus,lochnagar.txt          |  141 +++
 .../devicetree/bindings/pinctrl/pinctrl-mt8183.txt |  132 +++
 arch/sh/include/cpu-sh4/cpu/sh7786.h               |    2 +-
 drivers/gpio/gpiolib-devprop.c                     |    2 +
 drivers/gpio/gpiolib.h                             |    3 -
 drivers/pinctrl/cirrus/Kconfig                     |   10 +
 drivers/pinctrl/cirrus/Makefile                    |    2 +
 drivers/pinctrl/cirrus/pinctrl-lochnagar.c         | 1235 ++++++++++++++++++++
 drivers/pinctrl/freescale/pinctrl-scu.c            |    2 +-
 drivers/pinctrl/mediatek/pinctrl-mt8183.c          |   50 +
 drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c   |   49 +
 drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h   |   11 +
 drivers/pinctrl/mediatek/pinctrl-paris.c           |   21 +
 drivers/pinctrl/pinctrl-artpec6.c                  |   10 +-
 drivers/pinctrl/pinctrl-axp209.c                   |    2 +
 drivers/pinctrl/pinctrl-mcp23s08.c                 |    3 +-
 drivers/pinctrl/pinctrl-rza1.c                     |   18 +-
 drivers/pinctrl/sh-pfc/Kconfig                     |  204 ++--
 drivers/pinctrl/sh-pfc/Makefile                    |   15 +
 drivers/pinctrl/sh-pfc/core.c                      |  130 +++
 drivers/pinctrl/sh-pfc/gpio.c                      |    8 +-
 drivers/pinctrl/sh-pfc/pfc-emev2.c                 |   67 +-
 drivers/pinctrl/sh-pfc/pfc-r8a73a4.c               |   64 +-
 drivers/pinctrl/sh-pfc/pfc-r8a7740.c               |   56 +-
 drivers/pinctrl/sh-pfc/pfc-r8a77470.c              |  136 ++-
 drivers/pinctrl/sh-pfc/pfc-r8a7778.c               |  101 +-
 drivers/pinctrl/sh-pfc/pfc-r8a7779.c               |  235 +++-
 drivers/pinctrl/sh-pfc/pfc-r8a7790.c               |  132 ++-
 drivers/pinctrl/sh-pfc/pfc-r8a7791.c               |  156 +--
 drivers/pinctrl/sh-pfc/pfc-r8a7792.c               |  134 ++-
 drivers/pinctrl/sh-pfc/pfc-r8a7794.c               |  127 +-
 drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c           |  222 ++--
 drivers/pinctrl/sh-pfc/pfc-r8a7795.c               |  201 ++--
 drivers/pinctrl/sh-pfc/pfc-r8a7796.c               |  225 ++--
 drivers/pinctrl/sh-pfc/pfc-r8a77965.c              |  294 +++--
 drivers/pinctrl/sh-pfc/pfc-r8a77970.c              |  123 +-
 drivers/pinctrl/sh-pfc/pfc-r8a77980.c              |  135 +--
 drivers/pinctrl/sh-pfc/pfc-r8a77990.c              |  214 ++--
 drivers/pinctrl/sh-pfc/pfc-r8a77995.c              |  120 +-
 drivers/pinctrl/sh-pfc/pfc-sh7203.c                |  152 +--
 drivers/pinctrl/sh-pfc/pfc-sh7264.c                |  232 ++--
 drivers/pinctrl/sh-pfc/pfc-sh7269.c                |  252 ++--
 drivers/pinctrl/sh-pfc/pfc-sh73a0.c                |   52 +-
 drivers/pinctrl/sh-pfc/pfc-sh7720.c                |  144 +--
 drivers/pinctrl/sh-pfc/pfc-sh7722.c                |  220 ++--
 drivers/pinctrl/sh-pfc/pfc-sh7723.c                |  200 ++--
 drivers/pinctrl/sh-pfc/pfc-sh7724.c                |  204 ++--
 drivers/pinctrl/sh-pfc/pfc-sh7734.c                |  140 ++-
 drivers/pinctrl/sh-pfc/pfc-sh7757.c                |  244 ++--
 drivers/pinctrl/sh-pfc/pfc-sh7785.c                |  136 +--
 drivers/pinctrl/sh-pfc/pfc-sh7786.c                |   80 +-
 drivers/pinctrl/sh-pfc/pfc-shx3.c                  |   32 +-
 drivers/pinctrl/sh-pfc/sh_pfc.h                    |   68 +-
 drivers/pinctrl/sunxi/Kconfig                      |   57 +-
 drivers/pinctrl/sunxi/pinctrl-sunxi.c              |   40 +-
 include/linux/gpio/driver.h                        |    3 +
 56 files changed, 4583 insertions(+), 2465 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/pinctrl/cirrus,lochnagar.txt
 create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-mt8183.txt
 create mode 100644 drivers/pinctrl/cirrus/pinctrl-lochnagar.c
Merging pinctrl-samsung/for-next (9e98c678c2d6 Linux 5.1-rc1)
$ git merge pinctrl-samsung/for-next
Already up to date.
Merging pwm/for-next (9ff06679e109 pwm: sysfs: fix typo "its" -> "it's")
$ git merge pwm/for-next
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt |  1 +
 drivers/pwm/Kconfig                                    |  5 ++---
 drivers/pwm/core.c                                     | 10 +++++-----
 drivers/pwm/pwm-img.c                                  |  2 +-
 drivers/pwm/pwm-tiehrpwm.c                             |  2 ++
 drivers/pwm/sysfs.c                                    | 16 ++--------------
 include/linux/pwm.h                                    |  5 -----
 7 files changed, 13 insertions(+), 28 deletions(-)
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 (6cd110a91f52 ktest: Take submenu into account for grub2 menus)
$ git merge ktest/for-next
Already up to date.
Merging random/dev (05cbbb6f9ed5 drivers/char/random.c: make primary_crng static)
$ git merge random/dev
Auto-merging drivers/char/random.c
Merge made by the 'recursive' strategy.
 drivers/char/random.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
Merging kselftest/next (e14d314c7a48 selftests: cgroup: fix cleanup path in test_memcg_subtree_control())
$ git merge kselftest/next
Auto-merging lib/test_printf.c
Auto-merging lib/Kconfig.debug
Merge made by the 'recursive' strategy.
 Documentation/dev-tools/kselftest.rst              |  94 ++++++++++++-
 include/linux/string.h                             |   4 +
 lib/Kconfig.debug                                  |   3 +
 lib/Makefile                                       |   1 +
 lib/string.c                                       |  47 ++++++-
 lib/test_bitmap.c                                  |  20 +--
 lib/test_printf.c                                  |  17 +--
 lib/test_strscpy.c                                 | 150 +++++++++++++++++++++
 tools/testing/selftests/cgroup/test_memcontrol.c   |  38 +++---
 tools/testing/selftests/gpio/gpio-mockup-chardev.c |   1 -
 tools/testing/selftests/kselftest_module.h         |  48 +++++++
 tools/testing/selftests/kselftest_module.sh        |  84 ++++++++++++
 tools/testing/selftests/lib/Makefile               |   2 +-
 tools/testing/selftests/lib/bitmap.sh              |  18 +--
 tools/testing/selftests/lib/config                 |   1 +
 tools/testing/selftests/lib/prime_numbers.sh       |  17 +--
 tools/testing/selftests/lib/printf.sh              |  19 +--
 tools/testing/selftests/lib/strscpy.sh             |   3 +
 tools/testing/selftests/rseq/rseq.h                |   1 -
 tools/testing/selftests/timers/skew_consistency.c  |   1 -
 tools/testing/selftests/x86/mpx-dig.c              |   2 -
 21 files changed, 461 insertions(+), 110 deletions(-)
 create mode 100644 lib/test_strscpy.c
 create mode 100644 tools/testing/selftests/kselftest_module.h
 create mode 100755 tools/testing/selftests/kselftest_module.sh
 create mode 100755 tools/testing/selftests/lib/strscpy.sh
Merging y2038/y2038 (a2318b6a16a8 riscv: Use latest system call ABI)
$ git merge y2038/y2038
Auto-merging arch/riscv/Kconfig
Merge made by the 'recursive' strategy.
Merging livepatching/for-next (768321fdbcb1 Merge branch 'for-5.1-upstream-fixes' into for-next)
$ git merge livepatching/for-next
Merge made by the 'recursive' strategy.
 tools/testing/selftests/livepatch/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging coresight/next (d5d246a56af0 coresight: Merge the static and dynamic replicator drivers)
$ git merge coresight/next
Removing drivers/hwtracing/coresight/coresight-dynamic-replicator.c
Merge made by the 'recursive' strategy.
 drivers/hwtracing/coresight/Kconfig                |   8 -
 drivers/hwtracing/coresight/Makefile               |   1 -
 drivers/hwtracing/coresight/coresight-catu.c       |   4 +-
 drivers/hwtracing/coresight/coresight-catu.h       |   5 -
 .../coresight/coresight-dynamic-replicator.c       | 255 ---------------------
 drivers/hwtracing/coresight/coresight-replicator.c | 232 ++++++++++++++++---
 drivers/hwtracing/coresight/coresight-tmc-etr.c    |   5 +-
 drivers/hwtracing/coresight/coresight-tmc.c        |   7 +-
 tools/perf/util/cs-etm.c                           |  12 +-
 9 files changed, 222 insertions(+), 307 deletions(-)
 delete mode 100644 drivers/hwtracing/coresight/coresight-dynamic-replicator.c
Merging rtc/rtc-next (43dae505dae6 rtc: test: use .set_time)
$ git merge rtc/rtc-next
Auto-merging drivers/rtc/rtc-sh.c
Auto-merging drivers/rtc/rtc-omap.c
CONFLICT (content): Merge conflict in drivers/rtc/rtc-omap.c
Auto-merging drivers/rtc/rtc-da9063.c
Auto-merging drivers/rtc/Kconfig
Recorded preimage for 'drivers/rtc/rtc-omap.c'
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
Recorded resolution for 'drivers/rtc/rtc-omap.c'.
[master dcb8ee9b792a] Merge remote-tracking branch 'rtc/rtc-next'
$ git diff -M --stat --summary HEAD^..
 .../devicetree/bindings/rtc/nxp,pcf85063.txt       |   6 +-
 .../devicetree/bindings/rtc/rtc-aspeed.txt         |  22 +
 Documentation/devicetree/bindings/rtc/rtc.txt      |   1 +
 drivers/rtc/Kconfig                                |  19 +-
 drivers/rtc/Makefile                               |   1 +
 drivers/rtc/class.c                                |  21 +-
 drivers/rtc/dev.c                                  |  20 +-
 drivers/rtc/hctosys.c                              |  10 +-
 drivers/rtc/interface.c                            | 113 +++---
 drivers/rtc/lib.c                                  |  30 +-
 drivers/rtc/nvmem.c                                |   7 +-
 drivers/rtc/proc.c                                 |  21 +-
 drivers/rtc/rtc-88pm80x.c                          |  14 +-
 drivers/rtc/rtc-ab-b5ze-s3.c                       | 189 +++------
 drivers/rtc/rtc-abx80x.c                           |  43 +-
 drivers/rtc/rtc-aspeed.c                           | 136 +++++++
 drivers/rtc/rtc-at91sam9.c                         | 108 ++---
 drivers/rtc/rtc-brcmstb-waketimer.c                |   2 +-
 drivers/rtc/rtc-da9063.c                           |  27 +-
 drivers/rtc/rtc-dm355evm.c                         |  24 +-
 drivers/rtc/rtc-goldfish.c                         |  50 +--
 drivers/rtc/rtc-mt6397.c                           |   9 +-
 drivers/rtc/rtc-mv.c                               |  33 +-
 drivers/rtc/rtc-mxc.c                              |   4 +-
 drivers/rtc/rtc-omap.c                             |  32 +-
 drivers/rtc/rtc-opal.c                             |   2 +-
 drivers/rtc/rtc-pcf85063.c                         | 446 ++++++++++++++++-----
 drivers/rtc/rtc-ps3.c                              |  30 +-
 drivers/rtc/rtc-sh.c                               |  30 +-
 drivers/rtc/rtc-snvs.c                             |  29 +-
 drivers/rtc/rtc-sun4v.c                            |  21 +-
 drivers/rtc/rtc-test.c                             |  11 +-
 drivers/rtc/rtc-wm831x.c                           |  43 +-
 drivers/rtc/rtc-x1205.c                            |   7 +
 drivers/rtc/rtc-xgene.c                            |  61 ++-
 drivers/rtc/rtc-zynqmp.c                           |  13 +-
 drivers/rtc/sysfs.c                                |  23 +-
 drivers/rtc/systohc.c                              |   7 +-
 include/linux/rtc.h                                |   4 +-
 39 files changed, 906 insertions(+), 763 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/rtc/rtc-aspeed.txt
 create mode 100644 drivers/rtc/rtc-aspeed.c
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 6aadc6a5f998] 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
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/eeprom/at24.txt | 1 +
 MAINTAINERS                                       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
Merging ntb/ntb-next (6202b3c150bc NTB: ntb_test: Fix bug when counting remote files)
$ git merge ntb/ntb-next
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 (50ceaa95ea09 lib: Introduce test_stackinit module)
$ 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
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/gnss/u-blox.txt | 1 +
 drivers/gnss/ubx.c                                | 1 +
 2 files changed, 2 insertions(+)
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.
 drivers/slimbus/qcom-ngd-ctrl.c | 4 ++++
 1 file changed, 4 insertions(+)
Merging nvmem/for-next (f7e49c81df8e nvmem: sunxi_sid: Support SID on H6)
$ git merge nvmem/for-next
Merge made by the 'recursive' strategy.
 .../bindings/nvmem/allwinner,sunxi-sid.txt         |   3 +-
 .../devicetree/bindings/nvmem/imx-ocotp.txt        |   4 +-
 .../devicetree/bindings/nvmem/st,stm32-romem.txt   |  31 ++++
 drivers/nvmem/Kconfig                              |  14 +-
 drivers/nvmem/Makefile                             |   2 +
 drivers/nvmem/core.c                               |  52 +++++-
 drivers/nvmem/imx-iim.c                            |   4 +-
 drivers/nvmem/imx-ocotp.c                          |  11 +-
 drivers/nvmem/mxs-ocotp.c                          |   4 +-
 drivers/nvmem/stm32-romem.c                        | 202 +++++++++++++++++++++
 drivers/nvmem/sunxi_sid.c                          | 115 +++++-------
 include/linux/nvmem-consumer.h                     |   7 +
 12 files changed, 362 insertions(+), 87 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/nvmem/st,stm32-romem.txt
 create mode 100644 drivers/nvmem/stm32-romem.c
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 (396ae57ef1ef Drivers: hv: vmbus: Expose counters for interrupts and full conditions)
$ git merge hyperv/hyperv-next
Already up to date.
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 (97498c96a186 kgdb/treewide: constify struct kgdb_arch arch_kgdb_ops)
$ git merge kgdb-dt/kgdb/for-next
Auto-merging arch/x86/kernel/kgdb.c
Auto-merging arch/sparc/kernel/smp_64.c
Auto-merging arch/sh/kernel/kgdb.c
Auto-merging arch/powerpc/kernel/kgdb.c
Auto-merging arch/mips/kernel/kgdb.c
Auto-merging arch/arm64/kernel/kgdb.c
Merge made by the 'recursive' strategy.
Merging pidfd/for-next (9e98c678c2d6 Linux 5.1-rc1)
$ git merge pidfd/for-next
Already up to date.
Merging devfreq/for-next (e143645ca40d PM / devfreq: rk3399_dmc: Pass ODT and auto power down parameters to TF-A.)
$ git merge devfreq/for-next
Merge made by the 'recursive' strategy.
 drivers/devfreq/devfreq-event.c      |  2 +-
 drivers/devfreq/devfreq.c            | 85 +++++++++++++++++++++++-------------
 drivers/devfreq/event/exynos-ppmu.c  |  2 +-
 drivers/devfreq/event/rockchip-dfi.c | 25 ++++-------
 drivers/devfreq/exynos-bus.c         |  8 ++++
 drivers/devfreq/rk3399_dmc.c         | 73 ++++++++++++++++++++++++++++++-
 drivers/devfreq/tegra-devfreq.c      |  7 +--
 include/soc/rockchip/rk3399_grf.h    | 21 +++++++++
 include/soc/rockchip/rockchip_sip.h  |  1 +
 9 files changed, 167 insertions(+), 57 deletions(-)
 create mode 100644 include/soc/rockchip/rk3399_grf.h
$ git am -3 ../patches/0001-Mark-Cirrus-driver-for-QEMU-emulated-device-as-broke.patch
Applying: Mark Cirrus driver for QEMU emulated device as broken for now
$ git am -3 ../patches/0001-Revert-scsi-tcm_qla2xxx-Minimize-include-directives.patch
Applying: Revert "scsi: tcm_qla2xxx: Minimize #include directives"
Merging akpm-current/current (554f5a36e081 ipc: do cyclic id allocation for the ipc object.)
$ git merge --no-ff akpm-current/current
Auto-merging scripts/checkpatch.pl
Auto-merging lib/test_bitmap.c
Removing lib/rational.c
Auto-merging lib/iov_iter.c
Auto-merging lib/Makefile
Auto-merging lib/Kconfig.debug
Auto-merging kernel/cgroup/cgroup.c
Auto-merging ipc/util.c
Auto-merging include/linux/kernel.h
Auto-merging drivers/tty/sysrq.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/uverbs_main.c
Auto-merging drivers/infiniband/core/umem.c
Auto-merging arch/parisc/mm/init.c
Auto-merging arch/nds32/mm/init.c
Auto-merging arch/arm64/mm/init.c
Auto-merging Documentation/admin-guide/kernel-parameters.txt
Merge made by the 'recursive' strategy.
 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    |   17 +-
 Documentation/core-api/genalloc.rst                |    2 +-
 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                                   |    1 +
 arch/arm/mm/dma-mapping.c                          |    2 +-
 arch/arm/mm/init.c                                 |   25 +-
 arch/arm64/Kconfig                                 |    3 +-
 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/mm/init.c                             |   10 -
 arch/ia64/mm/init.c                                |    6 +-
 arch/m68k/mm/init.c                                |    7 -
 arch/microblaze/mm/init.c                          |   12 -
 arch/mips/mm/gup.c                                 |   11 +-
 arch/mips/mm/init.c                                |    8 -
 arch/nds32/mm/init.c                               |   12 -
 arch/nios2/mm/init.c                               |   12 -
 arch/openrisc/mm/init.c                            |   12 -
 arch/parisc/mm/init.c                              |    7 -
 arch/powerpc/include/asm/book3s/64/hugetlb.h       |    5 +-
 arch/powerpc/kernel/process.c                      |   12 +-
 arch/powerpc/kvm/book3s_64_mmu_hv.c                |    4 +-
 arch/powerpc/kvm/e500_mmu.c                        |    2 +-
 arch/powerpc/mm/fault.c                            |    6 +-
 arch/powerpc/mm/mem.c                              |   13 +-
 arch/powerpc/mm/mmu_context_iommu.c                |    3 +-
 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                                  |    2 +-
 arch/s390/include/asm/hugetlb.h                    |    8 +-
 arch/s390/kvm/interrupt.c                          |    2 +-
 arch/s390/mm/gup.c                                 |   12 +-
 arch/s390/mm/init.c                                |   14 +-
 arch/sh/Kconfig                                    |    1 +
 arch/sh/boards/mach-dreamcast/irq.c                |    1 -
 arch/sh/mm/gup.c                                   |   11 +-
 arch/sh/mm/init.c                                  |   18 +-
 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                                   |    2 +-
 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                              |    6 +-
 arch/x86/mm/init_64.c                              |   10 +-
 arch/xtensa/mm/init.c                              |    5 -
 drivers/base/memory.c                              |   14 +-
 drivers/fpga/dfl-afu-dma-region.c                  |    2 +-
 drivers/gpu/drm/via/via_dmablit.c                  |    3 +-
 drivers/infiniband/core/umem.c                     |    5 +-
 drivers/infiniband/core/uverbs_main.c              |    3 +
 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/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/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                |    3 +-
 drivers/vfio/vfio_iommu_type1.c                    |    3 +-
 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                               |    2 +-
 fs/binfmt_elf.c                                    |   29 +-
 fs/buffer.c                                        |   56 +-
 fs/dax.c                                           |    2 +-
 fs/eventfd.c                                       |    8 +
 fs/hugetlbfs/inode.c                               |    7 +-
 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/export.c                                  |   30 +-
 fs/ocfs2/ocfs2_fs.h                                |   28 +-
 fs/orangefs/orangefs-bufmap.c                      |    2 +-
 fs/proc/base.c                                     |    2 +-
 fs/proc/task_mmu.c                                 |   18 +
 fs/ramfs/inode.c                                   |   12 +
 fs/userfaultfd.c                                   |   14 +
 include/asm-generic/hugetlb.h                      |    7 +
 include/asm-generic/shmparam.h                     |    2 +-
 include/linux/balloon_compaction.h                 |   15 -
 include/linux/bitops.h                             |   12 +
 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/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                           |   41 +
 include/linux/memcontrol.h                         |   54 +-
 include/linux/memory_hotplug.h                     |   34 +-
 include/linux/mm.h                                 |  113 +-
 include/linux/mm_inline.h                          |    2 +-
 include/linux/mm_types.h                           |    5 +-
 include/linux/mmzone.h                             |   64 +-
 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                             |    2 +
 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/sched/mm.h                           |   21 +
 include/linux/shmem_fs.h                           |    1 +
 include/linux/uaccess.h                            |   34 +
 include/linux/userfaultfd_k.h                      |    2 +
 include/linux/vmalloc.h                            |    6 +-
 include/linux/vmstat.h                             |    2 +-
 include/trace/events/compaction.h                  |   10 +-
 include/trace/events/vmscan.h                      |   78 +-
 init/Kconfig                                       |   23 +
 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/debug/kdb/Makefile                          |    1 -
 kernel/debug/kdb/kdb_main.c                        |    1 -
 kernel/dma/remap.c                                 |    2 +-
 kernel/exit.c                                      |    6 +-
 kernel/fork.c                                      |   37 +-
 kernel/futex.c                                     |    2 +-
 kernel/gcov/Makefile                               |    4 +-
 kernel/gcov/base.c                                 |   84 +-
 kernel/gcov/gcc_base.c                             |   86 ++
 kernel/gcov/gcov.h                                 |    3 +
 kernel/kthread.c                                   |    1 +
 kernel/latencytop.c                                |    8 +-
 kernel/memremap.c                                  |   12 +-
 kernel/notifier.c                                  |    1 +
 kernel/panic.c                                     |    5 +
 kernel/pid.c                                       |   10 +-
 kernel/printk/printk.c                             |   10 +
 kernel/reboot.c                                    |   20 +-
 kernel/sched/psi.c                                 |  615 +++++++++--
 kernel/signal.c                                    |    1 +
 kernel/sys.c                                       |    2 +-
 kernel/sysctl.c                                    |   24 +-
 lib/Kconfig                                        |   14 +-
 lib/Kconfig.debug                                  |    8 +-
 lib/Makefile                                       |   15 +-
 lib/bitmap.c                                       |  283 ++---
 lib/debugobjects.c                                 |   66 +-
 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 +-
 mm/Kconfig                                         |    5 +-
 mm/Makefile                                        |    7 +-
 mm/cma.c                                           |   23 +-
 mm/cma_debug.c                                     |    2 +-
 mm/compaction.c                                    |    8 +-
 mm/filemap.c                                       |  163 ++-
 mm/gup.c                                           |  393 +++++--
 mm/gup_benchmark.c                                 |    5 +-
 mm/hmm.c                                           | 1077 +++++++++++++------
 mm/huge_memory.c                                   |    3 +
 mm/hugetlb.c                                       |  146 ++-
 mm/khugepaged.c                                    |    4 +-
 mm/memblock.c                                      |   64 ++
 mm/memcontrol.c                                    |  112 +-
 mm/memfd.c                                         |    2 +
 mm/memory.c                                        |    2 +-
 mm/memory_hotplug.c                                |   68 +-
 mm/migrate.c                                       |    2 +-
 mm/mincore.c                                       |   23 +-
 mm/mmap.c                                          |    7 +-
 mm/page_alloc.c                                    |  336 +++---
 mm/page_isolation.c                                |    2 -
 mm/rmap.c                                          |    4 +-
 mm/shmem.c                                         |   59 +-
 mm/shuffle.c                                       |  207 ++++
 mm/shuffle.h                                       |   64 ++
 mm/slab.c                                          |   56 +-
 mm/slob.c                                          |   59 +-
 mm/slub.c                                          |   83 +-
 mm/sparse.c                                        |   16 +-
 mm/swap.c                                          |    2 +-
 mm/swap_state.c                                    |    4 +-
 mm/swapfile.c                                      |   36 +-
 mm/userfaultfd.c                                   |    3 +-
 mm/util.c                                          |    8 +-
 mm/vmalloc.c                                       | 1127 +++++++++++++++-----
 mm/vmscan.c                                        |  257 ++---
 mm/workingset.c                                    |    5 +-
 net/ceph/pagevec.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/config.py                        |   44 +
 scripts/gdb/linux/constants.py.in                  |   13 +
 scripts/gdb/linux/cpus.py                          |    1 +
 scripts/gdb/linux/lists.py                         |    1 +
 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                         |    3 +
 scripts/spelling.txt                               |  579 ++++++++--
 tools/vm/slabinfo.c                                |    7 +-
 271 files changed, 7583 insertions(+), 2991 deletions(-)
 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/config.py
 create mode 100644 scripts/gdb/linux/rbtree.py
 create mode 100644 scripts/gdb/linux/timerlist.py
$ 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: scripts/atomic/gen-atomics.sh: don't assume that scripts are executable
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: kernel, resource: use resource_overlaps() to simplify region_intersects()
Applying: treewide: replace #include <asm/sizes.h> with #include <linux/sizes.h>
Applying: arch: remove <asm/sizes.h> amd <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: 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
 + 0ee526e7da2a...b5887c35f547 akpm       -> akpm/master  (forced update)
$ rm -rf ../rebase-tmp
Merging akpm/master (b5887c35f547 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                         |  34 +++--
 include/linux/sched/signal.h                       |  51 +++----
 kernel/cgroup/cgroup.c                             |  16 ++-
 kernel/iomem.c                                     |   4 +-
 kernel/resource.c                                  |  11 +-
 mm/memcontrol.c                                    | 148 +++++++++++----------
 scripts/atomic/gen-atomics.sh                      |   2 +-
 91 files changed, 245 insertions(+), 217 deletions(-)
 delete mode 100644 include/asm-generic/sizes.h