path: root/Next/merge.log

$ date -R
Mon, 22 Jun 2020 08:14:15 +1000
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at 8b6ddd10d678 Merge tag 'trace-v5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Merging origin/master (16f4aa9b7c23 Merge tag 'pinctrl-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl)
$ git merge origin/master
Updating 8b6ddd10d678..16f4aa9b7c23
Fast-forward
 Documentation/driver-api/media/v4l2-subdev.rst    |  2 +-
 Documentation/i2c/smbus-protocol.rst              |  2 +-
 Documentation/userspace-api/media/conf_nitpick.py |  2 +-
 MAINTAINERS                                       |  9 ++++++++
 Makefile                                          | 16 ++++-----------
 arch/arm64/Kconfig                                |  2 +-
 arch/powerpc/include/asm/nohash/32/pgtable.h      | 18 +++++++++++-----
 arch/powerpc/kernel/exceptions-64s.S              |  4 ++--
 arch/powerpc/kernel/process.c                     | 20 ++++++++++--------
 arch/powerpc/platforms/cell/spu_callbacks.c       |  2 +-
 arch/x86/platform/intel-mid/sfi.c                 |  4 ++--
 crypto/algboss.c                                  |  2 --
 crypto/algif_skcipher.c                           |  6 +-----
 crypto/drbg.c                                     |  6 ++++--
 drivers/char/hw_random/ks-sa-rng.c                |  1 +
 drivers/crypto/caam/Kconfig                       |  2 +-
 drivers/crypto/caam/ctrl.c                        | 18 ++++++++--------
 drivers/crypto/caam/desc.h                        |  4 ++--
 drivers/crypto/caam/pdb.h                         |  2 +-
 drivers/crypto/ccp/sev-dev.c                      | 23 ++++++++++++++-------
 drivers/crypto/hisilicon/sgl.c                    |  3 ++-
 drivers/crypto/marvell/octeontx/otx_cptvf_algs.c  | 11 ++++++----
 drivers/gpu/drm/drm_encoder_slave.c               | 15 +++++---------
 drivers/i2c/i2c-core-base.c                       | 25 -----------------------
 drivers/i2c/i2c-core-smbus.c                      |  2 +-
 drivers/pinctrl/freescale/pinctrl-imx.c           |  7 +++----
 drivers/pinctrl/pinctrl-mcp23s08_spi.c            |  5 +----
 drivers/pinctrl/pinctrl-single.c                  |  2 +-
 drivers/pinctrl/qcom/pinctrl-ipq6018.c            |  3 ++-
 drivers/pinctrl/qcom/pinctrl-spmi-gpio.c          | 21 +++++++++----------
 drivers/pinctrl/tegra/pinctrl-tegra.c             |  4 ++--
 drivers/scsi/aic94xx/aic94xx_init.c               |  1 +
 drivers/scsi/hisi_sas/hisi_sas_v1_hw.c            |  1 +
 drivers/scsi/hisi_sas/hisi_sas_v2_hw.c            |  1 +
 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c            |  1 +
 drivers/scsi/ipr.c                                |  1 +
 drivers/scsi/isci/init.c                          |  1 +
 drivers/scsi/mvsas/mv_init.c                      |  1 +
 drivers/scsi/pm8001/pm8001_init.c                 |  1 +
 drivers/scsi/ufs/ufs_bsg.c                        |  4 +++-
 drivers/video/backlight/tosa_lcd.c                |  4 ++--
 include/asm-generic/hugetlb.h                     |  2 +-
 include/linux/i2c.h                               |  8 +++-----
 include/linux/libata.h                            |  4 ++++
 include/linux/pgtable.h                           |  7 +++++++
 include/linux/psp-sev.h                           |  2 +-
 lib/Kconfig.debug                                 |  1 -
 mm/gup.c                                          |  4 ++--
 samples/Kconfig                                   |  2 +-
 samples/watch_queue/Makefile                      | 10 ++++-----
 scripts/Kbuild.include                            | 11 +++++-----
 scripts/Kconfig.include                           |  8 +-------
 scripts/headers_install.sh                        |  2 +-
 53 files changed, 159 insertions(+), 161 deletions(-)
Merging fixes/master (9bd7b7c45d71 sched: Fix RANDSTRUCT build fail)
$ git merge fixes/master
Updating 16f4aa9b7c23..9bd7b7c45d71
Fast-forward
 include/linux/sched.h    | 6 ++++--
 security/device_cgroup.c | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)
Merging kbuild-current/fixes (214377e9b7e3 samples: watch_queue: build sample program for target architecture)
$ git merge kbuild-current/fixes
Already up to date.
Merging arc-current/for-curr (10011f7d95de ARCv2: support loop buffer (LPB) disabling)
$ git merge arc-current/for-curr
Merge made by the 'recursive' strategy.
 arch/arc/Kconfig                        | 15 +++++++++++++++
 arch/arc/Makefile                       | 21 +++++++++++++++++++--
 arch/arc/include/asm/elf.h              |  2 +-
 arch/arc/include/asm/irqflags-compact.h |  5 ++++-
 arch/arc/kernel/entry.S                 | 16 +++++-----------
 arch/arc/kernel/head.S                  |  8 ++++++++
 arch/arc/kernel/setup.c                 | 19 +++++++------------
 7 files changed, 59 insertions(+), 27 deletions(-)
Merging arm-current/fixes (3866f217aaa8 ARM: 8977/1: ptrace: Fix mask for thumb breakpoint hook)
$ git merge arm-current/fixes
Already up to date.
Merging arm-soc-fixes/arm/fixes (99706d62fb50 Merge tag 'omap-for-v5.7/cpsw-fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes)
$ git merge arm-soc-fixes/arm/fixes
Already up to date.
Merging uniphier-fixes/fixes (0e698dfa2822 Linux 5.7-rc4)
$ git merge uniphier-fixes/fixes
Already up to date.
Merging arm64-fixes/for-next/fixes (24ebec25fb27 arm64: hw_breakpoint: Don't invoke overflow handler on uaccess watchpoints)
$ git merge arm64-fixes/for-next/fixes
Already up to date.
Merging m68k-current/for-linus (3381df095419 m68k: tools: Replace zero-length array with flexible-array member)
$ git merge m68k-current/for-linus
Already up to date.
Merging powerpc-fixes/fixes (c0e1c8c22beb powerpc/8xx: Provide ptep_get() with 16k pages)
$ git merge powerpc-fixes/fixes
Already up to date.
Merging s390-fixes/fixes (b3583fca5fb6 s390: fix syscall_get_error for compat processes)
$ git merge s390-fixes/fixes
Already up to date.
Merging sparc/master (b3a9e3b9622a Linux 5.8-rc1)
$ git merge sparc/master
Already up to date.
Merging fscrypt-current/for-stable (2b4eae95c736 fscrypt: don't evict dirty inodes after removing key)
$ git merge fscrypt-current/for-stable
Already up to date.
Merging net/master (67c20de35a3c net: Add MODULE_DESCRIPTION entries to network modules)
$ git merge net/master
Auto-merging kernel/trace/bpf_trace.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 Documentation/bpf/prog_cgroup_sockopt.rst          |  14 +++
 Documentation/networking/ieee802154.rst            |   4 +-
 MAINTAINERS                                        |   2 +-
 drivers/net/bareudp.c                              |   3 +
 drivers/net/dsa/bcm_sf2.c                          |   2 +
 drivers/net/dsa/sja1105/sja1105_vl.c               |  12 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c       |  21 ++--
 drivers/net/ethernet/broadcom/tg3.c                |   4 +-
 drivers/net/ethernet/cadence/macb_main.c           |   6 +-
 drivers/net/ethernet/freescale/enetc/enetc.c       |  26 +++++
 drivers/net/ethernet/freescale/enetc/enetc_hw.h    |  16 +--
 drivers/net/ethernet/freescale/enetc/enetc_pf.c    |   8 --
 drivers/net/ethernet/ibm/ibmveth.c                 |   2 +-
 drivers/net/ethernet/ibm/ibmvnic.c                 |   9 +-
 drivers/net/ethernet/intel/i40e/i40e_ethtool.c     |   3 +
 drivers/net/ethernet/intel/i40e/i40e_main.c        |  29 +++--
 drivers/net/ethernet/intel/ice/ice_lib.c           |   8 +-
 drivers/net/ethernet/intel/ice/ice_main.c          |   2 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c       |  12 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c      |  14 ++-
 drivers/net/ethernet/marvell/mvneta.c              |  86 ++++++++------
 .../net/ethernet/mellanox/mlx5/core/en/rep/tc.c    |  24 ++--
 drivers/net/ethernet/neterion/vxge/vxge-config.h   |   2 +-
 drivers/net/ethernet/netronome/nfp/flower/main.c   |   2 +-
 drivers/net/ethernet/netronome/nfp/flower/main.h   |   7 +-
 .../net/ethernet/netronome/nfp/flower/offload.c    |  24 ++--
 drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h    |   2 +-
 drivers/net/ethernet/pensando/ionic/ionic_lif.c    |  19 ++--
 drivers/net/ethernet/realtek/r8169_main.c          |   5 +-
 drivers/net/geneve.c                               |   1 +
 drivers/net/phy/phy_device.c                       |   6 +-
 drivers/net/usb/ax88179_178a.c                     |  11 +-
 drivers/of/of_mdio.c                               |   9 +-
 drivers/s390/net/qeth_core_main.c                  |  11 +-
 include/linux/netdevice.h                          |   2 +-
 include/net/flow_offload.h                         |  21 +++-
 include/net/xfrm.h                                 |   1 +
 include/trace/events/rxrpc.h                       |   2 +-
 include/uapi/linux/bpf.h                           |   2 +-
 kernel/bpf/cgroup.c                                |  53 +++++----
 kernel/bpf/devmap.c                                |  10 +-
 kernel/trace/bpf_trace.c                           |   2 +-
 net/9p/mod.c                                       |   1 +
 net/core/dev.c                                     |   9 ++
 net/core/drop_monitor.c                            |   1 +
 net/core/flow_offload.c                            |  47 ++++----
 net/core/sock.c                                    |   2 +-
 net/core/xdp.c                                     |   1 +
 net/ethtool/common.c                               |   1 +
 net/ipv4/Kconfig                                   |  34 +++---
 net/ipv4/esp4_offload.c                            |   1 +
 net/ipv4/fib_semantics.c                           |   2 +-
 net/ipv4/fou.c                                     |   1 +
 net/ipv4/ip_tunnel.c                               |  14 ++-
 net/ipv6/Kconfig                                   |  34 +++---
 net/ipv6/esp6_offload.c                            |   1 +
 net/ipv6/fou6.c                                    |   1 +
 net/ipv6/ila/ila_main.c                            |   1 +
 net/ipv6/ip6_gre.c                                 |   9 +-
 net/mptcp/protocol.h                               |   1 +
 net/mptcp/subflow.c                                |  57 +++++-----
 net/netfilter/nf_flow_table_offload.c              |   1 +
 net/netfilter/nf_tables_offload.c                  |   1 +
 net/rxrpc/call_accept.c                            |   7 ++
 net/rxrpc/call_event.c                             |   2 +-
 net/rxrpc/input.c                                  |   7 +-
 net/sched/act_gate.c                               | 126 +++++++++++----------
 net/sched/cls_api.c                                |  25 ++--
 net/sched/sch_fq.c                                 |   1 +
 net/sched/sch_fq_codel.c                           |   1 +
 net/sched/sch_hhf.c                                |   1 +
 net/xfrm/Kconfig                                   |  24 ++++
 net/xfrm/xfrm_device.c                             |   4 +-
 net/xfrm/xfrm_output.c                             |   4 -
 samples/bpf/xdp_monitor_user.c                     |   8 +-
 samples/bpf/xdp_redirect_cpu_user.c                |   7 +-
 samples/bpf/xdp_rxq_info_user.c                    |  13 +--
 tools/bpf/bpftool/Documentation/bpftool-map.rst    |   2 +-
 tools/bpf/bpftool/map.c                            |   3 +-
 tools/include/uapi/linux/bpf.h                     |   2 +-
 .../testing/selftests/bpf/prog_tests/sockopt_sk.c  |  46 ++++++--
 tools/testing/selftests/bpf/progs/sockopt_sk.c     |  54 ++++++++-
 tools/testing/selftests/net/so_txtime.c            |  33 ++++--
 .../tc-testing/tc-tests/actions/tunnel_key.json    |  14 +--
 84 files changed, 706 insertions(+), 397 deletions(-)
Merging bpf/master (ef7232da6bcd ionic: export features for vlans to use)
$ git merge bpf/master
Already up to date.
Merging ipsec/master (be01369859b8 esp, ah: modernize the crypto algorithm selections)
$ git merge ipsec/master
Already up to date.
Merging netfilter/master (c92cbaea3cc0 net: dsa: sja1105: fix PTP timestamping with large tc-taprio cycles)
$ git merge netfilter/master
Already up to date.
Merging ipvs/master (bdc48fa11e46 checkpatch/coding-style: deprecate 80-column warning)
$ git merge ipvs/master
Already up to date.
Merging wireless-drivers/master (b3a9e3b9622a Linux 5.8-rc1)
$ git merge wireless-drivers/master
Already up to date.
Merging mac80211/master (59d4bfc1e2c0 net: fix wiki website url mac80211 and wireless files)
$ git merge mac80211/master
Already up to date.
Merging rdma-fixes/for-rc (9e0dc7b9e1cb RDMA/mlx5: Fix integrity enabled QP creation)
$ git merge rdma-fixes/for-rc
Merge made by the 'recursive' strategy.
 drivers/infiniband/core/cm.c                |  1 +
 drivers/infiniband/core/cma.c               | 18 +++++++++++
 drivers/infiniband/core/rdma_core.c         | 36 +++++++++++++---------
 drivers/infiniband/hw/efa/efa_verbs.c       |  1 +
 drivers/infiniband/hw/hfi1/iowait.h         |  2 +-
 drivers/infiniband/hw/hfi1/ipoib_tx.c       |  2 +-
 drivers/infiniband/hw/hfi1/verbs_txreq.h    |  2 +-
 drivers/infiniband/hw/hns/hns_roce_device.h |  7 +++--
 drivers/infiniband/hw/hns/hns_roce_hw_v1.c  |  4 +--
 drivers/infiniband/hw/hns/hns_roce_hw_v2.c  | 17 +++++-----
 drivers/infiniband/hw/hns/hns_roce_mr.c     |  5 +--
 drivers/infiniband/hw/mlx5/qp.c             | 48 ++++++++++++++---------------
 drivers/infiniband/hw/mlx5/qpc.c            |  8 +++++
 drivers/infiniband/hw/qedr/qedr_iw_cm.c     | 13 ++++++--
 drivers/infiniband/sw/rdmavt/qp.c           |  6 ++--
 drivers/infiniband/sw/siw/siw_qp_rx.c       |  3 +-
 include/linux/mlx5/mlx5_ifc.h               | 10 +++---
 17 files changed, 117 insertions(+), 66 deletions(-)
Merging sound-current/for-linus (d50313a5a0d8 ALSA: hda: Intel: add missing PCI IDs for ICL-H, TGL-H and EKL)
$ git merge sound-current/for-linus
Auto-merging sound/pci/hda/hda_intel.c
Merge made by the 'recursive' strategy.
 sound/pci/hda/hda_intel.c     | 8 ++++++++
 sound/pci/hda/patch_hdmi.c    | 5 +++++
 sound/pci/hda/patch_realtek.c | 3 +++
 sound/usb/format.c            | 6 ++++--
 sound/usb/pcm.c               | 2 ++
 sound/usb/quirks.c            | 1 +
 6 files changed, 23 insertions(+), 2 deletions(-)
Merging sound-asoc-fixes/for-linus (f66aada04ccf Merge remote-tracking branch 'asoc/for-5.8' into asoc-linus)
$ git merge sound-asoc-fixes/for-linus
Merge made by the 'recursive' strategy.
 include/sound/dmaengine_pcm.h         |  11 +++
 include/sound/soc.h                   |   6 ++
 sound/hda/intel-dsp-config.c          |   4 +-
 sound/soc/amd/raven/acp3x-pcm-dma.c   |  30 ++++++--
 sound/soc/codecs/hdac_hda.c           |  16 +++--
 sound/soc/codecs/max98390.c           |   6 +-
 sound/soc/codecs/rt1015.c             | 124 ++++++++++++++++++++--------------
 sound/soc/codecs/rt1015.h             |  15 +++-
 sound/soc/codecs/rt5682.c             |  11 +--
 sound/soc/fsl/fsl_asrc_common.h       |   2 +
 sound/soc/fsl/fsl_asrc_dma.c          |  47 +++++++++----
 sound/soc/fsl/fsl_ssi.c               |  13 ++--
 sound/soc/intel/boards/Kconfig        |   4 +-
 sound/soc/qcom/common.c               |  14 +++-
 sound/soc/qcom/qdsp6/q6afe.c          |   8 +++
 sound/soc/qcom/qdsp6/q6afe.h          |   1 +
 sound/soc/qcom/qdsp6/q6asm.c          |   7 +-
 sound/soc/rockchip/rockchip_pdm.c     |   4 +-
 sound/soc/soc-core.c                  |   3 +-
 sound/soc/soc-devres.c                |  37 ++++++++++
 sound/soc/soc-generic-dmaengine-pcm.c |  12 ----
 sound/soc/soc-pcm.c                   |   6 +-
 sound/soc/soc-topology.c              |   3 +-
 sound/soc/sof/intel/Kconfig           |  29 +++-----
 sound/soc/sof/intel/hda-stream.c      |   9 ++-
 sound/soc/sof/sof-pci-dev.c           |  24 ++++---
 26 files changed, 295 insertions(+), 151 deletions(-)
Merging regmap-fixes/for-linus (82228364de4a Merge remote-tracking branch 'regmap/for-5.8' into regmap-linus)
$ git merge regmap-fixes/for-linus
Merge made by the 'recursive' strategy.
 drivers/base/regmap/regmap.c | 106 ++++++++++++++++++++-----------------------
 1 file changed, 50 insertions(+), 56 deletions(-)
Merging regulator-fixes/for-linus (1b3bcca20858 regulator: mt6358: Remove BROKEN dependency)
$ git merge regulator-fixes/for-linus
Merge made by the 'recursive' strategy.
 drivers/regulator/Kconfig              |  2 +-
 drivers/regulator/da9063-regulator.c   |  1 -
 drivers/regulator/helpers.c            |  2 +-
 drivers/regulator/pfuze100-regulator.c | 60 ++++++++++++++++++++++------------
 4 files changed, 41 insertions(+), 24 deletions(-)
Merging spi-fixes/for-linus (0c5e6b29f27a Merge remote-tracking branch 'spi/for-5.8' into spi-linus)
$ git merge spi-fixes/for-linus
Merge made by the 'recursive' strategy.
 .../bindings/spi/amlogic,meson-gx-spicc.yaml       | 26 +++++++-----
 drivers/spi/spi-fsl-dspi.c                         |  8 ++--
 drivers/spi/spi-rspi.c                             | 28 +++++++++----
 drivers/spi/spi-sprd-adi.c                         |  2 +-
 drivers/spi/spi-stm32-qspi.c                       | 46 ++++++++++++----------
 drivers/spi/spidev.c                               | 24 +++++------
 include/uapi/linux/spi/spidev.h                    |  4 ++
 tools/spi/spidev_test.c                            | 10 ++---
 8 files changed, 90 insertions(+), 58 deletions(-)
Merging pci-current/for-linus (b3a9e3b9622a Linux 5.8-rc1)
$ git merge pci-current/for-linus
Already up to date.
Merging driver-core.current/driver-core-linus (b3a9e3b9622a Linux 5.8-rc1)
$ git merge driver-core.current/driver-core-linus
Already up to date.
Merging tty.current/tty-linus (b3a9e3b9622a Linux 5.8-rc1)
$ git merge tty.current/tty-linus
Already up to date.
Merging usb.current/usb-linus (302c570bf36e usb: typec: tcpci_rt1711h: avoid screaming irq causing boot hangs)
$ git merge usb.current/usb-linus
Merge made by the 'recursive' strategy.
 .../ABI/testing/sysfs-platform-chipidea-usb-otg    |  8 +++---
 drivers/usb/class/cdc-acm.c                        |  2 ++
 drivers/usb/core/quirks.c                          |  3 ++-
 drivers/usb/dwc2/gadget.c                          |  6 -----
 drivers/usb/dwc2/platform.c                        | 11 ++++++++
 drivers/usb/host/ehci-exynos.c                     |  5 ++--
 drivers/usb/host/ehci-pci.c                        |  7 +++++
 drivers/usb/host/ohci-sm501.c                      |  1 +
 drivers/usb/misc/usbtest.c                         |  1 +
 drivers/usb/typec/mux/intel_pmc_mux.c              | 13 +++++++--
 drivers/usb/typec/tcpm/tcpci_rt1711h.c             | 31 +++++++---------------
 11 files changed, 51 insertions(+), 37 deletions(-)
Merging usb-gadget-fixes/fixes (172b14b48ca1 usb: cdns3: gadget: make a bunch of functions static)
$ git merge usb-gadget-fixes/fixes
Already up to date.
Merging usb-serial-fixes/usb-linus (399ad9477c52 USB: serial: option: add Telit LE910C1-EUX compositions)
$ git merge usb-serial-fixes/usb-linus
Already up to date.
Merging usb-chipidea-fixes/ci-for-usb-stable (b3f3736ac305 usb: chipidea: msm: Ensure proper controller reset using role switch API)
$ git merge usb-chipidea-fixes/ci-for-usb-stable
Merge made by the 'recursive' strategy.
Merging phy/fixes (b3a9e3b9622a Linux 5.8-rc1)
$ git merge phy/fixes
Already up to date.
Merging staging.current/staging-linus (b65a2d8c8614 Staging: rtl8723bs: prevent buffer overflow in update_sta_support_rate())
$ git merge staging.current/staging-linus
Merge made by the 'recursive' strategy.
 drivers/staging/rtl8723bs/core/rtw_wlan_util.c |  4 +++-
 drivers/staging/wfx/hif_tx.c                   |  6 ++++--
 drivers/staging/wfx/hif_tx.h                   |  2 +-
 drivers/staging/wfx/queue.c                    | 21 +++++++++------------
 drivers/staging/wfx/scan.c                     |  6 +++---
 5 files changed, 20 insertions(+), 19 deletions(-)
Merging char-misc.current/char-misc-linus (b3a9e3b9622a Linux 5.8-rc1)
$ git merge char-misc.current/char-misc-linus
Already up to date.
Merging soundwire-fixes/fixes (b3a9e3b9622a Linux 5.8-rc1)
$ git merge soundwire-fixes/fixes
Already up to date.
Merging thunderbolt-fixes/fixes (b3a9e3b9622a Linux 5.8-rc1)
$ git merge thunderbolt-fixes/fixes
Already up to date.
Merging input-current/for-linus (751ad34fbad7 Input: adi - work around module name confict)
$ git merge input-current/for-linus
Already up to date.
Merging crypto-current/master (e04ec0de61c1 padata: upgrade smp_mb__after_atomic to smp_mb in padata_do_serial)
$ git merge crypto-current/master
Merge made by the 'recursive' strategy.
 crypto/af_alg.c         | 26 +++++++++++---------------
 crypto/algif_aead.c     |  9 +++------
 crypto/algif_hash.c     |  9 +++------
 crypto/algif_skcipher.c |  9 +++------
 include/crypto/if_alg.h |  4 ++--
 kernel/padata.c         |  4 ++--
 6 files changed, 24 insertions(+), 37 deletions(-)
Merging ide/master (b3a9e3b9622a Linux 5.8-rc1)
$ git merge ide/master
Already up to date.
Merging vfio-fixes/for-linus (5c5866c593bb vfio/pci: Clear error and request eventfd ctx after releasing)
$ git merge vfio-fixes/for-linus
Merge made by the 'recursive' strategy.
 drivers/vfio/pci/vfio_pci.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
Merging kselftest-fixes/fixes (b3a9e3b9622a Linux 5.8-rc1)
$ git merge kselftest-fixes/fixes
Already up to date.
Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch)
$ git merge modules-fixes/modules-linus
Already up to date.
Merging slave-dma-fixes/fixes (b5b0180c2f76 dmaengine: ti: k3-udma: Fix the running channel handling in alloc_chan_resources)
$ git merge slave-dma-fixes/fixes
Auto-merging drivers/dma/ti/k3-udma.c
Merge made by the 'recursive' strategy.
 drivers/dma/ti/k3-udma.c | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)
Merging backlight-fixes/for-backlight-fixes (219d54332a09 Linux 5.4)
$ git merge backlight-fixes/for-backlight-fixes
Already up to date.
Merging mtd-fixes/mtd/fixes (630e8d5507d9 mtd: set master partition panic write flag)
$ git merge mtd-fixes/mtd/fixes
Merge made by the 'recursive' strategy.
 drivers/mtd/mtdcore.c          | 4 ++--
 drivers/mtd/nand/raw/nandsim.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
Merging mfd-fixes/for-mfd-fixes (603d9299da32 mfd: mt6397: Fix probe after changing mt6397-core)
$ git merge mfd-fixes/for-mfd-fixes
Already up to date.
Merging v4l-dvb-fixes/fixes (8f3d9f354286 Linux 5.7-rc1)
$ git merge v4l-dvb-fixes/fixes
Already up to date.
Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency)
$ git merge reset-fixes/reset/fixes
Already up to date.
Merging mips-fixes/mips-fixes (03e62fd67d3a MIPS: lantiq: xway: sysctrl: fix the GPHY clock alias names)
$ git merge mips-fixes/mips-fixes
Merge made by the 'recursive' strategy.
 arch/mips/lantiq/xway/sysctrl.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1)
$ git merge at91-fixes/at91-fixes
Already up to date.
Merging omap-fixes/fixes (a352fe371053 Merge branch 'omap-for-v5.8/fixes-rc1' into fixes)
$ git merge omap-fixes/fixes
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/am335x-pocketbeagle.dts      |  1 -
 arch/arm/boot/dts/am33xx.dtsi                  |  4 +-
 arch/arm/boot/dts/am437x-gp-evm.dts            | 16 -----
 arch/arm/boot/dts/am437x-sk-evm.dts            | 16 -----
 arch/arm/boot/dts/am43x-epos-evm.dts           | 16 -----
 arch/arm/boot/dts/am5729-beagleboneai.dts      |  2 +-
 arch/arm/boot/dts/dra7-evm-common.dtsi         | 20 ------
 arch/arm/boot/dts/dra7-l4.dtsi                 | 34 +++++----
 arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi |  4 +-
 arch/arm/boot/dts/omap4-duovero-parlor.dts     |  2 +-
 arch/arm/boot/dts/omap4.dtsi                   |  2 +-
 arch/arm/mach-omap2/omap_hwmod.c               |  2 +-
 drivers/bus/ti-sysc.c                          | 98 +++++++++++++++++++-------
 drivers/soc/ti/omap_prm.c                      |  8 +--
 14 files changed, 103 insertions(+), 122 deletions(-)
Merging kvm-fixes/master (49b3deaad345 Merge tag 'kvmarm-fixes-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD)
$ git merge kvm-fixes/master
Already up to date.
Merging kvms390-fixes/master (774911290c58 KVM: s390: reduce number of IO pins to 1)
$ git merge kvms390-fixes/master
Merge made by the 'recursive' strategy.
 arch/s390/include/asm/kvm_host.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
Merging hwmon-fixes/hwmon (09aa62c08b99 hwmon: (bt1-pvt) Mark is_visible functions static)
$ git merge hwmon-fixes/hwmon
Merge made by the 'recursive' strategy.
 drivers/hwmon/bt1-pvt.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
Merging nvdimm-fixes/libnvdimm-fixes (543094e19c82 nvdimm/region: always show the 'align' attribute)
$ git merge nvdimm-fixes/libnvdimm-fixes
Already up to date.
Merging btrfs-fixes/next-fixes (4f28062adf92 Merge branch 'misc-5.7' into next-fixes)
$ git merge btrfs-fixes/next-fixes
Already up to date!
Merge made by the 'recursive' strategy.
Merging vfs-fixes/fixes (9e4636545933 copy_xstate_to_kernel(): don't leave parts of destination uninitialized)
$ git merge vfs-fixes/fixes
Already up to date.
Merging dma-mapping-fixes/for-linus (9c24eaf81cc4 iommu/vt-d: Return the correct dma mask when we are bypassing the IOMMU)
$ git merge dma-mapping-fixes/for-linus
Already up to date.
Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7)
$ git merge i3c-fixes/master
Already up to date.
Merging drivers-x86-fixes/fixes (b3a9e3b9622a Linux 5.8-rc1)
$ git merge drivers-x86-fixes/fixes
Already up to date.
Merging samsung-krzk-fixes/fixes (b3a9e3b9622a Linux 5.8-rc1)
$ git merge samsung-krzk-fixes/fixes
Already up to date.
Merging pinctrl-samsung-fixes/pinctrl-fixes (b3a9e3b9622a Linux 5.8-rc1)
$ git merge pinctrl-samsung-fixes/pinctrl-fixes
Already up to date.
Merging devicetree-fixes/dt/linus (8c31055758bc doc: devicetree: bindings: fix spelling mistake)
$ git merge devicetree-fixes/dt/linus
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt      | 2 +-
 Documentation/devicetree/bindings/display/bridge/sii902x.txt     | 2 +-
 Documentation/devicetree/bindings/display/imx/fsl-imx-drm.txt    | 4 ++--
 Documentation/devicetree/bindings/display/imx/ldb.txt            | 4 ++--
 .../devicetree/bindings/display/rockchip/rockchip-drm.yaml       | 2 +-
 Documentation/devicetree/bindings/gpio/mediatek,mt7621-gpio.txt  | 2 +-
 .../devicetree/bindings/interrupt-controller/csky,mpintc.txt     | 2 +-
 Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.txt        | 2 +-
 Documentation/devicetree/bindings/net/mediatek-bluetooth.txt     | 2 +-
 .../devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt          | 2 +-
 Documentation/devicetree/bindings/sound/audio-graph-card.txt     | 2 +-
 Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt     | 2 +-
 Documentation/devicetree/bindings/spi/qcom,spi-geni-qcom.txt     | 2 +-
 Documentation/devicetree/bindings/timer/csky,mptimer.txt         | 2 +-
 Documentation/devicetree/writing-schema.rst                      | 9 ++++++---
 Documentation/mips/ingenic-tcu.rst                               | 2 +-
 MAINTAINERS                                                      | 8 ++++----
 17 files changed, 27 insertions(+), 24 deletions(-)
Merging scsi-fixes/fixes (b8f1d1e05817 scsi: Wire up ata_scsi_dma_need_drain for SAS HBA drivers)
$ git merge scsi-fixes/fixes
Already up to date.
Merging drm-fixes/drm-fixes (8a7a3d1d0dcf Merge tag 'amd-drm-fixes-5.8-2020-06-17' of git://people.freedesktop.org/~agd5f/linux into drm-fixes)
$ git merge drm-fixes/drm-fixes
Already up to date.
Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
$ git merge amdgpu-fixes/drm-fixes
Already up to date.
Merging drm-intel-fixes/for-linux-next-fixes (8e68c6340d58 drm/i915/display: Fix the encoder type check)
$ git merge drm-intel-fixes/for-linux-next-fixes
Already up to date.
Merging mmc-fixes/fixes (27a5e7d36d38 mmc: meson-gx: limit segments to 1 when dram-access-quirk is needed)
$ git merge mmc-fixes/fixes
Merge made by the 'recursive' strategy.
 drivers/mmc/host/meson-gx-mmc.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
Merging rtc-fixes/rtc-fixes (8f3d9f354286 Linux 5.7-rc1)
$ git merge rtc-fixes/rtc-fixes
Already up to date.
Merging gnss-fixes/gnss-linus (2ef96a5bb12b Linux 5.7-rc5)
$ git merge gnss-fixes/gnss-linus
Already up to date.
Merging hyperv-fixes/hyperv-fixes (38dce4195f0d x86/hyperv: Properly suspend/resume reenlightenment notifications)
$ git merge hyperv-fixes/hyperv-fixes
Already up to date.
Merging soc-fsl-fixes/fix (fe8fe7723a3a soc: fsl: dpio: register dpio irq handlers after dpio create)
$ git merge soc-fsl-fixes/fix
Already up to date.
Merging risc-v-fixes/fixes (0e2c09011d4d RISC-V: Acquire mmap lock before invoking walk_page_range)
$ git merge risc-v-fixes/fixes
Already up to date.
Merging pidfd-fixes/fixes (86f56395feb2 tests: test for setns() EINVAL regression)
$ git merge pidfd-fixes/fixes
Merge made by the 'recursive' strategy.
 kernel/nsproxy.c                                 |  2 +-
 tools/testing/selftests/pidfd/pidfd.h            |  5 +++++
 tools/testing/selftests/pidfd/pidfd_getfd_test.c |  5 -----
 tools/testing/selftests/pidfd/pidfd_setns_test.c | 12 ++++++++++++
 4 files changed, 18 insertions(+), 6 deletions(-)
Merging fpga-fixes/fixes (6a47d6efc693 fpga: zynqmp: fix modular build)
$ git merge fpga-fixes/fixes
Auto-merging drivers/fpga/Kconfig
Merge made by the 'recursive' strategy.
 drivers/fpga/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging spdx/spdx-linus (3d77e6a8804a Linux 5.7)
$ git merge spdx/spdx-linus
Already up to date.
Merging gpio-intel-fixes/fixes (b3a9e3b9622a Linux 5.8-rc1)
$ git merge gpio-intel-fixes/fixes
Already up to date.
Merging pinctrl-intel-fixes/fixes (b3a9e3b9622a Linux 5.8-rc1)
$ git merge pinctrl-intel-fixes/fixes
Already up to date.
Merging erofs-fixes/fixes (a8dfdba8de7e erofs: fix partially uninitialized misuse in z_erofs_onlinepage_fixup)
$ git merge erofs-fixes/fixes
Merge made by the 'recursive' strategy.
 fs/erofs/zdata.h | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc())
$ git merge integrity-fixes/fixes
Already up to date.
Merging drm-misc-fixes/for-linux-next-fixes (7f757cb6b2fc video: fbdev: uvesafb: fix "noblank" option handling)
$ git merge drm-misc-fixes/for-linux-next-fixes
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/mcde/mcde_display.c  | 2 +-
 drivers/gpu/drm/mcde/mcde_drv.c      | 3 ++-
 drivers/gpu/drm/panel/panel-simple.c | 2 ++
 drivers/gpu/drm/ttm/ttm_bo.c         | 4 +++-
 drivers/gpu/drm/ttm/ttm_bo_vm.c      | 2 ++
 drivers/video/fbdev/uvesafb.c        | 2 +-
 6 files changed, 11 insertions(+), 4 deletions(-)
Merging kspp-gustavo/for-next/kspp (76fafbfffb44 w1: Replace zero-length array with flexible-array)
$ git merge kspp-gustavo/for-next/kspp
Already up to date.
Merging kbuild/for-next (b170290c2836 Merge tag 'kconfig-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
$ git merge kbuild/for-next
Already up to date.
Merging compiler-attributes/compiler-attributes (98d54f81e36b Linux 5.6-rc4)
$ git merge compiler-attributes/compiler-attributes
Already up to date.
Merging dma-mapping/for-next (ba9e8a1a2c3e dma-mapping: DMA_COHERENT_POOL should select GENERIC_ALLOCATOR)
$ git merge dma-mapping/for-next
Merge made by the 'recursive' strategy.
 include/linux/dma-direct.h |  2 --
 kernel/dma/Kconfig         |  3 ++-
 kernel/dma/direct.c        | 59 ++++++++++++++++++++++++++--------------------
 3 files changed, 36 insertions(+), 28 deletions(-)
Merging asm-generic/master (060dc911501f nds32: fix build failure caused by page table folding updates)
$ git merge asm-generic/master
Already up to date.
Merging arc/for-next (def9d2780727 Linux 5.5-rc7)
$ git merge arc/for-next
Already up to date.
Merging arm/for-next (03c7f5f0b844 Merge branches 'fixes' and 'misc' into for-next)
$ git merge arm/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging arm64/for-next/core (dd4bc6076587 arm64: warn on incorrect placement of the kernel by the bootloader)
$ git merge arm64/for-next/core
Already up to date.
Merging arm-perf/for-next/perf (10f6cd2af21b pmu/smmuv3: Clear IRQ affinity hint on device removal)
$ git merge arm-perf/for-next/perf
Already up to date.
Merging arm-soc/for-next (28107944fb70 soc: document merges)
$ git merge arm-soc/for-next
Merge made by the 'recursive' strategy.
 arch/arm/arm-soc-for-next-contents.txt | 246 +++++++++++++++++++++++++++++++++
 1 file changed, 246 insertions(+)
 create mode 100644 arch/arm/arm-soc-for-next-contents.txt
Merging amlogic/for-next (9233c526bc0e Merge branch 'v5.8/defconfig' into tmp/aml-rebuild)
$ git merge amlogic/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging aspeed/for-next (33f466eef906 ARM: dts: aspeed: mihawk: Add 8 tmp401 thermal sensors)
$ git merge aspeed/for-next
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts |   7 --
 arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts  | 152 +++++++++++++++++++++++++++
 2 files changed, 152 insertions(+), 7 deletions(-)
Merging at91/at91-next (ec539e70d882 Merge branches 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next)
$ git merge at91/at91-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging imx-mxs/for-next (3d0c88d3776b Merge branch 'imx/dt64' into for-next)
$ git merge imx-mxs/for-next
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/imx6qdl.dtsi                     | 22 ++++++++--------
 arch/arm/boot/dts/imx6sl.dtsi                      | 20 +++++++--------
 arch/arm/boot/dts/imx6sll.dtsi                     | 20 +++++++--------
 arch/arm/boot/dts/imx6sx.dtsi                      | 20 +++++++--------
 arch/arm/boot/dts/imx6ul.dtsi                      | 20 +++++++--------
 arch/arm/boot/dts/imx7s.dtsi                       | 20 +++++++--------
 arch/arm/boot/dts/ls1021a.dtsi                     |  2 +-
 arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi     | 22 +++++++++++++++-
 .../boot/dts/freescale/imx8mm-beacon-som.dtsi      |  4 +--
 arch/arm64/boot/dts/freescale/imx8mm-evk.dts       |  4 +--
 arch/arm64/boot/dts/freescale/imx8mm.dtsi          | 16 ++++++------
 arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts  |  4 +--
 arch/arm64/boot/dts/freescale/imx8mp.dtsi          |  6 +++++
 arch/arm64/boot/dts/freescale/imx8mq.dtsi          | 30 ++++++++++++++++++++++
 14 files changed, 133 insertions(+), 77 deletions(-)
Merging keystone/next (a158c2b7ec23 Merge branch 'for_5.8/driver-soc' into next)
$ git merge keystone/next
Already up to date!
Merge made by the 'recursive' strategy.
Merging mediatek/for-next (64ee939736e7 Merge branch 'v5.7-next/soc' into for-next)
$ git merge mediatek/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging mvebu/for-next (869da228bd45 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 (712c602893d7 Merge branch 'fixes' into for-next)
$ git merge omap/for-next
Auto-merging arch/arm/boot/dts/am437x-sk-evm.dts
Auto-merging arch/arm/boot/dts/am437x-gp-evm.dts
Auto-merging arch/arm/boot/dts/am33xx.dtsi
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/am335x-baltos.dtsi              | 2 +-
 arch/arm/boot/dts/am335x-boneblack-common.dtsi    | 1 +
 arch/arm/boot/dts/am335x-boneblack-wireless.dts   | 1 -
 arch/arm/boot/dts/am335x-boneblue.dts             | 1 -
 arch/arm/boot/dts/am335x-bonegreen-wireless.dts   | 1 -
 arch/arm/boot/dts/am335x-evm.dts                  | 3 +--
 arch/arm/boot/dts/am335x-evmsk.dts                | 2 +-
 arch/arm/boot/dts/am335x-lxm.dts                  | 2 +-
 arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi | 2 +-
 arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts    | 2 +-
 arch/arm/boot/dts/am335x-pepper.dts               | 4 ++--
 arch/arm/boot/dts/am335x-phycore-som.dtsi         | 2 +-
 arch/arm/boot/dts/am33xx-l4.dtsi                  | 6 ++----
 arch/arm/boot/dts/am33xx.dtsi                     | 3 ++-
 arch/arm/boot/dts/am4372.dtsi                     | 3 ++-
 arch/arm/boot/dts/am437x-cm-t43.dts               | 2 +-
 arch/arm/boot/dts/am437x-gp-evm.dts               | 4 ++--
 arch/arm/boot/dts/am437x-l4.dtsi                  | 5 ++---
 arch/arm/boot/dts/am437x-sk-evm.dts               | 2 +-
 19 files changed, 22 insertions(+), 26 deletions(-)
Merging qcom/for-next (2db45abf5ac7 Merge branches 'arm64-defconfig-for-5.9', 'arm64-for-5.9' and 'dts-for-5.9' into for-next)
$ git merge qcom/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/thermal/qcom-tsens.yaml    |    2 +
 arch/arm/boot/dts/Makefile                         |    1 +
 arch/arm/boot/dts/qcom-ipq8064-rb3011.dts          |  308 +++++
 arch/arm/boot/dts/qcom-ipq8064.dtsi                |  115 ++
 arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi          |   75 +-
 arch/arm64/boot/dts/qcom/ipq8074-hk01.dts          |    4 +
 arch/arm64/boot/dts/qcom/ipq8074.dtsi              |   22 +
 arch/arm64/boot/dts/qcom/msm8916-pins.dtsi         |   12 +-
 arch/arm64/boot/dts/qcom/msm8916.dtsi              |   31 +
 arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi    |    2 +-
 .../boot/dts/qcom/msm8998-lenovo-miix-630.dts      |    5 +
 arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi          |    2 +-
 arch/arm64/boot/dts/qcom/pm8009.dtsi               |   37 +
 arch/arm64/boot/dts/qcom/pm8150.dtsi               |   42 +-
 arch/arm64/boot/dts/qcom/pm8150b.dtsi              |   44 +-
 arch/arm64/boot/dts/qcom/pm8150l.dtsi              |   44 +-
 arch/arm64/boot/dts/qcom/sc7180-idp.dts            |   11 +
 arch/arm64/boot/dts/qcom/sc7180.dtsi               |  124 +-
 arch/arm64/boot/dts/qcom/sm8150-mtp.dts            |   21 +
 arch/arm64/boot/dts/qcom/sm8150.dtsi               |  903 ++++++++++++++
 arch/arm64/boot/dts/qcom/sm8250-mtp.dts            |    8 +
 arch/arm64/boot/dts/qcom/sm8250.dtsi               | 1306 ++++++++++++++++++--
 arch/arm64/configs/defconfig                       |    2 +
 23 files changed, 2948 insertions(+), 173 deletions(-)
 create mode 100644 arch/arm/boot/dts/qcom-ipq8064-rb3011.dts
 create mode 100644 arch/arm64/boot/dts/qcom/pm8009.dtsi
Merging raspberrypi/for-next (b3a9e3b9622a Linux 5.8-rc1)
$ git merge raspberrypi/for-next
Already up to date.
Merging realtek/for-next (486f29df6941 Merge branch 'v5.8/dt' into next)
$ git merge realtek/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging renesas/next (a3fa35e19650 Merge branch 'renesas-arm-dt-for-v5.9' into renesas-next)
$ git merge renesas/next
Auto-merging arch/arm/boot/dts/Makefile
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/Makefile                      |   1 +
 arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ca.dts |  97 +++
 arch/arm/boot/dts/r8a7742-iwg21d-q7.dts         | 187 ++++++
 arch/arm/boot/dts/r8a7742.dtsi                  | 790 ++++++++++++++++++++++++
 arch/arm/boot/dts/r9a06g032.dtsi                |   2 +-
 5 files changed, 1076 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ca.dts
Merging reset/reset/next (3b9164c0f173 dt-bindings: reset: Convert i.MX7 reset to json-schema)
$ git merge reset/reset/next
Removing Documentation/devicetree/bindings/reset/fsl,imx7-src.txt
Removing Documentation/devicetree/bindings/reset/fsl,imx-src.txt
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/reset/fsl,imx-src.txt      | 49 -------------
 .../devicetree/bindings/reset/fsl,imx-src.yaml     | 82 ++++++++++++++++++++++
 .../devicetree/bindings/reset/fsl,imx7-src.txt     | 56 ---------------
 .../devicetree/bindings/reset/fsl,imx7-src.yaml    | 58 +++++++++++++++
 drivers/reset/reset-simple.c                       | 23 +++++-
 drivers/reset/reset-socfpga.c                      |  3 +-
 drivers/reset/reset-sunxi.c                        |  3 +-
 drivers/reset/reset-uniphier-glue.c                |  3 +-
 {drivers => include/linux}/reset/reset-simple.h    |  7 ++
 9 files changed, 171 insertions(+), 113 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/reset/fsl,imx-src.txt
 create mode 100644 Documentation/devicetree/bindings/reset/fsl,imx-src.yaml
 delete mode 100644 Documentation/devicetree/bindings/reset/fsl,imx7-src.txt
 create mode 100644 Documentation/devicetree/bindings/reset/fsl,imx7-src.yaml
 rename {drivers => include/linux}/reset/reset-simple.h (74%)
Merging rockchip/for-next (99bcf38dd05b Merge branch 'v5.9-clk/next' into for-next)
$ git merge rockchip/for-next
Merge made by the 'recursive' strategy.
 .../bindings/clock/rockchip,rk3288-cru.txt         |  8 +-
 arch/arm/boot/dts/rk322x.dtsi                      |  6 +-
 arch/arm/boot/dts/rk3288-veyron-jaq.dts            | 17 +++-
 arch/arm/boot/dts/rk3288-veyron-jerry.dts          |  2 +-
 arch/arm/boot/dts/rk3288-veyron-mighty.dts         |  6 +-
 arch/arm/boot/dts/rk3288-veyron-minnie.dts         |  2 +-
 arch/arm/boot/dts/rk3288-veyron-pinky.dts          |  6 +-
 arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi         |  2 +-
 arch/arm/boot/dts/rk3288-veyron-speedy.dts         |  2 +-
 arch/arm/boot/dts/rk3288.dtsi                      |  6 +-
 arch/arm/boot/dts/rv1108.dtsi                      | 12 +--
 arch/arm64/boot/dts/rockchip/px30.dtsi             |  6 +-
 arch/arm64/boot/dts/rockchip/rk3308.dtsi           |  6 +-
 arch/arm64/boot/dts/rockchip/rk3328-evb.dts        |  2 +-
 arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts     |  2 +-
 arch/arm64/boot/dts/rockchip/rk3328-rock64.dts     |  2 +-
 arch/arm64/boot/dts/rockchip/rk3328.dtsi           | 24 +++---
 .../arm64/boot/dts/rockchip/rk3368-lion-haikou.dts |  8 +-
 arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi      | 10 +--
 arch/arm64/boot/dts/rockchip/rk3368.dtsi           |  6 +-
 arch/arm64/boot/dts/rockchip/rk3399-firefly.dts    |  4 +-
 .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi      |  2 +-
 arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi       |  4 +-
 arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts |  8 +-
 .../boot/dts/rockchip/rk3399-khadas-edge.dtsi      | 10 +--
 arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts  |  8 +-
 arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi   |  6 +-
 .../boot/dts/rockchip/rk3399-pinebook-pro.dts      | 99 ++++++++++++++--------
 .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts |  6 +-
 arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi      | 10 +--
 arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi    | 22 ++---
 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts  |  8 +-
 arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi   |  4 +-
 arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 20 ++---
 arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi  |  4 +-
 arch/arm64/boot/dts/rockchip/rk3399.dtsi           |  6 +-
 drivers/clk/rockchip/clk-pll.c                     | 70 ++++++++-------
 drivers/clk/rockchip/clk-rk3288.c                  | 20 ++++-
 38 files changed, 260 insertions(+), 186 deletions(-)
Merging samsung-krzk/for-next (b0953d8b7cdb Merge branch 'next/drivers' into for-next)
$ git merge samsung-krzk/for-next
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/exynos3250-artik5.dtsi        |  41 +++++
 arch/arm/boot/dts/exynos5800.dtsi               |   6 +-
 arch/arm/boot/dts/s5pv210-aries.dtsi            |  90 ++++++++--
 arch/arm/boot/dts/s5pv210-fascinate4g.dts       |  17 ++
 arch/arm/boot/dts/s5pv210-pinctrl.dtsi          |   2 +
 arch/arm/mach-exynos/Kconfig                    |   1 +
 arch/arm64/boot/dts/exynos/exynos7-espresso.dts |   4 +
 arch/arm64/boot/dts/exynos/exynos7.dtsi         |  43 ++++-
 drivers/soc/samsung/Kconfig                     |   3 +
 drivers/soc/samsung/Makefile                    |   1 +
 drivers/soc/samsung/exynos-regulator-coupler.c  | 221 ++++++++++++++++++++++++
 11 files changed, 413 insertions(+), 16 deletions(-)
 create mode 100644 drivers/soc/samsung/exynos-regulator-coupler.c
Merging scmi/for-linux-next (24077bf8f9e6 Merge tag 'juno-fix-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
$ git merge scmi/for-linux-next
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 146 ++++++++++++++++----------------
 1 file changed, 73 insertions(+), 73 deletions(-)
Merging sunxi/sunxi/for-next (b3a9e3b9622a Linux 5.8-rc1)
$ git merge sunxi/sunxi/for-next
Already up to date.
Merging tegra/for-next (fc87d5985a7c Merge branch for-5.9/memory into for-next)
$ git merge tegra/for-next
Merge made by the 'recursive' strategy.
 drivers/clk/tegra/clk-pll.c                   |    7 +-
 drivers/memory/tegra/Kconfig                  |   14 +
 drivers/memory/tegra/Makefile                 |    4 +
 drivers/memory/tegra/mc.h                     |    1 +
 drivers/memory/tegra/tegra124-emc.c           |    6 +-
 drivers/memory/tegra/tegra186-emc.c           |   21 +-
 drivers/memory/tegra/tegra186.c               |    4 +-
 drivers/memory/tegra/tegra20-emc.c            |   34 +-
 drivers/memory/tegra/tegra210-emc-cc-r21021.c | 1775 +++++++++++++++++++++
 drivers/memory/tegra/tegra210-emc-core.c      | 2100 +++++++++++++++++++++++++
 drivers/memory/tegra/tegra210-emc-table.c     |   90 ++
 drivers/memory/tegra/tegra210-emc.h           | 1016 ++++++++++++
 drivers/memory/tegra/tegra210-mc.h            |   50 +
 drivers/memory/tegra/tegra30-emc.c            |  122 +-
 14 files changed, 5129 insertions(+), 115 deletions(-)
 create mode 100644 drivers/memory/tegra/tegra210-emc-cc-r21021.c
 create mode 100644 drivers/memory/tegra/tegra210-emc-core.c
 create mode 100644 drivers/memory/tegra/tegra210-emc-table.c
 create mode 100644 drivers/memory/tegra/tegra210-emc.h
 create mode 100644 drivers/memory/tegra/tegra210-mc.h
Merging ti-k3/ti-k3-next (cae809434da1 arm64: dts: ti: k3-j721e-main: Add main domain watchdog entries)
$ git merge ti-k3/ti-k3-next
Already up to date.
Merging uniphier/for-next (0e698dfa2822 Linux 5.7-rc4)
$ git merge uniphier/for-next
Already up to date.
Merging clk/clk-next (b3a9e3b9622a Linux 5.8-rc1)
$ git merge clk/clk-next
Already up to date.
Merging clk-samsung/for-next (3d77e6a8804a Linux 5.7)
$ git merge clk-samsung/for-next
Already up to date.
Merging csky/linux-next (f36e0aab6f1f csky: Fixup CONFIG_DEBUG_RSEQ)
$ git merge csky/linux-next
Already up to date.
Merging h8300/h8300-next (9d48776fc609 Merge remote-tracking branch 'origin/master' into h8300-next)
$ git merge h8300/h8300-next
Merge made by the 'recursive' strategy.
 arch/h8300/Kconfig.cpu                  |  4 ++
 arch/h8300/boot/dts/edosk2674.dts       | 10 ++++-
 arch/h8300/configs/edosk2674_defconfig  | 10 ++---
 arch/h8300/configs/h8300h-sim_defconfig |  8 +---
 arch/h8300/configs/h8s-sim_defconfig    |  8 +---
 arch/h8300/lib/memset.S                 | 17 +++++----
 drivers/clocksource/h8300_timer8.c      | 20 +++++-----
 drivers/irqchip/irq-renesas-h8300h.c    | 19 +++++++++-
 drivers/irqchip/irq-renesas-h8s.c       | 67 +++++++++++++++++++++++++--------
 drivers/net/ethernet/smsc/Kconfig       |  1 -
 drivers/net/ethernet/smsc/smc91x.c      | 10 +++++
 drivers/tty/serial/sh-sci.c             |  5 +--
 12 files changed, 120 insertions(+), 59 deletions(-)
Merging ia64/next (172e7890406d tty/serial: cleanup after ioc*_serial driver removal)
$ git merge ia64/next
Already up to date.
Merging m68k/for-next (3381df095419 m68k: tools: Replace zero-length array with flexible-array member)
$ git merge m68k/for-next
Already up to date.
Merging m68knommu/for-next (59f7d71f35c1 m68k: mcfmmu: remove stale part of comment about steal_context)
$ git merge m68knommu/for-next
Merge made by the 'recursive' strategy.
 arch/m68k/configs/stmark2_defconfig | 47 +++++++++++++++++++++----------------
 arch/m68k/include/asm/io_no.h       | 20 ++++++++--------
 arch/m68k/include/asm/m53xxacr.h    |  6 ++---
 arch/m68k/mm/mcfmmu.c               |  6 -----
 4 files changed, 40 insertions(+), 39 deletions(-)
Merging microblaze/next (b3a9e3b9622a Linux 5.8-rc1)
$ git merge microblaze/next
Already up to date.
Merging mips/mips-next (9909bc43a2e2 dt-bindings: MIPS: Document Ingenic SoCs binding.)
$ git merge mips/mips-next
Merge made by the 'recursive' strategy.
 .../bindings/mips/ingenic/ingenic,cpu.yaml         | 67 ++++++++++++++++++++++
 arch/mips/bcm63xx/boards/board_bcm963xx.c          | 33 +++++------
 2 files changed, 82 insertions(+), 18 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mips/ingenic/ingenic,cpu.yaml
Merging nds32/next (3d77e6a8804a Linux 5.7)
$ git merge nds32/next
Already up to date.
Merging nios2/for-next (6b57fa4d374b nios2: signal: Mark expected switch fall-through)
$ git merge nios2/for-next
Already up to date.
Merging openrisc/for-next (6bd140e14d9a openrisc: Fix issue with argument clobbering for clone/fork)
$ git merge openrisc/for-next
Already up to date.
Merging parisc-hd/for-next (fb775a8805ed parisc: Whitespace cleanups in atomic.h)
$ git merge parisc-hd/for-next
Auto-merging arch/parisc/mm/init.c
Merge made by the 'recursive' strategy.
 arch/parisc/include/asm/atomic.h  | 76 +++++++++++++++++++++------------------
 arch/parisc/include/asm/bitops.h  | 41 +++++++--------------
 arch/parisc/include/asm/cmpxchg.h |  6 ++--
 arch/parisc/include/asm/futex.h   | 26 +++++++-------
 arch/parisc/lib/bitops.c          |  6 ++--
 arch/parisc/mm/init.c             | 12 +++----
 6 files changed, 81 insertions(+), 86 deletions(-)
Merging powerpc/next (5b14671be58d Merge tag 'fuse-update-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse)
$ git merge powerpc/next
Already up to date.
Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges)
$ git merge fsl/next
Already up to date.
Merging soc-fsl/next (e9e4ef9116b1 soc: fsl: dpio: Remove unused inline function qbman_write_eqcr_am_rt_register)
$ git merge soc-fsl/next
Already up to date.
Merging risc-v/for-next (bac61e37848b riscv: Select ARCH_SUPPORTS_ATOMIC_RMW by default)
$ git merge risc-v/for-next
Merge made by the 'recursive' strategy.
 arch/riscv/Kconfig | 1 +
 1 file changed, 1 insertion(+)
Merging s390/features (b3a9e3b9622a Linux 5.8-rc1)
$ git merge s390/features
Already up to date.
Merging sh/for-next (37744feebc08 sh: remove sh5 support)
$ git merge sh/for-next
Already up to date.
Merging sparc-next/master (b3a9e3b9622a Linux 5.8-rc1)
$ git merge sparc-next/master
Already up to date.
Merging uml/linux-next (f6e8c474390b um: virtio: Replace zero-length array with flexible-array)
$ git merge uml/linux-next
Already up to date.
Merging xtensa/xtensa-for-next (f04758d5aea9 xtensa: fix __sync_fetch_and_{and,or}_4 declarations)
$ git merge xtensa/xtensa-for-next
Merge made by the 'recursive' strategy.
 arch/xtensa/kernel/xtensa_ksyms.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Merging fscrypt/master (e3b1078bedd3 fscrypt: add support for IV_INO_LBLK_32 policies)
$ git merge fscrypt/master
Already up to date.
Merging afs/afs-next (8409f67b6437 afs: Adjust the fileserver rotation algorithm to reprobe/retry more quickly)
$ git merge afs/afs-next
Already up to date.
Merging btrfs/for-next (8113246479a5 Merge branch 'for-next-next-v5.7-20200528' into for-next-20200528)
$ git merge btrfs/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging ceph/master (7ed286f3e061 libceph: don't omit used_replica in target_copy())
$ git merge ceph/master
Already up to date.
Merging cifs/for-next (a0892b413f6b cifs: misc: Use array_size() in if-statement controlling expression)
$ git merge cifs/for-next
Merge made by the 'recursive' strategy.
 fs/cifs/misc.c    | 16 +++++++---------
 fs/cifs/smb2ops.c |  1 +
 2 files changed, 8 insertions(+), 9 deletions(-)
Merging configfs/for-next (8aebfffacfa3 configfs: fix config_item refcnt leak in configfs_rmdir())
$ git merge configfs/for-next
Already up to date.
Merging ecryptfs/next (8b614cb8f1dc Merge tag '5.6-rc4-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6)
$ git merge ecryptfs/next
Already up to date.
Merging erofs/dev (b3a9e3b9622a Linux 5.8-rc1)
$ git merge erofs/dev
Already up to date.
Merging exfat/dev (83cf239fa6d5 exfat: move setting VOL_DIRTY over exfat_remove_entries())
$ git merge exfat/dev
Merge made by the 'recursive' strategy.
 fs/exfat/balloc.c   |  4 ++--
 fs/exfat/dir.c      | 26 ++++++++++++++------------
 fs/exfat/exfat_fs.h |  5 +----
 fs/exfat/fatent.c   |  7 ++-----
 fs/exfat/misc.c     |  3 +--
 fs/exfat/namei.c    | 26 +++++++++++++++++---------
 fs/exfat/super.c    | 24 ++++++++++++++++--------
 7 files changed, 53 insertions(+), 42 deletions(-)
Merging ext3/for_next (a68f93d90fbb Pull writeback fixes from me.)
$ git merge ext3/for_next
Auto-merging include/linux/fs.h
Auto-merging fs/ext4/inode.c
Merge made by the 'recursive' strategy.
 fs/ext2/dir.c                    |  55 ++++++++++-----------
 fs/ext2/ext2.h                   |   3 +-
 fs/ext2/ialloc.c                 |   3 +-
 fs/ext2/namei.c                  |  39 +++++++++------
 fs/ext2/xattr.c                  |   3 +-
 fs/ext4/inode.c                  |   2 +-
 fs/fs-writeback.c                | 103 ++++++++++++++++++++-------------------
 fs/xfs/libxfs/xfs_trans_inode.c  |   4 +-
 include/linux/fs.h               |   7 ++-
 include/trace/events/writeback.h |  14 +++---
 10 files changed, 124 insertions(+), 109 deletions(-)
Merging ext4/dev (7b97d868b7ab ext4, jbd2: ensure panic by fix a race between jbd2 abort and ext4 error handlers)
$ git merge ext4/dev
Already up to date.
Merging f2fs/dev (b29482fde649 Merge branch 'work.epoll' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge f2fs/dev
Already up to date.
Merging fsverity/fsverity (9cd6b593cfc9 fs-verity: remove unnecessary extern keywords)
$ git merge fsverity/fsverity
Already up to date.
Merging fuse/for-next (9b46418c40fe fuse: copy_file_range should truncate cache)
$ git merge fuse/for-next
Already up to date.
Merging jfs/jfs-next (7aba5dcc2346 jfs: Replace zero-length array with flexible-array member)
$ git merge jfs/jfs-next
Already up to date.
Merging nfs/linux-next (b3a9e3b9622a Linux 5.8-rc1)
$ git merge nfs/linux-next
Already up to date.
Merging nfs-anna/linux-next (ba838a75e73f NFS: Fix direct WRITE throughput regression)
$ git merge nfs-anna/linux-next
Already up to date.
Merging nfsd/nfsd-next (b3a9e3b9622a Linux 5.8-rc1)
$ git merge nfsd/nfsd-next
Already up to date.
Merging orangefs/for-next (0df556457748 orangefs: convert get_user_pages() --> pin_user_pages())
$ git merge orangefs/for-next
Already up to date.
Merging overlayfs/overlayfs-next (2068cf7dfbc6 ovl: remove unnecessary lock check)
$ git merge overlayfs/overlayfs-next
Already up to date.
Merging ubifs/linux-next (4b68bf9a69d2 ubi: Select fastmap anchor PEBs considering wear level rules)
$ git merge ubifs/linux-next
Already up to date.
Merging v9fs/9p-next (36f9967531da 9p/xen: increase XEN_9PFS_RING_ORDER)
$ git merge v9fs/9p-next
Already up to date.
Merging xfs/for-next (8cc007246972 xfs: Add the missed xfs_perag_put() for xfs_ifree_cluster())
$ git merge xfs/for-next
Already up to date.
Merging zonefs/for-next (568776f992c4 zonefs: Replace uuid_copy() with import_uuid())
$ git merge zonefs/for-next
Already up to date.
Merging iomap/iomap-for-next (d4ff3b2ef901 iomap: Fix unsharing of an extent >2GB on a 32-bit machine)
$ git merge iomap/iomap-for-next
Already up to date.
Merging djw-vfs/vfs-for-next (e4f9ba20d3b8 fs/xfs: Update xfs_ioctl_setattr_dax_invalidate())
$ git merge djw-vfs/vfs-for-next
Already up to date.
Merging file-locks/locks-next (5ef159681309 locks: add locks_move_blocks in posix_lock_inode)
$ git merge file-locks/locks-next
Auto-merging fs/locks.c
Merge made by the 'recursive' strategy.
 fs/locks.c | 1 +
 1 file changed, 1 insertion(+)
Merging vfs/for-next (159acfa8df28 iov_iter: Move unnecessary inclusion of crypto/hash.h)
$ git merge vfs/for-next
Merge made by the 'recursive' strategy.
 drivers/dma/sf-pdma/sf-pdma.c                  |  1 +
 drivers/dma/st_fdma.c                          |  1 +
 drivers/dma/uniphier-xdmac.c                   |  1 +
 drivers/misc/uacce/uacce.c                     |  1 +
 drivers/mtd/mtdpstore.c                        |  1 +
 drivers/mtd/nand/raw/cadence-nand-controller.c |  1 +
 drivers/soc/qcom/pdr_interface.c               |  1 +
 fs/btrfs/inode.c                               |  1 +
 fs/ocfs2/dlmfs/dlmfs.c                         | 52 ++++----------------------
 fs/ocfs2/dlmfs/userdlm.c                       | 12 ++----
 fs/ocfs2/dlmfs/userdlm.h                       |  4 +-
 include/linux/skbuff.h                         |  1 +
 include/linux/socket.h                         |  1 +
 include/linux/uio.h                            |  1 -
 lib/iov_iter.c                                 |  3 +-
 15 files changed, 25 insertions(+), 57 deletions(-)
$ git am -3 ../patches/0001-further-fixes-for-iov_iter-Move-unnecessary-inclusio.patch
Applying: further fixes for "iov_iter: Move unnecessary inclusion of crypto/hash.h"
$ git reset HEAD^
Unstaged changes after reset:
M	arch/s390/lib/test_unwind.c
M	drivers/remoteproc/qcom_q6v5_mss.c
$ git add -A .
$ git commit -v -a --amend
[master ec80d25de244] Merge remote-tracking branch 'vfs/for-next'
 Date: Mon Jun 22 09:07:12 2020 +1000
Merging printk/for-next (f8d10ecd0f83 Merge branch 'for-5.9' into for-next)
$ git merge printk/for-next
Merge made by the 'recursive' strategy.
 arch/s390/include/asm/bug.h     |  2 +-
 include/linux/printk.h          |  1 +
 include/linux/ratelimit.h       | 36 +---------------------------------
 include/linux/ratelimit_types.h | 43 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 46 insertions(+), 36 deletions(-)
 create mode 100644 include/linux/ratelimit_types.h
$ git reset --hard HEAD^
HEAD is now at ec80d25de244 Merge remote-tracking branch 'vfs/for-next'
Merging next-20200618 version of printk
$ git merge -m next-20200618/printk d6c8bb00c126423dab5d6fc50bcd984f369e1450
Already up to date!
Merge made by the 'recursive' strategy.
Merging pci/next (b3a9e3b9622a Linux 5.8-rc1)
$ git merge pci/next
Already up to date.
Merging pstore/for-next/pstore (b3a9e3b9622a Linux 5.8-rc1)
$ git merge pstore/for-next/pstore
Already up to date.
Merging hid/for-next (f064b98aa777 Merge branch 'for-5.9/wiimote' into for-next)
$ git merge hid/for-next
Auto-merging drivers/hid/hid-alps.c
Merge made by the 'recursive' strategy.
 drivers/hid/hid-alps.c                   |  2 +
 drivers/hid/hid-ids.h                    |  1 +
 drivers/hid/hid-input.c                  | 30 +++++++++-----
 drivers/hid/hid-magicmouse.c             |  6 +++
 drivers/hid/hid-quirks.c                 |  1 +
 drivers/hid/hid-steam.c                  |  6 ++-
 drivers/hid/hid-wiimote-core.c           |  5 +++
 drivers/hid/hid-wiimote-modules.c        | 67 ++++++++++++++++++++------------
 drivers/hid/hid-wiimote.h                |  2 +
 drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c |  8 ++++
 drivers/hid/intel-ish-hid/Makefile       |  2 +-
 drivers/hid/usbhid/hid-core.c            | 55 ++++++++++++++------------
 drivers/hid/usbhid/usbhid.h              |  2 +
 13 files changed, 125 insertions(+), 62 deletions(-)
$ git reset --hard HEAD^
HEAD is now at 3a54d6bf4283 next-20200618/printk
Merging next-20200618 version of hid
$ git merge -m next-20200618/hid 64528f9b9e5a6f0695b6f2afd944dd05ddc0a8fb
Auto-merging drivers/hid/hid-alps.c
Merge made by the 'recursive' strategy.
 drivers/hid/hid-alps.c                   |  2 ++
 drivers/hid/hid-ids.h                    |  1 +
 drivers/hid/hid-input.c                  | 30 +++++++++++------
 drivers/hid/hid-magicmouse.c             |  6 ++++
 drivers/hid/hid-quirks.c                 |  1 +
 drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c |  8 +++++
 drivers/hid/usbhid/hid-core.c            | 55 +++++++++++++++++---------------
 drivers/hid/usbhid/usbhid.h              |  2 ++
 8 files changed, 70 insertions(+), 35 deletions(-)
Merging i2c/i2c/for-next (28f9f8fb4f40 MAINTAINERS: Add robert and myself as qcom i2c cci maintainers)
$ git merge i2c/i2c/for-next
Already up to date.
Merging i3c/i3c/next (b4203ce05563 i3c master: GETMRL's 3rd byte is optional even with BCR_IBI_PAYLOAD)
$ git merge i3c/i3c/next
Already up to date.
Merging dmi/master (d9d8efd3241b firmware/dmi: Report DMI Bios & EC firmware release)
$ git merge dmi/master
Auto-merging include/linux/mod_devicetable.h
Merge made by the 'recursive' strategy.
Merging hwmon-staging/hwmon-next (5093411241c5 hwmon: (nct6683) Replace container_of() with  kobj_to_dev())
$ git merge hwmon-staging/hwmon-next
Merge made by the 'recursive' strategy.
 drivers/hwmon/i5k_amb.c | 2 +-
 drivers/hwmon/nct6683.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
Merging jc_docs/docs-next (b103c607654e docs: staging: don't use literalinclude)
$ git merge jc_docs/docs-next
Auto-merging MAINTAINERS
Auto-merging Documentation/sh/index.rst
Removing Documentation/misc-devices/spear-pcie-gadget.txt
Removing Documentation/misc-devices/pci-endpoint-test.txt
Removing Documentation/PCI/endpoint/function/binding/pci-test.txt
Merge made by the 'recursive' strategy.
 .mailmap                                           |   2 +
 .../PCI/endpoint/function/binding/pci-test.rst     |  26 +++
 .../PCI/endpoint/function/binding/pci-test.txt     |  19 --
 Documentation/PCI/endpoint/index.rst               |   2 +
 .../special-register-buffer-data-sampling.rst      |   6 +-
 Documentation/admin-guide/kernel-parameters.txt    |  18 +-
 Documentation/admin-guide/sysctl/kernel.rst        |   8 +-
 Documentation/arm64/index.rst                      |   1 +
 Documentation/arm64/{perf.txt => perf.rst}         |   7 +-
 Documentation/core-api/pin_user_pages.rst          |   2 +-
 .../crypto/{api-intro.txt => api-intro.rst}        | 186 ++++++++-------
 .../{asymmetric-keys.txt => asymmetric-keys.rst}   |  91 ++++----
 .../crypto/{async-tx-api.txt => async-tx-api.rst}  | 255 ++++++++++++---------
 .../{descore-readme.txt => descore-readme.rst}     | 152 ++++++++----
 Documentation/crypto/index.rst                     |   5 +
 Documentation/driver-api/dmaengine/client.rst      |   2 +-
 Documentation/driver-api/dmaengine/provider.rst    |   2 +-
 .../driver-api/thermal/cpu-idle-cooling.rst        |  14 +-
 Documentation/filesystems/locking.rst              |  12 +-
 Documentation/filesystems/proc.rst                 |   2 +-
 Documentation/index.rst                            |  13 ++
 .../{ad525x_dpot.txt => ad525x_dpot.rst}           |  24 +-
 .../misc-devices/{apds990x.txt => apds990x.rst}    |  31 ++-
 .../misc-devices/{bh1770glc.txt => bh1770glc.rst}  |  45 ++--
 .../misc-devices/{c2port.txt => c2port.rst}        |  56 ++---
 Documentation/misc-devices/index.rst               |   6 +
 Documentation/misc-devices/pci-endpoint-test.rst   |  56 +++++
 Documentation/misc-devices/pci-endpoint-test.txt   |  41 ----
 Documentation/misc-devices/spear-pcie-gadget.rst   | 170 ++++++++++++++
 Documentation/misc-devices/spear-pcie-gadget.txt   | 130 -----------
 Documentation/powerpc/index.rst                    |   1 +
 ...pudispatch_stats.txt => vcpudispatch_stats.rst} |  17 +-
 Documentation/process/deprecated.rst               | 118 ++++++++++
 Documentation/security/keys/core.rst               |   2 +-
 Documentation/sh/index.rst                         |   6 +
 .../sh/{new-machine.txt => new-machine.rst}        | 199 ++++++++--------
 .../sh/{register-banks.txt => register-banks.rst}  |  13 +-
 Documentation/{crc32.txt => staging/crc32.rst}     |   0
 Documentation/staging/index.rst                    |  35 +++
 Documentation/{kprobes.txt => staging/kprobes.rst} |   0
 Documentation/{lzo.txt => staging/lzo.rst}         |   0
 .../{remoteproc.txt => staging/remoteproc.rst}     |   2 +-
 Documentation/{rpmsg.txt => staging/rpmsg.rst}     |   0
 .../{speculation.txt => staging/speculation.rst}   |   8 +-
 .../{static-keys.txt => staging/static-keys.rst}   |   0
 Documentation/{tee.txt => staging/tee.rst}         |  69 ++++++
 Documentation/{xz.txt => staging/xz.rst}           |   0
 Documentation/trace/kprobetrace.rst                |   2 +-
 .../translations/it_IT/core-api/index.rst          |  18 ++
 .../it_IT/core-api/symbol-namespaces.rst           | 166 ++++++++++++++
 Documentation/translations/it_IT/index.rst         |   5 +-
 .../translations/it_IT/kernel-hacking/hacking.rst  |   4 +-
 .../translations/zh_CN/filesystems/sysfs.txt       |   6 +-
 .../translations/zh_CN/process/2.Process.rst       |   8 +-
 .../translations/zh_CN/process/4.Coding.rst        |   2 +-
 .../zh_CN/process/7.AdvancedTopics.rst             |   6 +-
 .../translations/zh_CN/process/8.Conclusion.rst    |  10 +-
 .../translations/zh_CN/process/coding-style.rst    |   2 +-
 Documentation/translations/zh_CN/process/howto.rst |  12 +-
 .../zh_CN/process/submitting-drivers.rst           |  18 +-
 .../zh_CN/process/submitting-patches.rst           |   4 +-
 .../zh_CN/process/volatile-considered-harmful.rst  |   4 +-
 MAINTAINERS                                        |  12 +-
 arch/sh/Kconfig.cpu                                |   2 +-
 crypto/asymmetric_keys/asymmetric_type.c           |   2 +-
 crypto/asymmetric_keys/public_key.c                |   2 +-
 crypto/asymmetric_keys/signature.c                 |   2 +-
 drivers/misc/Kconfig                               |   2 +-
 drivers/misc/ad525x_dpot.c                         |   2 +-
 include/crypto/public_key.h                        |   2 +-
 include/keys/asymmetric-parser.h                   |   2 +-
 include/keys/asymmetric-subtype.h                  |   2 +-
 include/keys/asymmetric-type.h                     |   2 +-
 include/linux/jump_label.h                         |   2 +-
 lib/crc32.c                                        |   2 +-
 lib/lzo/lzo1x_decompress_safe.c                    |   2 +-
 lib/xz/Kconfig                                     |   2 +-
 samples/kprobes/kprobe_example.c                   |   2 +-
 samples/kprobes/kretprobe_example.c                |   2 +-
 79 files changed, 1428 insertions(+), 737 deletions(-)
 create mode 100644 Documentation/PCI/endpoint/function/binding/pci-test.rst
 delete mode 100644 Documentation/PCI/endpoint/function/binding/pci-test.txt
 rename Documentation/arm64/{perf.txt => perf.rst} (95%)
 rename Documentation/crypto/{api-intro.txt => api-intro.rst} (70%)
 rename Documentation/crypto/{asymmetric-keys.txt => asymmetric-keys.rst} (91%)
 rename Documentation/crypto/{async-tx-api.txt => async-tx-api.rst} (55%)
 rename Documentation/crypto/{descore-readme.txt => descore-readme.rst} (81%)
 rename Documentation/misc-devices/{ad525x_dpot.txt => ad525x_dpot.rst} (85%)
 rename Documentation/misc-devices/{apds990x.txt => apds990x.rst} (86%)
 rename Documentation/misc-devices/{bh1770glc.txt => bh1770glc.rst} (83%)
 rename Documentation/misc-devices/{c2port.txt => c2port.rst} (61%)
 create mode 100644 Documentation/misc-devices/pci-endpoint-test.rst
 delete mode 100644 Documentation/misc-devices/pci-endpoint-test.txt
 create mode 100644 Documentation/misc-devices/spear-pcie-gadget.rst
 delete mode 100644 Documentation/misc-devices/spear-pcie-gadget.txt
 rename Documentation/powerpc/{vcpudispatch_stats.txt => vcpudispatch_stats.rst} (94%)
 rename Documentation/sh/{new-machine.txt => new-machine.rst} (73%)
 rename Documentation/sh/{register-banks.txt => register-banks.rst} (88%)
 rename Documentation/{crc32.txt => staging/crc32.rst} (100%)
 create mode 100644 Documentation/staging/index.rst
 rename Documentation/{kprobes.txt => staging/kprobes.rst} (100%)
 rename Documentation/{lzo.txt => staging/lzo.rst} (100%)
 rename Documentation/{remoteproc.txt => staging/remoteproc.rst} (99%)
 rename Documentation/{rpmsg.txt => staging/rpmsg.rst} (100%)
 rename Documentation/{speculation.txt => staging/speculation.rst} (97%)
 rename Documentation/{static-keys.txt => staging/static-keys.rst} (100%)
 rename Documentation/{tee.txt => staging/tee.rst} (80%)
 rename Documentation/{xz.txt => staging/xz.rst} (100%)
 create mode 100644 Documentation/translations/it_IT/core-api/index.rst
 create mode 100644 Documentation/translations/it_IT/core-api/symbol-namespaces.rst
Merging v4l-dvb/master (b3a9e3b9622a Linux 5.8-rc1)
$ git merge v4l-dvb/master
Already up to date.
Merging v4l-dvb-next/master (2630e1bb0948 media: rkvdec: Fix H264 scaling list order)
$ git merge v4l-dvb-next/master
Already up to date.
Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe())
$ git merge fbdev/fbdev-for-next
Already up to date.
Merging pm/linux-next (30bbd465a449 Merge branches 'pm-acpi', 'pm-sleep' and 'pm-cpufreq' into linux-next)
$ git merge pm/linux-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging cpufreq-arm/cpufreq/arm/linux-next (fa647413b761 cpufreq: brcmstb-avs-cpufreq: send S2_ENTER / S2_EXIT commands to AVS)
$ git merge cpufreq-arm/cpufreq/arm/linux-next
Merge made by the 'recursive' strategy.
 drivers/cpufreq/brcmstb-avs-cpufreq.c | 89 +++++++++++++++++++++++------------
 drivers/cpufreq/cpufreq-dt-platdev.c  |  2 +
 drivers/cpufreq/qcom-cpufreq-hw.c     | 86 +++++++++++++++++++++++++++++++--
 drivers/opp/core.c                    | 31 ++++++++++++
 include/linux/pm_opp.h                |  6 +++
 5 files changed, 180 insertions(+), 34 deletions(-)
Merging cpupower/cpupower (b3a9e3b9622a Linux 5.8-rc1)
$ git merge cpupower/cpupower
Already up to date.
Merging opp/opp/linux-next (b466542f331e OPP: Add and export helper to set bandwidth)
$ git merge opp/opp/linux-next
Already up to date.
Merging thermal/thermal/linux-next (64488908b523 thermal/int340x_thermal: Don't require IDSP to exist)
$ git merge thermal/thermal/linux-next
Merge made by the 'recursive' strategy.
Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1)
$ git merge thermal-rzhang/next
Already up to date.
Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pure OF sensor)
$ git merge thermal-soc/next
Already up to date.
Merging ieee1394/for-next (67f8e65e4fc1 firewire: net: remove set but not used variable 'guid')
$ git merge ieee1394/for-next
Auto-merging drivers/firewire/net.c
Merge made by the 'recursive' strategy.
 drivers/firewire/net.c | 2 --
 1 file changed, 2 deletions(-)
Merging dlm/next (fe204591cc94 dlm: remove BUG() before panic())
$ git merge dlm/next
Already up to date.
Merging swiotlb/linux-next (4cdfb27ba80d xen/swiotlb: remember having called xen_create_contiguous_region())
$ git merge swiotlb/linux-next
Auto-merging include/linux/page-flags.h
Auto-merging drivers/xen/swiotlb-xen.c
Merge made by the 'recursive' strategy.
Merging rdma/for-next (b3a9e3b9622a Linux 5.8-rc1)
$ git merge rdma/for-next
Already up to date.
Merging net-next/master (29a720c1042f Merge branch 'Marvell-mvpp2-improvements')
$ git merge net-next/master
Auto-merging net/sched/act_gate.c
Auto-merging net/core/dev.c
Auto-merging include/net/flow_offload.h
Auto-merging drivers/of/of_mdio.c
Auto-merging drivers/net/phy/phy_device.c
Auto-merging drivers/net/ethernet/realtek/r8169_main.c
Auto-merging drivers/net/ethernet/netronome/nfp/flower/offload.c
Removing drivers/net/ethernet/mscc/ocelot_tc.h
Removing drivers/net/ethernet/mscc/ocelot_tc.c
Removing drivers/net/ethernet/mscc/ocelot_regs.c
Removing drivers/net/ethernet/mscc/ocelot_board.c
Auto-merging drivers/net/ethernet/marvell/mvneta.c
Auto-merging drivers/net/ethernet/freescale/enetc/enetc.c
Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c
Auto-merging drivers/net/dsa/sja1105/sja1105_vl.c
Merge made by the 'recursive' strategy.
 drivers/isdn/hardware/mISDN/hfcsusb.c              |    3 +-
 drivers/net/dsa/ocelot/Kconfig                     |    4 +-
 drivers/net/dsa/ocelot/felix_vsc9959.c             |    4 +-
 drivers/net/dsa/sja1105/sja1105_tas.c              |    3 +-
 drivers/net/dsa/sja1105/sja1105_vl.c               |    2 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c       |    2 +-
 .../net/ethernet/cavium/liquidio/request_manager.c |   10 +-
 drivers/net/ethernet/cavium/thunder/nicvf_queues.c |    5 +-
 drivers/net/ethernet/chelsio/cxgb4/cudbg_if.h      |    3 +-
 drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c     |   37 +
 drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.h     |    4 +-
 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h         |   81 ++
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c   |   14 +
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.h   |    1 +
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c |  572 ++++++++++-
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c  |    5 +
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.h  |    2 +
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c    |   40 +-
 .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c   |  137 ++-
 .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.h   |    5 +
 .../net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.c |    2 +-
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h     |    2 +
 drivers/net/ethernet/chelsio/cxgb4/sge.c           |    2 +-
 drivers/net/ethernet/chelsio/cxgb4/t4_hw.c         |  277 +++++
 drivers/net/ethernet/chelsio/cxgb4/t4_regs.h       |   10 +
 drivers/net/ethernet/freescale/enetc/enetc.c       |    6 +-
 drivers/net/ethernet/freescale/enetc/enetc_qos.c   |    7 +-
 drivers/net/ethernet/freescale/fec_main.c          |    5 +-
 drivers/net/ethernet/hisilicon/hns3/hns3_enet.c    |   41 +-
 drivers/net/ethernet/hisilicon/hns3/hns3_enet.h    |    2 +-
 drivers/net/ethernet/marvell/mv643xx_eth.c         |    5 +-
 drivers/net/ethernet/marvell/mvneta.c              |    5 +-
 drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c    |  169 ++--
 drivers/net/ethernet/marvell/octeontx2/af/common.h |    2 +-
 .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c |    6 +-
 drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c |    2 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_tc.c    |    4 +-
 .../net/ethernet/mellanox/mlxsw/spectrum_flower.c  |    2 +-
 drivers/net/ethernet/microchip/lan743x_main.c      |   41 +-
 drivers/net/ethernet/mscc/Kconfig                  |   22 +-
 drivers/net/ethernet/mscc/Makefile                 |   16 +-
 drivers/net/ethernet/mscc/ocelot.c                 |  913 +----------------
 drivers/net/ethernet/mscc/ocelot.h                 |   46 +-
 drivers/net/ethernet/mscc/ocelot_board.c           |  626 ------------
 drivers/net/ethernet/mscc/ocelot_flower.c          |  146 ++-
 drivers/net/ethernet/mscc/ocelot_net.c             | 1031 +++++++++++++++++++
 drivers/net/ethernet/mscc/ocelot_police.c          |   49 +-
 drivers/net/ethernet/mscc/ocelot_police.h          |   25 +-
 drivers/net/ethernet/mscc/ocelot_regs.c            |  450 ---------
 drivers/net/ethernet/mscc/ocelot_tc.c              |  179 ----
 drivers/net/ethernet/mscc/ocelot_tc.h              |   22 -
 .../ethernet/mscc/{ocelot_ace.c => ocelot_vcap.c}  |  336 +++---
 .../ethernet/mscc/{ocelot_ace.h => ocelot_vcap.h}  |   88 +-
 drivers/net/ethernet/mscc/ocelot_vsc7514.c         | 1068 ++++++++++++++++++++
 .../net/ethernet/netronome/nfp/flower/offload.c    |    2 +-
 .../net/ethernet/netronome/nfp/flower/qos_conf.c   |    2 +-
 drivers/net/ethernet/realtek/r8169_main.c          |   51 +-
 .../net/ethernet/stmicro/stmmac/stmmac_selftests.c |    2 +-
 drivers/net/ethernet/ti/am65-cpsw-qos.c            |    8 +-
 drivers/net/phy/phy-c45.c                          |    4 +-
 drivers/net/phy/phy_device.c                       |  159 ++-
 drivers/net/phy/phylink.c                          |    8 +-
 drivers/net/vrf.c                                  |  450 ++++++++-
 drivers/of/of_mdio.c                               |    2 +-
 include/linux/icmpv6.h                             |   22 +-
 include/linux/phy.h                                |    8 +-
 include/net/act_api.h                              |   11 +-
 include/net/busy_poll.h                            |    6 +-
 include/net/flow_offload.h                         |    5 +-
 include/net/ip.h                                   |    6 +-
 include/net/ip6_checksum.h                         |    9 -
 include/net/l3mdev.h                               |   39 +
 include/net/pkt_cls.h                              |    5 +-
 include/net/tcp.h                                  |    4 +
 include/net/tso.h                                  |   23 +-
 include/soc/mscc/ocelot.h                          |    4 +-
 net/core/dev.c                                     |    4 +-
 net/core/tso.c                                     |   44 +-
 net/ethtool/ioctl.c                                |    4 +-
 net/ipv4/ip_output.c                               |    6 +
 net/ipv4/tcp_output.c                              |   12 +-
 net/ipv6/icmp.c                                    |    5 +-
 net/ipv6/ip6_icmp.c                                |   10 +-
 net/ipv6/tcp_ipv6.c                                |    7 +
 net/l3mdev/l3mdev.c                                |   93 ++
 net/sched/act_api.c                                |   12 +-
 net/sched/act_ct.c                                 |    6 +-
 net/sched/act_gact.c                               |    7 +-
 net/sched/act_gate.c                               |    6 +-
 net/sched/act_mirred.c                             |    6 +-
 net/sched/act_pedit.c                              |    6 +-
 net/sched/act_police.c                             |    4 +-
 net/sched/act_skbedit.c                            |    5 +-
 net/sched/act_vlan.c                               |    6 +-
 net/sched/cls_flower.c                             |    1 +
 net/sched/cls_matchall.c                           |    3 +-
 net/sched/cls_u32.c                                |    4 +-
 net/sched/sch_api.c                                |    3 +-
 net/sched/sch_taprio.c                             |    5 +-
 net/tipc/bcast.c                                   |    6 +-
 net/tipc/bcast.h                                   |    4 +-
 net/tipc/link.c                                    |   10 +-
 net/tipc/msg.h                                     |   46 +-
 net/tipc/name_distr.c                              |  116 ++-
 net/tipc/name_distr.h                              |    9 +-
 net/tipc/name_table.c                              |    9 +-
 net/tipc/name_table.h                              |    2 +
 net/tipc/node.c                                    |   29 +-
 net/tipc/node.h                                    |    8 +-
 .../testing/selftests/net/vrf_strict_mode_test.sh  |  390 +++++++
 110 files changed, 5238 insertions(+), 3021 deletions(-)
 delete mode 100644 drivers/net/ethernet/mscc/ocelot_board.c
 create mode 100644 drivers/net/ethernet/mscc/ocelot_net.c
 delete mode 100644 drivers/net/ethernet/mscc/ocelot_regs.c
 delete mode 100644 drivers/net/ethernet/mscc/ocelot_tc.c
 delete mode 100644 drivers/net/ethernet/mscc/ocelot_tc.h
 rename drivers/net/ethernet/mscc/{ocelot_ace.c => ocelot_vcap.c} (77%)
 rename drivers/net/ethernet/mscc/{ocelot_ace.h => ocelot_vcap.h} (75%)
 create mode 100644 drivers/net/ethernet/mscc/ocelot_vsc7514.c
 create mode 100755 tools/testing/selftests/net/vrf_strict_mode_test.sh
Merging bpf-next/master (bb8dc2695a7d tools/bpftool: Relicense bpftool's BPF profiler prog as dual-license GPL/BSD)
$ git merge bpf-next/master
Merge made by the 'recursive' strategy.
 kernel/bpf/verifier.c                              |  5 +++
 net/core/bpf_sk_storage.c                          | 41 +++++++++++++++++++---
 tools/bpf/bpftool/skeleton/profiler.bpf.c          |  4 +--
 tools/lib/bpf/libbpf.map                           |  3 ++
 .../selftests/bpf/verifier/value_ptr_arith.c       | 38 ++++++++++++++++++++
 5 files changed, 85 insertions(+), 6 deletions(-)
Merging ipsec-next/master (69119673bd50 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
$ git merge ipsec-next/master
Already up to date.
Merging mlx5-next/mlx5-next (6b646a7e4af6 net/mlx5: Add ability to read and write ECE options)
$ git merge mlx5-next/mlx5-next
Already up to date.
Merging netfilter-next/master (69119673bd50 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
$ git merge netfilter-next/master
Already up to date.
Merging ipvs-next/master (9a25c1df24a6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next)
$ git merge ipvs-next/master
Already up to date.
Merging wireless-drivers-next/master (a15a20acc980 Merge tag 'iwlwifi-next-for-kalle-2020-06-11' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next)
$ git merge wireless-drivers-next/master
Merge made by the 'recursive' strategy.
 drivers/net/wireless/ath/Kconfig                   |    4 +-
 drivers/net/wireless/ath/ath10k/htt_tx.c           |    4 +
 drivers/net/wireless/ath/ath11k/Kconfig            |    9 +
 drivers/net/wireless/ath/ath11k/Makefile           |    4 +-
 drivers/net/wireless/ath/ath11k/core.c             |   10 +
 drivers/net/wireless/ath/ath11k/core.h             |   52 +-
 drivers/net/wireless/ath/ath11k/dbring.c           |  356 +++++++
 drivers/net/wireless/ath/ath11k/dbring.h           |   79 ++
 drivers/net/wireless/ath/ath11k/debug.c            |  128 ++-
 drivers/net/wireless/ath/ath11k/dp.c               |    3 +-
 drivers/net/wireless/ath/ath11k/dp.h               |   42 +
 drivers/net/wireless/ath/ath11k/dp_rx.c            |   36 +-
 drivers/net/wireless/ath/ath11k/dp_tx.c            |    7 +-
 drivers/net/wireless/ath/ath11k/mac.c              |  220 ++++-
 drivers/net/wireless/ath/ath11k/reg.c              |    4 +
 drivers/net/wireless/ath/ath11k/spectral.c         | 1023 ++++++++++++++++++++
 drivers/net/wireless/ath/ath11k/spectral.h         |   82 ++
 drivers/net/wireless/ath/ath11k/wmi.c              |  690 +++++++++++--
 drivers/net/wireless/ath/ath11k/wmi.h              |  184 +++-
 drivers/net/wireless/ath/ath9k/Kconfig             |    5 +-
 drivers/net/wireless/ath/ath9k/hw.c                |    2 +-
 drivers/net/wireless/ath/carl9170/Kconfig          |    2 +-
 drivers/net/wireless/ath/carl9170/usb.c            |    2 +-
 drivers/net/wireless/ath/spectral_common.h         |   17 +
 drivers/net/wireless/ath/wil6210/Kconfig           |    2 +-
 drivers/net/wireless/intel/iwlegacy/4965-mac.c     |    2 +-
 drivers/net/wireless/intel/iwlwifi/Kconfig         |    2 +-
 drivers/net/wireless/intel/iwlwifi/dvm/commands.h  |   12 +-
 drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c  |    1 +
 .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h    |    4 +-
 drivers/net/wireless/intel/iwlwifi/fw/api/tx.h     |   14 +-
 drivers/net/wireless/intel/iwlwifi/fw/dbg.c        |    2 +-
 drivers/net/wireless/intel/iwlwifi/fw/debugfs.c    |    2 +-
 drivers/net/wireless/intel/iwlwifi/iwl-config.h    |    2 +-
 drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h   |    2 +-
 drivers/net/wireless/intel/iwlwifi/iwl-trans.h     |    2 +-
 drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c  |   10 +-
 drivers/net/wireless/intel/iwlwifi/mvm/rs.c        |    2 +-
 drivers/net/wireless/intel/iwlwifi/mvm/sta.c       |    8 -
 39 files changed, 2876 insertions(+), 156 deletions(-)
 create mode 100644 drivers/net/wireless/ath/ath11k/dbring.c
 create mode 100644 drivers/net/wireless/ath/ath11k/dbring.h
 create mode 100644 drivers/net/wireless/ath/ath11k/spectral.c
 create mode 100644 drivers/net/wireless/ath/ath11k/spectral.h
Merging bluetooth/master (46605a271114 Bluetooth: mgmt: Use command complete on success for set system config)
$ git merge bluetooth/master
Auto-merging drivers/bluetooth/btmrvl_sdio.c
Merge made by the 'recursive' strategy.
 drivers/bluetooth/btintel.c                 |  59 +++++
 drivers/bluetooth/btintel.h                 |  21 ++
 drivers/bluetooth/btmrvl_main.c             |  11 +
 drivers/bluetooth/btmrvl_sdio.c             |  21 +-
 drivers/bluetooth/btqca.c                   |  27 ++
 drivers/bluetooth/btqca.h                   |   2 +
 drivers/bluetooth/btusb.c                   |   9 +
 drivers/bluetooth/hci_qca.c                 |  77 +++---
 drivers/net/wireless/marvell/mwifiex/sdio.h |   4 +-
 include/net/bluetooth/bluetooth.h           |  10 +
 include/net/bluetooth/hci_core.h            |  91 ++++++-
 include/net/bluetooth/hci_sock.h            |   4 +-
 include/net/bluetooth/mgmt.h                |  95 +++++++
 include/net/bluetooth/sco.h                 |   2 +
 net/bluetooth/Makefile                      |   2 +-
 net/bluetooth/af_bluetooth.c                |   5 +-
 net/bluetooth/hci_conn.c                    |  25 +-
 net/bluetooth/hci_core.c                    | 185 ++++++++++++-
 net/bluetooth/hci_event.c                   |  13 +-
 net/bluetooth/hci_request.c                 |  57 ++--
 net/bluetooth/hci_sock.c                    |   4 +-
 net/bluetooth/l2cap_core.c                  |   6 +-
 net/bluetooth/mgmt.c                        | 390 +++++++++++++++++++++++++++-
 net/bluetooth/mgmt_config.c                 | 270 +++++++++++++++++++
 net/bluetooth/mgmt_config.h                 |  17 ++
 net/bluetooth/msft.c                        |   7 +
 net/bluetooth/msft.h                        |   9 +
 net/bluetooth/sco.c                         |  32 +++
 28 files changed, 1337 insertions(+), 118 deletions(-)
 create mode 100644 net/bluetooth/mgmt_config.c
 create mode 100644 net/bluetooth/mgmt_config.h
Merging mac80211-next/master (cb8e59cc8720 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
$ git merge mac80211-next/master
Already up to date.
Merging gfs2/for-next (8a9e58a9bb7a gfs2: Add some flags missing from glock output)
$ git merge gfs2/for-next
Merge made by the 'recursive' strategy.
 fs/gfs2/glock.c | 11 ++++++++++-
 fs/gfs2/inode.c |  3 ++-
 fs/gfs2/log.c   | 10 ++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)
Merging mtd/mtd/next (5788ccf3c84f mtd: clear cache_state to avoid writing to bad blocks repeatedly)
$ git merge mtd/mtd/next
Already up to date.
Merging nand/nand/next (8c8cee0fea9d mtd: parsers: bcm63xx: simplify CFE detection)
$ git merge nand/nand/next
Auto-merging drivers/mtd/nand/raw/cadence-nand-controller.c
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/mtd/nand-controller.yaml   |   7 +
 drivers/mtd/nand/Kconfig                           |   5 +
 drivers/mtd/nand/onenand/Kconfig                   |   1 -
 drivers/mtd/nand/raw/Kconfig                       |   1 -
 drivers/mtd/nand/raw/ams-delta.c                   |   6 +-
 drivers/mtd/nand/raw/arasan-nand-controller.c      |   6 +-
 drivers/mtd/nand/raw/atmel/nand-controller.c       |  34 +--
 drivers/mtd/nand/raw/brcmnand/brcmnand.c           |  31 +-
 drivers/mtd/nand/raw/cadence-nand-controller.c     |   6 +-
 drivers/mtd/nand/raw/denali.c                      |   8 +-
 drivers/mtd/nand/raw/fsl_upm.c                     | 311 ++++++++-------------
 drivers/mtd/nand/raw/fsmc_nand.c                   |   6 +-
 drivers/mtd/nand/raw/gpio.c                        | 112 ++++++--
 drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c         |   6 +-
 drivers/mtd/nand/raw/internals.h                   |  23 +-
 drivers/mtd/nand/raw/marvell_nand.c                |  18 +-
 drivers/mtd/nand/raw/meson_nand.c                  |  14 +-
 drivers/mtd/nand/raw/mtk_nand.c                    | 122 ++++----
 drivers/mtd/nand/raw/mxc_nand.c                    |  22 +-
 drivers/mtd/nand/raw/mxic_nand.c                   |   6 +-
 drivers/mtd/nand/raw/nand_base.c                   | 275 ++++++++++--------
 drivers/mtd/nand/raw/nand_bbt.c                    |   2 +-
 drivers/mtd/nand/raw/nand_hynix.c                  |  16 +-
 drivers/mtd/nand/raw/nand_ids.c                    |  24 +-
 drivers/mtd/nand/raw/nand_legacy.c                 |   7 +-
 drivers/mtd/nand/raw/nand_macronix.c               |  10 +-
 drivers/mtd/nand/raw/nand_micron.c                 |   2 +-
 drivers/mtd/nand/raw/nand_timings.c                | 116 ++++++--
 drivers/mtd/nand/raw/nand_toshiba.c                |  72 ++++-
 drivers/mtd/nand/raw/qcom_nandc.c                  |  18 +-
 drivers/mtd/nand/raw/s3c2410.c                     |   6 +-
 drivers/mtd/nand/raw/stm32_fmc2_nand.c             |   6 +-
 drivers/mtd/nand/raw/sunxi_nand.c                  |   6 +-
 drivers/mtd/nand/raw/tango_nand.c                  | 129 +++++----
 drivers/mtd/nand/raw/tegra_nand.c                  |   6 +-
 drivers/mtd/parsers/bcm63xxpart.c                  |  32 +--
 include/linux/mtd/nand.h                           |  12 +-
 include/linux/mtd/rawnand.h                        | 265 +++++++++---------
 include/linux/mtd/spinand.h                        |   2 +-
 39 files changed, 1011 insertions(+), 740 deletions(-)
Merging spi-nor/spi-nor/next (b3a9e3b9622a Linux 5.8-rc1)
$ git merge spi-nor/spi-nor/next
Already up to date.
Merging crypto/master (a05b1c150f5b crypto: octeontx - Fix sparse warnings)
$ git merge crypto/master
Merge made by the 'recursive' strategy.
 .../bindings/rng/silex-insight,ba431-rng.yaml      |  36 ++++
 crypto/af_alg.c                                    |  11 +-
 crypto/algif_aead.c                                |   4 +-
 crypto/algif_skcipher.c                            |   4 +-
 drivers/char/hw_random/Kconfig                     |  12 ++
 drivers/char/hw_random/Makefile                    |   1 +
 drivers/char/hw_random/ba431-rng.c                 | 234 +++++++++++++++++++++
 drivers/crypto/caam/caamalg_qi2.c                  |  17 +-
 drivers/crypto/caam/ctrl.c                         |  12 +-
 drivers/crypto/caam/dpseci.c                       |  18 ++
 drivers/crypto/caam/dpseci.h                       |   2 +
 drivers/crypto/caam/dpseci_cmd.h                   |   1 +
 drivers/crypto/hisilicon/qm.c                      |  33 +--
 drivers/crypto/hisilicon/sec2/sec_main.c           |   6 +-
 drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c  |   8 +-
 drivers/crypto/marvell/octeontx/otx_cptpf_ucode.h  |   2 +-
 drivers/crypto/marvell/octeontx/otx_cptvf_algs.c   |  21 +-
 drivers/crypto/marvell/octeontx/otx_cptvf_algs.h   |   6 +-
 drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.c |   9 +-
 drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.h |  24 +--
 drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.c   |  48 +----
 drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.h   |  48 +----
 drivers/crypto/qat/qat_c3xxx/adf_drv.c             |  48 +----
 .../crypto/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c   |  48 +----
 .../crypto/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.h   |  48 +----
 drivers/crypto/qat/qat_c3xxxvf/adf_drv.c           |  48 +----
 drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.c     |  48 +----
 drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.h     |  48 +----
 drivers/crypto/qat/qat_c62x/adf_drv.c              |  48 +----
 drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.c |  48 +----
 drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.h |  48 +----
 drivers/crypto/qat/qat_c62xvf/adf_drv.c            |  48 +----
 drivers/crypto/qat/qat_common/adf_accel_devices.h  | 102 +++------
 drivers/crypto/qat/qat_common/adf_accel_engine.c   |  52 +----
 drivers/crypto/qat/qat_common/adf_admin.c          | 144 ++++++-------
 drivers/crypto/qat/qat_common/adf_aer.c            |  50 +----
 drivers/crypto/qat/qat_common/adf_cfg.c            |  48 +----
 drivers/crypto/qat/qat_common/adf_cfg.h            |  48 +----
 drivers/crypto/qat/qat_common/adf_cfg_common.h     |  72 ++-----
 drivers/crypto/qat/qat_common/adf_cfg_strings.h    |  48 +----
 drivers/crypto/qat/qat_common/adf_cfg_user.h       |  58 +----
 drivers/crypto/qat/qat_common/adf_common_drv.h     |  60 +-----
 drivers/crypto/qat/qat_common/adf_ctl_drv.c        |  52 +----
 drivers/crypto/qat/qat_common/adf_dev_mgr.c        |  56 +----
 drivers/crypto/qat/qat_common/adf_hw_arbiter.c     |  48 +----
 drivers/crypto/qat/qat_common/adf_init.c           |  48 +----
 drivers/crypto/qat/qat_common/adf_isr.c            |  48 +----
 drivers/crypto/qat/qat_common/adf_pf2vf_msg.c      |  49 +----
 drivers/crypto/qat/qat_common/adf_pf2vf_msg.h      |  48 +----
 drivers/crypto/qat/qat_common/adf_sriov.c          |  48 +----
 drivers/crypto/qat/qat_common/adf_transport.c      | 110 +++-------
 drivers/crypto/qat/qat_common/adf_transport.h      |  52 +----
 .../qat/qat_common/adf_transport_access_macros.h   |  54 +----
 .../crypto/qat/qat_common/adf_transport_debug.c    |  48 +----
 .../crypto/qat/qat_common/adf_transport_internal.h |  75 ++-----
 drivers/crypto/qat/qat_common/adf_vf2pf_msg.c      |  48 +----
 drivers/crypto/qat/qat_common/adf_vf_isr.c         |  48 +----
 drivers/crypto/qat/qat_common/icp_qat_fw.h         | 106 +++-------
 .../crypto/qat/qat_common/icp_qat_fw_init_admin.h  | 145 ++++++-------
 drivers/crypto/qat/qat_common/icp_qat_fw_la.h      | 206 +++++++-----------
 .../qat/qat_common/icp_qat_fw_loader_handle.h      |  48 +----
 drivers/crypto/qat/qat_common/icp_qat_fw_pke.h     | 100 +++------
 drivers/crypto/qat/qat_common/icp_qat_hal.h        |  48 +----
 drivers/crypto/qat/qat_common/icp_qat_hw.h         |  64 +-----
 drivers/crypto/qat/qat_common/icp_qat_uclo.h       |  54 +----
 drivers/crypto/qat/qat_common/qat_algs.c           | 102 +++------
 drivers/crypto/qat/qat_common/qat_asym_algs.c      |  61 +-----
 drivers/crypto/qat/qat_common/qat_crypto.c         |  48 +----
 drivers/crypto/qat/qat_common/qat_crypto.h         |  48 +----
 drivers/crypto/qat/qat_common/qat_hal.c            |  88 ++------
 drivers/crypto/qat/qat_common/qat_uclo.c           |  68 ++----
 .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c |  74 ++-----
 .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h |  48 +----
 drivers/crypto/qat/qat_dh895xcc/adf_drv.c          |  48 +----
 .../qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c    |  48 +----
 .../qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.h    |  48 +----
 drivers/crypto/qat/qat_dh895xccvf/adf_drv.c        |  48 +----
 include/crypto/if_alg.h                            |   4 +-
 lib/crc-t10dif.c                                   |  75 ++++---
 79 files changed, 997 insertions(+), 3133 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/rng/silex-insight,ba431-rng.yaml
 create mode 100644 drivers/char/hw_random/ba431-rng.c
Merging drm/drm-next (66057dd1d1cf Merge tag 'drm-misc-next-fixes-2020-06-11' of git://anongit.freedesktop.org/drm/drm-misc into drm-next)
$ git merge drm/drm-next
Already up to date.
Merging amdgpu/drm-next (f59073f6df9b drm/amdgpu: add another raven1 gfxoff quirk)
$ git merge amdgpu/drm-next
Auto-merging sound/pci/hda/hda_intel.c
Auto-merging drivers/gpu/drm/ttm/ttm_bo.c
Auto-merging drivers/gpu/drm/radeon/radeon_kms.c
Removing drivers/gpu/drm/amd/powerplay/vega20_ppt.h
Removing drivers/gpu/drm/amd/powerplay/vega20_ppt.c
Auto-merging drivers/gpu/drm/amd/powerplay/smu_v11_0.c
Auto-merging drivers/gpu/drm/amd/display/modules/color/color_gamma.c
Removing drivers/gpu/drm/amd/display/dmub/inc/dmub_rb.h
Removing drivers/gpu/drm/amd/display/dmub/inc/dmub_gpint_cmd.h
Auto-merging drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c
Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c
Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_priv.h
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
Resolved 'drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master aec42aa1b6c6] Merge remote-tracking branch 'amdgpu/drm-next'
$ git diff -M --stat --summary HEAD^..
 drivers/gpu/drm/amd/amdgpu/Makefile                |    27 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu.h                |    11 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c           |    73 +-
 .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c   |   834 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c       |     5 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c   |    79 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h   |     3 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c     |    16 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c         |   118 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_display.c        |     5 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h       |    11 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c            |     4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c            |    15 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c          |    26 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c     |     1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.h     |     4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h            |     1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c            |     3 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c        |     2 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c           |    16 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h           |     2 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c            |     8 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h            |    45 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c             |    76 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c            |   118 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h            |    12 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c            |    24 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h           |     3 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c           |     2 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c            |   113 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c          |    39 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h          |     9 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c            |     8 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h            |    25 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c           |   174 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h           |    30 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c             |     6 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c       |     2 -
 drivers/gpu/drm/amd/amdgpu/athub_v2_1.c            |   100 +
 drivers/gpu/drm/amd/amdgpu/athub_v2_1.h            |    30 +
 drivers/gpu/drm/amd/amdgpu/dce_v11_0.c             |     2 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c             |   527 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c              |    12 +-
 drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c           |     4 +
 drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c           |   375 +
 .../dmub/inc/dmub_types.h => amdgpu/gfxhub_v2_1.h} |    60 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c             |    81 +-
 drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c             |   613 +
 .../dmub/inc/dmub_fw_meta.h => amdgpu/jpeg_v3_0.h} |    42 +-
 drivers/gpu/drm/amd/amdgpu/mes_api_def.h           |   443 +
 drivers/gpu/drm/amd/amdgpu/mes_v10_1.c             |   664 +-
 drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c            |    76 +-
 drivers/gpu/drm/amd/amdgpu/navi10_ih.c             |    21 +-
 drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c             |    14 +-
 drivers/gpu/drm/amd/amdgpu/nv.c                    |   103 +-
 drivers/gpu/drm/amd/amdgpu/nv.h                    |     1 +
 drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h            |     8 +
 drivers/gpu/drm/amd/amdgpu/psp_v11_0.c             |    92 +-
 .../inc/dmub_cmd_dal.h => amdgpu/sdma_common.h}    |    42 +-
 drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c             |    44 +-
 drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c             |     1 +
 drivers/gpu/drm/amd/amdgpu/sdma_v5_0.h             |    15 -
 drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c             |  1753 +
 drivers/gpu/drm/amd/amdgpu/sdma_v5_2.h             |    30 +
 drivers/gpu/drm/amd/amdgpu/si_dpm.h                |     2 +-
 .../gpu/drm/amd/amdgpu/sienna_cichlid_reg_init.c   |    54 +
 drivers/gpu/drm/amd/amdgpu/soc15.c                 |    16 +-
 drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c              |    96 +-
 drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c              |    86 +-
 drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c              |    94 +-
 drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c              |  1689 +
 drivers/gpu/drm/amd/amdgpu/vcn_v3_0.h              |    29 +
 drivers/gpu/drm/amd/amdkfd/Makefile                |     1 +
 drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c   |     2 +
 drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h     |   877 +-
 .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm |   301 +-
 drivers/gpu/drm/amd/amdkfd/kfd_chardev.c           |    18 +
 drivers/gpu/drm/amd/amdkfd/kfd_crat.c              |     1 +
 drivers/gpu/drm/amd/amdkfd/kfd_device.c            |    35 +
 .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c  |    58 +
 .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h  |     2 +
 drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c       |     1 +
 drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c    |     2 +
 drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c    |     1 +
 drivers/gpu/drm/amd/amdkfd/kfd_priv.h              |    25 +-
 drivers/gpu/drm/amd/amdkfd/kfd_process.c           |   138 +-
 drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c        |   226 +
 drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h        |    29 +
 drivers/gpu/drm/amd/amdkfd/kfd_topology.c          |   295 +-
 drivers/gpu/drm/amd/display/Kconfig                |     8 +
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  |    44 +-
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h  |     2 +
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c    |    10 +-
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c  |     4 +-
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c  |    20 +
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c |    25 -
 drivers/gpu/drm/amd/display/dc/Makefile            |     4 +
 drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c |   204 +
 .../amd/display/dc/bios/command_table_helper2.c    |     5 +
 .../dc/bios/dce112/command_table_helper2_dce112.c  |    40 +
 .../dc/bios/dce112/command_table_helper2_dce112.h  |     3 +
 .../gpu/drm/amd/display/dc/calcs/dcn_calc_auto.c   |     6 +-
 drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c   |     7 +
 drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile    |    10 +
 drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c   |    22 +
 .../gpu/drm/amd/display/dc/clk_mgr/dcn30/dalsmc.h  |    60 +
 .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c   |   543 +
 .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.h   |    38 +
 .../dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.c       |   255 +
 .../dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.h       |   108 +
 drivers/gpu/drm/amd/display/dc/core/dc.c           |    97 +-
 drivers/gpu/drm/amd/display/dc/core/dc_debug.c     |    59 +
 drivers/gpu/drm/amd/display/dc/core/dc_link.c      |    29 +-
 drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c   |    42 +-
 drivers/gpu/drm/amd/display/dc/core/dc_resource.c  |    36 +-
 drivers/gpu/drm/amd/display/dc/core/dc_stream.c    |    37 +
 drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c |     3 -
 drivers/gpu/drm/amd/display/dc/dc.h                |    62 +-
 drivers/gpu/drm/amd/display/dc/dc_bios_types.h     |     5 +-
 drivers/gpu/drm/amd/display/dc/dc_hw_types.h       |    75 +
 drivers/gpu/drm/amd/display/dc/dc_link.h           |     4 +-
 drivers/gpu/drm/amd/display/dc/dc_stream.h         |    15 +
 drivers/gpu/drm/amd/display/dc/dc_types.h          |    34 +
 drivers/gpu/drm/amd/display/dc/dce/dce_abm.h       |    20 +
 drivers/gpu/drm/amd/display/dc/dce/dce_audio.c     |     4 +-
 .../gpu/drm/amd/display/dc/dce/dce_clock_source.c  |   153 +-
 .../gpu/drm/amd/display/dc/dce/dce_clock_source.h  |    42 +
 drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h     |    46 +
 drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c      |    92 -
 drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c      |     3 +-
 .../amd/display/dc/dce110/dce110_hw_sequencer.c    |    28 +-
 .../amd/display/dc/dce110/dce110_hw_sequencer.h    |     1 +
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c  |    12 +
 .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c  |    12 +-
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c  |     1 +
 .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h  |     6 +
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c  |    13 +-
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h  |    62 +
 .../amd/display/dc/dcn10/dcn10_stream_encoder.h    |    42 +
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h  |    22 +
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.c   |     4 +
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c   |    17 -
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.h   |    12 -
 .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c    |     9 +
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c  |    20 +
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h  |    41 +
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c |   116 +-
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c  |     1 +
 .../drm/amd/display/dc/dcn20/dcn20_link_encoder.h  |     7 +-
 .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c  |    70 +-
 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c  |   121 +-
 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c |    89 +
 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.h |     6 +
 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c  |     5 +-
 .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c  |     6 +-
 drivers/gpu/drm/amd/display/dc/dcn30/Makefile      |    54 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.c  |   206 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.h  |   230 +
 .../gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c |   640 +
 .../gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.h |    78 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dccg.c  |   100 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dccg.h  |    66 +
 .../amd/display/dc/dcn30/dcn30_dio_link_encoder.c  |   205 +
 .../amd/display/dc/dcn30/dcn30_dio_link_encoder.h  |    76 +
 .../display/dc/dcn30/dcn30_dio_stream_encoder.c    |   851 +
 .../display/dc/dcn30/dcn30_dio_stream_encoder.h    |   269 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c   |  1414 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.h   |   608 +
 .../gpu/drm/amd/display/dc/dcn30/dcn30_dpp_cm.c    |   410 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.c   |   264 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.h   |   923 +
 .../gpu/drm/amd/display/dc/dcn30/dcn30_dwb_cm.c    |   354 +
 .../gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.c    |   417 +
 .../gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.h    |   119 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c  |   532 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.h  |   292 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c |   714 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h |    70 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c  |   147 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.h  |    33 +
 .../gpu/drm/amd/display/dc/dcn30/dcn30_mmhubbub.c  |   239 +
 .../gpu/drm/amd/display/dc/dcn30/dcn30_mmhubbub.h  |   463 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c   |  1409 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.h   |   665 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_opp.h   |    36 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c  |   365 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h  |   333 +
 .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c  |  2620 +
 .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.h  |    82 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_vpg.c   |   194 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_vpg.h   |   133 +
 drivers/gpu/drm/amd/display/dc/dm_helpers.h        |    23 +
 drivers/gpu/drm/amd/display/dc/dm_services.h       |    69 -
 drivers/gpu/drm/amd/display/dc/dml/Makefile        |     7 +
 .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c  |    33 +-
 .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c        |    33 +-
 .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c  |    36 +-
 .../amd/display/dc/dml/dcn30/display_mode_vba_30.c |  6860 ++
 .../amd/display/dc/dml/dcn30/display_mode_vba_30.h |    43 +
 .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c  |  1868 +
 .../display/dc/dml/dcn30/display_rq_dlg_calc_30.h  |    69 +
 .../drm/amd/display/dc/dml/display_mode_enums.h    |     6 +
 .../gpu/drm/amd/display/dc/dml/display_mode_lib.c  |   181 +
 .../gpu/drm/amd/display/dc/dml/display_mode_lib.h  |    11 +
 .../drm/amd/display/dc/dml/display_mode_structs.h  |    14 +
 .../gpu/drm/amd/display/dc/dml/display_mode_vba.c  |    67 +-
 .../gpu/drm/amd/display/dc/dml/display_mode_vba.h  |   230 +-
 .../gpu/drm/amd/display/dc/dml/dml_inline_defs.h   |    18 +-
 drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c       |     8 +-
 drivers/gpu/drm/amd/display/dc/gpio/Makefile       |    10 +
 .../amd/display/dc/gpio/dcn30/hw_factory_dcn30.c   |   257 +
 .../amd/display/dc/gpio/dcn30/hw_factory_dcn30.h   |    33 +
 .../amd/display/dc/gpio/dcn30/hw_translate_dcn30.c |   387 +
 .../amd/display/dc/gpio/dcn30/hw_translate_dcn30.h |    35 +
 drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c   |     9 +-
 drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c |     8 +
 drivers/gpu/drm/amd/display/dc/inc/core_status.h   |     2 +
 drivers/gpu/drm/amd/display/dc/inc/core_types.h    |    31 +-
 drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h    |    75 +
 .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h   |    14 +
 drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h   |     6 +
 drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h        |     7 +
 drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h        |    83 +
 drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h       |     7 +-
 drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h  |     9 +
 drivers/gpu/drm/amd/display/dc/inc/hw/mcif_wb.h    |     8 +
 drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h        |   108 +
 .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h |     4 +
 .../drm/amd/display/dc/inc/hw/timing_generator.h   |    19 +
 drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h  |     6 +
 drivers/gpu/drm/amd/display/dc/inc/resource.h      |     3 +
 drivers/gpu/drm/amd/display/dc/irq/Makefile        |    10 +
 .../amd/display/dc/irq/dcn30/irq_service_dcn30.c   |   384 +
 .../amd/display/dc/irq/dcn30/irq_service_dcn30.h   |    37 +
 drivers/gpu/drm/amd/display/dc/os_types.h          |    10 +-
 drivers/gpu/drm/amd/display/dmub/dmub_srv.h        |    22 +-
 drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h    |   465 +-
 .../gpu/drm/amd/display/dmub/inc/dmub_gpint_cmd.h  |    75 -
 drivers/gpu/drm/amd/display/dmub/inc/dmub_rb.h     |   152 -
 drivers/gpu/drm/amd/display/dmub/src/Makefile      |     3 +
 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c  |    34 +-
 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h  |     2 +-
 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c  |   184 +
 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.h  |    50 +
 drivers/gpu/drm/amd/display/dmub/src/dmub_reg.h    |     2 +-
 drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c    |    45 +-
 drivers/gpu/drm/amd/display/include/dal_asic_id.h  |     4 +
 drivers/gpu/drm/amd/display/include/dal_types.h    |     1 +
 .../amd/display/include/grph_object_ctrl_defs.h    |     5 +
 drivers/gpu/drm/amd/display/modules/color/Makefile |     4 +
 .../drm/amd/display/modules/color/color_gamma.c    |   115 +-
 .../drm/amd/display/modules/color/color_gamma.h    |    18 +-
 .../drm/amd/display/modules/color/color_table.c    |    48 +
 .../drm/amd/display/modules/color/color_table.h    |    47 +
 .../gpu/drm/amd/display/modules/inc/mod_stats.h    |     8 +-
 .../drm/amd/display/modules/power/power_helpers.c  |    96 +-
 .../include/asic_reg/athub/athub_2_1_0_offset.h    |   523 +
 .../include/asic_reg/athub/athub_2_1_0_sh_mask.h   |  2378 +
 .../amd/include/asic_reg/dcn/dcn_3_0_0_offset.h    | 17880 +++++
 .../amd/include/asic_reg/dcn/dcn_3_0_0_sh_mask.h   | 70929 +++++++++++++++++++
 .../amd/include/asic_reg/dcn/dpcs_3_0_0_offset.h   |   573 +
 .../amd/include/asic_reg/dcn/dpcs_3_0_0_sh_mask.h  |  3565 +
 .../drm/amd/include/asic_reg/gc/gc_10_1_0_offset.h |     6 +-
 .../amd/include/asic_reg/gc/gc_10_1_0_sh_mask.h    |    36 +
 .../amd/include/asic_reg/gc/gc_10_3_0_default.h    |  7272 ++
 .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 13473 ++++
 .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h    | 47727 +++++++++++++
 .../drm/amd/include/asic_reg/gc/gc_9_0_offset.h    |     8 +-
 .../drm/amd/include/asic_reg/gc/gc_9_0_sh_mask.h   |    27 +
 .../drm/amd/include/asic_reg/gc/gc_9_1_offset.h    |     8 +-
 .../drm/amd/include/asic_reg/gc/gc_9_1_sh_mask.h   |    26 +
 .../drm/amd/include/asic_reg/gc/gc_9_2_1_offset.h  |     8 +-
 .../drm/amd/include/asic_reg/gc/gc_9_2_1_sh_mask.h |    26 +
 .../amd/include/asic_reg/vcn/vcn_3_0_0_offset.h    |  1542 +
 .../amd/include/asic_reg/vcn/vcn_3_0_0_sh_mask.h   |  5496 ++
 drivers/gpu/drm/amd/include/atomfirmware.h         |   283 +
 .../amd/include/ivsrcid/sdma2/irqsrcs_sdma2_5_0.h  |    45 +
 .../amd/include/ivsrcid/sdma3/irqsrcs_sdma3_5_0.h  |    45 +
 .../gpu/drm/amd/include/sienna_cichlid_ip_offset.h |  1168 +
 drivers/gpu/drm/amd/include/soc15_ih_clientid.h    |     1 +
 drivers/gpu/drm/amd/powerplay/Makefile             |     2 +-
 drivers/gpu/drm/amd/powerplay/amdgpu_smu.c         |  1518 +-
 drivers/gpu/drm/amd/powerplay/arcturus_ppt.c       |  1148 +-
 drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h     |    80 +-
 drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h |     3 +
 .../amd/powerplay/inc/smu11_driver_if_arcturus.h   |    12 +-
 .../powerplay/inc/smu11_driver_if_sienna_cichlid.h |  1220 +
 drivers/gpu/drm/amd/powerplay/inc/smu_types.h      |     4 +
 drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h      |    35 +-
 .../gpu/drm/amd/powerplay/inc/smu_v11_0_7_ppsmc.h  |   139 +
 .../drm/amd/powerplay/inc/smu_v11_0_7_pptable.h    |   196 +
 drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h      |     2 +-
 drivers/gpu/drm/amd/powerplay/navi10_ppt.c         |   744 +-
 drivers/gpu/drm/amd/powerplay/renoir_ppt.c         |    31 +-
 drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c |  2637 +
 .../sienna_cichlid_ppt.h}                          |    26 +-
 drivers/gpu/drm/amd/powerplay/smu_internal.h       |    53 +-
 drivers/gpu/drm/amd/powerplay/smu_v11_0.c          |   633 +-
 drivers/gpu/drm/amd/powerplay/smu_v12_0.c          |    54 +-
 drivers/gpu/drm/amd/powerplay/vega20_ppt.c         |  3288 -
 drivers/gpu/drm/amd/powerplay/vega20_ppt.h         |   179 -
 drivers/gpu/drm/radeon/ni_dpm.c                    |     7 +-
 drivers/gpu/drm/radeon/radeon_connectors.c         |    20 +-
 drivers/gpu/drm/radeon/radeon_display.c            |     4 +-
 drivers/gpu/drm/radeon/radeon_drv.c                |     9 +-
 drivers/gpu/drm/radeon/radeon_kms.c                |     4 +-
 drivers/gpu/drm/ttm/ttm_bo.c                       |     2 +-
 include/drm/amd_asic_type.h                        |     1 +
 include/uapi/drm/amdgpu_drm.h                      |    10 +-
 include/uapi/linux/kfd_ioctl.h                     |    22 +-
 sound/pci/hda/hda_intel.c                          |     3 +
 311 files changed, 219565 insertions(+), 7875 deletions(-)
 create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/athub_v2_1.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/athub_v2_1.h
 create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c
 rename drivers/gpu/drm/amd/{display/dmub/inc/dmub_types.h => amdgpu/gfxhub_v2_1.h} (55%)
 create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c
 rename drivers/gpu/drm/amd/{display/dmub/inc/dmub_fw_meta.h => amdgpu/jpeg_v3_0.h} (53%)
 create mode 100644 drivers/gpu/drm/amd/amdgpu/mes_api_def.h
 rename drivers/gpu/drm/amd/{display/dmub/inc/dmub_cmd_dal.h => amdgpu/sdma_common.h} (62%)
 create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v5_2.h
 create mode 100644 drivers/gpu/drm/amd/amdgpu/sienna_cichlid_reg_init.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v3_0.h
 create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c
 create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dalsmc.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/Makefile
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dccg.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dccg.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_link_encoder.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_link_encoder.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_stream_encoder.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_stream_encoder.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp_cm.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb_cm.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mmhubbub.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mmhubbub.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_opp.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_vpg.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_vpg.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_factory_dcn30.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_factory_dcn30.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_translate_dcn30.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_translate_dcn30.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn30/irq_service_dcn30.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn30/irq_service_dcn30.h
 delete mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_gpint_cmd.h
 delete mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_rb.h
 create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c
 create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.h
 create mode 100644 drivers/gpu/drm/amd/display/modules/color/color_table.c
 create mode 100644 drivers/gpu/drm/amd/display/modules/color/color_table.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/athub/athub_2_1_0_offset.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/athub/athub_2_1_0_sh_mask.h
 create mode 100755 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_0_offset.h
 create mode 100755 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_0_sh_mask.h
 create mode 100755 drivers/gpu/drm/amd/include/asic_reg/dcn/dpcs_3_0_0_offset.h
 create mode 100755 drivers/gpu/drm/amd/include/asic_reg/dcn/dpcs_3_0_0_sh_mask.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_10_3_0_default.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_3_0_0_offset.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_3_0_0_sh_mask.h
 create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/sdma2/irqsrcs_sdma2_5_0.h
 create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/sdma3/irqsrcs_sdma3_5_0.h
 create mode 100644 drivers/gpu/drm/amd/include/sienna_cichlid_ip_offset.h
 create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_sienna_cichlid.h
 create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu_v11_0_7_ppsmc.h
 create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu_v11_0_7_pptable.h
 create mode 100644 drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c
 rename drivers/gpu/drm/amd/{display/dmub/inc/dmub_cmd_vbios.h => powerplay/sienna_cichlid_ppt.h} (74%)
 delete mode 100644 drivers/gpu/drm/amd/powerplay/vega20_ppt.c
 delete mode 100644 drivers/gpu/drm/amd/powerplay/vega20_ppt.h
$ git am -3 ../patches/0001-drm-amdkfd-fix-up-for-un-use_mm-rename.patch
Applying: drm/amdkfd: fix up for {un}use_mm() rename
$ git reset HEAD^
Unstaged changes after reset:
M	drivers/gpu/drm/amd/amdkfd/kfd_process.c
$ git add -A .
$ git commit -v -a --amend
[master e575ebb09e69] Merge remote-tracking branch 'amdgpu/drm-next'
 Date: Mon Jun 22 10:22:20 2020 +1000
$ git reset --hard HEAD^
HEAD is now at 6f70dedf54ed Merge remote-tracking branch 'crypto/master'
Merging next-20200616 version of amdgpu
$ git merge -m next-20200616/amdgpu 624a498a539a7ea60a57114991389f0280785aec
Auto-merging sound/pci/hda/hda_intel.c
Auto-merging drivers/gpu/drm/ttm/ttm_bo.c
Removing drivers/gpu/drm/amd/powerplay/vega20_ppt.h
Removing drivers/gpu/drm/amd/powerplay/vega20_ppt.c
Auto-merging drivers/gpu/drm/amd/powerplay/smu_v11_0.c
Removing drivers/gpu/drm/amd/display/dmub/inc/dmub_rb.h
Removing drivers/gpu/drm/amd/display/dmub/inc/dmub_gpint_cmd.h
Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c
Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_priv.h
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/amd/amdgpu/Makefile                |    27 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu.h                |     7 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c           |    73 +-
 .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c   |   834 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c       |     5 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c   |    79 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h   |     3 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c         |   108 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h       |    11 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c            |     4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c          |    26 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c     |     1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.h     |     4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h            |     1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c            |     3 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c            |     5 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h            |    45 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c             |    72 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c            |    81 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h            |    12 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c            |    24 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h           |     3 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c            |   113 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c          |    39 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h          |     9 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c            |     8 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h            |    25 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c           |     1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c             |     6 +-
 drivers/gpu/drm/amd/amdgpu/athub_v2_1.c            |   100 +
 drivers/gpu/drm/amd/amdgpu/athub_v2_1.h            |    30 +
 drivers/gpu/drm/amd/amdgpu/dce_v11_0.c             |     2 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c             |   521 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c              |     6 +-
 drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c           |     4 +
 drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c           |   375 +
 .../dmub/inc/dmub_types.h => amdgpu/gfxhub_v2_1.h} |    60 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c             |    81 +-
 drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c             |   613 +
 .../dmub/inc/dmub_fw_meta.h => amdgpu/jpeg_v3_0.h} |    42 +-
 drivers/gpu/drm/amd/amdgpu/mes_api_def.h           |   443 +
 drivers/gpu/drm/amd/amdgpu/mes_v10_1.c             |   664 +-
 drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c            |    76 +-
 drivers/gpu/drm/amd/amdgpu/navi10_ih.c             |    21 +-
 drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c             |    14 +-
 drivers/gpu/drm/amd/amdgpu/nv.c                    |   103 +-
 drivers/gpu/drm/amd/amdgpu/nv.h                    |     1 +
 drivers/gpu/drm/amd/amdgpu/psp_v11_0.c             |    92 +-
 .../inc/dmub_cmd_dal.h => amdgpu/sdma_common.h}    |    42 +-
 drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c             |    12 +-
 drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c             |     1 +
 drivers/gpu/drm/amd/amdgpu/sdma_v5_0.h             |    15 -
 drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c             |  1753 +
 drivers/gpu/drm/amd/amdgpu/sdma_v5_2.h             |    30 +
 drivers/gpu/drm/amd/amdgpu/si_dpm.h                |     2 +-
 .../gpu/drm/amd/amdgpu/sienna_cichlid_reg_init.c   |    54 +
 drivers/gpu/drm/amd/amdgpu/soc15.c                 |    13 +-
 drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c              |    96 +-
 drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c              |    86 +-
 drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c              |    94 +-
 drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c              |  1689 +
 drivers/gpu/drm/amd/amdgpu/vcn_v3_0.h              |    29 +
 drivers/gpu/drm/amd/amdkfd/Makefile                |     1 +
 drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c   |     2 +
 drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h     |   877 +-
 .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm |   301 +-
 drivers/gpu/drm/amd/amdkfd/kfd_chardev.c           |    18 +
 drivers/gpu/drm/amd/amdkfd/kfd_crat.c              |     1 +
 drivers/gpu/drm/amd/amdkfd/kfd_device.c            |    32 +
 .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c  |    58 +
 .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h  |     2 +
 drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c       |     1 +
 drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c    |     2 +
 drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c    |     1 +
 drivers/gpu/drm/amd/amdkfd/kfd_priv.h              |    20 +-
 drivers/gpu/drm/amd/amdkfd/kfd_process.c           |   138 +-
 drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c        |   226 +
 drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h        |    29 +
 drivers/gpu/drm/amd/amdkfd/kfd_topology.c          |   275 +-
 drivers/gpu/drm/amd/display/Kconfig                |     8 +
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  |    31 +-
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c  |     4 +-
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c  |    20 +
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c |    25 -
 drivers/gpu/drm/amd/display/dc/Makefile            |     4 +
 drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c |   101 +
 .../amd/display/dc/bios/command_table_helper2.c    |     5 +
 .../dc/bios/dce112/command_table_helper2_dce112.c  |    40 +
 .../dc/bios/dce112/command_table_helper2_dce112.h  |     3 +
 drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c   |     7 +
 drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile    |    10 +
 drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c   |    22 +
 .../gpu/drm/amd/display/dc/clk_mgr/dcn30/dalsmc.h  |    60 +
 .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c   |   543 +
 .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.h   |    38 +
 .../dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.c       |   255 +
 .../dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.h       |   108 +
 drivers/gpu/drm/amd/display/dc/core/dc.c           |    95 +-
 drivers/gpu/drm/amd/display/dc/core/dc_link.c      |    25 +-
 drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c  |    13 +-
 drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c   |    85 +-
 drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c |     2 +-
 drivers/gpu/drm/amd/display/dc/core/dc_resource.c  |    36 +-
 drivers/gpu/drm/amd/display/dc/core/dc_stream.c    |    37 +
 drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c |     3 -
 drivers/gpu/drm/amd/display/dc/dc.h                |    64 +-
 drivers/gpu/drm/amd/display/dc/dc_bios_types.h     |     4 +-
 drivers/gpu/drm/amd/display/dc/dc_hw_types.h       |    75 +
 drivers/gpu/drm/amd/display/dc/dc_link.h           |     5 +-
 drivers/gpu/drm/amd/display/dc/dc_stream.h         |    15 +
 drivers/gpu/drm/amd/display/dc/dc_types.h          |    34 +
 drivers/gpu/drm/amd/display/dc/dce/dce_abm.h       |    20 +
 .../gpu/drm/amd/display/dc/dce/dce_clock_source.c  |   153 +-
 .../gpu/drm/amd/display/dc/dce/dce_clock_source.h  |    42 +
 drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h     |    46 +
 drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c      |    92 -
 drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c      |     2 +-
 .../amd/display/dc/dce110/dce110_hw_sequencer.c    |    13 +
 .../amd/display/dc/dce110/dce110_hw_sequencer.h    |     1 +
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c  |    12 +
 .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c  |    12 +-
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c  |     1 +
 .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h  |     6 +
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c  |    13 +-
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h  |    62 +
 .../amd/display/dc/dcn10/dcn10_stream_encoder.h    |    42 +
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h  |    22 +
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c   |    17 -
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.h   |    12 -
 .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c    |     9 +
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c  |    20 +
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h  |    41 +
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c |   112 +-
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c  |     1 +
 .../drm/amd/display/dc/dcn20/dcn20_link_encoder.h  |     7 +-
 .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c  |    53 +-
 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c  |   121 +-
 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c |    89 +
 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.h |     6 +
 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c  |     5 +-
 .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c  |     1 -
 drivers/gpu/drm/amd/display/dc/dcn30/Makefile      |    54 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.c  |   206 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.h  |   230 +
 .../gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c |   640 +
 .../gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.h |    78 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dccg.c  |   100 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dccg.h  |    66 +
 .../amd/display/dc/dcn30/dcn30_dio_link_encoder.c  |   205 +
 .../amd/display/dc/dcn30/dcn30_dio_link_encoder.h  |    76 +
 .../display/dc/dcn30/dcn30_dio_stream_encoder.c    |   851 +
 .../display/dc/dcn30/dcn30_dio_stream_encoder.h    |   269 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c   |  1414 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.h   |   608 +
 .../gpu/drm/amd/display/dc/dcn30/dcn30_dpp_cm.c    |   410 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.c   |   264 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.h   |   923 +
 .../gpu/drm/amd/display/dc/dcn30/dcn30_dwb_cm.c    |   354 +
 .../gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.c    |   417 +
 .../gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.h    |   119 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c  |   532 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.h  |   292 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c |   714 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h |    70 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c  |   148 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.h  |    33 +
 .../gpu/drm/amd/display/dc/dcn30/dcn30_mmhubbub.c  |   239 +
 .../gpu/drm/amd/display/dc/dcn30/dcn30_mmhubbub.h  |   463 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c   |  1409 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.h   |   665 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_opp.h   |    36 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c  |   365 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h  |   333 +
 .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c  |  2671 +
 .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.h  |    82 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_vpg.c   |   194 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_vpg.h   |   133 +
 drivers/gpu/drm/amd/display/dc/dm_helpers.h        |    23 +
 drivers/gpu/drm/amd/display/dc/dm_services.h       |    69 -
 drivers/gpu/drm/amd/display/dc/dml/Makefile        |     7 +
 .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c  |    33 +-
 .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c        |    33 +-
 .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c  |    36 +-
 .../amd/display/dc/dml/dcn30/display_mode_vba_30.c |  6860 ++
 .../amd/display/dc/dml/dcn30/display_mode_vba_30.h |    43 +
 .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c  |  1868 +
 .../display/dc/dml/dcn30/display_rq_dlg_calc_30.h  |    69 +
 .../drm/amd/display/dc/dml/display_mode_enums.h    |     6 +
 .../gpu/drm/amd/display/dc/dml/display_mode_lib.c  |   181 +
 .../gpu/drm/amd/display/dc/dml/display_mode_lib.h  |    11 +
 .../drm/amd/display/dc/dml/display_mode_structs.h  |    14 +
 .../gpu/drm/amd/display/dc/dml/display_mode_vba.c  |    63 +-
 .../gpu/drm/amd/display/dc/dml/display_mode_vba.h  |   230 +-
 .../gpu/drm/amd/display/dc/dml/dml_inline_defs.h   |    18 +-
 drivers/gpu/drm/amd/display/dc/gpio/Makefile       |    10 +
 .../amd/display/dc/gpio/dcn30/hw_factory_dcn30.c   |   257 +
 .../amd/display/dc/gpio/dcn30/hw_factory_dcn30.h   |    33 +
 .../amd/display/dc/gpio/dcn30/hw_translate_dcn30.c |   387 +
 .../amd/display/dc/gpio/dcn30/hw_translate_dcn30.h |    35 +
 drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c   |     9 +-
 drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c |     8 +
 drivers/gpu/drm/amd/display/dc/inc/core_types.h    |    25 +
 drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h   |     2 +-
 drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h    |     2 +-
 drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h    |    69 +
 .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h   |    14 +
 drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h   |     6 +
 drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h        |     7 +
 drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h        |    83 +
 drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h       |     7 +-
 drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h  |     9 +
 drivers/gpu/drm/amd/display/dc/inc/hw/mcif_wb.h    |     8 +
 drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h        |   108 +
 .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h |     4 +
 .../drm/amd/display/dc/inc/hw/timing_generator.h   |    19 +
 drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h  |     6 +
 drivers/gpu/drm/amd/display/dc/inc/resource.h      |     3 +
 drivers/gpu/drm/amd/display/dc/irq/Makefile        |    10 +
 .../amd/display/dc/irq/dcn30/irq_service_dcn30.c   |   384 +
 .../amd/display/dc/irq/dcn30/irq_service_dcn30.h   |    37 +
 drivers/gpu/drm/amd/display/dc/os_types.h          |    10 +-
 drivers/gpu/drm/amd/display/dmub/dmub_srv.h        |    18 +-
 drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h    |   401 +-
 .../gpu/drm/amd/display/dmub/inc/dmub_gpint_cmd.h  |    75 -
 drivers/gpu/drm/amd/display/dmub/inc/dmub_rb.h     |   152 -
 drivers/gpu/drm/amd/display/dmub/src/Makefile      |     3 +
 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c  |    28 +-
 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h  |     2 +-
 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c  |   184 +
 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.h  |    50 +
 drivers/gpu/drm/amd/display/dmub/src/dmub_reg.h    |     2 +-
 drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c    |    29 +-
 drivers/gpu/drm/amd/display/include/dal_asic_id.h  |     4 +
 drivers/gpu/drm/amd/display/include/dal_types.h    |     1 +
 .../gpu/drm/amd/display/modules/inc/mod_stats.h    |     8 +-
 .../drm/amd/display/modules/power/power_helpers.c  |    95 +-
 .../include/asic_reg/athub/athub_2_1_0_offset.h    |   523 +
 .../include/asic_reg/athub/athub_2_1_0_sh_mask.h   |  2378 +
 .../amd/include/asic_reg/dcn/dcn_3_0_0_offset.h    | 17880 +++++
 .../amd/include/asic_reg/dcn/dcn_3_0_0_sh_mask.h   | 70929 +++++++++++++++++++
 .../amd/include/asic_reg/dcn/dpcs_3_0_0_offset.h   |   573 +
 .../amd/include/asic_reg/dcn/dpcs_3_0_0_sh_mask.h  |  3565 +
 .../amd/include/asic_reg/gc/gc_10_3_0_default.h    |  7272 ++
 .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 13469 ++++
 .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h    | 47692 +++++++++++++
 .../amd/include/asic_reg/vcn/vcn_3_0_0_offset.h    |  1542 +
 .../amd/include/asic_reg/vcn/vcn_3_0_0_sh_mask.h   |  5496 ++
 drivers/gpu/drm/amd/include/atomfirmware.h         |   283 +
 .../amd/include/ivsrcid/sdma2/irqsrcs_sdma2_5_0.h  |    45 +
 .../amd/include/ivsrcid/sdma3/irqsrcs_sdma3_5_0.h  |    45 +
 .../gpu/drm/amd/include/sienna_cichlid_ip_offset.h |  1168 +
 drivers/gpu/drm/amd/include/soc15_ih_clientid.h    |     1 +
 drivers/gpu/drm/amd/powerplay/Makefile             |     2 +-
 drivers/gpu/drm/amd/powerplay/amdgpu_smu.c         |   482 +-
 drivers/gpu/drm/amd/powerplay/arcturus_ppt.c       |   239 +-
 drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h     |     9 +-
 drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h |     3 +
 .../amd/powerplay/inc/smu11_driver_if_arcturus.h   |    12 +-
 .../powerplay/inc/smu11_driver_if_sienna_cichlid.h |  1209 +
 drivers/gpu/drm/amd/powerplay/inc/smu_types.h      |     4 +
 drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h      |    14 +-
 .../gpu/drm/amd/powerplay/inc/smu_v11_0_7_ppsmc.h  |   139 +
 drivers/gpu/drm/amd/powerplay/navi10_ppt.c         |   159 +-
 drivers/gpu/drm/amd/powerplay/renoir_ppt.c         |     2 -
 drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c |  2506 +
 .../sienna_cichlid_ppt.h}                          |    26 +-
 drivers/gpu/drm/amd/powerplay/smu_internal.h       |    20 +-
 drivers/gpu/drm/amd/powerplay/smu_v11_0.c          |   136 +-
 drivers/gpu/drm/amd/powerplay/smu_v12_0.c          |    22 -
 drivers/gpu/drm/amd/powerplay/vega20_ppt.c         |  3288 -
 drivers/gpu/drm/amd/powerplay/vega20_ppt.h         |   179 -
 drivers/gpu/drm/radeon/ni_dpm.c                    |     7 +-
 drivers/gpu/drm/radeon/radeon_drv.c                |     5 -
 drivers/gpu/drm/ttm/ttm_bo.c                       |     2 +-
 include/drm/amd_asic_type.h                        |     1 +
 include/uapi/drm/amdgpu_drm.h                      |    10 +-
 include/uapi/linux/kfd_ioctl.h                     |    22 +-
 sound/pci/hda/hda_intel.c                          |     3 +
 278 files changed, 216604 insertions(+), 6176 deletions(-)
 create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/athub_v2_1.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/athub_v2_1.h
 create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c
 rename drivers/gpu/drm/amd/{display/dmub/inc/dmub_types.h => amdgpu/gfxhub_v2_1.h} (55%)
 create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c
 rename drivers/gpu/drm/amd/{display/dmub/inc/dmub_fw_meta.h => amdgpu/jpeg_v3_0.h} (53%)
 create mode 100644 drivers/gpu/drm/amd/amdgpu/mes_api_def.h
 rename drivers/gpu/drm/amd/{display/dmub/inc/dmub_cmd_dal.h => amdgpu/sdma_common.h} (62%)
 create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v5_2.h
 create mode 100644 drivers/gpu/drm/amd/amdgpu/sienna_cichlid_reg_init.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v3_0.h
 create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c
 create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dalsmc.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/Makefile
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dccg.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dccg.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_link_encoder.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_link_encoder.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_stream_encoder.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_stream_encoder.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp_cm.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb_cm.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mmhubbub.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mmhubbub.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_opp.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_vpg.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_vpg.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_factory_dcn30.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_factory_dcn30.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_translate_dcn30.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_translate_dcn30.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn30/irq_service_dcn30.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn30/irq_service_dcn30.h
 delete mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_gpint_cmd.h
 delete mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_rb.h
 create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c
 create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/athub/athub_2_1_0_offset.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/athub/athub_2_1_0_sh_mask.h
 create mode 100755 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_0_offset.h
 create mode 100755 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_0_sh_mask.h
 create mode 100755 drivers/gpu/drm/amd/include/asic_reg/dcn/dpcs_3_0_0_offset.h
 create mode 100755 drivers/gpu/drm/amd/include/asic_reg/dcn/dpcs_3_0_0_sh_mask.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_10_3_0_default.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_3_0_0_offset.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_3_0_0_sh_mask.h
 create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/sdma2/irqsrcs_sdma2_5_0.h
 create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/sdma3/irqsrcs_sdma3_5_0.h
 create mode 100644 drivers/gpu/drm/amd/include/sienna_cichlid_ip_offset.h
 create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_sienna_cichlid.h
 create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu_v11_0_7_ppsmc.h
 create mode 100644 drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c
 rename drivers/gpu/drm/amd/{display/dmub/inc/dmub_cmd_vbios.h => powerplay/sienna_cichlid_ppt.h} (74%)
 delete mode 100644 drivers/gpu/drm/amd/powerplay/vega20_ppt.c
 delete mode 100644 drivers/gpu/drm/amd/powerplay/vega20_ppt.h
$ git am -3 ../patches/0001-drm-amdkfd-fix-up-for-un-use_mm-rename.patch
Applying: drm/amdkfd: fix up for {un}use_mm() rename
$ git reset HEAD^
Unstaged changes after reset:
M	drivers/gpu/drm/amd/amdkfd/kfd_process.c
$ git add -A .
$ git commit -v -a --amend
[master a2408cecb44a] next-20200616/amdgpu
 Date: Mon Jun 22 10:24:17 2020 +1000
Merging drm-intel/for-linux-next (cf46143fe2c9 drm/i915/gt: Replace manual kmap_atomic() with pin_map for renderstate)
$ git merge drm-intel/for-linux-next
Auto-merging drivers/gpu/drm/i915/selftests/i915_mock_selftests.h
Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.c
Auto-merging drivers/gpu/drm/i915/intel_pm.c
Auto-merging drivers/gpu/drm/i915/i915_request.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_request.c
Auto-merging drivers/gpu/drm/i915/i915_reg.h
Auto-merging drivers/gpu/drm/i915/i915_query.c
Auto-merging drivers/gpu/drm/i915/i915_pmu.c
Auto-merging drivers/gpu/drm/i915/i915_pci.c
Auto-merging drivers/gpu/drm/i915/i915_params.h
Auto-merging drivers/gpu/drm/i915/i915_params.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_params.c
Auto-merging drivers/gpu/drm/i915/i915_irq.c
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c
Auto-merging drivers/gpu/drm/i915/gvt/display.c
Auto-merging drivers/gpu/drm/i915/gt/selftest_workarounds.c
Auto-merging drivers/gpu/drm/i915/gt/selftest_timeline.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/selftest_timeline.c
Auto-merging drivers/gpu/drm/i915/gt/selftest_rps.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/selftest_rps.c
Auto-merging drivers/gpu/drm/i915/gt/selftest_mocs.c
Auto-merging drivers/gpu/drm/i915/gt/selftest_lrc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/selftest_lrc.c
Auto-merging drivers/gpu/drm/i915/gt/selftest_hangcheck.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/selftest_hangcheck.c
Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.c
Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c
Auto-merging drivers/gpu/drm/i915/gt/intel_engine_cs.c
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_userptr.c
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_shmem.c
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_phys.c
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_mman.c
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.c
Auto-merging drivers/gpu/drm/i915/display/intel_dp_mst.c
Auto-merging drivers/gpu/drm/i915/display/intel_dp.c
Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h
Auto-merging drivers/gpu/drm/i915/display/intel_display_debugfs.c
Auto-merging drivers/gpu/drm/i915/display/intel_display.c
Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_ddi.c
Auto-merging drivers/dma-buf/selftests.h
Resolved 'drivers/gpu/drm/i915/display/intel_ddi.c' using previous resolution.
Resolved 'drivers/gpu/drm/i915/gt/selftest_hangcheck.c' using previous resolution.
Resolved 'drivers/gpu/drm/i915/gt/selftest_lrc.c' using previous resolution.
Resolved 'drivers/gpu/drm/i915/gt/selftest_rps.c' using previous resolution.
Resolved 'drivers/gpu/drm/i915/gt/selftest_timeline.c' using previous resolution.
Resolved 'drivers/gpu/drm/i915/i915_params.c' using previous resolution.
Resolved 'drivers/gpu/drm/i915/i915_request.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master 024556599929] Merge remote-tracking branch 'drm-intel/for-linux-next'
$ git diff -M --stat --summary HEAD^..
 arch/x86/kernel/early-quirks.c                     |   1 +
 drivers/char/agp/intel-gtt.c                       |   4 +-
 drivers/dma-buf/selftests.h                        |   2 +-
 drivers/gpu/drm/i915/Makefile                      |   2 +
 drivers/gpu/drm/i915/display/icl_dsi.c             |  14 +-
 drivers/gpu/drm/i915/display/intel_atomic.c        |   4 +
 drivers/gpu/drm/i915/display/intel_bios.c          |  72 +-
 drivers/gpu/drm/i915/display/intel_bw.c            | 151 +++-
 drivers/gpu/drm/i915/display/intel_bw.h            |  10 +
 drivers/gpu/drm/i915/display/intel_cdclk.c         | 100 ++-
 drivers/gpu/drm/i915/display/intel_color.c         |  66 +-
 drivers/gpu/drm/i915/display/intel_combo_phy.c     |  55 +-
 drivers/gpu/drm/i915/display/intel_csr.c           |  14 +-
 drivers/gpu/drm/i915/display/intel_ddi.c           | 109 ++-
 drivers/gpu/drm/i915/display/intel_ddi.h           |   3 -
 drivers/gpu/drm/i915/display/intel_display.c       | 308 ++++---
 drivers/gpu/drm/i915/display/intel_display.h       |   7 +
 .../gpu/drm/i915/display/intel_display_debugfs.c   |   3 +-
 drivers/gpu/drm/i915/display/intel_display_power.c | 351 ++++++--
 drivers/gpu/drm/i915/display/intel_display_power.h |   7 +-
 drivers/gpu/drm/i915/display/intel_display_types.h |  33 +-
 drivers/gpu/drm/i915/display/intel_dp.c            | 170 ++--
 drivers/gpu/drm/i915/display/intel_dp.h            |   4 -
 .../gpu/drm/i915/display/intel_dp_link_training.c  |  35 +-
 drivers/gpu/drm/i915/display/intel_dsb.c           | 252 +++---
 drivers/gpu/drm/i915/display/intel_dsb.h           |  17 +-
 drivers/gpu/drm/i915/display/intel_hdcp.c          |   7 +-
 drivers/gpu/drm/i915/display/intel_hdmi.c          |  22 +-
 drivers/gpu/drm/i915/display/intel_hotplug.c       |   9 +
 drivers/gpu/drm/i915/display/intel_overlay.c       |  30 +-
 drivers/gpu/drm/i915/display/intel_psr.c           |  68 +-
 drivers/gpu/drm/i915/display/intel_sdvo.c          |  21 +-
 drivers/gpu/drm/i915/display/intel_sprite.c        |  26 +-
 drivers/gpu/drm/i915/display/intel_sprite.h        |  11 +-
 drivers/gpu/drm/i915/display/intel_tc.c            |  14 +-
 drivers/gpu/drm/i915/display/intel_tv.c            |   4 +-
 drivers/gpu/drm/i915/display/intel_vdsc.c          |   4 +-
 drivers/gpu/drm/i915/display/vlv_dsi.c             |   6 +-
 drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c         |   1 +
 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c     | 321 +------
 drivers/gpu/drm/i915/gem/i915_gem_internal.c       |   1 +
 drivers/gpu/drm/i915/gem/i915_gem_lmem.c           |   1 +
 drivers/gpu/drm/i915/gem/i915_gem_mman.c           |   2 +-
 drivers/gpu/drm/i915/gem/i915_gem_object.c         |   6 +-
 drivers/gpu/drm/i915/gem/i915_gem_object_blt.c     |  52 +-
 drivers/gpu/drm/i915/gem/i915_gem_object_types.h   |   2 +
 drivers/gpu/drm/i915/gem/i915_gem_phys.c           |   3 +-
 drivers/gpu/drm/i915/gem/i915_gem_shmem.c          |   4 +-
 drivers/gpu/drm/i915/gem/i915_gem_stolen.c         |   1 +
 drivers/gpu/drm/i915/gem/i915_gem_userptr.c        |   3 +-
 .../gpu/drm/i915/gem/selftests/huge_gem_object.c   |   1 +
 drivers/gpu/drm/i915/gem/selftests/huge_pages.c    | 145 +---
 .../drm/i915/gem/selftests/i915_gem_client_blt.c   |   3 -
 .../drm/i915/gem/selftests/i915_gem_execbuffer.c   |  21 +-
 .../drm/i915/gem/selftests/i915_gem_object_blt.c   |  55 +-
 drivers/gpu/drm/i915/gem/selftests/mock_context.c  |  37 +
 drivers/gpu/drm/i915/gem/selftests/mock_context.h  |   4 +
 drivers/gpu/drm/i915/gt/gen2_engine_cs.c           | 329 ++++++++
 drivers/gpu/drm/i915/gt/gen2_engine_cs.h           |  38 +
 drivers/gpu/drm/i915/gt/gen6_engine_cs.c           | 455 ++++++++++
 drivers/gpu/drm/i915/gt/gen6_engine_cs.h           |  39 +
 drivers/gpu/drm/i915/gt/intel_context_sseu.c       |   2 +-
 drivers/gpu/drm/i915/gt/intel_engine.h             |   4 +-
 drivers/gpu/drm/i915/gt/intel_engine_cs.c          |  69 +-
 drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c   |  22 +-
 drivers/gpu/drm/i915/gt/intel_engine_types.h       |  11 +
 drivers/gpu/drm/i915/gt/intel_ggtt.c               |  46 +-
 drivers/gpu/drm/i915/gt/intel_gt.c                 |   5 +
 drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c     |   3 +-
 drivers/gpu/drm/i915/gt/intel_gt_pm.c              |   4 +-
 drivers/gpu/drm/i915/gt/intel_lrc.c                |  57 +-
 drivers/gpu/drm/i915/gt/intel_renderstate.c        |  29 +-
 drivers/gpu/drm/i915/gt/intel_ring_submission.c    | 866 +------------------
 drivers/gpu/drm/i915/gt/intel_rps.c                |  11 +-
 drivers/gpu/drm/i915/gt/intel_workarounds.c        |  91 +-
 drivers/gpu/drm/i915/gt/selftest_engine_cs.c       |   2 +-
 .../gpu/drm/i915/gt/selftest_engine_heartbeat.c    |  47 +-
 .../gpu/drm/i915/gt/selftest_engine_heartbeat.h    |  14 +
 drivers/gpu/drm/i915/gt/selftest_engine_pm.c       | 101 +++
 drivers/gpu/drm/i915/gt/selftest_gt_pm.c           | 132 +++
 drivers/gpu/drm/i915/gt/selftest_hangcheck.c       |  85 +-
 drivers/gpu/drm/i915/gt/selftest_lrc.c             | 931 +++++++++++++--------
 drivers/gpu/drm/i915/gt/selftest_mocs.c            |   2 +-
 drivers/gpu/drm/i915/gt/selftest_rc6.c             |   9 +-
 drivers/gpu/drm/i915/gt/selftest_rps.c             |  68 +-
 drivers/gpu/drm/i915/gt/selftest_timeline.c        |  25 +-
 drivers/gpu/drm/i915/gt/selftest_workarounds.c     |  17 +
 drivers/gpu/drm/i915/gt/shaders/README             |  46 +
 .../gpu/drm/i915/gt/shaders/clear_kernel/hsw.asm   | 119 +++
 .../gpu/drm/i915/gt/shaders/clear_kernel/ivb.asm   | 117 +++
 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c           |   5 +-
 drivers/gpu/drm/i915/gvt/cmd_parser.c              |  14 +-
 drivers/gpu/drm/i915/gvt/display.c                 |  30 +-
 drivers/gpu/drm/i915/gvt/dmabuf.c                  |   1 +
 drivers/gpu/drm/i915/gvt/edid.c                    |   2 +-
 drivers/gpu/drm/i915/gvt/handlers.c                |  17 +-
 drivers/gpu/drm/i915/gvt/scheduler.c               |  55 +-
 drivers/gpu/drm/i915/gvt/scheduler.h               |   2 -
 drivers/gpu/drm/i915/i915_drv.h                    |  39 +-
 drivers/gpu/drm/i915/i915_gem.c                    |  18 +
 drivers/gpu/drm/i915/i915_gem_gtt.h                |   1 -
 drivers/gpu/drm/i915/i915_irq.c                    |  79 +-
 drivers/gpu/drm/i915/i915_params.c                 |  43 +-
 drivers/gpu/drm/i915/i915_params.h                 |   1 +
 drivers/gpu/drm/i915/i915_pci.c                    |  40 +-
 drivers/gpu/drm/i915/i915_pmu.c                    |  17 +-
 drivers/gpu/drm/i915/i915_query.c                  |   3 +-
 drivers/gpu/drm/i915/i915_reg.h                    |  98 ++-
 drivers/gpu/drm/i915/i915_request.c                |  40 +-
 drivers/gpu/drm/i915/i915_request.h                |  11 +-
 drivers/gpu/drm/i915/i915_trace.h                  |  10 +-
 drivers/gpu/drm/i915/i915_utils.c                  |   2 +-
 drivers/gpu/drm/i915/i915_vma.c                    |  71 +-
 drivers/gpu/drm/i915/i915_vma.h                    |   1 +
 drivers/gpu/drm/i915/intel_device_info.c           |   7 +-
 drivers/gpu/drm/i915/intel_device_info.h           |   5 +
 drivers/gpu/drm/i915/intel_gvt.c                   |   2 +
 drivers/gpu/drm/i915/intel_pch.c                   |  42 +-
 drivers/gpu/drm/i915/intel_pm.c                    | 381 ++++++---
 drivers/gpu/drm/i915/intel_pm.h                    |  29 +-
 drivers/gpu/drm/i915/intel_runtime_pm.c            |  39 +-
 drivers/gpu/drm/i915/intel_uncore.c                |   2 +-
 drivers/gpu/drm/i915/selftests/i915_gem_gtt.c      |   1 +
 .../gpu/drm/i915/selftests/i915_live_selftests.h   |   4 +-
 .../gpu/drm/i915/selftests/i915_mock_selftests.h   |   4 +-
 drivers/gpu/drm/i915/selftests/i915_perf.c         |   2 +-
 .../gpu/drm/i915/selftests/i915_perf_selftests.h   |   2 +-
 drivers/gpu/drm/i915/selftests/i915_request.c      | 871 ++++++++++++++++++-
 drivers/gpu/drm/i915/selftests/igt_spinner.c       |  18 +-
 drivers/gpu/drm/i915/selftests/mock_region.c       |   1 +
 include/drm/i915_pciids.h                          |   9 +
 131 files changed, 5499 insertions(+), 2995 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/gt/gen2_engine_cs.c
 create mode 100644 drivers/gpu/drm/i915/gt/gen2_engine_cs.h
 create mode 100644 drivers/gpu/drm/i915/gt/gen6_engine_cs.c
 create mode 100644 drivers/gpu/drm/i915/gt/gen6_engine_cs.h
 create mode 100644 drivers/gpu/drm/i915/gt/selftest_engine_heartbeat.h
 create mode 100644 drivers/gpu/drm/i915/gt/shaders/README
 create mode 100644 drivers/gpu/drm/i915/gt/shaders/clear_kernel/hsw.asm
 create mode 100644 drivers/gpu/drm/i915/gt/shaders/clear_kernel/ivb.asm
Merging drm-tegra/drm/tegra/for-next (fce3a51d9b31 drm/tegra: Add zpos property for cursor planes)
$ git merge drm-tegra/drm/tegra/for-next
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/tegra/dc.c  |  1 +
 drivers/gpu/drm/tegra/hub.c | 17 +++++++++++++++--
 drivers/gpu/host1x/bus.c    |  9 +++++++++
 drivers/gpu/host1x/dev.c    | 11 +++++++++--
 include/linux/host1x.h      |  3 +++
 5 files changed, 37 insertions(+), 4 deletions(-)
Merging drm-misc/for-linux-next (b3bfcdf8a3b6 drm/panel: simple: add Tianma TM070JVHG33)
$ git merge drm-misc/for-linux-next
Auto-merging include/uapi/drm/drm_fourcc.h
Auto-merging include/linux/hdmi.h
Auto-merging include/drm/drm_modes.h
Auto-merging include/drm/drm_dp_helper.h
Auto-merging drivers/video/hdmi.c
Auto-merging drivers/video/console/newport_con.c
Auto-merging drivers/gpu/drm/virtio/virtgpu_ioctl.c
Auto-merging drivers/gpu/drm/virtio/virtgpu_gem.c
Removing drivers/gpu/drm/udl/udl_gem.c
Auto-merging drivers/gpu/drm/tegra/drm.c
Auto-merging drivers/gpu/drm/radeon/radeon_gem.c
Auto-merging drivers/gpu/drm/radeon/radeon_cs.c
Auto-merging drivers/gpu/drm/qxl/qxl_ioctl.c
Auto-merging drivers/gpu/drm/qxl/qxl_display.c
Auto-merging drivers/gpu/drm/qxl/qxl_cmd.c
Auto-merging drivers/gpu/drm/panel/panel-simple.c
Auto-merging drivers/gpu/drm/nouveau/nouveau_gem.c
Auto-merging drivers/gpu/drm/nouveau/nouveau_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/nouveau/nouveau_display.c
Auto-merging drivers/gpu/drm/nouveau/nouveau_connector.c
Auto-merging drivers/gpu/drm/nouveau/dispnv04/crtc.c
Auto-merging drivers/gpu/drm/msm/msm_gpu.c
Auto-merging drivers/gpu/drm/msm/msm_gem_submit.c
Auto-merging drivers/gpu/drm/msm/msm_gem.c
Auto-merging drivers/gpu/drm/msm/msm_drv.c
Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c
Auto-merging drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c
Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
Auto-merging drivers/gpu/drm/msm/adreno/a6xx_gpu.c
Auto-merging drivers/gpu/drm/msm/adreno/a5xx_gpu.c
Removing drivers/gpu/drm/mgag200/mgag200_ttm.c
Removing drivers/gpu/drm/mgag200/mgag200_main.c
Removing drivers/gpu/drm/mgag200/mgag200_cursor.c
Auto-merging drivers/gpu/drm/meson/meson_drv.c
Auto-merging drivers/gpu/drm/mediatek/mtk_hdmi.c
Auto-merging drivers/gpu/drm/mediatek/mtk_drm_gem.c
Auto-merging drivers/gpu/drm/mediatek/mtk_drm_crtc.c
Auto-merging drivers/gpu/drm/mcde/mcde_drv.c
Auto-merging drivers/gpu/drm/ingenic/ingenic-drm.c
Auto-merging drivers/gpu/drm/i915/display/intel_tv.c
Auto-merging drivers/gpu/drm/i915/display/intel_hotplug.h
Auto-merging drivers/gpu/drm/i915/display/intel_hotplug.c
Auto-merging drivers/gpu/drm/i915/display/intel_dp_mst.c
Auto-merging drivers/gpu/drm/i915/display/intel_dp.c
Auto-merging drivers/gpu/drm/i915/display/intel_display_debugfs.c
Auto-merging drivers/gpu/drm/i915/display/intel_display.c
Auto-merging drivers/gpu/drm/exynos/exynos_mixer.c
Auto-merging drivers/gpu/drm/exynos/exynos_drm_gem.h
Auto-merging drivers/gpu/drm/exynos/exynos_drm_gem.c
Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem.c
Auto-merging drivers/gpu/drm/etnaviv/etnaviv_drv.c
Auto-merging drivers/gpu/drm/drm_vm.c
Auto-merging drivers/gpu/drm/drm_vblank.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_vblank.c
Auto-merging drivers/gpu/drm/drm_ioctl.c
Auto-merging drivers/gpu/drm/drm_file.c
Auto-merging drivers/gpu/drm/drm_edid.c
Auto-merging drivers/gpu/drm/drm_dp_mst_topology.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_dp_mst_topology.c
Auto-merging drivers/gpu/drm/drm_dp_helper.c
Auto-merging drivers/gpu/drm/drm_connector.c
Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
Auto-merging MAINTAINERS
Removing Documentation/devicetree/bindings/display/bridge/ti,tfp410.txt
Removing Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.txt
Removing Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt
Resolved 'drivers/gpu/drm/drm_dp_mst_topology.c' using previous resolution.
Resolved 'drivers/gpu/drm/drm_vblank.c' using previous resolution.
Resolved 'drivers/gpu/drm/nouveau/nouveau_display.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master ee0f0d6da913] Merge remote-tracking branch 'drm-misc/for-linux-next'
$ git diff -M --stat --summary HEAD^..
 .../display/allwinner,sun8i-a83t-de2-mixer.yaml    |   3 +
 .../devicetree/bindings/display/brcm,bcm-vc4.txt   | 174 ----
 .../bindings/display/brcm,bcm2835-dpi.yaml         |  72 ++
 .../bindings/display/brcm,bcm2835-dsi0.yaml        |  84 ++
 .../bindings/display/brcm,bcm2835-hdmi.yaml        |  80 ++
 .../bindings/display/brcm,bcm2835-hvs.yaml         |  37 +
 .../bindings/display/brcm,bcm2835-pixelvalve0.yaml |  40 +
 .../bindings/display/brcm,bcm2835-txp.yaml         |  37 +
 .../bindings/display/brcm,bcm2835-v3d.yaml         |  42 +
 .../bindings/display/brcm,bcm2835-vc4.yaml         |  34 +
 .../bindings/display/brcm,bcm2835-vec.yaml         |  44 ++
 .../bindings/display/bridge/ti,sn65dsi86.txt       |  87 --
 .../bindings/display/bridge/ti,sn65dsi86.yaml      | 293 +++++++
 .../bindings/display/bridge/ti,tfp410.txt          |  66 --
 .../bindings/display/bridge/ti,tfp410.yaml         | 131 +++
 .../bindings/display/panel/panel-simple.yaml       |   8 +
 Documentation/gpu/drm-kms-helpers.rst              |  12 -
 Documentation/gpu/drm-kms.rst                      |   6 +
 Documentation/gpu/drm-mm.rst                       |  17 +-
 Documentation/gpu/todo.rst                         |  58 +-
 MAINTAINERS                                        |   2 +-
 drivers/dma-buf/dma-fence.c                        |   2 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c        |   2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c             |   2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_display.c        |   4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c             |   4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c            |  20 +-
 drivers/gpu/drm/amd/amdgpu/dce_v10_0.c             |   6 +-
 drivers/gpu/drm/amd/amdgpu/dce_v11_0.c             |   6 +-
 drivers/gpu/drm/amd/amdgpu/dce_v6_0.c              |   6 +-
 drivers/gpu/drm/amd/amdgpu/dce_v8_0.c              |   6 +-
 drivers/gpu/drm/arc/arcpgu_drv.c                   |  12 +-
 drivers/gpu/drm/arm/Kconfig                        |   4 +-
 .../drm/arm/display/komeda/komeda_framebuffer.c    |   6 +-
 drivers/gpu/drm/arm/display/komeda/komeda_kms.c    |  11 +-
 drivers/gpu/drm/arm/hdlcd_drv.c                    |  15 +-
 drivers/gpu/drm/arm/malidp_drv.c                   |  45 +-
 drivers/gpu/drm/arm/malidp_planes.c                |   2 +-
 drivers/gpu/drm/armada/armada_crtc.c               |   8 +-
 drivers/gpu/drm/armada/armada_fb.c                 |   4 +-
 drivers/gpu/drm/armada/armada_fbdev.c              |   6 +-
 drivers/gpu/drm/armada/armada_gem.c                |  10 +-
 drivers/gpu/drm/aspeed/aspeed_gfx_drv.c            |   2 +-
 drivers/gpu/drm/ast/ast_drv.c                      |  10 +-
 drivers/gpu/drm/ast/ast_main.c                     |   3 -
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c       |  11 +-
 drivers/gpu/drm/bridge/sii902x.c                   |   2 +-
 drivers/gpu/drm/bridge/ti-sn65dsi86.c              | 323 +++++++-
 drivers/gpu/drm/bridge/ti-tfp410.c                 |  10 +-
 drivers/gpu/drm/drm_atomic_helper.c                |   2 +-
 drivers/gpu/drm/drm_auth.c                         |  46 +-
 drivers/gpu/drm/drm_client.c                       |  35 +-
 drivers/gpu/drm/drm_client_modeset.c               |  42 +-
 drivers/gpu/drm/drm_connector.c                    |  29 +-
 drivers/gpu/drm/drm_crtc.c                         |  27 +
 drivers/gpu/drm/drm_debugfs.c                      |   8 +-
 drivers/gpu/drm/drm_dp_helper.c                    |   3 +-
 drivers/gpu/drm/drm_dp_mst_topology.c              |  94 ++-
 drivers/gpu/drm/drm_edid.c                         | 328 ++++----
 drivers/gpu/drm/drm_file.c                         |  10 +-
 drivers/gpu/drm/drm_format_helper.c                |  61 +-
 drivers/gpu/drm/drm_fourcc.c                       |  12 +
 drivers/gpu/drm/drm_gem.c                          |  84 +-
 drivers/gpu/drm/drm_gem_cma_helper.c               |  20 +-
 drivers/gpu/drm/drm_gem_framebuffer_helper.c       |   6 +-
 drivers/gpu/drm/drm_gem_shmem_helper.c             | 172 ++--
 drivers/gpu/drm/drm_gem_ttm_helper.c               |   2 +-
 drivers/gpu/drm/drm_gem_vram_helper.c              |  10 +-
 drivers/gpu/drm/drm_ioc32.c                        |   4 +-
 drivers/gpu/drm/drm_ioctl.c                        |  11 +-
 drivers/gpu/drm/drm_irq.c                          |   2 +-
 drivers/gpu/drm/drm_managed.c                      |   2 +
 drivers/gpu/drm/drm_mipi_dbi.c                     |   2 +-
 drivers/gpu/drm/drm_mm.c                           |   6 +-
 drivers/gpu/drm/drm_modes.c                        |  40 +-
 drivers/gpu/drm/drm_prime.c                        |   6 +-
 drivers/gpu/drm/drm_probe_helper.c                 |   5 +-
 drivers/gpu/drm/drm_vblank.c                       | 215 ++---
 drivers/gpu/drm/drm_vm.c                           |   1 -
 drivers/gpu/drm/drm_writeback.c                    |   1 -
 drivers/gpu/drm/etnaviv/etnaviv_drv.c              |   8 +-
 drivers/gpu/drm/etnaviv/etnaviv_gem.c              |   6 +-
 drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c        |   2 +-
 drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c       |   2 +-
 drivers/gpu/drm/exynos/exynos_drm_gem.c            |   4 +-
 drivers/gpu/drm/exynos/exynos_drm_gem.h            |   2 +-
 drivers/gpu/drm/exynos/exynos_hdmi.c               |   5 +-
 drivers/gpu/drm/exynos/exynos_mixer.c              |   2 +-
 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c          |  11 +-
 drivers/gpu/drm/gma500/framebuffer.c               |   2 +-
 drivers/gpu/drm/gma500/gem.c                       |   2 +-
 drivers/gpu/drm/gma500/gma_display.c               |   6 +-
 drivers/gpu/drm/gma500/psb_drv.c                   |   2 +-
 drivers/gpu/drm/gma500/psb_intel_drv.h             |  19 -
 drivers/gpu/drm/gma500/psb_intel_sdvo.c            |  11 +-
 drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c    |  12 +-
 drivers/gpu/drm/i2c/ch7006_mode.c                  |   1 -
 drivers/gpu/drm/i915/display/intel_display.c       |   1 -
 .../gpu/drm/i915/display/intel_display_debugfs.c   |   4 +-
 drivers/gpu/drm/i915/display/intel_dp.c            |  24 +-
 drivers/gpu/drm/i915/display/intel_dp_mst.c        |  10 +
 drivers/gpu/drm/i915/display/intel_hotplug.c       |  18 +
 drivers/gpu/drm/i915/display/intel_hotplug.h       |   2 +
 drivers/gpu/drm/i915/display/intel_tv.c            |   3 -
 drivers/gpu/drm/imx/imx-drm-core.c                 |  12 +-
 drivers/gpu/drm/ingenic/ingenic-drm.c              |  13 +-
 drivers/gpu/drm/lima/lima_gem.c                    |  10 +-
 drivers/gpu/drm/lima/lima_sched.c                  |   2 +-
 drivers/gpu/drm/mcde/mcde_drv.c                    |  12 +-
 drivers/gpu/drm/mcde/mcde_dsi.c                    |   7 +-
 drivers/gpu/drm/mediatek/mtk_drm_crtc.c            |   4 +-
 drivers/gpu/drm/mediatek/mtk_drm_gem.c             |   2 +-
 drivers/gpu/drm/mediatek/mtk_hdmi.c                |   2 +-
 drivers/gpu/drm/meson/meson_drv.c                  |  15 +-
 drivers/gpu/drm/meson/meson_venc_cvbs.c            |   2 -
 drivers/gpu/drm/mgag200/Kconfig                    |   4 +-
 drivers/gpu/drm/mgag200/Makefile                   |   3 +-
 drivers/gpu/drm/mgag200/mgag200_cursor.c           | 319 --------
 drivers/gpu/drm/mgag200/mgag200_drv.c              | 204 ++---
 drivers/gpu/drm/mgag200/mgag200_drv.h              |  56 +-
 drivers/gpu/drm/mgag200/mgag200_main.c             | 160 ----
 drivers/gpu/drm/mgag200/mgag200_mm.c               | 127 +++
 drivers/gpu/drm/mgag200/mgag200_mode.c             | 875 ++++++++++++---------
 drivers/gpu/drm/mgag200/mgag200_reg.h              |  11 +-
 drivers/gpu/drm/mgag200/mgag200_ttm.c              |  70 --
 drivers/gpu/drm/msm/adreno/a5xx_debugfs.c          |   4 +-
 drivers/gpu/drm/msm/adreno/a5xx_gpu.c              |   6 +-
 drivers/gpu/drm/msm/adreno/a6xx_gpu.c              |   2 +-
 drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c        |  29 +-
 drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h          |  10 +-
 drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c          |   4 +-
 drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c           |   2 +-
 drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c          |   2 +-
 drivers/gpu/drm/msm/dsi/dsi_host.c                 |   2 +-
 drivers/gpu/drm/msm/msm_drv.c                      |   8 +-
 drivers/gpu/drm/msm/msm_fb.c                       |   4 +-
 drivers/gpu/drm/msm/msm_gem.c                      |  24 +-
 drivers/gpu/drm/msm/msm_gem_submit.c               |   2 +-
 drivers/gpu/drm/msm/msm_gpu.c                      |   2 +-
 drivers/gpu/drm/mxsfb/mxsfb_drv.c                  |  11 +-
 drivers/gpu/drm/nouveau/dispnv04/crtc.c            |   2 +-
 drivers/gpu/drm/nouveau/nouveau_abi16.c            |   2 +-
 drivers/gpu/drm/nouveau/nouveau_connector.c        |   5 +-
 drivers/gpu/drm/nouveau/nouveau_display.c          |   6 +-
 drivers/gpu/drm/nouveau/nouveau_gem.c              |  14 +-
 drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c    |  18 +-
 drivers/gpu/drm/omapdrm/omap_drv.c                 |   2 +-
 drivers/gpu/drm/omapdrm/omap_fb.c                  |   2 +-
 drivers/gpu/drm/omapdrm/omap_fbdev.c               |   2 +-
 drivers/gpu/drm/omapdrm/omap_gem.c                 |   4 +-
 drivers/gpu/drm/panel/panel-arm-versatile.c        |   4 -
 .../gpu/drm/panel/panel-asus-z00t-tm5p5-n35596.c   |   1 -
 drivers/gpu/drm/panel/panel-boe-himax8279d.c       |   3 +-
 drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c     |   7 +-
 drivers/gpu/drm/panel/panel-elida-kd35t133.c       |   3 +-
 drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c  |   3 +-
 .../gpu/drm/panel/panel-feiyang-fy07024di26a30d.c  |   3 +-
 drivers/gpu/drm/panel/panel-ilitek-ili9322.c       |   7 -
 drivers/gpu/drm/panel/panel-ilitek-ili9881c.c      |   3 +-
 drivers/gpu/drm/panel/panel-innolux-p079zca.c      |   4 +-
 drivers/gpu/drm/panel/panel-jdi-lt070me05000.c     |   3 +-
 drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c |   3 +-
 drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c |   3 +-
 drivers/gpu/drm/panel/panel-lg-lb035q02.c          |   1 -
 drivers/gpu/drm/panel/panel-lg-lg4573.c            |   3 +-
 drivers/gpu/drm/panel/panel-nec-nl8048hl11.c       |   1 -
 drivers/gpu/drm/panel/panel-novatek-nt35510.c      |   1 -
 drivers/gpu/drm/panel/panel-novatek-nt39016.c      |   2 -
 drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c |   1 -
 drivers/gpu/drm/panel/panel-orisetech-otm8009a.c   |   4 +-
 drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c |   3 +-
 .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c   |   3 +-
 .../gpu/drm/panel/panel-raspberrypi-touchscreen.c  |   4 +-
 drivers/gpu/drm/panel/panel-raydium-rm67191.c      |   3 +-
 drivers/gpu/drm/panel/panel-raydium-rm68200.c      |   3 +-
 drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c |   5 +-
 drivers/gpu/drm/panel/panel-ronbo-rb070d30.c       |   1 -
 drivers/gpu/drm/panel/panel-samsung-s6d16d0.c      |   6 -
 drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c      |   4 +-
 drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c   |   3 +-
 drivers/gpu/drm/panel/panel-samsung-s6e63m0.c      |   3 +-
 .../drm/panel/panel-samsung-s6e88a0-ams452ef01.c   |   1 -
 drivers/gpu/drm/panel/panel-seiko-43wvf1g.c        |   3 +-
 drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c    |   3 +-
 drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c    |   1 -
 drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c    |   3 +-
 drivers/gpu/drm/panel/panel-simple.c               | 214 ++---
 drivers/gpu/drm/panel/panel-sitronix-st7701.c      |   2 +-
 drivers/gpu/drm/panel/panel-sitronix-st7789v.c     |   3 +-
 drivers/gpu/drm/panel/panel-sony-acx424akp.c       |   2 -
 drivers/gpu/drm/panel/panel-sony-acx565akm.c       |   1 -
 drivers/gpu/drm/panel/panel-tpo-td028ttec1.c       |   1 -
 drivers/gpu/drm/panel/panel-tpo-td043mtea1.c       |   1 -
 drivers/gpu/drm/panel/panel-tpo-tpg110.c           |   5 -
 drivers/gpu/drm/panel/panel-truly-nt35597.c        |   1 -
 drivers/gpu/drm/panel/panel-visionox-rm69299.c     |   1 -
 drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c   |   3 +-
 drivers/gpu/drm/panfrost/panfrost_device.c         |   8 +-
 drivers/gpu/drm/panfrost/panfrost_drv.c            |  10 +-
 drivers/gpu/drm/panfrost/panfrost_gem.c            |   6 +-
 drivers/gpu/drm/panfrost/panfrost_job.c            |   8 +-
 drivers/gpu/drm/panfrost/panfrost_mmu.c            |   4 +-
 drivers/gpu/drm/panfrost/panfrost_perfcnt.c        |   4 +-
 drivers/gpu/drm/qxl/qxl_cmd.c                      |   2 +-
 drivers/gpu/drm/qxl/qxl_display.c                  |   6 +-
 drivers/gpu/drm/qxl/qxl_dumb.c                     |   2 +-
 drivers/gpu/drm/qxl/qxl_gem.c                      |   2 +-
 drivers/gpu/drm/qxl/qxl_ioctl.c                    |   4 +-
 drivers/gpu/drm/qxl/qxl_object.c                   |   4 +-
 drivers/gpu/drm/radeon/radeon_cs.c                 |   2 +-
 drivers/gpu/drm/radeon/radeon_cursor.c             |   6 +-
 drivers/gpu/drm/radeon/radeon_display.c            |   8 +-
 drivers/gpu/drm/radeon/radeon_fb.c                 |   4 +-
 drivers/gpu/drm/radeon/radeon_gem.c                |  30 +-
 drivers/gpu/drm/radeon/radeon_object.c             |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_drv.c              |  11 +-
 drivers/gpu/drm/rockchip/rockchip_drm_fb.c         |   2 +-
 drivers/gpu/drm/rockchip/rockchip_drm_gem.c        |   2 +-
 drivers/gpu/drm/rockchip/rockchip_drm_vop.c        |   8 +-
 drivers/gpu/drm/rockchip/rockchip_drm_vop.h        |   3 +
 drivers/gpu/drm/rockchip/rockchip_vop_reg.c        |   9 +
 drivers/gpu/drm/selftests/drm_mm_selftests.h       |   1 +
 drivers/gpu/drm/selftests/test-drm_mm.c            | 126 ++-
 drivers/gpu/drm/shmobile/shmob_drm_drv.c           |  11 +-
 drivers/gpu/drm/sti/sti_drv.c                      |  12 +-
 drivers/gpu/drm/sti/sti_hda.c                      |   1 -
 drivers/gpu/drm/stm/drv.c                          |  11 +-
 drivers/gpu/drm/sun4i/sun4i_drv.c                  |   3 +-
 drivers/gpu/drm/sun4i/sun8i_mixer.c                |  13 +
 drivers/gpu/drm/tegra/drm.c                        |  12 +-
 drivers/gpu/drm/tegra/fb.c                         |   6 +-
 drivers/gpu/drm/tegra/gem.c                        |   4 +-
 drivers/gpu/drm/tidss/tidss_drv.c                  |   2 +-
 drivers/gpu/drm/tilcdc/tilcdc_drv.c                |  13 +-
 drivers/gpu/drm/tilcdc/tilcdc_panel.c              |  25 +-
 drivers/gpu/drm/tilcdc/tilcdc_plane.c              |   3 +-
 drivers/gpu/drm/tiny/hx8357d.c                     |   2 +-
 drivers/gpu/drm/tiny/ili9225.c                     |   2 +-
 drivers/gpu/drm/tiny/ili9341.c                     |   2 +-
 drivers/gpu/drm/tiny/ili9486.c                     |   2 +-
 drivers/gpu/drm/tiny/mi0283qt.c                    |   2 +-
 drivers/gpu/drm/tiny/repaper.c                     |   2 +-
 drivers/gpu/drm/tiny/st7586.c                      |   2 +-
 drivers/gpu/drm/tiny/st7735r.c                     |   2 +-
 drivers/gpu/drm/tve200/tve200_drv.c                |  12 +-
 drivers/gpu/drm/udl/Makefile                       |   2 +-
 drivers/gpu/drm/udl/udl_drv.c                      |   4 +-
 drivers/gpu/drm/udl/udl_drv.h                      |   3 -
 drivers/gpu/drm/udl/udl_gem.c                      | 106 ---
 drivers/gpu/drm/v3d/v3d_bo.c                       |   6 +-
 drivers/gpu/drm/v3d/v3d_gem.c                      |   4 +-
 drivers/gpu/drm/v3d/v3d_irq.c                      |   2 +-
 drivers/gpu/drm/vc4/vc4_bo.c                       |  14 +-
 drivers/gpu/drm/vc4/vc4_crtc.c                     |  82 +-
 drivers/gpu/drm/vc4/vc4_drv.c                      |   4 +
 drivers/gpu/drm/vc4/vc4_drv.h                      |  26 +
 drivers/gpu/drm/vc4/vc4_gem.c                      |  14 +-
 drivers/gpu/drm/vc4/vc4_hdmi.c                     |   6 +-
 drivers/gpu/drm/vc4/vc4_kms.c                      |   2 +-
 drivers/gpu/drm/vc4/vc4_plane.c                    |  41 +
 drivers/gpu/drm/vc4/vc4_v3d.c                      |   4 +-
 drivers/gpu/drm/vgem/vgem_drv.c                    |   6 +-
 drivers/gpu/drm/vgem/vgem_fence.c                  |   2 +-
 drivers/gpu/drm/virtio/virtgpu_display.c           |   2 +-
 drivers/gpu/drm/virtio/virtgpu_gem.c               |   6 +-
 drivers/gpu/drm/virtio/virtgpu_ioctl.c             |   6 +-
 drivers/gpu/drm/virtio/virtgpu_object.c            |   2 +-
 drivers/gpu/drm/vkms/vkms_gem.c                    |   2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c                |   8 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c                |   2 -
 drivers/gpu/drm/xen/xen_drm_front.c                |   4 +-
 drivers/gpu/drm/zte/zx_drm_drv.c                   |  11 +-
 drivers/video/console/newport_con.c                |  12 +-
 drivers/video/fbdev/amba-clcd.c                    |  19 +-
 drivers/video/fbdev/aty/aty128fb.c                 |   6 +-
 drivers/video/fbdev/aty/atyfb_base.c               |   7 +-
 drivers/video/fbdev/aty/radeon_base.c              |   6 +-
 drivers/video/fbdev/nvidia/nvidia.c                |   6 +-
 drivers/video/fbdev/omap/omapfb_main.c             |   6 +-
 drivers/video/fbdev/omap2/omapfb/dss/dispc.c       |   2 +-
 drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c       |   4 +-
 drivers/video/fbdev/pvr2fb.c                       |  24 +-
 drivers/video/fbdev/pxafb.c                        |   6 +-
 drivers/video/fbdev/riva/fbdev.c                   |   6 +-
 drivers/video/fbdev/s3c2410fb.c                    |   6 +-
 drivers/video/fbdev/sm712fb.c                      |   2 +
 drivers/video/hdmi.c                               |   2 +-
 include/drm/drm_client.h                           |   2 +
 include/drm/drm_device.h                           |   3 +
 include/drm/drm_dp_helper.h                        |  10 +-
 include/drm/drm_dp_mst_helper.h                    |  17 +
 include/drm/drm_drv.h                              |  31 +-
 include/drm/drm_format_helper.h                    |   4 +-
 include/drm/drm_gem.h                              |  37 +-
 include/drm/drm_gem_cma_helper.h                   |  74 +-
 include/drm/drm_gem_shmem_helper.h                 |   4 +
 include/drm/drm_modes.h                            | 194 +++--
 include/linux/hdmi.h                               |   1 +
 include/uapi/drm/drm_fourcc.h                      |  34 +
 299 files changed, 3846 insertions(+), 3204 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt
 create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm2835-dpi.yaml
 create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml
 create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml
 create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml
 create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm2835-pixelvalve0.yaml
 create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm2835-txp.yaml
 create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm2835-v3d.yaml
 create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm2835-vc4.yaml
 create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm2835-vec.yaml
 delete mode 100644 Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.txt
 create mode 100644 Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml
 delete mode 100644 Documentation/devicetree/bindings/display/bridge/ti,tfp410.txt
 create mode 100644 Documentation/devicetree/bindings/display/bridge/ti,tfp410.yaml
 delete mode 100644 drivers/gpu/drm/mgag200/mgag200_cursor.c
 delete mode 100644 drivers/gpu/drm/mgag200/mgag200_main.c
 create mode 100644 drivers/gpu/drm/mgag200/mgag200_mm.c
 delete mode 100644 drivers/gpu/drm/mgag200/mgag200_ttm.c
 delete mode 100644 drivers/gpu/drm/udl/udl_gem.c
$ git am -3 ../patches/0001-drm-amdgpu-remove-stray-drm_gem_object_put_unlocked.patch
Applying: drm/amdgpu: remove stray drm_gem_object_put_unlocked
$ git reset HEAD^
Unstaged changes after reset:
M	drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
$ git add -A .
$ git commit -v -a --amend
[master e75ec1391947] Merge remote-tracking branch 'drm-misc/for-linux-next'
 Date: Mon Jun 22 10:29:07 2020 +1000
Merging drm-msm/msm-next (078e8f8ce8ad drm/msm: Fix setup of a6xx create_address_space.)
$ git merge drm-msm/msm-next
Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
Auto-merging drivers/gpu/drm/msm/adreno/a6xx_gpu.c
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/msm/adreno/a6xx_gpu.c       |  2 +-
 drivers/gpu/drm/msm/adreno/adreno_gpu.c     |  2 +-
 drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 18 +++++++++++-------
 drivers/gpu/drm/msm/msm_submitqueue.c       |  4 +++-
 4 files changed, 16 insertions(+), 10 deletions(-)
Merging mali-dp/for-upstream/mali-dp (f634c6a80287 dt/bindings: display: Add optional property node define for Mali DP500)
$ git merge mali-dp/for-upstream/mali-dp
Merge made by the 'recursive' strategy.
Merging imx-drm/imx-drm/next (2c76b324c794 drm/imx: parallel-display: Adjust bus_flags handling)
$ git merge imx-drm/imx-drm/next
Auto-merging drivers/gpu/drm/imx/parallel-display.c
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/imx/parallel-display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging etnaviv/etnaviv/next (6a5ef3b224c6 drm/etnaviv: Simplify clock enable/disable)
$ git merge etnaviv/etnaviv/next
Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem.c
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/etnaviv/etnaviv_gem.c |  6 ++--
 drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 66 ++++++++++++++---------------------
 2 files changed, 30 insertions(+), 42 deletions(-)
Merging regmap/for-next (e6ad256a03ef Merge remote-tracking branch 'regmap/for-5.9' into regmap-next)
$ git merge regmap/for-next
Merge made by the 'recursive' strategy.
 drivers/base/regmap/regmap.c |   2 +-
 include/linux/regmap.h       | 222 +++++++++++++++++++++++++++++++++++++------
 2 files changed, 193 insertions(+), 31 deletions(-)
Merging sound/for-next (c7440acc8597 Merge branch 'topic/hda-micmute-led' into for-next)
$ git merge sound/for-next
Auto-merging sound/pci/hda/patch_realtek.c
Auto-merging sound/pci/hda/hda_intel.c
Merge made by the 'recursive' strategy.
 include/sound/memalloc.h               |   9 +-
 sound/core/memalloc.c                  |   7 +-
 sound/core/pcm_memory.c                |  13 ++
 sound/core/pcm_native.c                |   2 -
 sound/core/sgbuf.c                     |   3 +
 sound/firewire/motu/motu-protocol-v3.c |  16 ++-
 sound/pci/hda/Kconfig                  |   9 ++
 sound/pci/hda/hda_controller.c         |  11 +-
 sound/pci/hda/hda_controller.h         |   2 +-
 sound/pci/hda/hda_generic.c            | 134 +++++++++++++-------
 sound/pci/hda/hda_generic.h            |  13 +-
 sound/pci/hda/hda_intel.c              |  16 ++-
 sound/pci/hda/patch_conexant.c         |  47 ++++---
 sound/pci/hda/patch_realtek.c          | 220 ++++++++++++++++-----------------
 sound/pci/hda/patch_sigmatel.c         |  22 ++--
 sound/pci/hda/thinkpad_helper.c        |  19 +--
 16 files changed, 298 insertions(+), 245 deletions(-)
Merging sound-asoc/for-next (f2e02f2c84b3 Merge remote-tracking branch 'asoc/for-5.9' into asoc-next)
$ git merge sound-asoc/for-next
Removing sound/soc/soc-io.c
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/sound/fsl,spdif.txt        |   6 +-
 .../devicetree/bindings/sound/fsl-asoc-card.txt    |  12 +-
 .../bindings/sound/intel,keembay-i2s.yaml          |  68 ++
 .../devicetree/bindings/sound/max98357a.txt        |  12 +-
 .../devicetree/bindings/sound/maxim,max98390.yaml  |  51 ++
 Documentation/devicetree/bindings/sound/mt6358.txt |   6 +
 .../bindings/sound/samsung,aries-wm8994.yaml       | 147 +++++
 Documentation/devicetree/bindings/sound/wm8960.txt |  11 +
 Documentation/devicetree/bindings/sound/wm8994.txt |  23 +
 include/sound/soc-component.h                      |  29 +-
 include/sound/wm8960.h                             |  17 +
 sound/soc/Makefile                                 |   2 +-
 sound/soc/amd/acp3x-rt5682-max9836.c               |  58 +-
 sound/soc/amd/raven/acp3x-i2s.c                    |   8 -
 sound/soc/codecs/max98357a.c                       |   1 +
 sound/soc/codecs/max98390.c                        |  26 +-
 sound/soc/codecs/mt6358.c                          |  23 +-
 sound/soc/codecs/rl6231.c                          |   2 +
 sound/soc/codecs/rt1015.c                          |  18 +-
 sound/soc/codecs/rt1015.h                          |   5 +
 sound/soc/codecs/rt5682.c                          |  58 +-
 sound/soc/codecs/rt5682.h                          |   4 +
 sound/soc/codecs/wm0010.c                          |   4 +-
 sound/soc/codecs/wm8960.c                          |  20 +
 sound/soc/fsl/fsl-asoc-card.c                      |  78 ++-
 sound/soc/fsl/fsl_easrc.c                          |  42 +-
 sound/soc/fsl/fsl_spdif.c                          | 167 +++--
 sound/soc/img/img-i2s-in.c                         |   4 +-
 sound/soc/img/img-parallel-out.c                   |   4 +-
 sound/soc/intel/Kconfig                            |   7 +
 sound/soc/intel/Makefile                           |   1 +
 sound/soc/intel/boards/bdw-rt5650.c                |  12 +-
 sound/soc/intel/boards/bdw-rt5677.c                |  12 +-
 sound/soc/intel/boards/broadwell.c                 |  12 +-
 sound/soc/intel/boards/bytcht_cx2072x.c            |  12 +-
 sound/soc/intel/boards/bytcht_da7213.c             |  12 +-
 sound/soc/intel/boards/bytcht_es8316.c             |  12 +-
 sound/soc/intel/boards/bytcr_rt5640.c              |  12 +-
 sound/soc/intel/boards/bytcr_rt5651.c              |  12 +-
 sound/soc/intel/boards/cht_bsw_max98090_ti.c       |  12 +-
 sound/soc/intel/boards/cht_bsw_nau8824.c           |  12 +-
 sound/soc/intel/boards/cht_bsw_rt5645.c            |  17 +-
 sound/soc/intel/boards/cht_bsw_rt5672.c            |  12 +-
 sound/soc/intel/keembay/Makefile                   |   4 +
 sound/soc/intel/keembay/kmb_platform.c             | 654 +++++++++++++++++++
 sound/soc/intel/keembay/kmb_platform.h             | 145 +++++
 sound/soc/meson/Kconfig                            |   1 +
 sound/soc/qcom/Kconfig                             |   4 +-
 sound/soc/samsung/Kconfig                          |  13 +
 sound/soc/samsung/Makefile                         |   2 +
 sound/soc/samsung/aries_wm8994.c                   | 695 +++++++++++++++++++++
 sound/soc/soc-component.c                          | 666 ++++++++++++++------
 sound/soc/soc-compress.c                           |   4 +-
 sound/soc/soc-core.c                               | 106 +---
 sound/soc/soc-io.c                                 | 202 ------
 sound/soc/soc-pcm.c                                | 127 +---
 sound/soc/tegra/tegra30_ahub.c                     |   4 +-
 sound/soc/tegra/tegra30_i2s.c                      |   4 +-
 58 files changed, 2900 insertions(+), 794 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/sound/intel,keembay-i2s.yaml
 create mode 100644 Documentation/devicetree/bindings/sound/maxim,max98390.yaml
 create mode 100644 Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml
 create mode 100644 sound/soc/intel/keembay/Makefile
 create mode 100644 sound/soc/intel/keembay/kmb_platform.c
 create mode 100644 sound/soc/intel/keembay/kmb_platform.h
 create mode 100644 sound/soc/samsung/aries_wm8994.c
 delete mode 100644 sound/soc/soc-io.c
Merging modules/modules-next (5c3a7db0c7ec module: Harden STRICT_MODULE_RWX)
$ git merge modules/modules-next
Already up to date.
Merging input/next (d0ac7079d5fc Input: iqs269a - add missing I2C dependency)
$ git merge input/next
Already up to date.
Merging block/for-next (35e6ecf1bc49 Merge branch 'for-5.9/block' into for-next)
$ git merge block/for-next
Auto-merging include/linux/fs.h
Auto-merging fs/block_dev.c
Auto-merging drivers/block/loop.c
Removing block/blk-softirq.c
Merge made by the 'recursive' strategy.
 block/Makefile                    |   2 +-
 block/bio.c                       |   4 +-
 block/blk-core.c                  |  37 +++-
 block/blk-iocost.c                |   3 +-
 block/blk-mq-debugfs.c            |   5 -
 block/blk-mq.c                    | 184 ++++++++++------
 block/blk-softirq.c               | 156 -------------
 block/blk-sysfs.c                 |  52 +++--
 block/blk-timeout.c               |   6 +-
 block/blk.h                       |  11 -
 block/bsg-lib.c                   |   5 +-
 block/genhd.c                     |  73 ++++++-
 drivers/block/loop.c              |  10 +-
 drivers/block/mtip32xx/mtip32xx.c |   3 +-
 drivers/block/nbd.c               |   5 +-
 drivers/block/null_blk_main.c     |   5 +-
 drivers/block/skd_main.c          |   9 +-
 drivers/block/virtio_blk.c        |   3 +-
 drivers/block/xen-blkfront.c      |   3 +-
 drivers/md/dm-rq.c                |   3 +-
 drivers/mmc/core/block.c          |   8 +-
 drivers/nvme/host/core.c          |   2 +-
 drivers/nvme/host/fc.c            |   4 +-
 drivers/nvme/host/nvme.h          |   6 +-
 drivers/nvme/host/pci.c           |   3 +-
 drivers/nvme/host/rdma.c          |  38 ++--
 drivers/nvme/host/tcp.c           |   6 +-
 drivers/nvme/target/loop.c        |   3 +-
 drivers/s390/block/dasd.c         |   2 +-
 drivers/s390/block/scm_blk.c      |   3 +-
 drivers/scsi/scsi_lib.c           |  12 +-
 fs/block_dev.c                    |   2 +-
 fs/btrfs/file.c                   |   2 +-
 fs/ext4/file.c                    |   2 +-
 fs/io_uring.c                     | 445 +++++++++++++++++++++++++++++++-------
 fs/xfs/xfs_file.c                 |   2 +-
 include/linux/blk-mq.h            |  13 +-
 include/linux/blkdev.h            |   9 +-
 include/linux/fs.h                |  10 +-
 include/linux/pagemap.h           |  75 +++++++
 include/uapi/linux/io_uring.h     |   4 +-
 kernel/trace/blktrace.c           |  76 ++++---
 mm/filemap.c                      | 110 ++++++----
 tools/io_uring/liburing.h         |   6 +-
 44 files changed, 934 insertions(+), 488 deletions(-)
 delete mode 100644 block/blk-softirq.c
Merging device-mapper/for-next (4e670f43081c dm rq: don't call blk_mq_queue_stopped() in dm_stop_queue())
$ git merge device-mapper/for-next
Auto-merging drivers/md/dm-rq.c
Merge made by the 'recursive' strategy.
 Documentation/admin-guide/device-mapper/index.rst |   1 +
 drivers/md/dm-ioctl.c                             |   2 +-
 drivers/md/dm-mpath.c                             | 146 +++++++++++++++-------
 drivers/md/dm-rq.c                                |   3 -
 drivers/md/dm-writecache.c                        |  10 +-
 drivers/md/dm-zoned-metadata.c                    |  42 +++++--
 drivers/md/dm-zoned-reclaim.c                     |   4 +-
 drivers/md/dm-zoned-target.c                      |   2 +-
 drivers/md/dm.c                                   |  13 ++
 9 files changed, 154 insertions(+), 69 deletions(-)
Merging pcmcia/pcmcia-next (46d079790663 pcmcia: make pccard_loop_tuple() static)
$ git merge pcmcia/pcmcia-next
Already up to date.
Merging mmc/next (49377432943d Merge branch 'fixes' into next)
$ git merge mmc/next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/mmc/sdhci-msm.txt          | 18 ++++++++
 drivers/mmc/core/core.c                            | 10 ++---
 drivers/mmc/core/host.c                            |  3 ++
 drivers/mmc/core/sdio.c                            | 49 +++++++++++++++-------
 drivers/mmc/core/sdio_io.c                         |  2 +-
 drivers/mmc/host/mmci.c                            |  2 +
 drivers/mmc/host/sdhci-msm.c                       |  6 +++
 drivers/mmc/host/sdhci-of-arasan.c                 |  4 ++
 drivers/mmc/host/sdhci-tegra.c                     |  9 ++++
 include/linux/mmc/host.h                           |  1 +
 10 files changed, 83 insertions(+), 21 deletions(-)
Merging mfd/for-mfd-next (098c4adf249c mfd: mt6360: Remove duplicate REGMAP_IRQ_REG_LINE() entry)
$ git merge mfd/for-mfd-next
Already up to date.
Merging backlight/for-backlight-next (479da1f538a2 backlight: Add backlight_device_get_by_name())
$ git merge backlight/for-backlight-next
Already up to date.
Merging battery/for-next (5d809cb28056 power: supply: max8998_charger: Correct ONLINE and add STATUS props)
$ git merge battery/for-next
Removing Documentation/devicetree/bindings/power/supply/gpio-charger.txt
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/power/supply/bq25890.txt   | 30 ++++----
 .../bindings/power/supply/gpio-charger.txt         | 31 --------
 .../bindings/power/supply/gpio-charger.yaml        | 63 +++++++++++++++
 drivers/power/supply/axp20x_usb_power.c            |  2 +-
 drivers/power/supply/bq24190_charger.c             |  4 +-
 drivers/power/supply/gpio-charger.c                | 38 +++++----
 drivers/power/supply/max8998_charger.c             | 25 +++++-
 drivers/power/supply/power_supply_sysfs.c          |  2 +-
 drivers/power/supply/sbs-battery.c                 | 89 +++++++++++++++++++++-
 9 files changed, 219 insertions(+), 65 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/power/supply/gpio-charger.txt
 create mode 100644 Documentation/devicetree/bindings/power/supply/gpio-charger.yaml
Merging regulator/for-next (187dc605d288 Merge remote-tracking branch 'regulator/for-5.9' into regulator-next)
$ git merge regulator/for-next
Merge made by the 'recursive' strategy.
 .../regulator/google,cros-ec-regulator.yaml        |  51 ++++
 drivers/platform/chrome/cros_ec_trace.c            |   5 +
 drivers/regulator/Kconfig                          |  10 +
 drivers/regulator/Makefile                         |   1 +
 drivers/regulator/anatop-regulator.c               |   2 +-
 drivers/regulator/cpcap-regulator.c                |   2 +-
 drivers/regulator/cros-ec-regulator.c              | 257 +++++++++++++++++++++
 drivers/regulator/fixed.c                          |   2 +-
 drivers/regulator/gpio-regulator.c                 |   2 +-
 drivers/regulator/ltc3676.c                        |   2 +-
 drivers/regulator/max8907-regulator.c              |   6 +-
 drivers/regulator/max8997-regulator.c              |  14 +-
 include/linux/platform_data/cros_ec_commands.h     |  82 +++++++
 13 files changed, 421 insertions(+), 15 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/regulator/google,cros-ec-regulator.yaml
 create mode 100644 drivers/regulator/cros-ec-regulator.c
Merging security/next-testing (56f2e3b7d819 capabilities: add description for CAP_SETFCAP)
$ git merge security/next-testing
Already up to date.
Merging apparmor/apparmor-next (e37986097ba6 apparmor: Use true and false for bool variable)
$ git merge apparmor/apparmor-next
Already up to date.
Merging integrity/next-integrity (4235b1a4efe1 ima: fix mprotect checking)
$ git merge integrity/next-integrity
Already up to date.
Merging keys/keys-next (b6f61c314649 keys: Implement update for the big_key type)
$ git merge keys/keys-next
Already up to date.
Merging safesetid/safesetid-next (4d63f7c2e382 security: Add LSM hooks to set*gid syscalls)
$ git merge safesetid/safesetid-next
Auto-merging security/security.c
Auto-merging kernel/sys.c
Auto-merging include/linux/security.h
Auto-merging include/linux/lsm_hooks.h
Auto-merging include/linux/lsm_hook_defs.h
Merge made by the 'recursive' strategy.
Merging selinux/next (b3a9e3b9622a Linux 5.8-rc1)
$ git merge selinux/next
Already up to date.
Merging smack/next (ef26650a201f Smack: Remove unused inline function smk_ad_setfield_u_fs_path_mnt)
$ git merge smack/next
Already up to date.
Merging tomoyo/master (b3a9e3b9622a Linux 5.8-rc1)
$ git merge tomoyo/master
Already up to date.
Merging tpmdd/next (8270cafb505e tpm/st33zp24: fix spelling mistake "drescription" -> "description")
$ git merge tpmdd/next
Merge made by the 'recursive' strategy.
 drivers/char/tpm/st33zp24/i2c.c      |  2 +-
 drivers/char/tpm/st33zp24/spi.c      |  4 ++--
 drivers/char/tpm/st33zp24/st33zp24.c |  2 +-
 drivers/char/tpm/tpm-dev-common.c    | 19 +++++++++----------
 drivers/char/tpm/tpm_tis_core.c      |  2 +-
 drivers/char/tpm/tpm_tis_spi_main.c  |  9 ++++-----
 6 files changed, 18 insertions(+), 20 deletions(-)
Merging watchdog/master (072cb8b628d3 watchdog: m54xx: Add missing include)
$ git merge watchdog/master
Already up to date.
Merging iommu/next (672cf6df9b8a iommu/vt-d: Move Intel IOMMU driver into subdirectory)
$ git merge iommu/next
Already up to date.
Merging vfio/next (4f085ca2f5a8 Merge branch 'v5.8/vfio/kirti-migration-fixes' into v5.8/vfio/next)
$ git merge vfio/next
Already up to date.
Merging audit/next (bbccc11bc884 audit: Use struct_size() helper in alloc_chunk)
$ git merge audit/next
Merge made by the 'recursive' strategy.
 kernel/audit_tree.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
Merging devicetree/for-next (bb278b149df9 of: property: Improve cycle detection when one of the devices is never added)
$ git merge devicetree/for-next
Removing Documentation/devicetree/bindings/thermal/qoriq-thermal.txt
Removing Documentation/devicetree/bindings/rtc/imxdi-rtc.txt
Removing Documentation/devicetree/bindings/mmc/mxs-mmc.txt
Removing Documentation/devicetree/bindings/mmc/fsl-imx-mmc.txt
Removing Documentation/devicetree/bindings/interrupt-controller/renesas,rza1-irqc.txt
Removing Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.txt
Removing Documentation/devicetree/bindings/clock/imx7ulp-clock.txt
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/clock/imx7ulp-clock.txt    | 103 ------------------
 .../bindings/clock/imx7ulp-pcc-clock.yaml          | 121 +++++++++++++++++++++
 .../bindings/clock/imx7ulp-scg-clock.yaml          |  99 +++++++++++++++++
 .../devicetree/bindings/i2c/i2c-imx-lpi2c.txt      |  20 ----
 .../devicetree/bindings/i2c/i2c-imx-lpi2c.yaml     |  47 ++++++++
 .../interrupt-controller/renesas,rza1-irqc.txt     |  43 --------
 .../interrupt-controller/renesas,rza1-irqc.yaml    |  80 ++++++++++++++
 .../devicetree/bindings/mmc/fsl-imx-mmc.txt        |  23 ----
 .../devicetree/bindings/mmc/fsl-imx-mmc.yaml       |  53 +++++++++
 Documentation/devicetree/bindings/mmc/mxs-mmc.txt  |  27 -----
 Documentation/devicetree/bindings/mmc/mxs-mmc.yaml |  58 ++++++++++
 .../devicetree/bindings/property-units.txt         |   1 +
 .../devicetree/bindings/rtc/imxdi-rtc.txt          |  20 ----
 .../devicetree/bindings/rtc/imxdi-rtc.yaml         |  44 ++++++++
 .../devicetree/bindings/spi/brcm,bcm2835-spi.txt   |   3 +-
 .../devicetree/bindings/thermal/qoriq-thermal.txt  |  71 ------------
 .../devicetree/bindings/thermal/qoriq-thermal.yaml | 114 +++++++++++++++++++
 drivers/base/core.c                                |   2 +-
 drivers/of/of_reserved_mem.c                       |   2 +-
 drivers/of/property.c                              |  62 ++++++++++-
 include/linux/device.h                             |   1 +
 21 files changed, 678 insertions(+), 316 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/clock/imx7ulp-clock.txt
 create mode 100644 Documentation/devicetree/bindings/clock/imx7ulp-pcc-clock.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/imx7ulp-scg-clock.yaml
 delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.txt
 create mode 100644 Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml
 delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,rza1-irqc.txt
 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,rza1-irqc.yaml
 delete mode 100644 Documentation/devicetree/bindings/mmc/fsl-imx-mmc.txt
 create mode 100644 Documentation/devicetree/bindings/mmc/fsl-imx-mmc.yaml
 delete mode 100644 Documentation/devicetree/bindings/mmc/mxs-mmc.txt
 create mode 100644 Documentation/devicetree/bindings/mmc/mxs-mmc.yaml
 delete mode 100644 Documentation/devicetree/bindings/rtc/imxdi-rtc.txt
 create mode 100644 Documentation/devicetree/bindings/rtc/imxdi-rtc.yaml
 delete mode 100644 Documentation/devicetree/bindings/thermal/qoriq-thermal.txt
 create mode 100644 Documentation/devicetree/bindings/thermal/qoriq-thermal.yaml
Merging mailbox/mailbox-for-next (e9f901dc05c0 mailbox: qcom: Add ipq6018 apcs compatible)
$ git merge mailbox/mailbox-for-next
Already up to date.
Merging spi/for-next (1a6b879c8582 Merge remote-tracking branch 'spi/for-5.9' into spi-next)
$ git merge spi/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/spi/renesas,sh-msiof.yaml  |   1 +
 drivers/mtd/spi-nor/controllers/Kconfig            |  11 -
 drivers/mtd/spi-nor/controllers/Makefile           |   1 -
 drivers/spi/Kconfig                                |  22 +-
 drivers/spi/Makefile                               |   2 +
 drivers/spi/spi-altera.c                           | 177 ++++++-
 drivers/spi/spi-bcm63xx-hsspi.c                    |  12 +
 drivers/spi/spi-bcm63xx.c                          |  12 +
 .../spi-cadence-quadspi.c}                         | 541 ++++++++-------------
 drivers/spi/spi-cavium-thunderx.c                  |   1 +
 drivers/spi/spi-geni-qcom.c                        | 120 +++--
 drivers/spi/spi-npcm-fiu.c                         |   6 +-
 drivers/spi/spi-rpc-if.c                           | 216 ++++++++
 include/linux/spi/altera.h                         |  29 ++
 14 files changed, 740 insertions(+), 411 deletions(-)
 rename drivers/{mtd/spi-nor/controllers/cadence-quadspi.c => spi/spi-cadence-quadspi.c} (74%)
 create mode 100644 drivers/spi/spi-rpc-if.c
 create mode 100644 include/linux/spi/altera.h
Merging tip/auto-latest (03e5e9954269 Merge branch 'locking/core')
$ git merge tip/auto-latest
Auto-merging tools/arch/x86/include/asm/msr-index.h
Auto-merging kernel/trace/ftrace.c
Auto-merging kernel/kprobes.c
Auto-merging include/linux/sched.h
Auto-merging include/linux/kprobes.h
Auto-merging drivers/gpu/drm/msm/msm_drv.c
Auto-merging arch/x86/kernel/kprobes/core.c
Auto-merging Documentation/admin-guide/kernel-parameters.txt
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-devices-mapping |  33 +++
 Documentation/admin-guide/kernel-parameters.txt |   2 +
 Documentation/dev-tools/kcsan.rst               |   6 -
 Documentation/x86/x86_64/fsgs.rst               | 199 +++++++++++++++++
 Documentation/x86/x86_64/index.rst              |   1 +
 arch/arm/common/bL_switcher.c                   |   3 +-
 arch/x86/Kconfig                                |   3 -
 arch/x86/entry/calling.h                        |  40 ++++
 arch/x86/entry/entry_64.S                       | 139 +++++++++---
 arch/x86/events/Makefile                        |   2 +-
 arch/x86/events/amd/power.c                     |   4 -
 arch/x86/events/intel/uncore.c                  |  26 ++-
 arch/x86/events/intel/uncore.h                  |  37 ++++
 arch/x86/events/intel/uncore_snb.c              |  80 ++++++-
 arch/x86/events/intel/uncore_snbep.c            | 208 +++++++++++++++++-
 arch/x86/include/asm/asm.h                      |   6 +-
 arch/x86/include/asm/bitops.h                   |   6 +-
 arch/x86/include/asm/bug.h                      |   7 +
 arch/x86/include/asm/cpu.h                      |   5 +
 arch/x86/include/asm/cpufeatures.h              |   2 +
 arch/x86/include/asm/cpumask.h                  |  18 ++
 arch/x86/include/asm/div64.h                    |  14 +-
 arch/x86/include/asm/fsgsbase.h                 |  45 +++-
 arch/x86/include/asm/inst.h                     |  15 ++
 arch/x86/include/asm/kprobes.h                  |   2 +
 arch/x86/include/asm/mem_encrypt.h              |   5 +-
 arch/x86/include/asm/msr-index.h                |   5 +-
 arch/x86/include/asm/pgtable.h                  |   9 +-
 arch/x86/include/asm/processor.h                |   6 +-
 arch/x86/include/asm/stackprotector.h           |  12 ++
 arch/x86/include/asm/topology.h                 |   2 +-
 arch/x86/include/uapi/asm/hwcap2.h              |   3 +
 arch/x86/kernel/alternative.c                   |  41 +++-
 arch/x86/kernel/cpu/bugs.c                      |  19 +-
 arch/x86/kernel/cpu/centaur.c                   |   1 +
 arch/x86/kernel/cpu/common.c                    |  46 ++--
 arch/x86/kernel/cpu/cpu.h                       |   4 -
 arch/x86/kernel/cpu/mce/core.c                  |   2 +-
 arch/x86/kernel/cpu/mce/dev-mcelog.c            |   2 +-
 arch/x86/kernel/cpu/mce/inject.c                |   2 +-
 arch/x86/kernel/cpu/microcode/core.c            |   2 -
 arch/x86/kernel/cpu/resctrl/core.c              |   8 +-
 arch/x86/kernel/cpu/resctrl/internal.h          |   1 +
 arch/x86/kernel/cpu/resctrl/rdtgroup.c          |   1 +
 arch/x86/kernel/cpu/zhaoxin.c                   |   1 +
 arch/x86/kernel/kprobes/core.c                  |  15 +-
 arch/x86/kernel/kprobes/opt.c                   |  38 +++-
 arch/x86/kernel/msr.c                           |  69 ++++++
 arch/x86/kernel/nmi.c                           |   2 +-
 arch/x86/kernel/process.c                       |  10 +-
 arch/x86/kernel/process_64.c                    | 123 +++++++++--
 arch/x86/kernel/ptrace.c                        |  17 +-
 arch/x86/kernel/smpboot.c                       |  64 ++++--
 arch/x86/kvm/vmx/vmx.c                          |   2 +-
 arch/x86/mm/init.c                              |   3 +-
 arch/x86/mm/mem_encrypt.c                       |   2 +-
 arch/x86/power/cpu.c                            |   6 +
 arch/x86/xen/smp_pv.c                           |   2 -
 crypto/crypto_engine.c                          |   3 +-
 drivers/acpi/acpi_pad.c                         |   3 +-
 drivers/block/drbd/drbd_receiver.c              |   5 +-
 drivers/firmware/psci/psci_checker.c            |  10 +-
 drivers/gpu/drm/msm/msm_drv.c                   |  13 +-
 drivers/gpu/drm/scheduler/sched_main.c          |   3 +-
 drivers/hwmon/fam15h_power.c                    |   4 -
 drivers/media/pci/ivtv/ivtv-driver.c            |   4 +-
 drivers/mmc/core/sdio_irq.c                     |   3 +-
 drivers/platform/chrome/cros_ec_spi.c           |  11 +-
 drivers/powercap/idle_inject.c                  |   4 +-
 drivers/spi/spi.c                               |   4 +-
 drivers/staging/android/ion/ion_heap.c          |   4 +-
 drivers/thermal/intel/intel_powerclamp.c        |   5 +-
 drivers/tty/serial/sc16is7xx.c                  |   3 +-
 drivers/watchdog/watchdog_dev.c                 |   3 +-
 include/asm-generic/bug.h                       |   1 +
 include/linux/compiler-clang.h                  |   8 +
 include/linux/compiler-gcc.h                    |   6 +
 include/linux/compiler.h                        |  53 -----
 include/linux/compiler_attributes.h             |   1 +
 include/linux/compiler_types.h                  |  14 +-
 include/linux/context_tracking.h                |   2 +
 include/linux/cpu.h                             |   1 +
 include/linux/ftrace.h                          |  12 +-
 include/linux/instrumentation.h                 |  57 +++++
 include/linux/kprobes.h                         |  15 ++
 include/linux/lockdep.h                         | 178 +--------------
 include/linux/lockdep_types.h                   | 196 +++++++++++++++++
 include/linux/math64.h                          |   2 +
 include/linux/perf_event.h                      |   8 +
 include/linux/psi_types.h                       |   7 +-
 include/linux/sched.h                           |   3 +
 include/linux/sched/isolation.h                 |   1 +
 include/linux/sched/sysctl.h                    |   3 +
 include/linux/spinlock.h                        |   1 +
 include/linux/spinlock_types.h                  |   2 +-
 include/linux/syscalls.h                        |   2 +-
 include/linux/timekeeping.h                     |  14 +-
 include/trace/events/sched.h                    |   8 +
 include/uapi/linux/perf_event.h                 |  26 ++-
 kernel/events/core.c                            |  90 +++++++-
 kernel/irq/manage.c                             |   6 +-
 kernel/kallsyms.c                               |  42 +++-
 kernel/kprobes.c                                |  57 +++++
 kernel/kthread.c                                |   6 +-
 kernel/locking/locktorture.c                    |  10 +-
 kernel/rcu/rcuperf.c                            |  10 +-
 kernel/rcu/rcutorture.c                         |   7 +-
 kernel/sched/core.c                             |  54 ++++-
 kernel/sched/cpudeadline.c                      |  24 +++
 kernel/sched/cputime.c                          |  46 +---
 kernel/sched/deadline.c                         | 114 ++++++++--
 kernel/sched/fair.c                             |  67 +++---
 kernel/sched/idle.c                             |   7 -
 kernel/sched/isolation.c                        |   3 +-
 kernel/sched/pelt.c                             |   4 +-
 kernel/sched/pelt.h                             |   5 +
 kernel/sched/psi.c                              | 110 +++++-----
 kernel/sched/sched.h                            |  23 +-
 kernel/sched/stop_task.c                        |   8 -
 kernel/sched/topology.c                         |   2 +-
 kernel/sysctl.c                                 |  14 ++
 kernel/trace/ftrace.c                           | 101 ++++++++-
 lib/Kconfig.kasan                               |   4 +
 lib/math/div64.c                                |  41 ++++
 tools/arch/x86/include/asm/msr-index.h          |   5 +-
 tools/objtool/arch.h                            |   2 +-
 tools/objtool/arch/x86/decode.c                 |   2 +-
 tools/objtool/check.c                           | 224 ++++++++++---------
 tools/objtool/check.h                           |   2 +-
 tools/objtool/elf.c                             | 275 +++++++++++++++++-------
 tools/objtool/elf.h                             |  27 +--
 tools/objtool/orc_gen.c                         |  46 ++--
 tools/objtool/special.c                         |  28 +--
 tools/testing/selftests/x86/fsgsbase.c          |  24 ++-
 134 files changed, 2664 insertions(+), 957 deletions(-)
 create mode 100644 Documentation/ABI/testing/sysfs-devices-mapping
 create mode 100644 Documentation/x86/x86_64/fsgs.rst
 create mode 100644 include/linux/instrumentation.h
 create mode 100644 include/linux/lockdep_types.h
$ git am -3 ../patches/x86-msr-Move-the-F15h-MSRs-where-they-belong.patch
Applying: x86/msr: Move the F15h MSRs where they belong
Using index info to reconstruct a base tree...
M	tools/arch/x86/include/asm/msr-index.h
Falling back to patching base and 3-way merge...
Auto-merging tools/arch/x86/include/asm/msr-index.h
$ git reset HEAD^
Unstaged changes after reset:
M	arch/x86/include/asm/msr-index.h
M	tools/arch/x86/include/asm/msr-index.h
$ git add -A .
$ git commit -v -a --amend
[master d342023465ea] Merge remote-tracking branch 'tip/auto-latest'
 Date: Mon Jun 22 11:13:59 2020 +1000
$ git am -3 ../patches/0001-Revert-sched-Remove-sched_setscheduler-EXPORTs.patch
Applying: Revert "sched: Remove sched_setscheduler*() EXPORTs"
$ git reset HEAD^
Unstaged changes after reset:
M	kernel/sched/core.c
$ git add -A .
$ git commit -v -a --amend
[master 3fe59d94e859] Merge remote-tracking branch 'tip/auto-latest'
 Date: Mon Jun 22 11:13:59 2020 +1000
Merging clockevents/timers/drivers/next (809eb4e9bf9d dt-bindings: timer: Add renesas,em-sti bindings)
$ git merge clockevents/timers/drivers/next
Already up to date.
Merging edac/edac-for-next (17ed808ad243 EDAC: Fix reference count leaks)
$ git merge edac/edac-for-next
Merge made by the 'recursive' strategy.
 drivers/edac/edac_device_sysfs.c |  1 +
 drivers/edac/edac_mc.c           |  4 ++--
 drivers/edac/edac_pci_sysfs.c    |  2 +-
 drivers/edac/i10nm_base.c        | 12 +++++-------
 drivers/edac/pnd2_edac.c         |  1 +
 drivers/edac/skx_base.c          |  2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)
Merging irqchip/irq/irqchip-next (005c34ae4b44 irqchip/gic: Atomically update affinity)
$ git merge irqchip/irq/irqchip-next
Merge made by the 'recursive' strategy.
 drivers/irqchip/Kconfig          |  2 +-
 drivers/irqchip/irq-gic-v3-its.c |  8 ++++----
 drivers/irqchip/irq-gic.c        | 14 +++-----------
 drivers/irqchip/irq-riscv-intc.c |  2 +-
 4 files changed, 9 insertions(+), 17 deletions(-)
Merging ftrace/for-next (026bb845b0ff ftrace: Fix maybe-uninitialized compiler warning)
$ git merge ftrace/for-next
Already up to date.
Merging rcu/rcu/next (d831090dafcc kcsan: Disable branch tracing in core runtime)
$ git merge rcu/rcu/next
Auto-merging net/core/sock.c
Auto-merging kernel/sched/core.c
Auto-merging kernel/rcu/rcutorture.c
Auto-merging kernel/rcu/rcuperf.c
Auto-merging kernel/locking/locktorture.c
Auto-merging MAINTAINERS
Auto-merging Documentation/dev-tools/kcsan.rst
Auto-merging Documentation/admin-guide/kernel-parameters.txt
Removing Documentation/RCU/rculist_nulls.txt
Merge made by the 'recursive' strategy.
 .../RCU/Design/Requirements/Requirements.rst       |    7 +-
 Documentation/RCU/{checklist.txt => checklist.rst} |   17 +-
 Documentation/RCU/index.rst                        |    9 +
 .../RCU/{lockdep-splat.txt => lockdep-splat.rst}   |  109 +-
 Documentation/RCU/{lockdep.txt => lockdep.rst}     |   12 +-
 Documentation/RCU/rculist_nulls.rst                |  200 ++++
 Documentation/RCU/rculist_nulls.txt                |  172 ---
 Documentation/RCU/{rcuref.txt => rcuref.rst}       |  199 ++--
 Documentation/RCU/{stallwarn.txt => stallwarn.rst} |   62 +-
 Documentation/RCU/{torture.txt => torture.rst}     |  117 ++-
 Documentation/admin-guide/kernel-parameters.txt    |   68 ++
 Documentation/atomic_t.txt                         |   24 +-
 Documentation/dev-tools/kcsan.rst                  |    3 +-
 Documentation/litmus-tests/README                  |   34 +
 ...b__after_atomic-is-stronger-than-acquire.litmus |   32 +
 ...Atomic-RMW-ops-are-atomic-WRT-atomic_set.litmus |   24 +
 .../litmus-tests/rcu/RCU+sync+free.litmus          |   42 +
 .../litmus-tests/rcu/RCU+sync+read.litmus          |   37 +
 Documentation/locking/locktorture.rst              |    2 +-
 Documentation/memory-barriers.txt                  |    6 +-
 MAINTAINERS                                        |    6 +-
 arch/x86/mm/pat/set_memory.c                       |    2 +-
 fs/btrfs/extent_io.c                               |    2 +
 include/linux/rculist.h                            |    4 +-
 include/linux/rculist_nulls.h                      |    2 +-
 include/linux/rcupdate.h                           |   53 +-
 include/linux/rcupdate_trace.h                     |    4 +-
 include/linux/rcutiny.h                            |   20 +-
 include/linux/rcutree.h                            |    2 +-
 include/linux/torture.h                            |    5 +
 include/trace/events/rcu.h                         |   73 +-
 kernel/fork.c                                      |    8 +-
 kernel/kcsan/Makefile                              |    9 +-
 kernel/kcsan/atomic.h                              |    6 +-
 kernel/kcsan/core.c                                |    9 +
 kernel/kcsan/kcsan-test.c                          | 1107 ++++++++++++++++++++
 kernel/kcsan/{test.c => selftest.c}                |    0
 kernel/locking/lockdep.c                           |    4 +-
 kernel/locking/locktorture.c                       |   14 +-
 kernel/locking/osq_lock.c                          |    6 +-
 kernel/rcu/Kconfig.debug                           |   19 +
 kernel/rcu/Makefile                                |    1 +
 kernel/rcu/rcu_segcblist.c                         |   10 +-
 kernel/rcu/rcuperf.c                               |   25 +-
 kernel/rcu/rcutorture.c                            |  145 ++-
 kernel/rcu/refscale.c                              |  717 +++++++++++++
 kernel/rcu/srcutree.c                              |   29 +-
 kernel/rcu/tasks.h                                 |   37 +-
 kernel/rcu/tiny.c                                  |    7 +-
 kernel/rcu/tree.c                                  |  425 +++++---
 kernel/rcu/tree.h                                  |   15 +-
 kernel/rcu/tree_exp.h                              |    8 +-
 kernel/rcu/tree_plugin.h                           |    4 +-
 kernel/rcu/tree_stall.h                            |    9 +-
 kernel/rcu/update.c                                |   29 +-
 kernel/sched/core.c                                |    9 +-
 kernel/time/tick-sched.c                           |   22 +-
 kernel/torture.c                                   |    6 +-
 lib/Kconfig.kcsan                                  |   26 +-
 lib/test_vmalloc.c                                 |  103 +-
 mm/list_lru.c                                      |    6 +-
 mm/mmap.c                                          |    1 +
 net/core/sock.c                                    |    4 +-
 scripts/Makefile.kcsan                             |    2 +-
 tools/memory-model/Documentation/explanation.txt   |   83 +-
 tools/memory-model/Documentation/recipes.txt       |    2 +-
 tools/memory-model/Documentation/references.txt    |   21 +-
 tools/memory-model/README                          |   40 +-
 tools/memory-model/litmus-tests/.gitignore         |    2 +-
 tools/memory-model/scripts/README                  |   16 +-
 tools/memory-model/scripts/checkalllitmus.sh       |   29 +-
 tools/memory-model/scripts/checkghlitmus.sh        |   11 +-
 tools/memory-model/scripts/checklitmus.sh          |   25 +-
 tools/memory-model/scripts/checklitmushist.sh      |    2 +-
 tools/memory-model/scripts/checktheselitmus.sh     |   43 +
 tools/memory-model/scripts/cmplitmushist.sh        |   49 +-
 tools/memory-model/scripts/hwfnseg.sh              |   20 +
 tools/memory-model/scripts/initlitmushist.sh       |    2 +-
 tools/memory-model/scripts/judgelitmus.sh          |  120 ++-
 tools/memory-model/scripts/newlitmushist.sh        |    4 +-
 tools/memory-model/scripts/parseargs.sh            |   21 +-
 tools/memory-model/scripts/runlitmus.sh            |   80 ++
 tools/memory-model/scripts/runlitmushist.sh        |   29 +-
 tools/memory-model/scripts/simpletest.sh           |   35 +
 .../testing/selftests/rcutorture/bin/configinit.sh |    4 +-
 .../selftests/rcutorture/bin/console-badness.sh    |   16 +
 .../testing/selftests/rcutorture/bin/functions.sh  |   23 +-
 tools/testing/selftests/rcutorture/bin/jitter.sh   |    6 +
 .../testing/selftests/rcutorture/bin/kvm-build.sh  |    6 +
 .../selftests/rcutorture/bin/kvm-check-branches.sh |  108 ++
 .../rcutorture/bin/kvm-recheck-refscale.sh         |   71 ++
 .../selftests/rcutorture/bin/kvm-recheck.sh        |   20 +-
 .../selftests/rcutorture/bin/kvm-test-1-run.sh     |   27 +-
 .../selftests/rcutorture/bin/kvm-transform.sh      |   51 +
 tools/testing/selftests/rcutorture/bin/kvm.sh      |   19 +-
 .../selftests/rcutorture/bin/parse-console.sh      |   27 +-
 .../selftests/rcutorture/configs/refscale/CFLIST   |    2 +
 .../selftests/rcutorture/configs/refscale/CFcommon |    2 +
 .../rcutorture/configs/refscale/NOPREEMPT          |   18 +
 .../selftests/rcutorture/configs/refscale/PREEMPT  |   18 +
 .../rcutorture/configs/refscale/ver_functions.sh   |   16 +
 101 files changed, 4306 insertions(+), 933 deletions(-)
 rename Documentation/RCU/{checklist.txt => checklist.rst} (98%)
 rename Documentation/RCU/{lockdep-splat.txt => lockdep-splat.rst} (54%)
 rename Documentation/RCU/{lockdep.txt => lockdep.rst} (96%)
 create mode 100644 Documentation/RCU/rculist_nulls.rst
 delete mode 100644 Documentation/RCU/rculist_nulls.txt
 rename Documentation/RCU/{rcuref.txt => rcuref.rst} (50%)
 rename Documentation/RCU/{stallwarn.txt => stallwarn.rst} (88%)
 rename Documentation/RCU/{torture.txt => torture.rst} (76%)
 create mode 100644 Documentation/litmus-tests/README
 create mode 100644 Documentation/litmus-tests/atomic/Atomic-RMW+mb__after_atomic-is-stronger-than-acquire.litmus
 create mode 100644 Documentation/litmus-tests/atomic/Atomic-RMW-ops-are-atomic-WRT-atomic_set.litmus
 create mode 100644 Documentation/litmus-tests/rcu/RCU+sync+free.litmus
 create mode 100644 Documentation/litmus-tests/rcu/RCU+sync+read.litmus
 create mode 100644 kernel/kcsan/kcsan-test.c
 rename kernel/kcsan/{test.c => selftest.c} (100%)
 create mode 100644 kernel/rcu/refscale.c
 create mode 100755 tools/memory-model/scripts/checktheselitmus.sh
 create mode 100755 tools/memory-model/scripts/hwfnseg.sh
 create mode 100755 tools/memory-model/scripts/runlitmus.sh
 create mode 100755 tools/memory-model/scripts/simpletest.sh
 create mode 100755 tools/testing/selftests/rcutorture/bin/console-badness.sh
 create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-check-branches.sh
 create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-refscale.sh
 create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-transform.sh
 create mode 100644 tools/testing/selftests/rcutorture/configs/refscale/CFLIST
 create mode 100644 tools/testing/selftests/rcutorture/configs/refscale/CFcommon
 create mode 100644 tools/testing/selftests/rcutorture/configs/refscale/NOPREEMPT
 create mode 100644 tools/testing/selftests/rcutorture/configs/refscale/PREEMPT
 create mode 100644 tools/testing/selftests/rcutorture/configs/refscale/ver_functions.sh
Merging kvm/linux-next (49b3deaad345 Merge tag 'kvmarm-fixes-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD)
$ git merge kvm/linux-next
Already up to date.
Merging kvm-arm/next (15c99816ed93 Merge branch 'kvm-arm64/ptrauth-fixes' into kvmarm-master/next)
$ git merge kvm-arm/next
Already up to date.
Merging kvm-ppc/kvm-ppc-next (11362b1befea KVM: PPC: Book3S HV: Close race with page faults around memslot flushes)
$ git merge kvm-ppc/kvm-ppc-next
Already up to date.
Merging kvms390/next (0b545fd17f84 KVM: s390: remove unneeded semicolon in gisa_vcpu_kicker())
$ git merge kvms390/next
Already up to date.
Merging xen-tip/linux-next (a952f64d14e5 MAINTAINERS: Update PARAVIRT_OPS_INTERFACE and VMWARE_HYPERVISOR_INTERFACE)
$ git merge xen-tip/linux-next
Already up to date.
Merging percpu/for-next (dedac37ea96b Merge branch 'for-5.7' into for-next)
$ git merge percpu/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging workqueues/for-next (10cdb1575954 workqueue: use BUILD_BUG_ON() for compile time test instead of WARN_ON())
$ git merge workqueues/for-next
Already up to date.
Merging drivers-x86/for-next (b3a9e3b9622a Linux 5.8-rc1)
$ git merge drivers-x86/for-next
Already up to date.
Merging chrome-platform/for-next (b3a9e3b9622a Linux 5.8-rc1)
$ git merge chrome-platform/for-next
Already up to date.
Merging hsi/for-next (bb6d3fb354c5 Linux 5.6-rc1)
$ git merge hsi/for-next
Already up to date.
Merging leds/for-next (59ea3c9faf32 leds: add aw2013 driver)
$ git merge leds/for-next
Already up to date.
Merging ipmi/for-next (a5dc8300df75 scripts/decode_stacktrace: warn when modpath is needed but is unset)
$ git merge ipmi/for-next
Already up to date.
Merging driver-core/driver-core-next (b3a9e3b9622a Linux 5.8-rc1)
$ git merge driver-core/driver-core-next
Already up to date.
Merging usb/usb-next (f8f02d5c671f USB: OTG: rename product list of devices)
$ git merge usb/usb-next
Auto-merging drivers/usb/core/quirks.c
Merge made by the 'recursive' strategy.
 arch/mips/configs/fuloong2e_defconfig              |  2 +-
 arch/mips/configs/gcw0_defconfig                   |  2 +-
 arch/mips/configs/lemote2f_defconfig               |  2 +-
 drivers/usb/core/Kconfig                           |  8 +--
 drivers/usb/core/config.c                          |  8 +--
 drivers/usb/core/devices.c                         |  4 ++
 drivers/usb/core/hub.c                             |  6 +--
 drivers/usb/core/of.c                              |  2 +-
 .../core/{otg_whitelist.h => otg_productlist.h}    | 14 ++----
 drivers/usb/core/quirks.c                          | 18 +++----
 drivers/usb/core/usb.h                             |  2 +-
 drivers/usb/dwc2/hcd.c                             |  4 +-
 drivers/usb/dwc2/params.c                          | 12 ++---
 drivers/usb/gadget/composite.c                     |  4 +-
 drivers/usb/gadget/configfs.c                      |  2 +-
 drivers/usb/gadget/function/u_serial.h             |  2 +-
 drivers/usb/gadget/usbstring.c                     |  4 +-
 drivers/usb/host/Kconfig                           |  4 +-
 drivers/usb/host/ohci-pci.c                        |  4 --
 drivers/usb/host/xhci-tegra.c                      |  8 ---
 drivers/usb/misc/sisusbvga/sisusb.c                |  6 +--
 drivers/usb/misc/sisusbvga/sisusb_con.c            | 12 ++---
 drivers/usb/misc/sisusbvga/sisusb_init.h           |  2 +-
 drivers/usb/musb/Kconfig                           |  2 +-
 drivers/usb/musb/musb_core.c                       |  4 +-
 drivers/usb/serial/qcserial.c                      |  5 +-
 drivers/usb/serial/sierra.c                        | 57 ++++++++--------------
 drivers/usb/storage/scsiglue.c                     |  2 +-
 drivers/usb/storage/uas-detect.h                   |  2 +-
 include/linux/usb/quirks.h                         |  4 +-
 include/uapi/linux/usb/ch9.h                       |  7 +++
 31 files changed, 95 insertions(+), 120 deletions(-)
 rename drivers/usb/core/{otg_whitelist.h => otg_productlist.h} (90%)
Merging usb-gadget/next (1c11e74e9079 usb: dwc3: keystone: Turn on USB3 PHY before controller)
$ git merge usb-gadget/next
Already up to date.
Merging usb-serial/usb-next (c432df155919 USB: serial: ch341: fix lockup of devices with limited prescaler)
$ git merge usb-serial/usb-next
Already up to date.
Merging usb-chipidea-next/ci-for-usb-next (c71d13f9a868 Documentation: ABI: usb: chipidea: Update Li Jun's e-mail)
$ git merge usb-chipidea-next/ci-for-usb-next
Merge made by the 'recursive' strategy.
 drivers/usb/chipidea/udc.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
Merging phy-next/next (b3a9e3b9622a Linux 5.8-rc1)
$ git merge phy-next/next
Already up to date.
Merging tty/tty-next (b3a9e3b9622a Linux 5.8-rc1)
$ git merge tty/tty-next
Already up to date.
Merging char-misc/char-misc-next (b3a9e3b9622a Linux 5.8-rc1)
$ git merge char-misc/char-misc-next
Already up to date.
Merging extcon/extcon-next (b2e5575a8d04 extcon: arizona: Fix runtime PM imbalance on error)
$ git merge extcon/extcon-next
Already up to date.
Merging soundwire/next (b3a9e3b9622a Linux 5.8-rc1)
$ git merge soundwire/next
Already up to date.
Merging thunderbolt/next (b7c408a5e5e6 thunderbolt: Improve USB4 config symbol help text)
$ git merge thunderbolt/next
Merge made by the 'recursive' strategy.
 drivers/thunderbolt/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Merging staging/staging-next (9bea6eb3f59c staging:rtl8712: avoid skb_clone after skb allocation fail)
$ git merge staging/staging-next
Merge made by the 'recursive' strategy.
 drivers/staging/comedi/comedi_fops.c               |   3 +
 drivers/staging/comedi/drivers/ni_mio_common.c     |   2 +-
 drivers/staging/gasket/gasket_page_table.c         |   6 +-
 drivers/staging/qlge/qlge_main.c                   |  18 +-
 drivers/staging/rtl8712/Kconfig                    |   2 +-
 drivers/staging/rtl8712/ieee80211.h                | 584 +--------------------
 drivers/staging/rtl8712/rtl8712_recv.c             |  39 +-
 drivers/staging/rtl8712/rtl871x_ht.h               |   2 +-
 drivers/staging/rtl8712/rtl871x_ioctl_linux.c      |  13 +-
 drivers/staging/rtl8712/rtl871x_mlme.c             |  14 +-
 drivers/staging/rtl8712/rtl871x_recv.c             |   7 +-
 drivers/staging/rtl8712/rtl871x_recv.h             |   2 -
 drivers/staging/rtl8712/rtl871x_xmit.c             |   2 +-
 drivers/staging/rtl8712/wifi.h                     |  21 +-
 drivers/staging/rtl8723bs/include/osdep_service.h  |   3 -
 drivers/staging/rtl8723bs/os_dep/osdep_service.c   |   5 -
 drivers/staging/rtl8723bs/os_dep/recv_linux.c      |   2 +-
 drivers/staging/rts5208/ms.c                       |   6 +-
 .../interface/vchiq_arm/vchiq_2835_arm.c           |  16 +-
 drivers/staging/wfx/sta.c                          |   4 +-
 20 files changed, 60 insertions(+), 691 deletions(-)
Merging mux/for-next (05f19f7f8944 mux: adgs1408: Add mod_devicetable.h and remove of_match_ptr)
$ git merge mux/for-next
Merge made by the 'recursive' strategy.
 drivers/mux/adgs1408.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Merging icc/icc-next (65461e26b1fe interconnect: Allow inter-provider pairs to be configured)
$ git merge icc/icc-next
Merge made by the 'recursive' strategy.
 drivers/interconnect/core.c           | 16 ++++++++--------
 include/linux/interconnect-provider.h |  8 ++++++++
 2 files changed, 16 insertions(+), 8 deletions(-)
Merging slave-dma/next (c09a7ce668a6 dmaengine: mmp_tdma: share the IRQ line)
$ git merge slave-dma/next
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/dma/renesas,usb-dmac.yaml | 1 +
 drivers/dma/dw/Makefile                                     | 6 +++---
 drivers/dma/dw/acpi.c                                       | 2 ++
 drivers/dma/dw/pci.c                                        | 4 ++++
 drivers/dma/mmp_pdma.c                                      | 2 +-
 drivers/dma/mmp_tdma.c                                      | 2 +-
 6 files changed, 12 insertions(+), 5 deletions(-)
Merging cgroup/for-next (936f2a70f207 cgroup: add cpu.stat file to root cgroup)
$ git merge cgroup/for-next
Already up to date.
Merging scsi/for-next (112ceff79e89 Merge branch 'misc' into for-next)
$ git merge scsi/for-next
Merge made by the 'recursive' strategy.
 drivers/scsi/ibmvscsi/ibmvfc.c              |    2 +-
 drivers/scsi/ibmvscsi/ibmvscsi.c            |    2 +-
 drivers/scsi/mpt3sas/mpt3sas_base.h         |    2 +-
 drivers/scsi/mpt3sas/mpt3sas_trigger_diag.h |    2 +-
 drivers/scsi/qla2xxx/qla_inline.h           |    2 +-
 drivers/scsi/qla2xxx/qla_iocb.c             |    6 +-
 drivers/scsi/ufs/Kconfig                    |   12 +
 drivers/scsi/ufs/Makefile                   |    1 +
 drivers/scsi/ufs/ufs-exynos.c               | 1292 +++++++++++++++++++++++++++
 drivers/scsi/ufs/ufs-exynos.h               |  287 ++++++
 drivers/scsi/ufs/ufs-mediatek.c             |  116 ++-
 drivers/scsi/ufs/ufs-mediatek.h             |    3 +-
 drivers/scsi/ufs/ufs.h                      |   38 +-
 drivers/scsi/ufs/ufs_bsg.c                  |    5 +-
 drivers/scsi/ufs/ufs_quirks.h               |    3 +-
 drivers/scsi/ufs/ufshcd-pci.c               |   25 +-
 drivers/scsi/ufs/ufshcd-pltfrm.c            |   27 +-
 drivers/scsi/ufs/ufshcd.c                   |  422 +++++----
 drivers/scsi/ufs/ufshcd.h                   |   78 +-
 drivers/scsi/ufs/ufshci.h                   |   27 +-
 drivers/scsi/ufs/unipro.h                   |   33 +
 include/trace/events/ufs.h                  |   31 +
 22 files changed, 2003 insertions(+), 413 deletions(-)
 create mode 100644 drivers/scsi/ufs/ufs-exynos.c
 create mode 100644 drivers/scsi/ufs/ufs-exynos.h
Merging scsi-mkp/for-next (3145550a7f8b scsi: target: tcmu: Fix crash in tcmu_flush_dcache_range on ARM)
$ git merge scsi-mkp/for-next
Auto-merging drivers/scsi/scsi_lib.c
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-driver-ufs | 136 +++++++++++++++++++++++++++++
 drivers/scsi/scsi.c                        |   3 -
 drivers/scsi/scsi_lib.c                    |  58 +++++-------
 drivers/scsi/scsi_priv.h                   |   1 -
 drivers/scsi/ufs/ufs-exynos.c              |   2 +-
 drivers/scsi/ufs/ufs-mediatek.c            |   4 +-
 drivers/target/target_core_user.c          |  15 ++--
 7 files changed, 168 insertions(+), 51 deletions(-)
Merging vhost/linux-next (a20daaa6c4d6 tools/virtio: Use tools/include/list.h instead of stubs)
$ git merge vhost/linux-next
Merge made by the 'recursive' strategy.
 drivers/vdpa/vdpa.c         |   2 +-
 drivers/vhost/test.c        |  57 ++++++++++++++++++
 drivers/vhost/test.h        |   1 +
 drivers/vhost/vdpa.c        |   2 +-
 drivers/virtio/virtio_mem.c |  27 +++++++--
 tools/virtio/linux/kernel.h |   7 +--
 tools/virtio/linux/virtio.h |   5 +-
 tools/virtio/virtio_test.c  | 139 +++++++++++++++++++++++++++++++++++++-------
 tools/virtio/vringh_test.c  |   2 +
 9 files changed, 207 insertions(+), 35 deletions(-)
Merging rpmsg/for-next (71f56fef13d4 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
$ git merge rpmsg/for-next
Merge made by the 'recursive' strategy.
 drivers/hwspinlock/Kconfig | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
Merging gpio/for-next (42ba326cdeff Merge branch 'devel' into for-next)
$ git merge gpio/for-next
Merge made by the 'recursive' strategy.
 arch/arm/plat-orion/gpio.c     |    8 +-
 drivers/gpio/Makefile          |    1 +
 drivers/gpio/gpio-arizona.c    |    7 +-
 drivers/gpio/gpio-max732x.c    |    2 +-
 drivers/gpio/gpio-mvebu.c      |    8 +-
 drivers/gpio/gpio-xra1403.c    |    8 +-
 drivers/gpio/gpiolib-cdev.c    | 1154 ++++++++++++++++++++++++++++++++++++++++
 drivers/gpio/gpiolib-cdev.h    |   11 +
 drivers/gpio/gpiolib.c         | 1119 +-------------------------------------
 drivers/pinctrl/pinctrl-at91.c |    7 +-
 include/linux/gpio/driver.h    |   16 +
 11 files changed, 1201 insertions(+), 1140 deletions(-)
 create mode 100644 drivers/gpio/gpiolib-cdev.c
 create mode 100644 drivers/gpio/gpiolib-cdev.h
Merging gpio-brgl/gpio/for-next (3ba3ff5c0966 gpio: pca953x: Add support for the PCAL9535)
$ git merge gpio-brgl/gpio/for-next
Auto-merging include/linux/gpio/driver.h
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/gpio/gpio-pca953x.txt | 1 +
 drivers/gpio/TODO                                       | 2 +-
 drivers/gpio/gpio-mpc8xxx.c                             | 2 +-
 drivers/gpio/gpio-pca953x.c                             | 2 ++
 drivers/gpio/gpiolib-sysfs.c                            | 2 +-
 include/linux/gpio/driver.h                             | 2 +-
 6 files changed, 7 insertions(+), 4 deletions(-)
Merging gpio-intel/for-next (b3a9e3b9622a Linux 5.8-rc1)
$ git merge gpio-intel/for-next
Already up to date.
Merging pinctrl/for-next (44fc2d79b547 Merge branch 'devel' into for-next)
$ git merge pinctrl/for-next
Merge made by the 'recursive' strategy.
 drivers/pinctrl/pinctrl-ingenic.c     |  6 +++-
 drivers/pinctrl/pinctrl-single.c      | 11 ++++---
 drivers/pinctrl/stm32/pinctrl-stm32.c | 60 +++++++++++++++++++++++++++--------
 3 files changed, 59 insertions(+), 18 deletions(-)
Merging pinctrl-intel/for-next (b3a9e3b9622a Linux 5.8-rc1)
$ git merge pinctrl-intel/for-next
Already up to date.
Merging pinctrl-samsung/for-next (7efece8a057f pinctrl: samsung: Use bank name as irqchip name)
$ git merge pinctrl-samsung/for-next
Merge made by the 'recursive' strategy.
 drivers/pinctrl/samsung/pinctrl-exynos.c | 58 ++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 26 deletions(-)
Merging pwm/for-next (b8fb642afa02 pwm: iqs620a: Use lowercase hexadecimal literals for consistency)
$ git merge pwm/for-next
Merge made by the 'recursive' strategy.
 drivers/clk/clk-pwm.c                      |  7 ++++++-
 drivers/gpu/drm/i915/display/intel_panel.c |  2 +-
 drivers/hwmon/pwm-fan.c                    |  2 +-
 drivers/pwm/core.c                         | 14 +++++++-------
 drivers/pwm/pwm-clps711x.c                 |  2 +-
 drivers/pwm/pwm-imx-tpm.c                  |  2 +-
 drivers/pwm/pwm-imx27.c                    |  2 +-
 drivers/pwm/pwm-iqs620a.c                  | 15 ++++++++-------
 drivers/pwm/pwm-sifive.c                   |  2 +-
 drivers/pwm/pwm-stm32-lp.c                 |  2 +-
 drivers/pwm/pwm-sun4i.c                    |  2 +-
 drivers/pwm/sysfs.c                        |  8 ++++----
 drivers/video/backlight/pwm_bl.c           |  3 ++-
 drivers/video/fbdev/ssd1307fb.c            |  2 +-
 include/linux/pwm.h                        | 12 ++++++------
 15 files changed, 42 insertions(+), 35 deletions(-)
Merging userns/for-next (d35bec8a5788 Merge proc-next and exec-next for testing in linux-next)
$ git merge userns/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging ktest/for-next (1091c8fce8aa ktest: Fix typos in ktest.pl)
$ git merge ktest/for-next
Already up to date.
Merging random/dev (ab9a7e27044b random: avoid warnings for !CONFIG_NUMA builds)
$ git merge random/dev
Already up to date.
Merging kselftest/next (1b8eec510ba6 selftests/ftrace: Support ":README" suffix for requires)
$ git merge kselftest/next
Already up to date.
Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC")
$ git merge y2038/y2038
Already up to date.
Merging livepatching/for-next (b950460b2486 Merge branch 'for-5.9/selftests-cleanup' into for-next)
$ git merge livepatching/for-next
Merge made by the 'recursive' strategy.
 lib/livepatch/test_klp_callbacks_busy.c            |  37 +++-
 lib/livepatch/test_klp_shadow_vars.c               | 240 +++++++++++----------
 tools/testing/selftests/livepatch/README           |  16 +-
 tools/testing/selftests/livepatch/functions.sh     |  37 +++-
 .../testing/selftests/livepatch/test-callbacks.sh  |  84 +++-----
 tools/testing/selftests/livepatch/test-ftrace.sh   |   4 +-
 .../testing/selftests/livepatch/test-livepatch.sh  |  12 +-
 .../selftests/livepatch/test-shadow-vars.sh        |  85 +++++---
 tools/testing/selftests/livepatch/test-state.sh    |  21 +-
 9 files changed, 293 insertions(+), 243 deletions(-)
Merging coresight/next (6e5446ac46dd coresight: Fix comment in main header file)
$ git merge coresight/next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/arm/coresight.txt          | 13 +++++
 drivers/hwtracing/coresight/coresight-catu.c       |  5 +-
 drivers/hwtracing/coresight/coresight-etm4x.c      | 33 +++++++----
 drivers/hwtracing/coresight/coresight-etm4x.h      |  7 ++-
 drivers/hwtracing/coresight/coresight-platform.c   |  5 +-
 drivers/hwtracing/coresight/coresight-replicator.c | 68 +++++++++++++---------
 drivers/hwtracing/coresight/coresight-stm.c        |  2 -
 include/linux/coresight.h                          |  3 +-
 8 files changed, 87 insertions(+), 49 deletions(-)
Merging rtc/rtc-next (4601e24a6fb8 rtc: pcf2127: watchdog: handle nowayout feature)
$ git merge rtc/rtc-next
Already up to date.
Merging nvdimm/libnvdimm-for-next (b86153077d5c Merge branch 'for-5.8/papr_scm' into libnvdimm-for-next)
$ git merge nvdimm/libnvdimm-for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging at24/at24/for-next (8f3d9f354286 Linux 5.7-rc1)
$ git merge at24/at24/for-next
Already up to date.
Merging ntb/ntb-next (b3a9e3b9622a Linux 5.8-rc1)
$ git merge ntb/ntb-next
Already up to date.
Merging seccomp/for-next/seccomp (dfbf4ad2ec6c selftests/seccomp: Test SECCOMP_IOCTL_NOTIF_ADDFD)
$ git merge seccomp/for-next/seccomp
Auto-merging tools/testing/selftests/seccomp/seccomp_bpf.c
Auto-merging kernel/fork.c
Merge made by the 'recursive' strategy.
 arch/mips/include/asm/seccomp.h                    |   4 +-
 fs/file.c                                          |  63 +++
 fs/proc/array.c                                    |   2 +
 include/asm-generic/seccomp.h                      |   2 +-
 include/linux/file.h                               |  19 +
 include/linux/net.h                                |   9 +
 include/linux/seccomp.h                            |   6 +-
 include/uapi/linux/seccomp.h                       |  25 +-
 init/init_task.c                                   |   3 +
 kernel/exit.c                                      |   1 +
 kernel/fork.c                                      |   1 -
 kernel/pid.c                                       |  11 +-
 kernel/seccomp.c                                   | 373 +++++++++++++---
 net/compat.c                                       |  55 ++-
 net/core/scm.c                                     |  50 +--
 .../testing/selftests/seccomp/seccomp_benchmark.c  |  80 +++-
 tools/testing/selftests/seccomp/seccomp_bpf.c      | 480 ++++++++++++++++++---
 tools/testing/selftests/seccomp/settings           |   1 +
 18 files changed, 952 insertions(+), 233 deletions(-)
 create mode 100644 tools/testing/selftests/seccomp/settings
Merging kspp/for-next/kspp (5276926f1926 Merge branch 'for-next/seccomp' into for-next/kspp)
$ git merge kspp/for-next/kspp
Auto-merging tools/virtio/linux/kernel.h
Auto-merging net/sched/sch_fq_codel.c
Auto-merging mm/slub.c
Auto-merging lib/test_lockup.c
Auto-merging kernel/locking/lockdep.c
Auto-merging kernel/events/core.c
Auto-merging include/net/flow_offload.h
Auto-merging include/linux/compiler-gcc.h
Auto-merging include/linux/compiler-clang.h
Auto-merging fs/afs/dir.c
Auto-merging drivers/net/wireless/intel/iwlegacy/4965-mac.c
Auto-merging drivers/mtd/nand/raw/s3c2410.c
Auto-merging drivers/md/dm-writecache.c
Auto-merging drivers/md/dm-ioctl.c
Auto-merging drivers/infiniband/sw/siw/siw_qp_rx.c
Auto-merging drivers/gpu/drm/i915/intel_uncore.c
Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c
Auto-merging drivers/gpu/drm/drm_edid.c
Auto-merging drivers/firewire/ohci.c
Auto-merging drivers/block/rbd.c
Auto-merging drivers/ata/libata-scsi.c
Auto-merging drivers/acpi/acpi_pad.c
Auto-merging arch/powerpc/kvm/book3s_64_mmu_radix.c
Auto-merging arch/arm/mm/alignment.c
Auto-merging Makefile
Auto-merging Documentation/process/deprecated.rst
Merge made by the 'recursive' strategy.
 Documentation/process/deprecated.rst               | 18 ++++++++++++++
 Makefile                                           | 13 ++++++++--
 arch/arm/mach-sa1100/assabet.c                     |  2 +-
 arch/arm/mm/alignment.c                            |  2 +-
 arch/ia64/kernel/process.c                         |  2 +-
 arch/ia64/mm/discontig.c                           |  2 +-
 arch/ia64/mm/tlb.c                                 |  2 +-
 arch/mips/lib/dump_tlb.c                           |  2 +-
 arch/mips/mm/init.c                                |  2 +-
 arch/mips/mm/tlb-r4k.c                             |  6 ++---
 arch/powerpc/kvm/book3s_64_mmu_radix.c             |  2 +-
 arch/powerpc/kvm/book3s_pr.c                       |  3 ---
 arch/powerpc/kvm/powerpc.c                         |  2 +-
 arch/powerpc/platforms/52xx/mpc52xx_pic.c          |  2 +-
 arch/s390/kernel/smp.c                             |  2 +-
 arch/x86/kernel/quirks.c                           | 10 ++++----
 arch/x86/kvm/mmu/mmu.c                             |  2 +-
 arch/x86/kvm/mmu/paging_tmpl.h                     |  2 +-
 arch/x86/kvm/x86.c                                 |  2 +-
 arch/x86/mm/numa.c                                 | 18 +++++++-------
 block/blk-merge.c                                  |  2 +-
 drivers/acpi/acpi_pad.c                            |  2 +-
 drivers/ata/libata-scsi.c                          |  2 +-
 drivers/atm/zatm.c                                 |  2 +-
 drivers/block/drbd/drbd_nl.c                       |  6 ++---
 drivers/block/drbd/drbd_state.c                    |  2 +-
 drivers/block/rbd.c                                |  2 +-
 drivers/clk/clk-gate.c                             |  2 +-
 drivers/clk/spear/clk-vco-pll.c                    |  2 +-
 drivers/clk/st/clkgen-fsyn.c                       |  1 -
 drivers/firewire/ohci.c                            | 14 +++++------
 drivers/gpu/drm/bridge/sil-sii8620.c               |  2 +-
 drivers/gpu/drm/drm_edid.c                         |  2 +-
 drivers/gpu/drm/exynos/exynos_drm_dsi.c            |  6 ++---
 drivers/gpu/drm/i915/display/intel_fbc.c           |  2 +-
 drivers/gpu/drm/i915/gt/intel_lrc.c                |  2 +-
 drivers/gpu/drm/i915/intel_uncore.c                |  2 +-
 drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c    |  4 +--
 drivers/i2c/busses/i2c-rk3x.c                      |  2 +-
 drivers/ide/ide-acpi.c                             |  2 +-
 drivers/ide/ide-atapi.c                            |  2 +-
 drivers/ide/ide-io-std.c                           |  4 +--
 drivers/ide/ide-io.c                               |  8 +++---
 drivers/ide/ide-sysfs.c                            |  2 +-
 drivers/ide/ide-taskfile.c                         |  1 -
 drivers/ide/umc8672.c                              |  2 +-
 drivers/idle/intel_idle.c                          |  2 +-
 drivers/infiniband/core/uverbs_cmd.c               |  4 +--
 drivers/infiniband/hw/cxgb4/cm.c                   |  2 +-
 drivers/infiniband/hw/cxgb4/cq.c                   |  2 +-
 drivers/infiniband/hw/mlx4/qp.c                    |  6 ++---
 drivers/infiniband/hw/mlx5/cq.c                    |  6 ++---
 drivers/infiniband/hw/mlx5/devx.c                  |  2 +-
 drivers/infiniband/hw/mlx5/wr.c                    |  2 +-
 drivers/infiniband/hw/mthca/mthca_qp.c             | 10 ++++----
 drivers/infiniband/sw/siw/siw_qp_rx.c              |  2 +-
 drivers/input/serio/serio_raw.c                    |  2 +-
 drivers/input/touchscreen/sur40.c                  |  4 +--
 drivers/iommu/intel/iommu.c                        |  2 +-
 drivers/md/dm-io.c                                 |  2 +-
 drivers/md/dm-ioctl.c                              |  2 +-
 drivers/md/dm-snap-persistent.c                    |  2 +-
 drivers/md/dm-table.c                              |  2 +-
 drivers/md/dm-writecache.c                         |  2 +-
 drivers/md/raid5.c                                 |  2 +-
 drivers/media/dvb-frontends/rtl2832.c              |  2 +-
 drivers/media/tuners/qt1010.c                      |  4 +--
 drivers/media/usb/gspca/vicam.c                    |  2 +-
 drivers/media/usb/uvc/uvc_video.c                  |  8 +++---
 drivers/memstick/host/jmb38x_ms.c                  |  2 +-
 drivers/memstick/host/tifm_ms.c                    |  2 +-
 drivers/mmc/host/sdhci.c                           |  2 +-
 drivers/mtd/nand/raw/nand_ecc.c                    |  2 +-
 drivers/mtd/nand/raw/s3c2410.c                     |  2 +-
 drivers/mtd/parsers/afs.c                          |  4 +--
 drivers/mtd/ubi/eba.c                              |  2 +-
 drivers/net/can/janz-ican3.c                       |  2 +-
 drivers/net/ethernet/broadcom/bnx2.c               |  4 +--
 .../net/ethernet/mellanox/mlx5/core/pagealloc.c    |  4 +--
 drivers/net/ethernet/neterion/s2io.c               |  2 +-
 drivers/net/ethernet/qlogic/qla3xxx.c              |  2 +-
 drivers/net/ethernet/sun/cassini.c                 |  2 +-
 drivers/net/ethernet/sun/niu.c                     |  6 ++---
 drivers/net/wan/z85230.c                           |  2 +-
 drivers/net/wireless/ath/ath10k/core.c             |  2 +-
 drivers/net/wireless/ath/ath6kl/init.c             |  2 +-
 drivers/net/wireless/ath/ath9k/init.c              |  2 +-
 drivers/net/wireless/broadcom/b43/debugfs.c        |  2 +-
 drivers/net/wireless/broadcom/b43/dma.c            |  2 +-
 drivers/net/wireless/broadcom/b43/lo.c             |  2 +-
 drivers/net/wireless/broadcom/b43/phy_n.c          |  4 +--
 drivers/net/wireless/broadcom/b43/xmit.c           | 12 ++++-----
 drivers/net/wireless/broadcom/b43legacy/debugfs.c  |  2 +-
 drivers/net/wireless/broadcom/b43legacy/main.c     |  2 +-
 drivers/net/wireless/intel/iwlegacy/3945.c         |  2 +-
 drivers/net/wireless/intel/iwlegacy/4965-mac.c     |  2 +-
 .../net/wireless/realtek/rtlwifi/rtl8192cu/hw.c    |  8 +++---
 drivers/pci/pcie/aer.c                             |  2 +-
 drivers/platform/x86/hdaps.c                       |  4 +--
 drivers/scsi/dc395x.c                              |  2 +-
 drivers/scsi/pm8001/pm8001_hwi.c                   |  2 +-
 drivers/scsi/pm8001/pm80xx_hwi.c                   |  2 +-
 drivers/spi/spi-davinci.c                          |  1 -
 drivers/ssb/driver_chipcommon.c                    |  4 +--
 drivers/tty/cyclades.c                             |  2 +-
 drivers/tty/isicom.c                               |  2 +-
 drivers/usb/musb/cppi_dma.c                        |  2 +-
 drivers/usb/storage/sddr55.c                       |  4 +--
 drivers/vhost/net.c                                |  6 ++---
 drivers/video/fbdev/matrox/matroxfb_maven.c        |  6 ++---
 drivers/video/fbdev/pm3fb.c                        |  6 ++---
 drivers/video/fbdev/riva/riva_hw.c                 |  3 +--
 drivers/virtio/virtio_ring.c                       |  6 ++---
 fs/afs/dir.c                                       |  2 +-
 fs/afs/security.c                                  |  2 +-
 fs/dlm/netlink.c                                   |  2 +-
 fs/erofs/data.c                                    |  4 +--
 fs/erofs/zdata.c                                   |  2 +-
 fs/f2fs/data.c                                     |  4 +--
 fs/fat/dir.c                                       |  2 +-
 fs/fuse/control.c                                  |  4 +--
 fs/fuse/cuse.c                                     |  2 +-
 fs/fuse/file.c                                     |  2 +-
 fs/gfs2/aops.c                                     |  2 +-
 fs/gfs2/bmap.c                                     |  2 +-
 fs/gfs2/lops.c                                     |  2 +-
 fs/hfsplus/unicode.c                               |  2 +-
 fs/isofs/namei.c                                   |  4 +--
 fs/jffs2/erase.c                                   |  2 +-
 fs/nfsd/nfsctl.c                                   |  2 +-
 fs/ocfs2/alloc.c                                   |  4 +--
 fs/ocfs2/dir.c                                     | 14 +++++------
 fs/ocfs2/extent_map.c                              |  4 +--
 fs/ocfs2/namei.c                                   |  2 +-
 fs/ocfs2/refcounttree.c                            |  2 +-
 fs/ocfs2/xattr.c                                   |  2 +-
 fs/omfs/file.c                                     |  2 +-
 fs/overlayfs/copy_up.c                             |  2 +-
 fs/ubifs/commit.c                                  |  6 ++---
 fs/ubifs/dir.c                                     |  2 +-
 fs/ubifs/file.c                                    |  4 +--
 fs/ubifs/journal.c                                 |  4 +--
 fs/ubifs/lpt.c                                     |  2 +-
 fs/ubifs/tnc.c                                     |  6 ++---
 fs/ubifs/tnc_misc.c                                |  4 +--
 fs/udf/balloc.c                                    |  2 +-
 fs/xfs/xfs_bmap_util.c                             |  2 +-
 include/linux/compiler-clang.h                     |  2 --
 include/linux/compiler-gcc.h                       |  6 -----
 include/linux/page-flags-layout.h                  |  4 ++-
 include/net/flow_offload.h                         |  2 +-
 init/main.c                                        | 12 +++++----
 kernel/async.c                                     |  4 +--
 kernel/audit.c                                     |  2 +-
 kernel/debug/kdb/kdb_io.c                          |  2 +-
 kernel/dma/debug.c                                 |  2 +-
 kernel/events/core.c                               |  2 +-
 kernel/events/uprobes.c                            |  2 +-
 kernel/exit.c                                      |  2 +-
 kernel/futex.c                                     | 14 +++++------
 kernel/locking/lockdep.c                           | 16 ++++++------
 kernel/trace/ring_buffer.c                         |  2 +-
 lib/radix-tree.c                                   |  2 +-
 lib/test_lockup.c                                  |  2 +-
 mm/debug_vm_pgtable.c                              |  2 +-
 mm/frontswap.c                                     |  2 +-
 mm/ksm.c                                           |  2 +-
 mm/memcontrol.c                                    |  2 +-
 mm/memory.c                                        |  2 +-
 mm/mempolicy.c                                     |  4 +--
 mm/page_alloc.c                                    |  2 +-
 mm/percpu.c                                        |  2 +-
 mm/slub.c                                          |  4 +--
 mm/swap.c                                          |  4 +--
 net/dccp/options.c                                 |  2 +-
 net/ipv4/netfilter/nf_socket_ipv4.c                |  6 ++---
 net/ipv6/ip6_flowlabel.c                           |  2 +-
 net/ipv6/netfilter/nf_socket_ipv6.c                |  2 +-
 net/netfilter/nf_conntrack_ftp.c                   |  2 +-
 net/netfilter/nfnetlink_log.c                      |  2 +-
 net/netfilter/nfnetlink_queue.c                    |  4 +--
 net/sched/cls_flow.c                               |  2 +-
 net/sched/sch_cake.c                               |  2 +-
 net/sched/sch_cbq.c                                |  2 +-
 net/sched/sch_fq_codel.c                           |  2 +-
 net/sched/sch_fq_pie.c                             |  2 +-
 net/sched/sch_hfsc.c                               |  2 +-
 net/sched/sch_htb.c                                |  2 +-
 net/sched/sch_sfq.c                                |  2 +-
 net/sunrpc/svcsock.c                               |  4 +--
 net/sunrpc/xprtsock.c                              | 10 ++++----
 net/tls/tls_sw.c                                   |  2 +-
 scripts/checkpatch.pl                              | 16 ++++--------
 security/Kconfig.hardening                         | 29 +++++++++++++++++++---
 sound/core/control_compat.c                        |  2 +-
 sound/isa/sb/sb16_csp.c                            |  2 +-
 sound/usb/endpoint.c                               |  2 +-
 tools/include/linux/compiler.h                     |  2 --
 tools/virtio/linux/kernel.h                        |  2 --
 199 files changed, 364 insertions(+), 341 deletions(-)
Merging gnss/gnss-next (9b5816b56af6 gnss: replace zero-length array with flexible-array)
$ git merge gnss/gnss-next
Already up to date.
Merging fsi/next (2c01397b71c5 fsi: aspeed: Fix OPB0 byte order register values)
$ git merge fsi/next
Auto-merging drivers/fsi/Kconfig
CONFLICT (content): Merge conflict in drivers/fsi/Kconfig
Resolved 'drivers/fsi/Kconfig' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master d79870870327] Merge remote-tracking branch 'fsi/next'
$ git diff -M --stat --summary HEAD^..
Merging slimbus/for-next (b3a9e3b9622a Linux 5.8-rc1)
$ git merge slimbus/for-next
Already up to date.
Merging nvmem/for-next (b1f9f1162c5c nvmem: sc27xx: add sc2730 efuse support)
$ git merge nvmem/for-next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                  |  1 +
 drivers/nvmem/core.c         |  6 ++++++
 drivers/nvmem/sc27xx-efuse.c | 27 ++++++++++++++++++++++++---
 drivers/nvmem/sprd-efuse.c   |  4 ++--
 4 files changed, 33 insertions(+), 5 deletions(-)
Merging xarray/xarray (27586ca786a7 XArray: Handle retry entries within xas_find_marked)
$ git merge xarray/xarray
Auto-merging include/linux/xarray.h
Auto-merging drivers/infiniband/core/device.c
Merge made by the 'recursive' strategy.
 Documentation/core-api/xarray.rst   | 13 +++++++------
 drivers/infiniband/core/device.c    |  6 +-----
 include/linux/xarray.h              | 23 +++++++++++++++++++++-
 lib/idr.c                           |  1 +
 lib/test_xarray.c                   | 20 +++++++++++++++++++
 lib/xarray.c                        | 39 +++++++++++++++++++++++++++++++------
 tools/testing/radix-tree/idr-test.c | 29 +++++++++++++++++++++++++++
 7 files changed, 113 insertions(+), 18 deletions(-)
Merging hyperv/hyperv-next (775f43facfe8 Drivers: hv: vmbus: Remove the lock field from the vmbus_channel struct)
$ git merge hyperv/hyperv-next
Merge made by the 'recursive' strategy.
 drivers/hv/channel.c       |  9 +++------
 drivers/hv/channel_mgmt.c  | 31 ++++++-------------------------
 drivers/hv/hv.c            |  3 ---
 drivers/hv/vmbus_drv.c     | 17 +++++------------
 drivers/scsi/storvsc_drv.c | 16 +++++++++++-----
 include/linux/hyperv.h     | 22 +++++++---------------
 6 files changed, 32 insertions(+), 66 deletions(-)
Merging auxdisplay/auxdisplay (3f03b6498172 auxdisplay: charlcd: Reuse hex_to_bin() instead of custom code)
$ git merge auxdisplay/auxdisplay
Merge made by the 'recursive' strategy.
 drivers/auxdisplay/charlcd.c | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)
Merging kgdb/kgdb/for-next (c893de12e1ef kdb: Remove the misfeature 'KDBFLAGS')
$ git merge kgdb/kgdb/for-next
Already up to date.
Merging pidfd/for-next (a5161eeef97c tests: add CLOSE_RANGE_UNSHARE tests)
$ git merge pidfd/for-next
Auto-merging kernel/fork.c
Auto-merging include/linux/syscalls.h
Auto-merging fs/file.c
CONFLICT (content): Merge conflict in fs/file.c
Resolved 'fs/file.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master b6738927d06b] Merge remote-tracking branch 'pidfd/for-next'
$ git diff -M --stat --summary HEAD^..
 arch/alpha/kernel/syscalls/syscall.tbl          |   1 +
 arch/arm/tools/syscall.tbl                      |   1 +
 arch/arm64/include/asm/unistd32.h               |   2 +
 arch/ia64/kernel/syscalls/syscall.tbl           |   1 +
 arch/m68k/kernel/syscalls/syscall.tbl           |   1 +
 arch/microblaze/kernel/syscalls/syscall.tbl     |   1 +
 arch/mips/kernel/syscalls/syscall_n32.tbl       |   1 +
 arch/mips/kernel/syscalls/syscall_n64.tbl       |   1 +
 arch/mips/kernel/syscalls/syscall_o32.tbl       |   1 +
 arch/parisc/kernel/syscalls/syscall.tbl         |   1 +
 arch/powerpc/kernel/syscalls/syscall.tbl        |   1 +
 arch/s390/kernel/syscalls/syscall.tbl           |   1 +
 arch/sh/kernel/syscalls/syscall.tbl             |   1 +
 arch/sparc/kernel/syscalls/syscall.tbl          |   1 +
 arch/x86/entry/syscalls/syscall_32.tbl          |   1 +
 arch/x86/entry/syscalls/syscall_64.tbl          |   1 +
 arch/xtensa/kernel/syscalls/syscall.tbl         |   1 +
 fs/file.c                                       | 121 +++++++++++--
 fs/open.c                                       |  17 ++
 include/linux/fdtable.h                         |   6 +-
 include/linux/syscalls.h                        |   2 +
 include/uapi/asm-generic/unistd.h               |   2 +
 include/uapi/linux/close_range.h                |   9 +
 kernel/fork.c                                   |  11 +-
 tools/testing/selftests/Makefile                |   1 +
 tools/testing/selftests/core/.gitignore         |   1 +
 tools/testing/selftests/core/Makefile           |   7 +
 tools/testing/selftests/core/close_range_test.c | 227 ++++++++++++++++++++++++
 28 files changed, 405 insertions(+), 17 deletions(-)
 create mode 100644 include/uapi/linux/close_range.h
 create mode 100644 tools/testing/selftests/core/.gitignore
 create mode 100644 tools/testing/selftests/core/Makefile
 create mode 100644 tools/testing/selftests/core/close_range_test.c
Merging devfreq/devfreq-next (8fc0e48e0fae PM / devfreq: Use lockdep asserts instead of manual checks for locked mutex)
$ git merge devfreq/devfreq-next
Already up to date.
Merging hmm/hmm (b3a9e3b9622a Linux 5.8-rc1)
$ git merge hmm/hmm
Already up to date.
Merging fpga/for-next (d3fbd739fc8a fpga: Fix dead store in fpga-bridge.c)
$ git merge fpga/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/fpga/xilinx-slave-serial.txt  |  9 ++++++---
 drivers/fpga/dfl-afu-dma-region.c                     | 19 +++++--------------
 drivers/fpga/dfl.c                                    |  3 +--
 drivers/fpga/dfl.h                                    |  6 ------
 drivers/fpga/fpga-bridge.c                            |  6 ++----
 drivers/fpga/fpga-mgr.c                               |  4 +---
 drivers/fpga/xilinx-spi.c                             |  8 +++-----
 7 files changed, 18 insertions(+), 37 deletions(-)
Merging kunit/test (b3a9e3b9622a Linux 5.8-rc1)
$ git merge kunit/test
Already up to date.
Merging cel/cel-next (0a8e7b7d0846 SUNRPC: Revert 241b1f419f0e ("SUNRPC: Remove xdr_buf_trim()"))
$ git merge cel/cel-next
Already up to date.
Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and devm_ioremap_nocache)
$ git merge generic-ioremap/for-next
Already up to date.
Merging cfi/cfi/next (11399346ac39 mtd: Replace zero-length array with flexible-array)
$ git merge cfi/cfi/next
Already up to date.
Merging kunit-next/kunit (7bf200b3a4ac kunit: add support for named resources)
$ git merge kunit-next/kunit
Merge made by the 'recursive' strategy.
 include/kunit/test.h      | 210 +++++++++++++++++++++++++++++++++++++++-------
 lib/kunit/kunit-test.c    | 111 +++++++++++++++++++-----
 lib/kunit/string-stream.c |  14 ++--
 lib/kunit/test.c          | 171 ++++++++++++++++++++++---------------
 4 files changed, 380 insertions(+), 126 deletions(-)
Merging trivial/for-next (c1a371cf80fb printk: fix global comment)
$ git merge trivial/for-next
Auto-merging lib/bitmap.c
Auto-merging kernel/printk/printk_safe.c
Merge made by the 'recursive' strategy.
 fs/vboxsf/dir.c             | 2 +-
 kernel/printk/printk_safe.c | 2 +-
 lib/bitmap.c                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
Merging zx2c4/for-next (16fbf79b0f83 Linux 5.6-rc7)
$ git merge zx2c4/for-next
Already up to date.
Merging mhi/mhi-next (b3a9e3b9622a Linux 5.8-rc1)
$ git merge mhi/mhi-next
Already up to date.
Merging notifications/notifications-pipe-core (54e552c96d30 watch_queue: Add superblock notifications)
$ git merge notifications/notifications-pipe-core
Auto-merging include/uapi/asm-generic/unistd.h
Auto-merging include/linux/syscalls.h
Auto-merging include/linux/fs.h
Auto-merging arch/xtensa/kernel/syscalls/syscall.tbl
Auto-merging arch/x86/entry/syscalls/syscall_64.tbl
Auto-merging arch/x86/entry/syscalls/syscall_32.tbl
Auto-merging arch/sparc/kernel/syscalls/syscall.tbl
Auto-merging arch/sh/kernel/syscalls/syscall.tbl
Auto-merging arch/s390/kernel/syscalls/syscall.tbl
Auto-merging arch/powerpc/kernel/syscalls/syscall.tbl
Auto-merging arch/parisc/kernel/syscalls/syscall.tbl
Auto-merging arch/mips/kernel/syscalls/syscall_o32.tbl
Auto-merging arch/mips/kernel/syscalls/syscall_n64.tbl
Auto-merging arch/mips/kernel/syscalls/syscall_n32.tbl
Auto-merging arch/microblaze/kernel/syscalls/syscall.tbl
Auto-merging arch/m68k/kernel/syscalls/syscall.tbl
Auto-merging arch/ia64/kernel/syscalls/syscall.tbl
Auto-merging arch/arm64/include/asm/unistd32.h
Auto-merging arch/arm/tools/syscall.tbl
Auto-merging arch/alpha/kernel/syscalls/syscall.tbl
Merge made by the 'recursive' strategy.
 Documentation/watch_queue.rst               |  24 ++-
 arch/alpha/kernel/syscalls/syscall.tbl      |   2 +
 arch/arm/tools/syscall.tbl                  |   2 +
 arch/arm64/include/asm/unistd.h             |   2 +-
 arch/arm64/include/asm/unistd32.h           |   4 +
 arch/ia64/kernel/syscalls/syscall.tbl       |   2 +
 arch/m68k/kernel/syscalls/syscall.tbl       |   2 +
 arch/microblaze/kernel/syscalls/syscall.tbl |   2 +
 arch/mips/kernel/syscalls/syscall_n32.tbl   |   2 +
 arch/mips/kernel/syscalls/syscall_n64.tbl   |   2 +
 arch/mips/kernel/syscalls/syscall_o32.tbl   |   2 +
 arch/parisc/kernel/syscalls/syscall.tbl     |   2 +
 arch/powerpc/kernel/syscalls/syscall.tbl    |   2 +
 arch/s390/kernel/syscalls/syscall.tbl       |   2 +
 arch/sh/kernel/syscalls/syscall.tbl         |   2 +
 arch/sparc/kernel/syscalls/syscall.tbl      |   2 +
 arch/x86/entry/syscalls/syscall_32.tbl      |   2 +
 arch/x86/entry/syscalls/syscall_64.tbl      |   2 +
 arch/xtensa/kernel/syscalls/syscall.tbl     |   2 +
 fs/Kconfig                                  |  21 +++
 fs/Makefile                                 |   1 +
 fs/internal.h                               |   1 +
 fs/mount.h                                  |  21 +++
 fs/mount_notify.c                           | 228 ++++++++++++++++++++++++++++
 fs/namespace.c                              |  22 +++
 fs/super.c                                  | 205 +++++++++++++++++++++++++
 include/linux/dcache.h                      |   1 +
 include/linux/fs.h                          |  62 ++++++++
 include/linux/lsm_hook_defs.h               |   6 +
 include/linux/lsm_hooks.h                   |  12 ++
 include/linux/security.h                    |  16 ++
 include/linux/syscalls.h                    |   4 +
 include/uapi/asm-generic/unistd.h           |   6 +-
 include/uapi/linux/watch_queue.h            |  65 +++++++-
 kernel/sys_ni.c                             |   6 +
 samples/watch_queue/watch_test.c            |  44 +++++-
 security/security.c                         |  14 ++
 37 files changed, 792 insertions(+), 5 deletions(-)
 create mode 100644 fs/mount_notify.c
Merging fsinfo/fsinfo-core (dbc87e74d022 vfs, fsinfo: Add an RCU safe per-ns mount list)
$ git merge fsinfo/fsinfo-core
Auto-merging include/uapi/asm-generic/unistd.h
Auto-merging include/linux/syscalls.h
Auto-merging include/linux/fs.h
Auto-merging fs/afs/internal.h
Auto-merging arch/xtensa/kernel/syscalls/syscall.tbl
Auto-merging arch/x86/entry/syscalls/syscall_64.tbl
Auto-merging arch/x86/entry/syscalls/syscall_32.tbl
Auto-merging arch/sparc/kernel/syscalls/syscall.tbl
Auto-merging arch/sh/kernel/syscalls/syscall.tbl
Auto-merging arch/s390/kernel/syscalls/syscall.tbl
Auto-merging arch/powerpc/kernel/syscalls/syscall.tbl
Auto-merging arch/parisc/kernel/syscalls/syscall.tbl
Auto-merging arch/mips/kernel/syscalls/syscall_o32.tbl
Auto-merging arch/mips/kernel/syscalls/syscall_n64.tbl
Auto-merging arch/mips/kernel/syscalls/syscall_n32.tbl
Auto-merging arch/microblaze/kernel/syscalls/syscall.tbl
Auto-merging arch/m68k/kernel/syscalls/syscall.tbl
Auto-merging arch/ia64/kernel/syscalls/syscall.tbl
Auto-merging arch/arm64/include/asm/unistd32.h
Auto-merging arch/arm/tools/syscall.tbl
Auto-merging arch/alpha/kernel/syscalls/syscall.tbl
Merge made by the 'recursive' strategy.
 Documentation/filesystems/fsinfo.rst        | 574 +++++++++++++++++++
 arch/alpha/kernel/syscalls/syscall.tbl      |   1 +
 arch/arm/tools/syscall.tbl                  |   1 +
 arch/arm64/include/asm/unistd32.h           |   2 +
 arch/ia64/kernel/syscalls/syscall.tbl       |   1 +
 arch/m68k/kernel/syscalls/syscall.tbl       |   1 +
 arch/microblaze/kernel/syscalls/syscall.tbl |   1 +
 arch/mips/kernel/syscalls/syscall_n32.tbl   |   1 +
 arch/mips/kernel/syscalls/syscall_n64.tbl   |   1 +
 arch/mips/kernel/syscalls/syscall_o32.tbl   |   1 +
 arch/parisc/kernel/syscalls/syscall.tbl     |   1 +
 arch/powerpc/kernel/syscalls/syscall.tbl    |   1 +
 arch/s390/kernel/syscalls/syscall.tbl       |   1 +
 arch/sh/kernel/syscalls/syscall.tbl         |   1 +
 arch/sparc/kernel/syscalls/syscall.tbl      |   1 +
 arch/x86/entry/syscalls/syscall_32.tbl      |   1 +
 arch/x86/entry/syscalls/syscall_64.tbl      |   1 +
 arch/xtensa/kernel/syscalls/syscall.tbl     |   1 +
 fs/Kconfig                                  |   7 +
 fs/Makefile                                 |   1 +
 fs/afs/internal.h                           |   1 +
 fs/afs/super.c                              | 216 ++++++-
 fs/d_path.c                                 |   2 +-
 fs/ext4/Makefile                            |   1 +
 fs/ext4/ext4.h                              |   6 +
 fs/ext4/fsinfo.c                            |  97 ++++
 fs/ext4/super.c                             |   3 +
 fs/fsinfo.c                                 | 737 ++++++++++++++++++++++++
 fs/internal.h                               |  15 +
 fs/mount.h                                  |   6 +
 fs/mount_notify.c                           |   2 +
 fs/namespace.c                              | 457 ++++++++++++++-
 include/linux/fs.h                          |   4 +
 include/linux/fsinfo.h                      | 112 ++++
 include/linux/syscalls.h                    |   4 +
 include/uapi/asm-generic/unistd.h           |   4 +-
 include/uapi/linux/fsinfo.h                 | 335 +++++++++++
 include/uapi/linux/mount.h                  |  10 +-
 kernel/sys_ni.c                             |   1 +
 samples/vfs/Makefile                        |   6 +-
 samples/vfs/test-fsinfo.c                   | 854 ++++++++++++++++++++++++++++
 samples/vfs/test-mntinfo.c                  | 279 +++++++++
 42 files changed, 3741 insertions(+), 11 deletions(-)
 create mode 100644 Documentation/filesystems/fsinfo.rst
 create mode 100644 fs/ext4/fsinfo.c
 create mode 100644 fs/fsinfo.c
 create mode 100644 include/linux/fsinfo.h
 create mode 100644 include/uapi/linux/fsinfo.h
 create mode 100644 samples/vfs/test-fsinfo.c
 create mode 100644 samples/vfs/test-mntinfo.c
$ git am -3 ../patches/0001-extra-syscall-updates.patch
Applying: extra syscall updates
Using index info to reconstruct a base tree...
M	arch/arm64/include/asm/unistd32.h
M	include/uapi/asm-generic/unistd.h
Falling back to patching base and 3-way merge...
Auto-merging include/uapi/asm-generic/unistd.h
Auto-merging arch/arm64/include/asm/unistd32.h
$ git reset HEAD^
Unstaged changes after reset:
M	arch/arm64/include/asm/unistd.h
$ git add -A .
$ git commit -v -a --amend
[master 22a9fffe966a] Merge remote-tracking branch 'fsinfo/fsinfo-core'
 Date: Mon Jun 22 13:31:12 2020 +1000
Merging akpm-current/current (276d96312693 kcov: unconditionally add -fno-stack-protector to compiler options)
$ git merge --no-ff akpm-current/current
Auto-merging scripts/checkpatch.pl
Auto-merging net/core/sock.c
Auto-merging mm/swap.c
Auto-merging mm/slub.c
Auto-merging mm/percpu.c
Auto-merging mm/page_alloc.c
Auto-merging mm/mmap.c
Auto-merging mm/memory.c
Auto-merging mm/memcontrol.c
Auto-merging mm/debug_vm_pgtable.c
Auto-merging lib/bitmap.c
Auto-merging lib/Kconfig.debug
Auto-merging kernel/sysctl.c
Auto-merging include/linux/sched.h
Auto-merging fs/open.c
Auto-merging fs/ocfs2/namei.c
Auto-merging fs/cifs/misc.c
Auto-merging drivers/tty/serial/sh-sci.c
Auto-merging drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.h
Auto-merging drivers/block/drbd/drbd_nl.c
Auto-merging crypto/drbg.c
Auto-merging arch/s390/crypto/prng.c
Auto-merging Documentation/admin-guide/kernel-parameters.txt
Merge made by the 'recursive' strategy.
 Documentation/admin-guide/cgroup-v2.rst            |   8 +-
 Documentation/admin-guide/kernel-parameters.txt    |   2 +-
 Documentation/admin-guide/mm/transhuge.rst         |   3 +-
 Documentation/admin-guide/sysctl/vm.rst            |  15 +
 Documentation/vm/slub.rst                          |  37 +-
 arch/arm64/kernel/probes/kprobes.c                 |  12 +-
 arch/openrisc/kernel/dma.c                         |   5 +
 arch/s390/crypto/prng.c                            |   4 +-
 arch/x86/hyperv/hv_init.c                          |   4 +-
 arch/x86/include/asm/pgtable_types.h               |   2 +
 arch/x86/mm/init_64.c                              |  10 +
 arch/x86/power/hibernate.c                         |   2 +-
 crypto/adiantum.c                                  |   2 +-
 crypto/ahash.c                                     |   4 +-
 crypto/api.c                                       |   2 +-
 crypto/asymmetric_keys/verify_pefile.c             |   4 +-
 crypto/deflate.c                                   |   2 +-
 crypto/drbg.c                                      |  10 +-
 crypto/ecc.c                                       |   8 +-
 crypto/ecdh.c                                      |   2 +-
 crypto/gcm.c                                       |   2 +-
 crypto/gf128mul.c                                  |   4 +-
 crypto/jitterentropy-kcapi.c                       |   2 +-
 crypto/rng.c                                       |   2 +-
 crypto/rsa-pkcs1pad.c                              |   6 +-
 crypto/seqiv.c                                     |   2 +-
 crypto/shash.c                                     |   2 +-
 crypto/skcipher.c                                  |   2 +-
 crypto/testmgr.c                                   |   6 +-
 crypto/zstd.c                                      |   2 +-
 drivers/base/node.c                                |   6 +-
 drivers/block/drbd/drbd_nl.c                       |  20 +-
 .../crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c    |   2 +-
 .../crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c    |   2 +-
 drivers/crypto/amlogic/amlogic-gxl-cipher.c        |   4 +-
 drivers/crypto/atmel-ecc.c                         |   2 +-
 drivers/crypto/caam/caampkc.c                      |  28 +-
 drivers/crypto/cavium/cpt/cptvf_main.c             |   6 +-
 drivers/crypto/cavium/cpt/cptvf_reqmanager.c       |  12 +-
 drivers/crypto/cavium/nitrox/nitrox_lib.c          |   4 +-
 drivers/crypto/cavium/zip/zip_crypto.c             |   6 +-
 drivers/crypto/ccp/ccp-crypto-rsa.c                |   6 +-
 drivers/crypto/ccree/cc_aead.c                     |   4 +-
 drivers/crypto/ccree/cc_buffer_mgr.c               |   4 +-
 drivers/crypto/ccree/cc_cipher.c                   |   6 +-
 drivers/crypto/ccree/cc_hash.c                     |   8 +-
 drivers/crypto/ccree/cc_request_mgr.c              |   2 +-
 drivers/crypto/marvell/cesa/hash.c                 |   2 +-
 drivers/crypto/marvell/octeontx/otx_cptvf_main.c   |   6 +-
 drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.h |   2 +-
 drivers/crypto/mediatek/mtk-aes.c                  |   2 +-
 drivers/crypto/nx/nx.c                             |   4 +-
 drivers/crypto/virtio/virtio_crypto_algs.c         |  12 +-
 drivers/crypto/virtio/virtio_crypto_core.c         |   2 +-
 drivers/md/dm-crypt.c                              |  32 +-
 drivers/md/dm-integrity.c                          |   6 +-
 drivers/misc/ibmvmc.c                              |   6 +-
 .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c |   2 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c     |   6 +-
 drivers/net/ppp/ppp_mppe.c                         |   6 +-
 drivers/net/wireguard/noise.c                      |   4 +-
 drivers/net/wireguard/peer.c                       |   2 +-
 drivers/net/wireless/intel/iwlwifi/pcie/rx.c       |   2 +-
 drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c  |   6 +-
 drivers/net/wireless/intel/iwlwifi/pcie/tx.c       |   6 +-
 drivers/net/wireless/intersil/orinoco/wext.c       |   4 +-
 drivers/rapidio/devices/rio_mport_cdev.c           |   3 +-
 drivers/rapidio/rio-scan.c                         |   8 +-
 drivers/s390/crypto/ap_bus.h                       |   4 +-
 drivers/staging/ks7010/ks_hostif.c                 |   2 +-
 drivers/staging/rtl8723bs/core/rtw_security.c      |   2 +-
 drivers/staging/wlan-ng/p80211netdev.c             |   2 +-
 drivers/target/iscsi/iscsi_target_auth.c           |   2 +-
 drivers/tty/serial/sh-sci.c                        |   2 +-
 fs/aio.c                                           |   9 +-
 fs/buffer.c                                        |  56 +-
 fs/cifs/cifsencrypt.c                              |   2 +-
 fs/cifs/connect.c                                  |  10 +-
 fs/cifs/dfs_cache.c                                |   2 +-
 fs/cifs/misc.c                                     |   8 +-
 fs/crypto/keyring.c                                |   6 +-
 fs/crypto/keysetup_v1.c                            |   4 +-
 fs/ecryptfs/keystore.c                             |   4 +-
 fs/ecryptfs/messaging.c                            |   2 +-
 fs/exec.c                                          |  37 +-
 fs/hugetlbfs/inode.c                               |   6 +
 fs/namei.c                                         |  10 +-
 fs/nfsd/nfs4recover.c                              |   2 +-
 fs/ocfs2/dlmglue.c                                 |  17 +-
 fs/ocfs2/namei.c                                   |  17 +-
 fs/ocfs2/ocfs2.h                                   |   1 +
 fs/ocfs2/ocfs2_fs.h                                |   4 +-
 fs/ocfs2/suballoc.c                                |   9 +-
 fs/open.c                                          |   6 -
 fs/proc/meminfo.c                                  |   4 +-
 fs/proc/page.c                                     |  40 +-
 fs/ramfs/inode.c                                   |  12 +
 fs/signalfd.c                                      |  10 +-
 include/crypto/aead.h                              |   2 +-
 include/crypto/akcipher.h                          |   2 +-
 include/crypto/gf128mul.h                          |   2 +-
 include/crypto/hash.h                              |   2 +-
 include/crypto/internal/acompress.h                |   2 +-
 include/crypto/kpp.h                               |   2 +-
 include/crypto/skcipher.h                          |   2 +-
 include/linux/bits.h                               |   3 +-
 include/linux/compaction.h                         |   2 +
 include/linux/crash_core.h                         |   6 +
 include/linux/huge_mm.h                            |   7 -
 include/linux/kernel.h                             |   2 +-
 include/linux/memcontrol.h                         |  93 ++-
 include/linux/memremap.h                           |   6 +
 include/linux/mm.h                                 |  45 --
 include/linux/mm_types.h                           |   5 +-
 include/linux/mmzone.h                             |  28 +-
 include/linux/nmi.h                                |   1 +
 include/linux/pgalloc-track.h                      |  51 ++
 include/linux/sched.h                              |   8 +
 include/linux/sched/mm.h                           |  10 +-
 include/linux/sched/task.h                         |  13 +
 include/linux/slab.h                               |   9 +-
 include/linux/slab_def.h                           |   9 +-
 include/linux/slub_def.h                           |  31 +-
 include/linux/swap.h                               |   3 +-
 include/linux/vm_event_item.h                      |   4 +
 include/linux/vmalloc.h                            |   1 -
 include/linux/vmstat.h                             |  14 +-
 include/linux/wait.h                               |   4 +-
 kernel/Makefile                                    |   2 +-
 kernel/crash_core.c                                |  50 ++
 kernel/hung_task.c                                 |  44 ++
 kernel/kexec_file.c                                |  34 +-
 kernel/kmod.c                                      |   5 +-
 kernel/module.c                                    |   4 +-
 kernel/panic.c                                     |   2 +-
 kernel/power/snapshot.c                            |   2 +-
 kernel/sysctl.c                                    |   9 +
 kernel/umh.c                                       |   4 +-
 kernel/watchdog.c                                  |  21 +
 kernel/watchdog_hld.c                              |   1 +
 lib/Kconfig.debug                                  |  19 +-
 lib/Makefile                                       |   1 +
 lib/bitmap.c                                       |   4 +-
 lib/cpumask.c                                      | 102 +++-
 lib/ioremap.c                                      |   1 +
 lib/mpi/mpiutil.c                                  |   6 +-
 lib/test_bitmap.c                                  |  58 ++
 lib/test_bits.c                                    |  73 +++
 lib/test_hmm.c                                     |   3 +-
 lib/test_kasan.c                                   |   6 +-
 lib/test_kmod.c                                    |   2 +-
 mm/cma.c                                           |  15 +-
 mm/cma.h                                           |   4 +-
 mm/compaction.c                                    | 200 ++++++-
 mm/debug_vm_pgtable.c                              |   4 +-
 mm/huge_memory.c                                   |  21 -
 mm/hugetlb.c                                       |   4 +-
 mm/internal.h                                      |   1 +
 mm/memcontrol.c                                    | 638 ++++++++++++--------
 mm/memory.c                                        |  40 +-
 mm/memory_hotplug.c                                |  16 +-
 mm/memremap.c                                      |  20 +
 mm/migrate.c                                       |  23 +
 mm/mmap.c                                          |  43 +-
 mm/mmu_notifier.c                                  |   7 -
 mm/nommu.c                                         |  17 -
 mm/oom_kill.c                                      |   2 +-
 mm/page-writeback.c                                |   6 +-
 mm/page_alloc.c                                    | 144 +++--
 mm/percpu-internal.h                               |  55 +-
 mm/percpu-km.c                                     |   5 +-
 mm/percpu-stats.c                                  |  36 +-
 mm/percpu-vm.c                                     |   5 +-
 mm/percpu.c                                        | 208 ++++++-
 mm/slab.c                                          |  74 +--
 mm/slab.h                                          | 400 ++++++-------
 mm/slab_common.c                                   | 665 +--------------------
 mm/slob.c                                          |  12 +-
 mm/slub.c                                          | 595 ++++++------------
 mm/swap.c                                          |   3 +-
 mm/swap_state.c                                    |   4 +-
 mm/vmalloc.c                                       | 153 ++---
 mm/vmscan.c                                        |  13 +-
 mm/vmstat.c                                        |  52 +-
 mm/workingset.c                                    |  52 +-
 mm/zswap.c                                         | 153 +++--
 net/atm/mpoa_caches.c                              |   4 +-
 net/bluetooth/ecdh_helper.c                        |   6 +-
 net/bluetooth/smp.c                                |  24 +-
 net/bridge/br_stp_if.c                             |  10 +-
 net/core/sock.c                                    |   2 +-
 net/ipv4/tcp_fastopen.c                            |   2 +-
 net/mac80211/aead_api.c                            |   4 +-
 net/mac80211/aes_gmac.c                            |   2 +-
 net/mac80211/key.c                                 |   2 +-
 net/mac802154/llsec.c                              |  20 +-
 net/sctp/auth.c                                    |   2 +-
 net/sctp/socket.c                                  |   2 +-
 net/sunrpc/auth_gss/gss_krb5_crypto.c              |   4 +-
 net/sunrpc/auth_gss/gss_krb5_keys.c                |   6 +-
 net/sunrpc/auth_gss/gss_krb5_mech.c                |   2 +-
 net/tipc/crypto.c                                  |  10 +-
 net/wireless/core.c                                |   2 +-
 net/wireless/ibss.c                                |   4 +-
 net/wireless/lib80211_crypt_tkip.c                 |   2 +-
 net/wireless/lib80211_crypt_wep.c                  |   2 +-
 net/wireless/nl80211.c                             |  24 +-
 net/wireless/sme.c                                 |   6 +-
 net/wireless/util.c                                |   2 +-
 net/wireless/wext-sme.c                            |   2 +-
 scripts/bloat-o-meter                              |   2 +
 scripts/checkpatch.pl                              |  78 ++-
 scripts/coccinelle/free/devm_free.cocci            |   4 +-
 scripts/coccinelle/free/ifnullfree.cocci           |   4 +-
 scripts/coccinelle/free/kfree.cocci                |   6 +-
 scripts/coccinelle/free/kfreeaddr.cocci            |   2 +-
 scripts/deprecated_terms.txt                       |   7 +
 scripts/tags.sh                                    |  18 +-
 security/apparmor/domain.c                         |   4 +-
 security/apparmor/include/file.h                   |   2 +-
 security/apparmor/policy.c                         |  24 +-
 security/apparmor/policy_ns.c                      |   6 +-
 security/apparmor/policy_unpack.c                  |  14 +-
 security/keys/big_key.c                            |   6 +-
 security/keys/dh.c                                 |  14 +-
 security/keys/encrypted-keys/encrypted.c           |  14 +-
 security/keys/request_key.c                        |   2 +-
 security/keys/trusted-keys/trusted_tpm1.c          |  34 +-
 security/keys/user_defined.c                       |   6 +-
 tools/cgroup/memcg_slabinfo.py                     | 226 +++++++
 tools/testing/selftests/cgroup/.gitignore          |   1 +
 tools/testing/selftests/cgroup/Makefile            |   2 +
 tools/testing/selftests/cgroup/test_kmem.c         | 450 ++++++++++++++
 tools/testing/selftests/kmod/kmod.sh               |  50 +-
 234 files changed, 3726 insertions(+), 2613 deletions(-)
 create mode 100644 include/linux/pgalloc-track.h
 create mode 100644 lib/test_bits.c
 create mode 100644 scripts/deprecated_terms.txt
 create mode 100644 tools/cgroup/memcg_slabinfo.py
 create mode 100644 tools/testing/selftests/cgroup/test_kmem.c
$ git am -3 ../patches/0001-Revert-drivers-tty-serial-sh-sci.c-suppress-uninitia.patch
Applying: Revert "drivers/tty/serial/sh-sci.c: suppress uninitialized var warning"
$ git reset HEAD^
Unstaged changes after reset:
M	drivers/tty/serial/sh-sci.c
$ git add -A .
$ git commit -v -a --amend
[master b5556b220d64] Merge branch 'akpm-current/current'
 Date: Mon Jun 22 14:12:16 2020 +1000
$ 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
Rebasing (1/22)
Rebasing (2/22)
Rebasing (3/22)
Rebasing (4/22)
Rebasing (5/22)
Rebasing (6/22)
Rebasing (7/22)
Rebasing (8/22)
Rebasing (9/22)
Rebasing (10/22)
Rebasing (11/22)
Rebasing (12/22)
Rebasing (13/22)
Rebasing (14/22)
Rebasing (15/22)
Rebasing (16/22)
Rebasing (17/22)
Rebasing (18/22)
Rebasing (19/22)
Rebasing (20/22)
Rebasing (21/22)
Rebasing (22/22)

Successfully rebased and updated refs/heads/akpm.
$ cd ../next
$ git fetch -f ../rebase-tmp akpm:akpm/master
From ../rebase-tmp
 + 4a5d2b1ce5e3...eb8ffe9e5c16 akpm       -> akpm/master  (forced update)
$ rm -rf ../rebase-tmp
Merging akpm/master (eb8ffe9e5c16 sh: add missing EXPORT_SYMBOL() for __delay)
$ git merge --no-ff akpm/master
Removing kernel/sysctl_binary.c
Merge made by the 'recursive' strategy.
 arch/alpha/kernel/syscalls/syscall.tbl             |   2 +-
 arch/arm/configs/am200epdkit_defconfig             |   1 -
 arch/arm/tools/syscall.tbl                         |   2 +-
 arch/arm64/include/asm/unistd32.h                  |   4 +-
 arch/ia64/kernel/syscalls/syscall.tbl              |   2 +-
 arch/m68k/kernel/syscalls/syscall.tbl              |   2 +-
 arch/microblaze/kernel/syscalls/syscall.tbl        |   2 +-
 arch/mips/configs/cu1000-neo_defconfig             |   1 -
 arch/mips/kernel/syscalls/syscall_n32.tbl          |   2 +-
 arch/mips/kernel/syscalls/syscall_n64.tbl          |   2 +-
 arch/mips/kernel/syscalls/syscall_o32.tbl          |   2 +-
 arch/parisc/kernel/syscalls/syscall.tbl            |   2 +-
 arch/powerpc/kernel/syscalls/syscall.tbl           |   2 +-
 arch/s390/kernel/syscalls/syscall.tbl              |   2 +-
 arch/sh/configs/dreamcast_defconfig                |   1 -
 arch/sh/configs/espt_defconfig                     |   1 -
 arch/sh/configs/hp6xx_defconfig                    |   1 -
 arch/sh/configs/landisk_defconfig                  |   1 -
 arch/sh/configs/lboxre2_defconfig                  |   1 -
 arch/sh/configs/microdev_defconfig                 |   1 -
 arch/sh/configs/migor_defconfig                    |   1 -
 arch/sh/configs/r7780mp_defconfig                  |   1 -
 arch/sh/configs/r7785rp_defconfig                  |   1 -
 arch/sh/configs/rts7751r2d1_defconfig              |   1 -
 arch/sh/configs/rts7751r2dplus_defconfig           |   1 -
 arch/sh/configs/se7206_defconfig                   |   1 -
 arch/sh/configs/se7343_defconfig                   |   1 -
 arch/sh/configs/se7619_defconfig                   |   1 -
 arch/sh/configs/se7705_defconfig                   |   1 -
 arch/sh/configs/se7750_defconfig                   |   1 -
 arch/sh/configs/se7751_defconfig                   |   1 -
 arch/sh/configs/secureedge5410_defconfig           |   1 -
 arch/sh/configs/sh03_defconfig                     |   1 -
 arch/sh/configs/sh7710voipgw_defconfig             |   1 -
 arch/sh/configs/sh7757lcr_defconfig                |   1 -
 arch/sh/configs/sh7763rdp_defconfig                |   1 -
 arch/sh/configs/shmin_defconfig                    |   1 -
 arch/sh/configs/titan_defconfig                    |   1 -
 arch/sh/include/asm/string_32.h                    |  26 ----
 arch/sh/kernel/syscalls/syscall.tbl                |   2 +-
 arch/sh/lib/delay.c                                |   1 +
 arch/sh/mm/consistent.c                            |   2 -
 arch/sparc/kernel/syscalls/syscall.tbl             |   2 +-
 arch/x86/entry/syscalls/syscall_32.tbl             |   2 +-
 arch/x86/entry/syscalls/syscall_64.tbl             |   2 +-
 arch/xtensa/kernel/syscalls/syscall.tbl            |   2 +-
 drivers/sh/clk/cpg.c                               |  23 +--
 include/asm-generic/vmlinux.lds.h                  |   1 +
 include/linux/compat.h                             |   1 -
 include/linux/memcontrol.h                         |   2 +-
 include/linux/mm.h                                 |   1 +
 include/linux/syscalls.h                           |   2 -
 include/linux/sysctl.h                             |   6 +-
 kernel/Makefile                                    |   2 +-
 kernel/sys_ni.c                                    |   1 -
 kernel/sysctl_binary.c                             | 171 ---------------------
 mm/filemap.c                                       |  20 ++-
 mm/frontswap.c                                     |   8 +-
 mm/kmemleak.c                                      |   2 +
 mm/list_lru.c                                      |   2 +-
 mm/memory.c                                        |   4 +-
 mm/mempool.c                                       |   2 +-
 mm/page_counter.c                                  |  13 +-
 mm/page_io.c                                       |   8 +-
 mm/rmap.c                                          |   2 +-
 mm/swap.c                                          |   5 +-
 mm/swap_state.c                                    |   4 +-
 mm/swapfile.c                                      |  31 ++--
 tools/perf/arch/powerpc/entry/syscalls/syscall.tbl |   2 +-
 tools/perf/arch/s390/entry/syscalls/syscall.tbl    |   2 +-
 tools/perf/arch/x86/entry/syscalls/syscall_64.tbl  |   2 +-
 71 files changed, 90 insertions(+), 318 deletions(-)
 delete mode 100644 kernel/sysctl_binary.c