--- /dev/null
+$ date -R
+Thu, 06 May 2021 08:34:24 +1000
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at e4adffb8daf4 Merge tag 'dmaengine-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine
+Merging origin/master (8404c9fbc84b Merge branch 'akpm' (patches from Andrew))
+$ git merge origin/master
+Updating e4adffb8daf4..8404c9fbc84b
+Fast-forward
+ Documentation/ABI/testing/sysfs-fs-f2fs | 31 +-
+ Documentation/ABI/testing/sysfs-kernel-mm-cma | 25 +
+ Documentation/admin-guide/gpio/gpio-mockup.rst | 11 +-
+ Documentation/admin-guide/kernel-parameters.txt | 27 +-
+ Documentation/admin-guide/mm/memory-hotplug.rst | 9 +
+ Documentation/admin-guide/mm/userfaultfd.rst | 107 +-
+ Documentation/core-api/irq/irq-domain.rst | 22 +-
+ .../bindings/gpio/fairchild,74hc595.yaml | 77 ++
+ .../devicetree/bindings/gpio/gpio-74x164.txt | 27 -
+ .../bindings/gpio/realtek,otto-gpio.yaml | 78 ++
+ .../bindings/gpio/rockchip,gpio-bank.yaml | 82 ++
+ .../devicetree/bindings/pci/hisilicon-pcie.txt | 43 -
+ .../bindings/pci/mediatek-pcie-gen3.yaml | 181 +++
+ .../devicetree/bindings/pci/sifive,fu740-pcie.yaml | 113 ++
+ .../devicetree/bindings/pci/ti,j721e-pci-ep.yaml | 9 +-
+ .../devicetree/bindings/pci/ti,j721e-pci-host.yaml | 20 +-
+ .../devicetree/bindings/pci/xilinx-nwl-pcie.txt | 2 +
+ .../bindings/pinctrl/rockchip,pinctrl.txt | 58 +-
+ .../devicetree/bindings/pwm/pwm-rockchip.txt | 27 -
+ .../devicetree/bindings/pwm/pwm-rockchip.yaml | 100 ++
+ .../bindings/pwm/toshiba,pwm-visconti.yaml | 43 +
+ .../bindings/thermal/brcm,ns-thermal.txt | 37 -
+ .../bindings/thermal/brcm,ns-thermal.yaml | 60 +
+ .../devicetree/bindings/thermal/qcom-tsens.yaml | 59 +-
+ .../bindings/thermal/rcar-gen3-thermal.yaml | 43 +-
+ .../bindings/thermal/thermal-sensor.yaml | 3 +
+ Documentation/driver-api/gpio/consumer.rst | 2 +-
+ Documentation/driver-api/gpio/drivers-on-gpio.rst | 6 +
+ Documentation/driver-api/pwm.rst | 6 +-
+ Documentation/driver-api/thermal/sysfs-api.rst | 12 +-
+ Documentation/filesystems/f2fs.rst | 14 +
+ MAINTAINERS | 19 +-
+ arch/arc/Kconfig | 9 +-
+ arch/arm/Kconfig | 10 +-
+ arch/arm/boot/dts/rk3036.dtsi | 4 -
+ arch/arm/boot/dts/rk3288.dtsi | 4 -
+ arch/arm/mach-iop32x/n2100.c | 8 +-
+ arch/arm64/Kconfig | 30 +-
+ arch/arm64/boot/dts/rockchip/rk3368.dtsi | 4 -
+ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 4 -
+ arch/arm64/mm/hugetlbpage.c | 7 +-
+ arch/ia64/Kconfig | 14 +-
+ arch/ia64/mm/hugetlbpage.c | 3 +-
+ arch/mips/Kconfig | 6 +-
+ arch/mips/mm/hugetlbpage.c | 4 +-
+ arch/parisc/Kconfig | 5 +-
+ arch/parisc/mm/hugetlbpage.c | 2 +-
+ arch/powerpc/Kconfig | 17 +-
+ arch/powerpc/mm/hugetlbpage.c | 3 +-
+ arch/powerpc/platforms/Kconfig.cputype | 16 +-
+ arch/riscv/Kconfig | 5 +-
+ arch/riscv/boot/dts/sifive/fu740-c000.dtsi | 33 +
+ arch/s390/Kconfig | 12 +-
+ arch/s390/mm/hugetlbpage.c | 2 +-
+ arch/sh/Kconfig | 7 +-
+ arch/sh/mm/Kconfig | 8 -
+ arch/sh/mm/hugetlbpage.c | 2 +-
+ arch/sparc/mm/hugetlbpage.c | 2 +-
+ arch/um/Kconfig.debug | 1 +
+ arch/um/drivers/hostaudio_kern.c | 4 +-
+ arch/um/drivers/vector_kern.c | 1 -
+ arch/um/include/asm/pgtable.h | 2 +-
+ arch/um/include/uapi/asm/Kbuild | 1 +
+ arch/um/kernel/Makefile | 1 -
+ arch/um/kernel/dyn.lds.S | 6 +
+ arch/um/kernel/gmon_syms.c | 16 -
+ arch/um/kernel/mem.c | 3 +-
+ arch/um/kernel/uml.lds.S | 6 +
+ arch/x86/Kconfig | 29 +-
+ arch/x86/mm/pat/set_memory.c | 8 +
+ arch/x86/pci/amd_bus.c | 2 +-
+ arch/x86/um/Makefile | 1 +
+ arch/x86/um/asm/elf.h | 2 +-
+ arch/x86/um/shared/sysdep/stub_32.h | 2 +-
+ drivers/Makefile | 1 +
+ drivers/acpi/acpi_memhotplug.c | 5 +-
+ drivers/acpi/pci_mcfg.c | 7 +
+ drivers/ata/ahci_brcm.c | 46 +-
+ drivers/base/memory.c | 101 +-
+ drivers/clk/sifive/Kconfig | 2 +
+ drivers/clk/sifive/fu740-prci.c | 11 +
+ drivers/clk/sifive/fu740-prci.h | 2 +-
+ drivers/clk/sifive/sifive-prci.c | 54 +
+ drivers/clk/sifive/sifive-prci.h | 13 +
+ drivers/gpio/Kconfig | 24 +-
+ drivers/gpio/Makefile | 1 +
+ drivers/gpio/gpio-104-dio-48e.c | 50 +-
+ drivers/gpio/gpio-aggregator.c | 39 +-
+ drivers/gpio/gpio-ich.c | 2 -
+ drivers/gpio/gpio-it87.c | 8 -
+ drivers/gpio/gpio-mockup.c | 9 +-
+ drivers/gpio/gpio-mpc8xxx.c | 47 +-
+ drivers/gpio/gpio-mxs.c | 5 -
+ drivers/gpio/gpio-omap.c | 5 +-
+ drivers/gpio/gpio-realtek-otto.c | 325 +++++
+ drivers/gpio/gpio-sch.c | 198 ++-
+ drivers/gpio/gpiolib-acpi.c | 21 +
+ drivers/gpio/gpiolib-acpi.h | 4 +
+ drivers/gpio/gpiolib-of.c | 6 +-
+ drivers/gpio/gpiolib.c | 62 +-
+ drivers/iommu/intel/irq_remapping.c | 3 +-
+ drivers/mtd/ubi/build.c | 1 +
+ drivers/mtd/ubi/ubi.h | 2 -
+ drivers/net/ethernet/broadcom/bnx2.c | 2 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 3 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +-
+ drivers/net/ethernet/broadcom/tg3.c | 4 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 2 +-
+ drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 2 +-
+ drivers/net/ethernet/realtek/r8169_main.c | 14 -
+ drivers/net/ethernet/sfc/efx.c | 2 +-
+ drivers/net/ethernet/sfc/falcon/efx.c | 2 +-
+ drivers/net/virtio_net.c | 10 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 4 +-
+ drivers/pci/ats.c | 2 +-
+ drivers/pci/controller/Kconfig | 17 +-
+ drivers/pci/controller/Makefile | 8 +-
+ drivers/pci/controller/cadence/pci-j721e.c | 24 +-
+ drivers/pci/controller/dwc/Kconfig | 12 +-
+ drivers/pci/controller/dwc/Makefile | 10 +-
+ drivers/pci/controller/dwc/pci-keystone.c | 14 +-
+ drivers/pci/controller/dwc/pci-layerscape-ep.c | 2 +-
+ drivers/pci/controller/dwc/pcie-designware-ep.c | 2 +
+ drivers/pci/controller/dwc/pcie-designware-host.c | 4 +-
+ drivers/pci/controller/dwc/pcie-designware.c | 11 +-
+ drivers/pci/controller/dwc/pcie-designware.h | 1 +
+ drivers/pci/controller/dwc/pcie-fu740.c | 309 +++++
+ drivers/pci/controller/dwc/pcie-intel-gw.c | 5 -
+ drivers/pci/controller/dwc/pcie-tegra194.c | 108 +-
+ drivers/pci/controller/mobiveil/Kconfig | 3 +-
+ drivers/pci/controller/pci-host-common.c | 1 +
+ drivers/pci/controller/pci-hyperv.c | 4 -
+ drivers/pci/controller/pci-tegra.c | 349 +++---
+ drivers/pci/controller/pci-thunder-ecam.c | 2 +-
+ drivers/pci/controller/pci-thunder-pem.c | 13 +-
+ drivers/pci/controller/pci-xgene.c | 3 +-
+ drivers/pci/controller/pcie-altera-msi.c | 4 +-
+ drivers/pci/controller/pcie-brcmstb.c | 20 +-
+ drivers/pci/controller/pcie-iproc-msi.c | 2 +-
+ drivers/pci/controller/pcie-mediatek-gen3.c | 1027 +++++++++++++++
+ drivers/pci/controller/pcie-mediatek.c | 7 +-
+ drivers/pci/controller/pcie-microchip-host.c | 12 +-
+ drivers/pci/controller/pcie-rcar-host.c | 355 +++---
+ drivers/pci/controller/pcie-xilinx-nwl.c | 7 +
+ drivers/pci/controller/pcie-xilinx.c | 246 ++--
+ drivers/pci/controller/vmd.c | 63 +-
+ drivers/pci/endpoint/functions/pci-epf-ntb.c | 16 +-
+ drivers/pci/endpoint/functions/pci-epf-test.c | 22 +-
+ drivers/pci/endpoint/pci-epc-core.c | 2 +
+ drivers/pci/endpoint/pci-epf-core.c | 2 +-
+ drivers/pci/hotplug/acpi_pcihp.c | 2 +-
+ drivers/pci/hotplug/acpiphp.h | 3 +-
+ drivers/pci/hotplug/acpiphp_glue.c | 1 +
+ drivers/pci/hotplug/cpqphp_nvram.c | 5 +-
+ drivers/pci/hotplug/shpchp_hpc.c | 5 -
+ drivers/pci/msi.c | 45 +-
+ drivers/pci/of.c | 22 +-
+ drivers/pci/pci-acpi.c | 2 +-
+ drivers/pci/pci-label.c | 218 +---
+ drivers/pci/pci-sysfs.c | 260 ++--
+ drivers/pci/pci.c | 18 +
+ drivers/pci/pci.h | 24 +-
+ drivers/pci/pcie/aer.c | 6 +-
+ drivers/pci/pcie/pme.c | 2 +-
+ drivers/pci/pcie/rcec.c | 2 +-
+ drivers/pci/probe.c | 5 +-
+ drivers/pci/quirks.c | 29 +-
+ drivers/pci/remove.c | 2 +
+ drivers/pci/vpd.c | 232 +---
+ drivers/pwm/Kconfig | 9 +
+ drivers/pwm/Makefile | 1 +
+ drivers/pwm/core.c | 48 +-
+ drivers/pwm/pwm-ab8500.c | 54 +-
+ drivers/pwm/pwm-atmel-hlcdc.c | 3 +-
+ drivers/pwm/pwm-atmel-tcb.c | 42 +-
+ drivers/pwm/pwm-atmel.c | 30 +-
+ drivers/pwm/pwm-bcm-iproc.c | 5 +-
+ drivers/pwm/pwm-bcm-kona.c | 8 +-
+ drivers/pwm/pwm-bcm2835.c | 40 +-
+ drivers/pwm/pwm-berlin.c | 1 -
+ drivers/pwm/pwm-brcmstb.c | 1 -
+ drivers/pwm/pwm-clps711x.c | 1 -
+ drivers/pwm/pwm-crc.c | 1 -
+ drivers/pwm/pwm-cros-ec.c | 4 +-
+ drivers/pwm/pwm-dwc.c | 1 -
+ drivers/pwm/pwm-ep93xx.c | 1 -
+ drivers/pwm/pwm-fsl-ftm.c | 1 -
+ drivers/pwm/pwm-hibvt.c | 1 -
+ drivers/pwm/pwm-img.c | 1 -
+ drivers/pwm/pwm-imx-tpm.c | 5 +-
+ drivers/pwm/pwm-imx1.c | 1 -
+ drivers/pwm/pwm-imx27.c | 1 -
+ drivers/pwm/pwm-intel-lgm.c | 1 -
+ drivers/pwm/pwm-iqs620a.c | 1 -
+ drivers/pwm/pwm-jz4740.c | 1 -
+ drivers/pwm/pwm-keembay.c | 1 -
+ drivers/pwm/pwm-lp3943.c | 1 -
+ drivers/pwm/pwm-lpc18xx-sct.c | 5 +-
+ drivers/pwm/pwm-lpc32xx.c | 5 -
+ drivers/pwm/pwm-lpss.c | 7 -
+ drivers/pwm/pwm-mediatek.c | 7 -
+ drivers/pwm/pwm-meson.c | 1 -
+ drivers/pwm/pwm-mtk-disp.c | 1 -
+ drivers/pwm/pwm-mxs.c | 1 -
+ drivers/pwm/pwm-omap-dmtimer.c | 1 -
+ drivers/pwm/pwm-pca9685.c | 303 ++---
+ drivers/pwm/pwm-pxa.c | 1 -
+ drivers/pwm/pwm-rcar.c | 1 -
+ drivers/pwm/pwm-renesas-tpu.c | 1 -
+ drivers/pwm/pwm-rockchip.c | 1 -
+ drivers/pwm/pwm-samsung.c | 1 -
+ drivers/pwm/pwm-sifive.c | 1 -
+ drivers/pwm/pwm-sl28cpld.c | 1 -
+ drivers/pwm/pwm-spear.c | 1 -
+ drivers/pwm/pwm-sprd.c | 4 +-
+ drivers/pwm/pwm-sti.c | 7 +-
+ drivers/pwm/pwm-stm32-lp.c | 1 -
+ drivers/pwm/pwm-stm32.c | 1 -
+ drivers/pwm/pwm-stmpe.c | 1 -
+ drivers/pwm/pwm-sun4i.c | 1 -
+ drivers/pwm/pwm-tegra.c | 1 -
+ drivers/pwm/pwm-tiecap.c | 1 -
+ drivers/pwm/pwm-tiehrpwm.c | 1 -
+ drivers/pwm/pwm-twl-led.c | 1 -
+ drivers/pwm/pwm-twl.c | 1 -
+ drivers/pwm/pwm-visconti.c | 190 +++
+ drivers/pwm/pwm-vt8500.c | 1 -
+ drivers/reset/Kconfig | 1 +
+ drivers/scsi/cxlflash/main.c | 3 +-
+ drivers/thermal/amlogic_thermal.c | 4 +-
+ drivers/thermal/broadcom/bcm2835_thermal.c | 1 -
+ drivers/thermal/cpufreq_cooling.c | 49 +-
+ drivers/thermal/cpuidle_cooling.c | 37 +-
+ drivers/thermal/devfreq_cooling.c | 25 +-
+ drivers/thermal/gov_fair_share.c | 11 +-
+ drivers/thermal/gov_power_allocator.c | 32 +-
+ drivers/thermal/hisi_thermal.c | 10 +-
+ drivers/thermal/intel/Kconfig | 11 +
+ drivers/thermal/intel/Makefile | 1 +
+ drivers/thermal/intel/intel_tcc_cooling.c | 129 ++
+ drivers/thermal/mtk_thermal.c | 12 +-
+ drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 91 +-
+ drivers/thermal/qcom/tsens-8960.c | 235 ++--
+ drivers/thermal/qcom/tsens-v0_1.c | 98 +-
+ drivers/thermal/qcom/tsens-v1.c | 4 +-
+ drivers/thermal/qcom/tsens.c | 165 ++-
+ drivers/thermal/qcom/tsens.h | 6 +-
+ drivers/thermal/rcar_gen3_thermal.c | 3 +-
+ drivers/thermal/sun8i_thermal.c | 4 +-
+ drivers/thermal/tegra/soctherm.c | 15 +-
+ drivers/thermal/thermal_core.c | 57 +-
+ drivers/thermal/thermal_core.h | 1 +
+ drivers/thermal/thermal_helpers.c | 27 +-
+ drivers/thermal/thermal_mmio.c | 5 +-
+ drivers/thermal/thermal_of.c | 7 +-
+ drivers/thermal/ti-soc-thermal/ti-bandgap.c | 37 +-
+ drivers/vdpa/Kconfig | 15 +
+ drivers/vdpa/Makefile | 1 +
+ drivers/vdpa/ifcvf/ifcvf_base.c | 24 +-
+ drivers/vdpa/ifcvf/ifcvf_base.h | 26 +-
+ drivers/vdpa/ifcvf/ifcvf_main.c | 86 +-
+ drivers/vdpa/mlx5/net/mlx5_vnet.c | 85 +-
+ drivers/vdpa/vdpa.c | 12 +-
+ drivers/vdpa/vdpa_sim/Makefile | 1 +
+ drivers/vdpa/vdpa_sim/vdpa_sim.c | 127 +-
+ drivers/vdpa/vdpa_sim/vdpa_sim.h | 2 +
+ drivers/vdpa/vdpa_sim/vdpa_sim_blk.c | 338 +++++
+ drivers/vdpa/virtio_pci/Makefile | 2 +
+ drivers/vdpa/virtio_pci/vp_vdpa.c | 484 +++++++
+ drivers/vhost/vdpa.c | 16 +-
+ drivers/vhost/vringh.c | 69 +-
+ drivers/virt/nitro_enclaves/ne_misc_dev.c | 43 +-
+ drivers/virtio/virtio_balloon.c | 2 +-
+ drivers/virtio/virtio_pci_modern.c | 27 +-
+ drivers/virtio/virtio_pci_modern_dev.c | 67 +-
+ fs/Kconfig | 5 +-
+ fs/block_dev.c | 2 +-
+ fs/btrfs/compression.c | 5 +-
+ fs/btrfs/extent_io.c | 22 +-
+ fs/btrfs/inode.c | 33 +-
+ fs/btrfs/reflink.c | 6 +-
+ fs/btrfs/zlib.c | 5 +-
+ fs/btrfs/zstd.c | 5 +-
+ fs/buffer.c | 36 +-
+ fs/cifs/cifs_fs_sb.h | 1 +
+ fs/cifs/cifs_ioctl.h | 35 +
+ fs/cifs/cifsfs.c | 25 +-
+ fs/cifs/cifsglob.h | 17 +
+ fs/cifs/cifsproto.h | 13 +
+ fs/cifs/connect.c | 37 +-
+ fs/cifs/dir.c | 10 +
+ fs/cifs/file.c | 102 +-
+ fs/cifs/fs_context.c | 5 +
+ fs/cifs/inode.c | 27 +-
+ fs/cifs/ioctl.c | 112 ++
+ fs/cifs/link.c | 13 +-
+ fs/cifs/misc.c | 79 ++
+ fs/cifs/xattr.c | 4 +
+ fs/dax.c | 8 +-
+ fs/f2fs/Kconfig | 16 +-
+ fs/f2fs/acl.c | 1 +
+ fs/f2fs/checkpoint.c | 9 +-
+ fs/f2fs/compress.c | 15 +-
+ fs/f2fs/compress.h | 0
+ fs/f2fs/data.c | 125 +-
+ fs/f2fs/debug.c | 3 +
+ fs/f2fs/dir.c | 1 +
+ fs/f2fs/f2fs.h | 55 +-
+ fs/f2fs/file.c | 51 +-
+ fs/f2fs/gc.c | 95 +-
+ fs/f2fs/gc.h | 6 +
+ fs/f2fs/inline.c | 3 +-
+ fs/f2fs/inode.c | 3 +-
+ fs/f2fs/namei.c | 3 +
+ fs/f2fs/node.c | 19 +-
+ fs/f2fs/node.h | 1 +
+ fs/f2fs/recovery.c | 3 +-
+ fs/f2fs/segment.c | 184 ++-
+ fs/f2fs/segment.h | 16 +-
+ fs/f2fs/super.c | 102 +-
+ fs/f2fs/sysfs.c | 47 +
+ fs/f2fs/verity.c | 75 +-
+ fs/f2fs/xattr.c | 1 +
+ fs/gfs2/glock.c | 3 +-
+ fs/hugetlbfs/inode.c | 9 +-
+ fs/inode.c | 9 +-
+ fs/jffs2/file.c | 1 +
+ fs/jffs2/scan.c | 2 +-
+ fs/jffs2/summary.h | 16 +-
+ fs/locks.c | 3 +
+ fs/nfsd/nfs4state.c | 415 ++++---
+ fs/nfsd/nfsctl.c | 1 +
+ fs/nfsd/nfssvc.c | 8 +-
+ fs/nfsd/state.h | 3 +-
+ fs/proc/task_mmu.c | 3 +
+ fs/ubifs/replay.c | 3 +-
+ fs/ubifs/sb.c | 3 +
+ fs/ubifs/super.c | 6 +-
+ fs/userfaultfd.c | 149 ++-
+ include/dt-bindings/clock/sifive-fu740-prci.h | 1 +
+ include/linux/bitmap.h | 127 +-
+ include/linux/buffer_head.h | 4 +
+ include/linux/cma.h | 4 +-
+ include/linux/compaction.h | 1 -
+ include/linux/f2fs_fs.h | 2 +-
+ include/linux/fs.h | 2 -
+ include/linux/gfp.h | 2 +-
+ include/linux/gpio/driver.h | 12 +-
+ include/linux/highmem.h | 7 +
+ include/linux/huge_mm.h | 3 -
+ include/linux/hugetlb.h | 33 +-
+ include/linux/irqdomain.h | 19 +-
+ include/linux/memcontrol.h | 23 +-
+ include/linux/memory.h | 8 +-
+ include/linux/memory_hotplug.h | 15 +-
+ include/linux/memremap.h | 2 +-
+ include/linux/migrate.h | 7 +-
+ include/linux/mm.h | 26 +
+ include/linux/mmzone.h | 20 +-
+ include/linux/msi.h | 17 +-
+ include/linux/pagemap.h | 5 +
+ include/linux/pci-ecam.h | 1 +
+ include/linux/pci.h | 9 +-
+ include/linux/pgtable.h | 12 +
+ include/linux/pwm.h | 7 +-
+ include/linux/reset.h | 5 +
+ include/linux/sched.h | 2 +-
+ include/linux/sched/mm.h | 27 +-
+ include/linux/shrinker.h | 7 +-
+ include/linux/swap.h | 21 +
+ include/linux/thermal.h | 7 +-
+ include/linux/userfaultfd_k.h | 49 +-
+ include/linux/vdpa.h | 42 +-
+ include/linux/virtio_pci_modern.h | 11 +-
+ include/linux/vm_event_item.h | 8 +
+ include/linux/vringh.h | 19 +-
+ include/trace/events/cma.h | 68 +-
+ include/trace/events/migrate.h | 25 +-
+ include/trace/events/mmflags.h | 7 +
+ include/uapi/linux/mempolicy.h | 7 +
+ include/uapi/linux/thermal.h | 2 +-
+ include/uapi/linux/userfaultfd.h | 36 +-
+ init/Kconfig | 5 +
+ kernel/irq/irqdomain.c | 20 +-
+ kernel/sysctl.c | 2 +-
+ lib/Kconfig.kfence | 1 +
+ lib/bitmap.c | 42 +-
+ lib/cmdline.c | 1 +
+ lib/dynamic_debug.c | 2 +-
+ lib/iov_iter.c | 8 +-
+ mm/Kconfig | 28 +
+ mm/Makefile | 6 +-
+ mm/cma.c | 62 +-
+ mm/cma.h | 25 +-
+ mm/cma_debug.c | 8 +-
+ mm/cma_sysfs.c | 112 ++
+ mm/compaction.c | 107 +-
+ mm/filemap.c | 24 +-
+ mm/frontswap.c | 12 +-
+ mm/gup.c | 174 ++-
+ mm/gup_test.c | 29 +-
+ mm/gup_test.h | 3 +-
+ mm/highmem.c | 11 +-
+ mm/huge_memory.c | 324 ++++-
+ mm/hugetlb.c | 777 ++++++++----
+ mm/hugetlb_cgroup.c | 9 +-
+ mm/internal.h | 10 +-
+ mm/kfence/core.c | 59 +-
+ mm/khugepaged.c | 63 +-
+ mm/ksm.c | 17 +-
+ mm/list_lru.c | 6 +-
+ mm/memcontrol.c | 131 +-
+ mm/memory_hotplug.c | 216 +++-
+ mm/mempolicy.c | 12 +-
+ mm/mempool.c | 2 +-
+ mm/migrate.c | 89 +-
+ mm/mlock.c | 4 +-
+ mm/mmap.c | 18 +-
+ mm/oom_kill.c | 2 +-
+ mm/page_alloc.c | 75 +-
+ mm/process_vm_access.c | 1 -
+ mm/shmem.c | 2 +-
+ mm/sparse.c | 4 +-
+ mm/swap.c | 69 +-
+ mm/swap_state.c | 4 -
+ mm/swapfile.c | 4 +-
+ mm/truncate.c | 19 +-
+ mm/userfaultfd.c | 39 +-
+ mm/util.c | 26 +-
+ mm/vmalloc.c | 2 +-
+ mm/vmscan.c | 411 ++++--
+ mm/vmstat.c | 35 +-
+ mm/workingset.c | 1 -
+ mm/zsmalloc.c | 6 +-
+ mm/zswap.c | 2 +-
+ net/sunrpc/svc.c | 3 +-
+ net/sunrpc/svcsock.c | 2 +-
+ net/sunrpc/xprtrdma/svc_rdma_sendto.c | 36 +-
+ security/safesetid/lsm.c | 3 -
+ tools/gpio/gpio-utils.c | 18 +-
+ tools/power/x86/turbostat/turbostat.8 | 6 +-
+ tools/power/x86/turbostat/turbostat.c | 1314 ++++++++++++--------
+ tools/testing/ktest/examples/vmware.conf | 137 ++
+ tools/testing/ktest/ktest.pl | 571 ++++-----
+ tools/testing/selftests/vm/.gitignore | 1 +
+ tools/testing/selftests/vm/Makefile | 1 +
+ tools/testing/selftests/vm/gup_test.c | 36 +-
+ tools/testing/selftests/vm/split_huge_page_test.c | 390 ++++++
+ tools/testing/selftests/vm/userfaultfd.c | 164 ++-
+ 449 files changed, 12811 insertions(+), 5434 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cma
+ create mode 100644 Documentation/devicetree/bindings/gpio/fairchild,74hc595.yaml
+ delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-74x164.txt
+ create mode 100644 Documentation/devicetree/bindings/gpio/realtek,otto-gpio.yaml
+ create mode 100644 Documentation/devicetree/bindings/gpio/rockchip,gpio-bank.yaml
+ delete mode 100644 Documentation/devicetree/bindings/pci/hisilicon-pcie.txt
+ create mode 100644 Documentation/devicetree/bindings/pci/mediatek-pcie-gen3.yaml
+ create mode 100644 Documentation/devicetree/bindings/pci/sifive,fu740-pcie.yaml
+ delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-rockchip.txt
+ create mode 100644 Documentation/devicetree/bindings/pwm/pwm-rockchip.yaml
+ create mode 100644 Documentation/devicetree/bindings/pwm/toshiba,pwm-visconti.yaml
+ delete mode 100644 Documentation/devicetree/bindings/thermal/brcm,ns-thermal.txt
+ create mode 100644 Documentation/devicetree/bindings/thermal/brcm,ns-thermal.yaml
+ create mode 100644 arch/um/include/uapi/asm/Kbuild
+ delete mode 100644 arch/um/kernel/gmon_syms.c
+ create mode 100644 drivers/gpio/gpio-realtek-otto.c
+ create mode 100644 drivers/pci/controller/dwc/pcie-fu740.c
+ create mode 100644 drivers/pci/controller/pcie-mediatek-gen3.c
+ create mode 100644 drivers/pwm/pwm-visconti.c
+ create mode 100644 drivers/thermal/intel/intel_tcc_cooling.c
+ create mode 100644 drivers/vdpa/vdpa_sim/vdpa_sim_blk.c
+ create mode 100644 drivers/vdpa/virtio_pci/Makefile
+ create mode 100644 drivers/vdpa/virtio_pci/vp_vdpa.c
+ delete mode 100644 fs/f2fs/compress.h
+ create mode 100644 mm/cma_sysfs.c
+ create mode 100644 tools/testing/ktest/examples/vmware.conf
+ create mode 100644 tools/testing/selftests/vm/split_huge_page_test.c
+Merging fixes/fixes (e71ba9452f0b Linux 5.11-rc2)
+$ git merge fixes/fixes
+Already up to date.
+Merging kbuild-current/fixes (9f67672a817e Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4)
+$ git merge kbuild-current/fixes
+Already up to date.
+Merging arc-current/for-curr (1582f08d83d7 ARC: entry: fix off-by-one error in syscall number validation)
+$ git merge arc-current/for-curr
+Merge made by the 'recursive' strategy.
+ arch/arc/Makefile | 2 +-
+ arch/arc/include/asm/cmpxchg.h | 4 ++--
+ arch/arc/kernel/entry.S | 2 +-
+ arch/arc/kernel/kgdb.c | 1 +
+ arch/arc/kernel/process.c | 8 ++++----
+ arch/arc/kernel/signal.c | 4 ++--
+ 6 files changed, 11 insertions(+), 10 deletions(-)
+Merging arm-current/fixes (d2f7eca60b29 ARM: 9071/1: uprobes: Don't hook on thumb instructions)
+$ git merge arm-current/fixes
+Already up to date.
+Merging arm64-fixes/for-next/fixes (22315a2296f4 arm64: alternatives: Move length validation in alternative_{insn, endif})
+$ git merge arm64-fixes/for-next/fixes
+Already up to date.
+Merging arm-soc-fixes/arm/fixes (b5144a2bf401 dt-bindings: nvmem: mediatek: remove duplicate mt8192 line)
+$ git merge arm-soc-fixes/arm/fixes
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/nvmem/mtk-efuse.txt | 1 -
+ 1 file changed, 1 deletion(-)
+Merging drivers-memory-fixes/fixes (a38fd8748464 Linux 5.12-rc2)
+$ git merge drivers-memory-fixes/fixes
+Already up to date.
+Merging m68k-current/for-linus (34e5269bf987 m68k: sun3x: Remove unneeded semicolon)
+$ git merge m68k-current/for-linus
+Already up to date.
+Merging powerpc-fixes/fixes (791f9e36599d powerpc/vdso: Make sure vdso_wrapper.o is rebuilt everytime vdso.so is rebuilt)
+$ git merge powerpc-fixes/fixes
+Already up to date.
+Merging s390-fixes/fixes (6daa755f813e Merge tag 's390-5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
+$ git merge s390-fixes/fixes
+Already up to date.
+Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net)
+$ git merge sparc/master
+Already up to date.
+Merging fscrypt-current/for-stable (d19d8d345eec fscrypt: fix inline encryption not used on new files)
+$ git merge fscrypt-current/for-stable
+Already up to date.
+Merging net/master (8621436671f3 smc: disallow TCP_ULP in smc_setsockopt())
+$ git merge net/master
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ CREDITS | 5 +
+ Documentation/ABI/testing/sysfs-class-net-qmi | 16 ++
+ MAINTAINERS | 16 +-
+ drivers/net/dsa/microchip/ksz8795_spi.c | 3 +
+ drivers/net/dsa/microchip/ksz8863_smi.c | 5 +-
+ drivers/net/ethernet/atheros/alx/main.c | 2 +-
+ drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 1 -
+ drivers/net/ethernet/brocade/bna/bnad.c | 2 +-
+ drivers/net/ethernet/cadence/macb_main.c | 4 +-
+ drivers/net/ethernet/chelsio/cxgb4/sge.c | 16 +-
+ drivers/net/ethernet/cisco/enic/enic_main.c | 7 +-
+ drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 12 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 3 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h | 3 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 6 +
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 2 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 2 +
+ drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 1 +
+ drivers/net/ethernet/stmicro/stmmac/hwif.h | 1 -
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 +
+ drivers/net/phy/marvell.c | 62 +++++--
+ drivers/net/wan/hdlc_fr.c | 5 +-
+ include/linux/bpf_verifier.h | 5 +-
+ include/net/sctp/command.h | 1 -
+ include/uapi/linux/seg6_local.h | 30 ++++
+ kernel/bpf/verifier.c | 33 ++--
+ lib/nlattr.c | 2 +-
+ net/bridge/br_netlink.c | 5 +-
+ net/ethtool/netlink.c | 3 +-
+ net/hsr/hsr_forward.c | 4 +
+ net/ipv4/tcp_cong.c | 4 +
+ net/ipv6/seg6.c | 3 -
+ net/ipv6/seg6_local.c | 198 ++++++++++++++++++++-
+ net/nfc/llcp_sock.c | 4 +
+ net/openvswitch/actions.c | 8 +-
+ net/sched/sch_frag.c | 8 +-
+ net/sctp/sm_make_chunk.c | 6 +-
+ net/sctp/sm_sideeffect.c | 26 ---
+ net/sctp/sm_statefuns.c | 47 ++++-
+ net/sctp/socket.c | 38 ++--
+ net/smc/af_smc.c | 4 +-
+ net/vmw_vsock/vmci_transport.c | 2 -
+ net/xdp/xsk_queue.h | 7 +-
+ tools/lib/bpf/ringbuf.c | 30 +++-
+ tools/testing/selftests/bpf/prog_tests/snprintf.c | 2 +
+ tools/testing/selftests/bpf/progs/test_snprintf.c | 5 +
+ 47 files changed, 493 insertions(+), 159 deletions(-)
+Merging bpf/master (9683e5775c75 libbpf: Add NULL check to add_dummy_ksym_var)
+$ git merge bpf/master
+Merge made by the 'recursive' strategy.
+ tools/lib/bpf/libbpf.c | 3 +++
+ 1 file changed, 3 insertions(+)
+Merging ipsec/master (b515d2637276 xfrm: xfrm_state_mtu should return at least 1280 for ipv6)
+$ git merge ipsec/master
+Auto-merging net/ipv6/esp6.c
+Auto-merging net/ipv4/esp4.c
+Merge made by the 'recursive' strategy.
+ include/net/xfrm.h | 1 +
+ net/ipv4/esp4.c | 2 +-
+ net/ipv6/esp6.c | 2 +-
+ net/xfrm/xfrm_state.c | 14 ++++++++++++--
+ 4 files changed, 15 insertions(+), 4 deletions(-)
+Merging netfilter/master (7072a355ba19 netfilter: nfnetlink: add a missing rcu_read_unlock())
+$ git merge netfilter/master
+Merge made by the 'recursive' strategy.
+ include/linux/netfilter_arp/arp_tables.h | 3 +-
+ include/uapi/linux/netfilter/xt_SECMARK.h | 6 +++
+ net/ipv4/netfilter/arp_tables.c | 5 +-
+ net/ipv4/netfilter/arptable_filter.c | 2 +-
+ net/netfilter/nfnetlink.c | 1 +
+ net/netfilter/xt_SECMARK.c | 88 ++++++++++++++++++++++++-------
+ 6 files changed, 80 insertions(+), 25 deletions(-)
+Merging ipvs/master (bbd6f0a94813 bnxt_en: Fix RX consumer index logic in the error path.)
+$ git merge ipvs/master
+Already up to date.
+Merging wireless-drivers/master (e7020bb068d8 iwlwifi: Fix softirq/hardirq disabling in iwl_pcie_gen2_enqueue_hcmd())
+$ git merge wireless-drivers/master
+Already up to date.
+Merging mac80211/master (eefb45eef5c4 neighbour: Prevent Race condition in neighbour subsytem)
+$ git merge mac80211/master
+Already up to date.
+Merging rdma-fixes/for-rc (d434405aaab7 Linux 5.12-rc7)
+$ git merge rdma-fixes/for-rc
+Already up to date.
+Merging sound-current/for-linus (5d84b5318d86 ALSA: hda/realtek: Add fixup for HP OMEN laptop)
+$ git merge sound-current/for-linus
+Merge made by the 'recursive' strategy.
+ sound/pci/hda/patch_realtek.c | 90 +++++++++++++++++++++++++++++++++++++++++--
+ sound/usb/mixer_maps.c | 12 ++++++
+ 2 files changed, 98 insertions(+), 4 deletions(-)
+Merging sound-asoc-fixes/for-linus (03f2880ae8a8 Merge remote-tracking branch 'asoc/for-5.13' into asoc-linus)
+$ git merge sound-asoc-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ sound/soc/amd/raven/acp3x-pcm-dma.c | 10 ----------
+ sound/soc/amd/raven/acp3x.h | 1 +
+ sound/soc/amd/raven/pci-acp3x.c | 15 +++++++++++++++
+ sound/soc/codecs/da7219.c | 5 +----
+ sound/soc/codecs/max98088.c | 13 +++++++++++--
+ sound/soc/stm/stm32_sai_sub.c | 5 +----
+ 6 files changed, 29 insertions(+), 20 deletions(-)
+Merging regmap-fixes/for-linus (78d889705732 Merge remote-tracking branch 'regmap/for-5.12' into regmap-linus)
+$ git merge regmap-fixes/for-linus
+Already up to date.
+Merging regulator-fixes/for-linus (0bbefa641a32 Merge remote-tracking branch 'regulator/for-5.12' into regulator-linus)
+$ git merge regulator-fixes/for-linus
+Already up to date.
+Merging spi-fixes/for-linus (eb43e665d243 Merge remote-tracking branch 'spi/for-5.13' into spi-linus)
+$ git merge spi-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/spi/Kconfig | 2 +-
+ drivers/spi/spi-zynq-qspi.c | 9 ++++-----
+ drivers/spi/spi.c | 26 +++++++++++++++++---------
+ 3 files changed, 22 insertions(+), 15 deletions(-)
+Merging pci-current/for-linus (cf673bd0cc97 PCI: switchtec: Fix Spectre v1 vulnerability)
+$ git merge pci-current/for-linus
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 4 ++--
+ drivers/pci/switch/switchtec.c | 9 ++++++---
+ 2 files changed, 8 insertions(+), 5 deletions(-)
+Merging driver-core.current/driver-core-linus (d665ea6ea86c Merge tag 'for-linus-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml)
+$ git merge driver-core.current/driver-core-linus
+Already up to date.
+Merging tty.current/tty-linus (d665ea6ea86c Merge tag 'for-linus-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml)
+$ git merge tty.current/tty-linus
+Already up to date.
+Merging usb.current/usb-linus (d665ea6ea86c Merge tag 'for-linus-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml)
+$ git merge usb.current/usb-linus
+Already up to date.
+Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6)
+$ git merge usb-gadget-fixes/fixes
+Already up to date.
+Merging usb-serial-fixes/usb-linus (0d02ec6b3136 Linux 5.12-rc4)
+$ git merge usb-serial-fixes/usb-linus
+Already up to date.
+Merging usb-chipidea-fixes/for-usb-fixes (c1d8a521dbd7 usb: cdnsp: Fix lack of removing request from pending list.)
+$ git merge usb-chipidea-fixes/for-usb-fixes
+Auto-merging drivers/usb/cdns3/cdnsp-gadget.c
+Auto-merging drivers/usb/cdns3/cdns3-gadget.c
+Merge made by the 'recursive' strategy.
+ drivers/usb/cdns3/cdns3-gadget.c | 4 +++-
+ drivers/usb/cdns3/cdnsp-gadget.c | 14 +++++++-------
+ 2 files changed, 10 insertions(+), 8 deletions(-)
+Merging phy/fixes (da848f9a0e13 phy: qcom-qmp: add hbr3_hbr2 voltage and premphasis swing table)
+$ git merge phy/fixes
+Auto-merging drivers/phy/ti/phy-j721e-wiz.c
+Auto-merging drivers/phy/qualcomm/phy-qcom-qmp.c
+CONFLICT (content): Merge conflict in drivers/phy/qualcomm/phy-qcom-qmp.c
+Auto-merging drivers/phy/marvell/Kconfig
+Resolved 'drivers/phy/qualcomm/phy-qcom-qmp.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 0d7c337ffc10] Merge remote-tracking branch 'phy/fixes'
+$ git diff -M --stat --summary HEAD^..
+Merging staging.current/staging-linus (d665ea6ea86c Merge tag 'for-linus-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml)
+$ git merge staging.current/staging-linus
+Already up to date.
+Merging iio-fixes/fixes-togreg (4d28b580e80a iio: core: fix ioctl handlers removal)
+$ git merge iio-fixes/fixes-togreg
+Auto-merging drivers/iio/light/gp2ap002.c
+Auto-merging drivers/iio/industrialio-core.c
+Auto-merging drivers/iio/accel/Kconfig
+Merge made by the 'recursive' strategy.
+ drivers/iio/accel/Kconfig | 1 -
+ drivers/iio/common/hid-sensors/Kconfig | 1 +
+ drivers/iio/gyro/Kconfig | 1 -
+ drivers/iio/gyro/mpu3050-core.c | 13 +++++++++++--
+ drivers/iio/humidity/Kconfig | 1 -
+ drivers/iio/industrialio-core.c | 6 ------
+ drivers/iio/light/Kconfig | 2 --
+ drivers/iio/light/gp2ap002.c | 5 +++--
+ drivers/iio/magnetometer/Kconfig | 1 -
+ drivers/iio/orientation/Kconfig | 2 --
+ drivers/iio/pressure/Kconfig | 1 -
+ drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 1 +
+ drivers/iio/temperature/Kconfig | 1 -
+ 13 files changed, 16 insertions(+), 20 deletions(-)
+Merging char-misc.current/char-misc-linus (7b1ae248279b dyndbg: fix parsing file query without a line-range suffix)
+$ git merge char-misc.current/char-misc-linus
+Already up to date.
+Merging soundwire-fixes/fixes (fde5d7f27108 soundwire: bus: Fix device found flag correctly)
+$ git merge soundwire-fixes/fixes
+Auto-merging drivers/soundwire/cadence_master.c
+Auto-merging drivers/soundwire/bus.c
+Merge made by the 'recursive' strategy.
+Merging thunderbolt-fixes/fixes (9f4ad9e425a1 Linux 5.12)
+$ git merge thunderbolt-fixes/fixes
+Already up to date.
+Merging input-current/for-linus (d0034a7a4ac7 Merge branch 'next' into for-linus)
+$ git merge input-current/for-linus
+Auto-merging drivers/input/misc/Makefile
+Auto-merging drivers/input/misc/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Removing Documentation/devicetree/bindings/input/touchscreen/mms114.txt
+Removing Documentation/devicetree/bindings/input/touchscreen/iqs5xx.txt
+Merge made by the 'recursive' strategy.
+ .../ABI/testing/sysfs-driver-input-exc3000 | 9 +
+ .../devicetree/bindings/input/atmel,maxtouch.yaml | 32 +
+ .../devicetree/bindings/input/iqs626a.yaml | 843 +++++++++
+ .../bindings/input/touchscreen/azoteq,iqs5xx.yaml | 75 +
+ .../bindings/input/touchscreen/hycon,hy46xx.yaml | 119 ++
+ .../bindings/input/touchscreen/ilitek_ts_i2c.yaml | 73 +
+ .../bindings/input/touchscreen/iqs5xx.txt | 80 -
+ .../bindings/input/touchscreen/melfas,mms114.yaml | 87 +
+ .../bindings/input/touchscreen/mms114.txt | 42 -
+ .../bindings/input/touchscreen/mstar,msg2638.yaml | 69 +
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ Documentation/input/devices/rotary-encoder.rst | 8 +-
+ MAINTAINERS | 7 +
+ drivers/input/Makefile | 1 +
+ drivers/input/keyboard/gpio_keys.c | 105 +-
+ drivers/input/keyboard/imx_keypad.c | 13 +-
+ drivers/input/keyboard/tca6416-keypad.c | 3 +-
+ drivers/input/keyboard/tegra-kbc.c | 5 +-
+ drivers/input/misc/Kconfig | 11 +
+ drivers/input/misc/Makefile | 1 +
+ drivers/input/misc/ims-pcu.c | 1 -
+ drivers/input/misc/iqs626a.c | 1838 ++++++++++++++++++++
+ drivers/input/misc/max8997_haptic.c | 9 +-
+ drivers/input/mouse/elan_i2c.h | 7 +-
+ drivers/input/mouse/elan_i2c_core.c | 58 +-
+ drivers/input/serio/apbps2.c | 3 +-
+ .../of_touchscreen.c => touchscreen.c} | 13 +-
+ drivers/input/touchscreen/Kconfig | 39 +-
+ drivers/input/touchscreen/Makefile | 4 +-
+ drivers/input/touchscreen/ar1021_i2c.c | 5 +-
+ drivers/input/touchscreen/atmel_mxt_ts.c | 83 +-
+ drivers/input/touchscreen/bu21029_ts.c | 4 +-
+ drivers/input/touchscreen/cyttsp_core.c | 39 +-
+ drivers/input/touchscreen/cyttsp_core.h | 1 -
+ drivers/input/touchscreen/elants_i2c.c | 44 +-
+ drivers/input/touchscreen/exc3000.c | 253 +--
+ drivers/input/touchscreen/hycon-hy46xx.c | 591 +++++++
+ drivers/input/touchscreen/ilitek_ts_i2c.c | 690 ++++++++
+ drivers/input/touchscreen/iqs5xx.c | 171 +-
+ drivers/input/touchscreen/lpc32xx_ts.c | 10 +-
+ drivers/input/touchscreen/melfas_mip4.c | 5 +-
+ drivers/input/touchscreen/mms114.c | 26 +-
+ drivers/input/touchscreen/msg2638.c | 337 ++++
+ drivers/input/touchscreen/silead.c | 46 +-
+ drivers/input/touchscreen/stmfts.c | 3 +-
+ drivers/input/touchscreen/tsc2007.h | 4 +-
+ drivers/input/touchscreen/tsc2007_core.c | 60 +-
+ drivers/input/touchscreen/wacom_i2c.c | 56 +-
+ drivers/input/touchscreen/wm831x-ts.c | 3 +-
+ drivers/input/touchscreen/zinitix.c | 4 +-
+ include/dt-bindings/input/atmel-maxtouch.h | 10 +
+ 51 files changed, 5466 insertions(+), 536 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/input/iqs626a.yaml
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/azoteq,iqs5xx.yaml
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/hycon,hy46xx.yaml
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/ilitek_ts_i2c.yaml
+ delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/iqs5xx.txt
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/melfas,mms114.yaml
+ delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/mms114.txt
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/mstar,msg2638.yaml
+ create mode 100644 drivers/input/misc/iqs626a.c
+ rename drivers/input/{touchscreen/of_touchscreen.c => touchscreen.c} (93%)
+ create mode 100644 drivers/input/touchscreen/hycon-hy46xx.c
+ create mode 100644 drivers/input/touchscreen/ilitek_ts_i2c.c
+ create mode 100644 drivers/input/touchscreen/msg2638.c
+ create mode 100644 include/dt-bindings/input/atmel-maxtouch.h
+Merging crypto-current/master (e3a606f2c544 fsverity: relax build time dependency on CRYPTO_SHA256)
+$ git merge crypto-current/master
+Already up to date.
+Merging ide/master (6800cd8cbc6e ide-acpi: use %*ph to print small buffer)
+$ git merge ide/master
+Auto-merging include/linux/ide.h
+Auto-merging drivers/ide/sis5513.c
+Auto-merging drivers/ide/ide-acpi.c
+Auto-merging drivers/ide/hpt366.c
+Auto-merging drivers/ide/Kconfig
+Merge made by the 'recursive' strategy.
+ drivers/ide/Kconfig | 2 +-
+ drivers/ide/aec62xx.c | 3 +--
+ drivers/ide/alim15x3.c | 3 +--
+ drivers/ide/amd74xx.c | 3 +--
+ drivers/ide/atiixp.c | 3 +--
+ drivers/ide/cmd64x.c | 3 +--
+ drivers/ide/cs5520.c | 3 +--
+ drivers/ide/cs5530.c | 3 +--
+ drivers/ide/cs5535.c | 3 +--
+ drivers/ide/cs5536.c | 3 +--
+ drivers/ide/cy82c693.c | 3 +--
+ drivers/ide/delkin_cb.c | 32 ++++++--------------------------
+ drivers/ide/hpt366.c | 5 ++---
+ drivers/ide/ide-acpi.c | 5 +----
+ drivers/ide/ide-pci-generic.c | 3 +--
+ drivers/ide/it8172.c | 3 +--
+ drivers/ide/it8213.c | 3 +--
+ drivers/ide/it821x.c | 3 +--
+ drivers/ide/jmicron.c | 3 +--
+ drivers/ide/ns87415.c | 3 +--
+ drivers/ide/opti621.c | 3 +--
+ drivers/ide/pdc202xx_new.c | 3 +--
+ drivers/ide/pdc202xx_old.c | 3 +--
+ drivers/ide/piix.c | 3 +--
+ drivers/ide/sc1200.c | 43 ++++++++++++++-----------------------------
+ drivers/ide/serverworks.c | 3 +--
+ drivers/ide/setup-pci.c | 29 ++++++-----------------------
+ drivers/ide/siimage.c | 3 +--
+ drivers/ide/sis5513.c | 3 +--
+ drivers/ide/sl82c105.c | 3 +--
+ drivers/ide/slc90e66.c | 3 +--
+ drivers/ide/triflex.c | 24 ++++++++----------------
+ drivers/ide/via82cxxx.c | 3 +--
+ include/linux/ide.h | 8 +-------
+ 34 files changed, 65 insertions(+), 161 deletions(-)
+Merging vfio-fixes/for-linus (cc35518d29bc docs: vfio: fix typo)
+$ git merge vfio-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ Documentation/driver-api/vfio.rst | 2 +-
+ include/uapi/linux/vfio.h | 46 +++++++++++++++++++++++++++++++++++----
+ samples/vfio-mdev/mbochs.c | 2 --
+ samples/vfio-mdev/mdpy.c | 3 +--
+ 4 files changed, 44 insertions(+), 9 deletions(-)
+Merging kselftest-fixes/fixes (a38fd8748464 Linux 5.12-rc2)
+$ git merge kselftest-fixes/fixes
+Already up to date.
+Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch)
+$ git merge modules-fixes/modules-linus
+Already up to date.
+Merging dmaengine-fixes/fixes (ea9aadc06a9f dmaengine: idxd: fix wq cleanup of WQCFG registers)
+$ git merge dmaengine-fixes/fixes
+Already up to date.
+Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2)
+$ git merge backlight-fixes/for-backlight-fixes
+Already up to date.
+Merging mtd-fixes/mtd/fixes (2fb164f0ce95 mtd: rawnand: mtk: Fix WAITRDY break condition and timeout)
+$ git merge mtd-fixes/mtd/fixes
+Already up to date.
+Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources")
+$ git merge mfd-fixes/for-mfd-fixes
+Already up to date.
+Merging v4l-dvb-fixes/fixes (0e37b4fa67f5 media: coda: fix macroblocks count control usage)
+$ git merge v4l-dvb-fixes/fixes
+Auto-merging drivers/media/platform/coda/coda-common.c
+Merge made by the 'recursive' strategy.
+Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency)
+$ git merge reset-fixes/reset/fixes
+Already up to date.
+Merging mips-fixes/mips-fixes (9ae31e2ab293 MIPS: kernel: setup.c: fix compilation error)
+$ git merge mips-fixes/mips-fixes
+Already up to date.
+Merging at91-fixes/at91-fixes (2c69c8a1736e ARM: dts: at91: sam9x60: fix mux-mask to match product's datasheet)
+$ git merge at91-fixes/at91-fixes
+Already up to date.
+Merging omap-fixes/fixes (fc85dc42a384 ARM: OMAP2+: Fix uninitialized sr_inst)
+$ git merge omap-fixes/fixes
+Already up to date.
+Merging kvm-fixes/master (9c1a07442c95 KVM: x86/xen: Take srcu lock when accessing kvm_memslots())
+$ git merge kvm-fixes/master
+Already up to date.
+Merging kvms390-fixes/master (735931f9a51a MAINTAINERS: add uv.c also to KVM/s390)
+$ git merge kvms390-fixes/master
+Already up to date.
+Merging hwmon-fixes/hwmon (a38fd8748464 Linux 5.12-rc2)
+$ git merge hwmon-fixes/hwmon
+Already up to date.
+Merging nvdimm-fixes/libnvdimm-fixes (99a81dcc717d Merge branch 'for-5.12/cxl' into libnvdimm-fixes)
+$ git merge nvdimm-fixes/libnvdimm-fixes
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing)
+$ git merge cxl-fixes/fixes
+Already up to date.
+Merging btrfs-fixes/next-fixes (2e4f4de38d26 Merge branch 'misc-5.13' into next-fixes)
+$ git merge btrfs-fixes/next-fixes
+Auto-merging fs/btrfs/tree-log.c
+Auto-merging fs/btrfs/ioctl.c
+Auto-merging fs/btrfs/inode.c
+Auto-merging fs/btrfs/ctree.h
+Merge made by the 'recursive' strategy.
+ fs/btrfs/ctree.h | 2 +-
+ fs/btrfs/extent-tree.c | 6 +++++-
+ fs/btrfs/file.c | 35 +++++++++++++++++++++++++----------
+ fs/btrfs/free-space-cache.c | 2 +-
+ fs/btrfs/inode.c | 4 ++--
+ fs/btrfs/ioctl.c | 2 +-
+ fs/btrfs/ordered-data.c | 2 +-
+ fs/btrfs/qgroup.c | 16 ++++++++++------
+ fs/btrfs/send.c | 4 ++--
+ fs/btrfs/tree-log.c | 3 ++-
+ fs/btrfs/zoned.c | 17 +++++++++++++++++
+ 11 files changed, 67 insertions(+), 26 deletions(-)
+Merging vfs-fixes/fixes (173e84953eaa fs: fix reporting supported extra file attributes for statx())
+$ git merge vfs-fixes/fixes
+Merge made by the 'recursive' strategy.
+Merging dma-mapping-fixes/for-linus (18a3c5f7abfd Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost)
+$ git merge dma-mapping-fixes/for-linus
+Already up to date.
+Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1)
+$ git merge i3c-fixes/i3c/fixes
+Already up to date.
+Merging drivers-x86-fixes/fixes (a3790a8a94fc platform/x86: intel-hid: Fix spurious wakeups caused by tablet-mode events during suspend)
+$ git merge drivers-x86-fixes/fixes
+Already up to date.
+Merging samsung-krzk-fixes/fixes (a38fd8748464 Linux 5.12-rc2)
+$ git merge samsung-krzk-fixes/fixes
+Already up to date.
+Merging pinctrl-samsung-fixes/fixes (a38fd8748464 Linux 5.12-rc2)
+$ git merge pinctrl-samsung-fixes/fixes
+Already up to date.
+Merging devicetree-fixes/dt/linus (6799e3f281e9 dt-bindings: net: renesas,etheravb: Fix optional second clock name)
+$ git merge devicetree-fixes/dt/linus
+Removing Documentation/devicetree/bindings/pci/tango-pcie.txt
+Removing Documentation/devicetree/bindings/mtd/tango-nand.txt
+Merge made by the 'recursive' strategy.
+ .../bindings/display/brcm,bcm2711-hdmi.yaml | 2 +-
+ .../devicetree/bindings/display/renesas,du.yaml | 3 ++
+ .../interrupt-controller/idt,32434-pic.yaml | 4 ++
+ .../devicetree/bindings/media/renesas,vin.yaml | 46 ++++++++++++++--------
+ .../devicetree/bindings/mtd/tango-nand.txt | 38 ------------------
+ .../devicetree/bindings/net/renesas,etheravb.yaml | 2 +-
+ .../devicetree/bindings/pci/rcar-pci-host.yaml | 12 +++++-
+ .../devicetree/bindings/pci/tango-pcie.txt | 29 --------------
+ Documentation/devicetree/bindings/serial/8250.yaml | 5 ---
+ drivers/of/overlay.c | 3 --
+ 10 files changed, 49 insertions(+), 95 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/mtd/tango-nand.txt
+ delete mode 100644 Documentation/devicetree/bindings/pci/tango-pcie.txt
+Merging scsi-fixes/fixes (35ffbb60bdad scsi: fnic: Use scsi_host_busy_iter() to traverse commands)
+$ git merge scsi-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/scsi/fnic/fnic_scsi.c | 828 +++++++++++++++++---------------------
+ drivers/scsi/lpfc/lpfc_bsg.c | 2 +-
+ drivers/scsi/lpfc/lpfc_init.c | 12 +-
+ drivers/scsi/lpfc/lpfc_sli.c | 26 +-
+ drivers/scsi/qla2xxx/qla_init.c | 3 +
+ drivers/scsi/qla2xxx/qla_os.c | 1 +
+ drivers/scsi/scsi_debug.c | 24 +-
+ drivers/scsi/ufs/ufs-sysfs.c | 12 +-
+ drivers/scsi/ufs/ufshcd.c | 7 +-
+ drivers/target/target_core_user.c | 4 +-
+ include/linux/blk-mq.h | 8 +-
+ 11 files changed, 438 insertions(+), 489 deletions(-)
+Merging drm-fixes/drm-fixes (aca38735ae62 Merge tag 'drm-intel-fixes-2021-04-22' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes)
+$ git merge drm-fixes/drm-fixes
+Already up to date.
+Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
+$ git merge amdgpu-fixes/drm-fixes
+Already up to date.
+Merging drm-intel-fixes/for-linux-next-fixes (9f4ad9e425a1 Linux 5.12)
+$ git merge drm-intel-fixes/for-linux-next-fixes
+Already up to date.
+Merging mmc-fixes/fixes (7412dee9f1fd mmc: meson-gx: replace WARN_ONCE with dev_warn_once about scatterlist size alignment in block mode)
+$ git merge mmc-fixes/fixes
+Already up to date.
+Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt())
+$ git merge rtc-fixes/rtc-fixes
+Merge made by the 'recursive' strategy.
+ drivers/rtc/rtc-cmos.c | 2 ++
+ 1 file changed, 2 insertions(+)
+Merging gnss-fixes/gnss-linus (a38fd8748464 Linux 5.12-rc2)
+$ git merge gnss-fixes/gnss-linus
+Already up to date.
+Merging hyperv-fixes/hyperv-fixes (37df9f3fedb6 video: hyperv_fb: Fix a double free in hvfb_probe)
+$ git merge hyperv-fixes/hyperv-fixes
+Already up to date.
+Merging soc-fsl-fixes/fix (2663b3388551 soc: fsl: dpio: Get the cpumask through cpumask_of(cpu))
+$ git merge soc-fsl-fixes/fix
+Already up to date.
+Merging risc-v-fixes/fixes (18a3c5f7abfd Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost)
+$ git merge risc-v-fixes/fixes
+Already up to date.
+Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range())
+$ git merge pidfd-fixes/fixes
+Auto-merging fs/file.c
+Merge made by the 'recursive' strategy.
+ fs/file.c | 64 +++++++++++++++++++++++++++++++++++++++------------------------
+ 1 file changed, 40 insertions(+), 24 deletions(-)
+Merging fpga-fixes/fixes (2e8496f31d0b firmware: stratix10-svc: reset COMMAND_RECONFIG_FLAG_PARTIAL to 0)
+$ git merge fpga-fixes/fixes
+Already up to date.
+Merging spdx/spdx-linus (9f4ad9e425a1 Linux 5.12)
+$ git merge spdx/spdx-linus
+Already up to date.
+Merging gpio-brgl-fixes/gpio/for-current (ddd8d94ca31e gpio: omap: Save and restore sysconfig)
+$ git merge gpio-brgl-fixes/gpio/for-current
+Already up to date.
+Merging gpio-intel-fixes/fixes (b41ba2ec54a7 gpiolib: Read "gpio-line-names" from a firmware node)
+$ git merge gpio-intel-fixes/fixes
+Already up to date.
+Merging pinctrl-intel-fixes/fixes (196d94175329 pinctrl: lewisburg: Update number of pins in community)
+$ git merge pinctrl-intel-fixes/fixes
+Already up to date.
+Merging erofs-fixes/fixes (9f377622a484 erofs: fix bio->bi_max_vecs behavior change)
+$ git merge erofs-fixes/fixes
+Already up to date.
+Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc())
+$ git merge integrity-fixes/fixes
+Already up to date.
+Merging kunit-fixes/kunit-fixes (7fd53f41f771 kunit: tool: Disable PAGE_POISONING under --alltests)
+$ git merge kunit-fixes/kunit-fixes
+Already up to date.
+Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes)
+$ git merge ubifs-fixes/fixes
+Already up to date.
+Merging memblock-fixes/fixes (17cbe03872be mm/memblock: Fix typo in comment of memblock_phys_alloc_try_nid())
+$ git merge memblock-fixes/fixes
+Already up to date.
+Merging cel-fixes/for-rc (9f4ad9e425a1 Linux 5.12)
+$ git merge cel-fixes/for-rc
+Already up to date.
+Merging drm-misc-fixes/for-linux-next-fixes (ffe8768fb8f3 drm/vc4: remove unused function)
+$ git merge drm-misc-fixes/for-linux-next-fixes
+Auto-merging drivers/gpu/drm/ttm/ttm_bo.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_bo.c
+Resolved 'drivers/gpu/drm/ttm/ttm_bo.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master cafa2254e3fa] Merge remote-tracking branch 'drm-misc-fixes/for-linux-next-fixes'
+$ git diff -M --stat --summary HEAD^..
+ drivers/gpu/drm/vc4/vc4_vec.c | 6 ------
+ 1 file changed, 6 deletions(-)
+Merging kspp-gustavo/for-next/kspp (36f9ff9e03de lib: Fix fall-through warnings for Clang)
+$ git merge kspp-gustavo/for-next/kspp
+Already up to date.
+Merging kbuild/for-next (51eb95e2da41 kbuild: Don't remove link-vmlinux temporary files on exit/signal)
+$ git merge kbuild/for-next
+Auto-merging scripts/recordmcount.pl
+Removing arch/sparc/kernel/syscalls/syscalltbl.sh
+Removing arch/sparc/kernel/syscalls/syscallhdr.sh
+Removing arch/sh/kernel/syscalls/syscalltbl.sh
+Removing arch/sh/kernel/syscalls/syscallhdr.sh
+Auto-merging Makefile
+Merge made by the 'recursive' strategy.
+ .gitignore | 8 +--
+ Documentation/devicetree/bindings/.gitignore | 4 +-
+ Makefile | 42 +++++-----------
+ arch/.gitignore | 4 +-
+ arch/arm/boot/compressed/Makefile | 7 ---
+ arch/m68k/Makefile | 2 +-
+ arch/mips/Makefile | 2 +-
+ arch/parisc/Makefile | 2 +-
+ arch/powerpc/boot/wrapper | 2 +-
+ arch/sh/Makefile | 2 +-
+ arch/sh/kernel/syscalls/Makefile | 14 ++----
+ arch/sh/kernel/syscalls/syscallhdr.sh | 36 --------------
+ arch/sh/kernel/syscalls/syscalltbl.sh | 32 ------------
+ arch/sparc/include/asm/Kbuild | 1 -
+ arch/sparc/kernel/syscalls/Makefile | 30 ++++--------
+ arch/sparc/kernel/syscalls/syscallhdr.sh | 36 --------------
+ arch/sparc/kernel/syscalls/syscalltbl.sh | 36 --------------
+ arch/sparc/kernel/systbls_32.S | 4 +-
+ arch/sparc/kernel/systbls_64.S | 8 +--
+ arch/xtensa/Makefile | 6 +--
+ certs/.gitignore | 4 +-
+ drivers/memory/.gitignore | 2 +-
+ drivers/tty/vt/.gitignore | 6 +--
+ fs/unicode/.gitignore | 4 +-
+ kernel/.gitignore | 5 +-
+ kernel/Makefile | 9 +++-
+ lib/.gitignore | 10 ++--
+ samples/auxdisplay/.gitignore | 2 +-
+ samples/binderfs/.gitignore | 3 +-
+ samples/connector/.gitignore | 2 +-
+ samples/hidraw/.gitignore | 2 +-
+ samples/mei/.gitignore | 2 +-
+ samples/nitro_enclaves/.gitignore | 2 +-
+ samples/pidfd/.gitignore | 2 +-
+ samples/seccomp/.gitignore | 8 +--
+ samples/timers/.gitignore | 2 +-
+ samples/vfs/.gitignore | 4 +-
+ samples/watch_queue/.gitignore | 3 +-
+ samples/watchdog/.gitignore | 2 +-
+ scripts/.gitignore | 18 +++----
+ scripts/Makefile.build | 2 +-
+ scripts/Makefile.lib | 57 ++++++++++++----------
+ scripts/basic/.gitignore | 2 +-
+ scripts/dtc/.gitignore | 4 +-
+ scripts/gcc-plugins/.gitignore | 2 +-
+ scripts/genksyms/.gitignore | 2 +-
+ scripts/genksyms/Makefile | 2 +-
+ scripts/link-vmlinux.sh | 14 ------
+ scripts/mod/.gitignore | 8 +--
+ scripts/nsdeps | 2 +-
+ scripts/recordmcount.pl | 2 +-
+ scripts/remove-stale-files | 31 ++++++++++++
+ scripts/setlocalversion | 2 +-
+ scripts/tags.sh | 2 +-
+ tools/testing/selftests/net/mptcp/mptcp_connect.sh | 2 +-
+ usr/.gitignore | 4 +-
+ usr/gen_initramfs.sh | 2 +-
+ usr/include/.gitignore | 4 +-
+ 58 files changed, 178 insertions(+), 336 deletions(-)
+ delete mode 100644 arch/sh/kernel/syscalls/syscallhdr.sh
+ delete mode 100644 arch/sh/kernel/syscalls/syscalltbl.sh
+ delete mode 100644 arch/sparc/kernel/syscalls/syscallhdr.sh
+ delete mode 100644 arch/sparc/kernel/syscalls/syscalltbl.sh
+ create mode 100755 scripts/remove-stale-files
+Merging compiler-attributes/compiler-attributes (19c329f68089 Linux 5.11-rc4)
+$ git merge compiler-attributes/compiler-attributes
+Already up to date.
+Merging dma-mapping/for-next (a7f3d3d3600c dma-mapping: add unlikely hint to error path in dma_mapping_error)
+$ git merge dma-mapping/for-next
+Already up to date.
+Merging asm-generic/master (38489db09b10 Merge branch 'asm-generic-fixes' into asm-generic)
+$ git merge asm-generic/master
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging arc/for-next (def9d2780727 Linux 5.5-rc7)
+$ git merge arc/for-next
+Already up to date.
+Merging arm/for-next (d3506d256d94 Merge branch 'misc' into for-next)
+$ git merge arm/for-next
+Removing arch/arm/tools/syscalltbl.sh
+Removing arch/arm/tools/syscallhdr.sh
+Auto-merging arch/arm/mm/init.c
+Removing arch/arm/mach-footbridge/personal.c
+Removing arch/arm/mach-footbridge/personal-pci.c
+Auto-merging arch/arm/boot/compressed/Makefile
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/compressed/Makefile | 4 +-
+ arch/arm/configs/footbridge_defconfig | 1 -
+ arch/arm/include/asm/kexec.h | 3 -
+ arch/arm/include/asm/memory.h | 15 --
+ arch/arm/include/asm/set_memory.h | 8 -
+ arch/arm/include/uapi/asm/Kbuild | 1 -
+ arch/arm/include/uapi/asm/unistd.h | 1 -
+ arch/arm/kernel/asm-offsets.c | 3 +
+ arch/arm/kernel/entry-common.S | 8 +-
+ arch/arm/kernel/hw_breakpoint.c | 2 +-
+ arch/arm/kernel/machine_kexec.c | 8 -
+ arch/arm/kernel/smccc-call.S | 11 +-
+ arch/arm/kernel/suspend.c | 19 ++-
+ arch/arm/mach-footbridge/Kconfig | 21 ---
+ arch/arm/mach-footbridge/Makefile | 2 -
+ arch/arm/mach-footbridge/personal-pci.c | 57 -------
+ arch/arm/mach-footbridge/personal.c | 25 ---
+ arch/arm/mm/cache-v7.S | 58 +++----
+ arch/arm/mm/dump.c | 4 +-
+ arch/arm/mm/init.c | 21 ---
+ arch/arm/mm/proc-v7.S | 39 ++---
+ arch/arm/mm/ptdump_debugfs.c | 15 +-
+ arch/arm/probes/kprobes/test-arm.c | 294 ++++++++++++++++----------------
+ arch/arm/probes/kprobes/test-core.h | 1 +
+ arch/arm/tools/Makefile | 26 +--
+ arch/arm/tools/syscallhdr.sh | 31 ----
+ arch/arm/tools/syscalltbl.sh | 22 ---
+ 27 files changed, 246 insertions(+), 454 deletions(-)
+ delete mode 100644 arch/arm/mach-footbridge/personal-pci.c
+ delete mode 100644 arch/arm/mach-footbridge/personal.c
+ delete mode 100644 arch/arm/tools/syscallhdr.sh
+ delete mode 100644 arch/arm/tools/syscalltbl.sh
+Merging arm64/for-next/core (5d8505fd039c arm64: Fix the documented event stream frequency)
+$ git merge arm64/for-next/core
+Auto-merging drivers/firmware/psci/psci.c
+Auto-merging arch/arm64/mm/mmu.c
+Auto-merging arch/arm64/mm/init.c
+Auto-merging arch/arm64/kernel/stacktrace.c
+Auto-merging arch/arm64/kernel/process.c
+Auto-merging arch/arm64/kernel/entry.S
+Auto-merging arch/arm64/kernel/cpufeature.c
+Auto-merging arch/arm64/kernel/alternative.c
+CONFLICT (content): Merge conflict in arch/arm64/kernel/alternative.c
+Auto-merging arch/arm64/include/asm/memory.h
+Auto-merging arch/arm64/Kconfig
+Resolved 'arch/arm64/kernel/alternative.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 95e036140e3f] Merge remote-tracking branch 'arm64/for-next/core'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/arm64/booting.rst | 33 +++++++++++++++++++++++++++++-
+ Documentation/arm64/elf_hwcaps.rst | 2 +-
+ Documentation/arm64/tagged-address-abi.rst | 6 ++++++
+ arch/arm64/Kconfig | 11 +---------
+ arch/arm64/include/asm/daifflags.h | 3 +++
+ arch/arm64/include/asm/kernel-pgtable.h | 2 +-
+ arch/arm64/include/asm/memory.h | 4 ++--
+ arch/arm64/include/asm/sparsemem.h | 3 ---
+ arch/arm64/kernel/alternative.c | 3 +--
+ arch/arm64/kernel/cpufeature.c | 5 +++--
+ arch/arm64/kernel/entry-common.c | 17 ---------------
+ arch/arm64/kernel/entry.S | 21 +++++--------------
+ arch/arm64/kernel/process.c | 9 +++-----
+ arch/arm64/kernel/stacktrace.c | 10 +++++----
+ arch/arm64/kernel/vdso/vdso.lds.S | 8 +++++++-
+ arch/arm64/kernel/vdso32/Makefile | 8 --------
+ arch/arm64/mm/init.c | 8 ++------
+ arch/arm64/mm/mmu.c | 2 --
+ arch/arm64/mm/ptdump.c | 2 --
+ drivers/acpi/arm64/gtdt.c | 10 +++++----
+ drivers/acpi/irq.c | 6 +++++-
+ drivers/firmware/psci/psci.c | 2 +-
+ 22 files changed, 85 insertions(+), 90 deletions(-)
+Merging arm-perf/for-next/perf (2c2e21e78a94 arm64: perf: Remove redundant initialization in perf_event.c)
+$ git merge arm-perf/for-next/perf
+Already up to date.
+Merging arm-soc/for-next (d42805807be7 Merge branch 'arm/drivers' into for-next)
+$ git merge arm-soc/for-next
+Auto-merging arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
+CONFLICT (content): Merge conflict in arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
+Resolved 'arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 9e52398083eb] Merge remote-tracking branch 'arm-soc/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/arm-soc-for-next-contents.txt | 213 +++++++++++++++++++++++++++++++++
+ 1 file changed, 213 insertions(+)
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC)
+$ git merge actions/for-next
+Merge made by the 'recursive' strategy.
+Merging amlogic/for-next (09dc799bceb5 Merge branch 'v5.13/fixes' into tmp/aml-rebuild)
+$ git merge amlogic/for-next
+Auto-merging Documentation/devicetree/bindings/media/rc.yaml
+Merge made by the 'recursive' strategy.
+ drivers/soc/amlogic/meson-clk-measure.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+Merging aspeed/for-next (61fbc42084f4 Merge branches 'wpcm450-for-v5.13', 'dt-for-v5.13' and 'lpc-for-v5.13' into for-next)
+$ git merge aspeed/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging at91/at91-next (969bbb49f36c Merge branch 'at91-dt' into at91-next)
+$ git merge at91/at91-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging drivers-memory/for-next (93567c59f9b0 Merge branch 'mem-ctrl-next' into for-next)
+$ git merge drivers-memory/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging imx-mxs/for-next (1f0f76f795d5 Merge branch 'imx/defconfig' into for-next)
+$ git merge imx-mxs/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging keystone/next (9d2e21ed98a2 Merge branch 'for_5.12/drivers-soc' into next)
+$ git merge keystone/next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging mediatek/for-next (068acd3c4e4c Merge branch 'v5.12-next/dts64-2' into for-next)
+$ git merge mediatek/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm64/boot/dts/mediatek/mt8167.dtsi | 270 +++++++++++++++++++++++++++++++
+ arch/arm64/boot/dts/mediatek/mt8173.dtsi | 60 +++----
+ 2 files changed, 301 insertions(+), 29 deletions(-)
+Merging mvebu/for-next (79e93f9dc81a 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 (44e97f6fb29b Merge branch 'fixes' into for-next)
+$ git merge omap/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 6 ------
+ 1 file changed, 6 deletions(-)
+Merging qcom/for-next (0109038cffef Merge branches 'arm64-defconfig-for-5.13', 'arm64-for-5.13', 'defconfig-for-5.13', 'drivers-for-5.13' and 'dts-for-5.13' into for-next)
+$ git merge qcom/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging raspberrypi/for-next (fbdcf1d20126 ARM: dts: bcm2711: Add the CEC interrupt controller)
+$ git merge raspberrypi/for-next
+Auto-merging arch/arm64/configs/defconfig
+Auto-merging arch/arm64/Kconfig.platforms
+Auto-merging arch/arm/configs/multi_v7_defconfig
+Auto-merging arch/arm/boot/dts/bcm2711.dtsi
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/bcm2711.dtsi
+Resolved 'arch/arm/boot/dts/bcm2711.dtsi' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 848f00a2f260] Merge remote-tracking branch 'raspberrypi/for-next'
+$ git diff -M --stat --summary HEAD^..
+Merging realtek/for-next (486f29df6941 Merge branch 'v5.8/dt' into next)
+$ git merge realtek/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging renesas/next (0bacf4d3d276 Merge branch 'renesas-arm-dt-for-v5.13' into renesas-next)
+$ git merge renesas/next
+Merge made by the 'recursive' strategy.
+ .../hihope-rzg2-ex-aistarvision-mipi-adapter-2.1.dtsi | 2 --
+ arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 8 ++++++++
+ arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 8 ++++++++
+ arch/arm64/boot/dts/renesas/r8a774c0-ek874-mipi-2.1.dts | 2 +-
+ arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 4 ++++
+ arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 8 ++++++++
+ arch/arm64/boot/dts/renesas/r8a77950.dtsi | 4 ++++
+ arch/arm64/boot/dts/renesas/r8a77951.dtsi | 12 ++++++++++++
+ arch/arm64/boot/dts/renesas/r8a77960.dtsi | 8 ++++++++
+ arch/arm64/boot/dts/renesas/r8a77961.dtsi | 8 ++++++++
+ arch/arm64/boot/dts/renesas/r8a77965.dtsi | 8 ++++++++
+ arch/arm64/boot/dts/renesas/r8a77970.dtsi | 4 ++++
+ arch/arm64/boot/dts/renesas/r8a77980.dtsi | 8 ++++++++
+ arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 2 --
+ arch/arm64/boot/dts/renesas/r8a77990.dtsi | 4 ++++
+ arch/arm64/boot/dts/renesas/salvator-common.dtsi | 3 ---
+ 16 files changed, 85 insertions(+), 8 deletions(-)
+Merging reset/reset/next (7941ad8d45e2 reset: RESET_INTEL_GW should depend on X86)
+$ git merge reset/reset/next
+Auto-merging drivers/reset/core.c
+CONFLICT (content): Merge conflict in drivers/reset/core.c
+Auto-merging drivers/reset/Kconfig
+Resolved 'drivers/reset/core.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 37c5c4a0b287] Merge remote-tracking branch 'reset/reset/next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/reset/microchip,rst.yaml | 58 ++++++++
+ drivers/reset/Kconfig | 12 +-
+ drivers/reset/Makefile | 1 +
+ drivers/reset/core.c | 20 +--
+ drivers/reset/reset-bcm6345.c | 2 +-
+ drivers/reset/reset-berlin.c | 2 +-
+ drivers/reset/reset-microchip-sparx5.c | 146 +++++++++++++++++++++
+ drivers/reset/reset-oxnas.c | 2 +-
+ drivers/reset/reset-ti-syscon.c | 4 +-
+ drivers/reset/reset-uniphier.c | 2 +-
+ drivers/reset/reset-zynqmp.c | 4 +-
+ drivers/reset/sti/reset-syscfg.c | 2 +-
+ 12 files changed, 235 insertions(+), 20 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/reset/microchip,rst.yaml
+ create mode 100644 drivers/reset/reset-microchip-sparx5.c
+Merging rockchip/for-next (f40c51456fe0 Merge branch 'v5.13-armsoc/dts64' into for-next)
+$ git merge rockchip/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging samsung-krzk/for-next (8a4d4cd15c39 Merge branch 'next/soc' into for-next)
+$ git merge samsung-krzk/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging scmi/for-linux-next (04c552317e02 Merge tag 'scmi-fixes-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
+$ git merge scmi/for-linux-next
+Merge made by the 'recursive' strategy.
+ drivers/firmware/arm_scmi/notify.h | 2 --
+ drivers/firmware/arm_scpi.c | 4 +++-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+Merging stm32/stm32-next (6ed9269265e1 ARM: dts: stm32: Add PTP clock to Ethernet controller)
+$ git merge stm32/stm32-next
+Already up to date.
+Merging sunxi/sunxi/for-next (9fa021aa01fd Merge tags 'sunxi-dt-for-5.13-1' and 'sunxi-fixes-for-5.12' into sunxi/for-next)
+$ git merge sunxi/sunxi/for-next
+Auto-merging arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
+CONFLICT (content): Merge conflict in arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
+Auto-merging arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts
+CONFLICT (content): Merge conflict in arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts
+Auto-merging MAINTAINERS
+Resolved 'arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts' using previous resolution.
+Resolved 'arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master c59294bc24bb] Merge remote-tracking branch 'sunxi/sunxi/for-next'
+$ git diff -M --stat --summary HEAD^..
+Merging tegra/for-next (93b9ea9ca307 Merge branch for-5.13/arm64/dt into for-next)
+$ git merge tegra/for-next
+Merge made by the 'recursive' strategy.
+ drivers/phy/tegra/xusb-tegra186.c | 550 ++++++++++-
+ drivers/phy/tegra/xusb-tegra210.c | 1877 +++++++++++++++++++++++++++++--------
+ drivers/phy/tegra/xusb.c | 92 +-
+ drivers/phy/tegra/xusb.h | 22 +-
+ drivers/usb/host/xhci-tegra.c | 613 +++++++++---
+ include/linux/phy/tegra/xusb.h | 10 +-
+ 6 files changed, 2609 insertions(+), 555 deletions(-)
+Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into ti-k3-next)
+$ git merge ti-k3/ti-k3-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging ti-k3-new/ti-k3-next (112e5934ff3a arm64: dts: ti: k3-am64-main: Fix ospi compatible)
+$ git merge ti-k3-new/ti-k3-next
+Already up to date.
+Merging xilinx/for-next (fe07bfda2fb9 Linux 5.12-rc1)
+$ git merge xilinx/for-next
+Already up to date.
+Merging clk/clk-next (3ba2d41dca14 Merge branch 'clk-ralink' into clk-next)
+$ git merge clk/clk-next
+Already up to date.
+Merging clk-imx/for-next (054ef44ea3ef clk: imx: Reference preceded by free)
+$ git merge clk-imx/for-next
+Already up to date.
+Merging clk-renesas/renesas-clk (f2fb4fe62390 clk: renesas: Zero init clk_init_data)
+$ git merge clk-renesas/renesas-clk
+Already up to date.
+Merging clk-samsung/for-next (a38fd8748464 Linux 5.12-rc2)
+$ git merge clk-samsung/for-next
+Already up to date.
+Merging csky/linux-next (11e7a691a977 csky: syscache: Fixup duplicate cache flush)
+$ git merge csky/linux-next
+Merge made by the 'recursive' strategy.
+ arch/csky/mm/syscache.c | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+Merging h8300/h8300-next (6e5e55227c95 Merge tag 'v5.11' into h8300-next)
+$ git merge h8300/h8300-next
+Auto-merging drivers/tty/serial/sh-sci.c
+Auto-merging drivers/net/ethernet/smsc/smc91x.c
+Merge made by the 'recursive' strategy.
+ arch/h8300/Kconfig.cpu | 4 ++
+ arch/h8300/boot/dts/edosk2674.dts | 10 ++++-
+ arch/h8300/boot/dts/h8300h_sim.dts | 2 +-
+ arch/h8300/boot/dts/h8s_sim.dts | 2 +-
+ arch/h8300/configs/edosk2674_defconfig | 10 ++---
+ arch/h8300/configs/h8300h-sim_defconfig | 8 +---
+ arch/h8300/configs/h8s-sim_defconfig | 8 +---
+ arch/h8300/kernel/setup.c | 2 +-
+ arch/h8300/lib/memset.S | 17 +++++----
+ drivers/clocksource/h8300_timer8.c | 20 +++++-----
+ drivers/irqchip/irq-renesas-h8300h.c | 19 +++++++++-
+ drivers/irqchip/irq-renesas-h8s.c | 67 +++++++++++++++++++++++++--------
+ drivers/net/ethernet/smsc/Kconfig | 1 -
+ drivers/net/ethernet/smsc/smc91x.c | 10 +++++
+ drivers/tty/serial/sh-sci.c | 5 +--
+ 15 files changed, 123 insertions(+), 62 deletions(-)
+Merging m68k/for-next (34e5269bf987 m68k: sun3x: Remove unneeded semicolon)
+$ git merge m68k/for-next
+Already up to date.
+Merging m68knommu/for-next (6b3788e5fb80 m68k: coldfire: fix irq ranges)
+$ git merge m68knommu/for-next
+Already up to date.
+Merging microblaze/next (47de4477a8e6 microblaze: add 'fallthrough' to memcpy/memset/memmove)
+$ git merge microblaze/next
+Already up to date.
+Merging mips/mips-next (7e9be673cb1b MIPS: BCM63XX: Use BUG_ON instead of condition followed by BUG.)
+$ git merge mips/mips-next
+Already up to date.
+Merging nds32/next (40e0dd851e7b nds32: Fix bogus reference to <asm/procinfo.h>)
+$ git merge nds32/next
+Already up to date.
+Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn)
+$ git merge nios2/for-next
+Already up to date.
+Merging openrisc/for-next (1683f7de65db soc: litex: Remove duplicated header file inclusion)
+$ git merge openrisc/for-next
+Already up to date.
+Merging parisc-hd/for-next (9f4ad9e425a1 Linux 5.12)
+$ git merge parisc-hd/for-next
+Already up to date.
+Merging powerpc/next (c6b05f4e233c powerpc/kconfig: Restore alphabetic order of the selects under CONFIG_PPC)
+$ git merge powerpc/next
+Removing arch/powerpc/platforms/powernv/npu-dma.c
+Auto-merging arch/powerpc/Kconfig
+CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Resolved 'arch/powerpc/Kconfig' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 29ec3b84318e] Merge remote-tracking branch 'powerpc/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/kernel-parameters.txt | 2 +
+ arch/powerpc/Kconfig | 35 +-
+ arch/powerpc/include/asm/opal.h | 3 -
+ arch/powerpc/include/asm/pci-bridge.h | 1 -
+ arch/powerpc/include/asm/pci.h | 7 -
+ arch/powerpc/kernel/module.c | 18 +-
+ arch/powerpc/kexec/file_load_64.c | 92 ++++
+ arch/powerpc/lib/Makefile | 3 +
+ arch/powerpc/platforms/powernv/Makefile | 2 +-
+ arch/powerpc/platforms/powernv/memtrace.c | 4 +-
+ arch/powerpc/platforms/powernv/npu-dma.c | 705 ------------------------
+ arch/powerpc/platforms/powernv/opal-call.c | 2 -
+ arch/powerpc/platforms/powernv/pci-ioda.c | 185 +------
+ arch/powerpc/platforms/powernv/pci.c | 11 -
+ arch/powerpc/platforms/powernv/pci.h | 17 +-
+ arch/powerpc/platforms/pseries/pci.c | 23 -
+ 16 files changed, 138 insertions(+), 972 deletions(-)
+ delete mode 100644 arch/powerpc/platforms/powernv/npu-dma.c
+Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges)
+$ git merge fsl/next
+Already up to date.
+Merging soc-fsl/next (242b0b398ccd soc: fsl: enable acpi support in RCPM driver)
+$ git merge soc-fsl/next
+Already up to date.
+Merging risc-v/for-next (f54c7b5898d3 RISC-V: Always define XIP_FIXUP)
+$ git merge risc-v/for-next
+Auto-merging scripts/recordmcount.pl
+Auto-merging arch/riscv/mm/kasan_init.c
+CONFLICT (content): Merge conflict in arch/riscv/mm/kasan_init.c
+Auto-merging arch/riscv/mm/init.c
+Auto-merging arch/riscv/mm/fault.c
+Auto-merging arch/riscv/kernel/traps.c
+Auto-merging arch/riscv/kernel/time.c
+Auto-merging arch/riscv/kernel/setup.c
+CONFLICT (content): Merge conflict in arch/riscv/kernel/setup.c
+Auto-merging arch/riscv/kernel/sbi.c
+Auto-merging arch/riscv/kernel/probes/kprobes.c
+Auto-merging arch/riscv/kernel/entry.S
+Auto-merging arch/riscv/kernel/Makefile
+Auto-merging arch/riscv/include/asm/sbi.h
+Auto-merging arch/riscv/Kconfig.socs
+Auto-merging arch/riscv/Kconfig
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+CONFLICT (content): Merge conflict in Documentation/admin-guide/kernel-parameters.txt
+Resolved 'Documentation/admin-guide/kernel-parameters.txt' using previous resolution.
+Resolved 'arch/riscv/kernel/setup.c' using previous resolution.
+Resolved 'arch/riscv/mm/kasan_init.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 3eaee2a39909] Merge remote-tracking branch 'risc-v/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/kernel-parameters.txt | 2 +-
+ .../devicetree/bindings/riscv/microchip.yaml | 27 ++
+ Documentation/riscv/index.rst | 1 +
+ Documentation/riscv/vm-layout.rst | 63 ++++
+ arch/riscv/Kconfig | 90 +++++-
+ arch/riscv/Kconfig.erratas | 44 +++
+ arch/riscv/Kconfig.socs | 8 +
+ arch/riscv/Makefile | 9 +-
+ arch/riscv/boot/Makefile | 13 +
+ arch/riscv/boot/dts/Makefile | 1 +
+ arch/riscv/boot/dts/microchip/Makefile | 2 +
+ .../dts/microchip/microchip-mpfs-icicle-kit.dts | 72 +++++
+ arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi | 329 ++++++++++++++++++++
+ arch/riscv/boot/loader.lds.S | 3 +-
+ arch/riscv/configs/defconfig | 4 +
+ arch/riscv/errata/Makefile | 2 +
+ arch/riscv/errata/alternative.c | 74 +++++
+ arch/riscv/errata/sifive/Makefile | 2 +
+ arch/riscv/errata/sifive/errata.c | 106 +++++++
+ arch/riscv/errata/sifive/errata_cip_453.S | 38 +++
+ arch/riscv/include/asm/alternative-macros.h | 142 +++++++++
+ arch/riscv/include/asm/alternative.h | 39 +++
+ arch/riscv/include/asm/asm.h | 1 +
+ arch/riscv/include/asm/csr.h | 3 +
+ arch/riscv/include/asm/elf.h | 6 +
+ arch/riscv/include/asm/errata_list.h | 39 +++
+ arch/riscv/include/asm/ftrace.h | 14 +-
+ arch/riscv/include/asm/kexec.h | 56 ++++
+ arch/riscv/include/asm/page.h | 47 ++-
+ arch/riscv/include/asm/pgtable.h | 65 +++-
+ arch/riscv/include/asm/sbi.h | 3 +
+ arch/riscv/include/asm/sections.h | 1 +
+ arch/riscv/include/asm/set_memory.h | 1 +
+ arch/riscv/include/asm/smp.h | 4 +-
+ arch/riscv/include/asm/string.h | 5 +
+ arch/riscv/include/asm/syscall.h | 2 +-
+ arch/riscv/include/asm/tlbflush.h | 3 +-
+ arch/riscv/include/asm/vendorid_list.h | 10 +
+ arch/riscv/kernel/Makefile | 6 +
+ arch/riscv/kernel/crash_dump.c | 46 +++
+ arch/riscv/kernel/crash_save_regs.S | 56 ++++
+ arch/riscv/kernel/entry.S | 6 +-
+ arch/riscv/kernel/head.S | 49 ++-
+ arch/riscv/kernel/head.h | 3 +
+ arch/riscv/kernel/kexec_relocate.S | 223 ++++++++++++++
+ arch/riscv/kernel/machine_kexec.c | 193 ++++++++++++
+ arch/riscv/kernel/mcount.S | 10 +-
+ arch/riscv/kernel/module.c | 8 +-
+ arch/riscv/kernel/probes/kprobes.c | 12 +-
+ arch/riscv/kernel/sbi.c | 31 +-
+ arch/riscv/kernel/setup.c | 130 +++++---
+ arch/riscv/kernel/smp.c | 24 +-
+ arch/riscv/kernel/smpboot.c | 4 +
+ arch/riscv/kernel/syscall_table.c | 2 +-
+ arch/riscv/kernel/time.c | 2 +-
+ arch/riscv/kernel/traps.c | 2 +-
+ arch/riscv/kernel/vdso.c | 4 +-
+ arch/riscv/kernel/vdso/Makefile | 16 +-
+ arch/riscv/kernel/vmlinux-xip.lds.S | 133 ++++++++
+ arch/riscv/kernel/vmlinux.lds.S | 16 +-
+ arch/riscv/mm/fault.c | 13 +
+ arch/riscv/mm/init.c | 337 +++++++++++++++++++--
+ arch/riscv/mm/kasan_init.c | 72 ++---
+ arch/riscv/mm/physaddr.c | 2 +-
+ arch/riscv/mm/ptdump.c | 75 ++++-
+ arch/riscv/net/bpf_jit_comp64.c | 13 -
+ arch/riscv/net/bpf_jit_core.c | 14 +
+ include/uapi/linux/kexec.h | 1 +
+ samples/kprobes/kprobe_example.c | 8 +
+ scripts/package/buildtar | 8 +
+ scripts/recordmcount.pl | 2 +-
+ 71 files changed, 2636 insertions(+), 216 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/riscv/microchip.yaml
+ create mode 100644 Documentation/riscv/vm-layout.rst
+ create mode 100644 arch/riscv/Kconfig.erratas
+ create mode 100644 arch/riscv/boot/dts/microchip/Makefile
+ create mode 100644 arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts
+ create mode 100644 arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
+ create mode 100644 arch/riscv/errata/Makefile
+ create mode 100644 arch/riscv/errata/alternative.c
+ create mode 100644 arch/riscv/errata/sifive/Makefile
+ create mode 100644 arch/riscv/errata/sifive/errata.c
+ create mode 100644 arch/riscv/errata/sifive/errata_cip_453.S
+ create mode 100644 arch/riscv/include/asm/alternative-macros.h
+ create mode 100644 arch/riscv/include/asm/alternative.h
+ create mode 100644 arch/riscv/include/asm/errata_list.h
+ create mode 100644 arch/riscv/include/asm/kexec.h
+ create mode 100644 arch/riscv/include/asm/vendorid_list.h
+ create mode 100644 arch/riscv/kernel/crash_dump.c
+ create mode 100644 arch/riscv/kernel/crash_save_regs.S
+ create mode 100644 arch/riscv/kernel/kexec_relocate.S
+ create mode 100644 arch/riscv/kernel/machine_kexec.c
+ create mode 100644 arch/riscv/kernel/vmlinux-xip.lds.S
+Merging s390/for-next (b208108638c4 s390: fix detection of vector enhancements facility 1 vs. vector packed decimal facility)
+$ git merge s390/for-next
+Auto-merging arch/s390/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/s390/Kconfig | 1 +
+ arch/s390/configs/debug_defconfig | 3 +-
+ arch/s390/configs/defconfig | 3 +-
+ arch/s390/include/asm/cpu_mcf.h | 2 ++
+ arch/s390/include/asm/entry-common.h | 10 +++++++
+ arch/s390/include/asm/pci.h | 2 +-
+ arch/s390/kernel/perf_cpum_cf.c | 12 ++------
+ arch/s390/kernel/perf_cpum_cf_common.c | 46 +++++++++++++++++++++++++++++
+ arch/s390/kernel/perf_cpum_cf_diag.c | 54 +++-------------------------------
+ arch/s390/kernel/setup.c | 4 +--
+ arch/s390/kernel/syscall.c | 1 +
+ arch/s390/kernel/traps.c | 2 ++
+ arch/s390/pci/pci.c | 10 ++++---
+ arch/s390/pci/pci_event.c | 28 ++++++++++++------
+ drivers/pci/hotplug/s390_pci_hpc.c | 2 +-
+ drivers/s390/cio/device.c | 3 +-
+ 16 files changed, 103 insertions(+), 80 deletions(-)
+Merging sh/for-next (2882b7626f49 sh: kernel: traps: remove unused variable)
+$ git merge sh/for-next
+Auto-merging drivers/sh/maple/maple.c
+Merge made by the 'recursive' strategy.
+ arch/sh/boards/mach-landisk/irq.c | 4 ++--
+ arch/sh/boot/Makefile | 4 ++--
+ arch/sh/boot/compressed/.gitignore | 5 -----
+ arch/sh/boot/compressed/Makefile | 32 +++++++++++++-------------------
+ arch/sh/boot/compressed/ashiftrt.S | 2 ++
+ arch/sh/boot/compressed/ashldi3.c | 2 ++
+ arch/sh/boot/compressed/ashlsi3.S | 2 ++
+ arch/sh/boot/compressed/ashrsi3.S | 2 ++
+ arch/sh/boot/compressed/lshrsi3.S | 2 ++
+ arch/sh/include/asm/checksum_32.h | 5 +++--
+ arch/sh/include/asm/uaccess.h | 4 ++--
+ arch/sh/kernel/cpu/sh4a/smp-shx3.c | 5 +++--
+ arch/sh/kernel/crash_dump.c | 4 ++--
+ arch/sh/kernel/traps.c | 1 -
+ arch/sh/kernel/traps_32.c | 8 ++++----
+ arch/sh/math-emu/math.c | 4 ++--
+ arch/sh/mm/nommu.c | 4 ++--
+ drivers/sh/maple/maple.c | 5 ++++-
+ 18 files changed, 49 insertions(+), 46 deletions(-)
+ create mode 100644 arch/sh/boot/compressed/ashiftrt.S
+ create mode 100644 arch/sh/boot/compressed/ashldi3.c
+ create mode 100644 arch/sh/boot/compressed/ashlsi3.S
+ create mode 100644 arch/sh/boot/compressed/ashrsi3.S
+ create mode 100644 arch/sh/boot/compressed/lshrsi3.S
+Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi)
+$ git merge sparc-next/master
+Already up to date.
+Merging uml/linux-next (ed102bf2afed um: Fix W=1 missing-include-dirs warnings)
+$ git merge uml/linux-next
+Already up to date.
+Merging xtensa/xtensa-for-next (6a8eb99e130f xtensa: ISS: add GDBIO implementation to semihosting interface)
+$ git merge xtensa/xtensa-for-next
+Already up to date.
+Merging pidfd/for-next (8fac44cbbaa2 Merge branch 'fs/idmapped_mounts/helpers' into for-next)
+$ git merge pidfd/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging fscrypt/master (a14d0b676491 fscrypt: allow deleting files with unsupported encryption policy)
+$ git merge fscrypt/master
+Already up to date.
+Merging fscache/fscache-next (3003bbd0697b afs: Use the netfs_write_begin() helper)
+$ git merge fscache/fscache-next
+Already up to date.
+Merging afs/afs-next (7af08140979a Revert "gcov: clang: fix clang-11+ build")
+$ git merge afs/afs-next
+Already up to date.
+Merging btrfs/for-next (8a03ef87ec7e Merge branch 'for-next-next-v5.13-20210420' into for-next-20210420)
+$ git merge btrfs/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging ceph/master (0e1c1526416f Merge commit 'ed94f87c2b123241ae5644cf82327e2da653adb6')
+$ git merge ceph/master
+Merge made by the 'recursive' strategy.
+ fs/ceph/Kconfig | 1 +
+ fs/ceph/addr.c | 626 +++++++++++++++++++++------------------------------
+ fs/ceph/cache.c | 125 ----------
+ fs/ceph/cache.h | 101 ++-------
+ fs/ceph/caps.c | 27 +--
+ fs/ceph/debugfs.c | 12 +-
+ fs/ceph/dir.c | 34 ++-
+ fs/ceph/export.c | 12 +-
+ fs/ceph/file.c | 52 ++---
+ fs/ceph/inode.c | 36 +--
+ fs/ceph/io.c | 2 +-
+ fs/ceph/mds_client.c | 20 +-
+ fs/ceph/mds_client.h | 1 +
+ fs/ceph/metric.c | 62 +++--
+ fs/ceph/metric.h | 56 ++++-
+ fs/ceph/snap.c | 2 +-
+ fs/ceph/super.h | 32 ++-
+ fs/ceph/xattr.c | 7 +
+ net/ceph/auth.c | 36 +--
+ net/ceph/auth_x.c | 2 +-
+ net/ceph/decode.c | 20 +-
+ 21 files changed, 563 insertions(+), 703 deletions(-)
+Merging cifs/for-next (7c9e41e0ef7d Merge tag '5.13-rc-smb3-part2' of git://git.samba.org/sfrench/cifs-2.6)
+$ git merge cifs/for-next
+Already up to date.
+Merging cifsd/cifsd-for-next (ba1e260f4630 cifsd: add ksmbd/nfsd interoperability to feature table)
+$ git merge cifsd/cifsd-for-next
+Auto-merging fs/Makefile
+Auto-merging fs/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/filesystems/index.rst
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/cifs/cifsd.rst | 164 +
+ Documentation/filesystems/cifs/index.rst | 10 +
+ Documentation/filesystems/index.rst | 2 +-
+ MAINTAINERS | 12 +-
+ fs/Kconfig | 1 +
+ fs/Makefile | 1 +
+ fs/cifsd/Kconfig | 66 +
+ fs/cifsd/Makefile | 13 +
+ fs/cifsd/asn1.c | 702 +++
+ fs/cifsd/asn1.h | 29 +
+ fs/cifsd/auth.c | 1323 +++++
+ fs/cifsd/auth.h | 90 +
+ fs/cifsd/buffer_pool.c | 264 +
+ fs/cifsd/buffer_pool.h | 20 +
+ fs/cifsd/connection.c | 411 ++
+ fs/cifsd/connection.h | 208 +
+ fs/cifsd/crypto_ctx.c | 286 ++
+ fs/cifsd/crypto_ctx.h | 77 +
+ fs/cifsd/glob.h | 64 +
+ fs/cifsd/ksmbd_server.h | 283 ++
+ fs/cifsd/ksmbd_work.c | 93 +
+ fs/cifsd/ksmbd_work.h | 110 +
+ fs/cifsd/mgmt/ksmbd_ida.c | 48 +
+ fs/cifsd/mgmt/ksmbd_ida.h | 34 +
+ fs/cifsd/mgmt/share_config.c | 239 +
+ fs/cifsd/mgmt/share_config.h | 81 +
+ fs/cifsd/mgmt/tree_connect.c | 122 +
+ fs/cifsd/mgmt/tree_connect.h | 56 +
+ fs/cifsd/mgmt/user_config.c | 70 +
+ fs/cifsd/mgmt/user_config.h | 66 +
+ fs/cifsd/mgmt/user_session.c | 328 ++
+ fs/cifsd/mgmt/user_session.h | 103 +
+ fs/cifsd/misc.c | 340 ++
+ fs/cifsd/misc.h | 44 +
+ fs/cifsd/ndr.c | 347 ++
+ fs/cifsd/ndr.h | 21 +
+ fs/cifsd/nterr.h | 545 ++
+ fs/cifsd/ntlmssp.h | 169 +
+ fs/cifsd/oplock.c | 1667 ++++++
+ fs/cifsd/oplock.h | 133 +
+ fs/cifsd/server.c | 631 +++
+ fs/cifsd/server.h | 60 +
+ fs/cifsd/smb2misc.c | 435 ++
+ fs/cifsd/smb2ops.c | 300 ++
+ fs/cifsd/smb2pdu.c | 8087 ++++++++++++++++++++++++++++++
+ fs/cifsd/smb2pdu.h | 1646 ++++++
+ fs/cifsd/smb_common.c | 652 +++
+ fs/cifsd/smb_common.h | 544 ++
+ fs/cifsd/smbacl.c | 1317 +++++
+ fs/cifsd/smbacl.h | 201 +
+ fs/cifsd/smbfsctl.h | 90 +
+ fs/cifsd/smbstatus.h | 1822 +++++++
+ fs/cifsd/transport_ipc.c | 881 ++++
+ fs/cifsd/transport_ipc.h | 54 +
+ fs/cifsd/transport_rdma.c | 2034 ++++++++
+ fs/cifsd/transport_rdma.h | 61 +
+ fs/cifsd/transport_tcp.c | 618 +++
+ fs/cifsd/transport_tcp.h | 13 +
+ fs/cifsd/unicode.c | 383 ++
+ fs/cifsd/unicode.h | 356 ++
+ fs/cifsd/uniupr.h | 268 +
+ fs/cifsd/vfs.c | 1995 ++++++++
+ fs/cifsd/vfs.h | 273 +
+ fs/cifsd/vfs_cache.c | 683 +++
+ fs/cifsd/vfs_cache.h | 185 +
+ 65 files changed, 32229 insertions(+), 2 deletions(-)
+ create mode 100644 Documentation/filesystems/cifs/cifsd.rst
+ create mode 100644 Documentation/filesystems/cifs/index.rst
+ create mode 100644 fs/cifsd/Kconfig
+ create mode 100644 fs/cifsd/Makefile
+ create mode 100644 fs/cifsd/asn1.c
+ create mode 100644 fs/cifsd/asn1.h
+ create mode 100644 fs/cifsd/auth.c
+ create mode 100644 fs/cifsd/auth.h
+ create mode 100644 fs/cifsd/buffer_pool.c
+ create mode 100644 fs/cifsd/buffer_pool.h
+ create mode 100644 fs/cifsd/connection.c
+ create mode 100644 fs/cifsd/connection.h
+ create mode 100644 fs/cifsd/crypto_ctx.c
+ create mode 100644 fs/cifsd/crypto_ctx.h
+ create mode 100644 fs/cifsd/glob.h
+ create mode 100644 fs/cifsd/ksmbd_server.h
+ create mode 100644 fs/cifsd/ksmbd_work.c
+ create mode 100644 fs/cifsd/ksmbd_work.h
+ create mode 100644 fs/cifsd/mgmt/ksmbd_ida.c
+ create mode 100644 fs/cifsd/mgmt/ksmbd_ida.h
+ create mode 100644 fs/cifsd/mgmt/share_config.c
+ create mode 100644 fs/cifsd/mgmt/share_config.h
+ create mode 100644 fs/cifsd/mgmt/tree_connect.c
+ create mode 100644 fs/cifsd/mgmt/tree_connect.h
+ create mode 100644 fs/cifsd/mgmt/user_config.c
+ create mode 100644 fs/cifsd/mgmt/user_config.h
+ create mode 100644 fs/cifsd/mgmt/user_session.c
+ create mode 100644 fs/cifsd/mgmt/user_session.h
+ create mode 100644 fs/cifsd/misc.c
+ create mode 100644 fs/cifsd/misc.h
+ create mode 100644 fs/cifsd/ndr.c
+ create mode 100644 fs/cifsd/ndr.h
+ create mode 100644 fs/cifsd/nterr.h
+ create mode 100644 fs/cifsd/ntlmssp.h
+ create mode 100644 fs/cifsd/oplock.c
+ create mode 100644 fs/cifsd/oplock.h
+ create mode 100644 fs/cifsd/server.c
+ create mode 100644 fs/cifsd/server.h
+ create mode 100644 fs/cifsd/smb2misc.c
+ create mode 100644 fs/cifsd/smb2ops.c
+ create mode 100644 fs/cifsd/smb2pdu.c
+ create mode 100644 fs/cifsd/smb2pdu.h
+ create mode 100644 fs/cifsd/smb_common.c
+ create mode 100644 fs/cifsd/smb_common.h
+ create mode 100644 fs/cifsd/smbacl.c
+ create mode 100644 fs/cifsd/smbacl.h
+ create mode 100644 fs/cifsd/smbfsctl.h
+ create mode 100644 fs/cifsd/smbstatus.h
+ create mode 100644 fs/cifsd/transport_ipc.c
+ create mode 100644 fs/cifsd/transport_ipc.h
+ create mode 100644 fs/cifsd/transport_rdma.c
+ create mode 100644 fs/cifsd/transport_rdma.h
+ create mode 100644 fs/cifsd/transport_tcp.c
+ create mode 100644 fs/cifsd/transport_tcp.h
+ create mode 100644 fs/cifsd/unicode.c
+ create mode 100644 fs/cifsd/unicode.h
+ create mode 100644 fs/cifsd/uniupr.h
+ create mode 100644 fs/cifsd/vfs.c
+ create mode 100644 fs/cifsd/vfs.h
+ create mode 100644 fs/cifsd/vfs_cache.c
+ create mode 100644 fs/cifsd/vfs_cache.h
+Merging configfs/for-next (14fbbc829772 configfs: fix a use-after-free in __configfs_open_file)
+$ git merge configfs/for-next
+Already up to date.
+Merging ecryptfs/next (9046625511ad ecryptfs: fix kernel panic with null dev_name)
+$ git merge ecryptfs/next
+Auto-merging fs/ecryptfs/inode.c
+Auto-merging fs/ecryptfs/ecryptfs_kernel.h
+Merge made by the 'recursive' strategy.
+ fs/ecryptfs/crypto.c | 25 ++++++++++++-------------
+ fs/ecryptfs/debug.c | 4 ++--
+ fs/ecryptfs/dentry.c | 2 +-
+ fs/ecryptfs/ecryptfs_kernel.h | 2 +-
+ fs/ecryptfs/file.c | 4 ++--
+ fs/ecryptfs/inode.c | 11 +++++------
+ fs/ecryptfs/keystore.c | 15 ++++++++-------
+ fs/ecryptfs/kthread.c | 3 ++-
+ fs/ecryptfs/main.c | 30 ++++++++++++++++++------------
+ fs/ecryptfs/messaging.c | 14 +++++++-------
+ fs/ecryptfs/miscdev.c | 3 ++-
+ fs/ecryptfs/mmap.c | 11 ++++++-----
+ fs/ecryptfs/read_write.c | 4 +++-
+ fs/ecryptfs/super.c | 8 ++++----
+ 14 files changed, 73 insertions(+), 63 deletions(-)
+Merging erofs/dev (8e6c8fa9f2e9 erofs: enable big pcluster feature)
+$ git merge erofs/dev
+Already up to date.
+Merging exfat/dev (c6e2f52e3051 exfat: speed up iterate/lookup by fixing start point of traversing cluster chain)
+$ git merge exfat/dev
+Already up to date.
+Merging ext3/for_next (bf7ea7068a02 Pull reiserfs cleanup.)
+$ git merge ext3/for_next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging ext4/dev (6c0912739699 ext4: wipe ext4_dir_entry2 upon file deletion)
+$ git merge ext4/dev
+Already up to date.
+Merging f2fs/dev (d665ea6ea86c Merge tag 'for-linus-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml)
+$ git merge f2fs/dev
+Already up to date.
+Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl)
+$ git merge fsverity/fsverity
+Already up to date.
+Merging fuse/for-next (3c9c14338c12 cuse: simplify refcount)
+$ git merge fuse/for-next
+Already up to date.
+Merging jfs/jfs-next (b462cecfa323 fs: Fix typo issue)
+$ git merge jfs/jfs-next
+Merge made by the 'recursive' strategy.
+ fs/jfs/jfs_dmap.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging nfs/linux-next (9e895cd9649a xprtrdma: Fix a NULL dereference in frwr_unmap_sync())
+$ git merge nfs/linux-next
+Auto-merging include/trace/events/sunrpc.h
+Auto-merging include/linux/nfs_fs_sb.h
+Auto-merging fs/nfsd/Kconfig
+Auto-merging fs/nfs/super.c
+Auto-merging fs/nfs/internal.h
+Auto-merging fs/nfs/inode.c
+Auto-merging fs/nfs/fs_context.c
+Auto-merging fs/Kconfig
+Merge made by the 'recursive' strategy.
+ fs/Kconfig | 4 +-
+ fs/nfs/callback_proc.c | 17 +-
+ fs/nfs/client.c | 20 +-
+ fs/nfs/delegation.c | 29 ++-
+ fs/nfs/delegation.h | 3 +-
+ fs/nfs/dir.c | 29 ++-
+ fs/nfs/export.c | 15 +-
+ fs/nfs/file.c | 2 +-
+ fs/nfs/flexfilelayout/flexfilelayout.c | 2 +-
+ fs/nfs/fs_context.c | 66 ++++--
+ fs/nfs/inode.c | 418 +++++++++++++++++++++------------
+ fs/nfs/internal.h | 2 +-
+ fs/nfs/io.c | 2 +-
+ fs/nfs/mount_clnt.c | 14 +-
+ fs/nfs/nfs3acl.c | 2 +-
+ fs/nfs/nfs3xdr.c | 5 +-
+ fs/nfs/nfs42proc.c | 77 ++++--
+ fs/nfs/nfs42xattr.c | 2 +-
+ fs/nfs/nfs4file.c | 4 -
+ fs/nfs/nfs4proc.c | 258 +++++++++++---------
+ fs/nfs/nfs4state.c | 2 +-
+ fs/nfs/nfs4trace.h | 47 +++-
+ fs/nfs/nfs4xdr.c | 60 ++++-
+ fs/nfs/nfstrace.c | 1 +
+ fs/nfs/nfstrace.h | 22 +-
+ fs/nfs/pagelist.c | 4 +-
+ fs/nfs/pnfs.c | 11 +-
+ fs/nfs/proc.c | 1 +
+ fs/nfs/super.c | 6 +-
+ fs/nfs/write.c | 7 +-
+ fs/nfsd/Kconfig | 2 +-
+ include/linux/nfs4.h | 9 +
+ include/linux/nfs_fs.h | 6 +-
+ include/linux/nfs_fs_sb.h | 13 +-
+ include/linux/nfs_xdr.h | 13 +-
+ include/linux/sunrpc/xprt.h | 1 +
+ include/trace/events/rpcrdma.h | 146 ++++++------
+ include/trace/events/sunrpc.h | 41 +++-
+ net/sunrpc/clnt.c | 12 +-
+ net/sunrpc/rpcb_clnt.c | 7 +-
+ net/sunrpc/xprt.c | 18 +-
+ net/sunrpc/xprtrdma/backchannel.c | 4 +-
+ net/sunrpc/xprtrdma/frwr_ops.c | 209 +++++++----------
+ net/sunrpc/xprtrdma/rpc_rdma.c | 39 ++-
+ net/sunrpc/xprtrdma/transport.c | 6 +-
+ net/sunrpc/xprtrdma/verbs.c | 131 +++++------
+ net/sunrpc/xprtrdma/xprt_rdma.h | 29 ++-
+ net/sunrpc/xprtsock.c | 9 +-
+ 48 files changed, 1112 insertions(+), 715 deletions(-)
+Merging nfs-anna/linux-next (4f8be1f53bf6 nfs: we don't support removing system.nfs4_acl)
+$ git merge nfs-anna/linux-next
+Already up to date.
+Merging nfsd/nfsd-next (c3213d260a23 SUNRPC: Fix oops in the rpc_xdr_buf event class)
+$ git merge nfsd/nfsd-next
+Already up to date.
+Merging cel/for-next (b9f83ffaa0c0 SUNRPC: Fix null pointer dereference in svc_rqst_free())
+$ git merge cel/for-next
+Already up to date.
+Merging orangefs/for-next (211f9f2e0503 orangefs: leave files in the page cache for a few micro seconds at least)
+$ git merge orangefs/for-next
+Already up to date.
+Merging overlayfs/overlayfs-next (5e717c6fa41f ovl: add debug print to ovl_do_getxattr())
+$ git merge overlayfs/overlayfs-next
+Already up to date.
+Merging ubifs/next (9a29f7f020e0 ubi: Remove unnecessary struct declaration)
+$ git merge ubifs/next
+Already up to date.
+Merging v9fs/9p-next (f8b139e2f241 fs: 9p: fix v9fs_file_open writeback fid error check)
+$ git merge v9fs/9p-next
+Merge made by the 'recursive' strategy.
+ fs/9p/v9fs.c | 2 +-
+ fs/9p/vfs_file.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+Merging xfs/for-next (8e9800f9f2b8 xfs: don't allow log writes if the data device is readonly)
+$ git merge xfs/for-next
+Merge made by the 'recursive' strategy.
+ fs/xfs/libxfs/xfs_ag_resv.c | 34 +++++++++++++++++++++++-----------
+ fs/xfs/libxfs/xfs_alloc.c | 17 ++++++++++++++---
+ fs/xfs/libxfs/xfs_alloc_btree.c | 4 ++--
+ fs/xfs/libxfs/xfs_log_format.h | 12 ++++++------
+ fs/xfs/libxfs/xfs_rmap_btree.c | 2 --
+ fs/xfs/libxfs/xfs_sb.c | 16 +++++++++++++---
+ fs/xfs/scrub/agheader.c | 7 ++++++-
+ fs/xfs/scrub/fscounters.c | 40 +++++++++++++++++++++++++++++++++++++++-
+ fs/xfs/xfs_fsops.c | 2 --
+ fs/xfs/xfs_inode_item.c | 8 ++++----
+ fs/xfs/xfs_inode_item_recover.c | 6 +++---
+ fs/xfs/xfs_log.c | 10 ++++++----
+ fs/xfs/xfs_mount.c | 15 ++++++++++++++-
+ fs/xfs/xfs_mount.h | 6 ++++++
+ fs/xfs/xfs_ondisk.h | 4 ++--
+ fs/xfs/xfs_reflink.c | 3 ++-
+ fs/xfs/xfs_trans.c | 10 +++-------
+ fs/xfs/xfs_trans.h | 15 ---------------
+ 18 files changed, 143 insertions(+), 68 deletions(-)
+Merging zonefs/for-next (6980d29ce4da zonefs: fix to update .i_wr_refcnt correctly in zonefs_open_zone())
+$ git merge zonefs/for-next
+Already up to date.
+Merging iomap/iomap-for-next (6e552494fb90 iomap: remove unused private field from ioend)
+$ git merge iomap/iomap-for-next
+Merge made by the 'recursive' strategy.
+ fs/iomap/buffered-io.c | 7 +------
+ fs/xfs/xfs_aops.c | 2 +-
+ include/linux/iomap.h | 5 +----
+ 3 files changed, 3 insertions(+), 11 deletions(-)
+Merging djw-vfs/vfs-for-next (9b8523423b23 vfs: move __sb_{start,end}_write* to fs.h)
+$ git merge djw-vfs/vfs-for-next
+Already up to date.
+Merging file-locks/locks-next (cbe6fc4e0142 fs/locks: remove useless assignment in fcntl_getlk)
+$ git merge file-locks/locks-next
+Already up to date.
+Merging vfs/for-next (e8727aec724e Merge branch 'work.misc' into for-next)
+$ git merge vfs/for-next
+Auto-merging fs/cifs/file.c
+Merge made by the 'recursive' strategy.
+Merging printk/for-next (a386d19acc30 Merge branch 'for-5.13' into for-next)
+$ git merge printk/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging pci/next (882862aaacef Merge branch 'pci/tegra')
+$ git merge pci/next
+Already up to date.
+Merging pstore/for-next/pstore (9d843e8fafc7 pstore: Add mem_type property DT parsing support)
+$ git merge pstore/for-next/pstore
+Already up to date.
+Merging hid/for-next (dce6a0d56a77 Merge branches 'for-5.14/core', 'for-5.14/google' and 'for-5.14/logitech' into for-next)
+$ git merge hid/for-next
+Merge made by the 'recursive' strategy.
+ drivers/hid/Kconfig | 19 +++-
+ drivers/hid/Makefile | 1 +
+ drivers/hid/hid-a4tech.c | 2 +
+ drivers/hid/hid-asus.c | 12 ++-
+ drivers/hid/hid-core.c | 13 ++-
+ drivers/hid/hid-debug.c | 3 +
+ drivers/hid/hid-ft260.c | 5 +-
+ drivers/hid/hid-google-hammer.c | 10 ++
+ drivers/hid/hid-ids.h | 10 +-
+ drivers/hid/hid-input.c | 9 +-
+ drivers/hid/hid-ite.c | 1 +
+ drivers/hid/hid-lg-g15.c | 141 ++++++++++++++++++---------
+ drivers/hid/hid-logitech-dj.c | 8 ++
+ drivers/hid/hid-logitech-hidpp.c | 12 +++
+ drivers/hid/hid-multitouch.c | 18 ++--
+ drivers/hid/hid-quirks.c | 4 +
+ drivers/hid/hid-semitek.c | 40 ++++++++
+ drivers/hid/hid-sensor-hub.c | 13 ++-
+ drivers/hid/hid-thrustmaster.c | 2 +-
+ drivers/hid/intel-ish-hid/ipc/ipc.c | 2 +-
+ drivers/hid/intel-ish-hid/ipc/pci-ish.c | 3 +-
+ drivers/hid/intel-ish-hid/ishtp-fw-loader.c | 49 +++++-----
+ drivers/hid/intel-ish-hid/ishtp-hid-client.c | 15 +--
+ drivers/hid/intel-ish-hid/ishtp-hid.c | 2 +-
+ drivers/hid/intel-ish-hid/ishtp-hid.h | 9 +-
+ drivers/hid/intel-ish-hid/ishtp/bus.c | 24 +++--
+ drivers/hid/intel-ish-hid/ishtp/client.c | 5 +-
+ drivers/hid/intel-ish-hid/ishtp/hbm.c | 10 +-
+ drivers/hid/intel-ish-hid/ishtp/hbm.h | 1 +
+ drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h | 4 +-
+ drivers/hid/surface-hid/surface_hid_core.c | 6 +-
+ drivers/hid/usbhid/hid-core.c | 2 +-
+ drivers/platform/chrome/cros_ec_ishtp.c | 4 +-
+ include/linux/hid.h | 3 +-
+ include/linux/intel-ish-client-if.h | 10 +-
+ include/uapi/linux/input-event-codes.h | 1 +
+ 36 files changed, 324 insertions(+), 149 deletions(-)
+ create mode 100644 drivers/hid/hid-semitek.c
+Merging i2c/i2c/for-next (f9743e4d0a62 Merge branch 'i2c/for-5.13' into i2c/for-next)
+$ git merge i2c/i2c/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging i3c/i3c/next (0d95f41ebde4 Revert "i3c master: fix missing destroy_workqueue() on error in i3c_master_register")
+$ git merge i3c/i3c/next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml | 2 +-
+ drivers/i3c/master.c | 5 +----
+ drivers/i3c/master/svc-i3c-master.c | 1 -
+ 3 files changed, 2 insertions(+), 6 deletions(-)
+Merging dmi/dmi-for-next (3cb4d29a2633 MAINTAINERS: The DMI/SMBIOS tree has moved)
+$ git merge dmi/dmi-for-next
+Already up to date.
+Merging hwmon-staging/hwmon-next (9049572fb145 hwmon: Remove amd_energy driver)
+$ git merge hwmon-staging/hwmon-next
+Already up to date.
+Merging jc_docs/docs-next (7fc4607899e8 Enlisted oprofile version line removed)
+$ git merge jc_docs/docs-next
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-devices-system-cpu | 2 +-
+ Documentation/admin-guide/reporting-issues.rst | 49 +++---
+ Documentation/core-api/symbol-namespaces.rst | 26 ++--
+ Documentation/input/joydev/joystick-api.rst | 14 +-
+ Documentation/input/joydev/joystick.rst | 26 ++--
+ Documentation/process/changes.rst | 1 -
+ .../translations/it_IT/process/changes.rst | 1 -
+ Documentation/translations/zh_CN/index.rst | 168 +++++++++++++++++++--
+ Documentation/x86/x86_64/5level-paging.rst | 4 +-
+ scripts/kernel-doc | 1 +
+ scripts/ver_linux | 1 -
+ 11 files changed, 225 insertions(+), 68 deletions(-)
+Merging v4l-dvb/master (0b276e470a4d media: coda: fix macroblocks count control usage)
+$ git merge v4l-dvb/master
+Already up to date.
+Merging v4l-dvb-next/master (bf05bf16c76b Linux 5.12-rc8)
+$ 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 (1f348871f80e Merge branch 'acpi-pm' into linux-next)
+$ git merge pm/linux-next
+Merge made by the 'recursive' strategy.
+ Documentation/firmware-guide/acpi/gpio-properties.rst | 6 ++++++
+ drivers/acpi/custom_method.c | 4 +++-
+ drivers/acpi/internal.h | 1 -
+ drivers/acpi/power.c | 2 +-
+ drivers/acpi/scan.c | 2 --
+ drivers/acpi/sleep.h | 1 +
+ 6 files changed, 11 insertions(+), 5 deletions(-)
+Merging cpufreq-arm/cpufreq/arm/linux-next (dbbd49bade05 cpufreq: armada-37xx: Fix module unloading)
+$ git merge cpufreq-arm/cpufreq/arm/linux-next
+Already up to date.
+Merging cpupower/cpupower (a38fd8748464 Linux 5.12-rc2)
+$ git merge cpupower/cpupower
+Already up to date.
+Merging devfreq/devfreq-next (0a7dc8318c28 PM / devfreq: imx8m-ddrc: Remove unneeded of_match_ptr())
+$ git merge devfreq/devfreq-next
+Already up to date.
+Merging opp/opp/linux-next (a8bb0e872bfb memory: samsung: exynos5422-dmc: Convert to use resource-managed OPP API)
+$ git merge opp/opp/linux-next
+Already up to date.
+Merging thermal/thermal/linux-next (c310e546164d thermal/drivers/mtk_thermal: Remove redundant initializations of several variables)
+$ git merge thermal/thermal/linux-next
+Already up to date.
+Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1)
+$ git merge thermal-rzhang/next
+Already up to date.
+Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pure OF sensor)
+$ git merge thermal-soc/next
+Already up to date.
+Merging ieee1394/for-next (67f8e65e4fc1 firewire: net: remove set but not used variable 'guid')
+$ git merge ieee1394/for-next
+Auto-merging drivers/firewire/net.c
+Merge made by the 'recursive' strategy.
+ drivers/firewire/net.c | 2 --
+ 1 file changed, 2 deletions(-)
+Merging dlm/next (2fd8db2dd05d fs: dlm: fix missing unlock on error in accept_from_sock())
+$ git merge dlm/next
+Already up to date.
+Merging swiotlb/linux-next (dfc06b389a4f swiotlb: don't override user specified size in swiotlb_adjust_size)
+$ git merge swiotlb/linux-next
+Already up to date.
+Merging rdma/for-next (6da7bda36388 IB/qib: Remove redundant assignment to ret)
+$ git merge rdma/for-next
+Already up to date.
+Merging net-next/master (9d31d2338950 Merge tag 'net-next-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
+$ git merge net-next/master
+Already up to date.
+Merging bpf-next/for-next (9d31d2338950 Merge tag 'net-next-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
+$ git merge bpf-next/for-next
+Already up to date.
+Merging ipsec-next/master (747b67088f8d xfrm: ipcomp: remove unnecessary get_cpu())
+$ git merge ipsec-next/master
+Already up to date.
+Merging mlx5-next/mlx5-next (63f9c44bca5e net/mlx5: Add MEMIC operations related bits)
+$ git merge mlx5-next/mlx5-next
+Already up to date.
+Merging netfilter-next/master (9d31d2338950 Merge tag 'net-next-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
+$ git merge netfilter-next/master
+Already up to date.
+Merging ipvs-next/master (99ba0ea616aa sfc: adjust efx->xdp_tx_queue_count with the real number of initialized queues)
+$ git merge ipvs-next/master
+Already up to date.
+Merging wireless-drivers-next/master (9382531ec63f Merge tag 'mt76-for-kvalo-2021-04-21' of https://github.com/nbd168/wireless)
+$ git merge wireless-drivers-next/master
+Already up to date.
+Merging bluetooth/master (c96a0ebb1514 Bluetooth: Fix the HCI to MGMT status conversion table)
+$ git merge bluetooth/master
+Merge made by the 'recursive' strategy.
+ drivers/bluetooth/btusb.c | 15 ++++++++++-----
+ drivers/bluetooth/virtio_bt.c | 3 +++
+ include/net/bluetooth/hci_core.h | 2 +-
+ include/net/bluetooth/mgmt.h | 1 +
+ net/bluetooth/6lowpan.c | 2 +-
+ net/bluetooth/cmtp/core.c | 5 +++++
+ net/bluetooth/hci_event.c | 8 ++++----
+ net/bluetooth/l2cap_core.c | 2 +-
+ net/bluetooth/mgmt.c | 9 ++++++++-
+ net/bluetooth/msft.c | 6 +++---
+ 10 files changed, 37 insertions(+), 16 deletions(-)
+Merging mac80211-next/master (5d869070569a net: phy: marvell: don't use empty switch default case)
+$ git merge mac80211-next/master
+Already up to date.
+Merging gfs2/for-next (f2c80837e27e Merge tag 'gfs2-for-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2)
+$ git merge gfs2/for-next
+Already up to date.
+Merging mtd/mtd/next (a881537dfaf2 Revert "mtd: rawnand: bbt: Skip bad blocks when searching for the BBT in NAND")
+$ git merge mtd/mtd/next
+Already up to date.
+Merging nand/nand/next (32cbc7cb70b0 mtd: rawnand: qcom: Use dma_mapping_error() for error check)
+$ git merge nand/nand/next
+Already up to date.
+Merging spi-nor/spi-nor/next (46094049a49b Revert "mtd: spi-nor: macronix: Add support for mx25l51245g")
+$ git merge spi-nor/spi-nor/next
+Already up to date.
+Merging crypto/master (e3a606f2c544 fsverity: relax build time dependency on CRYPTO_SHA256)
+$ git merge crypto/master
+Already up to date.
+Merging drm/drm-next (1cd6b4a04f03 Merge tag 'drm-intel-next-fixes-2021-04-27' of git://anongit.freedesktop.org/drm/drm-intel into drm-next)
+$ git merge drm/drm-next
+Already up to date.
+$ git am -3 ../patches/0001-merge-fix-for-drm-Switch-to-p4cc-format-modifier.patch
+Applying: merge fix for "drm: Switch to %p4cc format modifier"
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/gpu/drm/i915/display/skl_universal_plane.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 38b90c2dc83b] Merge remote-tracking branch 'bluetooth/master'
+ Date: Thu May 6 09:25:45 2021 +1000
+Merging drm-misc/for-linux-next (b9d79e4ca4ff fbmem: Mark proc_fb_seq_ops as __maybe_unused)
+$ git merge drm-misc/for-linux-next
+Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 10 ----------
+ drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 16 ----------------
+ drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 6 ------
+ drivers/video/fbdev/core/fbmem.c | 2 +-
+ 4 files changed, 1 insertion(+), 33 deletions(-)
+Merging amdgpu/drm-next (e42491343712 Revert "drm/radeon/si_dpm: Replace one-element array with flexible-array in struct SISLANDS_SMC_SWSTATE")
+$ git merge amdgpu/drm-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 4 +-
+ drivers/gpu/drm/Kconfig | 1 +
+ drivers/gpu/drm/amd/amdgpu/Makefile | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 15 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 26 +-
+ .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c | 20 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 98 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 43 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 21 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 61 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 169 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c | 69 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h | 13 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 19 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 28 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 86 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h | 7 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 72 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 7 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 42 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 70 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 99 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 10 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 130 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 18 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 231 +-
+ drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 6 +-
+ drivers/gpu/drm/amd/amdgpu/atom.c | 158 +
+ drivers/gpu/drm/amd/amdgpu/atom.h | 11 +
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 11 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 628 +++-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 13 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 11 +
+ drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 31 +-
+ drivers/gpu/drm/amd/amdgpu/hdp_v4_0.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/nv.c | 5 +
+ drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 1 -
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 35 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 40 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 8 +
+ drivers/gpu/drm/amd/amdgpu/smuio_v13_0.c | 18 +
+ drivers/gpu/drm/amd/amdgpu/soc15.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 7 +
+ drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 1 +
+ drivers/gpu/drm/amd/amdkfd/Kconfig | 13 +
+ drivers/gpu/drm/amd/amdkfd/Makefile | 5 +
+ drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 80 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 750 ++++-
+ drivers/gpu/drm/amd/amdkfd/kfd_device.c | 19 +-
+ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 6 +-
+ .../drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 13 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 4 +
+ drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 1 -
+ drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 937 ++++++
+ drivers/gpu/drm/amd/amdkfd/kfd_migrate.h | 65 +
+ drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 12 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 58 +-
+ .../gpu/drm/amd/amdkfd/kfd_pm4_headers_aldebaran.h | 93 +
+ drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 39 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_process.c | 124 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 3081 ++++++++++++++++++++
+ drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 206 ++
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 76 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 10 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 327 ++-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 22 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 108 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 13 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 27 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h | 1 +
+ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 3 +
+ drivers/gpu/drm/amd/display/dc/Makefile | 2 +-
+ drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 2 +
+ .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 58 +-
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 16 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link.c | 40 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 5 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 28 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 7 +-
+ drivers/gpu/drm/amd/display/dc/dc.h | 6 +-
+ drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/dc_dsc.h | 5 +-
+ drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 1 +
+ drivers/gpu/drm/amd/display/dc/dc_types.h | 3 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 19 +
+ drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 3 +
+ drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 30 +
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 155 +-
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 5 -
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 4 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 6 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 2 +-
+ .../display/dc/dcn30/dcn30_dio_stream_encoder.h | 4 +
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 2 +-
+ .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/dm_helpers.h | 9 +-
+ drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 128 +-
+ drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c | 43 -
+ drivers/gpu/drm/amd/display/dc/dsc/rc_calc.h | 2 -
+ drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 2 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/dsc.h | 1 +
+ .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 18 +-
+ drivers/gpu/drm/amd/display/dc/irq_types.h | 2 +-
+ drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 37 +-
+ drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 88 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 2 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 2 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 4 +
+ drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 1 -
+ .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 5 +
+ .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 5 +
+ drivers/gpu/drm/amd/include/atomfirmware.h | 16 +-
+ drivers/gpu/drm/amd/include/kgd_pp_interface.h | 1 +
+ drivers/gpu/drm/amd/pm/amdgpu_pm.c | 76 +-
+ drivers/gpu/drm/amd/pm/inc/smu_types.h | 2 +-
+ drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h | 2 +-
+ drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 21 +
+ .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c | 8 +-
+ drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 21 +
+ drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 5 +-
+ .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 4 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 4 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 1 -
+ drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 4 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 4 +-
+ drivers/gpu/drm/radeon/radeon.h | 3 +
+ drivers/gpu/drm/radeon/radeon_atombios.c | 26 +-
+ drivers/gpu/drm/radeon/radeon_audio.c | 92 +
+ drivers/gpu/drm/radeon/radeon_device.c | 3 +-
+ drivers/gpu/drm/radeon/si_dpm.c | 5 +-
+ drivers/gpu/drm/radeon/sislands_smc.h | 10 +-
+ drivers/usb/host/xhci-pci.c | 3 +
+ include/uapi/drm/amdgpu_drm.h | 17 +-
+ include/uapi/linux/kfd_ioctl.h | 171 +-
+ 149 files changed, 8510 insertions(+), 1244 deletions(-)
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c
+ create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_migrate.c
+ create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_migrate.h
+ create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_aldebaran.h
+ create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_svm.c
+ create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_svm.h
+$ git reset --hard HEAD^
+HEAD is now at 04ce1bc23f59 Merge remote-tracking branch 'drm-misc/for-linux-next'
+Merging next-20210504 version of amdgpu
+$ git merge -m next-20210504/amdgpu 85021fe9d80007336b6aa7e617e20ec85134c0df
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/Kconfig | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 15 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 26 +-
+ .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c | 20 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 98 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 35 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 48 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 169 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 19 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 28 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 86 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h | 7 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 72 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 7 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 41 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 42 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 99 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 129 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 18 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 231 +-
+ drivers/gpu/drm/amd/amdgpu/atom.c | 158 +
+ drivers/gpu/drm/amd/amdgpu/atom.h | 11 +
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 11 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 628 +++-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/nv.c | 5 +
+ drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 1 -
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 35 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 28 +
+ drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 8 +
+ drivers/gpu/drm/amd/amdgpu/smuio_v13_0.c | 18 +
+ drivers/gpu/drm/amd/amdgpu/soc15.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 7 +
+ drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 1 +
+ drivers/gpu/drm/amd/amdkfd/Kconfig | 13 +
+ drivers/gpu/drm/amd/amdkfd/Makefile | 5 +
+ drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 80 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 749 ++++-
+ drivers/gpu/drm/amd/amdkfd/kfd_device.c | 17 +-
+ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 6 +-
+ .../drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 13 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 4 +
+ drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 1 -
+ drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 937 ++++++
+ drivers/gpu/drm/amd/amdkfd/kfd_migrate.h | 65 +
+ drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 12 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 58 +-
+ .../gpu/drm/amd/amdkfd/kfd_pm4_headers_aldebaran.h | 93 +
+ drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 39 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_process.c | 124 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 3078 ++++++++++++++++++++
+ drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 206 ++
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 6 +
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 10 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 26 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 5 +
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 22 +-
+ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 3 +
+ drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 2 +
+ .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 10 +-
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 15 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link.c | 22 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 8 +-
+ drivers/gpu/drm/amd/display/dc/dc.h | 3 +-
+ drivers/gpu/drm/amd/display/dc/dc_dsc.h | 5 +-
+ drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 30 +
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 2 +-
+ .../display/dc/dcn30/dcn30_dio_stream_encoder.h | 4 +
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 2 +-
+ .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 113 +-
+ drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c | 43 -
+ drivers/gpu/drm/amd/display/dc/dsc/rc_calc.h | 2 -
+ drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 88 +-
+ drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 1 -
+ .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 5 +
+ .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 5 +
+ drivers/gpu/drm/amd/include/atomfirmware.h | 16 +-
+ drivers/gpu/drm/amd/pm/amdgpu_pm.c | 8 +
+ drivers/gpu/drm/amd/pm/inc/smu_types.h | 2 +-
+ drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h | 2 +-
+ .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c | 8 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 5 +-
+ .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 4 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 4 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 1 -
+ drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 4 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 4 +-
+ drivers/gpu/drm/radeon/radeon.h | 3 +
+ drivers/gpu/drm/radeon/radeon_audio.c | 92 +
+ drivers/gpu/drm/radeon/radeon_device.c | 3 +-
+ drivers/usb/host/xhci-pci.c | 3 +
+ include/uapi/drm/amdgpu_drm.h | 17 +-
+ include/uapi/linux/kfd_ioctl.h | 171 +-
+ 109 files changed, 7648 insertions(+), 798 deletions(-)
+ create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_migrate.c
+ create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_migrate.h
+ create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_aldebaran.h
+ create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_svm.c
+ create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_svm.h
+Merging drm-intel/for-linux-next (c7b397e9ca4d Merge tag 'gvt-next-fixes-2021-04-29' of https://github.com/intel/gvt-linux into drm-intel-next-fixes)
+$ git merge drm-intel/for-linux-next
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/i915/gvt/handlers.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+Merging drm-tegra/drm/tegra/for-next (c79184a9c029 drm/tegra: Fix shift overflow in tegra_shared_plane_atomic_update)
+$ git merge drm-tegra/drm/tegra/for-next
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/tegra/hub.c | 2 +-
+ drivers/gpu/drm/tegra/sor.c | 41 +++++++++++++++++++++++------------------
+ drivers/gpu/host1x/bus.c | 30 ++++++++++++++++++++++++------
+ include/linux/host1x.h | 30 ++++++++++++++++++++++++------
+ 4 files changed, 72 insertions(+), 31 deletions(-)
+Merging drm-msm/msm-next (02ded1314a46 drm/msm: fix minor version to indicate MSM_PARAM_SUSPENDS support)
+$ git merge drm-msm/msm-next
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 9 +++++----
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 2 +-
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 4 ++++
+ drivers/gpu/drm/msm/msm_drv.c | 2 +-
+ drivers/gpu/drm/msm/msm_gem.c | 16 +++++++++++++++-
+ drivers/gpu/drm/msm/msm_gem.h | 4 ++--
+ 6 files changed, 28 insertions(+), 9 deletions(-)
+Merging imx-drm/imx-drm/next (74181df8c6db drm/imx: ipuv3-plane: Remove two unnecessary export symbols)
+$ git merge imx-drm/imx-drm/next
+Auto-merging drivers/gpu/drm/imx/ipuv3-plane.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/imx/ipuv3-plane.c
+Auto-merging drivers/gpu/drm/imx/imx-ldb.c
+Auto-merging drivers/gpu/drm/imx/imx-drm-core.c
+Resolved 'drivers/gpu/drm/imx/ipuv3-plane.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 3cfb603d025e] Merge remote-tracking branch 'imx-drm/imx-drm/next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/gpu/drm/imx/imx-drm-core.c | 21 ++++++++++++-
+ drivers/gpu/drm/imx/imx-ldb.c | 5 +++
+ drivers/gpu/drm/imx/ipuv3-crtc.c | 11 ++++++-
+ drivers/gpu/drm/imx/ipuv3-plane.c | 62 ++++++++++++++++++++++++++++++++------
+ drivers/gpu/ipu-v3/ipu-dc.c | 5 +++
+ drivers/gpu/ipu-v3/ipu-di.c | 7 +++++
+ 6 files changed, 99 insertions(+), 12 deletions(-)
+Merging etnaviv/etnaviv/next (4bfdd2aa67fb drm/etnaviv: rework linear window offset calculation)
+$ git merge etnaviv/etnaviv/next
+Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/etnaviv/etnaviv_dump.c | 8 ++--
+ drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 3 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 12 ++---
+ drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 68 ++++++++++++++++------------
+ include/uapi/drm/etnaviv_drm.h | 3 ++
+ 5 files changed, 51 insertions(+), 43 deletions(-)
+Merging regmap/for-next (ccac12acc0c0 Merge remote-tracking branch 'regmap/for-5.13' into regmap-next)
+$ git merge regmap/for-next
+Already up to date.
+Merging sound/for-next (5d84b5318d86 ALSA: hda/realtek: Add fixup for HP OMEN laptop)
+$ git merge sound/for-next
+Already up to date.
+Merging sound-asoc/for-next (03f2880ae8a8 Merge remote-tracking branch 'asoc/for-5.13' into asoc-linus)
+$ git merge sound-asoc/for-next
+Already up to date.
+Merging modules/modules-next (33121347fb1c module: treat exit sections the same as init sections when !CONFIG_MODULE_UNLOAD)
+$ git merge modules/modules-next
+Already up to date.
+Merging input/next (d12b64b9764e MAINTAINERS: repair reference in HYCON HY46XX TOUCHSCREEN SUPPORT)
+$ git merge input/next
+Already up to date.
+Merging block/for-next (5566b134d26a Merge branch 'block-5.13' into for-next)
+$ git merge block/for-next
+Merge made by the 'recursive' strategy.
+ block/bio.c | 13 ++++-
+ block/blk-settings.c | 5 ++
+ drivers/block/rnbd/rnbd-clt.c | 46 +++++++++-------
+ drivers/block/rnbd/rnbd-clt.h | 2 +-
+ drivers/block/rnbd/rnbd-srv.c | 2 +-
+ drivers/infiniband/ulp/rtrs/rtrs-clt.c | 3 +-
+ drivers/nvme/host/core.c | 98 ++++++++++++++++++++++++----------
+ drivers/nvme/host/fabrics.c | 57 --------------------
+ drivers/nvme/host/fabrics.h | 13 -----
+ drivers/nvme/host/fc.c | 4 +-
+ drivers/nvme/host/ioctl.c | 65 +++++++++++++---------
+ drivers/nvme/host/multipath.c | 3 ++
+ drivers/nvme/host/nvme.h | 16 +++++-
+ drivers/nvme/host/pci.c | 3 ++
+ drivers/nvme/host/rdma.c | 4 +-
+ drivers/nvme/host/tcp.c | 4 +-
+ drivers/nvme/target/admin-cmd.c | 6 +--
+ drivers/nvme/target/loop.c | 4 +-
+ drivers/s390/block/dasd_eckd.h | 8 +--
+ fs/io_uring.c | 65 ++++++++++++++++------
+ include/linux/bio.h | 4 +-
+ include/linux/blkdev.h | 2 +
+ 22 files changed, 248 insertions(+), 179 deletions(-)
+Merging device-mapper/for-next (ca4a4e9a55be dm raid: remove unnecessary discard limits for raid0 and raid10)
+$ git merge device-mapper/for-next
+Already up to date.
+Merging pcmcia/pcmcia-next (e9d503fef7da pcmcia: rsrc_nonstatic: Fix call-back function as reference formatting)
+$ git merge pcmcia/pcmcia-next
+Merge made by the 'recursive' strategy.
+ drivers/pcmcia/cistpl.c | 12 ++++++------
+ drivers/pcmcia/ds.c | 7 ++-----
+ drivers/pcmcia/pcmcia_cis.c | 10 +++++-----
+ drivers/pcmcia/pcmcia_resource.c | 11 ++++++-----
+ drivers/pcmcia/rsrc_nonstatic.c | 22 +++++++++++-----------
+ 5 files changed, 30 insertions(+), 32 deletions(-)
+Merging mmc/next (97fce126e279 mmc: block: Issue a cache flush only when it's enabled)
+$ git merge mmc/next
+Already up to date.
+Merging mfd/for-mfd-next (f9386c91574f mfd: intel-m10-bmc: Add support for MAX10 BMC Secure Updates)
+$ git merge mfd/for-mfd-next
+Already up to date.
+Merging backlight/for-backlight-next (04758386757c backlight: journada720: Fix Wmisleading-indentation warning)
+$ git merge backlight/for-backlight-next
+Already up to date.
+Merging battery/for-next (d0a43c12ee9f power: supply: cpcap-battery: fix invalid usage of list cursor)
+$ git merge battery/for-next
+Already up to date.
+Merging regulator/for-next (4dd1c9530698 Merge remote-tracking branch 'regulator/for-5.13' into regulator-next)
+$ git merge regulator/for-next
+Already up to date.
+Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing)
+$ git merge security/next-testing
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging apparmor/apparmor-next (d108370c644b apparmor: fix error check)
+$ git merge apparmor/apparmor-next
+Auto-merging security/apparmor/policy_unpack.c
+Auto-merging security/apparmor/policy.c
+Auto-merging security/apparmor/lsm.c
+Auto-merging security/apparmor/label.c
+Auto-merging security/apparmor/include/label.h
+Auto-merging security/apparmor/include/file.h
+Auto-merging security/apparmor/apparmorfs.c
+Merge made by the 'recursive' strategy.
+ security/apparmor/apparmorfs.c | 4 +--
+ security/apparmor/include/file.h | 2 +-
+ security/apparmor/include/label.h | 1 +
+ security/apparmor/include/policy.h | 6 ++--
+ security/apparmor/label.c | 4 +--
+ security/apparmor/lsm.c | 22 +++++++-------
+ security/apparmor/path.c | 2 +-
+ security/apparmor/policy.c | 59 ++++++++++++++++++++++++++++++++------
+ security/apparmor/policy_unpack.c | 2 +-
+ 9 files changed, 73 insertions(+), 29 deletions(-)
+Merging integrity/next-integrity (781a57394899 ima: ensure IMA_APPRAISE_MODSIG has necessary dependencies)
+$ git merge integrity/next-integrity
+Already up to date.
+Merging keys/keys-next (e377c31f788f integrity: Load mokx variables into the blacklist keyring)
+$ git merge keys/keys-next
+Auto-merging scripts/Makefile
+Auto-merging include/keys/system_keyring.h
+Auto-merging certs/system_keyring.c
+CONFLICT (content): Merge conflict in certs/system_keyring.c
+Auto-merging certs/Makefile
+Auto-merging certs/Kconfig
+Resolved 'certs/system_keyring.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master cf7ec1aacf3a] Merge remote-tracking branch 'keys/keys-next'
+$ git diff -M --stat --summary HEAD^..
+Merging safesetid/safesetid-next (1ca86ac1ec8d LSM: SafeSetID: Fix code specification by scripts/checkpatch.pl)
+$ git merge safesetid/safesetid-next
+Already up to date.
+Merging selinux/next (e4c82eafb609 selinux: add proper NULL termination to the secclass_map permissions)
+$ git merge selinux/next
+Already up to date.
+Merging smack/next (7ef4c19d245f smackfs: restrict bytes count in smackfs write functions)
+$ git merge smack/next
+Already up to date.
+Merging tomoyo/master (5dc33592e955 lockdep: Allow tuning tracing capacity constants.)
+$ git merge tomoyo/master
+Already up to date.
+Merging tpmdd/next (9ccce092fc64 Merge tag 'for-linus-5.13-ofs-1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux)
+$ git merge tpmdd/next
+Already up to date.
+Merging watchdog/master (bf05bf16c76b Linux 5.12-rc8)
+$ git merge watchdog/master
+Already up to date.
+Merging iommu/next (2d471b20c55e iommu: Streamline registration interface)
+$ git merge iommu/next
+Already up to date.
+Merging audit/next (b75d8f38bcc9 audit: drop /proc/PID/loginuid documentation Format field)
+$ git merge audit/next
+Already up to date.
+Merging devicetree/for-next (031cc263c037 powerpc: If kexec_build_elf_info() fails return immediately from elf64_load())
+$ git merge devicetree/for-next
+Already up to date.
+Merging mailbox/mailbox-for-next (2335f556b3af dt-bindings: mailbox: qcom-ipcc: Add compatible for SC7280)
+$ git merge mailbox/mailbox-for-next
+Already up to date.
+Merging spi/for-next (eb43e665d243 Merge remote-tracking branch 'spi/for-5.13' into spi-linus)
+$ git merge spi/for-next
+Already up to date.
+Merging tip/auto-latest (17ae69aba89d Merge tag 'landlock_v34' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security)
+$ git merge tip/auto-latest
+Already up to date.
+Merging clockevents/timers/drivers/next (8120891105ba dt-bindings: timer: nuvoton,npcm7xx: Add wpcm450-timer)
+$ git merge clockevents/timers/drivers/next
+Already up to date.
+Merging edac/edac-for-next (faf042d15093 Merge branch 'edac-amd64' into edac-for-next)
+$ git merge edac/edac-for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging irqchip/irq/irqchip-next (33aa3698bac9 ARM: PXA: Fix cplds irqdesc allocation when using legacy mode)
+$ git merge irqchip/irq/irqchip-next
+Merge made by the 'recursive' strategy.
+ arch/arm/mach-pxa/pxa_cplds_irqs.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+Merging ftrace/for-next (8c9af478c06b ftrace: Handle commands when closing set_ftrace_filter file)
+$ git merge ftrace/for-next
+Auto-merging kernel/trace/ftrace.c
+Merge made by the 'recursive' strategy.
+ kernel/trace/ftrace.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+Merging rcu/rcu/next (35c0c1d51208 Merge branch 'clocksource.2021.05.02a' into HEAD)
+$ git merge rcu/rcu/next
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/time/jiffies.c
+Auto-merging kernel/time/clocksource.c
+Auto-merging include/linux/clocksource.h
+Auto-merging arch/x86/kernel/tsc.c
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/kernel-parameters.txt | 22 +++
+ arch/x86/kernel/tsc.c | 4 +-
+ include/linux/clocksource.h | 8 +-
+ kernel/time/Makefile | 1 +
+ kernel/time/clocksource-wdtest.c | 202 ++++++++++++++++++++++
+ kernel/time/clocksource.c | 218 +++++++++++++++++++++++-
+ kernel/time/jiffies.c | 15 +-
+ lib/Kconfig.debug | 12 ++
+ 8 files changed, 464 insertions(+), 18 deletions(-)
+ create mode 100644 kernel/time/clocksource-wdtest.c
+Merging kvm/next (3bf0fcd75434 KVM: selftests: Speed up set_memory_region_test)
+$ git merge kvm/next
+Already up to date.
+Merging kvm-arm/next (9a8aae605b80 Merge branch 'kvm-arm64/kill_oprofile_dependency' into kvmarm-master/next)
+$ git merge kvm-arm/next
+Already up to date.
+Merging kvm-ppc/kvm-ppc-next (72476aaa4691 KVM: PPC: Book3S HV: Fix host radix SLB optimisation with hash guests)
+$ git merge kvm-ppc/kvm-ppc-next
+Already up to date.
+Merging kvms390/next (44bada282190 KVM: s390: fix guarded storage control register handling)
+$ git merge kvms390/next
+Already up to date.
+Merging xen-tip/linux-next (f5079a9a2a31 xen/arm: introduce XENFEAT_direct_mapped and XENFEAT_not_direct_mapped)
+$ git merge xen-tip/linux-next
+Already up to date.
+Merging percpu/for-next (bd0d09ebd4f8 Merge branch 'for-5.12-fixes' into for-next)
+$ git merge percpu/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging workqueues/for-next (89e28ce60cb6 workqueue/watchdog: Make unbound workqueues aware of touch_softlockup_watchdog() 84;0;0c84;0;0c There are two workqueue-specific watchdog timestamps:)
+$ git merge workqueues/for-next
+Already up to date.
+Merging drivers-x86/for-next (e7882cd7aebe platform/x86: gigabyte-wmi: add support for B550M AORUS PRO-P)
+$ git merge drivers-x86/for-next
+Already up to date.
+Merging chrome-platform/for-next (d61b3f9b91be platform/chrome: cros_ec_lpc: Use DEFINE_MUTEX() for mutex lock)
+$ git merge chrome-platform/for-next
+Auto-merging include/linux/platform_data/cros_ec_commands.h
+Merge made by the 'recursive' strategy.
+ drivers/platform/chrome/cros_ec_lpc_mec.c | 3 +-
+ drivers/platform/chrome/cros_ec_typec.c | 47 +++++++++++++++++++-------
+ drivers/platform/chrome/cros_usbpd_notify.c | 3 +-
+ drivers/platform/chrome/wilco_ec/telemetry.c | 2 +-
+ include/linux/platform_data/cros_ec_commands.h | 1 +
+ 5 files changed, 39 insertions(+), 17 deletions(-)
+Merging hsi/for-next (5c08b0f75575 HSI: core: fix resource leaks in hsi_add_client_from_dt())
+$ git merge hsi/for-next
+Already up to date.
+Merging leds/for-next (23a700455a1b leds: pca9532: Assign gpio base dynamically)
+$ git merge leds/for-next
+Already up to date.
+Merging ipmi/for-next (d72cd4ad4174 Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
+$ git merge ipmi/for-next
+Already up to date.
+Merging driver-core/driver-core-next (d665ea6ea86c Merge tag 'for-linus-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml)
+$ git merge driver-core/driver-core-next
+Already up to date.
+Merging usb/usb-next (d665ea6ea86c Merge tag 'for-linus-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml)
+$ git merge usb/usb-next
+Already up to date.
+Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6)
+$ git merge usb-gadget/next
+Already up to date.
+Merging usb-serial/usb-next (039b81d50a48 USB: cdc-acm: add more Maxlinear/Exar models to ignore list)
+$ git merge usb-serial/usb-next
+Already up to date.
+Merging usb-chipidea-next/for-usb-next (b85a512e023c usb: cdnsp: Useless condition has been removed)
+$ git merge usb-chipidea-next/for-usb-next
+Auto-merging drivers/usb/cdns3/cdns3-gadget.c
+Merge made by the 'recursive' strategy.
+ drivers/usb/cdns3/cdns3-gadget.c | 2 +-
+ drivers/usb/cdns3/cdnsp-mem.c | 5 ++---
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+Merging tty/tty-next (d665ea6ea86c Merge tag 'for-linus-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml)
+$ git merge tty/tty-next
+Already up to date.
+Merging char-misc/char-misc-next (8e3a3249502d Merge tag 'char-misc-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc)
+$ git merge char-misc/char-misc-next
+Already up to date.
+Merging extcon/extcon-next (7b1222b224af extcon: qcom-spmi: Add support for VBUS detection)
+$ git merge extcon/extcon-next
+Already up to date.
+Merging phy-next/next (8a6b85b14f08 phy: Revert "phy: ti: j721e-wiz: add missing of_node_put")
+$ git merge phy-next/next
+Merge made by the 'recursive' strategy.
+Merging soundwire/next (14968dd36a50 soundwire: intel_init: test link->cdns)
+$ git merge soundwire/next
+Already up to date.
+Merging thunderbolt/next (6f3badead6a0 thunderbolt: Hide authorized attribute if router does not support PCIe tunnels)
+$ git merge thunderbolt/next
+Already up to date.
+Merging vfio/next (adaeb718d46f vfio/gvt: fix DRM_I915_GVT dependency on VFIO_MDEV)
+$ git merge vfio/next
+Already up to date.
+Merging staging/staging-next (d665ea6ea86c Merge tag 'for-linus-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml)
+$ git merge staging/staging-next
+Already up to date.
+Merging iio/togreg (6470a8206a10 Merge tag 'iio-for-5.13b-take2' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next)
+$ git merge iio/togreg
+Already up to date.
+Merging mux/for-next (3516bd729358 Merge tag 's390-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
+$ git merge mux/for-next
+Already up to date.
+Merging icc/icc-next (c1de07884f2b Merge branch 'icc-sm8350' into icc-next)
+$ git merge icc/icc-next
+Already up to date.
+Merging dmaengine/next (0bde4444ec44 dmaengine: idxd: Enable IDXD performance monitor support)
+$ git merge dmaengine/next
+Already up to date.
+Merging cgroup/for-next (ffeee417d97f cgroup: use tsk->in_iowait instead of delayacct_is_task_waiting_on_io())
+$ git merge cgroup/for-next
+Already up to date.
+Merging scsi/for-next (d53a664e67f0 Merge branch 'misc' into for-next)
+$ git merge scsi/for-next
+Merge made by the 'recursive' strategy.
+ drivers/target/iscsi/iscsi_target.c | 1 -
+ 1 file changed, 1 deletion(-)
+Merging scsi-mkp/for-next (85367040511f scsi: blk-mq: Fix build warning when making htmldocs)
+$ git merge scsi-mkp/for-next
+Already up to date.
+Merging vhost/linux-next (7ff6e99e021c virtio_net: disable cb aggressively)
+$ git merge vhost/linux-next
+Auto-merging drivers/net/virtio_net.c
+Merge made by the 'recursive' strategy.
+ drivers/net/virtio_net.c | 35 +++++++++++++++++++++++++++++------
+ drivers/virtio/virtio_ring.c | 26 +++++++++++++++++++++++++-
+ 2 files changed, 54 insertions(+), 7 deletions(-)
+Merging rpmsg/for-next (dc0e14fa833b Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
+$ git merge rpmsg/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file)
+$ git merge gpio/for-next
+Already up to date.
+Merging gpio-brgl/gpio/for-next (444952956f34 dt-bindings: gpio: add YAML description for rockchip,gpio-bank)
+$ git merge gpio-brgl/gpio/for-next
+Already up to date.
+Merging gpio-intel/for-next (058459043e71 gpio: ich: Switch to be dependent on LPC_ICH)
+$ git merge gpio-intel/for-next
+Auto-merging drivers/gpio/gpiolib-acpi.c
+Auto-merging drivers/gpio/Kconfig
+Merge made by the 'recursive' strategy.
+Merging pinctrl/for-next (835109266494 Merge branch 'devel' into for-next)
+$ git merge pinctrl/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging pinctrl-intel/for-next (5b613df3f499 pinctrl: intel: No need to disable IRQs in the handler)
+$ git merge pinctrl-intel/for-next
+Already up to date.
+Merging pinctrl-renesas/renesas-pinctrl (61232cd6efca pinctrl: renesas: r8a7791: Add bias pinconf support)
+$ git merge pinctrl-renesas/renesas-pinctrl
+Already up to date.
+Merging pinctrl-samsung/for-next (a38fd8748464 Linux 5.12-rc2)
+$ git merge pinctrl-samsung/for-next
+Already up to date.
+Merging pwm/for-next (a6efb35019d0 pwm: Reword docs about pwm_apply_state())
+$ git merge pwm/for-next
+Already up to date.
+Merging userns/for-next (4cf4e48fff05 signal: sort out si_trapno and si_perf)
+$ git merge userns/for-next
+Auto-merging kernel/signal.c
+Auto-merging kernel/events/core.c
+Auto-merging include/linux/signal.h
+Auto-merging include/linux/compat.h
+Merge made by the 'recursive' strategy.
+ arch/alpha/include/uapi/asm/siginfo.h | 2 -
+ arch/alpha/kernel/osf_sys.c | 2 +-
+ arch/alpha/kernel/signal.c | 4 +-
+ arch/alpha/kernel/traps.c | 24 ++---
+ arch/alpha/mm/fault.c | 4 +-
+ arch/arm/kernel/signal.c | 39 +++++++
+ arch/arm64/kernel/signal.c | 39 +++++++
+ arch/arm64/kernel/signal32.c | 39 +++++++
+ arch/mips/include/uapi/asm/siginfo.h | 2 -
+ arch/sparc/include/uapi/asm/siginfo.h | 3 -
+ arch/sparc/kernel/process_64.c | 2 +-
+ arch/sparc/kernel/signal32.c | 37 +++++++
+ arch/sparc/kernel/signal_64.c | 36 +++++++
+ arch/sparc/kernel/sys_sparc_32.c | 2 +-
+ arch/sparc/kernel/sys_sparc_64.c | 2 +-
+ arch/sparc/kernel/traps_32.c | 22 ++--
+ arch/sparc/kernel/traps_64.c | 44 ++++----
+ arch/sparc/kernel/unaligned_32.c | 2 +-
+ arch/sparc/mm/fault_32.c | 2 +-
+ arch/sparc/mm/fault_64.c | 2 +-
+ arch/x86/kernel/signal_compat.c | 15 ++-
+ fs/signalfd.c | 23 ++---
+ include/linux/compat.h | 10 +-
+ include/linux/sched/signal.h | 13 +--
+ include/linux/signal.h | 3 +-
+ include/uapi/asm-generic/siginfo.h | 20 ++--
+ include/uapi/linux/signalfd.h | 4 +-
+ kernel/events/core.c | 11 +-
+ kernel/signal.c | 113 +++++++++++++--------
+ .../selftests/perf_events/sigtrap_threads.c | 12 +--
+ 30 files changed, 373 insertions(+), 160 deletions(-)
+Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email)
+$ git merge ktest/for-next
+Already up to date.
+Merging random/dev (ab9a7e27044b random: avoid warnings for !CONFIG_NUMA builds)
+$ git merge random/dev
+Already up to date.
+Merging kselftest/next (e75074781f17 selftests/resctrl: Change a few printed messages)
+$ git merge kselftest/next
+Already up to date.
+Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC")
+$ git merge y2038/y2038
+Already up to date.
+Merging livepatching/for-next (c150bbbb1731 Merge branch 'for-5.13/signal' into for-next)
+$ git merge livepatching/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging coresight/next (1efbcec2ef8c coresight: cti: Reduce scope for the variable “cs_fwnode” in cti_plat_create_connection())
+$ git merge coresight/next
+Merge made by the 'recursive' strategy.
+Merging rtc/rtc-next (4d0185e67806 rtc: sysfs: check features instead of ops)
+$ git merge rtc/rtc-next
+Already up to date.
+Merging nvdimm/libnvdimm-for-next (30c10d32152d Merge branch 'for-5.12/cxl' 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 (fe07bfda2fb9 Linux 5.12-rc1)
+$ git merge at24/at24/for-next
+Already up to date.
+Merging ntb/ntb-next (5c8fe583cce5 Linux 5.11-rc1)
+$ git merge ntb/ntb-next
+Already up to date.
+Merging seccomp/for-next/seccomp (a3fc712c5b37 seccomp: Fix "cacheable" typo in comments)
+$ git merge seccomp/for-next/seccomp
+Already up to date.
+Merging kspp/for-next/kspp (f4648c741299 Merge branch 'for-next/overflow' into for-next/kspp)
+$ git merge kspp/for-next/kspp
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
+$ git merge cisco/for-next
+Already up to date.
+Merging gnss/gnss-next (994adcbd3714 gnss: drop stray semicolons)
+$ git merge gnss/gnss-next
+Merge made by the 'recursive' strategy.
+ drivers/gnss/mtk.c | 2 +-
+ drivers/gnss/serial.c | 2 +-
+ drivers/gnss/sirf.c | 2 +-
+ drivers/gnss/ubx.c | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+Merging fsi/next (4a851d714ead fsi: aspeed: Support CFAM reset GPIO)
+$ git merge fsi/next
+Already up to date.
+Merging slimbus/for-next (0320ed0a8236 drivers: slimbus: Fix word resposible -> responsible in slimbus.h)
+$ git merge slimbus/for-next
+Auto-merging drivers/of/platform.c
+Auto-merging drivers/nvmem/Makefile
+CONFLICT (content): Merge conflict in drivers/nvmem/Makefile
+Auto-merging drivers/nvmem/Kconfig
+CONFLICT (content): Merge conflict in drivers/nvmem/Kconfig
+Resolved 'drivers/nvmem/Kconfig' using previous resolution.
+Resolved 'drivers/nvmem/Makefile' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master a178d831432f] Merge remote-tracking branch 'slimbus/for-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/slimbus/slimbus.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging nvmem/for-next (e8405ad55f4c nvmem: sprd: Add missing MODULE_DEVICE_TABLE)
+$ git merge nvmem/for-next
+Merge made by the 'recursive' strategy.
+ drivers/nvmem/sprd-efuse.c | 1 +
+ 1 file changed, 1 insertion(+)
+Merging xarray/main (2c7e57a02708 idr test suite: Improve reporting from idr_find_test_1)
+$ git merge xarray/main
+Already up to date.
+Merging hyperv/hyperv-next (20a40e4da6a6 hv_balloon: Remove redundant assignment to region_start)
+$ git merge hyperv/hyperv-next
+Auto-merging drivers/hv/hv_balloon.c
+Merge made by the 'recursive' strategy.
+ drivers/hv/hv_balloon.c | 1 -
+ 1 file changed, 1 deletion(-)
+Merging auxdisplay/auxdisplay (701454bce906 auxdisplay: Remove in_interrupt() usage.)
+$ git merge auxdisplay/auxdisplay
+Already up to date.
+Merging kgdb/kgdb/for-next (83fa2d13d628 kdb: Refactor env variables get/set code)
+$ git merge kgdb/kgdb/for-next
+Already up to date.
+Merging hmm/hmm (fe07bfda2fb9 Linux 5.12-rc1)
+$ git merge hmm/hmm
+Already up to date.
+Merging fpga/for-next (a78a51a851ed fpga: dfl: pci: add DID for D5005 PAC cards)
+$ git merge fpga/for-next
+Already up to date.
+Merging kunit/test (a38fd8748464 Linux 5.12-rc2)
+$ git merge kunit/test
+Already up to date.
+Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and devm_ioremap_nocache)
+$ git merge generic-ioremap/for-next
+Already up to date.
+Merging cfi/cfi/next (f3907773d602 mtd: cfi_cmdset_0002: remove redundant assignment to variable timeo)
+$ git merge cfi/cfi/next
+Already up to date.
+Merging kunit-next/kunit (de2fcb3e6201 Documentation: kunit: add tips for using current->kunit_test)
+$ git merge kunit-next/kunit
+Already up to date.
+Merging trivial/for-next (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
+$ git merge trivial/for-next
+Already up to date.
+Merging zx2c4/for-next (16fbf79b0f83 Linux 5.6-rc7)
+$ git merge zx2c4/for-next
+Already up to date.
+Merging mhi/mhi-next (a503d1628c9c bus: mhi: fix typo in comments for struct mhi_channel_config)
+$ git merge mhi/mhi-next
+Already up to date.
+Merging memblock/for-next (097d43d85704 mm: memblock: remove return value of memblock_free_all())
+$ git merge memblock/for-next
+Already up to date.
+Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy)
+$ git merge init/init-user-pointers
+Already up to date.
+Merging counters/counters (e71ba9452f0b Linux 5.11-rc2)
+$ git merge counters/counters
+Already up to date.
+Merging iomem-mmap-vs-gup/topic/iomem-mmap-vs-gup (ac8b8400620a mm: unexport follow_pfn)
+$ git merge iomem-mmap-vs-gup/topic/iomem-mmap-vs-gup
+Auto-merging security/Kconfig
+Auto-merging mm/memory.c
+Auto-merging include/linux/mm.h
+Auto-merging drivers/media/common/videobuf2/frame_vector.c
+Merge made by the 'recursive' strategy.
+ drivers/media/common/videobuf2/frame_vector.c | 2 +-
+ drivers/media/v4l2-core/videobuf-dma-contig.c | 2 +-
+ include/linux/mm.h | 4 +--
+ mm/memory.c | 46 +++++++++++++++++----------
+ mm/nommu.c | 28 ++++++++++++----
+ security/Kconfig | 13 ++++++++
+ 6 files changed, 68 insertions(+), 27 deletions(-)
+Merging rust/rust-next (fef0214731cc rust: allow printing in the kernel crate)
+$ git merge rust/rust-next
+Auto-merging tools/lib/perf/include/perf/event.h
+Auto-merging scripts/kconfig/confdata.c
+Auto-merging scripts/Makefile.lib
+Auto-merging scripts/Makefile.build
+Auto-merging samples/Makefile
+Auto-merging samples/Kconfig
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/printk/printk.c
+CONFLICT (content): Merge conflict in kernel/printk/printk.c
+Auto-merging kernel/kallsyms.c
+Auto-merging init/Kconfig
+Auto-merging include/uapi/linux/android/binder.h
+CONFLICT (content): Merge conflict in include/uapi/linux/android/binder.h
+Auto-merging Makefile
+CONFLICT (content): Merge conflict in Makefile
+Auto-merging MAINTAINERS
+Auto-merging Documentation/process/changes.rst
+Auto-merging Documentation/index.rst
+Auto-merging .gitignore
+Resolved 'Makefile' using previous resolution.
+Resolved 'include/uapi/linux/android/binder.h' using previous resolution.
+Resolved 'kernel/printk/printk.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master a498d6c142fd] Merge remote-tracking branch 'rust/rust-next'
+$ git diff -M --stat --summary HEAD^..
+ .gitignore | 5 +
+ .rustfmt.toml | 12 +
+ Documentation/doc-guide/kernel-doc.rst | 3 +
+ Documentation/index.rst | 1 +
+ Documentation/kbuild/kbuild.rst | 4 +
+ Documentation/process/changes.rst | 9 +
+ Documentation/rust/arch-support.rst | 32 ++
+ Documentation/rust/coding.rst | 92 ++++
+ Documentation/rust/docs.rst | 109 ++++
+ Documentation/rust/index.rst | 20 +
+ Documentation/rust/quick-start.rst | 220 ++++++++
+ Documentation/rust/rust-project.json | 35 ++
+ MAINTAINERS | 14 +
+ Makefile | 147 ++++-
+ arch/arm/rust/target.json | 28 +
+ arch/arm64/rust/target.json | 40 ++
+ arch/powerpc/rust/target.json | 30 ++
+ arch/x86/rust/target.json | 42 ++
+ drivers/android/Kconfig | 7 +
+ drivers/android/Makefile | 2 +
+ drivers/android/allocation.rs | 252 +++++++++
+ drivers/android/context.rs | 80 +++
+ drivers/android/defs.rs | 92 ++++
+ drivers/android/node.rs | 479 +++++++++++++++++
+ drivers/android/process.rs | 950 +++++++++++++++++++++++++++++++++
+ drivers/android/range_alloc.rs | 191 +++++++
+ drivers/android/rust_binder.rs | 128 +++++
+ drivers/android/thread.rs | 821 ++++++++++++++++++++++++++++
+ drivers/android/transaction.rs | 206 +++++++
+ include/linux/kallsyms.h | 2 +-
+ include/linux/spinlock.h | 17 +-
+ include/uapi/linux/android/binder.h | 28 +-
+ init/Kconfig | 27 +
+ kernel/kallsyms.c | 7 +
+ kernel/livepatch/core.c | 4 +-
+ kernel/printk/printk.c | 1 +
+ lib/Kconfig.debug | 106 ++++
+ rust/.gitignore | 5 +
+ rust/Makefile | 152 ++++++
+ rust/compiler_builtins.rs | 156 ++++++
+ rust/exports.c | 16 +
+ rust/helpers.c | 94 ++++
+ rust/kernel/allocator.rs | 68 +++
+ rust/kernel/bindings.rs | 22 +
+ rust/kernel/bindings_helper.h | 18 +
+ rust/kernel/buffer.rs | 39 ++
+ rust/kernel/c_types.rs | 133 +++++
+ rust/kernel/chrdev.rs | 162 ++++++
+ rust/kernel/error.rs | 106 ++++
+ rust/kernel/file_operations.rs | 674 +++++++++++++++++++++++
+ rust/kernel/lib.rs | 204 +++++++
+ rust/kernel/linked_list.rs | 245 +++++++++
+ rust/kernel/miscdev.rs | 109 ++++
+ rust/kernel/module_param.rs | 497 +++++++++++++++++
+ rust/kernel/pages.rs | 173 ++++++
+ rust/kernel/prelude.rs | 22 +
+ rust/kernel/print.rs | 463 ++++++++++++++++
+ rust/kernel/random.rs | 50 ++
+ rust/kernel/raw_list.rs | 361 +++++++++++++
+ rust/kernel/static_assert.rs | 38 ++
+ rust/kernel/sync/arc.rs | 184 +++++++
+ rust/kernel/sync/condvar.rs | 136 +++++
+ rust/kernel/sync/guard.rs | 82 +++
+ rust/kernel/sync/locked_by.rs | 112 ++++
+ rust/kernel/sync/mod.rs | 85 +++
+ rust/kernel/sync/mutex.rs | 101 ++++
+ rust/kernel/sync/spinlock.rs | 108 ++++
+ rust/kernel/sysctl.rs | 185 +++++++
+ rust/kernel/types.rs | 73 +++
+ rust/kernel/user_ptr.rs | 282 ++++++++++
+ rust/module.rs | 764 ++++++++++++++++++++++++++
+ samples/Kconfig | 2 +
+ samples/Makefile | 1 +
+ samples/rust/Kconfig | 113 ++++
+ samples/rust/Makefile | 12 +
+ samples/rust/rust_chrdev.rs | 55 ++
+ samples/rust/rust_minimal.rs | 40 ++
+ samples/rust/rust_miscdev.rs | 145 +++++
+ samples/rust/rust_module_parameters.rs | 72 +++
+ samples/rust/rust_print.rs | 58 ++
+ samples/rust/rust_random.rs | 60 +++
+ samples/rust/rust_semaphore.rs | 176 ++++++
+ samples/rust/rust_semaphore_c.c | 212 ++++++++
+ samples/rust/rust_stack_probing.rs | 42 ++
+ samples/rust/rust_sync.rs | 84 +++
+ scripts/Makefile.build | 19 +
+ scripts/Makefile.lib | 12 +
+ scripts/dummy-tools/elfedit | 1 +
+ scripts/kallsyms.c | 33 +-
+ scripts/kconfig/confdata.c | 67 ++-
+ scripts/rust-version.sh | 31 ++
+ tools/include/linux/kallsyms.h | 2 +-
+ tools/include/linux/lockdep.h | 2 +-
+ tools/lib/perf/include/perf/event.h | 2 +-
+ tools/lib/symbol/kallsyms.h | 2 +-
+ 95 files changed, 11357 insertions(+), 48 deletions(-)
+ create mode 100644 .rustfmt.toml
+ create mode 100644 Documentation/rust/arch-support.rst
+ create mode 100644 Documentation/rust/coding.rst
+ create mode 100644 Documentation/rust/docs.rst
+ create mode 100644 Documentation/rust/index.rst
+ create mode 100644 Documentation/rust/quick-start.rst
+ create mode 100644 Documentation/rust/rust-project.json
+ create mode 100644 arch/arm/rust/target.json
+ create mode 100644 arch/arm64/rust/target.json
+ create mode 100644 arch/powerpc/rust/target.json
+ create mode 100644 arch/x86/rust/target.json
+ create mode 100644 drivers/android/allocation.rs
+ create mode 100644 drivers/android/context.rs
+ create mode 100644 drivers/android/defs.rs
+ create mode 100644 drivers/android/node.rs
+ create mode 100644 drivers/android/process.rs
+ create mode 100644 drivers/android/range_alloc.rs
+ create mode 100644 drivers/android/rust_binder.rs
+ create mode 100644 drivers/android/thread.rs
+ create mode 100644 drivers/android/transaction.rs
+ create mode 100644 rust/.gitignore
+ create mode 100644 rust/Makefile
+ create mode 100644 rust/compiler_builtins.rs
+ create mode 100644 rust/exports.c
+ create mode 100644 rust/helpers.c
+ create mode 100644 rust/kernel/allocator.rs
+ create mode 100644 rust/kernel/bindings.rs
+ create mode 100644 rust/kernel/bindings_helper.h
+ create mode 100644 rust/kernel/buffer.rs
+ create mode 100644 rust/kernel/c_types.rs
+ create mode 100644 rust/kernel/chrdev.rs
+ create mode 100644 rust/kernel/error.rs
+ create mode 100644 rust/kernel/file_operations.rs
+ create mode 100644 rust/kernel/lib.rs
+ create mode 100644 rust/kernel/linked_list.rs
+ create mode 100644 rust/kernel/miscdev.rs
+ create mode 100644 rust/kernel/module_param.rs
+ create mode 100644 rust/kernel/pages.rs
+ create mode 100644 rust/kernel/prelude.rs
+ create mode 100644 rust/kernel/print.rs
+ create mode 100644 rust/kernel/random.rs
+ create mode 100644 rust/kernel/raw_list.rs
+ create mode 100644 rust/kernel/static_assert.rs
+ create mode 100644 rust/kernel/sync/arc.rs
+ create mode 100644 rust/kernel/sync/condvar.rs
+ create mode 100644 rust/kernel/sync/guard.rs
+ create mode 100644 rust/kernel/sync/locked_by.rs
+ create mode 100644 rust/kernel/sync/mod.rs
+ create mode 100644 rust/kernel/sync/mutex.rs
+ create mode 100644 rust/kernel/sync/spinlock.rs
+ create mode 100644 rust/kernel/sysctl.rs
+ create mode 100644 rust/kernel/types.rs
+ create mode 100644 rust/kernel/user_ptr.rs
+ create mode 100644 rust/module.rs
+ create mode 100644 samples/rust/Kconfig
+ create mode 100644 samples/rust/Makefile
+ create mode 100644 samples/rust/rust_chrdev.rs
+ create mode 100644 samples/rust/rust_minimal.rs
+ create mode 100644 samples/rust/rust_miscdev.rs
+ create mode 100644 samples/rust/rust_module_parameters.rs
+ create mode 100644 samples/rust/rust_print.rs
+ create mode 100644 samples/rust/rust_random.rs
+ create mode 100644 samples/rust/rust_semaphore.rs
+ create mode 100644 samples/rust/rust_semaphore_c.c
+ create mode 100644 samples/rust/rust_stack_probing.rs
+ create mode 100644 samples/rust/rust_sync.rs
+ create mode 120000 scripts/dummy-tools/elfedit
+ create mode 100755 scripts/rust-version.sh
+Merging cxl/next (e49d033bddf5 Linux 5.12-rc6)
+$ git merge cxl/next
+Already up to date.
+Merging tpmdd-jejb/tpmdd-for-next (69977d1aeeca Merge branch 'tpmdd-fixes' into tpmdd-for-next)
+$ git merge tpmdd-jejb/tpmdd-for-next
+Merge made by the 'recursive' strategy.
+Merging akpm-current/current (e38d8f2d10ba ipc/sem.c: mundane typo fixes)
+$ git merge --no-ff akpm-current/current
+Auto-merging mm/memory.c
+Auto-merging lib/Kconfig.debug
+Auto-merging init/main.c
+Auto-merging init/Kconfig
+Auto-merging include/linux/compat.h
+Auto-merging include/linux/blkdev.h
+Auto-merging include/linux/bitmap.h
+CONFLICT (content): Merge conflict in include/linux/bitmap.h
+Auto-merging fs/buffer.c
+Auto-merging block/blk-settings.c
+Auto-merging arch/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Resolved 'include/linux/bitmap.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master f4e19c08c0ac] Merge branch 'akpm-current/current'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/kdump/kdump.rst | 3 +-
+ Documentation/admin-guide/kernel-parameters.txt | 18 ++
+ Documentation/dev-tools/gdb-kernel-debugging.rst | 2 +-
+ Documentation/filesystems/proc.rst | 37 ++-
+ MAINTAINERS | 16 ++
+ arch/Kconfig | 20 ++
+ arch/alpha/kernel/pc873xx.c | 4 +-
+ arch/h8300/include/asm/bitops.h | 8 +-
+ arch/m68k/include/asm/bitops.h | 6 +-
+ arch/sh/include/asm/bitops.h | 5 +-
+ block/blk-settings.c | 1 +
+ drivers/base/firmware_loader/main.c | 2 +
+ drivers/block/brd.c | 1 +
+ drivers/block/loop.c | 1 +
+ drivers/isdn/capi/kcapi_proc.c | 1 +
+ drivers/md/bcache/super.c | 1 +
+ drivers/net/wireless/intersil/hostap/hostap_proc.c | 1 +
+ drivers/nvdimm/btt.c | 1 +
+ drivers/nvdimm/pmem.c | 1 +
+ drivers/scsi/esas2r/esas2r_main.c | 1 +
+ drivers/scsi/scsicam.c | 1 +
+ fs/aio.c | 9 +-
+ fs/buffer.c | 56 ++++-
+ fs/eventpoll.c | 6 +
+ fs/hfsplus/catalog.c | 16 +-
+ fs/hfsplus/dir.c | 4 +-
+ fs/hfsplus/hfsplus_raw.h | 12 +-
+ fs/hfsplus/xattr.c | 18 +-
+ fs/hpfs/hpfs.h | 3 +-
+ fs/isofs/rock.c | 1 +
+ fs/nilfs2/cpfile.c | 2 +-
+ fs/nilfs2/ioctl.c | 4 +-
+ fs/nilfs2/segment.c | 4 +-
+ fs/nilfs2/the_nilfs.c | 2 +-
+ fs/ocfs2/namei.c | 17 +-
+ fs/proc/base.c | 4 +-
+ fs/proc/fd.c | 20 +-
+ fs/proc/generic.c | 13 +-
+ fs/proc/inode.c | 18 +-
+ fs/proc/page.c | 40 +--
+ fs/proc/proc_sysctl.c | 2 +-
+ include/asm-generic/bitops/find.h | 108 +++++++-
+ include/asm-generic/bitops/le.h | 38 ++-
+ include/asm-generic/bitsperlong.h | 12 +
+ include/linux/align.h | 15 ++
+ include/linux/async.h | 1 -
+ include/linux/bitmap.h | 11 +-
+ include/linux/bitops.h | 12 -
+ include/linux/blkdev.h | 1 -
+ include/linux/compat.h | 1 -
+ include/linux/crc8.h | 2 +-
+ include/linux/cred.h | 1 -
+ include/linux/delayacct.h | 20 +-
+ include/linux/highmem.h | 28 +--
+ include/linux/init_task.h | 1 -
+ include/linux/initrd.h | 2 +
+ include/linux/kernel.h | 9 +-
+ include/linux/memremap.h | 6 +
+ include/linux/proc_fs.h | 1 +
+ include/linux/profile.h | 3 -
+ include/linux/sched.h | 8 +
+ include/linux/slab.h | 2 +
+ include/linux/slub_def.h | 2 +
+ include/linux/smp.h | 8 +
+ include/linux/swap.h | 1 +
+ include/linux/wait.h | 4 +-
+ init/Kconfig | 12 +
+ init/initramfs.c | 38 ++-
+ init/main.c | 1 +
+ ipc/sem.c | 10 +-
+ kernel/async.c | 66 ++---
+ kernel/crash_core.c | 7 +
+ kernel/cred.c | 2 +-
+ kernel/exit.c | 67 ++++-
+ kernel/fork.c | 23 +-
+ kernel/gcov/Kconfig | 1 +
+ kernel/gcov/base.c | 49 ++++
+ kernel/gcov/clang.c | 276 +--------------------
+ kernel/gcov/fs.c | 110 ++++++++
+ kernel/gcov/gcc_4_7.c | 173 +------------
+ kernel/gcov/gcov.h | 14 +-
+ kernel/hung_task.c | 44 ++++
+ kernel/kexec_core.c | 4 +-
+ kernel/kexec_file.c | 4 +-
+ kernel/kmod.c | 2 +-
+ kernel/resource.c | 194 +++++++++------
+ kernel/sysctl.c | 8 +-
+ kernel/umh.c | 2 +
+ lib/Kconfig.debug | 11 +
+ lib/Makefile | 1 +
+ lib/bch.c | 2 +-
+ lib/crc8.c | 2 +-
+ lib/decompress_unlzma.c | 2 +-
+ lib/find_bit.c | 68 +----
+ lib/genalloc.c | 7 +-
+ lib/list_sort.c | 2 +-
+ lib/parser.c | 61 +++--
+ lib/percpu_counter.c | 2 +-
+ lib/stackdepot.c | 6 +-
+ lib/test_slub.c | 124 +++++++++
+ mm/memory.c | 8 +-
+ mm/memremap.c | 20 ++
+ mm/page_alloc.c | 2 +-
+ mm/slab.h | 7 +-
+ mm/slab_common.c | 2 +-
+ mm/slub.c | 126 ++++------
+ scripts/checkpatch.pl | 15 +-
+ scripts/gdb/linux/cpus.py | 23 +-
+ scripts/gdb/linux/symbols.py | 3 +-
+ tools/include/asm-generic/bitops/find.h | 85 ++++++-
+ tools/include/asm-generic/bitsperlong.h | 3 +
+ tools/include/linux/bitmap.h | 18 +-
+ tools/lib/bitmap.c | 4 +-
+ tools/lib/find_bit.c | 56 ++---
+ tools/scripts/Makefile.include | 1 +
+ .../filesystems/epoll/epoll_wakeup_test.c | 44 ++++
+ tools/testing/selftests/kvm/lib/sparsebit.c | 1 -
+ tools/testing/selftests/mincore/mincore_selftest.c | 1 -
+ tools/testing/selftests/powerpc/mm/tlbie_test.c | 1 -
+ tools/testing/selftests/proc/Makefile | 1 +
+ tools/testing/selftests/proc/proc-subset-pid.c | 121 +++++++++
+ tools/testing/selftests/proc/read.c | 4 +-
+ 122 files changed, 1564 insertions(+), 1056 deletions(-)
+ create mode 100644 include/linux/align.h
+ create mode 100644 lib/test_slub.c
+ create mode 100644 tools/testing/selftests/proc/proc-subset-pid.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
+Rebasing (1/32)\rRebasing (2/32)\rRebasing (3/32)\rRebasing (4/32)\rRebasing (5/32)\rRebasing (6/32)\rRebasing (7/32)\rRebasing (8/32)\rRebasing (9/32)\rRebasing (10/32)\rRebasing (11/32)\rRebasing (12/32)\rRebasing (13/32)\rRebasing (14/32)\rRebasing (15/32)\rRebasing (16/32)\rRebasing (17/32)\rRebasing (18/32)\rRebasing (19/32)\rRebasing (20/32)\rRebasing (21/32)\rRebasing (22/32)\rRebasing (23/32)\rRebasing (24/32)\rRebasing (25/32)\rRebasing (26/32)\rRebasing (27/32)\rRebasing (28/32)\rRebasing (29/32)\rRebasing (30/32)\rRebasing (31/32)\rRebasing (32/32)\r\r\e[KSuccessfully rebased and updated refs/heads/akpm.
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + 172e8ee7a90c...03fdb7246685 akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (03fdb7246685 memfd_secret: use unsigned int rather than long as syscall flags type)
+$ git merge --no-ff akpm/master
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/devices.txt | 2 +-
+ arch/alpha/include/asm/io.h | 5 -
+ arch/arm/configs/dove_defconfig | 1 -
+ arch/arm/configs/magician_defconfig | 1 -
+ arch/arm/configs/moxart_defconfig | 1 -
+ arch/arm/configs/mps2_defconfig | 1 -
+ arch/arm/configs/mvebu_v5_defconfig | 1 -
+ arch/arm/configs/xcep_defconfig | 1 -
+ arch/arm/include/asm/bug.h | 1 +
+ arch/arm/include/asm/io.h | 5 -
+ arch/arm/kernel/process.c | 11 +
+ arch/arm/kernel/traps.c | 1 +
+ arch/arm64/include/asm/Kbuild | 1 -
+ arch/arm64/include/asm/cacheflush.h | 6 -
+ arch/arm64/include/asm/kfence.h | 2 +-
+ arch/arm64/include/asm/set_memory.h | 17 ++
+ arch/arm64/include/uapi/asm/unistd.h | 1 +
+ arch/arm64/kernel/machine_kexec.c | 1 +
+ arch/arm64/mm/mmu.c | 6 +-
+ arch/arm64/mm/pageattr.c | 23 +-
+ arch/hexagon/configs/comet_defconfig | 1 -
+ arch/hexagon/include/asm/io.h | 1 -
+ arch/ia64/include/asm/io.h | 1 -
+ arch/ia64/include/asm/uaccess.h | 18 --
+ arch/m68k/atari/time.c | 7 -
+ arch/m68k/configs/amcore_defconfig | 1 -
+ arch/m68k/include/asm/io_mm.h | 5 -
+ arch/mips/include/asm/io.h | 5 -
+ arch/openrisc/configs/or1ksim_defconfig | 1 -
+ arch/parisc/include/asm/io.h | 5 -
+ arch/parisc/include/asm/pdc_chassis.h | 1 -
+ arch/powerpc/include/asm/io.h | 5 -
+ arch/riscv/Kconfig | 4 +-
+ arch/riscv/include/asm/set_memory.h | 4 +-
+ arch/riscv/include/asm/unistd.h | 1 +
+ arch/riscv/mm/pageattr.c | 8 +-
+ arch/s390/include/asm/io.h | 5 -
+ arch/sh/configs/edosk7705_defconfig | 1 -
+ arch/sh/configs/se7206_defconfig | 1 -
+ arch/sh/configs/sh2007_defconfig | 1 -
+ arch/sh/configs/sh7724_generic_defconfig | 1 -
+ arch/sh/configs/sh7770_generic_defconfig | 1 -
+ arch/sh/configs/sh7785lcr_32bit_defconfig | 1 -
+ arch/sh/include/asm/io.h | 5 -
+ arch/sparc/configs/sparc64_defconfig | 1 -
+ arch/sparc/include/asm/io_64.h | 5 -
+ arch/um/drivers/cow.h | 7 -
+ arch/x86/entry/syscalls/syscall_32.tbl | 1 +
+ arch/x86/entry/syscalls/syscall_64.tbl | 1 +
+ arch/x86/include/asm/set_memory.h | 4 +-
+ arch/x86/mm/pat/set_memory.c | 8 +-
+ arch/xtensa/configs/xip_kc705_defconfig | 1 -
+ drivers/auxdisplay/panel.c | 7 -
+ drivers/char/Kconfig | 10 -
+ drivers/char/mem.c | 231 ----------------
+ drivers/gpu/drm/qxl/qxl_drv.c | 1 -
+ drivers/media/usb/pwc/pwc-uncompress.c | 3 -
+ drivers/net/ethernet/adaptec/starfire.c | 8 -
+ drivers/net/ethernet/amd/atarilance.c | 8 -
+ drivers/net/ethernet/amd/pcnet32.c | 7 -
+ .../net/wireless/intersil/orinoco/orinoco_nortel.c | 8 -
+ .../net/wireless/intersil/orinoco/orinoco_pci.c | 8 -
+ .../net/wireless/intersil/orinoco/orinoco_plx.c | 8 -
+ .../net/wireless/intersil/orinoco/orinoco_tmd.c | 8 -
+ drivers/parport/parport_ip32.c | 12 -
+ drivers/platform/x86/dell/dell_rbu.c | 3 -
+ drivers/scsi/53c700.c | 1 -
+ drivers/scsi/53c700.h | 1 -
+ drivers/scsi/ch.c | 6 -
+ drivers/scsi/ips.c | 20 --
+ drivers/scsi/ips.h | 20 --
+ drivers/scsi/lasi700.c | 1 -
+ drivers/scsi/megaraid/mbox_defs.h | 2 -
+ drivers/scsi/megaraid/mega_common.h | 2 -
+ drivers/scsi/megaraid/megaraid_mbox.c | 2 -
+ drivers/scsi/megaraid/megaraid_mbox.h | 2 -
+ drivers/scsi/qla1280.c | 12 -
+ drivers/scsi/sni_53c710.c | 1 -
+ drivers/video/fbdev/matrox/matroxfb_base.c | 9 -
+ drivers/video/fbdev/vga16fb.c | 10 -
+ fs/configfs/configfs_internal.h | 4 +-
+ fs/configfs/dir.c | 4 +-
+ fs/configfs/file.c | 4 +-
+ fs/configfs/inode.c | 4 +-
+ fs/configfs/item.c | 4 +-
+ fs/configfs/mount.c | 4 +-
+ fs/configfs/symlink.c | 4 +-
+ fs/fat/fatent.c | 2 +-
+ fs/nfs/dir.c | 7 -
+ fs/nfs/nfs4proc.c | 6 -
+ fs/nfs/nfs4renewd.c | 6 -
+ fs/nfs/nfs4state.c | 6 -
+ fs/nfs/nfs4xdr.c | 6 -
+ fs/nfsd/nfs4proc.c | 6 -
+ fs/nfsd/nfs4xdr.c | 6 -
+ fs/nfsd/xdr4.h | 6 -
+ fs/ocfs2/acl.c | 4 +-
+ fs/ocfs2/acl.h | 4 +-
+ fs/ocfs2/alloc.c | 4 +-
+ fs/ocfs2/alloc.h | 4 +-
+ fs/ocfs2/aops.c | 4 +-
+ fs/ocfs2/aops.h | 4 +-
+ fs/ocfs2/blockcheck.c | 4 +-
+ fs/ocfs2/blockcheck.h | 4 +-
+ fs/ocfs2/buffer_head_io.c | 4 +-
+ fs/ocfs2/buffer_head_io.h | 4 +-
+ fs/ocfs2/cluster/heartbeat.c | 4 +-
+ fs/ocfs2/cluster/heartbeat.h | 4 +-
+ fs/ocfs2/cluster/masklog.c | 4 +-
+ fs/ocfs2/cluster/masklog.h | 4 +-
+ fs/ocfs2/cluster/netdebug.c | 4 +-
+ fs/ocfs2/cluster/nodemanager.c | 4 +-
+ fs/ocfs2/cluster/nodemanager.h | 4 +-
+ fs/ocfs2/cluster/ocfs2_heartbeat.h | 4 +-
+ fs/ocfs2/cluster/ocfs2_nodemanager.h | 4 +-
+ fs/ocfs2/cluster/quorum.c | 4 +-
+ fs/ocfs2/cluster/quorum.h | 4 +-
+ fs/ocfs2/cluster/sys.c | 4 +-
+ fs/ocfs2/cluster/sys.h | 4 +-
+ fs/ocfs2/cluster/tcp.c | 4 +-
+ fs/ocfs2/cluster/tcp.h | 4 +-
+ fs/ocfs2/cluster/tcp_internal.h | 4 +-
+ fs/ocfs2/dcache.c | 4 +-
+ fs/ocfs2/dcache.h | 4 +-
+ fs/ocfs2/dir.c | 4 +-
+ fs/ocfs2/dir.h | 4 +-
+ fs/ocfs2/dlm/dlmapi.h | 4 +-
+ fs/ocfs2/dlm/dlmast.c | 4 +-
+ fs/ocfs2/dlm/dlmcommon.h | 4 +-
+ fs/ocfs2/dlm/dlmconvert.c | 4 +-
+ fs/ocfs2/dlm/dlmconvert.h | 4 +-
+ fs/ocfs2/dlm/dlmdebug.c | 4 +-
+ fs/ocfs2/dlm/dlmdebug.h | 4 +-
+ fs/ocfs2/dlm/dlmdomain.c | 4 +-
+ fs/ocfs2/dlm/dlmdomain.h | 4 +-
+ fs/ocfs2/dlm/dlmlock.c | 4 +-
+ fs/ocfs2/dlm/dlmmaster.c | 4 +-
+ fs/ocfs2/dlm/dlmrecovery.c | 4 +-
+ fs/ocfs2/dlm/dlmthread.c | 4 +-
+ fs/ocfs2/dlm/dlmunlock.c | 4 +-
+ fs/ocfs2/dlmfs/dlmfs.c | 4 +-
+ fs/ocfs2/dlmfs/userdlm.c | 4 +-
+ fs/ocfs2/dlmfs/userdlm.h | 4 +-
+ fs/ocfs2/dlmglue.c | 4 +-
+ fs/ocfs2/dlmglue.h | 4 +-
+ fs/ocfs2/export.c | 4 +-
+ fs/ocfs2/export.h | 4 +-
+ fs/ocfs2/extent_map.c | 4 +-
+ fs/ocfs2/extent_map.h | 4 +-
+ fs/ocfs2/file.c | 4 +-
+ fs/ocfs2/file.h | 4 +-
+ fs/ocfs2/filecheck.c | 4 +-
+ fs/ocfs2/filecheck.h | 4 +-
+ fs/ocfs2/heartbeat.c | 4 +-
+ fs/ocfs2/heartbeat.h | 4 +-
+ fs/ocfs2/inode.c | 4 +-
+ fs/ocfs2/inode.h | 4 +-
+ fs/ocfs2/journal.c | 4 +-
+ fs/ocfs2/journal.h | 4 +-
+ fs/ocfs2/localalloc.c | 4 +-
+ fs/ocfs2/localalloc.h | 4 +-
+ fs/ocfs2/locks.c | 4 +-
+ fs/ocfs2/locks.h | 4 +-
+ fs/ocfs2/mmap.c | 4 +-
+ fs/ocfs2/move_extents.c | 4 +-
+ fs/ocfs2/move_extents.h | 4 +-
+ fs/ocfs2/namei.c | 4 +-
+ fs/ocfs2/namei.h | 4 +-
+ fs/ocfs2/ocfs1_fs_compat.h | 4 +-
+ fs/ocfs2/ocfs2.h | 4 +-
+ fs/ocfs2/ocfs2_fs.h | 4 +-
+ fs/ocfs2/ocfs2_ioctl.h | 4 +-
+ fs/ocfs2/ocfs2_lockid.h | 4 +-
+ fs/ocfs2/ocfs2_lockingver.h | 4 +-
+ fs/ocfs2/refcounttree.c | 4 +-
+ fs/ocfs2/refcounttree.h | 4 +-
+ fs/ocfs2/reservations.c | 4 +-
+ fs/ocfs2/reservations.h | 4 +-
+ fs/ocfs2/resize.c | 4 +-
+ fs/ocfs2/resize.h | 4 +-
+ fs/ocfs2/slot_map.c | 4 +-
+ fs/ocfs2/slot_map.h | 4 +-
+ fs/ocfs2/stack_o2cb.c | 4 +-
+ fs/ocfs2/stack_user.c | 4 +-
+ fs/ocfs2/stackglue.c | 4 +-
+ fs/ocfs2/stackglue.h | 4 +-
+ fs/ocfs2/suballoc.c | 4 +-
+ fs/ocfs2/suballoc.h | 4 +-
+ fs/ocfs2/super.c | 4 +-
+ fs/ocfs2/super.h | 4 +-
+ fs/ocfs2/symlink.c | 4 +-
+ fs/ocfs2/symlink.h | 4 +-
+ fs/ocfs2/sysfile.c | 4 +-
+ fs/ocfs2/sysfile.h | 4 +-
+ fs/ocfs2/uptodate.c | 4 +-
+ fs/ocfs2/uptodate.h | 4 +-
+ fs/ocfs2/xattr.c | 4 +-
+ fs/ocfs2/xattr.h | 4 +-
+ fs/reiserfs/procfs.c | 10 -
+ include/asm-generic/io.h | 11 -
+ include/linux/configfs.h | 4 +-
+ include/linux/fs.h | 2 +-
+ include/linux/genl_magic_func.h | 1 -
+ include/linux/genl_magic_struct.h | 1 -
+ include/linux/gfp.h | 2 +-
+ include/linux/mm.h | 2 +-
+ include/linux/mmzone.h | 2 +-
+ include/linux/pgtable.h | 10 +-
+ include/linux/secretmem.h | 54 ++++
+ include/linux/set_memory.h | 16 +-
+ include/linux/syscalls.h | 1 +
+ include/linux/vmalloc.h | 7 +-
+ include/uapi/asm-generic/unistd.h | 6 +-
+ include/uapi/linux/if_bonding.h | 11 -
+ include/uapi/linux/magic.h | 1 +
+ include/uapi/linux/nfs4.h | 6 -
+ include/xen/interface/elfnote.h | 10 -
+ include/xen/interface/hvm/hvm_vcpu.h | 10 -
+ include/xen/interface/io/xenbus.h | 10 -
+ ipc/sem.c | 2 +-
+ kernel/configs/android-base.config | 1 -
+ kernel/power/hibernate.c | 5 +-
+ kernel/power/snapshot.c | 4 +-
+ kernel/sys.c | 14 +-
+ kernel/sys_ni.c | 2 +
+ kernel/umh.c | 6 +-
+ kernel/up.c | 2 +-
+ kernel/user_namespace.c | 6 +-
+ mm/Kconfig | 3 +
+ mm/Makefile | 1 +
+ mm/balloon_compaction.c | 4 +-
+ mm/compaction.c | 4 +-
+ mm/filemap.c | 2 +-
+ mm/gup.c | 14 +-
+ mm/highmem.c | 2 +-
+ mm/huge_memory.c | 6 +-
+ mm/hugetlb.c | 6 +-
+ mm/internal.h | 5 +-
+ mm/kasan/kasan.h | 8 +-
+ mm/kasan/quarantine.c | 4 +-
+ mm/kasan/shadow.c | 4 +-
+ mm/kfence/report.c | 2 +-
+ mm/khugepaged.c | 2 +-
+ mm/ksm.c | 6 +-
+ mm/madvise.c | 4 +-
+ mm/memcontrol.c | 18 +-
+ mm/memory-failure.c | 2 +-
+ mm/memory.c | 10 +-
+ mm/mempolicy.c | 6 +-
+ mm/migrate.c | 8 +-
+ mm/mlock.c | 3 +-
+ mm/mmap.c | 9 +-
+ mm/mprotect.c | 2 +-
+ mm/mremap.c | 2 +-
+ mm/nommu.c | 10 -
+ mm/oom_kill.c | 2 +-
+ mm/page-writeback.c | 4 +-
+ mm/page_alloc.c | 16 +-
+ mm/page_owner.c | 2 +-
+ mm/page_vma_mapped.c | 2 +-
+ mm/percpu-internal.h | 2 +-
+ mm/percpu.c | 2 +-
+ mm/pgalloc-track.h | 6 +-
+ mm/rmap.c | 2 +-
+ mm/secretmem.c | 251 +++++++++++++++++
+ mm/slab.c | 8 +-
+ mm/slub.c | 2 +-
+ mm/swap.c | 4 +-
+ mm/swap_slots.c | 2 +-
+ mm/swap_state.c | 2 +-
+ mm/vmalloc.c | 129 +--------
+ mm/vmstat.c | 2 +-
+ mm/z3fold.c | 2 +-
+ mm/zpool.c | 2 +-
+ mm/zsmalloc.c | 6 +-
+ samples/configfs/configfs_sample.c | 2 -
+ scripts/checksyscalls.sh | 4 +
+ scripts/spelling.txt | 3 +
+ tools/testing/selftests/vm/.gitignore | 1 +
+ tools/testing/selftests/vm/Makefile | 3 +-
+ tools/testing/selftests/vm/memfd_secret.c | 296 +++++++++++++++++++++
+ tools/testing/selftests/vm/run_vmtests.sh | 17 ++
+ tools/usb/hcd-tests.sh | 2 -
+ 283 files changed, 984 insertions(+), 1256 deletions(-)
+ create mode 100644 arch/arm64/include/asm/set_memory.h
+ create mode 100644 include/linux/secretmem.h
+ create mode 100644 mm/secretmem.c
+ create mode 100644 tools/testing/selftests/vm/memfd_secret.c
projects / users / jedix / linux-maple.git / commitdiff