diff options
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 8225 |
1 files changed, 8225 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..0ee2f74b3c25 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,8225 @@ +$ date -R +Fri, 07 Jun 2019 08:03:49 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 156c05917e09 Merge tag 'linux-kselftest-5.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest +Merging origin/master (16d72dd4891f Merge branch 'parisc-5.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux) +$ git merge origin/master +Updating 156c05917e09..16d72dd4891f +Fast-forward + Documentation/filesystems/overlayfs.txt | 16 ++- + arch/parisc/Kconfig | 4 +- + arch/parisc/configs/712_defconfig | 1 - + arch/parisc/configs/a500_defconfig | 1 - + arch/parisc/configs/b180_defconfig | 1 - + arch/parisc/configs/c3000_defconfig | 1 - + arch/parisc/configs/c8000_defconfig | 1 - + arch/parisc/configs/default_defconfig | 1 - + arch/parisc/configs/generic-32bit_defconfig | 1 - + arch/parisc/include/asm/special_insns.h | 24 ++++ + arch/parisc/kernel/alternative.c | 3 +- + arch/parisc/kernel/vmlinux.lds.S | 21 ++-- + arch/parisc/math-emu/cnv_float.h | 8 +- + crypto/hmac.c | 4 +- + crypto/jitterentropy-kcapi.c | 2 +- + drivers/parisc/ccio-dma.c | 6 +- + drivers/parisc/sba_iommu.c | 5 +- + fs/adfs/adfs.h | 14 +-- + fs/adfs/dir.c | 137 ++++++++++++---------- + fs/adfs/dir_f.c | 43 ++----- + fs/adfs/dir_fplus.c | 24 +--- + fs/fuse/file.c | 43 +++++-- + fs/gfs2/glock.c | 4 +- + fs/gfs2/incore.h | 2 +- + fs/gfs2/log.c | 4 +- + fs/gfs2/lops.c | 33 ++---- + fs/gfs2/main.c | 1 + + fs/gfs2/super.c | 2 +- + fs/nfs/nfs4proc.c | 32 ++---- + fs/overlayfs/file.c | 9 +- + fs/overlayfs/inode.c | 48 ++++++++ + fs/overlayfs/namei.c | 8 ++ + fs/overlayfs/overlayfs.h | 3 + + fs/overlayfs/ovl_entry.h | 6 + + fs/overlayfs/super.c | 169 +++++++++++++++++++++++++--- + fs/overlayfs/util.c | 12 ++ + fs/xfs/scrub/ialloc.c | 3 +- + fs/xfs/xfs_log.c | 11 +- + include/uapi/linux/fuse.h | 7 +- + net/sunrpc/clnt.c | 30 ++--- + net/sunrpc/xprtrdma/verbs.c | 3 +- + 41 files changed, 484 insertions(+), 264 deletions(-) +Merging fixes/master (3ab4436f688c Merge tag 'nfsd-5.2-1' of git://linux-nfs.org/~bfields/linux) +$ git merge fixes/master +Already up to date. +Merging kspp-gustavo/for-next/kspp (034e673710d3 platform/x86: acer-wmi: Mark expected switch fall-throughs) +$ git merge kspp-gustavo/for-next/kspp +Auto-merging fs/afs/yfsclient.c +Auto-merging fs/afs/fsclient.c +Auto-merging drivers/platform/x86/acer-wmi.c +Auto-merging drivers/net/can/at91_can.c +Auto-merging drivers/firewire/core-topology.c +Auto-merging drivers/firewire/core-iso.c +Auto-merging drivers/firewire/core-device.c +Merge made by the 'recursive' strategy. + drivers/firewire/core-device.c | 2 +- + drivers/firewire/core-iso.c | 2 +- + drivers/firewire/core-topology.c | 1 + + drivers/net/can/at91_can.c | 6 ++- + drivers/net/can/peak_canfd/peak_pciefd_main.c | 2 +- + drivers/net/can/spi/mcp251x.c | 3 +- + drivers/net/can/usb/peak_usb/pcan_usb.c | 2 +- + drivers/platform/x86/acer-wmi.c | 4 ++ + fs/afs/fsclient.c | 51 ++++++++++++++++--------- + fs/afs/yfsclient.c | 54 +++++++++++++++++---------- + 10 files changed, 83 insertions(+), 44 deletions(-) +Merging kbuild-current/fixes (4f45d62a5229 scripts/checkstack.pl: Fix arm64 wrong or unknown architecture) +$ git merge kbuild-current/fixes +Merge made by the 'recursive' strategy. + Makefile | 5 ++--- + scripts/checkstack.pl | 2 +- + scripts/kconfig/tests/err_recursive_inc/expected_stderr | 6 +++--- + scripts/package/Makefile | 2 +- + 4 files changed, 7 insertions(+), 8 deletions(-) +Merging arc-current/for-curr (46e04c25e72f ARC: [plat-hsdk] Get rid of inappropriate PHY settings) +$ git merge arc-current/for-curr +Already up to date. +Merging arm-current/fixes (e17b1af96b2a ARM: 8857/1: efi: enable CP15 DMB instructions before cleaning the cache) +$ git merge arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (ebcc5928c5d9 arm64: Silence gcc warnings about arch ABI drift) +$ git merge arm64-fixes/for-next/fixes +Merge made by the 'recursive' strategy. + arch/arm64/Makefile | 1 + + arch/arm64/include/asm/arch_timer.h | 8 ++++---- + arch/arm64/include/asm/smp.h | 6 ++++++ + arch/arm64/include/asm/smp_plat.h | 5 ----- + arch/arm64/include/asm/thread_info.h | 2 +- + arch/arm64/kernel/cpufeature.c | 1 + + 6 files changed, 13 insertions(+), 10 deletions(-) +Merging m68k-current/for-linus (fdd20ec8786a Documentation/features/time: Mark m68k having modern-timekeeping) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (8b909e354870 powerpc/kexec: Fix loading of kernel + initramfs with kexec_file_load()) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (962f0af83c23 s390/mm: fix address space detection in exception handling) +$ git merge s390-fixes/fixes +Merge made by the 'recursive' strategy. + arch/s390/mm/fault.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) +Merging sparc/master (30d1d92a888d Merge tag 'nds32-for-linux-5.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux) +$ git merge sparc/master +Already up to date. +Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (720f1de4021f pktgen: do not sleep with the thread lock held.) +$ git merge net/master +Auto-merging net/packet/af_packet.c +Auto-merging net/ipv6/raw.c +Auto-merging net/ipv4/udp.c +Auto-merging net/ipv4/route.c +Auto-merging net/core/pktgen.c +Auto-merging net/core/ethtool.c +Auto-merging net/core/dev.c +Auto-merging include/net/ip6_fib.h +Auto-merging drivers/net/ipvlan/ipvlan_main.c +Auto-merging drivers/net/ethernet/hisilicon/hns/hns_ethtool.c +Auto-merging drivers/net/dsa/mv88e6xxx/chip.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/net/dsa/mv88e6xxx/chip.c | 2 +- + drivers/net/dsa/sja1105/sja1105_main.c | 32 +++++++++++----------- + .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 14 +++++----- + .../aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c | 4 ++- + drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 4 +++ + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 4 +-- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 15 +++++----- + drivers/net/ethernet/ti/cpsw_ethtool.c | 2 +- + drivers/net/ipvlan/ipvlan_main.c | 2 +- + drivers/net/phy/phylink.c | 13 ++++++--- + drivers/net/phy/sfp.c | 24 +++++++++++++--- + drivers/s390/net/qeth_core_main.c | 22 +++++++++++---- + drivers/s390/net/qeth_l2_main.c | 2 +- + drivers/s390/net/qeth_l3_main.c | 32 ++++++++++++++++++---- + include/linux/dsa/sja1105.h | 12 -------- + include/net/ip6_fib.h | 3 +- + include/net/tls.h | 4 +++ + net/core/dev.c | 6 ++-- + net/core/ethtool.c | 5 +++- + net/core/fib_rules.c | 6 ++-- + net/core/pktgen.c | 11 ++++++++ + net/dsa/tag_sja1105.c | 10 ++----- + net/ipv4/route.c | 24 ++++++++-------- + net/ipv4/udp.c | 3 +- + net/ipv6/raw.c | 25 ++++++++++++----- + net/packet/af_packet.c | 2 +- + net/rds/ib.c | 2 +- + net/rds/ib_rdma.c | 10 ++++--- + net/rds/ib_recv.c | 3 ++ + net/sctp/sm_make_chunk.c | 13 ++------- + net/sctp/sm_sideeffect.c | 5 ++++ + net/tls/tls_device.c | 26 ++++++++++++------ + .../selftests/net/forwarding/router_broadcast.sh | 5 +++- + 34 files changed, 218 insertions(+), 131 deletions(-) +Merging bpf/master (1884c066579a tools: bpftool: Fix JSON output when lookup fails) +$ git merge bpf/master +Auto-merging net/ipv6/udp.c +Auto-merging net/ipv4/udp.c +Auto-merging net/core/skbuff.c +Auto-merging net/core/filter.c +Merge made by the 'recursive' strategy. + Documentation/networking/af_xdp.rst | 8 +- + arch/riscv/net/bpf_jit_comp.c | 24 + + include/linux/skmsg.h | 2 + + net/core/filter.c | 24 +- + net/core/skbuff.c | 1 + + net/ipv4/udp.c | 6 +- + net/ipv6/udp.c | 4 +- + samples/bpf/bpf_load.c | 2 +- + samples/bpf/task_fd_query_user.c | 2 +- + tools/bpf/bpftool/map.c | 2 + + tools/lib/bpf/libbpf.c | 28 +- + tools/lib/bpf/libbpf_internal.h | 4 +- + tools/lib/bpf/libbpf_probes.c | 13 +- + tools/testing/selftests/bpf/Makefile | 7 +- + .../selftests/bpf/prog_tests/flow_dissector.c | 1 + + tools/testing/selftests/bpf/verifier/subreg.c | 533 +++++++++++++++++++++ + 16 files changed, 623 insertions(+), 38 deletions(-) + create mode 100644 tools/testing/selftests/bpf/verifier/subreg.c +Merging ipsec/master (7c80eb1c7e2b af_key: fix leaks in key_pol_get_resp and dump_sp.) +$ git merge ipsec/master +Auto-merging net/xfrm/xfrm_user.c +Auto-merging net/key/af_key.c +Merge made by the 'recursive' strategy. + net/key/af_key.c | 8 ++++++-- + net/xfrm/xfrm_user.c | 16 ++++++++++++++++ + 2 files changed, 22 insertions(+), 2 deletions(-) +Merging netfilter/master (a0d56cb911ca netfilter: ipv6: nf_defrag: fix leakage of unqueued fragments) +$ git merge netfilter/master +Auto-merging net/ipv6/netfilter/nf_conntrack_reasm.c +Merge made by the 'recursive' strategy. + net/ipv6/netfilter/nf_conntrack_reasm.c | 12 +++++------- + net/netfilter/nft_masq.c | 3 +-- + net/netfilter/nft_redir.c | 3 +-- + 3 files changed, 7 insertions(+), 11 deletions(-) +Merging ipvs/master (58e8b37069ff Merge branch 'net-phy-dp83867-add-some-fixes') +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (69ae4f6aac15 mwifiex: Fix heap overflow in mwifiex_uap_parse_tail_ies()) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 39 +++++++++++++++ + drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 2 + + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 1 - + drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 22 ++++++++- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 22 --------- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 57 ---------------------- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 23 ++++++--- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 20 +++++--- + drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 3 +- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 2 + + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 2 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 53 ++++++++++++++------ + drivers/net/wireless/marvell/mwifiex/ie.c | 47 ++++++++++++------ + drivers/net/wireless/marvell/mwifiex/scan.c | 19 ++++++++ + drivers/net/wireless/realtek/rtw88/fw.c | 6 ++- + drivers/net/wireless/realtek/rtw88/main.c | 3 +- + drivers/net/wireless/realtek/rtw88/phy.c | 22 ++++++--- + drivers/net/wireless/rsi/rsi_91x_sdio.c | 21 +++++--- + 20 files changed, 220 insertions(+), 150 deletions(-) +Merging mac80211/master (180aa422ef27 nl80211: fill all policy .type entries) +$ git merge mac80211/master +Auto-merging net/wireless/nl80211.c +Auto-merging net/wireless/core.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/mac80211_hwsim.c | 1 + + include/net/cfg80211.h | 3 +- + net/mac80211/ieee80211_i.h | 3 ++ + net/mac80211/key.c | 2 - + net/mac80211/mesh.c | 6 ++- + net/mac80211/mlme.c | 12 ++++- + net/mac80211/tdls.c | 23 ++++++++ + net/mac80211/util.c | 4 +- + net/mac80211/wpa.c | 7 ++- + net/wireless/Makefile | 1 + + net/wireless/core.c | 6 ++- + net/wireless/nl80211.c | 99 ++++++++++++++++++++++++++--------- + net/wireless/util.c | 2 +- + 13 files changed, 136 insertions(+), 33 deletions(-) +Merging rdma-fixes/for-rc (4f240dfec6bc RDMA/efa: Remove MAYEXEC flag check from mmap flow) +$ git merge rdma-fixes/for-rc +Merge made by the 'recursive' strategy. + drivers/infiniband/core/device.c | 49 +++++++++++++++++++-------- + drivers/infiniband/core/rdma_core.h | 2 ++ + drivers/infiniband/core/uverbs_cmd.c | 30 +++++++++++----- + drivers/infiniband/core/uverbs_std_types_cq.c | 2 +- + drivers/infiniband/core/uverbs_std_types_mr.c | 2 +- + drivers/infiniband/hw/efa/efa_verbs.c | 1 - + drivers/infiniband/hw/hfi1/chip.c | 1 + + drivers/infiniband/hw/hfi1/user_exp_rcv.c | 3 ++ + drivers/infiniband/hw/hfi1/verbs.c | 2 -- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 1 + + drivers/infiniband/hw/mlx5/cmd.c | 9 +++-- + drivers/infiniband/hw/mlx5/main.c | 2 +- + drivers/infiniband/hw/qib/qib_verbs.c | 2 -- + drivers/infiniband/sw/rdmavt/mr.c | 2 ++ + drivers/infiniband/sw/rdmavt/qp.c | 3 +- + drivers/infiniband/ulp/srp/ib_srp.c | 18 +++++++++- + include/rdma/ib_verbs.h | 1 + + 17 files changed, 95 insertions(+), 35 deletions(-) +Merging sound-current/for-linus (717f43d81afc ALSA: hda/realtek - Update headset mode for ALC256) +$ git merge sound-current/for-linus +Auto-merging sound/pci/hda/patch_realtek.c +Merge made by the 'recursive' strategy. + sound/pci/hda/patch_realtek.c | 75 ++++++++++++++++++++++++++++++++++--------- + 1 file changed, 60 insertions(+), 15 deletions(-) +Merging sound-asoc-fixes/for-linus (45b2461230bf Merge branch 'asoc-5.2' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + include/sound/sof/dai.h | 1 + + include/sound/sof/header.h | 23 ++++ + include/sound/sof/info.h | 20 ++-- + include/sound/sof/xtensa.h | 9 +- + include/uapi/sound/sof/abi.h | 2 +- + sound/hda/ext/hdac_ext_bus.c | 1 - + sound/pci/hda/hda_codec.c | 9 +- + sound/soc/codecs/ak4458.c | 18 +-- + sound/soc/codecs/cs4265.c | 2 +- + sound/soc/codecs/cs42xx8.c | 1 + + sound/soc/codecs/max98090.c | 16 +++ + sound/soc/codecs/rt274.c | 3 +- + sound/soc/codecs/rt5670.c | 12 ++ + sound/soc/codecs/rt5677-spi.c | 5 +- + sound/soc/fsl/fsl_asrc.c | 4 +- + sound/soc/intel/boards/bytcht_es8316.c | 2 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 2 +- + sound/soc/intel/boards/cht_bsw_nau8824.c | 2 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 2 +- + sound/soc/intel/boards/sof_rt5682.c | 11 +- + sound/soc/intel/common/soc-acpi-intel-byt-match.c | 17 +++ + sound/soc/intel/common/soc-acpi-intel-cnl-match.c | 10 +- + sound/soc/mediatek/Kconfig | 2 +- + sound/soc/soc-core.c | 36 +++--- + sound/soc/soc-dapm.c | 7 +- + sound/soc/soc-pcm.c | 3 +- + sound/soc/sof/Kconfig | 8 +- + sound/soc/sof/control.c | 9 +- + sound/soc/sof/core.c | 29 ++++- + sound/soc/sof/intel/bdw.c | 26 +++-- + sound/soc/sof/intel/byt.c | 25 +++-- + sound/soc/sof/intel/cnl.c | 4 + + sound/soc/sof/intel/hda-ctrl.c | 102 +++++++++++++++-- + sound/soc/sof/intel/hda-ipc.c | 17 ++- + sound/soc/sof/intel/hda.c | 129 ++++++---------------- + sound/soc/sof/ipc.c | 26 ++--- + sound/soc/sof/loader.c | 2 + + sound/soc/sof/pcm.c | 8 +- + sound/soc/sof/xtensa/core.c | 2 +- + sound/soc/sunxi/sun4i-codec.c | 9 ++ + sound/soc/sunxi/sun4i-i2s.c | 6 +- + 41 files changed, 396 insertions(+), 226 deletions(-) +Merging regmap-fixes/for-linus (38ee2a8cc70e Merge branch 'regmap-5.2' into regmap-linus) +$ git merge regmap-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-debugfs.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging regulator-fixes/for-linus (2061c4be6a8e Merge branch 'regulator-5.2' into regulator-linus) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/regulator/tps6507x-regulator.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging spi-fixes/for-linus (25799698910e Merge branch 'spi-5.2' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/spi/spi-bitbang.c | 2 +- + drivers/spi/spi-fsl-spi.c | 2 +- + drivers/spi/spi.c | 11 ++++++++--- + 3 files changed, 10 insertions(+), 5 deletions(-) +Merging pci-current/for-linus (a188339ca5a3 Linux 5.2-rc1) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (f2c7c76c5d0a Linux 5.2-rc3) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (f2c7c76c5d0a Linux 5.2-rc3) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (bd21f0222ada USB: Fix chipmunk-like voice when using Logitech C270 for recording audio.) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/core/quirks.c | 3 +++ + drivers/usb/storage/unusual_realtek.h | 5 +++++ + drivers/usb/typec/ucsi/ucsi_ccg.c | 6 ++++-- + 3 files changed, 12 insertions(+), 2 deletions(-) +Merging usb-gadget-fixes/fixes (42cc68868ce9 usb: gadget: udc: lpc32xx: fix return value check in lpc32xx_udc_probe()) +$ git merge usb-gadget-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/usb/dwc2/gadget.c | 24 ++++++++++++++-------- + drivers/usb/dwc2/hcd.c | 39 ++++++++++++++++++++++-------------- + drivers/usb/dwc2/hcd.h | 20 +++++++++--------- + drivers/usb/dwc2/hcd_intr.c | 5 +++-- + drivers/usb/dwc2/hcd_queue.c | 10 +++++---- + drivers/usb/gadget/udc/fusb300_udc.c | 5 +++++ + drivers/usb/gadget/udc/lpc32xx_udc.c | 7 +++---- + drivers/usb/phy/phy-mxs-usb.c | 14 +++++++++++++ + 8 files changed, 82 insertions(+), 42 deletions(-) +Merging usb-serial-fixes/usb-linus (f3dfd4072c3e USB: serial: option: add Telit 0x1260 and 0x1261 compositions) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/option.c | 6 ++++++ + drivers/usb/serial/pl2303.c | 1 + + drivers/usb/serial/pl2303.h | 3 +++ + 3 files changed, 10 insertions(+) +Merging usb-chipidea-fixes/ci-for-usb-stable (d6d768a0ec3c usb: chipidea: fix static checker warning for NULL pointer) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Auto-merging drivers/usb/chipidea/ci_hdrc_imx.c +Merge made by the 'recursive' strategy. +Merging phy/fixes (700ffe3c92c2 phy: tegra: xusb: Add Tegra210 PLL power supplies) +$ git merge phy/fixes +Merge made by the 'recursive' strategy. + .../devicetree/bindings/phy/nvidia,tegra124-xusb-padctl.txt | 12 ++++++++++++ + drivers/phy/broadcom/phy-brcm-usb.c | 8 ++++++++ + drivers/phy/qualcomm/phy-qcom-qusb2.c | 2 +- + drivers/phy/renesas/phy-rcar-gen2.c | 2 ++ + drivers/phy/tegra/xusb-tegra124.c | 9 +++++++++ + drivers/phy/tegra/xusb-tegra210.c | 9 +++++++++ + drivers/phy/ti/phy-am654-serdes.c | 4 ++-- + 7 files changed, 43 insertions(+), 3 deletions(-) +Merging staging.current/staging-linus (f2c7c76c5d0a Linux 5.2-rc3) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (e7bf2ce83747 Merge tag 'misc-habanalabs-fixes-2019-06-06' of git://people.freedesktop.org/~gabbayo/linux into char-misc-linus) +$ git merge char-misc.current/char-misc-linus +Auto-merging lib/test_firmware.c +Auto-merging init/Kconfig +Auto-merging drivers/misc/lkdtm/core.c +Merge made by the 'recursive' strategy. + drivers/fpga/dfl-afu-dma-region.c | 2 +- + drivers/fpga/dfl.c | 22 +++++++-- + drivers/fpga/stratix10-soc.c | 6 ++- + drivers/fpga/zynqmp-fpga.c | 4 +- + drivers/misc/genwqe/card_dev.c | 2 + + drivers/misc/genwqe/card_utils.c | 4 ++ + drivers/misc/habanalabs/context.c | 6 +++ + drivers/misc/habanalabs/debugfs.c | 65 +++++++++------------------ + drivers/misc/habanalabs/device.c | 2 + + drivers/misc/habanalabs/goya/goya.c | 3 +- + drivers/misc/habanalabs/goya/goyaP.h | 1 + + drivers/misc/habanalabs/goya/goya_coresight.c | 31 ++++++++++++- + drivers/misc/habanalabs/habanalabs.h | 2 + + drivers/misc/habanalabs/memory.c | 6 --- + drivers/misc/habanalabs/mmu.c | 8 +--- + drivers/misc/lkdtm/bugs.c | 23 +++++++--- + drivers/misc/lkdtm/core.c | 6 +-- + drivers/misc/lkdtm/lkdtm.h | 2 +- + drivers/misc/lkdtm/usercopy.c | 10 +++-- + drivers/parport/share.c | 2 + + drivers/w1/slaves/w1_ds2408.c | 2 +- + include/uapi/misc/habanalabs.h | 22 ++++++++- + init/Kconfig | 17 ++++--- + kernel/Makefile | 4 +- + kernel/{gen_ikh_data.sh => gen_kheaders.sh} | 17 ++++--- + kernel/kheaders.c | 40 +++++++---------- + lib/test_firmware.c | 14 +++--- + 27 files changed, 192 insertions(+), 131 deletions(-) + rename kernel/{gen_ikh_data.sh => gen_kheaders.sh} (82%) +Merging soundwire-fixes/fixes (39194128701b soundwire: intel: set dai min and max channels correctly) +$ git merge soundwire-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/soundwire/intel.c | 4 ++-- + drivers/soundwire/stream.c | 7 +++---- + 2 files changed, 5 insertions(+), 6 deletions(-) +Merging thunderbolt-fixes/fixes (f2c7c76c5d0a Linux 5.2-rc3) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (7c7da40da164 Input: uinput - add compat ioctl number translation for UI_*_FF_UPLOAD) +$ git merge input-current/for-linus +Auto-merging drivers/input/touchscreen/silead.c +Auto-merging drivers/input/misc/uinput.c +Merge made by the 'recursive' strategy. + drivers/input/misc/uinput.c | 22 ++++++++++++++++++++-- + drivers/input/mouse/elan_i2c_core.c | 2 ++ + drivers/input/mouse/elantech.c | 2 ++ + drivers/input/touchscreen/silead.c | 1 + + 4 files changed, 25 insertions(+), 2 deletions(-) +Merging crypto-current/master (7829a0c1cb9c crypto: hmac - fix memory leak in hmac_init_tfm()) +$ git merge crypto-current/master +Already up to date. +Merging ide/master (54dee406374c Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux) +$ git merge ide/master +Already up to date. +Merging vfio-fixes/for-linus (5715c4dd66a3 vfio/mdev: Synchronize device create/remove with parent removal) +$ git merge vfio-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/vfio/mdev/mdev_core.c | 136 ++++++++++++++++++--------------------- + drivers/vfio/mdev/mdev_private.h | 4 +- + drivers/vfio/mdev/mdev_sysfs.c | 6 +- + 3 files changed, 69 insertions(+), 77 deletions(-) +Merging kselftest-fixes/fixes (e2e88325f4bc selftests: vm: Fix test build failure when built by itself) +$ git merge kselftest-fixes/fixes +Merge made by the 'recursive' strategy. + tools/testing/selftests/vm/Makefile | 4 ---- + 1 file changed, 4 deletions(-) +Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging slave-dma-fixes/fixes (8243b87c3abb dt-bindings: dma: uart: rename binding) +$ git merge slave-dma-fixes/fixes +Auto-merging drivers/dma/tegra210-adma.c +Auto-merging drivers/dma/mediatek/Makefile +CONFLICT (content): Merge conflict in drivers/dma/mediatek/Makefile +Auto-merging drivers/dma/mediatek/Kconfig +Auto-merging drivers/dma/dma-jz4780.c +Removing Documentation/devicetree/bindings/dma/8250_mtk_dma.txt +Resolved 'drivers/dma/mediatek/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 73bc47f6b683] Merge remote-tracking branch 'slave-dma-fixes/fixes' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/dma/8250_mtk_dma.txt | 33 - + .../devicetree/bindings/dma/mtk-uart-apdma.txt | 54 ++ + drivers/dma/dma-jz4780.c | 32 +- + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 3 +- + drivers/dma/fsl-qdma.c | 4 +- + drivers/dma/mediatek/Kconfig | 11 + + drivers/dma/mediatek/Makefile | 1 + + drivers/dma/mediatek/mtk-cqdma.c | 4 +- + drivers/dma/mediatek/mtk-uart-apdma.c | 666 +++++++++++++++++++++ + drivers/dma/sprd-dma.c | 49 +- + drivers/dma/tegra210-adma.c | 57 +- + 11 files changed, 832 insertions(+), 82 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/dma/8250_mtk_dma.txt + create mode 100644 Documentation/devicetree/bindings/dma/mtk-uart-apdma.txt + create mode 100644 drivers/dma/mediatek/mtk-uart-apdma.c +Merging backlight-fixes/for-backlight-fixes (e93c9c99a629 Linux 5.1) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (b2b5921fe4b3 mtd: rawnand: initialize ntargets with maxchips) +$ git merge mtd-fixes/mtd/fixes +Merge made by the 'recursive' strategy. + drivers/mtd/nand/raw/nand_base.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging mfd-fixes/for-mfd-fixes (e93c9c99a629 Linux 5.1) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (a200c721956c media: venus: hfi_parser: fix a regression in parser) +$ git merge v4l-dvb-fixes/fixes +Auto-merging drivers/media/dvb-core/dvb_frontend.c +Merge made by the 'recursive' strategy. + drivers/media/dvb-core/dvb_frontend.c | 2 +- + drivers/media/platform/qcom/venus/hfi_helper.h | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging reset-fixes/reset/fixes (d5d4218e1669 reset: remove redundant null check on pointer dev) +$ git merge reset-fixes/reset/fixes +Auto-merging drivers/reset/core.c +Merge made by the 'recursive' strategy. + drivers/reset/core.c | 3 --- + 1 file changed, 3 deletions(-) +Merging mips-fixes/mips-fixes (f532beeeff0c MIPS: uprobes: remove set but not used variable 'epc') +$ git merge mips-fixes/mips-fixes +Merge made by the 'recursive' strategy. + arch/mips/include/asm/ginvt.h | 2 +- + arch/mips/include/asm/page.h | 2 +- + arch/mips/kernel/uprobes.c | 3 --- + arch/mips/mm/mmap.c | 7 ++++++- + arch/mips/pistachio/Platform | 1 + + arch/mips/pnx833x/Platform | 2 +- + arch/mips/txx9/generic/setup.c | 6 ------ + 7 files changed, 10 insertions(+), 13 deletions(-) +Merging at91-fixes/at91-fixes (ba5e60c9b75d arm/mach-at91/pm : fix possible object reference leak) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (4ee23cd76c0c Merge branch 'omap-for-v5.2/ti-sysc' into fixes) +$ git merge omap-fixes/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am33xx-l4.dtsi | 14 +++++------ + arch/arm/boot/dts/am437x-l4.dtsi | 4 ---- + arch/arm/boot/dts/am57xx-idk-common.dtsi | 1 + + arch/arm/boot/dts/dra7-l4.dtsi | 2 +- + arch/arm/boot/dts/dra71-evm.dts | 2 +- + arch/arm/boot/dts/dra71x.dtsi | 17 +++++++++++++ + arch/arm/boot/dts/dra76x-mmc-iodelay.dtsi | 40 +++++++++++++++---------------- + arch/arm/boot/dts/dra76x.dtsi | 8 +++++++ + drivers/bus/ti-sysc.c | 23 +++++++++--------- + 9 files changed, 65 insertions(+), 46 deletions(-) + create mode 100644 arch/arm/boot/dts/dra71x.dtsi +Merging kvm-fixes/master (f8d221d2e0e1 Merge tag 'kvm-s390-master-5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (a86cb413f4bf KVM: s390: Do not report unusabled IDs via KVM_CAP_MAX_VCPU_ID) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (4a60570dce65 hwmon: (pmbus/core) Treat parameters as paged if on multiple pages) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + drivers/hwmon/hwmon.c | 2 +- + drivers/hwmon/pmbus/pmbus_core.c | 37 +++++++++++++++++++++++++++++++++---- + 2 files changed, 34 insertions(+), 5 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (52f476a323f9 libnvdimm/pmem: Bypass CONFIG_HARDENED_USERCOPY overhead) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (8b1d37b7b32d Merge branch 'misc-5.2' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Already up to date! +Merge made by the 'recursive' strategy. +Merging vfs-fixes/fixes (d8076bdb56af uapi: Wire up the mount API syscalls on non-x86 arches [ver #2]) +$ git merge vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (8c5165430c01 dma-debug: only skip one stackframe entry) +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/master (709a53e19484 MAINTAINERS: Fix the I3C entry) +$ git merge i3c-fixes/master +Already up to date. +Merging drivers-x86-fixes/fixes (d6423bd03031 platform/x86: pmc_atom: Add several Beckhoff Automation boards to critclk_systems DMI table) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (a188339ca5a3 Linux 5.2-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (a188339ca5a3 Linux 5.2-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (852d095d16a6 checkpatch.pl: Update DT vendor prefix check) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (cc8f52609bb4 scsi: smartpqi: unlock on error in pqi_submit_raid_request_synchronous()) +$ git merge scsi-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/scsi/smartpqi/smartpqi_init.c | 6 ++++-- + drivers/scsi/ufs/ufshcd.c | 3 ++- + 2 files changed, 6 insertions(+), 3 deletions(-) +Merging drm-fixes/drm-fixes (bcc9d0e346f9 Merge branch 'malidp-fixes' of git://linux-arm.org/linux-ld into drm-fixes) +$ git merge drm-fixes/drm-fixes +Merge made by the 'recursive' strategy. + drivers/dma-buf/udmabuf.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 12 ++--- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 15 +++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 12 ++++- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +- + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 1 + + drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 31 +++++++++++-- + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 1 + + .../gpu/drm/arm/display/komeda/d71/d71_component.c | 8 ++-- + drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c | 4 +- + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +- + drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 6 ++- + drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 8 ++-- + .../gpu/drm/arm/display/komeda/komeda_pipeline.c | 4 +- + .../gpu/drm/arm/display/komeda/komeda_pipeline.h | 10 ++--- + drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 4 +- + drivers/gpu/drm/arm/hdlcd_crtc.c | 14 +++--- + drivers/gpu/drm/arm/malidp_drv.c | 13 +++++- + drivers/gpu/drm/drm_atomic_helper.c | 22 +++++----- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 2 +- + drivers/gpu/drm/i915/gvt/gtt.c | 26 +++++++---- + drivers/gpu/drm/i915/gvt/handlers.c | 36 ++++++++++++++- + drivers/gpu/drm/i915/i915_reg.h | 3 ++ + drivers/gpu/drm/i915/intel_workarounds.c | 6 +++ + drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 4 ++ + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 51 +++++++++++----------- + drivers/gpu/drm/vc4/vc4_plane.c | 2 +- + include/drm/drm_modeset_helper_vtables.h | 8 ++++ + 30 files changed, 222 insertions(+), 92 deletions(-) +Merging amdgpu-fixes/drm-fixes (c08e56c647ba drm/amd/display: Don't load DMCU for Raven 1 (v2)) +$ git merge amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (fa2eb819ddf9 Merge tag 'gvt-fixes-2019-06-05' of https://github.com/intel/gvt-linux into drm-intel-fixes) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/gvt/gtt.c | 12 +++++++++++- + drivers/gpu/drm/i915/gvt/handlers.c | 13 +++++++------ + drivers/gpu/drm/i915/gvt/reg.h | 2 ++ + drivers/gpu/drm/i915/gvt/scheduler.c | 25 +++++++++++++++++++++++++ + drivers/gpu/drm/i915/gvt/scheduler.h | 1 + + 5 files changed, 46 insertions(+), 7 deletions(-) +Merging mmc-fixes/fixes (739799314587 mmc: sdhci_am654: Fix SLOTTYPE write) +$ git merge mmc-fixes/fixes +Auto-merging drivers/mmc/host/sdhci.c +Merge made by the 'recursive' strategy. + drivers/memstick/core/mspro_block.c | 13 ++++++------- + drivers/mmc/host/meson-gx-mmc.c | 6 +++--- + drivers/mmc/host/sdhci-tegra.c | 2 +- + drivers/mmc/host/sdhci.c | 24 +++++++++++++----------- + drivers/mmc/host/sdhci_am654.c | 2 +- + drivers/mmc/host/tmio_mmc_core.c | 3 ++- + 6 files changed, 26 insertions(+), 24 deletions(-) +Merging rtc-fixes/rtc-fixes (a188339ca5a3 Linux 5.2-rc1) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (f2c7c76c5d0a Linux 5.2-rc3) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (01e7d61b8ace PCI: hv: Detect and fix Hyper-V PCI domain number collision) +$ git merge hyperv-fixes/hyperv-fixes +Auto-merging drivers/pci/controller/pci-hyperv.c +Merge made by the 'recursive' strategy. + drivers/hv/channel.c | 2 +- + drivers/pci/controller/pci-hyperv.c | 91 +++++++++++++++++++++++++++++++------ + tools/hv/hv_get_dhcp_info.sh | 2 +- + tools/hv/hv_kvp_daemon.c | 8 ++-- + tools/hv/hv_set_ifconfig.sh | 2 +- + tools/hv/hv_vss_daemon.c | 4 +- + tools/hv/lsvmbus | 75 ++++++++++++++++-------------- + 7 files changed, 131 insertions(+), 53 deletions(-) +Merging soc-fsl-fixes/fix (5674a92ca4b7 soc/fsl/qe: Fix an error code in qe_pin_request()) +$ git merge soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (a188339ca5a3 Linux 5.2-rc1) +$ git merge risc-v-fixes/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (283f1e383e91 udmabuf: actually unmap the scatterlist) +$ git merge drm-misc-fixes/for-linux-next-fixes +Already up to date. +Merging kbuild/for-next (9208119be1c3 Merge branch 'kconfig' into for-next) +$ git merge kbuild/for-next +Auto-merging arch/arm64/Makefile +Merge made by the 'recursive' strategy. + arch/alpha/Makefile | 2 -- + arch/arm64/Makefile | 2 -- + arch/csky/Makefile | 1 - + arch/nds32/Makefile | 2 -- + arch/riscv/Makefile | 2 -- + arch/s390/Makefile | 2 -- + arch/unicore32/Makefile | 3 +-- + .../configs/{unicore32_defconfig => defconfig} | 0 + scripts/Makefile.extrawarn | 1 - + scripts/kconfig/Makefile | 8 +++++--- + scripts/kconfig/conf.c | 4 +--- + scripts/kconfig/confdata.c | 17 ----------------- + scripts/kconfig/lkc.h | 1 - + scripts/kconfig/lkc_proto.h | 1 - + scripts/kconfig/preprocess.c | 3 ++- + 15 files changed, 9 insertions(+), 40 deletions(-) + rename arch/unicore32/configs/{unicore32_defconfig => defconfig} (100%) +Merging compiler-attributes/compiler-attributes (a188339ca5a3 Linux 5.2-rc1) +$ git merge compiler-attributes/compiler-attributes +Already up to date. +Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge leaks/leaks-next +Already up to date. +Merging dma-mapping/for-next (2e96e04d25ca MIPS: use the generic uncached segment support in dma-direct) +$ git merge dma-mapping/for-next +Auto-merging arch/mips/include/asm/page.h +Merge made by the 'recursive' strategy. + arch/Kconfig | 8 + + arch/arm64/mm/dma-mapping.c | 425 +----------------------------------- + arch/mips/Kconfig | 1 + + arch/mips/include/asm/page.h | 3 - + arch/mips/jazz/jazzdma.c | 6 - + arch/mips/mm/cache.c | 2 - + arch/mips/mm/dma-noncoherent.c | 26 +-- + drivers/iommu/dma-iommu.c | 467 +++++++++++++++++++++++++++++++--------- + drivers/usb/Kconfig | 1 + + drivers/usb/core/buffer.c | 17 +- + drivers/usb/core/hcd.c | 51 ++++- + drivers/usb/host/ehci-hcd.c | 2 +- + drivers/usb/host/fotg210-hcd.c | 2 +- + drivers/usb/host/ohci-hcd.c | 25 ++- + drivers/usb/host/ohci-mem.c | 35 ++- + drivers/usb/host/ohci-sm501.c | 50 ++--- + drivers/usb/host/ohci-tmio.c | 15 +- + drivers/usb/host/ohci.h | 2 + + drivers/usb/host/uhci-hcd.c | 2 +- + drivers/video/fbdev/au1100fb.c | 24 +-- + drivers/video/fbdev/au1100fb.h | 1 + + include/linux/dma-contiguous.h | 19 ++ + include/linux/dma-iommu.h | 62 +----- + include/linux/dma-noncoherent.h | 3 + + include/linux/genalloc.h | 1 + + include/linux/usb/hcd.h | 6 +- + kernel/dma/contiguous.c | 56 +++++ + kernel/dma/direct.c | 41 ++-- + lib/genalloc.c | 29 ++- + 29 files changed, 670 insertions(+), 712 deletions(-) +Merging asm-generic/master (6edd1dbace0e asm-generic: optimize generic uaccess for 8-byte loads and stores) +$ git merge asm-generic/master +Already up to date. +Merging arc/for-next (ef94e8ea94ed ARC: entry: EV_Trap expects r10 (vs. r9) to have exception cause) +$ git merge arc/for-next +Merge made by the 'recursive' strategy. + arch/arc/include/asm/entry-arcv2.h | 361 ++++++++++++++++++----------------- + arch/arc/include/asm/entry-compact.h | 4 +- + arch/arc/include/asm/linkage.h | 18 ++ + arch/arc/kernel/asm-offsets.c | 7 + + arch/arc/kernel/entry-arcv2.S | 4 +- + arch/arc/kernel/entry.S | 4 +- + arch/arc/mm/fault.c | 185 ++++++++---------- + arch/arc/mm/tlbex.S | 11 ++ + 8 files changed, 309 insertions(+), 285 deletions(-) +Merging arm/for-next (439ae50145bf Merge commit 'riscpc^{/ARM: riscpc: dma: use __iomem pointers for writing DMA}' into for-next) +$ git merge arm/for-next +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 1 - + arch/arm/include/asm/bug.h | 2 +- + arch/arm/kernel/traps.c | 3 +- + arch/arm/mach-rpc/dma.c | 97 +++++++++++++++++------------------ + arch/arm/mach-rpc/ecard.c | 11 ++-- + arch/arm/mach-rpc/irq.c | 3 +- + arch/arm/mach-rpc/time.c | 38 +++++++++----- + arch/arm/mach-sa1100/assabet.c | 91 +++++++++++---------------------- + arch/arm/mach-sa1100/badge4.c | 2 - + arch/arm/mach-sa1100/h3xxx.c | 64 ++++------------------- + arch/arm/mach-sa1100/hackkit.c | 48 ------------------ + arch/arm/mach-sa1100/neponset.c | 109 +++++++++++----------------------------- + arch/arm/mm/fault.c | 20 ++++---- + drivers/tty/serial/Kconfig | 1 + + drivers/tty/serial/sa1100.c | 46 +++++++++++++++-- + 15 files changed, 207 insertions(+), 329 deletions(-) +Merging arm64/for-next/core (f086f67485c5 arm64: ptrace: add support for syscall emulation) +$ git merge arm64/for-next/core +Auto-merging arch/arm64/kernel/cpufeature.c +Auto-merging arch/arm64/include/asm/thread_info.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/thread_info.h +Recorded preimage for 'arch/arm64/include/asm/thread_info.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/arm64/include/asm/thread_info.h'. +[master 8d0c4719a495] Merge remote-tracking branch 'arm64/for-next/core' +$ git diff -M --stat --summary HEAD^.. + arch/arm64/Kconfig | 3 +- + arch/arm64/include/asm/cache.h | 6 +- + arch/arm64/include/asm/fpsimd.h | 5 +- + arch/arm64/include/asm/pgtable-hwdef.h | 1 + + arch/arm64/include/asm/pgtable-prot.h | 1 - + arch/arm64/include/asm/pgtable.h | 9 ++- + arch/arm64/include/asm/simd.h | 10 +-- + arch/arm64/include/asm/thread_info.h | 5 +- + arch/arm64/include/uapi/asm/ptrace.h | 3 + + arch/arm64/kernel/cacheinfo.c | 11 +++ + arch/arm64/kernel/cpufeature.c | 6 +- + arch/arm64/kernel/fpsimd.c | 139 +++++++++++++++++++++++---------- + arch/arm64/kernel/ptrace.c | 6 +- + arch/arm64/kernel/sleep.S | 2 +- + arch/arm64/kvm/fpsimd.c | 4 +- + arch/arm64/mm/fault.c | 20 +++-- + arch/arm64/mm/hugetlbpage.c | 12 +-- + arch/arm64/mm/init.c | 5 +- + arch/arm64/mm/mmu.c | 12 +-- + arch/powerpc/kernel/ptrace.c | 1 - + arch/x86/kernel/ptrace.c | 3 - + drivers/base/cacheinfo.c | 5 ++ + include/linux/cacheinfo.h | 2 + + kernel/ptrace.c | 3 + + 24 files changed, 173 insertions(+), 101 deletions(-) +Merging arm-perf/for-next/perf (9bcb929f969e perf/arm-ccn: Clean up CPU hotplug handling) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (7ad1b252cabe ARM: Document merges) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 37 ++++++++++++++++++++++++++++++++++ + 1 file changed, 37 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' into next) +$ git merge actions/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging amlogic/for-next (f3941d20431c Merge branch 'v5.3/drivers' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Removing Documentation/devicetree/bindings/arm/amlogic.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/amlogic.txt | 142 -- + Documentation/devicetree/bindings/arm/amlogic.yaml | 144 ++ + .../arm/amlogic/amlogic,meson-gx-ao-secure.txt | 28 + + .../bindings/soc/amlogic/amlogic,canvas.txt | 10 +- + arch/arm/boot/dts/meson.dtsi | 44 +- + arch/arm/boot/dts/meson6-atv1200.dts | 44 +- + arch/arm/boot/dts/meson6.dtsi | 44 +- + arch/arm/boot/dts/meson8-minix-neo-x8.dts | 39 +- + arch/arm/boot/dts/meson8.dtsi | 69 +- + arch/arm/boot/dts/meson8b-mxq.dts | 181 +- + arch/arm/boot/dts/meson8b-odroidc1.dts | 42 +- + arch/arm/boot/dts/meson8b.dtsi | 75 +- + arch/arm/boot/dts/meson8m2-mxiii-plus.dts | 9 +- + arch/arm/boot/dts/meson8m2.dtsi | 10 + + arch/arm/include/debug/meson.S | 5 +- + arch/arm64/boot/dts/amlogic/Makefile | 1 + + arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 4 +- + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 35 +- + arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 145 +- + arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 122 +- + arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 28 + + arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 1817 +++++++++++++++++++- + .../boot/dts/amlogic/meson-g12b-odroid-n2.dts | 290 ++++ + arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 82 + + .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 4 +- + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 4 +- + .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 6 +- + .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 2 +- + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 6 +- + arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 2 +- + .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 97 +- + arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 29 +- + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 35 +- + .../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 2 +- + .../boot/dts/amlogic/meson-gxl-s905d-p230.dts | 2 +- + .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 14 +- + .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 2 +- + .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 4 +- + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 35 +- + .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 28 +- + .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 4 +- + arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts | 2 +- + arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 6 +- + drivers/clk/meson/axg.c | 10 +- + drivers/clk/meson/clk-mpll.c | 36 +- + drivers/clk/meson/clk-mpll.h | 3 + + drivers/clk/meson/g12a.c | 36 +- + drivers/clk/meson/g12a.h | 2 +- + drivers/clk/meson/gxbb.c | 5 - + drivers/clk/meson/meson-eeclk.c | 3 + + drivers/clk/meson/meson-eeclk.h | 2 + + drivers/clk/meson/meson8b.c | 10 +- + drivers/soc/amlogic/meson-canvas.c | 14 +- + include/dt-bindings/clock/g12a-clkc.h | 2 +- + 54 files changed, 3128 insertions(+), 689 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/amlogic.txt + create mode 100644 Documentation/devicetree/bindings/arm/amlogic.yaml + create mode 100644 Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.txt + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b.dtsi +Merging aspeed/for-next (130413736376 ARM: dts: aspeed: Add Microsoft Olympus BMC) +$ git merge aspeed/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 4 + + arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts | 8 + + arch/arm/boot/dts/aspeed-bmc-facebook-yamp.dts | 160 ++++ + arch/arm/boot/dts/aspeed-bmc-lenovo-hr630.dts | 566 ++++++++++++ + arch/arm/boot/dts/aspeed-bmc-microsoft-olympus.dts | 207 +++++ + arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 2 + + arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 22 + + arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 2 + + arch/arm/boot/dts/aspeed-bmc-opp-swift.dts | 966 +++++++++++++++++++++ + arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 2 + + arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 123 ++- + arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts | 5 + + arch/arm/boot/dts/aspeed-g4.dtsi | 8 +- + arch/arm/boot/dts/aspeed-g5.dtsi | 11 +- + arch/arm/boot/dts/ibm-power9-dual.dtsi | 248 ++++++ + 15 files changed, 2321 insertions(+), 13 deletions(-) + create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-yamp.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-lenovo-hr630.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-microsoft-olympus.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-swift.dts + create mode 100644 arch/arm/boot/dts/ibm-power9-dual.dtsi +Merging at91/at91-next (32dfd9cfa4c6 Merge branch 'at91-dt' into at91-next) +$ git merge at91/at91-next +Auto-merging arch/arm/boot/dts/sama5d3.dtsi +Auto-merging arch/arm/boot/dts/at91sam9x5.dtsi +Auto-merging arch/arm/boot/dts/at91sam9rl.dtsi +Auto-merging arch/arm/boot/dts/at91sam9g45.dtsi +Auto-merging arch/arm/boot/dts/at91sam9261ek.dts +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/at91-wb50n.dtsi | 2 +- + arch/arm/boot/dts/at91sam9261ek.dts | 8 -------- + arch/arm/boot/dts/at91sam9g45.dtsi | 25 +++---------------------- + arch/arm/boot/dts/at91sam9rl.dtsi | 25 +++---------------------- + arch/arm/boot/dts/at91sam9x5.dtsi | 23 +++-------------------- + arch/arm/boot/dts/sama5d3.dtsi | 27 ++++----------------------- + 6 files changed, 14 insertions(+), 96 deletions(-) +Merging bcm2835/for-next (08e3c4158538 ARM: bcm283x: Enable DMA support for SPI controller) +$ git merge bcm2835/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/bcm283x.dtsi | 2 ++ + 1 file changed, 2 insertions(+) +Merging imx-mxs/for-next (bb27e33181d8 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Auto-merging drivers/soc/imx/Makefile +Auto-merging drivers/soc/imx/Kconfig +Auto-merging drivers/clk/imx/clk-imx8mm.c +Auto-merging drivers/clk/imx/clk-imx6ul.c +Auto-merging drivers/clk/imx/clk-imx6sx.c +Auto-merging drivers/clk/imx/clk-imx6q.c +Auto-merging arch/arm64/Kconfig.platforms +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/imx53-m53menlo.dts | 237 ++++++++++++++++++---- + arch/arm/boot/dts/imx53-smd.dts | 73 +++++++ + arch/arm/boot/dts/imx53.dtsi | 12 ++ + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 12 ++ + arch/arm/boot/dts/imx6qdl.dtsi | 10 +- + arch/arm/boot/dts/imx6sl-evk.dts | 12 ++ + arch/arm/boot/dts/imx6sl.dtsi | 12 +- + arch/arm/boot/dts/imx6sll-evk.dts | 4 + + arch/arm/boot/dts/imx6sx-sdb-reva.dts | 12 ++ + arch/arm/boot/dts/imx6sx-sdb.dts | 12 ++ + arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts | 39 +--- + arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts | 47 +---- + arch/arm/boot/dts/imx6sx-udoo-neo-full.dts | 47 +---- + arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 89 ++++---- + arch/arm/boot/dts/imx6sx.dtsi | 6 +- + arch/arm/boot/dts/imx6ul-geam.dts | 2 +- + arch/arm/boot/dts/imx6ul-isiot.dtsi | 2 +- + arch/arm/boot/dts/imx6ul.dtsi | 1 + + arch/arm/boot/dts/imx6ull.dtsi | 1 + + arch/arm/boot/dts/imx7d-sdb.dts | 12 +- + arch/arm/boot/dts/imx7s.dtsi | 6 +- + arch/arm/boot/dts/imx7ulp-evk.dts | 20 ++ + arch/arm/boot/dts/imx7ulp.dtsi | 10 + + arch/arm/boot/dts/vf610-zii-dev.dtsi | 52 ++++- + arch/arm/configs/imx_v6_v7_defconfig | 8 + + arch/arm/mach-imx/cpuidle-imx6q.c | 10 +- + arch/arm/mach-imx/cpuidle-imx6sx.c | 3 +- + arch/arm64/Kconfig.platforms | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 77 ++++++- + arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 131 ++++++++++++ + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 150 +++++++++++--- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 62 +++++- + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 24 ++- + arch/arm64/configs/defconfig | 17 ++ + drivers/clk/imx/clk-imx6q.c | 13 +- + drivers/clk/imx/clk-imx6sl.c | 5 +- + drivers/clk/imx/clk-imx6sll.c | 5 +- + drivers/clk/imx/clk-imx6sx.c | 7 +- + drivers/clk/imx/clk-imx6ul.c | 7 +- + drivers/clk/imx/clk-imx7ulp.c | 2 +- + drivers/clk/imx/clk-imx8mm.c | 18 +- + drivers/clk/imx/clk-imx8mq.c | 5 + + drivers/clk/imx/clk.c | 15 ++ + drivers/clk/imx/clk.h | 1 + + drivers/firmware/imx/imx-scu-irq.c | 3 + + drivers/soc/imx/Kconfig | 9 + + drivers/soc/imx/Makefile | 1 + + drivers/soc/imx/soc-imx-scu.c | 144 +++++++++++++ + drivers/soc/imx/soc-imx8.c | 49 ++++- + include/dt-bindings/clock/imx8mm-clock.h | 11 +- + include/dt-bindings/clock/imx8mq-clock.h | 5 +- + 53 files changed, 1189 insertions(+), 332 deletions(-) + create mode 100644 drivers/soc/imx/soc-imx-scu.c +Merging keystone/next (3c3a43c81bda Merge branch 'for_5.1/soc-drivers' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (73ade6a62931 Merge branch 'v5.1-next/soc' into for-next) +$ git merge mediatek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (07eb35473c64 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 ++ + arch/arm/boot/dts/armada-370-netgear-rn104.dts | 14 ++++++++++++++ + arch/arm/configs/mvebu_v7_defconfig | 1 + + arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi | 2 ++ + 4 files changed, 19 insertions(+) +Merging omap/for-next (4ee23cd76c0c Merge branch 'omap-for-v5.2/ti-sysc' into fixes) +$ git merge omap/for-next +Already up to date. +Merging reset/reset/next (6b251ea99242 dt-bindings: reset: imx7: Fix the spelling of 'indices') +$ git merge reset/reset/next +Auto-merging drivers/reset/reset-simple.c +CONFLICT (content): Merge conflict in drivers/reset/reset-simple.c +Auto-merging drivers/reset/Kconfig +Resolved 'drivers/reset/reset-simple.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7369d34f0ddd] Merge remote-tracking branch 'reset/reset/next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/reset/bitmain,bm1880-reset.txt | 18 ++++++++ + .../devicetree/bindings/reset/fsl,imx7-src.txt | 2 +- + drivers/reset/Kconfig | 3 +- + drivers/reset/reset-simple.c | 4 +- + include/dt-bindings/reset/bitmain,bm1880-reset.h | 51 ++++++++++++++++++++++ + 5 files changed, 75 insertions(+), 3 deletions(-) + create mode 100644 Documentation/devicetree/bindings/reset/bitmain,bm1880-reset.txt + create mode 100644 include/dt-bindings/reset/bitmain,bm1880-reset.h +Merging qcom/for-next (d1b240beca65 Merge branch 'drivers-for-5.3' into all-for-5.3) +$ git merge qcom/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/qcom,rpmpd.txt | 2 + + MAINTAINERS | 4 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 13 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 25 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 51 ++++ + arch/arm64/boot/dts/qcom/pms405.dtsi | 20 +- + arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 15 +- + arch/arm64/boot/dts/qcom/qcs404.dtsi | 298 ++++++++++++++------- + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 4 +- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 215 ++++++++++++++- + drivers/soc/qcom/rpmpd.c | 134 +++++++-- + include/dt-bindings/power/qcom-rpmpd.h | 34 +++ + 12 files changed, 671 insertions(+), 144 deletions(-) +Merging renesas/next (0f06efb44220 Merge branches 'arm-dt-for-v5.3', 'arm-soc-for-v5.3', 'arm64-defconfig-for-v5.3', 'arm64-dt-for-v5.3' and 'dt-bindings-for-v5.3' into next) +$ git merge renesas/next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/renesas.yaml | 8 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/boot/dts/emev2-kzm9d.dts | 2 +- + arch/arm/boot/dts/iwg20d-q7-common.dtsi | 2 +- + arch/arm/boot/dts/r7s72100-genmai.dts | 2 +- + arch/arm/boot/dts/r7s72100-rskrza1.dts | 38 +++ + arch/arm/boot/dts/r7s72100.dtsi | 19 ++ + arch/arm/boot/dts/r7s9210-rza2mevb.dts | 161 +++++++++++- + arch/arm/boot/dts/r7s9210.dtsi | 286 +++++++++++++++++++++ + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 2 +- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 +- + arch/arm/boot/dts/r8a7743-sk-rzg1m.dts | 2 +- + arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts | 2 +- + arch/arm/boot/dts/r8a7745-sk-rzg1e.dts | 2 +- + arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts | 4 +- + arch/arm/boot/dts/r8a7778-bockw.dts | 2 +- + arch/arm/boot/dts/r8a7779-marzen.dts | 2 +- + arch/arm/boot/dts/r8a7790-lager.dts | 9 +- + arch/arm/boot/dts/r8a7790-stout.dts | 9 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 9 +- + arch/arm/boot/dts/r8a7791-porter.dts | 9 +- + arch/arm/boot/dts/r8a7792-blanche.dts | 9 +- + arch/arm/boot/dts/r8a7792-wheat.dts | 2 +- + arch/arm/boot/dts/r8a7793-gose.dts | 9 +- + arch/arm/boot/dts/r8a7794-alt.dts | 2 +- + arch/arm/boot/dts/r8a7794-silk.dts | 2 +- + arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 +- + arch/arm/mach-shmobile/setup-rcar-gen2.c | 17 ++ + arch/arm64/boot/dts/renesas/Makefile | 2 + + arch/arm64/boot/dts/renesas/hihope-common.dtsi | 53 ++++ + arch/arm64/boot/dts/renesas/hihope-rzg2-ex.dtsi | 55 ++++ + .../boot/dts/renesas/r8a774a1-hihope-rzg2m-ex.dts | 15 ++ + .../boot/dts/renesas/r8a774a1-hihope-rzg2m.dts | 26 ++ + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 231 ++++++++++++++++- + arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts | 197 +++++++++++++- + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 12 +- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 93 +++---- + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 71 +++-- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 45 +++- + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 3 +- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 28 +- + arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 9 +- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 8 +- + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 2 +- + arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 49 ++++ + arch/arm64/boot/dts/renesas/ulcb.dtsi | 2 +- + arch/arm64/configs/defconfig | 1 + + drivers/soc/renesas/Kconfig | 4 +- + 49 files changed, 1358 insertions(+), 167 deletions(-) + create mode 100644 arch/arm64/boot/dts/renesas/hihope-common.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/hihope-rzg2-ex.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-ex.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m.dts +Merging rockchip/for-next (4e32fccf4934 Merge branch 'v5.3-clk/next' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 27 ++- + arch/arm/boot/dts/rk3288-veyron-jaq.dts | 207 ++++++++++++++++++ + arch/arm/boot/dts/rk3288-veyron-jerry.dts | 207 ++++++++++++++++++ + arch/arm/boot/dts/rk3288-veyron-mickey.dts | 234 +++++++++++++++++++- + arch/arm/boot/dts/rk3288-veyron-minnie.dts | 254 ++++++++++++++++++++-- + arch/arm/boot/dts/rk3288-veyron-pinky.dts | 2 +- + arch/arm/boot/dts/rk3288-veyron-speedy.dts | 219 +++++++++++++++++++ + arch/arm/boot/dts/rk3288-veyron.dtsi | 29 ++- + arch/arm/boot/dts/rk3288.dtsi | 30 +-- + arch/arm/mach-rockchip/platsmp.c | 12 +- + arch/arm/mach-rockchip/pm.c | 2 + + arch/arm64/boot/dts/rockchip/rk3399-ficus.dts | 6 + + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts | 97 +++++++++ + arch/arm64/boot/dts/rockchip/rk3399-rock960.dts | 10 + + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 18 ++ + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 8 +- + drivers/clk/rockchip/clk-mmc-phase.c | 14 +- + drivers/clk/rockchip/clk-rk3228.c | 1 + + drivers/clk/rockchip/clk-rk3288.c | 1 - + 19 files changed, 1297 insertions(+), 81 deletions(-) +Merging samsung-krzk/for-next (d68c44eaa535 Merge branch 'next/defconfig' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 14 +- + arch/arm/boot/dts/exynos5420.dtsi | 216 +++++++++++++------------- + arch/arm/configs/exynos_defconfig | 62 ++++---- + arch/arm/mach-exynos/Kconfig | 1 + + 4 files changed, 144 insertions(+), 149 deletions(-) +Merging sunxi/sunxi/for-next (973995d98f20 Merge branch 'sunxi/dt-for-5.3' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging drivers/clk/sunxi/clk-sunxi.c +Auto-merging arch/arm64/configs/defconfig +CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig +Removing Documentation/devicetree/bindings/clock/sunxi-ccu.txt +Removing Documentation/devicetree/bindings/bus/sunxi-rsb.txt +Recorded preimage for 'arch/arm64/configs/defconfig' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/arm64/configs/defconfig'. +[master 8ea09b137fd9] Merge remote-tracking branch 'sunxi/sunxi/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/sunxi.yaml | 2 +- + .../bindings/bus/allwinner,sun8i-a23-rsb.yaml | 79 ++++++++++++ + .../devicetree/bindings/bus/sunxi-rsb.txt | 47 ------- + .../bindings/clock/allwinner,sun4i-a10-ccu.yaml | 141 +++++++++++++++++++++ + .../devicetree/bindings/clock/sunxi-ccu.txt | 62 --------- + .../devicetree/bindings/input/sun4i-lradc-keys.txt | 1 + + .../devicetree/bindings/watchdog/sunxi-wdt.txt | 1 + + arch/arm/boot/dts/sun5i-gr8-evb.dts | 2 +- + arch/arm/boot/dts/sun6i-a31.dtsi | 25 +++- + arch/arm/boot/dts/sun7i-a20-icnova-swac.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 8 ++ + arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 4 +- + arch/arm/boot/dts/sun8i-a83t.dtsi | 29 +++++ + .../boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts | 3 +- + arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 3 +- + arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 4 + + arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 3 +- + arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts | 7 +- + arch/arm/boot/dts/sun8i-r40.dtsi | 3 +- + arch/arm/boot/dts/sun8i-v3s.dtsi | 13 +- + arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 123 ++++++++++++++++++ + arch/arm/boot/dts/sunxi-bananapi-m2-plus-v1.2.dtsi | 3 +- + arch/arm64/boot/dts/allwinner/axp803.dtsi | 6 + + .../dts/allwinner/sun50i-a64-amarula-relic.dts | 25 +++- + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 7 +- + .../boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | 6 - + .../allwinner/sun50i-a64-oceanic-5205-5inmfd.dts | 23 ++++ + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 23 ++++ + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 2 - + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 44 ++++++- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 22 ++++ + .../sun50i-h5-emlid-neutis-n5-devboard.dts | 3 +- + .../dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts | 3 +- + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 10 ++ + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 16 +++ + arch/arm64/configs/defconfig | 2 + + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 2 +- + drivers/clk/sunxi/clk-sunxi.c | 2 + + 38 files changed, 608 insertions(+), 154 deletions(-) + create mode 100644 Documentation/devicetree/bindings/bus/allwinner,sun8i-a23-rsb.yaml + delete mode 100644 Documentation/devicetree/bindings/bus/sunxi-rsb.txt + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-ccu.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/sunxi-ccu.txt +Merging tegra/for-next (1cad9fdb86d5 Merge branch for-5.3/arm64/dt into for-next) +$ git merge tegra/for-next +Auto-merging drivers/soc/tegra/fuse/fuse-tegra.c +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 10 +++- + arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 2 +- + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 66 ++++++++++++++++++++++ + arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 2 +- + arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 2 +- + drivers/soc/tegra/fuse/fuse-tegra.c | 6 +- + drivers/soc/tegra/pmc.c | 18 ++++++ + include/dt-bindings/gpio/tegra186-gpio.h | 41 -------------- + 8 files changed, 98 insertions(+), 49 deletions(-) +Merging clk/clk-next (8dbc37590cd2 Merge branch 'clk-mtk' into clk-next) +$ git merge clk/clk-next +Auto-merging drivers/clk/mediatek/Kconfig +Auto-merging drivers/clk/bcm/Kconfig +CONFLICT (content): Merge conflict in drivers/clk/bcm/Kconfig +Recorded preimage for 'drivers/clk/bcm/Kconfig' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/clk/bcm/Kconfig'. +[master bc7901873a8a] Merge remote-tracking branch 'clk/clk-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/arm/mediatek/mediatek,audsys.txt | 1 + + drivers/clk/bcm/Kconfig | 10 +++ + drivers/clk/bcm/Makefile | 4 +- + drivers/clk/clk-pwm.c | 14 ++++ + drivers/clk/mediatek/Kconfig | 6 ++ + drivers/clk/mediatek/Makefile | 1 + + drivers/clk/mediatek/clk-mt8183.c | 19 ----- + drivers/clk/mediatek/clk-mt8516-aud.c | 65 +++++++++++++++++ + drivers/clk/mediatek/clk-mt8516.c | 5 -- + drivers/clk/mmp/clk-frac.c | 3 +- + drivers/clk/ti/divider.c | 85 ---------------------- + drivers/clk/ti/gate.c | 30 -------- + drivers/clk/ti/mux.c | 31 -------- + include/dt-bindings/clock/mt8516-clk.h | 17 +++++ + 14 files changed, 117 insertions(+), 174 deletions(-) + create mode 100644 drivers/clk/mediatek/clk-mt8516-aud.c +Merging clk-samsung/for-next (2f57b95caf8f clk: samsung: add new clocks for DMC for Exynos5422 SoC) +$ git merge clk-samsung/for-next +Merge made by the 'recursive' strategy. + drivers/clk/samsung/clk-exynos5420.c | 78 +++++++++++++++++++++++++++++++--- + drivers/clk/samsung/clk-exynos5433.c | 4 +- + include/dt-bindings/clock/exynos5420.h | 18 +++++++- + 3 files changed, 90 insertions(+), 10 deletions(-) +Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge c6x/for-linux-next +Already up to date. +Merging csky/linux-next (6b436744a0b7 csky: Fixup no panic in kernel for some traps) +$ git merge csky/linux-next +Auto-merging arch/csky/Kconfig +Merge made by the 'recursive' strategy. + arch/csky/Kconfig | 4 ++++ + arch/csky/kernel/traps.c | 6 ++++++ + 2 files changed, 10 insertions(+) +Merging h8300/h8300-next (3ab4436f688c Merge tag 'nfsd-5.2-1' of git://linux-nfs.org/~bfields/linux) +$ git merge h8300/h8300-next +Already up to date. +Merging ia64/next (c51836246f97 ia64: generate uapi header and system call table files) +$ git merge ia64/next +Already up to date. +Merging m68k/for-next (f67d667213ba m68k: defconfig: Update defconfigs for v5.2-rc1) +$ git merge m68k/for-next +Merge made by the 'recursive' strategy. + arch/m68k/configs/amiga_defconfig | 17 +++++++---------- + arch/m68k/configs/apollo_defconfig | 17 +++++++---------- + arch/m68k/configs/atari_defconfig | 17 +++++++---------- + arch/m68k/configs/bvme6000_defconfig | 17 +++++++---------- + arch/m68k/configs/hp300_defconfig | 17 +++++++---------- + arch/m68k/configs/mac_defconfig | 17 +++++++---------- + arch/m68k/configs/multi_defconfig | 17 +++++++---------- + arch/m68k/configs/mvme147_defconfig | 17 +++++++---------- + arch/m68k/configs/mvme16x_defconfig | 17 +++++++---------- + arch/m68k/configs/q40_defconfig | 17 +++++++---------- + arch/m68k/configs/sun3_defconfig | 17 +++++++---------- + arch/m68k/configs/sun3x_defconfig | 17 +++++++---------- + 12 files changed, 84 insertions(+), 120 deletions(-) +Merging m68knommu/for-next (f2c7c76c5d0a Linux 5.2-rc3) +$ git merge m68knommu/for-next +Already up to date. +Merging microblaze/next (226a893bbb1f microblaze: no need to check return value of debugfs_create functions) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (361686288213 MIPS: replace MBIT_ULL() with BIT_ULL()) +$ git merge mips/mips-next +Merge made by the 'recursive' strategy. + arch/mips/include/asm/cpu.h | 125 +++++++++++++++++++++----------------------- + 1 file changed, 60 insertions(+), 65 deletions(-) +Merging nds32/next (932296120543 nds32: add new emulations for floating point instruction) +$ git merge nds32/next +Already up to date. +Merging nios2/for-next (21e6bff5e0ef nios2: Fix update_mmu_cache preload the TLB with the new PTE) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (57ce8ba0fd3a openrisc: Fix broken paths to arch/or32) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (e626e6b4f4c3 parisc: add dynamic ftrace) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/Kconfig | 2 + + arch/parisc/Makefile | 18 ++++++ + arch/parisc/include/asm/ftrace.h | 15 ++++- + arch/parisc/include/asm/patch.h | 4 +- + arch/parisc/kernel/Makefile | 9 +-- + arch/parisc/kernel/entry.S | 64 +++++++++++++++++++ + arch/parisc/kernel/ftrace.c | 129 +++++++++++++++++++++++++++++++++++--- + arch/parisc/kernel/module.c | 64 +++++++++++-------- + arch/parisc/kernel/module.lds | 7 +++ + arch/parisc/kernel/patch.c | 88 +++++++++++++++++++++----- + arch/parisc/kernel/vmlinux.lds.S | 2 + + arch/parisc/mm/fixmap.c | 7 ++- + include/asm-generic/vmlinux.lds.h | 7 +++ + include/linux/compiler_types.h | 2 + + 14 files changed, 358 insertions(+), 60 deletions(-) + create mode 100644 arch/parisc/kernel/module.lds +Merging powerpc/next (a3bf9fbdad60 powerpc/pseries: Fix xive=off command line) +$ git merge powerpc/next +Auto-merging arch/powerpc/sysdev/xive/spapr.c +Auto-merging arch/powerpc/platforms/powernv/opal.c +Auto-merging arch/powerpc/platforms/powernv/npu-dma.c +Auto-merging arch/powerpc/mm/book3s64/radix_pgtable.c +Auto-merging arch/powerpc/mm/book3s64/hash_utils.c +Auto-merging arch/powerpc/mm/book3s64/hash_native.c +Auto-merging arch/powerpc/lib/ldstfp.S +Auto-merging arch/powerpc/kernel/prom_init.c +Auto-merging arch/powerpc/include/asm/opal-api.h +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/opal-api.h | 1 + + arch/powerpc/kernel/prom_init.c | 29 +++++++++++------ + arch/powerpc/lib/Makefile | 3 +- + arch/powerpc/lib/ldstfp.S | 4 --- + arch/powerpc/mm/book3s64/hash_native.c | 2 +- + arch/powerpc/mm/book3s64/hash_utils.c | 2 +- + arch/powerpc/mm/book3s64/radix_pgtable.c | 2 +- + arch/powerpc/platforms/powernv/npu-dma.c | 15 ++++++++- + arch/powerpc/platforms/powernv/opal-hmi.c | 40 ++++++++++++++++++++++++ + arch/powerpc/platforms/powernv/opal.c | 23 +++++++++----- + arch/powerpc/platforms/pseries/dlpar.c | 4 +++ + arch/powerpc/sysdev/xive/spapr.c | 52 ++++++++++++++++++++++++++++++- + drivers/misc/ocxl/pci.c | 2 +- + 13 files changed, 150 insertions(+), 29 deletions(-) +Merging fsl/next (63d86876f324 Revert "powerpc/fsl_pci: simplify fsl_pci_dma_set_mask") +$ git merge fsl/next +Already up to date. +Merging soc-fsl/next (21560067fb1f soc: fsl: qe: fold qe_get_num_of_snums into qe_snums_init) +$ git merge soc-fsl/next +Auto-merging drivers/soc/fsl/qe/qe.c +Auto-merging drivers/soc/fsl/guts.c +Auto-merging drivers/soc/fsl/Makefile +Auto-merging drivers/soc/fsl/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/misc/fsl,dpaa2-console.txt | 11 + + .../devicetree/bindings/soc/fsl/cpm_qe/qe.txt | 13 +- + MAINTAINERS | 1 + + drivers/bus/fsl-mc/dprc.c | 30 +- + drivers/bus/fsl-mc/fsl-mc-bus.c | 15 +- + drivers/bus/fsl-mc/fsl-mc-private.h | 17 +- + drivers/soc/fsl/Kconfig | 10 + + drivers/soc/fsl/Makefile | 1 + + drivers/soc/fsl/dpaa2-console.c | 329 +++++++++++++++++++++ + drivers/soc/fsl/dpio/dpio-driver.c | 23 +- + drivers/soc/fsl/dpio/qbman-portal.c | 148 +++++++-- + drivers/soc/fsl/dpio/qbman-portal.h | 9 +- + drivers/soc/fsl/guts.c | 6 + + drivers/soc/fsl/qbman/bman_portal.c | 20 +- + drivers/soc/fsl/qbman/qman_ccsr.c | 2 +- + drivers/soc/fsl/qbman/qman_portal.c | 21 +- + drivers/soc/fsl/qbman/qman_priv.h | 9 +- + drivers/soc/fsl/qe/qe.c | 163 ++++------ + include/soc/fsl/bman.h | 8 + + include/soc/fsl/qman.h | 9 + + 20 files changed, 695 insertions(+), 150 deletions(-) + create mode 100644 Documentation/devicetree/bindings/misc/fsl,dpaa2-console.txt + create mode 100644 drivers/soc/fsl/dpaa2-console.c +Merging risc-v-pjw/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge risc-v-pjw/for-next +Already up to date. +Merging risc-v/for-next (8fef9900d43f riscv: fix locking violation in page fault handler) +$ git merge risc-v/for-next +Already up to date. +Merging sifive/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge sifive/for-next +Already up to date. +Merging s390/features (753469a23b42 Merge tag 'vfio-ccw-20190603' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/vfio-ccw into features) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 2 +- + arch/s390/include/asm/idals.h | 3 +- + arch/s390/kernel/dis.c | 5 +- + arch/s390/kernel/jump_label.c | 18 ++--- + arch/s390/mm/maccess.c | 9 ++- + arch/s390/mm/mmap.c | 2 - + arch/s390/purgatory/.gitignore | 3 +- + arch/s390/tools/Makefile | 7 +- + arch/s390/tools/opcodes.txt | 51 +++++++++++-- + drivers/s390/block/Kconfig | 2 +- + drivers/s390/char/Kconfig | 15 ++-- + drivers/s390/cio/vfio_ccw_cp.c | 159 +++++++++++++++++++++++++++++----------- + drivers/s390/cio/vfio_ccw_drv.c | 6 +- + drivers/s390/net/Kconfig | 8 +- + 14 files changed, 192 insertions(+), 98 deletions(-) +Merging sh/sh-next (860dbce3d8dd Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux) +$ git merge sh/sh-next +Merge made by the 'recursive' strategy. + arch/sh/boards/Kconfig | 14 +++----------- + 1 file changed, 3 insertions(+), 11 deletions(-) +Merging sparc-next/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge sparc-next/master +Already up to date. +Merging uml/linux-next (1987b1b8f9f1 um: irq: don't set the chip for all irqs) +$ git merge uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (2ba543d3e7db Merge branch 'xtensa-5.2-fixes' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Merge made by the 'recursive' strategy. + arch/xtensa/kernel/setup.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging fscrypt/master (5858bdad4d0d fscrypt: don't set policy for a dead directory) +$ git merge fscrypt/master +Merge made by the 'recursive' strategy. + fs/crypto/bio.c | 73 +++-------- + fs/crypto/crypto.c | 299 ++++++++++++++++++++++++-------------------- + fs/crypto/fscrypt_private.h | 15 +-- + fs/crypto/policy.c | 2 + + fs/ext4/inode.c | 37 +++--- + fs/ext4/page-io.c | 44 ++++--- + fs/f2fs/data.c | 17 ++- + fs/ubifs/crypto.c | 19 +-- + include/linux/fscrypt.h | 96 +++++++++----- + 9 files changed, 321 insertions(+), 281 deletions(-) +Merging btrfs/next (29dcea88779c Linux 4.17) +$ git merge btrfs/next +Already up to date. +Merging btrfs-kdave/for-next (6fc9f4e59957 Merge branch 'for-next-current-v5.1-20190509' into for-next-20190509) +$ git merge btrfs-kdave/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ceph/master (7b2f936fc828 ceph: fix error handling in ceph_get_caps()) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + fs/ceph/caps.c | 34 ++++++----- + fs/ceph/file.c | 2 +- + fs/ceph/inode.c | 155 +++++++++++++++++++++++++++------------------------ + fs/ceph/mds_client.c | 28 ++++++---- + fs/ceph/quota.c | 9 ++- + fs/ceph/snap.c | 16 ++++-- + fs/ceph/super.c | 28 +++------- + fs/ceph/super.h | 19 ++++--- + 8 files changed, 156 insertions(+), 135 deletions(-) +Merging cifs/for-next (28290abeaef1 Add SMB3.1.1 GCM to negotiated crypto algorigthms) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/dfs_cache.c | 2 +- + fs/cifs/smb2pdu.c | 18 +++++++++++++----- + fs/cifs/smb2pdu.h | 2 +- + 3 files changed, 15 insertions(+), 7 deletions(-) +Merging configfs/for-next (f6122ed2a4f9 configfs: Fix use-after-free when accessing sd->s_dentry) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (d43388dea04b eCryptfs: fix permission denied with ecryptfs_xattr mount option when create readonly file) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/keystore.c +Auto-merging fs/ecryptfs/crypto.c +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 29 +++++++++++++++++++++++------ + fs/ecryptfs/keystore.c | 5 +++-- + 2 files changed, 26 insertions(+), 8 deletions(-) +Merging ext3/for_next (3803f4dc265f Merge ext2 bitmap bh leak fix.) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + Documentation/filesystems/ext2.txt | 8 +- + fs/ext2/ialloc.c | 5 +- + fs/ext2/super.c | 17 ++-- + fs/ext2/xattr.c | 161 +++++++++++++++++++++---------------- + fs/notify/fanotify/fanotify_user.c | 22 +++++ + fs/proc/root.c | 2 +- + fs/quota/dquot.c | 11 ++- + include/linux/fs.h | 1 + + 8 files changed, 142 insertions(+), 85 deletions(-) +Merging ext4/dev (a49773064bc2 jbd2: fix typo in comment of journal_submit_inode_data_buffers) +$ git merge ext4/dev +Auto-merging fs/ext4/inode.c +Merge made by the 'recursive' strategy. + fs/ext4/inode.c | 66 +++++++++++++++++++++++++++++-------------------------- + fs/jbd2/commit.c | 2 +- + fs/jbd2/journal.c | 18 +++++++-------- + 3 files changed, 45 insertions(+), 41 deletions(-) +Merging f2fs/dev (f14f319eb1a1 f2fs: add a rw_sem to cover quota flag changes) +$ git merge f2fs/dev +Auto-merging fs/f2fs/data.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 8 +++ + Documentation/filesystems/f2fs.txt | 108 ++++++++++++++++++++++++++++--- + fs/f2fs/checkpoint.c | 58 ++++++----------- + fs/f2fs/data.c | 91 +++++++++++++++++++++++--- + fs/f2fs/dir.c | 4 +- + fs/f2fs/f2fs.h | 29 +++++++-- + fs/f2fs/gc.c | 3 +- + fs/f2fs/node.c | 2 +- + fs/f2fs/segment.c | 75 ++++++++++++++++++++-- + fs/f2fs/super.c | 109 ++++++++++++++++++++++---------- + fs/f2fs/sysfs.c | 16 +++++ + 11 files changed, 398 insertions(+), 105 deletions(-) +Merging fuse/for-next (26eb3bae5003 fuse: extract helper for range writeback) +$ git merge fuse/for-next +Already up to date. +Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (f2c7c76c5d0a Linux 5.2-rc3) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (ba851a39c970 NFSv4.1: Fix bug only first CB_NOTIFY_LOCK is handled) +$ git merge nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (f420eae8f7c9 nfsd: Spelling s/EACCESS/EACCES/) +$ git merge nfsd/nfsd-next +Auto-merging include/linux/fs.h +Merge made by the 'recursive' strategy. + Documentation/filesystems/Locking | 14 --- + fs/lockd/clntproc.c | 21 ++-- + fs/lockd/svc4proc.c | 14 ++- + fs/lockd/svclock.c | 118 ++++++++++++++++---- + fs/lockd/svcproc.c | 14 ++- + fs/lockd/svcsubs.c | 2 +- + fs/lockd/xdr.c | 3 - + fs/lockd/xdr4.c | 3 - + fs/locks.c | 5 - + fs/nfsd/cache.h | 5 +- + fs/nfsd/netns.h | 38 +++++++ + fs/nfsd/nfscache.c | 227 ++++++++++++++++++-------------------- + fs/nfsd/nfsctl.c | 14 ++- + fs/nfsd/vfs.c | 2 +- + include/linux/fs.h | 2 - + include/linux/lockd/lockd.h | 2 + + 16 files changed, 297 insertions(+), 187 deletions(-) +Merging orangefs/for-next (33713cd09ccd orangefs: truncate before updating size) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (5d3211b651a0 ovl: doc: add non-standard corner cases) +$ git merge overlayfs/overlayfs-next +Already up to date. +Merging ubifs/linux-next (c16e73587ad6 ubifs: Don't leak orphans on memory during commit) +$ git merge ubifs/linux-next +Merge made by the 'recursive' strategy. + fs/ubifs/orphan.c | 50 ++++++++++++++++++++++++-------------------------- + fs/ubifs/tnc.c | 16 +++++++++++----- + 2 files changed, 35 insertions(+), 31 deletions(-) +Merging v9fs/9p-next (80a316ff1627 9p/xen: Add cleanup path in p9_trans_xen_init) +$ git merge v9fs/9p-next +Auto-merging net/9p/trans_xen.c +Auto-merging net/9p/trans_virtio.c +Merge made by the 'recursive' strategy. + net/9p/trans_virtio.c | 8 +++++++- + net/9p/trans_xen.c | 8 +++++++- + 2 files changed, 14 insertions(+), 2 deletions(-) +Merging xfs/for-next (025197ebb08a xfs: inode btree scrubber should calculate im_boffset correctly) +$ git merge xfs/for-next +Already up to date. +Merging file-locks/locks-next (945ab8f6de94 locks: wake any locks blocked on request before deadlock check) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (6e14c3cf8bc4 Merge branch 'work.icache' into for-next) +$ git merge vfs/for-next +Auto-merging Documentation/filesystems/porting +CONFLICT (content): Merge conflict in Documentation/filesystems/porting +Resolved 'Documentation/filesystems/porting' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a0abad058dee] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging printk/for-next (967aa2217b6d Merge branch 'for-5.2-fixes' into for-next) +$ git merge printk/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging pci/next (bf593ef5d4c4 Merge branch 'pci/trivial') +$ git merge pci/next +Auto-merging include/linux/pci.h +Auto-merging drivers/pci/pci-driver.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/PCI/{acpi-info.txt => acpi-info.rst} | 15 +- + Documentation/PCI/endpoint/index.rst | 13 + + .../{pci-endpoint-cfs.txt => pci-endpoint-cfs.rst} | 99 +++--- + .../{pci-endpoint.txt => pci-endpoint.rst} | 92 +++--- + ...pci-test-function.txt => pci-test-function.rst} | 84 +++-- + .../{pci-test-howto.txt => pci-test-howto.rst} | 81 +++-- + Documentation/PCI/index.rst | 18 ++ + Documentation/PCI/{MSI-HOWTO.txt => msi-howto.rst} | 85 +++-- + ...i-error-recovery.txt => pci-error-recovery.rst} | 287 +++++++++-------- + .../PCI/{pci-iov-howto.txt => pci-iov-howto.rst} | 161 ++++++---- + Documentation/PCI/{pci.txt => pci.rst} | 356 +++++++++------------ + .../PCI/{pcieaer-howto.txt => pcieaer-howto.rst} | 156 +++++---- + .../PCI/{PCIEBUS-HOWTO.txt => picebus-howto.rst} | 140 ++++---- + .../devicetree/bindings/pci/qcom,pcie.txt | 25 +- + Documentation/index.rst | 1 + + MAINTAINERS | 4 +- + drivers/pci/controller/Kconfig | 4 +- + drivers/pci/controller/dwc/pcie-qcom.c | 115 ++++--- + drivers/pci/controller/pcie-altera-msi.c | 10 + + drivers/pci/controller/pcie-altera.c | 28 +- + drivers/pci/pci-driver.c | 13 +- + include/linux/mod_devicetable.h | 29 +- + include/linux/pci.h | 50 ++- + include/linux/pci_ids.h | 6 +- + tools/pci/pcitest.c | 8 +- + 25 files changed, 1083 insertions(+), 797 deletions(-) + rename Documentation/PCI/{acpi-info.txt => acpi-info.rst} (96%) + create mode 100644 Documentation/PCI/endpoint/index.rst + rename Documentation/PCI/endpoint/{pci-endpoint-cfs.txt => pci-endpoint-cfs.rst} (64%) + rename Documentation/PCI/endpoint/{pci-endpoint.txt => pci-endpoint.rst} (83%) + rename Documentation/PCI/endpoint/{pci-test-function.txt => pci-test-function.rst} (55%) + rename Documentation/PCI/endpoint/{pci-test-howto.txt => pci-test-howto.rst} (78%) + create mode 100644 Documentation/PCI/index.rst + rename Documentation/PCI/{MSI-HOWTO.txt => msi-howto.rst} (88%) + rename Documentation/PCI/{pci-error-recovery.txt => pci-error-recovery.rst} (67%) + rename Documentation/PCI/{pci-iov-howto.txt => pci-iov-howto.rst} (63%) + rename Documentation/PCI/{pci.txt => pci.rst} (68%) + rename Documentation/PCI/{pcieaer-howto.txt => pcieaer-howto.rst} (72%) + rename Documentation/PCI/{PCIEBUS-HOWTO.txt => picebus-howto.rst} (70%) +Merging pstore/for-next/pstore (e070e380c674 Merge branch 'for-linus/pstore' into for-next/pstore) +$ git merge pstore/for-next/pstore +Merge made by the 'recursive' strategy. + fs/pstore/ram.c | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) +Merging hid/for-next (e72e014cd305 Merge branch 'for-5.2/fixes' into for-next) +$ git merge hid/for-next +Auto-merging drivers/hid/wacom_wac.h +Auto-merging drivers/hid/wacom_wac.c +Auto-merging drivers/hid/wacom_sys.c +Auto-merging drivers/hid/hid-rmi.c +Auto-merging drivers/hid/hid-multitouch.c +Auto-merging drivers/hid/hid-lg.c +Auto-merging drivers/hid/hid-ids.h +Auto-merging drivers/hid/hid-core.c +Auto-merging drivers/hid/hid-a4tech.c +Merge made by the 'recursive' strategy. + drivers/hid/hid-a4tech.c | 11 ++-- + drivers/hid/hid-core.c | 16 ++---- + drivers/hid/hid-hyperv.c | 2 + + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-lg.c | 2 - + drivers/hid/hid-logitech-dj.c | 67 ++++++++++++++++-------- + drivers/hid/hid-logitech-hidpp.c | 11 +++- + drivers/hid/hid-multitouch.c | 7 +++ + drivers/hid/hid-rmi.c | 15 +++++- + drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 8 +++ + drivers/hid/wacom_sys.c | 3 ++ + drivers/hid/wacom_wac.c | 90 ++++++++++++++++++++------------ + drivers/hid/wacom_wac.h | 1 + + 13 files changed, 161 insertions(+), 73 deletions(-) +Merging i2c/i2c/for-next (6e2700c656e5 Merge branch 'i2c/for-current' into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + drivers/i2c/busses/Kconfig | 4 +- + drivers/i2c/busses/i2c-bcm-iproc.c | 117 +++++++++++++++++-------------------- + drivers/i2c/busses/i2c-imx.c | 11 +--- + drivers/i2c/busses/i2c-meson.c | 5 +- + 4 files changed, 59 insertions(+), 78 deletions(-) +Merging i3c/i3c/next (5e343fbb7176 dt-bindings: i3c: Document dropped support for I2C 10 bit devices) +$ git merge i3c/i3c/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/i3c/i3c.txt | 4 +++- + drivers/i3c/master.c | 21 ++++++++++++++------- + drivers/i3c/master/dw-i3c-master.c | 6 ------ + drivers/i3c/master/i3c-master-cdns.c | 10 +--------- + include/linux/i3c/master.h | 5 +---- + 5 files changed, 19 insertions(+), 27 deletions(-) +Merging dmi/master (57361846b52b Linux 4.19-rc2) +$ git merge dmi/master +Already up to date. +Merging hwmon-staging/hwmon-next (da4512d2a0ec hwmon: (core) Add comment describing how hwdev is freed in error path) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + Documentation/hwmon/pxe1610 | 90 ++++++++++++++++++++++++++ + drivers/hwmon/hwmon.c | 6 ++ + drivers/hwmon/nct7904.c | 72 ++++++++++++++++++--- + drivers/hwmon/occ/common.c | 6 ++ + drivers/hwmon/pmbus/Kconfig | 18 ++++++ + drivers/hwmon/pmbus/Makefile | 2 + + drivers/hwmon/pmbus/adm1275.c | 59 ++++++++++++++++- + drivers/hwmon/pmbus/irps5401.c | 67 ++++++++++++++++++++ + drivers/hwmon/pmbus/pxe1610.c | 139 +++++++++++++++++++++++++++++++++++++++++ + drivers/hwmon/smsc47m1.c | 2 + + 10 files changed, 451 insertions(+), 10 deletions(-) + create mode 100644 Documentation/hwmon/pxe1610 + create mode 100644 drivers/hwmon/pmbus/irps5401.c + create mode 100644 drivers/hwmon/pmbus/pxe1610.c +Merging jc_docs/docs-next (18e1572419d6 docs: Completely fix the remote build tree case) +$ git merge jc_docs/docs-next +Auto-merging scripts/sphinx-pre-install +Merge made by the 'recursive' strategy. + Documentation/Makefile | 9 ++- + Documentation/admin-guide/kernel-parameters.txt | 5 +- + Documentation/core-api/kernel-api.rst | 2 - + Documentation/doc-guide/sphinx.rst | 17 +++--- + Documentation/driver-api/basics.rst | 3 - + .../driver-api/firmware/other_interfaces.rst | 2 +- + Documentation/driver-api/iio/hw-consumer.rst | 1 - + Documentation/driver-api/target.rst | 4 +- + Documentation/filesystems/api-summary.rst | 3 - + Documentation/interconnect/interconnect.rst | 5 +- + Documentation/sphinx/cdomain.py | 5 +- + Documentation/sphinx/requirements.txt | 4 +- + Documentation/trace/histogram.rst | 10 ++-- + scripts/documentation-file-ref-check | 44 +++++++++++--- + scripts/kernel-doc | 16 +++--- + scripts/sphinx-pre-install | 67 ++++++++++++---------- + 16 files changed, 116 insertions(+), 81 deletions(-) +Merging v4l-dvb/master (edadd68031e5 media: MAINTAINERS: update email address) +$ git merge v4l-dvb/master +Auto-merging include/media/v4l2-mem2mem.h +Auto-merging include/media/v4l2-ctrls.h +Auto-merging include/media/v4l2-common.h +Removing drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c +Auto-merging drivers/media/v4l2-core/v4l2-mem2mem.c +Auto-merging drivers/media/v4l2-core/v4l2-ioctl.c +Auto-merging drivers/media/v4l2-core/v4l2-fwnode.c +Auto-merging drivers/media/v4l2-core/v4l2-dev.c +Auto-merging drivers/media/v4l2-core/v4l2-ctrls.c +Auto-merging drivers/media/usb/zr364xx/zr364xx.c +Auto-merging drivers/media/usb/usbvision/usbvision-video.c +Auto-merging drivers/media/usb/stk1160/stk1160-v4l.c +Auto-merging drivers/media/usb/s2255/s2255drv.c +Auto-merging drivers/media/usb/pwc/pwc.h +Auto-merging drivers/media/usb/pwc/pwc-v4l.c +Auto-merging drivers/media/usb/pwc/pwc-if.c +Auto-merging drivers/media/usb/msi2500/msi2500.c +Auto-merging drivers/media/usb/hackrf/hackrf.c +Auto-merging drivers/media/usb/gspca/gspca.c +Auto-merging drivers/media/usb/go7007/go7007-v4l2.c +Auto-merging drivers/media/usb/dvb-usb-v2/dvbsky.c +Auto-merging drivers/media/usb/cpia2/cpia2_v4l.c +Auto-merging drivers/media/usb/cpia2/cpia2_usb.c +Auto-merging drivers/media/usb/au0828/au0828-video.c +Auto-merging drivers/media/usb/au0828/au0828-core.c +Auto-merging drivers/media/usb/airspy/airspy.c +Auto-merging drivers/media/radio/wl128x/fmdrv_v4l2.c +Auto-merging drivers/media/radio/tea575x.c +Auto-merging drivers/media/radio/si4713/radio-platform-si4713.c +Auto-merging drivers/media/radio/si470x/radio-si470x-usb.c +Auto-merging drivers/media/radio/si470x/radio-si470x-i2c.c +Auto-merging drivers/media/radio/radio-wl1273.c +Auto-merging drivers/media/radio/radio-timb.c +Auto-merging drivers/media/radio/radio-tea5777.c +Auto-merging drivers/media/radio/radio-tea5764.c +Auto-merging drivers/media/radio/radio-mr800.c +Auto-merging drivers/media/radio/radio-ma901.c +Auto-merging drivers/media/radio/radio-keene.c +Auto-merging drivers/media/radio/radio-isa.c +Auto-merging drivers/media/radio/dsbr100.c +Auto-merging drivers/media/platform/vimc/vimc-sensor.c +Auto-merging drivers/media/platform/vimc/vimc-scaler.c +Auto-merging drivers/media/platform/vimc/vimc-debayer.c +Auto-merging drivers/media/platform/vimc/vimc-core.c +Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_enc.c +Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_dec.c +Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc.c +Auto-merging drivers/media/platform/pxa_camera.c +Auto-merging drivers/media/platform/mtk-vpu/mtk_vpu.c +Auto-merging drivers/media/platform/mtk-vcodec/venc_vpu_if.h +CONFLICT (content): Merge conflict in drivers/media/platform/mtk-vcodec/venc_vpu_if.h +Auto-merging drivers/media/platform/mtk-vcodec/venc_vpu_if.c +CONFLICT (content): Merge conflict in drivers/media/platform/mtk-vcodec/venc_vpu_if.c +Auto-merging drivers/media/platform/mtk-vcodec/venc_ipi_msg.h +CONFLICT (content): Merge conflict in drivers/media/platform/mtk-vcodec/venc_ipi_msg.h +Auto-merging drivers/media/platform/mtk-vcodec/venc_drv_if.h +CONFLICT (content): Merge conflict in drivers/media/platform/mtk-vcodec/venc_drv_if.h +Auto-merging drivers/media/platform/mtk-vcodec/venc_drv_if.c +CONFLICT (content): Merge conflict in drivers/media/platform/mtk-vcodec/venc_drv_if.c +Auto-merging drivers/media/platform/mtk-vcodec/venc_drv_base.h +CONFLICT (content): Merge conflict in drivers/media/platform/mtk-vcodec/venc_drv_base.h +Auto-merging drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c +CONFLICT (content): Merge conflict in drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c +Auto-merging drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c +CONFLICT (content): Merge conflict in drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c +Auto-merging drivers/media/platform/mtk-vcodec/vdec_vpu_if.h +CONFLICT (content): Merge conflict in drivers/media/platform/mtk-vcodec/vdec_vpu_if.h +Auto-merging drivers/media/platform/mtk-vcodec/vdec_vpu_if.c +CONFLICT (content): Merge conflict in drivers/media/platform/mtk-vcodec/vdec_vpu_if.c +Auto-merging drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h +CONFLICT (content): Merge conflict in drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h +Auto-merging drivers/media/platform/mtk-vcodec/vdec_drv_if.h +CONFLICT (content): Merge conflict in drivers/media/platform/mtk-vcodec/vdec_drv_if.h +Auto-merging drivers/media/platform/mtk-vcodec/vdec_drv_if.c +CONFLICT (content): Merge conflict in drivers/media/platform/mtk-vcodec/vdec_drv_if.c +Auto-merging drivers/media/platform/mtk-vcodec/vdec_drv_base.h +CONFLICT (content): Merge conflict in drivers/media/platform/mtk-vcodec/vdec_drv_base.h +Auto-merging drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c +CONFLICT (content): Merge conflict in drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c +Auto-merging drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c +CONFLICT (content): Merge conflict in drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c +Auto-merging drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c +CONFLICT (content): Merge conflict in drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c +Auto-merging drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h +CONFLICT (content): Merge conflict in drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h +Auto-merging drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c +CONFLICT (content): Merge conflict in drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c +Auto-merging drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h +CONFLICT (content): Merge conflict in drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h +Auto-merging drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c +CONFLICT (content): Merge conflict in drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c +Auto-merging drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h +CONFLICT (content): Merge conflict in drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h +Auto-merging drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c +CONFLICT (content): Merge conflict in drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c +Auto-merging drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c +CONFLICT (content): Merge conflict in drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c +Auto-merging drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h +CONFLICT (content): Merge conflict in drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h +Auto-merging drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c +CONFLICT (content): Merge conflict in drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c +Auto-merging drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h +CONFLICT (content): Merge conflict in drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h +Auto-merging drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h +CONFLICT (content): Merge conflict in drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h +Auto-merging drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c +CONFLICT (content): Merge conflict in drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c +Auto-merging drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c +CONFLICT (content): Merge conflict in drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c +Auto-merging drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h +CONFLICT (content): Merge conflict in drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h +Auto-merging drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c +CONFLICT (content): Merge conflict in drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c +Auto-merging drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c +Auto-merging drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +Auto-merging drivers/media/platform/exynos4-is/media-dev.c +Auto-merging drivers/media/platform/exynos4-is/fimc-m2m.c +Auto-merging drivers/media/platform/exynos-gsc/gsc-m2m.c +Auto-merging drivers/media/platform/exynos-gsc/gsc-core.c +Auto-merging drivers/media/platform/davinci/vpss.c +Auto-merging drivers/media/platform/coda/coda_regs.h +Auto-merging drivers/media/platform/coda/coda.h +Auto-merging drivers/media/platform/coda/coda-h264.c +Auto-merging drivers/media/platform/coda/coda-common.c +Auto-merging drivers/media/platform/coda/coda-bit.c +Auto-merging drivers/media/pci/saa7164/saa7164-core.c +Auto-merging drivers/media/pci/cx23885/cx23885-dvb.c +Auto-merging drivers/media/mc/mc-device.c +Auto-merging drivers/media/i2c/smiapp/smiapp-quirk.c +Auto-merging drivers/media/i2c/cx25840/cx25840-vbi.c +Auto-merging drivers/media/i2c/cx25840/cx25840-core.h +Auto-merging drivers/media/i2c/cx25840/cx25840-core.c +CONFLICT (content): Merge conflict in drivers/media/i2c/cx25840/cx25840-core.c +Auto-merging drivers/media/dvb-frontends/si2168.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Resolved 'drivers/media/i2c/cx25840/cx25840-core.c' using previous resolution. +Resolved 'drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c' using previous resolution. +Resolved 'drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h' using previous resolution. +Resolved 'drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c' using previous resolution. +Resolved 'drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c' using previous resolution. +Resolved 'drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h' using previous resolution. +Resolved 'drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h' using previous resolution. +Resolved 'drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c' using previous resolution. +Resolved 'drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h' using previous resolution. +Resolved 'drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c' using previous resolution. +Resolved 'drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c' using previous resolution. +Resolved 'drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h' using previous resolution. +Resolved 'drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c' using previous resolution. +Resolved 'drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h' using previous resolution. +Resolved 'drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c' using previous resolution. +Resolved 'drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h' using previous resolution. +Resolved 'drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c' using previous resolution. +Resolved 'drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c' using previous resolution. +Resolved 'drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c' using previous resolution. +Resolved 'drivers/media/platform/mtk-vcodec/vdec_drv_base.h' using previous resolution. +Resolved 'drivers/media/platform/mtk-vcodec/vdec_drv_if.c' using previous resolution. +Resolved 'drivers/media/platform/mtk-vcodec/vdec_drv_if.h' using previous resolution. +Resolved 'drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h' using previous resolution. +Resolved 'drivers/media/platform/mtk-vcodec/vdec_vpu_if.c' using previous resolution. +Resolved 'drivers/media/platform/mtk-vcodec/vdec_vpu_if.h' using previous resolution. +Resolved 'drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c' using previous resolution. +Resolved 'drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c' using previous resolution. +Resolved 'drivers/media/platform/mtk-vcodec/venc_drv_base.h' using previous resolution. +Resolved 'drivers/media/platform/mtk-vcodec/venc_drv_if.c' using previous resolution. +Resolved 'drivers/media/platform/mtk-vcodec/venc_drv_if.h' using previous resolution. +Resolved 'drivers/media/platform/mtk-vcodec/venc_ipi_msg.h' using previous resolution. +Resolved 'drivers/media/platform/mtk-vcodec/venc_vpu_if.c' using previous resolution. +Resolved 'drivers/media/platform/mtk-vcodec/venc_vpu_if.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1e29a39cb09c] Merge remote-tracking branch 'v4l-dvb/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/debugfs-cec-error-inj | 2 +- + .../devicetree/bindings/media/allegro.txt | 43 + + .../bindings/media/marvell,mmp2-ccic.txt | 50 + + .../devicetree/bindings/media/sun6i-csi.txt | 1 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/media/kapi/dtv-core.rst | 6 +- + Documentation/media/uapi/cec/cec-api.rst | 2 +- + Documentation/media/uapi/cec/cec-ioc-g-mode.rst | 3 +- + Documentation/media/uapi/cec/cec-ioc-receive.rst | 15 +- + .../media/uapi/mediactl/media-ioc-enum-links.rst | 7 +- + Documentation/media/uapi/v4l/biblio.rst | 9 + + Documentation/media/uapi/v4l/ext-ctrls-codec.rst | 625 ++++ + Documentation/media/uapi/v4l/field-order.rst | 17 +- + Documentation/media/uapi/v4l/pixfmt-compressed.rst | 25 + + .../media/uapi/v4l/pixfmt-v4l2-mplane.rst | 15 +- + Documentation/media/uapi/v4l/pixfmt-v4l2.rst | 13 +- + Documentation/media/uapi/v4l/vidioc-queryctrl.rst | 30 + + Documentation/media/videodev2.h.rst.exceptions | 5 + + MAINTAINERS | 27 +- + drivers/media/Kconfig | 37 +- + drivers/media/Makefile | 13 +- + drivers/media/cec/cec-adap.c | 112 +- + drivers/media/cec/cec-api.c | 8 - + drivers/media/cec/cec-core.c | 3 +- + drivers/media/cec/cec-priv.h | 5 + + drivers/media/common/videobuf2/videobuf2-core.c | 5 + + .../media/common/videobuf2/videobuf2-dma-contig.c | 3 +- + drivers/media/common/videobuf2/videobuf2-dma-sg.c | 5 +- + drivers/media/common/videobuf2/videobuf2-memops.c | 9 +- + drivers/media/common/videobuf2/videobuf2-v4l2.c | 10 +- + drivers/media/common/videobuf2/videobuf2-vmalloc.c | 3 +- + drivers/media/dvb-core/Kconfig | 3 - + drivers/media/dvb-frontends/Kconfig | 3 +- + drivers/media/dvb-frontends/rtl2832_sdr.c | 5 +- + drivers/media/dvb-frontends/si2168.c | 7 +- + drivers/media/i2c/Kconfig | 4 +- + drivers/media/i2c/cx25840/cx25840-core.c | 1410 ++++++--- + drivers/media/i2c/cx25840/cx25840-core.h | 30 +- + drivers/media/i2c/cx25840/cx25840-vbi.c | 4 + + drivers/media/i2c/ov7740.c | 24 +- + drivers/media/i2c/ov8856.c | 12 +- + drivers/media/i2c/smiapp/smiapp-quirk.c | 2 +- + drivers/media/mc/Kconfig | 33 + + drivers/media/mc/Makefile | 10 + + .../mc-dev-allocator.c} | 0 + drivers/media/{media-device.c => mc/mc-device.c} | 10 +- + drivers/media/{media-devnode.c => mc/mc-devnode.c} | 0 + drivers/media/{media-entity.c => mc/mc-entity.c} | 0 + drivers/media/{media-request.c => mc/mc-request.c} | 0 + drivers/media/pci/cx23885/cx23885-dvb.c | 2 - + drivers/media/pci/ddbridge/Kconfig | 1 - + drivers/media/pci/dt3155/Kconfig | 1 - + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 2 +- + drivers/media/pci/ivtv/Kconfig | 2 - + drivers/media/pci/saa7164/saa7164-core.c | 33 +- + drivers/media/platform/Kconfig | 12 - + drivers/media/platform/aspeed-video.c | 128 +- + drivers/media/platform/atmel/atmel-isc-regs.h | 6 +- + drivers/media/platform/atmel/atmel-isc.c | 263 +- + drivers/media/platform/cec-gpio/cec-gpio.c | 28 +- + drivers/media/platform/coda/Makefile | 3 +- + drivers/media/platform/coda/coda-bit.c | 75 +- + drivers/media/platform/coda/coda-common.c | 148 +- + drivers/media/platform/coda/coda-h264.c | 3 +- + drivers/media/platform/coda/coda-mpeg2.c | 44 + + drivers/media/platform/coda/coda-mpeg4.c | 49 + + drivers/media/platform/coda/coda.h | 14 + + drivers/media/platform/coda/coda_regs.h | 2 +- + drivers/media/platform/coda/trace.h | 2 +- + drivers/media/platform/davinci/vpss.c | 7 +- + drivers/media/platform/exynos-gsc/gsc-core.c | 2 +- + drivers/media/platform/exynos-gsc/gsc-core.h | 2 +- + drivers/media/platform/exynos-gsc/gsc-m2m.c | 14 +- + drivers/media/platform/exynos4-is/common.c | 5 +- + drivers/media/platform/exynos4-is/common.h | 3 +- + drivers/media/platform/exynos4-is/fimc-capture.c | 10 +- + drivers/media/platform/exynos4-is/fimc-isp-video.c | 9 +- + drivers/media/platform/exynos4-is/fimc-lite.c | 10 +- + drivers/media/platform/exynos4-is/fimc-m2m.c | 12 +- + drivers/media/platform/exynos4-is/media-dev.c | 6 +- + drivers/media/platform/marvell-ccic/mcam-core.c | 11 +- + drivers/media/platform/meson/ao-cec-g12a.c | 21 +- + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 4 +- + drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 18 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 49 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h | 7 +- + .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 7 +- + .../media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 8 +- + .../media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h | 6 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 9 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 38 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h | 7 +- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 7 +- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 6 +- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h | 6 +- + .../media/platform/mtk-vcodec/mtk_vcodec_intr.c | 6 +- + .../media/platform/mtk-vcodec/mtk_vcodec_intr.h | 6 +- + .../media/platform/mtk-vcodec/mtk_vcodec_util.c | 7 +- + .../media/platform/mtk-vcodec/mtk_vcodec_util.h | 7 +- + .../media/platform/mtk-vcodec/vdec/vdec_h264_if.c | 6 +- + .../media/platform/mtk-vcodec/vdec/vdec_vp8_if.c | 7 +- + .../media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 8 +- + drivers/media/platform/mtk-vcodec/vdec_drv_base.h | 6 +- + drivers/media/platform/mtk-vcodec/vdec_drv_if.c | 7 +- + drivers/media/platform/mtk-vcodec/vdec_drv_if.h | 7 +- + drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h | 6 +- + drivers/media/platform/mtk-vcodec/vdec_vpu_if.c | 6 +- + drivers/media/platform/mtk-vcodec/vdec_vpu_if.h | 6 +- + .../media/platform/mtk-vcodec/venc/venc_h264_if.c | 8 +- + .../media/platform/mtk-vcodec/venc/venc_vp8_if.c | 7 +- + drivers/media/platform/mtk-vcodec/venc_drv_base.h | 8 +- + drivers/media/platform/mtk-vcodec/venc_drv_if.c | 8 +- + drivers/media/platform/mtk-vcodec/venc_drv_if.h | 8 +- + drivers/media/platform/mtk-vcodec/venc_ipi_msg.h | 8 +- + drivers/media/platform/mtk-vcodec/venc_vpu_if.c | 6 +- + drivers/media/platform/mtk-vcodec/venc_vpu_if.h | 6 +- + drivers/media/platform/mtk-vpu/mtk_vpu.c | 2 +- + drivers/media/platform/omap/Kconfig | 1 - + drivers/media/platform/omap3isp/isp.c | 18 +- + drivers/media/platform/omap3isp/isph3a_aewb.c | 24 +- + drivers/media/platform/omap3isp/isph3a_af.c | 24 +- + drivers/media/platform/omap3isp/isphist.c | 11 +- + drivers/media/platform/omap3isp/ispstat.c | 4 +- + drivers/media/platform/omap3isp/ispvideo.c | 3 +- + drivers/media/platform/pxa_camera.c | 2 +- + drivers/media/platform/qcom/camss/camss-video.c | 2 +- + drivers/media/platform/qcom/venus/core.c | 4 +- + drivers/media/platform/qcom/venus/firmware.c | 6 +- + drivers/media/platform/qcom/venus/helpers.c | 7 + + drivers/media/platform/qcom/venus/hfi_cmds.c | 2 + + drivers/media/platform/qcom/venus/vdec.c | 4 +- + drivers/media/platform/qcom/venus/vdec_ctrls.c | 2 +- + drivers/media/platform/qcom/venus/venc.c | 4 +- + drivers/media/platform/qcom/venus/venc_ctrls.c | 23 +- + drivers/media/platform/rcar-vin/rcar-csi2.c | 4 +- + drivers/media/platform/rcar_fdp1.c | 4 +- + drivers/media/platform/rcar_jpu.c | 10 +- + drivers/media/platform/renesas-ceu.c | 2 +- + drivers/media/platform/s5p-mfc/s5p_mfc.c | 2 + + drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 19 +- + drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 21 +- + drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 4 +- + drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 8 +- + .../media/platform/sti/c8sectpfe/c8sectpfe-dvb.c | 4 +- + drivers/media/platform/stm32/stm32-dcmi.c | 2 +- + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 1 + + drivers/media/platform/ti-vpe/vpe.c | 7 +- + drivers/media/platform/vicodec/Kconfig | 1 - + drivers/media/platform/vicodec/vicodec-core.c | 60 +- + drivers/media/platform/vim2m.c | 6 +- + drivers/media/platform/vimc/Kconfig | 1 - + drivers/media/platform/vimc/vimc-core.c | 7 +- + drivers/media/platform/vimc/vimc-debayer.c | 5 +- + drivers/media/platform/vimc/vimc-scaler.c | 7 +- + drivers/media/platform/vimc/vimc-sensor.c | 7 +- + drivers/media/platform/vivid/Kconfig | 1 - + drivers/media/platform/vivid/vivid-core.c | 6 +- + drivers/media/platform/vivid/vivid-osd.c | 2 +- + drivers/media/platform/vivid/vivid-vid-common.c | 20 - + drivers/media/platform/vivid/vivid-vid-common.h | 2 - + drivers/media/radio/Kconfig | 1 - + drivers/media/radio/dsbr100.c | 3 +- + drivers/media/radio/radio-cadet.c | 5 +- + drivers/media/radio/radio-isa.c | 4 +- + drivers/media/radio/radio-keene.c | 3 +- + drivers/media/radio/radio-ma901.c | 3 +- + drivers/media/radio/radio-miropcm20.c | 4 +- + drivers/media/radio/radio-mr800.c | 5 +- + drivers/media/radio/radio-raremono.c | 3 +- + drivers/media/radio/radio-sf16fmi.c | 3 +- + drivers/media/radio/radio-si476x.c | 21 +- + drivers/media/radio/radio-tea5764.c | 3 +- + drivers/media/radio/radio-tea5777.c | 5 +- + drivers/media/radio/radio-timb.c | 3 +- + drivers/media/radio/radio-wl1273.c | 12 +- + drivers/media/radio/si470x/radio-si470x-i2c.c | 7 +- + drivers/media/radio/si470x/radio-si470x-usb.c | 6 +- + drivers/media/radio/si4713/radio-platform-si4713.c | 4 +- + drivers/media/radio/si4713/radio-usb-si4713.c | 4 +- + drivers/media/radio/tea575x.c | 7 +- + drivers/media/radio/wl128x/fmdrv_v4l2.c | 13 +- + drivers/media/rc/ir-spi.c | 1 + + drivers/media/rc/meson-ir.c | 8 +- + drivers/media/rc/rc-main.c | 6 +- + drivers/media/spi/Kconfig | 2 +- + drivers/media/tuners/Kconfig | 2 +- + drivers/media/usb/airspy/airspy.c | 6 +- + drivers/media/usb/au0828/au0828-core.c | 12 +- + drivers/media/usb/au0828/au0828-video.c | 21 +- + drivers/media/usb/cpia2/cpia2_usb.c | 3 +- + drivers/media/usb/cpia2/cpia2_v4l.c | 9 +- + drivers/media/usb/cx231xx/cx231xx-dvb.c | 1 + + drivers/media/usb/cx231xx/cx231xx-video.c | 28 +- + drivers/media/usb/dvb-usb-v2/af9035.c | 2 - + drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c | 15 +- + drivers/media/usb/dvb-usb-v2/dvbsky.c | 11 - + drivers/media/usb/dvb-usb/Kconfig | 16 +- + drivers/media/usb/dvb-usb/Makefile | 3 + + drivers/media/usb/dvb-usb/cxusb-analog.c | 1845 ++++++++++++ + drivers/media/usb/dvb-usb/cxusb.c | 796 +++-- + drivers/media/usb/dvb-usb/cxusb.h | 158 +- + drivers/media/usb/dvb-usb/dvb-usb-dvb.c | 5 +- + drivers/media/usb/dvb-usb/dvb-usb-init.c | 20 +- + drivers/media/usb/dvb-usb/dvb-usb.h | 10 + + drivers/media/usb/em28xx/em28xx-input.c | 35 +- + drivers/media/usb/em28xx/em28xx-video.c | 32 +- + drivers/media/usb/go7007/go7007-v4l2.c | 15 +- + drivers/media/usb/gspca/gspca.c | 6 +- + drivers/media/usb/hackrf/hackrf.c | 14 +- + drivers/media/usb/hdpvr/hdpvr-video.c | 5 +- + drivers/media/usb/msi2500/msi2500.c | 5 +- + drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 4 +- + drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c | 6 +- + drivers/media/usb/pvrusb2/pvrusb2-std.c | 2 +- + drivers/media/usb/pvrusb2/pvrusb2-sysfs.c | 3 +- + drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 17 +- + drivers/media/usb/pwc/pwc-if.c | 2 + + drivers/media/usb/pwc/pwc-v4l.c | 3 - + drivers/media/usb/pwc/pwc.h | 18 +- + drivers/media/usb/s2255/Kconfig | 1 - + drivers/media/usb/s2255/s2255drv.c | 5 +- + drivers/media/usb/stk1160/stk1160-v4l.c | 7 +- + drivers/media/usb/stkwebcam/stk-webcam.c | 6 +- + drivers/media/usb/tm6000/tm6000-video.c | 20 +- + drivers/media/usb/usbtv/usbtv-video.c | 5 +- + drivers/media/usb/usbvision/usbvision-video.c | 20 +- + drivers/media/usb/zr364xx/zr364xx.c | 10 +- + drivers/media/v4l2-core/Kconfig | 2 - + drivers/media/v4l2-core/v4l2-common.c | 32 +- + drivers/media/v4l2-core/v4l2-ctrls.c | 104 +- + drivers/media/v4l2-core/v4l2-dev.c | 2 - + drivers/media/v4l2-core/v4l2-fwnode.c | 8 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 22 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 29 + + drivers/media/v4l2-core/videobuf-dma-contig.c | 4 +- + drivers/staging/media/Kconfig | 2 + + drivers/staging/media/Makefile | 1 + + drivers/staging/media/allegro-dvt/Kconfig | 16 + + drivers/staging/media/allegro-dvt/Makefile | 5 + + drivers/staging/media/allegro-dvt/TODO | 4 + + drivers/staging/media/allegro-dvt/allegro-core.c | 3032 ++++++++++++++++++++ + drivers/staging/media/allegro-dvt/nal-h264.c | 1001 +++++++ + drivers/staging/media/allegro-dvt/nal-h264.h | 208 ++ + drivers/staging/media/bcm2048/radio-bcm2048.c | 7 +- + drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 10 +- + drivers/staging/media/davinci_vpfe/dm365_isif.c | 8 +- + .../staging/media/davinci_vpfe/vpfe_mc_capture.c | 8 +- + drivers/staging/media/davinci_vpfe/vpfe_video.c | 12 +- + drivers/staging/media/imx/Kconfig | 2 +- + drivers/staging/media/imx/Makefile | 18 +- + drivers/staging/media/imx/imx-ic-common.c | 68 +- + drivers/staging/media/imx/imx-ic-prp.c | 36 +- + drivers/staging/media/imx/imx-ic-prpencvf.c | 90 +- + drivers/staging/media/imx/imx-ic.h | 6 +- + drivers/staging/media/imx/imx-media-capture.c | 97 +- + drivers/staging/media/imx/imx-media-csi.c | 51 +- + drivers/staging/media/imx/imx-media-dev-common.c | 346 ++- + drivers/staging/media/imx/imx-media-dev.c | 449 +-- + drivers/staging/media/imx/imx-media-fim.c | 9 - + drivers/staging/media/imx/imx-media-internal-sd.c | 357 +-- + drivers/staging/media/imx/imx-media-of.c | 41 +- + drivers/staging/media/imx/imx-media-utils.c | 170 +- + drivers/staging/media/imx/imx-media-vdic.c | 84 +- + drivers/staging/media/imx/imx-media.h | 116 +- + drivers/staging/media/imx/imx7-media-csi.c | 161 +- + drivers/staging/media/imx/imx7-mipi-csis.c | 41 +- + drivers/staging/media/ipu3/include/intel-ipu3.h | 2 +- + drivers/staging/media/ipu3/ipu3-css-fw.c | 6 +- + drivers/staging/media/ipu3/ipu3-css.c | 14 +- + drivers/staging/media/ipu3/ipu3-dmamap.c | 15 +- + drivers/staging/media/ipu3/ipu3-mmu.c | 125 +- + drivers/staging/media/ipu3/ipu3-mmu.h | 5 +- + drivers/staging/media/ipu3/ipu3-v4l2.c | 4 +- + drivers/staging/media/omap4iss/iss_video.c | 11 +- + drivers/staging/media/rockchip/vpu/Kconfig | 1 + + drivers/staging/media/rockchip/vpu/Makefile | 7 +- + drivers/staging/media/rockchip/vpu/rk3288_vpu_hw.c | 61 +- + .../media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c | 6 +- + .../media/rockchip/vpu/rk3288_vpu_hw_mpeg2_dec.c | 261 ++ + .../staging/media/rockchip/vpu/rk3288_vpu_regs.h | 1 + + drivers/staging/media/rockchip/vpu/rk3399_vpu_hw.c | 61 +- + .../media/rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c | 12 +- + .../media/rockchip/vpu/rk3399_vpu_hw_mpeg2_dec.c | 267 ++ + drivers/staging/media/rockchip/vpu/rockchip_vpu.h | 122 +- + .../staging/media/rockchip/vpu/rockchip_vpu_drv.c | 473 ++- + .../staging/media/rockchip/vpu/rockchip_vpu_enc.c | 671 ----- + .../staging/media/rockchip/vpu/rockchip_vpu_hw.h | 44 + + .../staging/media/rockchip/vpu/rockchip_vpu_jpeg.c | 29 + + .../media/rockchip/vpu/rockchip_vpu_mpeg2.c | 61 + + .../staging/media/rockchip/vpu/rockchip_vpu_v4l2.c | 692 +++++ + .../{rockchip_vpu_common.h => rockchip_vpu_v4l2.h} | 15 +- + drivers/staging/media/sunxi/cedrus/Makefile | 3 +- + drivers/staging/media/sunxi/cedrus/cedrus.c | 42 +- + drivers/staging/media/sunxi/cedrus/cedrus.h | 39 +- + drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 13 + + drivers/staging/media/sunxi/cedrus/cedrus_h264.c | 576 ++++ + drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 6 +- + drivers/staging/media/sunxi/cedrus/cedrus_hw.h | 2 - + drivers/staging/media/sunxi/cedrus/cedrus_regs.h | 91 + + drivers/staging/media/sunxi/cedrus/cedrus_video.c | 9 + + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 6 +- + drivers/usb/gadget/function/f_uvc.c | 1 + + drivers/usb/gadget/function/uvc_v4l2.c | 4 - + include/media/drv-intf/cx25840.h | 138 +- + include/media/dvbdev.h | 4 +- + include/media/h264-ctrls.h | 197 ++ + include/media/v4l2-common.h | 10 +- + include/media/v4l2-ctrls.h | 13 +- + include/media/v4l2-ioctl.h | 14 +- + include/media/v4l2-mem2mem.h | 4 + + include/media/videobuf2-core.h | 3 +- + include/media/videobuf2-memops.h | 3 +- + include/uapi/linux/cec.h | 1 + + include/uapi/linux/dvb/audio.h | 6 +- + include/uapi/linux/dvb/osd.h | 174 +- + include/uapi/linux/dvb/video.h | 4 +- + include/uapi/linux/v4l2-controls.h | 23 + + samples/v4l/v4l2-pci-skeleton.c | 1 + + 318 files changed, 14621 insertions(+), 4000 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/allegro.txt + create mode 100644 Documentation/devicetree/bindings/media/marvell,mmp2-ccic.txt + create mode 100644 drivers/media/mc/Kconfig + create mode 100644 drivers/media/mc/Makefile + rename drivers/media/{media-dev-allocator.c => mc/mc-dev-allocator.c} (100%) + rename drivers/media/{media-device.c => mc/mc-device.c} (99%) + rename drivers/media/{media-devnode.c => mc/mc-devnode.c} (100%) + rename drivers/media/{media-entity.c => mc/mc-entity.c} (100%) + rename drivers/media/{media-request.c => mc/mc-request.c} (100%) + create mode 100644 drivers/media/platform/coda/coda-mpeg2.c + create mode 100644 drivers/media/platform/coda/coda-mpeg4.c + create mode 100644 drivers/media/usb/dvb-usb/cxusb-analog.c + create mode 100644 drivers/staging/media/allegro-dvt/Kconfig + create mode 100644 drivers/staging/media/allegro-dvt/Makefile + create mode 100644 drivers/staging/media/allegro-dvt/TODO + create mode 100644 drivers/staging/media/allegro-dvt/allegro-core.c + create mode 100644 drivers/staging/media/allegro-dvt/nal-h264.c + create mode 100644 drivers/staging/media/allegro-dvt/nal-h264.h + create mode 100644 drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_mpeg2_dec.c + create mode 100644 drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_mpeg2_dec.c + delete mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c + create mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_mpeg2.c + create mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_v4l2.c + rename drivers/staging/media/rockchip/vpu/{rockchip_vpu_common.h => rockchip_vpu_v4l2.h} (50%) + create mode 100644 drivers/staging/media/sunxi/cedrus/cedrus_h264.c + create mode 100644 include/media/h264-ctrls.h +Merging v4l-dvb-next/master (a188339ca5a3 Linux 5.2-rc1) +$ git merge v4l-dvb-next/master +Already up to date. +Merging fbdev/fbdev-for-next (73ee89436047 Merge tag 'v5.2-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next) +$ git merge fbdev/fbdev-for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging pm/linux-next (b4e3258c27cd Merge branch 'devprop' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + arch/x86/kernel/cpu/Makefile | 5 +- + arch/x86/kernel/cpu/intel_epb.c | 22 +- + arch/x86/power/cpu.c | 10 + + arch/x86/power/hibernate.c | 33 ++ + drivers/acpi/acpi_lpit.c | 7 +- + drivers/acpi/property.c | 26 +- + drivers/base/core.c | 28 + + drivers/base/devcon.c | 26 + + drivers/base/power/clock_ops.c | 6 +- + drivers/base/property.c | 24 + + drivers/base/swnode.c | 324 +++++++++--- + drivers/platform/x86/intel_cht_int33fe.c | 291 +++++++++-- + drivers/usb/roles/class.c | 2 +- + drivers/usb/typec/bus.h | 15 + + drivers/usb/typec/class.c | 17 +- + drivers/usb/typec/mux.c | 238 ++++++--- + drivers/usb/typec/mux/pi3usb30532.c | 46 +- + include/linux/cpu.h | 4 + + include/linux/device.h | 2 + + include/linux/property.h | 51 ++ + include/linux/suspend.h | 31 ++ + include/linux/usb/typec_mux.h | 62 +-- + kernel/cpu.c | 4 +- + kernel/power/hibernate.c | 9 + + kernel/power/suspend.c | 6 + + tools/power/acpi/.gitignore | 8 +- + tools/power/pm-graph/README | 552 ++++++++++++++++++++ + tools/power/pm-graph/bootgraph.py | 8 +- + tools/power/pm-graph/config/example.cfg | 26 + + tools/power/pm-graph/sleepgraph.8 | 16 +- + tools/power/pm-graph/sleepgraph.py | 857 +++++++++++++++++++++++-------- + 31 files changed, 2265 insertions(+), 491 deletions(-) + create mode 100644 tools/power/pm-graph/README +Merging cpufreq-arm/cpufreq/arm/linux-next (e6abacabb5ac cpufreq: Switch imx7d to imx-cpufreq-dt for speed grading) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Auto-merging drivers/soc/imx/soc-imx8.c +Auto-merging drivers/cpufreq/Kconfig.arm +Merge made by the 'recursive' strategy. + .../devicetree/bindings/cpufreq/imx-cpufreq-dt.txt | 37 +++++++++ + drivers/cpufreq/Kconfig.arm | 9 ++ + drivers/cpufreq/Makefile | 1 + + drivers/cpufreq/armada-37xx-cpufreq.c | 4 +- + drivers/cpufreq/brcmstb-avs-cpufreq.c | 12 +-- + drivers/cpufreq/cpufreq-dt-platdev.c | 5 +- + drivers/cpufreq/imx-cpufreq-dt.c | 97 ++++++++++++++++++++++ + drivers/soc/imx/soc-imx8.c | 3 + + 8 files changed, 158 insertions(+), 10 deletions(-) + create mode 100644 Documentation/devicetree/bindings/cpufreq/imx-cpufreq-dt.txt + create mode 100644 drivers/cpufreq/imx-cpufreq-dt.c +Merging cpupower/cpupower (04507c0a9385 cpupower : frequency-set -r option misses the last cpu in related cpu list) +$ git merge cpupower/cpupower +Merge made by the 'recursive' strategy. + tools/power/cpupower/man/cpupower-monitor.1 | 2 +- + tools/power/cpupower/po/cs.po | 2 +- + tools/power/cpupower/po/de.po | 2 +- + tools/power/cpupower/po/fr.po | 2 +- + tools/power/cpupower/po/it.po | 2 +- + tools/power/cpupower/po/pt.po | 2 +- + tools/power/cpupower/utils/cpufreq-set.c | 2 ++ + 7 files changed, 8 insertions(+), 6 deletions(-) +Merging opp/opp/linux-next (c0ab9e0812da opp: Allocate genpd_virt_devs from dev_pm_opp_attach_genpd()) +$ git merge opp/opp/linux-next +Merge made by the 'recursive' strategy. + drivers/opp/core.c | 138 ++++++++++++++++++++++++++++++++----------------- + drivers/opp/of.c | 30 +---------- + include/linux/pm_opp.h | 8 +-- + 3 files changed, 98 insertions(+), 78 deletions(-) +Merging thermal/next (6df24c3e81b9 Merge branches 'thermal-core', 'thermal-built-it' and 'thermal-intel' into next) +$ git merge thermal/next +Already up to date. +Merging thermal-soc/next (4cb9f043447e thermal: thermal_mmio: remove some dead code) +$ git merge thermal-soc/next +Merge made by the 'recursive' strategy. + drivers/thermal/thermal_mmio.c | 7 ------- + 1 file changed, 7 deletions(-) +Merging ieee1394/for-next (812cd88749e0 firewire: mark expected switch fall-throughs) +$ git merge ieee1394/for-next +Auto-merging drivers/firewire/core-topology.c +Auto-merging drivers/firewire/core-iso.c +Auto-merging drivers/firewire/core-device.c +Merge made by the 'recursive' strategy. +Merging dlm/next (54cca4bad076 dlm: allow binding to all network interfaces) +$ git merge dlm/next +Auto-merging fs/dlm/lowcomms.h +Auto-merging fs/dlm/lowcomms.c +Auto-merging fs/dlm/lockspace.c +Auto-merging fs/dlm/config.h +Auto-merging fs/dlm/config.c +Merge made by the 'recursive' strategy. + fs/dlm/config.c | 42 ++++++++++++++++++++++++ + fs/dlm/config.h | 3 +- + fs/dlm/lockspace.c | 6 ++-- + fs/dlm/lowcomms.c | 95 +++++++++++++++++++++++++++++++++++++++++++----------- + fs/dlm/lowcomms.h | 1 + + 5 files changed, 125 insertions(+), 22 deletions(-) +Merging swiotlb/linux-next (4e7372e0dc5d xen/swiotlb: don't initialize swiotlb twice on arm64) +$ git merge swiotlb/linux-next +Auto-merging drivers/xen/swiotlb-xen.c +Merge made by the 'recursive' strategy. + drivers/xen/swiotlb-xen.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) +Merging rdma/for-next (97545b10221a RDMA/hns: Bugfix for posting multiple srq work request) +$ git merge rdma/for-next +Auto-merging include/rdma/ib_verbs.h +Auto-merging drivers/infiniband/ulp/isert/ib_isert.c +Auto-merging drivers/infiniband/sw/rdmavt/qp.c +Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v1.c +Auto-merging drivers/infiniband/hw/efa/efa_verbs.c +Auto-merging drivers/infiniband/core/device.c +Merge made by the 'recursive' strategy. + drivers/infiniband/core/cq.c | 4 +- + drivers/infiniband/core/device.c | 9 +-- + drivers/infiniband/core/rw.c | 7 +- + drivers/infiniband/core/umem.c | 10 +-- + drivers/infiniband/core/umem_odp.c | 89 +++++++++++------------ + drivers/infiniband/core/uverbs_uapi.c | 2 + + drivers/infiniband/core/verbs.c | 4 +- + drivers/infiniband/hw/cxgb3/cxio_hal.c | 24 ++----- + drivers/infiniband/hw/cxgb3/cxio_hal.h | 1 - + drivers/infiniband/hw/cxgb3/iwch_cm.c | 2 +- + drivers/infiniband/hw/cxgb3/iwch_provider.c | 105 +++++----------------------- + drivers/infiniband/hw/cxgb4/cm.c | 21 +++--- + drivers/infiniband/hw/cxgb4/cq.c | 14 ++-- + drivers/infiniband/hw/cxgb4/device.c | 9 ++- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 4 +- + drivers/infiniband/hw/cxgb4/mem.c | 5 +- + drivers/infiniband/hw/cxgb4/provider.c | 1 - + drivers/infiniband/hw/cxgb4/qp.c | 94 +++++++++++-------------- + drivers/infiniband/hw/cxgb4/resource.c | 16 ++--- + drivers/infiniband/hw/efa/efa.h | 2 - + drivers/infiniband/hw/efa/efa_com.c | 74 +------------------- + drivers/infiniband/hw/efa/efa_com.h | 1 - + drivers/infiniband/hw/efa/efa_com_cmd.c | 1 - + drivers/infiniband/hw/efa/efa_verbs.c | 95 +++++++++---------------- + drivers/infiniband/hw/hfi1/mad.c | 9 +-- + drivers/infiniband/hw/hfi1/pio.c | 3 +- + drivers/infiniband/hw/hfi1/tid_rdma.c | 5 +- + drivers/infiniband/hw/hfi1/user_pages.c | 11 ++- + drivers/infiniband/hw/hns/hns_roce_cq.c | 3 +- + drivers/infiniband/hw/hns/hns_roce_db.c | 8 ++- + drivers/infiniband/hw/hns/hns_roce_device.h | 39 +++++++++-- + drivers/infiniband/hw/hns/hns_roce_hem.c | 39 ++++++----- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 26 ++++--- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 98 ++++++++++++++------------ + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 6 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 17 ++--- + drivers/infiniband/hw/hns/hns_roce_mr.c | 43 +++++++----- + drivers/infiniband/hw/hns/hns_roce_srq.c | 25 ++----- + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 8 --- + drivers/infiniband/hw/mlx4/mr.c | 16 ++--- + drivers/infiniband/hw/mlx4/srq.c | 2 +- + drivers/infiniband/hw/mlx5/mem.c | 20 +++--- + drivers/infiniband/hw/mlx5/mr.c | 5 +- + drivers/infiniband/hw/mlx5/odp.c | 23 +++--- + drivers/infiniband/hw/mthca/mthca_memfree.c | 6 +- + drivers/infiniband/hw/nes/nes_utils.c | 1 - + drivers/infiniband/hw/nes/nes_verbs.c | 15 ++-- + drivers/infiniband/hw/qedr/verbs.c | 25 +++---- + drivers/infiniband/hw/qib/qib_user_pages.c | 11 ++- + drivers/infiniband/hw/qib/qib_user_sdma.c | 11 +-- + drivers/infiniband/hw/usnic/usnic_uiom.c | 7 +- + drivers/infiniband/sw/rdmavt/qp.c | 4 +- + drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 7 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 9 +-- + drivers/infiniband/ulp/iser/iser_memory.c | 11 ++- + drivers/infiniband/ulp/isert/ib_isert.c | 11 ++- + include/rdma/ib_umem.h | 19 ++--- + include/rdma/ib_umem_odp.h | 20 ++++++ + include/rdma/ib_verbs.h | 4 +- + net/rds/ib_cm.c | 8 +-- + 60 files changed, 475 insertions(+), 694 deletions(-) +Merging net-next/master (96524ea4be04 Merge branch 'Xilinx-axienet-driver-updates') +$ git merge net-next/master +Auto-merging tools/testing/selftests/bpf/test_verifier.c +Auto-merging tools/testing/selftests/bpf/Makefile +CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/Makefile +Auto-merging tools/lib/bpf/libbpf_internal.h +Auto-merging tools/lib/bpf/libbpf.c +Auto-merging samples/bpf/bpf_load.c +Auto-merging net/tls/tls_device.c +Auto-merging net/socket.c +Auto-merging net/sctp/offload.c +Auto-merging net/rds/ib.c +Auto-merging net/netfilter/nf_conntrack_broadcast.c +Auto-merging net/netfilter/ipvs/ip_vs_xmit.c +Auto-merging net/netfilter/ipvs/ip_vs_proto_udp.c +Auto-merging net/netfilter/ipvs/ip_vs_proto_tcp.c +Auto-merging net/netfilter/ipvs/ip_vs_ftp.c +Auto-merging net/netfilter/ipvs/ip_vs_ctl.c +Auto-merging net/netfilter/ipvs/ip_vs_core.c +Auto-merging net/netfilter/ipvs/ip_vs_app.c +Auto-merging net/ipv6/udp.c +Auto-merging net/ipv6/tcp_ipv6.c +Auto-merging net/ipv6/route.c +Auto-merging net/ipv6/reassembly.c +Auto-merging net/ipv6/proc.c +Auto-merging net/ipv6/netfilter/nf_conntrack_reasm.c +Auto-merging net/ipv6/ndisc.c +Auto-merging net/ipv6/ip6_output.c +Auto-merging net/ipv6/ip6_fib.c +Auto-merging net/ipv6/inet6_hashtables.c +Auto-merging net/ipv6/icmp.c +Auto-merging net/ipv6/af_inet6.c +Auto-merging net/ipv6/addrconf.c +Auto-merging net/ipv4/udp_offload.c +Auto-merging net/ipv4/udp.c +Auto-merging net/ipv4/tcp_ipv4.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/ipv4/route.c +Auto-merging net/ipv4/proc.c +Auto-merging net/ipv4/inet_hashtables.c +Auto-merging net/ipv4/inet_fragment.c +Auto-merging net/ipv4/inet_connection_sock.c +Auto-merging net/ipv4/igmp.c +Auto-merging net/ipv4/icmp.c +Auto-merging net/ipv4/fib_trie.c +Auto-merging net/ipv4/fib_semantics.c +Auto-merging net/ipv4/fib_rules.c +Auto-merging net/ipv4/fib_frontend.c +Auto-merging net/ipv4/devinet.c +Auto-merging net/ieee802154/6lowpan/reassembly.c +Auto-merging net/ethernet/eth.c +Auto-merging net/dsa/slave.c +Auto-merging net/dsa/port.c +Auto-merging net/dsa/dsa_priv.h +Auto-merging net/dsa/dsa2.c +Auto-merging net/core/skbuff.c +Auto-merging net/core/pktgen.c +Auto-merging net/core/neighbour.c +Auto-merging net/core/filter.c +Auto-merging net/core/devlink.c +Auto-merging net/bridge/br_private.h +Auto-merging net/bridge/br_device.c +Auto-merging net/8021q/vlan_dev.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging kernel/bpf/stackmap.c +Auto-merging kernel/bpf/core.c +Removing include/uapi/linux/wanrouter.h +Removing include/uapi/linux/isdnif.h +Removing include/uapi/linux/isdn_ppp.h +Removing include/uapi/linux/isdn_divertif.h +Removing include/uapi/linux/isdn.h +Auto-merging include/net/tls.h +Auto-merging include/net/tcp.h +Auto-merging include/net/ipv6.h +Auto-merging include/net/ip_fib.h +Auto-merging include/net/ip6_fib.h +Auto-merging include/net/ip.h +Auto-merging include/net/dsa.h +Auto-merging include/net/devlink.h +Removing include/linux/wanrouter.h +Auto-merging include/linux/skbuff.h +Auto-merging include/linux/phy.h +Removing include/linux/isdnif.h +Removing include/linux/isdn_ppp.h +Removing include/linux/isdn_divertif.h +Removing include/linux/isdn.h +Auto-merging include/linux/igmp.h +Removing include/linux/concap.h +Auto-merging include/linux/bpf_verifier.h +Auto-merging include/linux/bpf.h +Auto-merging include/dt-bindings/net/ti-dp83867.h +Removing fs/afs/netdevices.c +Auto-merging fs/afs/internal.h +Auto-merging fs/afs/cmservice.c +Auto-merging drivers/net/wan/hdlc_cisco.c +Auto-merging drivers/net/plip/plip.c +Auto-merging drivers/net/phy/sfp.c +Auto-merging drivers/net/phy/phylink.c +Auto-merging drivers/net/macvlan.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +Auto-merging drivers/net/ethernet/rocker/rocker_ofdpa.c +Auto-merging drivers/net/ethernet/rocker/rocker_main.c +Auto-merging drivers/net/ethernet/mediatek/mtk_eth_soc.c +Auto-merging drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +Removing drivers/net/ethernet/intel/iavf/i40e_adminq_cmd.h +Auto-merging drivers/net/dsa/sja1105/sja1105_main.c +Auto-merging drivers/net/dsa/mv88e6xxx/smi.c +Auto-merging drivers/net/dsa/mv88e6xxx/port.h +Auto-merging drivers/net/dsa/mv88e6xxx/port.c +Auto-merging drivers/net/dsa/mv88e6xxx/global2.h +Auto-merging drivers/net/dsa/mv88e6xxx/global2.c +Auto-merging drivers/net/dsa/mv88e6xxx/global1_vtu.c +Auto-merging drivers/net/dsa/mv88e6xxx/global1_atu.c +Auto-merging drivers/net/dsa/mv88e6xxx/global1.h +Auto-merging drivers/net/dsa/mv88e6xxx/global1.c +Auto-merging drivers/net/dsa/mv88e6xxx/chip.h +Auto-merging drivers/net/dsa/mv88e6xxx/chip.c +Auto-merging drivers/media/dvb-frontends/tua6100.c +Removing drivers/isdn/isdnloop/isdnloop.h +Removing drivers/isdn/isdnloop/isdnloop.c +Removing drivers/isdn/isdnloop/Makefile +Removing drivers/isdn/i4l/isdn_x25iface.h +Removing drivers/isdn/i4l/isdn_x25iface.c +Removing drivers/isdn/i4l/isdn_v110.h +Removing drivers/isdn/i4l/isdn_v110.c +Removing drivers/isdn/i4l/isdn_ttyfax.h +Removing drivers/isdn/i4l/isdn_ttyfax.c +Removing drivers/isdn/i4l/isdn_tty.h +Removing drivers/isdn/i4l/isdn_tty.c +Removing drivers/isdn/i4l/isdn_ppp.h +Removing drivers/isdn/i4l/isdn_ppp.c +Removing drivers/isdn/i4l/isdn_net.h +Removing drivers/isdn/i4l/isdn_net.c +Removing drivers/isdn/i4l/isdn_concap.h +Removing drivers/isdn/i4l/isdn_concap.c +Removing drivers/isdn/i4l/isdn_common.h +Removing drivers/isdn/i4l/isdn_common.c +Removing drivers/isdn/i4l/isdn_bsdcomp.c +Removing drivers/isdn/i4l/isdn_audio.h +Removing drivers/isdn/i4l/isdn_audio.c +Removing drivers/isdn/i4l/Makefile +Removing drivers/isdn/i4l/Kconfig +Removing drivers/isdn/hisax/w6692.h +Removing drivers/isdn/hisax/w6692.c +Removing drivers/isdn/hisax/telespci.c +Removing drivers/isdn/hisax/teles_cs.c +Removing drivers/isdn/hisax/teles3.c +Removing drivers/isdn/hisax/teles0.c +Removing drivers/isdn/hisax/teleint.c +Removing drivers/isdn/hisax/tei.c +Removing drivers/isdn/hisax/st5481_usb.c +Removing drivers/isdn/hisax/st5481_init.c +Removing drivers/isdn/hisax/st5481_d.c +Removing drivers/isdn/hisax/st5481_b.c +Removing drivers/isdn/hisax/st5481.h +Removing drivers/isdn/hisax/sportster.c +Removing drivers/isdn/hisax/sedlbauer_cs.c +Removing drivers/isdn/hisax/sedlbauer.c +Removing drivers/isdn/hisax/saphir.c +Removing drivers/isdn/hisax/s0box.c +Removing drivers/isdn/hisax/q931.c +Removing drivers/isdn/hisax/nj_u.c +Removing drivers/isdn/hisax/nj_s.c +Removing drivers/isdn/hisax/niccy.c +Removing drivers/isdn/hisax/netjet.h +Removing drivers/isdn/hisax/netjet.c +Removing drivers/isdn/hisax/mic.c +Removing drivers/isdn/hisax/lmgr.c +Removing drivers/isdn/hisax/l3ni1.h +Removing drivers/isdn/hisax/l3ni1.c +Removing drivers/isdn/hisax/l3dss1.h +Removing drivers/isdn/hisax/l3dss1.c +Removing drivers/isdn/hisax/l3_1tr6.h +Removing drivers/isdn/hisax/l3_1tr6.c +Removing drivers/isdn/hisax/jade_irq.c +Removing drivers/isdn/hisax/jade.h +Removing drivers/isdn/hisax/jade.c +Removing drivers/isdn/hisax/ix1_micro.c +Removing drivers/isdn/hisax/isurf.c +Removing drivers/isdn/hisax/isdnl3.h +Removing drivers/isdn/hisax/isdnl3.c +Removing drivers/isdn/hisax/isdnl2.h +Removing drivers/isdn/hisax/isdnl2.c +Removing drivers/isdn/hisax/isdnl1.h +Removing drivers/isdn/hisax/isdnl1.c +Removing drivers/isdn/hisax/isar.h +Removing drivers/isdn/hisax/isar.c +Removing drivers/isdn/hisax/isac.h +Removing drivers/isdn/hisax/isac.c +Removing drivers/isdn/hisax/ipacx.h +Removing drivers/isdn/hisax/ipacx.c +Removing drivers/isdn/hisax/ipac.h +Removing drivers/isdn/hisax/icc.h +Removing drivers/isdn/hisax/icc.c +Removing drivers/isdn/hisax/hscx_irq.c +Removing drivers/isdn/hisax/hscx.h +Removing drivers/isdn/hisax/hscx.c +Removing drivers/isdn/hisax/hisax_isac.h +Removing drivers/isdn/hisax/hisax_isac.c +Removing drivers/isdn/hisax/hisax_if.h +Removing drivers/isdn/hisax/hisax_fcpcipnp.h +Removing drivers/isdn/hisax/hisax_fcpcipnp.c +Removing drivers/isdn/hisax/hisax_debug.h +Removing drivers/isdn/hisax/hisax_cfg.h +Removing drivers/isdn/hisax/hisax.h +Removing drivers/isdn/hisax/hfcscard.c +Removing drivers/isdn/hisax/hfc_usb.h +CONFLICT (modify/delete): drivers/isdn/hisax/hfc_usb.c deleted in net-next/master and modified in HEAD. Version HEAD of drivers/isdn/hisax/hfc_usb.c left in tree. +Removing drivers/isdn/hisax/hfc_sx.h +Removing drivers/isdn/hisax/hfc_sx.c +Removing drivers/isdn/hisax/hfc_pci.h +Removing drivers/isdn/hisax/hfc_pci.c +Removing drivers/isdn/hisax/hfc_2bs0.h +Removing drivers/isdn/hisax/hfc_2bs0.c +Removing drivers/isdn/hisax/hfc_2bds0.h +Removing drivers/isdn/hisax/hfc_2bds0.c +Removing drivers/isdn/hisax/hfc4s8s_l1.h +Removing drivers/isdn/hisax/hfc4s8s_l1.c +Removing drivers/isdn/hisax/gazel.c +Removing drivers/isdn/hisax/fsm.h +Removing drivers/isdn/hisax/fsm.c +Removing drivers/isdn/hisax/enternow_pci.c +Removing drivers/isdn/hisax/elsa_ser.c +Removing drivers/isdn/hisax/elsa_cs.c +Removing drivers/isdn/hisax/elsa.c +Removing drivers/isdn/hisax/diva.c +Removing drivers/isdn/hisax/config.c +Removing drivers/isdn/hisax/callc.c +Removing drivers/isdn/hisax/bkm_ax.h +Removing drivers/isdn/hisax/bkm_a8.c +Removing drivers/isdn/hisax/bkm_a4t.c +Removing drivers/isdn/hisax/avma1_cs.c +Removing drivers/isdn/hisax/avm_pci.c +Removing drivers/isdn/hisax/avm_a1p.c +Removing drivers/isdn/hisax/avm_a1.c +Removing drivers/isdn/hisax/asuscom.c +Removing drivers/isdn/hisax/arcofi.h +Removing drivers/isdn/hisax/arcofi.c +Removing drivers/isdn/hisax/amd7930_fn.h +Removing drivers/isdn/hisax/amd7930_fn.c +Removing drivers/isdn/hisax/Makefile +Removing drivers/isdn/hisax/Kconfig +Auto-merging drivers/isdn/hardware/mISDN/netjet.c +Removing drivers/isdn/hardware/Kconfig +CONFLICT (modify/delete): drivers/isdn/gigaset/i4l.c deleted in net-next/master and modified in HEAD. Version HEAD of drivers/isdn/gigaset/i4l.c left in tree. +Removing drivers/isdn/divert/isdn_divert.h +Removing drivers/isdn/divert/isdn_divert.c +Removing drivers/isdn/divert/divert_procfs.c +Removing drivers/isdn/divert/divert_init.c +Removing drivers/isdn/divert/Makefile +Removing drivers/isdn/capi/capidrv.h +Removing drivers/isdn/capi/capidrv.c +Auto-merging drivers/infiniband/hw/cxgb4/cm.c +Auto-merging drivers/i2c/i2c-core-acpi.c +Auto-merging arch/riscv/net/bpf_jit_comp.c +Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi +Auto-merging MAINTAINERS +Removing Documentation/isdn/syncPPP.FAQ +Removing Documentation/isdn/README.x25 +Removing Documentation/isdn/README.syncppp +Removing Documentation/isdn/README.hfc-pci +Removing Documentation/isdn/README.fax +Removing Documentation/isdn/README.diversion +Removing Documentation/isdn/README.concap +Removing Documentation/isdn/README.audio +Removing Documentation/isdn/README.HiSax +Removing Documentation/isdn/README.FAQ +Removing Documentation/isdn/README +Removing Documentation/isdn/INTERFACE.fax +Removing Documentation/isdn/INTERFACE +Removing Documentation/isdn/HiSax.cert +Resolved 'tools/testing/selftests/bpf/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/isdn/gigaset/i4l.c drivers/isdn/hisax/hfc_usb.c +drivers/isdn/gigaset/i4l.c: needs merge +drivers/isdn/hisax/hfc_usb.c: needs merge +rm 'drivers/isdn/gigaset/i4l.c' +rm 'drivers/isdn/hisax/hfc_usb.c' +$ git commit -v -a +[master 8b117bba99fe] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-net-phydev | 8 + + Documentation/bpf/bpf_design_QA.rst | 30 +- + .../bindings/arm/mediatek/mediatek,sgmiisys.txt | 2 + + .../devicetree/bindings/net/dsa/marvell.txt | 7 +- + Documentation/devicetree/bindings/net/ethernet.txt | 1 + + .../devicetree/bindings/net/mediatek-net.txt | 14 +- + .../devicetree/bindings/net/qca,ar71xx.txt | 45 + + .../devicetree/bindings/net/socfpga-dwmac.txt | 10 +- + .../devicetree/bindings/net/ti,dp83867.txt | 14 +- + .../devicetree/bindings/net/xilinx_axienet.txt | 29 +- + .../devicetree/bindings/ptp/ptp-qoriq.txt | 1 + + Documentation/isdn/HiSax.cert | 96 - + Documentation/isdn/INTERFACE | 759 ---- + Documentation/isdn/INTERFACE.fax | 163 - + Documentation/isdn/README | 599 ---- + Documentation/isdn/README.FAQ | 26 - + Documentation/isdn/README.HiSax | 659 ---- + Documentation/isdn/README.audio | 138 - + Documentation/isdn/README.concap | 259 -- + Documentation/isdn/README.diversion | 127 - + Documentation/isdn/README.fax | 45 - + Documentation/isdn/README.gigaset | 36 +- + Documentation/isdn/README.hfc-pci | 41 - + Documentation/isdn/README.syncppp | 58 - + Documentation/isdn/README.x25 | 184 - + Documentation/isdn/syncPPP.FAQ | 224 -- + .../networking/device_drivers/amazon/ena.txt | 5 +- + Documentation/networking/ip-sysctl.txt | 40 +- + Documentation/networking/sfp-phylink.rst | 5 +- + Documentation/networking/tls-offload.rst | 19 - + Documentation/process/changes.rst | 16 +- + MAINTAINERS | 31 +- + arch/arm/net/bpf_jit_32.c | 42 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 6 + + arch/arm64/boot/dts/mediatek/mt7622.dtsi | 3 +- + arch/mips/boot/dts/mscc/ocelot.dtsi | 5 +- + arch/mips/boot/dts/qca/ar9331.dtsi | 26 + + arch/mips/boot/dts/qca/ar9331_dpt_module.dts | 8 + + arch/powerpc/net/bpf_jit_comp64.c | 36 +- + arch/riscv/net/bpf_jit_comp.c | 43 +- + arch/s390/net/bpf_jit_comp.c | 41 +- + arch/sparc/net/bpf_jit_comp_64.c | 29 +- + arch/x86/net/bpf_jit_comp32.c | 83 +- + drivers/i2c/i2c-core-acpi.c | 3 +- + drivers/infiniband/core/roce_gid_mgmt.c | 5 +- + drivers/infiniband/hw/cxgb4/cm.c | 9 +- + drivers/infiniband/hw/i40iw/i40iw_cm.c | 7 +- + drivers/infiniband/hw/i40iw/i40iw_main.c | 6 +- + drivers/infiniband/hw/i40iw/i40iw_utils.c | 12 +- + drivers/infiniband/hw/mlx5/ib_rep.c | 19 +- + drivers/infiniband/hw/mlx5/ib_rep.h | 2 +- + drivers/infiniband/hw/nes/nes.c | 8 +- + drivers/infiniband/hw/qedr/main.c | 25 +- + drivers/infiniband/hw/qedr/qedr.h | 2 + + drivers/infiniband/hw/usnic/usnic_ib_main.c | 15 +- + drivers/isdn/Kconfig | 51 - + drivers/isdn/Makefile | 6 - + drivers/isdn/capi/Kconfig | 29 +- + drivers/isdn/capi/Makefile | 2 + + drivers/isdn/capi/capidrv.c | 2525 ------------- + drivers/isdn/capi/capidrv.h | 140 - + drivers/isdn/divert/Makefile | 10 - + drivers/isdn/divert/divert_init.c | 82 - + drivers/isdn/divert/divert_procfs.c | 336 -- + drivers/isdn/divert/isdn_divert.c | 846 ----- + drivers/isdn/divert/isdn_divert.h | 132 - + drivers/isdn/gigaset/i4l.c | 692 ---- + drivers/isdn/hardware/Kconfig | 8 - + drivers/isdn/hardware/Makefile | 1 - + drivers/isdn/hardware/mISDN/Kconfig | 7 +- + drivers/isdn/hardware/mISDN/Makefile | 2 + + drivers/isdn/{i4l => hardware/mISDN}/isdnhdlc.c | 2 +- + .../isdn/hardware/mISDN/isdnhdlc.h | 0 + drivers/isdn/hardware/mISDN/netjet.c | 2 +- + drivers/isdn/hisax/Kconfig | 423 --- + drivers/isdn/hisax/Makefile | 60 - + drivers/isdn/hisax/amd7930_fn.c | 794 ----- + drivers/isdn/hisax/amd7930_fn.h | 37 - + drivers/isdn/hisax/arcofi.c | 131 - + drivers/isdn/hisax/arcofi.h | 27 - + drivers/isdn/hisax/asuscom.c | 423 --- + drivers/isdn/hisax/avm_a1.c | 307 -- + drivers/isdn/hisax/avm_a1p.c | 267 -- + drivers/isdn/hisax/avm_pci.c | 904 ----- + drivers/isdn/hisax/avma1_cs.c | 162 - + drivers/isdn/hisax/bkm_a4t.c | 358 -- + drivers/isdn/hisax/bkm_a8.c | 433 --- + drivers/isdn/hisax/bkm_ax.h | 119 - + drivers/isdn/hisax/callc.c | 1792 ---------- + drivers/isdn/hisax/config.c | 1993 ----------- + drivers/isdn/hisax/diva.c | 1282 ------- + drivers/isdn/hisax/elsa.c | 1245 ------- + drivers/isdn/hisax/elsa_cs.c | 218 -- + drivers/isdn/hisax/elsa_ser.c | 659 ---- + drivers/isdn/hisax/enternow_pci.c | 420 --- + drivers/isdn/hisax/fsm.c | 161 - + drivers/isdn/hisax/fsm.h | 61 - + drivers/isdn/hisax/gazel.c | 691 ---- + drivers/isdn/hisax/hfc4s8s_l1.c | 1584 --------- + drivers/isdn/hisax/hfc4s8s_l1.h | 89 - + drivers/isdn/hisax/hfc_2bds0.c | 1078 ------ + drivers/isdn/hisax/hfc_2bds0.h | 128 - + drivers/isdn/hisax/hfc_2bs0.c | 591 --- + drivers/isdn/hisax/hfc_2bs0.h | 60 - + drivers/isdn/hisax/hfc_pci.c | 1755 --------- + drivers/isdn/hisax/hfc_pci.h | 235 -- + drivers/isdn/hisax/hfc_sx.c | 1517 -------- + drivers/isdn/hisax/hfc_sx.h | 196 - + drivers/isdn/hisax/hfc_usb.c | 1594 --------- + drivers/isdn/hisax/hfc_usb.h | 208 -- + drivers/isdn/hisax/hfcscard.c | 261 -- + drivers/isdn/hisax/hisax.h | 1352 ------- + drivers/isdn/hisax/hisax_cfg.h | 66 - + drivers/isdn/hisax/hisax_debug.h | 80 - + drivers/isdn/hisax/hisax_fcpcipnp.c | 1024 ------ + drivers/isdn/hisax/hisax_fcpcipnp.h | 58 - + drivers/isdn/hisax/hisax_if.h | 66 - + drivers/isdn/hisax/hisax_isac.c | 895 ----- + drivers/isdn/hisax/hisax_isac.h | 46 - + drivers/isdn/hisax/hscx.c | 277 -- + drivers/isdn/hisax/hscx.h | 41 - + drivers/isdn/hisax/hscx_irq.c | 294 -- + drivers/isdn/hisax/icc.c | 680 ---- + drivers/isdn/hisax/icc.h | 72 - + drivers/isdn/hisax/ipac.h | 29 - + drivers/isdn/hisax/ipacx.c | 913 ----- + drivers/isdn/hisax/ipacx.h | 162 - + drivers/isdn/hisax/isac.c | 681 ---- + drivers/isdn/hisax/isac.h | 70 - + drivers/isdn/hisax/isar.c | 1910 ---------- + drivers/isdn/hisax/isar.h | 222 -- + drivers/isdn/hisax/isdnl1.c | 930 ----- + drivers/isdn/hisax/isdnl1.h | 32 - + drivers/isdn/hisax/isdnl2.c | 1839 ---------- + drivers/isdn/hisax/isdnl2.h | 25 - + drivers/isdn/hisax/isdnl3.c | 594 ---- + drivers/isdn/hisax/isdnl3.h | 42 - + drivers/isdn/hisax/isurf.c | 305 -- + drivers/isdn/hisax/ix1_micro.c | 316 -- + drivers/isdn/hisax/jade.c | 305 -- + drivers/isdn/hisax/jade.h | 134 - + drivers/isdn/hisax/jade_irq.c | 238 -- + drivers/isdn/hisax/l3_1tr6.c | 932 ----- + drivers/isdn/hisax/l3_1tr6.h | 164 - + drivers/isdn/hisax/l3dss1.c | 3227 ----------------- + drivers/isdn/hisax/l3dss1.h | 124 - + drivers/isdn/hisax/l3ni1.c | 3182 ----------------- + drivers/isdn/hisax/l3ni1.h | 136 - + drivers/isdn/hisax/lmgr.c | 50 - + drivers/isdn/hisax/mic.c | 235 -- + drivers/isdn/hisax/netjet.c | 985 ----- + drivers/isdn/hisax/netjet.h | 69 - + drivers/isdn/hisax/niccy.c | 380 -- + drivers/isdn/hisax/nj_s.c | 294 -- + drivers/isdn/hisax/nj_u.c | 258 -- + drivers/isdn/hisax/q931.c | 1513 -------- + drivers/isdn/hisax/s0box.c | 260 -- + drivers/isdn/hisax/saphir.c | 296 -- + drivers/isdn/hisax/sedlbauer.c | 873 ----- + drivers/isdn/hisax/sedlbauer_cs.c | 209 -- + drivers/isdn/hisax/sportster.c | 267 -- + drivers/isdn/hisax/st5481.h | 529 --- + drivers/isdn/hisax/st5481_b.c | 380 -- + drivers/isdn/hisax/st5481_d.c | 780 ---- + drivers/isdn/hisax/st5481_init.c | 221 -- + drivers/isdn/hisax/st5481_usb.c | 659 ---- + drivers/isdn/hisax/tei.c | 465 --- + drivers/isdn/hisax/teleint.c | 334 -- + drivers/isdn/hisax/teles0.c | 364 -- + drivers/isdn/hisax/teles3.c | 498 --- + drivers/isdn/hisax/teles_cs.c | 201 -- + drivers/isdn/hisax/telespci.c | 349 -- + drivers/isdn/hisax/w6692.c | 1085 ------ + drivers/isdn/hisax/w6692.h | 184 - + drivers/isdn/i4l/Kconfig | 129 - + drivers/isdn/i4l/Makefile | 20 - + drivers/isdn/i4l/isdn_audio.c | 711 ---- + drivers/isdn/i4l/isdn_audio.h | 44 - + drivers/isdn/i4l/isdn_bsdcomp.c | 930 ----- + drivers/isdn/i4l/isdn_common.c | 2368 ------------ + drivers/isdn/i4l/isdn_common.h | 47 - + drivers/isdn/i4l/isdn_concap.c | 99 - + drivers/isdn/i4l/isdn_concap.h | 11 - + drivers/isdn/i4l/isdn_net.c | 3198 ----------------- + drivers/isdn/i4l/isdn_net.h | 151 - + drivers/isdn/i4l/isdn_ppp.c | 3046 ---------------- + drivers/isdn/i4l/isdn_ppp.h | 41 - + drivers/isdn/i4l/isdn_tty.c | 3756 -------------------- + drivers/isdn/i4l/isdn_tty.h | 120 - + drivers/isdn/i4l/isdn_ttyfax.c | 1123 ------ + drivers/isdn/i4l/isdn_ttyfax.h | 17 - + drivers/isdn/i4l/isdn_v110.c | 625 ---- + drivers/isdn/i4l/isdn_v110.h | 29 - + drivers/isdn/i4l/isdn_x25iface.c | 332 -- + drivers/isdn/i4l/isdn_x25iface.h | 30 - + drivers/isdn/isdnloop/Makefile | 6 - + drivers/isdn/isdnloop/isdnloop.c | 1528 -------- + drivers/isdn/isdnloop/isdnloop.h | 112 - + drivers/media/dvb-frontends/tua6100.c | 22 +- + drivers/media/rc/bpf-lirc.c | 30 +- + drivers/net/bonding/bond_main.c | 11 + + drivers/net/dsa/mv88e6xxx/chip.c | 81 + + drivers/net/dsa/mv88e6xxx/chip.h | 8 + + drivers/net/dsa/mv88e6xxx/global1.c | 35 +- + drivers/net/dsa/mv88e6xxx/global1.h | 16 +- + drivers/net/dsa/mv88e6xxx/global1_atu.c | 5 +- + drivers/net/dsa/mv88e6xxx/global1_vtu.c | 58 + + drivers/net/dsa/mv88e6xxx/global2.c | 26 + + drivers/net/dsa/mv88e6xxx/global2.h | 14 + + drivers/net/dsa/mv88e6xxx/port.c | 77 + + drivers/net/dsa/mv88e6xxx/port.h | 14 + + drivers/net/dsa/mv88e6xxx/smi.c | 25 +- + drivers/net/dsa/sja1105/sja1105.h | 20 +- + drivers/net/dsa/sja1105/sja1105_dynamic_config.c | 144 +- + drivers/net/dsa/sja1105/sja1105_dynamic_config.h | 11 +- + drivers/net/dsa/sja1105/sja1105_main.c | 197 +- + drivers/net/dsa/sja1105/sja1105_spi.c | 12 + + drivers/net/dsa/sja1105/sja1105_static_config.c | 20 +- + drivers/net/dsa/sja1105/sja1105_static_config.h | 26 + + drivers/net/ethernet/amazon/ena/ena_admin_defs.h | 21 + + drivers/net/ethernet/amazon/ena/ena_com.c | 123 +- + drivers/net/ethernet/amazon/ena/ena_com.h | 48 + + drivers/net/ethernet/amazon/ena/ena_eth_com.c | 28 +- + drivers/net/ethernet/amazon/ena/ena_eth_com.h | 73 +- + drivers/net/ethernet/amazon/ena/ena_ethtool.c | 78 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 86 +- + drivers/net/ethernet/amazon/ena/ena_netdev.h | 16 +- + drivers/net/ethernet/atheros/Kconfig | 10 +- + drivers/net/ethernet/atheros/Makefile | 1 + + drivers/net/ethernet/atheros/ag71xx.c | 1898 ++++++++++ + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 2 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 41 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 52 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 1 + + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 79 +- + drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 4 + + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 25 + + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 7 +- + drivers/net/ethernet/freescale/enetc/Kconfig | 10 + + drivers/net/ethernet/freescale/enetc/enetc.c | 216 +- + drivers/net/ethernet/freescale/enetc/enetc.h | 18 +- + .../net/ethernet/freescale/enetc/enetc_ethtool.c | 31 + + drivers/net/ethernet/freescale/enetc/enetc_hw.h | 25 +- + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 2 + + drivers/net/ethernet/freescale/enetc/enetc_ptp.c | 5 + + drivers/net/ethernet/freescale/enetc/enetc_vf.c | 2 + + drivers/net/ethernet/freescale/fec_main.c | 7 +- + drivers/net/ethernet/freescale/fec_ptp.c | 2 +- + drivers/net/ethernet/freescale/fman/fman_keygen.c | 3 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.c | 2 + + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 8 +- + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 1 + + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 153 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 3 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 12 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 9 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 59 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 50 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h | 9 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 565 ++- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 19 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 4 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 2 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c | 2 - + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 95 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 2 + + drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c | 2 + + drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h | 8 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_io.c | 60 + + .../net/ethernet/huawei/hinic/hinic_hw_qp_ctxt.h | 5 + + drivers/net/ethernet/huawei/hinic/hinic_hw_wqe.h | 22 +- + drivers/net/ethernet/huawei/hinic/hinic_main.c | 65 +- + drivers/net/ethernet/huawei/hinic/hinic_port.c | 114 + + drivers/net/ethernet/huawei/hinic/hinic_port.h | 41 + + drivers/net/ethernet/huawei/hinic/hinic_rx.c | 46 +- + drivers/net/ethernet/huawei/hinic/hinic_rx.h | 2 + + drivers/net/ethernet/intel/e1000e/netdev.c | 21 +- + drivers/net/ethernet/intel/i40e/i40e.h | 2 - + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 16 +- + drivers/net/ethernet/intel/iavf/Makefile | 2 +- + drivers/net/ethernet/intel/iavf/i40e_adminq_cmd.h | 530 --- + drivers/net/ethernet/intel/iavf/iavf.h | 8 +- + .../intel/iavf/{i40e_adminq.c => iavf_adminq.c} | 267 +- + .../intel/iavf/{i40e_adminq.h => iavf_adminq.h} | 80 +- + drivers/net/ethernet/intel/iavf/iavf_adminq_cmd.h | 528 +++ + drivers/net/ethernet/intel/iavf/iavf_alloc.h | 17 +- + drivers/net/ethernet/intel/iavf/iavf_client.c | 127 +- + drivers/net/ethernet/intel/iavf/iavf_client.h | 104 +- + drivers/net/ethernet/intel/iavf/iavf_common.c | 499 +-- + drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 12 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 85 +- + drivers/net/ethernet/intel/iavf/iavf_osdep.h | 3 +- + drivers/net/ethernet/intel/iavf/iavf_prototype.h | 58 +- + drivers/net/ethernet/intel/iavf/iavf_status.h | 136 +- + drivers/net/ethernet/intel/iavf/iavf_trace.h | 4 +- + drivers/net/ethernet/intel/iavf/iavf_txrx.c | 12 +- + drivers/net/ethernet/intel/iavf/iavf_type.h | 4 +- + drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 38 +- + drivers/net/ethernet/intel/ice/ice.h | 63 +- + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 49 +- + drivers/net/ethernet/intel/ice/ice_common.c | 250 +- + drivers/net/ethernet/intel/ice/ice_common.h | 11 +- + drivers/net/ethernet/intel/ice/ice_controlq.c | 2 +- + drivers/net/ethernet/intel/ice/ice_controlq.h | 2 +- + drivers/net/ethernet/intel/ice/ice_dcb.c | 35 +- + drivers/net/ethernet/intel/ice/ice_dcb.h | 12 +- + drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 230 +- + drivers/net/ethernet/intel/ice/ice_dcb_lib.h | 5 +- + drivers/net/ethernet/intel/ice/ice_ethtool.c | 1027 +++++- + drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 4 + + drivers/net/ethernet/intel/ice/ice_lib.c | 477 ++- + drivers/net/ethernet/intel/ice/ice_lib.h | 14 + + drivers/net/ethernet/intel/ice/ice_main.c | 362 +- + drivers/net/ethernet/intel/ice/ice_nvm.c | 35 +- + drivers/net/ethernet/intel/ice/ice_status.h | 1 + + drivers/net/ethernet/intel/ice/ice_switch.c | 9 +- + drivers/net/ethernet/intel/ice/ice_switch.h | 7 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 16 +- + drivers/net/ethernet/intel/ice/ice_txrx.h | 35 +- + drivers/net/ethernet/intel/ice/ice_type.h | 13 +- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 301 +- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | 33 +- + drivers/net/ethernet/intel/igb/e1000_82575.c | 2 +- + drivers/net/ethernet/intel/igb/igb_main.c | 3 +- + drivers/net/ethernet/intel/igc/igc_base.c | 49 - + drivers/net/ethernet/intel/igc/igc_defines.h | 18 +- + drivers/net/ethernet/intel/igc/igc_hw.h | 3 - + drivers/net/ethernet/intel/igc/igc_mac.c | 23 +- + drivers/net/ethernet/intel/igc/igc_main.c | 22 + + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 14 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 6 + + drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 187 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 14 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 82 +- + drivers/net/ethernet/intel/ixgbevf/vf.c | 5 +- + drivers/net/ethernet/marvell/mvneta.c | 36 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 21 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c | 276 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.h | 15 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 110 +- + drivers/net/ethernet/mediatek/Makefile | 3 +- + drivers/net/ethernet/mediatek/mtk_eth_path.c | 323 ++ + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 97 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 177 +- + drivers/net/ethernet/mediatek/mtk_sgmii.c | 105 + + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 7 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/ecpf.c | 27 - + drivers/net/ethernet/mellanox/mlx5/core/ecpf.h | 4 - + drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 - + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 287 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.h | 41 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_geneve.c | 335 ++ + .../ethernet/mellanox/mlx5/core/en/tc_tun_gre.c | 95 + + .../ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c | 151 + + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 35 - + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 67 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | 7 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 74 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 7 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 32 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 42 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 130 +- + .../mellanox/mlx5/core/eswitch_offloads_termtbl.c | 277 ++ + drivers/net/ethernet/mellanox/mlx5/core/events.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 3 + + drivers/net/ethernet/mellanox/mlx5/core/fw.c | 6 +- + .../ethernet/mellanox/mlx5/core/ipoib/ethtool.c | 9 - + drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c | 33 +- + .../net/ethernet/mellanox/mlx5/core/lib/geneve.c | 157 + + .../net/ethernet/mellanox/mlx5/core/lib/geneve.h | 33 + + drivers/net/ethernet/mellanox/mlx5/core/main.c | 24 + + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/rdma.c | 4 +- + drivers/net/ethernet/mellanox/mlxfw/mlxfw.h | 11 +- + drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c | 57 +- + drivers/net/ethernet/mellanox/mlxsw/core.c | 36 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 3 + + drivers/net/ethernet/mellanox/mlxsw/core_env.c | 27 +- + drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c | 135 +- + drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 46 +- + drivers/net/ethernet/mellanox/mlxsw/i2c.c | 76 +- + drivers/net/ethernet/mellanox/mlxsw/minimal.c | 18 + + drivers/net/ethernet/mellanox/mlxsw/reg.h | 62 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 75 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 64 +- + drivers/net/ethernet/mscc/Makefile | 2 +- + drivers/net/ethernet/mscc/ocelot.c | 26 +- + drivers/net/ethernet/mscc/ocelot.h | 11 + + drivers/net/ethernet/mscc/ocelot_ace.c | 783 ++++ + drivers/net/ethernet/mscc/ocelot_ace.h | 232 ++ + drivers/net/ethernet/mscc/ocelot_board.c | 1 + + drivers/net/ethernet/mscc/ocelot_flower.c | 357 ++ + drivers/net/ethernet/mscc/ocelot_police.c | 227 ++ + drivers/net/ethernet/mscc/ocelot_police.h | 22 + + drivers/net/ethernet/mscc/ocelot_regs.c | 11 + + drivers/net/ethernet/mscc/ocelot_s2.h | 64 + + drivers/net/ethernet/mscc/ocelot_tc.c | 178 + + drivers/net/ethernet/mscc/ocelot_tc.h | 22 + + drivers/net/ethernet/mscc/ocelot_vcap.h | 403 +++ + drivers/net/ethernet/netronome/Kconfig | 1 + + drivers/net/ethernet/netronome/nfp/Makefile | 6 + + drivers/net/ethernet/netronome/nfp/bpf/jit.c | 115 +- + drivers/net/ethernet/netronome/nfp/bpf/main.h | 2 + + drivers/net/ethernet/netronome/nfp/bpf/verifier.c | 12 + + drivers/net/ethernet/netronome/nfp/ccm.c | 3 - + drivers/net/ethernet/netronome/nfp/ccm.h | 48 +- + drivers/net/ethernet/netronome/nfp/ccm_mbox.c | 591 +++ + drivers/net/ethernet/netronome/nfp/crypto/crypto.h | 23 + + drivers/net/ethernet/netronome/nfp/crypto/fw.h | 82 + + drivers/net/ethernet/netronome/nfp/crypto/tls.c | 429 +++ + .../ethernet/netronome/nfp/flower/tunnel_conf.c | 3 +- + drivers/net/ethernet/netronome/nfp/nfp_net.h | 48 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 147 +- + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.c | 15 + + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 21 + + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 16 +- + drivers/net/ethernet/qlogic/Kconfig | 1 + + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 8 +- + drivers/net/ethernet/qlogic/qed/qed.h | 24 +- + drivers/net/ethernet/qlogic/qed/qed_cxt.c | 5 +- + drivers/net/ethernet/qlogic/qed/qed_debug.c | 2 +- + drivers/net/ethernet/qlogic/qed/qed_dev.c | 1275 +++++-- + drivers/net/ethernet/qlogic/qed/qed_dev_api.h | 113 +- + drivers/net/ethernet/qlogic/qed/qed_fcoe.c | 26 +- + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 16 +- + drivers/net/ethernet/qlogic/qed/qed_hw.c | 44 +- + drivers/net/ethernet/qlogic/qed/qed_init_ops.c | 9 +- + drivers/net/ethernet/qlogic/qed/qed_int.c | 8 +- + drivers/net/ethernet/qlogic/qed/qed_iscsi.c | 35 +- + drivers/net/ethernet/qlogic/qed/qed_iwarp.c | 24 +- + drivers/net/ethernet/qlogic/qed/qed_iwarp.h | 4 +- + drivers/net/ethernet/qlogic/qed/qed_l2.c | 4 +- + drivers/net/ethernet/qlogic/qed/qed_ll2.c | 406 ++- + drivers/net/ethernet/qlogic/qed/qed_main.c | 157 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 65 + + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 16 + + drivers/net/ethernet/qlogic/qed/qed_ptp.c | 3 +- + drivers/net/ethernet/qlogic/qed/qed_rdma.c | 75 +- + drivers/net/ethernet/qlogic/qed/qed_reg_addr.h | 6 + + drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 2 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 3 +- + drivers/net/ethernet/qlogic/qede/qede.h | 2 + + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 1 + + drivers/net/ethernet/qlogic/qede/qede_main.c | 6 +- + drivers/net/ethernet/qlogic/qede/qede_ptp.c | 37 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 5 +- + drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h | 25 +- + drivers/net/ethernet/realtek/Makefile | 1 + + drivers/net/ethernet/realtek/r8169_firmware.c | 231 ++ + drivers/net/ethernet/realtek/r8169_firmware.h | 39 + + .../net/ethernet/realtek/{r8169.c => r8169_main.c} | 854 ++--- + drivers/net/ethernet/rocker/rocker_main.c | 4 + + drivers/net/ethernet/rocker/rocker_ofdpa.c | 25 +- + drivers/net/ethernet/stmicro/stmmac/Kconfig | 10 + + drivers/net/ethernet/stmicro/stmmac/Makefile | 2 + + drivers/net/ethernet/stmicro/stmmac/common.h | 3 +- + .../net/ethernet/stmicro/stmmac/dwmac-mediatek.c | 8 + + drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c | 8 +- + .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 8 +- + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 118 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 13 + + drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 1 + + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 22 +- + .../net/ethernet/stmicro/stmmac/dwmac100_core.c | 13 + + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 3 + + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 37 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c | 4 - + drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 2 + + .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 15 +- + drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 4 - + drivers/net/ethernet/stmicro/stmmac/hwif.c | 9 + + drivers/net/ethernet/stmicro/stmmac/hwif.h | 21 + + drivers/net/ethernet/stmicro/stmmac/mmc.h | 4 - + drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 13 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 22 + + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 8 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 22 +- + .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 850 +++++ + drivers/net/ethernet/ti/cpsw.c | 7 +- + drivers/net/ethernet/via/via-velocity.h | 2 +- + drivers/net/ethernet/xilinx/Kconfig | 6 +- + drivers/net/ethernet/xilinx/ll_temac.h | 5 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 258 +- + drivers/net/ethernet/xilinx/ll_temac_mdio.c | 20 +- + drivers/net/ethernet/xilinx/xilinx_axienet.h | 35 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 677 ++-- + drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 111 +- + drivers/net/macvlan.c | 2 +- + drivers/net/netdevsim/dev.c | 44 + + drivers/net/netdevsim/netdevsim.h | 1 + + drivers/net/phy/Kconfig | 6 + + drivers/net/phy/Makefile | 1 + + drivers/net/phy/aquantia_main.c | 8 + + drivers/net/phy/bcm87xx.c | 20 +- + drivers/net/phy/dp83867.c | 193 +- + drivers/net/phy/lxt.c | 6 + + drivers/net/phy/nxp-tja11xx.c | 403 +++ + drivers/net/phy/phy-core.c | 4 +- + drivers/net/phy/phy.c | 112 +- + drivers/net/phy/phy_device.c | 107 +- + drivers/net/phy/phylink.c | 288 +- + drivers/net/phy/sfp-bus.c | 14 +- + drivers/net/phy/sfp.c | 35 +- + drivers/net/plip/plip.c | 4 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 20 +- + drivers/net/vmxnet3/vmxnet3_ethtool.c | 10 + + drivers/net/vmxnet3/vmxnet3_int.h | 7 +- + drivers/net/vxlan.c | 94 +- + drivers/net/wan/hdlc_cisco.c | 11 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 4 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 +- + drivers/net/xen-netback/interface.c | 2 +- + drivers/scsi/qedf/qedf_main.c | 39 +- + drivers/scsi/qedi/qedi_main.c | 34 +- + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + drivers/staging/isdn/Kconfig | 12 + + drivers/staging/isdn/Makefile | 8 + + drivers/staging/isdn/TODO | 22 + + .../{isdn/hardware => staging/isdn}/avm/Kconfig | 0 + .../{isdn/hardware => staging/isdn}/avm/Makefile | 0 + .../{isdn/hardware => staging/isdn}/avm/avm_cs.c | 0 + .../{isdn/hardware => staging/isdn}/avm/avmcard.h | 0 + drivers/{isdn/hardware => staging/isdn}/avm/b1.c | 0 + .../{isdn/hardware => staging/isdn}/avm/b1dma.c | 0 + .../{isdn/hardware => staging/isdn}/avm/b1isa.c | 0 + .../{isdn/hardware => staging/isdn}/avm/b1pci.c | 0 + .../{isdn/hardware => staging/isdn}/avm/b1pcmcia.c | 0 + drivers/{isdn/hardware => staging/isdn}/avm/c4.c | 0 + .../{isdn/hardware => staging/isdn}/avm/t1isa.c | 0 + .../{isdn/hardware => staging/isdn}/avm/t1pci.c | 0 + drivers/{ => staging}/isdn/gigaset/Kconfig | 9 - + drivers/{ => staging}/isdn/gigaset/Makefile | 10 +- + drivers/{ => staging}/isdn/gigaset/asyncdata.c | 0 + drivers/{ => staging}/isdn/gigaset/bas-gigaset.c | 0 + drivers/{ => staging}/isdn/gigaset/capi.c | 0 + drivers/{ => staging}/isdn/gigaset/common.c | 0 + drivers/{ => staging}/isdn/gigaset/dummyll.c | 0 + drivers/{ => staging}/isdn/gigaset/ev-layer.c | 0 + drivers/{ => staging}/isdn/gigaset/gigaset.h | 0 + drivers/{ => staging}/isdn/gigaset/interface.c | 0 + drivers/{ => staging}/isdn/gigaset/isocdata.c | 0 + drivers/{ => staging}/isdn/gigaset/proc.c | 0 + drivers/{ => staging}/isdn/gigaset/ser-gigaset.c | 0 + drivers/{ => staging}/isdn/gigaset/usb-gigaset.c | 0 + drivers/{ => staging}/isdn/hysdn/Kconfig | 0 + drivers/{ => staging}/isdn/hysdn/Makefile | 0 + drivers/{ => staging}/isdn/hysdn/boardergo.c | 0 + drivers/{ => staging}/isdn/hysdn/boardergo.h | 0 + drivers/{ => staging}/isdn/hysdn/hycapi.c | 0 + drivers/{ => staging}/isdn/hysdn/hysdn_boot.c | 0 + drivers/{ => staging}/isdn/hysdn/hysdn_defs.h | 0 + drivers/{ => staging}/isdn/hysdn/hysdn_init.c | 0 + drivers/{ => staging}/isdn/hysdn/hysdn_net.c | 6 +- + drivers/{ => staging}/isdn/hysdn/hysdn_pof.h | 0 + drivers/{ => staging}/isdn/hysdn/hysdn_procconf.c | 0 + drivers/{ => staging}/isdn/hysdn/hysdn_proclog.c | 0 + drivers/{ => staging}/isdn/hysdn/hysdn_sched.c | 0 + drivers/{ => staging}/isdn/hysdn/ince1pc.h | 0 + fs/afs/Makefile | 1 - + fs/afs/cmservice.c | 24 +- + fs/afs/internal.h | 15 - + fs/afs/netdevices.c | 48 - + include/dt-bindings/net/ti-dp83867.h | 2 + + include/linux/bpf-cgroup.h | 13 +- + include/linux/bpf.h | 78 +- + include/linux/bpf_verifier.h | 16 +- + include/linux/cgroup.h | 18 + + include/linux/concap.h | 112 - + include/linux/filter.h | 18 +- + include/linux/i2c.h | 6 + + include/linux/if_rmnet.h | 55 + + include/linux/igmp.h | 2 +- + include/linux/inetdevice.h | 19 +- + include/linux/isdn.h | 473 --- + include/linux/isdn_divertif.h | 35 - + include/linux/isdn_ppp.h | 194 - + include/linux/isdnif.h | 505 --- + include/linux/mlx5/device.h | 2 +- + include/linux/mlx5/driver.h | 3 + + include/linux/mlx5/eswitch.h | 20 +- + include/linux/mlx5/fs.h | 1 + + include/linux/mlx5/mlx5_ifc.h | 33 +- + include/linux/netfilter.h | 5 - + include/linux/netfilter_ipv6.h | 52 + + include/linux/phy.h | 20 +- + include/linux/phylink.h | 57 +- + include/linux/platform_data/xilinx-ll-temac.h | 3 +- + include/linux/qed/qed_if.h | 10 +- + include/linux/qed/qed_rdma_if.h | 2 + + include/linux/rhashtable.h | 36 +- + include/linux/sfp.h | 12 +- + include/linux/skbuff.h | 1 + + include/linux/wanrouter.h | 11 - + include/net/devlink.h | 10 + + include/net/dsa.h | 2 + + include/net/fib_rules.h | 1 + + include/net/flow_dissector.h | 5 +- + include/net/flow_offload.h | 1 + + include/net/inet_frag.h | 37 +- + include/net/ip.h | 38 + + include/net/ip6_fib.h | 33 +- + include/net/ip6_route.h | 15 +- + include/net/ip_fib.h | 30 +- + include/net/ip_vs.h | 8 + + include/net/ipv6.h | 43 + + include/net/ipv6_stubs.h | 5 + + include/net/net_namespace.h | 2 + + include/net/netfilter/nf_conntrack.h | 1 + + include/net/netfilter/nf_conntrack_bridge.h | 20 + + include/net/netfilter/nf_conntrack_core.h | 3 + + include/net/netfilter/nf_flow_table.h | 2 - + include/net/netns/ieee802154_6lowpan.h | 2 +- + include/net/netns/ipv4.h | 2 +- + include/net/netns/ipv6.h | 4 +- + include/net/netns/nexthop.h | 18 + + include/net/nexthop.h | 308 ++ + include/net/sctp/checksum.h | 12 +- + include/net/tc_act/tc_ctinfo.h | 28 + + include/net/tcp.h | 41 +- + include/net/tls.h | 68 +- + include/net/vxlan.h | 2 +- + include/trace/events/neigh.h | 49 + + include/uapi/linux/bpf.h | 35 +- + include/uapi/linux/devlink.h | 5 + + include/uapi/linux/ethtool.h | 2 + + include/uapi/linux/if_ether.h | 1 + + include/uapi/linux/ip_vs.h | 7 + + include/uapi/linux/isdn.h | 144 - + include/uapi/linux/isdn_divertif.h | 31 - + include/uapi/linux/isdn_ppp.h | 68 - + include/uapi/linux/isdnif.h | 57 - + include/uapi/linux/mii.h | 2 + + include/uapi/linux/netfilter/xt_owner.h | 7 +- + include/uapi/linux/nexthop.h | 56 + + include/uapi/linux/pkt_cls.h | 1 + + include/uapi/linux/rds.h | 2 + + include/uapi/linux/rtnetlink.h | 10 + + include/uapi/linux/snmp.h | 1 + + include/uapi/linux/tc_act/tc_ctinfo.h | 34 + + include/uapi/linux/unix_diag.h | 2 + + include/uapi/linux/wanrouter.h | 18 - + kernel/bpf/arraymap.c | 18 +- + kernel/bpf/cgroup.c | 94 +- + kernel/bpf/core.c | 46 +- + kernel/bpf/cpumap.c | 9 +- + kernel/bpf/devmap.c | 14 +- + kernel/bpf/hashtab.c | 14 +- + kernel/bpf/local_storage.c | 13 +- + kernel/bpf/lpm_trie.c | 8 +- + kernel/bpf/queue_stack_maps.c | 13 +- + kernel/bpf/reuseport_array.c | 17 +- + kernel/bpf/stackmap.c | 28 +- + kernel/bpf/syscall.c | 103 +- + kernel/bpf/verifier.c | 397 ++- + kernel/bpf/xskmap.c | 10 +- + kernel/cgroup/cgroup.c | 11 +- + kernel/trace/bpf_trace.c | 96 +- + lib/objagg.c | 6 +- + net/8021q/vlan_dev.c | 1 + + net/bridge/br_device.c | 1 + + net/bridge/br_private.h | 1 + + net/bridge/netfilter/Kconfig | 14 + + net/bridge/netfilter/Makefile | 3 + + net/bridge/netfilter/ebt_dnat.c | 2 +- + net/bridge/netfilter/ebt_redirect.c | 2 +- + net/bridge/netfilter/ebt_snat.c | 2 +- + net/bridge/netfilter/nf_conntrack_bridge.c | 433 +++ + net/core/bpf_sk_storage.c | 12 +- + net/core/devlink.c | 140 + + net/core/filter.c | 3 +- + net/core/flow_dissector.c | 10 +- + net/core/flow_offload.c | 3 +- + net/core/neighbour.c | 2 + + net/core/netpoll.c | 10 +- + net/core/pktgen.c | 8 +- + net/core/skbuff.c | 40 +- + net/core/sock_map.c | 9 +- + net/dsa/dsa2.c | 89 +- + net/dsa/dsa_priv.h | 17 + + net/dsa/port.c | 157 + + net/dsa/slave.c | 99 +- + net/ethernet/eth.c | 14 +- + net/ieee802154/6lowpan/reassembly.c | 38 +- + net/ipv4/Makefile | 2 +- + net/ipv4/devinet.c | 146 +- + net/ipv4/fib_frontend.c | 42 +- + net/ipv4/fib_lookup.h | 1 + + net/ipv4/fib_rules.c | 8 +- + net/ipv4/fib_semantics.c | 278 +- + net/ipv4/fib_trie.c | 109 +- + net/ipv4/icmp.c | 2 +- + net/ipv4/igmp.c | 5 +- + net/ipv4/inet_connection_sock.c | 5 +- + net/ipv4/inet_fragment.c | 141 +- + net/ipv4/inet_hashtables.c | 2 +- + net/ipv4/ip_fragment.c | 67 +- + net/ipv4/ip_output.c | 342 +- + net/ipv4/netfilter/arpt_mangle.c | 2 +- + net/ipv4/netfilter/ipt_ECN.c | 4 +- + net/ipv4/netfilter/nf_nat_h323.c | 2 +- + net/ipv4/netfilter/nf_nat_snmp_basic_main.c | 2 +- + net/ipv4/netfilter/nf_tproxy_ipv4.c | 9 +- + net/ipv4/nexthop.c | 1588 +++++++++ + net/ipv4/proc.c | 5 +- + net/ipv4/route.c | 5 +- + net/ipv4/sysctl_net_ipv4.c | 93 +- + net/ipv4/tcp.c | 29 +- + net/ipv4/tcp_fastopen.c | 233 +- + net/ipv4/tcp_ipv4.c | 4 +- + net/ipv4/udp.c | 2 +- + net/ipv4/udp_offload.c | 2 +- + net/ipv6/addrconf.c | 19 +- + net/ipv6/addrconf_core.c | 6 + + net/ipv6/af_inet6.c | 5 +- + net/ipv6/icmp.c | 4 +- + net/ipv6/inet6_hashtables.c | 2 +- + net/ipv6/ip6_fib.c | 115 +- + net/ipv6/ip6_output.c | 340 +- + net/ipv6/ndisc.c | 11 +- + net/ipv6/netfilter.c | 123 + + net/ipv6/netfilter/nf_conntrack_reasm.c | 43 +- + net/ipv6/proc.c | 4 +- + net/ipv6/reassembly.c | 42 +- + net/ipv6/route.c | 625 +++- + net/ipv6/sysctl_net_ipv6.c | 3 + + net/ipv6/tcp_ipv6.c | 15 +- + net/ipv6/udp.c | 2 +- + net/mac80211/main.c | 4 +- + net/netfilter/core.c | 22 - + net/netfilter/ipvs/ip_vs_app.c | 4 +- + net/netfilter/ipvs/ip_vs_core.c | 72 +- + net/netfilter/ipvs/ip_vs_ctl.c | 83 +- + net/netfilter/ipvs/ip_vs_ftp.c | 4 +- + net/netfilter/ipvs/ip_vs_proto_sctp.c | 4 +- + net/netfilter/ipvs/ip_vs_proto_tcp.c | 4 +- + net/netfilter/ipvs/ip_vs_proto_udp.c | 4 +- + net/netfilter/ipvs/ip_vs_xmit.c | 155 +- + net/netfilter/nf_conntrack_broadcast.c | 9 +- + net/netfilter/nf_conntrack_proto.c | 126 +- + net/netfilter/nf_conntrack_proto_sctp.c | 2 +- + net/netfilter/nf_conntrack_seqadj.c | 4 +- + net/netfilter/nf_flow_table_core.c | 1 - + net/netfilter/nf_nat_helper.c | 4 +- + net/netfilter/nf_nat_proto.c | 24 +- + net/netfilter/nf_nat_redirect.c | 12 +- + net/netfilter/nf_nat_sip.c | 2 +- + net/netfilter/nf_synproxy_core.c | 2 +- + net/netfilter/nf_tables_api.c | 26 +- + net/netfilter/nfnetlink_osf.c | 5 +- + net/netfilter/nfnetlink_queue.c | 2 +- + net/netfilter/nft_exthdr.c | 3 +- + net/netfilter/nft_payload.c | 6 +- + net/netfilter/xt_DSCP.c | 8 +- + net/netfilter/xt_HL.c | 4 +- + net/netfilter/xt_TCPMSS.c | 2 +- + net/netfilter/xt_TCPOPTSTRIP.c | 28 +- + net/netfilter/xt_owner.c | 23 +- + net/openvswitch/datapath.c | 2 +- + net/rds/ib.c | 2 + + net/sched/Kconfig | 17 + + net/sched/Makefile | 1 + + net/sched/act_ctinfo.c | 392 ++ + net/sctp/offload.c | 7 +- + net/sctp/protocol.c | 2 +- + net/smc/smc_clc.c | 11 +- + net/socket.c | 2 +- + net/strparser/strparser.c | 8 +- + net/tls/tls_device.c | 28 +- + net/tls/tls_device_fallback.c | 12 +- + net/tls/tls_sw.c | 17 +- + net/unix/diag.c | 12 + + net/vmw_vsock/hyperv_transport.c | 95 +- + samples/bpf/.gitignore | 1 + + samples/bpf/Makefile | 2 - + samples/bpf/bpf_load.c | 8 +- + samples/bpf/do_hbm_test.sh | 10 +- + samples/bpf/hbm.c | 51 +- + samples/bpf/hbm.h | 9 +- + samples/bpf/hbm_kern.h | 77 +- + samples/bpf/hbm_out_kern.c | 48 +- + samples/bpf/tcp_basertt_kern.c | 7 - + samples/bpf/tcp_bufs_kern.c | 7 - + samples/bpf/tcp_clamp_kern.c | 7 - + samples/bpf/tcp_cong_kern.c | 7 - + samples/bpf/tcp_iw_kern.c | 7 - + samples/bpf/tcp_rwnd_kern.c | 7 - + samples/bpf/tcp_synrto_kern.c | 7 - + samples/bpf/tcp_tos_reflect_kern.c | 7 - + samples/bpf/xdp_sample_pkts_kern.c | 7 - + security/selinux/nlmsgtab.c | 5 +- + tools/bpf/bpftool/Documentation/bpftool-btf.rst | 39 +- + tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 4 + + .../bpf/bpftool/Documentation/bpftool-feature.rst | 4 + + tools/bpf/bpftool/Documentation/bpftool-map.rst | 4 + + tools/bpf/bpftool/Documentation/bpftool-net.rst | 4 + + tools/bpf/bpftool/Documentation/bpftool-perf.rst | 4 + + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 5 + + tools/bpf/bpftool/Documentation/bpftool.rst | 4 + + tools/bpf/bpftool/bash-completion/bpftool | 32 +- + tools/bpf/bpftool/btf.c | 162 +- + tools/bpf/bpftool/main.c | 16 +- + tools/bpf/bpftool/main.h | 1 + + tools/bpf/bpftool/prog.c | 27 +- + tools/bpf/bpftool/xlated_dumper.c | 4 +- + tools/include/uapi/linux/bpf.h | 35 +- + tools/include/uapi/linux/if_tun.h | 114 + + tools/lib/bpf/Build | 4 +- + tools/lib/bpf/Makefile | 12 +- + tools/lib/bpf/bpf.c | 1 + + tools/lib/bpf/bpf.h | 1 + + tools/lib/bpf/btf.c | 329 +- + tools/lib/bpf/btf.h | 19 + + tools/lib/bpf/btf_dump.c | 1336 +++++++ + tools/lib/bpf/hashmap.c | 229 ++ + tools/lib/bpf/hashmap.h | 173 + + tools/lib/bpf/libbpf.c | 175 +- + tools/lib/bpf/libbpf.h | 7 + + tools/lib/bpf/libbpf.map | 9 + + tools/lib/bpf/libbpf_internal.h | 2 + + tools/testing/selftests/bpf/.gitignore | 4 + + tools/testing/selftests/bpf/Makefile | 21 +- + tools/testing/selftests/bpf/bpf_helpers.h | 9 + + tools/testing/selftests/bpf/cgroup_helpers.c | 57 + + .../selftests/bpf/prog_tests/bpf_verif_scale.c | 32 +- + .../testing/selftests/bpf/prog_tests/send_signal.c | 198 ++ + .../bpf/progs/btf_dump_test_case_bitfields.c | 92 + + .../bpf/progs/btf_dump_test_case_multidim.c | 35 + + .../bpf/progs/btf_dump_test_case_namespacing.c | 73 + + .../bpf/progs/btf_dump_test_case_ordering.c | 63 + + .../bpf/progs/btf_dump_test_case_packing.c | 75 + + .../bpf/progs/btf_dump_test_case_padding.c | 111 + + .../bpf/progs/btf_dump_test_case_syntax.c | 229 ++ + tools/testing/selftests/bpf/progs/pyperf.h | 268 ++ + tools/testing/selftests/bpf/progs/pyperf100.c | 4 + + tools/testing/selftests/bpf/progs/pyperf180.c | 4 + + tools/testing/selftests/bpf/progs/pyperf50.c | 4 + + .../selftests/bpf/progs/sockmap_parse_prog.c | 7 - + .../selftests/bpf/progs/sockmap_tcp_msg_prog.c | 7 - + .../selftests/bpf/progs/sockmap_verdict_prog.c | 7 - + .../selftests/bpf/progs/test_lwt_seg6local.c | 7 - + .../selftests/bpf/progs/test_send_signal_kern.c | 51 + + .../selftests/bpf/progs/test_xdp_noinline.c | 7 - + tools/testing/selftests/bpf/progs/xdping_kern.c | 184 + + tools/testing/selftests/bpf/test_btf.c | 71 +- + tools/testing/selftests/bpf/test_btf_dump.c | 143 + + .../testing/selftests/bpf/test_cgroup_attach.c | 146 +- + tools/testing/selftests/bpf/test_hashmap.c | 382 ++ + tools/testing/selftests/bpf/test_sock_addr.c | 1 + + tools/testing/selftests/bpf/test_sock_fields.c | 1 + + tools/testing/selftests/bpf/test_socket_cookie.c | 1 + + tools/testing/selftests/bpf/test_sockmap_kern.h | 7 - + tools/testing/selftests/bpf/test_stub.c | 40 + + tools/testing/selftests/bpf/test_tunnel.sh | 32 + + tools/testing/selftests/bpf/test_verifier.c | 62 +- + tools/testing/selftests/bpf/test_xdping.sh | 99 + + tools/testing/selftests/bpf/trace_helpers.c | 4 +- + tools/testing/selftests/bpf/xdping.c | 258 ++ + tools/testing/selftests/bpf/xdping.h | 13 + + .../selftests/drivers/net/netdevsim/devlink.sh | 53 + + tools/testing/selftests/net/.gitignore | 4 + + tools/testing/selftests/net/Makefile | 5 +- + tools/testing/selftests/net/config | 2 + + tools/testing/selftests/net/fib-onlink-tests.sh | 48 +- + tools/testing/selftests/net/fib_nexthops.sh | 1026 ++++++ + tools/testing/selftests/net/icmp_redirect.sh | 485 +++ + tools/testing/selftests/net/ipv6_flowlabel.c | 229 ++ + tools/testing/selftests/net/ipv6_flowlabel.sh | 21 + + tools/testing/selftests/net/ipv6_flowlabel_mgr.c | 199 ++ + tools/testing/selftests/net/pmtu.sh | 17 +- + tools/testing/selftests/net/so_txtime.c | 296 ++ + tools/testing/selftests/net/so_txtime.sh | 31 + + .../selftests/net/tcp_fastopen_backup_key.c | 336 ++ + .../selftests/net/tcp_fastopen_backup_key.sh | 55 + + tools/testing/selftests/tc-testing/config | 1 + + 880 files changed, 36502 insertions(+), 92139 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/qca,ar71xx.txt + delete mode 100644 Documentation/isdn/HiSax.cert + delete mode 100644 Documentation/isdn/INTERFACE + delete mode 100644 Documentation/isdn/INTERFACE.fax + delete mode 100644 Documentation/isdn/README + delete mode 100644 Documentation/isdn/README.FAQ + delete mode 100644 Documentation/isdn/README.HiSax + delete mode 100644 Documentation/isdn/README.audio + delete mode 100644 Documentation/isdn/README.concap + delete mode 100644 Documentation/isdn/README.diversion + delete mode 100644 Documentation/isdn/README.fax + delete mode 100644 Documentation/isdn/README.hfc-pci + delete mode 100644 Documentation/isdn/README.syncppp + delete mode 100644 Documentation/isdn/README.x25 + delete mode 100644 Documentation/isdn/syncPPP.FAQ + delete mode 100644 drivers/isdn/capi/capidrv.c + delete mode 100644 drivers/isdn/capi/capidrv.h + delete mode 100644 drivers/isdn/divert/Makefile + delete mode 100644 drivers/isdn/divert/divert_init.c + delete mode 100644 drivers/isdn/divert/divert_procfs.c + delete mode 100644 drivers/isdn/divert/isdn_divert.c + delete mode 100644 drivers/isdn/divert/isdn_divert.h + delete mode 100644 drivers/isdn/gigaset/i4l.c + delete mode 100644 drivers/isdn/hardware/Kconfig + rename drivers/isdn/{i4l => hardware/mISDN}/isdnhdlc.c (99%) + rename include/linux/isdn/hdlc.h => drivers/isdn/hardware/mISDN/isdnhdlc.h (100%) + delete mode 100644 drivers/isdn/hisax/Kconfig + delete mode 100644 drivers/isdn/hisax/Makefile + delete mode 100644 drivers/isdn/hisax/amd7930_fn.c + delete mode 100644 drivers/isdn/hisax/amd7930_fn.h + delete mode 100644 drivers/isdn/hisax/arcofi.c + delete mode 100644 drivers/isdn/hisax/arcofi.h + delete mode 100644 drivers/isdn/hisax/asuscom.c + delete mode 100644 drivers/isdn/hisax/avm_a1.c + delete mode 100644 drivers/isdn/hisax/avm_a1p.c + delete mode 100644 drivers/isdn/hisax/avm_pci.c + delete mode 100644 drivers/isdn/hisax/avma1_cs.c + delete mode 100644 drivers/isdn/hisax/bkm_a4t.c + delete mode 100644 drivers/isdn/hisax/bkm_a8.c + delete mode 100644 drivers/isdn/hisax/bkm_ax.h + delete mode 100644 drivers/isdn/hisax/callc.c + delete mode 100644 drivers/isdn/hisax/config.c + delete mode 100644 drivers/isdn/hisax/diva.c + delete mode 100644 drivers/isdn/hisax/elsa.c + delete mode 100644 drivers/isdn/hisax/elsa_cs.c + delete mode 100644 drivers/isdn/hisax/elsa_ser.c + delete mode 100644 drivers/isdn/hisax/enternow_pci.c + delete mode 100644 drivers/isdn/hisax/fsm.c + delete mode 100644 drivers/isdn/hisax/fsm.h + delete mode 100644 drivers/isdn/hisax/gazel.c + delete mode 100644 drivers/isdn/hisax/hfc4s8s_l1.c + delete mode 100644 drivers/isdn/hisax/hfc4s8s_l1.h + delete mode 100644 drivers/isdn/hisax/hfc_2bds0.c + delete mode 100644 drivers/isdn/hisax/hfc_2bds0.h + delete mode 100644 drivers/isdn/hisax/hfc_2bs0.c + delete mode 100644 drivers/isdn/hisax/hfc_2bs0.h + delete mode 100644 drivers/isdn/hisax/hfc_pci.c + delete mode 100644 drivers/isdn/hisax/hfc_pci.h + delete mode 100644 drivers/isdn/hisax/hfc_sx.c + delete mode 100644 drivers/isdn/hisax/hfc_sx.h + delete mode 100644 drivers/isdn/hisax/hfc_usb.c + delete mode 100644 drivers/isdn/hisax/hfc_usb.h + delete mode 100644 drivers/isdn/hisax/hfcscard.c + delete mode 100644 drivers/isdn/hisax/hisax.h + delete mode 100644 drivers/isdn/hisax/hisax_cfg.h + delete mode 100644 drivers/isdn/hisax/hisax_debug.h + delete mode 100644 drivers/isdn/hisax/hisax_fcpcipnp.c + delete mode 100644 drivers/isdn/hisax/hisax_fcpcipnp.h + delete mode 100644 drivers/isdn/hisax/hisax_if.h + delete mode 100644 drivers/isdn/hisax/hisax_isac.c + delete mode 100644 drivers/isdn/hisax/hisax_isac.h + delete mode 100644 drivers/isdn/hisax/hscx.c + delete mode 100644 drivers/isdn/hisax/hscx.h + delete mode 100644 drivers/isdn/hisax/hscx_irq.c + delete mode 100644 drivers/isdn/hisax/icc.c + delete mode 100644 drivers/isdn/hisax/icc.h + delete mode 100644 drivers/isdn/hisax/ipac.h + delete mode 100644 drivers/isdn/hisax/ipacx.c + delete mode 100644 drivers/isdn/hisax/ipacx.h + delete mode 100644 drivers/isdn/hisax/isac.c + delete mode 100644 drivers/isdn/hisax/isac.h + delete mode 100644 drivers/isdn/hisax/isar.c + delete mode 100644 drivers/isdn/hisax/isar.h + delete mode 100644 drivers/isdn/hisax/isdnl1.c + delete mode 100644 drivers/isdn/hisax/isdnl1.h + delete mode 100644 drivers/isdn/hisax/isdnl2.c + delete mode 100644 drivers/isdn/hisax/isdnl2.h + delete mode 100644 drivers/isdn/hisax/isdnl3.c + delete mode 100644 drivers/isdn/hisax/isdnl3.h + delete mode 100644 drivers/isdn/hisax/isurf.c + delete mode 100644 drivers/isdn/hisax/ix1_micro.c + delete mode 100644 drivers/isdn/hisax/jade.c + delete mode 100644 drivers/isdn/hisax/jade.h + delete mode 100644 drivers/isdn/hisax/jade_irq.c + delete mode 100644 drivers/isdn/hisax/l3_1tr6.c + delete mode 100644 drivers/isdn/hisax/l3_1tr6.h + delete mode 100644 drivers/isdn/hisax/l3dss1.c + delete mode 100644 drivers/isdn/hisax/l3dss1.h + delete mode 100644 drivers/isdn/hisax/l3ni1.c + delete mode 100644 drivers/isdn/hisax/l3ni1.h + delete mode 100644 drivers/isdn/hisax/lmgr.c + delete mode 100644 drivers/isdn/hisax/mic.c + delete mode 100644 drivers/isdn/hisax/netjet.c + delete mode 100644 drivers/isdn/hisax/netjet.h + delete mode 100644 drivers/isdn/hisax/niccy.c + delete mode 100644 drivers/isdn/hisax/nj_s.c + delete mode 100644 drivers/isdn/hisax/nj_u.c + delete mode 100644 drivers/isdn/hisax/q931.c + delete mode 100644 drivers/isdn/hisax/s0box.c + delete mode 100644 drivers/isdn/hisax/saphir.c + delete mode 100644 drivers/isdn/hisax/sedlbauer.c + delete mode 100644 drivers/isdn/hisax/sedlbauer_cs.c + delete mode 100644 drivers/isdn/hisax/sportster.c + delete mode 100644 drivers/isdn/hisax/st5481.h + delete mode 100644 drivers/isdn/hisax/st5481_b.c + delete mode 100644 drivers/isdn/hisax/st5481_d.c + delete mode 100644 drivers/isdn/hisax/st5481_init.c + delete mode 100644 drivers/isdn/hisax/st5481_usb.c + delete mode 100644 drivers/isdn/hisax/tei.c + delete mode 100644 drivers/isdn/hisax/teleint.c + delete mode 100644 drivers/isdn/hisax/teles0.c + delete mode 100644 drivers/isdn/hisax/teles3.c + delete mode 100644 drivers/isdn/hisax/teles_cs.c + delete mode 100644 drivers/isdn/hisax/telespci.c + delete mode 100644 drivers/isdn/hisax/w6692.c + delete mode 100644 drivers/isdn/hisax/w6692.h + delete mode 100644 drivers/isdn/i4l/Kconfig + delete mode 100644 drivers/isdn/i4l/Makefile + delete mode 100644 drivers/isdn/i4l/isdn_audio.c + delete mode 100644 drivers/isdn/i4l/isdn_audio.h + delete mode 100644 drivers/isdn/i4l/isdn_bsdcomp.c + delete mode 100644 drivers/isdn/i4l/isdn_common.c + delete mode 100644 drivers/isdn/i4l/isdn_common.h + delete mode 100644 drivers/isdn/i4l/isdn_concap.c + delete mode 100644 drivers/isdn/i4l/isdn_concap.h + delete mode 100644 drivers/isdn/i4l/isdn_net.c + delete mode 100644 drivers/isdn/i4l/isdn_net.h + delete mode 100644 drivers/isdn/i4l/isdn_ppp.c + delete mode 100644 drivers/isdn/i4l/isdn_ppp.h + delete mode 100644 drivers/isdn/i4l/isdn_tty.c + delete mode 100644 drivers/isdn/i4l/isdn_tty.h + delete mode 100644 drivers/isdn/i4l/isdn_ttyfax.c + delete mode 100644 drivers/isdn/i4l/isdn_ttyfax.h + delete mode 100644 drivers/isdn/i4l/isdn_v110.c + delete mode 100644 drivers/isdn/i4l/isdn_v110.h + delete mode 100644 drivers/isdn/i4l/isdn_x25iface.c + delete mode 100644 drivers/isdn/i4l/isdn_x25iface.h + delete mode 100644 drivers/isdn/isdnloop/Makefile + delete mode 100644 drivers/isdn/isdnloop/isdnloop.c + delete mode 100644 drivers/isdn/isdnloop/isdnloop.h + create mode 100644 drivers/net/ethernet/atheros/ag71xx.c + delete mode 100644 drivers/net/ethernet/intel/iavf/i40e_adminq_cmd.h + rename drivers/net/ethernet/intel/iavf/{i40e_adminq.c => iavf_adminq.c} (77%) + rename drivers/net/ethernet/intel/iavf/{i40e_adminq.h => iavf_adminq.h} (58%) + create mode 100644 drivers/net/ethernet/intel/iavf/iavf_adminq_cmd.h + create mode 100644 drivers/net/ethernet/mediatek/mtk_eth_path.c + create mode 100644 drivers/net/ethernet/mediatek/mtk_sgmii.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_geneve.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_gre.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/geneve.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/geneve.h + create mode 100644 drivers/net/ethernet/mscc/ocelot_ace.c + create mode 100644 drivers/net/ethernet/mscc/ocelot_ace.h + create mode 100644 drivers/net/ethernet/mscc/ocelot_flower.c + create mode 100644 drivers/net/ethernet/mscc/ocelot_police.c + create mode 100644 drivers/net/ethernet/mscc/ocelot_police.h + create mode 100644 drivers/net/ethernet/mscc/ocelot_s2.h + create mode 100644 drivers/net/ethernet/mscc/ocelot_tc.c + create mode 100644 drivers/net/ethernet/mscc/ocelot_tc.h + create mode 100644 drivers/net/ethernet/mscc/ocelot_vcap.h + create mode 100644 drivers/net/ethernet/netronome/nfp/ccm_mbox.c + create mode 100644 drivers/net/ethernet/netronome/nfp/crypto/crypto.h + create mode 100644 drivers/net/ethernet/netronome/nfp/crypto/fw.h + create mode 100644 drivers/net/ethernet/netronome/nfp/crypto/tls.c + create mode 100644 drivers/net/ethernet/realtek/r8169_firmware.c + create mode 100644 drivers/net/ethernet/realtek/r8169_firmware.h + rename drivers/net/ethernet/realtek/{r8169.c => r8169_main.c} (92%) + create mode 100644 drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c + create mode 100644 drivers/net/phy/nxp-tja11xx.c + create mode 100644 drivers/staging/isdn/Kconfig + create mode 100644 drivers/staging/isdn/Makefile + create mode 100644 drivers/staging/isdn/TODO + rename drivers/{isdn/hardware => staging/isdn}/avm/Kconfig (100%) + rename drivers/{isdn/hardware => staging/isdn}/avm/Makefile (100%) + rename drivers/{isdn/hardware => staging/isdn}/avm/avm_cs.c (100%) + rename drivers/{isdn/hardware => staging/isdn}/avm/avmcard.h (100%) + rename drivers/{isdn/hardware => staging/isdn}/avm/b1.c (100%) + rename drivers/{isdn/hardware => staging/isdn}/avm/b1dma.c (100%) + rename drivers/{isdn/hardware => staging/isdn}/avm/b1isa.c (100%) + rename drivers/{isdn/hardware => staging/isdn}/avm/b1pci.c (100%) + rename drivers/{isdn/hardware => staging/isdn}/avm/b1pcmcia.c (100%) + rename drivers/{isdn/hardware => staging/isdn}/avm/c4.c (100%) + rename drivers/{isdn/hardware => staging/isdn}/avm/t1isa.c (100%) + rename drivers/{isdn/hardware => staging/isdn}/avm/t1pci.c (100%) + rename drivers/{ => staging}/isdn/gigaset/Kconfig (92%) + rename drivers/{ => staging}/isdn/gigaset/Makefile (74%) + rename drivers/{ => staging}/isdn/gigaset/asyncdata.c (100%) + rename drivers/{ => staging}/isdn/gigaset/bas-gigaset.c (100%) + rename drivers/{ => staging}/isdn/gigaset/capi.c (100%) + rename drivers/{ => staging}/isdn/gigaset/common.c (100%) + rename drivers/{ => staging}/isdn/gigaset/dummyll.c (100%) + rename drivers/{ => staging}/isdn/gigaset/ev-layer.c (100%) + rename drivers/{ => staging}/isdn/gigaset/gigaset.h (100%) + rename drivers/{ => staging}/isdn/gigaset/interface.c (100%) + rename drivers/{ => staging}/isdn/gigaset/isocdata.c (100%) + rename drivers/{ => staging}/isdn/gigaset/proc.c (100%) + rename drivers/{ => staging}/isdn/gigaset/ser-gigaset.c (100%) + rename drivers/{ => staging}/isdn/gigaset/usb-gigaset.c (100%) + rename drivers/{ => staging}/isdn/hysdn/Kconfig (100%) + rename drivers/{ => staging}/isdn/hysdn/Makefile (100%) + rename drivers/{ => staging}/isdn/hysdn/boardergo.c (100%) + rename drivers/{ => staging}/isdn/hysdn/boardergo.h (100%) + rename drivers/{ => staging}/isdn/hysdn/hycapi.c (100%) + rename drivers/{ => staging}/isdn/hysdn/hysdn_boot.c (100%) + rename drivers/{ => staging}/isdn/hysdn/hysdn_defs.h (100%) + rename drivers/{ => staging}/isdn/hysdn/hysdn_init.c (100%) + rename drivers/{ => staging}/isdn/hysdn/hysdn_net.c (98%) + rename drivers/{ => staging}/isdn/hysdn/hysdn_pof.h (100%) + rename drivers/{ => staging}/isdn/hysdn/hysdn_procconf.c (100%) + rename drivers/{ => staging}/isdn/hysdn/hysdn_proclog.c (100%) + rename drivers/{ => staging}/isdn/hysdn/hysdn_sched.c (100%) + rename drivers/{ => staging}/isdn/hysdn/ince1pc.h (100%) + delete mode 100644 fs/afs/netdevices.c + delete mode 100644 include/linux/concap.h + create mode 100644 include/linux/if_rmnet.h + delete mode 100644 include/linux/isdn.h + delete mode 100644 include/linux/isdn_divertif.h + delete mode 100644 include/linux/isdn_ppp.h + delete mode 100644 include/linux/isdnif.h + delete mode 100644 include/linux/wanrouter.h + create mode 100644 include/net/netfilter/nf_conntrack_bridge.h + create mode 100644 include/net/netns/nexthop.h + create mode 100644 include/net/nexthop.h + create mode 100644 include/net/tc_act/tc_ctinfo.h + delete mode 100644 include/uapi/linux/isdn.h + delete mode 100644 include/uapi/linux/isdn_divertif.h + delete mode 100644 include/uapi/linux/isdn_ppp.h + delete mode 100644 include/uapi/linux/isdnif.h + create mode 100644 include/uapi/linux/nexthop.h + create mode 100644 include/uapi/linux/tc_act/tc_ctinfo.h + delete mode 100644 include/uapi/linux/wanrouter.h + create mode 100644 net/bridge/netfilter/nf_conntrack_bridge.c + create mode 100644 net/ipv4/nexthop.c + create mode 100644 net/sched/act_ctinfo.c + create mode 100644 tools/include/uapi/linux/if_tun.h + create mode 100644 tools/lib/bpf/btf_dump.c + create mode 100644 tools/lib/bpf/hashmap.c + create mode 100644 tools/lib/bpf/hashmap.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/send_signal.c + create mode 100644 tools/testing/selftests/bpf/progs/btf_dump_test_case_bitfields.c + create mode 100644 tools/testing/selftests/bpf/progs/btf_dump_test_case_multidim.c + create mode 100644 tools/testing/selftests/bpf/progs/btf_dump_test_case_namespacing.c + create mode 100644 tools/testing/selftests/bpf/progs/btf_dump_test_case_ordering.c + create mode 100644 tools/testing/selftests/bpf/progs/btf_dump_test_case_packing.c + create mode 100644 tools/testing/selftests/bpf/progs/btf_dump_test_case_padding.c + create mode 100644 tools/testing/selftests/bpf/progs/btf_dump_test_case_syntax.c + create mode 100644 tools/testing/selftests/bpf/progs/pyperf.h + create mode 100644 tools/testing/selftests/bpf/progs/pyperf100.c + create mode 100644 tools/testing/selftests/bpf/progs/pyperf180.c + create mode 100644 tools/testing/selftests/bpf/progs/pyperf50.c + create mode 100644 tools/testing/selftests/bpf/progs/test_send_signal_kern.c + create mode 100644 tools/testing/selftests/bpf/progs/xdping_kern.c + create mode 100644 tools/testing/selftests/bpf/test_btf_dump.c + rename samples/bpf/test_cgrp2_attach2.c => tools/testing/selftests/bpf/test_cgroup_attach.c (79%) + create mode 100644 tools/testing/selftests/bpf/test_hashmap.c + create mode 100644 tools/testing/selftests/bpf/test_stub.c + create mode 100755 tools/testing/selftests/bpf/test_xdping.sh + create mode 100644 tools/testing/selftests/bpf/xdping.c + create mode 100644 tools/testing/selftests/bpf/xdping.h + create mode 100755 tools/testing/selftests/drivers/net/netdevsim/devlink.sh + create mode 100755 tools/testing/selftests/net/fib_nexthops.sh + create mode 100755 tools/testing/selftests/net/icmp_redirect.sh + create mode 100644 tools/testing/selftests/net/ipv6_flowlabel.c + create mode 100755 tools/testing/selftests/net/ipv6_flowlabel.sh + create mode 100644 tools/testing/selftests/net/ipv6_flowlabel_mgr.c + create mode 100644 tools/testing/selftests/net/so_txtime.c + create mode 100755 tools/testing/selftests/net/so_txtime.sh + create mode 100644 tools/testing/selftests/net/tcp_fastopen_backup_key.c + create mode 100755 tools/testing/selftests/net/tcp_fastopen_backup_key.sh +Merging bpf-next/master (4ecabd55c904 bpf: allow CGROUP_SKB programs to use bpf_skb_cgroup_id() helper) +$ git merge bpf-next/master +Auto-merging net/core/filter.c +Merge made by the 'recursive' strategy. + kernel/bpf/devmap.c | 2 +- + kernel/bpf/xskmap.c | 2 +- + net/core/filter.c | 4 ++++ + samples/bpf/Makefile | 9 +++++++++ + samples/bpf/hbm.c | 2 +- + 5 files changed, 16 insertions(+), 3 deletions(-) +Merging ipsec-next/master (2a99283cb7c1 Merge branch 'net-dsa-mv88e6xxx-support-for-mv88e6250') +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (8693115af4c2 {IB,net}/mlx5: Constify rep ops functions pointers) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (16e6427c88c5 netfilter: ipv6: Fix undefined symbol nf_ct_frag6_gather) +$ git merge netfilter-next/master +Merge made by the 'recursive' strategy. + net/ipv6/netfilter.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings) +$ git merge nfc-next/master +Auto-merging net/nfc/netlink.c +Auto-merging net/nfc/hci/core.c +Auto-merging drivers/nfc/st95hf/core.c +Auto-merging drivers/nfc/st21nfca/dep.c +Auto-merging drivers/nfc/fdp/i2c.c +Auto-merging drivers/nfc/fdp/fdp.c +Merge made by the 'recursive' strategy. + drivers/nfc/fdp/fdp.c | 35 +++++------------------------------ + drivers/nfc/fdp/i2c.c | 26 +++++++++++++------------- + drivers/nfc/st21nfca/dep.c | 3 ++- + drivers/nfc/st21nfca/se.c | 5 +++-- + drivers/nfc/st95hf/core.c | 7 ++----- + net/nfc/netlink.c | 6 ++++-- + 6 files changed, 29 insertions(+), 53 deletions(-) +Merging ipvs-next/master (1b0b807dd746 Merge branch 'r8169-fw') +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (ec2e93cf1910 b43: Avoid possible double calls to b43_one_core_detach()) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/realtek/rtw88/main.c +Auto-merging drivers/net/wireless/marvell/libertas_tf/if_usb.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath10k/ahb.c | 2 +- + drivers/net/wireless/ath/ath10k/core.c | 48 +- + drivers/net/wireless/ath/ath10k/core.h | 12 +- + drivers/net/wireless/ath/ath10k/coredump.c | 4 +- + drivers/net/wireless/ath/ath10k/debug.c | 50 +- + drivers/net/wireless/ath/ath10k/debugfs_sta.c | 7 + + drivers/net/wireless/ath/ath10k/htc.c | 1 + + drivers/net/wireless/ath/ath10k/htt.h | 60 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 387 ++++++++++- + drivers/net/wireless/ath/ath10k/htt_tx.c | 29 +- + drivers/net/wireless/ath/ath10k/hw.h | 6 + + drivers/net/wireless/ath/ath10k/mac.c | 14 +- + drivers/net/wireless/ath/ath10k/pci.c | 2 +- + drivers/net/wireless/ath/ath10k/qmi.c | 15 +- + drivers/net/wireless/ath/ath10k/sdio.c | 18 +- + drivers/net/wireless/ath/ath10k/snoc.c | 4 +- + drivers/net/wireless/ath/ath10k/txrx.c | 3 + + drivers/net/wireless/ath/ath10k/usb.c | 2 +- + drivers/net/wireless/ath/ath10k/wmi-tlv.c | 28 +- + drivers/net/wireless/ath/ath10k/wmi-tlv.h | 12 + + drivers/net/wireless/ath/ath10k/wmi.c | 37 +- + drivers/net/wireless/ath/ath10k/wmi.h | 7 +- + drivers/net/wireless/ath/ath6kl/debug.c | 3 +- + drivers/net/wireless/ath/ath6kl/htc_pipe.c | 3 - + drivers/net/wireless/ath/ath6kl/wmi.c | 13 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 24 +- + drivers/net/wireless/ath/ath9k/eeprom.c | 2 +- + drivers/net/wireless/ath/ath9k/eeprom_4k.c | 1 + + drivers/net/wireless/ath/ath9k/hw.c | 40 +- + drivers/net/wireless/ath/ath9k/hw.h | 1 + + drivers/net/wireless/ath/ath9k/init.c | 2 +- + drivers/net/wireless/ath/ath9k/xmit.c | 18 +- + drivers/net/wireless/ath/carl9170/mac.c | 2 +- + drivers/net/wireless/ath/carl9170/rx.c | 2 +- + drivers/net/wireless/ath/dfs_pattern_detector.c | 2 +- + drivers/net/wireless/ath/regd.h | 1 - + drivers/net/wireless/ath/wil6210/cfg80211.c | 4 +- + drivers/net/wireless/ath/wil6210/debugfs.c | 70 +- + drivers/net/wireless/ath/wil6210/fw.h | 11 +- + drivers/net/wireless/ath/wil6210/fw_inc.c | 148 +++-- + drivers/net/wireless/ath/wil6210/interrupt.c | 67 +- + drivers/net/wireless/ath/wil6210/main.c | 18 +- + drivers/net/wireless/ath/wil6210/pcie_bus.c | 2 + + drivers/net/wireless/ath/wil6210/rx_reorder.c | 2 +- + drivers/net/wireless/ath/wil6210/txrx.c | 26 +- + drivers/net/wireless/ath/wil6210/txrx_edma.c | 10 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 33 +- + drivers/net/wireless/ath/wil6210/wmi.c | 14 +- + drivers/net/wireless/broadcom/b43/main.c | 7 +- + drivers/net/wireless/broadcom/brcm80211/Kconfig | 52 +- + drivers/net/wireless/broadcom/brcm80211/Makefile | 14 +- + .../wireless/broadcom/brcm80211/brcmfmac/Kconfig | 50 ++ + .../wireless/broadcom/brcm80211/brcmfmac/Makefile | 14 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcdc.c | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcdc.h | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/btcoex.c | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/btcoex.h | 13 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 13 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 13 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.h | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/chip.h | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/common.c | 15 +- + .../wireless/broadcom/brcm80211/brcmfmac/common.h | 16 +- + .../broadcom/brcm80211/brcmfmac/commonring.c | 16 +- + .../broadcom/brcm80211/brcmfmac/commonring.h | 16 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.h | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/debug.c | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/debug.h | 13 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/dmi.c | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/feature.h | 13 +- + .../broadcom/brcm80211/brcmfmac/firmware.c | 13 +- + .../broadcom/brcm80211/brcmfmac/firmware.h | 13 +- + .../broadcom/brcm80211/brcmfmac/flowring.c | 16 +- + .../broadcom/brcm80211/brcmfmac/flowring.h | 16 +- + .../wireless/broadcom/brcm80211/brcmfmac/fweh.c | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/fweh.h | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/fwil.c | 15 +- + .../wireless/broadcom/brcm80211/brcmfmac/fwil.h | 13 +- + .../broadcom/brcm80211/brcmfmac/fwil_types.h | 13 +- + .../broadcom/brcm80211/brcmfmac/fwsignal.c | 13 +- + .../broadcom/brcm80211/brcmfmac/fwsignal.h | 14 +- + .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 16 +- + .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.h | 16 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/of.c | 13 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/of.h | 13 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 13 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.h | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 16 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.h | 16 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/pno.c | 13 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/pno.h | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/proto.c | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/proto.h | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.h | 13 +- + .../broadcom/brcm80211/brcmfmac/tracepoint.c | 13 +- + .../broadcom/brcm80211/brcmfmac/tracepoint.h | 13 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 13 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/usb.h | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/vendor.c | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/vendor.h | 13 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_cmn.c | 13 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_hal.h | 13 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_int.h | 13 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 13 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_lcn.h | 13 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_n.c | 13 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_qmath.c | 13 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_qmath.h | 13 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_radio.h | 13 +- + .../broadcom/brcm80211/brcmsmac/phy/phyreg_n.h | 13 +- + .../broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.c | 13 +- + .../broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.h | 13 +- + .../broadcom/brcm80211/brcmsmac/phy/phytbl_n.c | 13 +- + .../broadcom/brcm80211/brcmsmac/phy/phytbl_n.h | 13 +- + .../wireless/broadcom/brcm80211/brcmutil/Makefile | 13 +- + .../net/wireless/broadcom/brcm80211/brcmutil/d11.c | 13 +- + .../wireless/broadcom/brcm80211/brcmutil/utils.c | 13 +- + .../broadcom/brcm80211/include/brcm_hw_ids.h | 13 +- + .../broadcom/brcm80211/include/brcmu_d11.h | 13 +- + .../broadcom/brcm80211/include/brcmu_utils.h | 13 +- + .../broadcom/brcm80211/include/brcmu_wifi.h | 13 +- + .../broadcom/brcm80211/include/chipcommon.h | 13 +- + .../net/wireless/broadcom/brcm80211/include/defs.h | 13 +- + .../net/wireless/broadcom/brcm80211/include/soc.h | 13 +- + drivers/net/wireless/intersil/p54/txrx.c | 11 +- + drivers/net/wireless/marvell/libertas/if_usb.c | 2 +- + drivers/net/wireless/marvell/libertas_tf/if_usb.c | 2 +- + .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 35 +- + .../realtek/rtlwifi/btcoexist/halbtcoutsrc.h | 1 - + .../wireless/realtek/rtlwifi/btcoexist/rtl_btc.c | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/dm.c | 695 ++++++++++---------- + .../net/wireless/realtek/rtlwifi/rtl8821ae/dm.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/trx.c | 253 ++++---- + .../net/wireless/realtek/rtlwifi/rtl8821ae/trx.h | 708 +++++++++++---------- + drivers/net/wireless/realtek/rtlwifi/wifi.h | 1 + + drivers/net/wireless/realtek/rtw88/main.c | 2 +- + drivers/net/wireless/realtek/rtw88/pci.c | 10 +- + 142 files changed, 2033 insertions(+), 2122 deletions(-) + create mode 100644 drivers/net/wireless/broadcom/brcm80211/brcmfmac/Kconfig +Merging bluetooth/master (8b5e07d7ee95 inet_connection_sock: remove unused parameter of reqsk_queue_unlink func) +$ git merge bluetooth/master +Already up to date. +Merging mac80211-next/master (a3ce17d1495b cfg80211: Handle bss expiry during connection) +$ git merge mac80211-next/master +Auto-merging include/net/cfg80211.h +Merge made by the 'recursive' strategy. + include/net/cfg80211.h | 15 +++++++++++---- + net/wireless/core.h | 4 ++++ + net/wireless/scan.c | 12 +++++++----- + net/wireless/sme.c | 32 ++++++++++++++++++++++++++++---- + 4 files changed, 50 insertions(+), 13 deletions(-) +Merging gfs2/for-next (d8e126ba276a gfs2: Clean up freeing struct gfs2_sbd) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/ops_fstype.c | 23 ++++++++++++++--------- + fs/gfs2/super.h | 2 ++ + fs/gfs2/sys.c | 3 +-- + 3 files changed, 17 insertions(+), 11 deletions(-) +Merging mtd/mtd/next (a188339ca5a3 Linux 5.2-rc1) +$ git merge mtd/mtd/next +Already up to date. +Merging nand/nand/next (5dc353d306bf mtd: onenand_base: Avoid fall-through warnings) +$ git merge nand/nand/next +Auto-merging drivers/mtd/nand/raw/nand_base.c +Auto-merging drivers/mtd/nand/raw/mtk_nand.c +Removing drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c +Auto-merging drivers/mtd/nand/raw/gpmi-nand/Makefile +Auto-merging drivers/mtd/nand/raw/brcmnand/brcmnand.c +Auto-merging Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt +Resolved 'Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 81eb60563c10] Merge remote-tracking branch 'nand/nand/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/mtd/brcm,brcmnand.txt | 4 +- + drivers/dma/mxs-dma.c | 25 +- + drivers/mtd/nand/onenand/onenand_base.c | 5 + + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 13 +- + drivers/mtd/nand/raw/fsmc_nand.c | 19 +- + drivers/mtd/nand/raw/gpmi-nand/Makefile | 1 - + drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c | 934 ----------- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 1709 ++++++++++++++------ + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h | 64 +- + drivers/mtd/nand/raw/mtk_nand.c | 84 +- + drivers/mtd/nand/raw/nand_base.c | 80 +- + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 6 + + drivers/mtd/nand/spi/core.c | 2 +- + drivers/mtd/nand/spi/gigadevice.c | 79 +- + include/linux/dma/mxs-dma.h | 24 + + include/linux/mtd/onenand_regs.h | 1 + + include/linux/mtd/rawnand.h | 36 + + include/linux/mtd/spinand.h | 34 +- + 18 files changed, 1515 insertions(+), 1605 deletions(-) + delete mode 100644 drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c + create mode 100644 include/linux/dma/mxs-dma.h +Merging spi-nor/spi-nor/next (a188339ca5a3 Linux 5.2-rc1) +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (7545b6c2087f crypto: chacha20poly1305 - fix atomic sleep when using async algorithm) +$ git merge crypto/master +Auto-merging include/linux/crypto.h +Auto-merging include/crypto/internal/hash.h +Removing include/crypto/crypto_wq.h +Auto-merging include/crypto/algapi.h +Auto-merging drivers/i2c/i2c-core-acpi.c +Auto-merging drivers/crypto/talitos.c +CONFLICT (content): Merge conflict in drivers/crypto/talitos.c +Auto-merging drivers/crypto/ixp4xx_crypto.c +Auto-merging drivers/crypto/cavium/cpt/cptvf_algs.c +Auto-merging drivers/crypto/caam/ctrl.c +Removing drivers/crypto/atmel-ecc.h +Auto-merging drivers/crypto/amcc/crypto4xx_core.h +Auto-merging drivers/crypto/amcc/crypto4xx_core.c +Auto-merging drivers/crypto/amcc/crypto4xx_alg.c +Auto-merging drivers/crypto/Kconfig +Auto-merging crypto/testmgr.h +Auto-merging crypto/testmgr.c +Auto-merging crypto/lrw.c +Auto-merging crypto/jitterentropy-kcapi.c +CONFLICT (modify/delete): crypto/crypto_wq.c deleted in crypto/master and modified in HEAD. Version HEAD of crypto/crypto_wq.c left in tree. +Auto-merging crypto/cryptd.c +Auto-merging crypto/chacha20poly1305.c +Auto-merging crypto/algapi.c +Resolved 'drivers/crypto/talitos.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f crypto/crypto_wq.c +crypto/crypto_wq.c: needs merge +rm 'crypto/crypto_wq.c' +$ git commit -v -a +[master 7c096e9903ec] Merge remote-tracking branch 'crypto/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/crypto/architecture.rst | 4 +- + .../devicetree/bindings/crypto/atmel-crypto.txt | 13 - + .../devicetree/bindings/trivial-devices.yaml | 4 + + arch/arm/crypto/sha512-glue.c | 2 +- + arch/arm64/crypto/sha1-ce-glue.c | 2 +- + arch/arm64/crypto/sha2-ce-glue.c | 2 +- + crypto/Kconfig | 35 +- + crypto/Makefile | 3 +- + crypto/algapi.c | 13 - + crypto/chacha20poly1305.c | 30 +- + crypto/cryptd.c | 26 +- + crypto/crypto_wq.c | 35 -- + crypto/drbg.c | 94 ++++- + crypto/ghash-generic.c | 8 +- + crypto/jitterentropy-kcapi.c | 5 - + crypto/jitterentropy.c | 305 +++++---------- + crypto/lrw.c | 2 +- + crypto/testmgr.c | 409 +++++++++++++++++---- + crypto/testmgr.h | 116 +++++- + crypto/xxhash_generic.c | 108 ++++++ + drivers/char/hw_random/meson-rng.c | 52 +-- + drivers/crypto/Kconfig | 20 +- + drivers/crypto/Makefile | 2 + + drivers/crypto/amcc/crypto4xx_alg.c | 36 +- + drivers/crypto/amcc/crypto4xx_core.c | 24 +- + drivers/crypto/amcc/crypto4xx_core.h | 10 +- + drivers/crypto/atmel-ecc.c | 403 ++------------------ + drivers/crypto/atmel-ecc.h | 116 ------ + drivers/crypto/atmel-i2c.c | 364 ++++++++++++++++++ + drivers/crypto/atmel-i2c.h | 197 ++++++++++ + drivers/crypto/atmel-sha204a.c | 171 +++++++++ + drivers/crypto/caam/Kconfig | 46 +-- + drivers/crypto/caam/Makefile | 18 +- + drivers/crypto/caam/caamalg.c | 253 ++++++------- + drivers/crypto/caam/caamalg_desc.c | 116 +++--- + drivers/crypto/caam/caamalg_qi.c | 171 ++++----- + drivers/crypto/caam/caamalg_qi2.c | 76 +++- + drivers/crypto/caam/caamhash.c | 314 ++++++---------- + drivers/crypto/caam/caampkc.c | 175 +++++---- + drivers/crypto/caam/caampkc.h | 9 +- + drivers/crypto/caam/caamrng.c | 76 +--- + drivers/crypto/caam/ctrl.c | 56 +-- + drivers/crypto/caam/desc_constr.h | 11 + + drivers/crypto/caam/error.c | 8 +- + drivers/crypto/caam/error.h | 2 +- + drivers/crypto/caam/intern.h | 102 ++++- + drivers/crypto/caam/jr.c | 43 +++ + drivers/crypto/caam/key_gen.c | 28 +- + drivers/crypto/caam/qi.c | 52 ++- + drivers/crypto/caam/sg_sw_sec4.h | 8 +- + drivers/crypto/cavium/cpt/cptvf_algs.c | 1 - + drivers/crypto/ccp/ccp-crypto-aes.c | 8 +- + drivers/crypto/ccp/ccp-ops.c | 21 +- + drivers/crypto/inside-secure/safexcel.c | 13 +- + drivers/crypto/inside-secure/safexcel.h | 17 +- + drivers/crypto/inside-secure/safexcel_cipher.c | 116 +++--- + drivers/crypto/inside-secure/safexcel_hash.c | 92 +++-- + drivers/crypto/inside-secure/safexcel_ring.c | 3 + + drivers/crypto/ixp4xx_crypto.c | 15 +- + drivers/crypto/qat/qat_common/qat_algs.c | 288 ++++++++++----- + drivers/crypto/qat/qat_common/qat_crypto.h | 2 + + drivers/crypto/talitos.c | 268 +++++++------- + drivers/crypto/talitos.h | 45 +-- + drivers/crypto/vmx/aes.c | 14 +- + drivers/crypto/vmx/aes_cbc.c | 197 ++++------ + drivers/crypto/vmx/aes_ctr.c | 179 ++++----- + drivers/crypto/vmx/aes_xts.c | 189 ++++------ + drivers/crypto/vmx/aesp8-ppc.h | 2 - + drivers/crypto/vmx/vmx.c | 86 ++--- + drivers/i2c/i2c-core-acpi.c | 6 +- + include/crypto/algapi.h | 7 - + include/crypto/crypto_wq.h | 8 - + include/crypto/drbg.h | 2 + + include/crypto/internal/hash.h | 6 - + include/linux/crypto.h | 1 - + 75 files changed, 3187 insertions(+), 2574 deletions(-) + delete mode 100644 crypto/crypto_wq.c + create mode 100644 crypto/xxhash_generic.c + delete mode 100644 drivers/crypto/atmel-ecc.h + create mode 100644 drivers/crypto/atmel-i2c.c + create mode 100644 drivers/crypto/atmel-i2c.h + create mode 100644 drivers/crypto/atmel-sha204a.c + delete mode 100644 include/crypto/crypto_wq.h +Merging drm/drm-next (396f9acaffd8 Merge branch 'drm-next-5.3' of git://people.freedesktop.org/~agd5f/linux into drm-next) +$ git merge drm/drm-next +Removing include/drm/gma_drm.h +Auto-merging include/drm/bridge/dw_mipi_dsi.h +Auto-merging drivers/gpu/drm/vc4/vc4_plane.c +Auto-merging drivers/gpu/drm/sun4i/sun4i_drv.c +Auto-merging drivers/gpu/drm/rockchip/rockchip_drm_vop.c +Auto-merging drivers/gpu/drm/panel/panel-innolux-p079zca.c +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c +Auto-merging drivers/gpu/drm/mediatek/mtk_hdmi.c +Auto-merging drivers/gpu/drm/mediatek/mtk_drm_fb.c +Auto-merging drivers/gpu/drm/imx/ipuv3-plane.c +Removing drivers/gpu/drm/i915/intel_context.h +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c +Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.c +Auto-merging drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c +Auto-merging drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c +Auto-merging drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h +Auto-merging drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +Auto-merging drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_dump.c +Auto-merging drivers/gpu/drm/drm_simple_kms_helper.c +Auto-merging drivers/gpu/drm/drm_lease.c +Auto-merging drivers/gpu/drm/drm_gem_framebuffer_helper.c +Auto-merging drivers/gpu/drm/drm_gem_cma_helper.c +Auto-merging drivers/gpu/drm/drm_atomic_helper.c +Removing drivers/gpu/drm/cirrus/cirrus_ttm.c +Removing drivers/gpu/drm/cirrus/cirrus_drv.h +Auto-merging drivers/gpu/drm/bridge/tc358767.c +Auto-merging drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +Auto-merging drivers/gpu/drm/bridge/sii902x.c +Auto-merging drivers/gpu/drm/bridge/panel.c +Auto-merging drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c +Auto-merging drivers/gpu/drm/bridge/lvds-encoder.c +Auto-merging drivers/gpu/drm/bridge/dumb-vga-dac.c +Auto-merging drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c +Auto-merging drivers/gpu/drm/bridge/analogix/analogix_dp_core.h +Auto-merging drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +Auto-merging drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +Auto-merging drivers/gpu/drm/bochs/bochs_mm.c +Auto-merging drivers/gpu/drm/bochs/bochs_kms.c +Auto-merging drivers/gpu/drm/bochs/bochs_drv.c +Removing drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/display/sunxi/sun6i-dsi.txt +Recorded preimage for 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c'. +[master e6cc7d805336] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + .../display/allwinner,sun6i-a31-mipi-dsi.yaml | 100 ++ + .../devicetree/bindings/display/bridge/sii902x.txt | 42 +- + .../bindings/display/bridge/toshiba,tc358767.txt | 1 + + .../display/panel/armadeus,st0700-adapt.txt | 9 + + .../bindings/display/panel/edt,et-series.txt | 16 + + .../display/panel/evervision,vgg804821.txt | 12 + + .../bindings/display/panel/friendlyarm,hd702e.txt | 32 + + .../bindings/display/panel/koe,tx14d24vm1bpa.txt | 42 + + .../display/panel/osddisplays,osd101t2045-53ts.txt | 11 + + .../display/panel/osddisplays,osd101t2587-53ts.txt | 14 + + .../bindings/display/panel/samsung,s6e63m0.txt | 33 + + .../display/panel/tfc,s9700rtwv43tr-01b.txt | 15 + + .../bindings/display/panel/vl050_8048nt_c01.txt | 12 + + .../devicetree/bindings/display/st,stm32-ltdc.txt | 3 + + .../bindings/display/sunxi/sun6i-dsi.txt | 93 -- + .../devicetree/bindings/gpu/arm,mali-midgard.txt | 19 +- + .../phy/allwinner,sun6i-a31-mipi-dphy.yaml | 57 + + .../devicetree/bindings/vendor-prefixes.yaml | 6 + + Documentation/gpu/amdgpu.rst | 24 +- + Documentation/gpu/drivers.rst | 1 + + Documentation/gpu/drm-client.rst | 3 + + Documentation/gpu/drm-kms-helpers.rst | 6 + + Documentation/gpu/drm-mm.rst | 34 +- + Documentation/gpu/drm-uapi.rst | 19 +- + Documentation/gpu/mcde.rst | 8 + + Documentation/gpu/todo.rst | 30 +- + MAINTAINERS | 9 +- + drivers/dma-buf/dma-buf.c | 39 +- + drivers/dma-buf/reservation.c | 4 + + drivers/dma-buf/sync_debug.c | 26 - + drivers/dma-buf/sync_debug.h | 1 - + drivers/gpu/drm/Kconfig | 9 + + drivers/gpu/drm/Makefile | 8 +- + drivers/gpu/drm/amd/amdgpu/Kconfig | 7 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 31 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 70 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 83 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 234 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 144 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 395 ++++--- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 4 - + .../amdgpu/{amdgpu_prime.c => amdgpu_dma_buf.c} | 131 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h | 46 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 14 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 93 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gds.h | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 16 - + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 185 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 254 ++++- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 28 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 37 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 248 +++- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 289 ++--- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 63 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 130 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 23 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 44 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 13 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 81 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 3 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 13 + + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 428 +++++++ + drivers/gpu/drm/amd/amdgpu/df_v3_6.h | 17 + + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 32 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 32 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 438 ++++++-- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 28 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 35 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 25 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 21 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 15 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 15 +- + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 8 + + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 131 ++- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 43 +- + drivers/gpu/drm/amd/amdgpu/si.c | 13 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 89 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 10 + + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 68 +- + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 1 + + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 3 + + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 135 ++- + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 91 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 13 + + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 483 ++++---- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx8.asm | 13 - + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm | 63 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 83 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.h | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 49 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 375 ++++--- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 14 +- + .../drm/amd/amdkfd/kfd_device_queue_manager_cik.c | 2 + + .../drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 1 + + .../drm/amd/amdkfd/kfd_device_queue_manager_vi.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 70 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 8 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 53 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 85 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 55 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h | 14 +- + drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_vi.h | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 24 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 71 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 18 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 3 + + drivers/gpu/drm/amd/display/Kconfig | 6 - + drivers/gpu/drm/amd/display/Makefile | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 303 ++++- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 1 - + drivers/gpu/drm/amd/display/dc/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 2 + + .../amd/display/dc/bios/command_table_helper2.c | 5 - + .../gpu/drm/amd/display/dc/calcs/dcn_calc_auto.h | 1 + + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 57 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 75 ++ + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 134 +++ + .../amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c | 471 ++++++++ + .../amd/display/dc/clk_mgr/dce100/dce_clk_mgr.h | 81 ++ + .../amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c | 276 +++++ + .../amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.h | 44 + + .../amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.c | 239 ++++ + .../amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.h | 39 + + .../amd/display/dc/clk_mgr/dce120/dce120_clk_mgr.c | 145 +++ + .../amd/display/dc/clk_mgr/dce120/dce120_clk_mgr.h | 34 + + .../dcn10/rv1_clk_mgr.c} | 185 ++- + .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.h | 31 + + .../amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr_clk.c | 79 ++ + .../amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr_clk.h | 29 + + .../dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.c | 126 +++ + .../dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.h | 32 + + .../drm/amd/display/dc/clk_mgr/dcn10/rv2_clk_mgr.c | 43 + + .../dcn10/rv2_clk_mgr.h} | 13 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 250 ++--- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 29 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 165 ++- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 12 + + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 132 +-- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 56 +- + drivers/gpu/drm/amd/display/dc/dc.h | 8 +- + drivers/gpu/drm/amd/display/dc/dc_helper.c | 2 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_link.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 1 - + drivers/gpu/drm/amd/display/dc/dc_types.h | 2 +- + drivers/gpu/drm/amd/display/dc/dce/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 13 + + drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c | 961 ---------------- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 5 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 6 + + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h | 2 + + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 7 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.h | 3 + + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 14 +- + .../amd/display/dc/dce100/dce100_hw_sequencer.c | 9 +- + .../drm/amd/display/dc/dce100/dce100_resource.c | 72 +- + .../drm/amd/display/dc/dce100/dce100_resource.h | 5 + + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 120 +- + .../drm/amd/display/dc/dce110/dce110_resource.c | 67 +- + .../drm/amd/display/dc/dce110/dce110_resource.h | 5 + + .../display/dc/dce110/dce110_timing_generator.c | 5 + + .../display/dc/dce110/dce110_timing_generator.h | 5 + + .../display/dc/dce110/dce110_timing_generator_v.c | 5 + + .../drm/amd/display/dc/dce112/dce112_resource.c | 31 +- + .../drm/amd/display/dc/dce120/dce120_resource.c | 29 +- + .../display/dc/dce120/dce120_timing_generator.c | 96 +- + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 50 +- + .../amd/display/dc/dce80/dce80_timing_generator.c | 7 +- + drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 2 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.h | 31 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 430 +++---- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 16 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 85 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 2 + + .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 2 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 184 ++- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 59 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 68 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.h | 5 + + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 128 ++- + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 39 + + drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 33 +- + .../drm/amd/display/dc/dml/display_mode_enums.h | 6 + + .../drm/amd/display/dc/dml/display_mode_structs.h | 5 + + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 4 - + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 5 - + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 27 +- + drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/abm.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/audio.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 33 +- + .../dce_clk_mgr.h => inc/hw/clk_mgr_internal.h} | 152 +-- + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 17 + + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 1 + + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 20 +- + .../drm/amd/display/dc/inc/hw/timing_generator.h | 28 +- + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 5 + + drivers/gpu/drm/amd/display/dc/inc/resource.h | 2 + + .../drm/amd/display/include/bios_parser_types.h | 3 +- + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 14 +- + drivers/gpu/drm/amd/display/include/dal_types.h | 2 - + .../gpu/drm/amd/display/include/set_mode_types.h | 5 +- + .../drm/amd/display/modules/color/color_gamma.c | 62 +- + .../drm/amd/display/modules/color/color_gamma.h | 1 + + .../amd/display/modules/info_packet/info_packet.c | 4 +- + .../drm/amd/include/asic_reg/df/df_3_6_offset.h | 18 + + .../drm/amd/include/asic_reg/gc/gc_9_0_offset.h | 31 + + .../drm/amd/include/asic_reg/nbio/nbio_6_1_smn.h | 3 + + .../drm/amd/include/asic_reg/nbio/nbio_7_0_smn.h | 3 + + .../drm/amd/include/asic_reg/nbio/nbio_7_4_0_smn.h | 3 + + drivers/gpu/drm/amd/include/cik_structs.h | 3 +- + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 1 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 11 + + drivers/gpu/drm/amd/include/v9_structs.h | 3 +- + drivers/gpu/drm/amd/include/vi_structs.h | 3 +- + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 76 +- + .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 18 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 5 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 156 ++- + .../amd/powerplay/hwmgr/vega10_processpptables.c | 24 + + .../amd/powerplay/hwmgr/vega10_processpptables.h | 1 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 123 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.h | 3 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 84 +- + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 12 +- + drivers/gpu/drm/amd/powerplay/inc/power_state.h | 7 + + drivers/gpu/drm/amd/powerplay/inc/pp_thermal.h | 12 +- + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 3 + + drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 1 + + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 191 +++- + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 2 + + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 2 + + .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 2 + + .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 2 + + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 2 + + .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c | 21 + + .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 2 + + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 153 +++ + drivers/gpu/drm/amd/powerplay/vega20_ppt.h | 44 + + drivers/gpu/drm/arm/malidp_crtc.c | 28 +- + drivers/gpu/drm/arm/malidp_hw.c | 3 +- + drivers/gpu/drm/arm/malidp_mw.c | 2 +- + drivers/gpu/drm/arm/malidp_planes.c | 8 +- + drivers/gpu/drm/armada/armada_fb.c | 3 +- + drivers/gpu/drm/ast/Kconfig | 3 +- + drivers/gpu/drm/ast/ast_drv.c | 13 +- + drivers/gpu/drm/ast/ast_drv.h | 71 +- + drivers/gpu/drm/ast/ast_fb.c | 41 +- + drivers/gpu/drm/ast/ast_main.c | 77 +- + drivers/gpu/drm/ast/ast_mode.c | 132 ++- + drivers/gpu/drm/ast/ast_ttm.c | 302 +---- + drivers/gpu/drm/ati_pcigart.c | 5 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 18 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 120 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 2 + + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 11 +- + drivers/gpu/drm/bochs/Kconfig | 2 +- + drivers/gpu/drm/bochs/bochs.h | 54 +- + drivers/gpu/drm/bochs/bochs_drv.c | 24 +- + drivers/gpu/drm/bochs/bochs_kms.c | 18 +- + drivers/gpu/drm/bochs/bochs_mm.c | 427 +------ + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 8 +- + drivers/gpu/drm/bridge/analogix-anx78xx.c | 8 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 30 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 2 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 10 +- + drivers/gpu/drm/bridge/dumb-vga-dac.c | 2 +- + drivers/gpu/drm/bridge/lvds-encoder.c | 10 +- + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 3 +- + drivers/gpu/drm/bridge/nxp-ptn3460.c | 3 +- + drivers/gpu/drm/bridge/panel.c | 5 +- + drivers/gpu/drm/bridge/parade-ps8622.c | 3 +- + drivers/gpu/drm/bridge/sii902x.c | 491 +++++++- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 27 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 9 +- + drivers/gpu/drm/bridge/tc358764.c | 14 +- + drivers/gpu/drm/bridge/tc358767.c | 593 ++++++---- + drivers/gpu/drm/bridge/thc63lvd1024.c | 10 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 18 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 4 +- + drivers/gpu/drm/cirrus/cirrus_drv.h | 250 ----- + drivers/gpu/drm/cirrus/cirrus_ttm.c | 337 ------ + drivers/gpu/drm/drm_agpsupport.c | 11 +- + drivers/gpu/drm/drm_atomic.c | 9 +- + drivers/gpu/drm/drm_atomic_helper.c | 13 +- + drivers/gpu/drm/drm_atomic_state_helper.c | 48 +- + drivers/gpu/drm/drm_atomic_uapi.c | 16 +- + drivers/gpu/drm/drm_auth.c | 30 +- + drivers/gpu/drm/drm_blend.c | 9 +- + drivers/gpu/drm/drm_bufs.c | 21 +- + drivers/gpu/drm/drm_client.c | 15 +- + drivers/gpu/drm/drm_client_modeset.c | 104 ++ + drivers/gpu/drm/drm_color_mgmt.c | 8 +- + drivers/gpu/drm/drm_connector.c | 89 +- + drivers/gpu/drm/drm_context.c | 8 +- + drivers/gpu/drm/drm_crtc_helper.c | 14 +- + drivers/gpu/drm/drm_crtc_internal.h | 24 +- + drivers/gpu/drm/drm_damage_helper.c | 2 +- + drivers/gpu/drm/drm_debugfs.c | 13 +- + drivers/gpu/drm/drm_debugfs_crc.c | 9 +- + drivers/gpu/drm/drm_dma.c | 6 +- + drivers/gpu/drm/drm_dp_aux_dev.c | 8 +- + drivers/gpu/drm/drm_dp_dual_mode_helper.c | 4 +- + drivers/gpu/drm/drm_dp_helper.c | 12 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 19 +- + drivers/gpu/drm/drm_drv.c | 9 +- + drivers/gpu/drm/drm_dumb_buffers.c | 4 +- + drivers/gpu/drm/drm_edid.c | 135 ++- + drivers/gpu/drm/drm_edid_load.c | 9 +- + drivers/gpu/drm/drm_encoder.c | 4 +- + drivers/gpu/drm/drm_fb_helper.c | 558 +++++---- + drivers/gpu/drm/drm_file.c | 133 +-- + drivers/gpu/drm/drm_flip_work.c | 6 +- + drivers/gpu/drm/drm_format_helper.c | 4 +- + drivers/gpu/drm/drm_fourcc.c | 120 +- + drivers/gpu/drm/drm_framebuffer.c | 13 +- + drivers/gpu/drm/drm_gem.c | 8 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 11 +- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 7 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 772 +++++++++++++ + drivers/gpu/drm/drm_hashtab.c | 10 +- + drivers/gpu/drm/drm_hdcp.c | 382 +++++++ + drivers/gpu/drm/drm_internal.h | 17 +- + drivers/gpu/drm/drm_ioc32.c | 9 +- + drivers/gpu/drm/drm_ioctl.c | 22 +- + drivers/gpu/drm/drm_irq.c | 13 +- + drivers/gpu/drm/drm_kms_helper_common.c | 3 +- + drivers/gpu/drm/drm_lease.c | 15 +- + drivers/gpu/drm/drm_legacy.h | 6 + + drivers/gpu/drm/drm_legacy_misc.c | 27 +- + drivers/gpu/drm/drm_lock.c | 8 +- + drivers/gpu/drm/drm_memory.c | 9 +- + drivers/gpu/drm/drm_mm.c | 9 +- + drivers/gpu/drm/drm_mode_config.c | 6 +- + drivers/gpu/drm/drm_mode_object.c | 9 +- + drivers/gpu/drm/drm_modes.c | 7 +- + drivers/gpu/drm/drm_modeset_lock.c | 2 +- + drivers/gpu/drm/drm_of.c | 5 +- + drivers/gpu/drm/drm_pci.c | 11 +- + drivers/gpu/drm/drm_plane_helper.c | 9 +- + drivers/gpu/drm/drm_prime.c | 84 +- + drivers/gpu/drm/drm_print.c | 7 +- + drivers/gpu/drm/drm_probe_helper.c | 16 +- + drivers/gpu/drm/drm_property.c | 7 +- + drivers/gpu/drm/drm_rect.c | 4 +- + drivers/gpu/drm/drm_scatter.c | 9 +- + drivers/gpu/drm/drm_scdc_helper.c | 2 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 5 +- + drivers/gpu/drm/drm_syncobj.c | 13 +- + drivers/gpu/drm/drm_sysfs.c | 17 +- + drivers/gpu/drm/drm_trace.h | 2 + + drivers/gpu/drm/drm_trace_points.c | 3 +- + drivers/gpu/drm/drm_vblank.c | 12 +- + drivers/gpu/drm/drm_vm.c | 14 +- + drivers/gpu/drm/drm_vma_manager.c | 6 +- + drivers/gpu/drm/drm_vram_helper_common.c | 96 ++ + drivers/gpu/drm/drm_vram_mm_helper.c | 297 +++++ + drivers/gpu/drm/drm_writeback.c | 6 +- + drivers/gpu/drm/etnaviv/etnaviv_dump.c | 5 - + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 2 +- + drivers/gpu/drm/gma500/accel_2d.c | 18 +- + drivers/gpu/drm/gma500/blitter.h | 2 + + drivers/gpu/drm/gma500/cdv_device.c | 13 +- + drivers/gpu/drm/gma500/cdv_device.h | 4 + + drivers/gpu/drm/gma500/cdv_intel_crt.c | 8 +- + drivers/gpu/drm/gma500/cdv_intel_display.c | 10 +- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 9 +- + drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 9 +- + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 9 +- + drivers/gpu/drm/gma500/framebuffer.c | 26 +- + drivers/gpu/drm/gma500/framebuffer.h | 1 - + drivers/gpu/drm/gma500/gem.c | 5 +- + drivers/gpu/drm/gma500/gma_device.c | 1 - + drivers/gpu/drm/gma500/gma_device.h | 1 + + drivers/gpu/drm/gma500/gma_display.c | 12 +- + drivers/gpu/drm/gma500/gma_display.h | 3 + + drivers/gpu/drm/gma500/gtt.c | 5 +- + drivers/gpu/drm/gma500/gtt.h | 1 - + drivers/gpu/drm/gma500/intel_bios.c | 6 +- + drivers/gpu/drm/gma500/intel_bios.h | 3 +- + drivers/gpu/drm/gma500/intel_gmbus.c | 11 +- + drivers/gpu/drm/gma500/intel_i2c.c | 4 +- + drivers/gpu/drm/gma500/mdfld_device.c | 16 +- + drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 4 +- + drivers/gpu/drm/gma500/mdfld_dsi_output.c | 12 +- + drivers/gpu/drm/gma500/mdfld_dsi_output.h | 8 +- + drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c | 4 +- + drivers/gpu/drm/gma500/mdfld_intel_display.c | 11 +- + drivers/gpu/drm/gma500/mdfld_tmd_vid.c | 2 + + drivers/gpu/drm/gma500/mid_bios.c | 5 +- + drivers/gpu/drm/gma500/mid_bios.h | 1 + + drivers/gpu/drm/gma500/mmu.c | 6 +- + drivers/gpu/drm/gma500/oaktrail.h | 2 + + drivers/gpu/drm/gma500/oaktrail_crtc.c | 8 +- + drivers/gpu/drm/gma500/oaktrail_device.c | 20 +- + drivers/gpu/drm/gma500/oaktrail_hdmi.c | 8 +- + drivers/gpu/drm/gma500/oaktrail_lvds.c | 6 +- + drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c | 11 +- + drivers/gpu/drm/gma500/power.h | 4 +- + drivers/gpu/drm/gma500/psb_device.c | 12 +- + drivers/gpu/drm/gma500/psb_drv.c | 33 +- + drivers/gpu/drm/gma500/psb_drv.h | 16 +- + drivers/gpu/drm/gma500/psb_intel_display.c | 7 +- + drivers/gpu/drm/gma500/psb_intel_lvds.c | 5 +- + drivers/gpu/drm/gma500/psb_intel_modes.c | 2 +- + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 15 +- + drivers/gpu/drm/gma500/psb_irq.c | 9 +- + drivers/gpu/drm/gma500/psb_irq.h | 2 +- + drivers/gpu/drm/gma500/psb_lid.c | 6 +- + drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c | 13 +- + drivers/gpu/drm/hisilicon/hibmc/Kconfig | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 19 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 14 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 33 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 37 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 341 +----- + drivers/gpu/drm/i915/Kconfig | 6 + + drivers/gpu/drm/i915/Kconfig.profile | 13 + + drivers/gpu/drm/i915/Makefile | 52 +- + drivers/gpu/drm/i915/Makefile.header-test | 34 +- + drivers/gpu/drm/i915/dvo_ch7017.c | 3 +- + drivers/gpu/drm/i915/dvo_ch7xxx.c | 3 +- + drivers/gpu/drm/i915/dvo_ivch.c | 3 +- + drivers/gpu/drm/i915/dvo_ns2501.c | 5 +- + drivers/gpu/drm/i915/dvo_sil164.c | 3 +- + drivers/gpu/drm/i915/dvo_tfp410.c | 3 +- + drivers/gpu/drm/i915/gt/Makefile | 2 + + drivers/gpu/drm/i915/gt/Makefile.header-test | 16 + + drivers/gpu/drm/i915/{ => gt}/intel_breadcrumbs.c | 19 + + drivers/gpu/drm/i915/gt/intel_context.c | 179 +++ + drivers/gpu/drm/i915/gt/intel_context.h | 130 +++ + .../gpu/drm/i915/{ => gt}/intel_context_types.h | 19 +- + .../i915/{intel_ringbuffer.h => gt/intel_engine.h} | 54 +- + drivers/gpu/drm/i915/{ => gt}/intel_engine_cs.c | 381 +++---- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 164 +++ + drivers/gpu/drm/i915/gt/intel_engine_pm.h | 22 + + drivers/gpu/drm/i915/{ => gt}/intel_engine_types.h | 38 +- + drivers/gpu/drm/i915/{ => gt}/intel_gpu_commands.h | 0 + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 143 +++ + drivers/gpu/drm/i915/gt/intel_gt_pm.h | 27 + + drivers/gpu/drm/i915/{ => gt}/intel_hangcheck.c | 29 +- + drivers/gpu/drm/i915/{ => gt}/intel_lrc.c | 1187 +++++++++++++++----- + drivers/gpu/drm/i915/{ => gt}/intel_lrc.h | 22 +- + drivers/gpu/drm/i915/{ => gt}/intel_lrc_reg.h | 0 + drivers/gpu/drm/i915/{ => gt}/intel_mocs.c | 4 +- + drivers/gpu/drm/i915/{ => gt}/intel_mocs.h | 4 +- + .../drm/i915/{i915_reset.c => gt/intel_reset.c} | 114 +- + .../drm/i915/{i915_reset.h => gt/intel_reset.h} | 3 +- + drivers/gpu/drm/i915/{ => gt}/intel_ringbuffer.c | 360 +++--- + drivers/gpu/drm/i915/gt/intel_sseu.c | 142 +++ + drivers/gpu/drm/i915/gt/intel_sseu.h | 67 ++ + drivers/gpu/drm/i915/{ => gt}/intel_workarounds.c | 305 +++-- + drivers/gpu/drm/i915/{ => gt}/intel_workarounds.h | 10 +- + .../drm/i915/{ => gt}/intel_workarounds_types.h | 7 +- + .../gpu/drm/i915/{selftests => gt}/mock_engine.c | 53 +- + .../gpu/drm/i915/{selftests => gt}/mock_engine.h | 4 +- + .../intel_engine_cs.c => gt/selftest_engine_cs.c} | 0 + .../intel_hangcheck.c => gt/selftest_hangcheck.c} | 227 +--- + .../{selftests/intel_lrc.c => gt/selftest_lrc.c} | 538 ++++++++- + drivers/gpu/drm/i915/gt/selftest_reset.c | 118 ++ + .../selftest_workarounds.c} | 429 +++++-- + drivers/gpu/drm/i915/gvt/gvt.h | 2 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 2 +- + drivers/gpu/drm/i915/gvt/mmio_context.c | 3 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 147 +-- + drivers/gpu/drm/i915/i915_cmd_parser.c | 3 +- + drivers/gpu/drm/i915/i915_debugfs.c | 121 +- + drivers/gpu/drm/i915/i915_debugfs.h | 20 + + drivers/gpu/drm/i915/i915_drv.c | 45 +- + drivers/gpu/drm/i915/i915_drv.h | 411 +------ + drivers/gpu/drm/i915/i915_fixed.h | 6 +- + drivers/gpu/drm/i915/i915_gem.c | 551 ++------- + drivers/gpu/drm/i915/i915_gem.h | 8 +- + drivers/gpu/drm/i915/i915_gem_context.c | 974 +++++++++++++--- + drivers/gpu/drm/i915/i915_gem_context.h | 83 +- + drivers/gpu/drm/i915/i915_gem_context_types.h | 45 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 47 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 175 ++- + drivers/gpu/drm/i915/i915_gem_gtt.c | 179 ++- + drivers/gpu/drm/i915/i915_gem_gtt.h | 32 +- + drivers/gpu/drm/i915/i915_gem_internal.c | 3 - + drivers/gpu/drm/i915/i915_gem_pm.c | 250 +++++ + drivers/gpu/drm/i915/i915_gem_pm.h | 25 + + drivers/gpu/drm/i915/i915_gem_shrinker.c | 75 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 5 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 7 +- + drivers/gpu/drm/i915/i915_irq.c | 8 +- + drivers/gpu/drm/i915/i915_irq.h | 114 ++ + drivers/gpu/drm/i915/i915_pci.c | 7 +- + drivers/gpu/drm/i915/i915_perf.c | 90 +- + drivers/gpu/drm/i915/i915_pmu.c | 7 +- + drivers/gpu/drm/i915/i915_query.c | 49 + + drivers/gpu/drm/i915/i915_reg.h | 17 +- + drivers/gpu/drm/i915/i915_request.c | 353 +++--- + drivers/gpu/drm/i915/i915_request.h | 17 +- + drivers/gpu/drm/i915/i915_scheduler.c | 57 +- + drivers/gpu/drm/i915/i915_scheduler.h | 18 + + drivers/gpu/drm/i915/i915_scheduler_types.h | 2 +- + drivers/gpu/drm/i915/i915_suspend.c | 3 +- + drivers/gpu/drm/i915/i915_sysfs.c | 51 +- + drivers/gpu/drm/i915/i915_timeline_types.h | 1 + + drivers/gpu/drm/i915/i915_trace.h | 4 +- + drivers/gpu/drm/i915/i915_utils.h | 197 +++- + drivers/gpu/drm/i915/i915_vma.c | 13 +- + drivers/gpu/drm/i915/i915_vma.h | 3 + + drivers/gpu/drm/i915/icl_dsi.c | 63 +- + drivers/gpu/drm/i915/intel_acpi.c | 3 + + drivers/gpu/drm/i915/intel_acpi.h | 17 + + drivers/gpu/drm/i915/intel_atomic.c | 13 + + drivers/gpu/drm/i915/intel_atomic.h | 49 + + drivers/gpu/drm/i915/intel_audio.c | 61 +- + drivers/gpu/drm/i915/intel_bios.c | 2 + + drivers/gpu/drm/i915/intel_bios.h | 21 + + drivers/gpu/drm/i915/intel_cdclk.c | 59 +- + drivers/gpu/drm/i915/intel_color.c | 96 +- + drivers/gpu/drm/i915/intel_combo_phy.c | 77 +- + drivers/gpu/drm/i915/intel_combo_phy.h | 20 + + drivers/gpu/drm/i915/intel_context.h | 87 -- + drivers/gpu/drm/i915/intel_crt.c | 3 + + drivers/gpu/drm/i915/intel_csr.c | 2 - + drivers/gpu/drm/i915/intel_csr.h | 4 + + drivers/gpu/drm/i915/intel_ddi.c | 40 +- + drivers/gpu/drm/i915/intel_device_info.h | 33 +- + drivers/gpu/drm/i915/intel_display.c | 1026 ++++++++++------- + drivers/gpu/drm/i915/intel_display.h | 10 +- + drivers/gpu/drm/i915/intel_dp.c | 263 ++++- + drivers/gpu/drm/i915/intel_dp.h | 1 + + drivers/gpu/drm/i915/intel_dp_aux_backlight.c | 1 + + drivers/gpu/drm/i915/intel_dp_aux_backlight.h | 13 + + drivers/gpu/drm/i915/intel_dp_link_training.c | 1 + + drivers/gpu/drm/i915/intel_dp_link_training.h | 14 + + drivers/gpu/drm/i915/intel_dp_mst.c | 3 + + drivers/gpu/drm/i915/intel_dp_mst.h | 14 + + drivers/gpu/drm/i915/intel_dpio_phy.c | 39 +- + drivers/gpu/drm/i915/intel_dpio_phy.h | 58 + + drivers/gpu/drm/i915/intel_dpll_mgr.c | 67 +- + drivers/gpu/drm/i915/intel_dpll_mgr.h | 8 +- + drivers/gpu/drm/i915/intel_drv.h | 412 +------ + drivers/gpu/drm/i915/intel_dsi.h | 7 + + drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c | 8 +- + drivers/gpu/drm/i915/intel_dsi_dcs_backlight.h | 13 + + drivers/gpu/drm/i915/intel_dsi_vbt.c | 21 +- + drivers/gpu/drm/i915/intel_dvo.c | 8 +- + drivers/gpu/drm/i915/{dvo.h => intel_dvo_dev.h} | 10 +- + drivers/gpu/drm/i915/intel_fifo_underrun.c | 1 + + drivers/gpu/drm/i915/intel_fifo_underrun.h | 27 + + .../gpu/drm/i915/{intel_i2c.c => intel_gmbus.c} | 33 +- + drivers/gpu/drm/i915/intel_gmbus.h | 27 + + drivers/gpu/drm/i915/intel_guc.c | 40 +- + drivers/gpu/drm/i915/intel_guc.h | 12 +- + drivers/gpu/drm/i915/intel_guc_ct.h | 5 + + drivers/gpu/drm/i915/intel_guc_fw.c | 20 +- + drivers/gpu/drm/i915/intel_guc_submission.c | 32 +- + drivers/gpu/drm/i915/intel_guc_submission.h | 3 +- + drivers/gpu/drm/i915/intel_hdcp.c | 55 +- + drivers/gpu/drm/i915/intel_hdcp.h | 1 + + drivers/gpu/drm/i915/intel_hdmi.c | 30 +- + drivers/gpu/drm/i915/intel_hotplug.c | 1 + + drivers/gpu/drm/i915/intel_hotplug.h | 30 + + drivers/gpu/drm/i915/intel_huc.c | 74 +- + drivers/gpu/drm/i915/intel_huc.h | 6 +- + drivers/gpu/drm/i915/intel_huc_fw.c | 49 +- + drivers/gpu/drm/i915/intel_lpe_audio.c | 8 +- + drivers/gpu/drm/i915/intel_lpe_audio.h | 22 + + drivers/gpu/drm/i915/intel_lvds.c | 2 + + drivers/gpu/drm/i915/intel_overlay.c | 9 +- + drivers/gpu/drm/i915/intel_overlay.h | 29 + + drivers/gpu/drm/i915/intel_panel.c | 2 + + drivers/gpu/drm/i915/intel_pipe_crc.c | 14 +- + drivers/gpu/drm/i915/intel_pipe_crc.h | 3 + + drivers/gpu/drm/i915/intel_pm.c | 393 ++----- + drivers/gpu/drm/i915/intel_pm.h | 10 + + drivers/gpu/drm/i915/intel_psr.c | 12 +- + drivers/gpu/drm/i915/intel_quirks.c | 1 + + drivers/gpu/drm/i915/intel_quirks.h | 13 + + drivers/gpu/drm/i915/intel_runtime_pm.c | 885 +++++++++++++-- + drivers/gpu/drm/i915/intel_runtime_pm.h | 142 +++ + drivers/gpu/drm/i915/intel_sdvo.c | 4 + + drivers/gpu/drm/i915/intel_sideband.c | 480 ++++++-- + drivers/gpu/drm/i915/intel_sideband.h | 140 +++ + drivers/gpu/drm/i915/intel_sprite.c | 37 +- + drivers/gpu/drm/i915/intel_sprite.h | 12 +- + drivers/gpu/drm/i915/intel_tv.c | 1 + + drivers/gpu/drm/i915/intel_uc.c | 90 +- + drivers/gpu/drm/i915/intel_uc.h | 3 +- + drivers/gpu/drm/i915/intel_uc_fw.c | 103 +- + drivers/gpu/drm/i915/intel_uc_fw.h | 10 +- + drivers/gpu/drm/i915/intel_uncore.c | 8 +- + drivers/gpu/drm/i915/intel_vdsc.c | 2 + + drivers/gpu/drm/i915/intel_vdsc.h | 21 + + drivers/gpu/drm/i915/intel_wakeref.c | 75 ++ + drivers/gpu/drm/i915/intel_wakeref.h | 133 +++ + drivers/gpu/drm/i915/selftests/huge_pages.c | 3 +- + drivers/gpu/drm/i915/selftests/i915_active.c | 2 +- + drivers/gpu/drm/i915/selftests/i915_gem.c | 21 +- + .../gpu/drm/i915/selftests/i915_gem_coherency.c | 2 +- + drivers/gpu/drm/i915/selftests/i915_gem_context.c | 223 +--- + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 3 +- + drivers/gpu/drm/i915/selftests/i915_gem_object.c | 31 +- + .../gpu/drm/i915/selftests/i915_live_selftests.h | 2 + + drivers/gpu/drm/i915/selftests/i915_request.c | 13 +- + drivers/gpu/drm/i915/selftests/i915_timeline.c | 4 +- + drivers/gpu/drm/i915/selftests/i915_vma.c | 246 +++- + drivers/gpu/drm/i915/selftests/igt_atomic.h | 56 + + drivers/gpu/drm/i915/selftests/igt_flush_test.c | 32 +- + drivers/gpu/drm/i915/selftests/igt_gem_utils.c | 34 + + drivers/gpu/drm/i915/selftests/igt_gem_utils.h | 17 + + drivers/gpu/drm/i915/selftests/igt_reset.c | 11 +- + drivers/gpu/drm/i915/selftests/igt_reset.h | 1 + + drivers/gpu/drm/i915/selftests/igt_spinner.c | 3 +- + drivers/gpu/drm/i915/selftests/igt_spinner.h | 3 +- + drivers/gpu/drm/i915/selftests/lib_sw_fence.c | 3 + + drivers/gpu/drm/i915/selftests/mock_context.c | 15 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 37 +- + drivers/gpu/drm/i915/selftests/mock_request.c | 6 +- + drivers/gpu/drm/i915/vlv_dsi.c | 34 +- + drivers/gpu/drm/i915/vlv_dsi_pll.c | 18 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 15 +- + drivers/gpu/drm/lima/lima_drv.c | 2 +- + drivers/gpu/drm/lima/lima_pp.c | 8 +- + drivers/gpu/drm/lima/lima_sched.c | 13 +- + drivers/gpu/drm/mcde/Kconfig | 18 + + drivers/gpu/drm/mcde/Makefile | 3 + + drivers/gpu/drm/mcde/mcde_display.c | 1142 +++++++++++++++++++ + drivers/gpu/drm/mcde/mcde_display_regs.h | 518 +++++++++ + drivers/gpu/drm/mcde/mcde_drm.h | 44 + + drivers/gpu/drm/mcde/mcde_drv.c | 572 ++++++++++ + drivers/gpu/drm/mcde/mcde_dsi.c | 1044 +++++++++++++++++ + drivers/gpu/drm/mcde/mcde_dsi_regs.h | 385 +++++++ + drivers/gpu/drm/mediatek/mtk_drm_fb.c | 8 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 3 + + drivers/gpu/drm/meson/Kconfig | 1 + + drivers/gpu/drm/meson/meson_overlay.c | 14 +- + drivers/gpu/drm/mgag200/Kconfig | 2 +- + drivers/gpu/drm/mgag200/mgag200_cursor.c | 96 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 13 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 74 +- + drivers/gpu/drm/mgag200/mgag200_fb.c | 41 +- + drivers/gpu/drm/mgag200/mgag200_main.c | 87 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 59 +- + drivers/gpu/drm/mgag200/mgag200_ttm.c | 301 +---- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 6 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 9 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 9 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 31 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 24 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c | 7 +- + drivers/gpu/drm/msm/msm_fb.c | 18 +- + drivers/gpu/drm/nouveau/dispnv50/head.c | 13 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv04.c | 2 - + drivers/gpu/drm/omapdrm/omap_fb.c | 6 +- + drivers/gpu/drm/panel/Kconfig | 18 + + drivers/gpu/drm/panel/Makefile | 2 + + drivers/gpu/drm/panel/panel-arm-versatile.c | 6 +- + drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 9 +- + drivers/gpu/drm/panel/panel-innolux-p079zca.c | 10 +- + drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 8 +- + drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c | 9 +- + drivers/gpu/drm/panel/panel-lg-lg4573.c | 9 +- + drivers/gpu/drm/panel/panel-lvds.c | 7 +- + drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 8 +- + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 11 +- + drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c | 254 +++++ + .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 7 +- + .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 3 +- + drivers/gpu/drm/panel/panel-raydium-rm68200.c | 5 +- + drivers/gpu/drm/panel/panel-samsung-ld9040.c | 10 +- + drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 10 +- + drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 11 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 514 +++++++++ + drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 12 +- + drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 10 +- + drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c | 7 +- + drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 7 +- + drivers/gpu/drm/panel/panel-simple.c | 276 ++++- + drivers/gpu/drm/panel/panel-sitronix-st7701.c | 6 +- + drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 10 +- + drivers/gpu/drm/panel/panel-truly-nt35597.c | 12 +- + drivers/gpu/drm/panfrost/panfrost_device.c | 22 + + drivers/gpu/drm/panfrost/panfrost_device.h | 1 + + drivers/gpu/drm/panfrost/panfrost_job.c | 2 +- + drivers/gpu/drm/qxl/qxl_release.c | 2 +- + drivers/gpu/drm/radeon/radeon_fb.c | 4 +- + drivers/gpu/drm/radeon/radeon_gem.c | 2 +- + drivers/gpu/drm/radeon/radeon_object.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 17 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 39 +- + drivers/gpu/drm/scheduler/sched_main.c | 179 +-- + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 84 +- + drivers/gpu/drm/stm/ltdc.c | 75 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 16 +- + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 1 + + drivers/gpu/drm/tegra/dc.c | 17 +- + drivers/gpu/drm/tegra/fb.c | 14 +- + drivers/gpu/drm/ttm/ttm_bo.c | 270 +++-- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 20 +- + drivers/gpu/drm/v3d/v3d_debugfs.c | 35 +- + drivers/gpu/drm/v3d/v3d_drv.c | 17 +- + drivers/gpu/drm/v3d/v3d_drv.h | 106 +- + drivers/gpu/drm/v3d/v3d_fence.c | 2 + + drivers/gpu/drm/v3d/v3d_gem.c | 552 +++++---- + drivers/gpu/drm/v3d/v3d_irq.c | 55 +- + drivers/gpu/drm/v3d/v3d_mmu.c | 7 +- + drivers/gpu/drm/v3d/v3d_regs.h | 122 +- + drivers/gpu/drm/v3d/v3d_sched.c | 382 ++++--- + drivers/gpu/drm/v3d/v3d_trace.h | 94 ++ + drivers/gpu/drm/vboxvideo/Kconfig | 2 +- + drivers/gpu/drm/vboxvideo/vbox_drv.c | 12 +- + drivers/gpu/drm/vboxvideo/vbox_drv.h | 75 +- + drivers/gpu/drm/vboxvideo/vbox_fb.c | 22 +- + drivers/gpu/drm/vboxvideo/vbox_main.c | 75 +- + drivers/gpu/drm/vboxvideo/vbox_mode.c | 36 +- + drivers/gpu/drm/vboxvideo/vbox_ttm.c | 355 +----- + drivers/gpu/drm/vc4/vc4_bo.c | 31 +- + drivers/gpu/drm/vc4/vc4_drv.c | 6 + + drivers/gpu/drm/vc4/vc4_drv.h | 14 + + drivers/gpu/drm/vc4/vc4_gem.c | 11 + + drivers/gpu/drm/vc4/vc4_irq.c | 20 +- + drivers/gpu/drm/vc4/vc4_plane.c | 15 +- + drivers/gpu/drm/vc4/vc4_v3d.c | 72 +- + drivers/gpu/drm/virtio/Makefile | 2 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 3 +- + drivers/gpu/drm/virtio/virtgpu_fence.c | 25 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 20 +- + drivers/gpu/drm/virtio/virtgpu_trace.h | 52 + + drivers/gpu/drm/virtio/virtgpu_trace_points.c | 5 + + drivers/gpu/drm/virtio/virtgpu_vq.c | 10 + + drivers/gpu/drm/vkms/vkms_crtc.c | 33 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_validation.h | 2 +- + drivers/gpu/drm/zte/zx_plane.c | 6 +- + drivers/misc/mei/hdcp/mei_hdcp.c | 2 +- + drivers/video/hdmi.c | 275 ++++- + include/drm/bridge/dw_mipi_dsi.h | 8 + + include/drm/drm_atomic_state_helper.h | 2 + + include/drm/drm_auth.h | 11 +- + include/drm/drm_client.h | 30 + + include/drm/drm_connector.h | 21 +- + include/drm/drm_device.h | 4 + + include/drm/drm_dp_helper.h | 33 +- + include/drm/drm_edid.h | 5 + + include/drm/drm_fb_helper.h | 18 - + include/drm/drm_fourcc.h | 50 +- + include/drm/drm_gem_vram_helper.h | 162 +++ + include/drm/drm_hdcp.h | 31 +- + include/drm/drm_legacy.h | 12 +- + include/drm/drm_mode_config.h | 13 + + include/drm/drm_plane.h | 2 +- + include/drm/drm_vram_mm_helper.h | 102 ++ + include/drm/gma_drm.h | 25 - + include/drm/gpu_scheduler.h | 8 +- + include/drm/i915_pciids.h | 4 +- + include/drm/ttm/ttm_bo_driver.h | 9 +- + include/drm/ttm/ttm_execbuf_util.h | 3 +- + include/linux/dma-buf.h | 47 +- + include/linux/hdmi.h | 67 ++ + include/uapi/drm/drm.h | 1 + + include/uapi/drm/drm_mode.h | 117 ++ + include/uapi/drm/i915_drm.h | 209 +++- + include/uapi/drm/v3d_drm.h | 28 + + include/uapi/linux/kfd_ioctl.h | 35 +- + 793 files changed, 32803 insertions(+), 14658 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/allwinner,sun6i-a31-mipi-dsi.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/armadeus,st0700-adapt.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/evervision,vgg804821.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/friendlyarm,hd702e.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/koe,tx14d24vm1bpa.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/osddisplays,osd101t2045-53ts.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/osddisplays,osd101t2587-53ts.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/samsung,s6e63m0.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/tfc,s9700rtwv43tr-01b.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/vl050_8048nt_c01.txt + delete mode 100644 Documentation/devicetree/bindings/display/sunxi/sun6i-dsi.txt + create mode 100644 Documentation/devicetree/bindings/phy/allwinner,sun6i-a31-mipi-dphy.yaml + create mode 100644 Documentation/gpu/mcde.rst + rename drivers/gpu/drm/amd/amdgpu/{amdgpu_prime.c => amdgpu_dma_buf.c} (93%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce100/dce_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce120/dce120_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce120/dce120_clk_mgr.h + rename drivers/gpu/drm/amd/display/dc/{dcn10/dcn10_clk_mgr.c => clk_mgr/dcn10/rv1_clk_mgr.c} (59%) + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr_clk.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr_clk.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv2_clk_mgr.c + rename drivers/gpu/drm/amd/display/dc/{dcn10/dcn10_clk_mgr.h => clk_mgr/dcn10/rv2_clk_mgr.h} (82%) + delete mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c + rename drivers/gpu/drm/amd/display/dc/{dce/dce_clk_mgr.h => inc/hw/clk_mgr_internal.h} (59%) + delete mode 100644 drivers/gpu/drm/cirrus/cirrus_drv.h + delete mode 100644 drivers/gpu/drm/cirrus/cirrus_ttm.c + create mode 100644 drivers/gpu/drm/drm_client_modeset.c + create mode 100644 drivers/gpu/drm/drm_gem_vram_helper.c + create mode 100644 drivers/gpu/drm/drm_hdcp.c + create mode 100644 drivers/gpu/drm/drm_vram_helper_common.c + create mode 100644 drivers/gpu/drm/drm_vram_mm_helper.c + create mode 100644 drivers/gpu/drm/i915/Kconfig.profile + create mode 100644 drivers/gpu/drm/i915/gt/Makefile + create mode 100644 drivers/gpu/drm/i915/gt/Makefile.header-test + rename drivers/gpu/drm/i915/{ => gt}/intel_breadcrumbs.c (95%) + create mode 100644 drivers/gpu/drm/i915/gt/intel_context.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_context.h + rename drivers/gpu/drm/i915/{ => gt}/intel_context_types.h (83%) + rename drivers/gpu/drm/i915/{intel_ringbuffer.h => gt/intel_engine.h} (90%) + rename drivers/gpu/drm/i915/{ => gt}/intel_engine_cs.c (88%) + create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_pm.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_pm.h + rename drivers/gpu/drm/i915/{ => gt}/intel_engine_types.h (95%) + rename drivers/gpu/drm/i915/{ => gt}/intel_gpu_commands.h (100%) + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_pm.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_pm.h + rename drivers/gpu/drm/i915/{ => gt}/intel_hangcheck.c (94%) + rename drivers/gpu/drm/i915/{ => gt}/intel_lrc.c (77%) + rename drivers/gpu/drm/i915/{ => gt}/intel_lrc.h (86%) + rename drivers/gpu/drm/i915/{ => gt}/intel_lrc_reg.h (100%) + rename drivers/gpu/drm/i915/{ => gt}/intel_mocs.c (99%) + rename drivers/gpu/drm/i915/{ => gt}/intel_mocs.h (97%) + rename drivers/gpu/drm/i915/{i915_reset.c => gt/intel_reset.c} (94%) + rename drivers/gpu/drm/i915/{i915_reset.h => gt/intel_reset.h} (95%) + rename drivers/gpu/drm/i915/{ => gt}/intel_ringbuffer.c (94%) + create mode 100644 drivers/gpu/drm/i915/gt/intel_sseu.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_sseu.h + rename drivers/gpu/drm/i915/{ => gt}/intel_workarounds.c (86%) + rename drivers/gpu/drm/i915/{ => gt}/intel_workarounds.h (79%) + rename drivers/gpu/drm/i915/{ => gt}/intel_workarounds_types.h (88%) + rename drivers/gpu/drm/i915/{selftests => gt}/mock_engine.c (88%) + rename drivers/gpu/drm/i915/{selftests => gt}/mock_engine.h (95%) + rename drivers/gpu/drm/i915/{selftests/intel_engine_cs.c => gt/selftest_engine_cs.c} (100%) + rename drivers/gpu/drm/i915/{selftests/intel_hangcheck.c => gt/selftest_hangcheck.c} (90%) + rename drivers/gpu/drm/i915/{selftests/intel_lrc.c => gt/selftest_lrc.c} (71%) + create mode 100644 drivers/gpu/drm/i915/gt/selftest_reset.c + rename drivers/gpu/drm/i915/{selftests/intel_workarounds.c => gt/selftest_workarounds.c} (66%) + create mode 100644 drivers/gpu/drm/i915/i915_debugfs.h + create mode 100644 drivers/gpu/drm/i915/i915_gem_pm.c + create mode 100644 drivers/gpu/drm/i915/i915_gem_pm.h + create mode 100644 drivers/gpu/drm/i915/i915_irq.h + create mode 100644 drivers/gpu/drm/i915/intel_acpi.h + create mode 100644 drivers/gpu/drm/i915/intel_atomic.h + create mode 100644 drivers/gpu/drm/i915/intel_combo_phy.h + delete mode 100644 drivers/gpu/drm/i915/intel_context.h + create mode 100644 drivers/gpu/drm/i915/intel_dp_aux_backlight.h + create mode 100644 drivers/gpu/drm/i915/intel_dp_link_training.h + create mode 100644 drivers/gpu/drm/i915/intel_dp_mst.h + create mode 100644 drivers/gpu/drm/i915/intel_dpio_phy.h + create mode 100644 drivers/gpu/drm/i915/intel_dsi_dcs_backlight.h + rename drivers/gpu/drm/i915/{dvo.h => intel_dvo_dev.h} (97%) + create mode 100644 drivers/gpu/drm/i915/intel_fifo_underrun.h + rename drivers/gpu/drm/i915/{intel_i2c.c => intel_gmbus.c} (97%) + create mode 100644 drivers/gpu/drm/i915/intel_gmbus.h + create mode 100644 drivers/gpu/drm/i915/intel_hotplug.h + create mode 100644 drivers/gpu/drm/i915/intel_lpe_audio.h + create mode 100644 drivers/gpu/drm/i915/intel_overlay.h + create mode 100644 drivers/gpu/drm/i915/intel_quirks.h + create mode 100644 drivers/gpu/drm/i915/intel_runtime_pm.h + create mode 100644 drivers/gpu/drm/i915/intel_sideband.h + create mode 100644 drivers/gpu/drm/i915/intel_vdsc.h + create mode 100644 drivers/gpu/drm/i915/intel_wakeref.c + create mode 100644 drivers/gpu/drm/i915/intel_wakeref.h + create mode 100644 drivers/gpu/drm/i915/selftests/igt_atomic.h + create mode 100644 drivers/gpu/drm/i915/selftests/igt_gem_utils.c + create mode 100644 drivers/gpu/drm/i915/selftests/igt_gem_utils.h + create mode 100644 drivers/gpu/drm/mcde/Kconfig + create mode 100644 drivers/gpu/drm/mcde/Makefile + create mode 100644 drivers/gpu/drm/mcde/mcde_display.c + create mode 100644 drivers/gpu/drm/mcde/mcde_display_regs.h + create mode 100644 drivers/gpu/drm/mcde/mcde_drm.h + create mode 100644 drivers/gpu/drm/mcde/mcde_drv.c + create mode 100644 drivers/gpu/drm/mcde/mcde_dsi.c + create mode 100644 drivers/gpu/drm/mcde/mcde_dsi_regs.h + create mode 100644 drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c + create mode 100644 drivers/gpu/drm/panel/panel-samsung-s6e63m0.c + create mode 100644 drivers/gpu/drm/virtio/virtgpu_trace.h + create mode 100644 drivers/gpu/drm/virtio/virtgpu_trace_points.c + create mode 100644 include/drm/drm_gem_vram_helper.h + create mode 100644 include/drm/drm_vram_mm_helper.h + delete mode 100644 include/drm/gma_drm.h +Merging amdgpu/drm-next (72a14e9b23d0 Revert "drm/amdgpu: add DRIVER_SYNCOBJ_TIMELINE to amdgpu") +$ git merge amdgpu/drm-next +Already up to date. +Merging drm-intel/for-linux-next (ac543d7145bf drm/i915: Report an earlier wedged event when suspending the engines) +$ git merge drm-intel/for-linux-next +Removing drivers/gpu/drm/i915/selftests/mock_dmabuf.h +Removing drivers/gpu/drm/i915/selftests/mock_context.h +Removing drivers/gpu/drm/i915/selftests/huge_gem_object.h +Removing drivers/gpu/drm/i915/intel_context.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Removing drivers/gpu/drm/i915/i915_gemfs.h +Removing drivers/gpu/drm/i915/i915_gem_object.c +Removing drivers/gpu/drm/i915/i915_gem_clflush.h +Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c +Auto-merging drivers/gpu/drm/i915/gvt/cmd_parser.c +Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.c +Merge made by the 'recursive' strategy. + Documentation/gpu/i915.rst | 21 +- + drivers/gpu/drm/i915/Kconfig | 29 +- + drivers/gpu/drm/i915/Kconfig.debug | 14 + + drivers/gpu/drm/i915/Kconfig.profile | 14 + + drivers/gpu/drm/i915/Makefile | 43 +- + drivers/gpu/drm/i915/Makefile.header-test | 3 +- + drivers/gpu/drm/i915/gem/Makefile | 1 + + drivers/gpu/drm/i915/gem/Makefile.header-test | 16 + + drivers/gpu/drm/i915/gem/i915_gem_busy.c | 138 + + drivers/gpu/drm/i915/{ => gem}/i915_gem_clflush.c | 28 +- + drivers/gpu/drm/i915/gem/i915_gem_clflush.h | 20 + + drivers/gpu/drm/i915/gem/i915_gem_client_blt.c | 306 ++ + drivers/gpu/drm/i915/gem/i915_gem_client_blt.h | 21 + + drivers/gpu/drm/i915/{ => gem}/i915_gem_context.c | 122 +- + drivers/gpu/drm/i915/{ => gem}/i915_gem_context.h | 22 +- + .../drm/i915/{ => gem}/i915_gem_context_types.h | 12 +- + drivers/gpu/drm/i915/{ => gem}/i915_gem_dmabuf.c | 38 +- + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 795 ++++ + .../gpu/drm/i915/{ => gem}/i915_gem_execbuffer.c | 183 +- + drivers/gpu/drm/i915/gem/i915_gem_fence.c | 96 + + drivers/gpu/drm/i915/{ => gem}/i915_gem_internal.c | 31 +- + drivers/gpu/drm/i915/gem/i915_gem_ioctls.h | 52 + + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 507 +++ + drivers/gpu/drm/i915/gem/i915_gem_object.c | 442 ++ + drivers/gpu/drm/i915/gem/i915_gem_object.h | 430 ++ + drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 109 + + drivers/gpu/drm/i915/gem/i915_gem_object_blt.h | 24 + + .../i915_gem_object_types.h} | 261 +- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 530 +++ + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 212 + + drivers/gpu/drm/i915/{ => gem}/i915_gem_pm.c | 13 +- + drivers/gpu/drm/i915/{ => gem}/i915_gem_pm.h | 0 + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 571 +++ + drivers/gpu/drm/i915/{ => gem}/i915_gem_shrinker.c | 122 +- + drivers/gpu/drm/i915/{ => gem}/i915_gem_stolen.c | 33 +- + drivers/gpu/drm/i915/gem/i915_gem_throttle.c | 73 + + drivers/gpu/drm/i915/{ => gem}/i915_gem_tiling.c | 31 +- + drivers/gpu/drm/i915/{ => gem}/i915_gem_userptr.c | 34 +- + drivers/gpu/drm/i915/gem/i915_gem_wait.c | 277 ++ + drivers/gpu/drm/i915/{ => gem}/i915_gemfs.c | 22 +- + drivers/gpu/drm/i915/gem/i915_gemfs.h | 16 + + .../drm/i915/{ => gem}/selftests/huge_gem_object.c | 24 +- + .../gpu/drm/i915/gem/selftests/huge_gem_object.h | 27 + + .../gpu/drm/i915/{ => gem}/selftests/huge_pages.c | 60 +- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 127 + + .../i915/{ => gem}/selftests/i915_gem_coherency.c | 50 +- + .../i915/{ => gem}/selftests/i915_gem_context.c | 98 +- + .../drm/i915/{ => gem}/selftests/i915_gem_dmabuf.c | 35 +- + .../selftests/i915_gem_mman.c} | 204 +- + .../gpu/drm/i915/gem/selftests/i915_gem_object.c | 99 + + .../drm/i915/gem/selftests/i915_gem_object_blt.c | 110 + + drivers/gpu/drm/i915/gem/selftests/i915_gem_phys.c | 80 + + .../drm/i915/{ => gem}/selftests/igt_gem_utils.c | 6 +- + .../drm/i915/{ => gem}/selftests/igt_gem_utils.h | 0 + .../drm/i915/{ => gem}/selftests/mock_context.c | 25 +- + drivers/gpu/drm/i915/gem/selftests/mock_context.h | 24 + + .../gpu/drm/i915/{ => gem}/selftests/mock_dmabuf.c | 22 +- + drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.h | 22 + + .../drm/i915/{ => gem}/selftests/mock_gem_object.h | 7 +- + drivers/gpu/drm/i915/gt/intel_context.c | 4 +- + drivers/gpu/drm/i915/gt/intel_context_types.h | 2 +- + drivers/gpu/drm/i915/gt/intel_engine.h | 2 + + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 14 +- + drivers/gpu/drm/i915/gt/intel_engine_types.h | 1 + + drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 1 + + drivers/gpu/drm/i915/gt/intel_lrc.c | 28 +- + drivers/gpu/drm/i915/gt/intel_lrc.h | 14 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 2 + + drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 8 +- + drivers/gpu/drm/i915/gt/intel_sseu.c | 17 + + drivers/gpu/drm/i915/gt/intel_sseu.h | 8 + + drivers/gpu/drm/i915/gt/intel_workarounds.c | 1 + + drivers/gpu/drm/i915/gt/mock_engine.c | 3 +- + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 19 +- + drivers/gpu/drm/i915/gt/selftest_lrc.c | 13 +- + drivers/gpu/drm/i915/gt/selftest_workarounds.c | 15 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 27 +- + drivers/gpu/drm/i915/gvt/mmio_context.c | 1 + + drivers/gpu/drm/i915/gvt/scheduler.c | 19 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 23 +- + drivers/gpu/drm/i915/i915_debugfs.c | 70 +- + drivers/gpu/drm/i915/i915_drv.c | 32 +- + drivers/gpu/drm/i915/i915_drv.h | 507 +-- + drivers/gpu/drm/i915/i915_gem.c | 3664 +-------------- + drivers/gpu/drm/i915/i915_gem_batch_pool.c | 2 +- + drivers/gpu/drm/i915/i915_gem_batch_pool.h | 3 +- + drivers/gpu/drm/i915/i915_gem_clflush.h | 36 - + drivers/gpu/drm/i915/i915_gem_evict.c | 2 + + drivers/gpu/drm/i915/i915_gem_fence_reg.c | 125 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 265 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 14 +- + drivers/gpu/drm/i915/i915_gem_object.c | 90 - + drivers/gpu/drm/i915/i915_gem_render_state.c | 8 +- + drivers/gpu/drm/i915/i915_gemfs.h | 34 - + drivers/gpu/drm/i915/i915_globals.c | 4 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 3 + + drivers/gpu/drm/i915/i915_irq.c | 59 +- + drivers/gpu/drm/i915/i915_irq.h | 3 + + drivers/gpu/drm/i915/i915_params.c | 7 +- + drivers/gpu/drm/i915/i915_params.h | 3 +- + drivers/gpu/drm/i915/i915_pci.c | 52 +- + drivers/gpu/drm/i915/i915_perf.c | 4 +- + drivers/gpu/drm/i915/i915_query.c | 17 +- + drivers/gpu/drm/i915/i915_reg.h | 23 +- + drivers/gpu/drm/i915/i915_request.c | 3 + + drivers/gpu/drm/i915/i915_scatterlist.c | 39 + + drivers/gpu/drm/i915/i915_scatterlist.h | 127 + + drivers/gpu/drm/i915/i915_timeline.c | 13 +- + drivers/gpu/drm/i915/i915_utils.h | 10 - + drivers/gpu/drm/i915/i915_vma.c | 90 +- + drivers/gpu/drm/i915/i915_vma.h | 33 +- + drivers/gpu/drm/i915/intel_atomic.c | 14 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 27 + + drivers/gpu/drm/i915/intel_atomic_plane.h | 2 + + drivers/gpu/drm/i915/intel_bios.c | 198 +- + drivers/gpu/drm/i915/intel_bios.h | 4 +- + drivers/gpu/drm/i915/intel_bw.c | 421 ++ + drivers/gpu/drm/i915/intel_bw.h | 47 + + drivers/gpu/drm/i915/intel_cdclk.c | 185 +- + drivers/gpu/drm/i915/intel_color.c | 12 +- + drivers/gpu/drm/i915/intel_color.h | 1 + + drivers/gpu/drm/i915/intel_combo_phy.c | 10 + + drivers/gpu/drm/i915/intel_context.c | 270 -- + drivers/gpu/drm/i915/intel_ddi.c | 3 + + drivers/gpu/drm/i915/intel_device_info.c | 64 +- + drivers/gpu/drm/i915/intel_device_info.h | 49 +- + drivers/gpu/drm/i915/intel_display.c | 443 +- + drivers/gpu/drm/i915/intel_display.h | 82 - + drivers/gpu/drm/i915/intel_display_power.c | 4611 +++++++++++++++++++ + drivers/gpu/drm/i915/intel_display_power.h | 288 ++ + drivers/gpu/drm/i915/intel_dp.c | 1 + + drivers/gpu/drm/i915/intel_dpll_mgr.c | 16 +- + drivers/gpu/drm/i915/intel_dpll_mgr.h | 2 +- + drivers/gpu/drm/i915/intel_drv.h | 6 + + drivers/gpu/drm/i915/intel_dsi_vbt.c | 11 + + drivers/gpu/drm/i915/intel_fbdev.c | 2 +- + drivers/gpu/drm/i915/intel_frontbuffer.h | 2 +- + drivers/gpu/drm/i915/intel_guc.c | 123 +- + drivers/gpu/drm/i915/intel_guc.h | 8 +- + drivers/gpu/drm/i915/intel_guc_ads.c | 167 +- + drivers/gpu/drm/i915/intel_guc_ads.h | 1 + + drivers/gpu/drm/i915/intel_guc_ct.c | 2 +- + drivers/gpu/drm/i915/intel_guc_fw.c | 97 +- + drivers/gpu/drm/i915/intel_guc_fwif.h | 201 +- + drivers/gpu/drm/i915/intel_guc_log.c | 6 +- + drivers/gpu/drm/i915/intel_guc_reg.h | 25 + + drivers/gpu/drm/i915/intel_guc_submission.c | 6 +- + drivers/gpu/drm/i915/intel_hdmi.c | 109 +- + drivers/gpu/drm/i915/intel_huc.c | 26 +- + drivers/gpu/drm/i915/intel_huc.h | 7 + + drivers/gpu/drm/i915/intel_huc_fw.c | 24 + + drivers/gpu/drm/i915/intel_overlay.c | 27 +- + drivers/gpu/drm/i915/intel_pm.c | 12 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 4793 +------------------- + drivers/gpu/drm/i915/intel_runtime_pm.h | 83 +- + drivers/gpu/drm/i915/intel_sideband.c | 15 +- + drivers/gpu/drm/i915/intel_sideband.h | 3 +- + drivers/gpu/drm/i915/intel_uc.c | 51 +- + drivers/gpu/drm/i915/intel_uc_fw.c | 29 +- + drivers/gpu/drm/i915/intel_vbt_defs.h | 630 +-- + drivers/gpu/drm/i915/intel_wakeref.c | 63 + + drivers/gpu/drm/i915/intel_wakeref.h | 31 + + drivers/gpu/drm/i915/selftests/huge_gem_object.h | 45 - + drivers/gpu/drm/i915/selftests/i915_active.c | 4 +- + drivers/gpu/drm/i915/selftests/i915_gem.c | 8 +- + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 8 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 5 +- + .../gpu/drm/i915/selftests/i915_live_selftests.h | 3 + + .../gpu/drm/i915/selftests/i915_mock_selftests.h | 1 + + drivers/gpu/drm/i915/selftests/i915_request.c | 18 +- + drivers/gpu/drm/i915/selftests/i915_timeline.c | 4 +- + drivers/gpu/drm/i915/selftests/i915_vma.c | 8 +- + drivers/gpu/drm/i915/selftests/igt_flush_test.c | 6 +- + drivers/gpu/drm/i915/selftests/igt_spinner.c | 14 +- + drivers/gpu/drm/i915/selftests/igt_spinner.h | 9 +- + drivers/gpu/drm/i915/selftests/intel_guc.c | 3 +- + drivers/gpu/drm/i915/selftests/mock_context.h | 42 - + drivers/gpu/drm/i915/selftests/mock_dmabuf.h | 41 - + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 6 +- + drivers/gpu/drm/i915/selftests/mock_request.c | 2 +- + drivers/gpu/drm/i915/selftests/scatterlist.c | 3 +- + drivers/gpu/drm/i915/vlv_dsi.c | 4 +- + 182 files changed, 13786 insertions(+), 12054 deletions(-) + create mode 100644 drivers/gpu/drm/i915/gem/Makefile + create mode 100644 drivers/gpu/drm/i915/gem/Makefile.header-test + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_busy.c + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_clflush.c (76%) + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_clflush.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_client_blt.c + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_client_blt.h + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_context.c (96%) + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_context.h (85%) + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_context_types.h (94%) + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_dmabuf.c (84%) + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_domain.c + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_execbuffer.c (96%) + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_fence.c + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_internal.c (81%) + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ioctls.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_mman.c + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_object.c + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_object.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_object_blt.c + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_object_blt.h + rename drivers/gpu/drm/i915/{i915_gem_object.h => gem/i915_gem_object_types.h} (51%) + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_pages.c + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_phys.c + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_pm.c (95%) + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_pm.h (100%) + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_shmem.c + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_shrinker.c (82%) + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_stolen.c (93%) + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_throttle.c + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_tiling.c (90%) + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_userptr.c (94%) + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_wait.c + rename drivers/gpu/drm/i915/{ => gem}/i915_gemfs.c (51%) + create mode 100644 drivers/gpu/drm/i915/gem/i915_gemfs.h + rename drivers/gpu/drm/i915/{ => gem}/selftests/huge_gem_object.c (70%) + create mode 100644 drivers/gpu/drm/i915/gem/selftests/huge_gem_object.h + rename drivers/gpu/drm/i915/{ => gem}/selftests/huge_pages.c (95%) + create mode 100644 drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c + rename drivers/gpu/drm/i915/{ => gem}/selftests/i915_gem_coherency.c (84%) + rename drivers/gpu/drm/i915/{ => gem}/selftests/i915_gem_context.c (95%) + rename drivers/gpu/drm/i915/{ => gem}/selftests/i915_gem_dmabuf.c (85%) + rename drivers/gpu/drm/i915/{selftests/i915_gem_object.c => gem/selftests/i915_gem_mman.c} (70%) + create mode 100644 drivers/gpu/drm/i915/gem/selftests/i915_gem_object.c + create mode 100644 drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c + create mode 100644 drivers/gpu/drm/i915/gem/selftests/i915_gem_phys.c + rename drivers/gpu/drm/i915/{ => gem}/selftests/igt_gem_utils.c (87%) + rename drivers/gpu/drm/i915/{ => gem}/selftests/igt_gem_utils.h (100%) + rename drivers/gpu/drm/i915/{ => gem}/selftests/mock_context.c (62%) + create mode 100644 drivers/gpu/drm/i915/gem/selftests/mock_context.h + rename drivers/gpu/drm/i915/{ => gem}/selftests/mock_dmabuf.c (73%) + create mode 100644 drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.h + rename drivers/gpu/drm/i915/{ => gem}/selftests/mock_gem_object.h (65%) + delete mode 100644 drivers/gpu/drm/i915/i915_gem_clflush.h + delete mode 100644 drivers/gpu/drm/i915/i915_gem_object.c + delete mode 100644 drivers/gpu/drm/i915/i915_gemfs.h + create mode 100644 drivers/gpu/drm/i915/i915_scatterlist.c + create mode 100644 drivers/gpu/drm/i915/i915_scatterlist.h + create mode 100644 drivers/gpu/drm/i915/intel_bw.c + create mode 100644 drivers/gpu/drm/i915/intel_bw.h + delete mode 100644 drivers/gpu/drm/i915/intel_context.c + create mode 100644 drivers/gpu/drm/i915/intel_display_power.c + create mode 100644 drivers/gpu/drm/i915/intel_display_power.h + delete mode 100644 drivers/gpu/drm/i915/selftests/huge_gem_object.h + delete mode 100644 drivers/gpu/drm/i915/selftests/mock_context.h + delete mode 100644 drivers/gpu/drm/i915/selftests/mock_dmabuf.h +Merging drm-tegra/drm/tegra/for-next (f3b0d8793c16 drm/tegra: dpaux: Make VDD supply optional) +$ git merge drm-tegra/drm/tegra/for-next +Auto-merging include/linux/host1x.h +Auto-merging drivers/gpu/host1x/dev.c +Auto-merging drivers/gpu/host1x/bus.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/dpaux.c | 13 +++++++---- + drivers/gpu/drm/tegra/drm.h | 3 +-- + drivers/gpu/drm/tegra/output.c | 52 +++++++++++++++--------------------------- + drivers/gpu/host1x/bus.c | 35 +++++++++++++++++++++++++++- + drivers/gpu/host1x/dev.c | 5 +++- + include/linux/host1x.h | 2 ++ + 6 files changed, 69 insertions(+), 41 deletions(-) +Merging drm-misc/for-linux-next (7355965da22b drm/vkms: Forward timer right after drm_crtc_handle_vblank) +$ git merge drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/virtio/virtgpu_ioctl.c +Auto-merging drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +Merge made by the 'recursive' strategy. + .../bindings/display/rockchip/dw_hdmi-rockchip.txt | 7 ++ + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 116 ++++++++++++++++++--- + drivers/gpu/drm/drm_debugfs_crc.c | 5 +- + drivers/gpu/drm/drm_edid.c | 4 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 2 +- + drivers/gpu/drm/drm_panel_orientation_quirks.c | 32 ++++++ + drivers/gpu/drm/panel/panel-truly-nt35597.c | 1 + + drivers/gpu/drm/r128/r128_cce.c | 28 +++-- + drivers/gpu/drm/r128/r128_drv.c | 9 +- + drivers/gpu/drm/r128/r128_drv.h | 16 ++- + drivers/gpu/drm/r128/r128_state.c | 25 +++-- + drivers/gpu/drm/savage/savage_bci.c | 25 +++-- + drivers/gpu/drm/savage/savage_drv.c | 9 +- + drivers/gpu/drm/savage/savage_drv.h | 10 +- + drivers/gpu/drm/savage/savage_state.c | 9 +- + drivers/gpu/drm/sis/sis_drv.c | 8 +- + drivers/gpu/drm/sis/sis_drv.h | 10 +- + drivers/gpu/drm/sis/sis_mm.c | 7 +- + drivers/gpu/drm/sti/sti_awg_utils.c | 2 + + drivers/gpu/drm/sti/sti_awg_utils.h | 2 +- + drivers/gpu/drm/sti/sti_compositor.c | 5 +- + drivers/gpu/drm/sti/sti_crtc.c | 4 +- + drivers/gpu/drm/sti/sti_crtc.h | 6 +- + drivers/gpu/drm/sti/sti_cursor.c | 2 + + drivers/gpu/drm/sti/sti_cursor.h | 3 + + drivers/gpu/drm/sti/sti_drv.c | 11 +- + drivers/gpu/drm/sti/sti_drv.h | 5 +- + drivers/gpu/drm/sti/sti_dvo.c | 3 +- + drivers/gpu/drm/sti/sti_gdp.c | 4 + + drivers/gpu/drm/sti/sti_gdp.h | 5 + + drivers/gpu/drm/sti/sti_hda.c | 6 +- + drivers/gpu/drm/sti/sti_hdmi.c | 5 +- + drivers/gpu/drm/sti/sti_hdmi.h | 4 +- + drivers/gpu/drm/sti/sti_hdmi_tx3g4c28phy.c | 2 + + drivers/gpu/drm/sti/sti_hqvdp.c | 8 +- + drivers/gpu/drm/sti/sti_mixer.c | 4 + + drivers/gpu/drm/sti/sti_mixer.h | 7 +- + drivers/gpu/drm/sti/sti_plane.c | 4 +- + drivers/gpu/drm/sti/sti_plane.h | 1 - + drivers/gpu/drm/sti/sti_tvout.c | 6 +- + drivers/gpu/drm/sti/sti_vid.c | 4 +- + drivers/gpu/drm/sti/sti_vtg.c | 4 +- + drivers/gpu/drm/sti/sti_vtg.h | 1 + + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 15 ++- + drivers/gpu/drm/virtio/virtgpu_vq.c | 24 ++++- + drivers/gpu/drm/vkms/vkms_crtc.c | 22 ++-- + drivers/gpu/drm/vkms/vkms_output.c | 10 -- + include/drm/drm_edid.h | 32 +++--- + 48 files changed, 395 insertions(+), 139 deletions(-) +Merging drm-msm/msm-next (981f2aabeae6 drm/msm/a6xx: Rename a6xx_gmu_probe to a6xx_gmu_init) +$ git merge drm-msm/msm-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 66 ++++++++++++++++++++++++----------- + drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 1 + + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 2 +- + 4 files changed, 48 insertions(+), 23 deletions(-) +Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane) +$ git merge hdlcd/for-upstream/hdlcd +Already up to date. +Merging mali-dp/for-upstream/mali-dp (15e9122d9b5c drm/komeda: Mark the local functions as static) +$ git merge mali-dp/for-upstream/mali-dp +Already up to date. +Merging imx-drm/imx-drm/next (5d5fe9970c76 drm/imx: enable IDMAC watermark feature) +$ git merge imx-drm/imx-drm/next +Auto-merging drivers/gpu/ipu-v3/ipu-dp.c +Auto-merging drivers/gpu/drm/imx/ipuv3-plane.c +Auto-merging drivers/gpu/drm/imx/ipuv3-crtc.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/ipuv3-plane.c | 1 + + 1 file changed, 1 insertion(+) +Merging etnaviv/etnaviv/next (2b76f5be7c27 drm/etnaviv: initialize idle mask before querying the HW db) +$ git merge etnaviv/etnaviv/next +Already up to date. +Merging regmap/for-next (38ee2a8cc70e Merge branch 'regmap-5.2' into regmap-linus) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (e046b64b1547 ALSA: hda/ca0132: Use struct_size()) +$ git merge sound/for-next +Auto-merging sound/soc/sof/intel/hda.c +Auto-merging sound/pci/rme9652/hdspm.c +CONFLICT (content): Merge conflict in sound/pci/rme9652/hdspm.c +Auto-merging sound/pci/hda/patch_ca0132.c +Auto-merging sound/pci/hda/hda_intel.c +Auto-merging sound/pci/hda/hda_controller.h +Auto-merging sound/pci/hda/hda_controller.c +Auto-merging sound/pci/hda/hda_codec.c +Auto-merging sound/hda/hdac_controller.c +Auto-merging sound/firewire/dice/Makefile +Auto-merging sound/core/control.c +Resolved 'sound/pci/rme9652/hdspm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3b1a81e85a44] Merge remote-tracking branch 'sound/for-next' +$ git diff -M --stat --summary HEAD^.. + include/sound/hdaudio.h | 3 + + sound/core/control.c | 6 +- + sound/core/oss/rate.c | 4 +- + sound/firewire/amdtp-am824.c | 2 +- + sound/firewire/amdtp-stream-trace.h | 163 ++------- + sound/firewire/amdtp-stream.c | 511 +++++++++++++++------------- + sound/firewire/amdtp-stream.h | 38 ++- + sound/firewire/dice/Makefile | 2 +- + sound/firewire/dice/dice-presonus.c | 62 ++++ + sound/firewire/dice/dice.c | 9 + + sound/firewire/dice/dice.h | 1 + + sound/firewire/digi00x/amdtp-dot.c | 2 +- + sound/firewire/fireworks/fireworks_stream.c | 4 +- + sound/firewire/motu/amdtp-motu.c | 2 +- + sound/firewire/tascam/amdtp-tascam.c | 2 +- + sound/hda/hdac_controller.c | 2 + + sound/pci/hda/hda_codec.c | 2 +- + sound/pci/hda/hda_controller.c | 12 +- + sound/pci/hda/hda_controller.h | 2 - + sound/pci/hda/hda_intel.c | 8 +- + sound/pci/hda/patch_ca0132.c | 2 +- + sound/pci/rme9652/hdspm.c | 62 ++-- + sound/soc/sof/intel/hda.c | 8 + + sound/usb/line6/driver.c | 11 - + sound/usb/line6/driver.h | 9 - + sound/usb/line6/pod.c | 108 ++---- + sound/usb/line6/podhd.c | 80 +---- + sound/usb/line6/toneport.c | 14 +- + sound/usb/line6/variax.c | 138 +++----- + 29 files changed, 551 insertions(+), 718 deletions(-) + create mode 100644 sound/firewire/dice/dice-presonus.c +Merging sound-asoc/for-next (8320a046b9e3 Merge branch 'asoc-5.3' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging sound/soc/sof/intel/hda.c +Removing include/uapi/sound/sof/trace.h +Removing include/uapi/sound/sof/tone.h +Removing include/uapi/sound/sof/manifest.h +Removing include/uapi/sound/sof/eq.h +Removing Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt +Removing Documentation/devicetree/bindings/sound/sun4i-i2s.txt +Merge made by the 'recursive' strategy. + .../bindings/sound/allwinner,sun4i-a10-i2s.yaml | 132 ++ + .../bindings/sound/allwinner,sun4i-a10-spdif.yaml | 120 ++ + .../bindings/sound/amlogic,g12a-tohdmitx.txt | 55 + + .../devicetree/bindings/sound/cs42xx8.txt | 6 + + Documentation/devicetree/bindings/sound/rt1011.txt | 32 + + .../devicetree/bindings/sound/sun4i-i2s.txt | 45 - + .../bindings/sound/sunxi,sun4i-spdif.txt | 42 - + drivers/gpu/drm/vc4/vc4_hdmi.c | 19 +- + include/dt-bindings/sound/meson-g12a-tohdmitx.h | 13 + + include/sound/simple_card_utils.h | 20 +- + include/sound/soc.h | 155 +- + include/sound/sof/header.h | 7 +- + include/sound/sof/topology.h | 3 + + include/sound/sof/trace.h | 10 + + include/uapi/sound/sof/abi.h | 2 +- + include/uapi/sound/sof/eq.h | 172 -- + include/uapi/sound/sof/manifest.h | 188 -- + include/uapi/sound/sof/tone.h | 21 - + include/uapi/sound/sof/trace.h | 66 - + sound/soc/amd/acp-da7219-max98357a.c | 42 +- + sound/soc/amd/acp-rt5645.c | 21 +- + sound/soc/amd/raven/acp3x-pcm-dma.c | 43 +- + sound/soc/atmel/atmel-classd.c | 21 +- + sound/soc/atmel/atmel-pdmic.c | 21 +- + sound/soc/atmel/atmel_wm8904.c | 17 +- + sound/soc/atmel/mikroe-proto.c | 21 +- + sound/soc/atmel/sam9g20_wm8731.c | 22 +- + sound/soc/atmel/sam9x5_wm8731.c | 20 +- + sound/soc/atmel/tse850-pcm5142.c | 13 +- + sound/soc/au1x/db1000.c | 10 +- + sound/soc/au1x/db1200.c | 50 +- + sound/soc/cirrus/edb93xx.c | 10 +- + sound/soc/cirrus/simone.c | 10 +- + sound/soc/cirrus/snappercl15.c | 11 +- + sound/soc/codecs/Kconfig | 16 +- + sound/soc/codecs/Makefile | 4 + + sound/soc/codecs/cs42xx8.c | 13 + + sound/soc/codecs/cx2072x.c | 1725 +++++++++++++++ + sound/soc/codecs/cx2072x.h | 314 +++ + sound/soc/codecs/hdmi-codec.c | 188 +- + sound/soc/codecs/max98357a.c | 29 +- + sound/soc/codecs/pcm3168a.c | 60 +- + sound/soc/codecs/rt1011.c | 2244 ++++++++++++++++++++ + sound/soc/codecs/rt1011.h | 672 ++++++ + sound/soc/codecs/rt5677-spi.c | 4 +- + sound/soc/codecs/rt5677.c | 15 +- + sound/soc/codecs/rt5677.h | 32 +- + sound/soc/codecs/tlv320aic3x.c | 14 +- + sound/soc/codecs/wcd9335.c | 2 +- + sound/soc/fsl/efika-audio-fabric.c | 22 +- + sound/soc/fsl/eukrea-tlv320.c | 19 +- + sound/soc/fsl/fsl-asoc-card.c | 47 +- + sound/soc/fsl/fsl_asrc.c | 103 +- + sound/soc/fsl/fsl_esai.c | 141 +- + sound/soc/fsl/fsl_sai.c | 54 +- + sound/soc/fsl/fsl_utils.c | 2 +- + sound/soc/fsl/imx-audmix.c | 45 +- + sound/soc/fsl/imx-es8328.c | 23 +- + sound/soc/fsl/imx-mc13783.c | 10 +- + sound/soc/fsl/imx-sgtl5000.c | 23 +- + sound/soc/fsl/imx-spdif.c | 20 +- + sound/soc/fsl/mpc8610_hpcd.c | 33 +- + sound/soc/fsl/mx27vis-aic32x4.c | 11 +- + sound/soc/fsl/p1022_ds.c | 36 +- + sound/soc/fsl/p1022_rdk.c | 35 +- + sound/soc/fsl/pcm030-audio-fabric.c | 20 +- + sound/soc/fsl/phycore-ac97.c | 10 +- + sound/soc/fsl/wm1133-ev1.c | 10 +- + sound/soc/generic/audio-graph-card.c | 30 +- + sound/soc/generic/simple-card-utils.c | 21 +- + sound/soc/generic/simple-card.c | 47 +- + sound/soc/intel/Kconfig | 25 + + sound/soc/intel/atom/sst/sst_acpi.c | 65 +- + sound/soc/intel/boards/Kconfig | 18 +- + sound/soc/intel/boards/Makefile | 2 + + sound/soc/intel/boards/bdw-rt5677.c | 22 +- + sound/soc/intel/boards/broadwell.c | 46 +- + sound/soc/intel/boards/bxt_da7219_max98357a.c | 151 +- + sound/soc/intel/boards/bxt_rt298.c | 135 +- + sound/soc/intel/boards/byt-max98090.c | 10 +- + sound/soc/intel/boards/byt-rt5640.c | 10 +- + sound/soc/intel/boards/bytcht_cx2072x.c | 270 +++ + sound/soc/intel/boards/bytcht_da7213.c | 38 +- + sound/soc/intel/boards/bytcht_es8316.c | 51 +- + sound/soc/intel/boards/bytcht_nocodec.c | 30 +- + sound/soc/intel/boards/bytcr_rt5640.c | 60 +- + sound/soc/intel/boards/bytcr_rt5651.c | 58 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 32 +- + sound/soc/intel/boards/cht_bsw_nau8824.c | 41 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 59 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 39 +- + sound/soc/intel/boards/glk_rt5682_max98357a.c | 145 +- + sound/soc/intel/boards/haswell.c | 46 +- + sound/soc/intel/boards/kbl_da7219_max98357a.c | 115 +- + sound/soc/intel/boards/kbl_da7219_max98927.c | 286 +-- + sound/soc/intel/boards/kbl_rt5660.c | 83 +- + sound/soc/intel/boards/kbl_rt5663_max98927.c | 184 +- + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 126 +- + sound/soc/intel/boards/skl_hda_dsp_common.c | 67 +- + sound/soc/intel/boards/skl_hda_dsp_generic.c | 4 +- + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 120 +- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 132 +- + sound/soc/intel/boards/skl_rt286.c | 118 +- + sound/soc/intel/boards/sof_rt5682.c | 69 +- + sound/soc/intel/common/soc-acpi-intel-byt-match.c | 8 + + sound/soc/intel/common/soc-acpi-intel-cht-match.c | 8 + + sound/soc/intel/common/soc-intel-quirks.h | 115 + + sound/soc/intel/skylake/skl-messages.c | 16 + + sound/soc/intel/skylake/skl-pcm.c | 2 +- + sound/soc/intel/skylake/skl-topology.c | 11 +- + sound/soc/intel/skylake/skl.c | 10 + + sound/soc/jz4740/qi_lb60.c | 10 +- + sound/soc/kirkwood/armada-370-db.c | 42 +- + sound/soc/mediatek/common/mtk-afe-fe-dai.c | 6 + + sound/soc/mediatek/common/mtk-base-afe.h | 2 + + sound/soc/mediatek/common/mtk-btcvsd.c | 22 +- + sound/soc/mediatek/mt2701/mt2701-cs42448.c | 95 +- + sound/soc/mediatek/mt2701/mt2701-wm8960.c | 34 +- + sound/soc/mediatek/mt6797/mt6797-mt6351.c | 115 +- + sound/soc/mediatek/mt8173/mt8173-max98090.c | 34 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 51 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 85 +- + sound/soc/mediatek/mt8173/mt8173-rt5650.c | 74 +- + sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 23 +- + sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 197 +- + sound/soc/mediatek/mt8183/mt8183-dai-adda.c | 14 +- + .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 193 +- + sound/soc/meson/Kconfig | 8 + + sound/soc/meson/Makefile | 2 + + sound/soc/meson/axg-card.c | 86 +- + sound/soc/meson/g12a-tohdmitx.c | 413 ++++ + sound/soc/mxs/mxs-sgtl5000.c | 27 +- + sound/soc/nuc900/nuc900-audio.c | 10 +- + sound/soc/pxa/brownstone.c | 10 +- + sound/soc/pxa/corgi.c | 10 +- + sound/soc/pxa/e740_wm9705.c | 20 +- + sound/soc/pxa/e750_wm9705.c | 20 +- + sound/soc/pxa/e800_wm9712.c | 21 +- + sound/soc/pxa/em-x270.c | 20 +- + sound/soc/pxa/hx4700.c | 10 +- + sound/soc/pxa/imote2.c | 11 +- + sound/soc/pxa/magician.c | 22 +- + sound/soc/pxa/mioa701_wm9713.c | 20 +- + sound/soc/pxa/palm27x.c | 20 +- + sound/soc/pxa/poodle.c | 10 +- + sound/soc/pxa/spitz.c | 10 +- + sound/soc/pxa/tosa.c | 20 +- + sound/soc/pxa/ttc-dkb.c | 10 +- + sound/soc/pxa/z2.c | 10 +- + sound/soc/pxa/zylonite.c | 30 +- + sound/soc/qcom/apq8016_sbc.c | 19 +- + sound/soc/qcom/common.c | 33 +- + sound/soc/qcom/qdsp6/q6core.c | 16 +- + sound/soc/qcom/storm.c | 17 +- + sound/soc/rockchip/rk3288_hdmi_analog.c | 21 +- + sound/soc/rockchip/rk3399_gru_sound.c | 51 +- + sound/soc/rockchip/rockchip_max98090.c | 17 +- + sound/soc/rockchip/rockchip_rt5645.c | 33 +- + sound/soc/samsung/arndale_rt5631.c | 25 +- + sound/soc/samsung/bells.c | 87 +- + sound/soc/samsung/h1940_uda1380.c | 10 +- + sound/soc/samsung/jive_wm8750.c | 10 +- + sound/soc/samsung/littlemill.c | 19 +- + sound/soc/samsung/lowland.c | 26 +- + sound/soc/samsung/neo1973_wm8753.c | 18 +- + sound/soc/samsung/odroid.c | 29 +- + sound/soc/samsung/rx1950_uda1380.c | 11 +- + sound/soc/samsung/s3c24xx_simtec_hermes.c | 11 +- + sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c | 11 +- + sound/soc/samsung/s3c24xx_uda134x.c | 10 +- + sound/soc/samsung/smartq_wm8987.c | 10 +- + sound/soc/samsung/smdk_spdif.c | 10 +- + sound/soc/samsung/smdk_wm8580.c | 20 +- + sound/soc/samsung/smdk_wm8994.c | 30 +- + sound/soc/samsung/smdk_wm8994pcm.c | 10 +- + sound/soc/samsung/snow.c | 40 +- + sound/soc/samsung/speyside.c | 26 +- + sound/soc/samsung/tm2_wm5110.c | 42 +- + sound/soc/samsung/tobermory.c | 10 +- + sound/soc/sh/migor.c | 10 +- + sound/soc/sh/rcar/core.c | 120 +- + sound/soc/sh/sh7760-ac97.c | 11 +- + sound/soc/sirf/sirf-audio.c | 13 +- + sound/soc/soc-acpi.c | 2 + + sound/soc/soc-core.c | 235 +- + sound/soc/soc-dapm.c | 5 +- + sound/soc/soc-pcm.c | 88 +- + sound/soc/soc-topology.c | 22 +- + sound/soc/sof/Kconfig | 10 +- + sound/soc/sof/debug.c | 247 ++- + sound/soc/sof/intel/Kconfig | 32 + + sound/soc/sof/intel/byt.c | 5 +- + sound/soc/sof/intel/cnl.c | 75 +- + sound/soc/sof/intel/hda-ipc.c | 43 +- + sound/soc/sof/intel/hda.c | 13 +- + sound/soc/sof/intel/hda.h | 2 + + sound/soc/sof/ipc.c | 9 + + sound/soc/sof/loader.c | 10 +- + sound/soc/sof/nocodec.c | 21 +- + sound/soc/sof/pcm.c | 29 +- + sound/soc/sof/sof-acpi-dev.c | 57 +- + sound/soc/sof/sof-pci-dev.c | 34 +- + sound/soc/sof/sof-priv.h | 10 +- + sound/soc/sof/topology.c | 32 +- + sound/soc/sof/trace.c | 66 +- + sound/soc/stm/stm32_i2s.c | 60 +- + sound/soc/stm/stm32_sai.c | 44 +- + sound/soc/stm/stm32_sai.h | 54 +- + sound/soc/stm/stm32_sai_sub.c | 14 +- + sound/soc/stm/stm32_spdifrx.c | 37 +- + sound/soc/sunxi/sun4i-codec.c | 20 +- + sound/soc/sunxi/sun4i-i2s.c | 71 +- + sound/soc/sunxi/sun4i-spdif.c | 49 +- + sound/soc/tegra/tegra_alc5632.c | 37 +- + sound/soc/tegra/tegra_max98090.c | 17 +- + sound/soc/tegra/tegra_rt5640.c | 17 +- + sound/soc/tegra/tegra_rt5677.c | 37 +- + sound/soc/tegra/tegra_sgtl5000.c | 37 +- + sound/soc/tegra/tegra_wm8753.c | 17 +- + sound/soc/tegra/tegra_wm8903.c | 17 +- + sound/soc/tegra/tegra_wm9712.c | 14 +- + sound/soc/tegra/trimslice.c | 19 +- + sound/soc/ti/ams-delta.c | 10 +- + sound/soc/ti/davinci-evm.c | 105 +- + sound/soc/ti/n810.c | 11 +- + sound/soc/ti/omap-abe-twl6040.c | 36 +- + sound/soc/ti/omap-hdmi.c | 20 +- + sound/soc/ti/omap-twl4030.c | 36 +- + sound/soc/ti/omap3pandora.c | 20 +- + sound/soc/ti/osk5912.c | 11 +- + sound/soc/ti/rx51.c | 23 +- + sound/soc/txx9/txx9aclc-generic.c | 10 +- + sound/soc/ux500/mop500.c | 36 +- + 233 files changed, 11194 insertions(+), 3736 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-i2s.yaml + create mode 100644 Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-spdif.yaml + create mode 100644 Documentation/devicetree/bindings/sound/amlogic,g12a-tohdmitx.txt + create mode 100644 Documentation/devicetree/bindings/sound/rt1011.txt + delete mode 100644 Documentation/devicetree/bindings/sound/sun4i-i2s.txt + delete mode 100644 Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt + create mode 100644 include/dt-bindings/sound/meson-g12a-tohdmitx.h + delete mode 100644 include/uapi/sound/sof/eq.h + delete mode 100644 include/uapi/sound/sof/manifest.h + delete mode 100644 include/uapi/sound/sof/tone.h + delete mode 100644 include/uapi/sound/sof/trace.h + create mode 100644 sound/soc/codecs/cx2072x.c + create mode 100644 sound/soc/codecs/cx2072x.h + create mode 100644 sound/soc/codecs/rt1011.c + create mode 100644 sound/soc/codecs/rt1011.h + create mode 100644 sound/soc/intel/boards/bytcht_cx2072x.c + create mode 100644 sound/soc/intel/common/soc-intel-quirks.h + create mode 100644 sound/soc/meson/g12a-tohdmitx.c +Merging modules/modules-next (6e6de3dee51a kernel/module.c: Only return -EEXIST for modules that have finished loading) +$ git merge modules/modules-next +Auto-merging kernel/module.c +Merge made by the 'recursive' strategy. + kernel/module.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) +Merging input/next (b02f6b6b711b Input: tca8418 - remove set but not used variable 'max_keys') +$ git merge input/next +Auto-merging drivers/input/touchscreen/eeti_ts.c +Auto-merging drivers/input/misc/da9063_onkey.c +CONFLICT (content): Merge conflict in drivers/input/misc/da9063_onkey.c +Resolved 'drivers/input/misc/da9063_onkey.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f7127958117c] Merge remote-tracking branch 'input/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/input/elan_i2c.txt | 11 + + drivers/input/keyboard/imx_keypad.c | 4 +- + drivers/input/keyboard/tca8418_keypad.c | 3 +- + drivers/input/misc/da9063_onkey.c | 13 +- + drivers/input/mouse/elan_i2c_core.c | 72 ++++- + drivers/input/mouse/elantech.c | 322 +++++++++++---------- + drivers/input/mouse/elantech.h | 8 + + drivers/input/rmi4/rmi_f12.c | 6 +- + drivers/input/touchscreen/eeti_ts.c | 71 ++++- + drivers/input/touchscreen/imx6ul_tsc.c | 8 +- + drivers/input/touchscreen/iqs5xx.c | 2 - + 11 files changed, 311 insertions(+), 209 deletions(-) +Merging block/for-next (51af912e51dd Merge branch 'io_uring-next' into for-next) +$ git merge block/for-next +Auto-merging net/socket.c +Merge made by the 'recursive' strategy. + fs/aio.c | 9 +- + fs/io_uring.c | 331 ++++++++++++++++++++++++++++++++++-------- + fs/splice.c | 8 +- + include/linux/socket.h | 7 + + include/linux/uio.h | 4 +- + include/uapi/linux/io_uring.h | 4 + + lib/iov_iter.c | 15 +- + net/compat.c | 3 +- + net/socket.c | 18 ++- + 9 files changed, 323 insertions(+), 76 deletions(-) +Merging device-mapper/for-next (51b86f9a8d1c dm: make sure to obey max_io_len_target_boundary) +$ git merge device-mapper/for-next +Already up to date. +Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges) +$ git merge pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (a78b6dc2b410 mmc: sdhci-pci: remove redundant check of slots == 0) +$ git merge mmc/next +Auto-merging drivers/mmc/host/sdhci-pci-core.c +Auto-merging drivers/mmc/host/meson-mx-sdio.c +CONFLICT (content): Merge conflict in drivers/mmc/host/meson-mx-sdio.c +Removing Documentation/devicetree/bindings/mmc/sunxi-mmc.txt +Resolved 'drivers/mmc/host/meson-mx-sdio.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c55125ed69f8] Merge remote-tracking branch 'mmc/next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 98 ++++++ + .../devicetree/bindings/mmc/amlogic,meson-gx.txt | 4 + + .../devicetree/bindings/mmc/mmc-controller.yaml | 374 +++++++++++++++++++++ + Documentation/devicetree/bindings/mmc/mmc.txt | 178 +--------- + .../devicetree/bindings/mmc/sunxi-mmc.txt | 52 --- + drivers/memstick/core/memstick.c | 13 +- + drivers/mmc/host/android-goldfish.c | 31 +- + drivers/mmc/host/meson-gx-mmc.c | 85 +++-- + drivers/mmc/host/meson-mx-sdio.c | 2 +- + drivers/mmc/host/renesas_sdhi_core.c | 6 + + drivers/mmc/host/sdhci-pci-core.c | 2 - + drivers/mmc/host/sdhci_am654.c | 37 +- + drivers/mmc/host/tmio_mmc.c | 5 + + drivers/mmc/host/tmio_mmc_core.c | 11 +- + drivers/mmc/host/uniphier-sd.c | 3 + + 15 files changed, 598 insertions(+), 303 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/allwinner,sun4i-a10-mmc.yaml + create mode 100644 Documentation/devicetree/bindings/mmc/mmc-controller.yaml + delete mode 100644 Documentation/devicetree/bindings/mmc/sunxi-mmc.txt +Merging kgdb/kgdb-next (3bd67b37e350 kdb: print real address of pointers instead of hashed addresses) +$ git merge kgdb/kgdb-next +Auto-merging kernel/debug/kdb/kdb_support.c +Auto-merging kernel/debug/kdb/kdb_main.c +Auto-merging kernel/debug/kdb/kdb_bt.c +CONFLICT (content): Merge conflict in kernel/debug/kdb/kdb_bt.c +Resolved 'kernel/debug/kdb/kdb_bt.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 363e7db1711b] Merge remote-tracking branch 'kgdb/kgdb-next' +$ git diff -M --stat --summary HEAD^.. +Merging md/for-next (e820d55cb99d md: fix raid10 hang issue caused by barrier) +$ git merge md/for-next +Already up to date. +Merging mfd/for-mfd-next (c769c3cb70e0 mfd: cros_ec: Update I2S API) +$ git merge mfd/for-mfd-next +Auto-merging drivers/mfd/menelaus.c +Auto-merging drivers/mfd/cros_ec_dev.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/lp87565.txt | 36 + + .../devicetree/bindings/mfd/rohm,bd71837-pmic.txt | 8 + + drivers/mfd/cros_ec_dev.c | 13 +- + drivers/mfd/intel-lpss-pci.c | 6 +- + drivers/mfd/lp87565.c | 4 + + drivers/mfd/madera-core.c | 1 + + drivers/mfd/menelaus.c | 2 - + drivers/mfd/rohm-bd718x7.c | 61 +- + include/linux/mfd/cros_ec_commands.h | 3658 ++++++++++++++++---- + include/linux/mfd/lp87565.h | 2 + + sound/soc/codecs/cros_ec_codec.c | 8 +- + 11 files changed, 3019 insertions(+), 780 deletions(-) +Merging backlight/for-backlight-next (53fa0f87177d backlight: lm3630a: Add firmware node support) +$ git merge backlight/for-backlight-next +Auto-merging drivers/video/backlight/Kconfig +Merge made by the 'recursive' strategy. +Merging battery/for-next (a188339ca5a3 Linux 5.2-rc1) +$ git merge battery/for-next +Already up to date. +Merging regulator/for-next (2c447cd09251 Merge branch 'regulator-5.3' into regulator-next) +$ git merge regulator/for-next +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/regulator/max8660.txt +Removing Documentation/devicetree/bindings/regulator/gpio-regulator.txt +Merge made by the 'recursive' strategy. + .../bindings/regulator/arizona-regulator.txt | 3 +- + .../bindings/regulator/fixed-regulator.yaml | 5 +- + .../bindings/regulator/gpio-regulator.txt | 57 --- + .../bindings/regulator/gpio-regulator.yaml | 118 +++++ + .../devicetree/bindings/regulator/max8660.txt | 47 -- + .../devicetree/bindings/regulator/max8660.yaml | 77 +++ + .../devicetree/bindings/regulator/regulator.txt | 140 +----- + .../devicetree/bindings/regulator/regulator.yaml | 200 ++++++++ + .../devicetree/bindings/regulator/slg51000.txt | 88 ++++ + MAINTAINERS | 2 + + drivers/regulator/Kconfig | 26 +- + drivers/regulator/Makefile | 1 + + drivers/regulator/arizona-ldo1.c | 83 +++- + drivers/regulator/arizona-micsupp.c | 72 ++- + drivers/regulator/bd70528-regulator.c | 1 - + drivers/regulator/bd718x7-regulator.c | 1 - + drivers/regulator/core.c | 6 +- + drivers/regulator/da9063-regulator.c | 61 ++- + drivers/regulator/max77620-regulator.c | 26 +- + drivers/regulator/max77650-regulator.c | 134 ++---- + drivers/regulator/slg51000-regulator.c | 523 +++++++++++++++++++++ + drivers/regulator/slg51000-regulator.h | 505 ++++++++++++++++++++ + include/linux/mfd/da9063/pdata.h | 49 -- + 23 files changed, 1808 insertions(+), 417 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/regulator/gpio-regulator.txt + create mode 100644 Documentation/devicetree/bindings/regulator/gpio-regulator.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/max8660.txt + create mode 100644 Documentation/devicetree/bindings/regulator/max8660.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/regulator.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/slg51000.txt + create mode 100644 drivers/regulator/slg51000-regulator.c + create mode 100644 drivers/regulator/slg51000-regulator.h +Merging security/next-testing (5664f5faac11 Merge branch 'next-smack' into next-testing) +$ git merge security/next-testing +Auto-merging security/tomoyo/Kconfig +Auto-merging security/keys/trusted.c +Auto-merging drivers/char/tpm/eventlog/tpm2.c +Merge made by the 'recursive' strategy. +Merging apparmor/apparmor-next (06c13f554a71 apparmor: re-introduce a variant of PROFILE_MEDIATES_SAFE) +$ git merge apparmor/apparmor-next +Auto-merging security/apparmor/apparmorfs.c +Auto-merging security/apparmor/Kconfig +Merge made by the 'recursive' strategy. + security/apparmor/Kconfig | 2 + + security/apparmor/apparmorfs.c | 132 ++++++++++++++++++++++++++++-- + security/apparmor/include/apparmor.h | 1 + + security/apparmor/include/policy.h | 8 ++ + security/apparmor/include/policy_unpack.h | 8 +- + security/apparmor/lsm.c | 47 +++++++++++ + security/apparmor/policy.c | 5 +- + security/apparmor/policy_unpack.c | 116 +++++++++++++++++++++++++- + 8 files changed, 305 insertions(+), 14 deletions(-) +Merging integrity/next-integrity (2cd4737bc850 ima: prevent a file already mmap'ed write to be mmap'ed execute) +$ git merge integrity/next-integrity +Merge made by the 'recursive' strategy. + arch/x86/kernel/ima_arch.c | 12 ++++++++++-- + security/integrity/ima/ima_main.c | 32 ++++++++++++++++++++++++++++++-- + 2 files changed, 40 insertions(+), 4 deletions(-) +Merging selinux/next (beee56f3543a selinux: remove some no-op BUG_ONs) +$ git merge selinux/next +Merge made by the 'recursive' strategy. + security/selinux/ss/ebitmap.c | 10 ++++++---- + security/selinux/ss/services.c | 4 ---- + 2 files changed, 6 insertions(+), 8 deletions(-) +Merging tpmdd/next (3ed5d6926f08 efi: Attempt to get the TCG2 event log in the boot stub) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + drivers/char/tpm/eventlog/efi.c | 50 ++++++++++-- + drivers/char/tpm/eventlog/tpm2.c | 47 +----------- + drivers/char/tpm/tpm1-cmd.c | 7 +- + drivers/char/tpm/tpm2-cmd.c | 7 +- + drivers/firmware/efi/efi.c | 2 + + drivers/firmware/efi/libstub/tpm.c | 50 +++++++----- + drivers/firmware/efi/tpm.c | 62 ++++++++++++++- + include/linux/efi.h | 9 +++ + include/linux/tpm_eventlog.h | 152 +++++++++++++++++++++++++++++++++++++ + 9 files changed, 309 insertions(+), 77 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 226dacd25e90 Merge remote-tracking branch 'selinux/next' +Merging next-20190604 version of tpmdd +$ git merge -m next-20190604/tpmdd ff89e2f4b34dda492f4a14bad212ef9de570879c +Auto-merging security/keys/trusted.c +Auto-merging drivers/char/tpm/eventlog/tpm2.c +Merge made by the 'recursive' strategy. + drivers/char/tpm/tpm1-cmd.c | 7 +++++-- + drivers/char/tpm/tpm2-cmd.c | 7 +++++-- + 2 files changed, 10 insertions(+), 4 deletions(-) +Merging watchdog/master (a9f0bda567e3 watchdog: Enforce that at least one pretimeout governor is enabled) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (d6f11edc3bf7 Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'arm/renesas', 'generic-dma-ops' and 'core' into next) +$ git merge iommu/next +Merge made by the 'recursive' strategy. + drivers/iommu/amd_iommu.c | 6 +- + drivers/iommu/intel-iommu-debugfs.c | 137 ++++++-- + drivers/iommu/intel-iommu.c | 632 +++++++++++++++++------------------- + drivers/iommu/intel-pasid.c | 19 +- + drivers/iommu/intel-pasid.h | 26 ++ + drivers/iommu/intel-svm.c | 15 + + drivers/iommu/iommu.c | 44 ++- + drivers/iommu/ipmmu-vmsa.c | 185 +++++++---- + include/linux/intel-iommu.h | 7 +- + include/linux/intel-svm.h | 2 +- + include/linux/iommu.h | 6 + + 11 files changed, 622 insertions(+), 457 deletions(-) +Merging vfio/next (15c80c1659f2 vfio: Add Cornelia Huck as reviewer) +$ git merge vfio/next +Already up to date. +Merging audit/next (839d05e41385 audit: remove the BUG() calls in the audit rule comparison functions) +$ git merge audit/next +Auto-merging kernel/signal.c +Auto-merging kernel/auditfilter.c +Auto-merging kernel/audit.h +Auto-merging kernel/audit.c +Auto-merging include/linux/audit.h +Merge made by the 'recursive' strategy. + include/linux/audit.h | 9 +++++++ + include/uapi/linux/audit.h | 1 + + kernel/audit.c | 27 ++++++++++++++++++++ + kernel/audit.h | 8 ++++-- + kernel/auditfilter.c | 62 ++++++++++++++++++++++++++++------------------ + kernel/auditsc.c | 42 +++++++++++++++++-------------- + kernel/signal.c | 2 +- + 7 files changed, 105 insertions(+), 46 deletions(-) +Merging devicetree/for-next (b361797f3d0b dt-bindings: vendor: Fix simtek vendor compatible) +$ git merge devicetree/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/common-properties.txt | 17 +++++----- + .../devicetree/bindings/vendor-prefixes.yaml | 8 +++-- + drivers/of/fdt.c | 39 ++++------------------ + drivers/of/of_reserved_mem.c | 3 ++ + include/linux/of_fdt.h | 11 ------ + 5 files changed, 22 insertions(+), 56 deletions(-) +Merging mailbox/mailbox-for-next (8fbbfd966efa mailbox: Add support for Armada 37xx rWTM mailbox) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (65b65b97734b Merge remote-tracking branch 'spi/topic/pump-rt' into spi-next) +$ git merge spi/for-next +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/spi/spi_pl022.txt +Removing Documentation/devicetree/bindings/spi/spi-sun6i.txt +Removing Documentation/devicetree/bindings/spi/spi-sun4i.txt +Removing Documentation/devicetree/bindings/spi/spi-gpio.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mfd/atmel-usart.txt | 20 +- + .../bindings/spi/allwinner,sun4i-a10-spi.yaml | 86 +++ + .../bindings/spi/allwinner,sun6i-a31-spi.yaml | 106 +++ + Documentation/devicetree/bindings/spi/spi-bus.txt | 112 +-- + .../devicetree/bindings/spi/spi-controller.yaml | 161 ++++ + Documentation/devicetree/bindings/spi/spi-gpio.txt | 43 -- + .../devicetree/bindings/spi/spi-gpio.yaml | 72 ++ + .../devicetree/bindings/spi/spi-pl022.yaml | 165 +++++ + .../devicetree/bindings/spi/spi-sun4i.txt | 23 - + .../devicetree/bindings/spi/spi-sun6i.txt | 44 -- + .../devicetree/bindings/spi/spi-synquacer.txt | 27 + + .../devicetree/bindings/spi/spi_pl022.txt | 70 -- + MAINTAINERS | 8 + + drivers/spi/Kconfig | 14 +- + drivers/spi/Makefile | 1 + + drivers/spi/spi-at91-usart.c | 221 +++++- + drivers/spi/spi-bcm2835.c | 328 ++++---- + drivers/spi/spi-bcm2835aux.c | 4 +- + drivers/spi/spi-meson-spifc.c | 18 +- + drivers/spi/spi-mt65xx.c | 15 +- + drivers/spi/spi-qup.c | 4 - + drivers/spi/spi-rockchip.c | 4 +- + drivers/spi/spi-sh-msiof.c | 2 +- + drivers/spi/spi-synquacer.c | 822 +++++++++++++++++++++ + drivers/spi/spi-tegra114.c | 170 ++++- + drivers/spi/spi.c | 104 ++- + drivers/spi/spidev.c | 2 + + include/linux/platform_data/spi-mt65xx.h | 2 - + include/linux/spi/spi.h | 35 + + 29 files changed, 2194 insertions(+), 489 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/allwinner,sun4i-a10-spi.yaml + create mode 100644 Documentation/devicetree/bindings/spi/allwinner,sun6i-a31-spi.yaml + create mode 100644 Documentation/devicetree/bindings/spi/spi-controller.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/spi-gpio.txt + create mode 100644 Documentation/devicetree/bindings/spi/spi-gpio.yaml + create mode 100644 Documentation/devicetree/bindings/spi/spi-pl022.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/spi-sun4i.txt + delete mode 100644 Documentation/devicetree/bindings/spi/spi-sun6i.txt + create mode 100644 Documentation/devicetree/bindings/spi/spi-synquacer.txt + delete mode 100644 Documentation/devicetree/bindings/spi/spi_pl022.txt + create mode 100644 drivers/spi/spi-synquacer.c +Merging tip/auto-latest (6830f996dc6b Merge branch 'irq/core') +$ git merge tip/auto-latest +Auto-merging kernel/cpu.c +Removing arch/x86/kernel/paravirt_patch_64.c +Removing arch/x86/kernel/paravirt_patch_32.c +Merge made by the 'recursive' strategy. + Documentation/atomic_t.txt | 6 +- + Documentation/cputopology.txt | 48 +- + Documentation/locking/lockdep-design.txt | 112 +++- + Documentation/x86/exception-tables.rst | 2 +- + Documentation/x86/topology.rst | 4 + + arch/alpha/include/asm/atomic.h | 20 +- + arch/arc/include/asm/atomic.h | 41 +- + arch/arm/include/asm/atomic.h | 50 +- + arch/arm64/include/asm/atomic_ll_sc.h | 20 +- + arch/arm64/include/asm/atomic_lse.h | 34 +- + arch/ia64/include/asm/atomic.h | 20 +- + arch/ia64/kernel/mca.c | 2 +- + arch/mips/include/asm/atomic.h | 22 +- + arch/mips/include/asm/switch_to.h | 4 +- + arch/mips/kernel/mips-mt-fpaff.c | 2 +- + arch/mips/kernel/traps.c | 6 +- + arch/powerpc/include/asm/atomic.h | 44 +- + arch/powerpc/platforms/cell/spufs/sched.c | 2 +- + arch/riscv/include/asm/atomic.h | 44 +- + arch/s390/include/asm/atomic.h | 38 +- + arch/s390/pci/pci_debug.c | 2 +- + arch/sparc/include/asm/atomic_64.h | 8 +- + arch/x86/Kconfig.debug | 44 -- + arch/x86/events/core.c | 106 +--- + arch/x86/events/intel/core.c | 151 +++-- + arch/x86/events/intel/cstate.c | 14 +- + arch/x86/events/intel/ds.c | 8 +- + arch/x86/events/intel/rapl.c | 20 +- + arch/x86/events/intel/uncore.c | 80 +-- + arch/x86/events/intel/uncore.h | 4 +- + arch/x86/events/intel/uncore_snb.c | 85 ++- + arch/x86/events/intel/uncore_snbep.c | 4 +- + arch/x86/events/perf_event.h | 7 +- + arch/x86/include/asm/apic.h | 2 +- + arch/x86/include/asm/atomic64_32.h | 66 +-- + arch/x86/include/asm/atomic64_64.h | 38 +- + arch/x86/include/asm/paravirt_types.h | 21 +- + arch/x86/include/asm/processor.h | 4 +- + arch/x86/include/asm/smp.h | 1 + + arch/x86/include/asm/topology.h | 17 + + arch/x86/kernel/Makefile | 4 +- + arch/x86/kernel/alternative.c | 53 +- + arch/x86/kernel/apic/apic.c | 20 +- + arch/x86/kernel/asm-offsets.c | 1 - + arch/x86/kernel/cpu/common.c | 1 + + arch/x86/kernel/cpu/mshyperv.c | 4 +- + arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 2 +- + arch/x86/kernel/cpu/topology.c | 88 ++- + arch/x86/kernel/cpu/vmware.c | 2 +- + arch/x86/kernel/io_delay.c | 38 +- + arch/x86/kernel/jailhouse.c | 2 +- + arch/x86/kernel/kprobes/opt.c | 16 +- + arch/x86/kernel/paravirt.c | 46 +- + arch/x86/kernel/paravirt_patch.c | 126 ++++ + arch/x86/kernel/paravirt_patch_32.c | 67 --- + arch/x86/kernel/paravirt_patch_64.c | 75 --- + arch/x86/kernel/smpboot.c | 69 +++ + arch/x86/kernel/tsc.c | 57 +- + arch/x86/kernel/tsc_msr.c | 4 +- + arch/x86/tools/insn_decoder_test.c | 8 +- + arch/x86/tools/insn_sanity.c | 28 +- + arch/x86/xen/smp_pv.c | 1 + + drivers/base/topology.c | 22 + + drivers/crypto/nx/nx-842-pseries.c | 6 +- + drivers/hwmon/coretemp.c | 36 +- + drivers/infiniband/hw/hfi1/affinity.c | 6 +- + drivers/infiniband/hw/hfi1/sdma.c | 3 +- + drivers/infiniband/hw/qib/qib_file_ops.c | 7 +- + drivers/powercap/intel_rapl.c | 75 +-- + drivers/thermal/intel/x86_pkg_temp_thermal.c | 142 ++--- + fs/proc/array.c | 4 +- + fs/sysfs/group.c | 54 +- + include/asm-generic/atomic64.h | 20 +- + include/linux/lockdep.h | 32 +- + include/linux/perf_event.h | 1 + + include/linux/sched.h | 5 +- + include/linux/sched/nohz.h | 8 - + include/linux/sched/topology.h | 5 - + include/linux/sysfs.h | 8 + + include/linux/topology.h | 6 + + include/linux/types.h | 2 +- + init/init_task.c | 5 +- + kernel/cgroup/cpuset.c | 2 +- + kernel/cpu.c | 2 +- + kernel/events/core.c | 10 +- + kernel/fork.c | 5 +- + kernel/futex.c | 69 ++- + kernel/irq/irqdomain.c | 2 +- + kernel/locking/lock_events.h | 45 +- + kernel/locking/lockdep.c | 673 +++++++++++++--------- + kernel/sched/core.c | 47 +- + kernel/sched/cpudeadline.c | 4 +- + kernel/sched/cpupri.c | 4 +- + kernel/sched/deadline.c | 6 +- + kernel/sched/debug.c | 43 +- + kernel/sched/fair.c | 390 +------------ + kernel/sched/features.h | 1 - + kernel/sched/rt.c | 4 +- + kernel/sched/sched.h | 10 - + kernel/sched/topology.c | 10 - + kernel/time/tick-sched.c | 2 - + kernel/trace/trace_hwlat.c | 2 +- + kernel/trace/trace_uprobe.c | 2 +- + lib/atomic64.c | 32 +- + lib/smp_processor_id.c | 2 +- + mm/vmalloc.c | 14 +- + samples/trace_events/trace-events-sample.c | 2 +- + tools/include/linux/kernel.h | 1 + + tools/lib/vsprintf.c | 19 + + tools/perf/Documentation/intel-pt.txt | 10 +- + tools/perf/Documentation/perf-script.txt | 3 + + tools/perf/Documentation/perf-top.txt | 5 + + tools/perf/Makefile.perf | 44 +- + tools/perf/builtin-script.c | 43 ++ + tools/perf/builtin-top.c | 7 +- + tools/perf/builtin-trace.c | 35 ++ + tools/perf/examples/bpf/augmented_raw_syscalls.c | 15 +- + tools/perf/perf-with-kcore.sh | 5 - + tools/perf/scripts/python/export-to-postgresql.py | 43 +- + tools/perf/scripts/python/export-to-sqlite.py | 44 +- + tools/perf/scripts/python/exported-sql-viewer.py | 51 +- + tools/perf/tests/Build | 1 + + tools/perf/tests/builtin-test.c | 4 + + tools/perf/tests/map_groups.c | 120 ++++ + tools/perf/tests/tests.h | 1 + + tools/perf/trace/beauty/Build | 4 + + tools/perf/trace/beauty/beauty.h | 15 + + tools/perf/trace/beauty/clone.c | 1 + + tools/perf/trace/beauty/fsconfig.sh | 17 + + tools/perf/trace/beauty/fsmount.c | 34 ++ + tools/perf/trace/beauty/fsmount.sh | 22 + + tools/perf/trace/beauty/fspick.c | 24 + + tools/perf/trace/beauty/fspick.sh | 17 + + tools/perf/trace/beauty/move_mount.c | 24 + + tools/perf/trace/beauty/move_mount_flags.sh | 17 + + tools/perf/trace/beauty/sync_file_range.c | 31 + + tools/perf/trace/beauty/sync_file_range.sh | 17 + + tools/perf/ui/browsers/annotate.c | 5 +- + tools/perf/util/PERF-VERSION-GEN | 2 +- + tools/perf/util/auxtrace.c | 3 +- + tools/perf/util/dso.c | 125 ++-- + tools/perf/util/event.c | 4 +- + tools/perf/util/hist.c | 2 +- + tools/perf/util/intel-pt.c | 47 +- + tools/perf/util/machine.c | 8 +- + tools/perf/util/map.c | 6 + + tools/perf/util/map_groups.h | 2 + + tools/perf/util/setup.py | 2 + + tools/perf/util/symbol.c | 97 +++- + tools/perf/util/symbol_conf.h | 1 + + tools/perf/util/thread.c | 12 +- + tools/perf/util/thread.h | 4 +- + 152 files changed, 2744 insertions(+), 1995 deletions(-) + create mode 100644 arch/x86/kernel/paravirt_patch.c + delete mode 100644 arch/x86/kernel/paravirt_patch_32.c + delete mode 100644 arch/x86/kernel/paravirt_patch_64.c + create mode 100644 tools/perf/tests/map_groups.c + create mode 100755 tools/perf/trace/beauty/fsconfig.sh + create mode 100644 tools/perf/trace/beauty/fsmount.c + create mode 100755 tools/perf/trace/beauty/fsmount.sh + create mode 100644 tools/perf/trace/beauty/fspick.c + create mode 100755 tools/perf/trace/beauty/fspick.sh + create mode 100644 tools/perf/trace/beauty/move_mount.c + create mode 100755 tools/perf/trace/beauty/move_mount_flags.sh + create mode 100644 tools/perf/trace/beauty/sync_file_range.c + create mode 100755 tools/perf/trace/beauty/sync_file_range.sh +Merging clockevents/clockevents/next (a9b144553852 driver: clocksource: Add nxp system counter timer driver support) +$ git merge clockevents/clockevents/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/timer/nxp,sysctr-timer.txt | 25 ++ + drivers/clocksource/Kconfig | 8 +- + drivers/clocksource/Makefile | 3 +- + drivers/clocksource/arc_timer.c | 3 +- + drivers/clocksource/exynos_mct.c | 4 +- + drivers/clocksource/timer-imx-sysctr.c | 143 ++++++++++ + drivers/clocksource/timer-ixp4xx.c | 16 +- + drivers/clocksource/timer-meson6.c | 5 +- + .../clocksource/{timer-tegra20.c => timer-tegra.c} | 296 ++++++++++----------- + include/linux/cpuhotplug.h | 2 +- + 10 files changed, 343 insertions(+), 162 deletions(-) + create mode 100644 Documentation/devicetree/bindings/timer/nxp,sysctr-timer.txt + create mode 100644 drivers/clocksource/timer-imx-sysctr.c + rename drivers/clocksource/{timer-tegra20.c => timer-tegra.c} (54%) +Merging edac-amd/for-next (8de9930a4618 Revert "EDAC/amd64: Support more than two controllers for chip select handling") +$ git merge edac-amd/for-next +Already up to date. +Merging irqchip/irq/irqchip-next (4770533f71de irqchip/renesas-irqc: Convert to managed initializations) +$ git merge irqchip/irq/irqchip-next +Auto-merging include/linux/acpi.h +Merge made by the 'recursive' strategy. + .../interrupt-controller/renesas,rza1-irqc.txt | 43 ++++ + drivers/acpi/irq.c | 26 ++ + drivers/gpio/gpio-mb86s7x.c | 51 +++- + drivers/irqchip/Kconfig | 4 + + drivers/irqchip/Makefile | 1 + + drivers/irqchip/irq-renesas-irqc.c | 88 +++---- + drivers/irqchip/irq-renesas-rza1.c | 283 +++++++++++++++++++++ + drivers/irqchip/irq-sni-exiu.c | 142 ++++++++--- + include/linux/acpi.h | 7 + + 9 files changed, 549 insertions(+), 96 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,rza1-irqc.txt + create mode 100644 drivers/irqchip/irq-renesas-rza1.c +Merging ftrace/for-next (a124692b698b ftrace: Enable trampoline when rec count returns back to one) +$ git merge ftrace/for-next +Auto-merging tools/perf/util/probe-finder.c +Auto-merging tools/perf/util/probe-file.c +Auto-merging tools/perf/util/probe-event.c +Auto-merging mm/maccess.c +Auto-merging kernel/trace/trace_uprobe.c +Auto-merging kernel/trace/Kconfig +Auto-merging kernel/kprobes.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 13 +++ + Documentation/trace/kprobetrace.rst | 42 ++++++- + Documentation/trace/uprobetracer.rst | 10 +- + arch/x86/include/asm/uaccess.h | 4 +- + arch/x86/kernel/ftrace.c | 6 +- + include/linux/ftrace.h | 4 +- + include/linux/uaccess.h | 20 +++- + kernel/kprobes.c | 3 +- + kernel/trace/Kconfig | 12 +- + kernel/trace/ftrace.c | 48 ++++---- + kernel/trace/trace.c | 9 +- + kernel/trace/trace_events.c | 2 +- + kernel/trace/trace_kprobe.c | 112 ++++++++++++++++++- + kernel/trace/trace_probe.c | 37 +++++-- + kernel/trace/trace_probe.h | 3 + + kernel/trace/trace_probe_tmpl.h | 36 +++++- + kernel/trace/trace_uprobe.c | 19 ++++ + mm/maccess.c | 122 ++++++++++++++++++++- + tools/perf/Documentation/perf-probe.txt | 3 +- + tools/perf/util/probe-event.c | 11 ++ + tools/perf/util/probe-event.h | 2 + + tools/perf/util/probe-file.c | 7 ++ + tools/perf/util/probe-file.h | 1 + + tools/perf/util/probe-finder.c | 19 ++-- + .../ftrace/test.d/kprobe/kprobe_args_user.tc | 32 ++++++ + 25 files changed, 500 insertions(+), 77 deletions(-) + create mode 100644 tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_user.tc +Merging rcu/rcu/next (91df49e187c1 Merge LKMM and RCU commits) +$ git merge rcu/rcu/next +Already up to date. +Merging kvm/linux-next (94830f188a80 Merge tag 'kvm-s390-master-5.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (9eecfc22e0bf KVM: arm64: Fix ptrauth ID register masking logic) +$ git merge kvm-arm/next +Already up to date. +Merging kvm-ppc/kvm-ppc-next (4894fbcce856 KVM: PPC: Book3S: Remove useless checks in 'release' method of KVM device) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (8343ba2d4820 KVM: selftests: enable pgste option for the linker on s390) +$ git merge kvms390/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 + + tools/testing/selftests/kvm/Makefile | 14 +- + tools/testing/selftests/kvm/include/kvm_util.h | 8 + + .../selftests/kvm/include/s390x/processor.h | 22 ++ + .../kvm/{x86_64 => }/kvm_create_max_vcpus.c | 3 +- + .../testing/selftests/kvm/lib/aarch64/processor.c | 2 +- + tools/testing/selftests/kvm/lib/kvm_util.c | 23 +- + tools/testing/selftests/kvm/lib/s390x/processor.c | 286 +++++++++++++++++++++ + tools/testing/selftests/kvm/lib/x86_64/processor.c | 2 +- + tools/testing/selftests/kvm/s390x/sync_regs_test.c | 151 +++++++++++ + 10 files changed, 503 insertions(+), 10 deletions(-) + create mode 100644 tools/testing/selftests/kvm/include/s390x/processor.h + rename tools/testing/selftests/kvm/{x86_64 => }/kvm_create_max_vcpus.c (93%) + create mode 100644 tools/testing/selftests/kvm/lib/s390x/processor.c + create mode 100644 tools/testing/selftests/kvm/s390x/sync_regs_test.c +Merging xen-tip/linux-next (1d5c76e66433 xen-blkfront: switch kcalloc to kvcalloc for large array allocation) +$ git merge xen-tip/linux-next +Merge made by the 'recursive' strategy. + drivers/block/xen-blkfront.c | 38 +++++++++++++++++++------------------- + 1 file changed, 19 insertions(+), 19 deletions(-) +Merging percpu/for-next (558ac86039fc Merge branch 'for-5.3' into for-next) +$ git merge percpu/for-next +Auto-merging lib/percpu-refcount.c +Auto-merging fs/io_uring.c +Auto-merging drivers/md/md.c +Merge made by the 'recursive' strategy. + drivers/md/md.c | 3 ++- + fs/io_uring.c | 3 ++- + include/linux/percpu-refcount.h | 10 +++++++++- + lib/percpu-refcount.c | 13 +++++++++++-- + 4 files changed, 24 insertions(+), 5 deletions(-) +Merging workqueues/for-next (24acfb718225 workqueue: Use normal rcu) +$ git merge workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (ef071bab655b power: supply: olpc_battery: Allow building the driver on non-x86) +$ git merge drivers-x86/for-next +Auto-merging drivers/power/supply/Kconfig +Auto-merging drivers/platform/olpc/olpc-ec.c +Auto-merging drivers/platform/olpc/Makefile +Auto-merging drivers/platform/Kconfig +Auto-merging arch/x86/platform/olpc/olpc.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/misc/olpc,xo1.75-ec.txt | 23 + + arch/x86/Kconfig | 1 + + arch/x86/include/asm/olpc.h | 31 - + arch/x86/platform/olpc/olpc.c | 119 +--- + drivers/platform/Kconfig | 2 + + drivers/platform/Makefile | 2 +- + drivers/platform/olpc/Kconfig | 15 + + drivers/platform/olpc/Makefile | 3 +- + drivers/platform/olpc/olpc-ec.c | 174 ++++- + drivers/platform/olpc/olpc-xo175-ec.c | 752 +++++++++++++++++++++ + drivers/power/supply/Kconfig | 2 +- + drivers/power/supply/olpc_battery.c | 1 - + include/linux/olpc-ec.h | 37 +- + 13 files changed, 1017 insertions(+), 145 deletions(-) + create mode 100644 Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.txt + create mode 100644 drivers/platform/olpc/Kconfig + create mode 100644 drivers/platform/olpc/olpc-xo175-ec.c +Merging chrome-platform/for-next (81bc8c03e1b0 platform/chrome: cros_ec: Make some symbols static) +$ git merge chrome-platform/for-next +Auto-merging drivers/platform/chrome/wilco_ec/Kconfig +Auto-merging drivers/platform/chrome/Kconfig +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/debugfs-wilco-ec | 16 +- + Documentation/ABI/testing/sysfs-platform-wilco-ec | 40 ++ + drivers/platform/chrome/Kconfig | 13 + + drivers/platform/chrome/Makefile | 1 + + drivers/platform/chrome/cros_ec_debugfs.c | 4 +- + drivers/platform/chrome/cros_ec_ishtp.c | 763 ++++++++++++++++++++++ + drivers/platform/chrome/cros_ec_lightbar.c | 2 +- + drivers/platform/chrome/cros_ec_lpc.c | 2 +- + drivers/platform/chrome/cros_ec_spi.c | 68 +- + drivers/platform/chrome/cros_ec_sysfs.c | 2 +- + drivers/platform/chrome/cros_ec_vbc.c | 2 +- + drivers/platform/chrome/wilco_ec/Kconfig | 16 + + drivers/platform/chrome/wilco_ec/Makefile | 6 +- + drivers/platform/chrome/wilco_ec/core.c | 26 +- + drivers/platform/chrome/wilco_ec/debugfs.c | 12 +- + drivers/platform/chrome/wilco_ec/event.c | 541 +++++++++++++++ + drivers/platform/chrome/wilco_ec/mailbox.c | 21 +- + drivers/platform/chrome/wilco_ec/properties.c | 132 ++++ + drivers/platform/chrome/wilco_ec/sysfs.c | 156 +++++ + drivers/platform/chrome/wilco_ec/telemetry.c | 450 +++++++++++++ + include/linux/platform_data/wilco-ec.h | 94 ++- + 21 files changed, 2303 insertions(+), 64 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-platform-wilco-ec + create mode 100644 drivers/platform/chrome/cros_ec_ishtp.c + create mode 100644 drivers/platform/chrome/wilco_ec/event.c + create mode 100644 drivers/platform/chrome/wilco_ec/properties.c + create mode 100644 drivers/platform/chrome/wilco_ec/sysfs.c + create mode 100644 drivers/platform/chrome/wilco_ec/telemetry.c +Merging hsi/for-next (a188339ca5a3 Linux 5.2-rc1) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (1916ebfdfbac leds: max77650: Remove set but not used variable 'parent') +$ git merge leds/for-next +Auto-merging drivers/leds/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-spi-byte.txt | 44 ++++++ + drivers/leds/Kconfig | 10 ++ + drivers/leds/Makefile | 1 + + drivers/leds/leds-max77650.c | 2 - + drivers/leds/leds-spi-byte.c | 161 +++++++++++++++++++++ + 5 files changed, 216 insertions(+), 2 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-spi-byte.txt + create mode 100644 drivers/leds/leds-spi-byte.c +Merging ipmi/for-next (3559c3270aa3 drivers: ipmi: Drop device reference) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_si_intf.c | 4 ++-- + drivers/char/ipmi/ipmi_si_platform.c | 7 ++++++- + drivers/char/ipmi/ipmi_ssif.c | 5 ++++- + 3 files changed, 12 insertions(+), 4 deletions(-) +Merging driver-core/driver-core-next (64ae0e71c60d mm/zsmalloc.c: remove unused variable) +$ git merge driver-core/driver-core-next +Auto-merging kernel/trace/trace.c +Auto-merging kernel/kprobes.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/debugfs.txt | 2 +- + arch/arm/include/asm/ptdump.h | 9 ++--- + arch/arm/mach-omap1/clock.c | 63 ++++++----------------------- + arch/arm/mach-omap1/pm.c | 7 +--- + arch/arm/mach-omap2/pm-debug.c | 15 +++---- + arch/arm/mm/dump.c | 4 +- + arch/arm/mm/ptdump_debugfs.c | 8 +--- + arch/sh/kernel/kdebugfs.c | 3 -- + arch/sh/mm/asids-debugfs.c | 11 ++--- + arch/sh/mm/cache-debugfs.c | 20 ++------- + arch/sh/mm/pmb.c | 9 +---- + arch/sh/mm/tlb-debugfs.c | 20 ++------- + arch/x86/kernel/kdebugfs.c | 60 +++++---------------------- + arch/x86/mm/debug_pagetables.c | 35 ++++------------ + arch/x86/platform/atom/punit_atom_debug.c | 23 ++--------- + arch/x86/platform/intel-quark/imr.c | 14 ++----- + arch/x86/platform/intel/iosf_mbi.c | 21 ++-------- + arch/x86/platform/uv/tlb_uv.c | 15 +------ + arch/x86/xen/debugfs.c | 7 +--- + arch/x86/xen/p2m.c | 3 -- + drivers/mailbox/bcm-flexrm-mailbox.c | 28 +++---------- + drivers/mailbox/bcm-pdc-mailbox.c | 8 +--- + fs/btrfs/sysfs.c | 10 +---- + fs/debugfs/file.c | 14 ++----- + include/linux/backing-dev-defs.h | 1 - + include/linux/debugfs.h | 12 +++--- + kernel/fail_function.c | 23 +++-------- + kernel/gcov/fs.c | 24 +---------- + kernel/kprobes.c | 25 +++--------- + kernel/trace/blktrace.c | 6 --- + kernel/trace/trace.c | 4 -- + mm/backing-dev.c | 24 +++-------- + mm/cleancache.c | 3 +- + mm/hwpoison-inject.c | 67 ++++++++++--------------------- + mm/kmemleak.c | 7 +--- + mm/zsmalloc.c | 24 ++--------- + mm/zswap.c | 2 - + 37 files changed, 137 insertions(+), 494 deletions(-) +Merging usb/usb-next (cf2b5010f416 usbip: Replace unused kvec array with single variable in vhci_send_cmd_unlink()) +$ git merge usb/usb-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/phy/rcar-gen3-phy-usb2.txt | 13 +- + .../devicetree/bindings/usb/renesas_usbhs.txt | 2 + + drivers/usb/atm/Kconfig | 1 - + drivers/usb/atm/ueagle-atm.c | 48 +------ + drivers/usb/class/cdc-wdm.c | 2 +- + drivers/usb/core/Kconfig | 1 - + drivers/usb/core/devio.c | 8 +- + drivers/usb/core/hub.c | 36 +++-- + drivers/usb/dwc2/Kconfig | 1 - + drivers/usb/gadget/legacy/Kconfig | 2 - + drivers/usb/host/Kconfig | 5 - + drivers/usb/host/ehci-exynos.c | 11 ++ + drivers/usb/host/ehci-st.c | 2 - + drivers/usb/host/ohci-exynos.c | 11 ++ + drivers/usb/host/ohci-pci.c | 2 +- + drivers/usb/host/ohci-s3c2410.c | 2 - + drivers/usb/host/ohci-spear.c | 3 - + drivers/usb/host/ohci-st.c | 2 - + drivers/usb/host/xhci-ring.c | 27 +++- + drivers/usb/host/xhci.c | 23 +++ + drivers/usb/host/xhci.h | 5 + + drivers/usb/misc/ftdi-elan.c | 7 - + drivers/usb/phy/phy-mv-usb.c | 2 - + drivers/usb/renesas_usbhs/Kconfig | 1 - + drivers/usb/renesas_usbhs/Makefile | 2 +- + drivers/usb/renesas_usbhs/common.c | 160 ++++++++++++--------- + drivers/usb/renesas_usbhs/common.h | 8 +- + drivers/usb/renesas_usbhs/fifo.c | 15 +- + drivers/usb/renesas_usbhs/rza.h | 1 + + drivers/usb/renesas_usbhs/rza2.c | 72 ++++++++++ + drivers/usb/usbip/stub_main.c | 8 +- + drivers/usb/usbip/vhci_tx.c | 12 +- + include/linux/usb.h | 2 + + include/linux/usb/renesas_usbhs.h | 6 +- + 34 files changed, 310 insertions(+), 193 deletions(-) + create mode 100644 drivers/usb/renesas_usbhs/rza2.c +Merging usb-gadget/next (2e487d280525 usb: dwc3: Rename DWC3_DCTL_LPM_ERRATA) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (f2c7c76c5d0a Linux 5.2-rc3) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/ci-for-usb-next (bc65fae4b1f0 usb: chipidea: imx: set power polarity) +$ git merge usb-chipidea-next/ci-for-usb-next +Auto-merging drivers/usb/chipidea/ci_hdrc_imx.c +Merge made by the 'recursive' strategy. +Merging phy-next/next (6ef72bc036bc phy: qcom: Add Qualcomm PCIe2 PHY driver) +$ git merge phy-next/next +Auto-merging drivers/phy/qualcomm/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/phy/qcom-pcie2-phy.txt | 42 +++ + drivers/phy/qualcomm/Kconfig | 8 + + drivers/phy/qualcomm/Makefile | 1 + + drivers/phy/qualcomm/phy-qcom-pcie2.c | 331 +++++++++++++++++++++ + 4 files changed, 382 insertions(+) + create mode 100644 Documentation/devicetree/bindings/phy/qcom-pcie2-phy.txt + create mode 100644 drivers/phy/qualcomm/phy-qcom-pcie2.c +Merging tty/tty-next (15b3cd8ef46a Revert "consolemap: Fix a memory leaking bug in drivers/tty/vt/consolemap.c") +$ git merge tty/tty-next +Merge made by the 'recursive' strategy. + arch/ia64/hp/sim/simserial.c | 2 - + drivers/ipack/devices/ipoctal.h | 1 - + drivers/tty/serial/8250/8250_of.c | 9 +- + drivers/tty/serial/8250/8250_pnp.c | 4 +- + drivers/tty/serial/amba-pl011.c | 2 +- + drivers/tty/serial/cpm_uart/cpm_uart_core.c | 19 ++- + drivers/tty/serial/max310x.c | 157 ++++++++++++-------- + drivers/tty/serial/stm32-usart.c | 221 +++++++++++++++++++--------- + drivers/tty/serial/stm32-usart.h | 14 +- + drivers/tty/tty_io.c | 4 +- + 10 files changed, 267 insertions(+), 166 deletions(-) +Merging char-misc/char-misc-next (381e9760ee87 firmware: google: coreboot: Drop unnecessary headers) +$ git merge char-misc/char-misc-next +Auto-merging mm/balloon_compaction.c +Auto-merging drivers/misc/ocxl/Kconfig +Auto-merging drivers/misc/lis3lv02d/Kconfig +Auto-merging drivers/misc/genwqe/Kconfig +Auto-merging drivers/misc/eeprom/ee1004.c +Auto-merging drivers/misc/echo/Kconfig +Auto-merging drivers/misc/cxl/Kconfig +Auto-merging drivers/misc/cb710/Kconfig +Auto-merging drivers/misc/c2port/Kconfig +Auto-merging drivers/misc/altera-stapl/Kconfig +Auto-merging drivers/misc/Kconfig +Auto-merging drivers/char/bsr.c +Merge made by the 'recursive' strategy. + drivers/char/bsr.c | 5 +- + drivers/char/misc.c | 3 +- + drivers/counter/104-quad-8.c | 2 +- + drivers/firmware/google/coreboot_table.h | 11 +- + drivers/firmware/google/framebuffer-coreboot.c | 14 +- + drivers/firmware/google/memconsole-coreboot.c | 28 +- + drivers/firmware/google/memconsole.c | 9 +- + drivers/firmware/google/vpd.c | 14 +- + drivers/firmware/google/vpd_decode.c | 2 - + drivers/misc/Kconfig | 11 +- + drivers/misc/altera-stapl/Kconfig | 1 - + drivers/misc/c2port/Kconfig | 2 - + drivers/misc/cb710/Kconfig | 1 - + drivers/misc/cxl/Kconfig | 3 - + drivers/misc/echo/Kconfig | 1 - + drivers/misc/eeprom/ee1004.c | 43 ++- + drivers/misc/genwqe/Kconfig | 1 - + drivers/misc/lis3lv02d/Kconfig | 2 - + drivers/misc/lkdtm/Makefile | 3 +- + drivers/misc/mei/debugfs.c | 184 +++------- + drivers/misc/ocxl/Kconfig | 1 - + drivers/misc/sgi-xp/xpc_partition.c | 2 +- + drivers/misc/vmw_balloon.c | 489 ++++++++++++++++++++++--- + drivers/w1/slaves/w1_ds2413.c | 63 ++-- + fs/char_dev.c | 3 +- + include/linux/balloon_compaction.h | 4 + + mm/balloon_compaction.c | 144 ++++++-- + 27 files changed, 712 insertions(+), 334 deletions(-) +Merging extcon/extcon-next (fbdc60b2a787 extcon: arizona: Correct error handling on regmap_update_bits_check) +$ git merge extcon/extcon-next +Auto-merging drivers/extcon/extcon-arizona.c +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-arizona.c | 33 ++++++++++++++++++++------------- + 1 file changed, 20 insertions(+), 13 deletions(-) +Merging soundwire/next (be1038846b80 docs: soundwire: locking: fix tags for a code-block) +$ git merge soundwire/next +Auto-merging drivers/soundwire/stream.c +Auto-merging drivers/soundwire/intel.c +Merge made by the 'recursive' strategy. + Documentation/driver-api/soundwire/locking.rst | 4 +- + drivers/soundwire/bus.c | 6 +- + drivers/soundwire/cadence_master.c | 30 +++++---- + drivers/soundwire/intel.c | 17 +++-- + drivers/soundwire/intel.h | 2 +- + drivers/soundwire/intel_init.c | 25 +++++++- + drivers/soundwire/mipi_disco.c | 35 +++++----- + drivers/soundwire/stream.c | 8 +-- + include/linux/soundwire/sdw.h | 88 ++++++++++++++++++++------ + 9 files changed, 151 insertions(+), 64 deletions(-) +Merging thunderbolt/next (f2c7c76c5d0a Linux 5.2-rc3) +$ git merge thunderbolt/next +Already up to date. +Merging staging/staging-next (7acc77d20892 staging: rtl8188eu: remove ODM_PhyStatusQuery() wrapper) +$ git merge staging/staging-next +Auto-merging drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +Removing drivers/staging/kpc2000/kpc_spi/spi_parts.h +Removing drivers/staging/kpc2000/kpc_spi/spi_driver.c +Removing drivers/staging/kpc2000/kpc_spi/Makefile +Removing drivers/staging/kpc2000/kpc_i2c/i2c_driver.c +Removing drivers/staging/kpc2000/kpc_i2c/fileops.c +Removing drivers/staging/kpc2000/kpc_i2c/Makefile +Removing drivers/staging/kpc2000/kpc2000/kp2000_module.c +Removing drivers/staging/kpc2000/kpc2000/fileops.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/iio/light/tsl2772.txt +Removing Documentation/devicetree/bindings/iio/light/tsl2583.txt +Removing Documentation/devicetree/bindings/iio/light/isl29018.txt +Removing Documentation/devicetree/bindings/iio/accel/adxl345.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-iio-cros-ec | 10 +- + .../devicetree/bindings/iio/accel/adi,adxl345.yaml | 72 ++ + .../devicetree/bindings/iio/accel/adxl345.txt | 39 - + .../devicetree/bindings/iio/adc/mt6577_auxadc.txt | 2 + + .../devicetree/bindings/iio/light/isl29018.txt | 27 - + .../devicetree/bindings/iio/light/isl29018.yaml | 56 ++ + .../devicetree/bindings/iio/light/tsl2583.txt | 25 - + .../devicetree/bindings/iio/light/tsl2583.yaml | 46 + + .../devicetree/bindings/iio/light/tsl2772.txt | 42 - + .../devicetree/bindings/iio/light/tsl2772.yaml | 83 ++ + MAINTAINERS | 12 + + drivers/iio/accel/adxl372_spi.c | 9 + + drivers/iio/accel/kxsd9-spi.c | 9 + + drivers/iio/adc/at91-sama5d2_adc.c | 12 +- + drivers/iio/adc/at91_adc.c | 4 +- + drivers/iio/adc/mt6577_auxadc.c | 54 +- + drivers/iio/adc/rcar-gyroadc.c | 4 +- + drivers/iio/adc/stm32-dfsdm-adc.c | 6 + + drivers/iio/adc/stm32-dfsdm-core.c | 8 +- + drivers/iio/adc/stmpe-adc.c | 40 +- + drivers/iio/adc/sun4i-gpadc-iio.c | 5 +- + .../common/cros_ec_sensors/cros_ec_sensors_core.c | 14 + + drivers/iio/dac/ad5758.c | 18 +- + drivers/iio/dac/ds4424.c | 6 - + drivers/iio/frequency/ad9523.c | 8 +- + drivers/iio/temperature/maxim_thermocouple.c | 10 + + drivers/staging/erofs/Makefile | 2 +- + drivers/staging/erofs/inode.c | 34 +- + drivers/staging/erofs/internal.h | 2 + + drivers/staging/erofs/namei.c | 1 + + drivers/staging/erofs/unzip_pagevec.h | 5 +- + drivers/staging/fieldbus/anybuss/arcx-anybus.c | 44 +- + drivers/staging/fieldbus/dev_core.c | 6 +- + drivers/staging/fsl-dpaa2/Kconfig | 8 +- + drivers/staging/gasket/gasket_core.c | 6 +- + drivers/staging/gasket/gasket_ioctl.c | 3 +- + drivers/staging/gasket/gasket_page_table.c | 14 +- + drivers/staging/iio/adc/Kconfig | 3 + + drivers/staging/iio/addac/adt7316.c | 2 +- + drivers/staging/kpc2000/Kconfig | 4 +- + drivers/staging/kpc2000/Makefile | 4 +- + drivers/staging/kpc2000/TODO | 3 - + drivers/staging/kpc2000/kpc2000/Makefile | 2 +- + drivers/staging/kpc2000/kpc2000/cell_probe.c | 753 +++++++++-------- + drivers/staging/kpc2000/kpc2000/core.c | 938 ++++++++++++--------- + drivers/staging/kpc2000/kpc2000/dma_common_defs.h | 19 - + drivers/staging/kpc2000/kpc2000/fileops.c | 131 --- + drivers/staging/kpc2000/kpc2000/kp2000_module.c | 54 -- + drivers/staging/kpc2000/kpc2000/pcie.h | 119 ++- + drivers/staging/kpc2000/kpc2000/uapi.h | 22 +- + drivers/staging/kpc2000/kpc2000_i2c.c | 652 ++++++++++++++ + drivers/staging/kpc2000/kpc2000_spi.c | 525 ++++++++++++ + drivers/staging/kpc2000/kpc_dma/dma.c | 138 +-- + drivers/staging/kpc2000/kpc_dma/fileops.c | 220 ++--- + drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c | 119 +-- + drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.h | 32 +- + drivers/staging/kpc2000/kpc_i2c/Makefile | 4 - + drivers/staging/kpc2000/kpc_i2c/fileops.c | 181 ---- + drivers/staging/kpc2000/kpc_i2c/i2c_driver.c | 699 --------------- + drivers/staging/kpc2000/kpc_spi/Makefile | 4 - + drivers/staging/kpc2000/kpc_spi/spi_driver.c | 507 ----------- + drivers/staging/kpc2000/kpc_spi/spi_parts.h | 48 -- + drivers/staging/ks7010/ks7010_sdio.c | 2 +- + drivers/staging/ks7010/ks_hostif.c | 7 +- + drivers/staging/most/Kconfig | 2 +- + drivers/staging/mt7621-dma/mtk-hsdma.c | 5 +- + drivers/staging/octeon-usb/octeon-hcd.c | 3 +- + drivers/staging/pi433/pi433_if.c | 5 +- + drivers/staging/pi433/rf69.c | 4 +- + drivers/staging/pi433/rf69_registers.h | 2 +- + drivers/staging/rtl8188eu/Kconfig | 4 +- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 26 +- + drivers/staging/rtl8188eu/core/rtw_recv.c | 14 +- + drivers/staging/rtl8188eu/hal/odm_hwconfig.c | 15 +- + drivers/staging/rtl8188eu/include/ieee80211.h | 6 - + drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 8 +- + drivers/staging/rtl8188eu/os_dep/rtw_android.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 4 +- + .../staging/rtl8192u/ieee80211/ieee80211_module.c | 2 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 33 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 13 +- + .../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 4 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 58 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 36 +- + .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 10 +- + drivers/staging/rtl8712/ieee80211.c | 50 +- + drivers/staging/rtl8712/rtl8712_xmit.c | 2 +- + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 4 +- + drivers/staging/rtl8712/rtl871x_mlme.c | 7 +- + drivers/staging/rtl8712/rtl871x_mp.c | 14 +- + drivers/staging/rtl8712/rtl871x_recv.c | 14 +- + drivers/staging/rtl8712/rtl871x_security.c | 4 +- + drivers/staging/rtl8712/rtl871x_xmit.c | 12 +- + drivers/staging/rtl8712/wifi.h | 11 - + drivers/staging/rtl8723bs/Kconfig | 2 +- + drivers/staging/rtl8723bs/core/rtw_ap.c | 15 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 65 +- + drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_recv.c | 54 +- + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 60 +- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c | 4 +- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c | 2 +- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c | 2 +- + drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 6 +- + drivers/staging/rtl8723bs/hal/hal_com.c | 2 +- + drivers/staging/rtl8723bs/hal/odm_DIG.c | 11 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 5 +- + drivers/staging/rtl8723bs/hal/sdio_ops.c | 1 - + drivers/staging/rtl8723bs/include/rtw_ap.h | 2 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 34 +- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 452 +++++----- + drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 18 +- + drivers/staging/rts5208/rtsx_chip.c | 20 +- + drivers/staging/speakup/serialio.h | 3 - + drivers/staging/unisys/Kconfig | 4 +- + drivers/staging/unisys/visornic/visornic_main.c | 4 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 11 +- + .../vc04_services/bcm2835-camera/controls.c | 5 +- + .../vc04_services/bcm2835-camera/mmal-msg.h | 4 +- + .../interface/vchiq_arm/vchiq_2835_arm.c | 2 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 85 +- + .../interface/vchiq_arm/vchiq_connected.c | 4 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 53 +- + .../interface/vchiq_arm/vchiq_debugfs.c | 4 +- + .../vc04_services/interface/vchiq_arm/vchiq_shim.c | 4 +- + .../vc04_services/interface/vchiq_arm/vchiq_util.c | 6 +- + drivers/staging/vt6655/Kconfig | 5 +- + drivers/staging/vt6655/card.c | 8 +- + drivers/staging/vt6655/card.h | 2 +- + drivers/staging/vt6656/Kconfig | 5 +- + drivers/staging/vt6656/baseband.c | 130 ++- + drivers/staging/vt6656/baseband.h | 8 +- + drivers/staging/vt6656/card.c | 20 +- + drivers/staging/vt6656/firmware.c | 91 +- + drivers/staging/vt6656/int.c | 8 +- + drivers/staging/vt6656/int.h | 2 +- + drivers/staging/vt6656/mac.c | 19 +- + drivers/staging/vt6656/mac.h | 6 +- + drivers/staging/vt6656/main_usb.c | 230 +++-- + drivers/staging/vt6656/rf.c | 38 +- + drivers/staging/vt6656/rf.h | 2 +- + drivers/staging/vt6656/usbpipe.c | 115 +-- + drivers/staging/vt6656/usbpipe.h | 4 +- + drivers/staging/wilc1000/wilc_wlan.c | 3 - + drivers/staging/wlan-ng/cfg80211.c | 14 +- + 149 files changed, 3963 insertions(+), 4013 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/accel/adi,adxl345.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/accel/adxl345.txt + delete mode 100644 Documentation/devicetree/bindings/iio/light/isl29018.txt + create mode 100644 Documentation/devicetree/bindings/iio/light/isl29018.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/light/tsl2583.txt + create mode 100644 Documentation/devicetree/bindings/iio/light/tsl2583.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/light/tsl2772.txt + create mode 100644 Documentation/devicetree/bindings/iio/light/tsl2772.yaml + delete mode 100644 drivers/staging/kpc2000/kpc2000/fileops.c + delete mode 100644 drivers/staging/kpc2000/kpc2000/kp2000_module.c + create mode 100644 drivers/staging/kpc2000/kpc2000_i2c.c + create mode 100644 drivers/staging/kpc2000/kpc2000_spi.c + delete mode 100644 drivers/staging/kpc2000/kpc_i2c/Makefile + delete mode 100644 drivers/staging/kpc2000/kpc_i2c/fileops.c + delete mode 100644 drivers/staging/kpc2000/kpc_i2c/i2c_driver.c + delete mode 100644 drivers/staging/kpc2000/kpc_spi/Makefile + delete mode 100644 drivers/staging/kpc2000/kpc_spi/spi_driver.c + delete mode 100644 drivers/staging/kpc2000/kpc_spi/spi_parts.h +Merging mux/for-next (561eb7335f13 Merge branch 'i2c-mux/for-next' into for-next) +$ git merge mux/for-next +Auto-merging drivers/i2c/muxes/i2c-demux-pinctrl.c +Removing Documentation/devicetree/bindings/mux/mmio-mux.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mux/mmio-mux.txt | 60 ---------- + Documentation/devicetree/bindings/mux/reg-mux.txt | 129 +++++++++++++++++++++ + drivers/mux/Kconfig | 12 +- + drivers/mux/mmio.c | 6 +- + 4 files changed, 140 insertions(+), 67 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mux/mmio-mux.txt + create mode 100644 Documentation/devicetree/bindings/mux/reg-mux.txt +Merging icc/icc-next (83fdb2dfb0c2 interconnect: convert to DEFINE_SHOW_ATTRIBUTE) +$ git merge icc/icc-next +Already up to date. +Merging slave-dma/next (2fe5575f36ca dmaengine: sun6i: Add support for H6 DMA) +$ git merge slave-dma/next +Removing include/linux/sudmac.h +Auto-merging include/linux/dmaengine.h +Auto-merging drivers/soc/tegra/fuse/fuse-tegra20.c +Auto-merging drivers/dma/xilinx/xilinx_dma.c +Auto-merging drivers/dma/tegra20-apb-dma.c +Auto-merging drivers/dma/sun6i-dma.c +Auto-merging drivers/dma/stm32-dmamux.c +Auto-merging drivers/dma/stm32-dma.c +Removing drivers/dma/sh/sudmac.c +Auto-merging drivers/dma/mxs-dma.c +Auto-merging drivers/dma/mmp_tdma.c +Auto-merging drivers/dma/fsl-qdma.c +Auto-merging drivers/dma/dmaengine.c +Auto-merging drivers/dma/dma-jz4780.c +CONFLICT (content): Merge conflict in drivers/dma/dma-jz4780.c +Auto-merging drivers/dma/dma-axi-dmac.c +Resolved 'drivers/dma/dma-jz4780.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b372b40faaa3] Merge remote-tracking branch 'slave-dma/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/dma/sun6i-dma.txt | 9 +- + drivers/dma/dma-axi-dmac.c | 54 ++- + drivers/dma/dma-jz4780.c | 9 +- + drivers/dma/dmaengine.c | 10 +- + drivers/dma/fsl-qdma.c | 18 +- + drivers/dma/imx-sdma.c | 9 +- + drivers/dma/mmp_tdma.c | 10 +- + drivers/dma/mxs-dma.c | 8 +- + drivers/dma/of-dma.c | 4 +- + drivers/dma/sh/Kconfig | 6 - + drivers/dma/sh/Makefile | 1 - + drivers/dma/sh/rcar-dmac.c | 6 +- + drivers/dma/sh/sudmac.c | 414 --------------------- + drivers/dma/sh/usb-dmac.c | 6 +- + drivers/dma/stm32-dma.c | 1 - + drivers/dma/stm32-dmamux.c | 6 +- + drivers/dma/sun6i-dma.c | 147 ++++++-- + drivers/dma/tegra20-apb-dma.c | 12 +- + drivers/dma/xilinx/xilinx_dma.c | 4 +- + drivers/soc/tegra/fuse/fuse-tegra20.c | 2 +- + include/linux/dmaengine.h | 12 +- + include/linux/fpga/adi-axi-common.h | 19 + + include/linux/platform_data/dma-imx.h | 1 - + include/linux/sudmac.h | 52 --- + 24 files changed, 241 insertions(+), 579 deletions(-) + delete mode 100644 drivers/dma/sh/sudmac.c + create mode 100644 include/linux/fpga/adi-axi-common.h + delete mode 100644 include/linux/sudmac.h +Merging cgroup/for-next (155fef3bc7cd Merge branch 'for-5.3' into for-next) +$ git merge cgroup/for-next +Auto-merging kernel/cgroup/cgroup.c +Auto-merging include/linux/cgroup.h +Auto-merging include/linux/cgroup-defs.h +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cgroup-v2.rst | 6 ++ + Documentation/cgroup-v1/hugetlb.txt | 22 +++-- + include/linux/cgroup-defs.h | 1 + + include/linux/cgroup.h | 16 +++- + kernel/cgroup/cgroup.c | 149 +++++++++++++++++++++++++------- + kernel/exit.c | 2 +- + 6 files changed, 154 insertions(+), 42 deletions(-) +Merging scsi/for-next (b214814924c2 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging lib/sg_pool.c +Auto-merging include/scsi/scsi_transport_spi.h +CONFLICT (content): Merge conflict in include/scsi/scsi_transport_spi.h +Auto-merging include/scsi/scsi_transport_iscsi.h +CONFLICT (content): Merge conflict in include/scsi/scsi_transport_iscsi.h +Auto-merging include/scsi/scsi_transport_fc.h +CONFLICT (content): Merge conflict in include/scsi/scsi_transport_fc.h +Auto-merging include/scsi/scsi_transport.h +CONFLICT (content): Merge conflict in include/scsi/scsi_transport.h +Auto-merging include/scsi/scsi_bsg_iscsi.h +CONFLICT (content): Merge conflict in include/scsi/scsi_bsg_iscsi.h +Auto-merging include/scsi/sas_ata.h +CONFLICT (content): Merge conflict in include/scsi/sas_ata.h +Auto-merging include/scsi/sas.h +CONFLICT (content): Merge conflict in include/scsi/sas.h +Auto-merging include/scsi/libsas.h +CONFLICT (content): Merge conflict in include/scsi/libsas.h +Auto-merging include/scsi/libiscsi_tcp.h +CONFLICT (content): Merge conflict in include/scsi/libiscsi_tcp.h +Auto-merging include/scsi/libiscsi.h +CONFLICT (content): Merge conflict in include/scsi/libiscsi.h +Auto-merging include/scsi/iscsi_proto.h +CONFLICT (content): Merge conflict in include/scsi/iscsi_proto.h +Auto-merging include/scsi/iscsi_if.h +CONFLICT (content): Merge conflict in include/scsi/iscsi_if.h +Auto-merging drivers/target/iscsi/iscsi_target_nego.c +Auto-merging drivers/scsi/st.c +CONFLICT (content): Merge conflict in drivers/scsi/st.c +Auto-merging drivers/scsi/sr.c +CONFLICT (content): Merge conflict in drivers/scsi/sr.c +Auto-merging drivers/scsi/sg.c +CONFLICT (content): Merge conflict in drivers/scsi/sg.c +Auto-merging drivers/scsi/ses.c +CONFLICT (content): Merge conflict in drivers/scsi/ses.c +Auto-merging drivers/scsi/sd.c +CONFLICT (content): Merge conflict in drivers/scsi/sd.c +Auto-merging drivers/scsi/scsi_transport_spi.c +CONFLICT (content): Merge conflict in drivers/scsi/scsi_transport_spi.c +Auto-merging drivers/scsi/scsi_transport_sas.c +CONFLICT (content): Merge conflict in drivers/scsi/scsi_transport_sas.c +Auto-merging drivers/scsi/scsi_transport_iscsi.c +CONFLICT (content): Merge conflict in drivers/scsi/scsi_transport_iscsi.c +Auto-merging drivers/scsi/scsi_transport_fc.c +CONFLICT (content): Merge conflict in drivers/scsi/scsi_transport_fc.c +Auto-merging drivers/scsi/scsi_sysfs.c +CONFLICT (content): Merge conflict in drivers/scsi/scsi_sysfs.c +Auto-merging drivers/scsi/scsi_sysctl.c +CONFLICT (content): Merge conflict in drivers/scsi/scsi_sysctl.c +Auto-merging drivers/scsi/scsi_pm.c +CONFLICT (content): Merge conflict in drivers/scsi/scsi_pm.c +Auto-merging drivers/scsi/scsi_lib.c +CONFLICT (content): Merge conflict in drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/scsi_ioctl.c +CONFLICT (content): Merge conflict in drivers/scsi/scsi_ioctl.c +Auto-merging drivers/scsi/scsi_error.c +CONFLICT (content): Merge conflict in drivers/scsi/scsi_error.c +Auto-merging drivers/scsi/scsi.c +CONFLICT (content): Merge conflict in drivers/scsi/scsi.c +Auto-merging drivers/scsi/pcmcia/Kconfig +Removing drivers/scsi/osst_options.h +Removing drivers/scsi/osst_detect.h +Removing drivers/scsi/osst.h +CONFLICT (modify/delete): drivers/scsi/osst.c deleted in scsi/for-next and modified in HEAD. Version HEAD of drivers/scsi/osst.c left in tree. +Auto-merging drivers/scsi/megaraid/megaraid_sas_fusion.h +Auto-merging drivers/scsi/megaraid/megaraid_sas_fusion.c +Auto-merging drivers/scsi/megaraid/megaraid_sas_fp.c +Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c +Auto-merging drivers/scsi/megaraid/megaraid_sas.h +Auto-merging drivers/scsi/megaraid/Kconfig.megaraid +Auto-merging drivers/scsi/libsas/sas_task.c +CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_task.c +Auto-merging drivers/scsi/libsas/sas_scsi_host.c +CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_scsi_host.c +Auto-merging drivers/scsi/libsas/sas_internal.h +CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_internal.h +Auto-merging drivers/scsi/libsas/sas_init.c +CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_init.c +Auto-merging drivers/scsi/libsas/sas_ata.c +CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_ata.c +Auto-merging drivers/scsi/libiscsi_tcp.c +CONFLICT (content): Merge conflict in drivers/scsi/libiscsi_tcp.c +Auto-merging drivers/scsi/libiscsi.c +CONFLICT (content): Merge conflict in drivers/scsi/libiscsi.c +Auto-merging drivers/scsi/ibmvscsi/ibmvscsi.h +Auto-merging drivers/scsi/ibmvscsi/ibmvscsi.c +Auto-merging drivers/scsi/hosts.c +CONFLICT (content): Merge conflict in drivers/scsi/hosts.c +Auto-merging drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +Auto-merging drivers/scsi/hisi_sas/hisi_sas_v2_hw.c +Auto-merging drivers/scsi/hisi_sas/hisi_sas_main.c +Auto-merging drivers/scsi/hisi_sas/hisi_sas.h +Auto-merging drivers/scsi/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/scsi/osst.txt +Resolved 'drivers/scsi/hosts.c' using previous resolution. +Resolved 'drivers/scsi/libiscsi.c' using previous resolution. +Resolved 'drivers/scsi/libiscsi_tcp.c' using previous resolution. +Resolved 'drivers/scsi/libsas/sas_ata.c' using previous resolution. +Resolved 'drivers/scsi/libsas/sas_init.c' using previous resolution. +Resolved 'drivers/scsi/libsas/sas_internal.h' using previous resolution. +Resolved 'drivers/scsi/libsas/sas_scsi_host.c' using previous resolution. +Resolved 'drivers/scsi/libsas/sas_task.c' using previous resolution. +Resolved 'drivers/scsi/scsi.c' using previous resolution. +Resolved 'drivers/scsi/scsi_error.c' using previous resolution. +Resolved 'drivers/scsi/scsi_ioctl.c' using previous resolution. +Resolved 'drivers/scsi/scsi_lib.c' using previous resolution. +Resolved 'drivers/scsi/scsi_pm.c' using previous resolution. +Resolved 'drivers/scsi/scsi_sysctl.c' using previous resolution. +Resolved 'drivers/scsi/scsi_sysfs.c' using previous resolution. +Resolved 'drivers/scsi/scsi_transport_fc.c' using previous resolution. +Resolved 'drivers/scsi/scsi_transport_iscsi.c' using previous resolution. +Resolved 'drivers/scsi/scsi_transport_sas.c' using previous resolution. +Resolved 'drivers/scsi/scsi_transport_spi.c' using previous resolution. +Resolved 'drivers/scsi/sd.c' using previous resolution. +Resolved 'drivers/scsi/ses.c' using previous resolution. +Resolved 'drivers/scsi/sg.c' using previous resolution. +Resolved 'drivers/scsi/sr.c' using previous resolution. +Resolved 'drivers/scsi/st.c' using previous resolution. +Resolved 'include/scsi/iscsi_if.h' using previous resolution. +Resolved 'include/scsi/iscsi_proto.h' using previous resolution. +Resolved 'include/scsi/libiscsi.h' using previous resolution. +Resolved 'include/scsi/libiscsi_tcp.h' using previous resolution. +Resolved 'include/scsi/libsas.h' using previous resolution. +Resolved 'include/scsi/sas.h' using previous resolution. +Resolved 'include/scsi/sas_ata.h' using previous resolution. +Resolved 'include/scsi/scsi_bsg_iscsi.h' using previous resolution. +Resolved 'include/scsi/scsi_transport.h' using previous resolution. +Resolved 'include/scsi/scsi_transport_fc.h' using previous resolution. +Resolved 'include/scsi/scsi_transport_iscsi.h' using previous resolution. +Resolved 'include/scsi/scsi_transport_spi.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/scsi/osst.c +drivers/scsi/osst.c: needs merge +rm 'drivers/scsi/osst.c' +$ git commit -v -a +[master 6f8199696d94] Merge remote-tracking branch 'scsi/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/scsi/osst.txt | 218 - + MAINTAINERS | 10 - + drivers/message/fusion/mptbase.c | 3 +- + drivers/nvme/host/fc.c | 7 +- + drivers/nvme/host/rdma.c | 7 +- + drivers/nvme/target/loop.c | 4 +- + drivers/scsi/Kconfig | 57 +- + drivers/scsi/Makefile | 4 +- + drivers/scsi/fcoe/fcoe.c | 14 +- + drivers/scsi/fcoe/fcoe.h | 14 +- + drivers/scsi/fcoe/fcoe_ctlr.c | 14 +- + drivers/scsi/fcoe/fcoe_sysfs.c | 14 +- + drivers/scsi/fcoe/fcoe_transport.c | 14 +- + drivers/scsi/fdomain.c | 597 +++ + drivers/scsi/fdomain.h | 114 + + drivers/scsi/fdomain_isa.c | 222 + + drivers/scsi/fdomain_pci.c | 68 + + drivers/scsi/hisi_sas/hisi_sas.h | 4 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 8 + + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 46 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 46 +- + drivers/scsi/hosts.c | 2 +- + drivers/scsi/hpsa.c | 280 +- + drivers/scsi/hpsa.h | 6 +- + drivers/scsi/hpsa_cmd.h | 2 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 77 +- + drivers/scsi/ibmvscsi/ibmvscsi.h | 10 +- + drivers/scsi/libfc/fc_disc.c | 14 +- + drivers/scsi/libfc/fc_elsct.c | 14 +- + drivers/scsi/libfc/fc_exch.c | 14 +- + drivers/scsi/libfc/fc_fcp.c | 14 +- + drivers/scsi/libfc/fc_frame.c | 14 +- + drivers/scsi/libfc/fc_libfc.c | 14 +- + drivers/scsi/libfc/fc_libfc.h | 14 +- + drivers/scsi/libfc/fc_lport.c | 14 +- + drivers/scsi/libfc/fc_npiv.c | 14 +- + drivers/scsi/libfc/fc_rport.c | 14 +- + drivers/scsi/libiscsi.c | 2 +- + drivers/scsi/libiscsi_tcp.c | 4 +- + drivers/scsi/libsas/sas_ata.c | 2 +- + drivers/scsi/libsas/sas_discover.c | 18 +- + drivers/scsi/libsas/sas_event.c | 18 +- + drivers/scsi/libsas/sas_expander.c | 42 +- + drivers/scsi/libsas/sas_host_smp.c | 5 +- + drivers/scsi/libsas/sas_init.c | 2 +- + drivers/scsi/libsas/sas_internal.h | 2 +- + drivers/scsi/libsas/sas_phy.c | 18 +- + drivers/scsi/libsas/sas_port.c | 18 +- + drivers/scsi/libsas/sas_scsi_host.c | 2 +- + drivers/scsi/libsas/sas_task.c | 3 +- + drivers/scsi/lpfc/lpfc_attr.c | 34 +- + drivers/scsi/lpfc/lpfc_bsg.c | 2 +- + drivers/scsi/lpfc/lpfc_crtn.h | 3 +- + drivers/scsi/lpfc/lpfc_ct.c | 14 +- + drivers/scsi/lpfc/lpfc_els.c | 1 + + drivers/scsi/lpfc/lpfc_init.c | 512 ++- + drivers/scsi/lpfc/lpfc_nvme.c | 16 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 330 +- + drivers/scsi/lpfc/lpfc_nvmet.h | 1 + + drivers/scsi/lpfc/lpfc_scsi.c | 16 +- + drivers/scsi/lpfc/lpfc_sli.c | 76 +- + drivers/scsi/lpfc/lpfc_sli4.h | 11 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/megaraid/Kconfig.megaraid | 1 + + drivers/scsi/megaraid/Makefile | 2 +- + drivers/scsi/megaraid/megaraid_sas.h | 27 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 354 +- + drivers/scsi/megaraid/megaraid_sas_debugfs.c | 180 + + drivers/scsi/megaraid/megaraid_sas_fp.c | 1 + + drivers/scsi/megaraid/megaraid_sas_fusion.c | 303 +- + drivers/scsi/megaraid/megaraid_sas_fusion.h | 6 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 4 + + drivers/scsi/osst.c | 6108 -------------------------- + drivers/scsi/osst.h | 651 --- + drivers/scsi/osst_detect.h | 7 - + drivers/scsi/osst_options.h | 107 - + drivers/scsi/pcmcia/Kconfig | 10 + + drivers/scsi/pcmcia/Makefile | 1 + + drivers/scsi/pcmcia/fdomain_cs.c | 95 + + drivers/scsi/pm8001/pm8001_sas.c | 2 +- + drivers/scsi/qla2xxx/qla_init.c | 1 - + drivers/scsi/scsi.c | 14 +- + drivers/scsi/scsi_debugfs.h | 1 + + drivers/scsi/scsi_error.c | 2 +- + drivers/scsi/scsi_ioctl.c | 2 +- + drivers/scsi/scsi_lib.c | 33 +- + drivers/scsi/scsi_logging.c | 3 +- + drivers/scsi/scsi_pm.c | 8 +- + drivers/scsi/scsi_priv.h | 1 - + drivers/scsi/scsi_sysctl.c | 2 +- + drivers/scsi/scsi_sysfs.c | 2 +- + drivers/scsi/scsi_trace.c | 14 +- + drivers/scsi/scsi_transport_fc.c | 5 +- + drivers/scsi/scsi_transport_iscsi.c | 2 +- + drivers/scsi/scsi_transport_sas.c | 2 +- + drivers/scsi/scsi_transport_spi.c | 2 +- + drivers/scsi/scsi_transport_srp.c | 16 +- + drivers/scsi/sd.c | 113 +- + drivers/scsi/sd_dif.c | 16 +- + drivers/scsi/sd_zbc.c | 16 +- + drivers/scsi/ses.c | 9 +- + drivers/scsi/sg.c | 2 +- + drivers/scsi/sr.c | 2 +- + drivers/scsi/st.c | 8 +- + drivers/scsi/ufs/ufs-sysfs.c | 6 +- + drivers/scsi/ufs/ufshcd.c | 35 +- + drivers/scsi/ufs/ufshcd.h | 5 + + drivers/scsi/ufs/ufshci.h | 6 +- + drivers/target/iscsi/iscsi_target_nego.c | 15 +- + include/linux/scatterlist.h | 11 +- + include/scsi/fc/fc_encaps.h | 14 +- + include/scsi/fc/fc_fc2.h | 14 +- + include/scsi/fc/fc_fcoe.h | 14 +- + include/scsi/fc/fc_fcp.h | 14 +- + include/scsi/fc/fc_fip.h | 14 +- + include/scsi/fc/fc_ms.h | 17 +- + include/scsi/iscsi_if.h | 4 +- + include/scsi/iscsi_proto.h | 4 +- + include/scsi/libfc.h | 14 +- + include/scsi/libfcoe.h | 14 +- + include/scsi/libiscsi.h | 2 +- + include/scsi/libiscsi_tcp.h | 4 +- + include/scsi/libsas.h | 2 +- + include/scsi/sas.h | 2 +- + include/scsi/sas_ata.h | 2 +- + include/scsi/scsi_bsg_iscsi.h | 2 +- + include/scsi/scsi_transport.h | 2 +- + include/scsi/scsi_transport_fc.h | 5 +- + include/scsi/scsi_transport_iscsi.h | 2 +- + include/scsi/scsi_transport_spi.h | 2 +- + include/uapi/scsi/fc/fc_els.h | 13 - + include/uapi/scsi/fc/fc_fs.h | 13 - + include/uapi/scsi/fc/fc_gs.h | 13 - + include/uapi/scsi/fc/fc_ns.h | 13 - + include/uapi/scsi/scsi_bsg_fc.h | 15 - + include/uapi/scsi/scsi_netlink.h | 15 - + include/uapi/scsi/scsi_netlink_fc.h | 15 - + lib/scatterlist.c | 36 +- + lib/sg_pool.c | 37 +- + net/sunrpc/xprtrdma/svc_rdma_rw.c | 5 +- + 140 files changed, 3238 insertions(+), 8454 deletions(-) + delete mode 100644 Documentation/scsi/osst.txt + create mode 100644 drivers/scsi/fdomain.c + create mode 100644 drivers/scsi/fdomain.h + create mode 100644 drivers/scsi/fdomain_isa.c + create mode 100644 drivers/scsi/fdomain_pci.c + create mode 100644 drivers/scsi/megaraid/megaraid_sas_debugfs.c + delete mode 100644 drivers/scsi/osst.c + delete mode 100644 drivers/scsi/osst.h + delete mode 100644 drivers/scsi/osst_detect.h + delete mode 100644 drivers/scsi/osst_options.h + create mode 100644 drivers/scsi/pcmcia/fdomain_cs.c +Merging scsi-mkp/for-next (91a801703de8 scsi: ibmvscsi: Don't use rc uninitialized in ibmvscsi_do_work) +$ git merge scsi-mkp/for-next +Already up to date. +Merging vhost/linux-next (169a126c6e88 iommu/virtio: Add event queue) +$ git merge vhost/linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/virtio/iommu.txt | 66 ++ + Documentation/devicetree/bindings/virtio/mmio.txt | 30 + + MAINTAINERS | 7 + + drivers/iommu/Kconfig | 11 + + drivers/iommu/Makefile | 1 + + drivers/iommu/virtio-iommu.c | 1158 ++++++++++++++++++++ + drivers/of/base.c | 10 +- + drivers/pci/of.c | 8 + + drivers/vhost/net.c | 4 +- + drivers/vhost/vhost.c | 850 +++++++++++--- + drivers/vhost/vhost.h | 43 +- + include/uapi/linux/virtio_ids.h | 1 + + include/uapi/linux/virtio_iommu.h | 161 +++ + 13 files changed, 2221 insertions(+), 129 deletions(-) + create mode 100644 Documentation/devicetree/bindings/virtio/iommu.txt + create mode 100644 drivers/iommu/virtio-iommu.c + create mode 100644 include/uapi/linux/virtio_iommu.h +Merging rpmsg/for-next (b3e144584ac2 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Auto-merging drivers/remoteproc/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../{qcom,adsp-pil.txt => qcom,hexagon-v56.txt} | 35 ++++++++--- + .../devicetree/bindings/soc/qcom/qcom,glink.txt | 5 ++ + MAINTAINERS | 5 ++ + drivers/remoteproc/Kconfig | 2 +- + drivers/remoteproc/imx_rproc.c | 8 +-- + drivers/remoteproc/qcom_q6v5_adsp.c | 73 ++++++++++++++++------ + drivers/rpmsg/rpmsg_core.c | 3 +- + 7 files changed, 97 insertions(+), 34 deletions(-) + rename Documentation/devicetree/bindings/remoteproc/{qcom,adsp-pil.txt => qcom,hexagon-v56.txt} (74%) +Merging gpio/for-next (8b74ae41f1ee gpio: pca953x: Add support for the TI TCA9539) +$ git merge gpio/for-next +Auto-merging drivers/gpio/Kconfig +Removing Documentation/devicetree/bindings/gpio/pl061-gpio.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/pl061-gpio.txt | 10 ---- + .../devicetree/bindings/gpio/pl061-gpio.yaml | 69 ++++++++++++++++++++++ + Documentation/driver-api/gpio/consumer.rst | 2 - + Documentation/driver-api/gpio/driver.rst | 14 ++--- + drivers/gpio/Kconfig | 14 ++--- + drivers/gpio/gpio-ixp4xx.c | 14 ++--- + drivers/gpio/gpio-pca953x.c | 1 + + drivers/gpio/gpio-vf610.c | 14 +++-- + drivers/gpio/gpiolib-of.c | 37 ++++++++++++ + 9 files changed, 134 insertions(+), 41 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/gpio/pl061-gpio.txt + create mode 100644 Documentation/devicetree/bindings/gpio/pl061-gpio.yaml +Merging gpio-brgl/gpio/for-next (2674700c4c0e gpio: max732x: use devm_gpiochip_add_data()) +$ git merge gpio-brgl/gpio/for-next +Auto-merging drivers/gpio/gpio-em.c +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-em.c | 34 ++++++++++------------------------ + drivers/gpio/gpio-max732x.c | 45 ++++++++++++++++----------------------------- + tools/gpio/.gitignore | 2 +- + 3 files changed, 27 insertions(+), 54 deletions(-) +Merging pinctrl/for-next (8219ffa1e232 pinctrl: u300: Fix SPDX tags) +$ git merge pinctrl/for-next +Auto-merging include/linux/pinctrl/pinctrl.h +Auto-merging include/linux/pinctrl/pinconf-generic.h +Auto-merging drivers/pinctrl/tegra/Kconfig +Auto-merging drivers/pinctrl/pinctrl-u300.c +CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-u300.c +Auto-merging drivers/pinctrl/pinctrl-rockchip.c +Auto-merging drivers/pinctrl/pinctrl-coh901.c +CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-coh901.c +Auto-merging drivers/pinctrl/pinconf-generic.c +Auto-merging drivers/pinctrl/nomadik/pinctrl-abx500.c +CONFLICT (content): Merge conflict in drivers/pinctrl/nomadik/pinctrl-abx500.c +Auto-merging drivers/pinctrl/nomadik/Kconfig +CONFLICT (content): Merge conflict in drivers/pinctrl/nomadik/Kconfig +Auto-merging drivers/pinctrl/core.c +Auto-merging drivers/pinctrl/bcm/Kconfig +Removing Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt +Resolved 'drivers/pinctrl/nomadik/Kconfig' using previous resolution. +Resolved 'drivers/pinctrl/nomadik/pinctrl-abx500.c' using previous resolution. +Resolved 'drivers/pinctrl/pinctrl-coh901.c' using previous resolution. +Resolved 'drivers/pinctrl/pinctrl-u300.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ec45a1d97936] Merge remote-tracking branch 'pinctrl/for-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/pinctrl/bitmain,bm1880-pinctrl.txt | 23 +- + .../bindings/pinctrl/brcm,bcm2835-gpio.txt | 3 + + .../devicetree/bindings/pinctrl/meson,pinctrl.txt | 16 +- + .../bindings/pinctrl/nvidia,tegra194-pinmux.txt | 107 +++++ + .../bindings/pinctrl/pinctrl-bindings.txt | 3 + + .../bindings/pinctrl/qcom,apq8084-pinctrl.txt | 6 +- + .../bindings/pinctrl/qcom,ipq8074-pinctrl.txt | 6 +- + .../bindings/pinctrl/qcom,mdm9615-pinctrl.txt | 6 +- + .../bindings/pinctrl/qcom,msm8916-pinctrl.txt | 6 +- + .../bindings/pinctrl/qcom,msm8960-pinctrl.txt | 6 +- + .../bindings/pinctrl/qcom,msm8994-pinctrl.txt | 6 +- + .../bindings/pinctrl/qcom,msm8996-pinctrl.txt | 6 +- + .../bindings/pinctrl/qcom,msm8998-pinctrl.txt | 6 +- + .../bindings/pinctrl/qcom,qcs404-pinctrl.txt | 6 +- + .../bindings/pinctrl/qcom,sdm660-pinctrl.txt | 6 +- + .../bindings/pinctrl/qcom,sdm845-pinctrl.txt | 6 +- + .../bindings/pinctrl/st,stm32-pinctrl.txt | 208 ---------- + .../bindings/pinctrl/st,stm32-pinctrl.yaml | 264 ++++++++++++ + drivers/pinctrl/bcm/Kconfig | 6 +- + drivers/pinctrl/core.c | 13 + + drivers/pinctrl/mediatek/pinctrl-mt8183.c | 1 + + drivers/pinctrl/mediatek/pinctrl-paris.c | 19 + + drivers/pinctrl/mediatek/pinctrl-paris.h | 2 + + drivers/pinctrl/meson/pinctrl-meson-g12a.c | 36 +- + drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 8 +- + drivers/pinctrl/meson/pinctrl-meson-gxl.c | 8 +- + drivers/pinctrl/meson/pinctrl-meson.c | 358 ++++++++++++---- + drivers/pinctrl/meson/pinctrl-meson.h | 26 +- + drivers/pinctrl/meson/pinctrl-meson8-pmx.c | 8 +- + drivers/pinctrl/meson/pinctrl-meson8-pmx.h | 8 +- + drivers/pinctrl/meson/pinctrl-meson8.c | 8 +- + drivers/pinctrl/meson/pinctrl-meson8b.c | 8 +- + drivers/pinctrl/nomadik/Kconfig | 1 + + drivers/pinctrl/nomadik/pinctrl-ab8500.c | 5 +- + drivers/pinctrl/nomadik/pinctrl-ab8505.c | 5 +- + drivers/pinctrl/nomadik/pinctrl-abx500.c | 2 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 5 +- + drivers/pinctrl/pinconf-generic.c | 2 + + drivers/pinctrl/pinctrl-bm1880.c | 455 +++++++++++++-------- + drivers/pinctrl/pinctrl-coh901.c | 2 +- + drivers/pinctrl/pinctrl-rockchip.c | 1 + + drivers/pinctrl/pinctrl-stmfx.c | 1 + + drivers/pinctrl/pinctrl-u300.c | 2 +- + drivers/pinctrl/stm32/pinctrl-stm32.c | 184 ++++++++- + drivers/pinctrl/stm32/pinctrl-stm32.h | 2 + + drivers/pinctrl/stm32/pinctrl-stm32mp157.c | 5 + + drivers/pinctrl/tegra/Kconfig | 4 + + drivers/pinctrl/tegra/Makefile | 1 + + drivers/pinctrl/tegra/pinctrl-tegra.c | 8 +- + drivers/pinctrl/tegra/pinctrl-tegra.h | 8 +- + drivers/pinctrl/tegra/pinctrl-tegra194.c | 170 ++++++++ + include/dt-bindings/gpio/meson-gxbb-gpio.h | 8 +- + include/dt-bindings/gpio/meson-gxl-gpio.h | 8 +- + include/dt-bindings/gpio/meson8-gpio.h | 8 +- + include/dt-bindings/gpio/meson8b-gpio.h | 8 +- + include/linux/pinctrl/pinconf-generic.h | 3 + + include/linux/pinctrl/pinctrl.h | 5 + + 57 files changed, 1471 insertions(+), 631 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/nvidia,tegra194-pinmux.txt + delete mode 100644 Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.yaml + create mode 100644 drivers/pinctrl/tegra/pinctrl-tegra194.c +Merging pinctrl-samsung/for-next (a188339ca5a3 Linux 5.2-rc1) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (f41efceb46e6 pwm: meson: Add clock source configuration for Meson G12A) +$ git merge pwm/for-next +Already up to date. +Merging userns/for-next (318759b4737c signal/x86: Move tsk inside of CONFIG_MEMORY_FAILURE in do_sigbus) +$ git merge userns/for-next +Auto-merging kernel/signal.c +Auto-merging kernel/pid_namespace.c +Auto-merging fs/exec.c +Auto-merging drivers/usb/core/devio.c +Auto-merging drivers/misc/lkdtm/bugs.c +Auto-merging drivers/block/drbd/drbd_nl.c +Auto-merging drivers/block/drbd/drbd_main.c +Auto-merging drivers/block/drbd/drbd_int.h +Auto-merging arch/x86/kernel/uprobes.c +Auto-merging arch/x86/kernel/ptrace.c +Auto-merging arch/x86/kernel/cpu/mce/core.c +Auto-merging arch/sparc/kernel/traps_64.c +Auto-merging arch/s390/mm/fault.c +Auto-merging arch/riscv/mm/fault.c +Auto-merging arch/riscv/kernel/signal.c +Auto-merging arch/powerpc/platforms/cell/spufs/fault.c +Auto-merging arch/powerpc/mm/fault.c +Auto-merging arch/powerpc/kernel/traps.c +Auto-merging arch/powerpc/kernel/signal_64.c +Auto-merging arch/powerpc/kernel/signal_32.c +Auto-merging arch/powerpc/kernel/process.c +Auto-merging arch/parisc/math-emu/driver.c +Auto-merging arch/parisc/kernel/unaligned.c +Auto-merging arch/openrisc/mm/fault.c +Auto-merging arch/openrisc/kernel/traps.c +Auto-merging arch/openrisc/kernel/signal.c +Auto-merging arch/nds32/kernel/fpu.c +Auto-merging arch/mips/kernel/traps.c +Auto-merging arch/mips/kernel/signal_n32.c +Auto-merging arch/mips/kernel/kprobes.c +Auto-merging arch/csky/kernel/traps.c +Auto-merging arch/arm64/kernel/traps.c +CONFLICT (content): Merge conflict in arch/arm64/kernel/traps.c +Auto-merging arch/arm/mm/fault.c +Auto-merging arch/arm/kernel/traps.c +Auto-merging arch/arc/mm/fault.c +CONFLICT (content): Merge conflict in arch/arc/mm/fault.c +Resolved 'arch/arc/mm/fault.c' using previous resolution. +Resolved 'arch/arm64/kernel/traps.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 636e93b96207] Merge remote-tracking branch 'userns/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/kernel/signal.c | 4 +- + arch/alpha/kernel/traps.c | 2 +- + arch/alpha/mm/fault.c | 4 +- + arch/arc/kernel/process.c | 4 +- + arch/arc/kernel/signal.c | 2 +- + arch/arc/kernel/traps.c | 2 +- + arch/arc/mm/fault.c | 2 +- + arch/arm/include/asm/traps.h | 2 +- + arch/arm/kernel/ptrace.c | 6 +- + arch/arm/kernel/signal.c | 4 +- + arch/arm/kernel/traps.c | 4 +- + arch/arm/mm/alignment.c | 2 +- + arch/arm/mm/fault.c | 13 +- + arch/arm64/kernel/traps.c | 6 +- + arch/c6x/kernel/signal.c | 2 +- + arch/c6x/kernel/traps.c | 2 +- + arch/csky/abiv1/alignment.c | 2 +- + arch/csky/abiv2/fpu.c | 2 +- + arch/csky/kernel/signal.c | 4 +- + arch/csky/kernel/traps.c | 2 +- + arch/csky/mm/fault.c | 4 +- + arch/h8300/kernel/ptrace_h.c | 4 +- + arch/h8300/kernel/ptrace_s.c | 2 +- + arch/h8300/kernel/signal.c | 2 +- + arch/hexagon/kernel/signal.c | 2 +- + arch/hexagon/kernel/traps.c | 12 +- + arch/hexagon/mm/vm_fault.c | 4 +- + arch/ia64/kernel/brl_emu.c | 6 +- + arch/ia64/kernel/signal.c | 8 +- + arch/ia64/kernel/traps.c | 24 +-- + arch/ia64/kernel/unaligned.c | 2 +- + arch/ia64/mm/fault.c | 2 +- + arch/m68k/kernel/signal.c | 4 +- + arch/m68k/kernel/traps.c | 20 +-- + arch/m68k/mm/fault.c | 4 +- + arch/microblaze/kernel/exceptions.c | 2 +- + arch/microblaze/kernel/signal.c | 2 +- + arch/microblaze/mm/fault.c | 2 +- + arch/mips/kernel/branch.c | 18 +-- + arch/mips/kernel/kprobes.c | 2 +- + arch/mips/kernel/signal.c | 8 +- + arch/mips/kernel/signal_n32.c | 4 +- + arch/mips/kernel/signal_o32.c | 8 +- + arch/mips/kernel/traps.c | 50 +++--- + arch/mips/kernel/unaligned.c | 20 +-- + arch/mips/mm/fault.c | 4 +- + arch/mips/sgi-ip22/ip22-berr.c | 2 +- + arch/mips/sgi-ip22/ip28-berr.c | 2 +- + arch/mips/sgi-ip27/ip27-berr.c | 2 +- + arch/mips/sgi-ip32/ip32-berr.c | 2 +- + arch/nds32/kernel/fpu.c | 2 +- + arch/nds32/kernel/signal.c | 2 +- + arch/nds32/kernel/traps.c | 17 +- + arch/nds32/mm/fault.c | 4 +- + arch/nios2/kernel/signal.c | 4 +- + arch/nios2/kernel/traps.c | 2 +- + arch/openrisc/kernel/signal.c | 2 +- + arch/openrisc/kernel/traps.c | 12 +- + arch/openrisc/mm/fault.c | 4 +- + arch/parisc/kernel/ptrace.c | 6 +- + arch/parisc/kernel/signal.c | 2 +- + arch/parisc/kernel/traps.c | 14 +- + arch/parisc/kernel/unaligned.c | 4 +- + arch/parisc/math-emu/driver.c | 2 +- + arch/parisc/mm/fault.c | 4 +- + arch/powerpc/kernel/process.c | 2 +- + arch/powerpc/kernel/signal_32.c | 6 +- + arch/powerpc/kernel/signal_64.c | 2 +- + arch/powerpc/kernel/traps.c | 4 +- + arch/powerpc/mm/fault.c | 5 +- + arch/powerpc/platforms/cell/spufs/fault.c | 9 +- + arch/powerpc/platforms/cell/spufs/run.c | 2 +- + arch/riscv/include/asm/bug.h | 2 +- + arch/riscv/kernel/signal.c | 2 +- + arch/riscv/kernel/traps.c | 11 +- + arch/riscv/mm/fault.c | 6 +- + arch/s390/kernel/compat_signal.c | 4 +- + arch/s390/kernel/signal.c | 4 +- + arch/s390/kernel/traps.c | 6 +- + arch/s390/mm/fault.c | 6 +- + arch/sh/kernel/cpu/sh2a/fpu.c | 2 +- + arch/sh/kernel/cpu/sh4/fpu.c | 2 +- + arch/sh/kernel/cpu/sh5/fpu.c | 4 +- + arch/sh/kernel/hw_breakpoint.c | 2 +- + arch/sh/kernel/ptrace_64.c | 4 +- + arch/sh/kernel/signal_32.c | 4 +- + arch/sh/kernel/signal_64.c | 4 +- + arch/sh/kernel/traps.c | 4 +- + arch/sh/kernel/traps_32.c | 12 +- + arch/sh/kernel/traps_64.c | 2 +- + arch/sh/math-emu/math.c | 2 +- + arch/sh/mm/fault.c | 11 +- + arch/sparc/kernel/process_64.c | 4 +- + arch/sparc/kernel/signal32.c | 8 +- + arch/sparc/kernel/signal_32.c | 4 +- + arch/sparc/kernel/signal_64.c | 8 +- + arch/sparc/kernel/sys_sparc_32.c | 2 +- + arch/sparc/kernel/sys_sparc_64.c | 2 +- + arch/sparc/kernel/traps_32.c | 4 +- + arch/sparc/kernel/traps_64.c | 41 +++-- + arch/sparc/mm/fault_32.c | 4 +- + arch/sparc/mm/fault_64.c | 2 +- + arch/um/kernel/exec.c | 2 +- + arch/um/kernel/ptrace.c | 7 +- + arch/um/kernel/skas/mmu.c | 2 +- + arch/um/kernel/tlb.c | 4 +- + arch/um/kernel/trap.c | 16 +- + arch/unicore32/kernel/signal.c | 4 +- + arch/unicore32/kernel/traps.c | 2 +- + arch/unicore32/mm/fault.c | 13 +- + arch/x86/entry/vsyscall/vsyscall_64.c | 4 +- + arch/x86/include/asm/ptrace.h | 3 +- + arch/x86/kernel/cpu/mce/core.c | 2 +- + arch/x86/kernel/ptrace.c | 9 +- + arch/x86/kernel/signal.c | 2 +- + arch/x86/kernel/traps.c | 10 +- + arch/x86/kernel/umip.c | 2 +- + arch/x86/kernel/uprobes.c | 2 +- + arch/x86/kernel/vm86_32.c | 2 +- + arch/x86/mm/fault.c | 12 +- + arch/x86/mm/mpx.c | 2 +- + arch/x86/um/signal.c | 4 +- + arch/xtensa/kernel/signal.c | 2 +- + arch/xtensa/kernel/traps.c | 8 +- + arch/xtensa/mm/fault.c | 4 +- + drivers/block/drbd/drbd_int.h | 2 +- + drivers/block/drbd/drbd_main.c | 2 +- + drivers/block/drbd/drbd_nl.c | 2 +- + drivers/misc/lkdtm/bugs.c | 2 +- + drivers/usb/core/devio.c | 48 +++--- + fs/cifs/connect.c | 2 +- + fs/exec.c | 2 +- + include/linux/ptrace.h | 2 +- + include/linux/sched/signal.h | 15 +- + include/linux/syscalls.h | 2 +- + kernel/events/uprobes.c | 4 +- + kernel/pid_namespace.c | 2 +- + kernel/rseq.c | 4 +- + kernel/seccomp.c | 2 +- + kernel/signal.c | 249 +++++++++++++++++++++--------- + mm/memory-failure.c | 2 +- + net/bpfilter/bpfilter_kern.c | 2 +- + security/safesetid/lsm.c | 4 +- + 143 files changed, 566 insertions(+), 483 deletions(-) +Merging ktest/for-next (d20f6b41b7c2 ktest: update sample.conf for grub2bls) +$ git merge ktest/for-next +Already up to date. +Merging random/dev (58be0106c530 random: fix soft lockup when trying to read from an uninitialized blocking pool) +$ git merge random/dev +Already up to date. +Merging kselftest/next (fe48319243a6 selftests/timers: Add missing fflush(stdout) calls) +$ git merge kselftest/next +Already up to date. +Merging y2038/y2038 (a2318b6a16a8 riscv: Use latest system call ABI) +$ git merge y2038/y2038 +Auto-merging arch/riscv/kernel/vdso/Makefile +Auto-merging arch/riscv/Kconfig +Merge made by the 'recursive' strategy. +Merging livepatching/for-next (eb1bfcffba2c Merge branch 'for-5.3-core' into for-next) +$ git merge livepatching/for-next +Merge made by the 'recursive' strategy. + include/linux/livepatch.h | 3 --- + kernel/livepatch/transition.c | 3 +-- + 2 files changed, 1 insertion(+), 5 deletions(-) +Merging coresight/next (a3587ee6331d coresight: etb10: Do not call smp_processor_id from preemptible) +$ git merge coresight/next +Removing drivers/hwtracing/coresight/of_coresight.c +Merge made by the 'recursive' strategy. + drivers/acpi/acpi_amba.c | 9 + + drivers/hwtracing/coresight/Makefile | 3 +- + drivers/hwtracing/coresight/coresight-catu.c | 40 +- + drivers/hwtracing/coresight/coresight-catu.h | 1 - + drivers/hwtracing/coresight/coresight-cpu-debug.c | 3 +- + drivers/hwtracing/coresight/coresight-etb10.c | 78 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 8 +- + drivers/hwtracing/coresight/coresight-etm.h | 6 +- + .../hwtracing/coresight/coresight-etm3x-sysfs.c | 12 +- + drivers/hwtracing/coresight/coresight-etm3x.c | 45 +- + drivers/hwtracing/coresight/coresight-etm4x.c | 37 +- + drivers/hwtracing/coresight/coresight-etm4x.h | 2 - + drivers/hwtracing/coresight/coresight-funnel.c | 35 +- + drivers/hwtracing/coresight/coresight-platform.c | 815 +++++++++++++++++++++ + drivers/hwtracing/coresight/coresight-priv.h | 4 + + drivers/hwtracing/coresight/coresight-replicator.c | 42 +- + drivers/hwtracing/coresight/coresight-stm.c | 118 ++- + drivers/hwtracing/coresight/coresight-tmc-etf.c | 43 +- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 76 +- + drivers/hwtracing/coresight/coresight-tmc.c | 96 +-- + drivers/hwtracing/coresight/coresight-tmc.h | 2 - + drivers/hwtracing/coresight/coresight-tpiu.c | 24 +- + drivers/hwtracing/coresight/coresight.c | 164 ++++- + drivers/hwtracing/coresight/of_coresight.c | 297 -------- + include/linux/coresight.h | 61 +- + tools/perf/arch/arm/util/cs-etm.c | 124 +++- + 26 files changed, 1510 insertions(+), 635 deletions(-) + create mode 100644 drivers/hwtracing/coresight/coresight-platform.c + delete mode 100644 drivers/hwtracing/coresight/of_coresight.c +Merging rtc/rtc-next (a3094fc1a15e rtc: imx-sc: add rtc alarm support) +$ git merge rtc/rtc-next +Auto-merging drivers/rtc/rtc-tps65910.c +Auto-merging drivers/rtc/rtc-st-lpc.c +Auto-merging drivers/rtc/rtc-s35390a.c +Auto-merging drivers/rtc/Kconfig +Merge made by the 'recursive' strategy. + drivers/rtc/Kconfig | 2 +- + drivers/rtc/rtc-ds1307.c | 129 +++++++++++------------ + drivers/rtc/rtc-ds2404.c | 5 +- + drivers/rtc/rtc-imx-sc.c | 87 ++++++++++++++++ + drivers/rtc/rtc-s35390a.c | 55 +++++----- + drivers/rtc/rtc-st-lpc.c | 4 - + drivers/rtc/rtc-tegra.c | 254 +++++++++++++++++++++++---------------------- + drivers/rtc/rtc-test.c | 1 + + drivers/rtc/rtc-tps65910.c | 2 +- + 9 files changed, 308 insertions(+), 231 deletions(-) +Merging nvdimm/libnvdimm-for-next (cd6c84d8f0cd Linux 5.2-rc2) +$ git merge nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (9ae9d9bfb72c eeprom: at24: use struct_size() in devm_kzalloc()) +$ git merge at24/at24/for-next +Merge made by the 'recursive' strategy. + drivers/misc/eeprom/at24.c | 82 +++++++++++++++------------------------------- + 1 file changed, 26 insertions(+), 56 deletions(-) +Merging ntb/ntb-next (6202b3c150bc NTB: ntb_test: Fix bug when counting remote files) +$ git merge ntb/ntb-next +Auto-merging tools/testing/selftests/ntb/ntb_test.sh +Auto-merging drivers/ntb/test/ntb_perf.c +Auto-merging drivers/ntb/hw/idt/ntb_hw_idt.c +Merge made by the 'recursive' strategy. + drivers/ntb/hw/amd/ntb_hw_amd.c | 12 +++------ + drivers/ntb/hw/idt/ntb_hw_idt.c | 6 ----- + drivers/ntb/hw/intel/ntb_hw_gen1.c | 4 --- + drivers/ntb/hw/intel/ntb_hw_gen3.c | 6 ++--- + drivers/ntb/ntb.c | 9 ++----- + drivers/ntb/ntb_transport.c | 1 + + drivers/ntb/test/ntb_perf.c | 43 +++++++++++++++++++++++++-------- + drivers/ntb/test/ntb_pingpong.c | 14 +++++------ + drivers/ntb/test/ntb_tool.c | 9 +++---- + tools/testing/selftests/ntb/ntb_test.sh | 2 +- + 10 files changed, 54 insertions(+), 52 deletions(-) +Merging kspp/for-next/kspp (2dcbe7fe2265 lib/test_stackinit: Handle Clang auto-initialization pattern) +$ git merge kspp/for-next/kspp +Auto-merging lib/test_stackinit.c +Merge made by the 'recursive' strategy. + Documentation/admin-guide/LSM/LoadPin.rst | 10 +++++++ + lib/test_stackinit.c | 21 ++++++++++---- + security/loadpin/loadpin.c | 48 +++++++++++++++++++++++++++++++ + 3 files changed, 73 insertions(+), 6 deletions(-) +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge cisco/for-next +Already up to date. +Merging gnss/gnss-next (f2c7c76c5d0a Linux 5.2-rc3) +$ git merge gnss/gnss-next +Already up to date. +Merging fsi/master (d20810530b71 fsi: fsi-scom.c: Remove duplicate header) +$ git merge fsi/master +Already up to date. +Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4) +$ git merge siox/siox/next +Already up to date. +Merging slimbus/for-next (a188339ca5a3 Linux 5.2-rc1) +$ git merge slimbus/for-next +Already up to date. +Merging nvmem/for-next (c8d087d040cf nvmem: Broaden the selection of NVMEM_SNVS_LPGPR) +$ git merge nvmem/for-next +Auto-merging drivers/nvmem/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/freescale/fsl,scu.txt | 22 +++ + drivers/nvmem/Kconfig | 9 +- + drivers/nvmem/Makefile | 2 + + drivers/nvmem/imx-ocotp-scu.c | 161 +++++++++++++++++++++ + drivers/nvmem/meson-efuse.c | 10 +- + drivers/nvmem/meson-mx-efuse.c | 10 +- + 6 files changed, 195 insertions(+), 19 deletions(-) + create mode 100644 drivers/nvmem/imx-ocotp-scu.c +Merging xarray/xarray (12fd2aee6db7 XArray tests: Add check_insert) +$ git merge xarray/xarray +Merge made by the 'recursive' strategy. + fs/inode.c | 2 +- + include/linux/xarray.h | 1 + + lib/idr.c | 14 +++++++++-- + lib/test_xarray.c | 38 ++++++++++++++++++++++++++++++ + lib/xarray.c | 12 ++++++++-- + tools/testing/radix-tree/idr-test.c | 46 +++++++++++++++++++++++++++++++++++++ + 6 files changed, 108 insertions(+), 5 deletions(-) +Merging hyperv/hyperv-next (703a70908255 Drivers: hv: vmbus: Break out ISA independent parts of mshyperv.h) +$ git merge hyperv/hyperv-next +Auto-merging drivers/clocksource/Makefile +Auto-merging arch/x86/kernel/cpu/mshyperv.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 + + arch/x86/entry/vdso/vclock_gettime.c | 1 + + arch/x86/entry/vdso/vma.c | 2 +- + arch/x86/hyperv/hv_init.c | 91 +--------- + arch/x86/include/asm/hyperv-tlfs.h | 6 + + arch/x86/include/asm/mshyperv.h | 226 ++---------------------- + arch/x86/kernel/cpu/mshyperv.c | 2 + + arch/x86/kvm/x86.c | 1 + + drivers/clocksource/Makefile | 1 + + drivers/clocksource/hyperv_timer.c | 321 +++++++++++++++++++++++++++++++++++ + drivers/hv/Kconfig | 3 + + drivers/hv/hv.c | 156 +---------------- + drivers/hv/hv_util.c | 1 + + drivers/hv/hyperv_vmbus.h | 3 - + drivers/hv/vmbus_drv.c | 43 ++--- + include/asm-generic/mshyperv.h | 180 ++++++++++++++++++++ + include/clocksource/hyperv_timer.h | 105 ++++++++++++ + 17 files changed, 669 insertions(+), 476 deletions(-) + create mode 100644 drivers/clocksource/hyperv_timer.c + create mode 100644 include/asm-generic/mshyperv.h + create mode 100644 include/clocksource/hyperv_timer.h +Merging auxdisplay/auxdisplay (f4cd7203c1d4 auxdisplay/ht16k33.c: Convert to use vm_map_pages_zero()) +$ git merge auxdisplay/auxdisplay +Merge made by the 'recursive' strategy. + drivers/auxdisplay/cfag12864bfb.c | 5 +++-- + drivers/auxdisplay/ht16k33.c | 4 ++-- + 2 files changed, 5 insertions(+), 4 deletions(-) +Merging kgdb-dt/kgdb/for-next (ca976bfb3154 kdb: Fix bound check compiler warning) +$ git merge kgdb-dt/kgdb/for-next +Already up to date. +Merging pidfd/for-next (08f2abef168d tests: add pidfd_open() tests) +$ git merge pidfd/for-next +Auto-merging tools/testing/selftests/pidfd/pidfd_test.c +CONFLICT (content): Merge conflict in tools/testing/selftests/pidfd/pidfd_test.c +Auto-merging tools/testing/selftests/pidfd/Makefile +CONFLICT (content): Merge conflict in tools/testing/selftests/pidfd/Makefile +Auto-merging kernel/signal.c +Auto-merging kernel/pid.c +Auto-merging kernel/fork.c +Auto-merging include/linux/syscalls.h +Resolved 'tools/testing/selftests/pidfd/Makefile' using previous resolution. +Resolved 'tools/testing/selftests/pidfd/pidfd_test.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9a88031e8d03] Merge remote-tracking branch 'pidfd/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd.h | 2 +- + 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 + + include/linux/pid.h | 4 + + include/linux/syscalls.h | 1 + + include/uapi/asm-generic/unistd.h | 4 +- + kernel/fork.c | 28 ++- + kernel/pid.c | 45 +++++ + kernel/signal.c | 11 ++ + tools/testing/selftests/pidfd/.gitignore | 1 + + tools/testing/selftests/pidfd/Makefile | 4 +- + tools/testing/selftests/pidfd/pidfd.h | 57 ++++++ + tools/testing/selftests/pidfd/pidfd_open_test.c | 169 ++++++++++++++++ + tools/testing/selftests/pidfd/pidfd_test.c | 249 ++++++++++++++++++++---- + 29 files changed, 547 insertions(+), 46 deletions(-) + create mode 100644 tools/testing/selftests/pidfd/pidfd.h + create mode 100644 tools/testing/selftests/pidfd/pidfd_open_test.c +Merging devfreq/for-next (cf451adfa392 PM / devfreq: add tracing for scheduling work) +$ git merge devfreq/for-next +Already up to date. +Merging hmm/hmm (9b1ae605c8e2 mm/hmm: Only set FAULT_FLAG_ALLOW_RETRY for non-blocking) +$ git merge hmm/hmm +Merge made by the 'recursive' strategy. + Documentation/vm/hmm.rst | 141 +++++++++++++++++++++++++---------------------- + include/linux/hmm.h | 78 +++++++++++++------------- + mm/hmm.c | 75 ++++++++++++------------- + 3 files changed, 150 insertions(+), 144 deletions(-) +Merging akpm-current/current (db3362be6a29 include/linux/lz4.h: fix spelling and copy-paste errors in documentation) +$ git merge --no-ff akpm-current/current +Auto-merging security/loadpin/loadpin.c +Auto-merging net/netfilter/ipvs/ip_vs_ctl.c +Auto-merging net/ipv6/sysctl_net_ipv6.c +CONFLICT (content): Merge conflict in net/ipv6/sysctl_net_ipv6.c +Auto-merging net/ipv6/route.c +Auto-merging net/ipv6/addrconf.c +Auto-merging net/ipv4/sysctl_net_ipv4.c +Auto-merging net/core/neighbour.c +Auto-merging mm/vmalloc.c +Auto-merging mm/memory-failure.c +Auto-merging mm/kmemleak.c +Auto-merging mm/hmm.c +Auto-merging lib/genalloc.c +Auto-merging kernel/signal.c +Auto-merging kernel/ptrace.c +Auto-merging kernel/pid_namespace.c +Auto-merging kernel/pid.c +CONFLICT (content): Merge conflict in kernel/pid.c +Auto-merging init/Kconfig +Removing include/uapi/linux/coda_psdev.h +Auto-merging include/linux/sched/signal.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/pid.h +CONFLICT (content): Merge conflict in include/linux/pid.h +Auto-merging include/linux/genalloc.h +CONFLICT (content): Merge conflict in include/linux/genalloc.h +Auto-merging include/linux/device.h +Auto-merging fs/proc/array.c +Auto-merging fs/io_uring.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/aio.c +Auto-merging drivers/scsi/lpfc/lpfc_init.c +Auto-merging drivers/net/wireless/realtek/rtlwifi/wifi.h +Auto-merging drivers/misc/lkdtm/lkdtm.h +Auto-merging drivers/misc/lkdtm/core.c +Auto-merging drivers/hv/vmbus_drv.c +Auto-merging drivers/gpu/drm/i915/i915_perf.c +Auto-merging drivers/fpga/dfl-afu-dma-region.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/Kconfig +Auto-merging arch/arm64/mm/mmu.c +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm64/include/asm/pgtable-prot.h +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Resolved 'include/linux/genalloc.h' using previous resolution. +Resolved 'include/linux/pid.h' using previous resolution. +Resolved 'kernel/pid.c' using previous resolution. +Recorded preimage for 'net/ipv6/sysctl_net_ipv6.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'net/ipv6/sysctl_net_ipv6.c'. +[master 6e88c6a7cb62] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/cgroup-v2.rst | 30 +- + Documentation/admin-guide/kernel-parameters.txt | 21 +- + Documentation/core-api/genalloc.rst | 2 +- + .../devicetree/bindings/usb/s3c2410-usb.txt | 2 +- + Documentation/filesystems/coda.txt | 11 +- + arch/alpha/include/asm/pgalloc.h | 40 +- + arch/arm/Kconfig | 3 - + arch/arm/include/asm/pgalloc.h | 41 +- + arch/arm/kernel/efi.c | 3 +- + arch/arm/mm/dma-mapping.c | 5 +- + arch/arm/mm/mmu.c | 2 +- + arch/arm/mm/pageattr.c | 3 +- + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/pgalloc.h | 47 +- + arch/arm64/include/asm/pgtable-prot.h | 1 + + arch/arm64/include/asm/pgtable.h | 21 + + arch/arm64/kernel/efi.c | 3 +- + arch/arm64/mm/mmu.c | 19 +- + arch/arm64/mm/pageattr.c | 3 +- + arch/arm64/mm/pgd.c | 9 +- + arch/csky/include/asm/pgalloc.h | 30 +- + arch/hexagon/include/asm/syscall.h | 14 + + arch/ia64/mm/init.c | 2 - + arch/m68k/include/asm/sun3_pgalloc.h | 41 +- + arch/mips/include/asm/pgalloc.h | 33 +- + arch/mips/include/asm/syscall.h | 6 + + arch/nds32/include/asm/pgalloc.h | 31 +- + arch/nds32/include/asm/syscall.h | 27 +- + arch/nios2/include/asm/pgalloc.h | 37 +- + arch/parisc/include/asm/pgalloc.h | 33 +- + arch/parisc/include/asm/syscall.h | 7 + + arch/powerpc/Kconfig | 2 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 1 - + arch/powerpc/include/asm/syscall.h | 10 + + arch/powerpc/include/uapi/asm/mman.h | 6 +- + arch/powerpc/kvm/book3s_64_vio.c | 44 +- + arch/powerpc/kvm/book3s_xics.c | 2 +- + arch/powerpc/mm/book3s64/iommu_api.c | 41 +- + arch/powerpc/mm/mem.c | 2 - + arch/riscv/include/asm/pgalloc.h | 29 +- + arch/s390/Kconfig | 3 - + arch/s390/appldata/appldata_base.c | 15 +- + arch/s390/kernel/topology.c | 6 +- + arch/s390/mm/init.c | 18 +- + arch/sh/configs/hp6xx_defconfig | 1 - + arch/sh/configs/sdk7786_defconfig | 1 - + arch/sh/configs/sh2007_defconfig | 1 - + arch/sh/mm/init.c | 2 - + arch/sparc/Kconfig | 3 - + arch/sparc/include/uapi/asm/mman.h | 6 - + arch/um/include/asm/pgalloc.h | 16 +- + arch/um/kernel/mem.c | 22 - + arch/unicore32/include/asm/pgalloc.h | 36 +- + arch/unicore32/include/mach/regs-gpio.h | 2 +- + arch/x86/Kconfig | 2 +- + arch/x86/entry/vdso/vdso32-setup.c | 7 +- + arch/x86/include/asm/pgalloc.h | 19 +- + arch/x86/include/asm/pgtable.h | 4 +- + arch/x86/include/asm/pgtable_types.h | 1 - + arch/x86/kernel/itmt.c | 6 +- + arch/x86/mm/init_32.c | 2 - + arch/x86/mm/init_64.c | 2 - + arch/x86/mm/numa.c | 27 +- + arch/x86/mm/pgtable.c | 33 +- + arch/x86/xen/mmu_pv.c | 3 +- + crypto/zstd.c | 11 +- + drivers/base/devres.c | 24 +- + drivers/base/firmware_loader/fallback_table.c | 11 +- + drivers/base/memory.c | 146 +++--- + drivers/base/node.c | 27 +- + drivers/clk/renesas/r8a77470-cpg-mssr.c | 2 +- + drivers/dax/dax-private.h | 2 + + drivers/dax/device.c | 13 +- + drivers/dax/kmem.c | 46 +- + drivers/fpga/dfl-afu-dma-region.c | 53 +-- + drivers/gpu/drm/i915/i915_mm.c | 3 +- + drivers/gpu/drm/i915/i915_perf.c | 8 +- + drivers/hv/vmbus_drv.c | 6 +- + drivers/misc/lkdtm/core.c | 5 + + drivers/misc/lkdtm/heap.c | 72 +++ + drivers/misc/lkdtm/lkdtm.h | 5 + + drivers/misc/sram-exec.c | 2 +- + .../net/wireless/mediatek/mt76/mt76x02_usb_core.c | 2 +- + drivers/net/wireless/realtek/rtlwifi/wifi.h | 2 +- + drivers/nvdimm/pmem.c | 17 +- + drivers/pci/p2pdma.c | 115 +++-- + drivers/rapidio/devices/rio_mport_cdev.c | 2 + + drivers/s390/char/sclp_async.c | 7 +- + drivers/scsi/lpfc/lpfc_init.c | 2 +- + drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 2 +- + drivers/tty/tty_ldisc.c | 6 +- + drivers/vfio/vfio_iommu_spapr_tce.c | 54 +-- + drivers/vfio/vfio_iommu_type1.c | 17 +- + drivers/xen/balloon.c | 7 +- + drivers/xen/gntdev.c | 6 +- + drivers/xen/privcmd.c | 6 +- + drivers/xen/xlate_mmu.c | 3 +- + fs/9p/vfs_addr.c | 6 +- + fs/aio.c | 30 +- + fs/binfmt_elf.c | 1 - + fs/binfmt_flat.c | 25 +- + fs/btrfs/zstd.c | 24 +- + fs/buffer.c | 56 ++- + fs/coda/Makefile | 3 +- + fs/coda/cache.c | 2 +- + fs/coda/cnode.c | 17 +- + fs/coda/coda_fs_i.h | 3 +- + fs/coda/coda_int.h | 10 + + fs/coda/coda_linux.c | 45 +- + fs/coda/coda_linux.h | 16 - + {include/linux => fs/coda}/coda_psdev.h | 52 +- + fs/coda/dir.c | 12 +- + fs/coda/file.c | 90 +++- + fs/coda/inode.c | 3 +- + fs/coda/pioctl.c | 3 +- + fs/coda/psdev.c | 36 +- + fs/coda/symlink.c | 3 +- + fs/coda/sysctl.c | 11 - + fs/coda/upcall.c | 78 ++- + fs/coredump.c | 44 +- + fs/eventpoll.c | 7 +- + fs/f2fs/data.c | 2 +- + fs/hfsplus/xattr.c | 2 +- + fs/io_uring.c | 7 +- + fs/iomap.c | 2 +- + fs/jffs2/file.c | 4 +- + fs/jffs2/fs.c | 2 +- + fs/jffs2/os-linux.h | 2 +- + fs/notify/fanotify/fanotify.c | 5 +- + fs/notify/inotify/inotify_fsnotify.c | 8 +- + fs/notify/inotify/inotify_user.c | 8 +- + fs/ocfs2/alloc.c | 15 + + fs/ocfs2/aops.c | 22 +- + fs/ocfs2/cluster/heartbeat.c | 2 +- + fs/ocfs2/cluster/quorum.c | 2 +- + fs/ocfs2/cluster/tcp.c | 2 +- + fs/ocfs2/dcache.c | 12 + + fs/ocfs2/dlm/dlmmaster.c | 2 +- + fs/ocfs2/dlm/dlmunlock.c | 23 +- + fs/ocfs2/dlmglue.c | 57 ++- + fs/ocfs2/ocfs2.h | 3 + + fs/proc/Kconfig | 3 +- + fs/proc/array.c | 2 +- + fs/proc/inode.c | 27 +- + fs/proc/proc_sysctl.c | 4 + + fs/proc/vmcore.c | 9 + + fs/ramfs/inode.c | 12 + + fs/select.c | 18 +- + fs/ubifs/file.c | 2 +- + fs/ufs/super.c | 2 - + include/asm-generic/pgalloc.h | 107 ++++- + include/linux/coda.h | 3 +- + include/linux/device.h | 1 + + include/linux/dmar.h | 14 +- + include/linux/genalloc.h | 57 ++- + include/linux/hugetlb.h | 102 +++- + include/linux/kernel.h | 2 + + include/linux/lz4.h | 18 +- + include/linux/memcontrol.h | 59 ++- + include/linux/memory.h | 6 +- + include/linux/memory_hotplug.h | 20 +- + include/linux/memremap.h | 8 + + include/linux/migrate.h | 3 +- + include/linux/mm.h | 79 ++- + include/linux/mm_types.h | 2 + + include/linux/mmzone.h | 1 + + include/linux/node.h | 7 +- + include/linux/page-flags.h | 6 + + include/linux/page_ext.h | 1 - + include/linux/pagemap.h | 3 +- + include/linux/pfn_t.h | 11 +- + include/linux/pid.h | 5 +- + include/linux/poison.h | 2 +- + include/linux/sched.h | 8 + + include/linux/sched/signal.h | 4 +- + include/linux/signal.h | 2 +- + include/linux/swap.h | 18 +- + include/linux/sysctl.h | 7 + + include/linux/tracehook.h | 9 +- + include/linux/zstd.h | 16 +- + include/trace/events/vmscan.h | 71 ++- + include/uapi/asm-generic/mman-common.h | 7 +- + include/uapi/asm-generic/mman.h | 10 +- + include/uapi/linux/byteorder/big_endian.h | 4 + + include/uapi/linux/byteorder/little_endian.h | 4 + + include/uapi/linux/coda.h | 29 +- + include/uapi/linux/coda_psdev.h | 28 -- + include/uapi/linux/ptrace.h | 35 ++ + init/Kconfig | 4 +- + ipc/ipc_sysctl.c | 35 +- + kernel/dma/remap.c | 2 +- + kernel/hung_task.c | 44 ++ + kernel/memremap.c | 33 +- + kernel/pid.c | 10 +- + kernel/pid_namespace.c | 3 +- + kernel/ptrace.c | 101 +++- + kernel/signal.c | 5 +- + kernel/sysctl.c | 215 +++++---- + kernel/ucount.c | 6 +- + lib/Kconfig.debug | 14 + + lib/Makefile | 1 + + lib/debugobjects.c | 66 ++- + lib/genalloc.c | 56 +-- + lib/math/rational.c | 63 ++- + lib/string.c | 11 +- + lib/test_meminit.c | 362 ++++++++++++++ + lib/test_overflow.c | 11 +- + lib/test_string.c | 83 +++- + lib/zstd/compress.c | 85 ++-- + lib/zstd/decompress.c | 2 +- + lib/zstd/huf_compress.c | 4 +- + mm/Kconfig | 5 +- + mm/Kconfig.debug | 14 +- + mm/failslab.c | 3 +- + mm/filemap.c | 19 +- + mm/gup.c | 4 +- + mm/hmm.c | 16 +- + mm/kasan/kasan.h | 5 + + mm/kasan/report.c | 165 +++++++ + mm/kmemleak.c | 2 +- + mm/list_lru.c | 2 +- + mm/memcontrol.c | 373 +++++++++------ + mm/memory-failure.c | 2 +- + mm/memory.c | 13 +- + mm/memory_hotplug.c | 108 +++-- + mm/mempolicy.c | 2 +- + mm/migrate.c | 7 +- + mm/mlock.c | 7 +- + mm/mmap.c | 43 +- + mm/mmu_gather.c | 24 +- + mm/mmu_notifier.c | 2 +- + mm/page_alloc.c | 136 +++--- + mm/page_ext.c | 3 - + mm/page_io.c | 2 +- + mm/slab.c | 14 +- + mm/slab.h | 29 +- + mm/slub.c | 4 +- + mm/sparse.c | 10 +- + mm/swap.c | 13 +- + mm/swap_state.c | 49 +- + mm/swapfile.c | 295 ++++++++---- + mm/util.c | 75 +++ + mm/vmalloc.c | 2 +- + mm/vmscan.c | 179 +++++-- + mm/z3fold.c | 530 ++++++++++++++------- + net/core/neighbour.c | 20 +- + net/core/sysctl_net_core.c | 34 +- + net/dccp/sysctl.c | 16 +- + net/ipv4/sysctl_net_ipv4.c | 60 ++- + net/ipv6/addrconf.c | 6 +- + net/ipv6/route.c | 7 +- + net/ipv6/sysctl_net_ipv6.c | 10 +- + net/mpls/af_mpls.c | 10 +- + net/netfilter/ipvs/ip_vs_ctl.c | 3 +- + net/rxrpc/sysctl.c | 9 +- + net/sctp/sysctl.c | 35 +- + net/sunrpc/xprtrdma/transport.c | 3 +- + net/tipc/sysctl.c | 6 +- + scripts/checkpatch.pl | 30 +- + scripts/decode_stacktrace.sh | 6 +- + scripts/spelling.txt | 3 +- + security/keys/sysctl.c | 26 +- + security/loadpin/loadpin.c | 6 +- + security/yama/yama_lsm.c | 3 +- + sound/soc/qcom/qdsp6/q6asm.c | 2 +- + tools/testing/nvdimm/test/iomap.c | 2 + + tools/testing/selftests/proc/proc-pid-vm.c | 17 +- + tools/testing/selftests/ptrace/.gitignore | 1 + + tools/testing/selftests/ptrace/Makefile | 2 +- + tools/testing/selftests/ptrace/get_syscall_info.c | 271 +++++++++++ + tools/vm/slabinfo.c | 118 +++-- + virt/kvm/arm/mmu.c | 2 +- + 272 files changed, 4683 insertions(+), 2592 deletions(-) + rename {include/linux => fs/coda}/coda_psdev.h (62%) + delete mode 100644 include/uapi/linux/coda_psdev.h + create mode 100644 lib/test_meminit.c + create mode 100644 tools/testing/selftests/ptrace/get_syscall_info.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: pinctrl: fix pxa2xx.c build warnings +Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 0defa374961f...5763cc9941d6 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (5763cc9941d6 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + drivers/media/platform/sti/delta/delta-ipc.c | 4 ++-- + drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 1 + + 2 files changed, 3 insertions(+), 2 deletions(-) |