$ date -R Thu, 22 Aug 2019 07:50:42 +1000 $ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at 15d90b242290 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid Merging origin/master (bb7ba8069de9 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm) $ git merge origin/master Updating 15d90b242290..bb7ba8069de9 Fast-forward MAINTAINERS | 19 +++++++------ arch/x86/kvm/lapic.c | 5 ++++ arch/x86/kvm/mmu.c | 33 +--------------------- arch/x86/kvm/svm.c | 1 - fs/nfsd/nfscache.c | 2 +- fs/nfsd/nfsctl.c | 19 ++++++------- tools/testing/selftests/kvm/include/evmcs.h | 2 ++ tools/testing/selftests/kvm/lib/x86_64/processor.c | 16 +++++++---- tools/testing/selftests/kvm/lib/x86_64/vmx.c | 20 +++++++++++++ tools/testing/selftests/kvm/x86_64/evmcs_test.c | 15 ++-------- tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c | 12 +++----- .../selftests/kvm/x86_64/platform_info_test.c | 2 +- .../kvm/x86_64/vmx_set_nested_state_test.c | 32 +++++++++------------ 13 files changed, 79 insertions(+), 99 deletions(-) Merging fixes/master (609488bc979f Linux 5.3-rc2) $ git merge fixes/master Already up to date. Merging kbuild-current/fixes (451577f3e3a9 Merge tag 'kbuild-fixes-v5.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) $ git merge kbuild-current/fixes Already up to date. Merging arc-current/for-curr (e86d94fdda8e ARC: unwind: Mark expected switch fall-throughs) $ git merge arc-current/for-curr Merge made by the 'recursive' strategy. arch/arc/boot/dts/Makefile | 3 ++ arch/arc/include/asm/entry-arcv2.h | 2 +- arch/arc/kernel/unwind.c | 4 +- arch/arc/mm/dma.c | 2 +- arch/arc/plat-hsdk/platform.c | 87 ++++++++++++++++++++++++++++++++------ 5 files changed, 82 insertions(+), 16 deletions(-) Merging arm-current/fixes (c5d0e49e8d8f ARM: 8867/1: vdso: pass --be8 to linker if necessary) $ git merge arm-current/fixes Already up to date. Merging arm-soc-fixes/arm/fixes (305cd70ec311 Merge tag 'amlogic-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/fixes) $ git merge arm-soc-fixes/arm/fixes Merge made by the 'recursive' strategy. arch/arm/boot/dts/am33xx-l4.dtsi | 16 ++++--- arch/arm/boot/dts/am33xx.dtsi | 32 +++++++++++--- arch/arm/boot/dts/am4372.dtsi | 32 +++++++++++--- arch/arm/boot/dts/am437x-l4.dtsi | 4 ++ arch/arm/boot/dts/am571x-idk.dts | 7 +-- arch/arm/boot/dts/am572x-idk.dts | 7 +-- arch/arm/boot/dts/am574x-idk.dts | 7 +-- arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 3 +- arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts | 7 +-- arch/arm/boot/dts/am57xx-beagle-x15-revc.dts | 7 +-- arch/arm/boot/dts/dra7-evm.dts | 2 +- arch/arm/boot/dts/dra7-l4.dtsi | 6 +-- arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi | 50 +++++++++++----------- arch/arm/boot/dts/vf610-bk4.dts | 4 +- arch/arm/mach-omap1/ams-delta-fiq-handler.S | 3 +- arch/arm/mach-omap1/ams-delta-fiq.c | 4 +- arch/arm/mach-omap2/omap4-common.c | 3 ++ arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 3 +- arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 6 +++ arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 1 + .../boot/dts/amlogic/meson-g12b-odroid-n2.dts | 1 + drivers/bus/ti-sysc.c | 24 +++++------ drivers/soc/ti/pm33xx.c | 19 +++++--- 23 files changed, 143 insertions(+), 105 deletions(-) Merging arm64-fixes/for-next/fixes (b6143d10d23e arm64: ftrace: Ensure module ftrace trampoline is coherent with I-side) $ git merge arm64-fixes/for-next/fixes Already up to date. Merging m68k-current/for-linus (f28a1f16135c m68k: Don't select ARCH_HAS_DMA_PREP_COHERENT for nommu or coldfire) $ git merge m68k-current/for-linus Already up to date. Merging powerpc-fixes/fixes (b9ee5e04fd77 powerpc/64e: Drop stale call to smp_processor_id() which hangs SMP startup) $ git merge powerpc-fixes/fixes Merge made by the 'recursive' strategy. arch/powerpc/mm/nohash/tlb.c | 1 - 1 file changed, 1 deletion(-) Merging s390-fixes/fixes (d45331b00ddb Linux 5.3-rc4) $ git merge s390-fixes/fixes Already up to date. Merging sparc/master (038029c03e21 sparc: remove unneeded uapi/asm/statfs.h) $ git merge sparc/master Removing arch/sparc/include/uapi/asm/statfs.h Merge made by the 'recursive' strategy. arch/sparc/include/uapi/asm/statfs.h | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 arch/sparc/include/uapi/asm/statfs.h Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) $ git merge fscrypt-current/for-stable Already up to date. Merging net/master (2d683eaaeeb9 net: cpsw: fix NULL pointer exception in the probe error path) $ git merge net/master Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 7 +---- drivers/atm/Kconfig | 2 +- .../net/ethernet/netronome/nfp/flower/offload.c | 7 +++++ drivers/net/ethernet/ti/cpsw.c | 2 +- include/linux/netfilter/nf_conntrack_h323_types.h | 5 +++ include/net/addrconf.h | 2 +- include/net/net_namespace.h | 2 +- include/uapi/linux/netfilter/xt_nfacct.h | 5 +++ net/batman-adv/netlink.c | 2 +- net/bridge/netfilter/ebtables.c | 8 ++--- net/core/stream.c | 16 +++++----- net/ipv4/igmp.c | 4 +-- net/mac80211/cfg.c | 9 +++--- net/ncsi/ncsi-cmd.c | 2 +- net/ncsi/ncsi-rsp.c | 9 ++++-- net/netfilter/nft_flow_offload.c | 6 ++++ net/netfilter/xt_nfacct.c | 36 +++++++++++++++------- net/smc/smc_tx.c | 6 ++-- net/wireless/reg.c | 2 +- net/wireless/util.c | 23 ++++++++------ 20 files changed, 98 insertions(+), 57 deletions(-) Merging bpf/master (3035bb72ee47 selftests/bpf: install files test_xdp_vlan.sh) $ git merge bpf/master Merge made by the 'recursive' strategy. arch/s390/net/bpf_jit_comp.c | 12 +++++++----- net/xdp/xdp_umem.c | 4 +++- tools/bpf/bpftool/prog.c | 4 +++- tools/testing/selftests/bpf/Makefile | 6 +++++- tools/testing/selftests/bpf/config | 1 + tools/testing/selftests/bpf/test_btf_dump.c | 7 +++++++ tools/testing/selftests/bpf/test_cgroup_storage.c | 6 +++--- tools/testing/selftests/bpf/test_sock.c | 7 +++++-- 8 files changed, 34 insertions(+), 13 deletions(-) Merging ipsec/master (769a807d0b41 xfrm: policy: avoid warning splat when merging nodes) $ git merge ipsec/master Merge made by the 'recursive' strategy. include/net/xfrm.h | 2 -- net/xfrm/xfrm_interface.c | 56 +++++++++++++----------------- net/xfrm/xfrm_policy.c | 6 ++-- tools/testing/selftests/net/xfrm_policy.sh | 7 ++++ 4 files changed, 36 insertions(+), 35 deletions(-) Merging netfilter/master (a1c4cd67840e net: fix __ip_mc_inc_group usage) $ git merge netfilter/master Already up to date. Merging ipvs/master (58e8b37069ff Merge branch 'net-phy-dp83867-add-some-fixes') $ git merge ipvs/master Already up to date. Merging wireless-drivers/master (5a8c31aa6357 iwlwifi: pcie: fix recognition of QuZ devices) $ git merge wireless-drivers/master Merge made by the 'recursive' strategy. drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 33 ++++++++++++++++++++--- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 10 +++++++ drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 17 ++++++++++++ drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 1 + drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 20 +++++++++----- drivers/net/wireless/mediatek/mt76/mt76x0/usb.c | 8 +++--- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 9 +++++++ drivers/net/wireless/ralink/rt2x00/rt2x00.h | 1 + drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 13 +++++---- 9 files changed, 93 insertions(+), 19 deletions(-) Merging mac80211/master (0d31d4dbf384 Revert "cfg80211: fix processing world regdomain when non modular") $ git merge mac80211/master Already up to date. Merging rdma-fixes/for-rc (27b7fb1ab7bf RDMA/mlx5: Fix MR npages calculation for IB_ACCESS_HUGETLB) $ git merge rdma-fixes/for-rc Merge made by the 'recursive' strategy. drivers/infiniband/core/umem.c | 7 +------ drivers/infiniband/hw/mlx5/mem.c | 5 +++-- 2 files changed, 4 insertions(+), 8 deletions(-) Merging sound-current/for-linus (6de3c9e3f6b3 ALSA: usb-audio: Fix invalid NULL check in snd_emuusb_set_samplerate()) $ git merge sound-current/for-linus Merge made by the 'recursive' strategy. sound/pci/hda/patch_ca0132.c | 1 + sound/pci/hda/patch_conexant.c | 17 +++++++++-------- sound/usb/mixer_quirks.c | 8 ++++---- sound/usb/pcm.c | 1 + 4 files changed, 15 insertions(+), 12 deletions(-) Merging sound-asoc-fixes/for-linus (4e47d93d5cc3 Merge branch 'asoc-5.3' into asoc-linus) $ git merge sound-asoc-fixes/for-linus Merge made by the 'recursive' strategy. sound/soc/atmel/mchp-i2s-mcc.c | 41 ++++++++---- sound/soc/codecs/cs4349.c | 1 + sound/soc/codecs/es8328.c | 2 +- sound/soc/codecs/hdac_hda.c | 4 ++ sound/soc/codecs/hdac_hdmi.c | 57 +++++++++++++--- sound/soc/codecs/wm8737.c | 2 +- sound/soc/codecs/wm8904.c | 56 ++++++++++------ sound/soc/fsl/imx-audmux.c | 54 ++++++++++++++- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 98 ++++++++++++++++++++++++++++ sound/soc/intel/boards/sof_rt5682.c | 4 ++ sound/soc/meson/Kconfig | 1 + sound/soc/meson/axg-tdm-formatter.c | 2 +- sound/soc/rockchip/rockchip_max98090.c | 11 ++++ sound/soc/sh/rcar/adg.c | 21 ++++-- sound/soc/sof/intel/hda.c | 20 ++++-- sound/soc/sunxi/sun4i-i2s.c | 12 ++-- sound/soc/uniphier/aio-cpu.c | 31 ++++++--- sound/soc/uniphier/aio.h | 1 + 18 files changed, 341 insertions(+), 77 deletions(-) Merging regmap-fixes/for-linus (0161b8716465 Merge branch 'regmap-5.3' into regmap-linus) $ git merge regmap-fixes/for-linus Merge made by the 'recursive' strategy. drivers/base/regmap/regmap-irq.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) Merging regulator-fixes/for-linus (df932f9af7b2 Merge branch 'regulator-5.3' into regulator-linus) $ git merge regulator-fixes/for-linus Merge made by the 'recursive' strategy. drivers/regulator/act8945a-regulator.c | 8 ++++---- drivers/regulator/slg51000-regulator.c | 4 ++-- drivers/regulator/twl-regulator.c | 23 ++++++++++++++++++++--- 3 files changed, 26 insertions(+), 9 deletions(-) Merging spi-fixes/for-linus (f5179780ae36 Merge branch 'spi-5.3' into spi-linus) $ git merge spi-fixes/for-linus Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/spi/spi-controller.yaml | 2 +- drivers/spi/spi-bcm-qspi.c | 4 ++-- drivers/spi/spi-dw-pci.c | 13 +++++++++++++ drivers/spi/spi-zynq-qspi.c | 2 +- 4 files changed, 17 insertions(+), 4 deletions(-) Merging pci-current/for-linus (7bafda88de20 Documentation PCI: Fix pciebus-howto.rst filename typo) $ git merge pci-current/for-linus Merge made by the 'recursive' strategy. Documentation/PCI/index.rst | 2 +- Documentation/PCI/{picebus-howto.rst => pciebus-howto.rst} | 0 drivers/pci/quirks.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename Documentation/PCI/{picebus-howto.rst => pciebus-howto.rst} (100%) Merging driver-core.current/driver-core-linus (d45331b00ddb Linux 5.3-rc4) $ git merge driver-core.current/driver-core-linus Already up to date. Merging tty.current/tty-linus (d45331b00ddb Linux 5.3-rc4) $ git merge tty.current/tty-linus Already up to date. Merging usb.current/usb-linus (08d676d1685c usb-storage: Add new JMS567 revision to unusual_devs) $ git merge usb.current/usb-linus Merge made by the 'recursive' strategy. drivers/usb/chipidea/udc.c | 32 ++++++++++++++++++++++++-------- drivers/usb/class/usbtmc.c | 3 +++ drivers/usb/gadget/udc/lpc32xx_udc.c | 2 +- drivers/usb/storage/unusual_devs.h | 2 +- 4 files changed, 29 insertions(+), 10 deletions(-) Merging usb-gadget-fixes/fixes (4a56a478a525 usb: gadget: mass_storage: Fix races between fsg_disable and fsg_set_alt) $ git merge usb-gadget-fixes/fixes Already up to date. Merging usb-serial-fixes/usb-linus (d1abaeb3be7b Linux 5.3-rc5) $ git merge usb-serial-fixes/usb-linus Already up to date. Merging usb-chipidea-fixes/ci-for-usb-stable (16009db47c51 usb: chipidea: udc: workaround for endpoint conflict issue) $ git merge usb-chipidea-fixes/ci-for-usb-stable Auto-merging drivers/usb/chipidea/udc.c Merge made by the 'recursive' strategy. Merging phy/fixes (609488bc979f Linux 5.3-rc2) $ git merge phy/fixes Already up to date. Merging staging.current/staging-linus (d1abaeb3be7b Linux 5.3-rc5) $ git merge staging.current/staging-linus Already up to date. Merging char-misc.current/char-misc-linus (d1abaeb3be7b Linux 5.3-rc5) $ git merge char-misc.current/char-misc-linus Already up to date. Merging soundwire-fixes/fixes (d1abaeb3be7b Linux 5.3-rc5) $ git merge soundwire-fixes/fixes Already up to date. Merging thunderbolt-fixes/fixes (d1abaeb3be7b Linux 5.3-rc5) $ git merge thunderbolt-fixes/fixes Already up to date. Merging input-current/for-linus (849f5ae3a513 Input: iforce - add sanity checks) $ git merge input-current/for-linus Already up to date. Merging crypto-current/master (e2664ecbb2f2 crypto: ccp - Ignore tag length when decrypting GCM ciphertext) $ git merge crypto-current/master Already up to date. Merging ide/master (baf6722aa0cb ide: Use dev_get_drvdata where possible) $ git merge ide/master Merge made by the 'recursive' strategy. drivers/ide/siimage.c | 3 +-- drivers/ide/via82cxxx.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) Merging vfio-fixes/for-linus (5715c4dd66a3 vfio/mdev: Synchronize device create/remove with parent removal) $ git merge vfio-fixes/for-linus Already up to date. Merging kselftest-fixes/fixes (fbb01c52471c selftests/livepatch: push and pop dynamic debug config) $ git merge kselftest-fixes/fixes Already up to date. Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address) $ git merge modules-fixes/modules-linus Already up to date. Merging slave-dma-fixes/fixes (962411b05a6d dmaengine: ti: omap-dma: Add cleanup in omap_dma_probe()) $ git merge slave-dma-fixes/fixes Merge made by the 'recursive' strategy. drivers/dma/ti/dma-crossbar.c | 4 +++- drivers/dma/ti/omap-dma.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) 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 (834de5c1aa76 mtd: spi-nor: Fix the disabling of write protection at init) $ git merge mtd-fixes/mtd/fixes Already up to date. Merging mfd-fixes/for-mfd-fixes (63b2de12b7ee mfd: stmfx: Fix an endian bug in stmfx_irq_handler()) $ git merge mfd-fixes/for-mfd-fixes Already up to date. Merging v4l-dvb-fixes/fixes (92f5b0313e37 media: vivid: fix missing cec adapter name) $ git merge v4l-dvb-fixes/fixes Already up to date. Merging reset-fixes/reset/fixes (a71dcd3757e2 reset: remove redundant null check on pointer dev) $ git merge reset-fixes/reset/fixes Already up to date. Merging mips-fixes/mips-fixes (74034a09267c MIPS: BCM63XX: Mark expected switch fall-through) $ git merge mips-fixes/mips-fixes Already up to date. Merging at91-fixes/at91-fixes (5f9e832c1370 Linus 5.3-rc1) $ git merge at91-fixes/at91-fixes Already up to date. Merging omap-fixes/fixes (4a65bbb9109e soc: ti: pm33xx: Make two symbols static) $ git merge omap-fixes/fixes Already up to date. Merging kvm-fixes/master (e4427372398c selftests/kvm: make platform_info_test pass on AMD) $ 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 (c4bd7a9ca612 hwmon (coretemp) Fix a memory leak bug) $ git merge hwmon-fixes/hwmon Merge made by the 'recursive' strategy. drivers/hwmon/coretemp.c | 3 ++- drivers/hwmon/lm75.c | 2 +- drivers/hwmon/pmbus/ucd9000.c | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) Merging nvdimm-fixes/libnvdimm-fixes (06282373ff57 mm/memremap: Fix reuse of pgmap instances with internal references) $ git merge nvdimm-fixes/libnvdimm-fixes Already up to date. Merging btrfs-fixes/next-fixes (ae97b78e9c35 Merge branch 'misc-5.3' into next-fixes) $ git merge btrfs-fixes/next-fixes Merge made by the 'recursive' strategy. fs/btrfs/ctree.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Merging vfs-fixes/fixes (e272d4fb74d6 configfs: fix a deadlock in configfs_symlink()) $ git merge vfs-fixes/fixes Merge made by the 'recursive' strategy. fs/configfs/symlink.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) Merging dma-mapping-fixes/for-linus (33dcb37cef74 dma-mapping: fix page attributes for dma_mmap_*) $ git merge dma-mapping-fixes/for-linus Already up to date. Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7) $ git merge i3c-fixes/master Already up to date. Merging drivers-x86-fixes/fixes (d45331b00ddb Linux 5.3-rc4) $ git merge drivers-x86-fixes/fixes Already up to date. Merging samsung-krzk-fixes/fixes (5f9e832c1370 Linus 5.3-rc1) $ git merge samsung-krzk-fixes/fixes Already up to date. Merging pinctrl-samsung-fixes/pinctrl-fixes (5f9e832c1370 Linus 5.3-rc1) $ git merge pinctrl-samsung-fixes/pinctrl-fixes Already up to date. Merging devicetree-fixes/dt/linus (83f82d7a4258 of: irq: fix a trivial typo in a doc comment) $ git merge devicetree-fixes/dt/linus Already up to date. Merging scsi-fixes/fixes (77ffd3465ba8 scsi: lpfc: Mitigate high memory pre-allocation by SCSI-MQ) $ git merge scsi-fixes/fixes Merge made by the 'recursive' strategy. drivers/scsi/lpfc/lpfc.h | 1 + drivers/scsi/lpfc/lpfc_attr.c | 15 +++++++++++++++ drivers/scsi/lpfc/lpfc_init.c | 10 ++++++---- drivers/scsi/lpfc/lpfc_sli4.h | 5 +++++ drivers/scsi/qla2xxx/qla_attr.c | 2 ++ drivers/scsi/qla2xxx/qla_os.c | 11 ++++++++++- drivers/scsi/ufs/ufshcd.c | 3 +++ drivers/target/target_core_user.c | 9 +++++++-- 8 files changed, 49 insertions(+), 7 deletions(-) Merging drm-fixes/drm-fixes (d1abaeb3be7b Linux 5.3-rc5) $ git merge drm-fixes/drm-fixes Already up to date. Merging amdgpu-fixes/drm-fixes (e1b4ce25dbc9 drm/scheduler: use job count instead of peek) $ git merge amdgpu-fixes/drm-fixes Already up to date. Merging drm-intel-fixes/for-linux-next-fixes (ed19e3035c5a drm/i915: Fix HW readout for crtc_clock in HDMI mode) $ git merge drm-intel-fixes/for-linux-next-fixes Merge made by the 'recursive' strategy. drivers/gpu/drm/i915/display/intel_ddi.c | 4 ++-- drivers/gpu/drm/i915/intel_drv.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) Merging mmc-fixes/fixes (0f686ca93359 Revert "mmc: sdhci-tegra: drop ->get_ro() implementation") $ git merge mmc-fixes/fixes Merge made by the 'recursive' strategy. drivers/mmc/host/sdhci-tegra.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) Merging rtc-fixes/rtc-fixes (5f9e832c1370 Linus 5.3-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 (a9fc4340aee0 Drivers: hv: vmbus: Fix virt_to_hvpfn() for X86_PAE) $ git merge hyperv-fixes/hyperv-fixes Merge made by the 'recursive' strategy. drivers/hv/channel.c | 2 +- drivers/hv/hyperv_vmbus.h | 2 -- drivers/input/serio/hyperv-keyboard.c | 35 ++++++----------------------------- tools/hv/hv_kvp_daemon.c | 2 +- 4 files changed, 8 insertions(+), 33 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 (69703eb9a8ae riscv: Make __fstate_clean() work correctly.) $ git merge risc-v-fixes/fixes Already up to date. Merging pidfd-fixes/fixes (d45331b00ddb Linux 5.3-rc4) $ git merge pidfd-fixes/fixes Already up to date. Merging fpga-fixes/fixes (dec43da46f63 fpga: altera-ps-spi: Fix getting of optional confd gpio) $ git merge fpga-fixes/fixes Merge made by the 'recursive' strategy. drivers/fpga/altera-ps-spi.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) Merging spdx/spdx-linus (d1abaeb3be7b Linux 5.3-rc5) $ git merge spdx/spdx-linus Already up to date. Merging gpio-intel-fixes/fixes (5f9e832c1370 Linus 5.3-rc1) $ git merge gpio-intel-fixes/fixes Already up to date. Merging pinctrl-intel-fixes/fixes (5f9e832c1370 Linus 5.3-rc1) $ git merge pinctrl-intel-fixes/fixes Already up to date. Merging drm-misc-fixes/for-linux-next-fixes (63daf4e16654 drm/omap: ensure we have a valid dma_mask) $ git merge drm-misc-fixes/for-linux-next-fixes Merge made by the 'recursive' strategy. drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 9 +++++++++ .../gpu/drm/arm/display/komeda/komeda_format_caps.c | 19 +++++++++++++++++++ .../gpu/drm/arm/display/komeda/komeda_format_caps.h | 3 +++ .../gpu/drm/arm/display/komeda/komeda_framebuffer.c | 5 +++-- drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 5 +++++ drivers/gpu/drm/omapdrm/omap_drv.c | 2 +- 6 files changed, 40 insertions(+), 3 deletions(-) Merging kspp-gustavo/for-next/kspp (b8bff75a934c usb: udc: lpc32xx: Silence fall-through warning) $ git merge kspp-gustavo/for-next/kspp Auto-merging arch/arc/kernel/unwind.c Merge made by the 'recursive' strategy. arch/arc/kernel/unwind.c | 1 + arch/arm/mach-rpc/riscpc.c | 1 + arch/mips/include/asm/octeon/cvmx-sli-defs.h | 1 + drivers/dma/fsldma.c | 1 + drivers/gpu/drm/sun4i/sun4i_tcon.c | 1 + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 1 + drivers/mtd/maps/sa1100-flash.c | 1 + drivers/power/supply/ab8500_charger.c | 1 + drivers/scsi/libsas/sas_discover.c | 1 + drivers/video/fbdev/acornfb.c | 1 + drivers/watchdog/wdt285.c | 2 +- 11 files changed, 11 insertions(+), 1 deletion(-) Merging kbuild/for-next (a564bdeb5e0d .gitignore: ignore modules.order explicitly) $ git merge kbuild/for-next Removing drivers/net/ethernet/netronome/nfp/nic/Makefile Removing drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000/Makefile Removing drivers/net/ethernet/netronome/nfp/nfpcore/Makefile Removing drivers/net/ethernet/netronome/nfp/flower/Makefile Removing drivers/net/ethernet/netronome/nfp/bpf/Makefile Removing drivers/net/ethernet/mellanox/mlx5/core/lib/Makefile Removing drivers/net/ethernet/mellanox/mlx5/core/ipoib/Makefile Removing drivers/net/ethernet/mellanox/mlx5/core/fpga/Makefile Removing drivers/net/ethernet/mellanox/mlx5/core/en_accel/Makefile Removing drivers/net/ethernet/mellanox/mlx5/core/en/xsk/Makefile Removing drivers/net/ethernet/mellanox/mlx5/core/en/Makefile Removing drivers/net/ethernet/mellanox/mlx5/core/diag/Makefile Removing drivers/net/ethernet/mellanox/mlx5/core/accel/Makefile Removing drivers/net/ethernet/aquantia/atlantic/hw_atl/Makefile Auto-merging Makefile Merge made by the 'recursive' strategy. .gitignore | 2 +- Documentation/kbuild/kbuild.rst | 14 -- Documentation/kbuild/makefiles.rst | 25 ++- Kbuild | 7 - Makefile | 196 +++++++++++---------- arch/arm/Makefile | 2 +- arch/arm64/Makefile | 2 +- arch/ia64/Makefile | 2 +- arch/m68k/Makefile | 2 +- arch/parisc/Makefile | 2 +- arch/powerpc/Makefile | 2 +- arch/riscv/Makefile | 2 +- .../net/ethernet/aquantia/atlantic/hw_atl/Makefile | 2 - .../net/ethernet/mellanox/mlx5/core/accel/Makefile | 2 - .../net/ethernet/mellanox/mlx5/core/diag/Makefile | 2 - .../net/ethernet/mellanox/mlx5/core/en/Makefile | 2 - .../ethernet/mellanox/mlx5/core/en/xsk/Makefile | 1 - .../ethernet/mellanox/mlx5/core/en_accel/Makefile | 2 - .../net/ethernet/mellanox/mlx5/core/fpga/Makefile | 2 - .../net/ethernet/mellanox/mlx5/core/ipoib/Makefile | 2 - .../net/ethernet/mellanox/mlx5/core/lib/Makefile | 2 - drivers/net/ethernet/netronome/nfp/bpf/Makefile | 2 - drivers/net/ethernet/netronome/nfp/flower/Makefile | 2 - .../net/ethernet/netronome/nfp/nfpcore/Makefile | 2 - .../netronome/nfp/nfpcore/nfp6000/Makefile | 2 - drivers/net/ethernet/netronome/nfp/nic/Makefile | 2 - include/linux/vermagic.h | 2 + init/Makefile | 5 +- scripts/Kconfig.include | 3 + scripts/Makefile.build | 59 +++++-- scripts/Makefile.host | 17 ++ scripts/Makefile.lib | 32 +--- scripts/Makefile.modfinal | 60 +++++++ scripts/Makefile.modpost | 80 ++------- scripts/genksyms/Makefile | 9 +- scripts/headers_install.sh | 72 ++++++++ scripts/link-vmlinux.sh | 38 ++-- scripts/mkcompile_h | 4 +- scripts/mod/modpost.c | 32 ++++ 39 files changed, 406 insertions(+), 292 deletions(-) delete mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl/Makefile delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/Makefile delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/diag/Makefile delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/Makefile delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/xsk/Makefile delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/Makefile delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/Makefile delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/ipoib/Makefile delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/Makefile delete mode 100644 drivers/net/ethernet/netronome/nfp/bpf/Makefile delete mode 100644 drivers/net/ethernet/netronome/nfp/flower/Makefile delete mode 100644 drivers/net/ethernet/netronome/nfp/nfpcore/Makefile delete mode 100644 drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000/Makefile delete mode 100644 drivers/net/ethernet/netronome/nfp/nic/Makefile create mode 100644 scripts/Makefile.modfinal Merging compiler-attributes/compiler-attributes (6c4d6bc54864 auxdisplay: Fix a typo in cfag12864b-example.c) $ 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 (90ae409f9eb3 dma-direct: fix zone selection after an unaddressable CMA allocation) $ git merge dma-mapping/for-next Merge made by the 'recursive' strategy. arch/arm/Kconfig | 4 ++++ arch/arm/mm/Kconfig | 4 ---- drivers/iommu/dma-iommu.c | 3 +++ include/linux/dma-contiguous.h | 5 +---- kernel/dma/contiguous.c | 8 ++------ kernel/dma/direct.c | 10 +++++++++- 6 files changed, 19 insertions(+), 15 deletions(-) Merging asm-generic/master (7f3a8dff1219 asm-generic: remove ptrace.h) $ git merge asm-generic/master Already up to date. Merging arc/for-next (6fbc7275c7a9 Linux 5.2-rc7) $ git merge arc/for-next Already up to date. Merging arm/for-next (b7a735f3a606 Merge branch 'for-arm-soc' into for-next) $ git merge arm/for-next Already up to date! Merge made by the 'recursive' strategy. Merging arm64/for-next/core (5f7a16c7f01c Merge branches 'for-next/error-injection', 'for-next/tbi', 'for-next/psci-cpuidle', 'for-next/cpu-topology' and 'for-next/52-bit-kva' into for-next/core) $ git merge arm64/for-next/core Removing arch/x86/include/asm/error-injection.h Removing arch/powerpc/include/asm/error-injection.h Auto-merging arch/powerpc/Makefile Auto-merging arch/arm64/kernel/traps.c Auto-merging arch/arm64/kernel/cpufeature.c Removing arch/arm64/include/uapi/asm/stat.h Auto-merging arch/arm64/include/asm/pgtable.h Auto-merging arch/arm64/Makefile Auto-merging Makefile Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. Documentation/arm64/kasan-offsets.sh | 27 ++ Documentation/arm64/memory.rst | 123 ++++++-- .../{arm/topology.txt => cpu/cpu-topology.txt} | 256 +++++++++++------ MAINTAINERS | 15 + Makefile | 4 + arch/Kconfig | 14 + arch/arm/include/asm/topology.h | 20 -- arch/arm/kernel/topology.c | 60 +--- arch/arm64/Kconfig | 42 ++- arch/arm64/Makefile | 8 - arch/arm64/include/asm/assembler.h | 28 +- arch/arm64/include/asm/atomic.h | 5 +- arch/arm64/include/asm/cache.h | 2 +- arch/arm64/include/asm/compat.h | 2 - arch/arm64/include/asm/cpu_ops.h | 3 + arch/arm64/include/asm/cpufeature.h | 28 +- arch/arm64/include/asm/cputype.h | 21 +- arch/arm64/include/asm/debug-monitors.h | 3 - arch/arm64/include/asm/dma-mapping.h | 3 - arch/arm64/include/asm/efi.h | 4 +- arch/arm64/include/asm/esr.h | 3 +- arch/arm64/include/asm/fpsimd.h | 2 +- arch/arm64/include/asm/futex.h | 3 - arch/arm64/include/asm/hw_breakpoint.h | 3 - arch/arm64/include/asm/io.h | 7 +- arch/arm64/include/asm/irqflags.h | 5 +- arch/arm64/include/asm/kasan.h | 11 +- arch/arm64/include/asm/memory.h | 141 +++++----- arch/arm64/include/asm/mmu_context.h | 4 +- arch/arm64/include/asm/pci.h | 2 - arch/arm64/include/asm/pgtable-hwdef.h | 2 +- arch/arm64/include/asm/pgtable.h | 10 +- arch/arm64/include/asm/pointer_auth.h | 2 +- arch/arm64/include/asm/proc-fns.h | 2 - arch/arm64/include/asm/processor.h | 15 +- arch/arm64/include/asm/ptrace.h | 5 + arch/arm64/include/asm/signal32.h | 2 - arch/arm64/include/asm/sysreg.h | 29 -- arch/arm64/include/asm/thread_info.h | 29 +- arch/arm64/include/asm/topology.h | 23 -- arch/arm64/include/asm/uaccess.h | 12 +- arch/arm64/include/asm/vdso.h | 4 - arch/arm64/include/asm/vdso_datapage.h | 4 - arch/arm64/include/uapi/asm/stat.h | 17 -- arch/arm64/kernel/cpufeature.c | 2 +- arch/arm64/kernel/cpuidle.c | 50 +++- arch/arm64/kernel/cpuinfo.c | 2 +- arch/arm64/kernel/head.S | 108 ++++++- arch/arm64/kernel/hibernate-asm.S | 8 +- arch/arm64/kernel/hibernate.c | 2 +- arch/arm64/kernel/image-vars.h | 51 ++++ arch/arm64/kernel/image.h | 42 --- arch/arm64/kernel/insn.c | 2 +- arch/arm64/kernel/kaslr.c | 6 +- arch/arm64/kernel/kexec_image.c | 2 +- arch/arm64/kernel/machine_kexec_file.c | 4 +- arch/arm64/kernel/module-plts.c | 2 +- arch/arm64/kernel/process.c | 76 +++++ arch/arm64/kernel/psci.c | 10 +- arch/arm64/kernel/ptrace.c | 2 +- arch/arm64/kernel/setup.c | 11 +- arch/arm64/kernel/smp_spin_table.c | 2 +- arch/arm64/kernel/topology.c | 312 +-------------------- arch/arm64/kernel/traps.c | 11 +- arch/arm64/kernel/vmlinux.lds.S | 11 + arch/arm64/kvm/va_layout.c | 14 +- arch/arm64/lib/Makefile | 2 + arch/arm64/lib/error-inject.c | 18 ++ arch/arm64/mm/dump.c | 24 +- arch/arm64/mm/fault.c | 11 +- arch/arm64/mm/init.c | 35 ++- arch/arm64/mm/kasan_init.c | 9 +- arch/arm64/mm/mmu.c | 9 +- arch/arm64/mm/numa.c | 2 +- arch/arm64/mm/pageattr.c | 2 - arch/arm64/mm/proc.S | 11 +- arch/powerpc/Makefile | 2 - arch/powerpc/include/asm/error-injection.h | 13 - arch/riscv/Kconfig | 1 + arch/riscv/kernel/smpboot.c | 3 + arch/x86/include/asm/error-injection.h | 13 - drivers/acpi/arm64/iort.c | 6 +- drivers/acpi/pptt.c | 53 +++- drivers/base/Kconfig | 2 +- drivers/base/arch_topology.c | 298 ++++++++++++++++++++ drivers/cpuidle/Kconfig.arm | 10 + drivers/cpuidle/Makefile | 1 + drivers/cpuidle/cpuidle-arm.c | 13 +- drivers/cpuidle/cpuidle-psci.c | 236 ++++++++++++++++ drivers/firmware/psci/psci.c | 167 +---------- drivers/firmware/psci/psci_checker.c | 16 +- include/asm-generic/error-injection.h | 6 + include/linux/acpi.h | 5 + include/linux/arch_topology.h | 26 ++ include/linux/cpuidle.h | 17 +- include/linux/error-injection.h | 6 +- include/linux/psci.h | 4 +- include/linux/topology.h | 1 + include/uapi/linux/prctl.h | 5 + init/Kconfig | 3 + kernel/sys.c | 16 ++ scripts/Makefile.kasan | 11 +- scripts/tools-support-relr.sh | 16 ++ tools/testing/selftests/arm64/.gitignore | 1 + tools/testing/selftests/arm64/Makefile | 11 + tools/testing/selftests/arm64/run_tags_test.sh | 12 + tools/testing/selftests/arm64/tags_test.c | 31 ++ 107 files changed, 1744 insertions(+), 1119 deletions(-) create mode 100644 Documentation/arm64/kasan-offsets.sh rename Documentation/devicetree/bindings/{arm/topology.txt => cpu/cpu-topology.txt} (66%) delete mode 100644 arch/arm64/include/uapi/asm/stat.h create mode 100644 arch/arm64/kernel/image-vars.h create mode 100644 arch/arm64/lib/error-inject.c delete mode 100644 arch/powerpc/include/asm/error-injection.h delete mode 100644 arch/x86/include/asm/error-injection.h create mode 100644 drivers/cpuidle/cpuidle-psci.c create mode 100755 scripts/tools-support-relr.sh create mode 100644 tools/testing/selftests/arm64/.gitignore create mode 100644 tools/testing/selftests/arm64/Makefile create mode 100755 tools/testing/selftests/arm64/run_tags_test.sh create mode 100644 tools/testing/selftests/arm64/tags_test.c Merging arm-perf/for-next/perf (d91cc2f46ad5 arm64: perf_event: Add missing header needed for smp_processor_id()) $ git merge arm-perf/for-next/perf Merge made by the 'recursive' strategy. arch/arm64/kernel/perf_event.c | 2 +- drivers/perf/fsl_imx8_ddr_perf.c | 1 + drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c | 4 +--- drivers/perf/hisilicon/hisi_uncore_hha_pmu.c | 4 +--- drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c | 4 +--- drivers/perf/qcom_l2_pmu.c | 6 +----- drivers/perf/xgene_pmu.c | 4 +--- 7 files changed, 7 insertions(+), 18 deletions(-) Merging arm-soc/for-next (50e5bf56ba2f arm-soc: document merges) $ git merge arm-soc/for-next Auto-merging drivers/usb/gadget/udc/lpc32xx_udc.c Removing arch/arm/plat-iop/Makefile Auto-merging arch/arm/mm/Kconfig Removing arch/arm/mach-w90x900/time.c Removing arch/arm/mach-w90x900/regs-usb.h Removing arch/arm/mach-w90x900/regs-timer.h Removing arch/arm/mach-w90x900/regs-gcr.h Removing arch/arm/mach-w90x900/regs-ebi.h Removing arch/arm/mach-w90x900/nuc9xx.h Removing arch/arm/mach-w90x900/nuc960.h Removing arch/arm/mach-w90x900/nuc960.c Removing arch/arm/mach-w90x900/nuc950.h Removing arch/arm/mach-w90x900/nuc950.c Removing arch/arm/mach-w90x900/nuc910.h Removing arch/arm/mach-w90x900/nuc910.c Removing arch/arm/mach-w90x900/mfp.c Removing arch/arm/mach-w90x900/mach-nuc960evb.c Removing arch/arm/mach-w90x900/mach-nuc950evb.c Removing arch/arm/mach-w90x900/mach-nuc910evb.c Removing arch/arm/mach-w90x900/irq.c Removing arch/arm/mach-w90x900/include/mach/uncompress.h Removing arch/arm/mach-w90x900/include/mach/regs-serial.h Removing arch/arm/mach-w90x900/include/mach/regs-ldm.h Removing arch/arm/mach-w90x900/include/mach/regs-irq.h Removing arch/arm/mach-w90x900/include/mach/regs-clock.h Removing arch/arm/mach-w90x900/include/mach/mfp.h Removing arch/arm/mach-w90x900/include/mach/map.h Removing arch/arm/mach-w90x900/include/mach/irqs.h Removing arch/arm/mach-w90x900/include/mach/hardware.h Removing arch/arm/mach-w90x900/include/mach/entry-macro.S Removing arch/arm/mach-w90x900/gpio.c Removing arch/arm/mach-w90x900/dev.c Removing arch/arm/mach-w90x900/cpu.h Removing arch/arm/mach-w90x900/cpu.c Removing arch/arm/mach-w90x900/clock.h Removing arch/arm/mach-w90x900/clock.c Removing arch/arm/mach-w90x900/clksel.c Removing arch/arm/mach-w90x900/Makefile.boot Removing arch/arm/mach-w90x900/Makefile Removing arch/arm/mach-w90x900/Kconfig Removing arch/arm/mach-nspire/clcd.h Removing arch/arm/mach-nspire/clcd.c Removing arch/arm/mach-lpc32xx/include/mach/uncompress.h Removing arch/arm/mach-lpc32xx/include/mach/hardware.h Removing arch/arm/mach-lpc32xx/include/mach/entry-macro.S Removing arch/arm/mach-lpc32xx/include/mach/board.h Removing arch/arm/mach-ks8695/time.c Removing arch/arm/mach-ks8695/regs-wan.h Removing arch/arm/mach-ks8695/regs-sys.h Removing arch/arm/mach-ks8695/regs-pci.h Removing arch/arm/mach-ks8695/regs-mem.h Removing arch/arm/mach-ks8695/regs-lan.h Removing arch/arm/mach-ks8695/regs-hpna.h Removing arch/arm/mach-ks8695/pci.c Removing arch/arm/mach-ks8695/irq.c Removing arch/arm/mach-ks8695/include/mach/uncompress.h Removing arch/arm/mach-ks8695/include/mach/regs-uart.h Removing arch/arm/mach-ks8695/include/mach/regs-switch.h Removing arch/arm/mach-ks8695/include/mach/regs-misc.h Removing arch/arm/mach-ks8695/include/mach/regs-irq.h Removing arch/arm/mach-ks8695/include/mach/regs-gpio.h Removing arch/arm/mach-ks8695/include/mach/memory.h Removing arch/arm/mach-ks8695/include/mach/irqs.h Removing arch/arm/mach-ks8695/include/mach/hardware.h Removing arch/arm/mach-ks8695/include/mach/gpio-ks8695.h Removing arch/arm/mach-ks8695/include/mach/entry-macro.S Removing arch/arm/mach-ks8695/generic.h Removing arch/arm/mach-ks8695/devices.h Removing arch/arm/mach-ks8695/devices.c Removing arch/arm/mach-ks8695/cpu.c Removing arch/arm/mach-ks8695/board-sg.c Removing arch/arm/mach-ks8695/board-og.c Removing arch/arm/mach-ks8695/board-micrel.c Removing arch/arm/mach-ks8695/board-dsm320.c Removing arch/arm/mach-ks8695/board-acs5k.c Removing arch/arm/mach-ks8695/Makefile.boot Removing arch/arm/mach-ks8695/Makefile Removing arch/arm/mach-ks8695/Kconfig Removing arch/arm/mach-iop33x/uart.c Removing arch/arm/mach-iop33x/irq.c Removing arch/arm/mach-iop33x/iq80332.c Removing arch/arm/mach-iop33x/iq80331.c Removing arch/arm/mach-iop33x/include/mach/uncompress.h Removing arch/arm/mach-iop33x/include/mach/time.h Removing arch/arm/mach-iop33x/include/mach/irqs.h Removing arch/arm/mach-iop33x/include/mach/iq80332.h Removing arch/arm/mach-iop33x/include/mach/iq80331.h Removing arch/arm/mach-iop33x/include/mach/iop33x.h Removing arch/arm/mach-iop33x/include/mach/hardware.h Removing arch/arm/mach-iop33x/include/mach/entry-macro.S Removing arch/arm/mach-iop33x/include/mach/adma.h Removing arch/arm/mach-iop33x/Makefile.boot Removing arch/arm/mach-iop33x/Makefile Removing arch/arm/mach-iop33x/Kconfig Removing arch/arm/mach-iop32x/include/mach/time.h Removing arch/arm/mach-iop32x/include/mach/iop32x.h Removing arch/arm/mach-iop32x/include/mach/adma.h Removing arch/arm/mach-iop13xx/tpmi.c Removing arch/arm/mach-iop13xx/setup.c Removing arch/arm/mach-iop13xx/pci.h Removing arch/arm/mach-iop13xx/pci.c Removing arch/arm/mach-iop13xx/msi.h Removing arch/arm/mach-iop13xx/msi.c Removing arch/arm/mach-iop13xx/irq.c Removing arch/arm/mach-iop13xx/iq81340sc.c Removing arch/arm/mach-iop13xx/iq81340mc.c Removing arch/arm/mach-iop13xx/io.c Removing arch/arm/mach-iop13xx/include/mach/uncompress.h Removing arch/arm/mach-iop13xx/include/mach/time.h Removing arch/arm/mach-iop13xx/include/mach/memory.h Removing arch/arm/mach-iop13xx/include/mach/irqs.h Removing arch/arm/mach-iop13xx/include/mach/iq81340.h Removing arch/arm/mach-iop13xx/include/mach/iop13xx.h Removing arch/arm/mach-iop13xx/include/mach/hardware.h Removing arch/arm/mach-iop13xx/include/mach/entry-macro.S Removing arch/arm/mach-iop13xx/include/mach/adma.h Removing arch/arm/mach-iop13xx/Makefile.boot Removing arch/arm/mach-iop13xx/Makefile Removing arch/arm/mach-iop13xx/Kconfig Removing arch/arm/mach-dove/include/mach/hardware.h Removing arch/arm/include/debug/ks8695.S Removing arch/arm/configs/nuc960_defconfig Removing arch/arm/configs/nuc950_defconfig Removing arch/arm/configs/nuc910_defconfig Removing arch/arm/configs/ks8695_defconfig Removing arch/arm/configs/iop33x_defconfig Removing arch/arm/configs/iop13xx_defconfig Removing arch/arm/configs/acs5k_tiny_defconfig Removing arch/arm/configs/acs5k_defconfig Auto-merging arch/arm/Makefile Auto-merging arch/arm/Kconfig Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. Documentation/ABI/testing/debugfs-moxtet | 23 + Documentation/ABI/testing/sysfs-bus-moxtet-devices | 17 + Documentation/devicetree/bindings/arm/arm,scmi.txt | 17 + Documentation/devicetree/bindings/bus/moxtet.txt | 46 + .../devicetree/bindings/gpio/gpio-moxtet.txt | 18 + .../devicetree/bindings/net/can/rcar_can.txt | 2 +- .../devicetree/bindings/net/can/rcar_canfd.txt | 9 +- .../devicetree/bindings/reset/fsl,imx7-src.txt | 6 +- .../devicetree/bindings/reset/snps,dw-reset.txt | 30 + .../devicetree/bindings/soc/fsl/cpm_qe/qe.txt | 13 +- MAINTAINERS | 45 +- arch/arm/Kconfig | 77 +- arch/arm/Kconfig.debug | 21 +- arch/arm/Makefile | 5 - arch/arm/arm-soc-for-next-contents.txt | 76 ++ arch/arm/boot/dts/gemini-nas4220b.dts | 37 +- arch/arm/boot/dts/gemini-sl93512r.dts | 56 +- arch/arm/boot/dts/nspire-classic.dtsi | 15 +- arch/arm/boot/dts/nspire-cx.dts | 15 +- arch/arm/boot/dts/nspire.dtsi | 10 +- arch/arm/boot/dts/ste-dbx5x0.dtsi | 26 +- arch/arm/boot/dts/ste-href-stuib.dtsi | 11 + arch/arm/boot/dts/ste-nomadik-nhk15.dts | 8 +- arch/arm/boot/dts/ste-snowball.dts | 29 - arch/arm/boot/dts/stm32429i-eval.dts | 25 +- arch/arm/boot/dts/stm32f429.dtsi | 12 + arch/arm/boot/dts/stm32f746.dtsi | 12 + arch/arm/boot/dts/stm32h743i-eval.dts | 1 + arch/arm/boot/dts/stm32mp157-pinctrl.dtsi | 70 +- arch/arm/boot/dts/stm32mp157a-dk1.dts | 135 +++ arch/arm/boot/dts/stm32mp157c-ed1.dts | 46 + arch/arm/boot/dts/stm32mp157c-ev1.dts | 17 + arch/arm/boot/dts/stm32mp157c.dtsi | 61 ++ arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 1 + arch/arm/boot/dts/vexpress-v2m.dtsi | 2 +- arch/arm/configs/acs5k_defconfig | 77 -- arch/arm/configs/acs5k_tiny_defconfig | 69 -- arch/arm/configs/imx_v6_v7_defconfig | 1 + arch/arm/configs/iop13xx_defconfig | 118 --- arch/arm/configs/iop33x_defconfig | 85 -- arch/arm/configs/ks8695_defconfig | 67 -- arch/arm/configs/lpc32xx_defconfig | 2 + arch/arm/configs/multi_v7_defconfig | 3 + arch/arm/configs/nuc910_defconfig | 51 - arch/arm/configs/nuc950_defconfig | 67 -- arch/arm/configs/nuc960_defconfig | 57 - arch/arm/include/debug/ks8695.S | 37 - arch/arm/include/debug/ux500.S | 9 +- .../arm/mach-dove/{include/mach => }/bridge-regs.h | 4 +- arch/arm/mach-dove/cm-a510.c | 3 +- arch/arm/mach-dove/common.c | 4 +- arch/arm/mach-dove/dove-db-setup.c | 2 +- arch/arm/mach-dove/{include/mach => }/dove.h | 14 +- arch/arm/mach-dove/include/mach/hardware.h | 19 - arch/arm/mach-dove/include/mach/uncompress.h | 8 +- arch/arm/mach-dove/irq.c | 5 +- arch/arm/mach-dove/{include/mach => }/irqs.h | 2 - arch/arm/mach-dove/mpp.c | 2 +- arch/arm/mach-dove/pcie.c | 4 +- arch/arm/mach-dove/{include/mach => }/pm.h | 4 +- arch/arm/mach-iop13xx/Kconfig | 21 - arch/arm/mach-iop13xx/Makefile | 9 - arch/arm/mach-iop13xx/Makefile.boot | 4 - arch/arm/mach-iop13xx/include/mach/adma.h | 608 ----------- arch/arm/mach-iop13xx/include/mach/entry-macro.S | 29 - arch/arm/mach-iop13xx/include/mach/hardware.h | 22 - arch/arm/mach-iop13xx/include/mach/iop13xx.h | 508 --------- arch/arm/mach-iop13xx/include/mach/iq81340.h | 29 - arch/arm/mach-iop13xx/include/mach/irqs.h | 195 ---- arch/arm/mach-iop13xx/include/mach/memory.h | 68 -- arch/arm/mach-iop13xx/include/mach/time.h | 127 --- arch/arm/mach-iop13xx/include/mach/uncompress.h | 23 - arch/arm/mach-iop13xx/io.c | 77 -- arch/arm/mach-iop13xx/iq81340mc.c | 84 -- arch/arm/mach-iop13xx/iq81340sc.c | 86 -- arch/arm/mach-iop13xx/irq.c | 227 ---- arch/arm/mach-iop13xx/msi.c | 152 --- arch/arm/mach-iop13xx/msi.h | 12 - arch/arm/mach-iop13xx/pci.c | 1115 -------------------- arch/arm/mach-iop13xx/pci.h | 66 -- arch/arm/mach-iop13xx/setup.c | 595 ----------- arch/arm/mach-iop13xx/tpmi.c | 244 ----- arch/arm/mach-iop32x/Makefile | 10 +- arch/arm/{plat-iop => mach-iop32x}/adma.c | 39 +- arch/arm/{plat-iop => mach-iop32x}/cp6.c | 0 arch/arm/mach-iop32x/em7210.c | 5 +- arch/arm/mach-iop32x/glantank.c | 5 +- arch/arm/mach-iop32x/{include/mach => }/glantank.h | 2 - arch/arm/mach-iop32x/{include/mach => }/hardware.h | 6 +- arch/arm/{plat-iop => mach-iop32x}/i2c.c | 21 +- arch/arm/mach-iop32x/include/mach/adma.h | 6 - arch/arm/mach-iop32x/include/mach/entry-macro.S | 2 - arch/arm/mach-iop32x/include/mach/iop32x.h | 31 - arch/arm/mach-iop32x/include/mach/irqs.h | 33 - arch/arm/mach-iop32x/include/mach/time.h | 5 - arch/arm/mach-iop32x/include/mach/uncompress.h | 18 +- .../{include/asm/hardware => mach-iop32x}/iop3xx.h | 18 +- arch/arm/mach-iop32x/iq31244.c | 5 +- arch/arm/mach-iop32x/{include/mach => }/iq31244.h | 2 - arch/arm/mach-iop32x/iq80321.c | 5 +- arch/arm/mach-iop32x/{include/mach => }/iq80321.h | 2 - arch/arm/mach-iop32x/irq.c | 3 +- arch/arm/mach-iop32x/irqs.h | 42 + arch/arm/mach-iop32x/n2100.c | 5 +- arch/arm/mach-iop32x/{include/mach => }/n2100.h | 2 - arch/arm/{plat-iop => mach-iop32x}/pci.c | 4 +- arch/arm/{plat-iop => mach-iop32x}/pmu.c | 8 +- arch/arm/{plat-iop => mach-iop32x}/restart.c | 4 +- arch/arm/{plat-iop => mach-iop32x}/setup.c | 2 +- arch/arm/{plat-iop => mach-iop32x}/time.c | 7 +- arch/arm/mach-iop33x/Kconfig | 22 - arch/arm/mach-iop33x/Makefile | 9 - arch/arm/mach-iop33x/Makefile.boot | 4 - arch/arm/mach-iop33x/include/mach/adma.h | 6 - arch/arm/mach-iop33x/include/mach/entry-macro.S | 34 - arch/arm/mach-iop33x/include/mach/hardware.h | 44 - arch/arm/mach-iop33x/include/mach/iop33x.h | 37 - arch/arm/mach-iop33x/include/mach/iq80331.h | 17 - arch/arm/mach-iop33x/include/mach/iq80332.h | 17 - arch/arm/mach-iop33x/include/mach/irqs.h | 57 - arch/arm/mach-iop33x/include/mach/time.h | 5 - arch/arm/mach-iop33x/include/mach/uncompress.h | 37 - arch/arm/mach-iop33x/iq80331.c | 148 --- arch/arm/mach-iop33x/iq80332.c | 148 --- arch/arm/mach-iop33x/irq.c | 115 -- arch/arm/mach-iop33x/uart.c | 100 -- arch/arm/mach-ks8695/Kconfig | 88 -- arch/arm/mach-ks8695/Makefile | 23 - arch/arm/mach-ks8695/Makefile.boot | 9 - arch/arm/mach-ks8695/board-acs5k.c | 238 ----- arch/arm/mach-ks8695/board-dsm320.c | 127 --- arch/arm/mach-ks8695/board-micrel.c | 59 -- arch/arm/mach-ks8695/board-og.c | 197 ---- arch/arm/mach-ks8695/board-sg.c | 118 --- arch/arm/mach-ks8695/cpu.c | 60 -- arch/arm/mach-ks8695/devices.c | 197 ---- arch/arm/mach-ks8695/devices.h | 29 - arch/arm/mach-ks8695/generic.h | 12 - arch/arm/mach-ks8695/include/mach/entry-macro.S | 47 - arch/arm/mach-ks8695/include/mach/gpio-ks8695.h | 36 - arch/arm/mach-ks8695/include/mach/hardware.h | 42 - arch/arm/mach-ks8695/include/mach/irqs.h | 51 - arch/arm/mach-ks8695/include/mach/memory.h | 51 - arch/arm/mach-ks8695/include/mach/regs-gpio.h | 55 - arch/arm/mach-ks8695/include/mach/regs-irq.h | 41 - arch/arm/mach-ks8695/include/mach/regs-misc.h | 97 -- arch/arm/mach-ks8695/include/mach/regs-switch.h | 66 -- arch/arm/mach-ks8695/include/mach/regs-uart.h | 89 -- arch/arm/mach-ks8695/include/mach/uncompress.h | 33 - arch/arm/mach-ks8695/irq.c | 164 --- arch/arm/mach-ks8695/pci.c | 247 ----- arch/arm/mach-ks8695/regs-hpna.h | 25 - arch/arm/mach-ks8695/regs-lan.h | 65 -- arch/arm/mach-ks8695/regs-mem.h | 89 -- arch/arm/mach-ks8695/regs-pci.h | 53 - arch/arm/mach-ks8695/regs-sys.h | 34 - arch/arm/mach-ks8695/regs-wan.h | 65 -- arch/arm/mach-ks8695/time.c | 159 --- arch/arm/mach-lpc32xx/Kconfig | 11 + arch/arm/mach-lpc32xx/common.c | 24 +- arch/arm/mach-lpc32xx/common.h | 1 - arch/arm/mach-lpc32xx/include/mach/board.h | 15 - arch/arm/mach-lpc32xx/include/mach/entry-macro.S | 28 - arch/arm/mach-lpc32xx/include/mach/hardware.h | 25 - arch/arm/mach-lpc32xx/include/mach/uncompress.h | 50 - .../{include/mach/platform.h => lpc32xx.h} | 18 +- arch/arm/mach-lpc32xx/pm.c | 3 +- arch/arm/mach-lpc32xx/serial.c | 33 +- arch/arm/mach-lpc32xx/suspend.S | 3 +- arch/arm/mach-mv78xx0/mv78xx0.h | 4 +- arch/arm/mach-nspire/Makefile | 1 - arch/arm/mach-nspire/clcd.c | 114 -- arch/arm/mach-nspire/clcd.h | 10 - arch/arm/mach-nspire/nspire.c | 25 - arch/arm/mach-orion5x/orion5x.h | 4 +- arch/arm/mach-ux500/cpu-db8500.c | 1 - arch/arm/mach-w90x900/Kconfig | 50 - arch/arm/mach-w90x900/Makefile | 20 - arch/arm/mach-w90x900/Makefile.boot | 4 - arch/arm/mach-w90x900/clksel.c | 88 -- arch/arm/mach-w90x900/clock.c | 121 --- arch/arm/mach-w90x900/clock.h | 40 - arch/arm/mach-w90x900/cpu.c | 238 ----- arch/arm/mach-w90x900/cpu.h | 56 - arch/arm/mach-w90x900/dev.c | 537 ---------- arch/arm/mach-w90x900/gpio.c | 150 --- arch/arm/mach-w90x900/include/mach/entry-macro.S | 26 - arch/arm/mach-w90x900/include/mach/hardware.h | 19 - arch/arm/mach-w90x900/include/mach/irqs.h | 82 -- arch/arm/mach-w90x900/include/mach/map.h | 153 --- arch/arm/mach-w90x900/include/mach/mfp.h | 21 - arch/arm/mach-w90x900/include/mach/regs-clock.h | 49 - arch/arm/mach-w90x900/include/mach/regs-irq.h | 46 - arch/arm/mach-w90x900/include/mach/regs-ldm.h | 248 ----- arch/arm/mach-w90x900/include/mach/regs-serial.h | 54 - arch/arm/mach-w90x900/include/mach/uncompress.h | 43 - arch/arm/mach-w90x900/irq.c | 212 ---- arch/arm/mach-w90x900/mach-nuc910evb.c | 38 - arch/arm/mach-w90x900/mach-nuc950evb.c | 42 - arch/arm/mach-w90x900/mach-nuc960evb.c | 38 - arch/arm/mach-w90x900/mfp.c | 197 ---- arch/arm/mach-w90x900/nuc910.c | 58 - arch/arm/mach-w90x900/nuc910.h | 17 - arch/arm/mach-w90x900/nuc950.c | 52 - arch/arm/mach-w90x900/nuc950.h | 17 - arch/arm/mach-w90x900/nuc960.c | 50 - arch/arm/mach-w90x900/nuc960.h | 17 - arch/arm/mach-w90x900/nuc9xx.h | 22 - arch/arm/mach-w90x900/regs-ebi.h | 29 - arch/arm/mach-w90x900/regs-gcr.h | 34 - arch/arm/mach-w90x900/regs-timer.h | 37 - arch/arm/mach-w90x900/regs-usb.h | 31 - arch/arm/mach-w90x900/time.c | 168 --- arch/arm/mm/Kconfig | 2 +- arch/arm/mm/copypage-xscale.c | 6 +- arch/arm/plat-iop/Makefile | 28 - arch/arm64/boot/dts/arm/fvp-base-revc.dts | 8 - arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 2 - arch/arm64/boot/dts/renesas/hihope-common.dtsi | 78 ++ arch/arm64/boot/dts/renesas/hihope-rzg2-ex.dtsi | 22 + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 282 ++++- arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 4 + .../boot/dts/renesas/r8a7795-es1-salvator-x.dts | 26 +- arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 223 ++-- arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 26 +- .../arm64/boot/dts/renesas/r8a7795-salvator-xs.dts | 82 +- arch/arm64/boot/dts/renesas/r8a7795.dtsi | 154 +-- arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 10 +- .../arm64/boot/dts/renesas/r8a7796-salvator-xs.dts | 10 +- arch/arm64/boot/dts/renesas/r8a77965.dtsi | 48 +- arch/arm64/boot/dts/renesas/r8a77990.dtsi | 2 + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 4 +- arch/arm64/boot/dts/renesas/salvator-common.dtsi | 72 +- arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 226 ++-- arch/arm64/boot/dts/renesas/ulcb.dtsi | 10 +- arch/arm64/configs/defconfig | 1 + drivers/bus/Kconfig | 10 + drivers/bus/Makefile | 1 + drivers/bus/moxtet.c | 886 ++++++++++++++++ drivers/clk/clk-scmi.c | 2 +- drivers/dma/Kconfig | 4 +- drivers/dma/iop-adma.c | 22 +- .../iop3xx-adma.h => drivers/dma/iop-adma.h | 7 +- drivers/firmware/arm_scmi/Makefile | 2 +- drivers/firmware/arm_scmi/base.c | 2 +- drivers/firmware/arm_scmi/clock.c | 33 +- drivers/firmware/arm_scmi/common.h | 18 +- drivers/firmware/arm_scmi/driver.c | 366 ++++--- drivers/firmware/arm_scmi/perf.c | 264 ++++- drivers/firmware/arm_scmi/power.c | 6 +- drivers/firmware/arm_scmi/reset.c | 231 ++++ drivers/firmware/arm_scmi/sensors.c | 57 +- drivers/gpio/Kconfig | 18 +- drivers/gpio/Makefile | 3 +- drivers/gpio/gpio-lpc32xx.c | 118 ++- drivers/gpio/gpio-moxtet.c | 179 ++++ drivers/hwmon/scmi-hwmon.c | 2 +- drivers/i2c/busses/Kconfig | 2 +- drivers/net/ethernet/nxp/Kconfig | 2 +- drivers/net/ethernet/nxp/lpc_eth.c | 45 +- drivers/reset/Kconfig | 13 +- drivers/reset/Makefile | 1 + drivers/reset/reset-imx7.c | 12 +- drivers/reset/reset-meson.c | 51 +- drivers/reset/reset-scmi.c | 124 +++ drivers/reset/reset-simple.c | 3 + drivers/soc/fsl/dpaa2-console.c | 2 +- drivers/soc/fsl/qe/qe.c | 163 ++- drivers/soc/renesas/rcar-sysc.c | 2 +- drivers/soc/ux500/ux500-soc-id.c | 5 +- drivers/tee/optee/call.c | 1 + drivers/tty/serial/Kconfig | 3 +- drivers/tty/serial/lpc32xx_hs.c | 37 +- drivers/usb/gadget/udc/Kconfig | 3 +- drivers/usb/gadget/udc/lpc32xx_udc.c | 3 +- drivers/usb/host/Kconfig | 3 +- drivers/usb/host/ohci-nxp.c | 25 +- drivers/watchdog/Kconfig | 2 +- drivers/watchdog/pnx4008_wdt.c | 1 - include/dt-bindings/bus/moxtet.h | 16 + .../dt-bindings/reset/amlogic,meson-gxbb-reset.h | 51 +- include/dt-bindings/reset/amlogic,meson8b-reset.h | 51 +- include/dt-bindings/reset/imx8mq-reset.h | 34 +- include/linux/moxtet.h | 109 ++ .../linux/platform_data/dma-iop32x.h | 4 + include/linux/scmi_protocol.h | 46 +- include/linux/soc/nxp/lpc32xx-misc.h | 33 + 287 files changed, 4199 insertions(+), 13446 deletions(-) create mode 100644 Documentation/ABI/testing/debugfs-moxtet create mode 100644 Documentation/ABI/testing/sysfs-bus-moxtet-devices create mode 100644 Documentation/devicetree/bindings/bus/moxtet.txt create mode 100644 Documentation/devicetree/bindings/gpio/gpio-moxtet.txt create mode 100644 Documentation/devicetree/bindings/reset/snps,dw-reset.txt create mode 100644 arch/arm/arm-soc-for-next-contents.txt delete mode 100644 arch/arm/configs/acs5k_defconfig delete mode 100644 arch/arm/configs/acs5k_tiny_defconfig delete mode 100644 arch/arm/configs/iop13xx_defconfig delete mode 100644 arch/arm/configs/iop33x_defconfig delete mode 100644 arch/arm/configs/ks8695_defconfig delete mode 100644 arch/arm/configs/nuc910_defconfig delete mode 100644 arch/arm/configs/nuc950_defconfig delete mode 100644 arch/arm/configs/nuc960_defconfig delete mode 100644 arch/arm/include/debug/ks8695.S rename arch/arm/mach-dove/{include/mach => }/bridge-regs.h (96%) rename arch/arm/mach-dove/{include/mach => }/dove.h (95%) delete mode 100644 arch/arm/mach-dove/include/mach/hardware.h rename arch/arm/mach-dove/{include/mach => }/irqs.h (98%) rename arch/arm/mach-dove/{include/mach => }/pm.h (97%) delete mode 100644 arch/arm/mach-iop13xx/Kconfig delete mode 100644 arch/arm/mach-iop13xx/Makefile delete mode 100644 arch/arm/mach-iop13xx/Makefile.boot delete mode 100644 arch/arm/mach-iop13xx/include/mach/adma.h delete mode 100644 arch/arm/mach-iop13xx/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-iop13xx/include/mach/hardware.h delete mode 100644 arch/arm/mach-iop13xx/include/mach/iop13xx.h delete mode 100644 arch/arm/mach-iop13xx/include/mach/iq81340.h delete mode 100644 arch/arm/mach-iop13xx/include/mach/irqs.h delete mode 100644 arch/arm/mach-iop13xx/include/mach/memory.h delete mode 100644 arch/arm/mach-iop13xx/include/mach/time.h delete mode 100644 arch/arm/mach-iop13xx/include/mach/uncompress.h delete mode 100644 arch/arm/mach-iop13xx/io.c delete mode 100644 arch/arm/mach-iop13xx/iq81340mc.c delete mode 100644 arch/arm/mach-iop13xx/iq81340sc.c delete mode 100644 arch/arm/mach-iop13xx/irq.c delete mode 100644 arch/arm/mach-iop13xx/msi.c delete mode 100644 arch/arm/mach-iop13xx/msi.h delete mode 100644 arch/arm/mach-iop13xx/pci.c delete mode 100644 arch/arm/mach-iop13xx/pci.h delete mode 100644 arch/arm/mach-iop13xx/setup.c delete mode 100644 arch/arm/mach-iop13xx/tpmi.c rename arch/arm/{plat-iop => mach-iop32x}/adma.c (75%) rename arch/arm/{plat-iop => mach-iop32x}/cp6.c (100%) rename arch/arm/mach-iop32x/{include/mach => }/glantank.h (78%) rename arch/arm/mach-iop32x/{include/mach => }/hardware.h (90%) rename arch/arm/{plat-iop => mach-iop32x}/i2c.c (81%) delete mode 100644 arch/arm/mach-iop32x/include/mach/adma.h delete mode 100644 arch/arm/mach-iop32x/include/mach/iop32x.h delete mode 100644 arch/arm/mach-iop32x/include/mach/time.h rename arch/arm/{include/asm/hardware => mach-iop32x}/iop3xx.h (96%) rename arch/arm/mach-iop32x/{include/mach => }/iq31244.h (89%) rename arch/arm/mach-iop32x/{include/mach => }/iq80321.h (89%) create mode 100644 arch/arm/mach-iop32x/irqs.h rename arch/arm/mach-iop32x/{include/mach => }/n2100.h (89%) rename arch/arm/{plat-iop => mach-iop32x}/pci.c (99%) rename arch/arm/{plat-iop => mach-iop32x}/pmu.c (79%) rename arch/arm/{plat-iop => mach-iop32x}/restart.c (82%) rename arch/arm/{plat-iop => mach-iop32x}/setup.c (95%) rename arch/arm/{plat-iop => mach-iop32x}/time.c (97%) delete mode 100644 arch/arm/mach-iop33x/Kconfig delete mode 100644 arch/arm/mach-iop33x/Makefile delete mode 100644 arch/arm/mach-iop33x/Makefile.boot delete mode 100644 arch/arm/mach-iop33x/include/mach/adma.h delete mode 100644 arch/arm/mach-iop33x/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-iop33x/include/mach/hardware.h delete mode 100644 arch/arm/mach-iop33x/include/mach/iop33x.h delete mode 100644 arch/arm/mach-iop33x/include/mach/iq80331.h delete mode 100644 arch/arm/mach-iop33x/include/mach/iq80332.h delete mode 100644 arch/arm/mach-iop33x/include/mach/irqs.h delete mode 100644 arch/arm/mach-iop33x/include/mach/time.h delete mode 100644 arch/arm/mach-iop33x/include/mach/uncompress.h delete mode 100644 arch/arm/mach-iop33x/iq80331.c delete mode 100644 arch/arm/mach-iop33x/iq80332.c delete mode 100644 arch/arm/mach-iop33x/irq.c delete mode 100644 arch/arm/mach-iop33x/uart.c delete mode 100644 arch/arm/mach-ks8695/Kconfig delete mode 100644 arch/arm/mach-ks8695/Makefile delete mode 100644 arch/arm/mach-ks8695/Makefile.boot delete mode 100644 arch/arm/mach-ks8695/board-acs5k.c delete mode 100644 arch/arm/mach-ks8695/board-dsm320.c delete mode 100644 arch/arm/mach-ks8695/board-micrel.c delete mode 100644 arch/arm/mach-ks8695/board-og.c delete mode 100644 arch/arm/mach-ks8695/board-sg.c delete mode 100644 arch/arm/mach-ks8695/cpu.c delete mode 100644 arch/arm/mach-ks8695/devices.c delete mode 100644 arch/arm/mach-ks8695/devices.h delete mode 100644 arch/arm/mach-ks8695/generic.h delete mode 100644 arch/arm/mach-ks8695/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-ks8695/include/mach/gpio-ks8695.h delete mode 100644 arch/arm/mach-ks8695/include/mach/hardware.h delete mode 100644 arch/arm/mach-ks8695/include/mach/irqs.h delete mode 100644 arch/arm/mach-ks8695/include/mach/memory.h delete mode 100644 arch/arm/mach-ks8695/include/mach/regs-gpio.h delete mode 100644 arch/arm/mach-ks8695/include/mach/regs-irq.h delete mode 100644 arch/arm/mach-ks8695/include/mach/regs-misc.h delete mode 100644 arch/arm/mach-ks8695/include/mach/regs-switch.h delete mode 100644 arch/arm/mach-ks8695/include/mach/regs-uart.h delete mode 100644 arch/arm/mach-ks8695/include/mach/uncompress.h delete mode 100644 arch/arm/mach-ks8695/irq.c delete mode 100644 arch/arm/mach-ks8695/pci.c delete mode 100644 arch/arm/mach-ks8695/regs-hpna.h delete mode 100644 arch/arm/mach-ks8695/regs-lan.h delete mode 100644 arch/arm/mach-ks8695/regs-mem.h delete mode 100644 arch/arm/mach-ks8695/regs-pci.h delete mode 100644 arch/arm/mach-ks8695/regs-sys.h delete mode 100644 arch/arm/mach-ks8695/regs-wan.h delete mode 100644 arch/arm/mach-ks8695/time.c create mode 100644 arch/arm/mach-lpc32xx/Kconfig delete mode 100644 arch/arm/mach-lpc32xx/include/mach/board.h delete mode 100644 arch/arm/mach-lpc32xx/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-lpc32xx/include/mach/hardware.h delete mode 100644 arch/arm/mach-lpc32xx/include/mach/uncompress.h rename arch/arm/mach-lpc32xx/{include/mach/platform.h => lpc32xx.h} (98%) delete mode 100644 arch/arm/mach-nspire/clcd.c delete mode 100644 arch/arm/mach-nspire/clcd.h delete mode 100644 arch/arm/mach-w90x900/Kconfig delete mode 100644 arch/arm/mach-w90x900/Makefile delete mode 100644 arch/arm/mach-w90x900/Makefile.boot delete mode 100644 arch/arm/mach-w90x900/clksel.c delete mode 100644 arch/arm/mach-w90x900/clock.c delete mode 100644 arch/arm/mach-w90x900/clock.h delete mode 100644 arch/arm/mach-w90x900/cpu.c delete mode 100644 arch/arm/mach-w90x900/cpu.h delete mode 100644 arch/arm/mach-w90x900/dev.c delete mode 100644 arch/arm/mach-w90x900/gpio.c delete mode 100644 arch/arm/mach-w90x900/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-w90x900/include/mach/hardware.h delete mode 100644 arch/arm/mach-w90x900/include/mach/irqs.h delete mode 100644 arch/arm/mach-w90x900/include/mach/map.h delete mode 100644 arch/arm/mach-w90x900/include/mach/mfp.h delete mode 100644 arch/arm/mach-w90x900/include/mach/regs-clock.h delete mode 100644 arch/arm/mach-w90x900/include/mach/regs-irq.h delete mode 100644 arch/arm/mach-w90x900/include/mach/regs-ldm.h delete mode 100644 arch/arm/mach-w90x900/include/mach/regs-serial.h delete mode 100644 arch/arm/mach-w90x900/include/mach/uncompress.h delete mode 100644 arch/arm/mach-w90x900/irq.c delete mode 100644 arch/arm/mach-w90x900/mach-nuc910evb.c delete mode 100644 arch/arm/mach-w90x900/mach-nuc950evb.c delete mode 100644 arch/arm/mach-w90x900/mach-nuc960evb.c delete mode 100644 arch/arm/mach-w90x900/mfp.c delete mode 100644 arch/arm/mach-w90x900/nuc910.c delete mode 100644 arch/arm/mach-w90x900/nuc910.h delete mode 100644 arch/arm/mach-w90x900/nuc950.c delete mode 100644 arch/arm/mach-w90x900/nuc950.h delete mode 100644 arch/arm/mach-w90x900/nuc960.c delete mode 100644 arch/arm/mach-w90x900/nuc960.h delete mode 100644 arch/arm/mach-w90x900/nuc9xx.h delete mode 100644 arch/arm/mach-w90x900/regs-ebi.h delete mode 100644 arch/arm/mach-w90x900/regs-gcr.h delete mode 100644 arch/arm/mach-w90x900/regs-timer.h delete mode 100644 arch/arm/mach-w90x900/regs-usb.h delete mode 100644 arch/arm/mach-w90x900/time.c delete mode 100644 arch/arm/plat-iop/Makefile create mode 100644 drivers/bus/moxtet.c rename arch/arm/include/asm/hardware/iop3xx-adma.h => drivers/dma/iop-adma.h (99%) create mode 100644 drivers/firmware/arm_scmi/reset.c create mode 100644 drivers/gpio/gpio-moxtet.c create mode 100644 drivers/reset/reset-scmi.c create mode 100644 include/dt-bindings/bus/moxtet.h create mode 100644 include/linux/moxtet.h rename arch/arm/include/asm/hardware/iop_adma.h => include/linux/platform_data/dma-iop32x.h (98%) create mode 100644 include/linux/soc/nxp/lpc32xx-misc.h Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' into next) $ git merge actions/for-next Already up to date! Merge made by the 'recursive' strategy. Merging amlogic/for-next (2e4ff31d2748 Merge branch 'v5.4/drivers' into tmp/aml-rebuild) $ git merge amlogic/for-next Removing drivers/clk/meson/clk-input.h Removing drivers/clk/meson/clk-input.c Auto-merging drivers/clk/clk.c Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/arm/amlogic.yaml | 20 +- .../devicetree/bindings/media/amlogic,vdec.txt | 5 +- .../bindings/soc/amlogic/clk-measure.txt | 1 + arch/arm/boot/dts/meson8b-ec100.dts | 31 +- arch/arm/boot/dts/meson8b-mxq.dts | 26 +- arch/arm/boot/dts/meson8b-odroidc1.dts | 36 +- arch/arm/boot/dts/meson8b.dtsi | 10 + arch/arm64/boot/dts/amlogic/Makefile | 3 + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 2 + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 2420 ++++++++++++++++++++ arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 55 + arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 54 + arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 52 + arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 2418 +------------------ .../dts/amlogic/meson-g12b-a311d-khadas-vim3.dts | 15 + arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi | 149 ++ .../boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi | 544 +++++ .../boot/dts/amlogic/meson-g12b-odroid-n2.dts | 98 +- .../dts/amlogic/meson-g12b-s922x-khadas-vim3.dts | 15 + arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi | 124 + arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 30 +- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 16 + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 11 + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 11 + arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 4 + arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 300 +++ arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 68 + drivers/clk/clk.c | 6 + drivers/clk/meson/Kconfig | 11 +- drivers/clk/meson/Makefile | 2 +- drivers/clk/meson/axg-aoclk.c | 63 +- drivers/clk/meson/axg-audio.c | 261 +-- drivers/clk/meson/axg.c | 207 +- drivers/clk/meson/clk-cpu-dyndiv.c | 73 + drivers/clk/meson/clk-cpu-dyndiv.h | 20 + drivers/clk/meson/clk-input.c | 49 - drivers/clk/meson/clk-input.h | 19 - drivers/clk/meson/clk-regmap.h | 12 +- drivers/clk/meson/g12a-aoclk.c | 81 +- drivers/clk/meson/g12a.c | 1626 +++++++++---- drivers/clk/meson/g12a.h | 1 - drivers/clk/meson/gxbb-aoclk.c | 55 +- drivers/clk/meson/gxbb.c | 657 ++++-- drivers/clk/meson/meson-aoclk.c | 37 - drivers/clk/meson/meson-aoclk.h | 8 - drivers/clk/meson/meson-eeclk.c | 10 - drivers/clk/meson/meson-eeclk.h | 2 - drivers/clk/meson/meson8b.c | 710 ++++-- drivers/soc/amlogic/meson-clk-measure.c | 148 +- drivers/soc/amlogic/meson-gx-socinfo.c | 7 +- include/dt-bindings/clock/g12a-clkc.h | 1 + include/linux/clk-provider.h | 1 + 52 files changed, 6901 insertions(+), 3684 deletions(-) create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dts create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-s922x-khadas-vim3.dts create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1.dtsi create mode 100644 drivers/clk/meson/clk-cpu-dyndiv.c create mode 100644 drivers/clk/meson/clk-cpu-dyndiv.h delete mode 100644 drivers/clk/meson/clk-input.c delete mode 100644 drivers/clk/meson/clk-input.h Merging aspeed/for-next (ba0fdbb07d05 Merge branch 'dt-for-v5.4' into for-next) $ git merge aspeed/for-next Merge made by the 'recursive' strategy. arch/arm/boot/dts/Makefile | 5 + arch/arm/boot/dts/aspeed-ast2500-evb.dts | 11 + arch/arm/boot/dts/aspeed-bmc-facebook-minipack.dts | 429 ++++++++++ .../arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts | 272 +++++- arch/arm/boot/dts/aspeed-bmc-facebook-wedge100.dts | 149 ++++ arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts | 141 ++++ arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts | 4 +- arch/arm/boot/dts/aspeed-bmc-lenovo-hr855xg2.dts | 663 +++++++++++++++ arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts | 918 +++++++++++++++++++++ arch/arm/boot/dts/aspeed-bmc-opp-swift.dts | 4 +- arch/arm/boot/dts/aspeed-g4.dtsi | 28 + arch/arm/boot/dts/aspeed-g5.dtsi | 33 + arch/arm/configs/aspeed_g4_defconfig | 50 +- arch/arm/configs/aspeed_g5_defconfig | 57 +- 14 files changed, 2696 insertions(+), 68 deletions(-) create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-minipack.dts create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-wedge100.dts create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts create mode 100644 arch/arm/boot/dts/aspeed-bmc-lenovo-hr855xg2.dts create mode 100755 arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts Merging at91/at91-next (90fbe456b5f0 Merge branch 'at91-dt' into at91-next) $ git merge at91/at91-next Merge made by the 'recursive' strategy. arch/arm/boot/dts/at91sam9261ek.dts | 2 +- arch/arm/boot/dts/at91sam9263ek.dts | 2 +- arch/arm/boot/dts/at91sam9m10g45ek.dts | 2 +- arch/arm/boot/dts/at91sam9rlek.dts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) Merging bcm2835/for-next (c165c01bb6f7 Merge branch 'bcm2835-dt-next' into for-next) $ git merge bcm2835/for-next Auto-merging arch/arm64/configs/defconfig Auto-merging arch/arm/configs/multi_v7_defconfig Merge made by the 'recursive' strategy. arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 14 ++++++++++++++ arch/arm/boot/dts/bcm2835-rpi-a.dts | 14 ++++++++++++++ arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 14 ++++++++++++++ arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 14 ++++++++++++++ arch/arm/boot/dts/bcm2835-rpi-b.dts | 14 ++++++++++++++ arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts | 9 +++++++++ arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi | 5 +++++ arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 14 ++++++++++++++ arch/arm/boot/dts/bcm2835-rpi-zero.dts | 14 ++++++++++++++ arch/arm/boot/dts/bcm2835-rpi.dtsi | 23 ----------------------- arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 10 ++++++++++ arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts | 3 +++ arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 3 +++ arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 3 +++ arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts | 9 +++++++++ arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi | 1 + arch/arm/boot/dts/bcm283x.dtsi | 6 +++--- arch/arm/configs/bcm2835_defconfig | 9 +++++++++ arch/arm/configs/multi_v7_defconfig | 2 ++ arch/arm64/configs/defconfig | 2 ++ 20 files changed, 157 insertions(+), 26 deletions(-) Merging imx-mxs/for-next (da9e97dce800 Merge branch 'imx/defconfig' into for-next) $ git merge imx-mxs/for-next Auto-merging arch/arm64/configs/defconfig Auto-merging arch/arm/configs/imx_v6_v7_defconfig Auto-merging arch/arm/boot/dts/Makefile Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/arm/fsl.yaml | 10 + Documentation/devicetree/bindings/bus/imx-weim.txt | 4 + .../devicetree/bindings/clock/imx8mn-clock.yaml | 112 +++ .../devicetree/bindings/serial/fsl-lpuart.txt | 5 +- .../devicetree/bindings/vendor-prefixes.yaml | 2 + arch/arm/boot/dts/Makefile | 6 +- arch/arm/boot/dts/ep7211-edb7211.dts | 2 +- .../imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts | 2 +- .../imx25-eukrea-mbimxsd25-baseboard-dvi-svga.dts | 2 +- .../imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dts | 2 +- arch/arm/boot/dts/imx25-pdk.dts | 2 +- arch/arm/boot/dts/imx27-apf27dev.dts | 2 +- .../boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts | 2 +- arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts | 2 +- arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 2 +- arch/arm/boot/dts/imx53-m53menlo.dts | 3 +- arch/arm/boot/dts/imx6qdl-colibri.dtsi | 11 + arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 2 - arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 73 +- arch/arm/boot/dts/imx6qdl.dtsi | 4 +- arch/arm/boot/dts/imx6sl.dtsi | 18 +- arch/arm/boot/dts/imx6sll.dtsi | 24 +- arch/arm/boot/dts/imx6sx.dtsi | 22 +- arch/arm/boot/dts/imx6ul-opos6uldev.dts | 37 +- ...-pcl063.dtsi => imx6ul-phytec-phycore-som.dtsi} | 53 +- ...ull.dts => imx6ul-phytec-segin-ff-rdk-nand.dts} | 42 +- ...1.dtsi => imx6ul-phytec-segin-peb-eval-01.dtsi} | 16 +- ...hyboard-segin.dtsi => imx6ul-phytec-segin.dtsi} | 31 +- arch/arm/boot/dts/imx6ul.dtsi | 53 +- arch/arm/boot/dts/imx6ull-phytec-phycore-som.dtsi | 24 + .../boot/dts/imx6ull-phytec-segin-ff-rdk-emmc.dts | 93 +++ .../boot/dts/imx6ull-phytec-segin-ff-rdk-nand.dts | 93 +++ .../boot/dts/imx6ull-phytec-segin-lc-rdk-nand.dts | 45 ++ .../boot/dts/imx6ull-phytec-segin-peb-eval-01.dtsi | 19 + arch/arm/boot/dts/imx6ull-phytec-segin.dtsi | 38 ++ arch/arm/boot/dts/imx7-colibri.dtsi | 86 ++- arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 6 +- arch/arm/boot/dts/imx7d-zii-rmu2.dts | 357 ++++++++++ arch/arm/boot/dts/imx7d-zii-rpu2.dts | 4 - arch/arm/boot/dts/imx7d.dtsi | 4 +- arch/arm/boot/dts/imx7s.dtsi | 6 +- arch/arm/boot/dts/imx7ulp.dtsi | 36 +- arch/arm/boot/dts/vf610-zii-cfu1.dts | 19 + arch/arm/boot/dts/vf610-zii-scu4-aib.dts | 10 +- arch/arm/boot/dts/vf610-zii-spb4.dts | 7 - arch/arm/configs/imx_v6_v7_defconfig | 1 + arch/arm/mach-imx/anatop.c | 25 - arch/arm/mach-imx/common.h | 1 - arch/arm/mach-imx/mach-imx6q.c | 1 - arch/arm/mach-imx/mach-imx6sl.c | 1 - arch/arm/mach-imx/mach-imx6sx.c | 1 - arch/arm/mach-imx/mach-imx6ul.c | 1 - arch/arm/mach-imx/mach-imx7d.c | 7 - arch/arm64/Kconfig.platforms | 1 + arch/arm64/boot/dts/freescale/Makefile | 4 + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 4 +- arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 8 + arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 13 + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 151 +++- arch/arm64/boot/dts/freescale/fsl-ls1046a-frwy.dts | 155 +++++ arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 17 +- arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 5 + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 21 +- arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 68 +- arch/arm64/boot/dts/freescale/imx8mm.dtsi | 61 +- arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts | 348 ++++++++++ arch/arm64/boot/dts/freescale/imx8mn.dtsi | 758 +++++++++++++++++++++ arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 6 +- .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 4 + arch/arm64/boot/dts/freescale/imx8mq-pico-pi.dts | 413 +++++++++++ .../arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 46 +- arch/arm64/boot/dts/freescale/imx8mq.dtsi | 43 +- arch/arm64/boot/dts/freescale/imx8qxp-ai_ml.dts | 249 +++++++ arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 4 + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 55 +- arch/arm64/configs/defconfig | 7 + drivers/bus/imx-weim.c | 24 +- drivers/clk/imx/Kconfig | 6 + drivers/clk/imx/Makefile | 1 + drivers/clk/imx/clk-imx7ulp.c | 31 + drivers/clk/imx/clk-imx8mm.c | 109 +-- drivers/clk/imx/clk-imx8mn.c | 660 ++++++++++++++++++ drivers/clk/imx/clk-imx8mq.c | 131 ++-- drivers/clk/imx/clk-imx8qxp-lpcg.c | 5 + drivers/clk/imx/clk.c | 8 + drivers/clk/imx/clk.h | 43 +- drivers/firmware/imx/Kconfig | 11 + drivers/firmware/imx/Makefile | 1 + drivers/firmware/imx/imx-dsp.c | 155 +++++ drivers/firmware/imx/scu-pd.c | 4 +- drivers/soc/imx/soc-imx-scu.c | 39 ++ drivers/soc/imx/soc-imx8.c | 45 ++ include/dt-bindings/clock/imx8-clock.h | 6 +- include/dt-bindings/clock/imx8mn-clock.h | 216 ++++++ include/linux/firmware/imx/dsp.h | 67 ++ 95 files changed, 4991 insertions(+), 443 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/imx8mn-clock.yaml rename arch/arm/boot/dts/{imx6ul-phytec-pcl063.dtsi => imx6ul-phytec-phycore-som.dtsi} (71%) rename arch/arm/boot/dts/{imx6ul-phytec-phyboard-segin-full.dts => imx6ul-phytec-segin-ff-rdk-nand.dts} (51%) rename arch/arm/boot/dts/{imx6ul-phytec-peb-eval-01.dtsi => imx6ul-phytec-segin-peb-eval-01.dtsi} (84%) rename arch/arm/boot/dts/{imx6ul-phytec-phyboard-segin.dtsi => imx6ul-phytec-segin.dtsi} (91%) create mode 100644 arch/arm/boot/dts/imx6ull-phytec-phycore-som.dtsi create mode 100644 arch/arm/boot/dts/imx6ull-phytec-segin-ff-rdk-emmc.dts create mode 100644 arch/arm/boot/dts/imx6ull-phytec-segin-ff-rdk-nand.dts create mode 100644 arch/arm/boot/dts/imx6ull-phytec-segin-lc-rdk-nand.dts create mode 100644 arch/arm/boot/dts/imx6ull-phytec-segin-peb-eval-01.dtsi create mode 100644 arch/arm/boot/dts/imx6ull-phytec-segin.dtsi create mode 100644 arch/arm/boot/dts/imx7d-zii-rmu2.dts create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1046a-frwy.dts create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts create mode 100644 arch/arm64/boot/dts/freescale/imx8mn.dtsi create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-pico-pi.dts create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp-ai_ml.dts create mode 100644 drivers/clk/imx/clk-imx8mn.c create mode 100644 drivers/firmware/imx/imx-dsp.c create mode 100644 include/dt-bindings/clock/imx8mn-clock.h create mode 100644 include/linux/firmware/imx/dsp.h Merging keystone/next (78145dbeaea1 Merge branch 'for_5.3/driver-soc' 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 (e1b0b32a5ad6 Merge branch 'mvebu/dt64' into mvebu/for-next) $ git merge mvebu/for-next Already up to date! Merge made by the 'recursive' strategy. Merging omap/for-next (29baae1e8b9d Merge branch 'omap-for-v5.4/dt' into for-next) $ git merge omap/for-next Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 2 + arch/arm/boot/dts/am335x-boneblue.dts | 92 +---------------------------------- arch/arm/boot/dts/am335x-cm-t335.dts | 1 - arch/arm/boot/dts/omap3-gta04.dtsi | 4 ++ arch/arm/boot/dts/omap3-n950-n9.dtsi | 1 - drivers/bus/ti-sysc.c | 56 +++++++++------------ include/dt-bindings/bus/ti-sysc.h | 1 + include/linux/platform_data/ti-sysc.h | 7 ++- 8 files changed, 37 insertions(+), 127 deletions(-) Merging qcom/for-next (c4b551a05362 Merge branches 'arm64-for-5.4' and 'drivers-for-5.3' into for-next) $ git merge qcom/for-next Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml Merge made by the 'recursive' strategy. Documentation/ABI/testing/sysfs-devices-soc | 7 + Documentation/devicetree/bindings/arm/qcom.yaml | 8 + .../devicetree/bindings/vendor-prefixes.yaml | 2 + arch/arm64/boot/dts/qcom/Makefile | 6 + .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 228 +++++++ .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 236 +++++++ .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts | 10 + .../boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 10 + arch/arm64/boot/dts/qcom/msm8996.dtsi | 544 +++++++++++++++- .../boot/dts/qcom/msm8998-asus-novago-tp370ql.dts | 47 ++ arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi | 240 +++++++ arch/arm64/boot/dts/qcom/msm8998-hp-envy-x2.dts | 30 + .../boot/dts/qcom/msm8998-lenovo-miix-630.dts | 30 + arch/arm64/boot/dts/qcom/msm8998.dtsi | 689 +++++++++++++++++---- arch/arm64/boot/dts/qcom/pm8998.dtsi | 2 +- arch/arm64/boot/dts/qcom/pms405.dtsi | 16 +- arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 7 +- arch/arm64/boot/dts/qcom/qcs404.dtsi | 60 +- arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 12 +- arch/arm64/boot/dts/qcom/sdm845.dtsi | 562 +++++++++++++++-- drivers/base/soc.c | 9 + drivers/firmware/qcom_scm.c | 47 +- drivers/soc/qcom/Kconfig | 8 + drivers/soc/qcom/Makefile | 1 + drivers/soc/qcom/qcom_aoss.c | 131 ++++ drivers/soc/qcom/smem.c | 9 + drivers/soc/qcom/socinfo.c | 476 ++++++++++++++ include/linux/qcom_scm.h | 9 +- include/linux/sys_soc.h | 1 + 29 files changed, 3201 insertions(+), 236 deletions(-) create mode 100644 arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts create mode 100644 arch/arm64/boot/dts/qcom/msm8998-asus-novago-tp370ql.dts create mode 100644 arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi create mode 100644 arch/arm64/boot/dts/qcom/msm8998-hp-envy-x2.dts create mode 100644 arch/arm64/boot/dts/qcom/msm8998-lenovo-miix-630.dts create mode 100644 drivers/soc/qcom/socinfo.c Merging renesas/next (45f5d5a9e34d arm64: dts: renesas: r8a77995: draak: Fix backlight regulator name) $ git merge renesas/next Merge made by the 'recursive' strategy. arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Merging renesas-geert/next (51131a633b7f Merge branches 'renesas-arm-dt-for-v5.4', 'renesas-arm-soc-for-v5.4', 'renesas-arm64-dt-for-v5.4' and 'renesas-dt-bindings-for-v5.4' into renesas-next) $ git merge renesas-geert/next Auto-merging arch/arm/Kconfig.debug Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. .../{renesas,rcar-csi2.txt => renesas,csi2.txt} | 0 .../media/{rcar_imr.txt => renesas,imr.txt} | 0 .../media/{rcar_vin.txt => renesas,vin.txt} | 0 ...sas-memory-controllers.txt => renesas,dbsc.txt} | 0 .../devicetree/bindings/net/can/rcar_can.txt | 6 +- .../devicetree/bindings/net/can/rcar_canfd.txt | 14 +- MAINTAINERS | 4 +- arch/arm/Kconfig.debug | 20 +- arch/arm/boot/dts/r8a77470.dtsi | 7 + arch/arm/boot/dts/r8a7779.dtsi | 4 +- arch/arm/include/debug/renesas-scif.S | 6 +- arch/arm64/boot/dts/renesas/hihope-common.dtsi | 47 +++++ arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 174 ++++++++--------- arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts | 37 ++-- arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 96 ++++----- arch/arm64/boot/dts/renesas/r8a7795.dtsi | 2 +- arch/arm64/boot/dts/renesas/r8a7796.dtsi | 152 +++++++-------- .../arm64/boot/dts/renesas/r8a77965-salvator-x.dts | 28 +++ .../boot/dts/renesas/r8a77965-salvator-xs.dts | 28 +++ arch/arm64/boot/dts/renesas/r8a77965.dtsi | 2 +- arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 58 +++--- arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 116 +++++------ arch/arm64/boot/dts/renesas/r8a77970.dtsi | 6 +- arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 42 ++-- arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts | 12 +- arch/arm64/boot/dts/renesas/r8a77980.dtsi | 4 +- arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 216 +++++++++++---------- arch/arm64/boot/dts/renesas/r8a77990.dtsi | 46 ++--- arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 18 +- arch/arm64/boot/dts/renesas/r8a77995.dtsi | 78 ++++---- drivers/soc/renesas/rcar-sysc.c | 5 +- 31 files changed, 695 insertions(+), 533 deletions(-) rename Documentation/devicetree/bindings/media/{renesas,rcar-csi2.txt => renesas,csi2.txt} (100%) rename Documentation/devicetree/bindings/media/{rcar_imr.txt => renesas,imr.txt} (100%) rename Documentation/devicetree/bindings/media/{rcar_vin.txt => renesas,vin.txt} (100%) rename Documentation/devicetree/bindings/memory-controllers/{renesas-memory-controllers.txt => renesas,dbsc.txt} (100%) Merging reset/reset/next (ea651ffd4f7f reset: Add DesignWare IP support to simple reset) $ git merge reset/reset/next Already up to date. Merging rockchip/for-next (6350a4960285 Merge branch 'v5.4-armsoc/dts64' into for-next) $ git merge rockchip/for-next Auto-merging arch/arm/boot/dts/Makefile Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml Merge made by the 'recursive' strategy. .../devicetree/bindings/arm/rockchip.yaml | 40 ++ .../devicetree/bindings/vendor-prefixes.yaml | 4 + arch/arm/boot/dts/Makefile | 3 + arch/arm/boot/dts/rk3036.dtsi | 2 +- arch/arm/boot/dts/rk3229-xms6.dts | 283 +++++++++ arch/arm/boot/dts/rk3288-evb.dtsi | 2 +- arch/arm/boot/dts/rk3288-tinker.dtsi | 12 +- arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 101 +--- arch/arm/boot/dts/rk3288-veyron-edp.dtsi | 172 ++++++ arch/arm/boot/dts/rk3288-veyron-fievel.dts | 522 +++++++++++++++++ arch/arm/boot/dts/rk3288-veyron-jaq.dts | 55 -- arch/arm/boot/dts/rk3288-veyron-jerry.dts | 207 +++++-- arch/arm/boot/dts/rk3288-veyron-minnie.dts | 66 +-- arch/arm/boot/dts/rk3288-veyron-pinky.dts | 17 + arch/arm/boot/dts/rk3288-veyron-speedy.dts | 58 -- arch/arm/boot/dts/rk3288-veyron-tiger.dts | 118 ++++ arch/arm/boot/dts/rk3288-veyron.dtsi | 4 + arch/arm64/boot/dts/rockchip/Makefile | 1 + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 11 +- arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 14 + arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts | 645 +++++++++++++++++++++ arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 21 + drivers/clk/rockchip/clk-rv1108.c | 1 - 23 files changed, 2018 insertions(+), 341 deletions(-) create mode 100644 arch/arm/boot/dts/rk3229-xms6.dts create mode 100644 arch/arm/boot/dts/rk3288-veyron-edp.dtsi create mode 100644 arch/arm/boot/dts/rk3288-veyron-fievel.dts create mode 100644 arch/arm/boot/dts/rk3288-veyron-tiger.dts create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts Merging samsung-krzk/for-next (d2cf56ef3887 Merge branch 'next/soc' into for-next) $ git merge samsung-krzk/for-next Removing include/linux/usb/samsung_usb_phy.h Auto-merging arch/arm64/Kconfig.platforms Merge made by the 'recursive' strategy. arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi | 18 ++-- arch/arm/boot/dts/exynos5250.dtsi | 1 + arch/arm/boot/dts/exynos5420.dtsi | 13 ++- arch/arm/boot/dts/exynos5800.dtsi | 9 ++ arch/arm/configs/exynos_defconfig | 5 +- arch/arm/mach-exynos/Kconfig | 1 + arch/arm/mach-s3c64xx/setup-usb-phy.c | 5 ++ arch/arm/plat-samsung/include/plat/gpio-core.h | 1 + arch/arm/plat-samsung/include/plat/usb-phy.h | 2 - arch/arm64/Kconfig.platforms | 1 + drivers/soc/samsung/Kconfig | 5 ++ drivers/soc/samsung/Makefile | 2 + drivers/soc/samsung/exynos-chipid.c | 107 ++++++++++++++++++++++++ include/linux/soc/samsung/exynos-chipid.h | 52 ++++++++++++ include/linux/usb/samsung_usb_phy.h | 17 ---- 15 files changed, 207 insertions(+), 32 deletions(-) create mode 100644 drivers/soc/samsung/exynos-chipid.c create mode 100644 include/linux/soc/samsung/exynos-chipid.h delete mode 100644 include/linux/usb/samsung_usb_phy.h Merging scmi/for-linux-next (d1abaeb3be7b Linux 5.3-rc5) $ git merge scmi/for-linux-next Already up to date. Merging sunxi/sunxi/for-next (2a85689ae6e6 Merge branch 'sunxi/clk-for-5.4' into sunxi/for-next) $ git merge sunxi/sunxi/for-next Auto-merging arch/arm64/configs/defconfig Auto-merging arch/arm/boot/dts/Makefile Auto-merging MAINTAINERS Removing Documentation/devicetree/bindings/mfd/sun4i-gpadc.txt Auto-merging Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-ccu.yaml Auto-merging .mailmap Merge made by the 'recursive' strategy. .mailmap | 2 + Documentation/devicetree/bindings/arm/sunxi.yaml | 11 + .../bindings/clock/allwinner,sun4i-a10-ccu.yaml | 1 + .../bindings/i2c/marvell,mv64xxx-i2c.yaml | 3 + .../bindings/iio/adc/allwinner,sun8i-a33-ths.yaml | 43 ++++ .../bindings/mfd/allwinner,sun4i-a10-ts.yaml | 76 +++++++ .../devicetree/bindings/mfd/sun4i-gpadc.txt | 59 ----- MAINTAINERS | 10 +- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/sun4i-a10-a1000.dts | 2 +- arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 2 +- arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 2 +- arch/arm/boot/dts/sun4i-a10-hackberry.dts | 2 +- .../boot/dts/sun4i-a10-itead-iteaduino-plus.dts | 2 +- arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 2 +- arch/arm/boot/dts/sun4i-a10-marsboard.dts | 2 +- arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 2 +- arch/arm/boot/dts/sun4i-a10-pcduino.dts | 2 +- arch/arm/boot/dts/sun4i-a10.dtsi | 7 +- arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 2 +- arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 2 +- arch/arm/boot/dts/sun5i-a13-q8-tablet.dts | 2 +- arch/arm/boot/dts/sun5i.dtsi | 7 +- arch/arm/boot/dts/sun6i-a31-colombus.dts | 12 +- arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 18 +- arch/arm/boot/dts/sun6i-a31-i7.dts | 12 +- arch/arm/boot/dts/sun6i-a31-m9.dts | 12 +- arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts | 12 +- arch/arm/boot/dts/sun6i-a31.dtsi | 13 +- arch/arm/boot/dts/sun6i-a31s-cs908.dts | 11 +- arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 12 +- arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 18 +- arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 12 +- arch/arm/boot/dts/sun7i-a20-bananapi.dts | 12 +- arch/arm/boot/dts/sun7i-a20-bananapro.dts | 12 +- arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 12 +- arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 12 +- arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 21 +- arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 12 +- arch/arm/boot/dts/sun7i-a20-icnova-swac.dts | 12 +- arch/arm/boot/dts/sun7i-a20-itead-ibox.dts | 4 +- arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 2 - arch/arm/boot/dts/sun7i-a20-m3.dts | 12 +- arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 12 +- arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts | 20 +- arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 12 +- arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 12 +- arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 12 +- arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 12 +- arch/arm/boot/dts/sun7i-a20-orangepi.dts | 12 +- arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 12 +- arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 12 +- arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 12 +- arch/arm/boot/dts/sun7i-a20.dtsi | 8 +- arch/arm/boot/dts/sun8i-a23-a33.dtsi | 2 +- arch/arm/boot/dts/sun8i-a23-q8-tablet.dts | 2 +- arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts | 25 +++ arch/arm/boot/dts/sun8i-a83t.dtsi | 14 +- arch/arm/boot/dts/sun8i-r40.dtsi | 10 +- arch/arm/boot/dts/sun8i-s3-lichee-zero-plus.dts | 53 +++++ arch/arm/boot/dts/sun8i-v3.dtsi | 14 ++ arch/arm/boot/dts/sun8i-v3s.dtsi | 13 +- arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 12 +- arch/arm/boot/dts/sun9i-a80-optimus.dts | 4 +- arch/arm/boot/dts/sun9i-a80.dtsi | 10 +- arch/arm/boot/dts/sunxi-h3-h5.dtsi | 14 +- arch/arm64/boot/dts/allwinner/Makefile | 1 + .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 11 + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 4 + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 28 ++- .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 27 +++ .../boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 26 +++ .../boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 4 + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 4 + .../boot/dts/allwinner/sun50i-h6-tanix-tx6.dts | 100 +++++++++ arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 103 ++++++++- arch/arm64/configs/defconfig | 2 + drivers/bus/sunxi-rsb.c | 4 +- drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 8 +- drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 250 ++++++++++++++++++++- drivers/clk/sunxi-ng/ccu-sun8i-v3s.h | 6 +- include/dt-bindings/clock/sun8i-v3s-ccu.h | 4 + include/dt-bindings/reset/sun8i-v3s-ccu.h | 3 + 83 files changed, 1086 insertions(+), 295 deletions(-) create mode 100644 Documentation/devicetree/bindings/iio/adc/allwinner,sun8i-a33-ths.yaml create mode 100644 Documentation/devicetree/bindings/mfd/allwinner,sun4i-a10-ts.yaml delete mode 100644 Documentation/devicetree/bindings/mfd/sun4i-gpadc.txt create mode 100644 arch/arm/boot/dts/sun8i-s3-lichee-zero-plus.dts create mode 100644 arch/arm/boot/dts/sun8i-v3.dtsi create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts Merging tegra/for-next (6290ae1fb7e2 Merge branch for-5.4/firmware into for-next) $ git merge tegra/for-next Merge made by the 'recursive' strategy. drivers/firmware/tegra/bpmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Merging clk/clk-next (4c1fc2c811fb Merge branch 'clk-doc' into clk-next) $ git merge clk/clk-next Merge made by the 'recursive' strategy. .../arm/marvell/ap806-system-controller.txt | 31 +- .../devicetree/bindings/clock/qcom,gcc.txt | 21 + drivers/clk/actions/owl-common.c | 5 +- drivers/clk/clk-aspeed.c | 11 +- drivers/clk/clk-composite.c | 1 - drivers/clk/clk-lochnagar.c | 2 +- drivers/clk/clk-milbeaut.c | 2 +- drivers/clk/clk-qoriq.c | 2 +- drivers/clk/clk-si5341.c | 1 - drivers/clk/clk.c | 74 +- drivers/clk/davinci/pll.c | 5 +- drivers/clk/ingenic/jz4725b-cgu.c | 2 +- drivers/clk/ingenic/jz4740-cgu.c | 11 +- drivers/clk/ingenic/jz4770-cgu.c | 2 +- drivers/clk/ingenic/jz4780-cgu.c | 2 +- drivers/clk/mediatek/clk-mt8183.c | 16 +- drivers/clk/mediatek/clk-mtk.h | 3 + drivers/clk/mediatek/reset.c | 56 +- drivers/clk/meson/axg-audio.c | 7 +- drivers/clk/mvebu/Kconfig | 8 + drivers/clk/mvebu/Makefile | 2 + drivers/clk/mvebu/ap-cpu-clk.c | 259 ++ drivers/clk/mvebu/ap806-system-controller.c | 24 +- drivers/clk/mvebu/armada_ap_cp_helper.c | 30 + drivers/clk/mvebu/armada_ap_cp_helper.h | 11 + drivers/clk/mvebu/cp110-system-controller.c | 32 +- drivers/clk/qcom/Kconfig | 9 +- drivers/clk/qcom/Makefile | 1 + drivers/clk/qcom/clk-alpha-pll.c | 236 +- drivers/clk/qcom/clk-alpha-pll.h | 7 + drivers/clk/qcom/clk-rcg2.c | 8 +- drivers/clk/qcom/clk-rpmh.c | 4 +- drivers/clk/qcom/common.c | 20 + drivers/clk/qcom/common.h | 2 + drivers/clk/qcom/gcc-qcs404.c | 30 + drivers/clk/qcom/gcc-sm8150.c | 3588 ++++++++++++++++++++ drivers/clk/qcom/lpasscc-sdm845.c | 23 +- drivers/clk/sirf/clk-common.c | 12 +- drivers/clk/socfpga/clk-gate.c | 24 +- drivers/clk/socfpga/clk-periph-a10.c | 7 +- drivers/clk/sprd/common.c | 5 +- drivers/clk/st/clk-flexgen.c | 1 + drivers/clk/sunxi-ng/ccu_common.c | 5 +- drivers/clk/ti/apll.c | 9 +- drivers/clk/ti/clk-814x.c | 1 + drivers/clk/ti/dpll.c | 9 +- drivers/clk/versatile/clk-versatile.c | 1 + drivers/clk/zte/clk-zx296718.c | 109 +- drivers/phy/ti/phy-am654-serdes.c | 4 +- drivers/rtc/rtc-sun6i.c | 2 +- include/dt-bindings/clock/qcom,gcc-qcs404.h | 3 + include/dt-bindings/clock/qcom,gcc-sm8150.h | 243 ++ .../dt-bindings/reset-controller/mt8183-resets.h | 81 + include/linux/clk-provider.h | 3 +- include/linux/clk.h | 17 +- 55 files changed, 4854 insertions(+), 230 deletions(-) create mode 100644 drivers/clk/mvebu/ap-cpu-clk.c create mode 100644 drivers/clk/mvebu/armada_ap_cp_helper.c create mode 100644 drivers/clk/mvebu/armada_ap_cp_helper.h create mode 100644 drivers/clk/qcom/gcc-sm8150.c create mode 100644 include/dt-bindings/clock/qcom,gcc-sm8150.h create mode 100644 include/dt-bindings/reset-controller/mt8183-resets.h Merging clk-samsung/for-next (a188339ca5a3 Linux 5.2-rc1) $ git merge clk-samsung/for-next Already up to date. 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 (0d746003164b csky: Fixup 610 vipt cache flush mechanism) $ git merge csky/linux-next Merge made by the 'recursive' strategy. arch/csky/abiv1/alignment.c | 62 +++++++++++++++++++++-------- arch/csky/abiv1/cacheflush.c | 70 ++++++++++++++++++++++----------- arch/csky/abiv1/inc/abi/cacheflush.h | 43 ++++++++++++++------ arch/csky/abiv1/inc/abi/page.h | 5 ++- arch/csky/abiv1/mmap.c | 75 ++++++++++++++++++----------------- arch/csky/include/asm/barrier.h | 15 ++++--- arch/csky/include/asm/cache.h | 1 + arch/csky/include/asm/io.h | 23 +++++------ arch/csky/include/asm/pgtable.h | 10 +++++ arch/csky/mm/cachev1.c | 7 +++- arch/csky/mm/cachev2.c | 11 +++++- arch/csky/mm/dma-mapping.c | 76 +++++++++++++----------------------- arch/csky/mm/ioremap.c | 27 ++++++++----- 13 files changed, 257 insertions(+), 168 deletions(-) Merging h8300/h8300-next (a5de8865cb3e h8300: move definition of __kernel_size_t etc. to posix_types.h) $ git merge h8300/h8300-next Removing arch/h8300/include/uapi/asm/bitsperlong.h Auto-merging arch/h8300/Kconfig Merge made by the 'recursive' strategy. arch/h8300/Kconfig | 3 +++ arch/h8300/include/uapi/asm/bitsperlong.h | 15 --------------- arch/h8300/include/uapi/asm/posix_types.h | 13 +++++++++++++ arch/h8300/lib/memset.S | 17 ++++++++++------- 4 files changed, 26 insertions(+), 22 deletions(-) delete mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h create mode 100644 arch/h8300/include/uapi/asm/posix_types.h Merging ia64/next (0d3d343560ba genirq: remove the is_affinity_mask_valid hook) $ git merge ia64/next Removing include/linux/ioc4.h Removing drivers/tty/serial/sn_console.c Removing drivers/tty/serial/ioc4_serial.c Removing drivers/tty/serial/ioc3_serial.c Auto-merging drivers/tty/serial/Kconfig Removing drivers/sn/ioc3.c Removing drivers/sn/Makefile Removing drivers/sn/Kconfig Removing drivers/pci/hotplug/sgi_hotplug.c Removing drivers/misc/sgi-xp/xpc_sn2.c Removing drivers/misc/sgi-xp/xp_sn2.c Removing drivers/misc/sgi-xp/xp_nofault.S Removing drivers/misc/ioc4.c Auto-merging drivers/misc/Kconfig Removing drivers/ide/sgiioc4.c Removing drivers/char/snsc_event.c Removing drivers/char/snsc.h Removing drivers/char/snsc.c Removing drivers/char/mbcs.h Removing drivers/char/mbcs.c Removing drivers/char/agp/sgi-agp.c Removing arch/ia64/uv/kernel/machvec.c Removing arch/ia64/sn/pci/tioce_provider.c Removing arch/ia64/sn/pci/tioca_provider.c Removing arch/ia64/sn/pci/pcibr/pcibr_reg.c Removing arch/ia64/sn/pci/pcibr/pcibr_provider.c Removing arch/ia64/sn/pci/pcibr/pcibr_dma.c Removing arch/ia64/sn/pci/pcibr/pcibr_ate.c Removing arch/ia64/sn/pci/pcibr/Makefile Removing arch/ia64/sn/pci/pci_dma.c Removing arch/ia64/sn/pci/Makefile Removing arch/ia64/sn/kernel/tiocx.c Removing arch/ia64/sn/kernel/sn2/timer_interrupt.c Removing arch/ia64/sn/kernel/sn2/timer.c Removing arch/ia64/sn/kernel/sn2/sn_proc_fs.c Removing arch/ia64/sn/kernel/sn2/sn_hwperf.c Removing arch/ia64/sn/kernel/sn2/sn2_smp.c Removing arch/ia64/sn/kernel/sn2/ptc_deadlock.S Removing arch/ia64/sn/kernel/sn2/prominfo_proc.c Removing arch/ia64/sn/kernel/sn2/io.c Removing arch/ia64/sn/kernel/sn2/cache.c Removing arch/ia64/sn/kernel/sn2/Makefile Removing arch/ia64/sn/kernel/setup.c Removing arch/ia64/sn/kernel/pio_phys.S Removing arch/ia64/sn/kernel/msi_sn.c Removing arch/ia64/sn/kernel/mca.c Removing arch/ia64/sn/kernel/machvec.c Removing arch/ia64/sn/kernel/klconflib.c Removing arch/ia64/sn/kernel/irq.c Removing arch/ia64/sn/kernel/iomv.c Removing arch/ia64/sn/kernel/io_init.c Removing arch/ia64/sn/kernel/io_common.c Removing arch/ia64/sn/kernel/io_acpi_init.c Removing arch/ia64/sn/kernel/idle.c Removing arch/ia64/sn/kernel/huberror.c Removing arch/ia64/sn/kernel/bte_error.c Removing arch/ia64/sn/kernel/bte.c Removing arch/ia64/sn/kernel/Makefile Removing arch/ia64/sn/include/xtalk/xwidgetdev.h Removing arch/ia64/sn/include/xtalk/xbow.h Removing arch/ia64/sn/include/xtalk/hubdev.h Removing arch/ia64/sn/include/tio.h Removing arch/ia64/sn/include/ioerror.h Removing arch/ia64/sn/Makefile Removing arch/ia64/kernel/machvec.c Removing arch/ia64/include/asm/sn/types.h Removing arch/ia64/include/asm/sn/tiocx.h Removing arch/ia64/include/asm/sn/tiocp.h Removing arch/ia64/include/asm/sn/tioce_provider.h Removing arch/ia64/include/asm/sn/tioce.h Removing arch/ia64/include/asm/sn/tioca_provider.h Removing arch/ia64/include/asm/sn/tioca.h Removing arch/ia64/include/asm/sn/sn_feature_sets.h Removing arch/ia64/include/asm/sn/sn_cpuid.h Removing arch/ia64/include/asm/sn/sn2/sn_hwperf.h Removing arch/ia64/include/asm/sn/simulator.h Removing arch/ia64/include/asm/sn/shubio.h Removing arch/ia64/include/asm/sn/shub_mmr.h Removing arch/ia64/include/asm/sn/rw_mmr.h Removing arch/ia64/include/asm/sn/pic.h Removing arch/ia64/include/asm/sn/pda.h Removing arch/ia64/include/asm/sn/pcidev.h Removing arch/ia64/include/asm/sn/pcibus_provider_defs.h Removing arch/ia64/include/asm/sn/pcibr_provider.h Removing arch/ia64/include/asm/sn/nodepda.h Removing arch/ia64/include/asm/sn/mspec.h Removing arch/ia64/include/asm/sn/module.h Removing arch/ia64/include/asm/sn/leds.h Removing arch/ia64/include/asm/sn/l1.h Removing arch/ia64/include/asm/sn/klconfig.h Removing arch/ia64/include/asm/sn/ioc3.h Removing arch/ia64/include/asm/sn/io.h Removing arch/ia64/include/asm/sn/geo.h Removing arch/ia64/include/asm/sn/clksupport.h Removing arch/ia64/include/asm/sn/bte.h Removing arch/ia64/include/asm/sn/arch.h Removing arch/ia64/include/asm/sn/addrs.h Removing arch/ia64/include/asm/sn/acpi.h Removing arch/ia64/include/asm/machvec_uv.h Removing arch/ia64/include/asm/machvec_sn2.h Removing arch/ia64/include/asm/machvec_init.h Removing arch/ia64/include/asm/machvec_hpzx1_swiotlb.h Removing arch/ia64/include/asm/machvec_hpzx1.h Removing arch/ia64/include/asm/machvec_hpsim.h Removing arch/ia64/include/asm/machvec_dig_vtd.h Removing arch/ia64/include/asm/machvec_dig.h Removing arch/ia64/include/asm/machvec.h Removing arch/ia64/include/asm/hpsim.h Removing arch/ia64/hp/zx1/hpzx1_swiotlb_machvec.c Removing arch/ia64/hp/zx1/hpzx1_machvec.c Removing arch/ia64/hp/zx1/Makefile Removing arch/ia64/hp/sim/simserial.c Removing arch/ia64/hp/sim/simscsi.c Removing arch/ia64/hp/sim/simeth.c Removing arch/ia64/hp/sim/hpsim_ssc.h Removing arch/ia64/hp/sim/hpsim_setup.c Removing arch/ia64/hp/sim/hpsim_machvec.c Removing arch/ia64/hp/sim/hpsim_irq.c Removing arch/ia64/hp/sim/hpsim_console.c Removing arch/ia64/hp/sim/hpsim.S Removing arch/ia64/hp/sim/boot/ssc.h Removing arch/ia64/hp/sim/boot/fw-emu.c Removing arch/ia64/hp/sim/boot/bootloader.lds Removing arch/ia64/hp/sim/boot/bootloader.c Removing arch/ia64/hp/sim/boot/boot_head.S Removing arch/ia64/hp/sim/boot/Makefile Removing arch/ia64/hp/sim/Makefile Removing arch/ia64/hp/sim/Kconfig Removing arch/ia64/hp/common/hwsw_iommu.c Removing arch/ia64/dig/setup.c Removing arch/ia64/dig/machvec_vtd.c Removing arch/ia64/dig/machvec.c Removing arch/ia64/dig/Makefile Removing arch/ia64/configs/sim_defconfig Auto-merging arch/ia64/Makefile Auto-merging MAINTAINERS Removing Documentation/driver-api/sgi-ioc4.rst Auto-merging Documentation/admin-guide/kernel-parameters.txt Merge made by the 'recursive' strategy. Documentation/admin-guide/kernel-parameters.txt | 2 +- Documentation/driver-api/sgi-ioc4.rst | 49 - MAINTAINERS | 6 - arch/ia64/Kconfig | 141 +- arch/ia64/Kconfig.debug | 2 +- arch/ia64/Makefile | 36 +- arch/ia64/configs/bigsur_defconfig | 1 - arch/ia64/configs/generic_defconfig | 8 - arch/ia64/configs/gensparse_defconfig | 10 - arch/ia64/configs/sim_defconfig | 52 - arch/ia64/configs/tiger_defconfig | 1 - arch/ia64/configs/zx1_defconfig | 1 - arch/ia64/dig/Makefile | 15 - arch/ia64/dig/machvec.c | 3 - arch/ia64/dig/machvec_vtd.c | 3 - arch/ia64/dig/setup.c | 71 - arch/ia64/hp/common/Makefile | 4 +- arch/ia64/hp/common/hwsw_iommu.c | 60 - arch/ia64/hp/common/sba_iommu.c | 105 +- arch/ia64/hp/sim/Kconfig | 23 - arch/ia64/hp/sim/Makefile | 17 - arch/ia64/hp/sim/boot/Makefile | 37 - arch/ia64/hp/sim/boot/boot_head.S | 165 -- arch/ia64/hp/sim/boot/bootloader.c | 175 -- arch/ia64/hp/sim/boot/bootloader.lds | 67 - arch/ia64/hp/sim/boot/fw-emu.c | 374 --- arch/ia64/hp/sim/boot/ssc.h | 36 - arch/ia64/hp/sim/hpsim.S | 11 - arch/ia64/hp/sim/hpsim_console.c | 77 - arch/ia64/hp/sim/hpsim_irq.c | 76 - arch/ia64/hp/sim/hpsim_machvec.c | 3 - arch/ia64/hp/sim/hpsim_setup.c | 41 - arch/ia64/hp/sim/hpsim_ssc.h | 37 - arch/ia64/hp/sim/simeth.c | 510 ---- arch/ia64/hp/sim/simscsi.c | 373 --- arch/ia64/hp/sim/simserial.c | 521 ---- arch/ia64/hp/zx1/Makefile | 9 - arch/ia64/hp/zx1/hpzx1_machvec.c | 3 - arch/ia64/hp/zx1/hpzx1_swiotlb_machvec.c | 3 - arch/ia64/include/asm/acpi.h | 28 +- arch/ia64/include/asm/dma-mapping.h | 8 +- arch/ia64/include/asm/dma.h | 6 +- arch/ia64/include/asm/hpsim.h | 17 - arch/ia64/include/asm/hw_irq.h | 27 +- arch/ia64/include/asm/io.h | 222 +- arch/ia64/include/asm/iommu.h | 1 - arch/ia64/include/asm/iosapic.h | 12 - arch/ia64/include/asm/irq.h | 3 - arch/ia64/include/asm/machvec.h | 347 --- arch/ia64/include/asm/machvec_dig.h | 17 - arch/ia64/include/asm/machvec_dig_vtd.h | 19 - arch/ia64/include/asm/machvec_hpsim.h | 19 - arch/ia64/include/asm/machvec_hpzx1.h | 19 - arch/ia64/include/asm/machvec_hpzx1_swiotlb.h | 20 - arch/ia64/include/asm/machvec_init.h | 35 - arch/ia64/include/asm/machvec_sn2.h | 114 - arch/ia64/include/asm/machvec_uv.h | 26 - arch/ia64/include/asm/mmiowb.h | 12 +- arch/ia64/include/asm/mmzone.h | 13 +- arch/ia64/include/asm/pci.h | 9 +- arch/ia64/include/asm/processor.h | 2 - arch/ia64/include/asm/sn/acpi.h | 15 - arch/ia64/include/asm/sn/addrs.h | 299 -- arch/ia64/include/asm/sn/arch.h | 86 - arch/ia64/include/asm/sn/bte.h | 236 -- arch/ia64/include/asm/sn/clksupport.h | 28 - arch/ia64/include/asm/sn/geo.h | 132 - arch/ia64/include/asm/sn/intr.h | 53 - arch/ia64/include/asm/sn/io.h | 274 -- arch/ia64/include/asm/sn/ioc3.h | 242 -- arch/ia64/include/asm/sn/klconfig.h | 246 -- arch/ia64/include/asm/sn/l1.h | 51 - arch/ia64/include/asm/sn/leds.h | 33 - arch/ia64/include/asm/sn/module.h | 127 - arch/ia64/include/asm/sn/mspec.h | 59 - arch/ia64/include/asm/sn/nodepda.h | 82 - arch/ia64/include/asm/sn/pcibr_provider.h | 150 - arch/ia64/include/asm/sn/pcibus_provider_defs.h | 68 - arch/ia64/include/asm/sn/pcidev.h | 85 - arch/ia64/include/asm/sn/pda.h | 68 - arch/ia64/include/asm/sn/pic.h | 261 -- arch/ia64/include/asm/sn/rw_mmr.h | 28 - arch/ia64/include/asm/sn/shub_mmr.h | 502 ---- arch/ia64/include/asm/sn/shubio.h | 3358 ----------------------- arch/ia64/include/asm/sn/simulator.h | 25 - arch/ia64/include/asm/sn/sn2/sn_hwperf.h | 242 -- arch/ia64/include/asm/sn/sn_cpuid.h | 132 - arch/ia64/include/asm/sn/sn_feature_sets.h | 58 - arch/ia64/include/asm/sn/sn_sal.h | 1111 +------- arch/ia64/include/asm/sn/tioca.h | 596 ---- arch/ia64/include/asm/sn/tioca_provider.h | 207 -- arch/ia64/include/asm/sn/tioce.h | 760 ----- arch/ia64/include/asm/sn/tioce_provider.h | 63 - arch/ia64/include/asm/sn/tiocp.h | 257 -- arch/ia64/include/asm/sn/tiocx.h | 72 - arch/ia64/include/asm/sn/types.h | 26 - arch/ia64/include/asm/switch_to.h | 1 - arch/ia64/include/asm/tlb.h | 1 - arch/ia64/include/asm/uv/uv.h | 23 +- arch/ia64/kernel/Makefile | 9 +- arch/ia64/kernel/acpi.c | 81 +- arch/ia64/kernel/dma-mapping.c | 14 - arch/ia64/kernel/iosapic.c | 8 +- arch/ia64/kernel/irq.c | 23 - arch/ia64/kernel/irq_ia64.c | 11 +- arch/ia64/kernel/kprobes.c | 26 - arch/ia64/kernel/machine_kexec.c | 1 - arch/ia64/kernel/machvec.c | 77 - arch/ia64/kernel/mca.c | 29 +- arch/ia64/kernel/mca_drv.c | 1 - arch/ia64/kernel/module.c | 8 +- arch/ia64/kernel/msi_ia64.c | 21 +- arch/ia64/kernel/pci-dma.c | 22 - arch/ia64/kernel/sal.c | 9 +- arch/ia64/kernel/setup.c | 96 +- arch/ia64/kernel/signal.c | 10 +- arch/ia64/kernel/smp.c | 9 +- arch/ia64/kernel/smpboot.c | 9 +- arch/ia64/kernel/sys_ia64.c | 18 - arch/ia64/kernel/time.c | 3 - arch/ia64/kernel/topology.c | 4 - arch/ia64/kernel/unaligned.c | 6 +- arch/ia64/kernel/uncached.c | 6 +- arch/ia64/kernel/vmlinux.lds.S | 10 - arch/ia64/lib/io.c | 114 - arch/ia64/mm/discontig.c | 3 +- arch/ia64/mm/init.c | 19 +- arch/ia64/mm/tlb.c | 6 +- arch/ia64/pci/fixup.c | 6 +- arch/ia64/pci/pci.c | 14 +- arch/ia64/sn/Makefile | 12 - arch/ia64/sn/include/ioerror.h | 81 - arch/ia64/sn/include/tio.h | 41 - arch/ia64/sn/include/xtalk/hubdev.h | 91 - arch/ia64/sn/include/xtalk/xbow.h | 301 -- arch/ia64/sn/include/xtalk/xwidgetdev.h | 70 - arch/ia64/sn/kernel/Makefile | 18 - arch/ia64/sn/kernel/bte.c | 475 ---- arch/ia64/sn/kernel/bte_error.c | 255 -- arch/ia64/sn/kernel/huberror.c | 220 -- arch/ia64/sn/kernel/idle.c | 30 - arch/ia64/sn/kernel/io_acpi_init.c | 513 ---- arch/ia64/sn/kernel/io_common.c | 561 ---- arch/ia64/sn/kernel/io_init.c | 308 --- arch/ia64/sn/kernel/iomv.c | 82 - arch/ia64/sn/kernel/irq.c | 489 ---- arch/ia64/sn/kernel/klconflib.c | 107 - arch/ia64/sn/kernel/machvec.c | 11 - arch/ia64/sn/kernel/mca.c | 144 - arch/ia64/sn/kernel/msi_sn.c | 238 -- arch/ia64/sn/kernel/pio_phys.S | 71 - arch/ia64/sn/kernel/setup.c | 786 ------ arch/ia64/sn/kernel/sn2/Makefile | 13 - arch/ia64/sn/kernel/sn2/cache.c | 41 - arch/ia64/sn/kernel/sn2/io.c | 101 - arch/ia64/sn/kernel/sn2/prominfo_proc.c | 207 -- arch/ia64/sn/kernel/sn2/ptc_deadlock.S | 92 - arch/ia64/sn/kernel/sn2/sn2_smp.c | 577 ---- arch/ia64/sn/kernel/sn2/sn_hwperf.c | 1004 ------- arch/ia64/sn/kernel/sn2/sn_proc_fs.c | 69 - arch/ia64/sn/kernel/sn2/timer.c | 61 - arch/ia64/sn/kernel/sn2/timer_interrupt.c | 60 - arch/ia64/sn/kernel/tiocx.c | 569 ---- arch/ia64/sn/pci/Makefile | 10 - arch/ia64/sn/pci/pci_dma.c | 446 --- arch/ia64/sn/pci/pcibr/Makefile | 13 - arch/ia64/sn/pci/pcibr/pcibr_ate.c | 177 -- arch/ia64/sn/pci/pcibr/pcibr_dma.c | 413 --- arch/ia64/sn/pci/pcibr/pcibr_provider.c | 265 -- arch/ia64/sn/pci/pcibr/pcibr_reg.c | 285 -- arch/ia64/sn/pci/tioca_provider.c | 677 ----- arch/ia64/sn/pci/tioce_provider.c | 1062 ------- arch/ia64/uv/kernel/Makefile | 1 - arch/ia64/uv/kernel/machvec.c | 11 - arch/ia64/uv/kernel/setup.c | 74 +- arch/mips/configs/bigsur_defconfig | 1 - arch/mips/configs/ip32_defconfig | 1 - arch/mips/configs/markeins_defconfig | 1 - arch/mips/configs/rm200_defconfig | 1 - arch/mips/configs/sb1250_swarm_defconfig | 1 - drivers/Kconfig | 2 - drivers/Makefile | 1 - drivers/acpi/Kconfig | 2 +- drivers/char/Kconfig | 22 - drivers/char/Makefile | 2 - drivers/char/agp/Kconfig | 11 +- drivers/char/agp/Makefile | 1 - drivers/char/agp/sgi-agp.c | 338 --- drivers/char/mbcs.c | 831 ------ drivers/char/mbcs.h | 553 ---- drivers/char/mspec.c | 155 +- drivers/char/snsc.c | 469 ---- drivers/char/snsc.h | 92 - drivers/char/snsc_event.c | 303 -- drivers/ide/Kconfig | 9 - drivers/ide/Makefile | 1 - drivers/ide/sgiioc4.c | 630 ----- drivers/iommu/Kconfig | 2 +- drivers/misc/Kconfig | 17 +- drivers/misc/Makefile | 1 - drivers/misc/ioc4.c | 498 ---- drivers/misc/sgi-xp/Makefile | 13 +- drivers/misc/sgi-xp/xp.h | 19 - drivers/misc/sgi-xp/xp_main.c | 8 +- drivers/misc/sgi-xp/xp_nofault.S | 35 - drivers/misc/sgi-xp/xp_sn2.c | 190 -- drivers/misc/sgi-xp/xp_uv.c | 9 +- drivers/misc/sgi-xp/xpc.h | 273 -- drivers/misc/sgi-xp/xpc_main.c | 31 +- drivers/misc/sgi-xp/xpc_partition.c | 5 - drivers/misc/sgi-xp/xpc_sn2.c | 2459 ----------------- drivers/misc/sgi-xp/xpc_uv.c | 16 +- drivers/misc/sgi-xp/xpnet.c | 2 +- drivers/pci/hotplug/Kconfig | 9 - drivers/pci/hotplug/Makefile | 1 - drivers/pci/hotplug/sgi_hotplug.c | 700 ----- drivers/scsi/qla1280.c | 37 - drivers/scsi/qla1280.h | 3 - drivers/scsi/qla2xxx/qla_init.c | 14 - drivers/sn/Kconfig | 22 - drivers/sn/Makefile | 7 - drivers/sn/ioc3.c | 844 ------ drivers/tty/serial/Kconfig | 27 - drivers/tty/serial/Makefile | 3 - drivers/tty/serial/ioc3_serial.c | 2195 --------------- drivers/tty/serial/ioc4_serial.c | 2955 -------------------- drivers/tty/serial/sn_console.c | 1036 ------- include/linux/ioc4.h | 184 -- include/linux/pci_ids.h | 1 - kernel/fork.c | 2 + kernel/irq/proc.c | 14 - 231 files changed, 349 insertions(+), 40676 deletions(-) delete mode 100644 Documentation/driver-api/sgi-ioc4.rst delete mode 100644 arch/ia64/configs/sim_defconfig delete mode 100644 arch/ia64/dig/Makefile delete mode 100644 arch/ia64/dig/machvec.c delete mode 100644 arch/ia64/dig/machvec_vtd.c delete mode 100644 arch/ia64/dig/setup.c delete mode 100644 arch/ia64/hp/common/hwsw_iommu.c delete mode 100644 arch/ia64/hp/sim/Kconfig delete mode 100644 arch/ia64/hp/sim/Makefile delete mode 100644 arch/ia64/hp/sim/boot/Makefile delete mode 100644 arch/ia64/hp/sim/boot/boot_head.S delete mode 100644 arch/ia64/hp/sim/boot/bootloader.c delete mode 100644 arch/ia64/hp/sim/boot/bootloader.lds delete mode 100644 arch/ia64/hp/sim/boot/fw-emu.c delete mode 100644 arch/ia64/hp/sim/boot/ssc.h delete mode 100644 arch/ia64/hp/sim/hpsim.S delete mode 100644 arch/ia64/hp/sim/hpsim_console.c delete mode 100644 arch/ia64/hp/sim/hpsim_irq.c delete mode 100644 arch/ia64/hp/sim/hpsim_machvec.c delete mode 100644 arch/ia64/hp/sim/hpsim_setup.c delete mode 100644 arch/ia64/hp/sim/hpsim_ssc.h delete mode 100644 arch/ia64/hp/sim/simeth.c delete mode 100644 arch/ia64/hp/sim/simscsi.c delete mode 100644 arch/ia64/hp/sim/simserial.c delete mode 100644 arch/ia64/hp/zx1/Makefile delete mode 100644 arch/ia64/hp/zx1/hpzx1_machvec.c delete mode 100644 arch/ia64/hp/zx1/hpzx1_swiotlb_machvec.c delete mode 100644 arch/ia64/include/asm/hpsim.h delete mode 100644 arch/ia64/include/asm/machvec.h delete mode 100644 arch/ia64/include/asm/machvec_dig.h delete mode 100644 arch/ia64/include/asm/machvec_dig_vtd.h delete mode 100644 arch/ia64/include/asm/machvec_hpsim.h delete mode 100644 arch/ia64/include/asm/machvec_hpzx1.h delete mode 100644 arch/ia64/include/asm/machvec_hpzx1_swiotlb.h delete mode 100644 arch/ia64/include/asm/machvec_init.h delete mode 100644 arch/ia64/include/asm/machvec_sn2.h delete mode 100644 arch/ia64/include/asm/machvec_uv.h delete mode 100644 arch/ia64/include/asm/sn/acpi.h delete mode 100644 arch/ia64/include/asm/sn/addrs.h delete mode 100644 arch/ia64/include/asm/sn/arch.h delete mode 100644 arch/ia64/include/asm/sn/bte.h delete mode 100644 arch/ia64/include/asm/sn/clksupport.h delete mode 100644 arch/ia64/include/asm/sn/geo.h delete mode 100644 arch/ia64/include/asm/sn/io.h delete mode 100644 arch/ia64/include/asm/sn/ioc3.h delete mode 100644 arch/ia64/include/asm/sn/klconfig.h delete mode 100644 arch/ia64/include/asm/sn/l1.h delete mode 100644 arch/ia64/include/asm/sn/leds.h delete mode 100644 arch/ia64/include/asm/sn/module.h delete mode 100644 arch/ia64/include/asm/sn/mspec.h delete mode 100644 arch/ia64/include/asm/sn/nodepda.h delete mode 100644 arch/ia64/include/asm/sn/pcibr_provider.h delete mode 100644 arch/ia64/include/asm/sn/pcibus_provider_defs.h delete mode 100644 arch/ia64/include/asm/sn/pcidev.h delete mode 100644 arch/ia64/include/asm/sn/pda.h delete mode 100644 arch/ia64/include/asm/sn/pic.h delete mode 100644 arch/ia64/include/asm/sn/rw_mmr.h delete mode 100644 arch/ia64/include/asm/sn/shub_mmr.h delete mode 100644 arch/ia64/include/asm/sn/shubio.h delete mode 100644 arch/ia64/include/asm/sn/simulator.h delete mode 100644 arch/ia64/include/asm/sn/sn2/sn_hwperf.h delete mode 100644 arch/ia64/include/asm/sn/sn_cpuid.h delete mode 100644 arch/ia64/include/asm/sn/sn_feature_sets.h delete mode 100644 arch/ia64/include/asm/sn/tioca.h delete mode 100644 arch/ia64/include/asm/sn/tioca_provider.h delete mode 100644 arch/ia64/include/asm/sn/tioce.h delete mode 100644 arch/ia64/include/asm/sn/tioce_provider.h delete mode 100644 arch/ia64/include/asm/sn/tiocp.h delete mode 100644 arch/ia64/include/asm/sn/tiocx.h delete mode 100644 arch/ia64/include/asm/sn/types.h delete mode 100644 arch/ia64/kernel/machvec.c delete mode 100644 arch/ia64/sn/Makefile delete mode 100644 arch/ia64/sn/include/ioerror.h delete mode 100644 arch/ia64/sn/include/tio.h delete mode 100644 arch/ia64/sn/include/xtalk/hubdev.h delete mode 100644 arch/ia64/sn/include/xtalk/xbow.h delete mode 100644 arch/ia64/sn/include/xtalk/xwidgetdev.h delete mode 100644 arch/ia64/sn/kernel/Makefile delete mode 100644 arch/ia64/sn/kernel/bte.c delete mode 100644 arch/ia64/sn/kernel/bte_error.c delete mode 100644 arch/ia64/sn/kernel/huberror.c delete mode 100644 arch/ia64/sn/kernel/idle.c delete mode 100644 arch/ia64/sn/kernel/io_acpi_init.c delete mode 100644 arch/ia64/sn/kernel/io_common.c delete mode 100644 arch/ia64/sn/kernel/io_init.c delete mode 100644 arch/ia64/sn/kernel/iomv.c delete mode 100644 arch/ia64/sn/kernel/irq.c delete mode 100644 arch/ia64/sn/kernel/klconflib.c delete mode 100644 arch/ia64/sn/kernel/machvec.c delete mode 100644 arch/ia64/sn/kernel/mca.c delete mode 100644 arch/ia64/sn/kernel/msi_sn.c delete mode 100644 arch/ia64/sn/kernel/pio_phys.S delete mode 100644 arch/ia64/sn/kernel/setup.c delete mode 100644 arch/ia64/sn/kernel/sn2/Makefile delete mode 100644 arch/ia64/sn/kernel/sn2/cache.c delete mode 100644 arch/ia64/sn/kernel/sn2/io.c delete mode 100644 arch/ia64/sn/kernel/sn2/prominfo_proc.c delete mode 100644 arch/ia64/sn/kernel/sn2/ptc_deadlock.S delete mode 100644 arch/ia64/sn/kernel/sn2/sn2_smp.c delete mode 100644 arch/ia64/sn/kernel/sn2/sn_hwperf.c delete mode 100644 arch/ia64/sn/kernel/sn2/sn_proc_fs.c delete mode 100644 arch/ia64/sn/kernel/sn2/timer.c delete mode 100644 arch/ia64/sn/kernel/sn2/timer_interrupt.c delete mode 100644 arch/ia64/sn/kernel/tiocx.c delete mode 100644 arch/ia64/sn/pci/Makefile delete mode 100644 arch/ia64/sn/pci/pci_dma.c delete mode 100644 arch/ia64/sn/pci/pcibr/Makefile delete mode 100644 arch/ia64/sn/pci/pcibr/pcibr_ate.c delete mode 100644 arch/ia64/sn/pci/pcibr/pcibr_dma.c delete mode 100644 arch/ia64/sn/pci/pcibr/pcibr_provider.c delete mode 100644 arch/ia64/sn/pci/pcibr/pcibr_reg.c delete mode 100644 arch/ia64/sn/pci/tioca_provider.c delete mode 100644 arch/ia64/sn/pci/tioce_provider.c delete mode 100644 arch/ia64/uv/kernel/machvec.c delete mode 100644 drivers/char/agp/sgi-agp.c delete mode 100644 drivers/char/mbcs.c delete mode 100644 drivers/char/mbcs.h delete mode 100644 drivers/char/snsc.c delete mode 100644 drivers/char/snsc.h delete mode 100644 drivers/char/snsc_event.c delete mode 100644 drivers/ide/sgiioc4.c delete mode 100644 drivers/misc/ioc4.c delete mode 100644 drivers/misc/sgi-xp/xp_nofault.S delete mode 100644 drivers/misc/sgi-xp/xp_sn2.c delete mode 100644 drivers/misc/sgi-xp/xpc_sn2.c delete mode 100644 drivers/pci/hotplug/sgi_hotplug.c delete mode 100644 drivers/sn/Kconfig delete mode 100644 drivers/sn/Makefile delete mode 100644 drivers/sn/ioc3.c delete mode 100644 drivers/tty/serial/ioc3_serial.c delete mode 100644 drivers/tty/serial/ioc4_serial.c delete mode 100644 drivers/tty/serial/sn_console.c delete mode 100644 include/linux/ioc4.h Merging m68k/for-next (49ff824a028a m68k: defconfig: Update defconfigs for v5.3-rc2) $ git merge m68k/for-next Merge made by the 'recursive' strategy. arch/m68k/atari/config.c | 6 +- arch/m68k/configs/amiga_defconfig | 13 +++- arch/m68k/configs/apollo_defconfig | 13 +++- arch/m68k/configs/atari_defconfig | 13 +++- arch/m68k/configs/bvme6000_defconfig | 13 +++- arch/m68k/configs/hp300_defconfig | 13 +++- arch/m68k/configs/mac_defconfig | 13 +++- arch/m68k/configs/multi_defconfig | 13 +++- arch/m68k/configs/mvme147_defconfig | 13 +++- arch/m68k/configs/mvme16x_defconfig | 13 +++- arch/m68k/configs/q40_defconfig | 13 +++- arch/m68k/configs/sun3_defconfig | 13 +++- arch/m68k/configs/sun3x_defconfig | 13 +++- arch/m68k/include/asm/atarihw.h | 13 +--- arch/m68k/include/asm/io_mm.h | 6 +- arch/m68k/include/asm/macintosh.h | 11 +-- arch/m68k/mac/config.c | 128 +++++++++++++++++------------------ drivers/video/fbdev/atafb.c | 42 ++++++------ 18 files changed, 221 insertions(+), 141 deletions(-) Merging m68knommu/for-next (d1abaeb3be7b Linux 5.3-rc5) $ 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 (8084499bd7d4 irqchip/irq-ingenic-tcu: Fix COMPILE_TEST building) $ git merge mips/mips-next Removing sound/soc/jz4740/qi_lb60.c Removing drivers/video/fbdev/jz4740_fb.c Removing drivers/power/supply/jz4740-battery.c Removing drivers/mtd/nand/raw/ingenic/jz4740_nand.c Removing drivers/hwmon/jz4740-hwmon.c Removing drivers/dma/dma-jz4740.c Auto-merging drivers/dma/Kconfig Auto-merging drivers/clk/ingenic/jz4740-cgu.c Removing arch/mips/mm/tlb-r8k.c Removing arch/mips/jz4740/platform.c Removing arch/mips/jz4740/board-qi_lb60.c Auto-merging arch/mips/include/asm/vdso/vdso.h CONFLICT (content): Merge conflict in arch/mips/include/asm/vdso/vdso.h Removing arch/mips/include/asm/mach-jz4740/platform.h Removing arch/mips/include/asm/mach-jz4740/jz4740_mmc.h Removing arch/mips/include/asm/mach-jz4740/jz4740_fb.h Removing arch/mips/include/asm/mach-jz4740/gpio.h Auto-merging Documentation/index.rst CONFLICT (content): Merge conflict in Documentation/index.rst Removing Documentation/devicetree/bindings/watchdog/ingenic,jz4740-wdt.txt Removing Documentation/devicetree/bindings/pwm/ingenic,jz47xx-pwm.txt Resolved 'Documentation/index.rst' using previous resolution. Resolved 'arch/mips/include/asm/vdso/vdso.h' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit --no-edit -v -a [master af92273c5fc9] Merge remote-tracking branch 'mips/mips-next' $ git diff -M --stat --summary HEAD^.. .../devicetree/bindings/pwm/ingenic,jz47xx-pwm.txt | 22 - .../devicetree/bindings/timer/ingenic,tcu.txt | 137 ++++ .../bindings/watchdog/ingenic,jz4740-wdt.txt | 17 - Documentation/index.rst | 1 + Documentation/mips/index.rst | 11 + Documentation/mips/ingenic-tcu.rst | 71 +++ arch/mips/Kconfig | 60 +- arch/mips/Makefile | 4 - arch/mips/bcm47xx/board.c | 1 + arch/mips/bcm47xx/buttons.c | 10 + arch/mips/boot/dts/brcm/bcm3368.dtsi | 12 +- arch/mips/boot/dts/brcm/bcm63268.dtsi | 12 +- arch/mips/boot/dts/brcm/bcm6328.dtsi | 6 + arch/mips/boot/dts/brcm/bcm6358.dtsi | 12 +- arch/mips/boot/dts/brcm/bcm6362.dtsi | 12 +- arch/mips/boot/dts/brcm/bcm6368.dtsi | 12 +- arch/mips/boot/dts/ingenic/ci20.dts | 7 + arch/mips/boot/dts/ingenic/gcw0.dts | 10 + arch/mips/boot/dts/ingenic/jz4740.dtsi | 127 +++- arch/mips/boot/dts/ingenic/jz4770.dtsi | 21 + arch/mips/boot/dts/ingenic/jz4780.dtsi | 23 + arch/mips/boot/dts/ingenic/qi_lb60.dts | 325 ++++++++++ arch/mips/configs/qi_lb60_defconfig | 44 +- arch/mips/include/asm/addrspace.h | 9 - arch/mips/include/asm/bootinfo.h | 1 + arch/mips/include/asm/cpu-type.h | 15 +- arch/mips/include/asm/cpu.h | 15 +- arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h | 1 + .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 9 - arch/mips/include/asm/mach-cavium-octeon/war.h | 1 - arch/mips/include/asm/mach-generic/war.h | 1 - arch/mips/include/asm/mach-ip22/war.h | 1 - arch/mips/include/asm/mach-ip27/war.h | 1 - arch/mips/include/asm/mach-ip28/war.h | 1 - arch/mips/include/asm/mach-ip32/war.h | 1 - arch/mips/include/asm/mach-jz4740/gpio.h | 15 - arch/mips/include/asm/mach-jz4740/jz4740_fb.h | 58 -- arch/mips/include/asm/mach-jz4740/jz4740_mmc.h | 12 - arch/mips/include/asm/mach-jz4740/platform.h | 26 - arch/mips/include/asm/mach-malta/war.h | 1 - arch/mips/include/asm/mach-pmcs-msp71xx/war.h | 1 - arch/mips/include/asm/mach-rc32434/war.h | 1 - arch/mips/include/asm/mach-rm/war.h | 1 - arch/mips/include/asm/mach-sibyte/war.h | 1 - arch/mips/include/asm/mach-tx49xx/war.h | 1 - arch/mips/include/asm/mipsregs.h | 4 + arch/mips/include/asm/module.h | 6 - arch/mips/include/asm/octeon/octeon.h | 4 +- arch/mips/include/asm/pgtable-32.h | 58 +- arch/mips/include/asm/pgtable-bits.h | 9 +- arch/mips/include/asm/pgtable.h | 16 +- arch/mips/include/asm/syscall.h | 21 +- arch/mips/include/asm/vdso.h | 78 +-- arch/mips/include/asm/vdso/gettimeofday.h | 177 ++++++ arch/mips/{ => include/asm}/vdso/vdso.h | 17 +- arch/mips/include/asm/vdso/vsyscall.h | 43 ++ arch/mips/include/asm/war.h | 13 - arch/mips/jz4740/Makefile | 7 +- arch/mips/jz4740/board-qi_lb60.c | 523 ---------------- arch/mips/jz4740/platform.c | 250 -------- arch/mips/jz4740/prom.c | 5 - arch/mips/jz4740/setup.c | 7 +- arch/mips/jz4740/time.c | 151 +---- arch/mips/kernel/branch.c | 2 +- arch/mips/kernel/cpu-probe.c | 47 +- arch/mips/kernel/genex.S | 3 - arch/mips/kernel/idle.c | 3 +- arch/mips/kernel/scall32-o32.S | 2 +- arch/mips/kernel/scall64-n32.S | 2 +- arch/mips/kernel/scall64-n64.S | 2 +- arch/mips/kernel/scall64-o32.S | 2 +- arch/mips/kernel/syscalls/syscalltbl.sh | 4 +- arch/mips/kernel/vdso.c | 37 +- arch/mips/mm/Makefile | 1 - arch/mips/mm/c-r4k.c | 2 - arch/mips/mm/pgtable-32.c | 20 + arch/mips/mm/sc-mips.c | 27 +- arch/mips/mm/tlb-r8k.c | 239 ------- arch/mips/mm/tlbex.c | 10 +- arch/mips/vdso/Makefile | 41 +- arch/mips/vdso/config-n32-o32-env.c | 18 + arch/mips/vdso/elf.S | 2 +- arch/mips/vdso/sigreturn.S | 2 +- arch/mips/vdso/vdso.lds.S | 4 + arch/mips/vdso/vgettimeofday.c | 58 ++ drivers/clk/ingenic/Kconfig | 10 +- drivers/clk/ingenic/Makefile | 1 + drivers/clk/ingenic/jz4740-cgu.c | 6 + drivers/clk/ingenic/tcu.c | 474 ++++++++++++++ drivers/clocksource/Kconfig | 11 + drivers/clocksource/Makefile | 1 + drivers/clocksource/ingenic-timer.c | 356 +++++++++++ drivers/dma/Kconfig | 6 - drivers/dma/Makefile | 1 - drivers/dma/dma-jz4740.c | 623 ------------------- drivers/hwmon/Kconfig | 10 - drivers/hwmon/Makefile | 1 - drivers/hwmon/jz4740-hwmon.c | 135 ---- drivers/irqchip/Kconfig | 12 + drivers/irqchip/Makefile | 1 + drivers/irqchip/irq-ingenic-tcu.c | 182 ++++++ drivers/mfd/syscon.c | 46 +- drivers/mtd/nand/raw/ingenic/Kconfig | 7 - drivers/mtd/nand/raw/ingenic/Makefile | 1 - drivers/mtd/nand/raw/ingenic/jz4740_nand.c | 536 ---------------- drivers/power/supply/Kconfig | 11 - drivers/power/supply/Makefile | 1 - drivers/power/supply/jz4740-battery.c | 421 ------------- drivers/video/fbdev/Kconfig | 9 - drivers/video/fbdev/Makefile | 1 - drivers/video/fbdev/jz4740_fb.c | 690 --------------------- include/dt-bindings/clock/ingenic,tcu.h | 20 + include/dt-bindings/clock/jz4740-cgu.h | 1 + include/linux/mfd/syscon.h | 6 + sound/soc/jz4740/Kconfig | 25 +- sound/soc/jz4740/Makefile | 5 - sound/soc/jz4740/qi_lb60.c | 106 ---- 117 files changed, 2455 insertions(+), 4308 deletions(-) delete mode 100644 Documentation/devicetree/bindings/pwm/ingenic,jz47xx-pwm.txt create mode 100644 Documentation/devicetree/bindings/timer/ingenic,tcu.txt delete mode 100644 Documentation/devicetree/bindings/watchdog/ingenic,jz4740-wdt.txt create mode 100644 Documentation/mips/index.rst create mode 100644 Documentation/mips/ingenic-tcu.rst delete mode 100644 arch/mips/include/asm/mach-jz4740/gpio.h delete mode 100644 arch/mips/include/asm/mach-jz4740/jz4740_fb.h delete mode 100644 arch/mips/include/asm/mach-jz4740/jz4740_mmc.h delete mode 100644 arch/mips/include/asm/mach-jz4740/platform.h create mode 100644 arch/mips/include/asm/vdso/gettimeofday.h rename arch/mips/{ => include/asm}/vdso/vdso.h (76%) create mode 100644 arch/mips/include/asm/vdso/vsyscall.h delete mode 100644 arch/mips/jz4740/board-qi_lb60.c delete mode 100644 arch/mips/jz4740/platform.c delete mode 100644 arch/mips/mm/tlb-r8k.c create mode 100644 arch/mips/vdso/config-n32-o32-env.c create mode 100644 arch/mips/vdso/vgettimeofday.c create mode 100644 drivers/clk/ingenic/tcu.c create mode 100644 drivers/clocksource/ingenic-timer.c delete mode 100644 drivers/dma/dma-jz4740.c delete mode 100644 drivers/hwmon/jz4740-hwmon.c create mode 100644 drivers/irqchip/irq-ingenic-tcu.c delete mode 100644 drivers/mtd/nand/raw/ingenic/jz4740_nand.c delete mode 100644 drivers/power/supply/jz4740-battery.c delete mode 100644 drivers/video/fbdev/jz4740_fb.c create mode 100644 include/dt-bindings/clock/ingenic,tcu.h delete mode 100644 sound/soc/jz4740/qi_lb60.c Merging nds32/next (932296120543 nds32: add new emulations for floating point instruction) $ git merge nds32/next Already up to date. Merging nios2/for-next (f017da5c7077 nios2: configs: Remove useless UEVENT_HELPER_PATH) $ 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 (a5ff2130a4d9 parisc: speed up flush_tlb_all_local with qemu) $ git merge parisc-hd/for-next Removing arch/parisc/lib/memset.c Merge made by the 'recursive' strategy. .../features/core/jump-labels/arch-support.txt | 2 +- .../debug/kprobes-on-ftrace/arch-support.txt | 2 +- arch/parisc/Kconfig | 2 + arch/parisc/include/asm/alternative.h | 11 +- arch/parisc/include/asm/ftrace.h | 1 + arch/parisc/include/asm/string.h | 15 +++ arch/parisc/kernel/alternative.c | 23 +++- arch/parisc/kernel/entry.S | 99 +++++++++++++++ arch/parisc/kernel/ftrace.c | 64 +++++++++- arch/parisc/kernel/pacache.S | 9 ++ arch/parisc/kernel/parisc_ksyms.c | 4 + arch/parisc/kernel/traps.c | 2 + arch/parisc/lib/Makefile | 4 +- arch/parisc/lib/memset.c | 91 -------------- arch/parisc/lib/string.S | 136 +++++++++++++++++++++ 15 files changed, 359 insertions(+), 106 deletions(-) delete mode 100644 arch/parisc/lib/memset.c create mode 100644 arch/parisc/lib/string.S Merging powerpc/next (42ac26d253eb powerpc: add machine check safe copy_to_user) $ git merge powerpc/next Removing arch/powerpc/sysdev/scom.c Removing arch/powerpc/include/asm/scom.h Auto-merging arch/powerpc/Kconfig Merge made by the 'recursive' strategy. arch/powerpc/Kconfig | 5 +- arch/powerpc/configs/powernv_defconfig | 2 +- arch/powerpc/include/asm/book3s/64/pgtable.h | 6 +- arch/powerpc/include/asm/book3s/pgtable.h | 11 ++ arch/powerpc/include/asm/current.h | 3 +- arch/powerpc/include/asm/futex.h | 3 +- arch/powerpc/include/asm/hugetlb.h | 3 - arch/powerpc/include/asm/iommu.h | 7 +- arch/powerpc/include/asm/mce.h | 4 +- arch/powerpc/include/asm/nohash/pgtable.h | 13 ++ arch/powerpc/include/asm/page.h | 14 +- arch/powerpc/include/asm/page_32.h | 4 + arch/powerpc/include/asm/pgtable.h | 12 -- arch/powerpc/include/asm/plpar_wrappers.h | 6 + arch/powerpc/include/asm/scom.h | 154 --------------- arch/powerpc/include/asm/string.h | 2 + arch/powerpc/include/asm/uaccess.h | 14 ++ arch/powerpc/include/asm/xive.h | 10 + arch/powerpc/kernel/dma-iommu.c | 11 +- arch/powerpc/kernel/head_32.S | 6 +- arch/powerpc/kernel/hw_breakpoint.c | 60 +++--- arch/powerpc/kernel/iommu.c | 74 +++++--- arch/powerpc/kernel/mce.c | 31 ++- arch/powerpc/kernel/mce_power.c | 34 +++- arch/powerpc/kernel/misc_32.S | 5 + arch/powerpc/kernel/rtas.c | 15 +- arch/powerpc/kernel/setup-common.c | 8 +- arch/powerpc/kvm/book3s_hv_rmhandlers.S | 38 ++-- arch/powerpc/kvm/book3s_xive.c | 60 +++++- arch/powerpc/kvm/book3s_xive.h | 2 + arch/powerpc/kvm/book3s_xive_native.c | 18 +- arch/powerpc/lib/Makefile | 4 +- arch/powerpc/lib/memcpy_mcsafe_64.S | 242 ++++++++++++++++++++++++ arch/powerpc/mm/book3s32/mmu.c | 45 ++++- arch/powerpc/mm/book3s64/hash_utils.c | 67 ++++++- arch/powerpc/mm/book3s64/radix_pgtable.c | 6 +- arch/powerpc/mm/kasan/kasan_init_32.c | 23 ++- arch/powerpc/mm/mem.c | 62 +----- arch/powerpc/mm/mmu_decl.h | 6 +- arch/powerpc/mm/nohash/book3e_hugetlbpage.c | 16 +- arch/powerpc/mm/pgtable_32.c | 2 +- arch/powerpc/mm/ptdump/hashpagetable.c | 24 +-- arch/powerpc/mm/ptdump/ptdump.c | 28 ++- arch/powerpc/perf/imc-pmu.c | 29 +-- arch/powerpc/platforms/cell/iommu.c | 2 +- arch/powerpc/platforms/pasemi/iommu.c | 2 +- arch/powerpc/platforms/powernv/Kconfig | 5 +- arch/powerpc/platforms/powernv/Makefile | 2 +- arch/powerpc/platforms/powernv/opal-xscom.c | 213 ++++++++++++++------- arch/powerpc/platforms/powernv/opal.c | 11 +- arch/powerpc/platforms/powernv/pci-ioda-tce.c | 38 ++-- arch/powerpc/platforms/powernv/pci-ioda.c | 42 +++- arch/powerpc/platforms/powernv/pci.h | 2 +- arch/powerpc/platforms/pseries/hotplug-memory.c | 26 ++- arch/powerpc/platforms/pseries/iommu.c | 8 +- arch/powerpc/platforms/pseries/lpar.c | 8 +- arch/powerpc/platforms/pseries/mobility.c | 9 + arch/powerpc/platforms/pseries/vio.c | 2 +- arch/powerpc/sysdev/Kconfig | 7 - arch/powerpc/sysdev/Makefile | 2 - arch/powerpc/sysdev/dart_iommu.c | 2 +- arch/powerpc/sysdev/scom.c | 223 ---------------------- arch/powerpc/sysdev/xive/common.c | 96 +++++++--- arch/powerpc/sysdev/xive/native.c | 15 ++ arch/powerpc/sysdev/xive/spapr.c | 57 +++++- arch/powerpc/sysdev/xive/xive-internal.h | 2 + arch/powerpc/xmon/xmon.c | 50 +++-- drivers/pci/hotplug/rpaphp_core.c | 18 +- include/linux/extable.h | 2 + kernel/extable.c | 11 +- 70 files changed, 1235 insertions(+), 809 deletions(-) delete mode 100644 arch/powerpc/include/asm/scom.h create mode 100644 arch/powerpc/lib/memcpy_mcsafe_64.S delete mode 100644 arch/powerpc/sysdev/scom.c 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 (eadf0b17b43d bus: fsl-mc: remove explicit device_link_del) $ git merge soc-fsl/next Merge made by the 'recursive' strategy. drivers/bus/fsl-mc/fsl-mc-allocator.c | 1 - drivers/bus/fsl-mc/mc-io.c | 1 - drivers/soc/fsl/dpio/dpio-service.c | 2 - drivers/soc/fsl/guts.c | 6 +++ drivers/soc/fsl/qbman/bman.c | 17 +++---- drivers/soc/fsl/qbman/bman_ccsr.c | 36 ++++++++++++++- drivers/soc/fsl/qbman/bman_portal.c | 22 ++++++++-- drivers/soc/fsl/qbman/bman_priv.h | 5 +++ drivers/soc/fsl/qbman/dpaa_sys.c | 63 +++++++++++++++----------- drivers/soc/fsl/qbman/qman.c | 83 ++++++++++++++++++++++++++++------- drivers/soc/fsl/qbman/qman_ccsr.c | 68 +++++++++++++++++++++++++--- drivers/soc/fsl/qbman/qman_portal.c | 22 ++++++++-- drivers/soc/fsl/qbman/qman_priv.h | 8 ++++ 13 files changed, 263 insertions(+), 71 deletions(-) Merging risc-v/for-next (f51edcec5288 MAINTAINERS: Add an entry for generic architecture topology) $ 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 (416f79c23dbe s390/paes: Prepare paes functions for large key blobs) $ git merge s390/features Auto-merging arch/s390/mm/gmap.c Auto-merging arch/s390/kernel/setup.c Auto-merging arch/s390/kernel/head64.S Removing arch/s390/kernel/early_nobss.c Auto-merging arch/s390/include/asm/setup.h Auto-merging arch/s390/boot/ipl_parm.c Removing Documentation/s390/debugging390.rst Removing Documentation/s390/dasd.rst Merge made by the 'recursive' strategy. Documentation/s390/dasd.rst | 84 - Documentation/s390/debugging390.rst | 2613 ------------------------------- Documentation/s390/index.rst | 2 - arch/s390/Kconfig | 1 + arch/s390/boot/compressed/.gitignore | 3 - arch/s390/boot/compressed/vmlinux.lds.S | 3 +- arch/s390/boot/head.S | 24 +- arch/s390/boot/ipl_parm.c | 7 +- arch/s390/boot/startup.c | 6 + arch/s390/crypto/paes_s390.c | 184 ++- arch/s390/include/asm/gmap.h | 4 +- arch/s390/include/asm/pgtable.h | 1 + arch/s390/include/asm/pkey.h | 114 +- arch/s390/include/asm/setup.h | 1 + arch/s390/include/asm/string.h | 9 +- arch/s390/include/uapi/asm/pkey.h | 257 ++- arch/s390/kernel/Makefile | 13 +- arch/s390/kernel/early.c | 16 + arch/s390/kernel/early_nobss.c | 45 - arch/s390/kernel/head64.S | 8 +- arch/s390/kernel/process.c | 26 +- arch/s390/kernel/setup.c | 13 +- arch/s390/kernel/stacktrace.c | 50 +- arch/s390/lib/Makefile | 3 - arch/s390/mm/extmem.c | 11 +- arch/s390/mm/gmap.c | 10 +- arch/s390/pci/pci.c | 8 +- drivers/s390/char/Makefile | 3 - drivers/s390/crypto/Makefile | 2 +- drivers/s390/crypto/pkey_api.c | 1638 ++++++++----------- drivers/s390/crypto/zcrypt_api.c | 30 + drivers/s390/crypto/zcrypt_api.h | 7 +- drivers/s390/crypto/zcrypt_ccamisc.c | 1764 +++++++++++++++++++++ drivers/s390/crypto/zcrypt_ccamisc.h | 217 +++ drivers/s390/crypto/zcrypt_cex4.c | 106 +- 35 files changed, 3297 insertions(+), 3986 deletions(-) delete mode 100644 Documentation/s390/dasd.rst delete mode 100644 Documentation/s390/debugging390.rst delete mode 100644 arch/s390/kernel/early_nobss.c create mode 100644 drivers/s390/crypto/zcrypt_ccamisc.c create mode 100644 drivers/s390/crypto/zcrypt_ccamisc.h Merging sh/sh-next (baf58858e8b6 sh: prefer __section from compiler_attributes.h) $ git merge sh/sh-next Auto-merging arch/sh/kernel/hw_breakpoint.c CONFLICT (modify/delete): arch/sh/include/uapi/asm/types.h deleted in sh/sh-next and modified in HEAD. Version HEAD of arch/sh/include/uapi/asm/types.h left in tree. CONFLICT (modify/delete): arch/sh/include/uapi/asm/setup.h deleted in sh/sh-next and modified in HEAD. Version HEAD of arch/sh/include/uapi/asm/setup.h left in tree. Automatic merge failed; fix conflicts and then commit the result. $ git rm -f arch/sh/include/uapi/asm/setup.h arch/sh/include/uapi/asm/types.h arch/sh/include/uapi/asm/setup.h: needs merge arch/sh/include/uapi/asm/types.h: needs merge rm 'arch/sh/include/uapi/asm/setup.h' rm 'arch/sh/include/uapi/asm/types.h' $ git commit --no-edit -v -a [master 012c7463c7e2] Merge remote-tracking branch 'sh/sh-next' $ git diff -M --stat --summary HEAD^.. arch/sh/include/asm/bitops-op32.h | 8 +++----- arch/sh/include/asm/cache.h | 2 +- arch/sh/include/uapi/asm/setup.h | 2 -- arch/sh/include/uapi/asm/types.h | 2 -- arch/sh/kernel/Makefile | 2 -- 5 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 arch/sh/include/uapi/asm/setup.h delete mode 100644 arch/sh/include/uapi/asm/types.h 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 (b482e48d29f1 um: fix build without CONFIG_UML_TIME_TRAVEL_SUPPORT) $ git merge uml/linux-next Already up to date. Merging xtensa/xtensa-for-next (fa4b55813b1e Merge branch 'xtensa-5.3' into xtensa-for-next) $ git merge xtensa/xtensa-for-next Merge made by the 'recursive' strategy. arch/xtensa/kernel/setup.c | 9 +++------ arch/xtensa/mm/init.c | 10 ---------- 2 files changed, 3 insertions(+), 16 deletions(-) Merging fscrypt/master (ba13f2c8d7a0 fscrypt: document the new ioctls and policy version) $ git merge fscrypt/master Removing fs/crypto/keyinfo.c Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. Documentation/filesystems/fscrypt.rst | 755 +++++++++++++++++++++----- MAINTAINERS | 1 + fs/crypto/Kconfig | 2 + fs/crypto/Makefile | 10 +- fs/crypto/crypto.c | 45 +- fs/crypto/fname.c | 47 +- fs/crypto/fscrypt_private.h | 399 ++++++++++++-- fs/crypto/hkdf.c | 181 +++++++ fs/crypto/hooks.c | 6 +- fs/crypto/keyinfo.c | 611 --------------------- fs/crypto/keyring.c | 984 ++++++++++++++++++++++++++++++++++ fs/crypto/keysetup.c | 591 ++++++++++++++++++++ fs/crypto/keysetup_v1.c | 340 ++++++++++++ fs/crypto/policy.c | 434 +++++++++++---- fs/ext4/ioctl.c | 30 ++ fs/ext4/super.c | 3 + fs/f2fs/file.c | 58 ++ fs/f2fs/super.c | 2 + fs/super.c | 2 + fs/ubifs/ioctl.c | 20 + fs/ubifs/super.c | 11 + include/linux/fs.h | 1 + include/linux/fscrypt.h | 55 +- include/uapi/linux/fs.h | 54 +- include/uapi/linux/fscrypt.h | 181 +++++++ 25 files changed, 3823 insertions(+), 1000 deletions(-) create mode 100644 fs/crypto/hkdf.c delete mode 100644 fs/crypto/keyinfo.c create mode 100644 fs/crypto/keyring.c create mode 100644 fs/crypto/keysetup.c create mode 100644 fs/crypto/keysetup_v1.c create mode 100644 include/uapi/linux/fscrypt.h Merging afs/afs-next (986d1c7de75a afs: Fix possible oops in afs_lookup trace event) $ git merge afs/afs-next Merge made by the 'recursive' strategy. fs/afs/cell.c | 4 + fs/afs/dir.c | 57 ++++++++- fs/afs/fsclient.c | 6 +- fs/afs/internal.h | 1 + fs/afs/security.c | 108 +++++++++++++--- fs/afs/volume.c | 2 - fs/afs/yfsclient.c | 8 +- include/linux/key.h | 14 ++- include/trace/events/rxrpc.h | 62 +++++----- net/rxrpc/af_rxrpc.c | 3 - net/rxrpc/ar-internal.h | 19 ++- net/rxrpc/call_event.c | 8 +- net/rxrpc/call_object.c | 33 +++-- net/rxrpc/conn_client.c | 49 ++++++++ net/rxrpc/conn_event.c | 6 +- net/rxrpc/conn_object.c | 2 +- net/rxrpc/input.c | 285 ++++++++++++++++++++++--------------------- net/rxrpc/local_event.c | 4 +- net/rxrpc/local_object.c | 5 +- net/rxrpc/output.c | 6 +- net/rxrpc/peer_event.c | 10 +- net/rxrpc/protocol.h | 9 ++ net/rxrpc/recvmsg.c | 58 +++++---- net/rxrpc/rxkad.c | 32 ++--- net/rxrpc/sendmsg.c | 14 ++- net/rxrpc/skbuff.c | 72 +++++++++-- 26 files changed, 572 insertions(+), 305 deletions(-) Merging btrfs/next (29dcea88779c Linux 4.17) $ git merge btrfs/next Already up to date. Merging btrfs-kdave/for-next (a668d8d6543c Merge branch 'cleanup/sysfs-refactoring' into for-next-20190805) $ git merge btrfs-kdave/for-next Auto-merging fs/btrfs/volumes.c Auto-merging fs/btrfs/extent-tree.c CONFLICT (content): Merge conflict in fs/btrfs/extent-tree.c Auto-merging fs/btrfs/disk-io.c Removing fs/btrfs/dedupe.h Auto-merging fs/btrfs/ctree.h CONFLICT (content): Merge conflict in fs/btrfs/ctree.h Auto-merging fs/btrfs/ctree.c Resolved 'fs/btrfs/ctree.h' using previous resolution. Resolved 'fs/btrfs/extent-tree.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit --no-edit -v -a [master b3dec2178a28] Merge remote-tracking branch 'btrfs-kdave/for-next' $ git diff -M --stat --summary HEAD^.. fs/btrfs/Kconfig | 1 + fs/btrfs/Makefile | 2 +- fs/btrfs/async-thread.c | 8 +- fs/btrfs/block-group.c | 202 +++++++++ fs/btrfs/block-group.h | 186 ++++++++ fs/btrfs/check-integrity.c | 7 +- fs/btrfs/compression.c | 16 +- fs/btrfs/compression.h | 3 +- fs/btrfs/ctree.c | 76 +++- fs/btrfs/ctree.h | 223 ++-------- fs/btrfs/dedupe.h | 12 - fs/btrfs/delayed-inode.c | 13 +- fs/btrfs/disk-io.c | 81 ++-- fs/btrfs/extent-tree.c | 769 +++++++++++---------------------- fs/btrfs/extent_io.c | 97 +++-- fs/btrfs/extent_io.h | 6 +- fs/btrfs/extent_map.c | 2 + fs/btrfs/file.c | 437 ++++++++++++------- fs/btrfs/free-space-cache.c | 9 + fs/btrfs/free-space-cache.h | 10 +- fs/btrfs/free-space-tree.c | 1 + fs/btrfs/free-space-tree.h | 2 + fs/btrfs/inode-map.c | 30 +- fs/btrfs/inode.c | 408 +++++++++-------- fs/btrfs/ioctl.c | 420 +++++++----------- fs/btrfs/locking.c | 124 ++++-- fs/btrfs/locking.h | 22 +- fs/btrfs/qgroup.c | 48 +- fs/btrfs/reada.c | 1 + fs/btrfs/relocation.c | 3 +- fs/btrfs/scrub.c | 1 + fs/btrfs/space-info.c | 139 +++--- fs/btrfs/super.c | 34 +- fs/btrfs/sysfs.c | 280 ++++++++++-- fs/btrfs/sysfs.h | 83 +--- fs/btrfs/tests/btrfs-tests.c | 1 + fs/btrfs/tests/extent-io-tests.c | 31 +- fs/btrfs/tests/free-space-tests.c | 1 + fs/btrfs/tests/free-space-tree-tests.c | 1 + fs/btrfs/tests/inode-tests.c | 12 +- fs/btrfs/transaction.c | 1 + fs/btrfs/tree-checker.c | 433 +++++++++++++++++++ fs/btrfs/tree-log.c | 26 +- fs/btrfs/volumes.c | 307 +------------ fs/btrfs/volumes.h | 13 +- include/trace/events/btrfs.h | 3 +- include/uapi/linux/btrfs.h | 13 +- include/uapi/linux/btrfs_tree.h | 6 +- 48 files changed, 2580 insertions(+), 2024 deletions(-) create mode 100644 fs/btrfs/block-group.c create mode 100644 fs/btrfs/block-group.h delete mode 100644 fs/btrfs/dedupe.h $ git am -3 ../patches/0001-btrfs-merge-fix-up-for-Btrfs-fix-sysfs-warning-and-m.patch Applying: btrfs: merge fix up for "Btrfs: fix sysfs warning and missing raid sysfs directories" $ git reset HEAD^ Unstaged changes after reset: M fs/btrfs/sysfs.c $ git add -A . $ git commit -v -a --amend [master 25565db70f4d] Merge remote-tracking branch 'btrfs-kdave/for-next' Date: Thu Aug 22 09:41:57 2019 +1000 Merging ceph/master (d31d07b97a5e ceph: fix end offset in truncate_inode_pages_range call) $ git merge ceph/master Already up to date. Merging cifs/for-next (0c219f5799c7 cifs: set domainName when a domain-key is used in multiuser) $ git merge cifs/for-next Merge made by the 'recursive' strategy. fs/cifs/cifs_ioctl.h | 1 + fs/cifs/cifsacl.c | 79 +++++++++++++++++++++++++++++++++++++++++----------- fs/cifs/cifsproto.h | 1 + fs/cifs/cifssmb.c | 2 +- fs/cifs/connect.c | 24 +++++++++++++++- fs/cifs/file.c | 2 -- fs/cifs/inode.c | 19 ++++++++++--- fs/cifs/smb2ops.c | 31 +++++++++++++++++---- fs/cifs/smb2pdu.c | 63 +++++++++++++++++++++++++++-------------- fs/cifs/smb2pdu.h | 2 ++ fs/cifs/smb2proto.h | 4 +++ 11 files changed, 177 insertions(+), 51 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 (b4a81b87a4cf ecryptfs: fix a memory leak bug in ecryptfs_init_messaging()) $ git merge ecryptfs/next Merge made by the 'recursive' strategy. fs/ecryptfs/keystore.c | 2 +- fs/ecryptfs/messaging.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) Merging ext3/for_next (56db1991690f udf: prevent allocation beyond UDF partition) $ git merge ext3/for_next Merge made by the 'recursive' strategy. fs/ext2/balloc.c | 10 ++-- fs/ext2/xattr.c | 2 +- fs/quota/dquot.c | 4 +- fs/udf/balloc.c | 11 +++++ fs/udf/super.c | 138 +++++++++++++++++++++++++++++++------------------------ 5 files changed, 95 insertions(+), 70 deletions(-) Merging ext4/dev (7a14826ede1d ext4: set error return correctly when ext4_htree_store_dirent fails) $ git merge ext4/dev Auto-merging fs/ext4/ioctl.c CONFLICT (content): Merge conflict in fs/ext4/ioctl.c Resolved 'fs/ext4/ioctl.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit --no-edit -v -a [master cddbb4348722] Merge remote-tracking branch 'ext4/dev' $ git diff -M --stat --summary HEAD^.. fs/ext4/ext4.h | 38 ++++++++++++------- fs/ext4/extents.c | 94 ++++++++++++++++++++++++++++++++++++++++++---- fs/ext4/extents_status.c | 38 +++++++++++++++++++ fs/ext4/extents_status.h | 2 + fs/ext4/file.c | 2 - fs/ext4/inline.c | 2 +- fs/ext4/inode.c | 24 ++++++------ fs/ext4/ioctl.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++ fs/jbd2/revoke.c | 4 +- 9 files changed, 262 insertions(+), 40 deletions(-) Merging f2fs/dev (3f27158cb511 f2fs: support FS_IOC_{GET,SET}FSLABEL) $ git merge f2fs/dev Auto-merging include/uapi/linux/fs.h Auto-merging fs/f2fs/super.c Auto-merging fs/f2fs/file.c Merge made by the 'recursive' strategy. Documentation/ABI/testing/sysfs-fs-f2fs | 7 ++ Documentation/filesystems/f2fs.txt | 3 + fs/f2fs/Kconfig | 1 + fs/f2fs/data.c | 54 ++++++++++-- fs/f2fs/debug.c | 4 +- fs/f2fs/dir.c | 125 +++++++++++++++++++++++--- fs/f2fs/f2fs.h | 34 +++++-- fs/f2fs/file.c | 114 +++++++++++++++++++++--- fs/f2fs/gc.c | 25 +++++- fs/f2fs/hash.c | 37 +++++++- fs/f2fs/inline.c | 12 ++- fs/f2fs/inode.c | 9 +- fs/f2fs/namei.c | 26 ++++++ fs/f2fs/node.c | 2 +- fs/f2fs/segment.c | 33 ++++--- fs/f2fs/segment.h | 3 + fs/f2fs/super.c | 152 ++++++++++++++++++++++++++++++-- fs/f2fs/sysfs.c | 23 +++++ fs/f2fs/xattr.c | 7 ++ include/linux/f2fs_fs.h | 10 ++- include/uapi/linux/fs.h | 1 + tools/include/uapi/linux/fs.h | 1 + 22 files changed, 616 insertions(+), 67 deletions(-) Merging fsverity/fsverity (95ae251fe828 f2fs: add fs-verity support) $ git merge fsverity/fsverity Auto-merging include/uapi/linux/fs.h Auto-merging include/linux/fs.h Auto-merging fs/f2fs/sysfs.c Auto-merging fs/f2fs/super.c Auto-merging fs/f2fs/inode.c CONFLICT (content): Merge conflict in fs/f2fs/inode.c Auto-merging fs/f2fs/file.c CONFLICT (content): Merge conflict in fs/f2fs/file.c Auto-merging fs/f2fs/f2fs.h Auto-merging fs/f2fs/data.c Auto-merging fs/ext4/super.c Auto-merging fs/ext4/ioctl.c CONFLICT (content): Merge conflict in fs/ext4/ioctl.c Auto-merging fs/ext4/inode.c Auto-merging fs/ext4/file.c Auto-merging fs/ext4/ext4.h Auto-merging MAINTAINERS Resolved 'fs/ext4/ioctl.c' using previous resolution. Resolved 'fs/f2fs/file.c' using previous resolution. Resolved 'fs/f2fs/inode.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit --no-edit -v -a [master d5b939ee2707] Merge remote-tracking branch 'fsverity/fsverity' $ git diff -M --stat --summary HEAD^.. Documentation/filesystems/ext4/inodes.rst | 6 +- Documentation/filesystems/ext4/overview.rst | 1 + Documentation/filesystems/ext4/super.rst | 2 + Documentation/filesystems/ext4/verity.rst | 41 ++ Documentation/filesystems/fsverity.rst | 726 ++++++++++++++++++++++++++++ Documentation/filesystems/index.rst | 1 + Documentation/ioctl/ioctl-number.rst | 1 + MAINTAINERS | 12 + fs/Kconfig | 2 + fs/Makefile | 1 + fs/ext4/Makefile | 1 + fs/ext4/ext4.h | 23 +- fs/ext4/file.c | 4 + fs/ext4/inode.c | 55 ++- fs/ext4/ioctl.c | 13 + fs/ext4/readpage.c | 211 ++++++-- fs/ext4/super.c | 18 +- fs/ext4/sysfs.c | 6 + fs/ext4/verity.c | 367 ++++++++++++++ fs/f2fs/Makefile | 1 + fs/f2fs/data.c | 75 ++- fs/f2fs/f2fs.h | 20 +- fs/f2fs/file.c | 43 +- fs/f2fs/inode.c | 5 +- fs/f2fs/super.c | 3 + fs/f2fs/sysfs.c | 11 + fs/f2fs/verity.c | 247 ++++++++++ fs/f2fs/xattr.h | 2 + fs/verity/Kconfig | 55 +++ fs/verity/Makefile | 10 + fs/verity/enable.c | 377 +++++++++++++++ fs/verity/fsverity_private.h | 185 +++++++ fs/verity/hash_algs.c | 280 +++++++++++ fs/verity/init.c | 61 +++ fs/verity/measure.c | 57 +++ fs/verity/open.c | 356 ++++++++++++++ fs/verity/signature.c | 157 ++++++ fs/verity/verify.c | 281 +++++++++++ include/linux/fs.h | 11 + include/linux/fsverity.h | 211 ++++++++ include/uapi/linux/fs.h | 1 + include/uapi/linux/fsverity.h | 40 ++ 42 files changed, 3910 insertions(+), 70 deletions(-) create mode 100644 Documentation/filesystems/ext4/verity.rst create mode 100644 Documentation/filesystems/fsverity.rst create mode 100644 fs/ext4/verity.c create mode 100644 fs/f2fs/verity.c create mode 100644 fs/verity/Kconfig create mode 100644 fs/verity/Makefile create mode 100644 fs/verity/enable.c create mode 100644 fs/verity/fsverity_private.h create mode 100644 fs/verity/hash_algs.c create mode 100644 fs/verity/init.c create mode 100644 fs/verity/measure.c create mode 100644 fs/verity/open.c create mode 100644 fs/verity/signature.c create mode 100644 fs/verity/verify.c create mode 100644 include/linux/fsverity.h create mode 100644 include/uapi/linux/fsverity.h Merging fuse/for-next (e7d6cd694383 fuse: cleanup fuse_wait_on_page_writeback) $ git merge fuse/for-next Auto-merging fs/fuse/file.c Merge made by the 'recursive' strategy. fs/fuse/dev.c | 18 ++++++++++++++++++ fs/fuse/file.c | 3 +-- 2 files changed, 19 insertions(+), 2 deletions(-) Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization) $ git merge jfs/jfs-next Already up to date. Merging nfs/linux-next (d1abaeb3be7b Linux 5.3-rc5) $ git merge nfs/linux-next Already up to date. Merging nfs-anna/linux-next (435eba4ae069 xprtrdma: Optimize rpcrdma_post_recvs()) $ git merge nfs-anna/linux-next Merge made by the 'recursive' strategy. fs/nfs/nfs4xdr.c | 2 +- include/linux/sunrpc/sched.h | 3 - include/linux/sunrpc/xprtrdma.h | 4 +- include/trace/events/rpcrdma.h | 88 +++++++++++--- net/sunrpc/sched.c | 27 +---- net/sunrpc/xdr.c | 2 +- net/sunrpc/xprtrdma/backchannel.c | 4 +- net/sunrpc/xprtrdma/frwr_ops.c | 131 +++++++-------------- net/sunrpc/xprtrdma/rpc_rdma.c | 63 ++++++---- net/sunrpc/xprtrdma/transport.c | 12 +- net/sunrpc/xprtrdma/verbs.c | 235 +++++++++++++++++--------------------- net/sunrpc/xprtrdma/xprt_rdma.h | 58 +++++----- 12 files changed, 306 insertions(+), 323 deletions(-) Merging nfsd/nfsd-next (bb13f35b96f4 nfsd: remove duplicated include from filecache.c) $ git merge nfsd/nfsd-next Auto-merging include/linux/fs.h Merge made by the 'recursive' strategy. fs/file_table.c | 1 + fs/locks.c | 62 +++ fs/nfsd/Kconfig | 1 + fs/nfsd/Makefile | 3 +- fs/nfsd/blocklayout.c | 3 +- fs/nfsd/export.c | 13 + fs/nfsd/filecache.c | 884 +++++++++++++++++++++++++++++++ fs/nfsd/filecache.h | 60 +++ fs/nfsd/nfs4callback.c | 35 +- fs/nfsd/nfs4layouts.c | 12 +- fs/nfsd/nfs4proc.c | 83 +-- fs/nfsd/nfs4state.c | 199 ++++--- fs/nfsd/nfs4xdr.c | 31 +- fs/nfsd/nfssvc.c | 16 +- fs/nfsd/state.h | 10 +- fs/nfsd/trace.h | 140 +++++ fs/nfsd/vfs.c | 295 ++++------- fs/nfsd/vfs.h | 9 +- fs/nfsd/xdr4.h | 19 +- fs/notify/fsnotify.h | 2 - fs/notify/group.c | 2 + fs/notify/mark.c | 6 + include/linux/fs.h | 5 + include/linux/fsnotify_backend.h | 2 + include/linux/sunrpc/cache.h | 7 +- include/linux/sunrpc/svc_rdma.h | 6 +- net/sunrpc/cache.c | 15 +- net/sunrpc/xprtrdma/svc_rdma.c | 7 - net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 24 +- net/sunrpc/xprtrdma/svc_rdma_transport.c | 6 +- 30 files changed, 1514 insertions(+), 444 deletions(-) create mode 100644 fs/nfsd/filecache.c create mode 100644 fs/nfsd/filecache.h Merging orangefs/for-next (e65682b55956 orangefs: eliminate needless variable assignments) $ git merge orangefs/for-next Already up to date. Merging overlayfs/overlayfs-next (0be0bfd2de9d ovl: fix regression caused by overlapping layers detection) $ git merge overlayfs/overlayfs-next Merge made by the 'recursive' strategy. Documentation/filesystems/overlayfs.txt | 2 +- fs/overlayfs/ovl_entry.h | 1 + fs/overlayfs/super.c | 73 +++++++++++++++++++++------------ 3 files changed, 49 insertions(+), 27 deletions(-) Merging ubifs/linux-next (8009ce956c3d ubifs: Don't leak orphans on memory during commit) $ git merge ubifs/linux-next Already up to date. Merging v9fs/9p-next (80a316ff1627 9p/xen: Add cleanup path in p9_trans_xen_init) $ git merge v9fs/9p-next Already up to date. Merging xfs/for-next (b68271609c4f fs/xfs: Fix return code of xfs_break_leased_layouts()) $ git merge xfs/for-next Merge made by the 'recursive' strategy. fs/read_write.c | 49 +++++++++++++++++++++++++++++++++------- fs/xfs/xfs_ioctl32.c | 56 +++------------------------------------------- fs/xfs/xfs_pnfs.c | 2 +- fs/xfs/xfs_reflink.c | 63 ++++++++++++++++++++++++++++++---------------------- 4 files changed, 82 insertions(+), 88 deletions(-) Merging iomap/iomap-for-next (791ee52eb10b iomap: Fix trivial typo) $ git merge iomap/iomap-for-next Merge made by the 'recursive' strategy. fs/iomap/buffered-io.c | 575 ++++++++++++++++++++++++++++++++++++++++++- fs/xfs/xfs_iomap.c | 9 +- include/linux/iomap.h | 43 ++++ include/linux/list.h | 33 +++ include/trace/events/iomap.h | 85 +++++++ 5 files changed, 739 insertions(+), 6 deletions(-) create mode 100644 include/trace/events/iomap.h Merging djw-vfs/vfs-for-next (dc617f29dbe5 vfs: don't allow writes to swap files) $ git merge djw-vfs/vfs-for-next Auto-merging include/linux/fs.h Auto-merging fs/block_dev.c Merge made by the 'recursive' strategy. fs/block_dev.c | 3 +++ include/linux/fs.h | 11 +++++++++++ mm/filemap.c | 3 +++ mm/memory.c | 4 ++++ mm/mmap.c | 8 ++++++-- mm/swapfile.c | 41 +++++++++++++++++++++++++---------------- 6 files changed, 52 insertions(+), 18 deletions(-) Merging file-locks/locks-next (cfddf9f4c9f0 locks: fix a memory leak bug in __break_lease()) $ git merge file-locks/locks-next Auto-merging fs/namespace.c Auto-merging fs/locks.c Merge made by the 'recursive' strategy. Documentation/filesystems/mandatory-locking.txt | 10 ++++++++++ fs/locks.c | 11 ++++++----- fs/namespace.c | 11 ++++++++--- include/trace/events/filelock.h | 14 +++++++------- 4 files changed, 31 insertions(+), 15 deletions(-) Merging vfs/for-next (dad5ea4bac62 ceph_real_mount(): missing initialization) $ git merge vfs/for-next Auto-merging net/ceph/ceph_common.c Auto-merging mm/shmem.c Auto-merging kernel/bpf/inode.c Auto-merging init/do_mounts.c Auto-merging include/linux/mtd/super.h Auto-merging include/linux/fs_context.h Auto-merging include/linux/fs.h Auto-merging include/linux/ceph/libceph.h Auto-merging fs/ubifs/super.c CONFLICT (content): Merge conflict in fs/ubifs/super.c Auto-merging fs/tracefs/inode.c Auto-merging fs/super.c Auto-merging fs/squashfs/super.c Auto-merging fs/pstore/inode.c Auto-merging fs/orangefs/orangefs-mod.c Auto-merging fs/jffs2/os-linux.h Auto-merging fs/jffs2/fs.c Auto-merging fs/gfs2/super.h Auto-merging fs/gfs2/super.c CONFLICT (content): Merge conflict in fs/gfs2/super.c Auto-merging fs/gfs2/ops_fstype.c Auto-merging fs/gfs2/incore.h Auto-merging fs/fs_parser.c Auto-merging fs/fs_context.c Auto-merging fs/devpts/inode.c Auto-merging fs/debugfs/inode.c Auto-merging fs/coda/inode.c Auto-merging fs/ceph/super.h Auto-merging fs/ceph/super.c CONFLICT (content): Merge conflict in fs/ceph/super.c Auto-merging fs/ceph/cache.h Auto-merging fs/ceph/cache.c Auto-merging fs/autofs/inode.c Auto-merging fs/autofs/init.c Auto-merging fs/autofs/autofs_i.h Auto-merging drivers/usb/gadget/function/f_fs.c Auto-merging drivers/mtd/mtdsuper.c Auto-merging drivers/block/rbd.c Auto-merging arch/powerpc/platforms/cell/spufs/inode.c CONFLICT (modify/delete): Documentation/filesystems/vfs.txt deleted in HEAD and modified in vfs/for-next. Version vfs/for-next of Documentation/filesystems/vfs.txt left in tree. Resolved 'fs/ceph/super.c' using previous resolution. Resolved 'fs/gfs2/super.c' using previous resolution. Resolved 'fs/ubifs/super.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git rm -f Documentation/filesystems/vfs.txt Documentation/filesystems/vfs.txt: needs merge rm 'Documentation/filesystems/vfs.txt' $ git commit --no-edit -v -a [master 09f2a7453bbf] Merge remote-tracking branch 'vfs/for-next' $ git diff -M --stat --summary HEAD^.. arch/powerpc/platforms/cell/spufs/inode.c | 207 +++++---- arch/s390/hypfs/inode.c | 137 +++--- drivers/android/binderfs.c | 160 +++---- drivers/base/devtmpfs.c | 38 +- drivers/block/rbd.c | 363 ++++++++-------- drivers/mtd/mtdcore.h | 1 + drivers/mtd/mtdsuper.c | 181 ++++---- drivers/usb/gadget/function/f_fs.c | 233 +++++----- fs/autofs/autofs_i.h | 13 +- fs/autofs/init.c | 9 +- fs/autofs/inode.c | 429 +++++++++--------- fs/ceph/cache.c | 9 +- fs/ceph/cache.h | 5 +- fs/ceph/super.c | 694 +++++++++++++++--------------- fs/ceph/super.h | 1 - fs/coda/inode.c | 171 +++++--- fs/cramfs/inode.c | 69 +-- fs/debugfs/inode.c | 185 ++++---- fs/devpts/inode.c | 265 ++++++------ fs/fs_context.c | 18 +- fs/fs_parser.c | 17 +- fs/fuse/inode.c | 291 +++++++------ fs/gfs2/incore.h | 8 +- fs/gfs2/ops_fstype.c | 495 ++++++++++++++++----- fs/gfs2/super.c | 333 +------------- fs/gfs2/super.h | 3 +- fs/jffs2/fs.c | 21 +- fs/jffs2/os-linux.h | 4 +- fs/jffs2/super.c | 172 ++++---- fs/orangefs/orangefs-kernel.h | 8 +- fs/orangefs/orangefs-mod.c | 3 +- fs/orangefs/super.c | 192 +++++---- fs/pstore/inode.c | 108 +++-- fs/ramfs/inode.c | 99 +++-- fs/romfs/super.c | 46 +- fs/squashfs/super.c | 100 +++-- fs/super.c | 203 ++++++--- fs/tracefs/inode.c | 179 ++++---- fs/ubifs/super.c | 450 +++++++++---------- include/linux/ceph/ceph_debug.h | 1 + include/linux/ceph/libceph.h | 17 +- include/linux/fs.h | 3 - include/linux/fs_context.h | 15 +- include/linux/mtd/super.h | 6 +- include/linux/ramfs.h | 6 +- include/linux/shmem_fs.h | 3 +- init/do_mounts.c | 11 +- kernel/bpf/inode.c | 92 ++-- mm/shmem.c | 391 +++++++++++------ net/ceph/ceph_common.c | 410 ++++++++---------- 50 files changed, 3584 insertions(+), 3291 deletions(-) $ git am -3 ../patches/0001-docs-filesystems-vfs-update-for-vfs-Kill-mount_singl.patch Applying: docs: filesystems: vfs: update for "vfs: Kill mount_single()" $ git reset HEAD^ Unstaged changes after reset: M Documentation/filesystems/vfs.rst $ git add -A . $ git commit -v -a --amend [master b203d70257ee] Merge remote-tracking branch 'vfs/for-next' Date: Thu Aug 22 10:53:42 2019 +1000 Merging printk/for-next (ba174ef6d224 Merge branch 'for-5.3-fixes' into for-next) $ git merge printk/for-next Merge made by the 'recursive' strategy. kernel/printk/printk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Merging pci/next (01c06bce49c0 Merge branch 'pci/trivial') $ git merge pci/next Auto-merging include/linux/pci_ids.h Auto-merging include/linux/pci.h Auto-merging drivers/pci/quirks.c Auto-merging drivers/pci/pci.h Auto-merging drivers/pci/pci.c Auto-merging drivers/nvme/host/pci.c Auto-merging Documentation/admin-guide/kernel-parameters.txt Merge made by the 'recursive' strategy. Documentation/admin-guide/kernel-parameters.txt | 5 +- .../devicetree/bindings/pci/designware-pcie.txt | 5 + .../devicetree/bindings/pci/mediatek-pcie.txt | 1 + .../bindings/pci/nvidia,tegra194-pcie.txt | 155 ++ Documentation/devicetree/bindings/pci/pci.txt | 5 + .../devicetree/bindings/phy/phy-tegra194-p2u.txt | 28 + arch/microblaze/include/asm/pci.h | 2 - arch/mips/include/asm/pci.h | 1 - arch/powerpc/include/asm/pci.h | 2 - arch/sparc/include/asm/pci.h | 2 - drivers/infiniband/core/rw.c | 6 +- drivers/nvme/host/pci.c | 10 +- drivers/pci/Kconfig | 4 +- drivers/pci/bus.c | 2 - drivers/pci/controller/dwc/Kconfig | 30 +- drivers/pci/controller/dwc/Makefile | 4 +- drivers/pci/controller/dwc/pci-imx6.c | 33 + drivers/pci/controller/dwc/pci-layerscape-ep.c | 1 + drivers/pci/controller/dwc/pcie-designware-ep.c | 37 +- drivers/pci/controller/dwc/pcie-designware-host.c | 14 +- drivers/pci/controller/dwc/pcie-designware.c | 88 ++ drivers/pci/controller/dwc/pcie-designware.h | 12 + drivers/pci/controller/dwc/pcie-tegra194.c | 1631 ++++++++++++++++++++ drivers/pci/controller/pci-host-common.c | 3 +- drivers/pci/controller/pci-hyperv.c | 94 +- drivers/pci/controller/pci-tegra.c | 22 +- drivers/pci/controller/pcie-mediatek.c | 18 + drivers/pci/hotplug/ibmphp_res.c | 1 + drivers/pci/iov.c | 172 ++- drivers/pci/of.c | 2 +- drivers/pci/p2pdma.c | 374 +++-- drivers/pci/pci-sysfs.c | 223 +-- drivers/pci/pci.c | 14 +- drivers/pci/pci.h | 50 +- drivers/pci/quirks.c | 53 + drivers/pci/search.c | 1 - drivers/pci/setup-bus.c | 4 +- drivers/pci/vc.c | 1 - drivers/phy/tegra/Kconfig | 7 + drivers/phy/tegra/Makefile | 1 + drivers/phy/tegra/phy-tegra194-p2u.c | 120 ++ include/linux/memremap.h | 1 - include/linux/pci-p2pdma.h | 28 +- include/linux/pci.h | 68 - include/linux/pci_ids.h | 1 + include/uapi/linux/pci_regs.h | 14 +- 46 files changed, 2869 insertions(+), 481 deletions(-) create mode 100644 Documentation/devicetree/bindings/pci/nvidia,tegra194-pcie.txt create mode 100644 Documentation/devicetree/bindings/phy/phy-tegra194-p2u.txt create mode 100644 drivers/pci/controller/dwc/pcie-tegra194.c create mode 100644 drivers/phy/tegra/phy-tegra194-p2u.c Merging pstore/for-next/pstore (609488bc979f Linux 5.3-rc2) $ git merge pstore/for-next/pstore Already up to date. Merging hid/for-next (1481b1827625 Merge branch 'for-5.4/wacom' into for-next) $ git merge hid/for-next Merge made by the 'recursive' strategy. drivers/hid/hid-logitech-dj.c | 4 +- drivers/hid/hidraw.c | 2 +- drivers/hid/intel-ish-hid/ipc/hw-ish.h | 1 + drivers/hid/intel-ish-hid/ipc/ipc.c | 2 +- drivers/hid/intel-ish-hid/ipc/pci-ish.c | 95 ++++++++++++++++++++------------- drivers/hid/usbhid/hiddev.c | 2 +- drivers/hid/wacom_sys.c | 7 +-- drivers/hid/wacom_wac.c | 72 ++++++++++++++++++++++++- 8 files changed, 139 insertions(+), 46 deletions(-) Merging i2c/i2c/for-next (cf254eed8bd5 Merge branch 'i2c/for-5.4' into i2c/for-next) $ git merge i2c/i2c/for-next Auto-merging drivers/i2c/busses/Kconfig Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. .../bindings/i2c/{i2c-rcar.txt => renesas,i2c.txt} | 0 .../i2c/{i2c-emev2.txt => renesas,iic-emev2.txt} | 0 .../i2c/{i2c-sh_mobile.txt => renesas,iic.txt} | 0 .../i2c/{i2c-riic.txt => renesas,riic.txt} | 0 MAINTAINERS | 8 ++-- drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 18 ++++----- drivers/i2c/busses/Kconfig | 2 +- drivers/i2c/busses/i2c-cht-wc.c | 46 ++++++++++++++++++++++ drivers/i2c/busses/i2c-designware-master.c | 14 +++---- drivers/i2c/busses/i2c-designware-pcidrv.c | 6 +-- drivers/i2c/busses/i2c-i801.c | 3 +- drivers/i2c/busses/i2c-imx-lpi2c.c | 4 +- drivers/i2c/busses/i2c-ismt.c | 2 - drivers/i2c/busses/i2c-mxs.c | 4 +- drivers/i2c/busses/i2c-sprd.c | 25 ++++++------ drivers/i2c/busses/i2c-tegra.c | 16 +++----- drivers/i2c/i2c-core-base.c | 20 +++++----- drivers/media/i2c/adv748x/adv748x-core.c | 6 +-- drivers/media/i2c/adv7604.c | 22 ++++++----- include/linux/i2c.h | 2 +- 20 files changed, 113 insertions(+), 85 deletions(-) rename Documentation/devicetree/bindings/i2c/{i2c-rcar.txt => renesas,i2c.txt} (100%) rename Documentation/devicetree/bindings/i2c/{i2c-emev2.txt => renesas,iic-emev2.txt} (100%) rename Documentation/devicetree/bindings/i2c/{i2c-sh_mobile.txt => renesas,iic.txt} (100%) rename Documentation/devicetree/bindings/i2c/{i2c-riic.txt => renesas,riic.txt} (100%) Merging i3c/i3c/next (7afe9a4e5665 i3c: master: fix a memory leak bug) $ git merge i3c/i3c/next Merge made by the 'recursive' strategy. drivers/i3c/device.c | 53 +++++++++++++++++++++++++++++ drivers/i3c/master.c | 65 ++++++++---------------------------- drivers/i3c/master/dw-i3c-master.c | 4 +-- drivers/i3c/master/i3c-master-cdns.c | 30 +++++++---------- include/linux/i3c/device.h | 4 +++ include/linux/i3c/master.h | 5 +++ 6 files changed, 89 insertions(+), 72 deletions(-) Merging dmi/master (57361846b52b Linux 4.19-rc2) $ git merge dmi/master Already up to date. Merging hwmon-staging/hwmon-next (5d0bd5d101dc dt-bindings: Add ipsps1 as a trivial device) $ git merge hwmon-staging/hwmon-next Auto-merging include/linux/pci_ids.h Removing drivers/hwmon/ads1015.c Auto-merging drivers/hwmon/Makefile Auto-merging drivers/hwmon/Kconfig Auto-merging MAINTAINERS Removing Documentation/hwmon/ads1015.rst Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/hwmon/lm75.txt | 1 + .../bindings/{hwmon => iio/adc}/ads1015.txt | 0 .../devicetree/bindings/trivial-devices.yaml | 2 + Documentation/hwmon/ads1015.rst | 90 ---- Documentation/hwmon/index.rst | 2 +- Documentation/hwmon/inspur-ipsps1.rst | 79 ++++ Documentation/hwmon/lm75.rst | 6 +- Documentation/hwmon/{pxe1610 => pxe1610.rst} | 33 +- MAINTAINERS | 8 - arch/x86/kernel/amd_nb.c | 3 + drivers/hwmon/Kconfig | 17 +- drivers/hwmon/Makefile | 1 - drivers/hwmon/acpi_power_meter.c | 4 +- drivers/hwmon/ads1015.c | 324 -------------- drivers/hwmon/adt7475.c | 146 +++---- drivers/hwmon/asb100.c | 12 +- drivers/hwmon/k10temp.c | 1 + drivers/hwmon/k8temp.c | 233 +++------- drivers/hwmon/lm75.c | 392 ++++++++++++----- drivers/hwmon/ltc2990.c | 10 +- drivers/hwmon/nct6775.c | 180 +++++++- drivers/hwmon/nct7904.c | 469 +++++++++++++++++++-- drivers/hwmon/npcm750-pwm-fan.c | 4 +- drivers/hwmon/pmbus/Kconfig | 9 + drivers/hwmon/pmbus/Makefile | 1 + drivers/hwmon/pmbus/inspur-ipsps.c | 228 ++++++++++ drivers/hwmon/pmbus/max31785.c | 2 - drivers/hwmon/raspberrypi-hwmon.c | 2 +- drivers/hwmon/smm665.c | 6 +- drivers/hwmon/w83781d.c | 6 +- drivers/iio/adc/Kconfig | 2 +- include/linux/pci_ids.h | 1 + 32 files changed, 1375 insertions(+), 899 deletions(-) rename Documentation/devicetree/bindings/{hwmon => iio/adc}/ads1015.txt (100%) delete mode 100644 Documentation/hwmon/ads1015.rst create mode 100644 Documentation/hwmon/inspur-ipsps1.rst rename Documentation/hwmon/{pxe1610 => pxe1610.rst} (82%) delete mode 100644 drivers/hwmon/ads1015.c create mode 100644 drivers/hwmon/pmbus/inspur-ipsps.c Merging jc_docs/docs-next (4514fe8cd96f Documentation/arm/samsung-s3c24xx: Remove stray U+FEFF character to fix title) $ git merge jc_docs/docs-next Auto-merging include/linux/i2c.h Auto-merging fs/orangefs/orangefs-kernel.h Auto-merging drivers/i2c/i2c-core-base.c Auto-merging drivers/i2c/busses/i2c-i801.c Auto-merging drivers/i2c/busses/Kconfig Auto-merging drivers/hwmon/smm665.c Auto-merging drivers/auxdisplay/Kconfig Auto-merging MAINTAINERS Removing Documentation/w1/slaves/w1_ds2423 Removing Documentation/w1/masters/mxc-w1 Auto-merging Documentation/mips/index.rst CONFLICT (add/add): Merge conflict in Documentation/mips/index.rst Auto-merging Documentation/index.rst Removing Documentation/i2c/busses/i2c-sis630 Removing Documentation/i2c/busses/i2c-parport Removing Documentation/i2c/busses/i2c-amd-mp2 Auto-merging Documentation/hwmon/pxe1610.rst Auto-merging Documentation/hwmon/index.rst Auto-merging Documentation/filesystems/vfs.rst Removing Documentation/filesystems/porting Auto-merging Documentation/filesystems/index.rst Removing Documentation/features/locking/rwsem-optimized/arch-support.txt Removing Documentation/devicetree/writing-schema.md Removing Documentation/auxdisplay/ks0108 Removing Documentation/auxdisplay/cfag12864b Removing Documentation/arm/sh-mobile/.gitignore Removing Documentation/arm/sa1100/yopy.rst Removing Documentation/arm/sa1100/tifon.rst Removing Documentation/arm/sa1100/pleb.rst Removing Documentation/arm/sa1100/pangolin.rst Removing Documentation/arm/sa1100/nanoengine.rst Removing Documentation/arm/sa1100/itsy.rst Removing Documentation/arm/sa1100/huw_webpanel.rst Removing Documentation/arm/sa1100/graphicsmaster.rst Removing Documentation/arm/sa1100/graphicsclient.rst Removing Documentation/arm/sa1100/freebird.rst Removing Documentation/arm/sa1100/brutus.rst Removing Documentation/arm/sa1100/adsbitsy.rst Auto-merging Documentation/admin-guide/cifs/todo.rst CONFLICT (content): Merge conflict in Documentation/admin-guide/cifs/todo.rst Auto-merging .mailmap Resolved 'Documentation/admin-guide/cifs/todo.rst' using previous resolution. Resolved 'Documentation/mips/index.rst' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit --no-edit -v -a [master 91ad48c27d0b] Merge remote-tracking branch 'jc_docs/docs-next' $ git diff -M --stat --summary HEAD^.. .mailmap | 8 + Documentation/ABI/stable/sysfs-bus-w1 | 2 +- Documentation/ABI/stable/sysfs-driver-w1_ds28e04 | 4 +- Documentation/ABI/stable/sysfs-driver-w1_ds28ea00 | 2 +- .../admin-guide/auxdisplay/cfag12864b.rst | 98 +++ Documentation/admin-guide/auxdisplay/index.rst | 16 + Documentation/admin-guide/auxdisplay/ks0108.rst | 50 ++ .../admin-guide/cgroup-v1/blkio-controller.rst | 6 - .../cifs/AUTHORS => admin-guide/cifs/authors.rst} | 64 +- .../cifs/CHANGES => admin-guide/cifs/changes.rst} | 4 + Documentation/admin-guide/cifs/index.rst | 21 + .../cifs.txt => admin-guide/cifs/introduction.rst} | 8 + .../cifs/TODO => admin-guide/cifs/todo.rst} | 92 +-- .../cifs/README => admin-guide/cifs/usage.rst} | 562 ++++++++------ .../cifs/winucase_convert.pl | 0 Documentation/admin-guide/index.rst | 5 + .../{filesystems/jfs.txt => admin-guide/jfs.rst} | 44 +- .../{filesystems/ufs.txt => admin-guide/ufs.rst} | 36 +- .../README.i2400m => admin-guide/wimax/i2400m.rst} | 145 ++-- Documentation/admin-guide/wimax/index.rst | 19 + .../README.wimax => admin-guide/wimax/wimax.rst} | 38 +- Documentation/admin-guide/xfs.rst | 5 +- Documentation/arm/sa1100/adsbitsy.rst | 51 -- Documentation/arm/sa1100/assabet.rst | 2 +- Documentation/arm/sa1100/brutus.rst | 69 -- Documentation/arm/sa1100/freebird.rst | 25 - Documentation/arm/sa1100/graphicsclient.rst | 102 --- Documentation/arm/sa1100/graphicsmaster.rst | 60 -- Documentation/arm/sa1100/huw_webpanel.rst | 21 - Documentation/arm/sa1100/index.rst | 12 - Documentation/arm/sa1100/itsy.rst | 47 -- Documentation/arm/sa1100/nanoengine.rst | 11 - Documentation/arm/sa1100/pangolin.rst | 29 - Documentation/arm/sa1100/pleb.rst | 13 - Documentation/arm/sa1100/tifon.rst | 7 - Documentation/arm/sa1100/yopy.rst | 5 - Documentation/arm/samsung-s3c24xx/index.rst | 2 +- Documentation/arm/sh-mobile/.gitignore | 1 - Documentation/auxdisplay/cfag12864b | 105 --- Documentation/auxdisplay/ks0108 | 55 -- Documentation/core-api/index.rst | 3 +- .../{packing.txt => core-api/packing.rst} | 81 +- .../devicetree/bindings/i2c/i2c-mux-gpmux.txt | 2 +- .../devicetree/bindings/sound/sun8i-a33-codec.txt | 2 +- Documentation/devicetree/writing-schema.md | 130 ---- Documentation/devicetree/writing-schema.rst | 153 ++++ Documentation/driver-api/dmaengine/index.rst | 2 +- Documentation/driver-api/index.rst | 2 + Documentation/driver-api/ipmb.rst | 2 +- Documentation/driver-api/soundwire/index.rst | 2 +- .../{ => driver-api}/thermal/cpu-cooling-api.rst | 0 .../{ => driver-api}/thermal/exynos_thermal.rst | 0 .../thermal/exynos_thermal_emulation.rst | 0 Documentation/{ => driver-api}/thermal/index.rst | 2 +- .../{ => driver-api}/thermal/intel_powerclamp.rst | 0 .../{ => driver-api}/thermal/nouveau_thermal.rst | 0 .../{ => driver-api}/thermal/power_allocator.rst | 0 .../{ => driver-api}/thermal/sysfs-api.rst | 12 +- .../thermal/x86_pkg_temperature_thermal.rst | 2 +- .../locking/queued-rwlocks/arch-support.txt | 2 +- .../locking/queued-spinlocks/arch-support.txt | 4 +- .../locking/rwsem-optimized/arch-support.txt | 34 - Documentation/filesystems/coda.txt | 4 +- .../{directory-locking => directory-locking.rst} | 40 +- Documentation/filesystems/index.rst | 4 + Documentation/filesystems/{Locking => locking.rst} | 259 +++++-- .../filesystems/nfs/{Exporting => exporting.rst} | 31 +- Documentation/filesystems/porting | 686 ----------------- Documentation/filesystems/porting.rst | 852 +++++++++++++++++++++ ...-authentication.md => ubifs-authentication.rst} | 70 +- Documentation/filesystems/vfs.rst | 2 +- Documentation/hwmon/adm1021.rst | 2 +- Documentation/hwmon/adm1275.rst | 2 +- Documentation/hwmon/hih6130.rst | 2 +- Documentation/hwmon/ibm-cffps.rst | 2 +- Documentation/hwmon/lm25066.rst | 2 +- Documentation/hwmon/max16064.rst | 2 +- Documentation/hwmon/max16065.rst | 2 +- Documentation/hwmon/max20751.rst | 2 +- Documentation/hwmon/max34440.rst | 2 +- Documentation/hwmon/max6650.rst | 2 +- Documentation/hwmon/max8688.rst | 2 +- Documentation/hwmon/menf21bmc.rst | 2 +- Documentation/hwmon/pcf8591.rst | 2 +- Documentation/hwmon/sht3x.rst | 2 +- Documentation/hwmon/shtc1.rst | 2 +- Documentation/hwmon/tmp103.rst | 2 +- Documentation/hwmon/tps40422.rst | 2 +- Documentation/hwmon/ucd9000.rst | 2 +- Documentation/hwmon/ucd9200.rst | 2 +- Documentation/hwmon/via686a.rst | 2 +- Documentation/hwmon/zl6100.rst | 2 +- .../i2c/busses/{i2c-ali1535 => i2c-ali1535.rst} | 13 +- .../i2c/busses/{i2c-ali1563 => i2c-ali1563.rst} | 3 + .../i2c/busses/{i2c-ali15x3 => i2c-ali15x3.rst} | 64 +- Documentation/i2c/busses/i2c-amd-mp2 | 23 - Documentation/i2c/busses/i2c-amd-mp2.rst | 25 + .../i2c/busses/{i2c-amd756 => i2c-amd756.rst} | 8 +- .../i2c/busses/{i2c-amd8111 => i2c-amd8111.rst} | 14 +- .../busses/{i2c-diolan-u2c => i2c-diolan-u2c.rst} | 3 + .../i2c/busses/{i2c-i801 => i2c-i801.rst} | 33 +- .../i2c/busses/{i2c-ismt => i2c-ismt.rst} | 20 +- .../i2c/busses/{i2c-mlxcpld => i2c-mlxcpld.rst} | 6 + .../i2c/busses/{i2c-nforce2 => i2c-nforce2.rst} | 33 +- .../busses/{i2c-nvidia-gpu => i2c-nvidia-gpu.rst} | 6 +- .../i2c/busses/{i2c-ocores => i2c-ocores.rst} | 22 +- Documentation/i2c/busses/i2c-parport | 178 ----- .../{i2c-parport-light => i2c-parport-light.rst} | 8 +- Documentation/i2c/busses/i2c-parport.rst | 190 +++++ .../i2c/busses/{i2c-pca-isa => i2c-pca-isa.rst} | 9 +- .../i2c/busses/{i2c-piix4 => i2c-piix4.rst} | 18 +- .../i2c/busses/{i2c-sis5595 => i2c-sis5595.rst} | 19 +- Documentation/i2c/busses/i2c-sis630 | 58 -- Documentation/i2c/busses/i2c-sis630.rst | 63 ++ .../i2c/busses/{i2c-sis96x => i2c-sis96x.rst} | 31 +- .../i2c/busses/{i2c-taos-evm => i2c-taos-evm.rst} | 8 +- Documentation/i2c/busses/{i2c-via => i2c-via.rst} | 28 +- .../i2c/busses/{i2c-viapro => i2c-viapro.rst} | 12 +- Documentation/i2c/busses/index.rst | 33 + .../i2c/busses/{scx200_acb => scx200_acb.rst} | 9 +- .../i2c/{dev-interface => dev-interface.rst} | 104 +-- .../{DMA-considerations => dma-considerations.rst} | 0 Documentation/i2c/{fault-codes => fault-codes.rst} | 5 +- .../i2c/{functionality => functionality.rst} | 22 +- ...io-fault-injection => gpio-fault-injection.rst} | 12 +- .../i2c/{i2c-protocol => i2c-protocol.rst} | 28 +- Documentation/i2c/{i2c-stub => i2c-stub.rst} | 20 +- .../i2c/{i2c-topology => i2c-topology.rst} | 68 +- Documentation/i2c/index.rst | 37 + ...antiating-devices => instantiating-devices.rst} | 45 +- .../i2c/muxes/{i2c-mux-gpio => i2c-mux-gpio.rst} | 26 +- ...module-parameters => old-module-parameters.rst} | 27 +- ...ave-eeprom-backend => slave-eeprom-backend.rst} | 4 +- .../i2c/{slave-interface => slave-interface.rst} | 33 +- .../i2c/{smbus-protocol => smbus-protocol.rst} | 86 ++- Documentation/i2c/{summary => summary.rst} | 6 +- .../{ten-bit-addresses => ten-bit-addresses.rst} | 5 + .../{upgrading-clients => upgrading-clients.rst} | 204 ++--- .../i2c/{writing-clients => writing-clients.rst} | 94 ++- Documentation/index.rst | 10 +- Documentation/input/multi-touch-protocol.rst | 2 +- Documentation/isdn/{README.avmb1 => avmb1.rst} | 229 ++++-- Documentation/isdn/{CREDITS => credits.rst} | 7 +- Documentation/isdn/{README.gigaset => gigaset.rst} | 292 ++++--- Documentation/isdn/{README.hysdn => hysdn.rst} | 125 +-- Documentation/isdn/index.rst | 24 + .../isdn/{INTERFACE.CAPI => interface_capi.rst} | 174 +++-- Documentation/isdn/{README.mISDN => m_isdn.rst} | 5 +- .../m68k/{README.buddha => buddha-driver.rst} | 95 ++- Documentation/m68k/index.rst | 1 + Documentation/maintainer/pull-requests.rst | 2 +- .../mips/{AU1xxx_IDE.README => au1xxx_ide.rst} | 89 ++- Documentation/mips/index.rst | 10 +- Documentation/networking/caif/{README => caif.rst} | 88 ++- Documentation/networking/device_drivers/index.rst | 2 +- Documentation/networking/index.rst | 2 +- .../mac80211_hwsim/{README => mac80211_hwsim.rst} | 28 +- Documentation/nios2/{README => nios2.rst} | 1 + Documentation/openrisc/index.rst | 18 + .../openrisc/{README => openrisc_port.rst} | 25 +- Documentation/openrisc/{TODO => todo.rst} | 9 +- Documentation/parisc/{debugging => debugging.rst} | 7 + Documentation/parisc/index.rst | 18 + Documentation/parisc/{registers => registers.rst} | 59 +- Documentation/process/email-clients.rst | 20 +- ...boot-image-header.txt => boot-image-header.rst} | 39 +- Documentation/riscv/index.rst | 1 + Documentation/security/tpm/index.rst | 1 + Documentation/security/tpm/tpm_event_log.rst | 55 ++ Documentation/sound/index.rst | 2 +- Documentation/sphinx/automarkup.py | 5 +- Documentation/spi/{butterfly => butterfly.rst} | 44 +- Documentation/spi/index.rst | 22 + Documentation/spi/{pxa2xx => pxa2xx.rst} | 95 +-- Documentation/spi/{spi-lm70llp => spi-lm70llp.rst} | 17 +- .../spi/{spi-sc18is602 => spi-sc18is602.rst} | 5 +- Documentation/spi/{spi-summary => spi-summary.rst} | 105 +-- Documentation/spi/{spidev => spidev.rst} | 30 +- ...sight-cpu-debug.txt => coresight-cpu-debug.rst} | 67 +- .../trace/{coresight.txt => coresight.rst} | 372 ++++----- Documentation/trace/index.rst | 2 + .../translations/it_IT/process/changes.rst | 22 +- Documentation/translations/zh_CN/process/howto.rst | 12 +- Documentation/w1/index.rst | 21 + Documentation/w1/masters/{ds2482 => ds2482.rst} | 16 +- Documentation/w1/masters/{ds2490 => ds2490.rst} | 6 +- Documentation/w1/masters/index.rst | 14 + Documentation/w1/masters/mxc-w1 | 12 - Documentation/w1/masters/mxc-w1.rst | 17 + .../w1/masters/{omap-hdq => omap-hdq.rst} | 12 +- Documentation/w1/masters/{w1-gpio => w1-gpio.rst} | 21 +- Documentation/w1/slaves/index.rst | 16 + .../w1/slaves/{w1_ds2406 => w1_ds2406.rst} | 4 +- .../w1/slaves/{w1_ds2413 => w1_ds2413.rst} | 9 + Documentation/w1/slaves/w1_ds2423 | 47 -- Documentation/w1/slaves/w1_ds2423.rst | 54 ++ .../w1/slaves/{w1_ds2438 => w1_ds2438.rst} | 10 +- .../w1/slaves/{w1_ds28e04 => w1_ds28e04.rst} | 5 + .../w1/slaves/{w1_ds28e17 => w1_ds28e17.rst} | 16 +- Documentation/w1/slaves/{w1_therm => w1_therm.rst} | 11 +- Documentation/w1/{w1.generic => w1-generic.rst} | 88 ++- Documentation/w1/{w1.netlink => w1-netlink.rst} | 89 ++- MAINTAINERS | 84 +- drivers/auxdisplay/Kconfig | 2 +- drivers/hwmon/atxp1.c | 2 +- drivers/hwmon/smm665.c | 2 +- drivers/hwtracing/coresight/Kconfig | 2 +- drivers/i2c/Kconfig | 4 +- drivers/i2c/busses/Kconfig | 2 +- drivers/i2c/busses/i2c-i801.c | 2 +- drivers/i2c/busses/i2c-taos-evm.c | 2 +- drivers/i2c/i2c-core-base.c | 4 +- drivers/iio/dummy/iio_simple_dummy.c | 4 +- drivers/rtc/rtc-ds1374.c | 2 +- drivers/spi/Kconfig | 2 +- drivers/spi/spi-butterfly.c | 2 +- drivers/spi/spi-lm70llp.c | 2 +- drivers/staging/isdn/hysdn/Kconfig | 2 +- fs/cifs/export.c | 2 +- fs/exportfs/expfs.c | 2 +- fs/isofs/export.c | 2 +- fs/jfs/Kconfig | 2 +- fs/orangefs/file.c | 2 +- fs/orangefs/orangefs-kernel.h | 2 +- fs/ufs/Kconfig | 2 +- include/linux/dcache.h | 2 +- include/linux/exportfs.h | 2 +- include/linux/i2c.h | 2 +- include/linux/platform_data/sc18is602.h | 2 +- include/linux/thermal.h | 4 +- scripts/kernel-doc | 3 +- 231 files changed, 4978 insertions(+), 3911 deletions(-) create mode 100644 Documentation/admin-guide/auxdisplay/cfag12864b.rst create mode 100644 Documentation/admin-guide/auxdisplay/index.rst create mode 100644 Documentation/admin-guide/auxdisplay/ks0108.rst rename Documentation/{filesystems/cifs/AUTHORS => admin-guide/cifs/authors.rst} (60%) rename Documentation/{filesystems/cifs/CHANGES => admin-guide/cifs/changes.rst} (91%) create mode 100644 Documentation/admin-guide/cifs/index.rst rename Documentation/{filesystems/cifs/cifs.txt => admin-guide/cifs/introduction.rst} (98%) rename Documentation/{filesystems/cifs/TODO => admin-guide/cifs/todo.rst} (55%) rename Documentation/{filesystems/cifs/README => admin-guide/cifs/usage.rst} (72%) rename Documentation/{filesystems => admin-guide}/cifs/winucase_convert.pl (100%) rename Documentation/{filesystems/jfs.txt => admin-guide/jfs.rst} (51%) rename Documentation/{filesystems/ufs.txt => admin-guide/ufs.rst} (69%) rename Documentation/{wimax/README.i2400m => admin-guide/wimax/i2400m.rst} (69%) create mode 100644 Documentation/admin-guide/wimax/index.rst rename Documentation/{wimax/README.wimax => admin-guide/wimax/wimax.rst} (74%) delete mode 100644 Documentation/arm/sa1100/adsbitsy.rst delete mode 100644 Documentation/arm/sa1100/brutus.rst delete mode 100644 Documentation/arm/sa1100/freebird.rst delete mode 100644 Documentation/arm/sa1100/graphicsclient.rst delete mode 100644 Documentation/arm/sa1100/graphicsmaster.rst delete mode 100644 Documentation/arm/sa1100/huw_webpanel.rst delete mode 100644 Documentation/arm/sa1100/itsy.rst delete mode 100644 Documentation/arm/sa1100/nanoengine.rst delete mode 100644 Documentation/arm/sa1100/pangolin.rst delete mode 100644 Documentation/arm/sa1100/pleb.rst delete mode 100644 Documentation/arm/sa1100/tifon.rst delete mode 100644 Documentation/arm/sa1100/yopy.rst delete mode 100644 Documentation/arm/sh-mobile/.gitignore delete mode 100644 Documentation/auxdisplay/cfag12864b delete mode 100644 Documentation/auxdisplay/ks0108 rename Documentation/{packing.txt => core-api/packing.rst} (61%) delete mode 100644 Documentation/devicetree/writing-schema.md create mode 100644 Documentation/devicetree/writing-schema.rst rename Documentation/{ => driver-api}/thermal/cpu-cooling-api.rst (100%) rename Documentation/{ => driver-api}/thermal/exynos_thermal.rst (100%) rename Documentation/{ => driver-api}/thermal/exynos_thermal_emulation.rst (100%) rename Documentation/{ => driver-api}/thermal/index.rst (86%) rename Documentation/{ => driver-api}/thermal/intel_powerclamp.rst (100%) rename Documentation/{ => driver-api}/thermal/nouveau_thermal.rst (100%) rename Documentation/{ => driver-api}/thermal/power_allocator.rst (100%) rename Documentation/{ => driver-api}/thermal/sysfs-api.rst (98%) rename Documentation/{ => driver-api}/thermal/x86_pkg_temperature_thermal.rst (94%) delete mode 100644 Documentation/features/locking/rwsem-optimized/arch-support.txt rename Documentation/filesystems/{directory-locking => directory-locking.rst} (86%) rename Documentation/filesystems/{Locking => locking.rst} (79%) rename Documentation/filesystems/nfs/{Exporting => exporting.rst} (91%) delete mode 100644 Documentation/filesystems/porting create mode 100644 Documentation/filesystems/porting.rst rename Documentation/filesystems/{ubifs-authentication.md => ubifs-authentication.rst} (95%) rename Documentation/i2c/busses/{i2c-ali1535 => i2c-ali1535.rst} (82%) rename Documentation/i2c/busses/{i2c-ali1563 => i2c-ali1563.rst} (93%) rename Documentation/i2c/busses/{i2c-ali15x3 => i2c-ali15x3.rst} (72%) delete mode 100644 Documentation/i2c/busses/i2c-amd-mp2 create mode 100644 Documentation/i2c/busses/i2c-amd-mp2.rst rename Documentation/i2c/busses/{i2c-amd756 => i2c-amd756.rst} (79%) rename Documentation/i2c/busses/{i2c-amd8111 => i2c-amd8111.rst} (66%) rename Documentation/i2c/busses/{i2c-diolan-u2c => i2c-diolan-u2c.rst} (91%) rename Documentation/i2c/busses/{i2c-i801 => i2c-i801.rst} (89%) rename Documentation/i2c/busses/{i2c-ismt => i2c-ismt.rst} (81%) rename Documentation/i2c/busses/{i2c-mlxcpld => i2c-mlxcpld.rst} (88%) rename Documentation/i2c/busses/{i2c-nforce2 => i2c-nforce2.rst} (58%) rename Documentation/i2c/busses/{i2c-nvidia-gpu => i2c-nvidia-gpu.rst} (63%) rename Documentation/i2c/busses/{i2c-ocores => i2c-ocores.rst} (82%) delete mode 100644 Documentation/i2c/busses/i2c-parport rename Documentation/i2c/busses/{i2c-parport-light => i2c-parport-light.rst} (91%) create mode 100644 Documentation/i2c/busses/i2c-parport.rst rename Documentation/i2c/busses/{i2c-pca-isa => i2c-pca-isa.rst} (72%) rename Documentation/i2c/busses/{i2c-piix4 => i2c-piix4.rst} (92%) rename Documentation/i2c/busses/{i2c-sis5595 => i2c-sis5595.rst} (74%) delete mode 100644 Documentation/i2c/busses/i2c-sis630 create mode 100644 Documentation/i2c/busses/i2c-sis630.rst rename Documentation/i2c/busses/{i2c-sis96x => i2c-sis96x.rst} (74%) rename Documentation/i2c/busses/{i2c-taos-evm => i2c-taos-evm.rst} (91%) rename Documentation/i2c/busses/{i2c-via => i2c-via.rst} (54%) rename Documentation/i2c/busses/{i2c-viapro => i2c-viapro.rst} (87%) create mode 100644 Documentation/i2c/busses/index.rst rename Documentation/i2c/busses/{scx200_acb => scx200_acb.rst} (86%) rename Documentation/i2c/{dev-interface => dev-interface.rst} (71%) rename Documentation/i2c/{DMA-considerations => dma-considerations.rst} (100%) rename Documentation/i2c/{fault-codes => fault-codes.rst} (98%) rename Documentation/i2c/{functionality => functionality.rst} (91%) rename Documentation/i2c/{gpio-fault-injection => gpio-fault-injection.rst} (97%) rename Documentation/i2c/{i2c-protocol => i2c-protocol.rst} (83%) rename Documentation/i2c/{i2c-stub => i2c-stub.rst} (93%) rename Documentation/i2c/{i2c-topology => i2c-topology.rst} (89%) create mode 100644 Documentation/i2c/index.rst rename Documentation/i2c/{instantiating-devices => instantiating-devices.rst} (93%) rename Documentation/i2c/muxes/{i2c-mux-gpio => i2c-mux-gpio.rst} (85%) rename Documentation/i2c/{old-module-parameters => old-module-parameters.rst} (75%) rename Documentation/i2c/{slave-eeprom-backend => slave-eeprom-backend.rst} (90%) rename Documentation/i2c/{slave-interface => slave-interface.rst} (94%) rename Documentation/i2c/{smbus-protocol => smbus-protocol.rst} (82%) rename Documentation/i2c/{summary => summary.rst} (96%) rename Documentation/i2c/{ten-bit-addresses => ten-bit-addresses.rst} (95%) rename Documentation/i2c/{upgrading-clients => upgrading-clients.rst} (54%) rename Documentation/i2c/{writing-clients => writing-clients.rst} (91%) rename Documentation/isdn/{README.avmb1 => avmb1.rst} (50%) rename Documentation/isdn/{CREDITS => credits.rst} (96%) rename Documentation/isdn/{README.gigaset => gigaset.rst} (74%) rename Documentation/isdn/{README.hysdn => hysdn.rst} (80%) create mode 100644 Documentation/isdn/index.rst rename Documentation/isdn/{INTERFACE.CAPI => interface_capi.rst} (75%) rename Documentation/isdn/{README.mISDN => m_isdn.rst} (89%) rename Documentation/m68k/{README.buddha => buddha-driver.rst} (73%) rename Documentation/mips/{AU1xxx_IDE.README => au1xxx_ide.rst} (67%) rename Documentation/networking/caif/{README => caif.rst} (70%) rename Documentation/networking/mac80211_hwsim/{README => mac80211_hwsim.rst} (81%) rename Documentation/nios2/{README => nios2.rst} (96%) create mode 100644 Documentation/openrisc/index.rst rename Documentation/openrisc/{README => openrisc_port.rst} (80%) rename Documentation/openrisc/{TODO => todo.rst} (78%) rename Documentation/parisc/{debugging => debugging.rst} (94%) create mode 100644 Documentation/parisc/index.rst rename Documentation/parisc/{registers => registers.rst} (70%) rename Documentation/riscv/{boot-image-header.txt => boot-image-header.rst} (72%) create mode 100644 Documentation/security/tpm/tpm_event_log.rst rename Documentation/spi/{butterfly => butterfly.rst} (71%) create mode 100644 Documentation/spi/index.rst rename Documentation/spi/{pxa2xx => pxa2xx.rst} (83%) rename Documentation/spi/{spi-lm70llp => spi-lm70llp.rst} (88%) rename Documentation/spi/{spi-sc18is602 => spi-sc18is602.rst} (92%) rename Documentation/spi/{spi-summary => spi-summary.rst} (93%) rename Documentation/spi/{spidev => spidev.rst} (90%) rename Documentation/trace/{coresight-cpu-debug.txt => coresight-cpu-debug.rst} (84%) rename Documentation/trace/{coresight.txt => coresight.rst} (56%) create mode 100644 Documentation/w1/index.rst rename Documentation/w1/masters/{ds2482 => ds2482.rst} (71%) rename Documentation/w1/masters/{ds2490 => ds2490.rst} (98%) create mode 100644 Documentation/w1/masters/index.rst delete mode 100644 Documentation/w1/masters/mxc-w1 create mode 100644 Documentation/w1/masters/mxc-w1.rst rename Documentation/w1/masters/{omap-hdq => omap-hdq.rst} (90%) rename Documentation/w1/masters/{w1-gpio => w1-gpio.rst} (75%) create mode 100644 Documentation/w1/slaves/index.rst rename Documentation/w1/slaves/{w1_ds2406 => w1_ds2406.rst} (96%) rename Documentation/w1/slaves/{w1_ds2413 => w1_ds2413.rst} (81%) delete mode 100644 Documentation/w1/slaves/w1_ds2423 create mode 100644 Documentation/w1/slaves/w1_ds2423.rst rename Documentation/w1/slaves/{w1_ds2438 => w1_ds2438.rst} (93%) rename Documentation/w1/slaves/{w1_ds28e04 => w1_ds28e04.rst} (93%) rename Documentation/w1/slaves/{w1_ds28e17 => w1_ds28e17.rst} (88%) rename Documentation/w1/slaves/{w1_therm => w1_therm.rst} (95%) rename Documentation/w1/{w1.generic => w1-generic.rst} (59%) rename Documentation/w1/{w1.netlink => w1-netlink.rst} (77%) Merging v4l-dvb/master (01faced6f65d media: dt-bindings: media: Convert Allwinner A10 IR to a schema) $ git merge v4l-dvb/master Removing drivers/staging/media/davinci_vpfe/vpfe_video.h Removing drivers/staging/media/davinci_vpfe/vpfe_video.c Removing drivers/staging/media/davinci_vpfe/vpfe_mc_capture.h Removing drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c Removing drivers/staging/media/davinci_vpfe/vpfe.h Removing drivers/staging/media/davinci_vpfe/dm365_resizer.h Removing drivers/staging/media/davinci_vpfe/dm365_resizer.c Removing drivers/staging/media/davinci_vpfe/dm365_isif_regs.h Removing drivers/staging/media/davinci_vpfe/dm365_isif.h Removing drivers/staging/media/davinci_vpfe/dm365_isif.c Removing drivers/staging/media/davinci_vpfe/dm365_ipipeif_user.h Removing drivers/staging/media/davinci_vpfe/dm365_ipipeif.h Removing drivers/staging/media/davinci_vpfe/dm365_ipipeif.c Removing drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.h Removing drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.c Removing drivers/staging/media/davinci_vpfe/dm365_ipipe.h Removing drivers/staging/media/davinci_vpfe/dm365_ipipe.c Removing drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h Removing drivers/staging/media/davinci_vpfe/davinci-vpfe-mc.txt Removing drivers/staging/media/davinci_vpfe/TODO Removing drivers/staging/media/davinci_vpfe/Makefile Removing drivers/staging/media/davinci_vpfe/Kconfig Removing drivers/staging/media/bcm2048/radio-bcm2048.h Removing drivers/staging/media/bcm2048/radio-bcm2048.c Removing drivers/staging/media/bcm2048/TODO Removing drivers/staging/media/bcm2048/Makefile Removing drivers/staging/media/bcm2048/Kconfig Auto-merging drivers/media/platform/omap/omap_vout_vrfb.c Auto-merging drivers/media/i2c/adv748x/adv748x-core.c Auto-merging MAINTAINERS Removing Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst Removing Documentation/devicetree/bindings/media/sunxi-ir.txt Merge made by the 'recursive' strategy. .../bindings/media/allwinner,sun4i-a10-ir.yaml | 80 + .../devicetree/bindings/media/cdns,csi2tx.txt | 3 +- .../devicetree/bindings/media/imx7-csi.txt | 2 +- .../devicetree/bindings/media/meson-ao-cec.txt | 8 +- .../devicetree/bindings/media/nvidia,tegra-vde.txt | 2 + Documentation/devicetree/bindings/media/rc.txt | 118 +- Documentation/devicetree/bindings/media/rc.yaml | 145 ++ .../devicetree/bindings/media/rockchip-vpu.txt | 18 +- .../devicetree/bindings/media/sunxi-ir.txt | 28 - Documentation/media/kapi/csi2.rst | 17 +- Documentation/media/kapi/v4l2-dev.rst | 1 + Documentation/media/uapi/rc/lirc-dev-intro.rst | 57 +- Documentation/media/uapi/rc/lirc-read.rst | 3 +- Documentation/media/uapi/rc/lirc-write.rst | 3 +- Documentation/media/uapi/rc/rc-protos.rst | 456 ++++ Documentation/media/uapi/rc/remote_controllers.rst | 1 + Documentation/media/uapi/v4l/biblio.rst | 10 + Documentation/media/uapi/v4l/control.rst | 2 +- Documentation/media/uapi/v4l/dev-decoder.rst | 1101 ++++++++ Documentation/media/uapi/v4l/dev-mem2mem.rst | 8 +- Documentation/media/uapi/v4l/ext-ctrls-codec.rst | 422 ++- Documentation/media/uapi/v4l/hist-v4l2.rst | 2 +- Documentation/media/uapi/v4l/pixfmt-bayer.rst | 38 + Documentation/media/uapi/v4l/pixfmt-compressed.rst | 67 +- Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst | 1306 ---------- Documentation/media/uapi/v4l/pixfmt-rgb.rst | 1302 +++++++++- Documentation/media/uapi/v4l/pixfmt-v4l2.rst | 7 +- Documentation/media/uapi/v4l/pixfmt.rst | 1 + Documentation/media/uapi/v4l/subdev-formats.rst | 8 + Documentation/media/uapi/v4l/v4l2.rst | 10 +- .../media/uapi/v4l/vidioc-decoder-cmd.rst | 41 +- Documentation/media/uapi/v4l/vidioc-dqevent.rst | 11 +- Documentation/media/uapi/v4l/vidioc-enum-fmt.rst | 16 + Documentation/media/uapi/v4l/vidioc-queryctrl.rst | 4 +- Documentation/media/v4l-drivers/imx7.rst | 127 +- Documentation/media/v4l-drivers/vimc.rst | 13 +- Documentation/media/videodev2.h.rst.exceptions | 6 +- MAINTAINERS | 28 +- arch/arm/mach-omap2/devices.c | 7 + drivers/input/touchscreen/sur40.c | 4 +- drivers/media/Kconfig | 7 +- drivers/media/common/saa7146/saa7146_video.c | 16 +- drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 107 + .../media/common/videobuf2/videobuf2-dma-contig.c | 23 +- drivers/media/common/videobuf2/videobuf2-v4l2.c | 8 +- drivers/media/dvb-core/dvb_frontend.c | 4 +- drivers/media/dvb-core/dvbdev.c | 7 +- drivers/media/dvb-frontends/Kconfig | 5 +- drivers/media/dvb-frontends/cx24117.c | 4 +- drivers/media/dvb-frontends/cxd2099.c | 2 +- drivers/media/dvb-frontends/cxd2820r_core.c | 9 +- drivers/media/dvb-frontends/dib7000p.c | 7 +- drivers/media/dvb-frontends/drx39xyj/drxj.c | 5 +- drivers/media/dvb-frontends/dvb-pll.c | 40 +- drivers/media/dvb-frontends/mn88443x.c | 6 +- drivers/media/dvb-frontends/mn88472.c | 18 +- drivers/media/dvb-frontends/mn88473.c | 18 +- drivers/media/dvb-frontends/rtl2832_sdr.c | 3 - drivers/media/dvb-frontends/si2168.c | 164 +- drivers/media/dvb-frontends/si2168.h | 1 + drivers/media/dvb-frontends/stv0900_core.c | 2 +- drivers/media/dvb-frontends/zd1301_demod.c | 3 +- drivers/media/firewire/firedtv-ci.c | 2 +- drivers/media/i2c/Kconfig | 18 +- drivers/media/i2c/Makefile | 1 + drivers/media/i2c/ad9389b.c | 6 +- drivers/media/i2c/adv7180.c | 12 +- drivers/media/i2c/adv7343.c | 5 +- drivers/media/i2c/adv748x/adv748x-core.c | 13 +- drivers/media/i2c/adv7511-v4l2.c | 22 +- drivers/media/i2c/adv7842.c | 9 +- drivers/media/i2c/et8ek8/et8ek8_driver.c | 5 +- drivers/media/i2c/imx274.c | 5 +- drivers/media/i2c/ir-kbd-i2c.c | 14 +- drivers/media/i2c/max2175.c | 5 +- drivers/media/i2c/mt9m001.c | 5 +- drivers/media/i2c/mt9m111.c | 7 +- drivers/media/i2c/ov2640.c | 7 +- drivers/media/i2c/ov2659.c | 9 +- drivers/media/i2c/ov2680.c | 9 +- drivers/media/i2c/ov5640.c | 14 +- drivers/media/i2c/ov5645.c | 151 +- drivers/media/i2c/ov5647.c | 5 +- drivers/media/i2c/ov5675.c | 1183 +++++++++ drivers/media/i2c/ov5695.c | 5 +- drivers/media/i2c/ov7670.c | 6 +- drivers/media/i2c/ov772x.c | 5 +- drivers/media/i2c/ov7740.c | 13 +- drivers/media/i2c/ov8856.c | 5 +- drivers/media/i2c/ov9650.c | 5 +- drivers/media/i2c/s5c73m3/s5c73m3-core.c | 5 +- drivers/media/i2c/s5k5baf.c | 5 +- drivers/media/i2c/s5k6a3.c | 5 +- drivers/media/i2c/smiapp/smiapp-core.c | 5 +- drivers/media/i2c/tc358743.c | 5 +- drivers/media/i2c/tda1997x.c | 9 +- drivers/media/i2c/ths8200.c | 5 +- drivers/media/i2c/tvp5150.c | 9 +- drivers/media/i2c/tvp7002.c | 4 +- drivers/media/pci/bt8xx/bttv-driver.c | 19 - drivers/media/pci/bt8xx/bttv-risc.c | 8 +- drivers/media/pci/bt8xx/bttvp.h | 1 - drivers/media/pci/bt8xx/dvb-bt8xx.c | 2 +- drivers/media/pci/cobalt/cobalt-driver.c | 40 +- drivers/media/pci/cobalt/cobalt-flash.c | 2 +- drivers/media/pci/cobalt/cobalt-v4l2.c | 6 - drivers/media/pci/cx23885/cx23885-417.c | 1 - drivers/media/pci/cx23885/cx23885-video.c | 7 +- drivers/media/pci/cx23885/cx23885.h | 1 - drivers/media/pci/cx25821/cx25821-video.c | 7 +- drivers/media/pci/cx25821/cx25821.h | 1 - drivers/media/pci/cx88/cx88-blackbird.c | 2 - drivers/media/pci/cx88/cx88-video.c | 17 +- drivers/media/pci/cx88/cx88.h | 1 - drivers/media/pci/dt3155/dt3155.c | 1 - drivers/media/pci/intel/ipu3/ipu3-cio2.c | 100 +- drivers/media/pci/meye/meye.c | 3 - drivers/media/pci/ngene/ngene-core.c | 4 - drivers/media/pci/pt1/pt1.c | 6 +- drivers/media/pci/pt3/pt3.c | 6 +- drivers/media/pci/saa7134/saa7134-empress.c | 2 - drivers/media/pci/saa7134/saa7134-tvaudio.c | 1 - drivers/media/pci/saa7134/saa7134-video.c | 28 +- drivers/media/pci/saa7134/saa7134.h | 1 - drivers/media/pci/saa7164/saa7164-encoder.c | 1 - drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 9 - drivers/media/pci/solo6x10/solo6x10-v4l2.c | 4 - drivers/media/pci/sta2x11/sta2x11_vip.c | 2 - drivers/media/pci/ttpci/av7110_ir.c | 14 +- drivers/media/pci/tw68/tw68-video.c | 14 - drivers/media/pci/tw68/tw68.h | 1 - drivers/media/platform/Kconfig | 4 +- drivers/media/platform/am437x/am437x-vpfe.c | 30 +- drivers/media/platform/am437x/am437x-vpfe.h | 6 - drivers/media/platform/atmel/atmel-sama5d2-isc.c | 7 +- drivers/media/platform/cadence/cdns-csi2tx.c | 155 +- drivers/media/platform/coda/coda-common.c | 4 +- drivers/media/platform/cros-ec-cec/cros-ec-cec.c | 69 +- drivers/media/platform/davinci/vpbe_display.c | 21 +- drivers/media/platform/davinci/vpbe_osd.c | 5 - drivers/media/platform/davinci/vpbe_venc.c | 5 - drivers/media/platform/davinci/vpfe_capture.c | 54 +- drivers/media/platform/davinci/vpif_capture.c | 33 +- drivers/media/platform/davinci/vpif_display.c | 7 +- drivers/media/platform/exynos-gsc/gsc-core.c | 22 - drivers/media/platform/exynos-gsc/gsc-core.h | 2 - drivers/media/platform/exynos4-is/fimc-capture.c | 3 - drivers/media/platform/exynos4-is/fimc-core.c | 20 - drivers/media/platform/exynos4-is/fimc-is.c | 2 +- drivers/media/platform/exynos4-is/fimc-isp-video.c | 1 - drivers/media/platform/exynos4-is/fimc-isp.c | 3 - drivers/media/platform/exynos4-is/fimc-lite.c | 8 - drivers/media/platform/exynos4-is/fimc-m2m.c | 1 - drivers/media/platform/exynos4-is/media-dev.c | 2 + drivers/media/platform/exynos4-is/mipi-csis.c | 4 +- drivers/media/platform/fsl-viu.c | 9 +- drivers/media/platform/imx-pxp.c | 4 +- drivers/media/platform/m2m-deinterlace.c | 140 +- drivers/media/platform/marvell-ccic/mcam-core.c | 15 +- drivers/media/platform/marvell-ccic/mmp-driver.c | 1 + drivers/media/platform/meson/ao-cec-g12a.c | 84 +- drivers/media/platform/meson/ao-cec.c | 44 +- drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 9 +- drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 4 + drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 1 + .../media/platform/mtk-vcodec/vdec/vdec_h264_if.c | 16 +- drivers/media/platform/mx2_emmaprp.c | 139 +- drivers/media/platform/omap/Kconfig | 3 +- drivers/media/platform/omap/omap_vout.c | 1045 ++------ drivers/media/platform/omap/omap_vout_vrfb.c | 26 +- drivers/media/platform/omap/omap_vout_vrfb.h | 4 +- drivers/media/platform/omap/omap_voutdef.h | 45 +- drivers/media/platform/omap/omap_voutlib.c | 6 +- drivers/media/platform/omap3isp/isp.c | 340 ++- drivers/media/platform/omap3isp/ispccdc.c | 1 + drivers/media/platform/omap3isp/ispccp2.c | 1 + drivers/media/platform/omap3isp/ispcsi2.c | 1 + drivers/media/platform/omap3isp/isppreview.c | 1 + drivers/media/platform/omap3isp/ispresizer.c | 1 + drivers/media/platform/omap3isp/ispstat.c | 2 + drivers/media/platform/omap3isp/ispvideo.c | 15 +- drivers/media/platform/pxa_camera.c | 3 - drivers/media/platform/qcom/camss/camss.c | 2 +- drivers/media/platform/qcom/venus/core.h | 33 +- drivers/media/platform/qcom/venus/helpers.c | 199 +- drivers/media/platform/qcom/venus/helpers.h | 11 + drivers/media/platform/qcom/venus/hfi.c | 11 +- drivers/media/platform/qcom/venus/hfi.h | 2 +- drivers/media/platform/qcom/venus/vdec.c | 548 +++- drivers/media/platform/qcom/venus/vdec_ctrls.c | 7 +- drivers/media/platform/qcom/venus/venc.c | 13 +- drivers/media/platform/rcar-vin/rcar-core.c | 55 +- drivers/media/platform/rcar-vin/rcar-dma.c | 56 +- drivers/media/platform/rcar-vin/rcar-v4l2.c | 68 +- drivers/media/platform/rcar-vin/rcar-vin.h | 9 +- drivers/media/platform/rcar_fdp1.c | 2 +- drivers/media/platform/renesas-ceu.c | 4 +- drivers/media/platform/rockchip/rga/rga.c | 1 - drivers/media/platform/s3c-camif/camif-capture.c | 16 +- drivers/media/platform/s3c-camif/camif-core.c | 10 +- drivers/media/platform/s3c-camif/camif-core.h | 1 - drivers/media/platform/s5p-cec/s5p_cec.c | 23 +- drivers/media/platform/s5p-g2d/g2d.c | 13 +- drivers/media/platform/s5p-g2d/g2d.h | 1 - drivers/media/platform/s5p-jpeg/jpeg-core.c | 31 +- drivers/media/platform/s5p-jpeg/jpeg-core.h | 2 - drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 1 - drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 19 +- drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 14 +- drivers/media/platform/seco-cec/seco-cec.c | 55 +- drivers/media/platform/sh_veu.c | 28 +- drivers/media/platform/sh_vou.c | 17 +- drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 6 +- .../media/platform/sti/c8sectpfe/c8sectpfe-core.c | 8 +- drivers/media/platform/sti/cec/stih-cec.c | 32 +- drivers/media/platform/sti/hva/hva-hw.c | 8 +- drivers/media/platform/stm32/stm32-dcmi.c | 322 ++- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 7 +- drivers/media/platform/tegra-cec/tegra_cec.c | 35 +- drivers/media/platform/ti-vpe/cal.c | 6 +- drivers/media/platform/ti-vpe/vpe.c | 12 - drivers/media/platform/via-camera.c | 579 ++--- drivers/media/platform/vicodec/codec-v4l2-fwht.c | 30 +- drivers/media/platform/vicodec/vicodec-core.c | 3 + drivers/media/platform/vimc/vimc-capture.c | 76 +- drivers/media/platform/vimc/vimc-common.c | 309 ++- drivers/media/platform/vimc/vimc-common.h | 58 +- drivers/media/platform/vimc/vimc-debayer.c | 88 +- drivers/media/platform/vimc/vimc-scaler.c | 68 +- drivers/media/platform/vimc/vimc-sensor.c | 57 +- drivers/media/platform/vimc/vimc-streamer.c | 40 +- drivers/media/platform/vimc/vimc-streamer.h | 14 - drivers/media/platform/vivid/vivid-core.c | 4 +- drivers/media/platform/vivid/vivid-ctrls.c | 26 +- drivers/media/platform/vivid/vivid-kthread-cap.c | 9 +- drivers/media/platform/vivid/vivid-vid-common.c | 132 +- drivers/media/platform/vsp1/vsp1_dl.c | 4 +- drivers/media/platform/vsp1/vsp1_histo.c | 3 +- drivers/media/platform/vsp1/vsp1_video.c | 10 +- drivers/media/platform/xilinx/xilinx-dma.c | 18 +- drivers/media/platform/xilinx/xilinx-vip.c | 16 +- drivers/media/platform/xilinx/xilinx-vip.h | 2 - drivers/media/platform/xilinx/xilinx-vipp.c | 2 +- drivers/media/radio/si470x/radio-si470x-i2c.c | 5 +- drivers/media/radio/si470x/radio-si470x-usb.c | 5 +- drivers/media/radio/si4713/si4713.c | 5 +- drivers/media/rc/iguanair.c | 15 +- drivers/media/rc/img-ir/img-ir-core.c | 4 +- drivers/media/rc/imon.c | 7 +- drivers/media/rc/imon_raw.c | 43 +- drivers/media/rc/ir-hix5hd2.c | 4 +- drivers/media/rc/keymaps/Makefile | 7 + drivers/media/rc/keymaps/rc-imon-rsc.c | 7 +- drivers/media/rc/keymaps/rc-khadas.c | 54 + drivers/media/rc/keymaps/rc-odroid.c | 54 + drivers/media/rc/keymaps/rc-tanix-tx3mini.c | 77 + drivers/media/rc/keymaps/rc-tanix-tx5max.c | 68 + drivers/media/rc/keymaps/rc-wetek-hub.c | 53 + drivers/media/rc/keymaps/rc-wetek-play2.c | 93 + drivers/media/rc/keymaps/rc-x96max.c | 83 + drivers/media/rc/mceusb.c | 401 +-- drivers/media/rc/meson-ir.c | 4 +- drivers/media/rc/mtk-cir.c | 14 +- drivers/media/rc/sunxi-cir.c | 89 +- drivers/media/spi/Kconfig | 5 +- drivers/media/tuners/Kconfig | 6 +- drivers/media/tuners/tuner-xc2028.c | 3 +- drivers/media/tuners/xc4000.c | 3 +- drivers/media/usb/airspy/airspy.c | 3 - drivers/media/usb/au0828/au0828-video.c | 6 - drivers/media/usb/cpia2/cpia2_v4l.c | 25 +- drivers/media/usb/cx231xx/cx231xx-417.c | 1 - drivers/media/usb/cx231xx/cx231xx-cards.c | 4 +- drivers/media/usb/cx231xx/cx231xx-core.c | 2 +- drivers/media/usb/cx231xx/cx231xx-video.c | 4 +- drivers/media/usb/cx231xx/cx231xx.h | 1 - drivers/media/usb/dvb-usb-v2/dvbsky.c | 26 +- drivers/media/usb/dvb-usb-v2/ec168.c | 2 +- drivers/media/usb/dvb-usb/cxusb.c | 161 -- drivers/media/usb/dvb-usb/dib0700_devices.c | 8 + drivers/media/usb/dvb-usb/pctv452e.c | 8 - drivers/media/usb/dvb-usb/technisat-usb2.c | 22 +- drivers/media/usb/em28xx/em28xx-cards.c | 4 +- drivers/media/usb/em28xx/em28xx-video.c | 11 +- drivers/media/usb/em28xx/em28xx.h | 4 +- drivers/media/usb/go7007/go7007-v4l2.c | 11 - drivers/media/usb/go7007/s2250-board.c | 6 +- drivers/media/usb/go7007/snd-go7007.c | 2 +- drivers/media/usb/gspca/gspca.c | 37 +- drivers/media/usb/gspca/konica.c | 5 + drivers/media/usb/gspca/nw80x.c | 5 + drivers/media/usb/gspca/ov519.c | 10 + drivers/media/usb/gspca/ov534.c | 5 + drivers/media/usb/gspca/ov534_9.c | 1 + drivers/media/usb/gspca/se401.c | 5 + drivers/media/usb/gspca/sn9c20x.c | 5 + drivers/media/usb/gspca/sonixb.c | 5 + drivers/media/usb/gspca/sonixj.c | 5 + drivers/media/usb/gspca/spca1528.c | 5 + drivers/media/usb/gspca/sq930x.c | 5 + drivers/media/usb/gspca/sunplus.c | 5 + drivers/media/usb/gspca/vc032x.c | 5 + drivers/media/usb/gspca/w996Xcf.c | 5 + drivers/media/usb/hdpvr/hdpvr-core.c | 13 +- drivers/media/usb/hdpvr/hdpvr-video.c | 3 - drivers/media/usb/msi2500/msi2500.c | 8 - drivers/media/usb/pvrusb2/pvrusb2-eeprom.c | 3 +- drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 3 +- drivers/media/usb/pwc/pwc-v4l.c | 5 - drivers/media/usb/s2255/s2255drv.c | 10 - drivers/media/usb/stk1160/stk1160-v4l.c | 2 - drivers/media/usb/stk1160/stk1160.h | 1 - drivers/media/usb/stkwebcam/stk-webcam.c | 5 - drivers/media/usb/tm6000/tm6000-cards.c | 2 +- drivers/media/usb/tm6000/tm6000-dvb.c | 3 + drivers/media/usb/tm6000/tm6000-video.c | 4 - drivers/media/usb/tm6000/tm6000.h | 1 - drivers/media/usb/ttusb-dec/ttusb_dec.c | 2 +- drivers/media/usb/usbtv/usbtv-video.c | 2 - drivers/media/usb/usbvision/usbvision-video.c | 18 +- drivers/media/usb/usbvision/usbvision.h | 1 - drivers/media/usb/uvc/uvc_v4l2.c | 2 - drivers/media/usb/zr364xx/zr364xx.c | 11 +- drivers/media/v4l2-core/Makefile | 10 +- drivers/media/v4l2-core/v4l2-async.c | 28 +- drivers/media/v4l2-core/v4l2-common.c | 4 + drivers/media/v4l2-core/v4l2-ctrls.c | 305 ++- drivers/media/v4l2-core/v4l2-dev.c | 3 + drivers/media/v4l2-core/v4l2-fwnode.c | 31 +- drivers/media/v4l2-core/v4l2-ioctl.c | 72 +- drivers/media/v4l2-core/v4l2-mem2mem.c | 47 +- drivers/media/v4l2-core/v4l2-subdev.c | 6 +- drivers/staging/media/Kconfig | 4 - drivers/staging/media/Makefile | 2 - drivers/staging/media/bcm2048/Kconfig | 14 - drivers/staging/media/bcm2048/Makefile | 2 - drivers/staging/media/bcm2048/TODO | 24 - drivers/staging/media/bcm2048/radio-bcm2048.c | 2689 -------------------- drivers/staging/media/bcm2048/radio-bcm2048.h | 26 - drivers/staging/media/davinci_vpfe/Kconfig | 13 - drivers/staging/media/davinci_vpfe/Makefile | 11 - drivers/staging/media/davinci_vpfe/TODO | 38 - .../staging/media/davinci_vpfe/davinci-vpfe-mc.txt | 154 -- .../staging/media/davinci_vpfe/davinci_vpfe_user.h | 1287 ---------- drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 1852 -------------- drivers/staging/media/davinci_vpfe/dm365_ipipe.h | 174 -- .../staging/media/davinci_vpfe/dm365_ipipe_hw.c | 1038 -------- .../staging/media/davinci_vpfe/dm365_ipipe_hw.h | 556 ---- drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 1070 -------- drivers/staging/media/davinci_vpfe/dm365_ipipeif.h | 228 -- .../media/davinci_vpfe/dm365_ipipeif_user.h | 90 - drivers/staging/media/davinci_vpfe/dm365_isif.c | 2097 --------------- drivers/staging/media/davinci_vpfe/dm365_isif.h | 200 -- .../staging/media/davinci_vpfe/dm365_isif_regs.h | 291 --- drivers/staging/media/davinci_vpfe/dm365_resizer.c | 1995 --------------- drivers/staging/media/davinci_vpfe/dm365_resizer.h | 241 -- drivers/staging/media/davinci_vpfe/vpfe.h | 83 - .../staging/media/davinci_vpfe/vpfe_mc_capture.c | 716 ------ .../staging/media/davinci_vpfe/vpfe_mc_capture.h | 90 - drivers/staging/media/davinci_vpfe/vpfe_video.c | 1646 ------------ drivers/staging/media/davinci_vpfe/vpfe_video.h | 150 -- drivers/staging/media/hantro/Kconfig | 2 +- drivers/staging/media/hantro/Makefile | 7 +- drivers/staging/media/hantro/hantro.h | 51 +- drivers/staging/media/hantro/hantro_drv.c | 106 +- drivers/staging/media/hantro/hantro_g1_h264_dec.c | 292 +++ drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c | 14 +- drivers/staging/media/hantro/hantro_g1_vp8_dec.c | 503 ++++ drivers/staging/media/hantro/hantro_h1_jpeg_enc.c | 11 +- drivers/staging/media/hantro/hantro_h264.c | 646 +++++ drivers/staging/media/hantro/hantro_hw.h | 80 + drivers/staging/media/hantro/hantro_v4l2.c | 11 + drivers/staging/media/hantro/hantro_vp8.c | 201 ++ drivers/staging/media/hantro/rk3288_vpu_hw.c | 41 +- drivers/staging/media/hantro/rk3399_vpu_hw.c | 39 +- .../staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c | 12 +- .../staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c | 14 +- .../staging/media/hantro/rk3399_vpu_hw_vp8_dec.c | 595 +++++ drivers/staging/media/imx/Kconfig | 4 +- drivers/staging/media/imx/imx-media-utils.c | 2 +- drivers/staging/media/imx/imx6-mipi-csi2.c | 12 +- drivers/staging/media/imx/imx7-media-csi.c | 30 +- drivers/staging/media/ipu3/ipu3.c | 3 +- drivers/staging/media/omap4iss/iss_video.c | 40 +- drivers/staging/media/omap4iss/iss_video.h | 2 - drivers/staging/media/soc_camera/soc_camera.c | 2 - drivers/staging/media/sunxi/cedrus/cedrus.c | 63 +- drivers/staging/media/sunxi/cedrus/cedrus.h | 7 +- drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 2 +- drivers/staging/media/sunxi/cedrus/cedrus_h264.c | 4 +- drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 3 - drivers/staging/media/sunxi/cedrus/cedrus_regs.h | 2 +- drivers/staging/media/sunxi/cedrus/cedrus_video.c | 28 +- drivers/staging/media/tegra-vde/Kconfig | 2 +- .../vc04_services/bcm2835-camera/bcm2835-camera.c | 29 - .../vc04_services/bcm2835-camera/mmal-common.h | 1 - include/linux/sort.h | 5 + include/media/davinci/vpfe_capture.h | 2 +- include/media/drv-intf/exynos-fimc.h | 2 - include/media/drv-intf/saa7146_vv.h | 1 - include/media/drv-intf/soc_mediabus.h | 2 - include/media/dvb-usb-ids.h | 1 + include/media/dvb_frontend.h | 21 +- include/media/h264-ctrls.h | 21 +- include/media/rc-map.h | 28 +- include/media/v4l2-async.h | 30 +- include/media/v4l2-ctrls.h | 12 +- include/media/v4l2-ioctl.h | 2 + include/media/vp8-ctrls.h | 112 + include/uapi/linux/videodev2.h | 6 +- lib/sort.c | 34 +- tools/testing/selftests/ir/ir_loopback.c | 6 +- 412 files changed, 12816 insertions(+), 22760 deletions(-) create mode 100644 Documentation/devicetree/bindings/media/allwinner,sun4i-a10-ir.yaml create mode 100644 Documentation/devicetree/bindings/media/rc.yaml delete mode 100644 Documentation/devicetree/bindings/media/sunxi-ir.txt create mode 100644 Documentation/media/uapi/rc/rc-protos.rst create mode 100644 Documentation/media/uapi/v4l/dev-decoder.rst create mode 100644 Documentation/media/uapi/v4l/pixfmt-bayer.rst delete mode 100644 Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst create mode 100644 drivers/media/i2c/ov5675.c create mode 100644 drivers/media/rc/keymaps/rc-khadas.c create mode 100644 drivers/media/rc/keymaps/rc-odroid.c create mode 100644 drivers/media/rc/keymaps/rc-tanix-tx3mini.c create mode 100644 drivers/media/rc/keymaps/rc-tanix-tx5max.c create mode 100644 drivers/media/rc/keymaps/rc-wetek-hub.c create mode 100644 drivers/media/rc/keymaps/rc-wetek-play2.c create mode 100644 drivers/media/rc/keymaps/rc-x96max.c delete mode 100644 drivers/staging/media/bcm2048/Kconfig delete mode 100644 drivers/staging/media/bcm2048/Makefile delete mode 100644 drivers/staging/media/bcm2048/TODO delete mode 100644 drivers/staging/media/bcm2048/radio-bcm2048.c delete mode 100644 drivers/staging/media/bcm2048/radio-bcm2048.h delete mode 100644 drivers/staging/media/davinci_vpfe/Kconfig delete mode 100644 drivers/staging/media/davinci_vpfe/Makefile delete mode 100644 drivers/staging/media/davinci_vpfe/TODO delete mode 100644 drivers/staging/media/davinci_vpfe/davinci-vpfe-mc.txt delete mode 100644 drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipe.c delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipe.h delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.c delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.h delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipeif.c delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipeif.h delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipeif_user.h delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_isif.c delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_isif.h delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_isif_regs.h delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_resizer.c delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_resizer.h delete mode 100644 drivers/staging/media/davinci_vpfe/vpfe.h delete mode 100644 drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c delete mode 100644 drivers/staging/media/davinci_vpfe/vpfe_mc_capture.h delete mode 100644 drivers/staging/media/davinci_vpfe/vpfe_video.c delete mode 100644 drivers/staging/media/davinci_vpfe/vpfe_video.h create mode 100644 drivers/staging/media/hantro/hantro_g1_h264_dec.c create mode 100644 drivers/staging/media/hantro/hantro_g1_vp8_dec.c create mode 100644 drivers/staging/media/hantro/hantro_h264.c create mode 100644 drivers/staging/media/hantro/hantro_vp8.c create mode 100644 drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c create mode 100644 include/media/vp8-ctrls.h Merging v4l-dvb-next/master (5f9e832c1370 Linus 5.3-rc1) $ git merge v4l-dvb-next/master Already up to date. Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe()) $ git merge fbdev/fbdev-for-next Already up to date. Merging pm/linux-next (ca1c6e855bcd Merge branches 'pm-sleep', 'pm-cpufreq', 'pm-qos' and 'pm-tools' into linux-next) $ git merge pm/linux-next Auto-merging include/linux/cpuidle.h Auto-merging include/linux/acpi.h Auto-merging drivers/cpuidle/Makefile Merge made by the 'recursive' strategy. Documentation/ABI/testing/sysfs-class-wakeup | 76 +++ Documentation/ABI/testing/sysfs-power | 106 ++++ .../leds.txt => firmware-guide/acpi/dsd/leds.rst} | 20 +- Documentation/firmware-guide/acpi/index.rst | 1 + Documentation/power/pm_qos_interface.rst | 5 +- Documentation/virtual/guest-halt-polling.txt | 78 +++ arch/x86/Kconfig | 7 + arch/x86/include/asm/cpuidle_haltpoll.h | 8 + arch/x86/kernel/kvm.c | 42 ++ arch/x86/kernel/process.c | 2 +- drivers/acpi/acpi_processor.c | 10 +- drivers/acpi/acpica/aclocal.h | 4 +- drivers/acpi/acpica/acobject.h | 2 +- drivers/acpi/acpica/acstruct.h | 2 +- drivers/acpi/acpica/acutils.h | 10 +- drivers/acpi/acpica/dbhistry.c | 2 +- drivers/acpi/acpica/dbinput.c | 10 +- drivers/acpi/acpica/dbmethod.c | 4 + drivers/acpi/acpica/dbobject.c | 1 - drivers/acpi/acpica/dbstats.c | 92 ++-- drivers/acpi/acpica/evxfgpe.c | 6 +- drivers/acpi/acpica/exdump.c | 6 +- drivers/acpi/acpica/nsaccess.c | 2 +- drivers/acpi/acpica/nsalloc.c | 2 +- drivers/acpi/acpica/nsdump.c | 2 +- drivers/acpi/acpica/nsrepair2.c | 2 +- drivers/acpi/acpica/tbdata.c | 1 + drivers/acpi/acpica/utdebug.c | 4 +- drivers/acpi/acpica/uterror.c | 6 +- drivers/acpi/acpica/utosi.c | 3 +- drivers/acpi/acpica/utownerid.c | 12 +- drivers/acpi/apei/ghes.c | 19 +- drivers/acpi/device_pm.c | 7 +- drivers/acpi/ec.c | 58 +- drivers/acpi/hmat/hmat.c | 143 ++++- drivers/acpi/internal.h | 6 +- drivers/acpi/pci_link.c | 4 +- drivers/acpi/sleep.c | 154 +++--- drivers/base/power/Makefile | 2 +- drivers/base/power/main.c | 35 +- drivers/base/power/power.h | 18 + drivers/base/power/sysfs.c | 6 + drivers/base/power/wakeup.c | 72 ++- drivers/base/power/wakeup_stats.c | 214 ++++++++ drivers/cpufreq/cpufreq.c | 2 +- drivers/cpufreq/intel_pstate.c | 120 +++- drivers/cpuidle/Kconfig | 20 + drivers/cpuidle/Makefile | 1 + drivers/cpuidle/cpuidle-haltpoll.c | 75 +++ drivers/cpuidle/cpuidle.c | 30 + drivers/cpuidle/governors/Makefile | 1 + drivers/cpuidle/governors/haltpoll.c | 150 +++++ drivers/cpuidle/governors/ladder.c | 21 +- drivers/cpuidle/governors/menu.c | 21 +- drivers/cpuidle/governors/teo.c | 60 +- drivers/cpuidle/poll_state.c | 11 +- drivers/cpuidle/sysfs.c | 7 + drivers/platform/x86/intel-hid.c | 40 +- drivers/platform/x86/intel-vbtn.c | 26 +- fs/eventpoll.c | 4 +- include/acpi/acconfig.h | 4 +- include/acpi/acpiosxf.h | 1 + include/acpi/acpixf.h | 10 +- include/acpi/actypes.h | 20 +- include/linux/acpi.h | 4 + include/linux/cpuidle.h | 7 + include/linux/cpuidle_haltpoll.h | 16 + include/linux/interrupt.h | 1 + include/linux/pm.h | 4 - include/linux/pm_domain.h | 16 +- include/linux/pm_qos.h | 6 - include/linux/pm_wakeup.h | 21 +- include/linux/suspend.h | 4 +- include/trace/events/power.h | 8 +- kernel/irq/pm.c | 20 + kernel/power/autosleep.c | 2 +- kernel/power/main.c | 99 +++- kernel/power/qos.c | 48 -- kernel/power/suspend.c | 65 +-- kernel/power/wakelock.c | 32 +- kernel/time/alarmtimer.c | 2 +- tools/power/acpi/tools/acpidump/apfiles.c | 10 +- tools/power/pm-graph/README | 6 +- tools/power/pm-graph/bootgraph.py | 59 +- tools/power/pm-graph/sleepgraph.8 | 8 +- tools/power/pm-graph/sleepgraph.py | 610 ++++++++++++--------- 86 files changed, 2111 insertions(+), 827 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-class-wakeup rename Documentation/{acpi/dsd/leds.txt => firmware-guide/acpi/dsd/leds.rst} (90%) create mode 100644 Documentation/virtual/guest-halt-polling.txt create mode 100644 arch/x86/include/asm/cpuidle_haltpoll.h create mode 100644 drivers/base/power/wakeup_stats.c create mode 100644 drivers/cpuidle/cpuidle-haltpoll.c create mode 100644 drivers/cpuidle/governors/haltpoll.c create mode 100644 include/linux/cpuidle_haltpoll.h Merging cpufreq-arm/cpufreq/arm/linux-next (c7b48823a13f Merge branch 'cpufreq/qcom-updates' into cpufreq/arm/linux-next) $ git merge cpufreq-arm/cpufreq/arm/linux-next Removing drivers/cpufreq/qcom-cpufreq-kryo.c Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. .../{kryo-cpufreq.txt => qcom-nvmem-cpufreq.txt} | 125 +++++++- Documentation/devicetree/bindings/opp/qcom-opp.txt | 19 ++ .../bindings/opp/sun50i-nvmem-cpufreq.txt | 167 ++++++++++ MAINTAINERS | 11 +- drivers/cpufreq/Kconfig.arm | 16 +- drivers/cpufreq/Makefile | 3 +- drivers/cpufreq/armada-8k-cpufreq.c | 2 + drivers/cpufreq/cpufreq-dt-platdev.c | 5 + drivers/cpufreq/imx-cpufreq-dt.c | 8 +- drivers/cpufreq/mediatek-cpufreq.c | 4 +- drivers/cpufreq/qcom-cpufreq-hw.c | 20 +- drivers/cpufreq/qcom-cpufreq-kryo.c | 249 --------------- drivers/cpufreq/qcom-cpufreq-nvmem.c | 352 +++++++++++++++++++++ drivers/cpufreq/sun50i-cpufreq-nvmem.c | 226 +++++++++++++ drivers/cpufreq/ti-cpufreq.c | 1 + drivers/opp/core.c | 68 +++- include/linux/pm_opp.h | 12 +- 17 files changed, 1009 insertions(+), 279 deletions(-) rename Documentation/devicetree/bindings/opp/{kryo-cpufreq.txt => qcom-nvmem-cpufreq.txt} (87%) create mode 100644 Documentation/devicetree/bindings/opp/qcom-opp.txt create mode 100644 Documentation/devicetree/bindings/opp/sun50i-nvmem-cpufreq.txt delete mode 100644 drivers/cpufreq/qcom-cpufreq-kryo.c create mode 100644 drivers/cpufreq/qcom-cpufreq-nvmem.c create mode 100644 drivers/cpufreq/sun50i-cpufreq-nvmem.c Merging cpupower/cpupower (04507c0a9385 cpupower : frequency-set -r option misses the last cpu in related cpu list) $ git merge cpupower/cpupower Already up to date. Merging opp/opp/linux-next (0203c0343a1f Merge branch 'opp/qcom-updates' into opp/linux-next) $ git merge opp/opp/linux-next Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/opp/opp.txt | 4 ++-- Documentation/power/opp.rst | 2 +- drivers/opp/core.c | 17 ++++++++++++--- drivers/opp/of.c | 30 +++++++++------------------ 4 files changed, 27 insertions(+), 26 deletions(-) Merging thermal/next (d093f91ff7d0 Merge branch 'for-rc' into next) $ git merge thermal/next CONFLICT (rename/add): Rename Documentation/thermal/index.rst->Documentation/driver-api/thermal/index.rst in HEAD. Documentation/driver-api/thermal/index.rst added in thermal/next Adding as Documentation/driver-api/thermal/index.rst~thermal_next instead Auto-merging drivers/thermal/intel/int340x_thermal/processor_thermal_device.c Auto-merging MAINTAINERS Auto-merging Documentation/driver-api/index.rst Automatic merge failed; fix conflicts and then commit the result. $ git commit --no-edit -v -a [master b53f62b35607] Merge remote-tracking branch 'thermal/next' $ git diff -M --stat --summary HEAD^.. .../intel/int340x_thermal/acpi_thermal_rel.c | 6 -- .../int340x_thermal/processor_thermal_device.c | 91 +++++++++++++++++++++- drivers/thermal/thermal_core.c | 19 +++-- 3 files changed, 101 insertions(+), 15 deletions(-) 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 (a48f9721e6db dlm: no need to check return value of debugfs_create functions) $ git merge dlm/next Already up to date. Merging swiotlb/linux-next (4cdfb27ba80d xen/swiotlb: remember having called xen_create_contiguous_region()) $ git merge swiotlb/linux-next Auto-merging include/linux/page-flags.h Merge made by the 'recursive' strategy. Merging rdma/for-next (77905379e9b2 RDMA/hns: Remove unuseful member) $ git merge rdma/for-next Auto-merging net/sunrpc/xprtrdma/verbs.c Auto-merging net/sunrpc/xprtrdma/svc_rdma_transport.c Auto-merging include/rdma/ib_verbs.h Auto-merging include/linux/mlx5/mlx5_ifc.h Auto-merging include/linux/mlx5/device.h Auto-merging drivers/net/ethernet/qlogic/qed/qed_rdma.c Auto-merging drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch.h Auto-merging drivers/infiniband/sw/siw/siw_verbs.c Auto-merging drivers/infiniband/hw/mlx5/odp.c Auto-merging drivers/infiniband/hw/mlx5/main.c Auto-merging drivers/infiniband/hw/mlx5/devx.c Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v1.c Auto-merging drivers/infiniband/hw/hfi1/verbs.c Auto-merging drivers/infiniband/core/user_mad.c Auto-merging drivers/infiniband/core/nldev.c Auto-merging drivers/infiniband/core/device.c Auto-merging drivers/infiniband/core/counters.c Auto-merging drivers/infiniband/core/core_priv.h Merge made by the 'recursive' strategy. drivers/infiniband/core/addr.c | 2 +- drivers/infiniband/core/cache.c | 1 + drivers/infiniband/core/cma_configfs.c | 8 +- drivers/infiniband/core/core_priv.h | 24 +- drivers/infiniband/core/counters.c | 8 +- drivers/infiniband/core/cq.c | 28 + drivers/infiniband/core/device.c | 128 ++-- drivers/infiniband/core/iwpm_msg.c | 8 +- drivers/infiniband/core/iwpm_util.c | 6 +- drivers/infiniband/core/netlink.c | 63 +- drivers/infiniband/core/nldev.c | 20 +- drivers/infiniband/core/sa_query.c | 2 +- drivers/infiniband/core/sysfs.c | 30 +- drivers/infiniband/core/user_mad.c | 2 +- drivers/infiniband/core/uverbs_main.c | 4 + drivers/infiniband/core/verbs.c | 1 + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 4 +- drivers/infiniband/hw/bnxt_re/main.c | 1 - drivers/infiniband/hw/cxgb3/iwch_provider.c | 45 +- drivers/infiniband/hw/cxgb4/provider.c | 24 - drivers/infiniband/hw/efa/efa.h | 3 + drivers/infiniband/hw/efa/efa_com.c | 70 +- drivers/infiniband/hw/efa/efa_com_cmd.c | 165 +++-- drivers/infiniband/hw/efa/efa_com_cmd.h | 23 + drivers/infiniband/hw/efa/efa_main.c | 2 + drivers/infiniband/hw/efa/efa_verbs.c | 77 +- drivers/infiniband/hw/hfi1/user_sdma.h | 6 - drivers/infiniband/hw/hfi1/verbs.c | 17 +- drivers/infiniband/hw/hns/Kconfig | 8 - drivers/infiniband/hw/hns/hns_roce_cmd.c | 1 - drivers/infiniband/hw/hns/hns_roce_cq.c | 186 +++-- drivers/infiniband/hw/hns/hns_roce_device.h | 78 +- drivers/infiniband/hw/hns/hns_roce_hem.c | 218 +++--- drivers/infiniband/hw/hns/hns_roce_hem.h | 6 +- drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 16 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 811 +++++++++++---------- drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 2 - drivers/infiniband/hw/hns/hns_roce_main.c | 3 +- drivers/infiniband/hw/hns/hns_roce_mr.c | 427 ++++++----- drivers/infiniband/hw/hns/hns_roce_qp.c | 260 ++++--- drivers/infiniband/hw/hns/hns_roce_srq.c | 310 ++++---- drivers/infiniband/hw/i40iw/i40iw_verbs.c | 11 - drivers/infiniband/hw/mlx4/main.c | 3 +- drivers/infiniband/hw/mlx4/mr.c | 7 +- drivers/infiniband/hw/mlx4/qp.c | 242 +++--- drivers/infiniband/hw/mlx5/devx.c | 27 + drivers/infiniband/hw/mlx5/main.c | 119 +-- drivers/infiniband/hw/mlx5/mlx5_ib.h | 1 + drivers/infiniband/hw/mlx5/odp.c | 24 - drivers/infiniband/hw/mlx5/qp.c | 25 +- drivers/infiniband/hw/mlx5/srq_cmd.c | 6 +- drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 4 +- drivers/infiniband/hw/qedr/main.c | 2 +- drivers/infiniband/hw/qedr/qedr.h | 2 +- drivers/infiniband/hw/qedr/verbs.c | 7 +- drivers/infiniband/hw/qib/qib_file_ops.c | 3 +- drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 9 +- drivers/infiniband/sw/rxe/rxe.h | 4 - drivers/infiniband/sw/rxe/rxe_param.h | 2 +- drivers/infiniband/sw/rxe/rxe_verbs.c | 6 +- drivers/infiniband/sw/siw/siw_verbs.c | 3 +- drivers/infiniband/ulp/srpt/ib_srpt.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 4 + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 12 +- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 184 +++-- drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 27 +- .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 56 +- drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 71 +- drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h | 16 +- .../net/ethernet/mellanox/mlx5/core/fs_counters.c | 125 ++-- drivers/net/ethernet/mellanox/mlx5/core/main.c | 5 +- drivers/net/ethernet/mellanox/mlx5/core/qp.c | 8 +- drivers/net/ethernet/mellanox/mlx5/core/rl.c | 6 +- drivers/net/ethernet/qlogic/qed/qed_rdma.c | 5 +- fs/cifs/smbdirect.c | 10 +- include/Kbuild | 6 - include/linux/mlx5/device.h | 9 + include/linux/mlx5/driver.h | 4 +- include/linux/mlx5/mlx5_ifc.h | 34 +- include/linux/qed/qed_rdma_if.h | 2 +- include/rdma/ib.h | 2 + include/rdma/ib_verbs.h | 71 ++ include/rdma/iw_portmap.h | 3 + include/rdma/opa_port_info.h | 2 + include/rdma/rdma_netlink.h | 10 +- include/rdma/rdmavt_cq.h | 1 + include/rdma/signature.h | 2 + net/9p/trans_rdma.c | 6 +- net/sunrpc/xprtrdma/svc_rdma_transport.c | 8 +- net/sunrpc/xprtrdma/verbs.c | 13 +- 90 files changed, 2542 insertions(+), 1769 deletions(-) Merging net-next/master (2b9b5e74507f net: stmmac: dwc-qos: use devm_platform_ioremap_resource() to simplify code) $ git merge net-next/master Auto-merging tools/testing/selftests/bpf/Makefile Auto-merging scripts/link-vmlinux.sh CONFLICT (content): Merge conflict in scripts/link-vmlinux.sh Auto-merging net/xdp/xdp_umem.c Auto-merging net/wireless/util.c Auto-merging net/wireless/reg.c Auto-merging net/rxrpc/rxkad.c Auto-merging net/rxrpc/call_object.c Auto-merging net/rxrpc/ar-internal.h Auto-merging net/mac80211/cfg.c Removing include/linux/platform_data/nxp-nci.h Removing include/linux/netfilter/ipset/ip_set_timeout.h Removing include/linux/netfilter/ipset/ip_set_skbinfo.h Removing include/linux/netfilter/ipset/ip_set_counter.h Removing include/linux/netfilter/ipset/ip_set_comment.h Auto-merging include/linux/mlx5/driver.h Removing include/linux/can/platform/rcar_can.h Auto-merging include/Kbuild Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c Auto-merging drivers/net/ethernet/ti/cpsw.c Auto-merging drivers/net/ethernet/netronome/nfp/flower/offload.c Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch.c Removing drivers/net/ethernet/mellanox/mlx5/core/en/reporter.h Auto-merging drivers/net/ethernet/mellanox/mlx5/core/cmd.c Removing drivers/net/dsa/microchip/ksz_priv.h Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts Auto-merging MAINTAINERS Auto-merging Documentation/networking/index.rst Resolved 'scripts/link-vmlinux.sh' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit --no-edit -v -a [master 9965bd6e9ef8] Merge remote-tracking branch 'net-next/master' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/sysfs-kernel-btf | 17 + Documentation/PCI/pci-error-recovery.rst | 1 - Documentation/bpf/prog_flow_dissector.rst | 18 + .../devicetree/bindings/net/adi,adin.yaml | 73 + .../bindings/net/aspeed,ast2600-mdio.yaml | 45 + .../devicetree/bindings/net/can/fsl-flexcan.txt | 10 + .../devicetree/bindings/net/can/tcan4x5x.txt | 37 + Documentation/devicetree/bindings/net/dsa/ksz.txt | 3 + .../devicetree/bindings/net/dsa/marvell.txt | 2 +- .../devicetree/bindings/net/fsl-enetc.txt | 42 +- .../devicetree/bindings/net/mediatek-net.txt | 1 + .../devicetree/bindings/net/mscc-ocelot.txt | 20 +- .../networking/device_drivers/mellanox/mlx5.rst | 33 +- .../networking/devlink-trap-netdevsim.rst | 20 + Documentation/networking/devlink-trap.rst | 208 ++ Documentation/networking/index.rst | 2 + Documentation/networking/ip-sysctl.txt | 6 + MAINTAINERS | 17 +- arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 40 + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 6 + drivers/atm/eni.c | 2 +- drivers/atm/he.c | 7 +- drivers/atm/solos-pci.c | 9 +- drivers/bcma/host_pci.c | 6 +- drivers/crypto/chelsio/chtls/chtls_io.c | 6 +- drivers/hsi/clients/ssi_protocol.c | 3 +- drivers/infiniband/hw/hfi1/vnic_sdma.c | 4 +- drivers/infiniband/ulp/ipoib/ipoib_ib.c | 3 +- drivers/net/bonding/bond_debugfs.c | 5 - drivers/net/caif/caif_serial.c | 26 +- drivers/net/caif/caif_virtio.c | 6 +- drivers/net/can/Kconfig | 13 + drivers/net/can/Makefile | 1 + drivers/net/can/flexcan.c | 138 +- drivers/net/can/janz-ican3.c | 1 - drivers/net/can/kvaser_pciefd.c | 1907 +++++++++++ drivers/net/can/m_can/Kconfig | 22 +- drivers/net/can/m_can/Makefile | 2 + drivers/net/can/m_can/m_can.c | 1079 +++--- drivers/net/can/m_can/m_can.h | 110 + drivers/net/can/m_can/m_can_platform.c | 201 ++ drivers/net/can/m_can/tcan4x5x.c | 527 +++ drivers/net/can/rcar/rcar_can.c | 23 +- drivers/net/can/rcar/rcar_canfd.c | 2 - drivers/net/can/sja1000/Kconfig | 79 +- drivers/net/can/sja1000/Makefile | 11 +- drivers/net/can/sja1000/f81601.c | 211 ++ drivers/net/can/sja1000/peak_pci.c | 2 +- drivers/net/can/spi/hi311x.c | 59 +- drivers/net/can/spi/mcp251x.c | 118 +- drivers/net/can/sun4i_can.c | 1 - drivers/net/can/ti_hecc.c | 268 +- drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 3 +- drivers/net/can/vcan.c | 19 +- drivers/net/can/xilinx_can.c | 292 +- drivers/net/dsa/b53/b53_common.c | 7 +- drivers/net/dsa/b53/b53_srab.c | 8 +- drivers/net/dsa/bcm_sf2.c | 7 +- drivers/net/dsa/lan9303-core.c | 6 + drivers/net/dsa/lantiq_gswip.c | 16 +- drivers/net/dsa/microchip/Kconfig | 18 +- drivers/net/dsa/microchip/Makefile | 2 + drivers/net/dsa/microchip/ksz8795.c | 1310 ++++++++ drivers/net/dsa/microchip/ksz8795_reg.h | 1004 ++++++ drivers/net/dsa/microchip/ksz8795_spi.c | 103 + drivers/net/dsa/microchip/ksz9477.c | 1 - drivers/net/dsa/microchip/ksz9477_spi.c | 1 - drivers/net/dsa/microchip/ksz_common.c | 21 +- drivers/net/dsa/microchip/ksz_common.h | 173 +- drivers/net/dsa/microchip/ksz_priv.h | 155 - drivers/net/dsa/mt7530.c | 6 + drivers/net/dsa/mv88e6xxx/chip.c | 386 ++- drivers/net/dsa/mv88e6xxx/chip.h | 25 +- drivers/net/dsa/mv88e6xxx/global1.c | 95 +- drivers/net/dsa/mv88e6xxx/global1.h | 5 +- drivers/net/dsa/mv88e6xxx/global1_atu.c | 7 +- drivers/net/dsa/mv88e6xxx/global1_vtu.c | 6 +- drivers/net/dsa/mv88e6xxx/global2.c | 72 +- drivers/net/dsa/mv88e6xxx/global2.h | 12 +- drivers/net/dsa/mv88e6xxx/global2_avb.c | 29 +- drivers/net/dsa/mv88e6xxx/global2_scratch.c | 3 +- drivers/net/dsa/mv88e6xxx/port.c | 38 + drivers/net/dsa/mv88e6xxx/port.h | 2 + drivers/net/dsa/mv88e6xxx/ptp.c | 95 +- drivers/net/dsa/mv88e6xxx/ptp.h | 6 +- drivers/net/dsa/mv88e6xxx/smi.c | 4 +- drivers/net/ethernet/3com/3c59x.c | 8 +- drivers/net/ethernet/aeroflex/greth.c | 2 +- drivers/net/ethernet/agere/et131x.c | 6 +- drivers/net/ethernet/amd/au1000_eth.c | 1 - drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c | 107 +- drivers/net/ethernet/amd/xgbe/xgbe-desc.c | 2 +- drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 +- drivers/net/ethernet/amd/xgbe/xgbe-platform.c | 33 +- drivers/net/ethernet/apm/xgene-v2/main.c | 4 +- drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 10 +- drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 8 +- drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c | 10 +- drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 10 +- drivers/net/ethernet/apple/bmac.c | 4 +- drivers/net/ethernet/atheros/ag71xx.c | 4 +- drivers/net/ethernet/atheros/alx/main.c | 10 +- drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 12 +- drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 3 +- drivers/net/ethernet/atheros/atlx/atl1.c | 11 +- drivers/net/ethernet/aurora/nb8800.c | 4 +- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 9 +- drivers/net/ethernet/broadcom/bcmsysport.c | 4 +- drivers/net/ethernet/broadcom/bgmac-platform.c | 4 +- drivers/net/ethernet/broadcom/bgmac.c | 2 +- drivers/net/ethernet/broadcom/bnx2.c | 6 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 552 +++- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 96 +- drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.c | 39 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 156 +- drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 109 +- drivers/net/ethernet/broadcom/cnic.c | 5 + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 +- drivers/net/ethernet/broadcom/tg3.c | 6 +- drivers/net/ethernet/brocade/bna/bnad.c | 2 +- drivers/net/ethernet/calxeda/xgmac.c | 2 +- drivers/net/ethernet/cavium/liquidio/lio_main.c | 23 +- drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 23 +- .../net/ethernet/cavium/liquidio/octeon_mailbox.c | 4 +- drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 6 +- drivers/net/ethernet/chelsio/cxgb3/sge.c | 4 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 5 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 3 - drivers/net/ethernet/chelsio/cxgb4/smt.c | 18 +- drivers/net/ethernet/chelsio/cxgb4/smt.h | 2 +- .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 21 +- drivers/net/ethernet/cirrus/cs89x0.c | 4 +- drivers/net/ethernet/cortina/gemini.c | 9 +- drivers/net/ethernet/davicom/dm9000.c | 2 - drivers/net/ethernet/emulex/benet/be.h | 2 +- drivers/net/ethernet/emulex/benet/be_ethtool.c | 7 +- drivers/net/ethernet/emulex/benet/be_main.c | 21 +- drivers/net/ethernet/ezchip/nps_enet.c | 4 +- drivers/net/ethernet/faraday/Kconfig | 1 + drivers/net/ethernet/faraday/ftgmac100.c | 39 +- drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 8 +- drivers/net/ethernet/freescale/dpaa/dpaa_eth.h | 3 +- .../ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c | 54 +- .../ethernet/freescale/dpaa2/dpaa2-eth-debugfs.h | 3 - drivers/net/ethernet/freescale/enetc/Kconfig | 9 + drivers/net/ethernet/freescale/enetc/Makefile | 19 +- drivers/net/ethernet/freescale/enetc/enetc.c | 2 +- drivers/net/ethernet/freescale/enetc/enetc_mdio.c | 97 +- drivers/net/ethernet/freescale/enetc/enetc_mdio.h | 12 + .../net/ethernet/freescale/enetc/enetc_pci_mdio.c | 101 + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 5 +- drivers/net/ethernet/freescale/fec_main.c | 8 +- .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- drivers/net/ethernet/hisilicon/hisi_femac.c | 1 - drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 2 +- drivers/net/ethernet/hisilicon/hns/hns_enet.c | 6 +- drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 2 + drivers/net/ethernet/hisilicon/hns3/hnae3.c | 9 +- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 36 +- drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 21 +- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 339 +- drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 33 +- drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 132 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 43 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 32 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 11 + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 143 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 109 +- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 737 ++++- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 18 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 47 +- .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 2 + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 20 +- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c | 16 +- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.h | 7 +- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 100 +- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 7 +- drivers/net/ethernet/huawei/hinic/hinic_tx.c | 2 +- drivers/net/ethernet/ibm/emac/core.c | 2 +- drivers/net/ethernet/ibm/ibmvnic.c | 2 +- drivers/net/ethernet/intel/e1000/e1000_main.c | 3 +- drivers/net/ethernet/intel/e1000e/ich8lan.c | 10 + drivers/net/ethernet/intel/e1000e/ich8lan.h | 2 +- drivers/net/ethernet/intel/e1000e/netdev.c | 10 +- drivers/net/ethernet/intel/fm10k/fm10k.h | 10 +- drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c | 6 +- drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c | 2 - drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 15 +- drivers/net/ethernet/intel/fm10k/fm10k_iov.c | 5 +- drivers/net/ethernet/intel/fm10k/fm10k_main.c | 20 +- drivers/net/ethernet/intel/fm10k/fm10k_mbx.c | 11 +- drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 20 +- drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 24 +- drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 15 +- drivers/net/ethernet/intel/fm10k/fm10k_tlv.c | 9 +- drivers/net/ethernet/intel/fm10k/fm10k_type.h | 2 +- drivers/net/ethernet/intel/fm10k/fm10k_vf.c | 25 +- drivers/net/ethernet/intel/i40e/i40e.h | 1 + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 22 +- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 74 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 19 +- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 6 +- drivers/net/ethernet/intel/i40e/i40e_txrx.h | 2 +- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 54 +- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 1 + drivers/net/ethernet/intel/iavf/iavf_txrx.c | 6 +- drivers/net/ethernet/intel/iavf/iavf_txrx.h | 2 +- drivers/net/ethernet/intel/ice/ice.h | 16 +- drivers/net/ethernet/intel/ice/ice_common.c | 72 +- drivers/net/ethernet/intel/ice/ice_common.h | 6 +- drivers/net/ethernet/intel/ice/ice_controlq.c | 112 +- drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 149 +- drivers/net/ethernet/intel/ice/ice_ethtool.c | 131 +- drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 34 +- drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 1 + drivers/net/ethernet/intel/ice/ice_lib.c | 128 +- drivers/net/ethernet/intel/ice/ice_main.c | 428 +-- drivers/net/ethernet/intel/ice/ice_txrx.c | 150 +- drivers/net/ethernet/intel/ice/ice_txrx.h | 13 + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 169 +- drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | 25 +- drivers/net/ethernet/intel/igb/igb_main.c | 8 +- drivers/net/ethernet/intel/igbvf/netdev.c | 2 +- drivers/net/ethernet/intel/igc/igc_base.c | 5 +- drivers/net/ethernet/intel/igc/igc_defines.h | 2 +- drivers/net/ethernet/intel/igc/igc_hw.h | 14 +- drivers/net/ethernet/intel/igc/igc_main.c | 8 +- drivers/net/ethernet/intel/ixgb/ixgb_main.c | 4 +- drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c | 22 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 13 +- drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 9 +- drivers/net/ethernet/jme.c | 15 +- drivers/net/ethernet/lantiq_xrx200.c | 10 +- drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +- drivers/net/ethernet/marvell/mvneta.c | 8 +- drivers/net/ethernet/marvell/mvneta_bm.c | 4 +- drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 3 +- drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c | 19 +- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 75 +- drivers/net/ethernet/marvell/pxa168_eth.c | 3 +- drivers/net/ethernet/marvell/skge.c | 45 +- drivers/net/ethernet/marvell/sky2.c | 3 +- drivers/net/ethernet/mediatek/Kconfig | 2 +- drivers/net/ethernet/mediatek/mtk_eth_path.c | 4 + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 494 ++- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 55 +- drivers/net/ethernet/mellanox/mlx4/crdump.c | 7 +- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 43 +- drivers/net/ethernet/mellanox/mlx4/en_tx.c | 4 +- drivers/net/ethernet/mellanox/mlx4/main.c | 66 +- drivers/net/ethernet/mellanox/mlx5/core/Makefile | 5 +- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 51 +- drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 102 +- drivers/net/ethernet/mellanox/mlx5/core/en.h | 36 +- drivers/net/ethernet/mellanox/mlx5/core/en/fs.h | 16 +- .../net/ethernet/mellanox/mlx5/core/en/health.c | 205 ++ .../net/ethernet/mellanox/mlx5/core/en/health.h | 53 + .../net/ethernet/mellanox/mlx5/core/en/reporter.h | 15 - .../ethernet/mellanox/mlx5/core/en/reporter_rx.c | 404 +++ .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 256 +- .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 33 +- drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 24 +- drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 36 +- drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h | 66 +- .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 29 +- .../net/ethernet/mellanox/mlx5/core/en/xsk/tx.c | 7 + .../net/ethernet/mellanox/mlx5/core/en_common.c | 12 - drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 2 +- .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 28 +- .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 11 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 102 +- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 82 +- drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | 6 + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 88 +- drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 9 + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 5 + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 972 ++++-- drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 35 +- drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 9 +- drivers/net/ethernet/mellanox/mlx5/core/eq.c | 11 +- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 38 +- drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 8 +- .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 33 +- .../net/ethernet/mellanox/mlx5/core/fs_counters.c | 325 +- drivers/net/ethernet/mellanox/mlx5/core/lib/eq.h | 2 +- .../net/ethernet/mellanox/mlx5/core/lib/vxlan.c | 9 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 7 +- .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 2 +- drivers/net/ethernet/mellanox/mlx5/core/vport.c | 7 +- drivers/net/ethernet/mellanox/mlx5/core/wq.c | 5 + drivers/net/ethernet/mellanox/mlx5/core/wq.h | 1 + drivers/net/ethernet/mellanox/mlxsw/Kconfig | 6 +- drivers/net/ethernet/mellanox/mlxsw/Makefile | 2 +- drivers/net/ethernet/mellanox/mlxsw/core.c | 64 + drivers/net/ethernet/mellanox/mlxsw/core.h | 12 + drivers/net/ethernet/mellanox/mlxsw/pci.h | 1 + drivers/net/ethernet/mellanox/mlxsw/reg.h | 12 + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 100 +- drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 20 +- drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 17 +- .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 22 + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 4 +- .../net/ethernet/mellanox/mlxsw/spectrum_trap.c | 267 ++ drivers/net/ethernet/mellanox/mlxsw/trap.h | 7 + drivers/net/ethernet/micrel/ks8851_mll.c | 7 +- drivers/net/ethernet/microchip/lan743x_main.c | 5 +- drivers/net/ethernet/mscc/ocelot.c | 401 ++- drivers/net/ethernet/mscc/ocelot.h | 49 +- drivers/net/ethernet/mscc/ocelot_board.c | 145 +- drivers/net/ethernet/mscc/ocelot_ptp.h | 41 + drivers/net/ethernet/mscc/ocelot_regs.c | 11 + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 19 +- drivers/net/ethernet/netronome/nfp/flower/action.c | 160 +- drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 25 +- drivers/net/ethernet/netronome/nfp/flower/main.c | 1 + drivers/net/ethernet/netronome/nfp/flower/main.h | 19 + .../net/ethernet/netronome/nfp/flower/offload.c | 197 +- .../ethernet/netronome/nfp/flower/tunnel_conf.c | 200 +- .../net/ethernet/netronome/nfp/nfp_net_common.c | 6 +- .../net/ethernet/netronome/nfp/nfp_net_debugfs.c | 17 +- drivers/net/ethernet/nuvoton/w90p910_ether.c | 2 - drivers/net/ethernet/nvidia/forcedeth.c | 3 +- drivers/net/ethernet/qlogic/Kconfig | 9 - drivers/net/ethernet/qlogic/Makefile | 1 - .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 4 +- drivers/net/ethernet/qlogic/qed/qed_hsi.h | 17 + drivers/net/ethernet/qlogic/qed/qed_l2.c | 34 +- drivers/net/ethernet/qlogic/qed/qed_main.c | 74 +- drivers/net/ethernet/qlogic/qed/qed_mcp.c | 32 + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 20 + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 3 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 2 +- drivers/net/ethernet/qualcomm/emac/emac-mac.c | 12 +- drivers/net/ethernet/qualcomm/emac/emac.c | 12 +- drivers/net/ethernet/qualcomm/qca_debug.c | 13 +- drivers/net/ethernet/realtek/r8169_main.c | 617 ++-- .../net/ethernet/samsung/sxgbe/sxgbe_platform.c | 4 +- drivers/net/ethernet/sfc/ef10.c | 4 +- drivers/net/ethernet/sfc/efx.c | 10 +- drivers/net/ethernet/sfc/falcon/efx.c | 6 +- drivers/net/ethernet/sfc/falcon/falcon_boards.c | 18 +- drivers/net/ethernet/sfc/falcon/rx.c | 5 +- drivers/net/ethernet/sfc/rx.c | 5 +- drivers/net/ethernet/sfc/tx.c | 2 +- drivers/net/ethernet/sis/sis900.c | 68 + drivers/net/ethernet/socionext/sni_ave.c | 8 +- drivers/net/ethernet/stmicro/stmmac/common.h | 16 + .../net/ethernet/stmicro/stmmac/dwmac-anarion.c | 4 +- .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 14 +- drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c | 4 +- .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 4 +- drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 132 +- .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 787 ++++- .../net/ethernet/stmicro/stmmac/dwxgmac2_descs.c | 114 +- drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 41 +- drivers/net/ethernet/stmicro/stmmac/hwif.c | 4 +- drivers/net/ethernet/stmicro/stmmac/hwif.h | 47 + drivers/net/ethernet/stmicro/stmmac/mmc.h | 9 + drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 192 ++ drivers/net/ethernet/stmicro/stmmac/stmmac.h | 23 +- .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 105 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 436 ++- drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 4 +- drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 1 + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 29 +- .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 516 ++- drivers/net/ethernet/sun/cassini.c | 8 +- drivers/net/ethernet/sun/niu.c | 2 +- drivers/net/ethernet/sun/sunvnet_common.c | 4 +- drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c | 2 +- drivers/net/ethernet/synopsys/dwc-xlgmac-net.c | 2 +- drivers/net/ethernet/tehuti/tehuti.c | 2 +- drivers/net/ethernet/ti/cpsw.c | 5 +- drivers/net/ethernet/ti/netcp_core.c | 2 +- drivers/net/ethernet/via/via-rhine.c | 4 +- drivers/net/hamradio/mkiss.c | 11 +- drivers/net/hyperv/netvsc_drv.c | 4 +- drivers/net/ieee802154/adf7242.c | 13 +- drivers/net/ieee802154/at86rf230.c | 20 +- drivers/net/ieee802154/ca8210.c | 9 +- drivers/net/ipvlan/ipvlan_main.c | 1 + drivers/net/netdevsim/dev.c | 414 ++- drivers/net/netdevsim/netdevsim.h | 4 + drivers/net/phy/Kconfig | 26 +- drivers/net/phy/Makefile | 2 + drivers/net/phy/adin.c | 720 ++++ drivers/net/phy/at803x.c | 4 - drivers/net/phy/dp83822.c | 5 - drivers/net/phy/dp83848.c | 11 +- drivers/net/phy/dp83tc811.c | 4 - drivers/net/phy/mdio-aspeed.c | 157 + drivers/net/phy/mdio-cavium.h | 2 + drivers/net/phy/mdio-xgene.c | 4 +- drivers/net/phy/meson-gxl.c | 2 +- drivers/net/phy/microchip.c | 1 - drivers/net/phy/microchip_t1.c | 1 - drivers/net/phy/mscc.c | 4 +- drivers/net/phy/phy-core.c | 66 +- drivers/net/phy/phy.c | 60 +- drivers/net/phy/phy_device.c | 111 +- drivers/net/phy/realtek.c | 188 +- drivers/net/phy/swphy.c | 8 + drivers/net/phy/vitesse.c | 6 +- drivers/net/slip/slhc.c | 30 +- drivers/net/thunderbolt.c | 2 +- drivers/net/usb/asix_common.c | 9 +- drivers/net/usb/ax88179_178a.c | 14 +- drivers/net/usb/lan78xx.c | 23 +- drivers/net/usb/r8152.c | 415 ++- drivers/net/usb/smsc75xx.c | 20 +- drivers/net/usb/sr9800.c | 9 +- drivers/net/usb/usbnet.c | 6 +- drivers/net/vmxnet3/vmxnet3_drv.c | 9 +- drivers/net/wimax/i2400m/debugfs.c | 150 +- drivers/net/wimax/i2400m/driver.c | 7 +- drivers/net/wimax/i2400m/i2400m.h | 7 +- drivers/net/wimax/i2400m/usb.c | 64 +- drivers/net/wireless/ath/ath10k/mac.c | 3 +- drivers/net/wireless/ath/ath9k/main.c | 3 +- drivers/net/wireless/ath/wil6210/cfg80211.c | 2 +- drivers/net/wireless/ath/wil6210/debugfs.c | 3 +- drivers/net/wireless/ath/wil6210/txrx.c | 9 +- drivers/net/wireless/ath/wil6210/txrx_edma.c | 2 +- drivers/net/wireless/broadcom/b43legacy/phy.c | 21 +- .../wireless/broadcom/brcm80211/brcmfmac/bcdc.c | 11 +- .../wireless/broadcom/brcm80211/brcmfmac/bcdc.h | 6 +- .../broadcom/brcm80211/brcmfmac/cfg80211.c | 61 +- .../wireless/broadcom/brcm80211/brcmfmac/common.c | 1 - .../wireless/broadcom/brcm80211/brcmfmac/core.c | 30 +- .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 1 + .../wireless/broadcom/brcm80211/brcmfmac/feature.h | 4 +- .../wireless/broadcom/brcm80211/brcmfmac/fweh.c | 9 - .../broadcom/brcm80211/brcmfmac/fwsignal.c | 16 +- .../broadcom/brcm80211/brcmfmac/fwsignal.h | 3 +- .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 7 + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 3 +- .../wireless/broadcom/brcm80211/brcmfmac/proto.c | 10 +- .../wireless/broadcom/brcm80211/brcmfmac/proto.h | 3 +- .../wireless/broadcom/brcm80211/brcmsmac/main.c | 13 - drivers/net/wireless/intel/ipw2x00/ipw2100.c | 2 +- drivers/net/wireless/intel/iwlegacy/common.c | 3 +- drivers/net/wireless/intel/iwlwifi/dvm/rs.c | 29 +- drivers/net/wireless/intel/iwlwifi/dvm/rs.h | 4 - drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 3 +- drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 5 - drivers/net/wireless/mac80211_hwsim.c | 20 +- drivers/net/wireless/marvell/libertas/if_spi.c | 14 +- drivers/net/wireless/marvell/libertas/if_usb.c | 3 +- drivers/net/wireless/marvell/libertas/main.c | 2 +- drivers/net/wireless/marvell/libertas_tf/cmd.c | 2 +- drivers/net/wireless/marvell/mwifiex/init.c | 2 +- drivers/net/wireless/marvell/mwifiex/pcie.c | 8 +- drivers/net/wireless/marvell/mwifiex/scan.c | 2 +- drivers/net/wireless/marvell/mwifiex/tdls.c | 3 +- drivers/net/wireless/mediatek/mt76/mt7603/soc.c | 4 +- drivers/net/wireless/mediatek/mt7601u/init.c | 3 + drivers/net/wireless/mediatek/mt7601u/main.c | 4 +- drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c | 4 +- drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 1 + drivers/net/wireless/ralink/rt2x00/rt2x00debug.c | 136 +- drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 9 +- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 11 +- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 3 +- .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 8 +- drivers/net/wireless/realtek/rtlwifi/pci.c | 6 +- drivers/net/wireless/realtek/rtlwifi/regd.c | 18 - .../net/wireless/realtek/rtlwifi/rtl8188ee/dm.c | 7 +- .../net/wireless/realtek/rtlwifi/rtl8188ee/sw.c | 4 - .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.c | 257 +- .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.h | 1046 +++--- .../net/wireless/realtek/rtlwifi/rtl8192ce/sw.c | 2 - .../net/wireless/realtek/rtlwifi/rtl8192ce/trx.c | 215 +- .../net/wireless/realtek/rtlwifi/rtl8192ce/trx.h | 803 ++--- .../net/wireless/realtek/rtlwifi/rtl8192cu/sw.c | 2 - .../net/wireless/realtek/rtlwifi/rtl8192se/sw.c | 2 - .../net/wireless/realtek/rtlwifi/rtl8723ae/sw.c | 4 - .../net/wireless/realtek/rtlwifi/rtl8723be/sw.c | 4 - .../net/wireless/realtek/rtlwifi/rtl8821ae/sw.c | 4 - drivers/net/wireless/realtek/rtw88/Makefile | 1 + drivers/net/wireless/realtek/rtw88/coex.c | 2507 ++++++++++++++ drivers/net/wireless/realtek/rtw88/coex.h | 369 +++ drivers/net/wireless/realtek/rtw88/debug.c | 112 + drivers/net/wireless/realtek/rtw88/fw.c | 135 +- drivers/net/wireless/realtek/rtw88/fw.h | 73 + drivers/net/wireless/realtek/rtw88/mac80211.c | 19 + drivers/net/wireless/realtek/rtw88/main.c | 45 +- drivers/net/wireless/realtek/rtw88/main.h | 233 ++ drivers/net/wireless/realtek/rtw88/pci.c | 74 +- drivers/net/wireless/realtek/rtw88/phy.c | 15 +- drivers/net/wireless/realtek/rtw88/phy.h | 9 + drivers/net/wireless/realtek/rtw88/ps.c | 9 + drivers/net/wireless/realtek/rtw88/reg.h | 62 + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 462 ++- .../net/wireless/realtek/rtw88/rtw8822b_table.c | 1564 ++++++--- drivers/net/wireless/realtek/rtw88/rtw8822c.c | 355 +- .../net/wireless/realtek/rtw88/rtw8822c_table.c | 2635 ++++++++++----- drivers/net/wireless/rsi/rsi_91x_mac80211.c | 3 +- drivers/net/wireless/rsi/rsi_91x_sdio.c | 31 +- drivers/net/wireless/ti/wlcore/main.c | 3 +- drivers/net/wireless/wl3501_cs.c | 4 +- drivers/net/xen-netback/netback.c | 13 +- drivers/net/xen-netback/xenbus.c | 46 +- drivers/net/xen-netfront.c | 8 +- drivers/nfc/nxp-nci/Kconfig | 7 +- drivers/nfc/nxp-nci/core.c | 2 - drivers/nfc/nxp-nci/i2c.c | 134 +- drivers/nfc/nxp-nci/nxp-nci.h | 1 - drivers/ptp/ptp_dte.c | 5 +- drivers/s390/net/ctcm_fsms.c | 42 +- drivers/s390/net/ctcm_main.c | 6 +- drivers/s390/net/ctcm_mpc.c | 6 +- drivers/s390/net/lcs.c | 6 +- drivers/s390/net/qeth_core.h | 36 +- drivers/s390/net/qeth_core_main.c | 263 +- drivers/s390/net/qeth_core_mpc.h | 1 - drivers/s390/net/qeth_l2_main.c | 62 +- drivers/s390/net/qeth_l3_main.c | 24 +- drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +- drivers/scsi/fcoe/fcoe.c | 3 +- drivers/scsi/fcoe/fcoe_transport.c | 4 +- drivers/scsi/qedf/qedf_main.c | 2 +- drivers/staging/Kconfig | 2 + drivers/staging/Makefile | 1 + drivers/staging/octeon/Kconfig | 3 +- drivers/staging/octeon/ethernet-defines.h | 2 - drivers/staging/octeon/ethernet-mdio.c | 6 +- drivers/staging/octeon/ethernet-mem.c | 5 +- drivers/staging/octeon/ethernet-rgmii.c | 10 +- drivers/staging/octeon/ethernet-rx.c | 13 +- drivers/staging/octeon/ethernet-rx.h | 2 - drivers/staging/octeon/ethernet-sgmii.c | 8 +- drivers/staging/octeon/ethernet-spi.c | 10 +- drivers/staging/octeon/ethernet-tx.c | 19 +- drivers/staging/octeon/ethernet-util.h | 4 - drivers/staging/octeon/ethernet.c | 12 +- drivers/staging/octeon/octeon-ethernet.h | 29 +- drivers/staging/octeon/octeon-stubs.h | 1429 ++++++++ drivers/staging/qlge/Kconfig | 10 + .../{net/ethernet/qlogic => staging}/qlge/Makefile | 0 drivers/staging/qlge/TODO | 46 + .../{net/ethernet/qlogic => staging}/qlge/qlge.h | 0 .../ethernet/qlogic => staging}/qlge/qlge_dbg.c | 0 .../qlogic => staging}/qlge/qlge_ethtool.c | 0 .../ethernet/qlogic => staging}/qlge/qlge_main.c | 0 .../ethernet/qlogic => staging}/qlge/qlge_mpi.c | 0 drivers/staging/unisys/visornic/visornic_main.c | 6 +- drivers/target/iscsi/cxgbit/cxgbit_target.c | 13 +- drivers/vhost/vsock.c | 68 +- include/Kbuild | 74 - include/linux/bpf.h | 11 +- include/linux/bpf_types.h | 1 + include/linux/can/core.h | 3 +- include/linux/can/platform/rcar_can.h | 18 - include/linux/can/skb.h | 2 +- include/linux/ieee80211.h | 63 +- include/linux/mlx5/driver.h | 24 +- include/linux/mlx5/eswitch.h | 1 - include/linux/mlx5/fs.h | 5 + include/linux/netdevice.h | 3 + include/linux/netfilter/ipset/ip_set.h | 238 +- include/linux/netfilter/ipset/ip_set_comment.h | 73 - include/linux/netfilter/ipset/ip_set_counter.h | 84 - include/linux/netfilter/ipset/ip_set_getport.h | 4 + include/linux/netfilter/ipset/ip_set_skbinfo.h | 42 - include/linux/netfilter/ipset/ip_set_timeout.h | 77 - include/linux/netfilter/nf_conntrack_amanda.h | 4 + include/linux/netfilter/nf_conntrack_dccp.h | 3 - include/linux/netfilter/nf_conntrack_ftp.h | 8 +- include/linux/netfilter/nf_conntrack_h323.h | 11 +- include/linux/netfilter/nf_conntrack_h323_asn1.h | 2 + include/linux/netfilter/nf_conntrack_irc.h | 5 +- include/linux/netfilter/nf_conntrack_pptp.h | 12 +- include/linux/netfilter/nf_conntrack_proto_gre.h | 2 - include/linux/netfilter/nf_conntrack_sane.h | 4 - include/linux/netfilter/nf_conntrack_sip.h | 6 +- include/linux/netfilter/nf_conntrack_snmp.h | 3 + include/linux/netfilter/nf_conntrack_tftp.h | 5 + include/linux/netfilter/x_tables.h | 6 + include/linux/netfilter_arp/arp_tables.h | 2 + include/linux/netfilter_bridge/ebtables.h | 2 + include/linux/netfilter_ipv4/ip_tables.h | 4 + include/linux/netfilter_ipv6/ip6_tables.h | 2 + include/linux/phy.h | 14 +- include/linux/platform_data/nxp-nci.h | 19 - include/linux/qed/qed_if.h | 3 +- include/linux/skbuff.h | 105 +- include/linux/stmmac.h | 2 + include/linux/virtio_vsock.h | 4 +- include/linux/wimax/debug.h | 20 +- include/net/cfg80211.h | 103 +- include/net/devlink.h | 177 +- include/net/drop_monitor.h | 33 + include/net/dsa.h | 2 + include/net/flow_offload.h | 60 + include/net/mac80211.h | 53 +- include/net/ndisc.h | 1 + include/net/netfilter/br_netfilter.h | 12 + include/net/netfilter/ipv4/nf_dup_ipv4.h | 3 + include/net/netfilter/ipv6/nf_defrag_ipv6.h | 4 +- include/net/netfilter/ipv6/nf_dup_ipv6.h | 2 + include/net/netfilter/nf_conntrack.h | 10 + include/net/netfilter/nf_conntrack_acct.h | 13 + include/net/netfilter/nf_conntrack_bridge.h | 6 + include/net/netfilter/nf_conntrack_core.h | 3 + include/net/netfilter/nf_conntrack_count.h | 3 + include/net/netfilter/nf_conntrack_l4proto.h | 4 + include/net/netfilter/nf_conntrack_synproxy.h | 2 +- include/net/netfilter/nf_conntrack_timestamp.h | 6 + include/net/netfilter/nf_conntrack_tuple.h | 2 + include/net/netfilter/nf_dup_netdev.h | 2 + include/net/netfilter/nf_flow_table.h | 5 + include/net/netfilter/nf_nat.h | 4 + include/net/netfilter/nf_nat_helper.h | 4 +- include/net/netfilter/nf_nat_redirect.h | 3 + include/net/netfilter/nf_queue.h | 7 + include/net/netfilter/nf_reject.h | 3 + include/net/netfilter/nf_synproxy.h | 4 + include/net/netfilter/nf_tables.h | 12 + include/net/netfilter/nf_tables_ipv6.h | 1 + include/net/netfilter/nf_tables_offload.h | 5 + include/net/netfilter/nft_fib.h | 2 + include/net/netfilter/nft_meta.h | 2 + include/net/netfilter/nft_reject.h | 5 + include/net/netns/ipv4.h | 1 + include/net/pkt_cls.h | 35 - include/net/sch_generic.h | 3 - include/net/sctp/auth.h | 2 + include/net/sctp/structs.h | 1 + include/net/tc_act/tc_mirred.h | 18 + include/net/tc_act/tc_mpls.h | 75 + include/net/tc_act/tc_skbedit.h | 27 + include/net/tcp.h | 12 +- include/trace/events/xdp.h | 3 +- include/uapi/linux/bpf.h | 37 +- include/uapi/linux/can/gw.h | 17 +- include/uapi/linux/can/netlink.h | 6 +- include/uapi/linux/devlink.h | 62 + include/uapi/linux/if_bridge.h | 1 + include/uapi/linux/mdio.h | 10 + include/uapi/linux/net_dropmon.h | 66 + include/uapi/linux/netfilter/xt_policy.h | 1 + include/uapi/linux/netfilter_ipv4/ipt_LOG.h | 2 - include/uapi/linux/netfilter_ipv6/ip6t_LOG.h | 2 - include/uapi/linux/nl80211.h | 60 +- include/uapi/linux/sctp.h | 2 + kernel/bpf/Makefile | 3 + kernel/bpf/cgroup.c | 17 +- kernel/bpf/devmap.c | 332 +- kernel/bpf/sysfs_btf.c | 51 + kernel/bpf/verifier.c | 2 + net/Kconfig | 1 + net/appletalk/ddp.c | 4 +- net/batman-adv/bat_v.c | 7 + net/batman-adv/bat_v_ogm.c | 179 +- net/batman-adv/bat_v_ogm.h | 3 + net/batman-adv/main.h | 2 +- net/batman-adv/soft-interface.c | 8 +- net/batman-adv/sysfs.c | 2 +- net/batman-adv/types.h | 12 + net/bpf/test_run.c | 39 +- net/bridge/br_mdb.c | 177 +- net/bridge/br_multicast.c | 32 +- net/bridge/br_private.h | 3 + net/can/Kconfig | 11 +- net/can/af_can.c | 99 +- net/can/af_can.h | 6 +- net/can/bcm.c | 166 +- net/can/gw.c | 511 ++- net/can/proc.c | 1 + net/can/raw.c | 40 +- net/core/datagram.c | 6 +- net/core/dev.c | 46 +- net/core/devlink.c | 1601 +++++++-- net/core/drop_monitor.c | 1341 +++++++- net/core/filter.c | 88 +- net/core/flow_dissector.c | 21 +- net/core/flow_offload.c | 241 ++ net/core/neighbour.c | 2 +- net/core/page_pool.c | 41 +- net/core/pktgen.c | 2 +- net/core/skbuff.c | 78 +- net/core/sysctl_net_core.c | 8 + net/core/tso.c | 8 +- net/dsa/Kconfig | 7 - net/dsa/dsa2.c | 98 +- net/dsa/master.c | 66 + net/dsa/port.c | 5 - net/dsa/tag_ksz.c | 62 + net/ipv4/af_inet.c | 5 - net/ipv4/netfilter/ipt_SYNPROXY.c | 4 +- net/ipv4/sysctl_net_ipv4.c | 9 + net/ipv4/tcp.c | 29 +- net/ipv4/tcp_input.c | 81 +- net/ipv4/tcp_ipv4.c | 16 + net/ipv4/tcp_output.c | 2 +- net/ipv4/tcp_timer.c | 2 +- net/ipv6/exthdrs_core.c | 4 +- net/ipv6/ndisc.c | 1 + net/ipv6/netfilter/ip6t_SYNPROXY.c | 4 +- net/ipv6/route.c | 14 +- net/ipv6/tcp_ipv6.c | 15 + net/kcm/kcmsock.c | 10 +- net/mac80211/agg-rx.c | 72 +- net/mac80211/cfg.c | 7 +- net/mac80211/debugfs.c | 3 +- net/mac80211/driver-ops.h | 8 +- net/mac80211/he.c | 40 + net/mac80211/ht.c | 2 +- net/mac80211/ieee80211_i.h | 17 +- net/mac80211/key.c | 16 +- net/mac80211/main.c | 18 +- net/mac80211/mesh.c | 62 + net/mac80211/mesh.h | 4 + net/mac80211/mesh_plink.c | 12 +- net/mac80211/mlme.c | 9 +- net/mac80211/offchannel.c | 5 +- net/mac80211/rate.h | 9 - net/mac80211/rc80211_minstrel.h | 1 + net/mac80211/rc80211_minstrel_ht.c | 277 +- net/mac80211/rc80211_minstrel_ht.h | 12 + net/mac80211/sta_info.c | 4 +- net/mac80211/sta_info.h | 2 + net/mac80211/status.c | 195 +- net/mac80211/trace.h | 7 +- net/mac80211/tx.c | 6 +- net/mac80211/util.c | 60 + net/mac80211/wpa.c | 6 +- net/netfilter/ipset/ip_set_hash_gen.h | 4 +- net/netfilter/ipset/ip_set_list_set.c | 2 +- net/netfilter/ipvs/ip_vs_core.c | 2 +- net/netfilter/ipvs/ip_vs_ctl.c | 73 +- net/netfilter/ipvs/ip_vs_lblcr.c | 4 +- net/netfilter/ipvs/ip_vs_mh.c | 4 +- net/netfilter/ipvs/ip_vs_proto_tcp.c | 2 +- net/netfilter/nf_conntrack_ftp.c | 2 +- net/netfilter/nf_conntrack_labels.c | 3 +- net/netfilter/nf_conntrack_proto_tcp.c | 2 +- net/netfilter/nf_conntrack_standalone.c | 34 +- net/netfilter/nf_nat_proto.c | 4 +- net/netfilter/nf_synproxy_core.c | 8 +- net/netfilter/nf_tables_api.c | 7 + net/netfilter/nf_tables_offload.c | 148 +- net/netfilter/nfnetlink_log.c | 4 +- net/netfilter/nfnetlink_queue.c | 4 +- net/netfilter/nft_bitwise.c | 19 + net/netfilter/nft_immediate.c | 24 +- net/netfilter/nft_set_bitmap.c | 2 +- net/netfilter/nft_set_hash.c | 2 +- net/netfilter/nft_set_rbtree.c | 2 +- net/netfilter/nft_synproxy.c | 4 +- net/netfilter/xt_IDLETIMER.c | 2 +- net/netfilter/xt_set.c | 1 - net/nfc/netlink.c | 6 +- net/openvswitch/datapath.c | 7 +- net/rds/af_rds.c | 95 +- net/rds/ib_recv.c | 12 +- net/rds/rds.h | 2 +- net/rds/send.c | 12 + net/rds/stats.c | 3 + net/rxrpc/ar-internal.h | 4 + net/rxrpc/call_object.c | 4 +- net/rxrpc/insecure.c | 5 + net/rxrpc/rxkad.c | 103 +- net/sched/cls_api.c | 288 +- net/sched/sch_fq_codel.c | 14 +- net/sched/sch_taprio.c | 4 - net/sctp/associola.c | 9 - net/sctp/auth.c | 101 +- net/sctp/endpointola.c | 64 +- net/sctp/sm_make_chunk.c | 18 +- net/sctp/sm_statefuns.c | 6 +- net/sctp/sm_statetable.c | 28 +- net/sctp/socket.c | 606 ++-- net/sctp/transport.c | 2 +- net/tipc/bcast.c | 14 +- net/tipc/bearer.c | 64 + net/tipc/bearer.h | 10 + net/tipc/core.c | 5 + net/tipc/core.h | 3 + net/tipc/group.c | 4 +- net/tipc/link.c | 160 +- net/tipc/msg.c | 59 + net/tipc/msg.h | 28 +- net/tipc/name_distr.c | 2 +- net/tipc/node.c | 14 +- net/tipc/node.h | 6 +- net/tipc/socket.c | 14 +- net/tipc/topsrv.c | 2 + net/tls/tls_device.c | 18 +- net/tls/tls_device_fallback.c | 2 +- net/vmw_vsock/hyperv_transport.c | 24 +- net/vmw_vsock/virtio_transport.c | 1 + net/vmw_vsock/virtio_transport_common.c | 99 +- net/wimax/debugfs.c | 42 +- net/wimax/stack.c | 11 +- net/wimax/wimax-internal.h | 7 +- net/wireless/Kconfig | 2 + net/wireless/chan.c | 162 +- net/wireless/core.c | 17 +- net/wireless/core.h | 2 + net/wireless/ibss.c | 16 +- net/wireless/lib80211_crypt_ccmp.c | 197 +- net/wireless/nl80211.c | 221 +- net/wireless/reg.c | 21 +- net/wireless/scan.c | 269 +- net/wireless/trace.h | 3 +- net/wireless/util.c | 56 +- net/xdp/xdp_umem.c | 12 +- net/xfrm/xfrm_ipcomp.c | 2 +- samples/bpf/trace_output_user.c | 43 +- samples/bpf/xdp_fwd_kern.c | 39 +- samples/bpf/xdp_fwd_user.c | 35 +- samples/bpf/xdp_sample_pkts_user.c | 61 +- scripts/link-vmlinux.sh | 49 +- tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 16 +- tools/bpf/bpftool/Documentation/bpftool-map.rst | 2 +- tools/bpf/bpftool/Makefile | 13 +- tools/bpf/bpftool/bash-completion/bpftool | 19 +- tools/bpf/bpftool/cgroup.c | 83 +- tools/bpf/bpftool/feature.c | 105 +- tools/bpf/bpftool/map.c | 3 +- tools/include/uapi/linux/bpf.h | 37 +- tools/lib/bpf/btf.c | 250 +- tools/lib/bpf/btf.h | 182 ++ tools/lib/bpf/btf_dump.c | 138 +- tools/lib/bpf/libbpf.c | 1009 +++++- tools/lib/bpf/libbpf.h | 3 +- tools/lib/bpf/libbpf_internal.h | 105 + tools/lib/bpf/libbpf_probes.c | 1 + tools/testing/selftests/bpf/Makefile | 14 +- tools/testing/selftests/bpf/bpf_helpers.h | 23 + .../testing/selftests/bpf/prog_tests/bpf_obj_id.c | 6 +- .../selftests/bpf/prog_tests/bpf_verif_scale.c | 92 +- .../testing/selftests/bpf/prog_tests/core_reloc.c | 385 +++ .../selftests/bpf/prog_tests/flow_dissector.c | 265 +- .../selftests/bpf/prog_tests/get_stack_raw_tp.c | 82 +- .../selftests/bpf/prog_tests/reference_tracking.c | 15 +- .../testing/selftests/bpf/prog_tests/send_signal.c | 15 +- .../selftests/bpf/prog_tests/xdp_noinline.c | 3 +- tools/testing/selftests/bpf/progs/bpf_flow.c | 60 +- .../selftests/bpf/progs/btf__core_reloc_arrays.c | 3 + .../progs/btf__core_reloc_arrays___diff_arr_dim.c | 3 + .../btf__core_reloc_arrays___diff_arr_val_sz.c | 3 + .../progs/btf__core_reloc_arrays___err_non_array.c | 3 + .../btf__core_reloc_arrays___err_too_shallow.c | 3 + .../progs/btf__core_reloc_arrays___err_too_small.c | 3 + .../btf__core_reloc_arrays___err_wrong_val_type1.c | 3 + .../btf__core_reloc_arrays___err_wrong_val_type2.c | 3 + .../selftests/bpf/progs/btf__core_reloc_flavors.c | 3 + .../btf__core_reloc_flavors__err_wrong_name.c | 3 + .../selftests/bpf/progs/btf__core_reloc_ints.c | 3 + .../bpf/progs/btf__core_reloc_ints___bool.c | 3 + .../progs/btf__core_reloc_ints___err_bitfield.c | 3 + .../progs/btf__core_reloc_ints___err_wrong_sz_16.c | 3 + .../progs/btf__core_reloc_ints___err_wrong_sz_32.c | 3 + .../progs/btf__core_reloc_ints___err_wrong_sz_64.c | 3 + .../progs/btf__core_reloc_ints___err_wrong_sz_8.c | 3 + .../progs/btf__core_reloc_ints___reverse_sign.c | 3 + .../selftests/bpf/progs/btf__core_reloc_misc.c | 5 + .../selftests/bpf/progs/btf__core_reloc_mods.c | 3 + .../bpf/progs/btf__core_reloc_mods___mod_swap.c | 3 + .../bpf/progs/btf__core_reloc_mods___typedefs.c | 3 + .../selftests/bpf/progs/btf__core_reloc_nesting.c | 3 + .../progs/btf__core_reloc_nesting___anon_embed.c | 3 + .../btf__core_reloc_nesting___dup_compat_types.c | 5 + ...btf__core_reloc_nesting___err_array_container.c | 3 + .../btf__core_reloc_nesting___err_array_field.c | 3 + ...__core_reloc_nesting___err_dup_incompat_types.c | 4 + ...f__core_reloc_nesting___err_missing_container.c | 3 + .../btf__core_reloc_nesting___err_missing_field.c | 3 + ..._core_reloc_nesting___err_nonstruct_container.c | 3 + ...__core_reloc_nesting___err_partial_match_dups.c | 4 + .../progs/btf__core_reloc_nesting___err_too_deep.c | 3 + .../btf__core_reloc_nesting___extra_nesting.c | 3 + .../btf__core_reloc_nesting___struct_union_mixup.c | 3 + .../bpf/progs/btf__core_reloc_primitives.c | 3 + .../btf__core_reloc_primitives___diff_enum_def.c | 3 + .../btf__core_reloc_primitives___diff_func_proto.c | 3 + .../btf__core_reloc_primitives___diff_ptr_type.c | 3 + .../btf__core_reloc_primitives___err_non_enum.c | 3 + .../btf__core_reloc_primitives___err_non_int.c | 3 + .../btf__core_reloc_primitives___err_non_ptr.c | 3 + .../bpf/progs/btf__core_reloc_ptr_as_arr.c | 3 + .../progs/btf__core_reloc_ptr_as_arr___diff_sz.c | 3 + .../testing/selftests/bpf/progs/core_reloc_types.h | 667 ++++ tools/testing/selftests/bpf/progs/loop4.c | 18 + tools/testing/selftests/bpf/progs/loop5.c | 32 + tools/testing/selftests/bpf/progs/sockopt_sk.c | 22 + .../selftests/bpf/progs/test_core_reloc_arrays.c | 55 + .../selftests/bpf/progs/test_core_reloc_flavors.c | 62 + .../selftests/bpf/progs/test_core_reloc_ints.c | 44 + .../selftests/bpf/progs/test_core_reloc_kernel.c | 36 + .../selftests/bpf/progs/test_core_reloc_misc.c | 57 + .../selftests/bpf/progs/test_core_reloc_mods.c | 62 + .../selftests/bpf/progs/test_core_reloc_nesting.c | 46 + .../bpf/progs/test_core_reloc_primitives.c | 43 + .../bpf/progs/test_core_reloc_ptr_as_arr.c | 30 + .../selftests/bpf/progs/test_get_stack_rawtp.c | 2 +- .../bpf/progs/test_tcp_check_syncookie_kern.c | 48 +- tools/testing/selftests/bpf/test_maps.c | 16 + tools/testing/selftests/bpf/test_progs.c | 374 ++- tools/testing/selftests/bpf/test_progs.h | 40 +- tools/testing/selftests/bpf/test_sockopt_sk.c | 25 + .../selftests/bpf/test_tcp_check_syncookie.sh | 3 + .../selftests/bpf/test_tcp_check_syncookie_user.c | 61 +- tools/testing/selftests/bpf/test_tcpnotify_user.c | 90 +- tools/testing/selftests/bpf/test_verifier.c | 12 +- tools/testing/selftests/bpf/trace_helpers.c | 125 - tools/testing/selftests/bpf/trace_helpers.h | 9 - .../testing/selftests/bpf/verifier/event_output.c | 94 + .../selftests/drivers/net/mlxsw/devlink_trap.sh | 129 + .../drivers/net/mlxsw/devlink_trap_l2_drops.sh | 484 +++ .../selftests/drivers/net/mlxsw/qos_dscp_bridge.sh | 6 +- .../selftests/drivers/net/mlxsw/qos_dscp_router.sh | 24 +- .../selftests/drivers/net/netdevsim/devlink.sh | 114 +- .../drivers/net/netdevsim/devlink_trap.sh | 364 +++ tools/testing/selftests/net/Makefile | 4 +- tools/testing/selftests/net/fcnal-test.sh | 3432 ++++++++++++++++++++ .../selftests/net/forwarding/devlink_lib.sh | 189 +- tools/testing/selftests/net/forwarding/lib.sh | 19 + .../testing/selftests/net/forwarding/tc_common.sh | 17 +- tools/testing/selftests/net/l2tp.sh | 382 +++ tools/testing/selftests/net/nettest.c | 1757 ++++++++++ tools/testing/selftests/tc-testing/README | 4 +- .../tc-testing/tc-tests/filters/concurrency.json | 18 +- .../tc-testing/tc-tests/filters/matchall.json | 391 +++ .../selftests/tc-testing/tc-tests/qdiscs/fifo.json | 304 ++ .../tc-testing/tc-tests/qdiscs/ingress.json | 50 +- .../selftests/tc-testing/tc-tests/qdiscs/prio.json | 128 +- tools/testing/selftests/tc-testing/tdc.py | 12 +- tools/testing/selftests/tc-testing/tdc_config.py | 1 + 931 files changed, 52444 insertions(+), 13397 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-kernel-btf create mode 100644 Documentation/devicetree/bindings/net/adi,adin.yaml create mode 100644 Documentation/devicetree/bindings/net/aspeed,ast2600-mdio.yaml create mode 100644 Documentation/devicetree/bindings/net/can/tcan4x5x.txt create mode 100644 Documentation/networking/devlink-trap-netdevsim.rst create mode 100644 Documentation/networking/devlink-trap.rst create mode 100644 drivers/net/can/kvaser_pciefd.c create mode 100644 drivers/net/can/m_can/m_can.h create mode 100644 drivers/net/can/m_can/m_can_platform.c create mode 100644 drivers/net/can/m_can/tcan4x5x.c create mode 100644 drivers/net/can/sja1000/f81601.c create mode 100644 drivers/net/dsa/microchip/ksz8795.c create mode 100644 drivers/net/dsa/microchip/ksz8795_reg.h create mode 100644 drivers/net/dsa/microchip/ksz8795_spi.c delete mode 100644 drivers/net/dsa/microchip/ksz_priv.h create mode 100644 drivers/net/ethernet/freescale/enetc/enetc_mdio.h create mode 100644 drivers/net/ethernet/freescale/enetc/enetc_pci_mdio.c create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/health.c create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/health.h delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/reporter.h create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_trap.c create mode 100644 drivers/net/ethernet/mscc/ocelot_ptp.h create mode 100644 drivers/net/phy/adin.c create mode 100644 drivers/net/phy/mdio-aspeed.c create mode 100644 drivers/net/wireless/realtek/rtw88/coex.c create mode 100644 drivers/net/wireless/realtek/rtw88/coex.h create mode 100644 drivers/staging/octeon/octeon-stubs.h create mode 100644 drivers/staging/qlge/Kconfig rename drivers/{net/ethernet/qlogic => staging}/qlge/Makefile (100%) create mode 100644 drivers/staging/qlge/TODO rename drivers/{net/ethernet/qlogic => staging}/qlge/qlge.h (100%) rename drivers/{net/ethernet/qlogic => staging}/qlge/qlge_dbg.c (100%) rename drivers/{net/ethernet/qlogic => staging}/qlge/qlge_ethtool.c (100%) rename drivers/{net/ethernet/qlogic => staging}/qlge/qlge_main.c (100%) rename drivers/{net/ethernet/qlogic => staging}/qlge/qlge_mpi.c (100%) delete mode 100644 include/linux/can/platform/rcar_can.h delete mode 100644 include/linux/netfilter/ipset/ip_set_comment.h delete mode 100644 include/linux/netfilter/ipset/ip_set_counter.h delete mode 100644 include/linux/netfilter/ipset/ip_set_skbinfo.h delete mode 100644 include/linux/netfilter/ipset/ip_set_timeout.h delete mode 100644 include/linux/platform_data/nxp-nci.h create mode 100644 include/net/drop_monitor.h create mode 100644 kernel/bpf/sysfs_btf.c create mode 100644 tools/testing/selftests/bpf/prog_tests/core_reloc.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___diff_arr_dim.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___diff_arr_val_sz.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_non_array.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_too_shallow.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_too_small.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_wrong_val_type1.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_wrong_val_type2.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_flavors.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_flavors__err_wrong_name.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ints.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ints___bool.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_bitfield.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_wrong_sz_16.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_wrong_sz_32.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_wrong_sz_64.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_wrong_sz_8.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ints___reverse_sign.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_misc.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_mods.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_mods___mod_swap.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_mods___typedefs.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_nesting.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___anon_embed.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___dup_compat_types.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___err_array_container.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___err_array_field.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___err_dup_incompat_types.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___err_missing_container.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___err_missing_field.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___err_nonstruct_container.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___err_partial_match_dups.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___err_too_deep.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___extra_nesting.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___struct_union_mixup.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_primitives.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_primitives___diff_enum_def.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_primitives___diff_func_proto.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_primitives___diff_ptr_type.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_primitives___err_non_enum.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_primitives___err_non_int.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_primitives___err_non_ptr.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ptr_as_arr.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ptr_as_arr___diff_sz.c create mode 100644 tools/testing/selftests/bpf/progs/core_reloc_types.h create mode 100644 tools/testing/selftests/bpf/progs/loop4.c create mode 100644 tools/testing/selftests/bpf/progs/loop5.c create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_arrays.c create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_flavors.c create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_ints.c create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_kernel.c create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_misc.c create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_mods.c create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_nesting.c create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_primitives.c create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_ptr_as_arr.c create mode 100644 tools/testing/selftests/bpf/verifier/event_output.c create mode 100755 tools/testing/selftests/drivers/net/mlxsw/devlink_trap.sh create mode 100755 tools/testing/selftests/drivers/net/mlxsw/devlink_trap_l2_drops.sh create mode 100755 tools/testing/selftests/drivers/net/netdevsim/devlink_trap.sh create mode 100755 tools/testing/selftests/net/fcnal-test.sh create mode 100644 tools/testing/selftests/net/l2tp.sh create mode 100644 tools/testing/selftests/net/nettest.c create mode 100644 tools/testing/selftests/tc-testing/tc-tests/filters/matchall.json create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/fifo.json Merging bpf-next/master (0bb52b0dfc88 tools: bpftool: add "bpftool map freeze" subcommand) $ git merge bpf-next/master Auto-merging tools/testing/selftests/bpf/Makefile Auto-merging tools/include/uapi/linux/bpf.h Auto-merging tools/bpf/bpftool/common.c Auto-merging scripts/link-vmlinux.sh Auto-merging net/xdp/xdp_umem.c Auto-merging net/core/sock.c Auto-merging include/uapi/linux/bpf.h Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_rx.c Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en/xsk/tx.c Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c Merge made by the 'recursive' strategy. drivers/net/ethernet/intel/i40e/i40e_main.c | 5 +- drivers/net/ethernet/intel/i40e/i40e_xsk.c | 25 +- drivers/net/ethernet/intel/i40e/i40e_xsk.h | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 +- .../net/ethernet/intel/ixgbe/ixgbe_txrx_common.h | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 22 +- .../net/ethernet/mellanox/mlx5/core/en/xsk/rx.h | 14 + .../net/ethernet/mellanox/mlx5/core/en/xsk/tx.c | 2 +- .../net/ethernet/mellanox/mlx5/core/en/xsk/tx.h | 14 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 7 +- drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 27 +- include/linux/bpf.h | 5 + include/linux/netdevice.h | 14 +- include/linux/tnum.h | 6 + include/net/bpf_sk_storage.h | 10 + include/net/xdp_sock.h | 51 ++- include/uapi/linux/bpf.h | 12 +- include/uapi/linux/if_xdp.h | 13 + kernel/bpf/btf.c | 16 +- kernel/bpf/syscall.c | 20 +- kernel/bpf/sysfs_btf.c | 9 +- kernel/bpf/xskmap.c | 133 ++++++-- kernel/trace/Kconfig | 3 +- lib/test_bpf.c | 2 +- net/core/bpf_sk_storage.c | 104 ++++++- net/core/dev.c | 15 +- net/core/sock.c | 9 +- net/xdp/xdp_umem.c | 48 ++- net/xdp/xsk.c | 199 ++++++++++-- net/xdp/xsk.h | 13 + net/xdp/xsk_queue.h | 1 + samples/bpf/syscall_nrs.c | 6 + samples/bpf/tracex5_kern.c | 13 + samples/bpf/xdpsock_user.c | 192 +++++++----- scripts/link-vmlinux.sh | 6 +- tools/bpf/bpftool/Documentation/bpftool-btf.rst | 7 + tools/bpf/bpftool/Documentation/bpftool-map.rst | 9 + tools/bpf/bpftool/Documentation/bpftool-net.rst | 57 +++- tools/bpf/bpftool/Makefile | 3 +- tools/bpf/bpftool/bash-completion/bpftool | 89 +++++- tools/bpf/bpftool/btf.c | 344 ++++++++++++++++++++- tools/bpf/bpftool/btf_dumper.c | 8 +- tools/bpf/bpftool/cgroup.c | 2 +- tools/bpf/bpftool/common.c | 4 +- tools/bpf/bpftool/json_writer.c | 6 +- tools/bpf/bpftool/json_writer.h | 6 +- tools/bpf/bpftool/main.c | 2 +- tools/bpf/bpftool/main.h | 4 +- tools/bpf/bpftool/map.c | 64 +++- tools/bpf/bpftool/map_perf_ring.c | 4 +- tools/bpf/bpftool/net.c | 178 ++++++++++- tools/bpf/bpftool/perf.c | 4 + tools/include/linux/compiler-gcc.h | 2 + tools/include/uapi/linux/bpf.h | 12 +- tools/include/uapi/linux/if_xdp.h | 13 + tools/lib/bpf/Makefile | 21 +- tools/lib/bpf/bpf.c | 24 +- tools/lib/bpf/bpf.h | 1 + tools/lib/bpf/libbpf.map | 5 + tools/lib/bpf/xsk.c | 53 ++-- tools/lib/bpf/xsk.h | 6 + tools/testing/selftests/bpf/.gitignore | 1 + tools/testing/selftests/bpf/Makefile | 3 +- tools/testing/selftests/bpf/bpf_endian.h | 2 +- tools/testing/selftests/bpf/bpf_helpers.h | 2 +- .../testing/selftests/bpf/progs/sockopt_inherit.c | 97 ++++++ tools/testing/selftests/bpf/test_sockopt_inherit.c | 253 +++++++++++++++ tools/testing/selftests/bpf/test_tcp_rtt.c | 31 ++ 69 files changed, 2056 insertions(+), 288 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/sockopt_inherit.c create mode 100644 tools/testing/selftests/bpf/test_sockopt_inherit.c Merging ipsec-next/master (c7b37c769d2a xfrm: remove get_mtu indirection from xfrm_type) $ git merge ipsec-next/master Already up to date. Merging mlx5-next/mlx5-next (e6806e9a63a7 net/mlx5: Create bypass and loopback flow steering namespaces for RDMA RX) $ git merge mlx5-next/mlx5-next Auto-merging include/linux/mlx5/mlx5_ifc.h Auto-merging include/linux/mlx5/fs.h Auto-merging drivers/net/ethernet/mellanox/mlx5/core/lib/crypto.c Auto-merging drivers/net/ethernet/mellanox/mlx5/core/fs_core.h Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eq.c Merge made by the 'recursive' strategy. drivers/net/ethernet/mellanox/mlx5/core/eq.c | 22 ++-- drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 120 ++++++++++++++------- drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 3 +- .../net/ethernet/mellanox/mlx5/core/lib/crypto.c | 1 + drivers/net/ethernet/mellanox/mlx5/core/rdma.c | 2 +- include/linux/mlx5/fs.h | 1 + include/linux/mlx5/mlx5_ifc.h | 18 +++- 8 files changed, 115 insertions(+), 56 deletions(-) Merging netfilter-next/master (20e79a0a2cfd net: hns: add phy_attached_info() to the hns driver) $ git merge netfilter-next/master Already up to date. Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings) $ git merge nfc-next/master Auto-merging net/nfc/netlink.c Auto-merging net/nfc/hci/core.c Auto-merging drivers/nfc/st95hf/core.c Auto-merging drivers/nfc/st21nfca/se.c CONFLICT (content): Merge conflict in drivers/nfc/st21nfca/se.c Auto-merging drivers/nfc/st21nfca/dep.c Auto-merging drivers/nfc/fdp/i2c.c Auto-merging drivers/nfc/fdp/fdp.c Resolved 'drivers/nfc/st21nfca/se.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit --no-edit -v -a [master 48b8737d8800] Merge remote-tracking branch 'nfc-next/master' $ git diff -M --stat --summary HEAD^.. drivers/nfc/fdp/fdp.c | 35 +++++------------------------------ drivers/nfc/fdp/i2c.c | 26 +++++++++++++------------- drivers/nfc/st21nfca/dep.c | 3 ++- drivers/nfc/st21nfca/se.c | 3 +-- drivers/nfc/st95hf/core.c | 7 ++----- net/nfc/netlink.c | 3 ++- 6 files changed, 25 insertions(+), 52 deletions(-) Merging ipvs-next/master (1b0b807dd746 Merge branch 'r8169-fw') $ git merge ipvs-next/master Already up to date. Merging wireless-drivers-next/master (932630fa9028 Merge tag 'wireless-drivers-next-for-davem-2019-08-19' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next) $ git merge wireless-drivers-next/master Already up to date. Merging bluetooth/master (cf80618a8402 Bluetooth: hci_qca: Use kfree_skb() instead of kfree()) $ git merge bluetooth/master Auto-merging include/net/bluetooth/hci_core.h Auto-merging drivers/bluetooth/hci_qca.c Auto-merging drivers/bluetooth/btusb.c Merge made by the 'recursive' strategy. drivers/bluetooth/btusb.c | 34 ++++++++++++++++++++++++++++++---- drivers/bluetooth/hci_bcm.c | 30 +++++++++++++++--------------- drivers/bluetooth/hci_qca.c | 21 +-------------------- include/net/bluetooth/hci_core.h | 2 ++ net/bluetooth/6lowpan.c | 2 +- net/bluetooth/hci_request.c | 29 ++++++++++++++++++++++------- 6 files changed, 71 insertions(+), 47 deletions(-) Merging mac80211-next/master (48cb39522a9d mac80211: minstrel_ht: improve rate probing for devices with static fallback) $ git merge mac80211-next/master Already up to date. Merging gfs2/for-next (1e5227a3a98b gfs2: Fix possible fs name overflows) $ git merge gfs2/for-next Auto-merging fs/gfs2/super.c Merge made by the 'recursive' strategy. fs/gfs2/bmap.c | 190 +++++++++++++++++++++---------------------------------- fs/gfs2/dentry.c | 45 ++++--------- fs/gfs2/file.c | 7 +- fs/gfs2/glock.c | 2 +- fs/gfs2/rgrp.c | 2 +- fs/gfs2/super.c | 14 ++-- fs/gfs2/util.c | 2 +- 7 files changed, 95 insertions(+), 167 deletions(-) Merging mtd/mtd/next (5f9e832c1370 Linus 5.3-rc1) $ git merge mtd/mtd/next Already up to date. Merging nand/nand/next (80107e764846 mtd: rawnand: remove redundant assignment to variable ret) $ git merge nand/nand/next Merge made by the 'recursive' strategy. drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c | 5 +- drivers/mtd/nand/raw/meson_nand.c | 1 + drivers/mtd/nand/raw/nand_base.c | 2 +- drivers/mtd/nand/raw/oxnas_nand.c | 8 ++- drivers/mtd/nand/raw/r852.c | 4 +- drivers/mtd/nand/raw/stm32_fmc2_nand.c | 90 ++++++++----------------- drivers/mtd/nand/raw/tango_nand.c | 1 + drivers/mtd/nand/raw/vf610_nfc.c | 1 + 8 files changed, 42 insertions(+), 70 deletions(-) Merging spi-nor/spi-nor/next (913787ca40b9 mtd: spi-nor: intel-spi: Whitelist 4B read commands) $ git merge spi-nor/spi-nor/next Auto-merging drivers/mtd/spi-nor/spi-nor.c Removing drivers/mtd/devices/m25p80.c Merge made by the 'recursive' strategy. drivers/mtd/devices/Kconfig | 18 - drivers/mtd/devices/Makefile | 1 - drivers/mtd/devices/m25p80.c | 347 -------------- drivers/mtd/spi-nor/Kconfig | 2 + drivers/mtd/spi-nor/cadence-quadspi.c | 19 +- drivers/mtd/spi-nor/intel-spi-pci.c | 1 + drivers/mtd/spi-nor/intel-spi.c | 2 + drivers/mtd/spi-nor/spi-nor.c | 825 +++++++++++++++++++++++++++++++--- include/linux/mtd/spi-nor.h | 26 +- 9 files changed, 793 insertions(+), 448 deletions(-) delete mode 100644 drivers/mtd/devices/m25p80.c Merging crypto/master (198429631a85 crypto: arm64/aegis128 - implement plain NEON version) $ git merge crypto/master Removing tools/crypto/getstat.c Auto-merging include/net/net_namespace.h Removing include/crypto/morus_common.h Removing include/crypto/morus640_glue.h Removing include/crypto/morus1280_glue.h Removing drivers/crypto/ccree/cc_ivgen.h Removing drivers/crypto/ccree/cc_ivgen.c Auto-merging drivers/crypto/ccp/ccp-ops.c Removing crypto/morus640.c Removing crypto/morus1280.c Removing crypto/aegis256.c Removing crypto/aegis128l.c Removing arch/x86/include/asm/crypto/aes.h Removing arch/x86/crypto/morus640_glue.c Removing arch/x86/crypto/morus640-sse2-glue.c Removing arch/x86/crypto/morus640-sse2-asm.S Removing arch/x86/crypto/morus1280_glue.c Removing arch/x86/crypto/morus1280-sse2-glue.c Removing arch/x86/crypto/morus1280-sse2-asm.S Removing arch/x86/crypto/morus1280-avx2-glue.c Removing arch/x86/crypto/morus1280-avx2-asm.S Removing arch/x86/crypto/aes-x86_64-asm_64.S Removing arch/x86/crypto/aes-i586-asm_32.S Removing arch/x86/crypto/aegis256-aesni-glue.c Removing arch/x86/crypto/aegis256-aesni-asm.S Removing arch/x86/crypto/aegis128l-aesni-glue.c Removing arch/x86/crypto/aegis128l-aesni-asm.S Removing arch/arm64/crypto/aes-ctr-fallback.h Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. Documentation/ABI/testing/debugfs-hisi-zip | 50 + Documentation/crypto/crypto_engine.rst | 1 + MAINTAINERS | 11 + arch/arm/crypto/Kconfig | 2 +- arch/arm/crypto/aes-ce-core.S | 20 +- arch/arm/crypto/aes-ce-glue.c | 168 +- arch/arm/crypto/aes-cipher-core.S | 40 +- arch/arm/crypto/aes-cipher-glue.c | 11 +- arch/arm/crypto/aes-neonbs-glue.c | 69 +- arch/arm/crypto/ghash-ce-glue.c | 80 +- arch/arm/include/asm/Kbuild | 1 - arch/arm64/crypto/Kconfig | 10 +- arch/arm64/crypto/aes-ce-ccm-glue.c | 18 +- arch/arm64/crypto/aes-ce-glue.c | 7 +- arch/arm64/crypto/aes-cipher-core.S | 40 +- arch/arm64/crypto/aes-cipher-glue.c | 11 +- arch/arm64/crypto/aes-ctr-fallback.h | 50 - arch/arm64/crypto/aes-glue.c | 39 +- arch/arm64/crypto/aes-neon.S | 74 +- arch/arm64/crypto/aes-neonbs-glue.c | 29 +- arch/arm64/crypto/ghash-ce-glue.c | 30 +- arch/powerpc/include/asm/Kbuild | 1 - arch/s390/crypto/aes_s390.c | 8 +- arch/s390/crypto/ghash_s390.c | 2 +- arch/sparc/crypto/aes_glue.c | 8 +- arch/x86/crypto/Makefile | 21 - arch/x86/crypto/aegis128l-aesni-asm.S | 823 ------- arch/x86/crypto/aegis128l-aesni-glue.c | 293 --- arch/x86/crypto/aegis256-aesni-asm.S | 700 ------ arch/x86/crypto/aegis256-aesni-glue.c | 293 --- arch/x86/crypto/aes-i586-asm_32.S | 362 ---- arch/x86/crypto/aes-x86_64-asm_64.S | 185 -- arch/x86/crypto/aes_glue.c | 70 - arch/x86/crypto/aesni-intel_glue.c | 23 +- arch/x86/crypto/ghash-clmulni-intel_glue.c | 3 +- arch/x86/crypto/morus1280-avx2-asm.S | 619 ------ arch/x86/crypto/morus1280-avx2-glue.c | 62 - arch/x86/crypto/morus1280-sse2-asm.S | 893 -------- arch/x86/crypto/morus1280-sse2-glue.c | 61 - arch/x86/crypto/morus1280_glue.c | 205 -- arch/x86/crypto/morus640-sse2-asm.S | 612 ------ arch/x86/crypto/morus640-sse2-glue.c | 61 - arch/x86/crypto/morus640_glue.c | 200 -- arch/x86/include/asm/crypto/aes.h | 12 - crypto/Kconfig | 152 +- crypto/Makefile | 26 +- crypto/aead.c | 3 +- crypto/aegis.h | 28 +- crypto/{aegis128.c => aegis128-core.c} | 63 +- crypto/aegis128-neon-inner.c | 212 ++ crypto/aegis128-neon.c | 49 + crypto/aegis128l.c | 522 ----- crypto/aegis256.c | 473 ---- crypto/aes_generic.c | 169 +- crypto/aes_ti.c | 313 +-- crypto/cryptd.c | 44 +- crypto/crypto_engine.c | 2 +- crypto/crypto_user_base.c | 37 +- crypto/crypto_user_stat.c | 4 +- crypto/fips.c | 11 + crypto/gcm.c | 47 +- crypto/ghash-generic.c | 31 +- crypto/morus1280.c | 542 ----- crypto/morus640.c | 533 ----- crypto/streebog_generic.c | 46 - crypto/tcrypt.c | 7 + crypto/testmgr.c | 38 +- crypto/testmgr.h | 2771 +----------------------- crypto/xts.c | 152 +- drivers/char/hw_random/atmel-rng.c | 3 +- drivers/char/hw_random/cavium-rng-vf.c | 11 +- drivers/char/hw_random/core.c | 5 +- drivers/char/hw_random/exynos-trng.c | 3 +- drivers/char/hw_random/imx-rngc.c | 4 +- drivers/char/hw_random/mxc-rnga.c | 4 +- drivers/char/hw_random/n2-drv.c | 4 +- drivers/char/hw_random/nomadik-rng.c | 3 +- drivers/char/hw_random/omap-rng.c | 3 +- drivers/char/hw_random/powernv-rng.c | 10 +- drivers/char/hw_random/st-rng.c | 4 +- drivers/char/hw_random/xgene-rng.c | 4 +- drivers/crypto/Kconfig | 14 +- drivers/crypto/amcc/crypto4xx_alg.c | 24 +- drivers/crypto/atmel-aes.c | 1 - drivers/crypto/atmel-sha.c | 1 - drivers/crypto/atmel-sha204a.c | 3 +- drivers/crypto/atmel-tdes.c | 1 - drivers/crypto/axis/artpec6_crypto.c | 4 +- drivers/crypto/bcm/cipher.c | 13 + drivers/crypto/caam/Kconfig | 2 + drivers/crypto/caam/Makefile | 1 + drivers/crypto/caam/caamalg.c | 227 +- drivers/crypto/caam/caamalg_desc.c | 56 +- drivers/crypto/caam/caamalg_desc.h | 4 +- drivers/crypto/caam/caamalg_qi.c | 232 +- drivers/crypto/caam/caamalg_qi2.c | 325 ++- drivers/crypto/caam/caamalg_qi2.h | 4 +- drivers/crypto/caam/caamhash.c | 114 +- drivers/crypto/caam/caamhash_desc.c | 5 +- drivers/crypto/caam/caamhash_desc.h | 2 +- drivers/crypto/caam/caampkc.c | 91 +- drivers/crypto/caam/caamrng.c | 17 +- drivers/crypto/caam/ctrl.c | 74 +- drivers/crypto/caam/desc_constr.h | 34 +- drivers/crypto/caam/dpseci-debugfs.c | 79 + drivers/crypto/caam/dpseci-debugfs.h | 18 + drivers/crypto/caam/error.c | 61 +- drivers/crypto/caam/error.h | 2 +- drivers/crypto/caam/key_gen.c | 14 +- drivers/crypto/caam/qi.c | 10 +- drivers/crypto/caam/regs.h | 1 + drivers/crypto/cavium/nitrox/nitrox_csr.h | 235 +- drivers/crypto/cavium/nitrox/nitrox_debugfs.c | 3 +- drivers/crypto/cavium/nitrox/nitrox_dev.h | 8 +- drivers/crypto/cavium/nitrox/nitrox_hal.c | 158 +- drivers/crypto/cavium/nitrox/nitrox_hal.h | 6 +- drivers/crypto/cavium/nitrox/nitrox_lib.c | 66 +- drivers/crypto/cavium/nitrox/nitrox_main.c | 148 +- drivers/crypto/cavium/nitrox/nitrox_req.h | 30 + drivers/crypto/cavium/nitrox/nitrox_sriov.c | 3 + drivers/crypto/ccp/Kconfig | 9 + drivers/crypto/ccp/Makefile | 4 +- drivers/crypto/ccp/ccp-crypto-aes-cmac.c | 25 +- drivers/crypto/ccp/ccp-crypto-main.c | 4 +- drivers/crypto/ccp/ccp-crypto.h | 8 +- drivers/crypto/ccp/ccp-dev-v3.c | 3 +- drivers/crypto/ccp/ccp-dev-v5.c | 26 +- drivers/crypto/ccp/ccp-dev.c | 29 +- drivers/crypto/ccp/ccp-dev.h | 3 +- drivers/crypto/ccp/ccp-dmaengine.c | 13 +- drivers/crypto/ccp/ccp-ops.c | 56 +- drivers/crypto/ccp/psp-dev.h | 1 - drivers/crypto/ccp/sp-dev.h | 1 - drivers/crypto/ccp/sp-platform.c | 4 +- drivers/crypto/ccree/Makefile | 2 +- drivers/crypto/ccree/cc_aead.c | 105 +- drivers/crypto/ccree/cc_aead.h | 3 +- drivers/crypto/ccree/cc_buffer_mgr.c | 21 - drivers/crypto/ccree/cc_buffer_mgr.h | 2 - drivers/crypto/ccree/cc_driver.c | 18 +- drivers/crypto/ccree/cc_driver.h | 10 - drivers/crypto/ccree/cc_fips.c | 31 +- drivers/crypto/ccree/cc_ivgen.c | 276 --- drivers/crypto/ccree/cc_ivgen.h | 55 - drivers/crypto/ccree/cc_pm.c | 2 - drivers/crypto/ccree/cc_request_mgr.c | 47 +- drivers/crypto/chelsio/Kconfig | 1 + drivers/crypto/chelsio/chcr_algo.c | 46 +- drivers/crypto/chelsio/chcr_crypto.h | 1 - drivers/crypto/chelsio/chcr_ipsec.c | 19 +- drivers/crypto/chelsio/chtls/chtls_hw.c | 20 +- drivers/crypto/exynos-rng.c | 4 +- drivers/crypto/hisilicon/Kconfig | 24 + drivers/crypto/hisilicon/Makefile | 3 + drivers/crypto/hisilicon/qm.c | 1913 ++++++++++++++++ drivers/crypto/hisilicon/qm.h | 215 ++ drivers/crypto/hisilicon/sgl.c | 214 ++ drivers/crypto/hisilicon/sgl.h | 24 + drivers/crypto/hisilicon/zip/Makefile | 2 + drivers/crypto/hisilicon/zip/zip.h | 71 + drivers/crypto/hisilicon/zip/zip_crypto.c | 653 ++++++ drivers/crypto/hisilicon/zip/zip_main.c | 1013 +++++++++ drivers/crypto/img-hash.c | 5 +- drivers/crypto/inside-secure/safexcel.c | 51 +- drivers/crypto/inside-secure/safexcel.h | 48 +- drivers/crypto/inside-secure/safexcel_cipher.c | 727 +++++-- drivers/crypto/inside-secure/safexcel_hash.c | 577 ++--- drivers/crypto/marvell/cipher.c | 2 +- drivers/crypto/mediatek/mtk-platform.c | 7 +- drivers/crypto/mxs-dcp.c | 8 +- drivers/crypto/nx/nx-842-powernv.c | 1 + drivers/crypto/omap-aes.c | 1 - drivers/crypto/omap-des.c | 1 - drivers/crypto/omap-sham.c | 1 - drivers/crypto/padlock-aes.c | 10 +- drivers/crypto/picoxcell_crypto.c | 5 +- drivers/crypto/qat/qat_common/adf_common_drv.h | 2 +- drivers/crypto/qce/core.c | 4 +- drivers/crypto/qcom-rng.c | 4 +- drivers/crypto/rockchip/rk3288_crypto.c | 4 +- drivers/crypto/sahara.c | 4 +- drivers/crypto/stm32/stm32-crc32.c | 4 +- drivers/crypto/stm32/stm32-cryp.c | 8 +- drivers/crypto/stm32/stm32-hash.c | 4 +- drivers/crypto/sunxi-ss/sun4i-ss-core.c | 4 +- drivers/crypto/ux500/cryp/cryp.h | 4 +- drivers/crypto/ux500/hash/hash_alg.h | 4 +- drivers/crypto/virtio/virtio_crypto_algs.c | 4 +- include/asm-generic/Kbuild | 2 + include/crypto/aes.h | 58 +- include/crypto/algapi.h | 2 - include/crypto/ctr.h | 50 + include/crypto/gcm.h | 55 + include/crypto/ghash.h | 2 +- include/crypto/internal/cryptouser.h | 7 +- include/crypto/morus1280_glue.h | 97 - include/crypto/morus640_glue.h | 97 - include/crypto/morus_common.h | 18 - include/crypto/sha1_base.h | 5 + include/crypto/sha256_base.h | 5 + include/crypto/sha512_base.h | 5 + include/crypto/sm3_base.h | 5 + include/linux/fips.h | 7 + include/linux/padata.h | 13 +- include/linux/timeriomem-rng.h | 5 + include/net/net_namespace.h | 3 + include/uapi/linux/cryptouser.h | 5 + kernel/padata.c | 116 +- lib/crypto/Makefile | 3 + lib/crypto/aes.c | 356 +++ net/bluetooth/Kconfig | 3 +- net/bluetooth/smp.c | 103 +- tools/crypto/getstat.c | 294 --- 213 files changed, 8623 insertions(+), 13870 deletions(-) create mode 100644 Documentation/ABI/testing/debugfs-hisi-zip delete mode 100644 arch/arm64/crypto/aes-ctr-fallback.h delete mode 100644 arch/x86/crypto/aegis128l-aesni-asm.S delete mode 100644 arch/x86/crypto/aegis128l-aesni-glue.c delete mode 100644 arch/x86/crypto/aegis256-aesni-asm.S delete mode 100644 arch/x86/crypto/aegis256-aesni-glue.c delete mode 100644 arch/x86/crypto/aes-i586-asm_32.S delete mode 100644 arch/x86/crypto/aes-x86_64-asm_64.S delete mode 100644 arch/x86/crypto/morus1280-avx2-asm.S delete mode 100644 arch/x86/crypto/morus1280-avx2-glue.c delete mode 100644 arch/x86/crypto/morus1280-sse2-asm.S delete mode 100644 arch/x86/crypto/morus1280-sse2-glue.c delete mode 100644 arch/x86/crypto/morus1280_glue.c delete mode 100644 arch/x86/crypto/morus640-sse2-asm.S delete mode 100644 arch/x86/crypto/morus640-sse2-glue.c delete mode 100644 arch/x86/crypto/morus640_glue.c delete mode 100644 arch/x86/include/asm/crypto/aes.h rename crypto/{aegis128.c => aegis128-core.c} (89%) create mode 100644 crypto/aegis128-neon-inner.c create mode 100644 crypto/aegis128-neon.c delete mode 100644 crypto/aegis128l.c delete mode 100644 crypto/aegis256.c delete mode 100644 crypto/morus1280.c delete mode 100644 crypto/morus640.c create mode 100644 drivers/crypto/caam/dpseci-debugfs.c create mode 100644 drivers/crypto/caam/dpseci-debugfs.h delete mode 100644 drivers/crypto/ccree/cc_ivgen.c delete mode 100644 drivers/crypto/ccree/cc_ivgen.h create mode 100644 drivers/crypto/hisilicon/qm.c create mode 100644 drivers/crypto/hisilicon/qm.h create mode 100644 drivers/crypto/hisilicon/sgl.c create mode 100644 drivers/crypto/hisilicon/sgl.h create mode 100644 drivers/crypto/hisilicon/zip/Makefile create mode 100644 drivers/crypto/hisilicon/zip/zip.h create mode 100644 drivers/crypto/hisilicon/zip/zip_crypto.c create mode 100644 drivers/crypto/hisilicon/zip/zip_main.c delete mode 100644 include/crypto/morus1280_glue.h delete mode 100644 include/crypto/morus640_glue.h delete mode 100644 include/crypto/morus_common.h create mode 100644 lib/crypto/aes.c delete mode 100644 tools/crypto/getstat.c Merging drm/drm-next (5f680625d976 Merge tag 'drm-misc-next-2019-08-19' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) $ git merge drm/drm-next Removing include/drm/tinydrm/tinydrm-helpers.h Removing include/drm/tinydrm/mipi-dbi.h Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_msg.c Removing drivers/gpu/drm/vboxvideo/vbox_prime.c Removing drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c Removing drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c Removing drivers/gpu/drm/tinydrm/core/Makefile Auto-merging drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c Auto-merging drivers/gpu/drm/sun4i/sun4i_tcon.c Auto-merging drivers/gpu/drm/scheduler/sched_entity.c Removing drivers/gpu/drm/rockchip/rockchip_drm_psr.h Removing drivers/gpu/drm/rockchip/rockchip_drm_psr.c Auto-merging drivers/gpu/drm/rockchip/analogix_dp-rockchip.c Auto-merging drivers/gpu/drm/omapdrm/omap_drv.c Removing drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c Removing drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c Removing drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c Removing drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c Removing drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c Removing drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c Removing drivers/gpu/drm/mgag200/mgag200_fb.c Removing drivers/gpu/drm/i915/selftests/igt_wedge_me.h Removing drivers/gpu/drm/i915/intel_uc_fw.c Removing drivers/gpu/drm/i915/intel_uc.c Removing drivers/gpu/drm/i915/intel_huc_fw.c Removing drivers/gpu/drm/i915/intel_guc_fw.c Auto-merging drivers/gpu/drm/i915/intel_drv.h Removing drivers/gpu/drm/i915/i915_timeline.h Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c Removing drivers/gpu/drm/i915/gt/Makefile.header-test Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Removing drivers/gpu/drm/i915/gem/Makefile.header-test Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c Removing drivers/gpu/drm/i915/display/Makefile.header-test Removing drivers/gpu/drm/i915/Makefile.header-test Auto-merging drivers/gpu/drm/drm_modes.c Auto-merging drivers/gpu/drm/bridge/adv7511/adv7511_drv.c Auto-merging drivers/gpu/drm/ast/ast_post.c Auto-merging drivers/gpu/drm/ast/ast_mode.c Auto-merging drivers/gpu/drm/ast/ast_main.c Removing drivers/gpu/drm/ast/ast_fb.c Auto-merging drivers/gpu/drm/arm/display/komeda/komeda_kms.c Auto-merging drivers/gpu/drm/arm/display/komeda/komeda_dev.c Auto-merging drivers/gpu/drm/amd/powerplay/smu_v11_0.c Auto-merging drivers/gpu/drm/amd/powerplay/navi10_ppt.c Auto-merging drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h Auto-merging drivers/gpu/drm/amd/powerplay/amdgpu_smu.c Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c Auto-merging drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h Auto-merging MAINTAINERS Auto-merging Documentation/media/uapi/v4l/subdev-formats.rst Removing Documentation/gpu/tinydrm.rst Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml Removing Documentation/devicetree/bindings/display/panel/tpo,tpg110.txt Removing Documentation/devicetree/bindings/display/panel/tfc,s9700rtwv43tr-01b.txt Removing Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.txt Removing Documentation/devicetree/bindings/display/panel/raspberrypi,7inch-touchscreen.txt Removing Documentation/devicetree/bindings/display/panel/pda,91-00156-a0.txt Removing Documentation/devicetree/bindings/display/panel/panel.txt Removing Documentation/devicetree/bindings/display/panel/panel-lvds.txt Removing Documentation/devicetree/bindings/display/panel/panel-common.txt Removing Documentation/devicetree/bindings/display/panel/mitsubishi,aa121td01.txt Removing Documentation/devicetree/bindings/display/panel/mitsubishi,aa104xd12.txt Removing Documentation/devicetree/bindings/display/panel/innolux,ee101ia-01d.txt Removing Documentation/devicetree/bindings/display/panel/dlc,dlc0700yzg-1.txt Removing Documentation/devicetree/bindings/display/panel/bananapi,s070wv20-ct16.txt Removing Documentation/devicetree/bindings/display/panel/armadeus,st0700-adapt.txt Removing Documentation/devicetree/bindings/display/panel/ampire,am-480272h3tmqw-t01h.txt Removing Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt Removing Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h' using previous resolution. Resolved 'drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit --no-edit -v -a [master 8466f4a16c60] Merge remote-tracking branch 'drm/drm-next' $ git diff -M --stat --summary HEAD^.. .../bindings/display/amlogic,meson-dw-hdmi.txt | 119 - .../bindings/display/amlogic,meson-dw-hdmi.yaml | 150 + .../bindings/display/amlogic,meson-vpu.txt | 121 - .../bindings/display/amlogic,meson-vpu.yaml | 137 + .../devicetree/bindings/display/arm,pl11x.txt | 9 +- .../devicetree/bindings/display/bridge/sii902x.txt | 5 +- .../bindings/display/connector/hdmi-connector.txt | 1 + .../display/panel/ampire,am-480272h3tmqw-t01h.txt | 26 - .../display/panel/ampire,am-480272h3tmqw-t01h.yaml | 42 + .../display/panel/arm,versatile-tft-panel.txt | 2 +- .../display/panel/armadeus,st0700-adapt.txt | 9 - .../display/panel/armadeus,st0700-adapt.yaml | 33 + .../display/panel/bananapi,s070wv20-ct16.txt | 12 - .../display/panel/bananapi,s070wv20-ct16.yaml | 31 + .../bindings/display/panel/boe,himax8279d.txt | 24 + .../bindings/display/panel/dlc,dlc0700yzg-1.txt | 13 - .../bindings/display/panel/dlc,dlc0700yzg-1.yaml | 31 + .../bindings/display/panel/edt,et-series.txt | 2 +- .../bindings/display/panel/giantplus,gpm940b0.txt | 12 + .../bindings/display/panel/innolux,ee101ia-01d.txt | 7 - .../display/panel/innolux,ee101ia-01d.yaml | 31 + .../display/panel/kingdisplay,kd035g6-54nt.txt | 42 + .../devicetree/bindings/display/panel/lvds.yaml | 107 + .../display/panel/mitsubishi,aa104xd12.txt | 47 - .../display/panel/mitsubishi,aa104xd12.yaml | 75 + .../display/panel/mitsubishi,aa121td01.txt | 47 - .../display/panel/mitsubishi,aa121td01.yaml | 74 + .../bindings/display/panel/nec,nl8048hl11.yaml | 62 + .../display/panel/ortustech,com37h3m05dtc.txt | 12 + .../display/panel/ortustech,com37h3m99dtc.txt | 12 + .../bindings/display/panel/panel-common.txt | 101 - .../bindings/display/panel/panel-common.yaml | 149 + .../bindings/display/panel/panel-lvds.txt | 121 - .../devicetree/bindings/display/panel/panel.txt | 4 - .../bindings/display/panel/pda,91-00156-a0.txt | 14 - .../bindings/display/panel/pda,91-00156-a0.yaml | 31 + .../panel/raspberrypi,7inch-touchscreen.txt | 49 - .../panel/raspberrypi,7inch-touchscreen.yaml | 71 + .../bindings/display/panel/raydium,rm67191.txt | 41 + .../display/panel/rocktech,jh057n00900.txt | 5 + .../bindings/display/panel/sgd,gktw70sdae4se.txt | 41 - .../bindings/display/panel/sgd,gktw70sdae4se.yaml | 68 + .../bindings/display/panel/sharp,ld-d5116z01b.txt | 26 + .../bindings/display/panel/sharp,lq070y3dg3b.txt | 12 + .../bindings/display/panel/sharp,ls020b1dd01d.txt | 12 + .../bindings/display/panel/simple-panel.txt | 29 +- .../display/panel/tfc,s9700rtwv43tr-01b.txt | 15 - .../display/panel/tfc,s9700rtwv43tr-01b.yaml | 33 + .../bindings/display/panel/ti,nspire.yaml | 36 + .../bindings/display/panel/tpo,tpg110.txt | 70 - .../bindings/display/panel/tpo,tpg110.yaml | 101 + .../bindings/display/rockchip/rockchip-lvds.txt | 11 - .../devicetree/bindings/display/ssd1307fb.txt | 10 + .../devicetree/bindings/vendor-prefixes.yaml | 5 + Documentation/gpu/drivers.rst | 1 - Documentation/gpu/drm-kms-helpers.rst | 12 + Documentation/gpu/drm-mm.rst | 40 +- Documentation/gpu/i915.rst | 20 +- Documentation/gpu/introduction.rst | 16 + Documentation/gpu/tinydrm.rst | 30 - Documentation/gpu/todo.rst | 81 +- Documentation/media/uapi/v4l/subdev-formats.rst | 107 + MAINTAINERS | 64 +- arch/x86/kernel/early-quirks.c | 1 + drivers/dma-buf/Makefile | 2 +- drivers/dma-buf/dma-buf.c | 28 +- drivers/dma-buf/dma-fence-array.c | 32 +- drivers/dma-buf/dma-fence-chain.c | 24 +- drivers/dma-buf/dma-fence.c | 55 +- drivers/dma-buf/{reservation.c => dma-resv.c} | 251 +- drivers/dma-buf/sw_sync.c | 16 +- drivers/dma-buf/sync_file.c | 2 +- drivers/gpu/drm/Kconfig | 6 +- drivers/gpu/drm/Makefile | 3 +- drivers/gpu/drm/amd/amdgpu/Makefile | 13 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 44 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 18 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 323 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 169 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 69 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 18 +- drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 96 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 26 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 145 +- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 23 +- drivers/gpu/drm/amd/amdgpu/amdgpu_display.h | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 48 +- drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 9 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 30 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 13 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 23 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 9 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ids.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 31 +- drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 132 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 79 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 37 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 181 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 308 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 10 +- drivers/gpu/drm/amd/amdgpu/amdgpu_sync.h | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 35 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 14 + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 16 + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 82 + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 202 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 34 +- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 45 - drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 13 - drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 47 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 9 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 114 +- drivers/gpu/drm/amd/amdgpu/arct_reg_init.c | 59 + drivers/gpu/drm/amd/amdgpu/athub_v2_0.c | 1 + drivers/gpu/drm/amd/amdgpu/cik.c | 7 + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 3 + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 202 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 193 +- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 19 + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 19 + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 1251 +- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 39 +- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 149 +- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.h | 7 + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 12 +- drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 3 +- drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 517 + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h | 33 + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 15 - drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 3 +- drivers/gpu/drm/amd/amdgpu/navi10_reg_init.c | 14 +- drivers/gpu/drm/amd/amdgpu/navi12_reg_init.c | 53 + drivers/gpu/drm/amd/amdgpu/navi14_reg_init.c | 54 + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 2 +- drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 72 +- drivers/gpu/drm/amd/amdgpu/nv.c | 99 +- drivers/gpu/drm/amd/amdgpu/nv.h | 2 + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 11 +- drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 25 + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 2 +- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 524 +- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 56 +- drivers/gpu/drm/amd/amdgpu/si.c | 7 + drivers/gpu/drm/amd/amdgpu/soc15.c | 164 +- drivers/gpu/drm/amd/amdgpu/soc15.h | 1 + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 5 +- drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 255 + drivers/gpu/drm/amd/amdgpu/umc_v6_1.h | 51 + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 116 +- drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 275 +- drivers/gpu/drm/amd/amdgpu/vcn_v2_0.h | 38 + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 1414 + .../amdgpu/vcn_v2_5.h} | 26 +- drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 29 +- drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c | 6 + drivers/gpu/drm/amd/amdgpu/vi.c | 7 + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 1455 +- .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 1992 +- .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx8.asm | 395 +- .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm | 547 +- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 25 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 9 +- drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 2 + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c | 59 +- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 10 +- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 2 + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 18 +- drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h | 24 +- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 1 + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 177 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 17 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 139 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 61 + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 26 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 51 +- drivers/gpu/drm/amd/display/dc/calcs/Makefile | 4 + drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 2 +- drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 2 +- .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 36 +- .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.h | 5 + drivers/gpu/drm/amd/display/dc/core/dc.c | 92 +- drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 40 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 71 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 355 +- drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 45 +- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 16 + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 27 +- drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 3 +- drivers/gpu/drm/amd/display/dc/dc.h | 44 +- drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 21 + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 56 +- drivers/gpu/drm/amd/display/dc/dc_link.h | 11 + drivers/gpu/drm/amd/display/dc/dc_types.h | 14 + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 28 +- drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 9 +- drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 7 +- drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 10 +- .../drm/amd/display/dc/dce/dce_stream_encoder.c | 30 +- .../amd/display/dc/dce110/dce110_hw_sequencer.c | 46 +- .../drm/amd/display/dc/dce110/dce110_mem_input_v.c | 42 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 70 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 27 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 64 +- .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 2 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 2 +- .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 33 +- .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 16 +- drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 4 + .../gpu/drm/amd/display/dc/dcn20/dcn20_dpp_cm.c | 7 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 8 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.h | 4 +- .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 11 + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 688 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h | 62 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 178 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 14 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 34 +- .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 489 +- .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 12 + .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 2 +- .../amd/display/dc/dcn20/dcn20_stream_encoder.h | 5 + drivers/gpu/drm/amd/display/dc/dm_services.h | 1 + drivers/gpu/drm/amd/display/dc/dml/Makefile | 7 + .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 5109 +++ .../display/dc/dml/dcn20/display_mode_vba_20v2.h | 32 + .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 1701 + .../dc/dml/dcn20/display_rq_dlg_calc_20v2.h | 74 + .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 12 + .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 1 + .../drm/amd/display/dc/dml/display_mode_structs.h | 1 + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 8 +- drivers/gpu/drm/amd/display/dc/dsc/Makefile | 4 + drivers/gpu/drm/amd/display/dc/dsc/drm_dsc_dc.c | 73 +- drivers/gpu/drm/amd/display/dc/gpio/Makefile | 2 +- .../amd/display/dc/gpio/dcn10/hw_factory_dcn10.c | 42 +- .../amd/display/dc/gpio/dcn20/hw_factory_dcn20.c | 41 +- .../amd/display/dc/gpio/dcn20/hw_translate_dcn20.c | 2 +- .../display/dc/gpio/diagnostics/hw_factory_diag.c | 1 + drivers/gpu/drm/amd/display/dc/gpio/generic_regs.h | 66 + drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c | 68 + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.h | 3 + drivers/gpu/drm/amd/display/dc/gpio/hw_generic.c | 134 + drivers/gpu/drm/amd/display/dc/gpio/hw_generic.h | 46 + drivers/gpu/drm/amd/display/dc/inc/core_status.h | 3 + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 1 + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 7 + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 3 + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 1 + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 2 +- drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 2 +- drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 1 + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 10 + drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 2 +- drivers/gpu/drm/amd/display/include/audio_types.h | 4 +- drivers/gpu/drm/amd/display/include/dal_asic_id.h | 10 + .../amd/display/include/gpio_service_interface.h | 18 +- .../drm/amd/display/include/link_service_types.h | 17 +- .../drm/amd/display/modules/color/color_gamma.c | 163 +- .../drm/amd/display/modules/color/color_gamma.h | 9 + drivers/gpu/drm/amd/include/arct_ip_offset.h | 1650 + .../drm/amd/include/asic_reg/df/df_3_6_offset.h | 4 + .../drm/amd/include/asic_reg/gc/gc_10_1_0_offset.h | 2 + .../amd/include/asic_reg/gc/gc_10_1_0_sh_mask.h | 39 + .../drm/amd/include/asic_reg/gc/gc_9_0_offset.h | 2 + .../drm/amd/include/asic_reg/gc/gc_9_0_sh_mask.h | 157 + .../include/asic_reg/mmhub/mmhub_9_4_1_default.h | 3933 ++ .../include/asic_reg/mmhub/mmhub_9_4_1_offset.h | 7753 ++++ .../include/asic_reg/mmhub/mmhub_9_4_1_sh_mask.h | 44884 +++++++++++++++++++ .../amd/include/asic_reg/nbio/nbio_7_0_sh_mask.h | 30 + .../drm/amd/include/asic_reg/nbio/nbio_7_0_smn.h | 6 + .../amd/include/asic_reg/rsmu/rsmu_0_0_2_offset.h | 27 + .../amd/include/asic_reg/rsmu/rsmu_0_0_2_sh_mask.h | 32 + .../include/asic_reg/sdma0/sdma0_4_2_2_offset.h | 1051 + .../include/asic_reg/sdma0/sdma0_4_2_2_sh_mask.h | 3002 ++ .../include/asic_reg/sdma1/sdma1_4_2_2_offset.h | 1043 + .../include/asic_reg/sdma1/sdma1_4_2_2_sh_mask.h | 2956 ++ .../include/asic_reg/sdma2/sdma2_4_2_2_offset.h | 1043 + .../include/asic_reg/sdma2/sdma2_4_2_2_sh_mask.h | 2956 ++ .../include/asic_reg/sdma3/sdma3_4_2_2_offset.h | 1043 + .../include/asic_reg/sdma3/sdma3_4_2_2_sh_mask.h | 2956 ++ .../include/asic_reg/sdma4/sdma4_4_2_2_offset.h | 1043 + .../include/asic_reg/sdma4/sdma4_4_2_2_sh_mask.h | 2956 ++ .../include/asic_reg/sdma5/sdma5_4_2_2_offset.h | 1043 + .../include/asic_reg/sdma5/sdma5_4_2_2_sh_mask.h | 2956 ++ .../include/asic_reg/sdma6/sdma6_4_2_2_offset.h | 1043 + .../include/asic_reg/sdma6/sdma6_4_2_2_sh_mask.h | 2956 ++ .../include/asic_reg/sdma7/sdma7_4_2_2_offset.h | 1043 + .../include/asic_reg/sdma7/sdma7_4_2_2_sh_mask.h | 2956 ++ .../amd/include/asic_reg/umc/umc_6_1_1_offset.h | 31 + .../amd/include/asic_reg/umc/umc_6_1_1_sh_mask.h | 91 + .../drm/amd/include/asic_reg/vcn/vcn_2_5_offset.h | 979 + .../drm/amd/include/asic_reg/vcn/vcn_2_5_sh_mask.h | 3609 ++ drivers/gpu/drm/amd/include/atomfirmware.h | 86 + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 9 + drivers/gpu/drm/amd/include/navi12_ip_offset.h | 1119 + drivers/gpu/drm/amd/include/navi14_ip_offset.h | 1119 + drivers/gpu/drm/amd/include/soc15_ih_clientid.h | 11 +- drivers/gpu/drm/amd/include/v9_structs.h | 8 +- drivers/gpu/drm/amd/powerplay/Makefile | 2 +- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 14 + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 299 +- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 1923 + drivers/gpu/drm/amd/powerplay/arcturus_ppt.h | 72 + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 25 + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 26 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 29 + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 207 +- drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h | 120 + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 1 + .../amd/powerplay/inc/smu11_driver_if_arcturus.h | 886 + drivers/gpu/drm/amd/powerplay/inc/smu_types.h | 218 + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 15 +- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 322 +- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 189 +- .../gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c | 4 + .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 4 + .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c | 4 + .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c | 8 + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 233 +- drivers/gpu/drm/arc/arcpgu_drv.c | 5 +- .../gpu/drm/arm/display/komeda/d71/d71_component.c | 42 +- drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 89 +- drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 5 +- drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 8 +- drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 5 +- drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 4 +- .../gpu/drm/arm/display/komeda/komeda_pipeline.c | 19 +- .../gpu/drm/arm/display/komeda/komeda_pipeline.h | 6 +- .../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +- drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 4 +- drivers/gpu/drm/arm/hdlcd_crtc.c | 12 +- drivers/gpu/drm/arm/hdlcd_drv.c | 13 +- drivers/gpu/drm/arm/malidp_crtc.c | 11 +- drivers/gpu/drm/arm/malidp_drv.c | 13 +- drivers/gpu/drm/arm/malidp_drv.h | 7 +- drivers/gpu/drm/arm/malidp_hw.c | 10 +- drivers/gpu/drm/arm/malidp_mw.c | 5 +- drivers/gpu/drm/arm/malidp_planes.c | 4 +- drivers/gpu/drm/armada/armada_crtc.c | 10 +- drivers/gpu/drm/armada/armada_debugfs.c | 8 +- drivers/gpu/drm/armada/armada_drm.h | 5 +- drivers/gpu/drm/armada/armada_drv.c | 11 +- drivers/gpu/drm/armada/armada_fb.c | 3 + drivers/gpu/drm/armada/armada_fbdev.c | 3 + drivers/gpu/drm/armada/armada_gem.c | 12 +- drivers/gpu/drm/armada/armada_gem.h | 3 +- drivers/gpu/drm/armada/armada_overlay.c | 8 +- drivers/gpu/drm/armada/armada_plane.c | 4 +- drivers/gpu/drm/armada/armada_trace.h | 5 +- drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 2 +- drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 3 +- drivers/gpu/drm/ast/Makefile | 2 +- drivers/gpu/drm/ast/ast_dp501.c | 5 +- drivers/gpu/drm/ast/ast_drv.c | 22 +- drivers/gpu/drm/ast/ast_drv.h | 46 +- drivers/gpu/drm/ast/ast_fb.c | 346 - drivers/gpu/drm/ast/ast_main.c | 77 +- drivers/gpu/drm/ast/ast_mode.c | 60 +- drivers/gpu/drm/ast/ast_post.c | 7 +- drivers/gpu/drm/ast/ast_ttm.c | 7 +- drivers/gpu/drm/ati_pcigart.c | 10 +- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 12 +- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 18 +- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 20 +- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 3 +- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 12 +- drivers/gpu/drm/bochs/bochs.h | 6 +- drivers/gpu/drm/bochs/bochs_drv.c | 17 +- drivers/gpu/drm/bochs/bochs_hw.c | 4 + drivers/gpu/drm/bochs/bochs_kms.c | 8 +- drivers/gpu/drm/bridge/Kconfig | 2 +- drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 12 +- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 295 +- drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 2 +- drivers/gpu/drm/bridge/dumb-vga-dac.c | 13 +- .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 1 - drivers/gpu/drm/bridge/nxp-ptn3460.c | 3 - drivers/gpu/drm/bridge/parade-ps8622.c | 1 - drivers/gpu/drm/bridge/sii902x.c | 44 +- .../gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c | 20 +- drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h | 1 + .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 60 +- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 88 +- drivers/gpu/drm/bridge/synopsys/dw-hdmi.h | 13 +- drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 47 + drivers/gpu/drm/bridge/tc358767.c | 683 +- drivers/gpu/drm/bridge/ti-sn65dsi86.c | 46 +- drivers/gpu/drm/bridge/ti-tfp410.c | 6 +- drivers/gpu/drm/cirrus/cirrus.c | 2 +- drivers/gpu/drm/drm_agpsupport.c | 45 +- drivers/gpu/drm/drm_atomic_uapi.c | 6 +- drivers/gpu/drm/drm_client.c | 1 - drivers/gpu/drm/drm_connector.c | 109 +- drivers/gpu/drm/drm_debugfs_crc.c | 15 +- drivers/gpu/drm/drm_dma.c | 2 +- drivers/gpu/drm/drm_dp_aux_dev.c | 18 +- drivers/gpu/drm/drm_dp_helper.c | 31 +- drivers/gpu/drm/drm_dp_mst_topology.c | 142 +- drivers/gpu/drm/drm_drv.c | 4 +- drivers/gpu/drm/drm_file.c | 9 +- drivers/gpu/drm/drm_gem.c | 37 +- drivers/gpu/drm/drm_gem_framebuffer_helper.c | 74 +- drivers/gpu/drm/drm_gem_shmem_helper.c | 62 +- drivers/gpu/drm/drm_gem_vram_helper.c | 94 +- drivers/gpu/drm/drm_hdcp.c | 77 +- drivers/gpu/drm/drm_ioc32.c | 13 +- drivers/gpu/drm/drm_ioctl.c | 139 +- drivers/gpu/drm/drm_legacy_misc.c | 2 +- drivers/gpu/drm/drm_lock.c | 2 +- drivers/gpu/drm/drm_memory.c | 2 +- .../gpu/drm/{tinydrm/mipi-dbi.c => drm_mipi_dbi.c} | 499 +- drivers/gpu/drm/drm_mm.c | 2 +- drivers/gpu/drm/drm_mode_object.c | 4 + drivers/gpu/drm/drm_modes.c | 17 +- drivers/gpu/drm/drm_panel.c | 102 +- drivers/gpu/drm/drm_prime.c | 868 +- drivers/gpu/drm/drm_scatter.c | 2 +- drivers/gpu/drm/drm_syncobj.c | 109 +- drivers/gpu/drm/drm_sysfs.c | 43 + drivers/gpu/drm/drm_vblank.c | 25 +- drivers/gpu/drm/drm_vm.c | 2 +- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 28 +- drivers/gpu/drm/etnaviv/etnaviv_gem.c | 22 +- drivers/gpu/drm/etnaviv/etnaviv_gem.h | 5 +- drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 1 - drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 14 +- drivers/gpu/drm/exynos/exynos_drm_drv.c | 21 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 5 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 9 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_kms.c | 1 - drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 2 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 11 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 6 + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 10 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 9 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 2 + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 1 + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 8 +- drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 8 +- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 10 +- drivers/gpu/drm/i2c/ch7006_priv.h | 1 - drivers/gpu/drm/i2c/sil164_drv.c | 3 +- drivers/gpu/drm/i2c/tda998x_drv.c | 2 +- drivers/gpu/drm/i810/i810_dma.c | 17 +- drivers/gpu/drm/i810/i810_drv.c | 8 +- drivers/gpu/drm/i810/i810_drv.h | 2 + drivers/gpu/drm/i915/Kconfig.debug | 15 + drivers/gpu/drm/i915/Makefile | 81 +- drivers/gpu/drm/i915/Makefile.header-test | 22 - drivers/gpu/drm/i915/display/Makefile | 6 +- drivers/gpu/drm/i915/display/Makefile.header-test | 16 - drivers/gpu/drm/i915/display/icl_dsi.c | 185 +- drivers/gpu/drm/i915/display/intel_atomic_plane.c | 56 +- drivers/gpu/drm/i915/display/intel_atomic_plane.h | 5 +- drivers/gpu/drm/i915/display/intel_audio.c | 81 +- drivers/gpu/drm/i915/display/intel_bios.c | 28 +- drivers/gpu/drm/i915/display/intel_bios.h | 3 +- drivers/gpu/drm/i915/display/intel_bw.c | 2 +- drivers/gpu/drm/i915/display/intel_cdclk.c | 84 +- drivers/gpu/drm/i915/display/intel_combo_phy.c | 193 +- drivers/gpu/drm/i915/display/intel_combo_phy.h | 4 +- drivers/gpu/drm/i915/display/intel_connector.c | 2 +- drivers/gpu/drm/i915/display/intel_ddi.c | 442 +- drivers/gpu/drm/i915/display/intel_display.c | 1249 +- drivers/gpu/drm/i915/display/intel_display.h | 50 +- drivers/gpu/drm/i915/display/intel_display_power.c | 658 +- drivers/gpu/drm/i915/display/intel_display_power.h | 35 +- drivers/gpu/drm/i915/display/intel_dp.c | 292 +- drivers/gpu/drm/i915/display/intel_dp.h | 2 - .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 5 +- drivers/gpu/drm/i915/display/intel_dp_mst.h | 8 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 652 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 57 +- drivers/gpu/drm/i915/display/intel_dsi.h | 12 +- drivers/gpu/drm/i915/display/intel_gmbus.c | 20 +- drivers/gpu/drm/i915/display/intel_hdcp.c | 65 +- drivers/gpu/drm/i915/display/intel_hdcp.h | 2 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 75 +- drivers/gpu/drm/i915/display/intel_hotplug.c | 59 +- drivers/gpu/drm/i915/display/intel_hotplug.h | 5 +- drivers/gpu/drm/i915/display/intel_overlay.c | 10 +- drivers/gpu/drm/i915/display/intel_pipe_crc.c | 2 +- drivers/gpu/drm/i915/display/intel_sdvo.c | 314 +- drivers/gpu/drm/i915/display/intel_sprite.c | 335 +- drivers/gpu/drm/i915/display/intel_tc.c | 537 + drivers/gpu/drm/i915/display/intel_tc.h | 35 + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 3 + drivers/gpu/drm/i915/display/intel_vdsc.c | 14 +- drivers/gpu/drm/i915/display/vlv_dsi.c | 4 +- drivers/gpu/drm/i915/gem/Makefile | 6 +- drivers/gpu/drm/i915/gem/Makefile.header-test | 16 - drivers/gpu/drm/i915/gem/i915_gem_busy.c | 4 +- drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_client_blt.c | 23 +- drivers/gpu/drm/i915/gem/i915_gem_context.c | 83 +- drivers/gpu/drm/i915/gem/i915_gem_context.h | 6 - drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 4 +- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 7 +- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 28 +- drivers/gpu/drm/i915/gem/i915_gem_fence.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 8 +- drivers/gpu/drm/i915/gem/i915_gem_object.c | 97 +- drivers/gpu/drm/i915/gem/i915_gem_object.h | 18 +- drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 6 +- drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 1 - drivers/gpu/drm/i915/gem/i915_gem_phys.c | 12 +- drivers/gpu/drm/i915/gem/i915_gem_pm.c | 37 +- drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 7 + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 27 +- drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 2 - drivers/gpu/drm/i915/gem/i915_gem_throttle.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 11 +- drivers/gpu/drm/i915/gem/i915_gem_wait.c | 24 +- drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 69 +- .../drm/i915/gem/selftests/i915_gem_client_blt.c | 26 +- .../drm/i915/gem/selftests/i915_gem_coherency.c | 9 +- .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 85 +- .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 8 +- drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 59 +- .../drm/i915/gem/selftests/i915_gem_object_blt.c | 15 +- drivers/gpu/drm/i915/gt/Makefile | 5 +- drivers/gpu/drm/i915/gt/Makefile.header-test | 16 - .../gen6_renderstate.c} | 0 .../gen7_renderstate.c} | 0 .../gen8_renderstate.c} | 0 .../gen9_renderstate.c} | 0 drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 13 +- drivers/gpu/drm/i915/gt/intel_context.c | 123 +- drivers/gpu/drm/i915/gt/intel_context.h | 18 +- drivers/gpu/drm/i915/gt/intel_context_types.h | 9 +- drivers/gpu/drm/i915/gt/intel_engine.h | 75 +- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 203 +- drivers/gpu/drm/i915/gt/intel_engine_pm.c | 7 +- drivers/gpu/drm/i915/gt/intel_engine_pm.h | 6 + drivers/gpu/drm/i915/gt/intel_engine_types.h | 74 +- drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 7 + drivers/gpu/drm/i915/gt/intel_gt.c | 250 + drivers/gpu/drm/i915/gt/intel_gt.h | 60 + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 62 +- drivers/gpu/drm/i915/gt/intel_gt_pm.h | 12 +- drivers/gpu/drm/i915/gt/intel_gt_types.h | 96 + drivers/gpu/drm/i915/gt/intel_hangcheck.c | 71 +- drivers/gpu/drm/i915/gt/intel_lrc.c | 1017 +- drivers/gpu/drm/i915/gt/intel_mocs.c | 62 +- drivers/gpu/drm/i915/gt/intel_mocs.h | 6 +- .../intel_renderstate.c} | 13 +- drivers/gpu/drm/i915/{ => gt}/intel_renderstate.h | 10 +- drivers/gpu/drm/i915/gt/intel_reset.c | 624 +- drivers/gpu/drm/i915/gt/intel_reset.h | 75 +- drivers/gpu/drm/i915/gt/intel_reset_types.h | 50 + drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 218 +- .../i915/{i915_timeline.c => gt/intel_timeline.c} | 230 +- drivers/gpu/drm/i915/gt/intel_timeline.h | 93 + .../intel_timeline_types.h} | 8 +- drivers/gpu/drm/i915/gt/intel_workarounds.c | 227 +- drivers/gpu/drm/i915/gt/intel_workarounds.h | 6 +- drivers/gpu/drm/i915/gt/intel_workarounds_types.h | 1 + drivers/gpu/drm/i915/gt/mock_engine.c | 14 +- drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 511 +- drivers/gpu/drm/i915/gt/selftest_lrc.c | 391 +- drivers/gpu/drm/i915/gt/selftest_reset.c | 133 +- .../i915_timeline.c => gt/selftest_timeline.c} | 131 +- drivers/gpu/drm/i915/gt/selftest_workarounds.c | 155 +- .../drm/i915/{ => gt}/selftests/mock_timeline.c | 8 +- .../drm/i915/{ => gt}/selftests/mock_timeline.h | 6 +- drivers/gpu/drm/i915/gt/uc/Makefile | 5 + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc.c | 290 +- drivers/gpu/drm/i915/{ => gt/uc}/intel_guc.h | 33 +- drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ads.c | 29 +- drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ads.h | 0 drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ct.c | 22 +- drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ct.h | 11 +- drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 181 + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_fw.h | 0 drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_fwif.h | 81 +- drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_log.c | 48 +- drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_log.h | 1 - drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_reg.h | 38 +- .../drm/i915/{ => gt/uc}/intel_guc_submission.c | 496 +- .../drm/i915/{ => gt/uc}/intel_guc_submission.h | 2 - drivers/gpu/drm/i915/{ => gt/uc}/intel_huc.c | 69 +- drivers/gpu/drm/i915/{ => gt/uc}/intel_huc.h | 12 +- drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 53 + drivers/gpu/drm/i915/{ => gt/uc}/intel_huc_fw.h | 0 drivers/gpu/drm/i915/gt/uc/intel_uc.c | 570 + drivers/gpu/drm/i915/{ => gt/uc}/intel_uc.h | 39 +- drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 540 + drivers/gpu/drm/i915/{ => gt/uc}/intel_uc_fw.h | 102 +- drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 82 + .../intel_guc.c => gt/uc/selftest_guc.c} | 49 +- drivers/gpu/drm/i915/gvt/dmabuf.c | 2 +- drivers/gpu/drm/i915/gvt/gtt.h | 13 +- drivers/gpu/drm/i915/gvt/scheduler.c | 2 +- drivers/gpu/drm/i915/i915_active.c | 321 +- drivers/gpu/drm/i915/i915_active.h | 28 +- drivers/gpu/drm/i915/i915_active_types.h | 13 +- drivers/gpu/drm/i915/i915_debugfs.c | 217 +- drivers/gpu/drm/i915/i915_drv.c | 208 +- drivers/gpu/drm/i915/i915_drv.h | 250 +- drivers/gpu/drm/i915/i915_fixed.h | 5 + drivers/gpu/drm/i915/i915_gem.c | 320 +- drivers/gpu/drm/i915/i915_gem_batch_pool.c | 42 +- drivers/gpu/drm/i915/i915_gem_fence_reg.c | 32 + drivers/gpu/drm/i915/i915_gem_fence_reg.h | 3 + drivers/gpu/drm/i915/i915_gem_gtt.c | 2053 +- drivers/gpu/drm/i915/i915_gem_gtt.h | 200 +- drivers/gpu/drm/i915/i915_globals.h | 2 + drivers/gpu/drm/i915/i915_gpu_error.c | 588 +- drivers/gpu/drm/i915/i915_gpu_error.h | 71 +- drivers/gpu/drm/i915/i915_irq.c | 803 +- drivers/gpu/drm/i915/i915_irq.h | 45 +- drivers/gpu/drm/i915/i915_params.c | 5 +- drivers/gpu/drm/i915/i915_params.h | 2 +- drivers/gpu/drm/i915/i915_pci.c | 43 +- drivers/gpu/drm/i915/i915_perf.c | 304 +- drivers/gpu/drm/i915/i915_pmu.c | 4 +- drivers/gpu/drm/i915/i915_priolist_types.h | 10 + drivers/gpu/drm/i915/i915_pvinfo.h | 7 +- drivers/gpu/drm/i915/i915_reg.h | 231 +- drivers/gpu/drm/i915/i915_request.c | 130 +- drivers/gpu/drm/i915/i915_request.h | 24 +- drivers/gpu/drm/i915/i915_scheduler.c | 4 +- drivers/gpu/drm/i915/i915_scheduler_types.h | 1 + drivers/gpu/drm/i915/i915_selftest.h | 27 +- drivers/gpu/drm/i915/i915_sw_fence.c | 8 +- drivers/gpu/drm/i915/i915_sw_fence.h | 4 +- drivers/gpu/drm/i915/i915_timeline.h | 94 - drivers/gpu/drm/i915/i915_trace.h | 12 +- drivers/gpu/drm/i915/i915_utils.h | 12 + drivers/gpu/drm/i915/i915_vgpu.c | 63 +- drivers/gpu/drm/i915/i915_vgpu.h | 7 +- drivers/gpu/drm/i915/i915_vma.c | 81 +- drivers/gpu/drm/i915/i915_vma.h | 8 +- drivers/gpu/drm/i915/intel_device_info.c | 40 +- drivers/gpu/drm/i915/intel_device_info.h | 5 +- drivers/gpu/drm/i915/intel_drv.h | 37 +- drivers/gpu/drm/i915/intel_guc_fw.c | 308 - drivers/gpu/drm/i915/intel_gvt.c | 7 +- drivers/gpu/drm/i915/intel_gvt.h | 7 +- drivers/gpu/drm/i915/intel_huc_fw.c | 215 - drivers/gpu/drm/i915/intel_pm.c | 441 +- drivers/gpu/drm/i915/intel_pm.h | 4 +- drivers/gpu/drm/i915/intel_runtime_pm.c | 2 +- drivers/gpu/drm/i915/intel_runtime_pm.h | 2 +- drivers/gpu/drm/i915/intel_uc.c | 561 - drivers/gpu/drm/i915/intel_uc_fw.c | 357 - drivers/gpu/drm/i915/intel_uncore.c | 465 +- drivers/gpu/drm/i915/intel_uncore.h | 24 +- drivers/gpu/drm/i915/intel_wakeref.c | 9 +- drivers/gpu/drm/i915/intel_wakeref.h | 11 +- drivers/gpu/drm/i915/intel_wopcm.c | 40 +- drivers/gpu/drm/i915/intel_wopcm.h | 4 +- drivers/gpu/drm/i915/oa/Makefile | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_bdw.c | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_bdw.h | 2 +- drivers/gpu/drm/i915/{ => oa}/i915_oa_bxt.c | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_bxt.h | 2 +- drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt2.c | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt2.h | 2 +- drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt3.c | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt3.h | 2 +- drivers/gpu/drm/i915/{ => oa}/i915_oa_chv.c | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_chv.h | 2 +- drivers/gpu/drm/i915/{ => oa}/i915_oa_cnl.c | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_cnl.h | 2 +- drivers/gpu/drm/i915/{ => oa}/i915_oa_glk.c | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_glk.h | 2 +- drivers/gpu/drm/i915/{ => oa}/i915_oa_hsw.c | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_hsw.h | 2 +- drivers/gpu/drm/i915/{ => oa}/i915_oa_icl.c | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_icl.h | 2 +- drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt2.c | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt2.h | 2 +- drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt3.c | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt3.h | 2 +- drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt2.c | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt2.h | 2 +- drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt3.c | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt3.h | 2 +- drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt4.c | 0 drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt4.h | 2 +- drivers/gpu/drm/i915/selftests/i915_active.c | 124 +- drivers/gpu/drm/i915/selftests/i915_gem.c | 11 +- drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 3 +- drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 +- .../gpu/drm/i915/selftests/i915_live_selftests.h | 2 +- .../gpu/drm/i915/selftests/i915_mock_selftests.h | 2 +- drivers/gpu/drm/i915/selftests/i915_request.c | 43 +- drivers/gpu/drm/i915/selftests/i915_selftest.c | 65 +- drivers/gpu/drm/i915/selftests/i915_vma.c | 10 + drivers/gpu/drm/i915/selftests/igt_flush_test.c | 5 +- drivers/gpu/drm/i915/selftests/igt_reset.c | 38 +- drivers/gpu/drm/i915/selftests/igt_reset.h | 10 +- drivers/gpu/drm/i915/selftests/igt_spinner.c | 8 +- drivers/gpu/drm/i915/selftests/igt_spinner.h | 3 + drivers/gpu/drm/i915/selftests/igt_wedge_me.h | 58 - drivers/gpu/drm/i915/selftests/mock_gem_device.c | 18 +- drivers/gpu/drm/i915/selftests/mock_gtt.c | 3 + drivers/gpu/drm/i915/selftests/mock_uncore.c | 4 +- drivers/gpu/drm/imx/dw_hdmi-imx.c | 14 +- drivers/gpu/drm/imx/imx-drm-core.c | 13 +- drivers/gpu/drm/imx/imx-ldb.c | 40 +- drivers/gpu/drm/imx/imx-tve.c | 16 +- drivers/gpu/drm/imx/ipuv3-crtc.c | 8 +- drivers/gpu/drm/imx/ipuv3-plane.c | 5 +- drivers/gpu/drm/imx/parallel-display.c | 19 +- drivers/gpu/drm/ingenic/ingenic-drm.c | 75 +- drivers/gpu/drm/lima/lima_device.c | 41 +- drivers/gpu/drm/lima/lima_drv.c | 20 +- drivers/gpu/drm/lima/lima_gem.c | 10 +- drivers/gpu/drm/lima/lima_gem_prime.c | 3 +- drivers/gpu/drm/lima/lima_object.c | 9 +- drivers/gpu/drm/lima/lima_object.h | 3 +- drivers/gpu/drm/lima/lima_vm.h | 4 +- drivers/gpu/drm/mcde/mcde_drv.c | 10 +- drivers/gpu/drm/mediatek/mtk_disp_color.c | 2 +- drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 2 +- drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 2 +- drivers/gpu/drm/mediatek/mtk_dpi.c | 18 +- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 10 +- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 33 +- drivers/gpu/drm/mediatek/mtk_drm_fb.c | 35 +- drivers/gpu/drm/mediatek/mtk_drm_fb.h | 1 - drivers/gpu/drm/mediatek/mtk_drm_gem.c | 7 +- drivers/gpu/drm/mediatek/mtk_drm_plane.c | 4 +- drivers/gpu/drm/mediatek/mtk_dsi.c | 14 +- drivers/gpu/drm/mediatek/mtk_hdmi.c | 14 +- drivers/gpu/drm/meson/meson_crtc.c | 33 +- drivers/gpu/drm/meson/meson_drv.c | 59 +- drivers/gpu/drm/meson/meson_drv.h | 11 +- drivers/gpu/drm/meson/meson_dw_hdmi.c | 21 +- drivers/gpu/drm/meson/meson_dw_hdmi.h | 12 +- drivers/gpu/drm/meson/meson_overlay.c | 13 +- drivers/gpu/drm/meson/meson_plane.c | 18 +- drivers/gpu/drm/meson/meson_registers.h | 138 +- drivers/gpu/drm/meson/meson_vclk.c | 14 +- drivers/gpu/drm/meson/meson_vclk.h | 4 + drivers/gpu/drm/meson/meson_venc.c | 179 +- drivers/gpu/drm/meson/meson_venc.h | 2 + drivers/gpu/drm/meson/meson_venc_cvbs.c | 14 +- drivers/gpu/drm/meson/meson_viu.c | 89 +- drivers/gpu/drm/meson/meson_vpp.c | 32 +- drivers/gpu/drm/meson/meson_vpp.h | 3 + drivers/gpu/drm/mga/mga_dma.c | 13 +- drivers/gpu/drm/mga/mga_drv.c | 7 +- drivers/gpu/drm/mga/mga_drv.h | 27 +- drivers/gpu/drm/mga/mga_ioc32.c | 3 +- drivers/gpu/drm/mga/mga_irq.c | 12 +- drivers/gpu/drm/mga/mga_state.c | 8 +- drivers/gpu/drm/mga/mga_warp.c | 4 +- drivers/gpu/drm/mgag200/Makefile | 2 +- drivers/gpu/drm/mgag200/mgag200_cursor.c | 11 +- drivers/gpu/drm/mgag200/mgag200_drv.c | 10 +- drivers/gpu/drm/mgag200/mgag200_drv.h | 40 +- drivers/gpu/drm/mgag200/mgag200_fb.c | 315 - drivers/gpu/drm/mgag200/mgag200_i2c.c | 6 +- drivers/gpu/drm/mgag200/mgag200_main.c | 96 +- drivers/gpu/drm/mgag200/mgag200_mode.c | 59 +- drivers/gpu/drm/mgag200/mgag200_ttm.c | 3 +- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 8 +- drivers/gpu/drm/msm/msm_atomic.c | 8 +- drivers/gpu/drm/msm/msm_drv.c | 25 +- drivers/gpu/drm/msm/msm_gem.c | 26 +- drivers/gpu/drm/msm/msm_gem.h | 2 +- drivers/gpu/drm/msm/msm_gem_submit.c | 2 +- drivers/gpu/drm/msm/msm_gpu.c | 3 +- drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 16 +- drivers/gpu/drm/mxsfb/mxsfb_drv.c | 18 +- drivers/gpu/drm/mxsfb/mxsfb_out.c | 3 +- drivers/gpu/drm/nouveau/dispnv50/wndw.c | 2 +- drivers/gpu/drm/nouveau/nouveau_abi16.c | 10 +- drivers/gpu/drm/nouveau/nouveau_abi16.h | 1 - drivers/gpu/drm/nouveau/nouveau_bo.c | 15 +- drivers/gpu/drm/nouveau/nouveau_bo.h | 7 +- drivers/gpu/drm/nouveau/nouveau_connector.c | 2 +- drivers/gpu/drm/nouveau/nouveau_display.c | 10 +- drivers/gpu/drm/nouveau/nouveau_drm.c | 33 +- drivers/gpu/drm/nouveau/nouveau_fence.c | 12 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 19 +- drivers/gpu/drm/nouveau/nouveau_gem.h | 3 +- drivers/gpu/drm/nouveau/nouveau_prime.c | 17 +- drivers/gpu/drm/omapdrm/displays/Kconfig | 38 - drivers/gpu/drm/omapdrm/displays/Makefile | 6 - .../omapdrm/displays/panel-lgphilips-lb035q02.c | 251 - .../drm/omapdrm/displays/panel-nec-nl8048hl11.c | 271 - .../drm/omapdrm/displays/panel-sharp-ls037v7dw01.c | 262 - .../drm/omapdrm/displays/panel-sony-acx565akm.c | 755 - .../drm/omapdrm/displays/panel-tpo-td028ttec1.c | 390 - .../drm/omapdrm/displays/panel-tpo-td043mtea1.c | 513 - drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c | 7 - drivers/gpu/drm/omapdrm/omap_crtc.c | 4 +- drivers/gpu/drm/omapdrm/omap_debugfs.c | 2 + drivers/gpu/drm/omapdrm/omap_drv.c | 22 +- drivers/gpu/drm/omapdrm/omap_drv.h | 5 +- drivers/gpu/drm/omapdrm/omap_fb.c | 4 +- drivers/gpu/drm/omapdrm/omap_fbdev.c | 4 +- drivers/gpu/drm/omapdrm/omap_gem.c | 2 + drivers/gpu/drm/omapdrm/omap_gem.h | 3 +- drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 8 +- drivers/gpu/drm/omapdrm/omap_irq.c | 2 + drivers/gpu/drm/panel/Kconfig | 64 + drivers/gpu/drm/panel/Makefile | 8 + drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 34 +- drivers/gpu/drm/panel/panel-lg-lb035q02.c | 237 + drivers/gpu/drm/panel/panel-lvds.c | 5 +- drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 248 + drivers/gpu/drm/panel/panel-novatek-nt39016.c | 359 + .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 13 + drivers/gpu/drm/panel/panel-raydium-rm67191.c | 668 + drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c | 75 +- drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c | 226 + drivers/gpu/drm/panel/panel-simple.c | 407 +- drivers/gpu/drm/panel/panel-sony-acx565akm.c | 701 + drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 399 + drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 509 + drivers/gpu/drm/panfrost/Makefile | 1 + drivers/gpu/drm/panfrost/TODO | 11 - drivers/gpu/drm/panfrost/panfrost_devfreq.c | 3 +- drivers/gpu/drm/panfrost/panfrost_device.c | 16 +- drivers/gpu/drm/panfrost/panfrost_device.h | 6 + drivers/gpu/drm/panfrost/panfrost_drv.c | 146 +- drivers/gpu/drm/panfrost/panfrost_gem.c | 135 +- drivers/gpu/drm/panfrost/panfrost_gem.h | 20 +- drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c | 107 + drivers/gpu/drm/panfrost/panfrost_gpu.c | 2 + drivers/gpu/drm/panfrost/panfrost_job.c | 13 +- drivers/gpu/drm/panfrost/panfrost_mmu.c | 216 +- drivers/gpu/drm/panfrost/panfrost_mmu.h | 3 +- drivers/gpu/drm/pl111/pl111_debugfs.c | 4 +- drivers/gpu/drm/pl111/pl111_display.c | 52 +- drivers/gpu/drm/pl111/pl111_drm.h | 11 +- drivers/gpu/drm/pl111/pl111_drv.c | 13 +- drivers/gpu/drm/pl111/pl111_nomadik.h | 3 +- drivers/gpu/drm/pl111/pl111_versatile.c | 9 +- drivers/gpu/drm/pl111/pl111_versatile.h | 3 + drivers/gpu/drm/pl111/pl111_vexpress.c | 1 + drivers/gpu/drm/qxl/qxl_cmd.c | 6 +- drivers/gpu/drm/qxl/qxl_debugfs.c | 10 +- drivers/gpu/drm/qxl/qxl_display.c | 11 +- drivers/gpu/drm/qxl/qxl_draw.c | 2 + drivers/gpu/drm/qxl/qxl_drv.c | 21 +- drivers/gpu/drm/qxl/qxl_drv.h | 13 +- drivers/gpu/drm/qxl/qxl_gem.c | 3 +- drivers/gpu/drm/qxl/qxl_ioctl.c | 3 + drivers/gpu/drm/qxl/qxl_irq.c | 4 + drivers/gpu/drm/qxl/qxl_kms.c | 9 +- drivers/gpu/drm/qxl/qxl_object.c | 20 +- drivers/gpu/drm/qxl/qxl_object.h | 6 +- drivers/gpu/drm/qxl/qxl_release.c | 14 +- drivers/gpu/drm/qxl/qxl_ttm.c | 20 +- drivers/gpu/drm/r128/r128_ioc32.c | 3 +- drivers/gpu/drm/r128/r128_irq.c | 5 +- drivers/gpu/drm/radeon/cik.c | 2 +- drivers/gpu/drm/radeon/cik_sdma.c | 2 +- drivers/gpu/drm/radeon/evergreen_dma.c | 2 +- drivers/gpu/drm/radeon/r100.c | 2 +- drivers/gpu/drm/radeon/r200.c | 2 +- drivers/gpu/drm/radeon/r600.c | 2 +- drivers/gpu/drm/radeon/r600_dma.c | 2 +- drivers/gpu/drm/radeon/radeon.h | 11 +- drivers/gpu/drm/radeon/radeon_asic.h | 18 +- drivers/gpu/drm/radeon/radeon_benchmark.c | 6 +- drivers/gpu/drm/radeon/radeon_connectors.c | 2 +- drivers/gpu/drm/radeon/radeon_cs.c | 6 +- drivers/gpu/drm/radeon/radeon_display.c | 6 +- drivers/gpu/drm/radeon/radeon_drv.c | 31 +- drivers/gpu/drm/radeon/radeon_gem.c | 8 +- drivers/gpu/drm/radeon/radeon_mn.c | 2 +- drivers/gpu/drm/radeon/radeon_object.c | 28 +- drivers/gpu/drm/radeon/radeon_object.h | 4 +- drivers/gpu/drm/radeon/radeon_prime.c | 20 +- drivers/gpu/drm/radeon/radeon_sync.c | 10 +- drivers/gpu/drm/radeon/radeon_test.c | 8 +- drivers/gpu/drm/radeon/radeon_ttm.c | 4 +- drivers/gpu/drm/radeon/radeon_uvd.c | 2 +- drivers/gpu/drm/radeon/radeon_vm.c | 6 +- drivers/gpu/drm/radeon/rv770_dma.c | 2 +- drivers/gpu/drm/radeon/si_dma.c | 2 +- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 5 +- drivers/gpu/drm/rockchip/Makefile | 3 +- drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 116 +- drivers/gpu/drm/rockchip/cdn-dp-core.c | 17 +- drivers/gpu/drm/rockchip/cdn-dp-core.h | 2 +- drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 9 +- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 5 +- drivers/gpu/drm/rockchip/inno_hdmi.c | 3 +- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 17 +- drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 29 +- drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 8 +- drivers/gpu/drm/rockchip/rockchip_drm_psr.c | 282 - drivers/gpu/drm/rockchip/rockchip_drm_psr.h | 22 - drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 117 +- drivers/gpu/drm/rockchip/rockchip_lvds.c | 16 +- drivers/gpu/drm/rockchip/rockchip_rgb.c | 9 +- drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 11 +- drivers/gpu/drm/scheduler/gpu_scheduler_trace.h | 2 - drivers/gpu/drm/scheduler/sched_entity.c | 3 + drivers/gpu/drm/scheduler/sched_fence.c | 6 +- drivers/gpu/drm/scheduler/sched_main.c | 3 +- drivers/gpu/drm/selftests/test-drm_framebuffer.c | 7 +- drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 3 +- drivers/gpu/drm/shmobile/shmob_drm_crtc.h | 4 +- drivers/gpu/drm/shmobile/shmob_drm_drv.c | 9 +- drivers/gpu/drm/shmobile/shmob_drm_kms.c | 1 - drivers/gpu/drm/shmobile/shmob_drm_plane.c | 2 +- drivers/gpu/drm/shmobile/shmob_drm_plane.h | 1 + drivers/gpu/drm/shmobile/shmob_drm_regs.h | 3 + drivers/gpu/drm/sti/sti_drv.c | 6 +- drivers/gpu/drm/sti/sti_dvo.c | 8 +- drivers/gpu/drm/sti/sti_hdmi.c | 9 +- drivers/gpu/drm/sti/sti_tvout.c | 16 +- drivers/gpu/drm/stm/drv.c | 5 +- drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 10 +- drivers/gpu/drm/stm/ltdc.c | 2 + drivers/gpu/drm/sun4i/sun4i_backend.c | 16 +- drivers/gpu/drm/sun4i/sun4i_crtc.c | 13 +- drivers/gpu/drm/sun4i/sun4i_drv.c | 7 +- drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 1 - drivers/gpu/drm/sun4i/sun4i_frontend.c | 10 +- drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 24 +- drivers/gpu/drm/sun4i/sun4i_layer.c | 3 +- drivers/gpu/drm/sun4i/sun4i_lvds.c | 2 +- drivers/gpu/drm/sun4i/sun4i_rgb.c | 2 +- drivers/gpu/drm/sun4i/sun4i_tcon.c | 28 +- drivers/gpu/drm/sun4i/sun4i_tv.c | 4 +- drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 9 +- drivers/gpu/drm/sun4i/sun8i_csc.c | 157 +- drivers/gpu/drm/sun4i/sun8i_csc.h | 6 +- drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 57 +- drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h | 2 + drivers/gpu/drm/sun4i/sun8i_mixer.c | 14 +- drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 6 +- drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 2 +- drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 22 +- drivers/gpu/drm/tdfx/tdfx_drv.c | 11 +- drivers/gpu/drm/tegra/dc.c | 13 +- drivers/gpu/drm/tegra/dpaux.c | 5 +- drivers/gpu/drm/tegra/drm.c | 38 +- drivers/gpu/drm/tegra/drm.h | 3 +- drivers/gpu/drm/tegra/dsi.c | 8 +- drivers/gpu/drm/tegra/fb.c | 6 +- drivers/gpu/drm/tegra/gem.c | 10 +- drivers/gpu/drm/tegra/gem.h | 4 +- drivers/gpu/drm/tegra/gr2d.c | 1 + drivers/gpu/drm/tegra/hdmi.c | 5 + drivers/gpu/drm/tegra/hub.c | 3 +- drivers/gpu/drm/tegra/hub.h | 1 - drivers/gpu/drm/tegra/plane.c | 1 + drivers/gpu/drm/tegra/sor.c | 3 + drivers/gpu/drm/tegra/vic.c | 1 + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 46 +- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 25 +- drivers/gpu/drm/tilcdc/tilcdc_drv.h | 33 +- drivers/gpu/drm/tilcdc/tilcdc_external.c | 89 +- drivers/gpu/drm/tilcdc/tilcdc_external.h | 1 - drivers/gpu/drm/tilcdc/tilcdc_panel.c | 20 +- drivers/gpu/drm/tilcdc/tilcdc_plane.c | 4 +- drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 17 +- drivers/gpu/drm/{tinydrm => tiny}/Kconfig | 64 +- drivers/gpu/drm/{tinydrm => tiny}/Makefile | 6 +- drivers/gpu/drm/tiny/gm12u320.c | 804 + drivers/gpu/drm/{tinydrm => tiny}/hx8357d.c | 64 +- drivers/gpu/drm/{tinydrm => tiny}/ili9225.c | 185 +- drivers/gpu/drm/{tinydrm => tiny}/ili9341.c | 86 +- drivers/gpu/drm/{tinydrm => tiny}/mi0283qt.c | 93 +- drivers/gpu/drm/{tinydrm => tiny}/repaper.c | 61 +- drivers/gpu/drm/{tinydrm => tiny}/st7586.c | 134 +- drivers/gpu/drm/{tinydrm => tiny}/st7735r.c | 81 +- drivers/gpu/drm/tinydrm/core/Makefile | 4 - drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c | 207 - drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c | 179 - drivers/gpu/drm/ttm/ttm_bo.c | 158 +- drivers/gpu/drm/ttm/ttm_bo_util.c | 20 +- drivers/gpu/drm/ttm/ttm_bo_vm.c | 15 +- drivers/gpu/drm/ttm/ttm_execbuf_util.c | 22 +- drivers/gpu/drm/ttm/ttm_tt.c | 2 +- drivers/gpu/drm/tve200/tve200_display.c | 8 +- drivers/gpu/drm/tve200/tve200_drm.h | 15 +- drivers/gpu/drm/tve200/tve200_drv.c | 8 +- drivers/gpu/drm/udl/udl_connector.c | 4 +- drivers/gpu/drm/udl/udl_connector.h | 2 + drivers/gpu/drm/udl/udl_dmabuf.c | 11 +- drivers/gpu/drm/udl/udl_drv.c | 9 +- drivers/gpu/drm/udl/udl_drv.h | 11 +- drivers/gpu/drm/udl/udl_encoder.c | 6 +- drivers/gpu/drm/udl/udl_fb.c | 15 +- drivers/gpu/drm/udl/udl_gem.c | 9 +- drivers/gpu/drm/udl/udl_main.c | 6 +- drivers/gpu/drm/udl/udl_modeset.c | 6 +- drivers/gpu/drm/udl/udl_transfer.c | 4 - drivers/gpu/drm/v3d/v3d_debugfs.c | 3 +- drivers/gpu/drm/v3d/v3d_drv.c | 6 +- drivers/gpu/drm/v3d/v3d_drv.h | 13 +- drivers/gpu/drm/v3d/v3d_gem.c | 16 +- drivers/gpu/drm/v3d/v3d_irq.c | 2 + drivers/gpu/drm/vboxvideo/Makefile | 2 +- drivers/gpu/drm/vboxvideo/vbox_drv.c | 15 +- drivers/gpu/drm/vboxvideo/vbox_drv.h | 12 - drivers/gpu/drm/vboxvideo/vbox_main.c | 2 +- drivers/gpu/drm/vboxvideo/vbox_prime.c | 56 - drivers/gpu/drm/vc4/vc4_bo.c | 7 +- drivers/gpu/drm/vc4/vc4_crtc.c | 11 +- drivers/gpu/drm/vc4/vc4_debugfs.c | 1 - drivers/gpu/drm/vc4/vc4_drv.c | 9 +- drivers/gpu/drm/vc4/vc4_drv.h | 20 +- drivers/gpu/drm/vc4/vc4_dsi.c | 17 +- drivers/gpu/drm/vc4/vc4_gem.c | 8 +- drivers/gpu/drm/vc4/vc4_hvs.c | 5 +- drivers/gpu/drm/vc4/vc4_kms.c | 4 +- drivers/gpu/drm/vc4/vc4_plane.c | 9 +- drivers/gpu/drm/vc4/vc4_txp.c | 14 +- drivers/gpu/drm/vc4/vc4_v3d.c | 4 + drivers/gpu/drm/vgem/vgem_drv.c | 21 +- drivers/gpu/drm/vgem/vgem_drv.h | 1 - drivers/gpu/drm/vgem/vgem_fence.c | 40 +- drivers/gpu/drm/via/via_dma.c | 43 +- drivers/gpu/drm/via/via_dmablit.c | 41 +- drivers/gpu/drm/via/via_drv.c | 7 +- drivers/gpu/drm/via/via_drv.h | 75 +- drivers/gpu/drm/via/via_irq.c | 54 +- drivers/gpu/drm/via/via_map.c | 6 +- drivers/gpu/drm/via/via_mm.c | 7 +- drivers/gpu/drm/via/via_verifier.c | 22 +- drivers/gpu/drm/via/via_video.c | 5 +- drivers/gpu/drm/virtio/virtgpu_debugfs.c | 4 +- drivers/gpu/drm/virtio/virtgpu_display.c | 7 +- drivers/gpu/drm/virtio/virtgpu_drv.c | 9 +- drivers/gpu/drm/virtio/virtgpu_drv.h | 8 +- drivers/gpu/drm/virtio/virtgpu_fence.c | 2 +- drivers/gpu/drm/virtio/virtgpu_gem.c | 4 +- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 30 +- drivers/gpu/drm/virtio/virtgpu_kms.c | 4 +- drivers/gpu/drm/virtio/virtgpu_plane.c | 8 +- drivers/gpu/drm/virtio/virtgpu_prime.c | 5 +- drivers/gpu/drm/virtio/virtgpu_ttm.c | 13 +- drivers/gpu/drm/virtio/virtgpu_vq.c | 7 +- drivers/gpu/drm/vkms/Makefile | 2 +- .../gpu/drm/vkms/{vkms_crc.c => vkms_composer.c} | 169 +- drivers/gpu/drm/vkms/vkms_crtc.c | 100 +- drivers/gpu/drm/vkms/vkms_drv.c | 50 +- drivers/gpu/drm/vkms/vkms_drv.h | 44 +- drivers/gpu/drm/vkms/vkms_gem.c | 1 + drivers/gpu/drm/vkms/vkms_output.c | 6 +- drivers/gpu/drm/vkms/vkms_plane.c | 46 +- drivers/gpu/drm/vmwgfx/ttm_lock.c | 100 - drivers/gpu/drm/vmwgfx/ttm_lock.h | 32 +- drivers/gpu/drm/vmwgfx/ttm_object.h | 7 +- drivers/gpu/drm/vmwgfx/vmwgfx_binding.h | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 17 +- drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 3 + drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 4 + drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 17 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 200 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 135 +- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 52 +- drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 8 +- drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 6 +- drivers/gpu/drm/vmwgfx/vmwgfx_fence.h | 5 +- drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 6 +- drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 41 +- drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 6 +- drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 2 + drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 11 +- drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 6 +- drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 62 +- drivers/gpu/drm/vmwgfx/vmwgfx_resource_priv.h | 2 + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 6 +- drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 8 +- drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 9 +- drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 14 +- drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c | 1 - drivers/gpu/drm/vmwgfx/vmwgfx_validation.h | 3 +- drivers/gpu/drm/xen/xen_drm_front.c | 16 +- drivers/gpu/drm/xen/xen_drm_front.h | 11 +- drivers/gpu/drm/xen/xen_drm_front_cfg.c | 4 +- drivers/gpu/drm/xen/xen_drm_front_conn.c | 1 + drivers/gpu/drm/xen/xen_drm_front_conn.h | 7 +- drivers/gpu/drm/xen/xen_drm_front_evtchnl.c | 4 +- drivers/gpu/drm/xen/xen_drm_front_gem.c | 11 +- drivers/gpu/drm/xen/xen_drm_front_gem.h | 7 +- drivers/gpu/drm/xen/xen_drm_front_kms.c | 9 +- drivers/gpu/drm/zte/zx_drm_drv.c | 8 +- drivers/gpu/drm/zte/zx_hdmi.c | 2 +- drivers/gpu/drm/zte/zx_plane.c | 2 +- drivers/gpu/drm/zte/zx_tvenc.c | 4 +- drivers/gpu/drm/zte/zx_vga.c | 4 +- drivers/gpu/drm/zte/zx_vou.c | 5 +- drivers/video/backlight/lcd.c | 8 - drivers/video/fbdev/amba-clcd.c | 4 +- drivers/video/fbdev/au1200fb.c | 5 +- drivers/video/fbdev/core/fbmem.c | 14 +- drivers/video/fbdev/core/fbmon.c | 96 - drivers/video/fbdev/core/modedb.c | 57 - drivers/video/fbdev/mmp/fb/mmpfb.c | 1 - drivers/video/fbdev/nvidia/nv_backlight.c | 2 - drivers/video/fbdev/nvidia/nv_setup.c | 24 - drivers/video/fbdev/omap2/omapfb/displays/Kconfig | 5 + drivers/video/fbdev/ssd1307fb.c | 131 +- drivers/video/of_display_timing.c | 11 +- include/drm/amd_asic_type.h | 3 + include/drm/bridge/analogix_dp.h | 4 - include/drm/bridge/dw_hdmi.h | 2 + include/drm/drmP.h | 2 +- include/drm/drm_agpsupport.h | 14 - include/drm/drm_connector.h | 32 +- include/drm/drm_crtc.h | 4 + include/drm/drm_dp_helper.h | 4 + include/drm/drm_dp_mst_helper.h | 11 + include/drm/drm_drv.h | 104 +- include/drm/drm_gem.h | 26 +- include/drm/drm_gem_framebuffer_helper.h | 7 - include/drm/drm_gem_shmem_helper.h | 15 + include/drm/drm_gem_vram_helper.h | 30 +- include/drm/drm_hdcp.h | 9 +- include/drm/drm_ioctl.h | 3 + include/drm/drm_mipi_dbi.h | 188 + include/drm/drm_mode_config.h | 6 + include/drm/drm_panel.h | 184 +- include/drm/drm_prime.h | 41 +- include/drm/drm_sysfs.h | 5 +- include/drm/drm_vblank.h | 1 - include/drm/drm_vram_mm_helper.h | 2 + include/drm/i915_component.h | 2 +- include/drm/i915_drm.h | 13 +- include/drm/i915_pciids.h | 13 +- include/drm/tinydrm/mipi-dbi.h | 117 - include/drm/tinydrm/tinydrm-helpers.h | 75 - include/drm/ttm/ttm_bo_api.h | 41 +- include/drm/ttm/ttm_bo_driver.h | 26 +- include/linux/amba/clcd-regs.h | 1 + include/linux/dma-buf.h | 4 +- include/linux/dma-fence.h | 34 +- include/linux/{reservation.h => dma-resv.h} | 186 +- include/linux/fb.h | 7 - include/linux/lcd.h | 10 - include/linux/soc/amlogic/meson-canvas.h | 1 + include/uapi/drm/amdgpu_drm.h | 4 + include/uapi/drm/drm_mode.h | 1 + include/uapi/drm/i915_drm.h | 1 + include/uapi/drm/panfrost_drm.h | 64 + include/uapi/linux/media-bus-format.h | 3 +- 1169 files changed, 148374 insertions(+), 26467 deletions(-) delete mode 100644 Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt create mode 100644 Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml delete mode 100644 Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt create mode 100644 Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml delete mode 100644 Documentation/devicetree/bindings/display/panel/ampire,am-480272h3tmqw-t01h.txt create mode 100644 Documentation/devicetree/bindings/display/panel/ampire,am-480272h3tmqw-t01h.yaml delete mode 100644 Documentation/devicetree/bindings/display/panel/armadeus,st0700-adapt.txt create mode 100644 Documentation/devicetree/bindings/display/panel/armadeus,st0700-adapt.yaml delete mode 100644 Documentation/devicetree/bindings/display/panel/bananapi,s070wv20-ct16.txt create mode 100644 Documentation/devicetree/bindings/display/panel/bananapi,s070wv20-ct16.yaml create mode 100644 Documentation/devicetree/bindings/display/panel/boe,himax8279d.txt delete mode 100644 Documentation/devicetree/bindings/display/panel/dlc,dlc0700yzg-1.txt create mode 100644 Documentation/devicetree/bindings/display/panel/dlc,dlc0700yzg-1.yaml create mode 100644 Documentation/devicetree/bindings/display/panel/giantplus,gpm940b0.txt delete mode 100644 Documentation/devicetree/bindings/display/panel/innolux,ee101ia-01d.txt create mode 100644 Documentation/devicetree/bindings/display/panel/innolux,ee101ia-01d.yaml create mode 100644 Documentation/devicetree/bindings/display/panel/kingdisplay,kd035g6-54nt.txt create mode 100644 Documentation/devicetree/bindings/display/panel/lvds.yaml delete mode 100644 Documentation/devicetree/bindings/display/panel/mitsubishi,aa104xd12.txt create mode 100644 Documentation/devicetree/bindings/display/panel/mitsubishi,aa104xd12.yaml delete mode 100644 Documentation/devicetree/bindings/display/panel/mitsubishi,aa121td01.txt create mode 100644 Documentation/devicetree/bindings/display/panel/mitsubishi,aa121td01.yaml create mode 100644 Documentation/devicetree/bindings/display/panel/nec,nl8048hl11.yaml create mode 100644 Documentation/devicetree/bindings/display/panel/ortustech,com37h3m05dtc.txt create mode 100644 Documentation/devicetree/bindings/display/panel/ortustech,com37h3m99dtc.txt delete mode 100644 Documentation/devicetree/bindings/display/panel/panel-common.txt create mode 100644 Documentation/devicetree/bindings/display/panel/panel-common.yaml delete mode 100644 Documentation/devicetree/bindings/display/panel/panel-lvds.txt delete mode 100644 Documentation/devicetree/bindings/display/panel/panel.txt delete mode 100644 Documentation/devicetree/bindings/display/panel/pda,91-00156-a0.txt create mode 100644 Documentation/devicetree/bindings/display/panel/pda,91-00156-a0.yaml delete mode 100644 Documentation/devicetree/bindings/display/panel/raspberrypi,7inch-touchscreen.txt create mode 100644 Documentation/devicetree/bindings/display/panel/raspberrypi,7inch-touchscreen.yaml create mode 100644 Documentation/devicetree/bindings/display/panel/raydium,rm67191.txt delete mode 100644 Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.txt create mode 100644 Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.yaml create mode 100644 Documentation/devicetree/bindings/display/panel/sharp,ld-d5116z01b.txt create mode 100644 Documentation/devicetree/bindings/display/panel/sharp,lq070y3dg3b.txt create mode 100644 Documentation/devicetree/bindings/display/panel/sharp,ls020b1dd01d.txt delete mode 100644 Documentation/devicetree/bindings/display/panel/tfc,s9700rtwv43tr-01b.txt create mode 100644 Documentation/devicetree/bindings/display/panel/tfc,s9700rtwv43tr-01b.yaml create mode 100644 Documentation/devicetree/bindings/display/panel/ti,nspire.yaml delete mode 100644 Documentation/devicetree/bindings/display/panel/tpo,tpg110.txt create mode 100644 Documentation/devicetree/bindings/display/panel/tpo,tpg110.yaml delete mode 100644 Documentation/gpu/tinydrm.rst rename drivers/dma-buf/{reservation.c => dma-resv.c} (68%) create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h create mode 100644 drivers/gpu/drm/amd/amdgpu/arct_reg_init.c create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h create mode 100644 drivers/gpu/drm/amd/amdgpu/navi12_reg_init.c create mode 100644 drivers/gpu/drm/amd/amdgpu/navi14_reg_init.c create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v6_1.c create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v6_1.h create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c rename drivers/gpu/drm/{i915/i915_gem_render_state.h => amd/amdgpu/vcn_v2_5.h} (52%) create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.h create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.h create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/generic_regs.h create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/hw_generic.c create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/hw_generic.h create mode 100644 drivers/gpu/drm/amd/include/arct_ip_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_1_default.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_1_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_1_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/rsmu/rsmu_0_0_2_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/rsmu/rsmu_0_0_2_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_2_2_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_2_2_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_2_2_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_2_2_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma2/sdma2_4_2_2_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma2/sdma2_4_2_2_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma3/sdma3_4_2_2_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma3/sdma3_4_2_2_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma4/sdma4_4_2_2_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma4/sdma4_4_2_2_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma5/sdma5_4_2_2_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma5/sdma5_4_2_2_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma6/sdma6_4_2_2_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma6/sdma6_4_2_2_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma7/sdma7_4_2_2_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma7/sdma7_4_2_2_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_1_1_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_1_1_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_2_5_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_2_5_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/navi12_ip_offset.h create mode 100644 drivers/gpu/drm/amd/include/navi14_ip_offset.h create mode 100644 drivers/gpu/drm/amd/powerplay/arcturus_ppt.c create mode 100644 drivers/gpu/drm/amd/powerplay/arcturus_ppt.h create mode 100644 drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_arcturus.h create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu_types.h delete mode 100644 drivers/gpu/drm/ast/ast_fb.c rename drivers/gpu/drm/{tinydrm/mipi-dbi.c => drm_mipi_dbi.c} (65%) delete mode 100644 drivers/gpu/drm/i915/Makefile.header-test delete mode 100644 drivers/gpu/drm/i915/display/Makefile.header-test create mode 100644 drivers/gpu/drm/i915/display/intel_tc.c create mode 100644 drivers/gpu/drm/i915/display/intel_tc.h delete mode 100644 drivers/gpu/drm/i915/gem/Makefile.header-test delete mode 100644 drivers/gpu/drm/i915/gt/Makefile.header-test rename drivers/gpu/drm/i915/{intel_renderstate_gen6.c => gt/gen6_renderstate.c} (100%) rename drivers/gpu/drm/i915/{intel_renderstate_gen7.c => gt/gen7_renderstate.c} (100%) rename drivers/gpu/drm/i915/{intel_renderstate_gen8.c => gt/gen8_renderstate.c} (100%) rename drivers/gpu/drm/i915/{intel_renderstate_gen9.c => gt/gen9_renderstate.c} (100%) create mode 100644 drivers/gpu/drm/i915/gt/intel_gt.c create mode 100644 drivers/gpu/drm/i915/gt/intel_gt.h create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_types.h rename drivers/gpu/drm/i915/{i915_gem_render_state.c => gt/intel_renderstate.c} (94%) rename drivers/gpu/drm/i915/{ => gt}/intel_renderstate.h (91%) create mode 100644 drivers/gpu/drm/i915/gt/intel_reset_types.h rename drivers/gpu/drm/i915/{i915_timeline.c => gt/intel_timeline.c} (69%) create mode 100644 drivers/gpu/drm/i915/gt/intel_timeline.h rename drivers/gpu/drm/i915/{i915_timeline_types.h => gt/intel_timeline_types.h} (92%) rename drivers/gpu/drm/i915/{selftests/i915_timeline.c => gt/selftest_timeline.c} (86%) rename drivers/gpu/drm/i915/{ => gt}/selftests/mock_timeline.c (68%) rename drivers/gpu/drm/i915/{ => gt}/selftests/mock_timeline.h (53%) create mode 100644 drivers/gpu/drm/i915/gt/uc/Makefile rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc.c (78%) rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc.h (90%) rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ads.c (93%) rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ads.h (100%) rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ct.c (97%) rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ct.h (93%) create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_fw.h (100%) rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_fwif.h (88%) rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_log.c (91%) rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_log.h (98%) rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_reg.h (87%) rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_submission.c (68%) rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_submission.h (98%) rename drivers/gpu/drm/i915/{ => gt/uc}/intel_huc.c (76%) rename drivers/gpu/drm/i915/{ => gt/uc}/intel_huc.h (91%) create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c rename drivers/gpu/drm/i915/{ => gt/uc}/intel_huc_fw.h (100%) create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_uc.c rename drivers/gpu/drm/i915/{ => gt/uc}/intel_uc.h (60%) create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c rename drivers/gpu/drm/i915/{ => gt/uc}/intel_uc_fw.h (57%) create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h rename drivers/gpu/drm/i915/{selftests/intel_guc.c => gt/uc/selftest_guc.c} (85%) delete mode 100644 drivers/gpu/drm/i915/i915_timeline.h delete mode 100644 drivers/gpu/drm/i915/intel_guc_fw.c delete mode 100644 drivers/gpu/drm/i915/intel_huc_fw.c delete mode 100644 drivers/gpu/drm/i915/intel_uc.c delete mode 100644 drivers/gpu/drm/i915/intel_uc_fw.c create mode 100644 drivers/gpu/drm/i915/oa/Makefile rename drivers/gpu/drm/i915/{ => oa}/i915_oa_bdw.c (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_bdw.h (74%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_bxt.c (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_bxt.h (74%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt2.c (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt2.h (74%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt3.c (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt3.h (74%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_chv.c (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_chv.h (74%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_cnl.c (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_cnl.h (74%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_glk.c (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_glk.h (74%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_hsw.c (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_hsw.h (74%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_icl.c (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_icl.h (74%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt2.c (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt2.h (74%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt3.c (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt3.h (74%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt2.c (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt2.h (74%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt3.c (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt3.h (74%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt4.c (100%) rename drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt4.h (74%) delete mode 100644 drivers/gpu/drm/i915/selftests/igt_wedge_me.h delete mode 100644 drivers/gpu/drm/mgag200/mgag200_fb.c delete mode 100644 drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c delete mode 100644 drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c delete mode 100644 drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c delete mode 100644 drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c delete mode 100644 drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c delete mode 100644 drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c create mode 100644 drivers/gpu/drm/panel/panel-lg-lb035q02.c create mode 100644 drivers/gpu/drm/panel/panel-nec-nl8048hl11.c create mode 100644 drivers/gpu/drm/panel/panel-novatek-nt39016.c create mode 100644 drivers/gpu/drm/panel/panel-raydium-rm67191.c create mode 100644 drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c create mode 100644 drivers/gpu/drm/panel/panel-sony-acx565akm.c create mode 100644 drivers/gpu/drm/panel/panel-tpo-td028ttec1.c create mode 100644 drivers/gpu/drm/panel/panel-tpo-td043mtea1.c create mode 100644 drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c delete mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_psr.c delete mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_psr.h rename drivers/gpu/drm/{tinydrm => tiny}/Kconfig (64%) rename drivers/gpu/drm/{tinydrm => tiny}/Makefile (76%) create mode 100644 drivers/gpu/drm/tiny/gm12u320.c rename drivers/gpu/drm/{tinydrm => tiny}/hx8357d.c (78%) rename drivers/gpu/drm/{tinydrm => tiny}/ili9225.c (64%) rename drivers/gpu/drm/{tinydrm => tiny}/ili9341.c (69%) rename drivers/gpu/drm/{tinydrm => tiny}/mi0283qt.c (70%) rename drivers/gpu/drm/{tinydrm => tiny}/repaper.c (94%) rename drivers/gpu/drm/{tinydrm => tiny}/st7586.c (74%) rename drivers/gpu/drm/{tinydrm => tiny}/st7735r.c (69%) delete mode 100644 drivers/gpu/drm/tinydrm/core/Makefile delete mode 100644 drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c delete mode 100644 drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c delete mode 100644 drivers/gpu/drm/vboxvideo/vbox_prime.c rename drivers/gpu/drm/vkms/{vkms_crc.c => vkms_composer.c} (52%) create mode 100644 include/drm/drm_mipi_dbi.h delete mode 100644 include/drm/tinydrm/mipi-dbi.h delete mode 100644 include/drm/tinydrm/tinydrm-helpers.h rename include/linux/{reservation.h => dma-resv.h} (63%) Merging amdgpu/drm-next (283791cbb202 drm/amdkfd: Remove GPU ID in GWS queue creation) $ git merge amdgpu/drm-next Auto-merging include/uapi/linux/kfd_ioctl.h CONFLICT (content): Merge conflict in include/uapi/linux/kfd_ioctl.h Auto-merging drivers/gpu/drm/radeon/radeon.h Removing drivers/gpu/drm/amd/display/dc/dsc/drm_dsc_dc.c Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_chardev.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_chardev.c Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c Resolved 'drivers/gpu/drm/amd/amdkfd/kfd_chardev.c' using previous resolution. Resolved 'include/uapi/linux/kfd_ioctl.h' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit --no-edit -v -a [master 3131e111e1c2] Merge remote-tracking branch 'amdgpu/drm-next' $ git diff -M --stat --summary HEAD^.. drivers/gpu/drm/amd/amdgpu/Makefile | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 41 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 12 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 17 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 10 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 9 +- drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 31 + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 17 + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 41 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 17 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 7 + drivers/gpu/drm/amd/amdgpu/athub_v1_0.c | 103 +++ drivers/gpu/drm/amd/amdgpu/athub_v1_0.h | 30 + drivers/gpu/drm/amd/amdgpu/athub_v2_0.c | 1 + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 4 + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 4 + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 4 + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 4 + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 1 + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 5 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 71 +- drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 70 +- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 21 +- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 26 +- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 26 +- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 238 ++++-- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 119 ++- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 2 + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 3 +- drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 125 +++ drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h | 3 + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 21 + drivers/gpu/drm/amd/amdgpu/nv.c | 16 +- drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 566 ++++++++++++++ drivers/gpu/drm/amd/amdgpu/psp_v12_0.h | 30 + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 129 ++- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 1 + drivers/gpu/drm/amd/amdgpu/soc15.c | 65 +- drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 9 +- drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 2 +- drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c | 4 + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2 + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 9 + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 3 +- drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 3 +- .../amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c | 17 +- .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 12 +- .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 136 +++- drivers/gpu/drm/amd/display/dc/core/dc.c | 39 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 172 ++-- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 320 +++++++- drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 151 ++-- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 46 +- drivers/gpu/drm/amd/display/dc/dc.h | 11 +- drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 5 +- drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 3 + drivers/gpu/drm/amd/display/dc/dc_link.h | 10 + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 2 +- drivers/gpu/drm/amd/display/dc/dce/dce_audio.h | 6 +- .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 35 +- drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 25 +- drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 13 +- .../drm/amd/display/dc/dce/dce_stream_encoder.c | 31 + .../drm/amd/display/dc/dce100/dce100_resource.c | 6 +- .../amd/display/dc/dce110/dce110_hw_sequencer.c | 17 +- .../amd/display/dc/dce110/dce110_hw_sequencer.h | 6 +- .../drm/amd/display/dc/dce110/dce110_resource.c | 6 +- .../drm/amd/display/dc/dce112/dce112_resource.c | 2 +- .../drm/amd/display/dc/dce120/dce120_resource.c | 2 +- .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 14 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 7 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 4 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 2 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 2 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 26 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 299 +++++-- .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 49 +- .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 1 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 19 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.h | 4 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 10 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 6 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 10 +- .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 26 + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 6 + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c | 31 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 2 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.c | 16 + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.h | 19 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 118 +-- .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 83 +- .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.h | 9 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 78 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h | 18 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 437 +++++------ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 6 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.h | 6 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 23 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.h | 4 +- .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 478 +++++++----- .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 27 +- .../drm/amd/display/dc/dml/display_mode_enums.h | 22 +- .../drm/amd/display/dc/dml/display_mode_structs.h | 3 + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 9 + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 18 + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 71 +- drivers/gpu/drm/amd/display/dc/dsc/drm_dsc_dc.c | 453 ----------- .../amd/display/dc/gpio/dce110/hw_factory_dce110.c | 18 +- .../amd/display/dc/gpio/dce120/hw_factory_dce120.c | 14 +- .../amd/display/dc/gpio/dce80/hw_factory_dce80.c | 14 +- .../amd/display/dc/gpio/dcn10/hw_factory_dcn10.c | 12 +- .../amd/display/dc/gpio/dcn20/hw_factory_dcn20.c | 12 +- .../display/dc/gpio/diagnostics/hw_factory_diag.c | 9 +- drivers/gpu/drm/amd/display/dc/gpio/gpio_base.c | 74 +- drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c | 51 +- drivers/gpu/drm/amd/display/dc/gpio/gpio_service.h | 6 +- drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c | 26 +- drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.h | 5 +- drivers/gpu/drm/amd/display/dc/gpio/hw_factory.h | 48 +- drivers/gpu/drm/amd/display/dc/gpio/hw_generic.c | 32 +- drivers/gpu/drm/amd/display/dc/gpio/hw_generic.h | 6 +- drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c | 31 +- drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.h | 5 +- drivers/gpu/drm/amd/display/dc/inc/core_types.h | 2 - drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 11 +- .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 12 +- drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 3 +- drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 4 + drivers/gpu/drm/amd/display/dc/inc/hw/dsc.h | 4 +- drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h | 12 - drivers/gpu/drm/amd/display/dc/inc/hw/gpio.h | 10 + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 11 +- .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 1 + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 7 + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 18 +- .../drm/amd/display/dc/inc/hw/timing_generator.h | 11 +- drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 32 + drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 2 - .../amd/display/dc/irq/dcn20/irq_service_dcn20.c | 28 +- .../display/dc/virtual/virtual_stream_encoder.c | 5 + .../gpu/drm/amd/display/include/gpio_interface.h | 9 + .../gpu/drm/amd/display/include/logger_interface.h | 2 + drivers/gpu/drm/amd/display/include/logger_types.h | 7 + .../drm/amd/display/modules/color/color_gamma.c | 224 ++++-- .../drm/amd/display/modules/color/color_gamma.h | 1 + .../drm/amd/display/modules/freesync/freesync.c | 27 +- .../include/asic_reg/mmhub/mmhub_9_4_0_offset.h | 21 + .../include/asic_reg/mmhub/mmhub_9_4_0_sh_mask.h | 222 ++++++ .../drm/amd/include/asic_reg/mp/mp_12_0_0_offset.h | 336 ++++++++ .../amd/include/asic_reg/mp/mp_12_0_0_sh_mask.h | 866 +++++++++++++++++++++ drivers/gpu/drm/amd/include/kgd_pp_interface.h | 1 + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 21 + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 3 + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 23 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 7 + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 5 + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 4 +- drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 9 + drivers/gpu/drm/amd/powerplay/inc/rv_ppsmc.h | 2 +- .../gpu/drm/amd/powerplay/inc/smu11_driver_if.h | 4 +- .../amd/powerplay/inc/smu11_driver_if_arcturus.h | 2 +- .../drm/amd/powerplay/inc/smu11_driver_if_navi10.h | 29 +- drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 6 + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 10 +- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 38 +- drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 6 +- drivers/gpu/drm/radeon/radeon.h | 1 - drivers/gpu/drm/radeon/radeon_device.c | 21 +- drivers/gpu/drm/radeon/radeon_ttm.c | 2 +- include/drm/amd_asic_type.h | 1 + 179 files changed, 5570 insertions(+), 2325 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h create mode 100644 drivers/gpu/drm/amd/amdgpu/athub_v1_0.c create mode 100644 drivers/gpu/drm/amd/amdgpu/athub_v1_0.h create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v12_0.c create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v12_0.h delete mode 100644 drivers/gpu/drm/amd/display/dc/dsc/drm_dsc_dc.c create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_12_0_0_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_12_0_0_sh_mask.h Merging drm-intel/for-linux-next (8e40983dec63 drm/i915/selftests: Fixup a couple of missing serialisation with vma) $ git merge drm-intel/for-linux-next Auto-merging drivers/gpu/drm/i915/i915_vma.h Auto-merging drivers/gpu/drm/i915/i915_vma.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_vma.c Auto-merging drivers/gpu/drm/i915/i915_sw_fence.h Auto-merging drivers/gpu/drm/i915/i915_sw_fence.c Auto-merging drivers/gpu/drm/i915/i915_request.c Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c Removing drivers/gpu/drm/i915/i915_gem_batch_pool.h CONFLICT (modify/delete): drivers/gpu/drm/i915/i915_gem_batch_pool.c deleted in drm-intel/for-linux-next and modified in HEAD. Version HEAD of drivers/gpu/drm/i915/i915_gem_batch_pool.c left in tree. Auto-merging drivers/gpu/drm/i915/i915_gem.c Auto-merging drivers/gpu/drm/i915/i915_drv.h Auto-merging drivers/gpu/drm/i915/i915_drv.c Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c Auto-merging drivers/gpu/drm/i915/gvt/kvmgt.c Auto-merging drivers/gpu/drm/i915/gvt/cmd_parser.c Auto-merging drivers/gpu/drm/i915/gt/intel_breadcrumbs.c Auto-merging drivers/gpu/drm/i915/gem/i915_gem_pages.c Auto-merging drivers/gpu/drm/i915/gem/i915_gem_object.h Auto-merging drivers/gpu/drm/i915/gem/i915_gem_object.c Auto-merging drivers/gpu/drm/i915/gem/i915_gem_mman.c Auto-merging drivers/gpu/drm/i915/gem/i915_gem_fence.c Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Auto-merging drivers/gpu/drm/i915/gem/i915_gem_client_blt.c Auto-merging drivers/gpu/drm/i915/gem/i915_gem_clflush.c Auto-merging drivers/gpu/drm/i915/display/vlv_dsi_pll.c Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h Auto-merging drivers/gpu/drm/i915/display/intel_display.c Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c Auto-merging drivers/gpu/drm/i915/Makefile Resolved 'drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c' using previous resolution. Recorded preimage for 'drivers/gpu/drm/i915/i915_vma.c' Automatic merge failed; fix conflicts and then commit the result. $ git rm -f drivers/gpu/drm/i915/i915_gem_batch_pool.c drivers/gpu/drm/i915/i915_gem_batch_pool.c: needs merge rm 'drivers/gpu/drm/i915/i915_gem_batch_pool.c' $ git commit --no-edit -v -a Recorded resolution for 'drivers/gpu/drm/i915/i915_vma.c'. [master 4978ecc2961e] Merge remote-tracking branch 'drm-intel/for-linux-next' $ git diff -M --stat --summary HEAD^.. Documentation/gpu/i915.rst | 3 - drivers/gpu/drm/i915/Makefile | 11 +- drivers/gpu/drm/i915/display/dvo_ch7017.c | 2 +- drivers/gpu/drm/i915/display/dvo_ch7xxx.c | 2 +- drivers/gpu/drm/i915/display/dvo_ivch.c | 2 +- drivers/gpu/drm/i915/display/dvo_ns2501.c | 2 +- drivers/gpu/drm/i915/display/dvo_sil164.c | 2 +- drivers/gpu/drm/i915/display/dvo_tfp410.c | 2 +- drivers/gpu/drm/i915/display/icl_dsi.c | 65 +- drivers/gpu/drm/i915/display/intel_atomic.c | 2 +- drivers/gpu/drm/i915/display/intel_atomic_plane.c | 3 +- drivers/gpu/drm/i915/display/intel_audio.c | 2 +- drivers/gpu/drm/i915/display/intel_bios.c | 23 +- drivers/gpu/drm/i915/display/intel_bw.c | 16 +- drivers/gpu/drm/i915/display/intel_bw.h | 15 - drivers/gpu/drm/i915/display/intel_cdclk.c | 22 +- drivers/gpu/drm/i915/display/intel_color.c | 2 +- drivers/gpu/drm/i915/display/intel_combo_phy.c | 2 +- drivers/gpu/drm/i915/display/intel_connector.c | 4 +- drivers/gpu/drm/i915/display/intel_crt.c | 17 +- drivers/gpu/drm/i915/display/intel_ddi.c | 25 +- drivers/gpu/drm/i915/display/intel_display.c | 134 +-- drivers/gpu/drm/i915/display/intel_display.h | 189 ++++ drivers/gpu/drm/i915/display/intel_display_power.c | 147 ++- drivers/gpu/drm/i915/display/intel_display_power.h | 38 +- .../{intel_drv.h => display/intel_display_types.h} | 156 +-- drivers/gpu/drm/i915/display/intel_dp.c | 102 +- .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 2 +- .../gpu/drm/i915/display/intel_dp_link_training.c | 2 +- drivers/gpu/drm/i915/display/intel_dp_mst.c | 27 +- drivers/gpu/drm/i915/display/intel_dp_mst.h | 9 +- drivers/gpu/drm/i915/display/intel_dpio_phy.c | 8 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 46 +- drivers/gpu/drm/i915/display/intel_dsi.h | 3 +- .../gpu/drm/i915/display/intel_dsi_dcs_backlight.c | 2 +- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 2 +- drivers/gpu/drm/i915/display/intel_dvo.c | 2 +- drivers/gpu/drm/i915/display/intel_fbc.c | 7 +- drivers/gpu/drm/i915/display/intel_fbdev.c | 51 +- drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 3 +- drivers/gpu/drm/i915/display/intel_frontbuffer.c | 257 +++-- drivers/gpu/drm/i915/display/intel_frontbuffer.h | 70 +- drivers/gpu/drm/i915/display/intel_gmbus.c | 29 +- drivers/gpu/drm/i915/display/intel_gmbus.h | 22 + drivers/gpu/drm/i915/display/intel_hdcp.c | 36 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 43 +- drivers/gpu/drm/i915/display/intel_hotplug.c | 8 +- drivers/gpu/drm/i915/display/intel_lspcon.c | 2 +- drivers/gpu/drm/i915/display/intel_lvds.c | 8 +- drivers/gpu/drm/i915/display/intel_opregion.c | 2 +- drivers/gpu/drm/i915/display/intel_overlay.c | 139 ++- drivers/gpu/drm/i915/display/intel_panel.c | 2 +- drivers/gpu/drm/i915/display/intel_pipe_crc.c | 2 +- drivers/gpu/drm/i915/display/intel_psr.c | 8 +- drivers/gpu/drm/i915/display/intel_quirks.c | 2 +- drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +- drivers/gpu/drm/i915/display/intel_sprite.c | 9 +- drivers/gpu/drm/i915/display/intel_sprite.h | 8 +- drivers/gpu/drm/i915/display/intel_tc.c | 7 + drivers/gpu/drm/i915/display/intel_tc.h | 9 +- drivers/gpu/drm/i915/display/intel_tv.c | 2 +- drivers/gpu/drm/i915/display/intel_vbt_defs.h | 3 - drivers/gpu/drm/i915/display/intel_vdsc.c | 2 +- drivers/gpu/drm/i915/display/vlv_dsi.c | 84 +- drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 16 +- drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 6 +- drivers/gpu/drm/i915/gem/i915_gem_client_blt.c | 39 +- drivers/gpu/drm/i915/gem/i915_gem_context.c | 170 ++- drivers/gpu/drm/i915/gem/i915_gem_context.h | 2 - drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 5 - drivers/gpu/drm/i915/gem/i915_gem_domain.c | 14 +- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 312 +++--- drivers/gpu/drm/i915/gem/i915_gem_fence.c | 3 +- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 14 +- drivers/gpu/drm/i915/gem/i915_gem_object.c | 78 +- drivers/gpu/drm/i915/gem/i915_gem_object.h | 6 +- drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 370 ++++++- drivers/gpu/drm/i915/gem/i915_gem_object_blt.h | 25 +- drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 9 +- drivers/gpu/drm/i915/gem/i915_gem_pages.c | 13 +- drivers/gpu/drm/i915/gem/i915_gem_phys.c | 7 + drivers/gpu/drm/i915/gem/i915_gem_pm.c | 18 +- drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 1 + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 74 +- drivers/gpu/drm/i915/gem/i915_gem_shrinker.h | 31 + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 9 +- drivers/gpu/drm/i915/gem/i915_gem_stolen.h | 35 + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 3 +- drivers/gpu/drm/i915/gem/i915_gemfs.c | 31 +- drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 120 +-- .../drm/i915/gem/selftests/i915_gem_client_blt.c | 16 +- .../drm/i915/gem/selftests/i915_gem_coherency.c | 4 +- .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 193 +--- drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 9 +- .../drm/i915/gem/selftests/i915_gem_object_blt.c | 128 ++- drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c | 141 ++- drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.h | 16 + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 36 +- drivers/gpu/drm/i915/gt/intel_context.c | 87 +- drivers/gpu/drm/i915/gt/intel_context.h | 41 +- drivers/gpu/drm/i915/gt/intel_context_types.h | 12 +- drivers/gpu/drm/i915/gt/intel_engine.h | 17 +- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 243 ++--- drivers/gpu/drm/i915/gt/intel_engine_pm.c | 68 +- drivers/gpu/drm/i915/gt/intel_engine_pm.h | 18 +- drivers/gpu/drm/i915/gt/intel_engine_pool.c | 177 ++++ drivers/gpu/drm/i915/gt/intel_engine_pool.h | 34 + drivers/gpu/drm/i915/gt/intel_engine_pool_types.h | 29 + drivers/gpu/drm/i915/gt/intel_engine_types.h | 59 +- drivers/gpu/drm/i915/gt/intel_engine_user.c | 303 ++++++ drivers/gpu/drm/i915/gt/intel_engine_user.h | 25 + drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 11 +- drivers/gpu/drm/i915/gt/intel_gt.c | 36 +- drivers/gpu/drm/i915/gt/intel_gt.h | 2 +- drivers/gpu/drm/i915/gt/intel_gt_irq.c | 455 ++++++++ drivers/gpu/drm/i915/gt/intel_gt_irq.h | 44 + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 40 +- drivers/gpu/drm/i915/gt/intel_gt_pm.h | 31 +- drivers/gpu/drm/i915/gt/intel_gt_pm_irq.c | 109 ++ drivers/gpu/drm/i915/gt/intel_gt_pm_irq.h | 22 + drivers/gpu/drm/i915/gt/intel_gt_types.h | 14 +- drivers/gpu/drm/i915/gt/intel_lrc.c | 486 ++++++--- drivers/gpu/drm/i915/gt/intel_lrc_reg.h | 1 + drivers/gpu/drm/i915/gt/intel_mocs.c | 166 +-- drivers/gpu/drm/i915/gt/intel_mocs.h | 3 +- drivers/gpu/drm/i915/gt/intel_renderstate.c | 4 +- drivers/gpu/drm/i915/gt/intel_reset.c | 16 +- drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 147 +-- drivers/gpu/drm/i915/gt/intel_sseu.c | 2 +- drivers/gpu/drm/i915/gt/intel_timeline.c | 132 +-- drivers/gpu/drm/i915/gt/intel_timeline.h | 3 +- drivers/gpu/drm/i915/gt/intel_timeline_types.h | 20 +- drivers/gpu/drm/i915/gt/intel_workarounds.c | 26 +- drivers/gpu/drm/i915/gt/mock_engine.c | 98 +- drivers/gpu/drm/i915/gt/selftest_context.c | 456 ++++++++ drivers/gpu/drm/i915/gt/selftest_engine.c | 28 + drivers/gpu/drm/i915/gt/selftest_engine.h | 14 + drivers/gpu/drm/i915/gt/selftest_engine_cs.c | 26 +- drivers/gpu/drm/i915/gt/selftest_engine_pm.c | 83 ++ drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 10 +- drivers/gpu/drm/i915/gt/selftest_lrc.c | 143 +-- drivers/gpu/drm/i915/gt/selftest_timeline.c | 6 +- drivers/gpu/drm/i915/gt/selftest_workarounds.c | 33 +- drivers/gpu/drm/i915/gt/selftests/mock_timeline.c | 2 +- drivers/gpu/drm/i915/gt/uc/intel_guc.c | 38 +- drivers/gpu/drm/i915/gt/uc/intel_guc.h | 43 +- drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 23 +- drivers/gpu/drm/i915/gt/uc/intel_guc_ads.h | 23 +- drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 22 +- drivers/gpu/drm/i915/gt/uc/intel_guc_ct.h | 22 +- drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 31 +- drivers/gpu/drm/i915/gt/uc/intel_guc_fw.h | 23 +- drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 23 +- drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 30 +- drivers/gpu/drm/i915/gt/uc/intel_guc_log.h | 23 +- drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h | 24 +- drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 108 +- drivers/gpu/drm/i915/gt/uc/intel_guc_submission.h | 26 +- drivers/gpu/drm/i915/gt/uc/intel_huc.c | 57 +- drivers/gpu/drm/i915/gt/uc/intel_huc.h | 33 +- drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 13 +- drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h | 5 +- drivers/gpu/drm/i915/gt/uc/intel_uc.c | 395 ++++--- drivers/gpu/drm/i915/gt/uc/intel_uc.h | 62 +- drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 292 ++++-- drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 134 ++- drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 21 +- drivers/gpu/drm/i915/gvt/cmd_parser.c | 180 +++- drivers/gpu/drm/i915/gvt/debugfs.c | 47 +- drivers/gpu/drm/i915/gvt/gvt.c | 4 +- drivers/gpu/drm/i915/gvt/gvt.h | 8 +- drivers/gpu/drm/i915/gvt/interrupt.c | 4 +- drivers/gpu/drm/i915/gvt/kvmgt.c | 15 +- drivers/gpu/drm/i915/gvt/mmio_context.c | 57 +- drivers/gpu/drm/i915/gvt/scheduler.c | 36 +- drivers/gpu/drm/i915/gvt/vgpu.c | 4 +- drivers/gpu/drm/i915/i915_active.c | 331 +++++- drivers/gpu/drm/i915/i915_active.h | 33 +- drivers/gpu/drm/i915/i915_active_types.h | 17 +- drivers/gpu/drm/i915/i915_buddy.c | 428 ++++++++ drivers/gpu/drm/i915/i915_buddy.h | 128 +++ drivers/gpu/drm/i915/i915_cmd_parser.c | 4 +- drivers/gpu/drm/i915/i915_debugfs.c | 283 ++--- drivers/gpu/drm/i915/i915_drv.c | 791 ++++---------- drivers/gpu/drm/i915/i915_drv.h | 583 +++-------- drivers/gpu/drm/i915/i915_gem.c | 265 ++--- drivers/gpu/drm/i915/i915_gem.h | 2 + drivers/gpu/drm/i915/i915_gem_batch_pool.c | 132 --- drivers/gpu/drm/i915/i915_gem_batch_pool.h | 26 - drivers/gpu/drm/i915/i915_gem_evict.c | 9 - drivers/gpu/drm/i915/i915_gem_fence_reg.c | 6 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 181 ++-- drivers/gpu/drm/i915/i915_gem_gtt.h | 6 +- drivers/gpu/drm/i915/i915_getparam.c | 168 +++ drivers/gpu/drm/i915/i915_globals.c | 1 + drivers/gpu/drm/i915/i915_globals.h | 1 + drivers/gpu/drm/i915/i915_gpu_error.c | 288 +++-- drivers/gpu/drm/i915/i915_gpu_error.h | 7 +- drivers/gpu/drm/i915/i915_irq.c | 1095 ++++++-------------- drivers/gpu/drm/i915/i915_irq.h | 79 +- drivers/gpu/drm/i915/i915_memcpy.c | 2 +- drivers/gpu/drm/i915/i915_memcpy.h | 32 + drivers/gpu/drm/i915/i915_mm.c | 5 +- drivers/gpu/drm/i915/i915_pci.c | 28 +- drivers/gpu/drm/i915/i915_perf.c | 546 +++++----- drivers/gpu/drm/i915/i915_perf.h | 32 + drivers/gpu/drm/i915/i915_pmu.c | 294 +++--- drivers/gpu/drm/i915/i915_priolist_types.h | 25 +- drivers/gpu/drm/i915/i915_query.c | 5 +- drivers/gpu/drm/i915/i915_reg.h | 131 ++- drivers/gpu/drm/i915/i915_request.c | 252 ++--- drivers/gpu/drm/i915/i915_request.h | 5 +- drivers/gpu/drm/i915/i915_scheduler.c | 3 +- drivers/gpu/drm/i915/i915_selftest.h | 2 + drivers/gpu/drm/i915/i915_suspend.c | 3 +- drivers/gpu/drm/i915/i915_suspend.h | 14 + drivers/gpu/drm/i915/i915_sw_fence.c | 23 +- drivers/gpu/drm/i915/i915_sw_fence.h | 7 + drivers/gpu/drm/i915/i915_sysfs.c | 2 +- drivers/gpu/drm/i915/i915_sysfs.h | 14 + drivers/gpu/drm/i915/i915_trace.h | 12 +- drivers/gpu/drm/i915/i915_utils.c | 78 ++ drivers/gpu/drm/i915/i915_utils.h | 59 +- drivers/gpu/drm/i915/i915_vgpu.c | 4 +- drivers/gpu/drm/i915/i915_vma.c | 72 +- drivers/gpu/drm/i915/i915_vma.h | 13 +- drivers/gpu/drm/i915/intel_csr.c | 7 + drivers/gpu/drm/i915/intel_device_info.c | 5 +- drivers/gpu/drm/i915/intel_device_info.h | 1 + drivers/gpu/drm/i915/intel_gvt.c | 2 +- drivers/gpu/drm/i915/intel_pch.c | 201 ++++ drivers/gpu/drm/i915/intel_pch.h | 73 ++ drivers/gpu/drm/i915/intel_pm.c | 19 +- drivers/gpu/drm/i915/intel_runtime_pm.c | 1 + drivers/gpu/drm/i915/intel_sideband.c | 4 +- drivers/gpu/drm/i915/intel_uncore.c | 101 +- drivers/gpu/drm/i915/intel_uncore.h | 30 +- drivers/gpu/drm/i915/intel_wakeref.c | 80 +- drivers/gpu/drm/i915/intel_wakeref.h | 73 +- drivers/gpu/drm/i915/intel_wopcm.c | 270 +++-- drivers/gpu/drm/i915/intel_wopcm.h | 20 +- drivers/gpu/drm/i915/oa/Makefile | 7 + drivers/gpu/drm/i915/oa/i915_oa_bdw.c | 35 +- drivers/gpu/drm/i915/oa/i915_oa_bdw.h | 7 +- drivers/gpu/drm/i915/oa/i915_oa_bxt.c | 35 +- drivers/gpu/drm/i915/oa/i915_oa_bxt.h | 7 +- drivers/gpu/drm/i915/oa/i915_oa_cflgt2.c | 35 +- drivers/gpu/drm/i915/oa/i915_oa_cflgt2.h | 7 +- drivers/gpu/drm/i915/oa/i915_oa_cflgt3.c | 35 +- drivers/gpu/drm/i915/oa/i915_oa_cflgt3.h | 7 +- drivers/gpu/drm/i915/oa/i915_oa_chv.c | 35 +- drivers/gpu/drm/i915/oa/i915_oa_chv.h | 7 +- drivers/gpu/drm/i915/oa/i915_oa_cnl.c | 35 +- drivers/gpu/drm/i915/oa/i915_oa_cnl.h | 7 +- drivers/gpu/drm/i915/oa/i915_oa_glk.c | 35 +- drivers/gpu/drm/i915/oa/i915_oa_glk.h | 7 +- drivers/gpu/drm/i915/oa/i915_oa_hsw.c | 35 +- drivers/gpu/drm/i915/oa/i915_oa_hsw.h | 7 +- drivers/gpu/drm/i915/oa/i915_oa_icl.c | 35 +- drivers/gpu/drm/i915/oa/i915_oa_icl.h | 7 +- drivers/gpu/drm/i915/oa/i915_oa_kblgt2.c | 35 +- drivers/gpu/drm/i915/oa/i915_oa_kblgt2.h | 7 +- drivers/gpu/drm/i915/oa/i915_oa_kblgt3.c | 35 +- drivers/gpu/drm/i915/oa/i915_oa_kblgt3.h | 7 +- drivers/gpu/drm/i915/oa/i915_oa_sklgt2.c | 35 +- drivers/gpu/drm/i915/oa/i915_oa_sklgt2.h | 7 +- drivers/gpu/drm/i915/oa/i915_oa_sklgt3.c | 35 +- drivers/gpu/drm/i915/oa/i915_oa_sklgt3.h | 7 +- drivers/gpu/drm/i915/oa/i915_oa_sklgt4.c | 35 +- drivers/gpu/drm/i915/oa/i915_oa_sklgt4.h | 7 +- drivers/gpu/drm/i915/selftests/i915_active.c | 3 +- drivers/gpu/drm/i915/selftests/i915_buddy.c | 720 +++++++++++++ drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 19 +- .../gpu/drm/i915/selftests/i915_live_selftests.h | 6 +- .../gpu/drm/i915/selftests/i915_mock_selftests.h | 1 + drivers/gpu/drm/i915/selftests/i915_request.c | 46 +- drivers/gpu/drm/i915/selftests/i915_selftest.c | 2 +- drivers/gpu/drm/i915/selftests/igt_spinner.c | 30 +- drivers/gpu/drm/i915/selftests/igt_spinner.h | 6 +- drivers/gpu/drm/i915/selftests/lib_sw_fence.c | 1 + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 1 + drivers/gpu/drm/i915/selftests/mock_request.c | 6 +- drivers/gpu/drm/i915/selftests/mock_request.h | 4 +- include/drm/i915_pciids.h | 5 +- 284 files changed, 11124 insertions(+), 7207 deletions(-) rename drivers/gpu/drm/i915/{intel_drv.h => display/intel_display_types.h} (85%) create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_shrinker.h create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_stolen.h create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_pool.c create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_pool.h create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_pool_types.h create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_user.c create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_user.h create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_irq.c create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_irq.h create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_pm_irq.c create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_pm_irq.h create mode 100644 drivers/gpu/drm/i915/gt/selftest_context.c create mode 100644 drivers/gpu/drm/i915/gt/selftest_engine.c create mode 100644 drivers/gpu/drm/i915/gt/selftest_engine.h create mode 100644 drivers/gpu/drm/i915/gt/selftest_engine_pm.c create mode 100644 drivers/gpu/drm/i915/i915_buddy.c create mode 100644 drivers/gpu/drm/i915/i915_buddy.h delete mode 100644 drivers/gpu/drm/i915/i915_gem_batch_pool.c delete mode 100644 drivers/gpu/drm/i915/i915_gem_batch_pool.h create mode 100644 drivers/gpu/drm/i915/i915_getparam.c create mode 100644 drivers/gpu/drm/i915/i915_memcpy.h create mode 100644 drivers/gpu/drm/i915/i915_perf.h create mode 100644 drivers/gpu/drm/i915/i915_suspend.h create mode 100644 drivers/gpu/drm/i915/i915_sysfs.h create mode 100644 drivers/gpu/drm/i915/i915_utils.c create mode 100644 drivers/gpu/drm/i915/intel_pch.c create mode 100644 drivers/gpu/drm/i915/intel_pch.h create mode 100644 drivers/gpu/drm/i915/selftests/i915_buddy.c $ git am -3 ../patches/0001-drm-fix-up-fallout-from-dma-buf-rename-reservation_o.patch Applying: drm: fix up fallout from "dma-buf: rename reservation_object to dma_resv" $ git reset HEAD^ Unstaged changes after reset: M drivers/gpu/drm/i915/gt/intel_engine_pool.c $ git add -A . $ git commit -v -a --amend [master bfd049b858ac] Merge remote-tracking branch 'drm-intel/for-linux-next' Date: Thu Aug 22 13:14:56 2019 +1000 Merging drm-tegra/drm/tegra/for-next (2a6fc3cb5cb6 drm/tegra: Fix gpiod_get_from_of_node() regression) $ git merge drm-tegra/drm/tegra/for-next Already up to date. Merging drm-misc/for-linux-next (89a565dba1a0 drm: kirin: Move ade drm init to kirin drm drv) $ git merge drm-misc/for-linux-next Auto-merging drivers/gpu/drm/i915/Kconfig.debug Merge made by the 'recursive' strategy. .../display/rockchip/dw_mipi_dsi_rockchip.txt | 23 +- drivers/dma-buf/Kconfig | 5 + drivers/dma-buf/Makefile | 6 + drivers/dma-buf/selftest.c | 167 ++++++ drivers/dma-buf/selftest.h | 30 ++ drivers/dma-buf/selftests.h | 13 + drivers/dma-buf/st-dma-fence.c | 574 +++++++++++++++++++++ drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c | 13 +- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 45 +- drivers/gpu/drm/drm_drv.c | 14 +- drivers/gpu/drm/hisilicon/kirin/Kconfig | 10 +- drivers/gpu/drm/hisilicon/kirin/Makefile | 3 +- drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h | 1 + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 351 +++++-------- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 250 ++++++--- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 48 +- drivers/gpu/drm/i915/Kconfig.debug | 1 + drivers/gpu/drm/nouveau/nouveau_bo.c | 69 ++- drivers/gpu/drm/nouveau/nouveau_bo.h | 4 + drivers/gpu/drm/nouveau/nouveau_gem.c | 29 +- drivers/gpu/drm/nouveau/nouveau_prime.c | 16 +- drivers/gpu/drm/panfrost/TODO | 4 - drivers/gpu/drm/panfrost/panfrost_devfreq.c | 13 +- drivers/gpu/drm/panfrost/panfrost_devfreq.h | 1 + drivers/gpu/drm/panfrost/panfrost_device.c | 2 + drivers/gpu/drm/panfrost/panfrost_device.h | 24 +- drivers/gpu/drm/panfrost/panfrost_drv.c | 36 +- drivers/gpu/drm/panfrost/panfrost_gem.c | 15 +- drivers/gpu/drm/panfrost/panfrost_gem.h | 3 + drivers/gpu/drm/panfrost/panfrost_job.c | 14 +- drivers/gpu/drm/panfrost/panfrost_mmu.c | 227 +++++--- drivers/gpu/drm/panfrost/panfrost_mmu.h | 8 + drivers/video/fbdev/aty/aty128fb.c | 18 - drivers/video/fbdev/aty/atyfb_base.c | 29 -- drivers/video/fbdev/aty/radeon_base.c | 6 +- drivers/video/fbdev/efifb.c | 27 +- drivers/video/fbdev/mmp/core.c | 6 +- drivers/video/fbdev/pvr2fb.c | 6 +- drivers/video/fbdev/sh_mobile_lcdcfb.c | 2 + drivers/video/fbdev/sm712fb.c | 8 +- drivers/video/fbdev/udlfb.c | 2 +- drivers/video/fbdev/via/via-core.c | 43 -- 42 files changed, 1573 insertions(+), 593 deletions(-) create mode 100644 drivers/dma-buf/selftest.c create mode 100644 drivers/dma-buf/selftest.h create mode 100644 drivers/dma-buf/selftests.h create mode 100644 drivers/dma-buf/st-dma-fence.c Merging drm-msm/msm-next (ddc73f32ba95 drm/msm: drop use of drmP.h) $ git merge drm-msm/msm-next Auto-merging drivers/gpu/drm/msm/msm_rd.c Auto-merging drivers/gpu/drm/msm/msm_perf.c Auto-merging drivers/gpu/drm/msm/msm_gem_submit.c Auto-merging drivers/gpu/drm/msm/msm_gem_prime.c Auto-merging drivers/gpu/drm/msm/msm_gem.c Auto-merging drivers/gpu/drm/msm/msm_fbdev.c Auto-merging drivers/gpu/drm/msm/msm_fb.c Auto-merging drivers/gpu/drm/msm/msm_drv.h Auto-merging drivers/gpu/drm/msm/msm_drv.c Auto-merging drivers/gpu/drm/msm/msm_debugfs.c Auto-merging drivers/gpu/drm/msm/msm_atomic.c CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_atomic.c Auto-merging drivers/gpu/drm/msm/hdmi/hdmi_pll_8960.c Auto-merging drivers/gpu/drm/msm/hdmi/hdmi_phy_8x60.c Auto-merging drivers/gpu/drm/msm/hdmi/hdmi_connector.c Auto-merging drivers/gpu/drm/msm/hdmi/hdmi_bridge.c Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_irq.c Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c Auto-merging drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c Auto-merging drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c Auto-merging drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c Auto-merging drivers/gpu/drm/msm/disp/mdp4/mdp4_irq.c Auto-merging drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c Resolved 'drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c' using previous resolution. Resolved 'drivers/gpu/drm/msm/msm_atomic.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit --no-edit -v -a [master 8b74f4cd753b] Merge remote-tracking branch 'drm-msm/msm-next' $ git diff -M --stat --summary HEAD^.. drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 4 +++- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 8 +++++--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 6 ++++-- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 3 ++- drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 1 + drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 1 + drivers/gpu/drm/msm/disp/mdp4/mdp4_irq.c | 1 + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 3 +++ drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c | 2 ++ drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 2 ++ drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 3 +++ drivers/gpu/drm/msm/disp/mdp5/mdp5_irq.c | 1 + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 6 ++++++ drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 2 ++ drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c | 1 + drivers/gpu/drm/msm/dsi/dsi_host.c | 8 +++++--- drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 2 ++ drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 2 ++ drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | 2 +- drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 2 ++ drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 1 + drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c | 1 + drivers/gpu/drm/msm/hdmi/hdmi_phy_8x60.c | 2 ++ drivers/gpu/drm/msm/hdmi/hdmi_pll_8960.c | 2 ++ drivers/gpu/drm/msm/msm_atomic.c | 1 + drivers/gpu/drm/msm/msm_debugfs.c | 5 +++++ drivers/gpu/drm/msm/msm_drv.c | 10 +++++++++- drivers/gpu/drm/msm/msm_drv.h | 1 - drivers/gpu/drm/msm/msm_fb.c | 2 ++ drivers/gpu/drm/msm/msm_fbdev.c | 1 + drivers/gpu/drm/msm/msm_gem.c | 2 ++ drivers/gpu/drm/msm/msm_gem_prime.c | 6 ++++-- drivers/gpu/drm/msm/msm_gem_submit.c | 4 ++++ drivers/gpu/drm/msm/msm_gpummu.c | 2 ++ drivers/gpu/drm/msm/msm_perf.c | 3 +++ drivers/gpu/drm/msm/msm_rd.c | 7 +++++-- drivers/gpu/drm/msm/msm_submitqueue.c | 2 ++ 40 files changed, 99 insertions(+), 18 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 (4cf643a39221 Merge tag 'drm-next-5.3-2019-06-27' of git://people.freedesktop.org/~agd5f/linux into drm-next) $ git merge mali-dp/for-upstream/mali-dp Already up to date. Merging imx-drm/imx-drm/next (a59957172b0c gpu: ipu-v3: enable remaining 32-bit RGB V4L2 pixel formats) $ git merge imx-drm/imx-drm/next Merge made by the 'recursive' strategy. drivers/gpu/drm/imx/Makefile | 1 - drivers/gpu/ipu-v3/ipu-common.c | 16 ++++++++++------ drivers/gpu/ipu-v3/ipu-cpmem.c | 26 +++++++++++++++++++++++++- 3 files changed, 35 insertions(+), 8 deletions(-) Merging etnaviv/etnaviv/next (088880ddc0b2 drm/etnaviv: implement softpin) $ git merge etnaviv/etnaviv/next Removing drivers/gpu/drm/etnaviv/etnaviv_iommu.h Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c CONFLICT (content): Merge conflict in drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem.h Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem.c Auto-merging drivers/gpu/drm/etnaviv/etnaviv_drv.c Resolved 'drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit --no-edit -v -a [master 93ed829c4436] Merge remote-tracking branch 'etnaviv/etnaviv/next' $ git diff -M --stat --summary HEAD^.. drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 93 ++++++-- drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c | 58 +++-- drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.h | 15 +- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 68 +++++- drivers/gpu/drm/etnaviv/etnaviv_drv.h | 27 +-- drivers/gpu/drm/etnaviv/etnaviv_dump.c | 65 +++--- drivers/gpu/drm/etnaviv/etnaviv_dump.h | 4 +- drivers/gpu/drm/etnaviv/etnaviv_gem.c | 56 +++-- drivers/gpu/drm/etnaviv/etnaviv_gem.h | 8 +- drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 2 + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 45 +++- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 158 +++++++------ drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 11 +- drivers/gpu/drm/etnaviv/etnaviv_iommu.c | 165 +++++++------- drivers/gpu/drm/etnaviv/etnaviv_iommu.h | 20 -- drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c | 284 +++++++++++------------ drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 326 ++++++++++++++++++--------- drivers/gpu/drm/etnaviv/etnaviv_mmu.h | 114 +++++++--- drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 48 ++-- drivers/gpu/drm/etnaviv/etnaviv_sched.c | 4 +- include/uapi/drm/etnaviv_drm.h | 10 +- 21 files changed, 922 insertions(+), 659 deletions(-) delete mode 100644 drivers/gpu/drm/etnaviv/etnaviv_iommu.h Merging regmap/for-next (1bd4584626a9 Merge branch 'regmap-5.4' into regmap-next) $ git merge regmap/for-next Merge made by the 'recursive' strategy. drivers/base/regmap/regmap-debugfs.c | 12 ------------ 1 file changed, 12 deletions(-) Merging sound/for-next (7c0a69394c26 ALSA: hda - Define a fallback_pin_fixup_tbl for alc269 family) $ git merge sound/for-next Auto-merging sound/usb/pcm.c Auto-merging sound/usb/mixer_quirks.c Auto-merging sound/usb/mixer.c Auto-merging sound/soc/sof/intel/hda.c Auto-merging sound/pci/hda/patch_realtek.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 Merge made by the 'recursive' strategy. Documentation/sound/hd-audio/models.rst | 3 + include/sound/hdaudio.h | 78 +- include/sound/hdaudio_ext.h | 1 - .../skl-nhlt.h => include/sound/intel-nhlt.h | 51 +- sound/aoa/codecs/onyx.c | 4 +- sound/firewire/amdtp-am824.c | 134 +- sound/firewire/amdtp-stream-trace.h | 6 +- sound/firewire/amdtp-stream.c | 358 +++- sound/firewire/amdtp-stream.h | 47 +- sound/firewire/bebob/bebob.h | 2 + sound/firewire/bebob/bebob_stream.c | 62 +- sound/firewire/dice/dice-stream.c | 32 +- sound/firewire/dice/dice.h | 2 + sound/firewire/digi00x/amdtp-dot.c | 112 +- sound/firewire/digi00x/digi00x-stream.c | 106 +- sound/firewire/digi00x/digi00x.h | 2 + sound/firewire/fireface/amdtp-ff.c | 105 +- sound/firewire/fireface/ff-stream.c | 96 +- sound/firewire/fireface/ff.h | 2 + sound/firewire/fireworks/fireworks.h | 2 + sound/firewire/fireworks/fireworks_stream.c | 176 +- sound/firewire/motu/amdtp-motu.c | 155 +- sound/firewire/motu/motu-stream.c | 131 +- sound/firewire/motu/motu.h | 2 + sound/firewire/oxfw/oxfw-stream.c | 72 +- sound/firewire/oxfw/oxfw.h | 2 + sound/firewire/tascam/amdtp-tascam.c | 115 +- sound/firewire/tascam/tascam-stream.c | 123 +- sound/firewire/tascam/tascam.h | 2 + sound/hda/Kconfig | 8 + sound/hda/Makefile | 3 + sound/hda/ext/hdac_ext_bus.c | 60 +- sound/hda/hdac_bus.c | 45 +- sound/hda/hdac_controller.c | 20 +- sound/hda/hdac_device.c | 6 +- sound/hda/hdac_regmap.c | 1 + sound/hda/hdac_stream.c | 14 +- sound/hda/intel-nhlt.c | 107 + sound/hda/local.h | 7 + sound/i2c/other/ak4xxx-adda.c | 7 +- sound/isa/sb/sb_common.c | 2 +- sound/isa/wavefront/wavefront_synth.c | 1 - sound/oss/dmasound/dmasound_atari.c | 16 +- sound/pci/ac97/ac97_codec.c | 5 - sound/pci/echoaudio/echoaudio.c | 5 +- sound/pci/hda/Kconfig | 11 + sound/pci/hda/hda_auto_parser.c | 12 +- sound/pci/hda/hda_controller.c | 24 +- sound/pci/hda/hda_controller.h | 3 +- sound/pci/hda/hda_intel.c | 119 +- sound/pci/hda/hda_local.h | 3 +- sound/pci/hda/hda_tegra.c | 84 +- sound/pci/hda/patch_hdmi.c | 274 ++- sound/pci/hda/patch_realtek.c | 96 +- sound/pci/hda/patch_sigmatel.c | 9 - sound/soc/intel/Kconfig | 1 + sound/soc/intel/skylake/skl-messages.c | 15 +- sound/soc/intel/skylake/skl-nhlt.c | 91 +- sound/soc/intel/skylake/skl-ssp-clk.c | 1 + sound/soc/intel/skylake/skl-topology.c | 1 + sound/soc/intel/skylake/skl.c | 19 +- sound/soc/intel/skylake/skl.h | 4 - sound/soc/sof/intel/hda-bus.c | 86 +- sound/soc/sof/intel/hda-dsp.c | 2 +- sound/soc/sof/intel/hda.c | 9 +- sound/soc/sof/intel/hda.h | 3 +- sound/sparc/dbri.c | 4 + sound/usb/Makefile | 1 + sound/usb/line6/driver.c | 4 +- sound/usb/mixer.c | 4 + sound/usb/mixer.h | 4 + sound/usb/mixer_quirks.c | 7 + sound/usb/mixer_scarlett_gen2.c | 2075 ++++++++++++++++++++ sound/usb/mixer_scarlett_gen2.h | 7 + sound/usb/pcm.c | 1 + sound/usb/quirks-table.h | 57 + sound/usb/stream.c | 65 +- 77 files changed, 4053 insertions(+), 1333 deletions(-) rename sound/soc/intel/skylake/skl-nhlt.h => include/sound/intel-nhlt.h (65%) create mode 100644 sound/hda/intel-nhlt.c create mode 100644 sound/usb/mixer_scarlett_gen2.c create mode 100644 sound/usb/mixer_scarlett_gen2.h Merging sound-asoc/for-next (3b3aaa017e80 Merge branch 'asoc-5.4' into asoc-next) $ git merge sound-asoc/for-next Auto-merging sound/soc/sof/intel/hda.c Removing sound/soc/nuc900/nuc900-pcm.c Removing sound/soc/nuc900/nuc900-audio.h Removing sound/soc/nuc900/nuc900-audio.c Removing sound/soc/nuc900/nuc900-ac97.c Removing sound/soc/nuc900/Makefile Removing sound/soc/nuc900/Kconfig Merge made by the 'recursive' strategy. .../devicetree/bindings/sound/fsl,esai.txt | 7 +- .../devicetree/bindings/sound/fsl-sai.txt | 4 +- .../devicetree/bindings/sound/uda1334.txt | 17 + include/sound/soc-acpi-intel-match.h | 2 + include/sound/soc-component.h | 387 ++++ include/sound/soc-dai.h | 25 + include/sound/soc-dapm.h | 8 +- include/sound/soc-dpcm.h | 9 +- include/sound/soc.h | 348 +--- include/sound/sof/dai-intel.h | 12 + include/sound/sof/dai.h | 5 +- include/uapi/sound/sof/abi.h | 2 +- include/uapi/sound/sof/tokens.h | 9 + sound/pci/hda/hda_codec.c | 8 +- sound/soc/Kconfig | 1 - sound/soc/Makefile | 3 +- sound/soc/atmel/atmel-classd.c | 7 +- sound/soc/atmel/atmel-pdmic.c | 7 +- sound/soc/atmel/mchp-i2s-mcc.c | 70 +- sound/soc/au1x/psc-ac97.c | 5 +- sound/soc/au1x/psc-i2s.c | 5 +- sound/soc/bcm/bcm2835-i2s.c | 4 +- sound/soc/bcm/cygnus-pcm.c | 6 +- sound/soc/bcm/cygnus-ssp.c | 7 +- sound/soc/cirrus/ep93xx-i2s.c | 4 +- sound/soc/codecs/88pm860x-codec.c | 15 - sound/soc/codecs/Kconfig | 21 + sound/soc/codecs/Makefile | 6 + sound/soc/codecs/ad193x.c | 19 +- sound/soc/codecs/cs4271.c | 6 +- sound/soc/codecs/cs42l56.c | 8 - sound/soc/codecs/cs42l73.c | 6 - sound/soc/codecs/cs47l15.c | 1490 ++++++++++++++ sound/soc/codecs/cs47l35.c | 2 +- sound/soc/codecs/cs47l90.c | 9 +- sound/soc/codecs/cs47l92.c | 2039 ++++++++++++++++++++ sound/soc/codecs/es8328.c | 1 - sound/soc/codecs/inno_rk3036.c | 4 +- sound/soc/codecs/jz4725b.c | 4 +- sound/soc/codecs/jz4740.c | 4 +- sound/soc/codecs/madera.c | 531 ++++- sound/soc/codecs/madera.h | 10 + sound/soc/codecs/max98371.c | 4 - sound/soc/codecs/max98373.c | 34 +- sound/soc/codecs/max98373.h | 1 + sound/soc/codecs/max9850.c | 13 - sound/soc/codecs/max98926.c | 9 - sound/soc/codecs/ml26124.c | 1 - sound/soc/codecs/msm8916-wcd-analog.c | 12 +- sound/soc/codecs/msm8916-wcd-digital.c | 4 +- sound/soc/codecs/mt6351.c | 5 - sound/soc/codecs/mt6358.c | 10 +- sound/soc/codecs/pcm3168a.c | 133 +- sound/soc/codecs/rk3328_codec.c | 4 +- sound/soc/codecs/rt1011.c | 26 +- sound/soc/codecs/rt1011.h | 3 +- sound/soc/codecs/rt1308.c | 48 +- sound/soc/codecs/rt1308.h | 6 +- sound/soc/codecs/rt5665.c | 8 +- sound/soc/codecs/sgtl5000.c | 248 ++- sound/soc/codecs/sgtl5000.h | 2 +- sound/soc/codecs/tlv320aic23.c | 2 - sound/soc/codecs/tlv320aic31xx.c | 8 +- sound/soc/codecs/tscs454.c | 1 - sound/soc/codecs/twl6040.c | 4 +- sound/soc/codecs/uda1334.c | 295 +++ sound/soc/codecs/wcd-clsh-v2.c | 2 +- sound/soc/codecs/wcd9335.c | 3 +- sound/soc/codecs/wm8955.c | 4 +- sound/soc/codecs/wm_adsp.c | 6 +- sound/soc/codecs/wm_adsp.h | 4 +- sound/soc/fsl/fsl_asrc.c | 4 +- sound/soc/fsl/fsl_audmix.c | 4 +- sound/soc/fsl/fsl_esai.c | 267 ++- sound/soc/fsl/fsl_sai.c | 358 ++-- sound/soc/fsl/fsl_sai.h | 85 +- sound/soc/fsl/fsl_spdif.c | 4 +- sound/soc/fsl/fsl_ssi.c | 4 +- sound/soc/fsl/imx-audmux.c | 4 +- sound/soc/fsl/imx-ssi.c | 4 +- sound/soc/generic/simple-card.c | 2 +- sound/soc/intel/baytrail/sst-baytrail-ipc.c | 65 +- sound/soc/intel/boards/Kconfig | 28 +- sound/soc/intel/boards/bxt_da7219_max98357a.c | 31 +- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 3 +- sound/soc/intel/boards/skl_hda_dsp_common.c | 5 + sound/soc/intel/boards/skl_hda_dsp_generic.c | 4 + sound/soc/intel/boards/sof_rt5682.c | 3 +- sound/soc/intel/common/Makefile | 1 + sound/soc/intel/common/soc-acpi-intel-cnl-match.c | 12 + sound/soc/intel/common/soc-acpi-intel-ehl-match.c | 18 + sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 24 + sound/soc/intel/common/soc-intel-quirks.h | 5 + sound/soc/intel/common/sst-ipc.c | 69 +- sound/soc/intel/common/sst-ipc.h | 28 +- sound/soc/intel/haswell/sst-haswell-ipc.c | 164 +- sound/soc/intel/skylake/Makefile | 12 +- sound/soc/intel/skylake/bxt-sst.c | 50 +- sound/soc/intel/skylake/cnl-sst-dsp.h | 7 +- sound/soc/intel/skylake/cnl-sst.c | 43 +- sound/soc/intel/skylake/skl-debug.c | 42 +- sound/soc/intel/skylake/skl-messages.c | 246 ++- sound/soc/intel/skylake/skl-nhlt.c | 16 +- sound/soc/intel/skylake/skl-pcm.c | 74 +- sound/soc/intel/skylake/skl-ssp-clk.c | 4 +- sound/soc/intel/skylake/skl-sst-dsp.c | 10 +- sound/soc/intel/skylake/skl-sst-dsp.h | 29 +- sound/soc/intel/skylake/skl-sst-ipc.c | 160 +- sound/soc/intel/skylake/skl-sst-ipc.h | 55 +- sound/soc/intel/skylake/skl-sst-utils.c | 37 +- sound/soc/intel/skylake/skl-sst.c | 54 +- sound/soc/intel/skylake/skl-topology.c | 473 ++--- sound/soc/intel/skylake/skl-topology.h | 43 +- sound/soc/intel/skylake/skl.c | 54 +- sound/soc/intel/skylake/skl.h | 100 +- sound/soc/kirkwood/kirkwood-i2s.c | 8 +- sound/soc/mediatek/common/mtk-btcvsd.c | 4 +- sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 17 +- sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 5 +- sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 8 +- sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 15 +- .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 23 +- sound/soc/meson/axg-card.c | 11 +- sound/soc/meson/axg-fifo.c | 4 +- sound/soc/meson/axg-pdm.c | 4 +- sound/soc/meson/axg-spdifin.c | 4 +- sound/soc/meson/axg-spdifout.c | 4 +- sound/soc/meson/axg-tdm-formatter.c | 4 +- sound/soc/meson/g12a-tohdmitx.c | 38 +- sound/soc/mxs/mxs-saif.c | 13 +- sound/soc/nuc900/Kconfig | 29 - sound/soc/nuc900/Makefile | 12 - sound/soc/nuc900/nuc900-ac97.c | 391 ---- sound/soc/nuc900/nuc900-audio.c | 73 - sound/soc/nuc900/nuc900-audio.h | 108 -- sound/soc/nuc900/nuc900-pcm.c | 321 --- sound/soc/pxa/mmp-sspa.c | 4 +- sound/soc/qcom/lpass-platform.c | 5 +- sound/soc/rockchip/rockchip_max98090.c | 7 +- sound/soc/samsung/neo1973_wm8753.c | 3 +- sound/soc/samsung/speyside.c | 3 +- sound/soc/samsung/tm2_wm5110.c | 10 +- sound/soc/sh/rcar/core.c | 16 +- sound/soc/sh/rcar/rsnd.h | 12 +- sound/soc/sirf/sirf-usp.c | 4 +- sound/soc/soc-component.c | 561 ++++++ sound/soc/soc-compress.c | 57 +- sound/soc/soc-core.c | 718 ++----- sound/soc/soc-dai.c | 407 ++++ sound/soc/soc-dapm.c | 340 ++-- sound/soc/soc-jack.c | 18 - sound/soc/soc-pcm.c | 546 ++---- sound/soc/soc-utils.c | 199 -- sound/soc/sof/Makefile | 4 +- sound/soc/sof/core.c | 4 +- sound/soc/sof/debug.c | 50 +- sound/soc/sof/intel/Kconfig | 33 + sound/soc/sof/intel/apl.c | 4 +- sound/soc/sof/intel/bdw.c | 166 +- sound/soc/sof/intel/byt.c | 174 +- sound/soc/sof/intel/cnl.c | 36 +- sound/soc/sof/intel/hda-codec.c | 50 +- sound/soc/sof/intel/hda-ctrl.c | 21 +- sound/soc/sof/intel/hda-dai.c | 38 +- sound/soc/sof/intel/hda-dsp.c | 100 +- sound/soc/sof/intel/hda-ipc.c | 150 +- sound/soc/sof/intel/hda.c | 103 +- sound/soc/sof/intel/hda.h | 15 +- sound/soc/sof/ipc.c | 8 +- sound/soc/sof/loader.c | 182 +- sound/soc/sof/ops.h | 46 +- sound/soc/sof/pcm.c | 66 +- sound/soc/sof/pm.c | 6 +- sound/soc/sof/sof-pci-dev.c | 47 + sound/soc/sof/sof-priv.h | 19 +- sound/soc/sof/topology.c | 276 ++- sound/soc/sof/trace.c | 9 +- sound/soc/spear/spdif_in.c | 5 +- sound/soc/sprd/sprd-mcdt.c | 4 +- sound/soc/sti/sti_uniperif.c | 4 +- sound/soc/stm/stm32_i2s.c | 5 +- sound/soc/stm/stm32_sai.c | 8 +- sound/soc/stm/stm32_spdifrx.c | 4 +- sound/soc/sunxi/sun4i-codec.c | 14 +- sound/soc/sunxi/sun4i-i2s.c | 608 +++--- sound/soc/sunxi/sun50i-codec-analog.c | 4 +- sound/soc/sunxi/sun8i-codec-analog.c | 4 +- sound/soc/sunxi/sun8i-codec.c | 4 +- sound/soc/tegra/tegra20_das.c | 4 +- sound/soc/tegra/tegra30_i2s.c | 4 +- sound/soc/ti/Kconfig | 4 +- sound/soc/ti/davinci-mcasp.c | 185 +- sound/soc/ti/n810.c | 1 + sound/soc/ti/rx51.c | 15 +- sound/soc/uniphier/aio-dma.c | 8 +- sound/soc/uniphier/evea.c | 4 +- sound/soc/xilinx/xlnx_formatter_pcm.c | 2 - sound/soc/xilinx/xlnx_i2s.c | 4 +- sound/soc/xilinx/xlnx_spdif.c | 3 +- sound/soc/xtensa/xtfpga-i2s.c | 5 +- sound/soc/zte/zx-tdm.c | 1 - 201 files changed, 9678 insertions(+), 5581 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/uda1334.txt create mode 100644 include/sound/soc-component.h create mode 100644 sound/soc/codecs/cs47l15.c create mode 100644 sound/soc/codecs/cs47l92.c create mode 100644 sound/soc/codecs/uda1334.c create mode 100644 sound/soc/intel/common/soc-acpi-intel-ehl-match.c create mode 100644 sound/soc/intel/common/soc-acpi-intel-tgl-match.c delete mode 100644 sound/soc/nuc900/Kconfig delete mode 100644 sound/soc/nuc900/Makefile delete mode 100644 sound/soc/nuc900/nuc900-ac97.c delete mode 100644 sound/soc/nuc900/nuc900-audio.c delete mode 100644 sound/soc/nuc900/nuc900-audio.h delete mode 100644 sound/soc/nuc900/nuc900-pcm.c create mode 100644 sound/soc/soc-component.c create mode 100644 sound/soc/soc-dai.c Merging modules/modules-next (3b5be16c7e90 modules: page-align module section allocations only for arches supporting strict module rwx) $ git merge modules/modules-next Merge made by the 'recursive' strategy. kernel/module.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Merging input/next (e95656ea15e5 Input: add support for polling to input devices) $ git merge input/next Removing include/linux/platform_data/keypad-w90p910.h Removing drivers/input/touchscreen/w90p910_ts.c Removing drivers/input/keyboard/w90p910_keypad.c Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. .../bindings/input/touchscreen/ads7846.txt | 29 +- MAINTAINERS | 6 + drivers/base/dd.c | 14 + drivers/input/Makefile | 2 +- drivers/input/evdev.c | 35 +-- drivers/input/input-poller.c | 213 +++++++++++++ drivers/input/input-poller.h | 18 ++ drivers/input/input.c | 76 ++++- drivers/input/joystick/Kconfig | 10 + drivers/input/joystick/Makefile | 5 +- drivers/input/joystick/fsia6b.c | 231 ++++++++++++++ drivers/input/keyboard/Kconfig | 11 - drivers/input/keyboard/Makefile | 1 - drivers/input/keyboard/applespi.c | 30 +- drivers/input/keyboard/bcm-keypad.c | 4 +- drivers/input/keyboard/cros_ec_keyb.c | 6 +- drivers/input/keyboard/davinci_keyscan.c | 1 - drivers/input/keyboard/gpio_keys.c | 13 +- drivers/input/keyboard/imx_keypad.c | 4 +- drivers/input/keyboard/lpc32xx-keys.c | 4 +- drivers/input/keyboard/mpr121_touchkey.c | 3 +- drivers/input/keyboard/nomadik-ske-keypad.c | 4 +- drivers/input/keyboard/nspire-keypad.c | 4 +- drivers/input/keyboard/opencores-kbd.c | 4 +- drivers/input/keyboard/pmic8xxx-keypad.c | 8 +- drivers/input/keyboard/pxa27x_keypad.c | 4 +- drivers/input/keyboard/pxa930_rotary.c | 4 +- drivers/input/keyboard/sh_keysc.c | 4 +- drivers/input/keyboard/snvs_pwrkey.c | 4 +- drivers/input/keyboard/spear-keyboard.c | 4 +- drivers/input/keyboard/st-keyscan.c | 4 +- drivers/input/keyboard/tegra-kbc.c | 4 +- drivers/input/keyboard/w90p910_keypad.c | 264 ---------------- drivers/input/matrix-keymap.c | 2 +- drivers/input/misc/88pm80x_onkey.c | 1 - drivers/input/misc/88pm860x_onkey.c | 4 +- drivers/input/misc/Kconfig | 6 +- drivers/input/misc/ab8500-ponkey.c | 8 +- drivers/input/misc/axp20x-pek.c | 25 +- drivers/input/misc/da9055_onkey.c | 5 +- drivers/input/misc/da9063_onkey.c | 7 +- drivers/input/misc/e3x0-button.c | 10 +- drivers/input/misc/hisi_powerkey.c | 8 +- drivers/input/misc/max8925_onkey.c | 8 +- drivers/input/misc/pm8941-pwrkey.c | 4 +- drivers/input/misc/rk805-pwrkey.c | 8 +- drivers/input/misc/soc_button_array.c | 105 ++++++- drivers/input/misc/stpmic1_onkey.c | 10 +- drivers/input/misc/tps65218-pwrbutton.c | 4 +- drivers/input/misc/twl6040-vibra.c | 4 +- drivers/input/mouse/cyapa.c | 16 +- drivers/input/mouse/elan_i2c_core.c | 20 +- drivers/input/mouse/pxa930_trkball.c | 4 +- drivers/input/mouse/synaptics.c | 2 +- drivers/input/rmi4/rmi_2d_sensor.c | 1 - drivers/input/serio/arc_ps2.c | 4 +- drivers/input/serio/ps2-gpio.c | 2 - drivers/input/touchscreen/88pm860x-ts.c | 4 +- drivers/input/touchscreen/Kconfig | 9 - drivers/input/touchscreen/Makefile | 1 - drivers/input/touchscreen/ads7846.c | 38 ++- drivers/input/touchscreen/atmel_mxt_ts.c | 3 +- drivers/input/touchscreen/bcm_iproc_tsc.c | 4 +- drivers/input/touchscreen/edt-ft5x06.c | 2 - drivers/input/touchscreen/fsl-imx25-tcq.c | 8 +- drivers/input/touchscreen/hideep.c | 3 +- drivers/input/touchscreen/imx6ul_tsc.c | 8 +- drivers/input/touchscreen/lpc32xx_ts.c | 4 +- drivers/input/touchscreen/mxs-lradc-ts.c | 10 +- drivers/input/touchscreen/sun4i-ts.c | 3 +- drivers/input/touchscreen/ts4800-ts.c | 4 +- drivers/input/touchscreen/w90p910_ts.c | 331 --------------------- drivers/input/touchscreen/wacom_w8001.c | 4 +- drivers/platform/x86/surfacepro3_button.c | 47 +++ include/linux/device.h | 3 + include/linux/input.h | 26 ++ include/linux/platform_data/keypad-w90p910.h | 16 - include/uapi/linux/serio.h | 1 + 78 files changed, 873 insertions(+), 952 deletions(-) create mode 100644 drivers/input/input-poller.c create mode 100644 drivers/input/input-poller.h create mode 100644 drivers/input/joystick/fsia6b.c delete mode 100644 drivers/input/keyboard/w90p910_keypad.c delete mode 100644 drivers/input/touchscreen/w90p910_ts.c delete mode 100644 include/linux/platform_data/keypad-w90p910.h Merging block/for-next (e845c43bb22a Merge branch 'for-5.4/block' into for-next) $ git merge block/for-next Auto-merging include/linux/blk_types.h Auto-merging fs/io_uring.c Auto-merging drivers/nvme/target/loop.c Auto-merging drivers/nvme/host/rdma.c Auto-merging drivers/nvme/host/pci.c Auto-merging drivers/nvme/host/core.c Auto-merging block/blk-mq.c Merge made by the 'recursive' strategy. block/bio.c | 8 ++- block/blk-core.c | 32 ++++++++- block/blk-merge.c | 151 ++++++++++++++++++++++++++------------- block/blk-mq-cpumap.c | 29 ++++++-- block/blk-mq-tag.c | 32 +++++++++ block/blk-mq.c | 22 +++--- block/blk-zoned.c | 39 ++++++++++ block/opal_proto.h | 5 +- block/sed-opal.c | 49 ++++++++++--- drivers/block/floppy.c | 4 +- drivers/block/loop.c | 1 + drivers/block/nbd.c | 127 ++++++++++++++++++++------------ drivers/block/null_blk_main.c | 3 + drivers/block/null_blk_zoned.c | 28 ++++++-- drivers/lightnvm/core.c | 43 ++++++++--- drivers/lightnvm/pblk-core.c | 116 ++++-------------------------- drivers/lightnvm/pblk-gc.c | 19 +++-- drivers/lightnvm/pblk-init.c | 38 +++------- drivers/lightnvm/pblk-read.c | 26 +------ drivers/lightnvm/pblk-recovery.c | 42 ++--------- drivers/lightnvm/pblk-write.c | 20 +----- drivers/lightnvm/pblk.h | 31 +------- drivers/md/dm-rq.c | 1 + drivers/md/md.c | 49 ++++++++++--- drivers/md/md.h | 1 + drivers/md/raid1.c | 76 ++++++++++---------- drivers/md/raid10.c | 32 +++++---- drivers/md/raid5.c | 4 +- drivers/nvme/host/core.c | 6 +- drivers/nvme/host/fc.c | 2 + drivers/nvme/host/lightnvm.c | 45 ++++-------- drivers/nvme/host/pci.c | 2 + drivers/nvme/host/rdma.c | 8 ++- drivers/nvme/host/tcp.c | 8 ++- drivers/nvme/target/loop.c | 2 + drivers/scsi/scsi_lib.c | 13 ++++ drivers/scsi/sd.c | 5 +- drivers/scsi/sd.h | 5 +- drivers/scsi/sd_zbc.c | 10 ++- fs/fs-writeback.c | 39 ++++++---- fs/io_uring.c | 8 +-- include/linux/blk-cgroup.h | 2 +- include/linux/blk-mq.h | 16 ++++- include/linux/blk_types.h | 3 + include/linux/blkdev.h | 39 +++++----- include/linux/lightnvm.h | 8 +-- lib/sg_split.c | 12 ++-- 47 files changed, 714 insertions(+), 547 deletions(-) Merging device-mapper/for-next (f4d02e229c8e dm verity: add root hash pkcs#7 signature verification) $ git merge device-mapper/for-next Merge made by the 'recursive' strategy. Documentation/admin-guide/device-mapper/verity.rst | 7 ++ drivers/md/Kconfig | 12 ++ drivers/md/Makefile | 4 + drivers/md/dm-bufio.c | 4 +- drivers/md/dm-crypt.c | 70 ++++------- drivers/md/dm-dust.c | 11 +- drivers/md/dm-integrity.c | 15 +++ drivers/md/dm-kcopyd.c | 5 +- drivers/md/dm-verity-target.c | 43 ++++++- drivers/md/dm-verity-verify-sig.c | 133 +++++++++++++++++++++ drivers/md/dm-verity-verify-sig.h | 60 ++++++++++ drivers/md/dm-verity.h | 2 + drivers/md/dm-zoned-metadata.c | 68 ++++++++--- drivers/md/dm-zoned-reclaim.c | 47 ++++++-- drivers/md/dm-zoned-target.c | 68 +++++++++-- drivers/md/dm-zoned.h | 11 ++ 16 files changed, 465 insertions(+), 95 deletions(-) create mode 100644 drivers/md/dm-verity-verify-sig.c create mode 100644 drivers/md/dm-verity-verify-sig.h 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 (583d4f1858d9 Merge branch 'fixes' into next) $ git merge mmc/next Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. .../bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 14 +++-- .../devicetree/bindings/mmc/brcm,sdhci-iproc.txt | 4 +- MAINTAINERS | 1 + drivers/memstick/host/r592.c | 6 +- drivers/mmc/host/atmel-mci.c | 4 ++ drivers/mmc/host/bcm2835.c | 1 - drivers/mmc/host/jz4740_mmc.c | 1 - drivers/mmc/host/meson-gx-mmc.c | 1 - drivers/mmc/host/mmci.c | 69 ++++++++++++---------- drivers/mmc/host/mxcmmc.c | 4 +- drivers/mmc/host/mxs-mmc.c | 4 +- drivers/mmc/host/s3cmci.c | 1 - drivers/mmc/host/sdhci-iproc.c | 9 +++ drivers/mmc/host/sdhci-msm.c | 2 - drivers/mmc/host/sdhci-pci-core.c | 13 ++-- drivers/mmc/host/sdhci-pci.h | 1 + drivers/mmc/host/sdhci-pltfm.c | 5 +- drivers/mmc/host/sdhci-s3c.c | 5 +- drivers/mmc/host/sdhci_f_sdh30.c | 4 +- drivers/mmc/host/uniphier-sd.c | 4 +- 20 files changed, 79 insertions(+), 74 deletions(-) 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 --no-edit -v -a [master 166238059e4f] 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 (5cd690a308e8 mfd: asic3: Include the right header) $ git merge mfd/for-mfd-next Removing include/linux/mfd/da9063/pdata.h Auto-merging include/Kbuild Removing drivers/mfd/jz4740-adc.c Auto-merging drivers/mfd/db8500-prcmu.c Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/mfd/rn5t618.txt | 5 + MAINTAINERS | 2 +- drivers/mfd/88pm800.c | 12 +- drivers/mfd/88pm860x-core.c | 6 +- drivers/mfd/Kconfig | 9 - drivers/mfd/Makefile | 4 +- drivers/mfd/aat2870-core.c | 13 +- drivers/mfd/ab3100-core.c | 53 +--- drivers/mfd/ab3100-otp.c | 21 +- drivers/mfd/ab8500-debugfs.c | 332 +++++++--------------- drivers/mfd/asic3.c | 2 +- drivers/mfd/bcm590xx.c | 6 +- drivers/mfd/da9150-core.c | 6 +- drivers/mfd/davinci_voicecodec.c | 9 +- drivers/mfd/db8500-prcmu.c | 4 +- drivers/mfd/fsl-imx25-tsadc.c | 4 +- drivers/mfd/intel-lpss-pci.c | 25 ++ drivers/mfd/intel_soc_pmic_bxtwc.c | 4 +- drivers/mfd/jz4740-adc.c | 324 --------------------- drivers/mfd/max14577.c | 6 +- drivers/mfd/max77620.c | 4 +- drivers/mfd/max77693.c | 12 +- drivers/mfd/max77843.c | 6 +- drivers/mfd/max8907.c | 6 +- drivers/mfd/max8925-i2c.c | 12 +- drivers/mfd/max8997.c | 18 +- drivers/mfd/max8998.c | 6 +- drivers/mfd/mt6397-core.c | 156 +--------- drivers/mfd/mt6397-irq.c | 181 ++++++++++++ drivers/mfd/palmas.c | 6 +- drivers/mfd/qcom_rpm.c | 12 +- drivers/mfd/sm501.c | 4 +- drivers/mfd/timberdale.c | 3 +- drivers/mfd/tps80031.c | 23 +- drivers/mfd/twl-core.c | 6 +- include/Kbuild | 1 - include/linux/mfd/aat2870.h | 1 - include/linux/mfd/cros_ec_commands.h | 12 + include/linux/mfd/da9063/pdata.h | 60 ---- include/linux/mfd/mt6397/core.h | 9 + 40 files changed, 437 insertions(+), 948 deletions(-) delete mode 100644 drivers/mfd/jz4740-adc.c create mode 100644 drivers/mfd/mt6397-irq.c delete mode 100644 include/linux/mfd/da9063/pdata.h Merging backlight/for-backlight-next (73fbfc499448 backlight: pwm_bl: Fix heuristic to determine number of brightness levels) $ git merge backlight/for-backlight-next Already up to date. Merging battery/for-next (5f9e832c1370 Linus 5.3-rc1) $ git merge battery/for-next Already up to date. Merging regulator/for-next (019dcb803859 Merge branch 'regulator-5.4' into regulator-next) $ git merge regulator/for-next Merge made by the 'recursive' strategy. .../bindings/regulator/act8865-regulator.txt | 27 +- .../bindings/regulator/qcom,rpmh-regulator.txt | 15 +- .../bindings/regulator/twl-regulator.txt | 7 + drivers/regulator/Kconfig | 1 + drivers/regulator/act8865-regulator.c | 316 ++++++++++++++++++++- drivers/regulator/core.c | 8 +- drivers/regulator/da9062-regulator.c | 4 +- drivers/regulator/da9063-regulator.c | 4 +- drivers/regulator/lm363x-regulator.c | 10 +- drivers/regulator/max8660.c | 1 - drivers/regulator/qcom-rpmh-regulator.c | 193 ++++++++++++- drivers/regulator/rk808-regulator.c | 2 +- drivers/regulator/stm32-booster.c | 4 - drivers/regulator/twl6030-regulator.c | 21 +- .../regulator/active-semi,8865-regulator.h | 28 ++ 15 files changed, 595 insertions(+), 46 deletions(-) create mode 100644 include/dt-bindings/regulator/active-semi,8865-regulator.h Merging security/next-testing (b602614a8107 lockdown: Print current->comm in restriction messages) $ git merge security/next-testing Auto-merging security/security.c Auto-merging security/integrity/ima/ima_policy.c Auto-merging security/integrity/ima/ima_main.c Auto-merging security/integrity/ima/ima.h Auto-merging security/integrity/ima/Kconfig CONFLICT (content): Merge conflict in security/integrity/ima/Kconfig Auto-merging security/Kconfig Auto-merging kernel/trace/trace_kprobe.c CONFLICT (content): Merge conflict in kernel/trace/trace_kprobe.c Auto-merging kernel/trace/bpf_trace.c Auto-merging kernel/module.c Auto-merging kernel/kexec_file.c Auto-merging kernel/events/core.c Auto-merging init/main.c Auto-merging init/Kconfig Auto-merging include/linux/security.h Auto-merging include/linux/lsm_hooks.h Auto-merging include/linux/ima.h Auto-merging include/linux/acpi.h Auto-merging include/asm-generic/vmlinux.lds.h Auto-merging fs/tracefs/inode.c CONFLICT (content): Merge conflict in fs/tracefs/inode.c Auto-merging fs/debugfs/inode.c Auto-merging fs/debugfs/file.c Auto-merging drivers/tty/serial/serial_core.c Auto-merging drivers/pci/proc.c Auto-merging drivers/pci/pci-sysfs.c Auto-merging drivers/firmware/efi/efi.c Auto-merging drivers/acpi/tables.c Auto-merging drivers/acpi/osl.c Auto-merging arch/x86/kernel/x86_init.c Auto-merging arch/x86/kernel/kexec-bzimage64.c Auto-merging arch/x86/kernel/ima_arch.c Auto-merging arch/x86/include/asm/x86_init.h Auto-merging arch/x86/boot/compressed/acpi.c Auto-merging arch/x86/Kconfig CONFLICT (modify/delete): arch/s390/configs/performance_defconfig deleted in HEAD and modified in security/next-testing. Version security/next-testing of arch/s390/configs/performance_defconfig left in tree. Auto-merging arch/s390/configs/defconfig CONFLICT (content): Merge conflict in arch/s390/configs/defconfig Auto-merging arch/s390/configs/debug_defconfig CONFLICT (content): Merge conflict in arch/s390/configs/debug_defconfig Auto-merging arch/s390/Kconfig Auto-merging arch/arm64/Kconfig Auto-merging Documentation/admin-guide/kernel-parameters.txt Resolved 'arch/s390/configs/debug_defconfig' using previous resolution. Resolved 'arch/s390/configs/defconfig' using previous resolution. Resolved 'fs/tracefs/inode.c' using previous resolution. Resolved 'kernel/trace/trace_kprobe.c' using previous resolution. Resolved 'security/integrity/ima/Kconfig' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git rm -f arch/s390/configs/performance_defconfig arch/s390/configs/performance_defconfig: needs merge rm 'arch/s390/configs/performance_defconfig' $ git commit --no-edit -v -a [master 621af095507f] Merge remote-tracking branch 'security/next-testing' $ git diff -M --stat --summary HEAD^.. Documentation/admin-guide/kernel-parameters.txt | 9 ++ arch/arm64/Kconfig | 6 +- arch/s390/Kconfig | 2 +- arch/s390/kernel/kexec_elf.c | 4 +- arch/s390/kernel/kexec_image.c | 4 +- arch/s390/kernel/machine_kexec_file.c | 4 +- arch/x86/Kconfig | 20 ++- arch/x86/boot/compressed/acpi.c | 19 ++- arch/x86/include/asm/acpi.h | 9 ++ arch/x86/include/asm/x86_init.h | 2 + arch/x86/kernel/acpi/boot.c | 5 + arch/x86/kernel/ima_arch.c | 4 +- arch/x86/kernel/ioport.c | 7 +- arch/x86/kernel/kexec-bzimage64.c | 1 + arch/x86/kernel/msr.c | 8 + arch/x86/kernel/x86_init.c | 1 + arch/x86/mm/testmmiotrace.c | 5 + crypto/asymmetric_keys/verify_pefile.c | 4 +- drivers/acpi/custom_method.c | 6 + drivers/acpi/osl.c | 14 +- drivers/acpi/tables.c | 6 + drivers/char/mem.c | 7 +- drivers/firmware/efi/efi.c | 6 + drivers/pci/pci-sysfs.c | 16 ++ drivers/pci/proc.c | 14 +- drivers/pci/syscall.c | 4 +- drivers/pcmcia/cistpl.c | 5 + drivers/tty/serial/serial_core.c | 5 + fs/debugfs/file.c | 30 ++++ fs/debugfs/inode.c | 32 +++- fs/proc/kcore.c | 6 + fs/tracefs/inode.c | 42 +++++- include/asm-generic/vmlinux.lds.h | 8 +- include/linux/acpi.h | 6 + include/linux/ima.h | 9 ++ include/linux/kexec.h | 4 +- include/linux/lsm_hooks.h | 13 ++ include/linux/security.h | 59 ++++++++ init/Kconfig | 5 + init/main.c | 1 + kernel/events/core.c | 7 + kernel/kexec.c | 8 + kernel/kexec_file.c | 68 +++++++-- kernel/module.c | 37 ++++- kernel/params.c | 21 ++- kernel/power/hibernate.c | 3 +- kernel/trace/bpf_trace.c | 10 ++ kernel/trace/trace_kprobe.c | 5 + security/Kconfig | 11 +- security/Makefile | 2 + security/integrity/ima/Kconfig | 2 +- security/integrity/ima/ima.h | 2 + security/integrity/ima/ima_main.c | 4 +- security/integrity/ima/ima_policy.c | 50 +++++++ security/lockdown/Kconfig | 47 ++++++ security/lockdown/Makefile | 1 + security/lockdown/lockdown.c | 191 ++++++++++++++++++++++++ security/security.c | 56 ++++++- 58 files changed, 861 insertions(+), 76 deletions(-) create mode 100644 security/lockdown/Kconfig create mode 100644 security/lockdown/Makefile create mode 100644 security/lockdown/lockdown.c Merging apparmor/apparmor-next (136db994852a apparmor: increase left match history buffer size) $ git merge apparmor/apparmor-next Auto-merging security/apparmor/policy_unpack.c Auto-merging security/apparmor/policy.c Auto-merging security/apparmor/mount.c Auto-merging security/apparmor/match.c Auto-merging security/apparmor/lsm.c Auto-merging security/apparmor/include/policy_unpack.h Auto-merging security/apparmor/include/path.h Auto-merging security/apparmor/include/match.h Auto-merging security/apparmor/include/apparmor.h Auto-merging security/apparmor/file.c Auto-merging security/apparmor/domain.c Auto-merging security/apparmor/apparmorfs.c Auto-merging security/apparmor/Kconfig Merge made by the 'recursive' strategy. security/apparmor/Kconfig | 2 + security/apparmor/apparmorfs.c | 130 ++++++++++++++++++++++-- security/apparmor/domain.c | 46 ++++----- security/apparmor/file.c | 26 +++-- security/apparmor/include/apparmor.h | 1 + security/apparmor/include/match.h | 3 +- security/apparmor/include/path.h | 49 +-------- security/apparmor/include/policy_unpack.h | 8 +- security/apparmor/lsm.c | 160 ++++++++++++++++++++++++------ security/apparmor/match.c | 6 +- security/apparmor/mount.c | 67 ++++++++++--- security/apparmor/policy.c | 5 +- security/apparmor/policy_unpack.c | 116 +++++++++++++++++++++- 13 files changed, 477 insertions(+), 142 deletions(-) Merging integrity/next-integrity (70433f67ec3a MODSIGN: make new include file self contained) $ git merge integrity/next-integrity Auto-merging security/integrity/ima/ima_policy.c Auto-merging security/integrity/ima/ima_main.c Auto-merging security/integrity/ima/ima.h Auto-merging security/integrity/ima/Kconfig Auto-merging kernel/module.c Auto-merging kernel/Makefile Auto-merging init/Kconfig Auto-merging arch/s390/kernel/machine_kexec_file.c CONFLICT (content): Merge conflict in arch/s390/kernel/machine_kexec_file.c Auto-merging arch/s390/Kconfig Resolved 'arch/s390/kernel/machine_kexec_file.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit --no-edit -v -a [master 33ac6049aaf0] Merge remote-tracking branch 'integrity/next-integrity' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/ima_policy | 6 +- Documentation/security/IMA-templates.rst | 3 + arch/s390/Kconfig | 2 +- arch/s390/kernel/machine_kexec_file.c | 24 +--- certs/system_keyring.c | 61 +++++++--- crypto/asymmetric_keys/pkcs7_verify.c | 33 +++++ include/crypto/pkcs7.h | 4 + include/linux/module.h | 3 - include/linux/module_signature.h | 46 +++++++ include/linux/verification.h | 10 ++ init/Kconfig | 6 +- kernel/Makefile | 1 + kernel/module.c | 1 + kernel/module_signature.c | 46 +++++++ kernel/module_signing.c | 56 ++------- scripts/Makefile | 2 +- security/integrity/Kconfig | 2 +- security/integrity/digsig.c | 43 +++++-- security/integrity/ima/Kconfig | 13 ++ security/integrity/ima/Makefile | 1 + security/integrity/ima/ima.h | 60 ++++++++- security/integrity/ima/ima_api.c | 23 +++- security/integrity/ima/ima_appraise.c | 194 ++++++++++++++++++++---------- security/integrity/ima/ima_crypto.c | 10 +- security/integrity/ima/ima_main.c | 24 +++- security/integrity/ima/ima_modsig.c | 167 +++++++++++++++++++++++++ security/integrity/ima/ima_policy.c | 71 +++++++++-- security/integrity/ima/ima_template.c | 26 +++- security/integrity/ima/ima_template_lib.c | 64 +++++++++- security/integrity/ima/ima_template_lib.h | 4 + security/integrity/integrity.h | 20 +++ 31 files changed, 832 insertions(+), 194 deletions(-) create mode 100644 include/linux/module_signature.h create mode 100644 kernel/module_signature.c create mode 100644 security/integrity/ima/ima_modsig.c Merging keys/keys-next (8cf8684e0d24 Merge branch 'keys-acl' into keys-next) $ git merge keys/keys-next Auto-merging security/integrity/integrity.h Auto-merging security/integrity/digsig.c Auto-merging net/wireless/reg.c Auto-merging net/ceph/ceph_common.c Auto-merging include/linux/key.h CONFLICT (content): Merge conflict in include/linux/key.h Auto-merging fs/ecryptfs/keystore.c CONFLICT (modify/delete): fs/crypto/keyinfo.c deleted in HEAD and modified in keys/keys-next. Version keys/keys-next of fs/crypto/keyinfo.c left in tree. Auto-merging fs/cifs/connect.c Auto-merging fs/cifs/cifsacl.c Auto-merging fs/afs/security.c CONFLICT (content): Merge conflict in fs/afs/security.c Auto-merging drivers/md/dm-crypt.c Auto-merging certs/system_keyring.c Resolved 'fs/afs/security.c' using previous resolution. Resolved 'include/linux/key.h' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git rm -f fs/crypto/keyinfo.c fs/crypto/keyinfo.c: needs merge rm 'fs/crypto/keyinfo.c' $ git commit --no-edit -v -a [master bc987f897f55] Merge remote-tracking branch 'keys/keys-next' $ git diff -M --stat --summary HEAD^.. Documentation/security/keys/core.rst | 128 ++++++-- Documentation/security/keys/request-key.rst | 9 +- certs/blacklist.c | 7 +- certs/system_keyring.c | 12 +- drivers/md/dm-crypt.c | 2 +- drivers/nvdimm/security.c | 2 +- fs/afs/security.c | 2 +- fs/cifs/cifs_spnego.c | 25 +- fs/cifs/cifsacl.c | 28 +- fs/cifs/connect.c | 4 +- fs/ecryptfs/ecryptfs_kernel.h | 2 +- fs/ecryptfs/keystore.c | 2 +- fs/fscache/object-list.c | 2 +- fs/nfs/nfs4idmap.c | 30 +- fs/ubifs/auth.c | 2 +- include/linux/key.h | 121 +++---- include/uapi/linux/keyctl.h | 65 ++++ lib/digsig.c | 2 +- net/ceph/ceph_common.c | 2 +- net/dns_resolver/dns_key.c | 12 +- net/dns_resolver/dns_query.c | 15 +- net/rxrpc/key.c | 19 +- net/wireless/reg.c | 6 +- security/integrity/digsig.c | 31 +- security/integrity/digsig_asymmetric.c | 2 +- security/integrity/evm/evm_crypto.c | 2 +- security/integrity/ima/ima_mok.c | 13 +- security/integrity/integrity.h | 6 +- .../integrity/platform_certs/platform_keyring.c | 14 +- security/keys/compat.c | 2 + security/keys/encrypted-keys/encrypted.c | 2 +- security/keys/encrypted-keys/masterkey_trusted.c | 2 +- security/keys/gc.c | 2 +- security/keys/internal.h | 16 +- security/keys/key.c | 29 +- security/keys/keyctl.c | 104 ++++-- security/keys/keyring.c | 27 +- security/keys/permission.c | 361 +++++++++++++++++++-- security/keys/persistent.c | 27 +- security/keys/proc.c | 22 +- security/keys/process_keys.c | 86 +++-- security/keys/request_key.c | 34 +- security/keys/request_key_auth.c | 15 +- security/selinux/hooks.c | 16 +- security/smack/smack_lsm.c | 3 +- 45 files changed, 991 insertions(+), 324 deletions(-) $ git am -3 ../patches/0001-fsverity-merge-fix-for-keyring_alloc-API-change.patch Applying: fsverity: merge fix for keyring_alloc API change $ git reset HEAD^ Unstaged changes after reset: M fs/verity/signature.c $ git add -A . $ git commit -v -a --amend [master 54d7170ac6b4] Merge remote-tracking branch 'keys/keys-next' Date: Thu Aug 22 14:20:40 2019 +1000 $ git am -3 ../patches/0001-fscrypt-merge-resolution-for-keys-Replace-uid-gid-pe.patch Applying: fscrypt: merge resolution for "keys: Replace uid/gid/perm permissions checking with an ACL" $ git reset HEAD^ Unstaged changes after reset: M fs/crypto/keyring.c M fs/crypto/keysetup_v1.c $ git add -A . $ git commit -v -a --amend [master 4b5c626ed8b8] Merge remote-tracking branch 'keys/keys-next' Date: Thu Aug 22 14:20:40 2019 +1000 $ git am -3 ../patches/0001-dm-verity-merge-fix-for-keys-Replace-uid-gid-perm-pe.patch Applying: dm verity: merge fix for "keys: Replace uid/gid/perm permissions checking with an ACL" $ git reset HEAD^ Unstaged changes after reset: M drivers/md/dm-verity-verify-sig.c $ git add -A . $ git commit -v -a --amend [master 97fab83c05f0] Merge remote-tracking branch 'keys/keys-next' Date: Thu Aug 22 14:20:40 2019 +1000 Merging selinux/next (ac5656d8a4cd fanotify, inotify, dnotify, security: add security hook for fs notifications) $ git merge selinux/next Auto-merging security/selinux/ss/services.c Auto-merging security/selinux/ss/policydb.h Auto-merging security/selinux/ss/policydb.c Auto-merging security/selinux/netport.c Auto-merging security/selinux/netnode.c Auto-merging security/selinux/netif.c Auto-merging security/selinux/hooks.c Auto-merging security/security.c Auto-merging include/linux/security.h Auto-merging include/linux/lsm_hooks.h Auto-merging fs/notify/inotify/inotify_user.c Auto-merging fs/notify/fanotify/fanotify_user.c Auto-merging fs/notify/dnotify/dnotify.c Merge made by the 'recursive' strategy. fs/notify/dnotify/dnotify.c | 15 +- fs/notify/fanotify/fanotify_user.c | 19 +- fs/notify/inotify/inotify_user.c | 14 +- include/linux/lsm_hooks.h | 9 +- include/linux/security.h | 10 +- security/security.c | 6 + security/selinux/hooks.c | 47 +++++ security/selinux/include/classmap.h | 5 +- security/selinux/netif.c | 31 ++- security/selinux/netnode.c | 30 ++- security/selinux/netport.c | 24 +-- security/selinux/ss/policydb.c | 402 ++++++++++++++++++------------------ security/selinux/ss/policydb.h | 2 +- security/selinux/ss/services.c | 6 +- 14 files changed, 357 insertions(+), 263 deletions(-) Merging tpmdd/next (d1abaeb3be7b Linux 5.3-rc5) $ git merge tpmdd/next Already up to date. Merging watchdog/master (194108705c9e watchdog: remove w90x900 driver) $ git merge watchdog/master Removing drivers/watchdog/nuc900_wdt.c Removing drivers/watchdog/ks8695_wdt.c Auto-merging drivers/watchdog/Kconfig Merge made by the 'recursive' strategy. Documentation/watchdog/watchdog-parameters.rst | 19 -- drivers/watchdog/Kconfig | 16 -- drivers/watchdog/Makefile | 2 - drivers/watchdog/ath79_wdt.c | 4 +- drivers/watchdog/jz4740_wdt.c | 1 - drivers/watchdog/ks8695_wdt.c | 319 ------------------------- drivers/watchdog/nuc900_wdt.c | 302 ----------------------- drivers/watchdog/sprd_wdt.c | 4 +- drivers/watchdog/ziirave_wdt.c | 74 ++++-- 9 files changed, 54 insertions(+), 687 deletions(-) delete mode 100644 drivers/watchdog/ks8695_wdt.c delete mode 100644 drivers/watchdog/nuc900_wdt.c Merging iommu/next (cebc919f05bf Merge branches 'arm/omap', 'arm/exynos', 'x86/amd' and 'core' into next) $ git merge iommu/next Auto-merging drivers/iommu/dma-iommu.c Auto-merging drivers/gpu/drm/panfrost/panfrost_mmu.c CONFLICT (content): Merge conflict in drivers/gpu/drm/panfrost/panfrost_mmu.c Resolved 'drivers/gpu/drm/panfrost/panfrost_mmu.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit --no-edit -v -a [master 8079e248cb36] Merge remote-tracking branch 'iommu/next' $ git diff -M --stat --summary HEAD^.. arch/arm/mach-omap2/Makefile | 2 + arch/arm/mach-omap2/omap-iommu.c | 43 ++++ drivers/gpu/drm/panfrost/panfrost_mmu.c | 24 ++- drivers/iommu/amd_iommu.c | 96 ++++++--- drivers/iommu/amd_iommu_types.h | 9 + drivers/iommu/arm-smmu-v3.c | 52 +++-- drivers/iommu/arm-smmu.c | 103 +++++++--- drivers/iommu/dma-iommu.c | 9 +- drivers/iommu/exynos-iommu.c | 9 +- drivers/iommu/intel-iommu.c | 3 +- drivers/iommu/io-pgtable-arm-v7s.c | 57 +++--- drivers/iommu/io-pgtable-arm.c | 48 ++--- drivers/iommu/iommu.c | 24 +-- drivers/iommu/ipmmu-vmsa.c | 28 +-- drivers/iommu/msm_iommu.c | 43 ++-- drivers/iommu/mtk_iommu.c | 45 ++++- drivers/iommu/mtk_iommu_v1.c | 3 +- drivers/iommu/omap-iommu.c | 324 ++++++++++++++++++++++++++++--- drivers/iommu/omap-iommu.h | 9 +- drivers/iommu/qcom_iommu.c | 48 +++-- drivers/iommu/rockchip-iommu.c | 2 +- drivers/iommu/s390-iommu.c | 3 +- drivers/iommu/tegra-gart.c | 12 +- drivers/iommu/tegra-smmu.c | 2 +- drivers/iommu/virtio-iommu.c | 5 +- drivers/vfio/vfio_iommu_type1.c | 27 ++- include/linux/amd-iommu.h | 12 ++ include/linux/io-pgtable.h | 57 ++++-- include/linux/iommu.h | 92 +++++++-- include/linux/omap-iommu.h | 15 ++ include/linux/platform_data/iommu-omap.h | 4 + 31 files changed, 933 insertions(+), 277 deletions(-) create mode 100644 arch/arm/mach-omap2/omap-iommu.c Merging vfio/next (1e4d09d2212d mdev: Send uevents around parent device registration) $ git merge vfio/next Already up to date. Merging audit/next (5f9e832c1370 Linus 5.3-rc1) $ git merge audit/next Already up to date. Merging devicetree/for-next (f981322804ca dt-bindings: rng: mtk-rng: Add documentation for MT8516) $ git merge devicetree/for-next Auto-merging Makefile Auto-merging Documentation/devicetree/writing-schema.rst CONFLICT (add/add): Merge conflict in Documentation/devicetree/writing-schema.rst Removing Documentation/devicetree/bindings/watchdog/meson-gxbb-wdt.txt Removing Documentation/devicetree/bindings/spi/spi-meson.txt Removing Documentation/devicetree/bindings/serial/amlogic,meson-uart.txt Removing Documentation/devicetree/bindings/rng/amlogic,meson-rng.txt Removing Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt Removing Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.txt Removing Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.txt Removing Documentation/devicetree/bindings/mailbox/meson-mhu.txt Removing Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt Removing Documentation/devicetree/bindings/crypto/sun4i-ss.txt Removing Documentation/devicetree/bindings/bus/sun50i-de2-bus.txt Removing Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.txt Resolved 'Documentation/devicetree/writing-schema.rst' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit --no-edit -v -a [master 48f5c49dcaf4] Merge remote-tracking branch 'devicetree/for-next' $ git diff -M --stat --summary HEAD^.. .../arm/amlogic/amlogic,meson-gx-ao-secure.txt | 28 ------- .../arm/amlogic/amlogic,meson-gx-ao-secure.yaml | 52 ++++++++++++ Documentation/devicetree/bindings/arm/arm-boards | 2 +- Documentation/devicetree/bindings/arm/cpus.yaml | 1 + .../devicetree/bindings/ata/ahci-platform.txt | 2 +- .../bindings/bus/allwinner,sun50i-a64-de2.yaml | 85 +++++++++++++++++++ .../devicetree/bindings/bus/sun50i-de2-bus.txt | 40 --------- .../crypto/allwinner,sun4i-a10-crypto.yaml | 79 ++++++++++++++++++ .../devicetree/bindings/crypto/sun4i-ss.txt | 23 ------ .../devicetree/bindings/gpu/arm,mali-utgard.txt | 5 ++ .../input/allwinner,sun4i-a10-lradc-keys.yaml | 95 ++++++++++++++++++++++ .../devicetree/bindings/input/sun4i-lradc-keys.txt | 65 --------------- .../bindings/mailbox/amlogic,meson-gxbb-mhu.yaml | 52 ++++++++++++ .../devicetree/bindings/mailbox/meson-mhu.txt | 34 -------- Documentation/devicetree/bindings/pci/pci-msi.txt | 2 +- .../bindings/phy/amlogic,meson-g12a-usb2-phy.yaml | 63 ++++++++++++++ .../phy/amlogic,meson-g12a-usb3-pcie-phy.yaml | 57 +++++++++++++ .../bindings/phy/meson-g12a-usb2-phy.txt | 22 ----- .../bindings/phy/meson-g12a-usb3-pcie-phy.txt | 22 ----- .../bindings/reset/amlogic,meson-reset.txt | 19 ----- .../bindings/reset/amlogic,meson-reset.yaml | 37 +++++++++ .../bindings/reset/hisilicon,hi6220-reset.txt | 1 + .../devicetree/bindings/rng/amlogic,meson-rng.txt | 21 ----- .../devicetree/bindings/rng/amlogic,meson-rng.yaml | 37 +++++++++ Documentation/devicetree/bindings/rng/mtk-rng.txt | 1 + .../bindings/serial/amlogic,meson-uart.txt | 38 --------- .../bindings/serial/amlogic,meson-uart.yaml | 73 +++++++++++++++++ .../bindings/spi/amlogic,meson-gx-spicc.yaml | 67 +++++++++++++++ .../bindings/spi/amlogic,meson6-spifc.yaml | 53 ++++++++++++ .../devicetree/bindings/spi/spi-meson.txt | 55 ------------- .../bindings/watchdog/amlogic,meson-gxbb-wdt.yaml | 37 +++++++++ .../bindings/watchdog/meson-gxbb-wdt.txt | 16 ---- Documentation/devicetree/writing-schema.rst | 1 + Makefile | 6 +- include/dt-bindings/reset/hisi,hi6220-resets.h | 7 ++ 35 files changed, 810 insertions(+), 388 deletions(-) delete mode 100644 Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.txt create mode 100644 Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml create mode 100644 Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml delete mode 100644 Documentation/devicetree/bindings/bus/sun50i-de2-bus.txt create mode 100644 Documentation/devicetree/bindings/crypto/allwinner,sun4i-a10-crypto.yaml delete mode 100644 Documentation/devicetree/bindings/crypto/sun4i-ss.txt create mode 100644 Documentation/devicetree/bindings/input/allwinner,sun4i-a10-lradc-keys.yaml delete mode 100644 Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt create mode 100644 Documentation/devicetree/bindings/mailbox/amlogic,meson-gxbb-mhu.yaml delete mode 100644 Documentation/devicetree/bindings/mailbox/meson-mhu.txt create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb2-phy.yaml create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml delete mode 100644 Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.txt delete mode 100644 Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.txt delete mode 100644 Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt create mode 100644 Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml delete mode 100644 Documentation/devicetree/bindings/rng/amlogic,meson-rng.txt create mode 100644 Documentation/devicetree/bindings/rng/amlogic,meson-rng.yaml delete mode 100644 Documentation/devicetree/bindings/serial/amlogic,meson-uart.txt create mode 100644 Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml create mode 100644 Documentation/devicetree/bindings/spi/amlogic,meson-gx-spicc.yaml create mode 100644 Documentation/devicetree/bindings/spi/amlogic,meson6-spifc.yaml delete mode 100644 Documentation/devicetree/bindings/spi/spi-meson.txt create mode 100644 Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml delete mode 100644 Documentation/devicetree/bindings/watchdog/meson-gxbb-wdt.txt Merging mailbox/mailbox-for-next (25777e5784a7 mailbox: handle failed named mailbox channel request) $ git merge mailbox/mailbox-for-next Already up to date. Merging spi/for-next (7af812fd3a89 Merge branch 'spi-5.4' into spi-next) $ git merge spi/for-next Merge made by the 'recursive' strategy. .../devicetree/bindings/spi/spi-sprd-adi.txt | 11 +- drivers/platform/chrome/cros_ec_spi.c | 2 +- drivers/spi/atmel-quadspi.c | 1 - drivers/spi/spi-armada-3700.c | 1 - drivers/spi/spi-atmel.c | 5 + drivers/spi/spi-bcm2835.c | 1 - drivers/spi/spi-bcm2835aux.c | 1 - drivers/spi/spi-bcm63xx-hsspi.c | 4 +- drivers/spi/spi-bcm63xx.c | 4 +- drivers/spi/spi-cadence.c | 1 - drivers/spi/spi-dw-mmio.c | 14 +- drivers/spi/spi-dw-pci.c | 6 +- drivers/spi/spi-efm32.c | 4 +- drivers/spi/spi-ep93xx.c | 4 +- drivers/spi/spi-fsl-dspi.c | 678 ++++++++++----------- drivers/spi/spi-fsl-qspi.c | 4 +- drivers/spi/spi-geni-qcom.c | 4 +- drivers/spi/spi-lantiq-ssc.c | 12 +- drivers/spi/spi-mt65xx.c | 1 - drivers/spi/spi-npcm-pspi.c | 1 - drivers/spi/spi-nuc900.c | 1 - drivers/spi/spi-nxp-fspi.c | 4 +- drivers/spi/spi-pic32-sqi.c | 1 - drivers/spi/spi-pic32.c | 12 +- drivers/spi/spi-qcom-qspi.c | 4 +- drivers/spi/spi-s3c24xx.c | 1 - drivers/spi/spi-sh-msiof.c | 5 +- drivers/spi/spi-sh.c | 4 +- drivers/spi/spi-sifive.c | 1 - drivers/spi/spi-slave-mt27xx.c | 1 - drivers/spi/spi-sprd-adi.c | 92 ++- drivers/spi/spi-sprd.c | 4 +- drivers/spi/spi-stm32-qspi.c | 5 +- drivers/spi/spi-sun4i.c | 1 - drivers/spi/spi-sun6i.c | 1 - drivers/spi/spi-synquacer.c | 2 - drivers/spi/spi-ti-qspi.c | 1 - drivers/spi/spi-uniphier.c | 1 - drivers/spi/spi-xlp.c | 4 +- drivers/spi/spi-zynq-qspi.c | 1 - drivers/spi/spi-zynqmp-gqspi.c | 1 - drivers/spi/spi.c | 19 +- 42 files changed, 447 insertions(+), 478 deletions(-) Merging tip/auto-latest (2230b8443ae0 Merge branch 'efi/core') $ git merge tip/auto-latest Removing tools/testing/selftests/x86/mpx-mm.h Removing tools/testing/selftests/x86/mpx-mini-test.c Removing tools/testing/selftests/x86/mpx-hw.h Removing tools/testing/selftests/x86/mpx-dig.c Removing tools/testing/selftests/x86/mpx-debug.h Auto-merging net/core/pktgen.c Auto-merging kernel/trace/Kconfig Auto-merging kernel/time/alarmtimer.c Auto-merging kernel/sys.c Auto-merging kernel/events/core.c Auto-merging init/main.c Auto-merging include/uapi/linux/prctl.h Auto-merging drivers/hv/hyperv_vmbus.h Auto-merging drivers/firmware/efi/efi.c Auto-merging block/blk-mq.c Auto-merging arch/x86/kvm/lapic.c Auto-merging arch/x86/kernel/kvm.c Removing arch/x86/kernel/apic/x2apic.h Removing arch/x86/include/uapi/asm/types.h Removing arch/x86/include/uapi/asm/termios.h Removing arch/x86/include/uapi/asm/termbits.h Removing arch/x86/include/uapi/asm/resource.h Removing arch/x86/include/uapi/asm/param.h Removing arch/x86/include/uapi/asm/ipcbuf.h Removing arch/x86/include/uapi/asm/ioctls.h Removing arch/x86/include/uapi/asm/ioctl.h Removing arch/x86/include/uapi/asm/fcntl.h Removing arch/x86/include/uapi/asm/errno.h Removing arch/x86/include/asm/ipi.h Removing arch/x86/include/asm/apic_flat_64.h Auto-merging arch/x86/Kconfig Auto-merging arch/ia64/kernel/setup.c Auto-merging arch/ia64/include/asm/sn/sn_sal.h CONFLICT (content): Merge conflict in arch/ia64/include/asm/sn/sn_sal.h Auto-merging arch/Kconfig Resolved 'arch/ia64/include/asm/sn/sn_sal.h' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit --no-edit -v -a [master 0f46fe26b535] Merge remote-tracking branch 'tip/auto-latest' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/sysfs-firmware-efi | 8 + Documentation/scheduler/sched-bwc.rst | 74 +- arch/Kconfig | 2 +- arch/ia64/include/asm/sal.h | 1 + arch/ia64/kernel/efi.c | 3 + arch/ia64/kernel/setup.c | 2 +- arch/x86/Kconfig | 2 +- arch/x86/boot/boot.h | 2 - arch/x86/boot/main.c | 1 + arch/x86/entry/common.c | 13 +- arch/x86/entry/entry_32.S | 6 +- arch/x86/entry/entry_64.S | 4 +- arch/x86/entry/syscall_64.c | 25 + arch/x86/entry/syscalls/syscall_32.tbl | 4 +- arch/x86/entry/syscalls/syscalltbl.sh | 35 +- arch/x86/entry/thunk_32.S | 2 +- arch/x86/entry/thunk_64.S | 4 +- arch/x86/events/core.c | 2 +- arch/x86/hyperv/hv_init.c | 14 + arch/x86/include/asm/apic.h | 11 +- arch/x86/include/asm/apic_flat_64.h | 8 - arch/x86/include/asm/barrier.h | 3 +- arch/x86/include/asm/bitops.h | 7 +- arch/x86/include/asm/bugs.h | 2 + arch/x86/include/asm/cpufeatures.h | 2 +- arch/x86/include/asm/efi.h | 5 + arch/x86/include/asm/hyperv-tlfs.h | 12 +- arch/x86/include/asm/intel-family.h | 15 + arch/x86/include/asm/ipi.h | 109 -- arch/x86/include/asm/mmu_context.h | 8 +- arch/x86/include/asm/mshyperv.h | 5 +- arch/x86/include/asm/msr.h | 3 +- arch/x86/include/asm/paravirt.h | 12 - arch/x86/include/asm/paravirt_types.h | 5 - arch/x86/include/asm/preempt.h | 2 +- arch/x86/include/asm/qspinlock.h | 15 + arch/x86/include/asm/realmode.h | 1 - arch/x86/include/asm/smp.h | 1 + arch/x86/include/asm/special_insns.h | 24 - arch/x86/include/asm/suspend_64.h | 2 +- arch/x86/include/asm/syscall.h | 4 + arch/x86/include/asm/tlbflush.h | 30 +- arch/x86/include/asm/unistd.h | 6 - arch/x86/include/asm/uv/uv.h | 4 +- arch/x86/include/uapi/asm/errno.h | 1 - arch/x86/include/uapi/asm/fcntl.h | 1 - arch/x86/include/uapi/asm/ioctl.h | 1 - arch/x86/include/uapi/asm/ioctls.h | 1 - arch/x86/include/uapi/asm/ipcbuf.h | 1 - arch/x86/include/uapi/asm/param.h | 1 - arch/x86/include/uapi/asm/resource.h | 1 - arch/x86/include/uapi/asm/termbits.h | 1 - arch/x86/include/uapi/asm/termios.h | 1 - arch/x86/include/uapi/asm/types.h | 7 - arch/x86/include/uapi/asm/unistd.h | 2 +- arch/x86/kernel/apic/apic.c | 188 ++- arch/x86/kernel/apic/apic_flat_64.c | 66 +- arch/x86/kernel/apic/apic_noop.c | 18 +- arch/x86/kernel/apic/apic_numachip.c | 8 +- arch/x86/kernel/apic/bigsmp_32.c | 9 +- arch/x86/kernel/apic/ipi.c | 174 ++- arch/x86/kernel/apic/local.h | 68 + arch/x86/kernel/apic/probe_32.c | 41 +- arch/x86/kernel/apic/probe_64.c | 21 +- arch/x86/kernel/apic/x2apic.h | 9 - arch/x86/kernel/apic/x2apic_cluster.c | 20 +- arch/x86/kernel/apic/x2apic_phys.c | 23 +- arch/x86/kernel/apic/x2apic_uv_x.c | 30 +- arch/x86/kernel/asm-offsets_64.c | 21 +- arch/x86/kernel/cpu/amd.c | 21 +- arch/x86/kernel/cpu/bugs.c | 2 +- arch/x86/kernel/cpu/common.c | 11 + arch/x86/kernel/cpu/cpuid-deps.c | 97 +- arch/x86/kernel/cpu/hygon.c | 21 +- arch/x86/kernel/cpu/intel.c | 6 +- arch/x86/kernel/cpu/mce/severity.c | 4 +- arch/x86/kernel/crash.c | 2 - arch/x86/kernel/dumpstack.c | 7 +- arch/x86/kernel/kgdb.c | 2 +- arch/x86/kernel/kprobes/core.c | 2 +- arch/x86/kernel/kvm.c | 2 +- arch/x86/kernel/nmi.c | 3 + arch/x86/kernel/paravirt.c | 4 - arch/x86/kernel/reboot.c | 7 +- arch/x86/kernel/smp.c | 88 +- arch/x86/kernel/smpboot.c | 12 +- arch/x86/kvm/lapic.c | 6 +- arch/x86/mm/ioremap.c | 1 + arch/x86/mm/tlb.c | 2 +- arch/x86/platform/efi/efi.c | 39 +- arch/x86/platform/uv/bios_uv.c | 10 +- arch/x86/power/cpu.c | 4 - arch/x86/realmode/rm/header.S | 1 - arch/x86/realmode/rm/trampoline_32.S | 3 - arch/x86/realmode/rm/trampoline_64.S | 3 - arch/x86/realmode/rm/trampoline_common.S | 4 - arch/x86/xen/enlighten_pv.c | 15 - block/blk-mq.c | 5 +- drivers/firmware/efi/Kconfig | 13 + drivers/firmware/efi/Makefile | 1 + drivers/firmware/efi/cper.c | 15 + drivers/firmware/efi/efi.c | 39 +- drivers/firmware/efi/rci2-table.c | 147 ++ drivers/hv/hyperv_vmbus.h | 8 +- drivers/ras/Makefile | 3 +- drivers/ras/cec.c | 1 + drivers/ras/debugfs.c | 2 + drivers/staging/android/vsoc.c | 8 +- fs/timerfd.c | 6 +- include/asm-generic/preempt.h | 4 +- include/linux/bitmap.h | 23 + include/linux/cgroup.h | 1 + include/linux/cpumask.h | 41 +- include/linux/cpuset.h | 13 +- include/linux/efi.h | 14 +- include/linux/hrtimer.h | 46 +- include/linux/lockdep.h | 11 +- include/linux/mutex.h | 25 +- include/linux/posix-timers.h | 5 +- include/linux/preempt.h | 6 +- include/linux/rcupdate.h | 2 +- include/linux/rcutree.h | 2 +- include/linux/rwsem.h | 10 + include/linux/sched.h | 11 +- include/linux/sched/deadline.h | 8 + include/linux/sched/task.h | 6 +- include/linux/sched/topology.h | 10 + include/linux/spinlock.h | 2 +- include/linux/spinlock_api_smp.h | 2 +- include/linux/stacktrace.h | 4 +- include/linux/timer.h | 2 +- include/linux/timerqueue.h | 13 +- include/linux/torture.h | 2 +- include/linux/wait.h | 4 +- include/uapi/linux/prctl.h | 2 +- init/init_task.c | 2 +- init/main.c | 2 +- kernel/cgroup/cgroup.c | 2 +- kernel/cgroup/cpuset.c | 163 +- kernel/cpu.c | 35 +- kernel/events/core.c | 17 +- kernel/futex.c | 12 +- kernel/irq/manage.c | 3 +- kernel/kprobes.c | 2 +- kernel/locking/lockdep.c | 159 +- kernel/locking/lockdep_internals.h | 9 +- kernel/locking/lockdep_proc.c | 8 +- kernel/locking/mutex.c | 26 + kernel/locking/rtmutex.c | 6 +- kernel/locking/rwsem.c | 54 +- kernel/rcu/Kconfig | 8 +- kernel/rcu/tree.c | 12 +- kernel/rcu/tree_stall.h | 6 +- kernel/sched/core.c | 247 +-- kernel/sched/cpufreq_schedutil.c | 6 +- kernel/sched/deadline.c | 142 +- kernel/sched/fair.c | 299 ++-- kernel/sched/idle.c | 31 +- kernel/sched/isolation.c | 12 +- kernel/sched/rt.c | 81 +- kernel/sched/sched.h | 51 +- kernel/sched/stats.h | 7 +- kernel/sched/stop_task.c | 22 +- kernel/sched/topology.c | 50 +- kernel/stacktrace.c | 4 +- kernel/stop_machine.c | 2 + kernel/sys.c | 16 +- kernel/time/alarmtimer.c | 2 +- kernel/time/hrtimer.c | 214 ++- kernel/time/itimer.c | 1 + kernel/time/posix-timers.c | 63 +- kernel/time/tick-broadcast-hrtimer.c | 13 +- kernel/time/tick-sched.c | 15 +- kernel/time/timer.c | 103 +- kernel/trace/Kconfig | 6 +- kernel/trace/ftrace.c | 2 +- kernel/trace/ring_buffer_benchmark.c | 2 +- kernel/trace/trace_events.c | 4 +- kernel/trace/trace_sched_wakeup.c | 3 +- kernel/watchdog.c | 4 +- lib/Makefile | 4 - lib/bitmap.c | 20 + lib/timerqueue.c | 30 +- net/core/pktgen.c | 6 +- tools/Makefile | 4 +- tools/arch/x86/include/asm/cpufeatures.h | 1 - tools/build/Makefile.feature | 2 + tools/build/feature/Makefile | 4 + tools/build/feature/test-libcap.c | 20 + tools/include/uapi/linux/perf_event.h | 3 +- tools/perf/Documentation/intel-pt.txt | 15 + tools/perf/Documentation/itrace.txt | 2 + tools/perf/Documentation/perf-config.txt | 4 + tools/perf/Documentation/perf-record.txt | 13 +- tools/perf/Documentation/perf-report.txt | 17 + tools/perf/Documentation/perf-script.txt | 9 + tools/perf/Documentation/perf-top.txt | 38 + tools/perf/Documentation/perf-trace.txt | 9 + tools/perf/Documentation/perf.data-file-format.txt | 25 +- tools/perf/Makefile.config | 12 + tools/perf/Makefile.perf | 33 +- tools/perf/arch/arm/util/auxtrace.c | 8 +- tools/perf/arch/arm/util/cs-etm.c | 82 +- tools/perf/arch/arm64/util/arm-spe.c | 24 +- tools/perf/arch/arm64/util/header.c | 6 +- tools/perf/arch/powerpc/util/kvm-stat.c | 12 +- tools/perf/arch/s390/util/auxtrace.c | 12 +- tools/perf/arch/s390/util/kvm-stat.c | 8 +- tools/perf/arch/x86/tests/intel-cqm.c | 8 +- tools/perf/arch/x86/tests/perf-time-to-tsc.c | 30 +- tools/perf/arch/x86/util/auxtrace.c | 10 +- tools/perf/arch/x86/util/intel-bts.c | 38 +- tools/perf/arch/x86/util/intel-pt.c | 105 +- tools/perf/arch/x86/util/kvm-stat.c | 16 +- tools/perf/arch/x86/util/tsc.c | 6 +- tools/perf/bench/epoll-ctl.c | 7 +- tools/perf/bench/epoll-wait.c | 7 +- tools/perf/bench/futex-hash.c | 5 +- tools/perf/bench/futex-lock-pi.c | 7 +- tools/perf/bench/futex-requeue.c | 7 +- tools/perf/bench/futex-wake-parallel.c | 6 +- tools/perf/bench/futex-wake.c | 7 +- tools/perf/builtin-annotate.c | 16 +- tools/perf/builtin-c2c.c | 10 +- tools/perf/builtin-diff.c | 20 +- tools/perf/builtin-evlist.c | 4 +- tools/perf/builtin-ftrace.c | 30 +- tools/perf/builtin-inject.c | 60 +- tools/perf/builtin-kmem.c | 24 +- tools/perf/builtin-kvm.c | 46 +- tools/perf/builtin-lock.c | 30 +- tools/perf/builtin-mem.c | 2 +- tools/perf/builtin-record.c | 85 +- tools/perf/builtin-report.c | 42 +- tools/perf/builtin-sched.c | 96 +- tools/perf/builtin-script.c | 177 ++- tools/perf/builtin-stat.c | 135 +- tools/perf/builtin-timechart.c | 46 +- tools/perf/builtin-top.c | 115 +- tools/perf/builtin-trace.c | 629 ++++++-- tools/perf/examples/bpf/augmented_raw_syscalls.c | 284 ++-- tools/perf/include/bpf/bpf.h | 2 + tools/perf/lib/Build | 12 + tools/perf/lib/Documentation/Makefile | 7 + tools/perf/lib/Documentation/man/libperf.rst | 100 ++ tools/perf/lib/Documentation/tutorial/tutorial.rst | 123 ++ tools/perf/lib/Makefile | 158 ++ tools/perf/lib/core.c | 34 + tools/perf/lib/cpumap.c | 239 +++ tools/perf/lib/evlist.c | 159 ++ tools/perf/lib/evsel.c | 232 +++ tools/perf/lib/include/internal/cpumap.h | 17 + tools/perf/lib/include/internal/evlist.h | 50 + tools/perf/lib/include/internal/evsel.h | 29 + tools/perf/lib/include/internal/lib.h | 10 + tools/perf/lib/include/internal/tests.h | 19 + tools/perf/lib/include/internal/threadmap.h | 23 + .../perf/{util => lib/include/internal}/xyarray.h | 6 +- tools/perf/lib/include/perf/core.h | 22 + tools/perf/lib/include/perf/cpumap.h | 23 + tools/perf/lib/include/perf/evlist.h | 35 + tools/perf/lib/include/perf/evsel.h | 39 + tools/perf/lib/include/perf/threadmap.h | 18 + tools/perf/lib/internal.h | 18 + tools/perf/lib/lib.c | 46 + tools/perf/lib/libperf.map | 40 + tools/perf/lib/libperf.pc.template | 11 + tools/perf/lib/tests/Makefile | 38 + tools/perf/lib/tests/test-cpumap.c | 21 + tools/perf/lib/tests/test-evlist.c | 186 +++ tools/perf/lib/tests/test-evsel.c | 125 ++ tools/perf/lib/tests/test-threadmap.c | 21 + tools/perf/lib/threadmap.c | 81 + tools/perf/lib/xyarray.c | 33 + tools/perf/perf.c | 3 + tools/perf/perf.h | 1 + .../pmu-events/arch/powerpc/power9/memory.json | 2 +- .../perf/pmu-events/arch/powerpc/power9/other.json | 8 +- tools/perf/pmu-events/arch/x86/icelake/cache.json | 552 +++++++ .../arch/x86/icelake/floating-point.json | 102 ++ .../perf/pmu-events/arch/x86/icelake/frontend.json | 424 +++++ tools/perf/pmu-events/arch/x86/icelake/memory.json | 410 +++++ tools/perf/pmu-events/arch/x86/icelake/other.json | 121 ++ .../perf/pmu-events/arch/x86/icelake/pipeline.json | 892 +++++++++++ .../arch/x86/icelake/virtual-memory.json | 236 +++ tools/perf/pmu-events/arch/x86/mapfile.csv | 3 + tools/perf/pmu-events/arch/x86/tremontx/cache.json | 111 ++ .../pmu-events/arch/x86/tremontx/frontend.json | 26 + .../perf/pmu-events/arch/x86/tremontx/memory.json | 26 + tools/perf/pmu-events/arch/x86/tremontx/other.json | 26 + .../pmu-events/arch/x86/tremontx/pipeline.json | 111 ++ .../arch/x86/tremontx/uncore-memory.json | 73 + .../pmu-events/arch/x86/tremontx/uncore-other.json | 431 ++++++ .../pmu-events/arch/x86/tremontx/uncore-power.json | 11 + .../arch/x86/tremontx/virtual-memory.json | 86 ++ tools/perf/tests/backward-ring-buffer.c | 18 +- tools/perf/tests/bitmap.c | 5 +- tools/perf/tests/bpf.c | 12 +- tools/perf/tests/code-reading.c | 50 +- tools/perf/tests/cpumap.c | 21 +- tools/perf/tests/event-times.c | 81 +- tools/perf/tests/event_update.c | 13 +- tools/perf/tests/evsel-roundtrip-name.c | 12 +- tools/perf/tests/evsel-tp-sched.c | 8 +- tools/perf/tests/hists_cumulate.c | 18 +- tools/perf/tests/hists_filter.c | 10 +- tools/perf/tests/hists_link.c | 10 +- tools/perf/tests/hists_output.c | 20 +- tools/perf/tests/keep-tracking.c | 44 +- tools/perf/tests/make | 1 + tools/perf/tests/mem2node.c | 5 +- tools/perf/tests/mmap-basic.c | 28 +- tools/perf/tests/mmap-thread-lookup.c | 4 +- tools/perf/tests/openat-syscall-all-cpus.c | 18 +- tools/perf/tests/openat-syscall-tp-fields.c | 14 +- tools/perf/tests/openat-syscall.c | 10 +- tools/perf/tests/parse-events.c | 1220 +++++++-------- tools/perf/tests/parse-no-sample-id-all.c | 6 +- tools/perf/tests/perf-record.c | 10 +- tools/perf/tests/sample-parsing.c | 14 +- tools/perf/tests/shell/trace+probe_vfs_getname.sh | 4 + tools/perf/tests/sw-clock.c | 33 +- tools/perf/tests/switch-tracking.c | 64 +- tools/perf/tests/task-exit.c | 35 +- tools/perf/tests/thread-map.c | 28 +- tools/perf/tests/time-utils-test.c | 2 +- tools/perf/tests/topology.c | 9 +- tools/perf/ui/browsers/annotate.c | 16 +- tools/perf/ui/browsers/hists.c | 54 +- tools/perf/ui/browsers/res_sample.c | 4 +- tools/perf/ui/browsers/scripts.c | 6 +- tools/perf/ui/gtk/annotate.c | 8 +- tools/perf/ui/gtk/gtk.h | 8 +- tools/perf/ui/gtk/hists.c | 6 +- tools/perf/ui/helpline.c | 4 +- tools/perf/ui/hist.c | 16 +- tools/perf/ui/setup.c | 2 +- tools/perf/ui/util.c | 2 +- tools/perf/util/Build | 9 +- tools/perf/util/annotate.c | 42 +- tools/perf/util/annotate.h | 28 +- tools/perf/util/auxtrace.c | 46 +- tools/perf/util/auxtrace.h | 29 +- tools/perf/util/bpf-event.c | 2 +- tools/perf/util/bpf-event.h | 4 +- tools/perf/util/bpf-loader.c | 38 +- tools/perf/util/bpf-loader.h | 30 +- tools/perf/util/build-id.c | 2 +- tools/perf/util/build-id.h | 2 +- tools/perf/util/callchain.c | 2 +- tools/perf/util/callchain.h | 2 +- tools/perf/util/cap.c | 29 + tools/perf/util/cap.h | 32 + tools/perf/util/cgroup.c | 22 +- tools/perf/util/cgroup.h | 6 +- tools/perf/util/counts.c | 17 +- tools/perf/util/counts.h | 34 +- tools/perf/util/cpumap.c | 264 +--- tools/perf/util/cpumap.h | 54 +- tools/perf/util/cputopo.c | 13 +- tools/perf/util/cs-etm.c | 28 +- tools/perf/util/data-convert-bt.c | 38 +- tools/perf/util/db-export.c | 10 +- tools/perf/util/db-export.h | 10 +- tools/perf/util/env.c | 2 +- tools/perf/util/env.h | 2 +- tools/perf/util/event.c | 30 +- tools/perf/util/event.h | 15 +- tools/perf/util/evlist.c | 607 ++++---- tools/perf/util/evlist.h | 215 ++- tools/perf/util/evsel.c | 508 +++--- tools/perf/util/evsel.h | 200 ++- tools/perf/util/evsel_fprintf.c | 16 +- tools/perf/util/evswitch.c | 61 + tools/perf/util/evswitch.h | 31 + tools/perf/util/header.c | 229 +-- tools/perf/util/header.h | 24 +- tools/perf/util/hist.c | 52 +- tools/perf/util/hist.h | 38 +- tools/perf/util/intel-bts.c | 22 +- tools/perf/util/intel-pt.c | 112 +- tools/perf/util/jitdump.c | 8 +- tools/perf/util/kvm-stat.h | 22 +- tools/perf/util/machine.c | 12 +- tools/perf/util/machine.h | 8 +- tools/perf/util/map.c | 5 +- tools/perf/util/map.h | 2 +- tools/perf/util/map_groups.h | 4 + tools/perf/util/metricgroup.c | 26 +- tools/perf/util/metricgroup.h | 6 +- tools/perf/util/mmap.c | 4 +- tools/perf/util/parse-events.c | 163 +- tools/perf/util/parse-events.h | 9 +- tools/perf/util/parse-events.l | 1 + tools/perf/util/pmu.c | 15 +- tools/perf/util/pmu.h | 2 +- tools/perf/util/python-ext-sources | 3 +- tools/perf/util/python.c | 73 +- tools/perf/util/record.c | 73 +- tools/perf/util/s390-cpumsf.c | 4 +- tools/perf/util/s390-sample-raw.c | 6 +- tools/perf/util/sample-raw.c | 2 +- tools/perf/util/sample-raw.h | 6 +- .../perf/util/scripting-engines/trace-event-perl.c | 14 +- .../util/scripting-engines/trace-event-python.c | 40 +- tools/perf/util/session.c | 92 +- tools/perf/util/session.h | 12 +- tools/perf/util/setup.py | 5 +- tools/perf/util/sort.c | 60 +- tools/perf/util/sort.h | 6 +- tools/perf/util/stat-display.c | 112 +- tools/perf/util/stat-shadow.c | 70 +- tools/perf/util/stat.c | 64 +- tools/perf/util/stat.h | 35 +- tools/perf/util/svghelper.c | 7 +- tools/perf/util/syscalltbl.c | 1 + tools/perf/util/syscalltbl.h | 1 + tools/perf/util/thread.c | 7 +- tools/perf/util/thread.h | 4 - tools/perf/util/thread_map.c | 131 +- tools/perf/util/thread_map.h | 58 +- tools/perf/util/tool.h | 8 +- tools/perf/util/top.c | 12 +- tools/perf/util/top.h | 10 +- tools/perf/util/trace-event-info.c | 14 +- tools/perf/util/trace-event-scripting.c | 2 +- tools/perf/util/trace-event.h | 4 +- tools/perf/util/unwind-libunwind-local.c | 18 +- tools/perf/util/unwind-libunwind.c | 40 +- tools/perf/util/unwind.h | 25 +- tools/perf/util/util.c | 49 +- tools/perf/util/util.h | 4 +- tools/testing/selftests/x86/Makefile | 4 +- tools/testing/selftests/x86/mpx-debug.h | 15 - tools/testing/selftests/x86/mpx-dig.c | 497 ------ tools/testing/selftests/x86/mpx-hw.h | 124 -- tools/testing/selftests/x86/mpx-mini-test.c | 1613 -------------------- tools/testing/selftests/x86/mpx-mm.h | 10 - tools/testing/selftests/x86/syscall_numbering.c | 89 ++ 439 files changed, 12844 insertions(+), 7980 deletions(-) delete mode 100644 arch/x86/include/asm/apic_flat_64.h delete mode 100644 arch/x86/include/asm/ipi.h delete mode 100644 arch/x86/include/uapi/asm/errno.h delete mode 100644 arch/x86/include/uapi/asm/fcntl.h delete mode 100644 arch/x86/include/uapi/asm/ioctl.h delete mode 100644 arch/x86/include/uapi/asm/ioctls.h delete mode 100644 arch/x86/include/uapi/asm/ipcbuf.h delete mode 100644 arch/x86/include/uapi/asm/param.h delete mode 100644 arch/x86/include/uapi/asm/resource.h delete mode 100644 arch/x86/include/uapi/asm/termbits.h delete mode 100644 arch/x86/include/uapi/asm/termios.h delete mode 100644 arch/x86/include/uapi/asm/types.h create mode 100644 arch/x86/kernel/apic/local.h delete mode 100644 arch/x86/kernel/apic/x2apic.h create mode 100644 drivers/firmware/efi/rci2-table.c create mode 100644 tools/build/feature/test-libcap.c create mode 100644 tools/perf/lib/Build create mode 100644 tools/perf/lib/Documentation/Makefile create mode 100644 tools/perf/lib/Documentation/man/libperf.rst create mode 100644 tools/perf/lib/Documentation/tutorial/tutorial.rst create mode 100644 tools/perf/lib/Makefile create mode 100644 tools/perf/lib/core.c create mode 100644 tools/perf/lib/cpumap.c create mode 100644 tools/perf/lib/evlist.c create mode 100644 tools/perf/lib/evsel.c create mode 100644 tools/perf/lib/include/internal/cpumap.h create mode 100644 tools/perf/lib/include/internal/evlist.h create mode 100644 tools/perf/lib/include/internal/evsel.h create mode 100644 tools/perf/lib/include/internal/lib.h create mode 100644 tools/perf/lib/include/internal/tests.h create mode 100644 tools/perf/lib/include/internal/threadmap.h rename tools/perf/{util => lib/include/internal}/xyarray.h (84%) create mode 100644 tools/perf/lib/include/perf/core.h create mode 100644 tools/perf/lib/include/perf/cpumap.h create mode 100644 tools/perf/lib/include/perf/evlist.h create mode 100644 tools/perf/lib/include/perf/evsel.h create mode 100644 tools/perf/lib/include/perf/threadmap.h create mode 100644 tools/perf/lib/internal.h create mode 100644 tools/perf/lib/lib.c create mode 100644 tools/perf/lib/libperf.map create mode 100644 tools/perf/lib/libperf.pc.template create mode 100644 tools/perf/lib/tests/Makefile create mode 100644 tools/perf/lib/tests/test-cpumap.c create mode 100644 tools/perf/lib/tests/test-evlist.c create mode 100644 tools/perf/lib/tests/test-evsel.c create mode 100644 tools/perf/lib/tests/test-threadmap.c create mode 100644 tools/perf/lib/threadmap.c create mode 100644 tools/perf/lib/xyarray.c create mode 100644 tools/perf/pmu-events/arch/x86/icelake/cache.json create mode 100644 tools/perf/pmu-events/arch/x86/icelake/floating-point.json create mode 100644 tools/perf/pmu-events/arch/x86/icelake/frontend.json create mode 100644 tools/perf/pmu-events/arch/x86/icelake/memory.json create mode 100644 tools/perf/pmu-events/arch/x86/icelake/other.json create mode 100644 tools/perf/pmu-events/arch/x86/icelake/pipeline.json create mode 100644 tools/perf/pmu-events/arch/x86/icelake/virtual-memory.json create mode 100644 tools/perf/pmu-events/arch/x86/tremontx/cache.json create mode 100644 tools/perf/pmu-events/arch/x86/tremontx/frontend.json create mode 100644 tools/perf/pmu-events/arch/x86/tremontx/memory.json create mode 100644 tools/perf/pmu-events/arch/x86/tremontx/other.json create mode 100644 tools/perf/pmu-events/arch/x86/tremontx/pipeline.json create mode 100644 tools/perf/pmu-events/arch/x86/tremontx/uncore-memory.json create mode 100644 tools/perf/pmu-events/arch/x86/tremontx/uncore-other.json create mode 100644 tools/perf/pmu-events/arch/x86/tremontx/uncore-power.json create mode 100644 tools/perf/pmu-events/arch/x86/tremontx/virtual-memory.json create mode 100644 tools/perf/util/cap.c create mode 100644 tools/perf/util/cap.h create mode 100644 tools/perf/util/evswitch.c create mode 100644 tools/perf/util/evswitch.h delete mode 100644 tools/testing/selftests/x86/mpx-debug.h delete mode 100644 tools/testing/selftests/x86/mpx-dig.c delete mode 100644 tools/testing/selftests/x86/mpx-hw.h delete mode 100644 tools/testing/selftests/x86/mpx-mini-test.c delete mode 100644 tools/testing/selftests/x86/mpx-mm.h create mode 100644 tools/testing/selftests/x86/syscall_numbering.c Merging clockevents/clockevents/next (a5f6679fc81e clocksource/drivers/npcm: Fix GENMASK and timer operation) $ git merge clockevents/clockevents/next Auto-merging drivers/clocksource/Kconfig Auto-merging arch/arm64/boot/dts/freescale/imx8mq.dtsi Auto-merging arch/arm64/boot/dts/freescale/imx8mm.dtsi Removing Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.txt Removing Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt Merge made by the 'recursive' strategy. .../bindings/timer/allwinner,sun4i-a10-timer.yaml | 102 +++++++++++++++++++++ .../bindings/timer/allwinner,sun4i-timer.txt | 19 ---- .../bindings/timer/allwinner,sun5i-a13-hstimer.txt | 26 ------ .../timer/allwinner,sun5i-a13-hstimer.yaml | 79 ++++++++++++++++ arch/arm64/boot/dts/freescale/imx8mm.dtsi | 8 ++ arch/arm64/boot/dts/freescale/imx8mq.dtsi | 8 ++ drivers/clocksource/Kconfig | 2 +- drivers/clocksource/em_sti.c | 4 +- drivers/clocksource/renesas-ostm.c | 2 +- drivers/clocksource/sh_cmt.c | 5 +- drivers/clocksource/sh_tmu.c | 5 +- drivers/clocksource/timer-atmel-tcb.c | 18 ++++ drivers/clocksource/timer-imx-sysctr.c | 5 + drivers/clocksource/timer-npcm7xx.c | 9 +- drivers/clocksource/timer-sun4i.c | 4 + 15 files changed, 232 insertions(+), 64 deletions(-) create mode 100644 Documentation/devicetree/bindings/timer/allwinner,sun4i-a10-timer.yaml delete mode 100644 Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt delete mode 100644 Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.txt create mode 100644 Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.yaml Merging edac/edac-for-next (718d58514ebc EDAC/mc: Cleanup _edac_mc_free() code) $ git merge edac/edac-for-next Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 9 +- drivers/edac/Kconfig | 7 + drivers/edac/Makefile | 1 + drivers/edac/altera_edac.c | 58 ++++++- drivers/edac/altera_edac.h | 25 ++- drivers/edac/bluefield_edac.c | 356 ++++++++++++++++++++++++++++++++++++++++++ drivers/edac/edac_mc.c | 33 ++-- drivers/edac/pnd2_edac.c | 7 +- 8 files changed, 472 insertions(+), 24 deletions(-) create mode 100644 drivers/edac/bluefield_edac.c Merging irqchip/irq/irqchip-next (6c9050a73469 irqchip: Remove dev_err() usage after platform_get_irq()) $ git merge irqchip/irq/irqchip-next Auto-merging drivers/pci/controller/pci-hyperv.c CONFLICT (content): Merge conflict in drivers/pci/controller/pci-hyperv.c Resolved 'drivers/pci/controller/pci-hyperv.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit --no-edit -v -a [master c0af261c486a] Merge remote-tracking branch 'irqchip/irq/irqchip-next' $ git diff -M --stat --summary HEAD^.. Documentation/arm64/silicon-errata.rst | 2 + .../bindings/interrupt-controller/arm,gic-v3.yaml | 6 +- drivers/gpio/gpio-ixp4xx.c | 2 +- drivers/irqchip/irq-gic-common.c | 35 +- drivers/irqchip/irq-gic-common.h | 2 +- drivers/irqchip/irq-gic-v2m.c | 2 +- drivers/irqchip/irq-gic-v3-its.c | 4 +- drivers/irqchip/irq-gic-v3.c | 384 ++++++++++++++++----- drivers/irqchip/irq-gic.c | 14 +- drivers/irqchip/irq-hip04.c | 9 +- drivers/irqchip/irq-imgpdc.c | 8 +- drivers/irqchip/irq-ixp4xx.c | 2 +- drivers/irqchip/irq-keystone.c | 4 +- drivers/irqchip/irq-mmp.c | 2 - drivers/irqchip/qcom-irq-combiner.c | 4 +- drivers/pci/controller/pci-hyperv.c | 10 +- include/linux/irqchip/arm-gic-v3.h | 30 +- include/linux/irqchip/irq-partition-percpu.h | 5 + include/linux/irqdomain.h | 6 +- kernel/irq/irqdomain.c | 9 +- 20 files changed, 407 insertions(+), 133 deletions(-) Merging ftrace/for-next (6d54ceb539aa tracing: Fix user stack trace "??" output) $ git merge ftrace/for-next Already up to date. Merging rcu/rcu/next (07f038a408fb Merge LKMM and RCU commits) $ git merge rcu/rcu/next Auto-merging kernel/sched/idle.c Auto-merging kernel/sched/core.c Auto-merging kernel/rcu/tree_stall.h Auto-merging kernel/rcu/tree.c Auto-merging kernel/locking/lockdep.c Auto-merging include/linux/rcupdate.h Auto-merging drivers/base/core.c Auto-merging drivers/acpi/osl.c Auto-merging MAINTAINERS Auto-merging Documentation/admin-guide/kernel-parameters.txt Merge made by the 'recursive' strategy. .../RCU/Design/Requirements/Requirements.html | 73 +- Documentation/RCU/stallwarn.txt | 6 + Documentation/admin-guide/kernel-parameters.txt | 17 +- MAINTAINERS | 2 +- arch/arm/kernel/smp.c | 6 +- arch/powerpc/include/asm/kvm_book3s_64.h | 2 +- arch/x86/pci/mmconfig-shared.c | 5 +- drivers/acpi/osl.c | 6 +- drivers/base/base.h | 1 + drivers/base/core.c | 12 + drivers/base/power/runtime.c | 15 +- include/linux/rcu_segcblist.h | 9 + include/linux/rcu_sync.h | 4 +- include/linux/rculist.h | 36 +- include/linux/rcupdate.h | 9 +- include/trace/events/rcu.h | 4 +- kernel/locking/lockdep.c | 2 +- kernel/rcu/Kconfig.debug | 11 + kernel/rcu/rcu.h | 1 + kernel/rcu/rcu_segcblist.c | 174 ++- kernel/rcu/rcu_segcblist.h | 54 +- kernel/rcu/rcuperf.c | 10 +- kernel/rcu/rcutorture.c | 30 +- kernel/rcu/srcutree.c | 5 +- kernel/rcu/tree.c | 205 ++-- kernel/rcu/tree.h | 81 +- kernel/rcu/tree_exp.h | 8 +- kernel/rcu/tree_plugin.h | 1195 ++++++++++++-------- kernel/rcu/tree_stall.h | 9 + kernel/rcu/update.c | 105 +- kernel/sched/idle.c | 5 +- kernel/torture.c | 2 - kernel/trace/ftrace_internal.h | 8 +- kernel/trace/trace.c | 4 +- net/ipv4/fib_frontend.c | 3 +- tools/memory-model/Documentation/explanation.txt | 53 +- tools/memory-model/README | 18 +- tools/memory-model/scripts/checkghlitmus.sh | 0 tools/memory-model/scripts/checklitmushist.sh | 0 tools/memory-model/scripts/cmplitmushist.sh | 0 tools/memory-model/scripts/initlitmushist.sh | 0 tools/memory-model/scripts/judgelitmus.sh | 0 tools/memory-model/scripts/newlitmushist.sh | 0 tools/memory-model/scripts/parseargs.sh | 0 tools/memory-model/scripts/runlitmushist.sh | 0 .../selftests/rcutorture/bin/kvm-test-1-run.sh | 2 +- .../selftests/rcutorture/configs/rcu/TREE03.boot | 1 + 47 files changed, 1423 insertions(+), 770 deletions(-) mode change 100644 => 100755 tools/memory-model/scripts/checkghlitmus.sh mode change 100644 => 100755 tools/memory-model/scripts/checklitmushist.sh mode change 100644 => 100755 tools/memory-model/scripts/cmplitmushist.sh mode change 100644 => 100755 tools/memory-model/scripts/initlitmushist.sh mode change 100644 => 100755 tools/memory-model/scripts/judgelitmus.sh mode change 100644 => 100755 tools/memory-model/scripts/newlitmushist.sh mode change 100644 => 100755 tools/memory-model/scripts/parseargs.sh mode change 100644 => 100755 tools/memory-model/scripts/runlitmushist.sh Merging kvm/linux-next (e4427372398c selftests/kvm: make platform_info_test pass on AMD) $ git merge kvm/linux-next Already up to date. Merging kvm-arm/next (00249491044a KVM: arm: VGIC: Properly initialise private IRQ affinity) $ git merge kvm-arm/next Merge made by the 'recursive' strategy. arch/arm64/kvm/hyp/tlb.c | 14 ++- include/kvm/arm_vgic.h | 3 + virt/kvm/arm/vgic/vgic-init.c | 14 ++- virt/kvm/arm/vgic/vgic-irqfd.c | 36 +++++-- virt/kvm/arm/vgic/vgic-its.c | 207 +++++++++++++++++++++++++++++++++++++++ virt/kvm/arm/vgic/vgic-mmio-v3.c | 4 +- virt/kvm/arm/vgic/vgic-v2.c | 7 +- virt/kvm/arm/vgic/vgic-v3.c | 7 +- virt/kvm/arm/vgic/vgic.c | 26 +++-- virt/kvm/arm/vgic/vgic.h | 5 + virt/kvm/kvm_main.c | 7 +- 11 files changed, 300 insertions(+), 30 deletions(-) Merging kvm-ppc/kvm-ppc-next (3bda7f0ae0f7 KVM: PPC: Book3S PR: Fix software breakpoints) $ git merge kvm-ppc/kvm-ppc-next Auto-merging arch/powerpc/kvm/emulate_loadstore.c Auto-merging arch/powerpc/kvm/emulate.c Merge made by the 'recursive' strategy. arch/powerpc/kvm/emulate.c | 1 + arch/powerpc/kvm/emulate_loadstore.c | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) Merging kvms390/next (a049a377164c KVM: selftests: Enable dirty_log_test on s390x) $ git merge kvms390/next Removing tools/testing/selftests/kvm/lib/ucall.c Merge made by the 'recursive' strategy. tools/testing/selftests/kvm/Makefile | 9 +- tools/testing/selftests/kvm/dirty_log_test.c | 61 ++++++-- tools/testing/selftests/kvm/include/kvm_util.h | 8 +- tools/testing/selftests/kvm/lib/aarch64/ucall.c | 112 +++++++++++++++ tools/testing/selftests/kvm/lib/s390x/ucall.c | 56 ++++++++ tools/testing/selftests/kvm/lib/ucall.c | 157 --------------------- tools/testing/selftests/kvm/lib/x86_64/ucall.c | 56 ++++++++ tools/testing/selftests/kvm/s390x/sync_regs_test.c | 6 +- 8 files changed, 287 insertions(+), 178 deletions(-) create mode 100644 tools/testing/selftests/kvm/lib/aarch64/ucall.c create mode 100644 tools/testing/selftests/kvm/lib/s390x/ucall.c delete mode 100644 tools/testing/selftests/kvm/lib/ucall.c create mode 100644 tools/testing/selftests/kvm/lib/x86_64/ucall.c Merging xen-tip/linux-next (b877ac9815a8 xen/swiotlb: remember having called xen_create_contiguous_region()) $ git merge xen-tip/linux-next Already up to date. Merging percpu/for-next (03ed70fb0e5e Merge branch 'for-5.3' into for-next) $ git merge percpu/for-next Already up to date! Merge made by the 'recursive' strategy. Merging workqueues/for-next (be69d00d9769 workqueue: Remove GPF argument from alloc_workqueue_attrs()) $ git merge workqueues/for-next Already up to date. Merging drivers-x86/for-next (109e8adfbc66 platform/x86: asus-wmi: Remove unnecessary blank lines) $ git merge drivers-x86/for-next Merge made by the 'recursive' strategy. drivers/platform/mellanox/mlxreg-hotplug.c | 5 +- drivers/platform/x86/acer-wmi.c | 49 +-- drivers/platform/x86/asus-nb-wmi.c | 9 + drivers/platform/x86/asus-wmi.c | 484 ++++++++++++--------- drivers/platform/x86/dell-wmi.c | 12 +- drivers/platform/x86/hp_accel.c | 1 + drivers/platform/x86/i2c-multi-instantiate.c | 4 +- drivers/platform/x86/intel_bxtwc_tmu.c | 5 +- drivers/platform/x86/intel_int0002_vgpio.c | 4 +- drivers/platform/x86/intel_pmc_ipc.c | 4 +- .../x86/intel_speed_select_if/isst_if_mmio.c | 8 +- drivers/platform/x86/pcengines-apuv2.c | 13 +- drivers/platform/x86/thinkpad_acpi.c | 17 +- drivers/platform/x86/touchscreen_dmi.c | 50 +++ drivers/platform/x86/wmi.c | 4 +- include/linux/platform_data/x86/asus-wmi.h | 6 +- 16 files changed, 379 insertions(+), 296 deletions(-) Merging chrome-platform/for-next (5f9e832c1370 Linus 5.3-rc1) $ git merge chrome-platform/for-next Already up to date. Merging hsi/for-next (c1030cd45619 HSI: Remove dev_err() usage after platform_get_irq()) $ git merge hsi/for-next Auto-merging drivers/hsi/clients/ssi_protocol.c Merge made by the 'recursive' strategy. drivers/hsi/clients/ssi_protocol.c | 7 ++++--- drivers/hsi/controllers/omap_ssi_core.c | 4 +--- drivers/hsi/controllers/omap_ssi_port.c | 4 +--- 3 files changed, 6 insertions(+), 9 deletions(-) Merging leds/for-next (60e2dde1e91a led: triggers: Fix a memory leak bug) $ git merge leds/for-next Removing include/linux/platform_data/leds-kirkwood-netxbig.h Auto-merging include/linux/device.h Auto-merging drivers/usb/core/devio.c Auto-merging drivers/spi/spi.c Auto-merging drivers/s390/crypto/zcrypt_api.c Auto-merging drivers/regulator/of_regulator.c Auto-merging drivers/iommu/arm-smmu.c Auto-merging drivers/iommu/arm-smmu-v3.c Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v1.c Auto-merging drivers/gpu/drm/vc4/vc4_drv.c Auto-merging drivers/gpu/drm/rockchip/rockchip_drm_drv.c Auto-merging drivers/gpu/drm/mcde/mcde_drv.c Auto-merging drivers/gpu/drm/exynos/exynos_drm_drv.c Auto-merging drivers/base/platform.c Auto-merging drivers/base/core.c Merge made by the 'recursive' strategy. .../devicetree/bindings/leds/ams,as3645a.txt | 22 +- Documentation/devicetree/bindings/leds/common.txt | 62 +++++- .../devicetree/bindings/leds/leds-aat1290.txt | 12 +- .../devicetree/bindings/leds/leds-an30259a.txt | 22 +- .../devicetree/bindings/leds/leds-cr0014114.txt | 26 ++- .../devicetree/bindings/leds/leds-gpio.txt | 23 +- .../devicetree/bindings/leds/leds-lm3601x.txt | 10 +- .../devicetree/bindings/leds/leds-lm3692x.txt | 9 +- .../devicetree/bindings/leds/leds-lp8860.txt | 9 +- .../devicetree/bindings/leds/leds-lt3593.txt | 11 +- .../devicetree/bindings/leds/leds-sc27xx-bltc.txt | 10 +- Documentation/leds/leds-class.rst | 70 +++++- drivers/amba/tegra-ahb.c | 11 +- drivers/base/bus.c | 24 --- drivers/base/core.c | 39 +++- drivers/base/devcon.c | 8 +- drivers/base/platform.c | 14 ++ drivers/fpga/fpga-bridge.c | 8 +- drivers/fpga/fpga-mgr.c | 8 +- drivers/gpu/drm/drm_mipi_dsi.c | 7 +- drivers/gpu/drm/exynos/exynos_drm_drv.c | 9 +- drivers/gpu/drm/mcde/mcde_drv.c | 3 +- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 3 +- drivers/gpu/drm/vc4/vc4_drv.c | 3 +- drivers/hwtracing/coresight/coresight-platform.c | 11 +- drivers/hwtracing/coresight/coresight-priv.h | 2 - drivers/hwtracing/coresight/coresight.c | 4 +- drivers/hwtracing/intel_th/core.c | 10 +- drivers/hwtracing/stm/core.c | 9 +- drivers/i2c/busses/i2c-amd-mp2-pci.c | 8 +- drivers/i2c/i2c-core-acpi.c | 11 +- drivers/i2c/i2c-core-of.c | 7 +- drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 8 +- drivers/iommu/arm-smmu-v3.c | 9 +- drivers/iommu/arm-smmu.c | 9 +- drivers/leds/Kconfig | 6 +- drivers/leds/led-class-flash.c | 9 +- drivers/leds/led-class.c | 58 +++-- drivers/leds/led-core.c | 127 +++++++++++ drivers/leds/led-triggers.c | 1 + drivers/leds/leds-aat1290.c | 16 +- drivers/leds/leds-an30259a.c | 29 +-- drivers/leds/leds-apu.c | 157 ++------------ drivers/leds/leds-as3645a.c | 74 +++---- drivers/leds/leds-cr0014114.c | 33 +-- drivers/leds/leds-gpio.c | 26 +-- drivers/leds/leds-is31fl319x.c | 3 +- drivers/leds/leds-ktd2692.c | 4 +- drivers/leds/leds-lm3532.c | 5 +- drivers/leds/leds-lm3601x.c | 38 ++-- drivers/leds/leds-lm36274.c | 4 +- drivers/leds/leds-lm3692x.c | 22 +- drivers/leds/leds-lm3697.c | 5 +- drivers/leds/leds-lp5562.c | 6 +- drivers/leds/leds-lp8860.c | 35 ++- drivers/leds/leds-lt3593.c | 20 +- drivers/leds/leds-max77650.c | 24 ++- drivers/leds/leds-netxbig.c | 76 +++++-- drivers/leds/leds-ns2.c | 21 +- drivers/leds/leds-pca9532.c | 2 +- drivers/leds/leds-pwm.c | 3 +- drivers/leds/leds-sc27xx-bltc.c | 22 +- drivers/leds/leds.h | 1 + drivers/mfd/altera-sysmgr.c | 14 +- drivers/misc/mei/main.c | 9 +- drivers/mux/core.c | 7 +- drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 8 +- drivers/net/phy/mdio_bus.c | 9 +- drivers/nvmem/core.c | 7 +- drivers/of/of_mdio.c | 8 +- drivers/of/platform.c | 7 +- drivers/pci/probe.c | 7 +- drivers/regulator/of_regulator.c | 7 +- drivers/rtc/interface.c | 11 +- drivers/s390/cio/ccwgroup.c | 18 +- drivers/s390/cio/device.c | 15 +- drivers/s390/crypto/zcrypt_api.c | 22 +- drivers/scsi/scsi_proc.c | 9 +- drivers/spi/spi.c | 28 +-- drivers/tty/tty_io.c | 8 +- drivers/usb/core/devio.c | 8 +- drivers/usb/roles/class.c | 16 +- drivers/usb/typec/class.c | 16 +- include/dt-bindings/leds/common.h | 55 ++++- include/linux/device.h | 237 ++++++++++++++++++++- include/linux/led-class-flash.h | 15 +- include/linux/leds.h | 79 ++++++- .../linux/platform_data/leds-kirkwood-netxbig.h | 54 ----- include/linux/platform_device.h | 3 + net/ieee802154/core.c | 7 +- sound/soc/rockchip/rk3399_gru_sound.c | 9 +- tools/leds/get_led_device_info.sh | 201 +++++++++++++++++ 92 files changed, 1322 insertions(+), 910 deletions(-) delete mode 100644 include/linux/platform_data/leds-kirkwood-netxbig.h create mode 100755 tools/leds/get_led_device_info.sh Merging ipmi/for-next (5b2a96999cde ipmi_ssif: avoid registering duplicate ssif interface) $ git merge ipmi/for-next Merge made by the 'recursive' strategy. drivers/char/ipmi/ipmi_dmi.c | 1 - drivers/char/ipmi/ipmi_dmi.h | 1 + drivers/char/ipmi/ipmi_msghandler.c | 120 ++++++++++++++++++----------------- drivers/char/ipmi/ipmi_si.h | 57 ++++++++++++++++- drivers/char/ipmi/ipmi_si_intf.c | 95 +++++++++++++++------------ drivers/char/ipmi/ipmi_si_mem_io.c | 2 +- drivers/char/ipmi/ipmi_si_pci.c | 2 +- drivers/char/ipmi/ipmi_si_platform.c | 2 +- drivers/char/ipmi/ipmi_si_port_io.c | 2 +- drivers/char/ipmi/ipmi_si_sm.h | 54 ++-------------- drivers/char/ipmi/ipmi_ssif.c | 79 ++++++++++++++++++++++- 11 files changed, 258 insertions(+), 157 deletions(-) Merging driver-core/driver-core-next (2a77eec0d3ca devcoredump: fix typo in comment) $ git merge driver-core/driver-core-next Auto-merging drivers/mfd/ab8500-debugfs.c Auto-merging drivers/mfd/ab3100-core.c Auto-merging drivers/base/power/runtime.c CONFLICT (content): Merge conflict in drivers/base/power/runtime.c Auto-merging drivers/base/core.c Auto-merging Documentation/admin-guide/kernel-parameters.txt Resolved 'drivers/base/power/runtime.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit --no-edit -v -a [master c1081c2f8942] Merge remote-tracking branch 'driver-core/driver-core-next' $ git diff -M --stat --summary HEAD^.. Documentation/admin-guide/kernel-parameters.txt | 5 + Documentation/driver-api/device_link.rst | 4 +- arch/x86/platform/olpc/olpc-xo1-sci.c | 17 +- drivers/base/core.c | 348 ++++++++++++++++++------ drivers/base/dd.c | 29 ++ drivers/base/devcoredump.c | 13 +- drivers/base/platform.c | 42 ++- drivers/base/power/runtime.c | 4 +- drivers/firmware/arm_scpi.c | 5 +- drivers/i2c/i2c-core-acpi.c | 5 +- drivers/of/platform.c | 190 +++++++++++++ drivers/platform/x86/hp-wmi.c | 47 +--- drivers/uio/uio_fsl_elbc_gpcm.c | 23 +- drivers/video/fbdev/sm501fb.c | 37 +-- drivers/video/fbdev/w100fb.c | 23 +- drivers/video/fbdev/wm8505fb.c | 13 +- fs/kernfs/dir.c | 9 +- include/linux/device.h | 76 +++++- scripts/coccinelle/api/platform_get_irq.cocci | 102 +++++++ 19 files changed, 769 insertions(+), 223 deletions(-) create mode 100644 scripts/coccinelle/api/platform_get_irq.cocci Merging usb/usb-next (7ffc95e90e30 Merge 5.3-rc5 into usb-next) $ git merge usb/usb-next Removing include/linux/oxu210hp.h Removing drivers/usb/host/oxu210hp.h Removing drivers/usb/host/ehci-w90x900.c Auto-merging drivers/usb/host/Kconfig Auto-merging drivers/usb/gadget/udc/lpc32xx_udc.c Auto-merging drivers/usb/core/devio.c Auto-merging drivers/usb/class/usbtmc.c Auto-merging drivers/usb/chipidea/udc.c Auto-merging drivers/staging/Makefile CONFLICT (content): Merge conflict in drivers/staging/Makefile Auto-merging drivers/staging/Kconfig CONFLICT (content): Merge conflict in drivers/staging/Kconfig Auto-merging drivers/Makefile Auto-merging drivers/Kconfig Auto-merging arch/arm/boot/dts/exynos5250.dtsi Auto-merging MAINTAINERS Resolved 'drivers/staging/Kconfig' using previous resolution. Resolved 'drivers/staging/Makefile' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit --no-edit -v -a [master a6f4296d3aa1] Merge remote-tracking branch 'usb/usb-next' $ git diff -M --stat --summary HEAD^.. .../devicetree/bindings/usb/exynos-usb.txt | 41 +- .../devicetree/bindings/usb/fcs,fusb302.txt | 7 - .../devicetree/bindings/usb/mediatek,mtu3.txt | 2 +- .../{renesas,usb3.txt => renesas,usb3-peri.txt} | 0 MAINTAINERS | 19 +- arch/arm/boot/dts/exynos4.dtsi | 28 +- arch/arm/boot/dts/exynos4210-universal_c210.dts | 8 +- arch/arm/boot/dts/exynos4412-itop-elite.dts | 9 +- arch/arm/boot/dts/exynos4412-odroidu3.dts | 8 +- arch/arm/boot/dts/exynos4412-odroidx.dts | 5 +- arch/arm/boot/dts/exynos4412-origen.dts | 9 +- arch/arm/boot/dts/exynos5250.dtsi | 16 +- arch/arm/boot/dts/exynos54xx.dtsi | 18 +- drivers/Kconfig | 2 - drivers/Makefile | 1 - drivers/staging/Kconfig | 3 + drivers/staging/Makefile | 2 + drivers/{ => staging}/uwb/Kconfig | 0 drivers/{ => staging}/uwb/Makefile | 0 drivers/staging/uwb/TODO | 8 + drivers/{ => staging}/uwb/address.c | 0 drivers/{ => staging}/uwb/allocator.c | 2 +- drivers/{ => staging}/uwb/beacon.c | 0 drivers/{ => staging}/uwb/driver.c | 0 drivers/{ => staging}/uwb/drp-avail.c | 0 drivers/{ => staging}/uwb/drp-ie.c | 2 +- drivers/{ => staging}/uwb/drp.c | 0 drivers/{ => staging}/uwb/est.c | 0 drivers/{ => staging}/uwb/hwa-rc.c | 6 +- drivers/{ => staging}/uwb/i1480/Makefile | 0 drivers/{ => staging}/uwb/i1480/dfu/Makefile | 0 drivers/{ => staging}/uwb/i1480/dfu/dfu.c | 2 +- drivers/{ => staging}/uwb/i1480/dfu/i1480-dfu.h | 2 +- drivers/{ => staging}/uwb/i1480/dfu/mac.c | 2 +- drivers/{ => staging}/uwb/i1480/dfu/phy.c | 2 +- drivers/{ => staging}/uwb/i1480/dfu/usb.c | 6 +- drivers/{ => staging}/uwb/i1480/i1480-est.c | 2 +- drivers/{ => staging}/uwb/ie-rcv.c | 0 drivers/{ => staging}/uwb/ie.c | 0 .../staging/uwb/include}/debug-cmd.h | 0 .../uwb => drivers/staging/uwb/include}/spec.h | 0 .../uwb => drivers/staging/uwb/include}/umc.h | 0 .../uwb => drivers/staging/uwb/include}/whci.h | 0 drivers/{ => staging}/uwb/lc-dev.c | 0 drivers/{ => staging}/uwb/lc-rc.c | 0 drivers/{ => staging}/uwb/neh.c | 0 drivers/{ => staging}/uwb/pal.c | 2 +- drivers/{ => staging}/uwb/radio.c | 2 +- drivers/{ => staging}/uwb/reset.c | 0 drivers/{ => staging}/uwb/rsv.c | 2 +- drivers/{ => staging}/uwb/scan.c | 0 drivers/{ => staging}/uwb/umc-bus.c | 2 +- drivers/{ => staging}/uwb/umc-dev.c | 2 +- drivers/{ => staging}/uwb/umc-drv.c | 2 +- drivers/{ => staging}/uwb/uwb-debug.c | 3 +- drivers/{ => staging}/uwb/uwb-internal.h | 2 +- {include/linux => drivers/staging/uwb}/uwb.h | 2 +- drivers/{ => staging}/uwb/uwbd.c | 0 drivers/{ => staging}/uwb/whc-rc.c | 6 +- drivers/{ => staging}/uwb/whci.c | 4 +- .../staging/wusbcore/Documentation}/wusb-cbaf | 0 .../Documentation}/wusb-design-overview.rst | 0 drivers/{usb => staging}/wusbcore/Kconfig | 3 +- drivers/{usb => staging}/wusbcore/Makefile | 2 + drivers/staging/wusbcore/TODO | 8 + drivers/{usb => staging}/wusbcore/cbaf.c | 6 +- drivers/{usb => staging}/wusbcore/crypto.c | 4 +- drivers/{usb => staging}/wusbcore/dev-sysfs.c | 0 drivers/{usb => staging}/wusbcore/devconnect.c | 2 +- drivers/staging/wusbcore/host/Kconfig | 28 ++ drivers/staging/wusbcore/host/Makefile | 3 + drivers/{usb => staging/wusbcore}/host/hwa-hc.c | 4 +- .../{usb => staging/wusbcore}/host/whci/Makefile | 0 drivers/{usb => staging/wusbcore}/host/whci/asl.c | 4 +- .../{usb => staging/wusbcore}/host/whci/debug.c | 2 +- drivers/{usb => staging/wusbcore}/host/whci/hcd.c | 4 +- drivers/{usb => staging/wusbcore}/host/whci/hw.c | 4 +- drivers/{usb => staging/wusbcore}/host/whci/init.c | 4 +- drivers/{usb => staging/wusbcore}/host/whci/int.c | 4 +- drivers/{usb => staging/wusbcore}/host/whci/pzl.c | 4 +- drivers/{usb => staging/wusbcore}/host/whci/qset.c | 4 +- drivers/{usb => staging/wusbcore}/host/whci/whcd.h | 4 +- .../{usb => staging/wusbcore}/host/whci/whci-hc.h | 0 drivers/{usb => staging/wusbcore}/host/whci/wusb.c | 4 +- .../staging/wusbcore/include}/association.h | 0 .../staging/wusbcore/include}/wusb-wa.h | 0 .../staging/wusbcore/include}/wusb.h | 2 +- drivers/{usb => staging}/wusbcore/mmc.c | 2 +- drivers/{usb => staging}/wusbcore/pal.c | 0 drivers/{usb => staging}/wusbcore/reservation.c | 2 +- drivers/{usb => staging}/wusbcore/rh.c | 0 drivers/{usb => staging}/wusbcore/security.c | 0 drivers/{usb => staging}/wusbcore/wa-hc.c | 0 drivers/{usb => staging}/wusbcore/wa-hc.h | 6 +- drivers/{usb => staging}/wusbcore/wa-nep.c | 0 drivers/{usb => staging}/wusbcore/wa-rpipe.c | 0 drivers/{usb => staging}/wusbcore/wa-xfer.c | 0 drivers/{usb => staging}/wusbcore/wusbhc.c | 0 drivers/{usb => staging}/wusbcore/wusbhc.h | 4 +- drivers/usb/Kconfig | 2 - drivers/usb/Makefile | 2 - drivers/usb/atm/cxacru.c | 58 +-- drivers/usb/atm/ueagle-atm.c | 16 +- drivers/usb/chipidea/core.c | 14 +- drivers/usb/chipidea/udc.c | 3 +- drivers/usb/class/usblp.c | 13 +- drivers/usb/class/usbtmc.c | 13 +- drivers/usb/core/devio.c | 105 ++++- drivers/usb/core/driver.c | 2 + drivers/usb/core/generic.c | 5 + drivers/usb/core/hcd-pci.c | 3 +- drivers/usb/core/port.c | 9 + drivers/usb/core/usb.h | 3 + drivers/usb/dwc2/params.c | 5 +- drivers/usb/dwc2/platform.c | 4 +- drivers/usb/dwc3/core.c | 3 +- drivers/usb/dwc3/dwc3-keystone.c | 1 - drivers/usb/dwc3/dwc3-meson-g12a.c | 4 +- drivers/usb/dwc3/dwc3-omap.c | 4 +- drivers/usb/gadget/udc/aspeed-vhub/core.c | 1 - drivers/usb/gadget/udc/atmel_usba_udc.c | 1 + drivers/usb/gadget/udc/bcm63xx_udc.c | 8 +- drivers/usb/gadget/udc/bdc/bdc_core.c | 4 +- drivers/usb/gadget/udc/gr_udc.c | 8 +- drivers/usb/gadget/udc/lpc32xx_udc.c | 5 +- drivers/usb/gadget/udc/renesas_usb3.c | 4 +- drivers/usb/gadget/udc/s3c-hsudc.c | 4 +- drivers/usb/gadget/udc/s3c2410_udc.c | 2 + drivers/usb/gadget/udc/udc-xilinx.c | 4 +- drivers/usb/host/Kconfig | 32 -- drivers/usb/host/Makefile | 4 - drivers/usb/host/ehci-atmel.c | 3 - drivers/usb/host/ehci-exynos.c | 23 +- drivers/usb/host/ehci-omap.c | 4 +- drivers/usb/host/ehci-orion.c | 3 - drivers/usb/host/ehci-platform.c | 4 +- drivers/usb/host/ehci-sh.c | 3 - drivers/usb/host/ehci-st.c | 4 +- drivers/usb/host/ehci-w90x900.c | 130 ------ drivers/usb/host/imx21-hcd.c | 4 +- drivers/usb/host/ohci-exynos.c | 23 +- drivers/usb/host/ohci-platform.c | 4 +- drivers/usb/host/ohci-st.c | 4 +- drivers/usb/host/ohci-tmio.c | 3 + drivers/usb/host/oxu210hp-hcd.c | 443 +++++++++++++++++++- drivers/usb/host/oxu210hp.h | 448 --------------------- drivers/usb/host/xhci-dbgcap.c | 1 - drivers/usb/host/xhci-hub.c | 2 +- drivers/usb/host/xhci-mem.c | 1 - drivers/usb/host/xhci-plat.c | 1 - drivers/usb/misc/cypress_cy7c63.c | 29 +- drivers/usb/misc/cytherm.c | 64 +-- drivers/usb/misc/lvstest.c | 19 +- drivers/usb/misc/trancevibrator.c | 15 +- drivers/usb/misc/usbsevseg.c | 17 +- drivers/usb/mtu3/mtu3_core.c | 4 +- drivers/usb/musb/musb_core.c | 24 +- drivers/usb/phy/phy-ab8500-usb.c | 18 +- drivers/usb/phy/phy-fsl-usb.c | 12 +- drivers/usb/phy/phy-mv-usb.c | 17 +- drivers/usb/phy/phy-tahvo.c | 18 +- drivers/usb/phy/phy-twl6030-usb.c | 12 +- drivers/usb/storage/debug.h | 2 - drivers/usb/storage/isd200.c | 2 +- drivers/usb/storage/scsiglue.c | 2 +- drivers/usb/typec/mux.c | 2 +- drivers/usb/typec/tcpm/fusb302.c | 101 ++--- drivers/usb/typec/tcpm/tcpm.c | 23 +- drivers/usb/typec/tcpm/wcove.c | 4 +- drivers/usb/typec/ucsi/ucsi_ccg.c | 13 +- drivers/usb/usbip/stub_dev.c | 50 +-- drivers/usb/usbip/vudc.h | 2 +- drivers/usb/usbip/vudc_dev.c | 9 - drivers/usb/usbip/vudc_main.c | 1 + drivers/usb/usbip/vudc_sysfs.c | 7 +- include/linux/oxu210hp.h | 8 - include/linux/usb.h | 6 + include/uapi/linux/usbdevice_fs.h | 4 + tools/usb/usbip/libsrc/usbip_common.c | 6 +- tools/usb/usbip/libsrc/usbip_device_driver.c | 6 +- 180 files changed, 1004 insertions(+), 1302 deletions(-) rename Documentation/devicetree/bindings/usb/{renesas,usb3.txt => renesas,usb3-peri.txt} (100%) rename drivers/{ => staging}/uwb/Kconfig (100%) rename drivers/{ => staging}/uwb/Makefile (100%) create mode 100644 drivers/staging/uwb/TODO rename drivers/{ => staging}/uwb/address.c (100%) rename drivers/{ => staging}/uwb/allocator.c (99%) rename drivers/{ => staging}/uwb/beacon.c (100%) rename drivers/{ => staging}/uwb/driver.c (100%) rename drivers/{ => staging}/uwb/drp-avail.c (100%) rename drivers/{ => staging}/uwb/drp-ie.c (99%) rename drivers/{ => staging}/uwb/drp.c (100%) rename drivers/{ => staging}/uwb/est.c (100%) rename drivers/{ => staging}/uwb/hwa-rc.c (99%) rename drivers/{ => staging}/uwb/i1480/Makefile (100%) rename drivers/{ => staging}/uwb/i1480/dfu/Makefile (100%) rename drivers/{ => staging}/uwb/i1480/dfu/dfu.c (99%) rename drivers/{ => staging}/uwb/i1480/dfu/i1480-dfu.h (99%) rename drivers/{ => staging}/uwb/i1480/dfu/mac.c (99%) rename drivers/{ => staging}/uwb/i1480/dfu/phy.c (99%) rename drivers/{ => staging}/uwb/i1480/dfu/usb.c (99%) rename drivers/{ => staging}/uwb/i1480/i1480-est.c (99%) rename drivers/{ => staging}/uwb/ie-rcv.c (100%) rename drivers/{ => staging}/uwb/ie.c (100%) rename {include/linux/uwb => drivers/staging/uwb/include}/debug-cmd.h (100%) rename {include/linux/uwb => drivers/staging/uwb/include}/spec.h (100%) rename {include/linux/uwb => drivers/staging/uwb/include}/umc.h (100%) rename {include/linux/uwb => drivers/staging/uwb/include}/whci.h (100%) rename drivers/{ => staging}/uwb/lc-dev.c (100%) rename drivers/{ => staging}/uwb/lc-rc.c (100%) rename drivers/{ => staging}/uwb/neh.c (100%) rename drivers/{ => staging}/uwb/pal.c (99%) rename drivers/{ => staging}/uwb/radio.c (99%) rename drivers/{ => staging}/uwb/reset.c (100%) rename drivers/{ => staging}/uwb/rsv.c (99%) rename drivers/{ => staging}/uwb/scan.c (100%) rename drivers/{ => staging}/uwb/umc-bus.c (99%) rename drivers/{ => staging}/uwb/umc-dev.c (98%) rename drivers/{ => staging}/uwb/umc-drv.c (96%) rename drivers/{ => staging}/uwb/uwb-debug.c (99%) rename drivers/{ => staging}/uwb/uwb-internal.h (99%) rename {include/linux => drivers/staging/uwb}/uwb.h (99%) rename drivers/{ => staging}/uwb/uwbd.c (100%) rename drivers/{ => staging}/uwb/whc-rc.c (99%) rename drivers/{ => staging}/uwb/whci.c (99%) rename {Documentation/usb => drivers/staging/wusbcore/Documentation}/wusb-cbaf (100%) rename {Documentation/usb => drivers/staging/wusbcore/Documentation}/wusb-design-overview.rst (100%) rename drivers/{usb => staging}/wusbcore/Kconfig (93%) rename drivers/{usb => staging}/wusbcore/Makefile (96%) create mode 100644 drivers/staging/wusbcore/TODO rename drivers/{usb => staging}/wusbcore/cbaf.c (99%) rename drivers/{usb => staging}/wusbcore/crypto.c (99%) rename drivers/{usb => staging}/wusbcore/dev-sysfs.c (100%) rename drivers/{usb => staging}/wusbcore/devconnect.c (99%) create mode 100644 drivers/staging/wusbcore/host/Kconfig create mode 100644 drivers/staging/wusbcore/host/Makefile rename drivers/{usb => staging/wusbcore}/host/hwa-hc.c (99%) rename drivers/{usb => staging/wusbcore}/host/whci/Makefile (100%) rename drivers/{usb => staging/wusbcore}/host/whci/asl.c (99%) rename drivers/{usb => staging/wusbcore}/host/whci/debug.c (99%) rename drivers/{usb => staging/wusbcore}/host/whci/hcd.c (99%) rename drivers/{usb => staging/wusbcore}/host/whci/hw.c (97%) rename drivers/{usb => staging/wusbcore}/host/whci/init.c (98%) rename drivers/{usb => staging/wusbcore}/host/whci/int.c (96%) rename drivers/{usb => staging/wusbcore}/host/whci/pzl.c (99%) rename drivers/{usb => staging/wusbcore}/host/whci/qset.c (99%) rename drivers/{usb => staging/wusbcore}/host/whci/whcd.h (98%) rename drivers/{usb => staging/wusbcore}/host/whci/whci-hc.h (100%) rename drivers/{usb => staging/wusbcore}/host/whci/wusb.c (98%) rename {include/linux/usb => drivers/staging/wusbcore/include}/association.h (100%) rename {include/linux/usb => drivers/staging/wusbcore/include}/wusb-wa.h (100%) rename {include/linux/usb => drivers/staging/wusbcore/include}/wusb.h (99%) rename drivers/{usb => staging}/wusbcore/mmc.c (99%) rename drivers/{usb => staging}/wusbcore/pal.c (100%) rename drivers/{usb => staging}/wusbcore/reservation.c (99%) rename drivers/{usb => staging}/wusbcore/rh.c (100%) rename drivers/{usb => staging}/wusbcore/security.c (100%) rename drivers/{usb => staging}/wusbcore/wa-hc.c (100%) rename drivers/{usb => staging}/wusbcore/wa-hc.h (99%) rename drivers/{usb => staging}/wusbcore/wa-nep.c (100%) rename drivers/{usb => staging}/wusbcore/wa-rpipe.c (100%) rename drivers/{usb => staging}/wusbcore/wa-xfer.c (100%) rename drivers/{usb => staging}/wusbcore/wusbhc.c (100%) rename drivers/{usb => staging}/wusbcore/wusbhc.h (99%) delete mode 100644 drivers/usb/host/ehci-w90x900.c delete mode 100644 drivers/usb/host/oxu210hp.h delete mode 100644 include/linux/oxu210hp.h Merging usb-gadget/next (b2357839c56a usb: renesas_usbhs: add a workaround for a race condition of workqueue) $ git merge usb-gadget/next Already up to date. Merging usb-serial/usb-next (e21a712a9685 Linux 5.3-rc3) $ git merge usb-serial/usb-next Already up to date. Merging usb-chipidea-next/ci-for-usb-next (034252e37b31 usb: chipidea: msm: Use devm_platform_ioremap_resource()) $ git merge usb-chipidea-next/ci-for-usb-next Already up to date. Merging phy-next/next (609488bc979f Linux 5.3-rc2) $ git merge phy-next/next Already up to date. Merging tty/tty-next (591f935db448 serial: mxs-auart: Don't check for mctrl_gpio_to_gpiod() returning error) $ git merge tty/tty-next Removing drivers/tty/serial/serial_ks8695.c Auto-merging drivers/tty/serial/lpc32xx_hs.c Auto-merging drivers/tty/serial/Makefile Auto-merging drivers/tty/serial/Kconfig Auto-merging Documentation/admin-guide/kernel-parameters.txt Merge made by the 'recursive' strategy. Documentation/admin-guide/kernel-parameters.txt | 6 + .../devicetree/bindings/serial/st,stm32-usart.txt | 5 + Documentation/driver-api/serial/n_gsm.rst | 16 +- drivers/parport/parport_serial.c | 44 +- drivers/tty/hvc/hvcs.c | 4 +- drivers/tty/isicom.c | 1 - drivers/tty/n_gsm.c | 19 +- drivers/tty/nozomi.c | 4 +- drivers/tty/serial/8250/8250_bcm2835aux.c | 4 +- drivers/tty/serial/8250/8250_core.c | 6 +- drivers/tty/serial/8250/8250_dw.c | 173 +--- drivers/tty/serial/8250/8250_dwlib.c | 126 +++ drivers/tty/serial/8250/8250_dwlib.h | 19 + drivers/tty/serial/8250/8250_exar.c | 114 ++- drivers/tty/serial/8250/8250_lpc18xx.c | 4 +- drivers/tty/serial/8250/8250_lpss.c | 76 +- drivers/tty/serial/8250/8250_omap.c | 11 +- drivers/tty/serial/8250/8250_pci.c | 388 ++++++++- drivers/tty/serial/8250/8250_pnp.c | 20 +- drivers/tty/serial/8250/8250_port.c | 93 +- drivers/tty/serial/8250/8250_uniphier.c | 4 +- drivers/tty/serial/8250/Kconfig | 5 + drivers/tty/serial/8250/Makefile | 1 + drivers/tty/serial/Kconfig | 32 +- drivers/tty/serial/Makefile | 2 +- drivers/tty/serial/amba-pl011.c | 5 +- drivers/tty/serial/atmel_serial.c | 3 +- drivers/tty/serial/fsl_linflexuart.c | 942 +++++++++++++++++++++ drivers/tty/serial/fsl_lpuart.c | 518 +++++------ drivers/tty/serial/icom.c | 2 - drivers/tty/serial/imx.c | 32 +- drivers/tty/serial/lantiq.c | 261 ++++-- drivers/tty/serial/lpc32xx_hs.c | 5 +- drivers/tty/serial/mvebu-uart.c | 12 +- drivers/tty/serial/mxs-auart.c | 6 +- drivers/tty/serial/owl-uart.c | 4 +- drivers/tty/serial/qcom_geni_serial.c | 23 +- drivers/tty/serial/rda-uart.c | 4 +- drivers/tty/serial/sccnxp.c | 1 - drivers/tty/serial/serial-tegra.c | 33 +- drivers/tty/serial/serial_ks8695.c | 698 --------------- drivers/tty/serial/serial_mctrl_gpio.h | 6 +- drivers/tty/serial/sh-sci.c | 50 +- drivers/tty/serial/sifive.c | 4 +- drivers/tty/serial/sprd_serial.c | 4 +- drivers/tty/serial/stm32-usart.c | 72 +- drivers/tty/serial/xilinx_uartps.c | 2 +- include/uapi/linux/serial_core.h | 9 +- 48 files changed, 2381 insertions(+), 1492 deletions(-) create mode 100644 drivers/tty/serial/8250/8250_dwlib.c create mode 100644 drivers/tty/serial/8250/8250_dwlib.h create mode 100644 drivers/tty/serial/fsl_linflexuart.c delete mode 100644 drivers/tty/serial/serial_ks8695.c Merging char-misc/char-misc-next (e70c971d7d8a Merge 5.3-rc5 into char-misc-next) $ git merge char-misc/char-misc-next Auto-merging drivers/parport/parport_serial.c Removing drivers/misc/spear13xx_pcie_gadget.c Auto-merging drivers/misc/sgi-xp/xpc_uv.c Auto-merging drivers/misc/Makefile Auto-merging drivers/misc/Kconfig Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. .../ABI/testing/sysfs-bus-intel_th-devices-msc | 3 +- .../{sysfs-class-mic.txt => sysfs-class-mic} | 0 Documentation/ABI/testing/sysfs-platform-dfl-fme | 23 + Documentation/ABI/testing/sysfs-platform-dfl-port | 32 + .../devicetree/bindings/arm/freescale/fsl,scu.txt | 4 +- .../bindings/fpga/altera-fpga2sdram-bridge.txt | 5 +- .../bindings/fpga/altera-freeze-bridge.txt | 5 +- .../bindings/fpga/altera-hps2fpga-bridge.txt | 5 +- .../devicetree/bindings/fpga/fpga-bridge.txt | 13 + .../bindings/fpga/xilinx-pr-decoupler.txt | 8 +- .../devicetree/bindings/nvmem/imx-ocotp.txt | 3 +- Documentation/misc-devices/index.rst | 1 + MAINTAINERS | 12 + drivers/char/ppdev.c | 2 +- drivers/fpga/altera-cvp.c | 3 +- drivers/fpga/altera-pr-ip-core-plat.c | 4 +- drivers/fpga/altera-pr-ip-core.c | 4 +- drivers/fpga/dfl-afu-main.c | 165 ++- drivers/fpga/dfl-fme-main.c | 108 +- drivers/fpga/dfl-fme-pr.c | 7 +- drivers/fpga/dfl-fme.h | 3 +- drivers/fpga/dfl-pci.c | 36 + drivers/fpga/dfl.c | 216 +++- drivers/fpga/dfl.h | 43 +- drivers/hwtracing/intel_th/Makefile | 3 + drivers/hwtracing/intel_th/msu-sink.c | 116 ++ drivers/hwtracing/intel_th/msu.c | 537 +++++++-- drivers/hwtracing/intel_th/msu.h | 20 +- drivers/misc/Kconfig | 9 - drivers/misc/Makefile | 1 - drivers/misc/cardreader/alcor_pci.c | 6 +- drivers/misc/eeprom/ee1004.c | 6 +- drivers/misc/eeprom/max6875.c | 6 +- drivers/misc/fastrpc.c | 5 +- drivers/misc/mei/pci-me.c | 19 +- drivers/misc/mei/pci-txe.c | 19 +- drivers/misc/mic/card/mic_x100.c | 28 +- drivers/misc/sgi-xp/xpc_uv.c | 4 +- drivers/misc/spear13xx_pcie_gadget.c | 797 ------------- drivers/misc/xilinx_sdfec.c | 1209 +++++++++++++++++++- drivers/nvmem/imx-ocotp-scu.c | 7 + drivers/nvmem/imx-ocotp.c | 7 + drivers/nvmem/meson-mx-efuse.c | 3 +- drivers/nvmem/mxs-ocotp.c | 2 +- drivers/nvmem/sunxi_sid.c | 1 + drivers/parport/Makefile | 2 +- drivers/parport/parport_serial.c | 6 +- drivers/slimbus/qcom-ngd-ctrl.c | 5 +- drivers/slimbus/slimbus.h | 2 +- drivers/uio/uio_dmem_genirq.c | 4 +- drivers/w1/masters/mxc_w1.c | 4 +- drivers/w1/masters/omap_hdq.c | 4 +- include/linux/fpga/altera-pr-ip-core.h | 2 +- include/linux/intel_th.h | 79 ++ include/uapi/linux/fpga-dfl.h | 18 + include/uapi/linux/ppdev.h | 5 +- include/uapi/misc/xilinx_sdfec.h | 448 ++++++++ 57 files changed, 3022 insertions(+), 1067 deletions(-) rename Documentation/ABI/testing/{sysfs-class-mic.txt => sysfs-class-mic} (100%) create mode 100644 Documentation/devicetree/bindings/fpga/fpga-bridge.txt create mode 100644 drivers/hwtracing/intel_th/msu-sink.c delete mode 100644 drivers/misc/spear13xx_pcie_gadget.c create mode 100644 include/linux/intel_th.h create mode 100644 include/uapi/misc/xilinx_sdfec.h Merging extcon/extcon-next (a3fc57233977 extcon: adc-jack: Remove dev_err() usage after platform_get_irq()) $ git merge extcon/extcon-next Merge made by the 'recursive' strategy. .../devicetree/bindings/extcon/extcon-arizona.txt | 2 +- .../devicetree/bindings/extcon/extcon-fsa9480.txt | 4 ++- drivers/extcon/extcon-adc-jack.c | 4 +-- drivers/extcon/extcon-arizona.c | 2 +- drivers/extcon/extcon-axp288.c | 16 ++++++------ drivers/extcon/extcon-fsa9480.c | 1 + drivers/extcon/extcon-gpio.c | 29 ++++++++++++++-------- drivers/extcon/extcon-max77843.c | 6 ++--- drivers/extcon/extcon-sm5502.c | 2 +- 9 files changed, 39 insertions(+), 27 deletions(-) Merging soundwire/next (183c7687802e soundwire: intel: move shutdown() callback and don't export symbol) $ git merge soundwire/next Auto-merging drivers/soundwire/cadence_master.c Merge made by the 'recursive' strategy. drivers/soundwire/bus.c | 10 +++- drivers/soundwire/bus.h | 7 ++- drivers/soundwire/cadence_master.c | 104 ++++++++++++++++++++++++------------ drivers/soundwire/cadence_master.h | 2 - drivers/soundwire/intel.c | 68 ++++++++++++++++++----- drivers/soundwire/intel_init.c | 11 ++++ drivers/soundwire/mipi_disco.c | 18 +++---- drivers/soundwire/stream.c | 93 +++++++++++++++++++++----------- include/linux/soundwire/sdw.h | 4 ++ include/linux/soundwire/sdw_intel.h | 1 + 10 files changed, 223 insertions(+), 95 deletions(-) Merging thunderbolt/next (04f7745300ed thunderbolt: Show key using %*pE not %*pEp) $ git merge thunderbolt/next Merge made by the 'recursive' strategy. drivers/thunderbolt/eeprom.c | 2 +- drivers/thunderbolt/xdomain.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Merging staging/staging-next (2cb05d8788f7 staging: rtl8723bs: core: Remove unneeded declaration WFD_OUI) $ git merge staging/staging-next Removing drivers/staging/rtl8723bs/os_dep/rtw_proc.h Removing drivers/staging/rtl8723bs/os_dep/rtw_proc.c Removing drivers/staging/rtl8723bs/hal/hal_phy.c Auto-merging drivers/staging/media/sunxi/cedrus/cedrus_hw.c Auto-merging drivers/staging/media/imx/imx7-media-csi.c Auto-merging drivers/staging/media/hantro/hantro_drv.c Removing drivers/staging/erofs/unzip_vle.c Auto-merging MAINTAINERS Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml Removing Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.txt Merge made by the 'recursive' strategy. .../ABI/testing/sysfs-bus-iio-dfsdm-adc-stm32 | 2 +- .../ABI/testing/sysfs-bus-iio-timer-stm32 | 23 - .../devicetree/bindings/iio/adc/st,stm32-adc.txt | 6 + .../bindings/iio/chemical/plantower,pms7003.txt | 26 - .../bindings/iio/chemical/plantower,pms7003.yaml | 51 + .../devicetree/bindings/iio/imu/adi,adis16460.yaml | 53 + .../devicetree/bindings/iio/imu/st_lsm6dsx.txt | 2 + .../devicetree/bindings/iio/light/noa1305.yaml | 44 + .../devicetree/bindings/iio/light/stk33xx.yaml | 49 + .../devicetree/bindings/iio/mount-matrix.txt | 203 +++ .../bindings/iio/potentiometer/max5432.yaml | 44 + .../devicetree/bindings/vendor-prefixes.yaml | 2 + MAINTAINERS | 14 + drivers/counter/ftm-quaddec.c | 30 +- drivers/iio/accel/Kconfig | 4 +- drivers/iio/accel/cros_ec_accel_legacy.c | 352 +---- drivers/iio/accel/mxc4005.c | 40 +- drivers/iio/accel/sca3000.c | 2 +- drivers/iio/accel/st_accel.h | 1 + drivers/iio/accel/st_accel_buffer.c | 44 +- drivers/iio/accel/st_accel_core.c | 32 +- drivers/iio/accel/st_accel_i2c.c | 23 +- drivers/iio/accel/st_accel_spi.c | 20 +- drivers/iio/adc/ad7606.c | 91 +- drivers/iio/adc/ad7606.h | 57 +- drivers/iio/adc/ad7606_par.c | 4 +- drivers/iio/adc/ad7606_spi.c | 175 ++- drivers/iio/adc/at91_adc.c | 4 +- drivers/iio/adc/axp288_adc.c | 4 +- drivers/iio/adc/bcm_iproc_adc.c | 7 +- drivers/iio/adc/da9150-gpadc.c | 4 +- drivers/iio/adc/envelope-detector.c | 5 +- drivers/iio/adc/exynos_adc.c | 4 +- drivers/iio/adc/fsl-imx25-gcq.c | 1 - drivers/iio/adc/hi8435.c | 34 +- drivers/iio/adc/imx7d_adc.c | 4 +- drivers/iio/adc/lpc32xx_adc.c | 4 +- drivers/iio/adc/npcm_adc.c | 1 - drivers/iio/adc/rockchip_saradc.c | 4 +- drivers/iio/adc/sc27xx_adc.c | 45 +- drivers/iio/adc/spear_adc.c | 1 - drivers/iio/adc/stm32-adc-core.c | 194 ++- drivers/iio/adc/stm32-adc.c | 4 +- drivers/iio/adc/stm32-dfsdm-adc.c | 5 +- drivers/iio/adc/sun4i-gpadc-iio.c | 4 +- drivers/iio/adc/twl6030-gpadc.c | 4 +- drivers/iio/adc/vf610_adc.c | 4 +- .../iio/common/cros_ec_sensors/cros_ec_sensors.c | 54 +- .../common/cros_ec_sensors/cros_ec_sensors_core.c | 150 +- drivers/iio/common/st_sensors/st_sensors_buffer.c | 10 +- drivers/iio/common/st_sensors/st_sensors_core.c | 118 +- drivers/iio/common/st_sensors/st_sensors_i2c.c | 82 +- drivers/iio/common/st_sensors/st_sensors_spi.c | 148 +- drivers/iio/common/st_sensors/st_sensors_trigger.c | 31 +- drivers/iio/gyro/st_gyro.h | 1 + drivers/iio/gyro/st_gyro_buffer.c | 48 +- drivers/iio/gyro/st_gyro_core.c | 32 +- drivers/iio/gyro/st_gyro_i2c.c | 22 +- drivers/iio/gyro/st_gyro_spi.c | 20 +- drivers/iio/humidity/am2315.c | 24 +- drivers/iio/humidity/hdc100x.c | 19 +- drivers/iio/imu/Kconfig | 12 + drivers/iio/imu/Makefile | 1 + drivers/iio/imu/adis.c | 12 + drivers/iio/imu/adis16460.c | 489 ++++++ drivers/iio/imu/inv_mpu6050/Kconfig | 10 +- drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 3 +- drivers/iio/imu/st_lsm6dsx/Kconfig | 11 +- drivers/iio/imu/st_lsm6dsx/Makefile | 1 + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 17 +- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 17 +- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 483 ++++-- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 10 + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c | 57 + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 10 + drivers/iio/light/Kconfig | 11 + drivers/iio/light/Makefile | 1 + drivers/iio/light/apds9960.c | 2 +- drivers/iio/light/cm3323.c | 33 +- drivers/iio/light/cm36651.c | 12 +- drivers/iio/light/cros_ec_light_prox.c | 51 +- drivers/iio/light/noa1305.c | 313 ++++ drivers/iio/light/si1145.c | 42 +- drivers/iio/light/stk3310.c | 9 + drivers/iio/light/tsl2772.c | 124 +- drivers/iio/light/veml6070.c | 6 +- drivers/iio/magnetometer/mmc35240.c | 4 +- drivers/iio/magnetometer/st_magn.h | 1 + drivers/iio/magnetometer/st_magn_buffer.c | 31 +- drivers/iio/magnetometer/st_magn_core.c | 32 +- drivers/iio/magnetometer/st_magn_i2c.c | 22 +- drivers/iio/magnetometer/st_magn_spi.c | 20 +- drivers/iio/potentiometer/Kconfig | 11 + drivers/iio/potentiometer/Makefile | 1 + drivers/iio/potentiometer/max5432.c | 135 ++ drivers/iio/pressure/cros_ec_baro.c | 19 +- drivers/iio/pressure/hp03.c | 6 +- drivers/iio/pressure/st_pressure.h | 1 + drivers/iio/pressure/st_pressure_buffer.c | 39 +- drivers/iio/pressure/st_pressure_core.c | 32 +- drivers/iio/pressure/st_pressure_i2c.c | 31 +- drivers/iio/pressure/st_pressure_spi.c | 22 +- drivers/iio/temperature/maxim_thermocouple.c | 25 +- drivers/iio/trigger/stm32-timer-trigger.c | 84 -- drivers/staging/android/ion/ion.c | 36 - drivers/staging/android/ion/ion.h | 10 +- drivers/staging/comedi/drivers/daqboard2000.c | 7 +- drivers/staging/comedi/drivers/ni_mio_common.c | 2 +- drivers/staging/comedi/drivers/usbduxsigma.c | 2 +- drivers/staging/emxx_udc/emxx_udc.c | 4 +- .../erofs/Documentation/filesystems/erofs.txt | 14 + drivers/staging/erofs/Kconfig | 111 +- drivers/staging/erofs/Makefile | 4 +- drivers/staging/erofs/compress.h | 2 +- drivers/staging/erofs/data.c | 51 +- drivers/staging/erofs/decompressor.c | 47 +- drivers/staging/erofs/dir.c | 48 +- drivers/staging/erofs/erofs_fs.h | 66 +- drivers/staging/erofs/include/trace/events/erofs.h | 2 +- drivers/staging/erofs/inode.c | 52 +- drivers/staging/erofs/internal.h | 260 ++-- drivers/staging/erofs/namei.c | 15 +- drivers/staging/erofs/super.c | 280 ++-- drivers/staging/erofs/{include/linux => }/tagptr.h | 12 +- drivers/staging/erofs/unzip_vle.c | 1591 -------------------- drivers/staging/erofs/utils.c | 112 +- drivers/staging/erofs/xattr.c | 25 +- drivers/staging/erofs/xattr.h | 43 +- drivers/staging/erofs/zdata.c | 1406 +++++++++++++++++ drivers/staging/erofs/{unzip_vle.h => zdata.h} | 127 +- drivers/staging/erofs/zmap.c | 33 +- drivers/staging/erofs/{unzip_pagevec.h => zpvec.h} | 52 +- drivers/staging/fbtft/fb_pcd8544.c | 4 +- drivers/staging/fsl-dpaa2/ethsw/TODO | 1 - drivers/staging/fsl-dpaa2/ethsw/dpsw-cmd.h | 15 +- drivers/staging/fsl-dpaa2/ethsw/dpsw.c | 51 + drivers/staging/fsl-dpaa2/ethsw/dpsw.h | 56 +- drivers/staging/fsl-dpaa2/ethsw/ethsw-ethtool.c | 44 +- drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 309 ++-- drivers/staging/fsl-dpaa2/ethsw/ethsw.h | 4 + drivers/staging/gasket/apex_driver.c | 2 +- drivers/staging/gasket/gasket_ioctl.c | 12 +- drivers/staging/goldfish/goldfish_audio.c | 4 +- drivers/staging/greybus/audio_manager.c | 2 +- drivers/staging/greybus/i2c.c | 22 +- drivers/staging/iio/adc/ad7192.c | 12 + drivers/staging/iio/resolver/ad2s1210.c | 12 +- drivers/staging/isdn/hysdn/hysdn_net.c | 2 +- drivers/staging/isdn/hysdn/hysdn_procconf.c | 2 +- drivers/staging/kpc2000/kpc2000_spi.c | 3 +- drivers/staging/media/allegro-dvt/allegro-core.c | 4 +- drivers/staging/media/hantro/hantro_drv.c | 4 +- drivers/staging/media/imx/imx7-media-csi.c | 4 +- drivers/staging/media/imx/imx7-mipi-csis.c | 4 +- drivers/staging/media/meson/vdec/esparser.c | 4 +- drivers/staging/media/omap4iss/iss.c | 1 - drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 5 +- drivers/staging/most/cdev/cdev.c | 4 +- drivers/staging/most/dim2/dim2.c | 21 - drivers/staging/most/dim2/hal.c | 99 +- drivers/staging/most/dim2/hal.h | 4 - drivers/staging/most/net/net.c | 3 +- drivers/staging/most/video/video.c | 3 +- drivers/staging/mt7621-dma/mtk-hsdma.c | 4 +- drivers/staging/mt7621-pci/pci-mt7621.c | 12 +- drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c | 5 +- drivers/staging/nvec/nvec.c | 4 +- drivers/staging/olpc_dcon/TODO | 4 - drivers/staging/ralink-gdma/ralink-gdma.c | 4 +- drivers/staging/rtl8188eu/core/rtw_cmd.c | 2 +- drivers/staging/rtl8188eu/core/rtw_efuse.c | 141 +- drivers/staging/rtl8188eu/core/rtw_mlme.c | 11 +- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 2 +- drivers/staging/rtl8188eu/core/rtw_recv.c | 8 +- drivers/staging/rtl8188eu/core/rtw_security.c | 41 +- drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 19 +- drivers/staging/rtl8188eu/hal/bb_cfg.c | 2 +- drivers/staging/rtl8188eu/hal/rf_cfg.c | 14 +- drivers/staging/rtl8188eu/hal/usb_halinit.c | 143 +- .../staging/rtl8188eu/include/hal8188e_phy_reg.h | 881 ----------- drivers/staging/rtl8188eu/include/hal_intf.h | 2 +- drivers/staging/rtl8188eu/include/mlme_osdep.h | 1 - drivers/staging/rtl8188eu/include/osdep_service.h | 2 - drivers/staging/rtl8188eu/include/rtw_mlme.h | 2 +- drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 1 - drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 5 - drivers/staging/rtl8188eu/os_dep/osdep_service.c | 5 - drivers/staging/rtl8192e/Kconfig | 1 + drivers/staging/rtl8192e/rtllib.h | 4 +- drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 203 ++- drivers/staging/rtl8192e/rtllib_rx.c | 2 - drivers/staging/rtl8192e/rtllib_softmac.c | 24 +- drivers/staging/rtl8192u/Kconfig | 2 + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 2 +- .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 201 ++- drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 455 +++--- drivers/staging/rtl8192u/r8190_rtl8256.c | 4 +- drivers/staging/rtl8192u/r8192U_core.c | 11 +- drivers/staging/rtl8192u/r8192U_dm.c | 2 +- drivers/staging/rtl8712/os_intfs.c | 35 +- drivers/staging/rtl8712/recv_linux.c | 18 +- drivers/staging/rtl8712/recv_osdep.h | 16 +- drivers/staging/rtl8712/rtl8712_cmd.c | 14 +- drivers/staging/rtl8712/rtl8712_recv.c | 54 +- drivers/staging/rtl8712/rtl8712_recv.h | 2 +- drivers/staging/rtl8712/rtl8712_xmit.c | 46 +- drivers/staging/rtl8712/rtl8712_xmit.h | 8 +- drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 5 +- drivers/staging/rtl8712/rtl871x_ioctl_set.c | 16 +- drivers/staging/rtl8712/rtl871x_ioctl_set.h | 4 +- drivers/staging/rtl8712/rtl871x_mlme.c | 34 +- drivers/staging/rtl8712/rtl871x_mlme.h | 8 +- drivers/staging/rtl8712/rtl871x_mp.c | 9 +- drivers/staging/rtl8712/rtl871x_pwrctrl.c | 10 +- drivers/staging/rtl8712/rtl871x_pwrctrl.h | 2 +- drivers/staging/rtl8712/rtl871x_recv.c | 22 +- drivers/staging/rtl8712/rtl871x_recv.h | 2 +- drivers/staging/rtl8712/rtl871x_security.c | 29 +- drivers/staging/rtl8712/rtl871x_security.h | 4 +- drivers/staging/rtl8712/rtl871x_xmit.c | 65 +- drivers/staging/rtl8712/rtl871x_xmit.h | 20 +- drivers/staging/rtl8712/usb_intf.c | 2 +- drivers/staging/rtl8712/usb_osintf.h | 4 +- drivers/staging/rtl8712/xmit_linux.c | 2 +- drivers/staging/rtl8723bs/Makefile | 1 - drivers/staging/rtl8723bs/core/rtw_ap.c | 113 +- drivers/staging/rtl8723bs/core/rtw_cmd.c | 11 +- drivers/staging/rtl8723bs/core/rtw_debug.c | 1307 ---------------- drivers/staging/rtl8723bs/core/rtw_io.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 15 +- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 117 +- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 5 - drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 6 - drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 1 - drivers/staging/rtl8723bs/hal/hal_btcoex.c | 40 +- drivers/staging/rtl8723bs/hal/hal_com.c | 5 +- drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 18 - drivers/staging/rtl8723bs/hal/hal_intf.c | 2 +- drivers/staging/rtl8723bs/hal/hal_phy.c | 157 -- drivers/staging/rtl8723bs/hal/odm.c | 19 +- drivers/staging/rtl8723bs/hal/odm.h | 4 - drivers/staging/rtl8723bs/hal/odm_CfoTracking.c | 5 - drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 7 - drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 14 +- drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 8 +- drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 1 - drivers/staging/rtl8723bs/include/autoconf.h | 4 - drivers/staging/rtl8723bs/include/drv_types.h | 2 - drivers/staging/rtl8723bs/include/hal_btcoex.h | 8 +- drivers/staging/rtl8723bs/include/hal_com_phycfg.h | 17 - drivers/staging/rtl8723bs/include/hal_intf.h | 2 +- drivers/staging/rtl8723bs/include/hal_phy_cfg.h | 4 +- drivers/staging/rtl8723bs/include/osdep_intf.h | 2 - drivers/staging/rtl8723bs/include/rtw_debug.h | 77 - drivers/staging/rtl8723bs/include/rtw_mlme.h | 6 +- drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 3 +- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 8 - drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 2 - drivers/staging/rtl8723bs/os_dep/os_intfs.c | 21 +- drivers/staging/rtl8723bs/os_dep/osdep_service.c | 4 - drivers/staging/rtl8723bs/os_dep/rtw_proc.c | 779 ---------- drivers/staging/rtl8723bs/os_dep/rtw_proc.h | 37 - drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 5 +- drivers/staging/sm750fb/ddk750.h | 3 - drivers/staging/sm750fb/ddk750_swi2c.c | 3 - drivers/staging/sm750fb/ddk750_swi2c.h | 3 - .../vc04_services/bcm2835-camera/mmal-vchiq.h | 2 +- .../interface/vchiq_arm/vchiq_2835_arm.c | 4 +- .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 5 +- drivers/staging/vt6656/rxtx.c | 10 +- drivers/staging/vt6656/usbpipe.c | 2 +- drivers/staging/wilc1000/wilc_hif.c | 70 +- drivers/staging/wilc1000/wilc_hif.h | 6 +- drivers/staging/wilc1000/wilc_mon.c | 3 +- drivers/staging/wilc1000/wilc_netdev.c | 76 +- drivers/staging/wilc1000/wilc_sdio.c | 4 +- drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 63 +- drivers/staging/wilc1000/wilc_wfi_netdevice.h | 2 - drivers/staging/wilc1000/wilc_wlan.c | 109 +- drivers/staging/wilc1000/wilc_wlan.h | 9 +- drivers/staging/wilc1000/wilc_wlan_cfg.c | 78 +- drivers/staging/wilc1000/wilc_wlan_cfg.h | 4 +- drivers/staging/wilc1000/wilc_wlan_if.h | 3 +- drivers/staging/wlan-ng/hfa384x_usb.c | 210 +-- drivers/staging/wlan-ng/prism2mib.c | 44 +- drivers/staging/wlan-ng/prism2sta.c | 2 +- include/linux/iio/common/cros_ec_sensors_core.h | 28 +- include/linux/iio/common/st_sensors.h | 66 +- include/linux/iio/common/st_sensors_i2c.h | 4 +- include/linux/iio/common/st_sensors_spi.h | 4 +- include/linux/iio/imu/adis.h | 2 + 291 files changed, 6888 insertions(+), 9301 deletions(-) delete mode 100644 Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.txt create mode 100644 Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.yaml create mode 100644 Documentation/devicetree/bindings/iio/imu/adi,adis16460.yaml create mode 100644 Documentation/devicetree/bindings/iio/light/noa1305.yaml create mode 100644 Documentation/devicetree/bindings/iio/light/stk33xx.yaml create mode 100644 Documentation/devicetree/bindings/iio/mount-matrix.txt create mode 100644 Documentation/devicetree/bindings/iio/potentiometer/max5432.yaml create mode 100644 drivers/iio/imu/adis16460.c create mode 100644 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c create mode 100644 drivers/iio/light/noa1305.c create mode 100644 drivers/iio/potentiometer/max5432.c rename drivers/staging/erofs/{include/linux => }/tagptr.h (94%) delete mode 100644 drivers/staging/erofs/unzip_vle.c create mode 100644 drivers/staging/erofs/zdata.c rename drivers/staging/erofs/{unzip_vle.h => zdata.h} (52%) rename drivers/staging/erofs/{unzip_pagevec.h => zpvec.h} (74%) delete mode 100644 drivers/staging/rtl8723bs/hal/hal_phy.c delete mode 100644 drivers/staging/rtl8723bs/os_dep/rtw_proc.c delete mode 100644 drivers/staging/rtl8723bs/os_dep/rtw_proc.h Merging mux/for-next (05fb8284a417 Merge branch 'i2c-mux/for-next' into for-next) $ git merge mux/for-next Merge made by the 'recursive' strategy. Merging icc/icc-next (6311b6521bcc drivers: qcom: Add BCM vote macro to header) $ git merge icc/icc-next Auto-merging drivers/clk/qcom/clk-rpmh.c Merge made by the 'recursive' strategy. .../bindings/interconnect/qcom,qcs404.txt | 45 ++ drivers/clk/qcom/clk-rpmh.c | 16 +- drivers/interconnect/core.c | 27 +- drivers/interconnect/qcom/Kconfig | 12 + drivers/interconnect/qcom/Makefile | 4 + drivers/interconnect/qcom/qcs404.c | 539 +++++++++++++++++++++ drivers/interconnect/qcom/sdm845.c | 160 ++++-- drivers/interconnect/qcom/smd-rpm.c | 77 +++ drivers/interconnect/qcom/smd-rpm.h | 15 + include/dt-bindings/interconnect/qcom,qcs404.h | 88 ++++ include/linux/interconnect-provider.h | 7 +- include/linux/interconnect.h | 5 + include/soc/qcom/tcs.h | 20 +- 13 files changed, 948 insertions(+), 67 deletions(-) create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,qcs404.txt create mode 100644 drivers/interconnect/qcom/qcs404.c create mode 100644 drivers/interconnect/qcom/smd-rpm.c create mode 100644 drivers/interconnect/qcom/smd-rpm.h create mode 100644 include/dt-bindings/interconnect/qcom,qcs404.h Merging slave-dma/next (d071fd294f24 dmaengine: change alignment of mux_configure32 and fsl_edma_chan_mux) $ git merge slave-dma/next Removing include/linux/omap-dmaengine.h Removing include/linux/edma.h Auto-merging drivers/dma/ti/omap-dma.c Auto-merging drivers/dma/tegra210-adma.c Auto-merging drivers/dma/stm32-mdma.c Auto-merging MAINTAINERS Removing Documentation/devicetree/bindings/dma/sun6i-dma.txt Removing Documentation/devicetree/bindings/dma/sun4i-dma.txt Merge made by the 'recursive' strategy. .../bindings/dma/allwinner,sun4i-a10-dma.yaml | 55 +++++++ .../bindings/dma/allwinner,sun50i-a64-dma.yaml | 88 ++++++++++ .../bindings/dma/allwinner,sun6i-a31-dma.yaml | 62 +++++++ .../devicetree/bindings/dma/dma-common.yaml | 45 ++++++ .../devicetree/bindings/dma/dma-controller.yaml | 35 ++++ .../devicetree/bindings/dma/dma-router.yaml | 50 ++++++ Documentation/devicetree/bindings/dma/dma.txt | 114 +------------ .../dma/{nbpfaxi.txt => renesas,nbpfaxi.txt} | 0 .../bindings/dma/{shdma.txt => renesas,shdma.txt} | 0 .../devicetree/bindings/dma/sun4i-dma.txt | 45 ------ .../devicetree/bindings/dma/sun6i-dma.txt | 81 ---------- MAINTAINERS | 2 +- drivers/dma/bcm2835-dma.c | 4 +- drivers/dma/dma-jz4780.c | 19 ++- drivers/dma/dw/pci.c | 2 +- drivers/dma/fsl-edma-common.c | 20 ++- drivers/dma/fsl-edma-common.h | 4 + drivers/dma/fsl-edma.c | 81 +++++++++- drivers/dma/fsl-qdma.c | 9 +- drivers/dma/imx-dma.c | 1 + drivers/dma/imx-sdma.c | 4 - drivers/dma/mediatek/mtk-uart-apdma.c | 4 +- drivers/dma/mv_xor_v2.c | 11 +- drivers/dma/pl330.c | 9 +- drivers/dma/qcom/hidma_ll.c | 2 - drivers/dma/qcom/hidma_mgmt.c | 9 +- drivers/dma/s3c24xx-dma.c | 5 +- drivers/dma/sh/rcar-dmac.c | 4 +- drivers/dma/sh/usb-dmac.c | 4 +- drivers/dma/st_fdma.c | 4 +- drivers/dma/stm32-dma.c | 6 +- drivers/dma/stm32-dmamux.c | 3 +- drivers/dma/stm32-mdma.c | 7 +- drivers/dma/sun4i-dma.c | 4 +- drivers/dma/sun6i-dma.c | 4 +- drivers/dma/tegra20-apb-dma.c | 75 ++++++++- drivers/dma/tegra210-adma.c | 12 +- drivers/dma/ti/edma.c | 180 ++++++++++++++------- drivers/dma/ti/omap-dma.c | 56 ++++--- drivers/dma/uniphier-mdmac.c | 5 +- drivers/dma/xgene-dma.c | 8 +- include/linux/edma.h | 29 ---- include/linux/omap-dma.h | 2 - include/linux/omap-dmaengine.h | 18 --- 44 files changed, 708 insertions(+), 474 deletions(-) create mode 100644 Documentation/devicetree/bindings/dma/allwinner,sun4i-a10-dma.yaml create mode 100644 Documentation/devicetree/bindings/dma/allwinner,sun50i-a64-dma.yaml create mode 100644 Documentation/devicetree/bindings/dma/allwinner,sun6i-a31-dma.yaml create mode 100644 Documentation/devicetree/bindings/dma/dma-common.yaml create mode 100644 Documentation/devicetree/bindings/dma/dma-controller.yaml create mode 100644 Documentation/devicetree/bindings/dma/dma-router.yaml rename Documentation/devicetree/bindings/dma/{nbpfaxi.txt => renesas,nbpfaxi.txt} (100%) rename Documentation/devicetree/bindings/dma/{shdma.txt => renesas,shdma.txt} (100%) delete mode 100644 Documentation/devicetree/bindings/dma/sun4i-dma.txt delete mode 100644 Documentation/devicetree/bindings/dma/sun6i-dma.txt delete mode 100644 include/linux/edma.h delete mode 100644 include/linux/omap-dmaengine.h Merging cgroup/for-next (653a23ca7e1e Use kvmalloc in cgroups-v1) $ git merge cgroup/for-next Auto-merging kernel/cgroup/cgroup.c Merge made by the 'recursive' strategy. kernel/cgroup/cgroup-v1.c | 27 ++++----------------------- kernel/cgroup/cgroup.c | 4 ++-- 2 files changed, 6 insertions(+), 25 deletions(-) Merging scsi/for-next (182747f87687 Merge branch 'misc' into for-next) $ git merge scsi/for-next Auto-merging drivers/target/target_core_user.c Auto-merging drivers/scsi/ufs/ufshcd.c Auto-merging drivers/scsi/scsi_lib.c Auto-merging drivers/scsi/qla2xxx/qla_os.c CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_os.c Auto-merging drivers/scsi/qla2xxx/qla_init.c Auto-merging drivers/scsi/qla2xxx/qla_attr.c Resolved 'drivers/scsi/qla2xxx/qla_os.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit --no-edit -v -a [master 534dacad45ad] Merge remote-tracking branch 'scsi/for-next' $ git diff -M --stat --summary HEAD^.. drivers/scsi/aic94xx/aic94xx_init.c | 9 +- drivers/scsi/csiostor/csio_wr.c | 8 +- drivers/scsi/cxlflash/main.c | 12 +- drivers/scsi/esas2r/esas2r_init.c | 13 +- drivers/scsi/esas2r/esas2r_ioctl.c | 14 +- drivers/scsi/fdomain.c | 6 +- drivers/scsi/fdomain_isa.c | 5 +- drivers/scsi/hisi_sas/hisi_sas.h | 36 ++- drivers/scsi/hisi_sas/hisi_sas_main.c | 438 +++++++++++++++++++--------- drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 43 +-- drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 75 +---- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 148 +++++----- drivers/scsi/ibmvscsi/ibmvfc.c | 3 + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 3 + drivers/scsi/lpfc/lpfc_bsg.c | 4 +- drivers/scsi/megaraid/megaraid_sas.h | 1 + drivers/scsi/megaraid/megaraid_sas_base.c | 112 +++++-- drivers/scsi/megaraid/megaraid_sas_fusion.c | 29 +- drivers/scsi/mpt3sas/mpi/mpi2.h | 5 +- drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 10 +- drivers/scsi/mpt3sas/mpi/mpi2_image.h | 39 +-- drivers/scsi/mpt3sas/mpi/mpi2_pci.h | 13 +- drivers/scsi/mpt3sas/mpi/mpi2_tool.h | 13 +- drivers/scsi/mpt3sas/mpt3sas_base.c | 175 ++++++++++- drivers/scsi/mpt3sas/mpt3sas_base.h | 28 +- drivers/scsi/mpt3sas/mpt3sas_ctl.c | 76 ++++- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 156 ++++++---- drivers/scsi/ncr53c8xx.c | 4 + drivers/scsi/pm8001/pm8001_sas.c | 13 +- drivers/scsi/pmcraid.c | 2 +- drivers/scsi/qla2xxx/qla_attr.c | 12 +- drivers/scsi/qla2xxx/qla_bsg.c | 23 +- drivers/scsi/qla2xxx/qla_dbg.c | 3 +- drivers/scsi/qla2xxx/qla_def.h | 132 ++++++--- drivers/scsi/qla2xxx/qla_dfs.c | 9 +- drivers/scsi/qla2xxx/qla_dsd.h | 2 + drivers/scsi/qla2xxx/qla_fw.h | 8 +- drivers/scsi/qla2xxx/qla_gbl.h | 33 ++- drivers/scsi/qla2xxx/qla_gs.c | 249 +++++++--------- drivers/scsi/qla2xxx/qla_init.c | 311 +++++++++----------- drivers/scsi/qla2xxx/qla_inline.h | 28 +- drivers/scsi/qla2xxx/qla_iocb.c | 226 ++++++-------- drivers/scsi/qla2xxx/qla_isr.c | 25 +- drivers/scsi/qla2xxx/qla_mbx.c | 10 +- drivers/scsi/qla2xxx/qla_mid.c | 4 +- drivers/scsi/qla2xxx/qla_mr.c | 67 ++--- drivers/scsi/qla2xxx/qla_nvme.c | 32 +- drivers/scsi/qla2xxx/qla_nvme.h | 5 +- drivers/scsi/qla2xxx/qla_nx.c | 16 +- drivers/scsi/qla2xxx/qla_nx.h | 14 +- drivers/scsi/qla2xxx/qla_nx2.c | 2 +- drivers/scsi/qla2xxx/qla_os.c | 236 +++++++-------- drivers/scsi/qla2xxx/qla_sup.c | 8 +- drivers/scsi/qla2xxx/qla_target.c | 212 ++++++-------- drivers/scsi/qla2xxx/qla_target.h | 35 +-- drivers/scsi/qla2xxx/qla_tmpl.c | 7 +- drivers/scsi/qla2xxx/qla_version.h | 2 +- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 27 +- drivers/scsi/qlogicpti.c | 10 + drivers/scsi/scsi_debugfs.c | 5 +- drivers/scsi/scsi_lib.c | 52 +++- drivers/scsi/scsi_logging.c | 48 +-- drivers/scsi/sun3_scsi.c | 2 + drivers/scsi/sym53c8xx_2/sym_nvram.c | 2 +- drivers/scsi/ufs/cdns-pltfrm.c | 13 +- drivers/scsi/ufs/ufs-sysfs.c | 18 +- drivers/scsi/ufs/ufs.h | 2 +- drivers/scsi/ufs/ufshcd.c | 267 ++++++++++------- drivers/scsi/ufs/ufshcd.h | 49 +++- drivers/scsi/virtio_scsi.c | 55 +++- drivers/scsi/wd33c93.c | 1 + drivers/target/target_core_user.c | 20 ++ include/linux/nvme-fc-driver.h | 2 + include/scsi/scsi_cmnd.h | 1 + include/scsi/scsi_dbg.h | 2 - include/scsi/scsi_host.h | 16 +- include/uapi/scsi/scsi_bsg_fc.h | 54 ++-- include/uapi/scsi/scsi_netlink.h | 20 +- include/uapi/scsi/scsi_netlink_fc.h | 17 +- 79 files changed, 2155 insertions(+), 1732 deletions(-) Merging scsi-mkp/for-next (c54591a3c8b8 Merge branch '5.4/scsi-queue' into 5.4/scsi-next) $ git merge scsi-mkp/for-next Auto-merging include/linux/blk-mq.h Auto-merging drivers/scsi/scsi_lib.c Auto-merging drivers/scsi/qla2xxx/qla_os.c Auto-merging drivers/scsi/qla2xxx/qla_init.c Merge made by the 'recursive' strategy. drivers/scsi/fnic/fnic_debugfs.c | 4 +- drivers/scsi/lpfc/lpfc.h | 9 +- drivers/scsi/lpfc/lpfc_attr.c | 76 +++- drivers/scsi/lpfc/lpfc_bsg.c | 25 +- drivers/scsi/lpfc/lpfc_crtn.h | 3 +- drivers/scsi/lpfc/lpfc_ct.c | 68 ++- drivers/scsi/lpfc/lpfc_debugfs.c | 96 +---- drivers/scsi/lpfc/lpfc_debugfs.h | 61 +-- drivers/scsi/lpfc/lpfc_disc.h | 3 + drivers/scsi/lpfc/lpfc_els.c | 116 ++++- drivers/scsi/lpfc/lpfc_hbadisc.c | 181 ++++---- drivers/scsi/lpfc/lpfc_hw.h | 6 +- drivers/scsi/lpfc/lpfc_hw4.h | 34 ++ drivers/scsi/lpfc/lpfc_init.c | 857 +++++++++++++++++++------------------ drivers/scsi/lpfc/lpfc_mem.c | 65 +-- drivers/scsi/lpfc/lpfc_nportdisc.c | 43 +- drivers/scsi/lpfc/lpfc_nvme.c | 389 ++++++++++------- drivers/scsi/lpfc/lpfc_nvmet.c | 28 +- drivers/scsi/lpfc/lpfc_scsi.c | 512 ++++++++++++++++------ drivers/scsi/lpfc/lpfc_sli.c | 530 +++++++++++++++++------ drivers/scsi/lpfc/lpfc_sli.h | 11 +- drivers/scsi/lpfc/lpfc_sli4.h | 47 +- drivers/scsi/lpfc/lpfc_version.h | 2 +- drivers/scsi/lpfc/lpfc_vport.c | 8 +- drivers/scsi/qla2xxx/qla_init.c | 212 +++++---- drivers/scsi/qla2xxx/qla_os.c | 1 + drivers/scsi/scsi_lib.c | 4 +- drivers/scsi/ufs/ufs-qcom.c | 2 +- 28 files changed, 2081 insertions(+), 1312 deletions(-) Merging vhost/linux-next (73f628ec9e6b vhost: disable metadata prefetch optimization) $ git merge vhost/linux-next Already up to date. Merging rpmsg/for-next (7f1345e9efcc Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) $ git merge rpmsg/for-next Merge made by the 'recursive' strategy. drivers/remoteproc/qcom_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Merging gpio/for-next (67d5826a3303 Merge branch 'devel' into for-next) $ git merge gpio/for-next Auto-merging sound/soc/intel/boards/cht_bsw_max98090_ti.c Auto-merging include/linux/acpi.h Removing drivers/gpio/gpio-ks8695.c Auto-merging drivers/gpio/gpio-ixp4xx.c CONFLICT (content): Merge conflict in drivers/gpio/gpio-ixp4xx.c Auto-merging drivers/gpio/Makefile Auto-merging drivers/gpio/Kconfig Resolved 'drivers/gpio/gpio-ixp4xx.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit --no-edit -v -a [master 29ca05db09c0] Merge remote-tracking branch 'gpio/for-next' $ git diff -M --stat --summary HEAD^.. .../devicetree/bindings/gpio/gpio-davinci.txt | 1 + .../devicetree/bindings/gpio/gpio-mpc8xxx.txt | 16 +- .../devicetree/bindings/gpio/sgpio-aspeed.txt | 45 ++ Documentation/driver-api/gpio/driver.rst | 122 +++++- arch/unicore32/kernel/irq.c | 1 - drivers/gpio/Kconfig | 4 +- drivers/gpio/Makefile | 1 - drivers/gpio/gpio-arizona.c | 4 +- drivers/gpio/gpio-aspeed.c | 60 ++- drivers/gpio/gpio-bd70528.c | 4 +- drivers/gpio/gpio-brcmstb.c | 4 +- drivers/gpio/gpio-cadence.c | 36 +- drivers/gpio/gpio-dwapb.c | 1 + drivers/gpio/gpio-eic-sprd.c | 4 +- drivers/gpio/gpio-ftgpio010.c | 8 +- drivers/gpio/gpio-grgpio.c | 2 - drivers/gpio/gpio-hlwd.c | 58 +-- drivers/gpio/gpio-ixp4xx.c | 277 +++--------- drivers/gpio/gpio-ks8695.c | 284 ------------ drivers/gpio/gpio-madera.c | 12 +- drivers/gpio/gpio-max77620.c | 4 +- drivers/gpio/gpio-max77650.c | 1 + drivers/gpio/gpio-mb86s7x.c | 1 + drivers/gpio/gpio-mpc8xxx.c | 31 ++ drivers/gpio/gpio-pmic-eic-sprd.c | 4 +- drivers/gpio/gpio-sprd.c | 4 +- drivers/gpio/gpio-tb10x.c | 4 +- drivers/gpio/gpio-tegra.c | 4 +- drivers/gpio/gpio-thunderx.c | 163 +++---- drivers/gpio/gpio-viperboard.c | 20 +- drivers/gpio/gpio-xgene-sb.c | 1 + drivers/gpio/gpio-xlp.c | 29 +- drivers/gpio/gpio-zx.c | 1 - drivers/gpio/gpio-zynq.c | 4 +- drivers/gpio/gpiolib-acpi.c | 8 + drivers/gpio/gpiolib-acpi.h | 104 +++++ drivers/gpio/gpiolib-of.c | 116 ++++- drivers/gpio/gpiolib-of.h | 45 ++ drivers/gpio/gpiolib.c | 482 +++++++++++++++------ drivers/gpio/gpiolib.h | 120 ----- drivers/pinctrl/pinctrl-stmfx.c | 18 +- drivers/pinctrl/qcom/Kconfig | 1 + drivers/pinctrl/qcom/pinctrl-msm.c | 23 +- drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 92 ++-- include/linux/acpi.h | 51 --- include/linux/gpio.h | 24 - include/linux/gpio/consumer.h | 135 ++++-- include/linux/gpio/driver.h | 124 +++++- sound/soc/intel/boards/bytcht_cx2072x.c | 1 + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 1 + sound/soc/intel/boards/cht_bsw_rt5672.c | 1 + 51 files changed, 1343 insertions(+), 1218 deletions(-) create mode 100644 Documentation/devicetree/bindings/gpio/sgpio-aspeed.txt delete mode 100644 drivers/gpio/gpio-ks8695.c create mode 100644 drivers/gpio/gpiolib-acpi.h create mode 100644 drivers/gpio/gpiolib-of.h Merging gpio-brgl/gpio/for-next (f2ee73147a3f gpio: lpc32xx: allow building on non-lpc32xx targets) $ git merge gpio-brgl/gpio/for-next Auto-merging include/linux/gpio/driver.h CONFLICT (content): Merge conflict in include/linux/gpio/driver.h Auto-merging drivers/gpio/gpio-ixp4xx.c Auto-merging drivers/gpio/Makefile Auto-merging drivers/gpio/Kconfig Auto-merging arch/arm/configs/lpc32xx_defconfig Auto-merging Documentation/driver-api/gpio/driver.rst Resolved 'include/linux/gpio/driver.h' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit --no-edit -v -a [master ae75ad832bf9] Merge remote-tracking branch 'gpio-brgl/gpio/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/driver-api/gpio/driver.rst | 16 ++++---- drivers/gpio/gpio-em.c | 37 +++++++++-------- drivers/gpio/gpio-ixp4xx.c | 4 +- drivers/gpio/gpio-mxc.c | 9 ++-- drivers/gpio/gpio-pca953x.c | 70 +++++++++++++++----------------- include/linux/gpio/driver.h | 29 ++++--------- 6 files changed, 72 insertions(+), 93 deletions(-) Merging gpio-intel/for-next (a7db285664dd gpio: pch: Use dev_get_drvdata) $ git merge gpio-intel/for-next Merge made by the 'recursive' strategy. drivers/gpio/gpio-pch.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) Merging pinctrl/for-next (880e4f93f946 Merge tag 'v5.3-rc5' into devel) $ git merge pinctrl/for-next Auto-merging drivers/pinctrl/qcom/pinctrl-spmi-gpio.c Auto-merging drivers/pinctrl/qcom/pinctrl-msm.c Auto-merging drivers/pinctrl/qcom/Kconfig Auto-merging drivers/pinctrl/pinctrl-stmfx.c Merge made by the 'recursive' strategy. .../devicetree/bindings/mfd/aspeed-scu.txt | 2 - .../devicetree/bindings/misc/aspeed-p2a-ctrl.txt | 2 - .../bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 45 +- .../bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 49 +- .../bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 115 + .../bindings/pinctrl/brcm,bcm2835-gpio.txt | 1 + .../bindings/pinctrl/ingenic,pinctrl.txt | 17 +- .../bindings/pinctrl/qcom,msm8998-pinctrl.txt | 5 +- .../bindings/pinctrl/qcom,sc7180-pinctrl.txt | 186 ++ Documentation/driver-api/pinctl.rst | 6 +- drivers/pinctrl/aspeed/Kconfig | 8 + drivers/pinctrl/aspeed/Makefile | 1 + drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c | 1825 ++++++++------- drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 1869 ++++++++------- drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 2395 ++++++++++++++++++++ drivers/pinctrl/aspeed/pinmux-aspeed.h | 227 +- drivers/pinctrl/bcm/pinctrl-bcm2835.c | 105 +- drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 33 +- drivers/pinctrl/cirrus/Kconfig | 6 + drivers/pinctrl/cirrus/Makefile | 6 + drivers/pinctrl/cirrus/pinctrl-cs47l15.c | 40 + drivers/pinctrl/cirrus/pinctrl-cs47l92.c | 40 + drivers/pinctrl/cirrus/pinctrl-madera-core.c | 24 +- drivers/pinctrl/cirrus/pinctrl-madera.h | 2 + drivers/pinctrl/devicetree.c | 6 +- drivers/pinctrl/freescale/pinctrl-imx.c | 13 +- drivers/pinctrl/freescale/pinctrl-mxs.c | 12 +- drivers/pinctrl/meson/pinctrl-meson-g12a.c | 9 + drivers/pinctrl/nomadik/pinctrl-abx500.c | 1 + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 1 + drivers/pinctrl/pinctrl-amd.c | 4 +- drivers/pinctrl/pinctrl-falcon.c | 11 +- drivers/pinctrl/pinctrl-ingenic.c | 755 +++++- drivers/pinctrl/pinctrl-oxnas.c | 8 +- drivers/pinctrl/pinctrl-pic32.c | 4 +- drivers/pinctrl/pinctrl-rk805.c | 4 +- drivers/pinctrl/pinctrl-rockchip.c | 1 + drivers/pinctrl/pinctrl-rza1.c | 4 +- drivers/pinctrl/pinctrl-rzn1.c | 12 +- drivers/pinctrl/pinctrl-st.c | 12 +- drivers/pinctrl/pinctrl-stmfx.c | 28 +- drivers/pinctrl/pinctrl-xway.c | 4 +- drivers/pinctrl/qcom/Kconfig | 9 + drivers/pinctrl/qcom/Makefile | 1 + drivers/pinctrl/qcom/pinctrl-msm.c | 36 +- drivers/pinctrl/qcom/pinctrl-msm8998.c | 76 +- drivers/pinctrl/qcom/pinctrl-qdf2xxx.c | 2 +- drivers/pinctrl/qcom/pinctrl-sc7180.c | 1146 ++++++++++ drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 2 + drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 5 +- drivers/pinctrl/sh-pfc/gpio.c | 9 +- drivers/pinctrl/spear/pinctrl-spear.c | 8 +- drivers/pinctrl/sprd/pinctrl-sprd-sc9860.c | 1 - drivers/pinctrl/sprd/pinctrl-sprd.c | 32 +- drivers/pinctrl/stm32/pinctrl-stm32.c | 5 +- drivers/pinctrl/sunxi/pinctrl-sun8i-v3s.c | 265 ++- drivers/pinctrl/sunxi/pinctrl-sunxi.h | 2 + drivers/pinctrl/tegra/pinctrl-tegra.c | 67 +- drivers/pinctrl/tegra/pinctrl-tegra.h | 3 + drivers/pinctrl/tegra/pinctrl-tegra210.c | 1 + drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 10 +- drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 20 +- drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c | 10 +- drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c | 10 +- drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c | 10 +- drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c | 17 +- drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c | 10 +- drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c | 10 +- drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c | 10 +- include/linux/platform_data/pinctrl-single.h | 6 + 70 files changed, 7540 insertions(+), 2141 deletions(-) create mode 100644 Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sc7180-pinctrl.txt create mode 100644 drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c create mode 100644 drivers/pinctrl/cirrus/pinctrl-cs47l15.c create mode 100644 drivers/pinctrl/cirrus/pinctrl-cs47l92.c create mode 100644 drivers/pinctrl/qcom/pinctrl-sc7180.c Merging pinctrl-intel/for-next (6cb0880f0822 pinctrl: intel: remap the pin number to gpio offset for irq enabled pin) $ git merge pinctrl-intel/for-next Merge made by the 'recursive' strategy. drivers/pinctrl/intel/pinctrl-baytrail.c | 67 +++++---------- drivers/pinctrl/intel/pinctrl-broxton.c | 4 +- drivers/pinctrl/intel/pinctrl-cannonlake.c | 2 + drivers/pinctrl/intel/pinctrl-cherryview.c | 8 +- drivers/pinctrl/intel/pinctrl-denverton.c | 53 ++++++------ drivers/pinctrl/intel/pinctrl-geminilake.c | 2 + drivers/pinctrl/intel/pinctrl-icelake.c | 2 + drivers/pinctrl/intel/pinctrl-intel.c | 120 +++++++++++++++++++-------- drivers/pinctrl/intel/pinctrl-intel.h | 9 +- drivers/pinctrl/intel/pinctrl-lewisburg.c | 2 + drivers/pinctrl/intel/pinctrl-merrifield.c | 4 +- drivers/pinctrl/intel/pinctrl-sunrisepoint.c | 2 + 12 files changed, 156 insertions(+), 119 deletions(-) Merging pinctrl-samsung/for-next (10971e2ab6eb pinctrl: samsung: Fix device node refcount leaks in init code) $ git merge pinctrl-samsung/for-next Merge made by the 'recursive' strategy. drivers/pinctrl/samsung/pinctrl-exynos.c | 14 +++++++++++--- drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 6 +++++- drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 6 +++++- drivers/pinctrl/samsung/pinctrl-samsung.c | 10 ++++++++-- 4 files changed, 29 insertions(+), 7 deletions(-) Merging pwm/for-next (6cf9481b440d pwm: Fallback to the static lookup-list when acpi_pwm_get fails) $ 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 Already up to date. Merging ktest/for-next (aecea57f84b0 ktest: Fix some typos in config-bisect.pl) $ 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 (0ac33e4e9b5e selftests: use "$(MAKE)" instead of "make") $ git merge kselftest/next Merge made by the 'recursive' strategy. tools/testing/selftests/Makefile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) 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/include/uapi/asm/unistd.h CONFLICT (content): Merge conflict in arch/riscv/include/uapi/asm/unistd.h Auto-merging arch/riscv/Kconfig Resolved 'arch/riscv/include/uapi/asm/unistd.h' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit --no-edit -v -a [master 92f31a81a6e9] Merge remote-tracking branch 'y2038/y2038' $ git diff -M --stat --summary HEAD^.. Merging livepatching/for-next (1cfe141e1715 Merge branch 'for-5.4-core' into for-next) $ git merge livepatching/for-next Merge made by the 'recursive' strategy. kernel/livepatch/core.c | 1 + 1 file changed, 1 insertion(+) Merging coresight/next (a7a03a695648 coresight: tmc-etr: Fix updating buffer in not-snapshot mode.) $ git merge coresight/next Merge made by the 'recursive' strategy. drivers/hwtracing/coresight/coresight-cpu-debug.c | 33 ++++++++-------- .../hwtracing/coresight/coresight-etm4x-sysfs.c | 13 ++----- drivers/hwtracing/coresight/coresight-etm4x.c | 38 +++++++++++++------ drivers/hwtracing/coresight/coresight-funnel.c | 11 +++++- drivers/hwtracing/coresight/coresight-priv.h | 10 ++--- drivers/hwtracing/coresight/coresight-replicator.c | 3 +- drivers/hwtracing/coresight/coresight-tmc-etr.c | 44 +++++++++++++--------- drivers/hwtracing/coresight/coresight-tmc.c | 12 ++++++ drivers/hwtracing/coresight/coresight-tmc.h | 4 ++ 9 files changed, 105 insertions(+), 63 deletions(-) Merging rtc/rtc-next (a6f26606ddd0 rtc: rv3029: revert error handling patch to rv3029_eeprom_write()) $ git merge rtc/rtc-next Auto-merging drivers/rtc/rtc-sun6i.c Removing drivers/rtc/rtc-nuc900.c Merge made by the 'recursive' strategy. .../devicetree/bindings/rtc/nxp,rtc-2123.txt | 4 +- .../devicetree/bindings/rtc/trivial-rtc.yaml | 2 - drivers/rtc/Kconfig | 8 +- drivers/rtc/Makefile | 1 - drivers/rtc/class.c | 4 +- drivers/rtc/rtc-88pm80x.c | 6 +- drivers/rtc/rtc-88pm860x.c | 4 +- drivers/rtc/rtc-ab-eoz9.c | 24 +- drivers/rtc/rtc-ac100.c | 14 +- drivers/rtc/rtc-armada38x.c | 12 +- drivers/rtc/rtc-asm9260.c | 4 +- drivers/rtc/rtc-aspeed.c | 7 +- drivers/rtc/rtc-at91rm9200.c | 4 +- drivers/rtc/rtc-at91sam9.c | 4 +- drivers/rtc/rtc-bd70528.c | 11 +- drivers/rtc/rtc-brcmstb-waketimer.c | 4 +- drivers/rtc/rtc-cadence.c | 13 +- drivers/rtc/rtc-davinci.c | 4 +- drivers/rtc/rtc-ds1305.c | 7 +- drivers/rtc/rtc-ds1672.c | 3 - drivers/rtc/rtc-imx-sc.c | 4 +- drivers/rtc/rtc-imxdi.c | 4 +- drivers/rtc/rtc-isl12026.c | 6 +- drivers/rtc/rtc-jz4740.c | 8 +- drivers/rtc/rtc-max77686.c | 13 +- drivers/rtc/rtc-mt6397.c | 4 +- drivers/rtc/rtc-mt7622.c | 1 - drivers/rtc/rtc-mxc.c | 5 +- drivers/rtc/rtc-mxc_v2.c | 4 +- drivers/rtc/rtc-nuc900.c | 271 --------------------- drivers/rtc/rtc-pcf2123.c | 136 +++++------ drivers/rtc/rtc-pic32.c | 4 +- drivers/rtc/rtc-pm8xxx.c | 4 +- drivers/rtc/rtc-puv3.c | 12 +- drivers/rtc/rtc-pxa.c | 8 +- drivers/rtc/rtc-rk808.c | 6 +- drivers/rtc/rtc-rv3028.c | 3 +- drivers/rtc/rtc-rv3029c2.c | 16 +- drivers/rtc/rtc-rv8803.c | 3 +- drivers/rtc/rtc-s35390a.c | 8 +- drivers/rtc/rtc-s3c.c | 8 +- drivers/rtc/rtc-s5m.c | 6 +- drivers/rtc/rtc-sc27xx.c | 5 +- drivers/rtc/rtc-sd3078.c | 4 +- drivers/rtc/rtc-spear.c | 4 +- drivers/rtc/rtc-stm32.c | 1 - drivers/rtc/rtc-sun6i.c | 4 +- drivers/rtc/rtc-sunxi.c | 14 +- drivers/rtc/rtc-tegra.c | 8 +- drivers/rtc/rtc-tps6586x.c | 5 +- drivers/rtc/rtc-tps65910.c | 8 +- drivers/rtc/rtc-vt8500.c | 4 +- drivers/rtc/rtc-xgene.c | 4 +- drivers/rtc/rtc-zynqmp.c | 8 +- 54 files changed, 160 insertions(+), 583 deletions(-) delete mode 100644 drivers/rtc/rtc-nuc900.c Merging nvdimm/libnvdimm-for-next (cb3110f7452d Merge branch 'for-5.3/dax' into libnvdimm-for-next) $ git merge nvdimm/libnvdimm-for-next Already up to date! Merge made by the 'recursive' strategy. Merging at24/at24/for-next (10742fee98eb eeprom: at24: remove unneeded include) $ git merge at24/at24/for-next Auto-merging drivers/misc/eeprom/at24.c Merge made by the 'recursive' strategy. drivers/misc/eeprom/at24.c | 1 - 1 file changed, 1 deletion(-) Merging ntb/ntb-next (5f9e832c1370 Linus 5.3-rc1) $ git merge ntb/ntb-next Already up to date. Merging kspp/for-next/kspp (60f2c82ed20b randstruct: Check member structs in is_pure_ops_struct()) $ git merge kspp/for-next/kspp Merge made by the 'recursive' strategy. scripts/gcc-plugins/randomize_layout_plugin.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 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/next (799e064cc79e fsi: scom: Don't abort operations for minor errors) $ git merge fsi/next Merge made by the 'recursive' strategy. drivers/fsi/fsi-scom.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4) $ git merge siox/siox/next Already up to date. Merging slimbus/for-next (0a43bffb7e21 slimbus: fix slim_tid_txn()) $ git merge slimbus/for-next Merge made by the 'recursive' strategy. Merging nvmem/for-next (8555b95dbd8b nvmem: imx: add i.MX8QM platform support) $ git merge nvmem/for-next Merge made by the 'recursive' strategy. Merging xarray/xarray (91abab83839a XArray: Fix xas_next() with a single entry at 0) $ git merge xarray/xarray Merge made by the 'recursive' strategy. lib/test_xarray.c | 24 ++++++++++++++++++++++++ lib/xarray.c | 4 ++++ 2 files changed, 28 insertions(+) Merging hyperv/hyperv-next (9b5434196529 Tools: hv: move to tools buildsystem) $ git merge hyperv/hyperv-next Merge made by the 'recursive' strategy. drivers/hv/hv_balloon.c | 143 ++++++++++++++++++++++++------------------------ tools/hv/Build | 3 + tools/hv/Makefile | 51 +++++++++++++---- 3 files changed, 114 insertions(+), 83 deletions(-) create mode 100644 tools/hv/Build Merging auxdisplay/auxdisplay (a180d023ec7b auxdisplay: ht16k33: Make ht16k33_fb_fix and ht16k33_fb_var constant) $ git merge auxdisplay/auxdisplay Merge made by the 'recursive' strategy. drivers/auxdisplay/ht16k33.c | 4 ++-- 1 file changed, 2 insertions(+), 2 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 (590ef0128b42 waitid: Add support for waiting for the current process group) $ git merge pidfd/for-next Auto-merging tools/testing/selftests/pidfd/pidfd_test.c Auto-merging kernel/signal.c Auto-merging kernel/fork.c Auto-merging kernel/exit.c Auto-merging include/linux/sched/task.h Merge made by the 'recursive' strategy. include/linux/pid.h | 6 +- include/linux/sched/task.h | 1 + include/uapi/linux/sched.h | 1 + include/uapi/linux/wait.h | 1 + kernel/exit.c | 38 +++- kernel/fork.c | 22 +- kernel/pid.c | 37 +++- kernel/signal.c | 7 +- tools/testing/selftests/clone3/.gitignore | 2 + tools/testing/selftests/clone3/Makefile | 11 + tools/testing/selftests/clone3/clone3.c | 231 ++++++++++++++++++++ tools/testing/selftests/clone3/clone3_set_tid.c | 161 ++++++++++++++ tools/testing/selftests/pidfd/.gitignore | 2 + tools/testing/selftests/pidfd/Makefile | 2 +- tools/testing/selftests/pidfd/pidfd.h | 30 +++ tools/testing/selftests/pidfd/pidfd_open_test.c | 5 - tools/testing/selftests/pidfd/pidfd_poll_test.c | 117 ++++++++++ tools/testing/selftests/pidfd/pidfd_test.c | 14 -- tools/testing/selftests/pidfd/pidfd_wait.c | 271 ++++++++++++++++++++++++ 19 files changed, 923 insertions(+), 36 deletions(-) create mode 100644 tools/testing/selftests/clone3/.gitignore create mode 100644 tools/testing/selftests/clone3/Makefile create mode 100644 tools/testing/selftests/clone3/clone3.c create mode 100644 tools/testing/selftests/clone3/clone3_set_tid.c create mode 100644 tools/testing/selftests/pidfd/pidfd_poll_test.c create mode 100644 tools/testing/selftests/pidfd/pidfd_wait.c Merging devfreq/for-next (26f9b841c455 PM / devfreq: tegra20: add COMMON_CLK dependency) $ git merge devfreq/for-next Merge made by the 'recursive' strategy. drivers/devfreq/Kconfig | 19 +- drivers/devfreq/Makefile | 3 +- drivers/devfreq/devfreq.c | 10 +- drivers/devfreq/event/exynos-ppmu.c | 6 + drivers/devfreq/rk3399_dmc.c | 2 +- drivers/devfreq/tegra20-devfreq.c | 212 ++++++++++++++ .../devfreq/{tegra-devfreq.c => tegra30-devfreq.c} | 315 ++++++++++----------- 7 files changed, 387 insertions(+), 180 deletions(-) create mode 100644 drivers/devfreq/tegra20-devfreq.c rename drivers/devfreq/{tegra-devfreq.c => tegra30-devfreq.c} (80%) Merging hmm/hmm (6869b7b20659 memremap: provide a not device managed memremap_pages) $ git merge hmm/hmm Auto-merging mm/migrate.c Auto-merging mm/memremap.c Auto-merging kernel/fork.c Auto-merging include/linux/mm_types.h Auto-merging include/linux/memremap.h Auto-merging drivers/gpu/drm/radeon/radeon_mn.c Auto-merging drivers/gpu/drm/radeon/radeon_drv.c Auto-merging drivers/gpu/drm/radeon/radeon_device.c Auto-merging drivers/gpu/drm/radeon/radeon.h Auto-merging drivers/gpu/drm/nouveau/nouveau_drm.c Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_process.c Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_priv.h Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c Merge made by the 'recursive' strategy. Documentation/vm/hmm.rst | 73 +---- drivers/gpu/drm/amd/amdgpu/Kconfig | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 15 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 31 +-- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 - drivers/gpu/drm/amd/amdkfd/kfd_process.c | 88 +++--- drivers/gpu/drm/nouveau/Kconfig | 5 +- drivers/gpu/drm/nouveau/nouveau_dmem.c | 456 ++++++++++--------------------- drivers/gpu/drm/nouveau/nouveau_dmem.h | 11 - drivers/gpu/drm/nouveau/nouveau_drm.c | 3 + drivers/gpu/drm/nouveau/nouveau_svm.c | 23 +- drivers/gpu/drm/radeon/radeon.h | 3 - drivers/gpu/drm/radeon/radeon_device.c | 2 - drivers/gpu/drm/radeon/radeon_drv.c | 2 + drivers/gpu/drm/radeon/radeon_mn.c | 157 +++-------- drivers/misc/sgi-gru/grufile.c | 1 + drivers/misc/sgi-gru/grutables.h | 2 - drivers/misc/sgi-gru/grutlbpurge.c | 84 ++---- include/linux/hmm.h | 125 ++------- include/linux/ioport.h | 2 + include/linux/memremap.h | 3 +- include/linux/migrate.h | 120 ++------ include/linux/mm_types.h | 6 - include/linux/mmu_notifier.h | 35 +++ kernel/fork.c | 1 - kernel/resource.c | 45 ++- mm/Kconfig | 20 +- mm/hmm.c | 448 +++++++++--------------------- mm/memremap.c | 105 ++++--- mm/migrate.c | 252 ++++++++--------- mm/mmu_notifier.c | 217 ++++++++++++--- mm/page_alloc.c | 2 +- tools/testing/nvdimm/test/iomap.c | 1 - 34 files changed, 902 insertions(+), 1445 deletions(-) Merging fpga/for-next (7d62460b4060 MAINTAINERS: Move linux-fpga tree to new location) $ git merge fpga/for-next Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. Merging akpm-current/current (e25aee40a9ef ipc/msg.c: consolidate all xxxctl_down() functions) $ git merge --no-ff akpm-current/current Auto-merging net/xdp/xsk.c Auto-merging net/xdp/xdp_umem.c Auto-merging mm/swapfile.c Auto-merging mm/shmem.c Removing mm/quicklist.c Auto-merging mm/page_alloc.c Auto-merging mm/mmap.c Auto-merging mm/migrate.c Auto-merging mm/memremap.c Auto-merging mm/memory.c Auto-merging mm/filemap.c Auto-merging mm/Kconfig Auto-merging kernel/sched/idle.c Auto-merging kernel/resource.c Auto-merging kernel/fork.c Auto-merging kernel/dma/remap.c Auto-merging init/main.c Auto-merging include/linux/wait.h Auto-merging include/linux/sched.h Removing include/linux/quicklist.h Auto-merging include/linux/mm_types.h Auto-merging include/linux/memremap.h CONFLICT (content): Merge conflict in include/linux/memremap.h Auto-merging include/linux/kexec.h Auto-merging include/linux/fs.h Auto-merging include/linux/cpumask.h Auto-merging fs/read_write.c Auto-merging fs/ramfs/inode.c Auto-merging fs/io_uring.c Auto-merging fs/f2fs/data.c Auto-merging drivers/infiniband/core/umem.c Auto-merging drivers/gpu/drm/via/via_dmablit.c Auto-merging drivers/crypto/chelsio/chtls/chtls_io.c Auto-merging drivers/char/mem.c Auto-merging arch/s390/include/asm/pgtable.h Auto-merging arch/riscv/Kconfig Auto-merging arch/powerpc/mm/book3s64/hash_utils.c Auto-merging arch/mips/Kconfig Auto-merging arch/ia64/mm/init.c Auto-merging arch/ia64/Kconfig Auto-merging arch/arm64/kernel/process.c Auto-merging arch/arm64/include/asm/processor.h CONFLICT (content): Merge conflict in arch/arm64/include/asm/processor.h Auto-merging arch/arm64/Kconfig Auto-merging arch/arm/mm/dma-mapping.c Auto-merging arch/arm/Kconfig CONFLICT (content): Merge conflict in arch/arm/Kconfig Auto-merging arch/Kconfig Resolved 'arch/arm/Kconfig' using previous resolution. Resolved 'arch/arm64/include/asm/processor.h' using previous resolution. Recorded preimage for 'include/linux/memremap.h' Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'include/linux/memremap.h'. [master 437c4d6634c6] Merge branch 'akpm-current/current' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/sysfs-kernel-slab | 13 +- Documentation/admin-guide/cgroup-v2.rst | 20 +- Documentation/admin-guide/sysctl/kernel.rst | 20 +- Documentation/core-api/genalloc.rst | 2 +- Documentation/core-api/kernel-api.rst | 3 + Documentation/process/deprecated.rst | 10 +- arch/Kconfig | 11 + arch/alpha/include/asm/pgalloc.h | 2 - arch/alpha/include/uapi/asm/mman.h | 3 + arch/arc/include/asm/pgalloc.h | 1 - arch/arm/Kconfig | 2 +- arch/arm/include/asm/pgalloc.h | 2 - arch/arm/include/asm/processor.h | 2 - arch/arm/include/asm/xen/page-coherent.h | 3 +- arch/arm/kernel/process.c | 5 - arch/arm/mm/dma-mapping.c | 2 +- arch/arm/mm/flush.c | 7 +- arch/arm/mm/mmap.c | 52 ---- arch/arm64/Kconfig | 2 +- arch/arm64/include/asm/pgalloc.h | 2 - arch/arm64/include/asm/processor.h | 2 - arch/arm64/include/asm/xen/page-coherent.h | 3 +- arch/arm64/kernel/process.c | 8 - arch/arm64/mm/flush.c | 3 +- arch/arm64/mm/mmap.c | 72 ------ arch/csky/include/asm/pgalloc.h | 2 - arch/hexagon/include/asm/pgalloc.h | 2 - arch/ia64/Kconfig | 4 - arch/ia64/include/asm/pgalloc.h | 52 +--- arch/ia64/mm/init.c | 2 +- arch/m68k/include/asm/pgtable_mm.h | 2 - arch/m68k/include/asm/pgtable_no.h | 2 - arch/microblaze/include/asm/pgalloc.h | 122 +--------- arch/microblaze/mm/pgtable.c | 4 - arch/mips/Kconfig | 2 +- arch/mips/include/asm/pgalloc.h | 2 - arch/mips/include/asm/processor.h | 5 - arch/mips/include/uapi/asm/mman.h | 3 + arch/mips/mm/mmap.c | 84 ------- arch/nds32/include/asm/pgalloc.h | 2 - arch/nios2/include/asm/pgalloc.h | 2 - arch/openrisc/include/asm/pgalloc.h | 2 - arch/parisc/include/asm/pgalloc.h | 2 - arch/parisc/include/asm/pgtable.h | 3 +- arch/parisc/include/uapi/asm/mman.h | 3 + arch/powerpc/include/asm/pgalloc.h | 2 - arch/powerpc/mm/book3s64/hash_utils.c | 2 +- arch/powerpc/mm/book3s64/iommu_api.c | 7 +- arch/powerpc/mm/hugetlbpage.c | 2 +- arch/riscv/Kconfig | 12 + arch/riscv/include/asm/pgalloc.h | 4 - arch/s390/include/asm/pgtable.h | 1 - arch/sh/include/asm/pgalloc.h | 44 +--- arch/sh/mm/Kconfig | 3 - arch/sparc/include/asm/pgalloc_32.h | 2 - arch/sparc/include/asm/pgalloc_64.h | 2 - arch/sparc/mm/init_32.c | 1 - arch/um/include/asm/pgalloc.h | 2 - arch/unicore32/include/asm/pgalloc.h | 2 - arch/x86/include/asm/pgtable_32.h | 1 - arch/x86/include/asm/pgtable_64.h | 1 - arch/x86/mm/pat_rbtree.c | 19 +- arch/xtensa/include/asm/tlbflush.h | 3 - arch/xtensa/include/uapi/asm/mman.h | 3 + drivers/base/memory.c | 44 ++-- drivers/base/node.c | 55 ++--- drivers/block/drbd/drbd_interval.c | 29 +-- drivers/char/mem.c | 9 + drivers/crypto/chelsio/chtls/chtls_io.c | 5 +- drivers/gpu/drm/via/via_dmablit.c | 10 +- drivers/infiniband/core/umem.c | 5 +- drivers/infiniband/hw/hfi1/user_pages.c | 5 +- drivers/infiniband/hw/qib/qib_user_pages.c | 5 +- drivers/infiniband/hw/usnic/usnic_uiom.c | 5 +- drivers/infiniband/sw/siw/siw_mem.c | 10 +- drivers/misc/sram-exec.c | 2 +- drivers/staging/android/ion/ion_system_heap.c | 4 +- drivers/target/tcm_fc/tfc_io.c | 3 +- drivers/vfio/vfio_iommu_spapr_tce.c | 8 +- fs/aio.c | 9 +- fs/binfmt_elf.c | 20 -- fs/buffer.c | 56 ++++- fs/f2fs/data.c | 1 + fs/fat/fat.h | 1 + fs/fat/file.c | 8 +- fs/fat/inode.c | 22 +- fs/inode.c | 3 + fs/io_uring.c | 2 +- fs/jbd2/journal.c | 2 - fs/jbd2/transaction.c | 12 - fs/ocfs2/alloc.c | 20 +- fs/ocfs2/aops.c | 38 ++- fs/ocfs2/blockcheck.c | 26 +- fs/ocfs2/cluster/heartbeat.c | 103 +++----- fs/ocfs2/dlm/dlmcommon.h | 1 - fs/ocfs2/dlm/dlmdebug.c | 55 +---- fs/ocfs2/dlm/dlmdebug.h | 16 +- fs/ocfs2/dlm/dlmdomain.c | 7 +- fs/ocfs2/dlm/dlmunlock.c | 23 +- fs/ocfs2/dlmglue.c | 20 +- fs/ocfs2/file.c | 10 +- fs/ocfs2/ioctl.c | 2 +- fs/ocfs2/journal.h | 42 +--- fs/ocfs2/ocfs2.h | 3 - fs/ocfs2/super.c | 10 +- fs/ocfs2/xattr.c | 56 ++--- fs/open.c | 8 + fs/proc/meminfo.c | 8 +- fs/proc/page.c | 40 ++-- fs/proc/task_mmu.c | 6 +- fs/ramfs/inode.c | 12 + fs/read_write.c | 6 + fs/reiserfs/journal.c | 5 +- include/asm-generic/pgalloc.h | 5 - include/asm-generic/pgtable.h | 5 +- include/linux/bits.h | 16 +- include/linux/compaction.h | 22 +- include/linux/cpumask.h | 14 +- include/linux/fs.h | 32 +++ include/linux/genalloc.h | 2 +- include/linux/huge_mm.h | 9 + include/linux/hugetlb.h | 2 +- include/linux/interval_tree_generic.h | 22 +- include/linux/jbd2.h | 2 - include/linux/kexec.h | 2 + include/linux/kgdb.h | 2 + include/linux/memcontrol.h | 49 +++- include/linux/memory.h | 7 +- include/linux/memremap.h | 6 + include/linux/mm.h | 25 +- include/linux/mm_types.h | 1 + include/linux/mm_types_task.h | 4 + include/linux/mmzone.h | 14 +- include/linux/pagemap.h | 10 + include/linux/quicklist.h | 94 -------- include/linux/rbtree_augmented.h | 88 +++++-- include/linux/sched.h | 9 + include/linux/sched/sysctl.h | 1 + include/linux/shrinker.h | 3 +- include/linux/slab.h | 62 ----- include/linux/string.h | 50 +++- include/linux/swap.h | 2 + include/linux/vmalloc.h | 20 +- include/linux/wait.h | 4 +- include/linux/zpool.h | 3 + include/trace/events/vmscan.h | 71 +++++- include/trace/events/writeback.h | 38 +-- include/uapi/asm-generic/mman-common.h | 3 + include/uapi/linux/coff.h | 5 + init/main.c | 3 +- ipc/msg.c | 18 +- kernel/debug/debug_core.c | 31 +-- kernel/dma/remap.c | 2 +- kernel/elfcore.c | 1 + kernel/fork.c | 16 +- kernel/hung_task.c | 94 ++++++-- kernel/kexec_core.c | 2 + kernel/panic.c | 8 + kernel/resource.c | 4 +- kernel/sched/idle.c | 1 - kernel/sched/psi.c | 2 + kernel/sysctl.c | 14 +- lib/Kconfig.debug | 19 +- lib/extable.c | 1 + lib/genalloc.c | 5 +- lib/generic-radix-tree.c | 4 +- lib/iov_iter.c | 2 +- lib/math/rational.c | 63 ++++- lib/rbtree_test.c | 37 ++- lib/show_mem.c | 5 - lib/string.c | 12 +- mm/Kconfig | 16 +- mm/Makefile | 1 - mm/compaction.c | 50 ++-- mm/filemap.c | 168 ++++++------- mm/gup.c | 117 ++++----- mm/huge_memory.c | 133 ++++++++--- mm/hugetlb.c | 89 ++++++- mm/hugetlb_cgroup.c | 2 +- mm/init-mm.c | 2 +- mm/internal.h | 2 +- mm/kasan/common.c | 10 +- mm/khugepaged.c | 174 +++++++++----- mm/kmemleak.c | 323 +++++++------------------ mm/madvise.c | 326 +++++++++++++++++++++++--- mm/memcontrol.c | 264 +++++++++++++++++++-- mm/memfd.c | 2 + mm/memory.c | 21 +- mm/memory_hotplug.c | 102 ++++---- mm/mempolicy.c | 4 - mm/memremap.c | 20 ++ mm/migrate.c | 13 +- mm/mmap.c | 84 ++++--- mm/mmu_gather.c | 2 - mm/nommu.c | 2 +- mm/oom_kill.c | 79 ++++--- mm/page_alloc.c | 46 ++-- mm/page_poison.c | 2 +- mm/page_vma_mapped.c | 3 +- mm/quicklist.c | 103 -------- mm/rmap.c | 25 +- mm/shmem.c | 10 +- mm/slab.h | 64 +++++ mm/slab_common.c | 37 +++ mm/slob.c | 2 +- mm/slub.c | 20 +- mm/sparse.c | 18 +- mm/swap.c | 58 ++++- mm/swap_state.c | 6 +- mm/swapfile.c | 4 +- mm/util.c | 109 ++++++++- mm/vmalloc.c | 81 +++++-- mm/vmscan.c | 316 ++++++++++++++++--------- mm/vmstat.c | 2 + mm/z3fold.c | 89 +++++++ mm/zpool.c | 16 ++ mm/zsmalloc.c | 19 +- mm/zswap.c | 8 +- net/xdp/xdp_umem.c | 9 +- net/xdp/xsk.c | 2 +- scripts/checkpatch.pl | 73 +++++- scripts/gdb/linux/symbols.py | 4 +- tools/include/linux/rbtree.h | 71 ++++-- tools/include/linux/rbtree_augmented.h | 119 ++++++---- tools/lib/rbtree.c | 37 +-- usr/Makefile | 3 + 226 files changed, 3326 insertions(+), 2603 deletions(-) delete mode 100644 include/linux/quicklist.h delete mode 100644 mm/quicklist.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: lib: untag user pointers in strn*_user Applying: mm: untag user pointers passed to memory syscalls Applying: mm: untag user pointers in mm/gup.c Applying: mm: untag user pointers in get_vaddr_frames Applying: fs/namespace: untag user pointers in copy_mount_options Applying: userfaultfd: untag user pointers Applying: drm/amdgpu: untag user pointers Applying: drm/radeon: untag user pointers in radeon_gem_userptr_ioctl Applying: media/v4l2-core: untag user pointers in videobuf_dma_contig_user_get Applying: tee/shm: untag user pointers in tee_shm_register Applying: vfio/type1: untag user pointers in vaddr_get_pfn Applying: mm: treewide: clarify pgtable_page_{ctor,dtor}() naming Applying: drivers/tty/serial/sh-sci.c: suppress warning 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 + 1509990fd7db...86b73af46acb akpm -> akpm/master (forced update) $ rm -rf ../rebase-tmp Merging akpm/master (86b73af46acb drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow) $ git merge --no-ff akpm/master Merge made by the 'recursive' strategy. Documentation/vm/split_page_table_lock.rst | 10 +++++----- arch/arc/include/asm/pgalloc.h | 4 ++-- arch/arm/include/asm/tlb.h | 2 +- arch/arm/mm/mmu.c | 2 +- arch/arm64/include/asm/tlb.h | 2 +- arch/arm64/mm/mmu.c | 2 +- arch/csky/include/asm/pgalloc.h | 2 +- arch/hexagon/include/asm/pgalloc.h | 2 +- arch/m68k/include/asm/mcf_pgalloc.h | 6 +++--- arch/m68k/include/asm/motorola_pgalloc.h | 6 +++--- arch/m68k/include/asm/sun3_pgalloc.h | 2 +- arch/mips/include/asm/pgalloc.h | 2 +- arch/nios2/include/asm/pgalloc.h | 2 +- arch/openrisc/include/asm/pgalloc.h | 6 +++--- arch/powerpc/mm/pgtable-frag.c | 6 +++--- arch/riscv/include/asm/pgalloc.h | 2 +- arch/s390/mm/pgalloc.c | 6 +++--- arch/sh/include/asm/pgalloc.h | 2 +- arch/sparc/mm/init_64.c | 4 ++-- arch/sparc/mm/srmmu.c | 4 ++-- arch/um/include/asm/pgalloc.h | 2 +- arch/unicore32/include/asm/tlb.h | 2 +- arch/x86/mm/pgtable.c | 2 +- arch/xtensa/include/asm/pgalloc.h | 4 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 ++ drivers/gpu/drm/radeon/radeon_gem.c | 2 ++ drivers/media/platform/sti/delta/delta-ipc.c | 4 ++-- drivers/media/v4l2-core/videobuf-dma-contig.c | 9 +++++---- drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 1 + drivers/tee/tee_shm.c | 1 + drivers/tty/serial/sh-sci.c | 2 +- drivers/vfio/vfio_iommu_type1.c | 2 ++ fs/namespace.c | 2 +- fs/userfaultfd.c | 22 ++++++++++++---------- include/asm-generic/pgalloc.h | 8 ++++---- include/linux/mm.h | 4 ++-- lib/strncpy_from_user.c | 3 ++- lib/strnlen_user.c | 3 ++- mm/frame_vector.c | 2 ++ mm/gup.c | 4 ++++ mm/madvise.c | 2 ++ mm/mempolicy.c | 3 +++ mm/migrate.c | 2 +- mm/mincore.c | 2 ++ mm/mlock.c | 4 ++++ mm/mprotect.c | 2 ++ mm/mremap.c | 7 +++++++ mm/msync.c | 2 ++ 49 files changed, 111 insertions(+), 70 deletions(-)