--- /dev/null
+$ date -R
+Fri, 30 Oct 2020 08:22:29 +1100
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at 23859ae44402 Merge tag 'trace-v5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
+Merging origin/master (07e088730245 Merge tag 'fallthrough-fixes-clang-5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux)
+$ git merge origin/master
+Updating 23859ae44402..07e088730245
+Fast-forward
+ drivers/infiniband/core/cma.c | 48 ++++++++--
+ drivers/infiniband/core/uverbs_std_types_device.c | 3 -
+ drivers/infiniband/hw/mlx5/main.c | 6 +-
+ drivers/infiniband/hw/qedr/qedr_iw_cm.c | 1 +
+ drivers/infiniband/sw/rxe/rxe_av.c | 35 ++++++-
+ drivers/infiniband/sw/rxe/rxe_net.c | 2 +-
+ drivers/infiniband/ulp/iser/iser_verbs.c | 2 +-
+ drivers/infiniband/ulp/rtrs/rtrs-clt.c | 4 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c | 49 ++++++----
+ drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 +
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 56 ++++++-----
+ drivers/net/ethernet/chelsio/cxgb4/t4_tcb.h | 4 +
+ .../chelsio/inline_crypto/chtls/chtls_cm.c | 29 +++---
+ .../chelsio/inline_crypto/chtls/chtls_io.c | 7 +-
+ drivers/net/ethernet/freescale/ucc_geth.c | 2 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 2 +-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 2 +-
+ drivers/net/ethernet/ibm/ibmveth.c | 6 --
+ drivers/net/ethernet/ibm/ibmvnic.c | 8 +-
+ drivers/net/ethernet/mellanox/mlx5/core/lib/mlx5.h | 5 -
+ drivers/net/ethernet/mellanox/mlxsw/core.c | 5 +
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 9 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 1 +
+ .../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 30 ++++++
+ drivers/net/ethernet/pensando/ionic/ionic_dev.c | 4 +-
+ drivers/net/ethernet/pensando/ionic/ionic_dev.h | 2 +
+ drivers/net/ethernet/pensando/ionic/ionic_fw.c | 6 +-
+ drivers/net/ethernet/pensando/ionic/ionic_lif.c | 29 +++---
+ drivers/net/ethernet/pensando/ionic/ionic_main.c | 4 +-
+ drivers/net/ethernet/pensando/ionic/ionic_stats.h | 2 +-
+ drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 47 ++++-----
+ drivers/net/ethernet/pensando/ionic/ionic_txrx.h | 1 -
+ drivers/net/ethernet/realtek/r8169_main.c | 4 +-
+ drivers/net/ethernet/renesas/ravb_main.c | 10 +-
+ drivers/net/gtp.c | 16 ++--
+ drivers/net/ipa/gsi_trans.c | 21 +++--
+ drivers/nvme/host/rdma.c | 4 +-
+ drivers/s390/net/ism_drv.c | 2 +-
+ fs/afs/cell.c | 3 +-
+ fs/afs/dir.c | 12 +--
+ fs/afs/dir_edit.c | 6 +-
+ fs/afs/file.c | 78 ++++++++++++---
+ fs/afs/internal.h | 57 +++++++++++
+ fs/afs/write.c | 105 +++++++++++----------
+ fs/afs/xattr.c | 2 +-
+ fs/ext4/dir.c | 64 +------------
+ fs/ext4/ext4.h | 20 +---
+ fs/ext4/extents.c | 30 +++---
+ fs/ext4/fast_commit.c | 37 +++++---
+ fs/ext4/hash.c | 2 +-
+ fs/ext4/inode.c | 15 +--
+ fs/ext4/namei.c | 20 ++--
+ fs/ext4/super.c | 16 ++--
+ fs/ext4/sysfs.c | 2 +
+ include/linux/jbd2.h | 7 +-
+ include/linux/jhash.h | 2 +
+ include/linux/mlx5/driver.h | 18 ++++
+ include/linux/signal.h | 2 +
+ include/rdma/rdma_cm.h | 14 +--
+ include/trace/events/afs.h | 20 +---
+ net/core/devlink.c | 30 +++---
+ net/ipv4/tcp.c | 2 +
+ net/ipv4/tcp_input.c | 3 +-
+ net/mptcp/protocol.c | 10 ++
+ net/rds/ib_cm.c | 5 +-
+ net/sched/act_mpls.c | 1 +
+ net/sched/cls_api.c | 4 +-
+ net/sched/sch_netem.c | 9 +-
+ net/smc/af_smc.c | 7 +-
+ net/smc/smc_core.c | 7 +-
+ net/tipc/msg.c | 5 +-
+ net/vmw_vsock/af_vsock.c | 2 +-
+ 72 files changed, 634 insertions(+), 452 deletions(-)
+Merging fixes/fixes (9123e3a74ec7 Linux 5.9-rc1)
+$ git merge fixes/fixes
+Already up to date.
+Merging kbuild-current/fixes (e36aec504147 builddeb: Fix rootless build in setuid/setgid directory)
+$ git merge kbuild-current/fixes
+Merge made by the 'recursive' strategy.
+ Documentation/kbuild/llvm.rst | 5 ++---
+ Makefile | 4 +---
+ scripts/package/builddeb | 2 ++
+ 3 files changed, 5 insertions(+), 6 deletions(-)
+Merging arc-current/for-curr (3650b228f83a Linux 5.10-rc1)
+$ git merge arc-current/for-curr
+Already up to date.
+Merging arm-current/fixes (9fa2e7af3d53 ARM: 9019/1: kprobes: Avoid fortify_panic() when copying optprobe template)
+$ git merge arm-current/fixes
+Merge made by the 'recursive' strategy.
+ arch/arm/include/asm/kprobes.h | 22 +++++++++++-----------
+ arch/arm/probes/kprobes/opt-arm.c | 18 +++++++++---------
+ 2 files changed, 20 insertions(+), 20 deletions(-)
+Merging arm64-fixes/for-next/fixes (96d389ca1011 arm64: Add workaround for Arm Cortex-A77 erratum 1508412)
+$ git merge arm64-fixes/for-next/fixes
+Merge made by the 'recursive' strategy.
+ Documentation/arm64/memory-tagging-extension.rst | 4 +++-
+ Documentation/arm64/silicon-errata.rst | 2 ++
+ arch/arm64/Kconfig | 20 +++++++++++++++++++
+ arch/arm64/include/asm/cache.h | 1 +
+ arch/arm64/include/asm/cpucaps.h | 3 ++-
+ arch/arm64/include/asm/cputype.h | 2 ++
+ arch/arm64/include/asm/sysreg.h | 9 +++++++++
+ arch/arm64/kernel/cpu_errata.c | 10 ++++++++++
+ arch/arm64/kernel/cpuinfo.c | 7 ++++---
+ arch/arm64/kernel/efi-header.S | 2 +-
+ arch/arm64/kernel/entry.S | 3 +++
+ arch/arm64/kernel/proton-pack.c | 2 --
+ arch/arm64/kernel/vdso32/Makefile | 23 +++++++++++-----------
+ arch/arm64/kernel/vmlinux.lds.S | 2 +-
+ arch/arm64/kvm/arm.c | 3 ++-
+ arch/arm64/kvm/hyp/include/hyp/switch.h | 21 ++++++++++++--------
+ arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 2 +-
+ arch/arm64/kvm/hyp/nvhe/switch.c | 2 +-
+ arch/arm64/kvm/hyp/vhe/switch.c | 2 +-
+ arch/arm64/kvm/hypercalls.c | 2 +-
+ arch/arm64/kvm/sys_regs.c | 2 +-
+ arch/arm64/mm/fault.c | 2 +-
+ include/linux/arm-smccc.h | 2 ++
+ include/linux/module.h | 2 +-
+ .../selftests/arm64/mte/check_buffer_fill.c | 3 +++
+ .../selftests/arm64/mte/check_child_memory.c | 3 +++
+ .../selftests/arm64/mte/check_ksm_options.c | 4 ++++
+ .../selftests/arm64/mte/check_mmap_options.c | 4 ++++
+ .../selftests/arm64/mte/check_tags_inclusion.c | 3 +++
+ tools/testing/selftests/arm64/mte/check_user_mem.c | 4 ++++
+ 30 files changed, 115 insertions(+), 36 deletions(-)
+Merging arm-soc-fixes/arm/fixes (deaafe8edde7 Merge tag 'sunxi-fixes-for-5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/fixes)
+$ git merge arm-soc-fixes/arm/fixes
+Merge made by the 'recursive' strategy.
+ CREDITS | 9 ++++
+ .../sram/allwinner,sun4i-a10-system-control.yaml | 3 ++
+ MAINTAINERS | 12 ++---
+ arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts | 4 +-
+ arch/arm/boot/dts/mmp3.dtsi | 2 +
+ arch/arm/boot/dts/stm32mp157c-ed1.dts | 15 +++++++
+ arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 17 +++++++
+ arch/arm/boot/dts/sun4i-a10.dtsi | 2 +-
+ arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 2 +-
+ arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 2 +-
+ arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 2 +-
+ arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts | 2 +-
+ arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts | 2 +-
+ arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts | 5 ---
+ arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts | 2 +-
+ arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts | 2 +-
+ arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 2 +-
+ arch/arm/boot/dts/sun9i-a80-optimus.dts | 2 +-
+ arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi | 2 +-
+ arch/arm/configs/imx_v4_v5_defconfig | 1 +
+ arch/arm/configs/imx_v6_v7_defconfig | 1 +
+ arch/arm/configs/multi_v5_defconfig | 1 +
+ arch/arm/configs/multi_v7_defconfig | 1 +
+ arch/arm/mach-mvebu/coherency_ll.S | 7 +--
+ arch/arm64/Kconfig.platforms | 1 +
+ .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 2 +-
+ .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 2 +-
+ .../boot/dts/allwinner/sun50i-a64-pine64-plus.dts | 2 +-
+ .../boot/dts/allwinner/sun50i-a64-pinetab.dts | 3 --
+ .../allwinner/sun50i-h5-libretech-all-h5-cc.dts | 2 +-
+ .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 2 +-
+ .../dts/allwinner/sun50i-h5-orangepi-prime.dts | 2 +-
+ .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 2 +-
+ .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 2 +-
+ arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 6 +++
+ arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 52 ++++++++++++++++++++++
+ arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 6 ++-
+ .../boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts | 2 +-
+ arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 3 ++
+ .../marvell/armada-3720-espressobin-v7-emmc.dts | 10 ++++-
+ .../dts/marvell/armada-3720-espressobin-v7.dts | 10 ++++-
+ .../boot/dts/marvell/armada-3720-espressobin.dtsi | 12 +++--
+ arch/arm64/configs/defconfig | 1 +
+ drivers/firmware/arm_scmi/base.c | 2 +
+ drivers/firmware/arm_scmi/clock.c | 2 +
+ drivers/firmware/arm_scmi/common.h | 2 +
+ drivers/firmware/arm_scmi/driver.c | 8 ++++
+ drivers/firmware/arm_scmi/notify.c | 22 +++++----
+ drivers/firmware/arm_scmi/perf.c | 2 +
+ drivers/firmware/arm_scmi/reset.c | 4 +-
+ drivers/firmware/arm_scmi/sensors.c | 2 +
+ drivers/firmware/arm_scmi/smc.c | 2 +-
+ drivers/soc/ti/ti_sci_pm_domains.c | 2 +-
+ drivers/tee/tee_core.c | 3 +-
+ 54 files changed, 205 insertions(+), 68 deletions(-)
+Merging drivers-memory-fixes/fixes (3650b228f83a Linux 5.10-rc1)
+$ git merge drivers-memory-fixes/fixes
+Already up to date.
+Merging m68k-current/for-linus (50c5feeea0af ide/macide: Convert Mac IDE driver to platform driver)
+$ git merge m68k-current/for-linus
+Already up to date.
+Merging powerpc-fixes/fixes (4ff753feab02 powerpc/pseries: Avoid using addr_to_pfn in real mode)
+$ git merge powerpc-fixes/fixes
+Already up to date.
+Merging s390-fixes/fixes (8e90b4b1305a s390: correct __bootdata / __bootdata_preserved macros)
+$ git merge s390-fixes/fixes
+Already up to date.
+Merging sparc/master (0a95a6d1a4cd sparc: use for_each_child_of_node() macro)
+$ git merge sparc/master
+Auto-merging arch/sparc/kernel/signal_64.c
+Auto-merging arch/sparc/kernel/signal_32.c
+Auto-merging arch/sparc/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/sparc/Kconfig | 2 +-
+ arch/sparc/boot/piggyback.c | 4 ++++
+ arch/sparc/include/asm/backoff.h | 2 +-
+ arch/sparc/include/asm/pgtsrmmu.h | 2 +-
+ arch/sparc/kernel/pci.c | 3 +--
+ arch/sparc/kernel/viohs.c | 6 ++----
+ arch/sparc/lib/memset.S | 1 +
+ arch/sparc/mm/srmmu.c | 18 +++++++++---------
+ 8 files changed, 20 insertions(+), 18 deletions(-)
+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 (07e088730245 Merge tag 'fallthrough-fixes-clang-5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux)
+$ git merge net/master
+Already up to date.
+Merging bpf/master (0698ac66e010 tools, bpftool: Remove two unused variables.)
+$ git merge bpf/master
+Merge made by the 'recursive' strategy.
+ include/linux/filter.h | 22 +++++++++++-----------
+ include/net/xsk_buff_pool.h | 2 +-
+ net/xdp/xsk.c | 3 ++-
+ net/xdp/xsk_buff_pool.c | 7 +++++--
+ samples/bpf/task_fd_query_user.c | 2 +-
+ samples/bpf/tracex2_user.c | 2 +-
+ samples/bpf/tracex3_user.c | 2 +-
+ samples/bpf/xdp_redirect_cpu_user.c | 2 +-
+ samples/bpf/xdp_rxq_info_user.c | 2 +-
+ scripts/bpf_helpers_doc.py | 1 +
+ tools/bpf/bpftool/feature.c | 7 ++++++-
+ tools/bpf/bpftool/skeleton/profiler.bpf.c | 4 ++--
+ tools/testing/selftests/bpf/progs/profiler.inc.h | 11 ++++++++---
+ 13 files changed, 41 insertions(+), 26 deletions(-)
+Merging ipsec/master (a779d91314ca net: xfrm: fix a race condition during allocing spi)
+$ git merge ipsec/master
+Auto-merging net/xfrm/xfrm_state.c
+Auto-merging net/xfrm/xfrm_interface.c
+Merge made by the 'recursive' strategy.
+ net/ipv4/xfrm4_tunnel.c | 4 ++--
+ net/ipv6/xfrm6_tunnel.c | 4 ++--
+ net/xfrm/xfrm_interface.c | 8 ++++----
+ net/xfrm/xfrm_state.c | 8 +++++---
+ 4 files changed, 13 insertions(+), 11 deletions(-)
+Merging netfilter/master (c77761c8a594 netfilter: nf_fwd_netdev: clear timestamp in forwarding path)
+$ git merge netfilter/master
+Already up to date.
+Merging ipvs/master (c77761c8a594 netfilter: nf_fwd_netdev: clear timestamp in forwarding path)
+$ git merge ipvs/master
+Already up to date.
+Merging wireless-drivers/master (3650b228f83a Linux 5.10-rc1)
+$ git merge wireless-drivers/master
+Already up to date.
+Merging mac80211/master (435ccfa894e3 tcp: Prevent low rmem stalls with SO_RCVLOWAT.)
+$ git merge mac80211/master
+Already up to date.
+Merging rdma-fixes/for-rc (a2267f8a52ee RDMA/qedr: Fix memory leak in iWARP CM)
+$ git merge rdma-fixes/for-rc
+Already up to date.
+Merging sound-current/for-linus (9fc149c3bce7 ALSA: hda: Reinstate runtime_allow() for all hda controllers)
+$ git merge sound-current/for-linus
+Merge made by the 'recursive' strategy.
+ include/sound/control.h | 2 +-
+ include/sound/core.h | 3 +-
+ include/sound/pcm.h | 4 +--
+ include/uapi/sound/compress_offload.h | 2 +-
+ sound/core/control.c | 4 +--
+ sound/core/pcm_dmaengine.c | 3 +-
+ sound/core/pcm_lib.c | 2 +-
+ sound/core/pcm_native.c | 4 +--
+ sound/pci/hda/hda_codec.c | 45 ++++++++++++++++---------
+ sound/pci/hda/hda_controller.h | 3 +-
+ sound/pci/hda/hda_intel.c | 63 +++++++++++++++++++----------------
+ sound/pci/hda/patch_realtek.c | 54 ++++++++++++++++++++++++------
+ sound/soc/soc-core.c | 2 +-
+ sound/soc/soc-dapm.c | 2 +-
+ sound/usb/pcm.c | 4 +++
+ 15 files changed, 128 insertions(+), 69 deletions(-)
+Merging sound-asoc-fixes/for-linus (838c70799b04 Merge remote-tracking branch 'asoc/for-5.10' into asoc-linus)
+$ git merge sound-asoc-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ sound/soc/codecs/cs42l51.c | 22 +++++++++++-
+ sound/soc/codecs/wcd9335.c | 2 +-
+ sound/soc/codecs/wcd934x.c | 2 +-
+ sound/soc/codecs/wsa881x.c | 2 ++
+ sound/soc/intel/Kconfig | 18 ----------
+ sound/soc/intel/atom/Makefile | 2 +-
+ sound/soc/intel/atom/sst/Makefile | 6 ++--
+ sound/soc/intel/boards/kbl_rt5663_max98927.c | 39 +++++++++++++++++-----
+ sound/soc/intel/catpt/dsp.c | 9 +++--
+ sound/soc/intel/catpt/pcm.c | 10 ++++++
+ sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 31 +++++++++++++----
+ sound/soc/qcom/lpass-cpu.c | 14 +++++---
+ sound/soc/qcom/lpass-sc7180.c | 2 +-
+ sound/soc/qcom/sdm845.c | 2 ++
+ sound/soc/sof/loader.c | 5 +++
+ 15 files changed, 119 insertions(+), 47 deletions(-)
+Merging regmap-fixes/for-linus (780f88b04704 Merge remote-tracking branch 'regmap/for-5.10' into regmap-linus)
+$ git merge regmap-fixes/for-linus
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging regulator-fixes/for-linus (c432bf3e3d82 Merge remote-tracking branch 'regulator/for-5.10' into regulator-linus)
+$ git merge regulator-fixes/for-linus
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+Merging spi-fixes/for-linus (9b3a2f2e8a67 Merge remote-tracking branch 'spi/for-5.10' into spi-linus)
+$ git merge spi-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/spi/spi-bcm2835.c | 12 ------------
+ drivers/spi/spi-imx.c | 23 +++++++++++++++--------
+ 2 files changed, 15 insertions(+), 20 deletions(-)
+Merging pci-current/for-linus (3650b228f83a Linux 5.10-rc1)
+$ git merge pci-current/for-linus
+Already up to date.
+Merging driver-core.current/driver-core-linus (3650b228f83a Linux 5.10-rc1)
+$ git merge driver-core.current/driver-core-linus
+Already up to date.
+Merging tty.current/tty-linus (d54654790302 vt_ioctl: fix GIO_UNIMAP regression)
+$ git merge tty.current/tty-linus
+Merge made by the 'recursive' strategy.
+ drivers/tty/serial/21285.c | 12 ++++++------
+ drivers/tty/serial/fsl_lpuart.c | 13 +++++++------
+ drivers/tty/vt/keyboard.c | 39 +++++++++++++++++++--------------------
+ drivers/tty/vt/vt_ioctl.c | 11 +++++------
+ 4 files changed, 37 insertions(+), 38 deletions(-)
+Merging usb.current/usb-linus (712da5fc4a66 xhci: Don't create stream debugfs files with spinlock held.)
+$ git merge usb.current/usb-linus
+Merge made by the 'recursive' strategy.
+ drivers/usb/class/cdc-acm.c | 12 +++++-------
+ drivers/usb/class/cdc-acm.h | 3 +--
+ drivers/usb/core/driver.c | 30 +++++++++++++++++++++---------
+ drivers/usb/core/generic.c | 4 +---
+ drivers/usb/core/usb.h | 2 ++
+ drivers/usb/dwc3/core.c | 2 +-
+ drivers/usb/dwc3/core.h | 2 +-
+ drivers/usb/gadget/composite.c | 2 +-
+ drivers/usb/host/ehci-tegra.c | 4 ++--
+ drivers/usb/host/fsl-mph-dr-of.c | 9 ++++++---
+ drivers/usb/host/xhci-mem.c | 4 ++--
+ drivers/usb/host/xhci-pci.c | 17 +++++++++++++++++
+ drivers/usb/host/xhci.c | 5 ++++-
+ drivers/usb/host/xhci.h | 1 +
+ drivers/usb/misc/apple-mfi-fastcharge.c | 17 ++++++++++++-----
+ drivers/usb/typec/mux.c | 2 +-
+ drivers/usb/typec/stusb160x.c | 24 +++++++++++-------------
+ drivers/usb/typec/tcpm/tcpm.c | 6 +++---
+ include/linux/usb/composite.h | 2 +-
+ 19 files changed, 93 insertions(+), 55 deletions(-)
+Merging usb-gadget-fixes/fixes (51609fba0cca usb: dwc3: simple: add support for Hikey 970)
+$ git merge usb-gadget-fixes/fixes
+Auto-merging drivers/usb/dwc3/gadget.h
+Auto-merging drivers/usb/dwc3/gadget.c
+CONFLICT (content): Merge conflict in drivers/usb/dwc3/gadget.c
+Auto-merging drivers/usb/dwc3/ep0.c
+Auto-merging drivers/usb/dwc3/dwc3-of-simple.c
+CONFLICT (content): Merge conflict in drivers/usb/dwc3/dwc3-of-simple.c
+Auto-merging drivers/usb/dwc3/core.h
+Auto-merging drivers/usb/cdns3/gadget.c
+CONFLICT (content): Merge conflict in drivers/usb/cdns3/gadget.c
+Resolved 'drivers/usb/cdns3/gadget.c' using previous resolution.
+Resolved 'drivers/usb/dwc3/dwc3-of-simple.c' using previous resolution.
+Resolved 'drivers/usb/dwc3/gadget.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 45566143a29e] Merge remote-tracking branch 'usb-gadget-fixes/fixes' into master
+$ git diff -M --stat --summary HEAD^..
+Merging usb-serial-fixes/usb-linus (a46b973bced1 USB: serial: option: add Quectel EC200T module support)
+$ git merge usb-serial-fixes/usb-linus
+Merge made by the 'recursive' strategy.
+ drivers/usb/serial/option.c | 2 ++
+ 1 file changed, 2 insertions(+)
+Merging usb-chipidea-fixes/for-usb-fixes (8c354998ff88 usb: cdns3: Fix on-chip memory overflow issue)
+$ git merge usb-chipidea-fixes/for-usb-fixes
+Merge made by the 'recursive' strategy.
+ drivers/usb/cdns3/ep0.c | 65 +++++++++++++++-------------
+ drivers/usb/cdns3/gadget.c | 104 +++++++++++++++++++++++++--------------------
+ drivers/usb/cdns3/gadget.h | 5 ++-
+ 3 files changed, 95 insertions(+), 79 deletions(-)
+Merging phy/fixes (25d76fed7ffe phy: cpcap-usb: Use IRQF_ONESHOT)
+$ git merge phy/fixes
+Merge made by the 'recursive' strategy.
+ drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c | 5 -----
+ drivers/phy/motorola/phy-cpcap-usb.c | 3 ++-
+ drivers/phy/qualcomm/phy-qcom-qmp.c | 2 +-
+ drivers/phy/tegra/xusb.c | 1 +
+ 4 files changed, 4 insertions(+), 7 deletions(-)
+Merging staging.current/staging-linus (7e97e4cbf300 staging: fieldbus: anybuss: jump to correct label in an error path)
+$ git merge staging.current/staging-linus
+Merge made by the 'recursive' strategy.
+ drivers/staging/comedi/drivers/cb_pcidas.c | 1 +
+ drivers/staging/fieldbus/anybuss/arcx-anybus.c | 2 +-
+ drivers/staging/octeon/ethernet-mdio.c | 6 ----
+ drivers/staging/octeon/ethernet-rx.c | 34 ++++++++++++----------
+ drivers/staging/octeon/ethernet.c | 9 ++++++
+ .../staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 19 +++++++++---
+ drivers/staging/wfx/bh.c | 2 +-
+ drivers/staging/wfx/data_tx.c | 6 ++--
+ 8 files changed, 49 insertions(+), 30 deletions(-)
+Merging char-misc.current/char-misc-linus (80624263fa28 coresight: cti: Initialize dynamic sysfs attributes)
+$ git merge char-misc.current/char-misc-linus
+Removing samples/mic/mpssd/sysfs.c
+Removing samples/mic/mpssd/mpssd.h
+Removing samples/mic/mpssd/mpssd.c
+Removing samples/mic/mpssd/mpss
+Removing samples/mic/mpssd/micctrl
+Removing samples/mic/mpssd/Makefile
+Removing samples/mic/mpssd/.gitignore
+Removing include/uapi/linux/mic_ioctl.h
+Removing include/uapi/linux/mic_common.h
+Removing include/linux/scif.h
+Removing include/linux/mic_bus.h
+Removing drivers/misc/mic/vop/vop_vringh.c
+Removing drivers/misc/mic/vop/vop_main.h
+Removing drivers/misc/mic/vop/vop_main.c
+Removing drivers/misc/mic/vop/vop_debugfs.c
+Removing drivers/misc/mic/vop/Makefile
+Removing drivers/misc/mic/scif/scif_rma_list.h
+Removing drivers/misc/mic/scif/scif_rma_list.c
+Removing drivers/misc/mic/scif/scif_rma.h
+Removing drivers/misc/mic/scif/scif_rma.c
+Removing drivers/misc/mic/scif/scif_rb.h
+Removing drivers/misc/mic/scif/scif_rb.c
+Removing drivers/misc/mic/scif/scif_ports.c
+Removing drivers/misc/mic/scif/scif_peer_bus.h
+Removing drivers/misc/mic/scif/scif_peer_bus.c
+Removing drivers/misc/mic/scif/scif_nodeqp.h
+Removing drivers/misc/mic/scif/scif_nodeqp.c
+Removing drivers/misc/mic/scif/scif_nm.c
+Removing drivers/misc/mic/scif/scif_mmap.c
+Removing drivers/misc/mic/scif/scif_map.h
+Removing drivers/misc/mic/scif/scif_main.h
+Removing drivers/misc/mic/scif/scif_main.c
+Removing drivers/misc/mic/scif/scif_fence.c
+Removing drivers/misc/mic/scif/scif_fd.c
+Removing drivers/misc/mic/scif/scif_epd.h
+Removing drivers/misc/mic/scif/scif_epd.c
+Removing drivers/misc/mic/scif/scif_dma.c
+Removing drivers/misc/mic/scif/scif_debugfs.c
+Removing drivers/misc/mic/scif/scif_api.c
+Removing drivers/misc/mic/scif/Makefile
+Removing drivers/misc/mic/host/mic_x100.h
+Removing drivers/misc/mic/host/mic_x100.c
+Removing drivers/misc/mic/host/mic_smpt.h
+Removing drivers/misc/mic/host/mic_smpt.c
+Removing drivers/misc/mic/host/mic_main.c
+Removing drivers/misc/mic/host/mic_intr.h
+Removing drivers/misc/mic/host/mic_intr.c
+Removing drivers/misc/mic/host/mic_device.h
+Removing drivers/misc/mic/host/mic_debugfs.c
+Removing drivers/misc/mic/host/mic_boot.c
+Removing drivers/misc/mic/host/Makefile
+Removing drivers/misc/mic/cosm_client/cosm_scif_client.c
+Removing drivers/misc/mic/cosm_client/Makefile
+Removing drivers/misc/mic/cosm/cosm_sysfs.c
+Removing drivers/misc/mic/cosm/cosm_scif_server.c
+Removing drivers/misc/mic/cosm/cosm_main.h
+Removing drivers/misc/mic/cosm/cosm_main.c
+Removing drivers/misc/mic/cosm/cosm_debugfs.c
+Removing drivers/misc/mic/cosm/Makefile
+Removing drivers/misc/mic/common/mic_dev.h
+Removing drivers/misc/mic/card/mic_x100.h
+Removing drivers/misc/mic/card/mic_x100.c
+Removing drivers/misc/mic/card/mic_device.h
+Removing drivers/misc/mic/card/mic_device.c
+Removing drivers/misc/mic/card/mic_debugfs.c
+Removing drivers/misc/mic/card/Makefile
+Removing drivers/misc/mic/bus/vop_bus.h
+Removing drivers/misc/mic/bus/vop_bus.c
+Removing drivers/misc/mic/bus/scif_bus.h
+Removing drivers/misc/mic/bus/scif_bus.c
+Removing drivers/misc/mic/bus/mic_bus.c
+Removing drivers/misc/mic/bus/cosm_bus.h
+Removing drivers/misc/mic/bus/cosm_bus.c
+Removing drivers/misc/mic/bus/Makefile
+Removing drivers/misc/mic/Makefile
+Removing drivers/misc/mic/Kconfig
+Removing drivers/dma/mic_x100_dma.h
+Removing drivers/dma/mic_x100_dma.c
+Auto-merging MAINTAINERS
+Removing Documentation/misc-devices/mic/scif_overview.rst
+Removing Documentation/misc-devices/mic/mic_overview.rst
+Removing Documentation/misc-devices/mic/index.rst
+Merge made by the 'recursive' strategy.
+ Documentation/misc-devices/mic/index.rst | 16 -
+ Documentation/misc-devices/mic/mic_overview.rst | 85 -
+ Documentation/misc-devices/mic/scif_overview.rst | 108 --
+ MAINTAINERS | 16 -
+ drivers/dma/Kconfig | 18 -
+ drivers/dma/Makefile | 1 -
+ drivers/dma/mic_x100_dma.c | 770 --------
+ drivers/dma/mic_x100_dma.h | 275 ---
+ drivers/hwtracing/coresight/coresight-core.c | 1 +
+ drivers/hwtracing/coresight/coresight-cti-sysfs.c | 7 +
+ drivers/hwtracing/coresight/coresight-etm-perf.c | 2 +-
+ drivers/misc/Kconfig | 1 -
+ drivers/misc/Makefile | 1 -
+ drivers/misc/mic/Kconfig | 141 --
+ drivers/misc/mic/Makefile | 12 -
+ drivers/misc/mic/bus/Makefile | 9 -
+ drivers/misc/mic/bus/cosm_bus.c | 130 --
+ drivers/misc/mic/bus/cosm_bus.h | 125 --
+ drivers/misc/mic/bus/mic_bus.c | 194 ---
+ drivers/misc/mic/bus/scif_bus.c | 201 ---
+ drivers/misc/mic/bus/scif_bus.h | 125 --
+ drivers/misc/mic/bus/vop_bus.c | 194 ---
+ drivers/misc/mic/bus/vop_bus.h | 129 --
+ drivers/misc/mic/card/Makefile | 11 -
+ drivers/misc/mic/card/mic_debugfs.c | 85 -
+ drivers/misc/mic/card/mic_device.c | 417 -----
+ drivers/misc/mic/card/mic_device.h | 137 --
+ drivers/misc/mic/card/mic_x100.c | 347 ----
+ drivers/misc/mic/card/mic_x100.h | 37 -
+ drivers/misc/mic/common/mic_dev.h | 55 -
+ drivers/misc/mic/cosm/Makefile | 11 -
+ drivers/misc/mic/cosm/cosm_debugfs.c | 116 --
+ drivers/misc/mic/cosm/cosm_main.c | 382 ----
+ drivers/misc/mic/cosm/cosm_main.h | 61 -
+ drivers/misc/mic/cosm/cosm_scif_server.c | 399 -----
+ drivers/misc/mic/cosm/cosm_sysfs.c | 449 -----
+ drivers/misc/mic/cosm_client/Makefile | 8 -
+ drivers/misc/mic/cosm_client/cosm_scif_client.c | 269 ---
+ drivers/misc/mic/host/Makefile | 12 -
+ drivers/misc/mic/host/mic_boot.c | 588 -------
+ drivers/misc/mic/host/mic_debugfs.c | 149 --
+ drivers/misc/mic/host/mic_device.h | 157 --
+ drivers/misc/mic/host/mic_intr.c | 635 -------
+ drivers/misc/mic/host/mic_intr.h | 137 --
+ drivers/misc/mic/host/mic_main.c | 335 ----
+ drivers/misc/mic/host/mic_smpt.c | 427 -----
+ drivers/misc/mic/host/mic_smpt.h | 87 -
+ drivers/misc/mic/host/mic_x100.c | 585 -------
+ drivers/misc/mic/host/mic_x100.h | 77 -
+ drivers/misc/mic/scif/Makefile | 21 -
+ drivers/misc/mic/scif/scif_api.c | 1485 ----------------
+ drivers/misc/mic/scif/scif_debugfs.c | 116 --
+ drivers/misc/mic/scif/scif_dma.c | 1940 ---------------------
+ drivers/misc/mic/scif/scif_epd.c | 357 ----
+ drivers/misc/mic/scif/scif_epd.h | 200 ---
+ drivers/misc/mic/scif/scif_fd.c | 462 -----
+ drivers/misc/mic/scif/scif_fence.c | 783 ---------
+ drivers/misc/mic/scif/scif_main.c | 351 ----
+ drivers/misc/mic/scif/scif_main.h | 274 ---
+ drivers/misc/mic/scif/scif_map.h | 127 --
+ drivers/misc/mic/scif/scif_mmap.c | 690 --------
+ drivers/misc/mic/scif/scif_nm.c | 229 ---
+ drivers/misc/mic/scif/scif_nodeqp.c | 1349 --------------
+ drivers/misc/mic/scif/scif_nodeqp.h | 221 ---
+ drivers/misc/mic/scif/scif_peer_bus.c | 175 --
+ drivers/misc/mic/scif/scif_peer_bus.h | 23 -
+ drivers/misc/mic/scif/scif_ports.c | 116 --
+ drivers/misc/mic/scif/scif_rb.c | 240 ---
+ drivers/misc/mic/scif/scif_rb.h | 100 --
+ drivers/misc/mic/scif/scif_rma.c | 1760 -------------------
+ drivers/misc/mic/scif/scif_rma.h | 477 -----
+ drivers/misc/mic/scif/scif_rma_list.c | 282 ---
+ drivers/misc/mic/scif/scif_rma_list.h | 48 -
+ drivers/misc/mic/vop/Makefile | 10 -
+ drivers/misc/mic/vop/vop_debugfs.c | 184 --
+ drivers/misc/mic/vop/vop_main.c | 784 ---------
+ drivers/misc/mic/vop/vop_main.h | 158 --
+ drivers/misc/mic/vop/vop_vringh.c | 1166 -------------
+ include/linux/mic_bus.h | 100 --
+ include/linux/scif.h | 1339 --------------
+ include/uapi/linux/mic_common.h | 235 ---
+ include/uapi/linux/mic_ioctl.h | 77 -
+ samples/mic/mpssd/.gitignore | 2 -
+ samples/mic/mpssd/Makefile | 28 -
+ samples/mic/mpssd/micctrl | 162 --
+ samples/mic/mpssd/mpss | 189 --
+ samples/mic/mpssd/mpssd.c | 1815 -------------------
+ samples/mic/mpssd/mpssd.h | 89 -
+ samples/mic/mpssd/sysfs.c | 91 -
+ 89 files changed, 9 insertions(+), 26780 deletions(-)
+ delete mode 100644 Documentation/misc-devices/mic/index.rst
+ delete mode 100644 Documentation/misc-devices/mic/mic_overview.rst
+ delete mode 100644 Documentation/misc-devices/mic/scif_overview.rst
+ delete mode 100644 drivers/dma/mic_x100_dma.c
+ delete mode 100644 drivers/dma/mic_x100_dma.h
+ delete mode 100644 drivers/misc/mic/Kconfig
+ delete mode 100644 drivers/misc/mic/Makefile
+ delete mode 100644 drivers/misc/mic/bus/Makefile
+ delete mode 100644 drivers/misc/mic/bus/cosm_bus.c
+ delete mode 100644 drivers/misc/mic/bus/cosm_bus.h
+ delete mode 100644 drivers/misc/mic/bus/mic_bus.c
+ delete mode 100644 drivers/misc/mic/bus/scif_bus.c
+ delete mode 100644 drivers/misc/mic/bus/scif_bus.h
+ delete mode 100644 drivers/misc/mic/bus/vop_bus.c
+ delete mode 100644 drivers/misc/mic/bus/vop_bus.h
+ delete mode 100644 drivers/misc/mic/card/Makefile
+ delete mode 100644 drivers/misc/mic/card/mic_debugfs.c
+ delete mode 100644 drivers/misc/mic/card/mic_device.c
+ delete mode 100644 drivers/misc/mic/card/mic_device.h
+ delete mode 100644 drivers/misc/mic/card/mic_x100.c
+ delete mode 100644 drivers/misc/mic/card/mic_x100.h
+ delete mode 100644 drivers/misc/mic/common/mic_dev.h
+ delete mode 100644 drivers/misc/mic/cosm/Makefile
+ delete mode 100644 drivers/misc/mic/cosm/cosm_debugfs.c
+ delete mode 100644 drivers/misc/mic/cosm/cosm_main.c
+ delete mode 100644 drivers/misc/mic/cosm/cosm_main.h
+ delete mode 100644 drivers/misc/mic/cosm/cosm_scif_server.c
+ delete mode 100644 drivers/misc/mic/cosm/cosm_sysfs.c
+ delete mode 100644 drivers/misc/mic/cosm_client/Makefile
+ delete mode 100644 drivers/misc/mic/cosm_client/cosm_scif_client.c
+ delete mode 100644 drivers/misc/mic/host/Makefile
+ delete mode 100644 drivers/misc/mic/host/mic_boot.c
+ delete mode 100644 drivers/misc/mic/host/mic_debugfs.c
+ delete mode 100644 drivers/misc/mic/host/mic_device.h
+ delete mode 100644 drivers/misc/mic/host/mic_intr.c
+ delete mode 100644 drivers/misc/mic/host/mic_intr.h
+ delete mode 100644 drivers/misc/mic/host/mic_main.c
+ delete mode 100644 drivers/misc/mic/host/mic_smpt.c
+ delete mode 100644 drivers/misc/mic/host/mic_smpt.h
+ delete mode 100644 drivers/misc/mic/host/mic_x100.c
+ delete mode 100644 drivers/misc/mic/host/mic_x100.h
+ delete mode 100644 drivers/misc/mic/scif/Makefile
+ delete mode 100644 drivers/misc/mic/scif/scif_api.c
+ delete mode 100644 drivers/misc/mic/scif/scif_debugfs.c
+ delete mode 100644 drivers/misc/mic/scif/scif_dma.c
+ delete mode 100644 drivers/misc/mic/scif/scif_epd.c
+ delete mode 100644 drivers/misc/mic/scif/scif_epd.h
+ delete mode 100644 drivers/misc/mic/scif/scif_fd.c
+ delete mode 100644 drivers/misc/mic/scif/scif_fence.c
+ delete mode 100644 drivers/misc/mic/scif/scif_main.c
+ delete mode 100644 drivers/misc/mic/scif/scif_main.h
+ delete mode 100644 drivers/misc/mic/scif/scif_map.h
+ delete mode 100644 drivers/misc/mic/scif/scif_mmap.c
+ delete mode 100644 drivers/misc/mic/scif/scif_nm.c
+ delete mode 100644 drivers/misc/mic/scif/scif_nodeqp.c
+ delete mode 100644 drivers/misc/mic/scif/scif_nodeqp.h
+ delete mode 100644 drivers/misc/mic/scif/scif_peer_bus.c
+ delete mode 100644 drivers/misc/mic/scif/scif_peer_bus.h
+ delete mode 100644 drivers/misc/mic/scif/scif_ports.c
+ delete mode 100644 drivers/misc/mic/scif/scif_rb.c
+ delete mode 100644 drivers/misc/mic/scif/scif_rb.h
+ delete mode 100644 drivers/misc/mic/scif/scif_rma.c
+ delete mode 100644 drivers/misc/mic/scif/scif_rma.h
+ delete mode 100644 drivers/misc/mic/scif/scif_rma_list.c
+ delete mode 100644 drivers/misc/mic/scif/scif_rma_list.h
+ delete mode 100644 drivers/misc/mic/vop/Makefile
+ delete mode 100644 drivers/misc/mic/vop/vop_debugfs.c
+ delete mode 100644 drivers/misc/mic/vop/vop_main.c
+ delete mode 100644 drivers/misc/mic/vop/vop_main.h
+ delete mode 100644 drivers/misc/mic/vop/vop_vringh.c
+ delete mode 100644 include/linux/mic_bus.h
+ delete mode 100644 include/linux/scif.h
+ delete mode 100644 include/uapi/linux/mic_common.h
+ delete mode 100644 include/uapi/linux/mic_ioctl.h
+ delete mode 100644 samples/mic/mpssd/.gitignore
+ delete mode 100644 samples/mic/mpssd/Makefile
+ delete mode 100755 samples/mic/mpssd/micctrl
+ delete mode 100755 samples/mic/mpssd/mpss
+ delete mode 100644 samples/mic/mpssd/mpssd.c
+ delete mode 100644 samples/mic/mpssd/mpssd.h
+ delete mode 100644 samples/mic/mpssd/sysfs.c
+Merging soundwire-fixes/fixes (3650b228f83a Linux 5.10-rc1)
+$ git merge soundwire-fixes/fixes
+Already up to date.
+Merging thunderbolt-fixes/fixes (7342ca34d931 thunderbolt: Add the missed ida_simple_remove() in ring_request_msix())
+$ git merge thunderbolt-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/thunderbolt/nhi.c | 19 +++++++++++++++----
+ 1 file changed, 15 insertions(+), 4 deletions(-)
+Merging input-current/for-linus (b1884583fcd1 Input: i8042 - allow insmod to succeed on devices without an i8042 controller)
+$ git merge input-current/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/input/misc/adxl34x.c | 2 +-
+ drivers/input/serio/i8042.c | 12 +++++++++++-
+ 2 files changed, 12 insertions(+), 2 deletions(-)
+Merging crypto-current/master (c3a98c3ad5c0 crypto: x86/poly1305 - add back a needed assignment)
+$ git merge crypto-current/master
+Already up to date.
+Merging ide/master (6800cd8cbc6e ide-acpi: use %*ph to print small buffer)
+$ git merge ide/master
+Auto-merging include/linux/ide.h
+Auto-merging drivers/ide/sis5513.c
+Auto-merging drivers/ide/ide-acpi.c
+Auto-merging drivers/ide/hpt366.c
+Auto-merging drivers/ide/Kconfig
+Merge made by the 'recursive' strategy.
+ drivers/ide/Kconfig | 2 +-
+ drivers/ide/aec62xx.c | 3 +--
+ drivers/ide/alim15x3.c | 3 +--
+ drivers/ide/amd74xx.c | 3 +--
+ drivers/ide/atiixp.c | 3 +--
+ drivers/ide/cmd64x.c | 3 +--
+ drivers/ide/cs5520.c | 3 +--
+ drivers/ide/cs5530.c | 3 +--
+ drivers/ide/cs5535.c | 3 +--
+ drivers/ide/cs5536.c | 3 +--
+ drivers/ide/cy82c693.c | 3 +--
+ drivers/ide/delkin_cb.c | 32 ++++++--------------------------
+ drivers/ide/hpt366.c | 5 ++---
+ drivers/ide/ide-acpi.c | 5 +----
+ drivers/ide/ide-pci-generic.c | 3 +--
+ drivers/ide/it8172.c | 3 +--
+ drivers/ide/it8213.c | 3 +--
+ drivers/ide/it821x.c | 3 +--
+ drivers/ide/jmicron.c | 3 +--
+ drivers/ide/ns87415.c | 3 +--
+ drivers/ide/opti621.c | 3 +--
+ drivers/ide/pdc202xx_new.c | 3 +--
+ drivers/ide/pdc202xx_old.c | 3 +--
+ drivers/ide/piix.c | 3 +--
+ drivers/ide/sc1200.c | 43 ++++++++++++++-----------------------------
+ drivers/ide/serverworks.c | 3 +--
+ drivers/ide/setup-pci.c | 29 ++++++-----------------------
+ drivers/ide/siimage.c | 3 +--
+ drivers/ide/sis5513.c | 3 +--
+ drivers/ide/sl82c105.c | 3 +--
+ drivers/ide/slc90e66.c | 3 +--
+ drivers/ide/triflex.c | 24 ++++++++----------------
+ drivers/ide/via82cxxx.c | 3 +--
+ include/linux/ide.h | 8 +-------
+ 34 files changed, 65 insertions(+), 161 deletions(-)
+Merging vfio-fixes/for-linus (aae7a75a821a vfio/type1: Add proper error unwind for vfio_iommu_replay())
+$ git merge vfio-fixes/for-linus
+Already up to date.
+Merging kselftest-fixes/fixes (1488472e712d selftests: binderfs: use SKIP instead of XFAIL)
+$ git merge kselftest-fixes/fixes
+Merge made by the 'recursive' strategy.
+ tools/testing/selftests/android/ion/ipcsocket.c | 1 +
+ tools/testing/selftests/android/ion/ipcsocket.h | 2 --
+ .../selftests/clone3/clone3_cap_checkpoint_restore.c | 2 +-
+ tools/testing/selftests/core/close_range_test.c | 8 ++++----
+ .../testing/selftests/filesystems/binderfs/binderfs_test.c | 8 ++++----
+ .../selftests/ftrace/test.d/dynevent/add_remove_kprobe.tc | 2 +-
+ .../ftrace/test.d/dynevent/clear_select_events.tc | 2 +-
+ .../ftrace/test.d/dynevent/generic_clear_event.tc | 2 +-
+ .../ftrace/test.d/ftrace/func-filter-notrace-pid.tc | 2 +-
+ .../selftests/ftrace/test.d/ftrace/func-filter-pid.tc | 2 +-
+ .../ftrace/test.d/ftrace/func-filter-stacktrace.tc | 4 ++--
+ tools/testing/selftests/ftrace/test.d/functions | 7 +++++++
+ .../selftests/ftrace/test.d/kprobe/add_and_remove.tc | 2 +-
+ tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc | 2 +-
+ .../testing/selftests/ftrace/test.d/kprobe/kprobe_args.tc | 4 ++--
+ .../selftests/ftrace/test.d/kprobe/kprobe_args_comm.tc | 2 +-
+ .../selftests/ftrace/test.d/kprobe/kprobe_args_string.tc | 4 ++--
+ .../selftests/ftrace/test.d/kprobe/kprobe_args_symbol.tc | 10 +++++-----
+ .../selftests/ftrace/test.d/kprobe/kprobe_args_type.tc | 2 +-
+ .../selftests/ftrace/test.d/kprobe/kprobe_args_user.tc | 4 ++++
+ .../selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc | 14 +++++++-------
+ .../selftests/ftrace/test.d/kprobe/kprobe_multiprobe.tc | 2 +-
+ .../selftests/ftrace/test.d/kprobe/kprobe_syntax_errors.tc | 12 ++++++------
+ .../selftests/ftrace/test.d/kprobe/kretprobe_args.tc | 4 ++--
+ tools/testing/selftests/ftrace/test.d/kprobe/profile.tc | 2 +-
+ tools/testing/selftests/kselftest_harness.h | 2 +-
+ tools/testing/selftests/lib.mk | 2 +-
+ tools/testing/selftests/pidfd/config | 1 +
+ tools/testing/selftests/pidfd/pidfd_getfd_test.c | 5 ++++-
+ tools/testing/selftests/pidfd/pidfd_open_test.c | 1 -
+ tools/testing/selftests/pidfd/pidfd_poll_test.c | 1 -
+ tools/testing/selftests/pidfd/pidfd_setns_test.c | 1 -
+ tools/testing/selftests/pidfd/pidfd_test.c | 2 +-
+ tools/testing/selftests/proc/proc-loadavg-001.c | 1 -
+ tools/testing/selftests/proc/proc-self-syscall.c | 1 -
+ tools/testing/selftests/proc/proc-uptime-002.c | 1 -
+ 36 files changed, 66 insertions(+), 58 deletions(-)
+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 dmaengine-fixes/fixes (768664114b1a dmaengine: ti: k3-udma: fix -Wenum-conversion warning)
+$ git merge dmaengine-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/dma/idxd/device.c | 29 ++++++++++++++---------------
+ drivers/dma/idxd/idxd.h | 3 ++-
+ drivers/dma/idxd/init.c | 5 +++++
+ drivers/dma/idxd/registers.h | 23 ++++++++++++++++++++++-
+ drivers/dma/ti/k3-udma-private.c | 2 +-
+ 5 files changed, 44 insertions(+), 18 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 (324f78dfb442 mtd: spi-nor: Fix address width on flash chips > 16MB)
+$ git merge mtd-fixes/mtd/fixes
+Merge made by the 'recursive' strategy.
+ drivers/mtd/nand/raw/fsl_ifc_nand.c | 43 +++++++++++++++++++++----------------
+ drivers/mtd/nand/raw/mxc_nand.c | 17 +++++----------
+ drivers/mtd/spi-nor/core.c | 13 +++++------
+ 3 files changed, 36 insertions(+), 37 deletions(-)
+Merging mfd-fixes/for-mfd-fixes (22380b65dc70 mfd: mfd-core: Ensure disabled devices are ignored without error)
+$ git merge mfd-fixes/for-mfd-fixes
+Already up to date.
+Merging v4l-dvb-fixes/fixes (d0254f82d702 media: dt-bindings: media: imx274: Convert to json-schema)
+$ 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 (31b4d8e172f6 MIPS: export has_transparent_hugepage() for modules)
+$ git merge mips-fixes/mips-fixes
+Merge made by the 'recursive' strategy.
+ arch/mips/mm/tlb-r4k.c | 1 +
+ 1 file changed, 1 insertion(+)
+Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1)
+$ git merge at91-fixes/at91-fixes
+Already up to date.
+Merging omap-fixes/fixes (8f04aea048d5 ARM: OMAP2+: Restore MPU power domain if cpu_cluster_pm_enter() fails)
+$ git merge omap-fixes/fixes
+Already up to date.
+Merging kvm-fixes/master (5a169bf04cd2 x86/kvm: Reserve KVM_FEATURE_MSI_EXT_DEST_ID)
+$ git merge kvm-fixes/master
+Merge made by the 'recursive' strategy.
+ Documentation/virt/kvm/cpuid.rst | 4 ++++
+ arch/x86/include/uapi/asm/kvm_para.h | 1 +
+ 2 files changed, 5 insertions(+)
+Merging kvms390-fixes/master (f20d4e924b44 docs: kvm: add documentation for KVM_CAP_S390_DIAG318)
+$ git merge kvms390-fixes/master
+Already up to date.
+Merging hwmon-fixes/hwmon (402dab548d0d hwmon: (pmbus/max20730) use scnprintf() instead of snprintf())
+$ git merge hwmon-fixes/hwmon
+Merge made by the 'recursive' strategy.
+ drivers/hwmon/pmbus/max20730.c | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+Merging nvdimm-fixes/libnvdimm-fixes (88b67edd7247 dax: Fix compilation for CONFIG_DAX && !CONFIG_FS_DAX)
+$ git merge nvdimm-fixes/libnvdimm-fixes
+Already up to date.
+Merging btrfs-fixes/next-fixes (45d8f990a77f Merge branch 'misc-5.10' into next-fixes)
+$ git merge btrfs-fixes/next-fixes
+Auto-merging fs/btrfs/disk-io.c
+Merge made by the 'recursive' strategy.
+ fs/btrfs/backref.c | 13 ++++-
+ fs/btrfs/block-group.c | 1 +
+ fs/btrfs/ctree.h | 2 +
+ fs/btrfs/dev-replace.c | 5 ++
+ fs/btrfs/disk-io.c | 139 ++++++++++++++++++++++++++++++++++--------------
+ fs/btrfs/disk-io.h | 3 ++
+ fs/btrfs/extent-tree.c | 2 +-
+ fs/btrfs/file.c | 3 +-
+ fs/btrfs/inode.c | 8 ++-
+ fs/btrfs/qgroup.c | 18 +++++++
+ fs/btrfs/reada.c | 47 ++++++++++++++++
+ fs/btrfs/tree-checker.c | 18 +++++++
+ fs/btrfs/volumes.c | 5 +-
+ fs/btrfs/volumes.h | 12 ++---
+ 14 files changed, 225 insertions(+), 51 deletions(-)
+Merging vfs-fixes/fixes (77f6ab8b7768 don't dump the threads that had been already exiting when zapped.)
+$ git merge vfs-fixes/fixes
+Merge made by the 'recursive' strategy.
+ kernel/exit.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+Merging dma-mapping-fixes/for-linus (892fc9f6835e dma-pool: Fix an uninitialized variable bug in atomic_pool_expand())
+$ 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 (3650b228f83a Linux 5.10-rc1)
+$ git merge drivers-x86-fixes/fixes
+Already up to date.
+Merging samsung-krzk-fixes/fixes (cd12e4f14f7c CREDITS: remove trailing white spaces)
+$ git merge samsung-krzk-fixes/fixes
+Auto-merging MAINTAINERS
+CONFLICT (content): Merge conflict in MAINTAINERS
+Auto-merging CREDITS
+Resolved 'MAINTAINERS' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master a2590968e85f] Merge remote-tracking branch 'samsung-krzk-fixes/fixes' into master
+$ git diff -M --stat --summary HEAD^..
+ CREDITS | 62 +++++++++++++++++++++++++++++++++++--------------------------
+ MAINTAINERS | 18 +-----------------
+ 2 files changed, 37 insertions(+), 43 deletions(-)
+Merging pinctrl-samsung-fixes/pinctrl-fixes (3650b228f83a Linux 5.10-rc1)
+$ git merge pinctrl-samsung-fixes/pinctrl-fixes
+Already up to date.
+Merging devicetree-fixes/dt/linus (f84e2c5c528d dt-bindings: Another round of adding missing 'additionalProperties/unevalutatedProperties')
+$ git merge devicetree-fixes/dt/linus
+Already up to date.
+Merging scsi-fixes/fixes (fab09aaee803 scsi: hisi_sas: Stop using queue #0 always for v2 hw)
+$ git merge scsi-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/message/fusion/mptscsih.c | 13 ++++++++-----
+ drivers/scsi/hisi_sas/hisi_sas_main.c | 2 +-
+ drivers/scsi/ibmvscsi/ibmvscsi.c | 36 +++++++++++++++++++++++++----------
+ drivers/scsi/qla2xxx/qla_nvme.c | 6 ++++--
+ drivers/scsi/scsi_scan.c | 7 ++++---
+ 5 files changed, 43 insertions(+), 21 deletions(-)
+Merging drm-fixes/drm-fixes (3650b228f83a Linux 5.10-rc1)
+$ 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 (55fc0bc9d97b lockdep: Fix nr_unused_locks)
+$ git merge drm-intel-fixes/for-linux-next-fixes
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/i915/display/intel_display.c | 4 ++
+ drivers/gpu/drm/i915/gem/i915_gem_domain.c | 28 ++++----
+ drivers/gpu/drm/i915/gt/intel_lrc.c | 27 +++++---
+ drivers/gpu/drm/i915/gt/intel_timeline.c | 18 ++---
+ drivers/gpu/drm/i915/gt/intel_timeline_types.h | 2 +
+ drivers/gpu/drm/i915/i915_pci.c | 1 +
+ drivers/gpu/drm/i915/intel_memory_region.c | 2 +-
+ .../gpu/drm/i915/selftests/intel_memory_region.c | 77 ++++++++++++++++++++++
+ drivers/gpu/drm/i915/selftests/mock_region.c | 2 +-
+ kernel/locking/lockdep.c | 14 ++--
+ 10 files changed, 132 insertions(+), 43 deletions(-)
+Merging mmc-fixes/fixes (011fde48394b mmc: sdhci-of-esdhc: make sure delay chain locked for HS400)
+$ git merge mmc-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/mmc/host/sdhci-esdhc.h | 2 ++
+ drivers/mmc/host/sdhci-of-esdhc.c | 28 ++++++++++++++++++++++++++++
+ drivers/mmc/host/sdhci.c | 6 ++++--
+ 3 files changed, 34 insertions(+), 2 deletions(-)
+Merging rtc-fixes/rtc-fixes (9123e3a74ec7 Linux 5.9-rc1)
+$ git merge rtc-fixes/rtc-fixes
+Already up to date.
+Merging gnss-fixes/gnss-linus (48778464bb7d Linux 5.8-rc2)
+$ git merge gnss-fixes/gnss-linus
+Already up to date.
+Merging hyperv-fixes/hyperv-fixes (dbf563eee0b8 x86/hyperv: Clarify comment on x2apic mode)
+$ git merge hyperv-fixes/hyperv-fixes
+Auto-merging drivers/hv/hv_balloon.c
+Merge made by the 'recursive' strategy.
+ arch/x86/hyperv/hv_apic.c | 14 +++++++++-----
+ drivers/hv/hv_balloon.c | 2 +-
+ 2 files changed, 10 insertions(+), 6 deletions(-)
+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 (84814460eef9 riscv: Fixup bootup failure with HARDENED_USERCOPY)
+$ git merge risc-v-fixes/fixes
+Already up to date.
+Merging pidfd-fixes/fixes (bda4c60d02e9 sys: Convert to the new fallthrough notation)
+$ git merge pidfd-fixes/fixes
+Auto-merging net/ipv4/tcp_metrics.c
+Auto-merging net/core/net_namespace.c
+Auto-merging net/core/net-sysfs.c
+Auto-merging kernel/user_namespace.c
+Auto-merging kernel/sys.c
+Auto-merging kernel/pid_namespace.c
+Auto-merging kernel/pid.c
+Auto-merging kernel/cgroup/cgroup.c
+Auto-merging include/net/net_namespace.h
+Auto-merging fs/namespace.c
+Merge made by the 'recursive' strategy.
+ fs/mount.h | 3 +--
+ fs/namespace.c | 4 ++--
+ include/linux/cgroup.h | 5 ++---
+ include/linux/ipc_namespace.h | 3 +--
+ include/linux/ns_common.h | 3 +++
+ include/linux/pid_namespace.h | 4 +---
+ include/linux/time_namespace.h | 9 ++++-----
+ include/linux/user_namespace.h | 5 ++---
+ include/linux/utsname.h | 9 ++++-----
+ include/net/net_namespace.h | 11 ++++-------
+ include/uapi/linux/ptrace.h | 3 ++-
+ init/version.c | 2 +-
+ ipc/msgutil.c | 2 +-
+ ipc/namespace.c | 4 ++--
+ kernel/cgroup/cgroup.c | 2 +-
+ kernel/cgroup/namespace.c | 2 +-
+ kernel/pid.c | 2 +-
+ kernel/pid_namespace.c | 13 +++----------
+ kernel/time/namespace.c | 9 +++------
+ kernel/user.c | 2 +-
+ kernel/user_namespace.c | 4 ++--
+ kernel/utsname.c | 7 ++-----
+ net/core/net-sysfs.c | 6 +++---
+ net/core/net_namespace.c | 6 +++---
+ net/ipv4/inet_timewait_sock.c | 4 ++--
+ net/ipv4/tcp_metrics.c | 2 +-
+ 26 files changed, 53 insertions(+), 73 deletions(-)
+Merging fpga-fixes/fixes (8614afd689df fpga: dfl: fix bug in port reset handshake)
+$ git merge fpga-fixes/fixes
+Already up to date.
+Merging spdx/spdx-linus (3650b228f83a Linux 5.10-rc1)
+$ git merge spdx/spdx-linus
+Already up to date.
+Merging gpio-intel-fixes/fixes (3650b228f83a Linux 5.10-rc1)
+$ git merge gpio-intel-fixes/fixes
+Already up to date.
+Merging pinctrl-intel-fixes/fixes (3650b228f83a Linux 5.10-rc1)
+$ git merge pinctrl-intel-fixes/fixes
+Already up to date.
+Merging erofs-fixes/fixes (9ebcfadb0610 Linux 5.8-rc3)
+$ git merge erofs-fixes/fixes
+Already up to date.
+Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc())
+$ git merge integrity-fixes/fixes
+Already up to date.
+Merging kunit-fixes/kunit-fixes (0d0d245104a4 kunit: tools: fix kunit_tool tests for parsing test plans)
+$ git merge kunit-fixes/kunit-fixes
+Merge made by the 'recursive' strategy.
+ Documentation/dev-tools/kunit/start.rst | 2 +-
+ Documentation/dev-tools/kunit/usage.rst | 5 ++++
+ include/kunit/test.h | 16 +++++------
+ tools/testing/kunit/kunit_parser.py | 3 +-
+ tools/testing/kunit/kunit_tool_test.py | 32 ++++++++++++++++-----
+ .../kunit/test_data/test_config_printk_time.log | Bin 1584 -> 1605 bytes
+ .../test_data/test_interrupted_tap_output.log | Bin 1982 -> 2003 bytes
+ .../test_data/test_kernel_panic_interrupt.log | Bin 1321 -> 1342 bytes
+ .../kunit/test_data/test_multiple_prefixes.log | Bin 1832 -> 1861 bytes
+ .../kunit/test_data/test_pound_no_prefix.log | Bin 1193 -> 1200 bytes
+ tools/testing/kunit/test_data/test_pound_sign.log | Bin 1656 -> 1676 bytes
+ 11 files changed, 40 insertions(+), 18 deletions(-)
+Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes)
+$ git merge ubifs-fixes/fixes
+Already up to date.
+Merging memblock-fixes/fixes (5f7b81c18366 ia64: fix min_low_pfn/max_low_pfn build errors)
+$ git merge memblock-fixes/fixes
+Already up to date.
+Merging drm-misc-fixes/for-linux-next-fixes (5066f42c7d3c drm/vc4: Rework the structure conversion functions)
+$ git merge drm-misc-fixes/for-linux-next-fixes
+Merge made by the 'recursive' strategy.
+ .../display/panel/mantix,mlaf057we51-x.yaml | 4 +++
+ drivers/gpu/drm/drm_dp_helper.c | 12 +++++++-
+ drivers/gpu/drm/drm_edid.c | 2 +-
+ drivers/gpu/drm/drm_gem.c | 4 +--
+ drivers/gpu/drm/drm_gem_shmem_helper.c | 7 ++++-
+ drivers/gpu/drm/drm_prime.c | 1 +
+ drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c | 25 ++++++++++-----
+ drivers/gpu/drm/sun4i/sun4i_frontend.c | 36 ++++++----------------
+ drivers/gpu/drm/sun4i/sun4i_frontend.h | 6 +---
+ drivers/gpu/drm/v3d/v3d_gem.c | 1 -
+ drivers/gpu/drm/vc4/vc4_drv.c | 1 +
+ drivers/gpu/drm/vc4/vc4_drv.h | 12 ++++----
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 6 ++--
+ include/drm/drm_dp_helper.h | 2 +-
+ include/drm/drm_edid.h | 7 -----
+ include/drm/drm_print.h | 20 ++++++++++--
+ 16 files changed, 82 insertions(+), 64 deletions(-)
+Merging kspp-gustavo/for-next/kspp (080bd2ae9a6c printk: ringbuffer: Replace zero-length array with flexible-array member)
+$ git merge kspp-gustavo/for-next/kspp
+Merge made by the 'recursive' strategy.
+ drivers/bluetooth/btintel.h | 2 +-
+ drivers/misc/mei/hw.h | 6 +++---
+ drivers/net/ethernet/freescale/enetc/enetc_qos.c | 2 +-
+ drivers/net/ethernet/google/gve/gve_adminq.h | 2 +-
+ drivers/net/ethernet/google/gve/gve_main.c | 5 ++---
+ drivers/target/target_core_user.c | 2 +-
+ fs/binfmt_elf.c | 2 +-
+ fs/hfs/btree.h | 2 +-
+ fs/hfsplus/hfsplus_fs.h | 2 +-
+ fs/isofs/rock.h | 8 ++++----
+ fs/select.c | 4 ++--
+ include/linux/dma/ti-cppi5.h | 4 ++--
+ include/linux/fs.h | 2 +-
+ include/linux/mailbox/zynqmp-ipi-message.h | 2 +-
+ include/linux/mlx5/mlx5_ifc.h | 4 ++--
+ include/linux/platform_data/cros_ec_commands.h | 14 +++++++-------
+ include/linux/platform_data/cros_ec_proto.h | 2 +-
+ kernel/params.c | 2 +-
+ kernel/printk/printk_ringbuffer.c | 2 +-
+ kernel/tracepoint.c | 2 +-
+ net/bluetooth/msft.c | 3 ++-
+ net/smc/smc_clc.h | 4 ++--
+ security/integrity/ima/ima.h | 2 +-
+ 23 files changed, 40 insertions(+), 40 deletions(-)
+Merging kbuild/for-next (729e39a558eb kconfig: qconf: convert to Qt5 new signal/slot connection syntax)
+$ git merge kbuild/for-next
+Merge made by the 'recursive' strategy.
+ scripts/kconfig/qconf-cfg.sh | 14 +----
+ scripts/kconfig/qconf.cc | 136 +++++++++++++++++++++++++------------------
+ 2 files changed, 81 insertions(+), 69 deletions(-)
+Merging compiler-attributes/compiler-attributes (bbf5c979011a Linux 5.9)
+$ git merge compiler-attributes/compiler-attributes
+Already up to date.
+Merging dma-mapping/for-next (48ab6d5d1f09 dma-mapping: fix 32-bit overflow with CONFIG_ARM_LPAE=n)
+$ git merge dma-mapping/for-next
+Merge made by the 'recursive' strategy.
+ drivers/of/device.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+Merging asm-generic/master (24a23387c15f Merge branch 'asm-generic-cleanup' into asm-generic)
+$ git merge asm-generic/master
+Merge made by the 'recursive' strategy.
+ arch/alpha/include/asm/mmu_context.h | 12 ++----
+ arch/arc/include/asm/mmu_context.h | 17 ++++----
+ arch/arm/include/asm/mmu_context.h | 26 ++-----------
+ arch/arm64/include/asm/mmu_context.h | 8 ++--
+ arch/c6x/include/asm/mmu_context.h | 6 +++
+ arch/csky/include/asm/mmu_context.h | 8 ++--
+ arch/hexagon/include/asm/mmu_context.h | 33 +++-------------
+ arch/ia64/include/asm/mmu_context.h | 17 ++------
+ arch/m68k/include/asm/mmu_context.h | 38 +++++-------------
+ arch/microblaze/include/asm/mmu_context.h | 2 +-
+ arch/microblaze/include/asm/mmu_context_mm.h | 8 ++--
+ arch/microblaze/include/asm/processor.h | 3 --
+ arch/mips/include/asm/mmu_context.h | 11 ++----
+ arch/nds32/include/asm/mmu_context.h | 10 +----
+ arch/nios2/include/asm/mmu_context.h | 21 ++--------
+ arch/openrisc/include/asm/mmu_context.h | 8 ++--
+ arch/parisc/include/asm/mmu_context.h | 12 +++---
+ arch/powerpc/include/asm/mmu_context.h | 13 ++++---
+ arch/riscv/include/asm/mmu_context.h | 22 +----------
+ arch/s390/include/asm/mmu_context.h | 9 ++---
+ arch/sh/include/asm/mmu_context.h | 7 ++--
+ arch/sh/include/asm/mmu_context_32.h | 9 -----
+ arch/sparc/include/asm/mmu_context_32.h | 10 ++---
+ arch/sparc/include/asm/mmu_context_64.h | 10 ++---
+ arch/um/include/asm/mmu_context.h | 12 +++---
+ arch/x86/include/asm/mmu_context.h | 6 +++
+ arch/xtensa/include/asm/mmu_context.h | 11 ++----
+ arch/xtensa/include/asm/nommu_context.h | 26 +------------
+ include/asm-generic/bitops/builtin-ffs.h | 5 +--
+ include/asm-generic/mmu_context.h | 58 +++++++++++++++++++++-------
+ include/asm-generic/nommu_context.h | 19 +++++++++
+ include/asm-generic/percpu.h | 18 ++++-----
+ include/asm-generic/qrwlock.h | 8 ++--
+ include/asm-generic/qspinlock.h | 4 +-
+ include/asm-generic/uaccess.h | 6 ++-
+ include/linux/compiler_types.h | 11 ++++++
+ include/linux/ctype.h | 15 +++++--
+ include/uapi/asm-generic/sembuf.h | 6 +--
+ 38 files changed, 221 insertions(+), 304 deletions(-)
+ create mode 100644 arch/c6x/include/asm/mmu_context.h
+ create mode 100644 include/asm-generic/nommu_context.h
+Merging arc/for-next (def9d2780727 Linux 5.5-rc7)
+$ git merge arc/for-next
+Already up to date.
+Merging arm/for-next (20f96e606509 Merge branches 'fixes' and 'misc' into for-next)
+$ git merge arm/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/arm/memory.rst | 12 +-
+ Documentation/dev-tools/kasan.rst | 4 +-
+ .../features/debug/KASAN/arch-support.txt | 2 +-
+ arch/arm/Kconfig | 10 +
+ arch/arm/boot/compressed/Makefile | 1 +
+ arch/arm/boot/compressed/string.c | 19 ++
+ arch/arm/include/asm/fixmap.h | 2 +-
+ arch/arm/include/asm/kasan.h | 33 +++
+ arch/arm/include/asm/kasan_def.h | 81 ++++++
+ arch/arm/include/asm/memory.h | 10 +
+ arch/arm/include/asm/pgalloc.h | 8 +-
+ arch/arm/include/asm/prom.h | 4 +-
+ arch/arm/include/asm/string.h | 26 ++
+ arch/arm/include/asm/thread_info.h | 8 +
+ arch/arm/include/asm/uaccess-asm.h | 2 +-
+ arch/arm/kernel/atags.h | 4 +-
+ arch/arm/kernel/atags_parse.c | 6 +-
+ arch/arm/kernel/devtree.c | 6 +-
+ arch/arm/kernel/entry-armv.S | 3 +-
+ arch/arm/kernel/entry-common.S | 9 +-
+ arch/arm/kernel/head-common.S | 7 +-
+ arch/arm/kernel/head.S | 5 +-
+ arch/arm/kernel/setup.c | 21 +-
+ arch/arm/kernel/unwind.c | 6 +-
+ arch/arm/lib/memcpy.S | 3 +
+ arch/arm/lib/memmove.S | 5 +-
+ arch/arm/lib/memset.S | 3 +
+ arch/arm/mm/Makefile | 5 +
+ arch/arm/mm/init.c | 1 -
+ arch/arm/mm/kasan_init.c | 291 +++++++++++++++++++++
+ arch/arm/mm/mmu.c | 38 ++-
+ arch/arm/mm/pgd.c | 16 +-
+ arch/arm/mm/pv-fixup-asm.S | 4 +-
+ arch/arm/vdso/Makefile | 2 +
+ 34 files changed, 614 insertions(+), 43 deletions(-)
+ create mode 100644 arch/arm/include/asm/kasan.h
+ create mode 100644 arch/arm/include/asm/kasan_def.h
+ create mode 100644 arch/arm/mm/kasan_init.c
+Merging arm64/for-next/core (66dd3474702a arm64: proton-pack: Update comment to reflect new function name)
+$ git merge arm64/for-next/core
+Already up to date.
+Merging arm-perf/for-next/perf (887e2cff0f8d perf: arm-cmn: Fix conversion specifiers for node type)
+$ git merge arm-perf/for-next/perf
+Already up to date.
+Merging arm-soc/for-next (36ab3c32cafc ARM: SoC: document merges)
+$ git merge arm-soc/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/arm-soc-for-next-contents.txt | 45 ++++++++++++++++++++++++++++++++++
+ drivers/tee/optee/device.c | 2 +-
+ 2 files changed, 46 insertions(+), 1 deletion(-)
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+Merging amlogic/for-next (4393916840fc Merge branch 'v5.11/soc' into tmp/aml-rebuild)
+$ git merge amlogic/for-next
+Auto-merging arch/arm64/Kconfig.platforms
+Merge made by the 'recursive' strategy.
+ arch/arm64/Kconfig.platforms | 2 --
+ drivers/firmware/meson/Kconfig | 5 +++--
+ drivers/firmware/meson/meson_sm.c | 1 +
+ drivers/soc/amlogic/Kconfig | 12 ++++++------
+ drivers/soc/amlogic/meson-clk-measure.c | 5 ++++-
+ drivers/soc/amlogic/meson-ee-pwrc.c | 5 ++++-
+ drivers/soc/amlogic/meson-gx-pwrc-vpu.c | 5 ++++-
+ drivers/soc/amlogic/meson-secure-pwrc.c | 5 ++++-
+ 8 files changed, 26 insertions(+), 14 deletions(-)
+Merging aspeed/for-next (9e3ed6fa024c ARM: dts: Fix label address for 64MiB OpenBMC flash layout)
+$ git merge aspeed/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts | 6 +-
+ arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts | 924 +++++++++++++++++++++++
+ arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts | 4 +-
+ arch/arm/boot/dts/aspeed-g6.dtsi | 2 +-
+ arch/arm/boot/dts/openbmc-flash-layout-64.dtsi | 35 +
+ 6 files changed, 966 insertions(+), 6 deletions(-)
+ create mode 100644 arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts
+ create mode 100644 arch/arm/boot/dts/openbmc-flash-layout-64.dtsi
+Merging at91/at91-next (0698efbb33ef Merge branches 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next)
+$ git merge at91/at91-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/at91-kizbox.dts | 10 +++++-----
+ arch/arm/boot/dts/at91-kizbox2-common.dtsi | 8 ++++----
+ arch/arm/boot/dts/at91-kizbox3-hs.dts | 16 ++++++++--------
+ arch/arm/boot/dts/at91-kizbox3_common.dtsi | 10 +++++-----
+ arch/arm/boot/dts/at91-kizboxmini-common.dtsi | 8 ++++----
+ arch/arm/boot/dts/at91-sama5d27_som1.dtsi | 2 +-
+ arch/arm/boot/dts/at91-smartkiz.dts | 6 ++----
+ arch/arm/boot/dts/at91sam9m10g45ek.dts | 10 +++++-----
+ arch/arm/boot/dts/at91sam9rlek.dts | 10 +++++-----
+ arch/arm/configs/at91_dt_defconfig | 5 +++++
+ arch/arm/configs/sama5_defconfig | 9 +++++++++
+ drivers/soc/atmel/soc.c | 6 ++++++
+ drivers/soc/atmel/soc.h | 3 +++
+ 13 files changed, 62 insertions(+), 41 deletions(-)
+Merging drivers-memory/for-next (5ddebb22417b Merge branch 'for-v5.11/tegra-mc' into for-next)
+$ git merge drivers-memory/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 1 +
+ drivers/memory/jz4780-nemc.c | 4 ++--
+ drivers/memory/tegra/tegra210.c | 50 ++++++++++++++++++++---------------------
+ 3 files changed, 28 insertions(+), 27 deletions(-)
+Merging imx-mxs/for-next (1f35c2c8497a Merge branch 'imx/dt64' into for-next)
+$ git merge imx-mxs/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/freescale/fsl,scu.txt | 12 +-
+ .../devicetree/bindings/clock/imx8qxp-lpcg.yaml | 79 +++++--
+ arch/arm/boot/dts/imx51-zii-rdu1.dts | 2 +-
+ arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 8 +-
+ arch/arm/boot/dts/imx6ul-ccimx6ulsbcpro.dts | 2 +-
+ arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 2 +-
+ drivers/clk/imx/clk-imx8qxp-lpcg.c | 139 ++++++++++++
+ drivers/clk/imx/clk-imx8qxp.c | 136 ++++++------
+ drivers/clk/imx/clk-lpcg-scu.c | 53 ++++-
+ drivers/clk/imx/clk-scu.c | 234 ++++++++++++++++++++-
+ drivers/clk/imx/clk-scu.h | 56 ++++-
+ include/dt-bindings/clock/imx8-lpcg.h | 14 ++
+ 12 files changed, 627 insertions(+), 110 deletions(-)
+ create mode 100644 include/dt-bindings/clock/imx8-lpcg.h
+Merging keystone/next (703dff8cb900 Merge branch 'for_5.10/drivers-soc' into next)
+$ git merge keystone/next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging mediatek/for-next (6c7949eccdbd Merge branch 'v5.10-tmp/soc' into for-next)
+$ git merge mediatek/for-next
+Auto-merging arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi
+Auto-merging arch/arm64/boot/dts/mediatek/mt8183.dtsi
+Auto-merging arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/iio/adc/mt6577_auxadc.txt | 1 +
+ MAINTAINERS | 2 +-
+ arch/arm64/boot/dts/mediatek/Makefile | 1 +
+ arch/arm64/boot/dts/mediatek/mt6779-evb.dts | 31 +++
+ arch/arm64/boot/dts/mediatek/mt6779.dtsi | 271 +++++++++++++++++++++
+ arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 1 -
+ arch/arm64/boot/dts/mediatek/mt8183.dtsi | 2 +-
+ arch/arm64/boot/dts/mediatek/mt8516.dtsi | 33 ++-
+ arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi | 2 +-
+ drivers/soc/mediatek/mtk-scpsys.c | 5 +-
+ 10 files changed, 342 insertions(+), 7 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt6779-evb.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt6779.dtsi
+Merging mvebu/for-next (f89c9685f6a1 Merge branch 'mvebu/dt64' into mvebu/for-next)
+$ git merge mvebu/for-next
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 15 ++-
+ arch/arm/boot/dts/Makefile | 6 ++
+ arch/arm/boot/dts/armada-388-clearfog.dts | 4 +-
+ arch/arm/boot/dts/armada-388-clearfog.dtsi | 10 +-
+ arch/arm/boot/dts/armada-388-helios4.dts | 6 +-
+ arch/arm/boot/dts/armada-xp-98dx3236.dtsi | 12 ++-
+ arch/arm/boot/dts/armada-xp-crs305-1g-4s-bit.dts | 43 +++++++++
+ arch/arm/boot/dts/armada-xp-crs305-1g-4s.dts | 17 ++++
+ arch/arm/boot/dts/armada-xp-crs305-1g-4s.dtsi | 104 +++++++++++++++++++++
+ arch/arm/boot/dts/armada-xp-crs326-24g-2s-bit.dts | 43 +++++++++
+ arch/arm/boot/dts/armada-xp-crs326-24g-2s.dts | 17 ++++
+ arch/arm/boot/dts/armada-xp-crs326-24g-2s.dtsi | 104 +++++++++++++++++++++
+ .../boot/dts/armada-xp-crs328-4c-20s-4s-bit.dts | 43 +++++++++
+ arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dts | 17 ++++
+ arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dtsi | 104 +++++++++++++++++++++
+ arch/arm/boot/dts/dove-sbc-a510.dts | 1 +
+ arch/arm/boot/dts/kirkwood-dockstar.dts | 2 +-
+ arch/arm/boot/dts/kirkwood-dreamplug.dts | 2 +-
+ arch/arm/boot/dts/kirkwood-goflexnet.dts | 2 +-
+ .../arm/boot/dts/kirkwood-guruplug-server-plus.dts | 2 +-
+ arch/arm/boot/dts/kirkwood-iconnect.dts | 2 +-
+ arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 2 +-
+ arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi | 2 +-
+ arch/arm/boot/dts/kirkwood.dtsi | 4 +-
+ .../dts/marvell/armada-3720-espressobin-emmc.dts | 18 ----
+ .../marvell/armada-3720-espressobin-v7-emmc.dts | 36 +------
+ .../dts/marvell/armada-3720-espressobin-v7.dts | 18 +---
+ .../boot/dts/marvell/armada-3720-espressobin.dtsi | 26 +++++-
+ 28 files changed, 572 insertions(+), 90 deletions(-)
+ create mode 100644 arch/arm/boot/dts/armada-xp-crs305-1g-4s-bit.dts
+ create mode 100644 arch/arm/boot/dts/armada-xp-crs305-1g-4s.dts
+ create mode 100644 arch/arm/boot/dts/armada-xp-crs305-1g-4s.dtsi
+ create mode 100644 arch/arm/boot/dts/armada-xp-crs326-24g-2s-bit.dts
+ create mode 100644 arch/arm/boot/dts/armada-xp-crs326-24g-2s.dts
+ create mode 100644 arch/arm/boot/dts/armada-xp-crs326-24g-2s.dtsi
+ create mode 100644 arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s-bit.dts
+ create mode 100644 arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dts
+ create mode 100644 arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dtsi
+Merging omap/for-next (7a159a1ad494 Merge branch 'fixes' into for-next)
+$ git merge omap/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging qcom/for-next (6bf920418f6c Merge branches 'arm64-for-5.11', 'drivers-for-5.11' and 'dts-for-5.11' into for-next)
+$ git merge qcom/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/power/qcom,rpmpd.yaml | 3 +
+ arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts | 301 ++++++++++++++++++++-
+ arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 10 -
+ arch/arm64/boot/dts/qcom/ipq6018.dtsi | 6 +-
+ .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 10 -
+ arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi | 7 +-
+ .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 10 -
+ arch/arm64/boot/dts/qcom/msm8916.dtsi | 38 +++
+ arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 19 +-
+ arch/arm64/boot/dts/qcom/sc7180.dtsi | 106 +++++++-
+ drivers/i2c/busses/i2c-qcom-geni.c | 6 +-
+ drivers/soc/qcom/Kconfig | 5 +-
+ drivers/soc/qcom/cmd-db.c | 8 +-
+ drivers/soc/qcom/llcc-qcom.c | 115 +++++---
+ drivers/soc/qcom/qcom-geni-se.c | 55 +++-
+ drivers/soc/qcom/rpmh-rsc.c | 7 +-
+ drivers/soc/qcom/rpmpd.c | 85 +++++-
+ drivers/soc/qcom/smp2p.c | 5 +-
+ include/dt-bindings/power/qcom-rpmpd.h | 29 ++
+ 19 files changed, 708 insertions(+), 117 deletions(-)
+Merging raspberrypi/for-next (4564363351e2 ARM: dts: bcm2711: Enable the display pipeline)
+$ 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 (97fc35aeb797 Merge branches 'renesas-arm-dt-for-v5.11' and 'renesas-drivers-for-v5.11' into renesas-next)
+$ git merge renesas/next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ca.dts | 222 +++++++++++++++++++++
+ arch/arm/boot/dts/r8a7742-iwg21d-q7.dts | 99 +++++++++
+ arch/arm64/boot/dts/renesas/Makefile | 3 +
+ .../dts/renesas/aistarvision-mipi-adapter-2.1.dtsi | 4 +-
+ arch/arm64/boot/dts/renesas/cat875.dtsi | 1 -
+ ...hope-rzg2-ex-aistarvision-mipi-adapter-2.1.dtsi | 109 ++++++++++
+ arch/arm64/boot/dts/renesas/hihope-rzg2-ex.dtsi | 1 -
+ .../renesas/r8a774a1-hihope-rzg2m-ex-mipi-2.1.dts | 29 +++
+ .../renesas/r8a774b1-hihope-rzg2n-ex-mipi-2.1.dts | 16 ++
+ .../boot/dts/renesas/r8a774c0-ek874-mipi-2.1.dts | 3 +-
+ .../renesas/r8a774e1-hihope-rzg2h-ex-mipi-2.1.dts | 16 ++
+ .../boot/dts/renesas/r8a77951-salvator-xs.dts | 2 +-
+ arch/arm64/boot/dts/renesas/r8a77961.dtsi | 62 ++++++
+ .../boot/dts/renesas/r8a77965-salvator-xs.dts | 2 +-
+ arch/arm64/boot/dts/renesas/r8a77965.dtsi | 120 +++++++++++
+ arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 14 +-
+ drivers/soc/renesas/rmobile-sysc.c | 1 +
+ 17 files changed, 691 insertions(+), 13 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/renesas/hihope-rzg2-ex-aistarvision-mipi-adapter-2.1.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-ex-mipi-2.1.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-ex-mipi-2.1.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a774e1-hihope-rzg2h-ex-mipi-2.1.dts
+Merging reset/reset/next (da8c0e4ee95a reset: meson: make it possible to build as a module)
+$ git merge reset/reset/next
+Merge made by the 'recursive' strategy.
+ drivers/reset/Kconfig | 3 ++-
+ drivers/reset/reset-meson.c | 8 +++++++-
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+Merging rockchip/for-next (ba0ceb95f560 Merge branch 'v5.10-armsoc/dts64' into for-next)
+$ git merge rockchip/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging samsung-krzk/for-next (8e478332817c Merge branch 'next/drivers' into for-next)
+$ git merge samsung-krzk/for-next
+Auto-merging arch/arm/configs/multi_v7_defconfig
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/exynos3250-artik5.dtsi | 2 +-
+ arch/arm/boot/dts/exynos3250-monk.dts | 8 +-
+ arch/arm/boot/dts/exynos3250-rinato.dts | 8 +-
+ arch/arm/boot/dts/exynos3250.dtsi | 5 -
+ arch/arm/boot/dts/exynos4210-i9100.dts | 6 +-
+ arch/arm/boot/dts/exynos4210-origen.dts | 4 +-
+ arch/arm/boot/dts/exynos4210-smdkv310.dts | 22 +--
+ arch/arm/boot/dts/exynos4210-trats.dts | 35 +++-
+ arch/arm/boot/dts/exynos4210-universal_c210.dts | 29 +++
+ arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 9 +-
+ arch/arm/boot/dts/exynos4412-itop-elite.dts | 2 +-
+ arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi | 2 +-
+ arch/arm/boot/dts/exynos4412-midas.dtsi | 45 +++--
+ arch/arm/boot/dts/exynos4412-n710x.dts | 2 +-
+ arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 11 +-
+ arch/arm/boot/dts/exynos4412-odroidx.dts | 28 +--
+ arch/arm/boot/dts/exynos4412-origen.dts | 14 +-
+ arch/arm/boot/dts/exynos4412-smdk4412.dts | 20 +--
+ arch/arm/boot/dts/exynos4412.dtsi | 6 -
+ arch/arm/boot/dts/exynos5250-arndale.dts | 6 +-
+ arch/arm/boot/dts/exynos5250-smdk5250.dts | 4 +-
+ arch/arm/boot/dts/exynos5250-snow-common.dtsi | 4 +-
+ arch/arm/boot/dts/exynos5250-snow-rev5.dts | 2 +-
+ arch/arm/boot/dts/exynos5250-snow.dts | 2 +-
+ arch/arm/boot/dts/exynos5250-spring.dts | 2 +-
+ arch/arm/boot/dts/exynos5250.dtsi | 4 +-
+ arch/arm/boot/dts/exynos5410-odroidxu.dts | 18 +-
+ arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 28 +++
+ arch/arm/boot/dts/exynos5410.dtsi | 4 +
+ arch/arm/boot/dts/exynos5420-arndale-octa.dts | 4 +-
+ arch/arm/boot/dts/exynos5420-peach-pit.dts | 6 +-
+ arch/arm/boot/dts/exynos5420-smdk5420.dts | 2 +-
+ arch/arm/boot/dts/exynos5420.dtsi | 3 -
+ arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 2 +-
+ arch/arm/boot/dts/exynos5422-odroidhc1.dts | 4 +-
+ arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi | 2 +-
+ arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 4 +-
+ arch/arm/boot/dts/exynos5422-odroidxu3.dts | 26 ++-
+ arch/arm/boot/dts/exynos5422-odroidxu4.dts | 4 +-
+ arch/arm/boot/dts/exynos54xx-odroidxu-leds.dtsi | 11 +-
+ arch/arm/boot/dts/exynos54xx.dtsi | 4 +-
+ arch/arm/boot/dts/exynos5800-peach-pi.dts | 4 +-
+ arch/arm/boot/dts/s5pv210-aquila.dts | 12 +-
+ arch/arm/boot/dts/s5pv210-aries.dtsi | 4 +-
+ arch/arm/boot/dts/s5pv210-goni.dts | 14 +-
+ arch/arm/boot/dts/s5pv210-smdkv210.dts | 20 +--
+ arch/arm/configs/exynos_defconfig | 1 +
+ arch/arm/configs/multi_v7_defconfig | 1 +
+ arch/arm/mach-exynos/platsmp.c | 2 +-
+ .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 11 +-
+ arch/arm64/boot/dts/exynos/exynos5433.dtsi | 4 +-
+ arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 2 +-
+ arch/arm64/boot/dts/exynos/exynos7.dtsi | 2 +-
+ drivers/clk/samsung/clk-exynos-clkout.c | 198 +++++++++++++++------
+ drivers/cpuidle/cpuidle-big_little.c | 3 +-
+ drivers/soc/samsung/exynos-pmu.c | 11 ++
+ 56 files changed, 460 insertions(+), 233 deletions(-)
+Merging scmi/for-linux-next (3650b228f83a Linux 5.10-rc1)
+$ git merge scmi/for-linux-next
+Already up to date.
+Merging sunxi/sunxi/for-next (2f098e04ce16 Merge branch 'sunxi/fixes-for-5.10' into sunxi/for-next)
+$ git merge sunxi/sunxi/for-next
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging Documentation/devicetree/bindings/arm/sunxi.yaml
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/sunxi.yaml | 5 ++
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/sun8i-h3-zeropi.dts | 85 ++++++++++++++++++++++++
+ arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 2 +-
+ 4 files changed, 92 insertions(+), 1 deletion(-)
+ create mode 100644 arch/arm/boot/dts/sun8i-h3-zeropi.dts
+Merging tegra/for-next (9ea55312ba10 Merge branch for-5.10/arm64/defconfig into for-next)
+$ git merge tegra/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into ti-k3-next)
+$ git merge ti-k3/ti-k3-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging ti-k3-new/ti-k3-next (9dcd17be61e4 arm64: dts: ti: k3-am65: ringacc: drop ti, dma-ring-reset-quirk)
+$ git merge ti-k3-new/ti-k3-next
+Merge made by the 'recursive' strategy.
+ arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 1 -
+ arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 1 -
+ 2 files changed, 2 deletions(-)
+Merging clk/clk-next (3650b228f83a Linux 5.10-rc1)
+$ git merge clk/clk-next
+Already up to date.
+Merging clk-samsung/for-next (ff8e0ff9b996 clk: samsung: Use cached clk_hws instead of __clk_lookup() calls)
+$ git merge clk-samsung/for-next
+Already up to date.
+Merging csky/linux-next (1c8499089bc6 csky: Add memory layout 2.5G(user):1.5G(kernel))
+$ git merge csky/linux-next
+Auto-merging arch/csky/kernel/vmlinux.lds.S
+Auto-merging arch/csky/kernel/setup.c
+Auto-merging arch/csky/include/asm/mmu_context.h
+Auto-merging arch/csky/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/csky/Kconfig | 16 ++++++++++++++++
+ arch/csky/abiv1/inc/abi/ckmmu.h | 8 ++++----
+ arch/csky/abiv2/inc/abi/ckmmu.h | 14 +++++++-------
+ arch/csky/abiv2/inc/abi/entry.h | 19 ++++++++++++++++---
+ arch/csky/include/asm/memory.h | 2 +-
+ arch/csky/include/asm/mmu_context.h | 8 +-------
+ arch/csky/include/asm/page.h | 2 +-
+ arch/csky/include/asm/pgalloc.h | 2 +-
+ arch/csky/include/asm/pgtable.h | 2 +-
+ arch/csky/include/asm/processor.h | 2 +-
+ arch/csky/include/asm/segment.h | 2 +-
+ arch/csky/kernel/atomic.S | 4 ++++
+ arch/csky/kernel/entry.S | 10 ++++++++--
+ arch/csky/kernel/head.S | 10 ++++++++--
+ arch/csky/kernel/setup.c | 18 ++++++++++++++++--
+ arch/csky/kernel/smp.c | 7 +++----
+ arch/csky/kernel/vmlinux.lds.S | 2 +-
+ arch/csky/mm/fault.c | 7 +------
+ arch/csky/mm/init.c | 29 ++++++++++++++++++++++-------
+ 19 files changed, 113 insertions(+), 51 deletions(-)
+Merging h8300/h8300-next (8808515be0ed h8300: Replace <linux/clk-provider.h> by <linux/of_clk.h>)
+$ git merge h8300/h8300-next
+Auto-merging drivers/net/ethernet/smsc/smc91x.c
+Auto-merging drivers/net/ethernet/smsc/Kconfig
+Auto-merging drivers/clocksource/h8300_timer8.c
+Auto-merging arch/h8300/kernel/setup.c
+Merge made by the 'recursive' strategy.
+ arch/h8300/Kconfig.cpu | 4 ++
+ arch/h8300/boot/dts/edosk2674.dts | 10 ++++-
+ arch/h8300/boot/dts/h8300h_sim.dts | 2 +-
+ arch/h8300/boot/dts/h8s_sim.dts | 2 +-
+ arch/h8300/configs/edosk2674_defconfig | 10 ++---
+ arch/h8300/configs/h8300h-sim_defconfig | 8 +---
+ arch/h8300/configs/h8s-sim_defconfig | 8 +---
+ arch/h8300/kernel/setup.c | 2 +-
+ 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 +--
+ 15 files changed, 123 insertions(+), 62 deletions(-)
+Merging ia64/next (c331649e6371 ia64: Use libata instead of the legacy ide driver in defconfigs)
+$ git merge ia64/next
+Already up to date.
+Merging m68k/for-next (50c5feeea0af ide/macide: Convert Mac IDE driver to platform driver)
+$ git merge m68k/for-next
+Already up to date.
+Merging m68knommu/for-next (02a0b3141ed9 m68knommu: align BSS section to 4-byte boundaries)
+$ git merge m68knommu/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/kernel/vmlinux-nommu.lds | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging microblaze/next (4a17e8513376 microblaze: fix kbuild redundant file warning)
+$ git merge microblaze/next
+Already up to date.
+Merging mips/mips-next (ab7cffb8d236 MIPS: ingenic: remove unused platform_data header file)
+$ git merge mips/mips-next
+Removing include/linux/platform_data/jz4740/jz4740_nand.h
+Merge made by the 'recursive' strategy.
+ .../ABI/testing/sysfs-firmware-lefi-boardinfo | 35 ++++++++++++++++
+ arch/mips/include/asm/mach-loongson64/boot_param.h | 4 ++
+ arch/mips/loongson64/Makefile | 1 +
+ arch/mips/loongson64/boardinfo.c | 48 ++++++++++++++++++++++
+ arch/mips/loongson64/env.c | 10 +++++
+ include/linux/platform_data/jz4740/jz4740_nand.h | 25 -----------
+ 6 files changed, 98 insertions(+), 25 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-firmware-lefi-boardinfo
+ create mode 100644 arch/mips/loongson64/boardinfo.c
+ delete mode 100644 include/linux/platform_data/jz4740/jz4740_nand.h
+Merging nds32/next (54bde873682b nds32: Fix bogus reference to <asm/procinfo.h>)
+$ git merge nds32/next
+Auto-merging arch/nds32/kernel/setup.c
+Merge made by the 'recursive' strategy.
+ arch/nds32/configs/defconfig | 1 -
+ arch/nds32/kernel/setup.c | 2 +-
+ arch/nds32/kernel/time.c | 2 +-
+ arch/nds32/kernel/traps.c | 50 +++-----------------------------------------
+ 4 files changed, 5 insertions(+), 50 deletions(-)
+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 (55b2662ec665 openrisc: uaccess: Add user address space check to access_ok)
+$ git merge openrisc/for-next
+Already up to date.
+Merging parisc-hd/for-next (3b7ab4a74a2d parisc: Switch to clockevent based timers)
+$ git merge parisc-hd/for-next
+Merge made by the 'recursive' strategy.
+ arch/parisc/include/asm/processor.h | 2 -
+ arch/parisc/kernel/irq.c | 7 +-
+ arch/parisc/kernel/processor.c | 5 +-
+ arch/parisc/kernel/time.c | 164 +++++++++++++++++++-----------------
+ 4 files changed, 90 insertions(+), 88 deletions(-)
+Merging powerpc/next (ffd0b25ca049 Revert "powerpc/pci: unmap legacy INTx interrupts when a PHB is removed")
+$ 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 (d97b957e32b1 soc: fsl: qe: Remove unnessesary check in ucc_set_tdm_rxtx_clk)
+$ git merge soc-fsl/next
+Already up to date.
+Merging risc-v/for-next (f69e1c7418b1 RISC-V: Fix the VDSO symbol generaton for binutils-2.35+)
+$ git merge risc-v/for-next
+Auto-merging arch/riscv/kernel/vdso/Makefile
+CONFLICT (content): Merge conflict in arch/riscv/kernel/vdso/Makefile
+Resolved 'arch/riscv/kernel/vdso/Makefile' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 8275ecc88779] Merge remote-tracking branch 'risc-v/for-next' into master
+$ git diff -M --stat --summary HEAD^..
+ arch/riscv/kernel/vdso/.gitignore | 1 +
+ arch/riscv/kernel/vdso/Makefile | 17 ++++++++---------
+ arch/riscv/kernel/vdso/so2s.sh | 6 ++++++
+ 3 files changed, 15 insertions(+), 9 deletions(-)
+ create mode 100755 arch/riscv/kernel/vdso/so2s.sh
+Merging s390/for-next (00be34947616 Merge branch 'fixes' into for-next)
+$ git merge s390/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging sh/for-next (b0cfc315ff38 sh: fix syscall tracing)
+$ git merge sh/for-next
+Already up to date.
+Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi)
+$ git merge sparc-next/master
+Already up to date.
+Merging uml/linux-next (f06885b3f3e3 um: vector: Add dynamic tap interfaces and scripting)
+$ git merge uml/linux-next
+Already up to date.
+Merging xtensa/xtensa-for-next (4ca4c562efb6 xtensa: uaccess: Add missing __user to strncpy_from_user() prototype)
+$ git merge xtensa/xtensa-for-next
+Merge made by the 'recursive' strategy.
+ arch/xtensa/include/asm/uaccess.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging fscrypt/master (5b2a828b98ec fscrypt: export fscrypt_d_revalidate())
+$ 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 (c4795f038f2e Merge branch 'for-next-current-v5.9-20201015' into for-next-20201015)
+$ git merge btrfs/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging ceph/master (28e1581c3b4e libceph: clear con->out_msg on Policy::stateful_server faults)
+$ git merge ceph/master
+Already up to date.
+Merging cifs/for-next (3650b228f83a Linux 5.10-rc1)
+$ git merge cifs/for-next
+Already up to date.
+Merging configfs/for-next (76ecfcb0852e samples: configfs: prefer pr_err() over bare printk(KERN_ERR)
+$ 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 (915f4c9358db erofs: remove unnecessary enum entries)
+$ git merge erofs/dev
+Already up to date.
+Merging exfat/dev (f9893351acae Merge tag 'kconfig-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
+$ git merge exfat/dev
+Already up to date.
+Merging ext3/for_next (e44b86917b3f Pull direct IO fix from Gabriel Krisman.)
+$ git merge ext3/for_next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging ext4/dev (00c69f98e83d ext4: use IS_ERR() for error checking of path)
+$ git merge ext4/dev
+Auto-merging fs/ext4/super.c
+Auto-merging fs/ext4/ext4.h
+Merge made by the 'recursive' strategy.
+Merging f2fs/dev (bcfd79928961 f2fs: call f2fs_get_meta_page_retry for nat page)
+$ git merge f2fs/dev
+Merge made by the 'recursive' strategy.
+ fs/f2fs/node.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging fsverity/fsverity (f3db0bed4583 fs-verity: use smp_load_acquire() for ->i_verity_info)
+$ git merge fsverity/fsverity
+Already up to date.
+Merging fuse/for-next (42d3e2d041f0 virtiofs: calculate number of scatter-gather elements accurately)
+$ 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 (3650b228f83a Linux 5.10-rc1)
+$ git merge nfs/linux-next
+Already up to date.
+Merging nfs-anna/linux-next (8c39076c276b NFSv4.2: support EXCHGID4_FLAG_SUPP_FENCE_OPS 4.2 EXCHANGE_ID flag)
+$ git merge nfs-anna/linux-next
+Already up to date.
+Merging nfsd/nfsd-next (856deb866d16 Linux 5.9-rc5)
+$ git merge nfsd/nfsd-next
+Already up to date.
+Merging cel/cel-next (13a9a9d74d4d SUNRPC: Fix svc_flush_dcache())
+$ git merge cel/cel-next
+Already up to date.
+Merging orangefs/for-next (e848643b524b orangefs: remove unnecessary assignment to variable ret)
+$ git merge orangefs/for-next
+Already up to date.
+Merging overlayfs/overlayfs-next (be4df0cea08a ovl: use generic vfs_ioc_setflags_prepare() helper)
+$ git merge overlayfs/overlayfs-next
+Already up to date.
+Merging ubifs/next (e2a05cc7f822 ubifs: mount_ubifs: Release authentication resource in error handling path)
+$ git merge ubifs/next
+Already up to date.
+Merging v9fs/9p-next (7ca1db21ef8e net: 9p: initialize sun_server.sun_path to have addr's value only when addr is valid)
+$ git merge v9fs/9p-next
+Already up to date.
+Merging xfs/for-next (2c334e12f957 xfs: set xefi_discard when creating a deferred agfl free log intent item)
+$ git merge xfs/for-next
+Merge made by the 'recursive' strategy.
+ fs/xfs/libxfs/xfs_alloc.c | 1 +
+ fs/xfs/libxfs/xfs_bmap.h | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+Merging zonefs/for-next (48bfd5c6fac1 zonefs: document the explicit-open mount option)
+$ git merge zonefs/for-next
+Already up to date.
+Merging iomap/iomap-for-next (1a31182edd00 iomap: Call inode_dio_end() before generic_write_sync())
+$ git merge iomap/iomap-for-next
+Already up to date.
+Merging djw-vfs/vfs-for-next (407e9c63ee57 vfs: move the generic write and copy checks out of mm)
+$ git merge djw-vfs/vfs-for-next
+Already up to date.
+Merging file-locks/locks-next (529adfe8f131 locks: fix a typo at a kernel-doc markup)
+$ git merge file-locks/locks-next
+Merge made by the 'recursive' strategy.
+ fs/locks.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging vfs/for-next (8853bf827ca8 Merge branches 'work.sparc', 'work.epoll', 'work.sparc32' and 'regset.followup' into for-next)
+$ git merge vfs/for-next
+Auto-merging include/linux/fs.h
+Removing arch/sparc/mm/extable.c
+Auto-merging arch/sparc/lib/memset.S
+Merge made by the 'recursive' strategy.
+ arch/arm/include/asm/elf.h | 4 -
+ arch/arm/kernel/process.c | 9 -
+ arch/c6x/include/asm/elf.h | 3 -
+ arch/csky/include/asm/elf.h | 1 -
+ arch/hexagon/include/asm/elf.h | 1 -
+ arch/ia64/kernel/process.c | 2 +-
+ arch/ia64/kernel/ptrace.c | 51 +-
+ arch/nds32/include/asm/elf.h | 1 -
+ arch/sparc/include/asm/elf_64.h | 1 -
+ arch/sparc/include/asm/{extable_64.h => extable.h} | 4 +-
+ arch/sparc/include/asm/processor_32.h | 6 +-
+ arch/sparc/include/asm/thread_info_64.h | 1 +
+ arch/sparc/include/asm/uaccess.h | 3 +
+ arch/sparc/include/asm/uaccess_32.h | 38 --
+ arch/sparc/include/asm/uaccess_64.h | 1 -
+ arch/sparc/kernel/head_32.S | 2 +-
+ arch/sparc/kernel/head_64.S | 2 +-
+ arch/sparc/kernel/process_32.c | 12 -
+ arch/sparc/kernel/setup_32.c | 3 -
+ arch/sparc/kernel/setup_64.c | 4 -
+ arch/sparc/kernel/unaligned_32.c | 106 +--
+ arch/sparc/lib/checksum_32.S | 64 +-
+ arch/sparc/lib/copy_user.S | 315 ++++-----
+ arch/sparc/lib/memset.S | 86 +--
+ arch/sparc/mm/Makefile | 2 +-
+ arch/sparc/mm/extable.c | 107 ---
+ arch/sparc/mm/fault_32.c | 80 +--
+ arch/sparc/mm/mm_32.h | 2 -
+ fs/eventpoll.c | 717 +++++++++------------
+ fs/file_table.c | 1 -
+ include/linux/eventpoll.h | 11 +-
+ include/linux/fs.h | 5 +-
+ lib/extable.c | 5 -
+ 33 files changed, 531 insertions(+), 1119 deletions(-)
+ rename arch/sparc/include/asm/{extable_64.h => extable.h} (92%)
+ delete mode 100644 arch/sparc/mm/extable.c
+$ git am -3 ../patches/0001-fix-up-for-merge-of-arch-sparc-lib-memset.S.patch
+Applying: fix up for merge of arch/sparc/lib/memset.S
+$ git reset HEAD^
+Unstaged changes after reset:
+M arch/sparc/lib/memset.S
+$ git add -A .
+$ git commit -v -a --amend
+[master dedd63ab2591] Merge remote-tracking branch 'vfs/for-next' into master
+ Date: Fri Oct 30 09:49:11 2020 +1100
+Merging printk/for-next (26911e6b1302 Merge branch 'for-5.10-fixup' into for-next)
+$ git merge printk/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging pci/next (3650b228f83a Linux 5.10-rc1)
+$ git merge pci/next
+Already up to date.
+Merging pstore/for-next/pstore (137c6236aeec mailmap: Add WeiXiong Liao)
+$ git merge pstore/for-next/pstore
+Auto-merging .mailmap
+CONFLICT (content): Merge conflict in .mailmap
+Resolved '.mailmap' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master f633119b37ae] Merge remote-tracking branch 'pstore/for-next/pstore' into master
+$ git diff -M --stat --summary HEAD^..
+Merging hid/for-next (2039112f7c1c Merge branch 'for-5.11/core' into for-next)
+$ git merge hid/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/hid/index.rst | 1 +
+ MAINTAINERS | 8 +
+ drivers/hid/Kconfig | 2 +
+ drivers/hid/Makefile | 2 +
+ drivers/hid/amd-sfh-hid/Kconfig | 18 +
+ drivers/hid/amd-sfh-hid/Makefile | 13 +
+ drivers/hid/amd-sfh-hid/amd_sfh_client.c | 246 ++++++++
+ drivers/hid/amd-sfh-hid/amd_sfh_hid.c | 174 ++++++
+ drivers/hid/amd-sfh-hid/amd_sfh_hid.h | 67 +++
+ drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 152 +++++
+ drivers/hid/amd-sfh-hid/amd_sfh_pcie.h | 79 +++
+ .../amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.c | 224 +++++++
+ .../amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.h | 107 ++++
+ .../hid_descriptor/amd_sfh_hid_report_desc.h | 645 +++++++++++++++++++++
+ drivers/hid/hid-asus.c | 123 +++-
+ drivers/hid/hid-cypress.c | 44 +-
+ drivers/hid/hid-ids.h | 5 +
+ drivers/hid/hid-input.c | 5 +-
+ drivers/hid/hid-ite.c | 61 +-
+ drivers/hid/hid-logitech-hidpp.c | 1 +
+ drivers/hid/hid-quirks.c | 1 +
+ drivers/hid/hid-uclogic-core.c | 2 +
+ drivers/hid/hid-uclogic-params.c | 2 +
+ drivers/hid/i2c-hid/i2c-hid-core.c | 14 +-
+ include/linux/hid.h | 1 +
+ 25 files changed, 1975 insertions(+), 22 deletions(-)
+ create mode 100644 drivers/hid/amd-sfh-hid/Kconfig
+ create mode 100644 drivers/hid/amd-sfh-hid/Makefile
+ create mode 100644 drivers/hid/amd-sfh-hid/amd_sfh_client.c
+ create mode 100644 drivers/hid/amd-sfh-hid/amd_sfh_hid.c
+ create mode 100644 drivers/hid/amd-sfh-hid/amd_sfh_hid.h
+ create mode 100644 drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
+ create mode 100644 drivers/hid/amd-sfh-hid/amd_sfh_pcie.h
+ create mode 100644 drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.c
+ create mode 100644 drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.h
+ create mode 100644 drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_report_desc.h
+Merging i2c/i2c/for-next (3650b228f83a Linux 5.10-rc1)
+$ git merge i2c/i2c/for-next
+Already up to date.
+Merging i3c/i3c/next (abea14bfdebb i3c: master: Fix error return in cdns_i3c_master_probe())
+$ git merge i3c/i3c/next
+Already up to date.
+Merging dmi/dmi-for-next (3cb4d29a2633 MAINTAINERS: The DMI/SMBIOS tree has moved)
+$ git merge dmi/dmi-for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 2 +-
+ drivers/firmware/dmi-id.c | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+Merging hwmon-staging/hwmon-next (eb3f6f77d58c hwmon: (pmbus) shrink code and remove pmbus_do_remove())
+$ git merge hwmon-staging/hwmon-next
+Merge made by the 'recursive' strategy.
+ Documentation/hwmon/pmbus-core.rst | 6 --
+ Documentation/hwmon/pmbus.rst | 6 --
+ drivers/hwmon/acpi_power_meter.c | 9 +--
+ drivers/hwmon/adt7470.c | 154 ++++++++++++++++++++++++++++---------
+ drivers/hwmon/pmbus/adm1266.c | 1 -
+ drivers/hwmon/pmbus/adm1275.c | 1 -
+ drivers/hwmon/pmbus/bel-pfe.c | 1 -
+ drivers/hwmon/pmbus/ibm-cffps.c | 1 -
+ drivers/hwmon/pmbus/inspur-ipsps.c | 1 -
+ drivers/hwmon/pmbus/ir35221.c | 1 -
+ drivers/hwmon/pmbus/ir38064.c | 1 -
+ drivers/hwmon/pmbus/irps5401.c | 1 -
+ drivers/hwmon/pmbus/isl68137.c | 1 -
+ drivers/hwmon/pmbus/lm25066.c | 1 -
+ drivers/hwmon/pmbus/ltc2978.c | 1 -
+ drivers/hwmon/pmbus/ltc3815.c | 1 -
+ drivers/hwmon/pmbus/max16064.c | 1 -
+ drivers/hwmon/pmbus/max16601.c | 1 -
+ drivers/hwmon/pmbus/max20730.c | 3 -
+ drivers/hwmon/pmbus/max20751.c | 1 -
+ drivers/hwmon/pmbus/max31785.c | 1 -
+ drivers/hwmon/pmbus/max34440.c | 1 -
+ drivers/hwmon/pmbus/max8688.c | 1 -
+ drivers/hwmon/pmbus/mp2975.c | 1 -
+ drivers/hwmon/pmbus/pmbus.c | 1 -
+ drivers/hwmon/pmbus/pmbus.h | 1 -
+ drivers/hwmon/pmbus/pmbus_core.c | 20 +++--
+ drivers/hwmon/pmbus/pxe1610.c | 1 -
+ drivers/hwmon/pmbus/tps40422.c | 1 -
+ drivers/hwmon/pmbus/tps53679.c | 1 -
+ drivers/hwmon/pmbus/ucd9000.c | 1 -
+ drivers/hwmon/pmbus/ucd9200.c | 1 -
+ drivers/hwmon/pmbus/xdpe12284.c | 1 -
+ drivers/hwmon/pmbus/zl6100.c | 1 -
+ 34 files changed, 131 insertions(+), 95 deletions(-)
+Merging jc_docs/docs-next (6fee9372e0af Merge branch 'mauro-warnings' into docs-next)
+$ git merge jc_docs/docs-next
+Auto-merging tools/testing/selftests/kselftest_harness.h
+Auto-merging MAINTAINERS
+Auto-merging Documentation/dev-tools/kasan.rst
+Merge made by the 'recursive' strategy.
+ Documentation/Makefile | 4 +
+ Documentation/admin-guide/LSM/SafeSetID.rst | 2 +-
+ Documentation/admin-guide/sysctl/net.rst | 1 +
+ Documentation/arm/sunxi.rst | 10 ++
+ Documentation/conf.py | 2 +-
+ Documentation/dev-tools/kasan.rst | 2 +
+ .../devicetree/bindings/clock/hi6220-clock.txt | 2 +-
+ Documentation/filesystems/api-summary.rst | 3 -
+ Documentation/gpu/amdgpu.rst | 7 --
+ Documentation/hwmon/adm1266.rst | 2 +-
+ Documentation/hwmon/index.rst | 1 +
+ Documentation/hwmon/mp2975.rst | 14 ++-
+ Documentation/locking/lockdep-design.rst | 51 ++++----
+ Documentation/networking/devlink/ice.rst | 1 +
+ Documentation/networking/statistics.rst | 3 +-
+ Documentation/userspace-api/index.rst | 1 +
+ MAINTAINERS | 9 +-
+ drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 2 +-
+ drivers/crypto/allwinner/sun8i-ce/sun8i-ce-prng.c | 2 +-
+ drivers/crypto/allwinner/sun8i-ce/sun8i-ce-trng.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 36 +++---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 7 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 6 +-
+ drivers/infiniband/ulp/srpt/ib_srpt.h | 1 +
+ .../bindings/net/wireless/silabs,wfx.yaml | 2 +-
+ include/linux/blk-mq.h | 2 +
+ include/linux/pagemap.h | 8 +-
+ include/linux/phy.h | 40 +------
+ include/linux/refcount.h | 130 ++++++++++-----------
+ scripts/kernel-doc | 21 +++-
+ tools/testing/selftests/kselftest_harness.h | 44 +++----
+ 33 files changed, 220 insertions(+), 206 deletions(-)
+Merging v4l-dvb/master (dfe3d19bd092 Merge tag 'v5.10-rc1' into patchwork)
+$ git merge v4l-dvb/master
+Auto-merging include/linux/refcount.h
+Merge made by the 'recursive' strategy.
+ include/linux/refcount.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging v4l-dvb-next/master (d0a9fffedca1 docs: fs: api-summary.rst: get rid of kernel-doc include)
+$ git merge v4l-dvb-next/master
+Auto-merging scripts/kernel-doc
+Auto-merging include/linux/refcount.h
+Auto-merging MAINTAINERS
+Auto-merging Documentation/dev-tools/kasan.rst
+Merge made by the 'recursive' strategy.
+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 (5e00eb5f6209 Merge branch 'pm-cpufreq' into linux-next)
+$ git merge pm/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/acpi/button.c | 13 -------------
+ drivers/acpi/dock.c | 3 ++-
+ drivers/acpi/nfit/core.c | 2 +-
+ drivers/base/core.c | 4 +++-
+ drivers/cpufreq/Kconfig | 2 ++
+ drivers/cpufreq/cpufreq.c | 15 ++++++++++++++-
+ drivers/cpufreq/e_powersaver.c | 1 -
+ drivers/cpufreq/intel_pstate.c | 13 ++++++-------
+ drivers/cpufreq/longhaul.c | 1 -
+ drivers/cpufreq/speedstep-lib.c | 2 +-
+ drivers/idle/intel_idle.c | 2 +-
+ drivers/opp/core.c | 9 +++++----
+ drivers/opp/of.c | 2 ++
+ drivers/pnp/core.c | 4 ++--
+ include/linux/cpufreq.h | 11 ++++++++++-
+ kernel/power/process.c | 2 +-
+ kernel/sched/cpufreq_schedutil.c | 6 ++++--
+ 17 files changed, 54 insertions(+), 38 deletions(-)
+Merging cpufreq-arm/cpufreq/arm/linux-next (8af3f8ece520 cpufreq: tegra194: get consistent cpuinfo_cur_freq)
+$ git merge cpufreq-arm/cpufreq/arm/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/cpufreq/cpufreq-dt-platdev.c | 2 ++
+ drivers/cpufreq/mediatek-cpufreq.c | 1 +
+ drivers/cpufreq/sti-cpufreq.c | 7 +++-
+ drivers/cpufreq/tegra194-cpufreq.c | 62 ++++++++++++++++++++++++++++++------
+ 4 files changed, 62 insertions(+), 10 deletions(-)
+Merging cpupower/cpupower (748f0d70087c cpupower: Provide online and offline CPU information)
+$ git merge cpupower/cpupower
+Merge made by the 'recursive' strategy.
+ tools/power/cpupower/utils/cpufreq-set.c | 3 ++
+ tools/power/cpupower/utils/cpuidle-set.c | 4 ++
+ tools/power/cpupower/utils/cpupower.c | 8 ++++
+ tools/power/cpupower/utils/helpers/helpers.h | 12 +++++
+ tools/power/cpupower/utils/helpers/misc.c | 66 +++++++++++++++++++++++++++-
+ 5 files changed, 92 insertions(+), 1 deletion(-)
+Merging devfreq/devfreq-next (09d56d92ad25 PM / devfreq: tegra30: Silence deferred probe error)
+$ git merge devfreq/devfreq-next
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-class-devfreq | 54 +++---
+ drivers/devfreq/Kconfig | 2 +-
+ drivers/devfreq/devfreq.c | 242 +++++++++++++++++---------
+ drivers/devfreq/governor.h | 33 +++-
+ drivers/devfreq/governor_passive.c | 44 ++---
+ drivers/devfreq/governor_simpleondemand.c | 2 +
+ drivers/devfreq/tegra20-devfreq.c | 8 +-
+ drivers/devfreq/tegra30-devfreq.c | 12 +-
+ include/linux/devfreq.h | 4 -
+ include/trace/events/devfreq.h | 30 +++-
+ 10 files changed, 274 insertions(+), 157 deletions(-)
+Merging opp/opp/linux-next (211866566cd0 drm/msm: Convert to devm_pm_opp_set_supported_hw)
+$ git merge opp/opp/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 +-
+ drivers/opp/core.c | 130 +++++++++++++++++++++++++---------
+ include/linux/pm_opp.h | 8 +++
+ 3 files changed, 107 insertions(+), 33 deletions(-)
+Merging thermal/thermal/linux-next (345a8af7ea63 thermal: core: Move power_actor_set_power into IPA)
+$ git merge thermal/thermal/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/thermal/gov_power_allocator.c | 40 +++++++++++++++-
+ drivers/thermal/thermal_core.c | 88 -----------------------------------
+ drivers/thermal/thermal_core.h | 6 ---
+ 3 files changed, 38 insertions(+), 96 deletions(-)
+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 (4f2b30fd9b4b fs: dlm: fix race in nodeid2con)
+$ git merge dlm/next
+Already up to date.
+Merging swiotlb/linux-next (b51e627158cb swiotlb: Mark max_segment with static keyword)
+$ git merge swiotlb/linux-next
+Already up to date.
+Merging rdma/for-next (eeed6965071b RDMA/rxe: Remove unused RXE_MR_TYPE_FMR)
+$ git merge rdma/for-next
+Auto-merging drivers/infiniband/hw/mlx5/main.c
+Merge made by the 'recursive' strategy.
+ drivers/infiniband/core/device.c | 33 ++++++++++
+ drivers/infiniband/core/sysfs.c | 47 ++++++++------
+ drivers/infiniband/core/ucma.c | 2 +-
+ drivers/infiniband/core/user_mad.c | 4 +-
+ drivers/infiniband/core/uverbs_cmd.c | 26 ++++----
+ drivers/infiniband/core/uverbs_main.c | 4 +-
+ drivers/infiniband/core/uverbs_uapi.c | 5 +-
+ drivers/infiniband/core/verbs.c | 5 +-
+ drivers/infiniband/hw/bnxt_re/ib_verbs.c | 11 +++-
+ drivers/infiniband/hw/bnxt_re/main.c | 34 +----------
+ drivers/infiniband/hw/cxgb4/cq.c | 2 +-
+ drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 2 -
+ drivers/infiniband/hw/cxgb4/mem.c | 84 --------------------------
+ drivers/infiniband/hw/cxgb4/provider.c | 35 ++---------
+ drivers/infiniband/hw/cxgb4/qp.c | 8 ++-
+ drivers/infiniband/hw/efa/efa_main.c | 22 +------
+ drivers/infiniband/hw/efa/efa_verbs.c | 6 ++
+ drivers/infiniband/hw/hfi1/sysfs.c | 16 ++---
+ drivers/infiniband/hw/hns/hns_roce_cq.c | 3 +
+ drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 9 +--
+ drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 3 +
+ drivers/infiniband/hw/hns/hns_roce_main.c | 35 +----------
+ drivers/infiniband/hw/hns/hns_roce_qp.c | 14 +----
+ drivers/infiniband/hw/hns/hns_roce_srq.c | 4 ++
+ drivers/infiniband/hw/i40iw/i40iw_verbs.c | 35 +++--------
+ drivers/infiniband/hw/mlx4/main.c | 59 ++----------------
+ drivers/infiniband/hw/mlx4/qp.c | 5 +-
+ drivers/infiniband/hw/mlx4/srq.c | 4 ++
+ drivers/infiniband/hw/mlx4/sysfs.c | 30 ++++-----
+ drivers/infiniband/hw/mlx5/main.c | 67 +++-----------------
+ drivers/infiniband/hw/mlx5/qp.c | 10 ++-
+ drivers/infiniband/hw/mlx5/srq.c | 5 ++
+ drivers/infiniband/hw/mthca/mthca_provider.c | 42 +++----------
+ drivers/infiniband/hw/mthca/mthca_qp.c | 3 +
+ drivers/infiniband/hw/ocrdma/ocrdma_main.c | 42 ++-----------
+ drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 11 +++-
+ drivers/infiniband/hw/qedr/main.c | 38 ++----------
+ drivers/infiniband/hw/qedr/verbs.c | 13 ++++
+ drivers/infiniband/hw/qib/qib_sysfs.c | 30 ++++-----
+ drivers/infiniband/hw/usnic/usnic_ib_main.c | 19 ------
+ drivers/infiniband/hw/usnic/usnic_ib_sysfs.c | 15 ++---
+ drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 7 ++-
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c | 3 +
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 34 +----------
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c | 5 +-
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c | 2 +-
+ drivers/infiniband/sw/rdmavt/ah.c | 1 -
+ drivers/infiniband/sw/rdmavt/cq.c | 2 +-
+ drivers/infiniband/sw/rdmavt/qp.c | 10 ++-
+ drivers/infiniband/sw/rdmavt/vt.c | 28 +--------
+ drivers/infiniband/sw/rxe/rxe_mr.c | 1 -
+ drivers/infiniband/sw/rxe/rxe_verbs.c | 47 ++++----------
+ drivers/infiniband/sw/rxe/rxe_verbs.h | 1 -
+ drivers/infiniband/sw/siw/siw_main.c | 24 --------
+ drivers/infiniband/sw/siw/siw_verbs.c | 12 ++++
+ drivers/infiniband/ulp/ipoib/ipoib_cm.c | 4 +-
+ drivers/infiniband/ulp/ipoib/ipoib_main.c | 7 ++-
+ drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 2 +-
+ drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c | 44 +++++++-------
+ drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c | 12 ++--
+ drivers/infiniband/ulp/srp/ib_srp.c | 40 ++++++------
+ include/rdma/ib_verbs.h | 5 +-
+ include/uapi/rdma/ib_user_verbs.h | 14 -----
+ 63 files changed, 373 insertions(+), 774 deletions(-)
+Merging net-next/master (1c29d9899081 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
+$ git merge net-next/master
+Merge made by the 'recursive' strategy.
+ drivers/net/ethernet/microchip/lan743x_main.c | 3 +--
+ drivers/net/ethernet/neterion/vxge/vxge-config.c | 2 +-
+ drivers/net/phy/phylink.c | 3 ++-
+ net/core/dev.c | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+Merging bpf-next/for-next (3cb12d27ff65 Merge tag 'net-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
+$ git merge bpf-next/for-next
+Already up to date.
+Merging ipsec-next/master (3cb12d27ff65 Merge tag 'net-5.10-rc1' of 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 (3650b228f83a Linux 5.10-rc1)
+$ git merge mlx5-next/mlx5-next
+Already up to date.
+Merging netfilter-next/master (3cb12d27ff65 Merge tag 'net-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
+$ git merge netfilter-next/master
+Already up to date.
+Merging ipvs-next/master (3cb12d27ff65 Merge tag 'net-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
+$ git merge ipvs-next/master
+Already up to date.
+Merging wireless-drivers-next/master (3650b228f83a Linux 5.10-rc1)
+$ git merge wireless-drivers-next/master
+Already up to date.
+Merging bluetooth/master (44d59235ace5 Bluetooth: hci_h5: close serdev device and free hu in h5_close)
+$ git merge bluetooth/master
+Merge made by the 'recursive' strategy.
+ drivers/bluetooth/hci_h5.c | 8 ++++++--
+ drivers/bluetooth/hci_qca.c | 19 +++++++++++++------
+ net/bluetooth/hci_event.c | 5 +++++
+ 3 files changed, 24 insertions(+), 8 deletions(-)
+Merging mac80211-next/master (3cb12d27ff65 Merge tag 'net-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
+$ git merge mac80211-next/master
+Already up to date.
+Merging gfs2/for-next (c5c68724696e gfs2: check for live vs. read-only file system in gfs2_fitrim)
+$ git merge gfs2/for-next
+Merge made by the 'recursive' strategy.
+ fs/gfs2/glops.c | 56 +++++++++++++++++++++++++++++++++++++++++-----------
+ fs/gfs2/glops.h | 1 +
+ fs/gfs2/lops.c | 31 +++++------------------------
+ fs/gfs2/lops.h | 2 --
+ fs/gfs2/ops_fstype.c | 14 ++++++++-----
+ fs/gfs2/recovery.c | 2 +-
+ fs/gfs2/rgrp.c | 5 ++++-
+ fs/gfs2/super.c | 1 +
+ 8 files changed, 66 insertions(+), 46 deletions(-)
+Merging mtd/mtd/next (232b67c39942 mtd: remove unneeded break)
+$ git merge mtd/mtd/next
+Merge made by the 'recursive' strategy.
+ drivers/mtd/mtdchar.c | 2 --
+ 1 file changed, 2 deletions(-)
+Merging nand/nand/next (88e315d12fbb mtd: onenand: simplify the return expression of onenand_transfer_auto_oob)
+$ git merge nand/nand/next
+Already up to date.
+Merging spi-nor/spi-nor/next (3650b228f83a Linux 5.10-rc1)
+$ git merge spi-nor/spi-nor/next
+Already up to date.
+Merging crypto/master (3093e7c16e12 X.509: Fix modular build of public_key_sm2)
+$ git merge crypto/master
+Already up to date.
+Merging drm/drm-next (b45b6fbc671c Merge tag 'drm-intel-next-fixes-2020-10-22' of git://anongit.freedesktop.org/drm/drm-intel into drm-next)
+$ git merge drm/drm-next
+Already up to date.
+Merging amdgpu/drm-next (2e3a5bc5feea drm/amdgpu/display: fix warnings when CONFIG_DRM_AMD_DC_DCN is not set)
+$ git merge amdgpu/drm-next
+Auto-merging drivers/gpu/drm/radeon/radeon.h
+Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
+Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
+Auto-merging drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+Auto-merging drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c
+Auto-merging drivers/gpu/drm/amd/pm/inc/smu_types.h
+Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
+Auto-merging drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c
+Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c
+Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_crat.c
+Auto-merging drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h
+Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+Auto-merging Documentation/gpu/amdgpu.rst
+Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c' using previous resolution.
+Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c' using previous resolution.
+Resolved 'drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c' using previous resolution.
+Resolved 'drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c' using previous resolution.
+Resolved 'drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 16fc0fba6319] Merge remote-tracking branch 'amdgpu/drm-next' into master
+$ git diff -M --stat --summary HEAD^..
+ drivers/gpu/drm/amd/amdgpu/Makefile | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 56 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 7 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 5 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 34 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 33 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 32 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_df.h | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 4 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 16 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fw_attestation.c | 142 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fw_attestation.h | 30 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 79 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 11 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 26 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 11 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 4 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 75 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c | 523 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.h | 28 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 82 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 10 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 8 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 21 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 284 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 14 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/athub_v2_1.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 6 -
+ drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 4 -
+ drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 7 -
+ drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 180 +-
+ drivers/gpu/drm/amd/amdgpu/df_v3_6.h | 9 -
+ .../gpu/drm/amd/amdgpu/dimgrey_cavefish_reg_init.c | 54 +
+ drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 214 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 17 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 17 +-
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c | 13 +-
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 47 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 24 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 10 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 6 +
+ drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 589 +
+ drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.h | 28 +
+ drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 39 +
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 341 +
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_2.h | 32 +
+ drivers/gpu/drm/amd/amdgpu/nv.c | 175 +-
+ drivers/gpu/drm/amd/amdgpu/nv.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 54 +-
+ drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 54 +-
+ drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 23 +-
+ drivers/gpu/drm/amd/amdgpu/soc15.c | 11 +-
+ drivers/gpu/drm/amd/amdgpu/vangogh_reg_init.c | 50 +
+ drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 4 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 6 +
+ drivers/gpu/drm/amd/amdkfd/kfd_device.c | 41 +
+ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 2 +
+ drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 2 +
+ drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 2 +
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 2 +
+ drivers/gpu/drm/amd/display/Kconfig | 11 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 199 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 -
+ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 4 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 34 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 17 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h | 565 +-
+ drivers/gpu/drm/amd/display/dc/Makefile | 5 +-
+ drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 187 +-
+ .../amd/display/dc/bios/command_table_helper2.c | 7 +-
+ .../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 | 8 +-
+ drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 10 +-
+ drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 32 +-
+ .../amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c | 3 +-
+ .../amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.c | 7 +-
+ .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 2 +-
+ .../gpu/drm/amd/display/dc/clk_mgr/dcn30/dalsmc.h | 1 +
+ .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 10 +
+ .../dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.c | 9 +
+ .../dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.h | 2 +
+ .../drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c | 241 +
+ .../drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.h | 164 +
+ .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 834 +
+ .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.h | 43 +
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 77 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 2 +
+ drivers/gpu/drm/amd/display/dc/core/dc_link.c | 12 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 13 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 39 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 43 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_sink.c | 1 -
+ drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 12 +-
+ drivers/gpu/drm/amd/display/dc/dc.h | 34 +-
+ drivers/gpu/drm/amd/display/dc/dc_dsc.h | 10 +-
+ drivers/gpu/drm/amd/display/dc/dc_helper.c | 26 -
+ drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 18 -
+ drivers/gpu/drm/amd/display/dc/dc_stream.h | 9 +-
+ drivers/gpu/drm/amd/display/dc/dc_trace.h | 39 +
+ drivers/gpu/drm/amd/display/dc/dc_types.h | 12 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 20 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 4 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c | 4 +-
+ .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 27 +-
+ .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 51 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 298 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 9 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 1 -
+ .../drm/amd/display/dc/dce100/dce100_resource.c | 9 +-
+ .../drm/amd/display/dc/dce110/dce110_resource.c | 11 +-
+ .../drm/amd/display/dc/dce112/dce112_resource.c | 9 +-
+ .../drm/amd/display/dc/dce120/dce120_resource.c | 9 +-
+ .../gpu/drm/amd/display/dc/dce60/dce60_resource.c | 7 -
+ .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 13 +-
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 2 -
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 153 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 1 -
+ .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 13 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c | 1 +
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 5 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 31 -
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 2 +
+ .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 8 -
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 8 -
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 4 -
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 6 -
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h | 18 -
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 17 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 1 -
+ .../drm/amd/display/dc/dcn20/dcn20_link_encoder.h | 2 -
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.c | 12 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.h | 4 +
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 41 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 3 +
+ drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 15 +
+ drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.h | 2 +
+ drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 2 +-
+ .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 296 +-
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c | 7 -
+ .../gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.c | 54 +
+ .../gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.h | 5 +
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.h | 3 +
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 98 +
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h | 2 +
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 4 +-
+ .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 51 +-
+ drivers/gpu/drm/amd/display/dc/dcn301/Makefile | 47 +
+ .../gpu/drm/amd/display/dc/dcn301/dcn301_dccg.c | 75 +
+ .../gpu/drm/amd/display/dc/dcn301/dcn301_dccg.h | 65 +
+ .../display/dc/dcn301/dcn301_dio_link_encoder.c | 192 +
+ .../display/dc/dcn301/dcn301_dio_link_encoder.h | 82 +
+ .../gpu/drm/amd/display/dc/dcn301/dcn301_hubbub.c | 81 +
+ .../gpu/drm/amd/display/dc/dcn301/dcn301_hubbub.h | 60 +
+ .../gpu/drm/amd/display/dc/dcn301/dcn301_hwseq.c | 42 +
+ .../gpu/drm/amd/display/dc/dcn301/dcn301_hwseq.h | 32 +
+ .../gpu/drm/amd/display/dc/dcn301/dcn301_init.c | 144 +
+ .../gpu/drm/amd/display/dc/dcn301/dcn301_init.h | 33 +
+ .../drm/amd/display/dc/dcn301/dcn301_panel_cntl.c | 218 +
+ .../drm/amd/display/dc/dcn301/dcn301_panel_cntl.h | 97 +
+ .../drm/amd/display/dc/dcn301/dcn301_resource.c | 2011 +
+ .../drm/amd/display/dc/dcn301/dcn301_resource.h | 42 +
+ drivers/gpu/drm/amd/display/dc/dcn302/Makefile | 46 +
+ .../gpu/drm/amd/display/dc/dcn302/dcn302_dccg.h | 41 +
+ .../gpu/drm/amd/display/dc/dcn302/dcn302_hwseq.c | 233 +
+ .../gpu/drm/amd/display/dc/dcn302/dcn302_hwseq.h | 35 +
+ .../gpu/drm/amd/display/dc/dcn302/dcn302_init.c | 39 +
+ .../gpu/drm/amd/display/dc/dcn302/dcn302_init.h | 33 +
+ .../drm/amd/display/dc/dcn302/dcn302_resource.c | 1563 +
+ .../drm/amd/display/dc/dcn302/dcn302_resource.h | 33 +
+ drivers/gpu/drm/amd/display/dc/dm_helpers.h | 2 -
+ drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 24 +-
+ drivers/gpu/drm/amd/display/dc/dm_services.h | 42 +-
+ drivers/gpu/drm/amd/display/dc/dml/Makefile | 5 -
+ .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 4 +-
+ .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 2 +-
+ .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 10 +-
+ .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 4 -
+ .../drm/amd/display/dc/dml/display_mode_structs.h | 2 -
+ .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 2 -
+ .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 2 -
+ drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 24 +-
+ drivers/gpu/drm/amd/display/dc/gpio/Makefile | 5 +-
+ .../amd/display/dc/gpio/dcn30/hw_factory_dcn30.c | 14 +-
+ .../amd/display/dc/gpio/dcn30/hw_factory_dcn30.h | 2 +-
+ .../amd/display/dc/gpio/dcn30/hw_translate_dcn30.c | 2 +-
+ .../amd/display/dc/gpio/dcn30/hw_translate_dcn30.h | 2 +-
+ drivers/gpu/drm/amd/display/dc/gpio/gpio_base.c | 4 +-
+ drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 7 +-
+ drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 7 +-
+ drivers/gpu/drm/amd/display/dc/inc/core_status.h | 2 +
+ drivers/gpu/drm/amd/display/dc/inc/core_types.h | 8 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 41 +-
+ .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 7 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 8 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 2 -
+ drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h | 6 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 5 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 2 -
+ .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 3 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/mcif_wb.h | 4 -
+ drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 19 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/opp.h | 5 +
+ .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 2 -
+ .../drm/amd/display/dc/inc/hw/timing_generator.h | 6 -
+ drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 7 +-
+ drivers/gpu/drm/amd/display/dc/inc/resource.h | 2 -
+ drivers/gpu/drm/amd/display/dc/irq/Makefile | 10 +-
+ .../amd/display/dc/irq/dcn30/irq_service_dcn30.c | 2 +-
+ .../amd/display/dc/irq/dcn30/irq_service_dcn30.h | 2 +-
+ .../amd/display/dc/irq/dcn302/irq_service_dcn302.c | 344 +
+ .../amd/display/dc/irq/dcn302/irq_service_dcn302.h | 33 +
+ drivers/gpu/drm/amd/display/dc/os_types.h | 33 +-
+ drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 4 +-
+ drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 47 +-
+ drivers/gpu/drm/amd/display/dmub/src/Makefile | 5 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn301.c | 55 +
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn301.h | 37 +
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn302.c | 55 +
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn302.h | 37 +
+ drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 39 +-
+ drivers/gpu/drm/amd/display/include/dal_asic_id.h | 16 +-
+ drivers/gpu/drm/amd/display/include/dal_types.h | 2 +
+ .../drm/amd/display/include/ddc_service_types.h | 2 +
+ drivers/gpu/drm/amd/display/include/dpcd_defs.h | 1 +
+ .../amd/display/include/grph_object_ctrl_defs.h | 13 +
+ .../drm/amd/display/modules/color/color_gamma.c | 122 +-
+ .../drm/amd/display/modules/color/color_gamma.h | 6 +-
+ .../drm/amd/display/modules/freesync/freesync.c | 55 +-
+ .../drm/amd/display/modules/power/power_helpers.c | 8 +-
+ drivers/gpu/drm/amd/include/amd_shared.h | 2 +
+ .../amd/include/asic_reg/clk/clk_11_5_0_offset.h | 50 +
+ .../amd/include/asic_reg/clk/clk_11_5_0_sh_mask.h | 70 +
+ .../amd/include/asic_reg/dcn/dcn_3_0_1_offset.h | 13271 ++
+ .../amd/include/asic_reg/dcn/dcn_3_0_1_sh_mask.h | 53357 ++++++
+ .../amd/include/asic_reg/gc/gc_10_3_0_default.h | 1 +
+ .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 2 +
+ .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h | 33 +
+ .../drm/amd/include/asic_reg/gc/gc_9_4_1_sh_mask.h | 2 +-
+ .../include/asic_reg/mmhub/mmhub_2_3_0_default.h | 1253 +
+ .../include/asic_reg/mmhub/mmhub_2_3_0_offset.h | 2439 +
+ .../include/asic_reg/mmhub/mmhub_2_3_0_sh_mask.h | 10331 ++
+ .../drm/amd/include/asic_reg/mp/mp_11_5_0_offset.h | 400 +
+ .../amd/include/asic_reg/mp/mp_11_5_0_sh_mask.h | 942 +
+ .../amd/include/asic_reg/nbio/nbio_7_2_0_offset.h | 31873 ++++
+ .../amd/include/asic_reg/nbio/nbio_7_2_0_sh_mask.h | 152495 ++++++++++++++++++
+ drivers/gpu/drm/amd/include/atombios.h | 20 +-
+ drivers/gpu/drm/amd/include/atomfirmware.h | 63 +-
+ .../drm/amd/include/dimgrey_cavefish_ip_offset.h | 1049 +
+ drivers/gpu/drm/amd/include/vangogh_ip_offset.h | 1516 +
+ drivers/gpu/drm/amd/pm/amdgpu_pm.c | 11 +-
+ drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 49 +-
+ drivers/gpu/drm/amd/pm/inc/hwmgr.h | 21 +-
+ .../amd/pm/inc/smu11_driver_if_sienna_cichlid.h | 14 +-
+ .../gpu/drm/amd/pm/inc/smu11_driver_if_vangogh.h | 239 +
+ drivers/gpu/drm/amd/pm/inc/smu74_discrete.h | 3 +-
+ drivers/gpu/drm/amd/pm/inc/smu7_ppsmc.h | 6 +
+ drivers/gpu/drm/amd/pm/inc/smu_types.h | 54 +-
+ drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 4 +-
+ drivers/gpu/drm/amd/pm/inc/smu_v11_5_pmfw.h | 120 +
+ drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h | 86 +
+ drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr.c | 10 +-
+ drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr_ppt.h | 8 +-
+ .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c | 125 +-
+ .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.h | 28 +-
+ .../gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h | 66 +
+ .../amd/pm/powerplay/hwmgr/process_pptables_v1_0.c | 192 +-
+ .../drm/amd/pm/powerplay/hwmgr/processpptables.c | 85 +-
+ .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 572 +-
+ .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.h | 20 +
+ .../drm/amd/pm/powerplay/hwmgr/smu7_powertune.c | 34 +-
+ .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_thermal.c | 11 +
+ .../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 2 +-
+ .../gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.c | 23 +-
+ .../pm/powerplay/hwmgr/vega10_processpptables.c | 88 +-
+ .../gpu/drm/amd/pm/powerplay/smumgr/fiji_smumgr.c | 3 +-
+ .../drm/amd/pm/powerplay/smumgr/polaris10_smumgr.c | 356 +-
+ .../drm/amd/pm/powerplay/smumgr/polaris10_smumgr.h | 1 +
+ .../gpu/drm/amd/pm/powerplay/smumgr/vegam_smumgr.c | 3 +-
+ drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 222 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/Makefile | 1 +
+ drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 18 +
+ drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 36 +-
+ .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 33 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 26 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 360 +
+ drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 30 +
+ drivers/gpu/drm/amd/pm/swsmu/smu_internal.h | 8 +-
+ drivers/gpu/drm/radeon/radeon.h | 1 +
+ drivers/gpu/drm/radeon/radeon_asic.c | 1 +
+ drivers/gpu/drm/radeon/radeon_asic.h | 1 +
+ drivers/gpu/drm/radeon/radeon_pm.c | 29 +-
+ drivers/gpu/drm/radeon/sumo_dpm.c | 20 +
+ drivers/pci/pcie/err.c | 41 +-
+ include/drm/amd_asic_type.h | 2 +
+ include/uapi/drm/amdgpu_drm.h | 6 +-
+ 313 files changed, 284143 insertions(+), 2361 deletions(-)
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fw_attestation.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fw_attestation.h
+ create mode 100755 drivers/gpu/drm/amd/amdgpu/dimgrey_cavefish_reg_init.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_2.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/vangogh_reg_init.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dc_trace.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/Makefile
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_dccg.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_dccg.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_dio_link_encoder.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_dio_link_encoder.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_hubbub.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_hubbub.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_hwseq.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_hwseq.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_init.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_init.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_panel_cntl.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_panel_cntl.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/Makefile
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_dccg.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_hwseq.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_hwseq.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_init.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_init.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn302/irq_service_dcn302.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn302/irq_service_dcn302.h
+ create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn301.c
+ create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn301.h
+ create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn302.c
+ create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn302.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/clk/clk_11_5_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/clk/clk_11_5_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_1_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_1_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_2_3_0_default.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_2_3_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_2_3_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_11_5_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_11_5_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_2_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_2_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/dimgrey_cavefish_ip_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/vangogh_ip_offset.h
+ create mode 100644 drivers/gpu/drm/amd/pm/inc/smu11_driver_if_vangogh.h
+ create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v11_5_pmfw.h
+ create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h
+ create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
+ create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h
+Merging drm-intel/for-linux-next (96eaeb3dfa40 drm/i915: Use _MMIO_PIPE3() for ilk+ WM0_PIPE registers)
+$ git merge drm-intel/for-linux-next
+Auto-merging include/drm/drm_dp_helper.h
+Auto-merging drivers/gpu/drm/i915/intel_uncore.c
+Auto-merging drivers/gpu/drm/i915/i915_pci.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.h
+Auto-merging drivers/gpu/drm/i915/i915_debugfs.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_mocs.c
+Auto-merging drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
+Auto-merging drivers/gpu/drm/i915/display/intel_display.c
+CONFLICT (content): Merge conflict in 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/gpu/drm/drm_dp_helper.c
+Auto-merging Documentation/gpu/i915.rst
+Resolved 'drivers/gpu/drm/i915/display/intel_ddi.c' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/display/intel_display.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master a0b37d2455e0] Merge remote-tracking branch 'drm-intel/for-linux-next' into master
+$ git diff -M --stat --summary HEAD^..
+ Documentation/gpu/i915.rst | 6 +
+ drivers/gpu/drm/drm_atomic_uapi.c | 8 +
+ drivers/gpu/drm/drm_blend.c | 13 +
+ drivers/gpu/drm/drm_crtc.c | 40 ++
+ drivers/gpu/drm/drm_crtc_internal.h | 3 +
+ drivers/gpu/drm/drm_dp_helper.c | 233 ++++++-
+ drivers/gpu/drm/drm_plane.c | 73 ++
+ drivers/gpu/drm/i915/display/icl_dsi.c | 74 ++-
+ drivers/gpu/drm/i915/display/intel_atomic_plane.c | 7 +-
+ drivers/gpu/drm/i915/display/intel_bios.c | 44 +-
+ drivers/gpu/drm/i915/display/intel_cdclk.c | 52 +-
+ drivers/gpu/drm/i915/display/intel_color.c | 124 +++-
+ drivers/gpu/drm/i915/display/intel_combo_phy.c | 13 +-
+ drivers/gpu/drm/i915/display/intel_csr.c | 12 +-
+ drivers/gpu/drm/i915/display/intel_ddi.c | 735 ++++++++++++---------
+ drivers/gpu/drm/i915/display/intel_ddi.h | 11 +-
+ drivers/gpu/drm/i915/display/intel_display.c | 458 +++++++++++--
+ drivers/gpu/drm/i915/display/intel_display.h | 4 +
+ .../gpu/drm/i915/display/intel_display_debugfs.c | 9 +-
+ drivers/gpu/drm/i915/display/intel_display_power.c | 77 ++-
+ drivers/gpu/drm/i915/display/intel_display_power.h | 3 +
+ drivers/gpu/drm/i915/display/intel_display_types.h | 57 +-
+ drivers/gpu/drm/i915/display/intel_dp.c | 616 +++++++++++------
+ drivers/gpu/drm/i915/display/intel_dp.h | 22 +-
+ .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 3 +-
+ .../gpu/drm/i915/display/intel_dp_link_training.c | 554 +++++++++++++---
+ .../gpu/drm/i915/display/intel_dp_link_training.h | 17 +-
+ drivers/gpu/drm/i915/display/intel_dp_mst.c | 38 +-
+ drivers/gpu/drm/i915/display/intel_dpio_phy.c | 23 +-
+ drivers/gpu/drm/i915/display/intel_dpio_phy.h | 2 +
+ drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 118 +++-
+ drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 17 +
+ drivers/gpu/drm/i915/display/intel_dsi.h | 1 +
+ drivers/gpu/drm/i915/display/intel_fbc.c | 7 +
+ drivers/gpu/drm/i915/display/intel_gmbus.c | 15 +-
+ drivers/gpu/drm/i915/display/intel_hdcp.c | 89 ++-
+ drivers/gpu/drm/i915/display/intel_hdmi.c | 18 +-
+ drivers/gpu/drm/i915/display/intel_hotplug.c | 64 +-
+ drivers/gpu/drm/i915/display/intel_hotplug.h | 3 +-
+ drivers/gpu/drm/i915/display/intel_lspcon.c | 97 ++-
+ drivers/gpu/drm/i915/display/intel_lspcon.h | 5 +-
+ drivers/gpu/drm/i915/display/intel_lvds.c | 10 +
+ drivers/gpu/drm/i915/display/intel_opregion.c | 6 +-
+ drivers/gpu/drm/i915/display/intel_psr.c | 210 ++++--
+ drivers/gpu/drm/i915/display/intel_psr.h | 10 +-
+ drivers/gpu/drm/i915/display/intel_sprite.c | 74 ++-
+ drivers/gpu/drm/i915/display/intel_vbt_defs.h | 13 +-
+ drivers/gpu/drm/i915/display/vlv_dsi.c | 8 +
+ drivers/gpu/drm/i915/gt/intel_ggtt.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_mocs.c | 41 +-
+ drivers/gpu/drm/i915/gt/intel_rps.c | 56 +-
+ drivers/gpu/drm/i915/gt/intel_sseu.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_workarounds.c | 143 +++-
+ drivers/gpu/drm/i915/gt/uc/intel_guc.c | 6 +-
+ drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 1 +
+ drivers/gpu/drm/i915/gvt/handlers.c | 14 +-
+ drivers/gpu/drm/i915/gvt/reg.h | 4 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 3 +-
+ drivers/gpu/drm/i915/i915_drv.c | 64 +-
+ drivers/gpu/drm/i915/i915_drv.h | 8 +-
+ drivers/gpu/drm/i915/i915_irq.c | 249 ++++++-
+ drivers/gpu/drm/i915/i915_irq.h | 3 +
+ drivers/gpu/drm/i915/i915_pci.c | 21 +
+ drivers/gpu/drm/i915/i915_reg.h | 327 +++++----
+ drivers/gpu/drm/i915/i915_suspend.c | 80 ++-
+ drivers/gpu/drm/i915/i915_suspend.h | 4 +-
+ drivers/gpu/drm/i915/intel_device_info.c | 1 +
+ drivers/gpu/drm/i915/intel_device_info.h | 1 +
+ drivers/gpu/drm/i915/intel_dram.c | 23 +-
+ drivers/gpu/drm/i915/intel_pch.c | 6 +-
+ drivers/gpu/drm/i915/intel_pm.c | 64 +-
+ drivers/gpu/drm/i915/intel_pm.h | 2 -
+ drivers/gpu/drm/i915/intel_sideband.c | 15 +
+ drivers/gpu/drm/i915/intel_sideband.h | 2 +
+ drivers/gpu/drm/i915/intel_uncore.c | 207 ++++--
+ drivers/gpu/drm/i915/intel_uncore.h | 4 +-
+ include/drm/drm_crtc.h | 16 +
+ include/drm/drm_dp_helper.h | 62 ++
+ include/drm/drm_plane.h | 21 +
+ include/drm/i915_pciids.h | 141 ++--
+ 80 files changed, 4174 insertions(+), 1515 deletions(-)
+Merging drm-tegra/drm/tegra/for-next (d9f980ebcd01 drm/tegra: output: rgb: Wrap directly-connected panel into DRM bridge)
+$ git merge drm-tegra/drm/tegra/for-next
+Already up to date.
+Merging drm-misc/for-linux-next (fa3bfa3527b3 drm: Quieten [zero] EDID carping)
+$ git merge drm-misc/for-linux-next
+Auto-merging include/linux/font.h
+Removing include/drm/ttm/ttm_set_memory.h
+Removing include/drm/ttm/ttm_page_alloc.h
+Auto-merging include/drm/drm_prime.h
+Auto-merging include/drm/drm_dp_helper.h
+CONFLICT (content): Merge conflict in include/drm/drm_dp_helper.h
+Auto-merging drivers/video/console/sticore.c
+Auto-merging drivers/misc/fastrpc.c
+Auto-merging drivers/media/common/videobuf2/videobuf2-vmalloc.c
+Auto-merging drivers/media/common/videobuf2/videobuf2-dma-sg.c
+Auto-merging drivers/media/common/videobuf2/videobuf2-dma-contig.c
+Auto-merging drivers/gpu/drm/xen/xen_drm_front_gem.c
+Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
+Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_thp.c
+Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
+Removing drivers/gpu/drm/vkms/vkms_gem.c
+Auto-merging drivers/gpu/drm/virtio/virtgpu_vq.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/virtio/virtgpu_vq.c
+Auto-merging drivers/gpu/drm/virtio/virtgpu_object.c
+Auto-merging drivers/gpu/drm/vc4/vc4_drv.h
+Auto-merging drivers/gpu/drm/vc4/vc4_drv.c
+Auto-merging drivers/gpu/drm/vc4/vc4_crtc.c
+Removing drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
+Removing drivers/gpu/drm/ttm/ttm_page_alloc.c
+Auto-merging drivers/gpu/drm/ttm/ttm_bo.c
+Auto-merging drivers/gpu/drm/tegra/gem.c
+Auto-merging drivers/gpu/drm/rockchip/rockchip_drm_gem.c
+Auto-merging drivers/gpu/drm/radeon/radeon_display.c
+Auto-merging drivers/gpu/drm/radeon/radeon.h
+Auto-merging drivers/gpu/drm/omapdrm/omap_gem.c
+Auto-merging drivers/gpu/drm/nouveau/nouveau_mem.c
+Auto-merging drivers/gpu/drm/msm/msm_gem.c
+Auto-merging drivers/gpu/drm/msm/msm_drv.h
+Auto-merging drivers/gpu/drm/msm/msm_drv.c
+Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
+Auto-merging drivers/gpu/drm/mediatek/mtk_drm_gem.c
+Auto-merging drivers/gpu/drm/mediatek/mtk_drm_drv.c
+Auto-merging drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+Auto-merging drivers/gpu/drm/ingenic/ingenic-drm.h
+Auto-merging drivers/gpu/drm/ingenic/ingenic-drm-drv.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/ingenic/ingenic-drm-drv.c
+Auto-merging drivers/gpu/drm/i915/selftests/mock_gem_device.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.c
+Auto-merging drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c
+Auto-merging drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
+Auto-merging drivers/gpu/drm/exynos/exynos_drm_gem.c
+Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem.c
+Auto-merging drivers/gpu/drm/drm_prime.c
+Auto-merging drivers/gpu/drm/drm_gem_shmem_helper.c
+Auto-merging drivers/gpu/drm/drm_gem_cma_helper.c
+Auto-merging drivers/gpu/drm/drm_gem.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_gem.c
+Auto-merging drivers/gpu/drm/drm_fb_helper.c
+Auto-merging drivers/gpu/drm/drm_edid.c
+Auto-merging drivers/gpu/drm/drm_dp_mst_topology.c
+Auto-merging drivers/gpu/drm/armada/armada_gem.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+Auto-merging drivers/dma-buf/heaps/heap-helpers.c
+Auto-merging drivers/dma-buf/dma-buf.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/driver-api/dma-buf.rst
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c' using previous resolution.
+Resolved 'drivers/gpu/drm/drm_gem.c' using previous resolution.
+Resolved 'drivers/gpu/drm/ingenic/ingenic-drm-drv.c' using previous resolution.
+Resolved 'drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c' using previous resolution.
+Resolved 'drivers/gpu/drm/virtio/virtgpu_vq.c' using previous resolution.
+Resolved 'include/drm/drm_dp_helper.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master e4d1ef012fd2] Merge remote-tracking branch 'drm-misc/for-linux-next' into master
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/display/bridge/analogix,anx7625.yaml | 95 +
+ .../bindings/display/panel/novatek,nt36672a.yaml | 87 +
+ .../bindings/display/panel/panel-simple-dsi.yaml | 3 +
+ .../bindings/display/panel/panel-simple.yaml | 2 +
+ .../bindings/display/ti/ti,am65x-dss.yaml | 11 +
+ .../bindings/display/ti/ti,j721e-dss.yaml | 11 +
+ .../devicetree/bindings/vendor-prefixes.yaml | 4 +
+ Documentation/driver-api/dma-buf.rst | 9 +
+ Documentation/gpu/drm-mm.rst | 4 +-
+ Documentation/gpu/todo.rst | 16 +-
+ Documentation/gpu/vkms.rst | 99 +-
+ MAINTAINERS | 11 +-
+ drivers/dma-buf/dma-buf.c | 63 +-
+ drivers/dma-buf/dma-resv.c | 2 +-
+ drivers/dma-buf/heaps/heap-helpers.c | 10 +-
+ drivers/gpu/drm/Kconfig | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 23 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 5 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 87 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 206 ++-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 2 +-
+ drivers/gpu/drm/arc/arcpgu_crtc.c | 4 +-
+ drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 8 +-
+ drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 16 +-
+ drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 2 -
+ drivers/gpu/drm/arm/hdlcd_crtc.c | 4 +-
+ drivers/gpu/drm/arm/malidp_crtc.c | 6 +-
+ drivers/gpu/drm/armada/armada_crtc.c | 8 +-
+ drivers/gpu/drm/armada/armada_drv.c | 3 -
+ drivers/gpu/drm/armada/armada_gem.c | 12 +-
+ drivers/gpu/drm/armada/armada_gem.h | 2 -
+ drivers/gpu/drm/aspeed/Kconfig | 1 +
+ drivers/gpu/drm/aspeed/aspeed_gfx.h | 2 +-
+ drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 78 +-
+ drivers/gpu/drm/ast/ast_mode.c | 23 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 4 +-
+ drivers/gpu/drm/bridge/adv7511/adv7511_audio.c | 6 +-
+ drivers/gpu/drm/bridge/analogix/Kconfig | 9 +
+ drivers/gpu/drm/bridge/analogix/Makefile | 1 +
+ drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 2 +-
+ drivers/gpu/drm/bridge/analogix/anx7625.c | 1850 ++++++++++++++++++++
+ drivers/gpu/drm/bridge/analogix/anx7625.h | 390 +++++
+ .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 2 +-
+ drivers/gpu/drm/bridge/tc358764.c | 107 +-
+ drivers/gpu/drm/bridge/ti-sn65dsi86.c | 43 +-
+ drivers/gpu/drm/drm_atomic.c | 39 +-
+ drivers/gpu/drm/drm_atomic_helper.c | 24 +-
+ drivers/gpu/drm/drm_connector.c | 5 +
+ drivers/gpu/drm/drm_dp_aux_dev.c | 2 +-
+ drivers/gpu/drm/drm_dp_mst_topology.c | 7 +-
+ drivers/gpu/drm/drm_edid.c | 4 +-
+ drivers/gpu/drm/drm_fb_helper.c | 26 +-
+ drivers/gpu/drm/drm_fourcc.c | 1 +
+ drivers/gpu/drm/drm_gem.c | 53 +-
+ drivers/gpu/drm/drm_gem_cma_helper.c | 28 +-
+ drivers/gpu/drm/drm_gem_shmem_helper.c | 17 +-
+ drivers/gpu/drm/drm_gem_vram_helper.c | 180 +-
+ drivers/gpu/drm/drm_internal.h | 8 +-
+ drivers/gpu/drm/drm_ioctl.c | 2 +-
+ drivers/gpu/drm/drm_pci.c | 6 +-
+ drivers/gpu/drm/drm_prime.c | 29 +-
+ drivers/gpu/drm/drm_simple_kms_helper.c | 4 +-
+ drivers/gpu/drm/etnaviv/etnaviv_drv.c | 13 -
+ drivers/gpu/drm/etnaviv/etnaviv_drv.h | 1 -
+ drivers/gpu/drm/etnaviv/etnaviv_gem.c | 19 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 13 +-
+ drivers/gpu/drm/exynos/exynos_drm_crtc.c | 4 +-
+ drivers/gpu/drm/exynos/exynos_drm_drv.c | 10 -
+ drivers/gpu/drm/exynos/exynos_drm_gem.c | 15 +
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 6 +-
+ drivers/gpu/drm/gma500/cdv_intel_dp.c | 7 +-
+ drivers/gpu/drm/gma500/framebuffer.c | 2 +
+ drivers/gpu/drm/gma500/gem.c | 18 +-
+ drivers/gpu/drm/gma500/gem.h | 3 +
+ drivers/gpu/drm/gma500/psb_drv.c | 9 -
+ drivers/gpu/drm/gma500/psb_drv.h | 2 -
+ drivers/gpu/drm/hisilicon/hibmc/Makefile | 2 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 87 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 18 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 33 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c | 99 ++
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 42 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 4 +-
+ drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 13 +-
+ drivers/gpu/drm/i915/gem/i915_gem_object.c | 21 +-
+ drivers/gpu/drm/i915/gem/i915_gem_object.h | 3 -
+ .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 18 +-
+ drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c | 14 +-
+ drivers/gpu/drm/i915/i915_drv.c | 4 -
+ drivers/gpu/drm/i915/selftests/mock_gem_device.c | 3 -
+ drivers/gpu/drm/imx/dcss/dcss-crtc.c | 9 +-
+ drivers/gpu/drm/imx/dcss/dcss-kms.c | 14 +-
+ drivers/gpu/drm/imx/dcss/dcss-plane.c | 2 -
+ drivers/gpu/drm/imx/ipuv3-crtc.c | 6 +-
+ drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 272 ++-
+ drivers/gpu/drm/ingenic/ingenic-drm.h | 3 +
+ drivers/gpu/drm/mcde/mcde_drv.c | 4 +-
+ drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 4 +-
+ drivers/gpu/drm/mediatek/mtk_drm_drv.c | 5 -
+ drivers/gpu/drm/mediatek/mtk_drm_gem.c | 11 +
+ drivers/gpu/drm/meson/meson_crtc.c | 8 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 7 +-
+ drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 4 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 4 +-
+ drivers/gpu/drm/msm/msm_drv.c | 13 -
+ drivers/gpu/drm/msm/msm_drv.h | 1 -
+ drivers/gpu/drm/msm/msm_gem.c | 19 +-
+ drivers/gpu/drm/mxsfb/mxsfb_kms.c | 4 +-
+ drivers/gpu/drm/nouveau/nouveau_bo.c | 294 ++--
+ drivers/gpu/drm/nouveau/nouveau_bo.h | 4 +-
+ drivers/gpu/drm/nouveau/nouveau_chan.c | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_drm.c | 14 +-
+ drivers/gpu/drm/nouveau/nouveau_drv.h | 1 -
+ drivers/gpu/drm/nouveau/nouveau_gem.c | 14 +-
+ drivers/gpu/drm/nouveau/nouveau_gem.h | 2 +
+ drivers/gpu/drm/nouveau/nouveau_mem.c | 8 +-
+ drivers/gpu/drm/nouveau/nouveau_mem.h | 4 +-
+ drivers/gpu/drm/nouveau/nouveau_prime.c | 2 +
+ drivers/gpu/drm/nouveau/nouveau_sgdma.c | 19 +-
+ drivers/gpu/drm/nouveau/nouveau_ttm.c | 30 +-
+ drivers/gpu/drm/omapdrm/omap_crtc.c | 4 +-
+ drivers/gpu/drm/omapdrm/omap_drv.c | 9 -
+ drivers/gpu/drm/omapdrm/omap_gem.c | 18 +-
+ drivers/gpu/drm/omapdrm/omap_gem.h | 2 -
+ drivers/gpu/drm/panel/Kconfig | 21 +
+ drivers/gpu/drm/panel/Makefile | 2 +
+ drivers/gpu/drm/panel/panel-novatek-nt36672a.c | 711 ++++++++
+ drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 20 +-
+ drivers/gpu/drm/panel/panel-raydium-rm68200.c | 14 +-
+ drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 7 +-
+ drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 2 +-
+ drivers/gpu/drm/panel/panel-simple.c | 29 +
+ drivers/gpu/drm/panel/panel-sitronix-st7703.c | 2 +-
+ drivers/gpu/drm/panel/panel-tdo-tl070wsh30.c | 250 +++
+ drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 7 +-
+ drivers/gpu/drm/panfrost/panfrost_devfreq.c | 7 +-
+ drivers/gpu/drm/panfrost/panfrost_device.c | 8 +-
+ drivers/gpu/drm/panfrost/panfrost_job.c | 62 +-
+ drivers/gpu/drm/pl111/pl111_drv.c | 5 +-
+ drivers/gpu/drm/qxl/qxl_debugfs.c | 2 +-
+ drivers/gpu/drm/qxl/qxl_display.c | 11 +-
+ drivers/gpu/drm/qxl/qxl_drv.h | 1 -
+ drivers/gpu/drm/qxl/qxl_ioctl.c | 4 +-
+ drivers/gpu/drm/qxl/qxl_object.c | 72 +-
+ drivers/gpu/drm/qxl/qxl_object.h | 25 +-
+ drivers/gpu/drm/qxl/qxl_release.c | 4 +-
+ drivers/gpu/drm/qxl/qxl_ttm.c | 110 +-
+ drivers/gpu/drm/radeon/radeon.h | 1 -
+ drivers/gpu/drm/radeon/radeon_display.c | 9 +-
+ drivers/gpu/drm/radeon/radeon_drv.c | 23 +-
+ drivers/gpu/drm/radeon/radeon_gem.c | 31 +-
+ drivers/gpu/drm/radeon/radeon_object.c | 126 +-
+ drivers/gpu/drm/radeon/radeon_object.h | 7 +-
+ drivers/gpu/drm/radeon/radeon_ttm.c | 232 +--
+ drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 6 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 5 -
+ drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 13 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 6 +-
+ drivers/gpu/drm/scheduler/sched_entity.c | 3 +
+ drivers/gpu/drm/sti/sti_crtc.c | 4 +-
+ drivers/gpu/drm/stm/ltdc.c | 4 +-
+ drivers/gpu/drm/sun4i/sun4i_crtc.c | 4 +-
+ drivers/gpu/drm/tegra/dc.c | 8 +-
+ drivers/gpu/drm/tegra/drm.c | 4 -
+ drivers/gpu/drm/tegra/gem.c | 31 +-
+ drivers/gpu/drm/tidss/tidss_crtc.c | 6 +-
+ drivers/gpu/drm/tidss/tidss_plane.c | 2 +
+ drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 56 +-
+ drivers/gpu/drm/tilcdc/tilcdc_drv.c | 42 +-
+ drivers/gpu/drm/tilcdc/tilcdc_drv.h | 7 +-
+ drivers/gpu/drm/ttm/Makefile | 5 +-
+ drivers/gpu/drm/ttm/ttm_agp_backend.c | 5 +-
+ drivers/gpu/drm/ttm/ttm_bo.c | 199 +--
+ drivers/gpu/drm/ttm/ttm_bo_util.c | 103 +-
+ drivers/gpu/drm/ttm/ttm_bo_vm.c | 40 +-
+ drivers/gpu/drm/ttm/ttm_memory.c | 10 +-
+ drivers/gpu/drm/ttm/ttm_page_alloc.c | 1189 -------------
+ drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 1239 -------------
+ drivers/gpu/drm/ttm/ttm_pool.c | 667 +++++++
+ drivers/gpu/drm/ttm/ttm_range_manager.c | 2 +-
+ drivers/gpu/drm/ttm/ttm_resource.c | 10 +-
+ drivers/gpu/drm/ttm/ttm_tt.c | 257 +--
+ drivers/gpu/drm/tve200/tve200_drv.c | 4 +-
+ drivers/gpu/drm/vboxvideo/vbox_mode.c | 4 +-
+ drivers/gpu/drm/vc4/vc4_bo.c | 21 +-
+ drivers/gpu/drm/vc4/vc4_crtc.c | 8 +-
+ drivers/gpu/drm/vc4/vc4_drv.c | 12 -
+ drivers/gpu/drm/vc4/vc4_drv.h | 1 -
+ drivers/gpu/drm/vc4/vc4_dsi.c | 25 +-
+ drivers/gpu/drm/vc4/vc4_txp.c | 9 +-
+ drivers/gpu/drm/vgem/vgem_drv.c | 21 +-
+ drivers/gpu/drm/via/via_mm.c | 2 +-
+ drivers/gpu/drm/virtio/Makefile | 2 +-
+ drivers/gpu/drm/virtio/virtgpu_debugfs.c | 26 +-
+ drivers/gpu/drm/virtio/virtgpu_display.c | 4 +-
+ drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +-
+ drivers/gpu/drm/virtio/virtgpu_drv.h | 79 +-
+ drivers/gpu/drm/virtio/virtgpu_ioctl.c | 185 +-
+ drivers/gpu/drm/virtio/virtgpu_kms.c | 34 +-
+ drivers/gpu/drm/virtio/virtgpu_object.c | 37 +-
+ drivers/gpu/drm/virtio/virtgpu_plane.c | 23 +-
+ drivers/gpu/drm/virtio/virtgpu_prime.c | 46 +-
+ drivers/gpu/drm/virtio/virtgpu_vq.c | 157 +-
+ drivers/gpu/drm/virtio/virtgpu_vram.c | 164 ++
+ drivers/gpu/drm/vkms/Makefile | 1 -
+ drivers/gpu/drm/vkms/vkms_composer.c | 17 +-
+ drivers/gpu/drm/vkms/vkms_crtc.c | 4 +-
+ drivers/gpu/drm/vkms/vkms_drv.c | 30 +-
+ drivers/gpu/drm/vkms/vkms_drv.h | 29 -
+ drivers/gpu/drm/vkms/vkms_gem.c | 248 ---
+ drivers/gpu/drm/vkms/vkms_plane.c | 13 +-
+ drivers/gpu/drm/vkms/vkms_writeback.c | 17 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 8 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 95 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 6 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 29 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 12 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 6 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 8 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 231 +--
+ drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 2 +-
+ drivers/gpu/drm/xen/xen_drm_front.c | 44 +-
+ drivers/gpu/drm/xen/xen_drm_front.h | 2 +
+ drivers/gpu/drm/xen/xen_drm_front_gem.c | 15 +
+ drivers/gpu/drm/xlnx/zynqmp_disp.c | 10 +-
+ drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 14 +-
+ drivers/gpu/drm/zte/zx_vou.c | 4 +-
+ drivers/gpu/vga/vga_switcheroo.c | 7 +-
+ .../media/common/videobuf2/videobuf2-dma-contig.c | 17 +-
+ drivers/media/common/videobuf2/videobuf2-dma-sg.c | 19 +-
+ drivers/media/common/videobuf2/videobuf2-vmalloc.c | 21 +-
+ drivers/misc/fastrpc.c | 6 +-
+ drivers/video/console/sticore.c | 2 +-
+ drivers/video/fbdev/atafb.c | 8 -
+ drivers/video/fbdev/aty/radeon_base.c | 4 +-
+ drivers/video/fbdev/cirrusfb.c | 3 +-
+ drivers/video/fbdev/core/fbmem.c | 44 +-
+ drivers/video/fbdev/fsl-diu-fb.c | 3 +-
+ drivers/video/fbdev/matrox/matroxfb_base.c | 8 +-
+ drivers/video/fbdev/mx3fb.c | 2 -
+ drivers/video/fbdev/nvidia/nv_of.c | 3 +-
+ .../omap2/omapfb/displays/connector-analog-tv.c | 7 +-
+ .../fbdev/omap2/omapfb/displays/connector-dvi.c | 7 +-
+ .../fbdev/omap2/omapfb/displays/connector-hdmi.c | 7 +-
+ .../video/fbdev/omap2/omapfb/displays/panel-dpi.c | 7 +-
+ .../omapfb/displays/panel-sharp-ls037v7dw01.c | 7 +-
+ .../omap2/omapfb/displays/panel-sony-acx565akm.c | 7 +-
+ .../omap2/omapfb/displays/panel-tpo-td043mtea1.c | 7 +-
+ drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c | 10 +-
+ drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c | 10 +-
+ drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c | 10 +-
+ drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c | 16 +-
+ drivers/video/fbdev/omap2/omapfb/dss/venc.c | 6 +-
+ drivers/video/fbdev/omap2/omapfb/dss/video-pll.c | 20 +-
+ drivers/video/fbdev/sbuslib.c | 124 +-
+ drivers/video/fbdev/sh_mobile_lcdcfb.c | 6 +-
+ drivers/video/fbdev/sis/300vtbl.h | 2 -
+ drivers/video/fbdev/sis/sis_accel.h | 14 +-
+ include/drm/drm_atomic.h | 12 +-
+ include/drm/drm_dp_helper.h | 72 +-
+ include/drm/drm_drv.h | 85 +-
+ include/drm/drm_gem.h | 2 +-
+ include/drm/drm_gem_vram_helper.h | 3 -
+ include/drm/drm_mode_config.h | 13 +
+ include/drm/drm_modeset_helper_vtables.h | 13 +-
+ include/drm/drm_prime.h | 5 +-
+ include/drm/ttm/ttm_bo_api.h | 83 +-
+ include/drm/ttm/ttm_bo_driver.h | 104 +-
+ include/drm/ttm/ttm_caching.h | 36 +
+ include/drm/ttm/ttm_page_alloc.h | 122 --
+ include/drm/ttm/ttm_placement.h | 15 -
+ include/drm/ttm/ttm_pool.h | 91 +
+ include/drm/ttm/ttm_resource.h | 12 +-
+ include/drm/ttm/ttm_set_memory.h | 150 --
+ include/drm/ttm/ttm_tt.h | 82 +-
+ include/linux/dma-buf-map.h | 193 ++
+ include/linux/dma-buf.h | 14 +-
+ include/linux/font.h | 2 +-
+ include/linux/platform_data/shmob_drm.h | 2 -
+ include/uapi/drm/drm_fourcc.h | 41 +-
+ include/uapi/drm/virtgpu_drm.h | 39 +-
+ include/uapi/linux/virtio_gpu.h | 78 +
+ 300 files changed, 8297 insertions(+), 5988 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/panel/novatek,nt36672a.yaml
+ create mode 100644 drivers/gpu/drm/bridge/analogix/anx7625.c
+ create mode 100644 drivers/gpu/drm/bridge/analogix/anx7625.h
+ create mode 100644 drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c
+ create mode 100644 drivers/gpu/drm/panel/panel-novatek-nt36672a.c
+ create mode 100644 drivers/gpu/drm/panel/panel-tdo-tl070wsh30.c
+ delete mode 100644 drivers/gpu/drm/ttm/ttm_page_alloc.c
+ delete mode 100644 drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
+ create mode 100644 drivers/gpu/drm/ttm/ttm_pool.c
+ create mode 100644 drivers/gpu/drm/virtio/virtgpu_vram.c
+ delete mode 100644 drivers/gpu/drm/vkms/vkms_gem.c
+ create mode 100644 include/drm/ttm/ttm_caching.h
+ delete mode 100644 include/drm/ttm/ttm_page_alloc.h
+ create mode 100644 include/drm/ttm/ttm_pool.h
+ delete mode 100644 include/drm/ttm/ttm_set_memory.h
+ create mode 100644 include/linux/dma-buf-map.h
+$ git am -3 ../patches/0001-merge-fix-up-for-drm-amdgpu-Add-debugfs-entry-for-pr.patch
+Applying: merge fix up for "drm/amdgpu: Add debugfs entry for printing VM info"
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+$ git add -A .
+$ git commit -v -a --amend
+[master d008442ed0b8] Merge remote-tracking branch 'drm-misc/for-linux-next' into master
+ Date: Fri Oct 30 10:56:40 2020 +1100
+$ git reset --hard HEAD^
+HEAD is now at a0b37d2455e0 Merge remote-tracking branch 'drm-intel/for-linux-next' into master
+Merging next-20201029 version of drm-misc
+$ git merge -m next-20201029/drm-misc 5144eead3f8c80ac7f913c07139442fede94003e
+Auto-merging include/linux/font.h
+Auto-merging include/drm/drm_prime.h
+Auto-merging include/drm/drm_dp_helper.h
+CONFLICT (content): Merge conflict in include/drm/drm_dp_helper.h
+Auto-merging drivers/video/console/sticore.c
+Auto-merging drivers/misc/fastrpc.c
+Auto-merging drivers/media/common/videobuf2/videobuf2-vmalloc.c
+Auto-merging drivers/media/common/videobuf2/videobuf2-dma-sg.c
+Auto-merging drivers/media/common/videobuf2/videobuf2-dma-contig.c
+Auto-merging drivers/gpu/drm/xen/xen_drm_front_gem.c
+Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
+Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_thp.c
+Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
+Removing drivers/gpu/drm/vkms/vkms_gem.c
+Auto-merging drivers/gpu/drm/virtio/virtgpu_vq.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/virtio/virtgpu_vq.c
+Auto-merging drivers/gpu/drm/virtio/virtgpu_object.c
+Auto-merging drivers/gpu/drm/vc4/vc4_drv.h
+Auto-merging drivers/gpu/drm/vc4/vc4_drv.c
+Auto-merging drivers/gpu/drm/vc4/vc4_crtc.c
+Auto-merging drivers/gpu/drm/ttm/ttm_bo.c
+Auto-merging drivers/gpu/drm/tegra/gem.c
+Auto-merging drivers/gpu/drm/rockchip/rockchip_drm_gem.c
+Auto-merging drivers/gpu/drm/radeon/radeon_display.c
+Auto-merging drivers/gpu/drm/radeon/radeon.h
+Auto-merging drivers/gpu/drm/omapdrm/omap_gem.c
+Auto-merging drivers/gpu/drm/nouveau/nouveau_mem.c
+Auto-merging drivers/gpu/drm/msm/msm_gem.c
+Auto-merging drivers/gpu/drm/msm/msm_drv.h
+Auto-merging drivers/gpu/drm/msm/msm_drv.c
+Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
+Auto-merging drivers/gpu/drm/mediatek/mtk_drm_gem.c
+Auto-merging drivers/gpu/drm/mediatek/mtk_drm_drv.c
+Auto-merging drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+Auto-merging drivers/gpu/drm/ingenic/ingenic-drm.h
+Auto-merging drivers/gpu/drm/ingenic/ingenic-drm-drv.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/ingenic/ingenic-drm-drv.c
+Auto-merging drivers/gpu/drm/i915/selftests/mock_gem_device.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.c
+Auto-merging drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c
+Auto-merging drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
+Auto-merging drivers/gpu/drm/exynos/exynos_drm_gem.c
+Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem.c
+Auto-merging drivers/gpu/drm/drm_prime.c
+Auto-merging drivers/gpu/drm/drm_gem_shmem_helper.c
+Auto-merging drivers/gpu/drm/drm_gem_cma_helper.c
+Auto-merging drivers/gpu/drm/drm_gem.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_gem.c
+Auto-merging drivers/gpu/drm/drm_fb_helper.c
+Auto-merging drivers/gpu/drm/drm_dp_mst_topology.c
+Auto-merging drivers/gpu/drm/armada/armada_gem.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+Auto-merging drivers/dma-buf/heaps/heap-helpers.c
+Auto-merging drivers/dma-buf/dma-buf.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/driver-api/dma-buf.rst
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c' using previous resolution.
+Resolved 'drivers/gpu/drm/drm_gem.c' using previous resolution.
+Resolved 'drivers/gpu/drm/ingenic/ingenic-drm-drv.c' using previous resolution.
+Resolved 'drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c' using previous resolution.
+Resolved 'drivers/gpu/drm/virtio/virtgpu_vq.c' using previous resolution.
+Resolved 'include/drm/drm_dp_helper.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 650ac09e383e] next-20201029/drm-misc
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/display/bridge/analogix,anx7625.yaml | 95 +
+ .../bindings/display/panel/novatek,nt36672a.yaml | 87 +
+ .../bindings/display/panel/panel-simple-dsi.yaml | 3 +
+ .../bindings/display/panel/panel-simple.yaml | 2 +
+ .../bindings/display/ti/ti,am65x-dss.yaml | 11 +
+ .../bindings/display/ti/ti,j721e-dss.yaml | 11 +
+ .../devicetree/bindings/vendor-prefixes.yaml | 4 +
+ Documentation/driver-api/dma-buf.rst | 9 +
+ Documentation/gpu/drm-mm.rst | 4 +-
+ Documentation/gpu/todo.rst | 16 +-
+ Documentation/gpu/vkms.rst | 99 +-
+ MAINTAINERS | 11 +-
+ drivers/dma-buf/dma-buf.c | 63 +-
+ drivers/dma-buf/dma-resv.c | 2 +-
+ drivers/dma-buf/heaps/heap-helpers.c | 10 +-
+ drivers/gpu/drm/Kconfig | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 23 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 5 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 87 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 157 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 2 +-
+ drivers/gpu/drm/arc/arcpgu_crtc.c | 4 +-
+ drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 8 +-
+ drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 16 +-
+ drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 2 -
+ drivers/gpu/drm/arm/hdlcd_crtc.c | 4 +-
+ drivers/gpu/drm/arm/malidp_crtc.c | 6 +-
+ drivers/gpu/drm/armada/armada_crtc.c | 8 +-
+ drivers/gpu/drm/armada/armada_drv.c | 3 -
+ drivers/gpu/drm/armada/armada_gem.c | 12 +-
+ drivers/gpu/drm/armada/armada_gem.h | 2 -
+ drivers/gpu/drm/aspeed/Kconfig | 1 +
+ drivers/gpu/drm/aspeed/aspeed_gfx.h | 2 +-
+ drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 78 +-
+ drivers/gpu/drm/ast/ast_mode.c | 23 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 4 +-
+ drivers/gpu/drm/bridge/adv7511/adv7511_audio.c | 6 +-
+ drivers/gpu/drm/bridge/analogix/Kconfig | 9 +
+ drivers/gpu/drm/bridge/analogix/Makefile | 1 +
+ drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 2 +-
+ drivers/gpu/drm/bridge/analogix/anx7625.c | 1850 ++++++++++++++++++++
+ drivers/gpu/drm/bridge/analogix/anx7625.h | 390 +++++
+ .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 2 +-
+ drivers/gpu/drm/bridge/tc358764.c | 107 +-
+ drivers/gpu/drm/bridge/ti-sn65dsi86.c | 43 +-
+ drivers/gpu/drm/drm_atomic.c | 39 +-
+ drivers/gpu/drm/drm_atomic_helper.c | 24 +-
+ drivers/gpu/drm/drm_connector.c | 5 +
+ drivers/gpu/drm/drm_dp_aux_dev.c | 2 +-
+ drivers/gpu/drm/drm_dp_mst_topology.c | 7 +-
+ drivers/gpu/drm/drm_fb_helper.c | 26 +-
+ drivers/gpu/drm/drm_fourcc.c | 1 +
+ drivers/gpu/drm/drm_gem.c | 53 +-
+ drivers/gpu/drm/drm_gem_cma_helper.c | 28 +-
+ drivers/gpu/drm/drm_gem_shmem_helper.c | 17 +-
+ drivers/gpu/drm/drm_gem_vram_helper.c | 175 +-
+ drivers/gpu/drm/drm_internal.h | 8 +-
+ drivers/gpu/drm/drm_ioctl.c | 2 +-
+ drivers/gpu/drm/drm_pci.c | 6 +-
+ drivers/gpu/drm/drm_prime.c | 29 +-
+ drivers/gpu/drm/drm_simple_kms_helper.c | 4 +-
+ drivers/gpu/drm/etnaviv/etnaviv_drv.c | 13 -
+ drivers/gpu/drm/etnaviv/etnaviv_drv.h | 1 -
+ drivers/gpu/drm/etnaviv/etnaviv_gem.c | 19 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 13 +-
+ drivers/gpu/drm/exynos/exynos_drm_crtc.c | 4 +-
+ drivers/gpu/drm/exynos/exynos_drm_drv.c | 10 -
+ drivers/gpu/drm/exynos/exynos_drm_gem.c | 15 +
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 6 +-
+ drivers/gpu/drm/gma500/cdv_intel_dp.c | 7 +-
+ drivers/gpu/drm/gma500/framebuffer.c | 2 +
+ drivers/gpu/drm/gma500/gem.c | 18 +-
+ drivers/gpu/drm/gma500/gem.h | 3 +
+ drivers/gpu/drm/gma500/psb_drv.c | 9 -
+ drivers/gpu/drm/gma500/psb_drv.h | 2 -
+ drivers/gpu/drm/hisilicon/hibmc/Makefile | 2 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 87 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 18 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 33 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c | 99 ++
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 42 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 4 +-
+ drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 13 +-
+ drivers/gpu/drm/i915/gem/i915_gem_object.c | 21 +-
+ drivers/gpu/drm/i915/gem/i915_gem_object.h | 3 -
+ .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 18 +-
+ drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c | 14 +-
+ drivers/gpu/drm/i915/i915_drv.c | 4 -
+ drivers/gpu/drm/i915/selftests/mock_gem_device.c | 3 -
+ drivers/gpu/drm/imx/dcss/dcss-crtc.c | 9 +-
+ drivers/gpu/drm/imx/dcss/dcss-kms.c | 14 +-
+ drivers/gpu/drm/imx/dcss/dcss-plane.c | 2 -
+ drivers/gpu/drm/imx/ipuv3-crtc.c | 6 +-
+ drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 272 ++-
+ drivers/gpu/drm/ingenic/ingenic-drm.h | 3 +
+ drivers/gpu/drm/mcde/mcde_drv.c | 4 +-
+ drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 4 +-
+ drivers/gpu/drm/mediatek/mtk_drm_drv.c | 5 -
+ drivers/gpu/drm/mediatek/mtk_drm_gem.c | 11 +
+ drivers/gpu/drm/meson/meson_crtc.c | 8 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 7 +-
+ drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 4 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 4 +-
+ drivers/gpu/drm/msm/msm_drv.c | 13 -
+ drivers/gpu/drm/msm/msm_drv.h | 1 -
+ drivers/gpu/drm/msm/msm_gem.c | 19 +-
+ drivers/gpu/drm/mxsfb/mxsfb_kms.c | 4 +-
+ drivers/gpu/drm/nouveau/nouveau_bo.c | 266 +--
+ drivers/gpu/drm/nouveau/nouveau_bo.h | 4 +-
+ drivers/gpu/drm/nouveau/nouveau_chan.c | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_drm.c | 14 +-
+ drivers/gpu/drm/nouveau/nouveau_gem.c | 14 +-
+ drivers/gpu/drm/nouveau/nouveau_gem.h | 2 +
+ drivers/gpu/drm/nouveau/nouveau_mem.c | 8 +-
+ drivers/gpu/drm/nouveau/nouveau_mem.h | 4 +-
+ drivers/gpu/drm/nouveau/nouveau_prime.c | 2 +
+ drivers/gpu/drm/nouveau/nouveau_sgdma.c | 19 +-
+ drivers/gpu/drm/nouveau/nouveau_ttm.c | 16 +-
+ drivers/gpu/drm/omapdrm/omap_crtc.c | 4 +-
+ drivers/gpu/drm/omapdrm/omap_drv.c | 9 -
+ drivers/gpu/drm/omapdrm/omap_gem.c | 18 +-
+ drivers/gpu/drm/omapdrm/omap_gem.h | 2 -
+ drivers/gpu/drm/panel/Kconfig | 21 +
+ drivers/gpu/drm/panel/Makefile | 2 +
+ drivers/gpu/drm/panel/panel-novatek-nt36672a.c | 711 ++++++++
+ drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 20 +-
+ drivers/gpu/drm/panel/panel-raydium-rm68200.c | 14 +-
+ drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 7 +-
+ drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 2 +-
+ drivers/gpu/drm/panel/panel-simple.c | 29 +
+ drivers/gpu/drm/panel/panel-sitronix-st7703.c | 2 +-
+ drivers/gpu/drm/panel/panel-tdo-tl070wsh30.c | 250 +++
+ drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 7 +-
+ drivers/gpu/drm/panfrost/panfrost_devfreq.c | 7 +-
+ drivers/gpu/drm/panfrost/panfrost_device.c | 8 +-
+ drivers/gpu/drm/panfrost/panfrost_job.c | 62 +-
+ drivers/gpu/drm/pl111/pl111_drv.c | 5 +-
+ drivers/gpu/drm/qxl/qxl_debugfs.c | 2 +-
+ drivers/gpu/drm/qxl/qxl_display.c | 11 +-
+ drivers/gpu/drm/qxl/qxl_drv.h | 1 -
+ drivers/gpu/drm/qxl/qxl_ioctl.c | 4 +-
+ drivers/gpu/drm/qxl/qxl_object.c | 72 +-
+ drivers/gpu/drm/qxl/qxl_object.h | 25 +-
+ drivers/gpu/drm/qxl/qxl_release.c | 4 +-
+ drivers/gpu/drm/qxl/qxl_ttm.c | 104 +-
+ drivers/gpu/drm/radeon/radeon.h | 1 -
+ drivers/gpu/drm/radeon/radeon_display.c | 9 +-
+ drivers/gpu/drm/radeon/radeon_drv.c | 23 +-
+ drivers/gpu/drm/radeon/radeon_gem.c | 31 +-
+ drivers/gpu/drm/radeon/radeon_object.c | 126 +-
+ drivers/gpu/drm/radeon/radeon_object.h | 7 +-
+ drivers/gpu/drm/radeon/radeon_ttm.c | 176 +-
+ drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 6 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 5 -
+ drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 13 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 6 +-
+ drivers/gpu/drm/scheduler/sched_entity.c | 3 +
+ drivers/gpu/drm/sti/sti_crtc.c | 4 +-
+ drivers/gpu/drm/stm/ltdc.c | 4 +-
+ drivers/gpu/drm/sun4i/sun4i_crtc.c | 4 +-
+ drivers/gpu/drm/tegra/dc.c | 8 +-
+ drivers/gpu/drm/tegra/drm.c | 4 -
+ drivers/gpu/drm/tegra/gem.c | 31 +-
+ drivers/gpu/drm/tidss/tidss_crtc.c | 6 +-
+ drivers/gpu/drm/tidss/tidss_plane.c | 2 +
+ drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 56 +-
+ drivers/gpu/drm/tilcdc/tilcdc_drv.c | 42 +-
+ drivers/gpu/drm/tilcdc/tilcdc_drv.h | 7 +-
+ drivers/gpu/drm/ttm/ttm_agp_backend.c | 4 +-
+ drivers/gpu/drm/ttm/ttm_bo.c | 192 +-
+ drivers/gpu/drm/ttm/ttm_bo_util.c | 103 +-
+ drivers/gpu/drm/ttm/ttm_bo_vm.c | 40 +-
+ drivers/gpu/drm/ttm/ttm_memory.c | 2 +-
+ drivers/gpu/drm/ttm/ttm_page_alloc.c | 89 +-
+ drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 77 +-
+ drivers/gpu/drm/ttm/ttm_range_manager.c | 2 +-
+ drivers/gpu/drm/ttm/ttm_resource.c | 10 +-
+ {include => drivers/gpu}/drm/ttm/ttm_set_memory.h | 66 -
+ drivers/gpu/drm/ttm/ttm_tt.c | 250 +--
+ drivers/gpu/drm/tve200/tve200_drv.c | 4 +-
+ drivers/gpu/drm/vboxvideo/vbox_mode.c | 4 +-
+ drivers/gpu/drm/vc4/vc4_bo.c | 21 +-
+ drivers/gpu/drm/vc4/vc4_crtc.c | 8 +-
+ drivers/gpu/drm/vc4/vc4_drv.c | 12 -
+ drivers/gpu/drm/vc4/vc4_drv.h | 1 -
+ drivers/gpu/drm/vc4/vc4_dsi.c | 25 +-
+ drivers/gpu/drm/vc4/vc4_txp.c | 9 +-
+ drivers/gpu/drm/vgem/vgem_drv.c | 21 +-
+ drivers/gpu/drm/via/via_mm.c | 2 +-
+ drivers/gpu/drm/virtio/Makefile | 2 +-
+ drivers/gpu/drm/virtio/virtgpu_debugfs.c | 26 +-
+ drivers/gpu/drm/virtio/virtgpu_display.c | 4 +-
+ drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +-
+ drivers/gpu/drm/virtio/virtgpu_drv.h | 79 +-
+ drivers/gpu/drm/virtio/virtgpu_ioctl.c | 185 +-
+ drivers/gpu/drm/virtio/virtgpu_kms.c | 34 +-
+ drivers/gpu/drm/virtio/virtgpu_object.c | 37 +-
+ drivers/gpu/drm/virtio/virtgpu_plane.c | 23 +-
+ drivers/gpu/drm/virtio/virtgpu_prime.c | 46 +-
+ drivers/gpu/drm/virtio/virtgpu_vq.c | 157 +-
+ drivers/gpu/drm/virtio/virtgpu_vram.c | 164 ++
+ drivers/gpu/drm/vkms/Makefile | 1 -
+ drivers/gpu/drm/vkms/vkms_composer.c | 17 +-
+ drivers/gpu/drm/vkms/vkms_crtc.c | 4 +-
+ drivers/gpu/drm/vkms/vkms_drv.c | 30 +-
+ drivers/gpu/drm/vkms/vkms_drv.h | 29 -
+ drivers/gpu/drm/vkms/vkms_gem.c | 248 ---
+ drivers/gpu/drm/vkms/vkms_plane.c | 13 +-
+ drivers/gpu/drm/vkms/vkms_writeback.c | 17 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 8 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 95 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 6 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 20 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 12 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 6 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 8 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 197 +--
+ drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 2 +-
+ drivers/gpu/drm/xen/xen_drm_front.c | 44 +-
+ drivers/gpu/drm/xen/xen_drm_front.h | 2 +
+ drivers/gpu/drm/xen/xen_drm_front_gem.c | 15 +
+ drivers/gpu/drm/xlnx/zynqmp_disp.c | 10 +-
+ drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 14 +-
+ drivers/gpu/drm/zte/zx_vou.c | 4 +-
+ drivers/gpu/vga/vga_switcheroo.c | 7 +-
+ .../media/common/videobuf2/videobuf2-dma-contig.c | 17 +-
+ drivers/media/common/videobuf2/videobuf2-dma-sg.c | 19 +-
+ drivers/media/common/videobuf2/videobuf2-vmalloc.c | 21 +-
+ drivers/misc/fastrpc.c | 6 +-
+ drivers/video/console/sticore.c | 2 +-
+ drivers/video/fbdev/atafb.c | 8 -
+ drivers/video/fbdev/aty/radeon_base.c | 4 +-
+ drivers/video/fbdev/cirrusfb.c | 3 +-
+ drivers/video/fbdev/core/fbmem.c | 44 +-
+ drivers/video/fbdev/fsl-diu-fb.c | 3 +-
+ drivers/video/fbdev/matrox/matroxfb_base.c | 8 +-
+ drivers/video/fbdev/mx3fb.c | 2 -
+ drivers/video/fbdev/nvidia/nv_of.c | 3 +-
+ .../omap2/omapfb/displays/connector-analog-tv.c | 7 +-
+ .../fbdev/omap2/omapfb/displays/connector-dvi.c | 7 +-
+ .../fbdev/omap2/omapfb/displays/connector-hdmi.c | 7 +-
+ .../video/fbdev/omap2/omapfb/displays/panel-dpi.c | 7 +-
+ .../omapfb/displays/panel-sharp-ls037v7dw01.c | 7 +-
+ .../omap2/omapfb/displays/panel-sony-acx565akm.c | 7 +-
+ .../omap2/omapfb/displays/panel-tpo-td043mtea1.c | 7 +-
+ drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c | 10 +-
+ drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c | 10 +-
+ drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c | 10 +-
+ drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c | 16 +-
+ drivers/video/fbdev/omap2/omapfb/dss/venc.c | 6 +-
+ drivers/video/fbdev/omap2/omapfb/dss/video-pll.c | 20 +-
+ drivers/video/fbdev/sbuslib.c | 124 +-
+ drivers/video/fbdev/sh_mobile_lcdcfb.c | 6 +-
+ drivers/video/fbdev/sis/300vtbl.h | 2 -
+ drivers/video/fbdev/sis/sis_accel.h | 14 +-
+ include/drm/drm_atomic.h | 12 +-
+ include/drm/drm_dp_helper.h | 72 +-
+ include/drm/drm_drv.h | 85 +-
+ include/drm/drm_gem.h | 2 +-
+ include/drm/drm_gem_vram_helper.h | 3 -
+ include/drm/drm_mode_config.h | 13 +
+ include/drm/drm_modeset_helper_vtables.h | 13 +-
+ include/drm/drm_prime.h | 5 +-
+ include/drm/ttm/ttm_bo_api.h | 83 +-
+ include/drm/ttm/ttm_bo_driver.h | 91 +-
+ include/drm/ttm/ttm_caching.h | 34 +
+ include/drm/ttm/ttm_page_alloc.h | 12 +-
+ include/drm/ttm/ttm_placement.h | 15 -
+ include/drm/ttm/ttm_resource.h | 12 +-
+ include/drm/ttm/ttm_tt.h | 82 +-
+ include/linux/dma-buf-map.h | 193 ++
+ include/linux/dma-buf.h | 14 +-
+ include/linux/font.h | 2 +-
+ include/linux/platform_data/shmob_drm.h | 2 -
+ include/uapi/drm/drm_fourcc.h | 41 +-
+ include/uapi/drm/virtgpu_drm.h | 39 +-
+ include/uapi/linux/virtio_gpu.h | 78 +
+ 295 files changed, 7543 insertions(+), 3272 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/panel/novatek,nt36672a.yaml
+ create mode 100644 drivers/gpu/drm/bridge/analogix/anx7625.c
+ create mode 100644 drivers/gpu/drm/bridge/analogix/anx7625.h
+ create mode 100644 drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c
+ create mode 100644 drivers/gpu/drm/panel/panel-novatek-nt36672a.c
+ create mode 100644 drivers/gpu/drm/panel/panel-tdo-tl070wsh30.c
+ rename {include => drivers/gpu}/drm/ttm/ttm_set_memory.h (66%)
+ create mode 100644 drivers/gpu/drm/virtio/virtgpu_vram.c
+ delete mode 100644 drivers/gpu/drm/vkms/vkms_gem.c
+ create mode 100644 include/drm/ttm/ttm_caching.h
+ create mode 100644 include/linux/dma-buf-map.h
+$ git am -3 ../patches/0001-merge-fix-up-for-drm-amdgpu-Add-debugfs-entry-for-pr.patch
+Applying: merge fix up for "drm/amdgpu: Add debugfs entry for printing VM info"
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 1f7508ebf10b] next-20201029/drm-misc
+ Date: Fri Oct 30 11:04:47 2020 +1100
+Merging drm-msm/msm-next (d1ea91492585 drm/msm/dp: fix incorrect function prototype of dp_debug_get())
+$ git merge drm-msm/msm-next
+Already up to date.
+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 (36fba366cf9f drm/imx: tve remove extraneous type qualifier)
+$ git merge imx-drm/imx-drm/next
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/imx/dw_hdmi-imx.c | 17 ++-------
+ drivers/gpu/drm/imx/imx-drm-core.c | 10 ++---
+ drivers/gpu/drm/imx/imx-ldb.c | 10 ++---
+ drivers/gpu/drm/imx/imx-tve.c | 40 +++-----------------
+ drivers/gpu/drm/imx/parallel-display.c | 20 ++--------
+ drivers/gpu/ipu-v3/ipu-common.c | 67 ----------------------------------
+ include/video/imx-ipu-v3.h | 3 --
+ 7 files changed, 21 insertions(+), 146 deletions(-)
+Merging etnaviv/etnaviv/next (3136fed4f91e drm/etnaviv: Drop local dma_parms)
+$ git merge etnaviv/etnaviv/next
+Auto-merging drivers/gpu/drm/etnaviv/etnaviv_drv.h
+Auto-merging drivers/gpu/drm/etnaviv/etnaviv_drv.c
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/etnaviv/etnaviv_drv.c | 3 --
+ drivers/gpu/drm/etnaviv/etnaviv_drv.h | 1 -
+ drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 78 ++++++++++++++++++++++---------
+ 3 files changed, 55 insertions(+), 27 deletions(-)
+Merging regmap/for-next (f243af4d473b Merge remote-tracking branch 'regmap/for-5.11' into regmap-next)
+$ git merge regmap/for-next
+Merge made by the 'recursive' strategy.
+ drivers/base/regmap/regmap-mmio.c | 90 +++++++++++++++++++++++++++++++++++----
+ include/linux/regmap.h | 5 +++
+ 2 files changed, 87 insertions(+), 8 deletions(-)
+Merging sound/for-next (ad26098970b6 ALSA: remove unneeded break)
+$ git merge sound/for-next
+Merge made by the 'recursive' strategy.
+ sound/pci/rme32.c | 1 -
+ sound/pci/rme9652/hdspm.c | 8 --------
+ sound/pci/rme9652/rme9652.c | 7 -------
+ sound/soc/codecs/wcd-clsh-v2.c | 1 -
+ sound/soc/codecs/wl1273.c | 1 -
+ sound/soc/intel/skylake/skl-pcm.c | 1 -
+ sound/soc/ti/davinci-mcasp.c | 1 -
+ 7 files changed, 20 deletions(-)
+Merging sound-asoc/for-next (715235e5162d Merge remote-tracking branch 'asoc/for-5.11' into asoc-next)
+$ git merge sound-asoc/for-next
+Auto-merging sound/soc/soc-dapm.c
+Removing include/linux/platform_data/adau1977.h
+Removing Documentation/devicetree/bindings/sound/st,stm32-sai.txt
+Removing Documentation/devicetree/bindings/sound/st,stm32-adfsdm.txt
+Merge made by the 'recursive' strategy.
+ .../bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 7 +-
+ .../devicetree/bindings/sound/fsl,spdif.yaml | 1 +
+ .../devicetree/bindings/sound/fsl,xcvr.yaml | 104 ++
+ .../bindings/sound/google,sc7180-trogdor.yaml | 130 ++
+ .../devicetree/bindings/sound/qcom,sm8250.yaml | 159 +++
+ .../devicetree/bindings/sound/st,stm32-adfsdm.txt | 63 -
+ .../devicetree/bindings/sound/st,stm32-sai.txt | 107 --
+ .../devicetree/bindings/sound/st,stm32-sai.yaml | 200 +++
+ include/dt-bindings/sound/adi,adau1977.h | 15 +
+ include/linux/platform_data/adau1977.h | 44 -
+ include/sound/soc-component.h | 6 +-
+ include/sound/soc-dai.h | 4 +-
+ include/sound/soc-link.h | 3 +-
+ include/sound/soc.h | 7 +-
+ sound/soc/amd/raven/pci-acp3x.c | 4 +-
+ sound/soc/codecs/Kconfig | 2 +-
+ sound/soc/codecs/adau1977.c | 9 +-
+ sound/soc/codecs/madera.c | 4 +-
+ sound/soc/codecs/wm5102.c | 4 +-
+ sound/soc/codecs/wm8350.c | 3 +-
+ sound/soc/fsl/Kconfig | 10 +
+ sound/soc/fsl/Makefile | 2 +
+ sound/soc/fsl/fsl_spdif.c | 73 +-
+ sound/soc/fsl/fsl_spdif.h | 9 +-
+ sound/soc/fsl/fsl_xcvr.c | 1359 ++++++++++++++++++++
+ sound/soc/fsl/fsl_xcvr.h | 266 ++++
+ sound/soc/intel/boards/bytcr_rt5651.c | 2 +-
+ sound/soc/jz4740/jz4740-i2s.c | 5 -
+ sound/soc/qcom/Kconfig | 23 +
+ sound/soc/qcom/Makefile | 4 +
+ sound/soc/qcom/lpass-hdmi.c | 2 +-
+ sound/soc/qcom/qdsp6/q6adm.c | 10 +-
+ sound/soc/qcom/qdsp6/q6afe.c | 10 +-
+ sound/soc/qcom/qdsp6/q6asm.c | 10 +-
+ sound/soc/qcom/sc7180.c | 266 ++++
+ sound/soc/qcom/sm8250.c | 227 ++++
+ sound/soc/samsung/snow.c | 2 +-
+ sound/soc/soc-component.c | 19 +-
+ sound/soc/soc-dai.c | 13 +-
+ sound/soc/soc-dapm.c | 6 +-
+ sound/soc/soc-link.c | 12 +-
+ sound/soc/soc-pcm.c | 131 +-
+ sound/soc/sof/control.c | 20 +-
+ sound/soc/sof/intel/hda-dsp.c | 2 +-
+ sound/soc/sof/sof-audio.c | 10 +-
+ sound/soc/sof/topology.c | 2 +-
+ sound/soc/sunxi/Kconfig | 1 +
+ sound/soc/sunxi/sun8i-codec.c | 834 ++++++++++--
+ 48 files changed, 3667 insertions(+), 539 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/fsl,xcvr.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/qcom,sm8250.yaml
+ delete mode 100644 Documentation/devicetree/bindings/sound/st,stm32-adfsdm.txt
+ delete mode 100644 Documentation/devicetree/bindings/sound/st,stm32-sai.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/st,stm32-sai.yaml
+ create mode 100644 include/dt-bindings/sound/adi,adau1977.h
+ delete mode 100644 include/linux/platform_data/adau1977.h
+ create mode 100644 sound/soc/fsl/fsl_xcvr.c
+ create mode 100644 sound/soc/fsl/fsl_xcvr.h
+ create mode 100644 sound/soc/qcom/sc7180.c
+ create mode 100644 sound/soc/qcom/sm8250.c
+Merging modules/modules-next (5e8ed280dab9 module: set MODULE_STATE_GOING state when a module fails to load)
+$ git merge modules/modules-next
+Merge made by the 'recursive' strategy.
+ kernel/module.c | 1 +
+ 1 file changed, 1 insertion(+)
+Merging input/next (8a30c6eb29e0 Input: Add MAINTAINERS entry for SiS i2c touch input driver)
+$ git merge input/next
+Already up to date.
+Merging block/for-next (0dae148b7cfa Merge branch 'for-5.11/io_uring' into for-next)
+$ git merge block/for-next
+Auto-merging arch/sparc/include/asm/thread_info_64.h
+Auto-merging arch/ia64/kernel/process.c
+Auto-merging arch/arm/kernel/entry-common.S
+Auto-merging arch/arm/include/asm/thread_info.h
+Merge made by the 'recursive' strategy.
+ arch/alpha/include/asm/thread_info.h | 2 +
+ arch/alpha/kernel/entry.S | 2 +-
+ arch/alpha/kernel/signal.c | 2 +-
+ arch/arc/include/asm/thread_info.h | 4 +-
+ arch/arc/kernel/entry.S | 2 +-
+ arch/arc/kernel/signal.c | 2 +-
+ arch/arm/include/asm/thread_info.h | 7 +-
+ arch/arm/kernel/entry-common.S | 6 +-
+ arch/arm/kernel/entry-v7m.S | 2 +-
+ arch/arm/kernel/signal.c | 2 +-
+ arch/arm64/include/asm/thread_info.h | 5 +-
+ arch/arm64/kernel/signal.c | 2 +-
+ arch/c6x/include/asm/thread_info.h | 1 +
+ arch/c6x/kernel/asm-offsets.c | 1 +
+ arch/c6x/kernel/signal.c | 2 +-
+ arch/csky/include/asm/thread_info.h | 5 +-
+ arch/csky/kernel/signal.c | 2 +-
+ arch/h8300/include/asm/thread_info.h | 4 +-
+ arch/h8300/kernel/signal.c | 2 +-
+ arch/hexagon/include/asm/thread_info.h | 2 +
+ arch/hexagon/kernel/process.c | 2 +-
+ arch/ia64/include/asm/thread_info.h | 4 +-
+ arch/ia64/kernel/process.c | 3 +-
+ arch/m68k/include/asm/thread_info.h | 1 +
+ arch/m68k/kernel/signal.c | 3 +-
+ arch/microblaze/include/asm/thread_info.h | 2 +
+ arch/microblaze/kernel/signal.c | 3 +-
+ arch/mips/include/asm/thread_info.h | 4 +-
+ arch/mips/kernel/signal.c | 2 +-
+ arch/nds32/include/asm/thread_info.h | 2 +
+ arch/nds32/kernel/ex-exit.S | 2 +-
+ arch/nds32/kernel/signal.c | 2 +-
+ arch/nios2/include/asm/thread_info.h | 2 +
+ arch/nios2/kernel/signal.c | 3 +-
+ arch/openrisc/include/asm/thread_info.h | 2 +
+ arch/openrisc/kernel/signal.c | 2 +-
+ arch/parisc/include/asm/thread_info.h | 4 +-
+ arch/parisc/kernel/signal.c | 3 +-
+ arch/powerpc/include/asm/thread_info.h | 5 +-
+ arch/powerpc/kernel/signal.c | 2 +-
+ arch/riscv/include/asm/thread_info.h | 5 +-
+ arch/riscv/kernel/signal.c | 2 +-
+ arch/s390/include/asm/thread_info.h | 2 +
+ arch/s390/kernel/entry.S | 7 +-
+ arch/sh/include/asm/thread_info.h | 4 +-
+ arch/sh/kernel/signal_32.c | 7 +-
+ arch/sparc/include/asm/thread_info_32.h | 4 +-
+ arch/sparc/include/asm/thread_info_64.h | 6 +-
+ arch/sparc/kernel/signal_32.c | 2 +-
+ arch/sparc/kernel/signal_64.c | 2 +-
+ arch/um/include/asm/thread_info.h | 2 +
+ arch/um/kernel/process.c | 3 +-
+ arch/x86/include/asm/thread_info.h | 2 +
+ arch/x86/kernel/signal.c | 4 +-
+ arch/xtensa/include/asm/thread_info.h | 2 +
+ arch/xtensa/kernel/entry.S | 1 +
+ arch/xtensa/kernel/signal.c | 3 +-
+ fs/internal.h | 2 +
+ fs/io_uring.c | 631 +++++++++++++++++++-----------
+ fs/namei.c | 23 +-
+ include/linux/entry-common.h | 7 +-
+ include/linux/entry-kvm.h | 4 +-
+ include/linux/sched/jobctl.h | 4 +-
+ include/linux/sched/signal.h | 18 +-
+ include/linux/socket.h | 1 +
+ include/linux/tracehook.h | 23 ++
+ include/uapi/linux/io_uring.h | 6 +
+ kernel/entry/common.c | 14 +-
+ kernel/entry/kvm.c | 3 +
+ kernel/events/uprobes.c | 2 +-
+ kernel/signal.c | 40 +-
+ kernel/task_work.c | 13 +-
+ net/socket.c | 15 +-
+ 73 files changed, 640 insertions(+), 334 deletions(-)
+Merging device-mapper/for-next (681cc5e8667e dm: fix request-based DM to not bounce through indirect dm_submit_bio)
+$ git merge device-mapper/for-next
+Already up to date.
+Merging pcmcia/pcmcia-next (46d079790663 pcmcia: make pccard_loop_tuple() static)
+$ git merge pcmcia/pcmcia-next
+Already up to date.
+Merging mmc/next (cc85a5ef3c83 mmc: rtsx_pci: Add SD Express mode support for RTS5261)
+$ git merge mmc/next
+Removing Documentation/devicetree/bindings/mmc/mtk-sd.txt
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mmc/mtk-sd.txt | 75 ---------
+ Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 176 ++++++++++++++++++++++
+ drivers/misc/cardreader/rts5261.c | 4 +
+ drivers/misc/cardreader/rts5261.h | 23 ---
+ drivers/misc/cardreader/rtsx_pcr.c | 5 +
+ drivers/mmc/core/core.c | 15 +-
+ drivers/mmc/core/host.h | 6 +
+ drivers/mmc/core/sd_ops.c | 49 +++++-
+ drivers/mmc/core/sd_ops.h | 1 +
+ drivers/mmc/host/Kconfig | 4 +-
+ drivers/mmc/host/mtk-sd.c | 79 +++++++---
+ drivers/mmc/host/rtsx_pci_sdmmc.c | 58 +++++++
+ drivers/mmc/host/s3cmci.c | 2 +-
+ drivers/mmc/host/sdhci-acpi.c | 38 ++++-
+ drivers/mmc/host/sunxi-mmc.c | 3 +-
+ include/linux/mmc/host.h | 7 +
+ include/linux/rtsx_pci.h | 23 +++
+ 17 files changed, 438 insertions(+), 130 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/mmc/mtk-sd.txt
+ create mode 100644 Documentation/devicetree/bindings/mmc/mtk-sd.yaml
+Merging mfd/for-mfd-next (6d81dc3c79d4 mfd: kempld-core: Fix unused variable 'kempld_acpi_table' when !ACPI)
+$ git merge mfd/for-mfd-next
+Already up to date.
+Merging backlight/for-backlight-next (97ecfda1a8ff backlight: tosa_bl: Include the right header)
+$ git merge backlight/for-backlight-next
+Already up to date.
+Merging battery/for-next (7007fab4ae82 power: reset: POWER_RESET_OCELOT_RESET should depend on Ocelot or Sparx5)
+$ git merge battery/for-next
+Already up to date.
+Merging regulator/for-next (62966abe7834 Merge remote-tracking branch 'regulator/for-5.11' into regulator-next)
+$ git merge regulator/for-next
+Merge made by the 'recursive' strategy.
+ .../bindings/regulator/fixed-regulator.yaml | 47 ++++++++++++++++
+ drivers/regulator/core.c | 2 +-
+ drivers/regulator/fixed.c | 63 +++++++++++++++++++---
+ drivers/regulator/lp872x.c | 2 +-
+ 4 files changed, 106 insertions(+), 8 deletions(-)
+Merging security/next-testing (bc62d68e2a0a device_cgroup: Fix RCU list debugging warning)
+$ 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 (aa662fc04f5b ima: Fix NULL pointer dereference in ima_file_hash)
+$ 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 (03ca0ec13892 LSM: SafeSetID: Fix warnings reported by test bot)
+$ git merge safesetid/safesetid-next
+Already up to date.
+Merging selinux/next (44141f58e143 selinux: allow dontauditx and auditallowx rules to take effect without allowx)
+$ git merge selinux/next
+Merge made by the 'recursive' strategy.
+ security/selinux/hooks.c | 19 ++++++++++++++++---
+ security/selinux/ss/services.c | 4 +---
+ 2 files changed, 17 insertions(+), 6 deletions(-)
+Merging smack/next (edd615371b66 Smack: Remove unnecessary variable initialization)
+$ git merge smack/next
+Already up to date.
+Merging tomoyo/master (d9594e040965 tomoyo: fix clang pointer arithmetic warning)
+$ git merge tomoyo/master
+Merge made by the 'recursive' strategy.
+ security/tomoyo/securityfs_if.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+Merging tpmdd/next (fb342e8868ed tpm: efi: Don't create binary_bios_measurements file for an empty log)
+$ git merge tpmdd/next
+Merge made by the 'recursive' strategy.
+ drivers/char/tpm/eventlog/efi.c | 5 +++++
+ drivers/char/tpm/tpm_tis.c | 29 +++++++++++++++++++++++++++--
+ 2 files changed, 32 insertions(+), 2 deletions(-)
+Merging watchdog/master (3650b228f83a Linux 5.10-rc1)
+$ git merge watchdog/master
+Already up to date.
+Merging iommu/next (7e3c3883c381 Merge branches 'arm/allwinner', 'arm/mediatek', 'arm/renesas', 'arm/tegra', 'arm/qcom', 'arm/smmu', 'ppc/pamu', 'x86/amd', 'x86/vt-d' and 'core' into next)
+$ git merge iommu/next
+Already up to date.
+Merging audit/next (6d915476e67d audit: trigger accompanying records when no rules present)
+$ git merge audit/next
+Merge made by the 'recursive' strategy.
+ include/linux/audit.h | 8 --------
+ kernel/audit.c | 5 ++++-
+ kernel/auditsc.c | 27 +++++++--------------------
+ security/lsm_audit.c | 5 -----
+ 4 files changed, 11 insertions(+), 34 deletions(-)
+Merging devicetree/for-next (bd36e51d10e7 dt-bindings: misc: explicitly add #address-cells for slave mode)
+$ git merge devicetree/for-next
+Already up to date.
+Merging mailbox/mailbox-for-next (c7dacf5b0f32 mailbox: avoid timer start from callback)
+$ git merge mailbox/mailbox-for-next
+Already up to date.
+Merging spi/for-next (3d9e5d3bd229 Merge remote-tracking branch 'spi/for-5.11' into spi-next)
+$ git merge spi/for-next
+Merge made by the 'recursive' strategy.
+ drivers/spi/spi-rockchip.c | 4 +
+ drivers/spi/spi-sun6i.c | 199 ++++++++++++++++++++++++++++++++++++++++-----
+ drivers/spi/spi.c | 6 +-
+ 3 files changed, 187 insertions(+), 22 deletions(-)
+Merging tip/auto-latest (6f72faf4a323 Merge branch 'locking/urgent')
+$ git merge tip/auto-latest
+Auto-merging kernel/locking/lockdep.c
+Auto-merging fs/binfmt_elf.c
+Auto-merging arch/x86/include/asm/thread_info.h
+Auto-merging arch/x86/include/asm/mmu_context.h
+Removing arch/x86/include/asm/copy_mc_test.h
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/hw-vuln/index.rst | 1 +
+ Documentation/admin-guide/hw-vuln/l1d_flush.rst | 70 ++++++
+ Documentation/admin-guide/kernel-parameters.txt | 17 ++
+ Documentation/userspace-api/spec_ctrl.rst | 8 +
+ Documentation/x86/index.rst | 2 +-
+ Documentation/x86/{resctrl_ui.rst => resctrl.rst} | 93 +++++++
+ MAINTAINERS | 6 +-
+ arch/um/include/asm/cacheflush.h | 9 +
+ arch/x86/Kconfig.debug | 3 -
+ arch/x86/entry/vdso/vma.c | 4 +-
+ arch/x86/entry/vsyscall/vsyscall_64.c | 2 +-
+ arch/x86/events/core.c | 2 +-
+ arch/x86/events/intel/ds.c | 2 +-
+ arch/x86/events/intel/lbr.c | 2 +-
+ arch/x86/include/asm/atomic.h | 2 +-
+ arch/x86/include/asm/atomic64_64.h | 2 +-
+ arch/x86/include/asm/cacheflush.h | 8 +
+ arch/x86/include/asm/cmpxchg.h | 2 +-
+ arch/x86/include/asm/compat.h | 15 +-
+ arch/x86/include/asm/copy_mc_test.h | 75 ------
+ arch/x86/include/asm/elf.h | 13 +-
+ arch/x86/include/asm/mmu.h | 9 +-
+ arch/x86/include/asm/mmu_context.h | 2 +-
+ arch/x86/include/asm/processor.h | 2 +
+ arch/x86/include/asm/thread_info.h | 13 +-
+ arch/x86/include/asm/tlbflush.h | 2 +-
+ arch/x86/kernel/cpu/bugs.c | 54 ++++
+ arch/x86/kernel/cpu/mce/core.c | 2 -
+ arch/x86/kernel/cpu/microcode/amd.c | 1 -
+ arch/x86/kernel/cpu/resctrl/core.c | 4 +
+ arch/x86/kernel/cpu/resctrl/internal.h | 1 +
+ arch/x86/kernel/cpu/resctrl/monitor.c | 82 ++++++-
+ arch/x86/kernel/perf_regs.c | 2 +-
+ arch/x86/kernel/process_64.c | 28 +--
+ arch/x86/kernel/smpboot.c | 11 +-
+ arch/x86/kernel/traps.c | 43 +++-
+ arch/x86/lib/copy_mc.c | 4 -
+ arch/x86/lib/copy_mc_64.S | 10 -
+ arch/x86/mm/tlb.c | 100 ++++++--
+ arch/x86/oprofile/backtrace.c | 2 +-
+ fs/binfmt_elf.c | 4 +-
+ fs/compat_binfmt_elf.c | 20 +-
+ include/asm-generic/atomic-instrumented.h | 216 +++++++++-------
+ include/linux/atomic-arch-fallback.h | 90 ++++++-
+ include/linux/atomic-fallback.h | 90 ++++++-
+ include/linux/elf.h | 10 +
+ include/linux/freelist.h | 129 ++++++++++
+ include/linux/kprobes.h | 25 +-
+ include/linux/llist.h | 23 ++
+ include/linux/sched.h | 4 +
+ include/linux/time64.h | 4 +
+ include/uapi/linux/prctl.h | 1 +
+ kernel/fork.c | 4 +
+ kernel/kprobes.c | 286 +++++++---------------
+ kernel/locking/lockdep.c | 4 +-
+ kernel/rcu/tree.c | 2 +-
+ kernel/stop_machine.c | 2 +-
+ kernel/time/hrtimer.c | 5 -
+ kernel/time/itimer.c | 4 -
+ kernel/time/jiffies.c | 3 +-
+ kernel/time/sched_clock.c | 4 +-
+ kernel/time/timekeeping.h | 2 +-
+ kernel/time/timer.c | 5 -
+ kernel/trace/trace_kprobe.c | 3 +-
+ scripts/atomic/gen-atomic-fallback.sh | 63 ++++-
+ scripts/atomic/gen-atomic-instrumented.sh | 29 ++-
+ tools/testing/nvdimm/test/nfit.c | 103 --------
+ 67 files changed, 1206 insertions(+), 639 deletions(-)
+ create mode 100644 Documentation/admin-guide/hw-vuln/l1d_flush.rst
+ rename Documentation/x86/{resctrl_ui.rst => resctrl.rst} (90%)
+ create mode 100644 arch/um/include/asm/cacheflush.h
+ delete mode 100644 arch/x86/include/asm/copy_mc_test.h
+ create mode 100644 include/linux/freelist.h
+Merging clockevents/timers/drivers/next (f087e452f27e clocksource: sp804: enable Hisilicon sp804 timer 64bit mode)
+$ git merge clockevents/timers/drivers/next
+Merge made by the 'recursive' strategy.
+Merging edac/edac-for-next (f09056c1dece EDAC/amd64: Remove unneeded breaks)
+$ git merge edac/edac-for-next
+Merge made by the 'recursive' strategy.
+ drivers/edac/amd64_edac.c | 8 --------
+ 1 file changed, 8 deletions(-)
+Merging irqchip/irq/irqchip-next (a7480c5d725c irqchip/sifive-plic: Fix broken irq_set_affinity() callback)
+$ git merge irqchip/irq/irqchip-next
+Auto-merging drivers/irqchip/Kconfig
+Merge made by the 'recursive' strategy.
+ drivers/irqchip/Kconfig | 3 +--
+ drivers/irqchip/irq-bcm2836.c | 2 +-
+ drivers/irqchip/irq-mst-intc.c | 4 ++--
+ drivers/irqchip/irq-sifive-plic.c | 2 +-
+ drivers/irqchip/irq-stm32-exti.c | 4 ++++
+ kernel/irq/Kconfig | 1 +
+ 6 files changed, 10 insertions(+), 6 deletions(-)
+Merging ftrace/for-next (e1981f75d398 ring-buffer: Update the description for ring_buffer_wait)
+$ git merge ftrace/for-next
+Already up to date.
+Merging rcu/rcu/next (a9863c90f503 Merge branch 'urezki-pcount.2020.10.01a' into HEAD)
+$ git merge rcu/rcu/next
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/rcu/tree.c
+Auto-merging include/linux/uaccess.h
+Auto-merging include/linux/pagemap.h
+Auto-merging include/linux/lockdep.h
+CONFLICT (content): Merge conflict in include/linux/lockdep.h
+Auto-merging drivers/gpu/drm/i915/Kconfig.debug
+Auto-merging arch/xtensa/kernel/entry.S
+Auto-merging arch/x86/kernel/kvm.c
+Resolved 'include/linux/lockdep.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 5628f5147239] Merge remote-tracking branch 'rcu/rcu/next' into master
+$ git diff -M --stat --summary HEAD^..
+ .../litmus-tests/locking/DCL-broken.litmus | 55 +++
+ .../litmus-tests/locking/DCL-fixed.litmus | 56 +++
+ .../litmus-tests/locking/RM-broken.litmus | 42 ++
+ Documentation/litmus-tests/locking/RM-fixed.litmus | 42 ++
+ arch/arm/include/asm/assembler.h | 11 -
+ arch/arm/kernel/iwmmxt.S | 2 -
+ arch/arm/mach-ep93xx/crunch-bits.S | 2 -
+ arch/xtensa/kernel/entry.S | 2 +-
+ drivers/gpu/drm/i915/Kconfig.debug | 1 -
+ drivers/gpu/drm/i915/i915_utils.h | 3 +-
+ include/linux/bit_spinlock.h | 4 +-
+ include/linux/lockdep.h | 6 +-
+ include/linux/pagemap.h | 4 +-
+ include/linux/preempt.h | 37 +-
+ include/linux/uaccess.h | 6 +-
+ kernel/Kconfig.preempt | 4 -
+ kernel/rcu/tree.c | 79 ++--
+ kernel/sched/core.c | 6 +-
+ lib/Kconfig.debug | 3 -
+ tools/memory-model/Documentation/README | 82 ++++
+ .../Documentation/control-dependencies.txt | 256 ++++++++++++
+ tools/memory-model/Documentation/litmus-tests.txt | 17 +
+ tools/memory-model/Documentation/locking.txt | 320 ++++++++++++++
+ tools/memory-model/Documentation/ordering.txt | 461 +++++++++++++++++++++
+ tools/memory-model/README | 22 +-
+ 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 ++
+ .../selftests/rcutorture/configs/rcu/SRCU-t | 1 -
+ .../selftests/rcutorture/configs/rcu/SRCU-u | 1 -
+ .../selftests/rcutorture/configs/rcu/TINY01 | 1 -
+ .../testing/selftests/rcutorture/doc/TINY_RCU.txt | 5 +-
+ .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 1 -
+ .../rcutorture/formal/srcu-cbmc/src/config.h | 1 -
+ 47 files changed, 1777 insertions(+), 244 deletions(-)
+ create mode 100644 Documentation/litmus-tests/locking/DCL-broken.litmus
+ create mode 100644 Documentation/litmus-tests/locking/DCL-fixed.litmus
+ create mode 100644 Documentation/litmus-tests/locking/RM-broken.litmus
+ create mode 100644 Documentation/litmus-tests/locking/RM-fixed.litmus
+ create mode 100644 tools/memory-model/Documentation/README
+ create mode 100644 tools/memory-model/Documentation/control-dependencies.txt
+ create mode 100644 tools/memory-model/Documentation/locking.txt
+ create mode 100644 tools/memory-model/Documentation/ordering.txt
+ 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
+Merging kvm/linux-next (e792415c5d3e KVM: MIPS/VZ: Fix build error caused by 'kvm_run' cleanup)
+$ git merge kvm/linux-next
+Already up to date.
+Merging kvm-arm/next (91a2c34b7d6f KVM: arm64: Force PTE mapping on fault resulting in a device mapping)
+$ git merge kvm-arm/next
+Auto-merging arch/arm64/kvm/sys_regs.c
+Auto-merging arch/arm64/kvm/mmu.c
+Auto-merging arch/arm64/kvm/hyp/nvhe/tlb.c
+Merge made by the 'recursive' strategy.
+ arch/arm64/include/asm/kvm_host.h | 1 +
+ arch/arm64/kvm/hyp/nvhe/host.S | 2 --
+ arch/arm64/kvm/hyp/nvhe/hyp-init.S | 23 ++++++++++++++++-------
+ arch/arm64/kvm/hyp/nvhe/tlb.c | 1 -
+ arch/arm64/kvm/hyp/pgtable.c | 4 ++--
+ arch/arm64/kvm/mmu.c | 27 ++++++++++++++++++++-------
+ arch/arm64/kvm/sys_regs.c | 6 +++---
+ 7 files changed, 42 insertions(+), 22 deletions(-)
+Merging kvm-ppc/kvm-ppc-next (cf59eb13e151 KVM: PPC: Book3S: Fix symbol undeclared warnings)
+$ git merge kvm-ppc/kvm-ppc-next
+Already up to date.
+Merging kvms390/next (23a60f834406 s390/kvm: diagnose 0x318 sync and reset)
+$ git merge kvms390/next
+Already up to date.
+Merging xen-tip/linux-next (1a89c1dc9520 Documentation: add xen.fifo_events kernel parameter description)
+$ git merge xen-tip/linux-next
+Already up to date.
+Merging percpu/for-next (38cabe062b96 Merge branch 'for-5.10-fixes' into for-next)
+$ git merge percpu/for-next
+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 (e8a60aa7404b platform/x86: Introduce support for Systems Management Driver over WMI for Dell Systems)
+$ git merge drivers-x86/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../ABI/testing/sysfs-class-firmware-attributes | 224 ++++++++
+ MAINTAINERS | 19 +-
+ drivers/platform/Kconfig | 2 +
+ drivers/platform/Makefile | 1 +
+ drivers/platform/surface/Kconfig | 49 ++
+ drivers/platform/surface/Makefile | 10 +
+ drivers/platform/{x86 => surface}/surface3-wmi.c | 0
+ .../platform/{x86 => surface}/surface3_button.c | 0
+ drivers/platform/{x86 => surface}/surface3_power.c | 0
+ .../platform/{x86 => surface}/surfacepro3_button.c | 0
+ drivers/platform/x86/Kconfig | 43 +-
+ drivers/platform/x86/Makefile | 7 +-
+ drivers/platform/x86/dell-wmi-sysman/Makefile | 8 +
+ .../x86/dell-wmi-sysman/biosattr-interface.c | 186 ++++++
+ .../platform/x86/dell-wmi-sysman/dell-wmi-sysman.h | 191 +++++++
+ .../platform/x86/dell-wmi-sysman/enum-attributes.c | 189 +++++++
+ .../platform/x86/dell-wmi-sysman/int-attributes.c | 173 ++++++
+ .../x86/dell-wmi-sysman/passobj-attributes.c | 194 +++++++
+ .../x86/dell-wmi-sysman/passwordattr-interface.c | 153 +++++
+ .../x86/dell-wmi-sysman/string-attributes.c | 159 ++++++
+ drivers/platform/x86/dell-wmi-sysman/sysman.c | 625 +++++++++++++++++++++
+ drivers/platform/x86/wmi.c | 4 +-
+ 22 files changed, 2197 insertions(+), 40 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-class-firmware-attributes
+ create mode 100644 drivers/platform/surface/Kconfig
+ create mode 100644 drivers/platform/surface/Makefile
+ rename drivers/platform/{x86 => surface}/surface3-wmi.c (100%)
+ rename drivers/platform/{x86 => surface}/surface3_button.c (100%)
+ rename drivers/platform/{x86 => surface}/surface3_power.c (100%)
+ rename drivers/platform/{x86 => surface}/surfacepro3_button.c (100%)
+ create mode 100644 drivers/platform/x86/dell-wmi-sysman/Makefile
+ create mode 100644 drivers/platform/x86/dell-wmi-sysman/biosattr-interface.c
+ create mode 100644 drivers/platform/x86/dell-wmi-sysman/dell-wmi-sysman.h
+ create mode 100644 drivers/platform/x86/dell-wmi-sysman/enum-attributes.c
+ create mode 100644 drivers/platform/x86/dell-wmi-sysman/int-attributes.c
+ create mode 100644 drivers/platform/x86/dell-wmi-sysman/passobj-attributes.c
+ create mode 100644 drivers/platform/x86/dell-wmi-sysman/passwordattr-interface.c
+ create mode 100644 drivers/platform/x86/dell-wmi-sysman/string-attributes.c
+ create mode 100644 drivers/platform/x86/dell-wmi-sysman/sysman.c
+Merging chrome-platform/for-next (3650b228f83a Linux 5.10-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 (6c3e42616bf2 leds: various: add missing put_device() call in netxbig_leds_get_of_pdata())
+$ git merge leds/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/leds/leds-class.rst | 10 ----------
+ drivers/leds/leds-netxbig.c | 35 ++++++++++++++++++++++++-----------
+ 2 files changed, 24 insertions(+), 21 deletions(-)
+Merging ipmi/for-next (0df7b988d9df char: ipmi: remove unneeded break)
+$ git merge ipmi/for-next
+Merge made by the 'recursive' strategy.
+ drivers/char/ipmi/ipmi_devintf.c | 1 -
+ 1 file changed, 1 deletion(-)
+Merging driver-core/driver-core-next (3650b228f83a Linux 5.10-rc1)
+$ git merge driver-core/driver-core-next
+Already up to date.
+Merging usb/usb-next (aee9ddb1d371 kcov, usb: only collect coverage from __usb_hcd_giveback_urb in softirq)
+$ git merge usb/usb-next
+Auto-merging drivers/usb/host/xhci.c
+Auto-merging drivers/usb/host/xhci-mem.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../bindings/connector/usb-connector.yaml | 19 ++
+ .../devicetree/bindings/usb/brcm,usb-pinmap.yaml | 70 ++++
+ MAINTAINERS | 8 +
+ drivers/usb/atm/usbatm.c | 2 +-
+ drivers/usb/core/buffer.c | 6 +-
+ drivers/usb/core/hcd-pci.c | 6 +-
+ drivers/usb/core/hcd.c | 37 ++-
+ drivers/usb/core/hub.c | 3 +-
+ drivers/usb/core/message.c | 35 +-
+ drivers/usb/core/usb.c | 4 +-
+ drivers/usb/gadget/udc/core.c | 2 -
+ drivers/usb/gadget/udc/dummy_hcd.c | 6 +-
+ drivers/usb/gadget/udc/pxa27x_udc.c | 19 +-
+ drivers/usb/host/ehci-fsl.c | 9 +-
+ drivers/usb/host/ehci-pmcmsp.c | 15 +-
+ drivers/usb/host/ehci-sched.c | 12 +
+ drivers/usb/host/isp1362.h | 54 ----
+ drivers/usb/host/ohci-at91.c | 11 +-
+ drivers/usb/host/ohci-omap.c | 9 +-
+ drivers/usb/host/ohci-pxa27x.c | 11 +-
+ drivers/usb/host/ohci-s3c2410.c | 12 +-
+ drivers/usb/host/xhci-mem.c | 3 +-
+ drivers/usb/host/xhci.c | 6 +-
+ drivers/usb/misc/Kconfig | 9 +
+ drivers/usb/misc/Makefile | 1 +
+ drivers/usb/misc/brcmstb-usb-pinmap.c | 351 +++++++++++++++++++++
+ drivers/usb/misc/iowarrior.c | 3 -
+ drivers/usb/misc/sisusbvga/Kconfig | 2 +-
+ drivers/usb/storage/freecom.c | 1 -
+ drivers/usb/usbip/usbip_common.c | 5 -
+ include/dt-bindings/usb/pd.h | 8 +
+ 31 files changed, 596 insertions(+), 143 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/usb/brcm,usb-pinmap.yaml
+ create mode 100644 drivers/usb/misc/brcmstb-usb-pinmap.c
+Merging usb-gadget/next (b2c586eb07ef usb: dwc2: Fix INTR OUT transfers in DDMA mode.)
+$ git merge usb-gadget/next
+Already up to date.
+Merging usb-serial/usb-next (d1849b9ff9f4 USB: serial: iuu_phoenix: remove unneeded break)
+$ git merge usb-serial/usb-next
+Merge made by the 'recursive' strategy.
+ drivers/usb/serial/digi_acceleport.c | 5 ++---
+ drivers/usb/serial/iuu_phoenix.c | 2 --
+ 2 files changed, 2 insertions(+), 5 deletions(-)
+Merging usb-chipidea-next/for-usb-next (eba158772841 usb: cdns3: Rids of duplicate error message)
+$ git merge usb-chipidea-next/for-usb-next
+Auto-merging drivers/usb/cdns3/gadget.c
+Merge made by the 'recursive' strategy.
+ drivers/usb/cdns3/core.c | 12 ++----------
+ drivers/usb/cdns3/gadget-export.h | 3 ---
+ drivers/usb/cdns3/gadget.c | 2 +-
+ 3 files changed, 3 insertions(+), 14 deletions(-)
+Merging phy-next/next (c36f74566cef MAINTAINERS: Add entry for Qualcomm IPQ4019 USB PHY)
+$ git merge phy-next/next
+Auto-merging MAINTAINERS
+CONFLICT (content): Merge conflict in MAINTAINERS
+Resolved 'MAINTAINERS' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master a708d5298971] Merge remote-tracking branch 'phy-next/next' into master
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 8 ++++++++
+ drivers/phy/freescale/phy-fsl-imx8mq-usb.c | 2 +-
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+Merging tty/tty-next (da31de35cd2f tty: goldfish: use __raw_writel()/__raw_readl())
+$ git merge tty/tty-next
+Merge made by the 'recursive' strategy.
+ drivers/tty/goldfish.c | 18 +++++++-------
+ drivers/tty/nozomi.c | 5 +---
+ drivers/tty/serial/max310x.c | 57 +++++++++++++++++++-------------------------
+ include/linux/goldfish.h | 8 +++----
+ 4 files changed, 38 insertions(+), 50 deletions(-)
+Merging char-misc/char-misc-next (3650b228f83a Linux 5.10-rc1)
+$ git merge char-misc/char-misc-next
+Already up to date.
+Merging extcon/extcon-next (ca26071da1bb dt-bindings: extcon: add binding for TUSB320)
+$ git merge extcon/extcon-next
+Merge made by the 'recursive' strategy.
+ .../bindings/extcon/extcon-usbc-tusb320.yaml | 41 +++++
+ drivers/extcon/Kconfig | 8 +
+ drivers/extcon/Makefile | 1 +
+ drivers/extcon/extcon-usbc-tusb320.c | 184 +++++++++++++++++++++
+ 4 files changed, 234 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/extcon/extcon-usbc-tusb320.yaml
+ create mode 100644 drivers/extcon/extcon-usbc-tusb320.c
+Merging soundwire/next (3650b228f83a Linux 5.10-rc1)
+$ git merge soundwire/next
+Already up to date.
+Merging thunderbolt/next (3650b228f83a Linux 5.10-rc1)
+$ git merge thunderbolt/next
+Already up to date.
+Merging vfio/next (2e6cfd496f5b vfio iommu type1: Fix memory leak in vfio_iommu_type1_pin_pages)
+$ git merge vfio/next
+Already up to date.
+Merging staging/staging-next (c2ec4a6e5410 staging: vc04_services: fix quoted string split across lines)
+$ git merge staging/staging-next
+Removing tools/testing/selftests/android/run.sh
+CONFLICT (modify/delete): tools/testing/selftests/android/ion/ipcsocket.h deleted in staging/staging-next and modified in HEAD. Version HEAD of tools/testing/selftests/android/ion/ipcsocket.h left in tree.
+CONFLICT (modify/delete): tools/testing/selftests/android/ion/ipcsocket.c deleted in staging/staging-next and modified in HEAD. Version HEAD of tools/testing/selftests/android/ion/ipcsocket.c left in tree.
+Removing tools/testing/selftests/android/ion/ionutils.h
+Removing tools/testing/selftests/android/ion/ionutils.c
+Removing tools/testing/selftests/android/ion/ionmap_test.c
+Removing tools/testing/selftests/android/ion/ionapp_import.c
+Removing tools/testing/selftests/android/ion/ionapp_export.c
+Removing tools/testing/selftests/android/ion/ion_test.sh
+Removing tools/testing/selftests/android/ion/ion.h
+Removing tools/testing/selftests/android/ion/README
+Removing tools/testing/selftests/android/ion/Makefile
+Removing tools/testing/selftests/android/ion/.gitignore
+Removing tools/testing/selftests/android/config
+Removing tools/testing/selftests/android/Makefile
+Removing drivers/staging/android/uapi/ion.h
+Removing drivers/staging/android/ion/ion_system_heap.c
+Removing drivers/staging/android/ion/ion_page_pool.c
+Removing drivers/staging/android/ion/ion_heap.c
+Removing drivers/staging/android/ion/ion_cma_heap.c
+Removing drivers/staging/android/ion/ion.h
+Removing drivers/staging/android/ion/ion.c
+Removing drivers/staging/android/ion/Makefile
+Removing drivers/staging/android/ion/Kconfig
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f tools/testing/selftests/android/ion/ipcsocket.c tools/testing/selftests/android/ion/ipcsocket.h
+rm 'tools/testing/selftests/android/ion/ipcsocket.c'
+rm 'tools/testing/selftests/android/ion/ipcsocket.h'
+$ git commit --no-edit -v -a
+[master 0f75f10cf25f] Merge remote-tracking branch 'staging/staging-next' into master
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 10 -
+ drivers/staging/android/Kconfig | 2 -
+ drivers/staging/android/Makefile | 2 -
+ drivers/staging/android/TODO | 5 -
+ drivers/staging/android/ion/Kconfig | 27 -
+ drivers/staging/android/ion/Makefile | 4 -
+ drivers/staging/android/ion/ion.c | 649 ---------------------
+ drivers/staging/android/ion/ion.h | 302 ----------
+ drivers/staging/android/ion/ion_cma_heap.c | 138 -----
+ drivers/staging/android/ion/ion_heap.c | 286 ---------
+ drivers/staging/android/ion/ion_page_pool.c | 155 -----
+ drivers/staging/android/ion/ion_system_heap.c | 377 ------------
+ drivers/staging/android/uapi/ion.h | 127 ----
+ drivers/staging/comedi/drivers/ni_mio_common.c | 3 +-
+ .../staging/comedi/drivers/tests/ni_routes_test.c | 8 +-
+ drivers/staging/fieldbus/anybuss/hms-profinet.c | 5 +-
+ drivers/staging/gdm724x/gdm_mux.c | 10 +-
+ drivers/staging/greybus/audio_codec.c | 109 ++--
+ drivers/staging/greybus/audio_manager_module.c | 3 +-
+ drivers/staging/iio/accel/adis16240.c | 1 +
+ drivers/staging/kpc2000/kpc2000/cell_probe.c | 71 ++-
+ drivers/staging/kpc2000/kpc2000/core.c | 3 +-
+ drivers/staging/kpc2000/kpc2000/dma_common_defs.h | 17 +-
+ drivers/staging/kpc2000/kpc_dma/dma.c | 21 +-
+ drivers/staging/kpc2000/kpc_dma/fileops.c | 28 +-
+ drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c | 13 +-
+ drivers/staging/qlge/qlge_ethtool.c | 1 +
+ drivers/staging/qlge/qlge_main.c | 9 -
+ drivers/staging/qlge/qlge_mpi.c | 2 +-
+ drivers/staging/rtl8188eu/core/rtw_ap.c | 54 +-
+ drivers/staging/rtl8188eu/core/rtw_cmd.c | 2 +-
+ drivers/staging/rtl8188eu/core/rtw_debug.c | 18 +-
+ drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 36 +-
+ drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 2 +-
+ drivers/staging/rtl8188eu/core/rtw_mlme.c | 18 +-
+ drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 122 ++--
+ drivers/staging/rtl8188eu/core/rtw_recv.c | 4 +-
+ drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 24 +-
+ drivers/staging/rtl8188eu/core/rtw_xmit.c | 10 +-
+ drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 10 +-
+ drivers/staging/rtl8188eu/include/osdep_intf.h | 1 -
+ drivers/staging/rtl8188eu/include/rtw_security.h | 3 -
+ drivers/staging/rtl8188eu/include/wifi.h | 34 --
+ drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 21 +-
+ drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 2 +-
+ drivers/staging/rtl8188eu/os_dep/os_intfs.c | 9 -
+ drivers/staging/rtl8188eu/os_dep/usb_intf.c | 6 +-
+ drivers/staging/rtl8192u/ieee80211/dot11d.c | 12 +-
+ drivers/staging/rtl8723bs/core/rtw_ap.c | 6 +-
+ drivers/staging/rtl8723bs/core/rtw_cmd.c | 33 +-
+ drivers/staging/rtl8723bs/core/rtw_mlme.c | 5 +-
+ drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 24 +-
+ drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 6 +-
+ drivers/staging/rtl8723bs/core/rtw_recv.c | 3 +-
+ drivers/staging/rtl8723bs/core/rtw_security.c | 4 +-
+ drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 3 +-
+ drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 6 +-
+ drivers/staging/rtl8723bs/core/rtw_xmit.c | 14 +-
+ drivers/staging/rtl8723bs/hal/hal_intf.c | 4 +-
+ drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +-
+ drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 56 +-
+ drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 116 ++--
+ drivers/staging/rtl8723bs/os_dep/os_intfs.c | 16 +-
+ drivers/staging/rtl8723bs/os_dep/recv_linux.c | 2 +-
+ drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 2 +-
+ .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 189 +++---
+ .../vc04_services/interface/vchiq_arm/vchiq_arm.h | 27 +-
+ .../vc04_services/interface/vchiq_arm/vchiq_cfg.h | 6 +-
+ .../interface/vchiq_arm/vchiq_connected.c | 3 +-
+ .../vc04_services/interface/vchiq_arm/vchiq_core.c | 277 +++++----
+ .../vc04_services/interface/vchiq_arm/vchiq_core.h | 55 +-
+ .../interface/vchiq_arm/vchiq_debugfs.c | 8 +-
+ drivers/staging/vt6655/card.c | 2 +-
+ drivers/staging/vt6655/device_main.c | 11 +-
+ drivers/staging/wfx/sta.c | 2 +-
+ tools/testing/selftests/Makefile | 3 +-
+ tools/testing/selftests/android/Makefile | 39 --
+ tools/testing/selftests/android/config | 5 -
+ tools/testing/selftests/android/ion/.gitignore | 4 -
+ tools/testing/selftests/android/ion/Makefile | 20 -
+ tools/testing/selftests/android/ion/README | 101 ----
+ tools/testing/selftests/android/ion/ion.h | 134 -----
+ tools/testing/selftests/android/ion/ion_test.sh | 58 --
+ .../testing/selftests/android/ion/ionapp_export.c | 127 ----
+ .../testing/selftests/android/ion/ionapp_import.c | 79 ---
+ tools/testing/selftests/android/ion/ionmap_test.c | 136 -----
+ tools/testing/selftests/android/ion/ionutils.c | 253 --------
+ tools/testing/selftests/android/ion/ionutils.h | 55 --
+ tools/testing/selftests/android/ion/ipcsocket.c | 228 --------
+ tools/testing/selftests/android/ion/ipcsocket.h | 33 --
+ tools/testing/selftests/android/run.sh | 3 -
+ 91 files changed, 797 insertions(+), 4139 deletions(-)
+ delete mode 100644 drivers/staging/android/ion/Kconfig
+ delete mode 100644 drivers/staging/android/ion/Makefile
+ delete mode 100644 drivers/staging/android/ion/ion.c
+ delete mode 100644 drivers/staging/android/ion/ion.h
+ delete mode 100644 drivers/staging/android/ion/ion_cma_heap.c
+ delete mode 100644 drivers/staging/android/ion/ion_heap.c
+ delete mode 100644 drivers/staging/android/ion/ion_page_pool.c
+ delete mode 100644 drivers/staging/android/ion/ion_system_heap.c
+ delete mode 100644 drivers/staging/android/uapi/ion.h
+ delete mode 100644 tools/testing/selftests/android/Makefile
+ delete mode 100644 tools/testing/selftests/android/config
+ delete mode 100644 tools/testing/selftests/android/ion/.gitignore
+ delete mode 100644 tools/testing/selftests/android/ion/Makefile
+ delete mode 100644 tools/testing/selftests/android/ion/README
+ delete mode 100644 tools/testing/selftests/android/ion/ion.h
+ delete mode 100755 tools/testing/selftests/android/ion/ion_test.sh
+ delete mode 100644 tools/testing/selftests/android/ion/ionapp_export.c
+ delete mode 100644 tools/testing/selftests/android/ion/ionapp_import.c
+ delete mode 100644 tools/testing/selftests/android/ion/ionmap_test.c
+ delete mode 100644 tools/testing/selftests/android/ion/ionutils.c
+ delete mode 100644 tools/testing/selftests/android/ion/ionutils.h
+ delete mode 100644 tools/testing/selftests/android/ion/ipcsocket.c
+ delete mode 100644 tools/testing/selftests/android/ion/ipcsocket.h
+ delete mode 100755 tools/testing/selftests/android/run.sh
+Merging mux/for-next (05f19f7f8944 mux: adgs1408: Add mod_devicetable.h and remove of_match_ptr)
+$ git merge mux/for-next
+Auto-merging drivers/mux/adgs1408.c
+Merge made by the 'recursive' strategy.
+Merging icc/icc-next (fce52ad34832 interconnect: qcom: use icc_sync state for sm8[12]50)
+$ git merge icc/icc-next
+Merge made by the 'recursive' strategy.
+ drivers/interconnect/core.c | 3 +++
+ drivers/interconnect/qcom/icc-rpmh.c | 7 +++++++
+ drivers/interconnect/qcom/sc7180.c | 6 +++---
+ drivers/interconnect/qcom/sdm845.c | 8 ++++----
+ drivers/interconnect/qcom/sm8150.c | 7 ++++---
+ drivers/interconnect/qcom/sm8250.c | 7 ++++---
+ 6 files changed, 25 insertions(+), 13 deletions(-)
+Merging dmaengine/next (9bdc32755c79 dmaengine: ppc4xx: remove xor_hw_desc assignment without reading)
+$ git merge dmaengine/next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/dma/atmel-xdma.txt | 3 +-
+ drivers/dma/at_xdmac.c | 163 +++++++++++++++++----
+ drivers/dma/pl330.c | 2 -
+ drivers/dma/ppc4xx/adma.c | 4 +-
+ drivers/dma/stm32-mdma.c | 2 +-
+ 5 files changed, 138 insertions(+), 36 deletions(-)
+Merging cgroup/for-next (65026da59cda cgroup: Zero sized write should be no-op)
+$ git merge cgroup/for-next
+Already up to date.
+Merging scsi/for-next (fab09aaee803 scsi: hisi_sas: Stop using queue #0 always for v2 hw)
+$ git merge scsi/for-next
+Already up to date.
+Merging scsi-mkp/for-next (f24a69a43c95 scsi: aic7xxx: aic79xx: Return negative error when register access fails)
+$ git merge scsi-mkp/for-next
+Auto-merging drivers/target/target_core_user.c
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-class-fc_host | 23 ++
+ .../ABI/testing/sysfs-class-fc_remote_ports | 23 ++
+ drivers/message/fusion/mptbase.c | 1 -
+ drivers/scsi/aic7xxx/aic79xx_pci.c | 2 +-
+ drivers/scsi/aic7xxx/aic7xxx_pci.c | 2 +-
+ drivers/scsi/aic94xx/aic94xx_task.c | 1 -
+ drivers/scsi/be2iscsi/be_mgmt.c | 4 -
+ drivers/scsi/bnx2fc/bnx2fc_hwi.c | 1 -
+ drivers/scsi/fcoe/fcoe.c | 1 -
+ drivers/scsi/hpsa.c | 1 -
+ drivers/scsi/hptiop.c | 1 -
+ drivers/scsi/ibmvscsi/ibmvfc.h | 22 +-
+ drivers/scsi/ipr.c | 1 -
+ drivers/scsi/isci/phy.c | 2 -
+ drivers/scsi/iscsi_tcp.c | 4 +-
+ drivers/scsi/libiscsi.c | 2 +-
+ drivers/scsi/lpfc/lpfc.h | 6 +-
+ drivers/scsi/lpfc/lpfc_attr.c | 14 +-
+ drivers/scsi/lpfc/lpfc_bsg.c | 21 +-
+ drivers/scsi/lpfc/lpfc_ct.c | 371 +++++++++++++++++-
+ drivers/scsi/lpfc/lpfc_debugfs.c | 12 +-
+ drivers/scsi/lpfc/lpfc_disc.h | 2 +
+ drivers/scsi/lpfc/lpfc_els.c | 6 +
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 41 +-
+ drivers/scsi/lpfc/lpfc_hw.h | 7 +-
+ drivers/scsi/lpfc/lpfc_hw4.h | 10 +-
+ drivers/scsi/lpfc/lpfc_init.c | 67 ++--
+ drivers/scsi/lpfc/lpfc_mem.c | 11 +-
+ drivers/scsi/lpfc/lpfc_nvme.c | 18 +-
+ drivers/scsi/lpfc/lpfc_scsi.c | 5 +-
+ drivers/scsi/lpfc/lpfc_sli.c | 83 ++--
+ drivers/scsi/lpfc/lpfc_sli4.h | 14 +-
+ drivers/scsi/lpfc/lpfc_version.h | 2 +-
+ drivers/scsi/mvumi.c | 1 -
+ drivers/scsi/pcmcia/nsp_cs.c | 2 -
+ drivers/scsi/qla2xxx/qla_mbx.c | 1 -
+ drivers/scsi/scsi_devinfo.c | 3 +-
+ drivers/scsi/scsi_lib.c | 6 +-
+ drivers/scsi/scsi_transport_fc.c | 417 ++++++++++++++++++++-
+ drivers/scsi/st.c | 1 -
+ drivers/scsi/sym53c8xx_2/sym_hipd.c | 1 -
+ drivers/target/target_core_user.c | 164 ++++----
+ include/scsi/scsi_transport_fc.h | 36 ++
+ include/uapi/scsi/fc/fc_els.h | 114 +++++-
+ 44 files changed, 1279 insertions(+), 248 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-class-fc_host
+ create mode 100644 Documentation/ABI/testing/sysfs-class-fc_remote_ports
+Merging vhost/linux-next (f12da77e3aac vdpa: handle irq bypass register failure case)
+$ git merge vhost/linux-next
+Auto-merging drivers/vdpa/vdpa_sim/vdpa_sim.c
+Merge made by the 'recursive' strategy.
+ drivers/vdpa/mlx5/core/mr.c | 5 +-
+ drivers/vdpa/vdpa_sim/vdpa_sim.c | 16 +++-
+ drivers/vhost/vdpa.c | 173 ++++++++++++++++++++++-----------------
+ include/linux/vdpa.h | 15 ++++
+ include/uapi/linux/vhost.h | 4 +
+ include/uapi/linux/vhost_types.h | 9 ++
+ 6 files changed, 142 insertions(+), 80 deletions(-)
+Merging rpmsg/for-next (49a29612d7cf Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
+$ git merge rpmsg/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 12 +--
+ .../bindings/remoteproc/qcom,wcnss-pil.txt | 20 +++-
+ drivers/hwspinlock/sprd_hwspinlock.c | 2 -
+ drivers/remoteproc/qcom_q6v5_mss.c | 68 ++++++++++---
+ drivers/remoteproc/qcom_wcnss.c | 109 ++++++++++++++++++---
+ 5 files changed, 171 insertions(+), 40 deletions(-)
+Merging gpio/for-next (50afb29ae413 Merge branch 'devel' into for-next)
+$ git merge gpio/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/driver-api/gpio/driver.rst | 67 +++++++-----
+ drivers/gpio/TODO | 49 ---------
+ drivers/gpio/gpio-omap.c | 12 ++-
+ drivers/gpio/gpio-stmpe.c | 10 +-
+ drivers/gpio/gpiolib-cdev.c | 24 ++---
+ drivers/gpio/gpiolib.c | 168 ++-----------------------------
+ include/linux/gpio/driver.h | 71 -------------
+ include/uapi/linux/gpio.h | 106 +++++++++----------
+ 8 files changed, 126 insertions(+), 381 deletions(-)
+Merging gpio-brgl/gpio/for-next (43ddebdd0966 gpio: mockup: Allow probing from device tree)
+$ git merge gpio-brgl/gpio/for-next
+Auto-merging drivers/gpio/gpiolib.c
+Auto-merging drivers/gpio/gpiolib-cdev.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/gpio/gpio-pca95xx.yaml | 1 +
+ drivers/gpio/gpio-mockup.c | 11 ++++++--
+ drivers/gpio/gpiolib-cdev.c | 32 ++++++++++++++--------
+ drivers/gpio/gpiolib-devres.c | 8 ++----
+ drivers/gpio/gpiolib-of.c | 14 +++++-----
+ drivers/gpio/gpiolib-sysfs.c | 2 +-
+ drivers/gpio/gpiolib.c | 31 ++++++++++-----------
+ drivers/gpio/gpiolib.h | 2 ++
+ 8 files changed, 59 insertions(+), 42 deletions(-)
+Merging gpio-intel/for-next (3650b228f83a Linux 5.10-rc1)
+$ git merge gpio-intel/for-next
+Already up to date.
+Merging pinctrl/for-next (03dec17c36a7 Merge branch 'devel' into for-next)
+$ git merge pinctrl/for-next
+Merge made by the 'recursive' strategy.
+ drivers/pinctrl/Kconfig | 2 +-
+ drivers/pinctrl/pinctrl-ingenic.c | 72 +++++++++++++++++-----------------
+ drivers/pinctrl/pinctrl-mcp23s08_spi.c | 4 +-
+ drivers/pinctrl/pinctrl-rockchip.c | 43 ++++++++++++--------
+ 4 files changed, 67 insertions(+), 54 deletions(-)
+$ git am -3 ../patches/0001-Revert-pinctrl-rockchip-make-driver-be-tristate-modu.patch
+Applying: Revert "pinctrl: rockchip: make driver be tristate module"
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/pinctrl/Kconfig
+M drivers/pinctrl/pinctrl-rockchip.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 5a2c5b700540] Merge remote-tracking branch 'pinctrl/for-next' into master
+ Date: Fri Oct 30 12:40:06 2020 +1100
+Merging pinctrl-intel/for-next (f3c75e7a9349 pinctrl: intel: Set default bias in case no particular value given)
+$ git merge pinctrl-intel/for-next
+Merge made by the 'recursive' strategy.
+ drivers/pinctrl/intel/pinctrl-intel.c | 40 ++++++++++++++++++++++++++---------
+ 1 file changed, 30 insertions(+), 10 deletions(-)
+Merging pinctrl-samsung/for-next (c5564a50d990 pinctrl: samsung: s3c24xx: remove unneeded break)
+$ git merge pinctrl-samsung/for-next
+Merge made by the 'recursive' strategy.
+ drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 5 -----
+ 1 file changed, 5 deletions(-)
+Merging pwm/for-next (3b1954cd57bf dt-bindings: pwm: renesas,pwm-rcar: Add r8a7742 support)
+$ git merge pwm/for-next
+Already up to date.
+Merging userns/for-next (7fce69dff8db Implement kernel_execve)
+$ git merge userns/for-next
+Already up to date.
+Merging ktest/for-next (ff131efff141 ktest.pl: Fix spelling mistake "Cant" -> "Can't")
+$ 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 (b2f1c3db2887 kselftest: Extend vdso correctness test to clock_gettime64)
+$ git merge kselftest/next
+Auto-merging tools/testing/selftests/Makefile
+Merge made by the 'recursive' strategy.
+ tools/testing/selftests/Makefile | 1 +
+ tools/testing/selftests/vDSO/Makefile | 16 +-
+ tools/testing/selftests/vDSO/vdso_config.h | 92 ++++++++
+ tools/testing/selftests/vDSO/vdso_test_abi.c | 244 +++++++++++++++++++++
+ .../selftests/vDSO/vdso_test_clock_getres.c | 124 +++++++++++
+ .../test_vdso.c => vDSO/vdso_test_correctness.c} | 115 +++++++++-
+ tools/testing/selftests/x86/Makefile | 2 +-
+ 7 files changed, 586 insertions(+), 8 deletions(-)
+ create mode 100644 tools/testing/selftests/vDSO/vdso_config.h
+ create mode 100644 tools/testing/selftests/vDSO/vdso_test_abi.c
+ create mode 100644 tools/testing/selftests/vDSO/vdso_test_clock_getres.c
+ rename tools/testing/selftests/{x86/test_vdso.c => vDSO/vdso_test_correctness.c} (73%)
+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 (59fc1e476962 Merge branch 'for-5.10/flive-patching' into for-next)
+$ git merge livepatching/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging coresight/next (02e94a827973 coresight: core: Remove unneeded semicolon)
+$ git merge coresight/next
+Auto-merging drivers/hwtracing/coresight/coresight-core.c
+Merge made by the 'recursive' strategy.
+ drivers/hwtracing/coresight/coresight-core.c | 2 +-
+ drivers/hwtracing/coresight/coresight-etm4x-core.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Merging rtc/rtc-next (28d211919e42 rtc: sun6i: Fix memleak in sun6i_rtc_clk_init)
+$ git merge rtc/rtc-next
+Merge made by the 'recursive' strategy.
+ drivers/rtc/rtc-pcf2127.c | 68 ++++++++++++++++++++++++-----------------------
+ drivers/rtc/rtc-sun6i.c | 8 +++---
+ 2 files changed, 40 insertions(+), 36 deletions(-)
+Merging nvdimm/libnvdimm-for-next (a1b8638ba132 Linux 5.9-rc7)
+$ git merge nvdimm/libnvdimm-for-next
+Already up to date.
+Merging at24/at24/for-next (3650b228f83a Linux 5.10-rc1)
+$ git merge at24/at24/for-next
+Already up to date.
+Merging ntb/ntb-next (3650b228f83a Linux 5.10-rc1)
+$ git merge ntb/ntb-next
+Already up to date.
+Merging seccomp/for-next/seccomp (38c37e8fd3d2 arm: Enable seccomp architecture tracking)
+$ git merge seccomp/for-next/seccomp
+Merge made by the 'recursive' strategy.
+ arch/arm/include/asm/Kbuild | 1 -
+ arch/arm/include/asm/seccomp.h | 11 +
+ arch/arm64/include/asm/seccomp.h | 15 ++
+ arch/x86/include/asm/seccomp.h | 20 ++
+ kernel/seccomp.c | 233 ++++++++++++++++++++-
+ .../testing/selftests/seccomp/seccomp_benchmark.c | 151 +++++++++++--
+ tools/testing/selftests/seccomp/settings | 2 +-
+ 7 files changed, 408 insertions(+), 25 deletions(-)
+ create mode 100644 arch/arm/include/asm/seccomp.h
+Merging kspp/for-next/kspp (9b80e4c4ddac overflow: Add __must_check attribute to check_*() helpers)
+$ git merge kspp/for-next/kspp
+Already up to date.
+Merging gnss/gnss-next (48778464bb7d Linux 5.8-rc2)
+$ git merge gnss/gnss-next
+Already up to date.
+Merging fsi/next (4a851d714ead fsi: aspeed: Support CFAM reset GPIO)
+$ git merge fsi/next
+Already up to date.
+Merging slimbus/for-next (c3e02abdf9af slimbus: fix a kernel-doc markup)
+$ git merge slimbus/for-next
+Merge made by the 'recursive' strategy.
+ drivers/slimbus/slimbus.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging nvmem/for-next (e08d1de1c075 nvmem: core: Add support for keepout regions)
+$ git merge nvmem/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/nvmem/mtk-efuse.txt | 1 +
+ drivers/nvmem/core.c | 153 ++++++++++++++++++++-
+ include/linux/nvmem-provider.h | 17 +++
+ 3 files changed, 167 insertions(+), 4 deletions(-)
+Merging xarray/main (fb11305101c2 XArray: Fix split documentation)
+$ git merge xarray/main
+Merge made by the 'recursive' strategy.
+ lib/xarray.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+Merging hyperv/hyperv-next (626b901f6044 Drivers: hv: vmbus: Add parsing of VMbus interrupt in ACPI DSDT)
+$ git merge hyperv/hyperv-next
+Already up to date.
+Merging auxdisplay/auxdisplay (bbf5c979011a Linux 5.9)
+$ git merge auxdisplay/auxdisplay
+Already up to date.
+Merging kgdb/kgdb/for-next (d081a6e35316 kdb: Fix pager search for multi-line strings)
+$ git merge kgdb/kgdb/for-next
+Already up to date.
+Merging pidfd/for-next (e06ce5515b74 Merge branch 'pidfd_o_nonblock' into for-next)
+$ git merge pidfd/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging hmm/hmm (3650b228f83a Linux 5.10-rc1)
+$ git merge hmm/hmm
+Already up to date.
+Merging fpga/for-next (cbadbf5a53b5 Merge branch 'dfl_modularization' into for-next)
+$ git merge fpga/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 1 +
+ drivers/fpga/altera-pr-ip-core-plat.c | 10 ----
+ drivers/fpga/altera-pr-ip-core.c | 4 +-
+ drivers/fpga/altera-ps-spi.c | 14 +-----
+ drivers/fpga/dfl-fme-mgr.c | 13 +-----
+ drivers/fpga/dfl.c | 4 +-
+ drivers/fpga/dfl.h | 85 +---------------------------------
+ drivers/fpga/fpga-mgr.c | 81 ++++++++++++++++++++++++++++-----
+ drivers/fpga/ice40-spi.c | 14 +-----
+ drivers/fpga/machxo2-spi.c | 14 +-----
+ drivers/fpga/socfpga.c | 14 +-----
+ drivers/fpga/ts73xx-fpga.c | 14 +-----
+ drivers/fpga/xilinx-spi.c | 14 +-----
+ drivers/fpga/zynqmp-fpga.c | 21 +--------
+ include/linux/dfl.h | 86 +++++++++++++++++++++++++++++++++++
+ include/linux/fpga/fpga-mgr.h | 2 +
+ include/linux/mod_devicetable.h | 24 ++++++++++
+ scripts/mod/devicetable-offsets.c | 4 ++
+ scripts/mod/file2alias.c | 13 ++++++
+ 19 files changed, 211 insertions(+), 221 deletions(-)
+ create mode 100644 include/linux/dfl.h
+Merging kunit/test (3650b228f83a Linux 5.10-rc1)
+$ git merge kunit/test
+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 (5de15b610f78 mtd: hyperbus: add Renesas RPC-IF driver)
+$ git merge cfi/cfi/next
+Already up to date.
+Merging kunit-next/kunit (3650b228f83a Linux 5.10-rc1)
+$ git merge kunit-next/kunit
+Already up to date.
+Merging trivial/for-next (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
+$ git merge trivial/for-next
+Already up to date.
+Merging zx2c4/for-next (16fbf79b0f83 Linux 5.6-rc7)
+$ git merge zx2c4/for-next
+Already up to date.
+Merging mhi/mhi-next (298edb32160f bus: mhi: debugfs: Print channel context read-pointer)
+$ git merge mhi/mhi-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+Merging notifications/notifications-pipe-core (841a0dfa5113 watch_queue: sample: Display mount tree change notifications)
+$ git merge notifications/notifications-pipe-core
+Auto-merging security/security.c
+Auto-merging kernel/sys_ni.c
+Auto-merging include/uapi/asm-generic/unistd.h
+CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h
+Auto-merging include/linux/watch_queue.h
+Auto-merging include/linux/syscalls.h
+Auto-merging include/linux/security.h
+Auto-merging include/linux/lsm_hooks.h
+Auto-merging include/linux/lsm_hook_defs.h
+Auto-merging include/linux/dcache.h
+Auto-merging fs/namespace.c
+Auto-merging fs/mount.h
+Auto-merging fs/Makefile
+Auto-merging fs/Kconfig
+Auto-merging arch/xtensa/kernel/syscalls/syscall.tbl
+CONFLICT (content): Merge conflict in arch/xtensa/kernel/syscalls/syscall.tbl
+Auto-merging arch/x86/entry/syscalls/syscall_64.tbl
+CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl
+Auto-merging arch/x86/entry/syscalls/syscall_32.tbl
+CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl
+Auto-merging arch/sparc/kernel/syscalls/syscall.tbl
+CONFLICT (content): Merge conflict in arch/sparc/kernel/syscalls/syscall.tbl
+Auto-merging arch/sh/kernel/syscalls/syscall.tbl
+CONFLICT (content): Merge conflict in arch/sh/kernel/syscalls/syscall.tbl
+Auto-merging arch/s390/kernel/syscalls/syscall.tbl
+CONFLICT (content): Merge conflict in arch/s390/kernel/syscalls/syscall.tbl
+Auto-merging arch/powerpc/kernel/syscalls/syscall.tbl
+CONFLICT (content): Merge conflict in arch/powerpc/kernel/syscalls/syscall.tbl
+Auto-merging arch/parisc/kernel/syscalls/syscall.tbl
+CONFLICT (content): Merge conflict in arch/parisc/kernel/syscalls/syscall.tbl
+Auto-merging arch/mips/kernel/syscalls/syscall_o32.tbl
+CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_o32.tbl
+Auto-merging arch/mips/kernel/syscalls/syscall_n64.tbl
+CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n64.tbl
+Auto-merging arch/mips/kernel/syscalls/syscall_n32.tbl
+CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n32.tbl
+Auto-merging arch/microblaze/kernel/syscalls/syscall.tbl
+CONFLICT (content): Merge conflict in arch/microblaze/kernel/syscalls/syscall.tbl
+Auto-merging arch/m68k/kernel/syscalls/syscall.tbl
+CONFLICT (content): Merge conflict in arch/m68k/kernel/syscalls/syscall.tbl
+Auto-merging arch/ia64/kernel/syscalls/syscall.tbl
+CONFLICT (content): Merge conflict in arch/ia64/kernel/syscalls/syscall.tbl
+Auto-merging arch/arm64/include/asm/unistd32.h
+CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd32.h
+Auto-merging arch/arm/tools/syscall.tbl
+CONFLICT (content): Merge conflict in arch/arm/tools/syscall.tbl
+Auto-merging arch/alpha/kernel/syscalls/syscall.tbl
+CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl
+Auto-merging Documentation/watch_queue.rst
+Resolved 'arch/alpha/kernel/syscalls/syscall.tbl' using previous resolution.
+Resolved 'arch/arm/tools/syscall.tbl' using previous resolution.
+Resolved 'arch/arm64/include/asm/unistd32.h' using previous resolution.
+Resolved 'arch/ia64/kernel/syscalls/syscall.tbl' using previous resolution.
+Resolved 'arch/m68k/kernel/syscalls/syscall.tbl' using previous resolution.
+Resolved 'arch/microblaze/kernel/syscalls/syscall.tbl' using previous resolution.
+Resolved 'arch/mips/kernel/syscalls/syscall_n32.tbl' using previous resolution.
+Resolved 'arch/mips/kernel/syscalls/syscall_n64.tbl' using previous resolution.
+Resolved 'arch/mips/kernel/syscalls/syscall_o32.tbl' using previous resolution.
+Resolved 'arch/parisc/kernel/syscalls/syscall.tbl' using previous resolution.
+Resolved 'arch/powerpc/kernel/syscalls/syscall.tbl' using previous resolution.
+Resolved 'arch/s390/kernel/syscalls/syscall.tbl' using previous resolution.
+Resolved 'arch/sh/kernel/syscalls/syscall.tbl' using previous resolution.
+Resolved 'arch/sparc/kernel/syscalls/syscall.tbl' using previous resolution.
+Resolved 'arch/x86/entry/syscalls/syscall_32.tbl' using previous resolution.
+Resolved 'arch/x86/entry/syscalls/syscall_64.tbl' using previous resolution.
+Resolved 'arch/xtensa/kernel/syscalls/syscall.tbl' using previous resolution.
+Resolved 'include/uapi/asm-generic/unistd.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 7b4c7d6e81f9] Merge remote-tracking branch 'notifications/notifications-pipe-core' into master
+$ git diff -M --stat --summary HEAD^..
+ Documentation/watch_queue.rst | 12 +-
+ 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 | 9 ++
+ fs/Makefile | 1 +
+ fs/mount.h | 18 +++
+ fs/mount_notify.c | 222 ++++++++++++++++++++++++++++
+ fs/namespace.c | 22 +++
+ include/linux/dcache.h | 1 +
+ include/linux/lsm_hook_defs.h | 3 +
+ include/linux/lsm_hooks.h | 6 +
+ include/linux/security.h | 8 +
+ include/linux/syscalls.h | 2 +
+ include/linux/watch_queue.h | 7 +-
+ include/uapi/asm-generic/unistd.h | 2 +
+ include/uapi/linux/watch_queue.h | 31 +++-
+ kernel/sys_ni.c | 3 +
+ samples/watch_queue/watch_test.c | 41 ++++-
+ security/security.c | 7 +
+ 34 files changed, 409 insertions(+), 4 deletions(-)
+ create mode 100644 fs/mount_notify.c
+$ git am -3 ../patches/0001-rest-of-merge-fix-up-for-syscall-conflict.patch
+Applying: rest of merge fix up for syscall conflict
+$ git reset HEAD^
+Unstaged changes after reset:
+M arch/arm64/include/asm/unistd.h
+M include/uapi/asm-generic/unistd.h
+$ git add -A .
+$ git commit -v -a --amend
+[master ed8e6299f0fe] Merge remote-tracking branch 'notifications/notifications-pipe-core' into master
+ Date: Fri Oct 30 13:19:51 2020 +1100
+Merging memblock/for-next (762d4d1a174c arch/ia64: Restore arch-specific pgd_offset_k implementation)
+$ git merge memblock/for-next
+Auto-merging include/linux/pgtable.h
+Merge made by the 'recursive' strategy.
+Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy)
+$ git merge init/init-user-pointers
+Already up to date.
+Merging counters/counters (3650b228f83a Linux 5.10-rc1)
+$ git merge counters/counters
+Already up to date.
+Merging akpm-current/current (0362f3dc0d13 lib/lzo/lzo1x_compress.c: make lzogeneric1x_1_compress() static)
+$ git merge --no-ff akpm-current/current
+Removing tools/testing/selftests/vm/gup_benchmark.c
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/signal.c
+Auto-merging kernel/fork.c
+Auto-merging include/linux/sched.h
+CONFLICT (content): Merge conflict in include/linux/sched.h
+Auto-merging include/linux/dcache.h
+Auto-merging fs/eventpoll.c
+Auto-merging arch/x86/entry/vdso/vma.c
+Auto-merging arch/arm64/Kconfig
+Resolved 'include/linux/sched.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master d06a28c3de43] Merge branch 'akpm-current/current' into master
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/blockdev/zram.rst | 5 +
+ Documentation/admin-guide/cgroup-v2.rst | 8 +
+ Documentation/admin-guide/kdump/vmcoreinfo.rst | 6 +
+ Documentation/admin-guide/sysctl/vm.rst | 4 +-
+ Documentation/core-api/pin_user_pages.rst | 6 +-
+ arch/Kconfig | 7 +
+ arch/arm/kernel/vdso.c | 9 -
+ arch/arm64/Kconfig | 1 +
+ arch/arm64/include/asm/pgtable.h | 1 +
+ arch/arm64/kernel/vdso.c | 39 +-
+ arch/mips/mm/pgtable-32.c | 1 -
+ arch/mips/mm/pgtable-64.c | 1 -
+ arch/mips/vdso/genvdso.c | 4 -
+ arch/s390/configs/debug_defconfig | 2 +-
+ arch/s390/configs/defconfig | 2 +-
+ arch/s390/kernel/vdso.c | 11 +-
+ arch/x86/Kconfig | 1 +
+ arch/x86/entry/vdso/vma.c | 17 -
+ arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 2 +-
+ drivers/block/zram/zram_drv.c | 21 +-
+ drivers/dax/device.c | 4 +-
+ drivers/dax/kmem.c | 2 +-
+ drivers/gpio/gpio-thunderx.c | 11 +-
+ drivers/gpio/gpio-xilinx.c | 65 ++-
+ drivers/virtio/virtio_balloon.c | 2 +-
+ drivers/xen/unpopulated-alloc.c | 14 +-
+ fs/aio.c | 14 +-
+ fs/buffer.c | 58 ++-
+ fs/eventpoll.c | 16 +-
+ fs/iomap/buffered-io.c | 2 +-
+ fs/nfs/callback_proc.c | 5 +
+ fs/ocfs2/cluster/tcp.c | 1 -
+ fs/ocfs2/namei.c | 21 +-
+ fs/proc/base.c | 4 +-
+ fs/proc/page.c | 40 +-
+ fs/proc/proc_net.c | 4 +-
+ fs/ramfs/inode.c | 12 +
+ include/asm-generic/bitops/find.h | 19 +
+ include/asm-generic/getorder.h | 2 +-
+ include/linux/bitmap.h | 65 ++-
+ include/linux/bitops.h | 24 +-
+ include/linux/compiler-clang.h | 6 -
+ include/linux/compiler-gcc.h | 19 -
+ include/linux/compiler.h | 18 +-
+ include/linux/dcache.h | 1 +
+ include/linux/iommu-helper.h | 4 +-
+ include/linux/kernel.h | 173 +------
+ include/linux/math.h | 177 +++++++
+ include/linux/memcontrol.h | 221 +++++++-
+ include/linux/memremap.h | 6 +
+ include/linux/mm.h | 76 ++-
+ include/linux/mm_types.h | 5 +-
+ include/linux/nmi.h | 1 +
+ include/linux/page-flags.h | 14 +-
+ include/linux/page_ext.h | 8 +
+ include/linux/pgtable.h | 4 -
+ include/linux/rcu_node_tree.h | 2 +
+ include/linux/sched.h | 8 +
+ include/linux/units.h | 2 +-
+ include/linux/wait.h | 4 +-
+ include/trace/events/sched.h | 84 +++
+ include/trace/events/writeback.h | 2 +-
+ include/uapi/linux/const.h | 5 +
+ include/uapi/linux/ethtool.h | 2 +-
+ include/uapi/linux/kernel.h | 9 +-
+ include/uapi/linux/lightnvm.h | 2 +-
+ include/uapi/linux/mroute6.h | 2 +-
+ include/uapi/linux/netfilter/x_tables.h | 2 +-
+ include/uapi/linux/netlink.h | 2 +-
+ include/uapi/linux/sysctl.h | 2 +-
+ init/main.c | 4 +-
+ ipc/shm.c | 8 +-
+ kernel/acct.c | 7 +-
+ kernel/crash_core.c | 1 +
+ kernel/fail_function.c | 6 +-
+ kernel/fork.c | 7 +-
+ kernel/hung_task.c | 47 +-
+ kernel/kthread.c | 12 +-
+ kernel/ptrace.c | 2 +-
+ kernel/signal.c | 19 +-
+ kernel/sysctl.c | 8 +-
+ kernel/watchdog.c | 21 +
+ kernel/watchdog_hld.c | 1 +
+ lib/Kconfig | 9 +
+ lib/Kconfig.debug | 6 +
+ lib/crc32test.c | 4 -
+ lib/errname.c | 1 +
+ lib/error-inject.c | 2 +
+ lib/errseq.c | 1 +
+ lib/find_bit.c | 17 +-
+ lib/lzo/lzo1x_compress.c | 2 +-
+ lib/math/div64.c | 3 +-
+ lib/math/int_pow.c | 2 +-
+ lib/math/int_sqrt.c | 3 +-
+ lib/math/reciprocal_div.c | 9 +-
+ lib/stackdepot.c | 14 +-
+ lib/test_bitmap.c | 143 +++++
+ lib/test_free_pages.c | 5 +
+ lib/test_kasan.c | 149 ++++--
+ lib/test_lockup.c | 16 +
+ mm/Kconfig | 21 +-
+ mm/Makefile | 2 +-
+ mm/cma.c | 4 +-
+ mm/compaction.c | 7 +-
+ mm/debug.c | 4 +-
+ mm/filemap.c | 576 ++++++++++++---------
+ mm/{gup_benchmark.c => gup_test.c} | 111 ++--
+ mm/gup_test.h | 32 ++
+ mm/huge_memory.c | 10 +-
+ mm/hugetlb.c | 25 +-
+ mm/khugepaged.c | 4 +-
+ mm/memcontrol.c | 190 ++++---
+ mm/memory.c | 11 +-
+ mm/mempolicy.c | 6 +-
+ mm/memremap.c | 59 ++-
+ mm/migrate.c | 11 +-
+ mm/mmap.c | 65 ++-
+ mm/mremap.c | 280 +++++++---
+ mm/msync.c | 6 +-
+ mm/nommu.c | 8 +-
+ mm/page_alloc.c | 147 +++---
+ mm/page_ext.c | 10 +-
+ mm/page_io.c | 6 +-
+ mm/page_poison.c | 40 +-
+ mm/shmem.c | 2 +-
+ mm/slab.h | 42 +-
+ mm/slab_common.c | 4 +-
+ mm/slub.c | 6 +-
+ mm/swap.c | 3 +
+ mm/swap_state.c | 4 +-
+ mm/swapfile.c | 14 +-
+ mm/truncate.c | 2 +-
+ mm/vmalloc.c | 2 +-
+ mm/vmscan.c | 2 +-
+ mm/vmstat.c | 32 +-
+ mm/workingset.c | 2 +-
+ mm/zsmalloc.c | 11 +-
+ mm/zswap.c | 6 +-
+ scripts/checkpatch.pl | 162 ++++--
+ .../filesystems/epoll/epoll_wakeup_test.c | 95 ++++
+ tools/testing/selftests/vm/.gitignore | 4 +-
+ tools/testing/selftests/vm/Makefile | 39 +-
+ tools/testing/selftests/vm/check_config.sh | 31 ++
+ tools/testing/selftests/vm/config | 2 +-
+ tools/testing/selftests/vm/gup_benchmark.c | 143 -----
+ tools/testing/selftests/vm/gup_test.c | 194 +++++++
+ tools/testing/selftests/vm/hmm-tests.c | 10 +-
+ tools/testing/selftests/vm/mremap_test.c | 344 ++++++++++++
+ tools/testing/selftests/vm/run_vmtests | 43 +-
+ 149 files changed, 3249 insertions(+), 1508 deletions(-)
+ create mode 100644 include/linux/math.h
+ rename mm/{gup_benchmark.c => gup_test.c} (60%)
+ create mode 100644 mm/gup_test.h
+ create mode 100644 tools/testing/selftests/vm/check_config.sh
+ delete mode 100644 tools/testing/selftests/vm/gup_benchmark.c
+ create mode 100644 tools/testing/selftests/vm/gup_test.c
+ create mode 100644 tools/testing/selftests/vm/mremap_test.c
+$ git am -3 ../patches/0001-kernel.h-Split-out-mathematical-helpers-fix.patch
+Applying: kernel.h: Split out mathematical helpers fix
+$ git reset HEAD^
+Unstaged changes after reset:
+M lib/math/div64.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 414d9642d3ad] Merge branch 'akpm-current/current' into master
+ Date: Fri Oct 30 14:10:09 2020 +1100
+$ 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/2)\rRebasing (2/2)\r\r\e[KSuccessfully rebased and updated refs/heads/akpm.
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + 31193de38d89...4ed854ff97e9 akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (4ed854ff97e9 mm/gup: assert that the mmap lock is held in __get_user_pages())
+$ git merge --no-ff akpm/master
+Merge made by the 'recursive' strategy.
+ fs/exec.c | 8 ++++++++
+ include/linux/mm_types.h | 10 ++++++++++
+ include/linux/mmap_lock.h | 16 ++++++++++++----
+ mm/gup.c | 2 ++
+ 4 files changed, 32 insertions(+), 4 deletions(-)
projects / users / hch / block.git / commitdiff