diff options
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 6112 |
1 files changed, 6112 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..40f56175e58e --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,6112 @@ +$ date -R +Mon, 08 Aug 2022 08:18:30 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at b2a88c212e65 Merge tag 'xfs-5.20-merge-6' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux +Merging origin/master (3bc1bc0b59d0 Merge tag '5.20-rc-smb3-client-fixes-part1' of git://git.samba.org/sfrench/cifs-2.6) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating b2a88c212e65..3bc1bc0b59d0 +Fast-forward (no commit created; -m option ignored) + .mailmap | 3 +- + Documentation/ABI/testing/procfs-smaps_rollup | 1 + + .../testing/sysfs-bus-event_source-devices-caps | 18 + + Documentation/ABI/testing/sysfs-kernel-mm-ksm | 2 +- + Documentation/ABI/testing/sysfs-kernel-slab | 4 +- + Documentation/admin-guide/cgroup-v2.rst | 31 +- + Documentation/admin-guide/kernel-parameters.txt | 90 +- + Documentation/admin-guide/mm/concepts.rst | 2 +- + Documentation/admin-guide/mm/damon/index.rst | 3 +- + Documentation/admin-guide/mm/damon/lru_sort.rst | 294 + + Documentation/admin-guide/mm/damon/reclaim.rst | 8 +- + Documentation/admin-guide/mm/damon/usage.rst | 10 +- + Documentation/admin-guide/mm/index.rst | 1 + + Documentation/admin-guide/mm/shrinker_debugfs.rst | 135 + + Documentation/admin-guide/sysctl/kernel.rst | 12 + + Documentation/admin-guide/sysctl/vm.rst | 7 +- + Documentation/core-api/bus-virt-phys-mapping.rst | 220 - + Documentation/core-api/dma-api-howto.rst | 14 - + Documentation/core-api/dma-api.rst | 14 + + Documentation/core-api/index.rst | 3 +- + Documentation/dev-tools/kmemleak.rst | 1 - + .../bindings/dsp/mediatek,mt8186-dsp.yaml | 91 + + .../bindings/dsp/mediatek,mt8195-dsp.yaml | 10 +- + .../devicetree/bindings/iommu/arm,smmu.yaml | 1 + + .../devicetree/bindings/iommu/mediatek,iommu.yaml | 17 + + .../devicetree/bindings/leds/backlight/common.yaml | 2 +- + .../bindings/leds/backlight/gpio-backlight.yaml | 2 +- + .../bindings/leds/backlight/led-backlight.yaml | 2 +- + .../bindings/leds/backlight/lm3630a-backlight.yaml | 2 +- + .../bindings/leds/backlight/pwm-backlight.yaml | 2 +- + .../leds/backlight/richtek,rt4831-backlight.yaml | 5 + + Documentation/devicetree/bindings/mfd/da9063.txt | 114 - + .../devicetree/bindings/mfd/dlg,da9063.yaml | 132 + + .../devicetree/bindings/mfd/mps,mp2629.yaml | 4 +- + Documentation/devicetree/bindings/mfd/mt6397.txt | 8 +- + .../devicetree/bindings/mfd/qcom,tcsr.txt | 24 - + .../devicetree/bindings/mfd/qcom,tcsr.yaml | 50 + + .../devicetree/bindings/mfd/qcom-pm8xxx.yaml | 2 +- + .../devicetree/bindings/mfd/st,stm32-lptimer.yaml | 28 +- + .../devicetree/bindings/mfd/st,stm32-timers.yaml | 37 +- + Documentation/devicetree/bindings/mfd/syscon.yaml | 2 +- + .../bindings/mfd/ti,j721e-system-controller.yaml | 12 + + .../devicetree/bindings/mtd/mxc-nand.yaml | 2 - + .../bindings/mtd/partitions/partition.yaml | 20 +- + .../bindings/mtd/partitions/qcom,smem-part.yaml | 27 + + .../devicetree/bindings/mtd/qcom,nandc.yaml | 27 + + .../bindings/reset/renesas,rzg2l-usbphy-ctrl.yaml | 1 + + .../bindings/reset/ti,tps380x-reset.yaml | 49 + + .../devicetree/bindings/sound/adi,adau1977.yaml | 7 +- + .../devicetree/bindings/sound/adi,max98396.yaml | 30 +- + .../sound/allwinner,sun50i-a64-codec-analog.yaml | 5 + + .../bindings/sound/atmel,sama5d2-classd.yaml | 100 + + .../bindings/sound/atmel,sama5d2-i2s.yaml | 85 + + .../bindings/sound/atmel,sama5d2-pdmic.yaml | 98 + + .../devicetree/bindings/sound/atmel-classd.txt | 55 - + .../devicetree/bindings/sound/atmel-i2s.txt | 46 - + .../devicetree/bindings/sound/atmel-pdmic.txt | 55 - + .../bindings/sound/atmel-sam9x5-wm8731-audio.txt | 2 +- + .../devicetree/bindings/sound/designware-i2s.txt | 35 - + .../devicetree/bindings/sound/fsl,micfil.txt | 33 - + .../devicetree/bindings/sound/fsl,micfil.yaml | 85 + + .../devicetree/bindings/sound/fsl,mqs.txt | 2 +- + .../devicetree/bindings/sound/fsl,spdif.yaml | 4 + + .../devicetree/bindings/sound/fsl-sai.txt | 11 + + Documentation/devicetree/bindings/sound/mt6358.txt | 4 +- + .../devicetree/bindings/sound/mt8186-afe-pcm.yaml | 175 + + .../sound/mt8186-mt6366-da7219-max98357.yaml | 75 + + .../sound/mt8186-mt6366-rt1019-rt5682s.yaml | 75 + + .../devicetree/bindings/sound/nau8821.txt | 2 +- + .../bindings/sound/nvidia,tegra210-ahub.yaml | 4 + + .../bindings/sound/nvidia,tegra210-mbdrc.yaml | 47 + + .../bindings/sound/nvidia,tegra210-ope.yaml | 87 + + .../bindings/sound/nvidia,tegra210-peq.yaml | 48 + + .../devicetree/bindings/sound/nxp,tfa989x.yaml | 1 + + .../devicetree/bindings/sound/qcom,sdm845.txt | 91 - + .../devicetree/bindings/sound/qcom,sm8250.yaml | 3 + + .../devicetree/bindings/sound/qcom,wcd934x.yaml | 2 +- + .../devicetree/bindings/sound/qcom,wsa883x.yaml | 74 + + .../devicetree/bindings/sound/rockchip-i2s.yaml | 7 + + .../devicetree/bindings/sound/sgtl5000.yaml | 1 + + .../bindings/sound/snps,designware-i2s.yaml | 94 + + .../devicetree/bindings/sound/wlf,wm8731.yaml | 9 +- + .../devicetree/bindings/trivial-devices.yaml | 4 +- + Documentation/driver-api/vfio-mediated-device.rst | 16 +- + Documentation/filesystems/proc.rst | 11 +- + Documentation/index.rst | 2 +- + Documentation/m68k/kernel-options.rst | 4 +- + Documentation/{vm => mm}/active_mm.rst | 0 + Documentation/{vm => mm}/arch_pgtable_helpers.rst | 0 + Documentation/{vm => mm}/balance.rst | 0 + Documentation/{vm => mm}/bootmem.rst | 0 + Documentation/{vm => mm}/damon/api.rst | 0 + Documentation/{vm => mm}/damon/design.rst | 0 + Documentation/{vm => mm}/damon/faq.rst | 0 + Documentation/{vm => mm}/damon/index.rst | 0 + Documentation/{vm => mm}/free_page_reporting.rst | 0 + Documentation/{vm => mm}/frontswap.rst | 0 + Documentation/{vm => mm}/highmem.rst | 0 + Documentation/{vm => mm}/hmm.rst | 0 + Documentation/{vm => mm}/hugetlbfs_reserv.rst | 0 + Documentation/{vm => mm}/hwpoison.rst | 0 + Documentation/{vm => mm}/index.rst | 0 + Documentation/{vm => mm}/ksm.rst | 0 + Documentation/{vm => mm}/memory-model.rst | 2 +- + Documentation/{vm => mm}/mmu_notifier.rst | 0 + Documentation/{vm => mm}/numa.rst | 0 + Documentation/{vm => mm}/oom.rst | 0 + Documentation/{vm => mm}/overcommit-accounting.rst | 0 + Documentation/{vm => mm}/page_allocation.rst | 0 + Documentation/{vm => mm}/page_cache.rst | 0 + Documentation/{vm => mm}/page_frags.rst | 0 + Documentation/{vm => mm}/page_migration.rst | 0 + Documentation/{vm => mm}/page_owner.rst | 0 + Documentation/{vm => mm}/page_reclaim.rst | 0 + Documentation/{vm => mm}/page_table_check.rst | 0 + Documentation/{vm => mm}/page_tables.rst | 0 + Documentation/{vm => mm}/physical_memory.rst | 0 + Documentation/{vm => mm}/process_addrs.rst | 0 + Documentation/{vm => mm}/remap_file_pages.rst | 0 + Documentation/{vm => mm}/shmfs.rst | 0 + Documentation/{vm => mm}/slab.rst | 0 + Documentation/{vm => mm}/slub.rst | 0 + Documentation/{vm => mm}/split_page_table_lock.rst | 0 + Documentation/{vm => mm}/swap.rst | 0 + Documentation/{vm => mm}/transhuge.rst | 0 + Documentation/{vm => mm}/unevictable-lru.rst | 0 + Documentation/{vm => mm}/vmalloc.rst | 0 + .../{vm => mm}/vmalloced-kernel-stacks.rst | 0 + Documentation/{vm => mm}/vmemmap_dedup.rst | 0 + Documentation/{vm => mm}/z3fold.rst | 0 + Documentation/{vm => mm}/zsmalloc.rst | 0 + Documentation/powerpc/elf_hwcaps.rst | 231 + + Documentation/powerpc/index.rst | 1 + + Documentation/process/kernel-docs.rst | 2 +- + Documentation/s390/index.rst | 1 + + Documentation/s390/vfio-ap-locking.rst | 115 + + Documentation/s390/vfio-ap.rst | 498 +- + Documentation/sound/soc/codec.rst | 2 +- + Documentation/sound/soc/platform.rst | 2 +- + Documentation/trace/index.rst | 1 + + Documentation/trace/kprobetrace.rst | 8 +- + .../trace/rv/da_monitor_instrumentation.rst | 171 + + Documentation/trace/rv/da_monitor_synthesis.rst | 147 + + Documentation/trace/rv/deterministic_automata.rst | 184 + + Documentation/trace/rv/index.rst | 14 + + Documentation/trace/rv/monitor_wip.rst | 55 + + Documentation/trace/rv/monitor_wwnr.rst | 45 + + Documentation/trace/rv/runtime-verification.rst | 231 + + Documentation/trace/uprobetracer.rst | 8 +- + .../zh_CN/admin-guide/mm/damon/index.rst | 2 +- + .../zh_CN/admin-guide/mm/damon/reclaim.rst | 2 +- + .../zh_CN/admin-guide/mm/damon/usage.rst | 8 +- + .../translations/zh_CN/core-api/index.rst | 3 +- + Documentation/translations/zh_CN/index.rst | 2 +- + .../translations/zh_CN/{vm => mm}/active_mm.rst | 2 +- + .../translations/zh_CN/{vm => mm}/balance.rst | 2 +- + .../translations/zh_CN/{vm => mm}/damon/api.rst | 2 +- + .../translations/zh_CN/{vm => mm}/damon/design.rst | 2 +- + .../translations/zh_CN/{vm => mm}/damon/faq.rst | 2 +- + .../translations/zh_CN/{vm => mm}/damon/index.rst | 5 +- + .../zh_CN/{vm => mm}/free_page_reporting.rst | 2 +- + .../translations/zh_CN/{vm => mm}/frontswap.rst | 2 +- + .../translations/zh_CN/{vm => mm}/highmem.rst | 2 +- + .../translations/zh_CN/{vm => mm}/hmm.rst | 2 +- + .../zh_CN/{vm => mm}/hugetlbfs_reserv.rst | 2 +- + .../translations/zh_CN/{vm => mm}/hwpoison.rst | 2 +- + .../translations/zh_CN/{vm => mm}/index.rst | 2 +- + .../translations/zh_CN/{vm => mm}/ksm.rst | 2 +- + .../translations/zh_CN/{vm => mm}/memory-model.rst | 4 +- + .../translations/zh_CN/{vm => mm}/mmu_notifier.rst | 2 +- + .../translations/zh_CN/{vm => mm}/numa.rst | 2 +- + .../zh_CN/{vm => mm}/overcommit-accounting.rst | 2 +- + .../translations/zh_CN/{vm => mm}/page_frags.rst | 2 +- + .../zh_CN/{vm => mm}/page_migration.rst | 2 +- + .../translations/zh_CN/{vm => mm}/page_owner.rst | 2 +- + .../zh_CN/{vm => mm}/page_table_check.rst | 2 +- + .../zh_CN/{vm => mm}/remap_file_pages.rst | 2 +- + .../zh_CN/{vm => mm}/split_page_table_lock.rst | 2 +- + .../zh_CN/{vm => mm}/vmalloced-kernel-stacks.rst | 2 +- + .../translations/zh_CN/{vm => mm}/z3fold.rst | 2 +- + .../translations/zh_CN/{vm => mm}/zsmalloc.rst | 2 +- + Documentation/translations/zh_TW/index.rst | 2 +- + Documentation/watchdog/watchdog-parameters.rst | 12 + + Documentation/x86/sgx.rst | 15 + + Documentation/x86/x86_64/boot-options.rst | 8 +- + MAINTAINERS | 64 +- + arch/Kconfig | 3 + + arch/alpha/Kconfig | 1 - + arch/alpha/include/asm/floppy.h | 2 +- + arch/alpha/include/asm/io.h | 8 +- + arch/alpha/include/asm/pgtable.h | 17 - + arch/alpha/kernel/smp.c | 6 - + arch/alpha/mm/fault.c | 4 + + arch/alpha/mm/init.c | 22 + + arch/arc/include/asm/pgtable-bits-arcv2.h | 18 - + arch/arc/kernel/smp.c | 8 - + arch/arc/mm/fault.c | 4 + + arch/arc/mm/mmap.c | 20 + + arch/arm/Kconfig | 5 +- + arch/arm/boot/dts/socfpga.dtsi | 8 + + arch/arm/boot/dts/uniphier-pxs2.dtsi | 8 +- + arch/arm/common/Kconfig | 6 +- + arch/arm/common/Makefile | 1 - + arch/arm/common/dmabounce.c | 582 - + arch/arm/common/sa1111.c | 64 - + arch/arm/include/asm/device.h | 3 - + arch/arm/include/asm/dma-direct.h | 49 +- + arch/arm/include/asm/dma-mapping.h | 128 - + arch/arm/include/asm/memory.h | 2 - + arch/arm/include/asm/pgtable.h | 17 - + arch/arm/kernel/head.S | 34 +- + arch/arm/kernel/irq.c | 3 +- + arch/arm/kernel/smp.c | 8 - + arch/arm/lib/uaccess_with_memcpy.c | 2 +- + arch/arm/mach-footbridge/Kconfig | 1 + + arch/arm/mach-footbridge/common.c | 19 +- + arch/arm/mach-footbridge/include/mach/dma-direct.h | 8 + + arch/arm/mach-footbridge/include/mach/memory.h | 4 - + arch/arm/mach-highbank/highbank.c | 2 +- + arch/arm/mach-mvebu/coherency.c | 2 +- + arch/arm/mach-pxa/eseries.c | 4 +- + arch/arm/mach-pxa/tosa.c | 4 +- + arch/arm/mm/dma-mapping.c | 652 +- + arch/arm/mm/fault.c | 4 + + arch/arm/mm/mmu.c | 20 + + arch/arm64/Kconfig | 2 +- + arch/arm64/boot/dts/apple/t8103-pmgr.dtsi | 7 +- + arch/arm64/boot/dts/apple/t8103.dtsi | 34 + + arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 8 +- + arch/arm64/include/asm/hugetlb.h | 3 - + arch/arm64/include/asm/io.h | 41 +- + arch/arm64/include/asm/memory.h | 9 + + arch/arm64/include/asm/pgtable-prot.h | 18 - + arch/arm64/kernel/smp.c | 8 - + arch/arm64/kvm/hyp/nvhe/Makefile | 7 +- + arch/arm64/mm/fault.c | 4 + + arch/arm64/mm/hugetlbpage.c | 56 +- + arch/arm64/mm/mmap.c | 21 + + arch/csky/include/asm/pgalloc.h | 2 +- + arch/csky/include/asm/pgtable.h | 24 +- + arch/csky/kernel/smp.c | 5 - + arch/csky/mm/fault.c | 4 + + arch/csky/mm/init.c | 20 + + arch/hexagon/include/asm/pgtable.h | 27 - + arch/hexagon/kernel/smp.c | 5 - + arch/hexagon/mm/init.c | 42 + + arch/hexagon/mm/vm_fault.c | 4 + + arch/ia64/Kconfig | 1 - + arch/ia64/include/asm/io.h | 8 - + arch/ia64/include/asm/mmu_context.h | 5 +- + arch/ia64/include/asm/pgtable.h | 18 - + arch/ia64/include/uapi/asm/cmpxchg.h | 28 +- + arch/ia64/kernel/smp.c | 6 - + arch/ia64/mm/fault.c | 4 + + arch/ia64/mm/init.c | 28 +- + arch/loongarch/Kconfig | 2 +- + arch/loongarch/include/asm/pgalloc.h | 6 +- + arch/loongarch/include/asm/pgtable-bits.h | 19 - + arch/loongarch/include/asm/pgtable.h | 27 +- + arch/loongarch/kernel/asm-offsets.c | 6 - + arch/loongarch/mm/cache.c | 46 + + arch/loongarch/mm/pgtable.c | 2 +- + arch/loongarch/mm/tlbex.S | 6 +- + arch/m68k/Kconfig | 1 - + arch/m68k/include/asm/mcf_pgtable.h | 59 - + arch/m68k/include/asm/motorola_pgtable.h | 29 - + arch/m68k/include/asm/sun3_pgtable.h | 23 - + arch/m68k/include/asm/virtconvert.h | 4 +- + arch/m68k/mm/fault.c | 4 + + arch/m68k/mm/mcfmmu.c | 55 + + arch/m68k/mm/motorola.c | 29 + + arch/m68k/mm/sun3mmu.c | 20 + + arch/microblaze/Kconfig | 2 - + arch/microblaze/include/asm/io.h | 2 - + arch/microblaze/include/asm/pgtable.h | 17 - + arch/microblaze/kernel/entry.S | 2 +- + arch/microblaze/mm/fault.c | 4 + + arch/microblaze/mm/init.c | 20 + + arch/mips/Kbuild.platforms | 1 - + arch/mips/Kconfig | 25 +- + arch/mips/Makefile | 1 - + arch/mips/alchemy/devboards/pm.c | 2 +- + arch/mips/bcm47xx/board.c | 2 + + arch/mips/bcm47xx/buttons.c | 10 + + arch/mips/bcm47xx/leds.c | 11 + + arch/mips/bcm47xx/prom.c | 2 +- + arch/mips/bcm47xx/workarounds.c | 1 + + arch/mips/bmips/setup.c | 14 +- + arch/mips/boot/dts/img/pistachio_marduk.dts | 4 +- + arch/mips/boot/dts/ingenic/ci20.dts | 2 +- + arch/mips/boot/dts/ingenic/gcw0.dts | 31 +- + arch/mips/boot/dts/ingenic/rs90.dts | 18 +- + arch/mips/boot/dts/mscc/ocelot.dtsi | 9 +- + arch/mips/boot/dts/pic32/pic32mzda_sk.dts | 9 +- + arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts | 6 +- + arch/mips/boot/dts/qca/ar9331_dpt_module.dts | 4 +- + arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts | 6 +- + arch/mips/boot/dts/qca/ar9331_omega.dts | 4 +- + .../dts/qca/ar9331_openembed_som9331_board.dts | 4 +- + arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts | 8 +- + .../dts/ralink/gardena_smart_gateway_mt7688.dts | 2 +- + arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts | 2 +- + arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts | 2 +- + arch/mips/cavium-octeon/Kconfig | 12 + + arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c | 21 +- + .../cavium-octeon/executive/cvmx-helper-board.c | 4 +- + arch/mips/cavium-octeon/octeon-platform.c | 3 +- + arch/mips/cavium-octeon/setup.c | 38 +- + arch/mips/configs/capcella_defconfig | 91 - + arch/mips/configs/e55_defconfig | 37 - + arch/mips/configs/mpc30x_defconfig | 53 - + arch/mips/configs/tb0219_defconfig | 76 - + arch/mips/configs/tb0226_defconfig | 71 - + arch/mips/configs/tb0287_defconfig | 84 - + arch/mips/configs/workpad_defconfig | 67 - + arch/mips/fw/cfe/cfe_api.c | 68 +- + arch/mips/include/asm/cpu-type.h | 11 - + arch/mips/include/asm/cpu.h | 3 +- + arch/mips/include/asm/fw/cfe/cfe_api.h | 2 + + arch/mips/include/asm/io.h | 11 +- + arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h | 1 + + arch/mips/include/asm/mach-vr41xx/irq.h | 9 - + arch/mips/include/asm/mipsregs.h | 14 - + arch/mips/include/asm/octeon/cvmx-helper-board.h | 12 +- + arch/mips/include/asm/pgalloc.h | 8 +- + arch/mips/include/asm/pgtable-32.h | 24 +- + arch/mips/include/asm/pgtable-64.h | 66 +- + arch/mips/include/asm/pgtable.h | 22 - + arch/mips/include/asm/vermagic.h | 2 - + arch/mips/include/asm/vr41xx/capcella.h | 30 - + arch/mips/include/asm/vr41xx/giu.h | 41 - + arch/mips/include/asm/vr41xx/irq.h | 97 - + arch/mips/include/asm/vr41xx/mpc30x.h | 24 - + arch/mips/include/asm/vr41xx/pci.h | 77 - + arch/mips/include/asm/vr41xx/siu.h | 45 - + arch/mips/include/asm/vr41xx/tb0219.h | 29 - + arch/mips/include/asm/vr41xx/tb0226.h | 30 - + arch/mips/include/asm/vr41xx/tb0287.h | 30 - + arch/mips/include/asm/vr41xx/vr41xx.h | 148 - + arch/mips/kernel/asm-offsets.c | 5 - + arch/mips/kernel/cpu-probe.c | 40 - + arch/mips/kernel/mips-mt.c | 4 +- + arch/mips/kernel/proc.c | 2 +- + arch/mips/kernel/vdso.c | 2 +- + arch/mips/kvm/mmu.c | 2 +- + arch/mips/lib/dump_tlb.c | 8 - + arch/mips/loongson64/numa.c | 1 - + arch/mips/math-emu/dsemul.c | 9 +- + arch/mips/mm/c-r4k.c | 44 - + arch/mips/mm/cache.c | 3 + + arch/mips/mm/context.c | 5 +- + arch/mips/mm/fault.c | 4 + + arch/mips/mm/pgtable.c | 2 +- + arch/mips/mm/physaddr.c | 14 +- + arch/mips/mm/tlbex.c | 53 +- + arch/mips/pci/Makefile | 6 - + arch/mips/pci/fixup-capcella.c | 37 - + arch/mips/pci/fixup-lemote2f.c | 2 +- + arch/mips/pci/fixup-mpc30x.c | 36 - + arch/mips/pci/fixup-tb0219.c | 38 - + arch/mips/pci/fixup-tb0226.c | 73 - + arch/mips/pci/fixup-tb0287.c | 52 - + arch/mips/pci/msi-octeon.c | 16 +- + arch/mips/pci/ops-vr41xx.c | 113 - + arch/mips/pci/pci-vr41xx.c | 309 - + arch/mips/pci/pci-vr41xx.h | 141 - + arch/mips/sgi-ip22/ip22-gio.c | 2 +- + arch/mips/vr41xx/Kconfig | 104 - + arch/mips/vr41xx/Makefile | 5 - + arch/mips/vr41xx/Platform | 29 - + arch/mips/vr41xx/casio-e55/Makefile | 6 - + arch/mips/vr41xx/casio-e55/setup.c | 27 - + arch/mips/vr41xx/common/Makefile | 6 - + arch/mips/vr41xx/common/bcu.c | 210 - + arch/mips/vr41xx/common/cmu.c | 242 - + arch/mips/vr41xx/common/giu.c | 110 - + arch/mips/vr41xx/common/icu.c | 714 - + arch/mips/vr41xx/common/init.c | 60 - + arch/mips/vr41xx/common/irq.c | 106 - + arch/mips/vr41xx/common/pmu.c | 123 - + arch/mips/vr41xx/common/rtc.c | 105 - + arch/mips/vr41xx/common/siu.c | 142 - + arch/mips/vr41xx/common/type.c | 11 - + arch/mips/vr41xx/ibm-workpad/Makefile | 6 - + arch/mips/vr41xx/ibm-workpad/setup.c | 27 - + arch/nios2/include/asm/pgtable.h | 23 +- + arch/nios2/mm/fault.c | 4 + + arch/nios2/mm/init.c | 25 +- + arch/nios2/mm/pgtable.c | 2 +- + arch/openrisc/Kconfig | 5 +- + arch/openrisc/configs/virt_defconfig | 108 + + arch/openrisc/include/asm/Kbuild | 1 + + arch/openrisc/include/asm/io.h | 4 +- + arch/openrisc/include/asm/pgtable.h | 18 - + arch/openrisc/kernel/smp.c | 6 - + arch/openrisc/mm/fault.c | 4 + + arch/openrisc/mm/init.c | 20 + + arch/openrisc/mm/ioremap.c | 2 +- + arch/parisc/Kconfig | 1 - + arch/parisc/include/asm/floppy.h | 4 +- + arch/parisc/include/asm/io.h | 2 - + arch/parisc/include/asm/pgalloc.h | 6 +- + arch/parisc/include/asm/pgtable.h | 26 +- + arch/parisc/kernel/cache.c | 3 - + arch/parisc/kernel/drivers.c | 9 +- + arch/parisc/kernel/hardware.c | 11 +- + arch/parisc/kernel/irq.c | 2 + + arch/parisc/kernel/pci-dma.c | 4 +- + arch/parisc/kernel/smp.c | 7 - + arch/parisc/kernel/syscalls/syscall.tbl | 2 +- + arch/parisc/mm/fault.c | 6 +- + arch/parisc/mm/init.c | 22 +- + arch/powerpc/Kconfig | 21 +- + arch/powerpc/Kconfig.debug | 4 +- + arch/powerpc/Makefile | 34 +- + arch/powerpc/boot/dts/fsl/p2020si-post.dtsi | 3 + + arch/powerpc/boot/dts/turris1x.dts | 483 + + arch/powerpc/configs/44x/akebono_defconfig | 2 +- + arch/powerpc/configs/44x/currituck_defconfig | 2 +- + arch/powerpc/configs/44x/fsp2_defconfig | 2 +- + arch/powerpc/configs/44x/iss476-smp_defconfig | 2 +- + arch/powerpc/configs/44x/warp_defconfig | 2 +- + arch/powerpc/configs/52xx/lite5200b_defconfig | 2 +- + arch/powerpc/configs/52xx/motionpro_defconfig | 2 +- + arch/powerpc/configs/52xx/tqm5200_defconfig | 2 +- + arch/powerpc/configs/adder875_defconfig | 2 +- + arch/powerpc/configs/ep8248e_defconfig | 2 +- + arch/powerpc/configs/ep88xc_defconfig | 2 +- + arch/powerpc/configs/fsl-emb-nonhw.config | 2 +- + arch/powerpc/configs/mgcoge_defconfig | 2 +- + arch/powerpc/configs/mpc5200_defconfig | 2 +- + arch/powerpc/configs/mpc8272_ads_defconfig | 2 +- + arch/powerpc/configs/mpc885_ads_defconfig | 2 +- + arch/powerpc/configs/ppc6xx_defconfig | 2 +- + arch/powerpc/configs/pq2fads_defconfig | 2 +- + arch/powerpc/configs/ps3_defconfig | 2 +- + arch/powerpc/configs/tqm8xx_defconfig | 2 +- + arch/powerpc/include/asm/archrandom.h | 7 +- + arch/powerpc/include/asm/asm-prototypes.h | 11 +- + arch/powerpc/include/asm/barrier.h | 2 + + arch/powerpc/include/asm/book3s/64/hugetlb.h | 3 + + arch/powerpc/include/asm/book3s/64/pgtable.h | 2 +- + arch/powerpc/include/asm/book3s/64/tlbflush.h | 26 +- + arch/powerpc/include/asm/cputable.h | 3 - + arch/powerpc/include/asm/cputime.h | 1 + + arch/powerpc/include/asm/firmware.h | 3 +- + arch/powerpc/include/asm/hvcall.h | 23 +- + arch/powerpc/include/asm/hw_irq.h | 77 +- + arch/powerpc/include/asm/inst.h | 19 - + arch/powerpc/include/asm/interrupt.h | 1 + + arch/powerpc/include/asm/io.h | 3 - + arch/powerpc/include/asm/irq.h | 1 - + arch/powerpc/include/asm/kasan.h | 13 +- + arch/powerpc/include/asm/kexec.h | 1 + + arch/powerpc/include/asm/kprobes.h | 2 +- + arch/powerpc/include/asm/kvm_book3s.h | 3 - + arch/powerpc/include/asm/kvm_host.h | 16 +- + arch/powerpc/include/asm/machdep.h | 2 - + arch/powerpc/include/asm/mman.h | 1 + + arch/powerpc/include/asm/mmu.h | 12 - + arch/powerpc/include/asm/mpc52xx.h | 4 +- + arch/powerpc/include/asm/mpc5xxx.h | 9 +- + arch/powerpc/include/asm/nmi.h | 2 + + arch/powerpc/include/asm/nohash/64/pgalloc.h | 5 +- + arch/powerpc/include/asm/nohash/64/pgtable.h | 23 +- + arch/powerpc/include/asm/nohash/pgtable.h | 2 +- + arch/powerpc/include/asm/pci-bridge.h | 4 + + arch/powerpc/include/asm/pci.h | 1 - + arch/powerpc/include/asm/pgtable.h | 20 +- + arch/powerpc/include/asm/plpar_wrappers.h | 5 +- + arch/powerpc/include/asm/ppc-opcode.h | 4 +- + arch/powerpc/include/asm/probes.h | 4 +- + arch/powerpc/include/asm/prom.h | 13 +- + arch/powerpc/include/asm/setup.h | 6 +- + arch/powerpc/include/asm/synch.h | 5 +- + arch/powerpc/include/asm/uaccess.h | 1 - + arch/powerpc/include/asm/uprobes.h | 2 +- + arch/powerpc/include/asm/word-at-a-time.h | 2 +- + arch/powerpc/kernel/Makefile | 11 +- + arch/powerpc/kernel/asm-offsets.c | 2 +- + arch/powerpc/kernel/btext.c | 2 +- + arch/powerpc/kernel/cputable.c | 67 +- + arch/powerpc/kernel/dawr.c | 1 + + arch/powerpc/kernel/dt_cpu_ftrs.c | 4 - + arch/powerpc/kernel/eeh_driver.c | 2 +- + arch/powerpc/kernel/exceptions-64s.S | 2 +- + arch/powerpc/kernel/head_64.S | 3 + + arch/powerpc/kernel/head_book3s_32.S | 4 +- + arch/powerpc/kernel/interrupt.c | 161 - + arch/powerpc/kernel/iommu.c | 5 + + arch/powerpc/kernel/irq.c | 500 +- + arch/powerpc/kernel/irq_64.c | 466 + + arch/powerpc/kernel/kprobes.c | 2 +- + arch/powerpc/kernel/mce.c | 2 +- + arch/powerpc/kernel/pci-common.c | 32 +- + arch/powerpc/kernel/pci_32.c | 27 +- + arch/powerpc/kernel/pci_64.c | 2 + + arch/powerpc/kernel/pci_dn.c | 2 +- + arch/powerpc/kernel/prom.c | 10 +- + arch/powerpc/kernel/prom_init.c | 2 +- + arch/powerpc/kernel/ptrace/ptrace-vsx.c | 2 +- + arch/powerpc/kernel/setup_64.c | 1 - + arch/powerpc/kernel/signal_64.c | 9 +- + arch/powerpc/kernel/smp.c | 36 +- + arch/powerpc/kernel/syscall.c | 190 + + arch/powerpc/kernel/trace/ftrace.c | 30 +- + arch/powerpc/kernel/traps.c | 2 +- + arch/powerpc/kernel/vdso/cacheflush.S | 1 + + arch/powerpc/kernel/watchdog.c | 23 +- + arch/powerpc/kexec/core.c | 2 + + arch/powerpc/kexec/crash.c | 77 +- + arch/powerpc/kexec/file_load_64.c | 55 + + arch/powerpc/kvm/Kconfig | 21 +- + arch/powerpc/kvm/Makefile | 1 + + arch/powerpc/kvm/book3s_64_mmu_radix.c | 1 + + arch/powerpc/kvm/book3s_64_vio.c | 2 +- + arch/powerpc/kvm/book3s_hv.c | 28 +- + arch/powerpc/kvm/book3s_hv.h | 10 + + arch/powerpc/kvm/book3s_hv_builtin.c | 25 +- + arch/powerpc/kvm/book3s_hv_nested.c | 1 + + arch/powerpc/kvm/book3s_hv_p9_entry.c | 257 +- + arch/powerpc/kvm/book3s_hv_p9_perf.c | 219 + + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 24 +- + arch/powerpc/kvm/book3s_xics.h | 1 + + arch/powerpc/kvm/powerpc.c | 1 + + arch/powerpc/kvm/trace_hv.h | 21 +- + arch/powerpc/lib/test_emulate_step.c | 15 +- + arch/powerpc/mm/book3s32/mmu.c | 12 +- + arch/powerpc/mm/book3s64/hash_pgtable.c | 1 + + arch/powerpc/mm/book3s64/hash_utils.c | 2 +- + arch/powerpc/mm/book3s64/pkeys.c | 1 + + arch/powerpc/mm/book3s64/radix_hugetlbpage.c | 10 +- + arch/powerpc/mm/book3s64/radix_pgtable.c | 35 +- + arch/powerpc/mm/book3s64/radix_tlb.c | 14 +- + arch/powerpc/mm/copro_fault.c | 5 + + arch/powerpc/mm/fault.c | 5 + + arch/powerpc/mm/hugetlbpage.c | 1 + + arch/powerpc/mm/init_32.c | 37 - + arch/powerpc/mm/kasan/Makefile | 1 + + arch/powerpc/mm/kasan/init_32.c | 2 +- + arch/powerpc/mm/kasan/init_book3e_64.c | 133 + + arch/powerpc/mm/kasan/init_book3s_64.c | 2 + + arch/powerpc/mm/mem.c | 1 + + arch/powerpc/mm/mmu_decl.h | 1 - + arch/powerpc/mm/nohash/40x.c | 9 +- + arch/powerpc/mm/nohash/8xx.c | 13 +- + arch/powerpc/mm/nohash/book3e_hugetlbpage.c | 30 +- + arch/powerpc/mm/nohash/tlb_low.S | 4 +- + arch/powerpc/mm/nohash/tlb_low_64e.S | 147 +- + arch/powerpc/mm/pgtable.c | 24 + + arch/powerpc/mm/pgtable_32.c | 6 +- + arch/powerpc/mm/ptdump/shared.c | 6 +- + arch/powerpc/net/bpf_jit_comp32.c | 72 +- + arch/powerpc/net/bpf_jit_comp64.c | 96 +- + arch/powerpc/perf/core-book3s.c | 66 +- + arch/powerpc/perf/e500-pmu.c | 9 +- + arch/powerpc/perf/e6500-pmu.c | 5 +- + arch/powerpc/perf/generic-compat-pmu.c | 12 +- + arch/powerpc/perf/hv-24x7.c | 6 +- + arch/powerpc/perf/isa207-common.c | 3 + + arch/powerpc/perf/isa207-common.h | 1 + + arch/powerpc/perf/mpc7450-pmu.c | 5 +- + arch/powerpc/perf/power10-pmu.c | 17 +- + arch/powerpc/perf/power5+-pmu.c | 6 +- + arch/powerpc/perf/power5-pmu.c | 5 +- + arch/powerpc/perf/power6-pmu.c | 5 +- + arch/powerpc/perf/power7-pmu.c | 7 +- + arch/powerpc/perf/power8-pmu.c | 15 +- + arch/powerpc/perf/power9-pmu.c | 14 +- + arch/powerpc/perf/ppc970-pmu.c | 7 +- + arch/powerpc/platforms/4xx/cpm.c | 2 +- + arch/powerpc/platforms/52xx/mpc52xx_common.c | 37 - + arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 27 +- + arch/powerpc/platforms/83xx/misc.c | 14 +- + arch/powerpc/platforms/83xx/suspend.c | 52 +- + arch/powerpc/platforms/85xx/Kconfig | 18 +- + arch/powerpc/platforms/Kconfig.cputype | 54 +- + arch/powerpc/platforms/cell/axon_msi.c | 1 + + arch/powerpc/platforms/cell/spufs/inode.c | 1 + + arch/powerpc/platforms/cell/spufs/spufs.h | 2 +- + arch/powerpc/platforms/powermac/setup.c | 7 - + arch/powerpc/platforms/powernv/Kconfig | 2 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 2 + + arch/powerpc/platforms/powernv/rng.c | 66 +- + arch/powerpc/platforms/powernv/vas-fault.c | 2 +- + arch/powerpc/platforms/ps3/Kconfig | 2 +- + arch/powerpc/platforms/pseries/Kconfig | 13 + + arch/powerpc/platforms/pseries/Makefile | 1 + + arch/powerpc/platforms/pseries/eeh_pseries.c | 2 +- + arch/powerpc/platforms/pseries/firmware.c | 1 + + arch/powerpc/platforms/pseries/iommu.c | 97 +- + arch/powerpc/platforms/pseries/kexec.c | 2 +- + arch/powerpc/platforms/pseries/lpar.c | 2 +- + arch/powerpc/platforms/pseries/mobility.c | 91 +- + .../platforms/pseries/papr_platform_attributes.c | 1 + + arch/powerpc/platforms/pseries/papr_scm.c | 4 +- + arch/powerpc/platforms/pseries/plpks.c | 460 + + arch/powerpc/platforms/pseries/plpks.h | 71 + + arch/powerpc/platforms/pseries/setup.c | 19 +- + arch/powerpc/platforms/pseries/vas.c | 3 +- + arch/powerpc/purgatory/.gitignore | 1 - + arch/powerpc/purgatory/Makefile | 8 +- + arch/powerpc/purgatory/kexec-purgatory.S | 14 + + arch/powerpc/sysdev/cpm2.c | 2 +- + arch/powerpc/sysdev/fsl_pci.c | 9 + + arch/powerpc/sysdev/fsl_pci.h | 1 + + arch/powerpc/sysdev/fsl_rio.c | 12 +- + arch/powerpc/sysdev/mpc5xxx_clocks.c | 41 +- + arch/powerpc/sysdev/of_rtc.c | 2 + + arch/powerpc/sysdev/xive/spapr.c | 1 + + arch/powerpc/xmon/xmon.c | 4 +- + arch/riscv/Kconfig | 47 +- + arch/riscv/Kconfig.erratas | 2 +- + arch/riscv/Kconfig.socs | 4 +- + arch/riscv/boot/dts/canaan/k210.dtsi | 12 + + arch/riscv/boot/dts/microchip/mpfs.dtsi | 27 +- + arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 24 + + arch/riscv/boot/dts/sifive/fu740-c000.dtsi | 24 + + .../riscv/boot/dts/sifive/hifive-unmatched-a00.dts | 2 +- + arch/riscv/boot/dts/starfive/jh7100.dtsi | 16 +- + arch/riscv/configs/32-bit.config | 2 + + arch/riscv/configs/defconfig | 65 +- + arch/riscv/configs/nommu_k210_defconfig | 1 + + arch/riscv/configs/nommu_k210_sdcard_defconfig | 1 + + arch/riscv/configs/nommu_virt_defconfig | 1 + + arch/riscv/configs/rv32_defconfig | 1 + + arch/riscv/errata/thead/errata.c | 38 +- + arch/riscv/include/asm/asm.h | 15 + + arch/riscv/include/asm/barrier.h | 2 + + arch/riscv/include/asm/errata_list.h | 8 +- + arch/riscv/include/asm/hwcap.h | 25 + + arch/riscv/include/asm/page.h | 1 - + arch/riscv/include/asm/pci.h | 3 + + arch/riscv/include/asm/pgtable.h | 20 - + arch/riscv/include/asm/processor.h | 4 +- + arch/riscv/include/asm/smp.h | 4 +- + arch/riscv/include/asm/switch_to.h | 4 +- + arch/riscv/kernel/alternative.c | 18 +- + arch/riscv/kernel/cpu.c | 26 +- + arch/riscv/kernel/cpu_ops_sbi.c | 4 +- + arch/riscv/kernel/cpu_ops_spinwait.c | 4 +- + arch/riscv/kernel/cpufeature.c | 52 +- + arch/riscv/kernel/smp.c | 10 +- + arch/riscv/kernel/smpboot.c | 9 +- + arch/riscv/kernel/sys_riscv.c | 5 +- + arch/riscv/kernel/traps.c | 4 + + arch/riscv/mm/fault.c | 4 + + arch/riscv/mm/init.c | 20 + + arch/s390/boot/startup.c | 10 +- + arch/s390/boot/uv.c | 5 +- + arch/s390/boot/uv.h | 7 +- + arch/s390/crypto/aes_s390.c | 2 +- + arch/s390/crypto/chacha-glue.c | 2 +- + arch/s390/crypto/crc32-vx.c | 2 +- + arch/s390/crypto/des_s390.c | 2 +- + arch/s390/crypto/ghash_s390.c | 2 +- + arch/s390/crypto/prng.c | 2 +- + arch/s390/crypto/sha1_s390.c | 2 +- + arch/s390/crypto/sha256_s390.c | 2 +- + arch/s390/crypto/sha3_256_s390.c | 2 +- + arch/s390/crypto/sha3_512_s390.c | 2 +- + arch/s390/crypto/sha512_s390.c | 2 +- + arch/s390/include/asm/ap.h | 6 +- + arch/s390/include/asm/cpufeature.h | 23 +- + arch/s390/include/asm/mmu.h | 14 - + arch/s390/include/asm/os_info.h | 17 +- + arch/s390/include/asm/pgtable.h | 17 - + arch/s390/include/asm/sclp.h | 4 +- + arch/s390/include/asm/softirq_stack.h | 3 +- + arch/s390/include/asm/uaccess.h | 1 - + arch/s390/include/asm/unwind.h | 2 +- + arch/s390/kernel/Makefile | 2 +- + arch/s390/kernel/cpufeature.c | 46 + + arch/s390/kernel/crash_dump.c | 116 +- + arch/s390/kernel/nmi.c | 8 +- + arch/s390/kernel/processor.c | 10 - + arch/s390/kernel/setup.c | 13 +- + arch/s390/mm/fault.c | 12 + + arch/s390/mm/maccess.c | 26 - + arch/s390/mm/mmap.c | 20 + + arch/sh/include/asm/pgtable.h | 17 - + arch/sh/kernel/irq.c | 2 + + arch/sh/mm/fault.c | 4 + + arch/sh/mm/mmap.c | 20 + + arch/sparc/Kconfig | 1 - + arch/sparc/include/asm/pgtable_32.h | 19 - + arch/sparc/include/asm/pgtable_64.h | 19 - + arch/sparc/kernel/irq_64.c | 2 + + arch/sparc/kernel/smp_32.c | 5 - + arch/sparc/kernel/smp_64.c | 6 - + arch/sparc/mm/fault_32.c | 4 + + arch/sparc/mm/fault_64.c | 5 + + arch/sparc/mm/init_32.c | 20 + + arch/sparc/mm/init_64.c | 3 + + arch/um/Kconfig | 17 +- + arch/um/drivers/Kconfig | 54 +- + arch/um/drivers/random.c | 2 +- + arch/um/include/asm/common.lds.S | 2 + + arch/um/include/asm/kasan.h | 37 + + arch/um/include/asm/pgtable.h | 17 - + arch/um/include/asm/processor-generic.h | 5 - + arch/um/include/asm/xor.h | 2 +- + arch/um/include/shared/user.h | 3 +- + arch/um/kernel/dyn.lds.S | 6 +- + arch/um/kernel/mem.c | 39 + + arch/um/kernel/stacktrace.c | 2 +- + arch/um/kernel/trap.c | 4 + + arch/um/kernel/uml.lds.S | 1 + + arch/um/os-Linux/mem.c | 22 + + arch/um/os-Linux/skas/process.c | 17 +- + arch/um/os-Linux/umid.c | 3 +- + arch/um/os-Linux/user_syms.c | 4 +- + arch/x86/Kconfig | 2 - + arch/x86/entry/Makefile | 3 +- + arch/x86/entry/thunk_32.S | 2 - + arch/x86/entry/thunk_64.S | 4 - + arch/x86/include/asm/apic.h | 2 - + arch/x86/include/asm/io.h | 9 - + arch/x86/include/asm/mem_encrypt.h | 2 + + arch/x86/include/asm/pgtable_types.h | 19 - + arch/x86/include/asm/sgx.h | 8 + + arch/x86/include/uapi/asm/sgx.h | 62 + + arch/x86/kernel/apic/apic.c | 5 - + arch/x86/kernel/cpu/cacheinfo.c | 6 + + arch/x86/kernel/cpu/intel.c | 27 +- + arch/x86/kernel/cpu/sgx/encl.c | 330 +- + arch/x86/kernel/cpu/sgx/encl.h | 16 +- + arch/x86/kernel/cpu/sgx/encls.h | 33 + + arch/x86/kernel/cpu/sgx/ioctl.c | 641 +- + arch/x86/kernel/cpu/sgx/main.c | 75 +- + arch/x86/kernel/cpu/sgx/sgx.h | 3 + + arch/x86/kernel/ftrace.c | 1 + + arch/x86/kernel/kprobes/core.c | 18 +- + arch/x86/kernel/smpboot.c | 4 - + arch/x86/kernel/tboot.c | 15 - + arch/x86/kvm/mmu/mmu.c | 2 +- + arch/x86/kvm/x86.c | 1 - + arch/x86/mm/fault.c | 4 + + arch/x86/mm/hugetlbpage.c | 39 - + arch/x86/mm/mem_encrypt_amd.c | 6 +- + arch/x86/mm/numa.c | 4 +- + arch/x86/mm/pgprot.c | 28 + + arch/x86/um/Kconfig | 10 +- + arch/x86/um/Makefile | 4 +- + arch/x86/um/mem_32.c | 2 +- + arch/x86/um/shared/sysdep/stub_64.h | 1 + + arch/x86/um/sysrq_64.c | 4 +- + arch/x86/um/vdso/Makefile | 3 + + arch/xtensa/Kconfig | 1 - + arch/xtensa/include/asm/io.h | 3 - + arch/xtensa/include/asm/pgalloc.h | 2 +- + arch/xtensa/include/asm/pgtable.h | 19 - + arch/xtensa/mm/fault.c | 4 + + arch/xtensa/mm/init.c | 22 + + crypto/asymmetric_keys/pkcs7_parser.c | 18 + + crypto/asymmetric_keys/public_key.c | 7 +- + crypto/asymmetric_keys/x509_cert_parser.c | 3 + + drivers/acpi/arm64/iort.c | 360 +- + drivers/acpi/scan.c | 1 + + drivers/acpi/utils.c | 38 + + drivers/android/binder_alloc.c | 37 +- + drivers/android/binder_alloc.h | 2 +- + drivers/android/binder_alloc_selftest.c | 2 +- + drivers/ata/libata-scsi.c | 1 + + drivers/ata/pata_mpc52xx.c | 2 +- + drivers/block/zram/zcomp.c | 11 +- + drivers/block/zram/zram_drv.c | 6 +- + drivers/char/agp/intel-gtt.c | 17 +- + drivers/char/hw_random/powernv-rng.c | 2 +- + drivers/char/hw_random/s390-trng.c | 2 +- + drivers/char/tpm/Kconfig | 12 + + drivers/char/tpm/Makefile | 1 + + drivers/char/tpm/tpm.h | 1 + + drivers/char/tpm/tpm1-cmd.c | 7 +- + drivers/char/tpm/tpm2-cmd.c | 6 + + drivers/char/tpm/tpm_tis_core.c | 14 + + drivers/char/tpm/tpm_tis_core.h | 10 + + drivers/char/tpm/tpm_tis_i2c.c | 390 + + drivers/clocksource/timer-riscv.c | 15 +- + drivers/dax/super.c | 67 +- + drivers/edac/mpc85xx_edac.c | 2 + + drivers/edac/ppc4xx_edac.c | 1 + + drivers/firmware/cirrus/cs_dsp.c | 107 + + drivers/firmware/efi/libstub/riscv-stub.c | 13 +- + drivers/firmware/mtk-adsp-ipc.c | 36 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 34 +- + drivers/gpu/drm/bridge/sii902x.c | 5 +- + .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 2 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 8 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 6 +- + drivers/gpu/drm/i915/display/intel_display.c | 1 - + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 1 - + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 3 +- + drivers/gpu/drm/i915/gvt/gvt.h | 1 - + drivers/gpu/drm/i915/gvt/kvmgt.c | 120 +- + drivers/gpu/drm/meson/meson_viu.c | 22 +- + drivers/gpu/drm/msm/msm_gem_shrinker.c | 2 +- + drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c | 2 +- + drivers/gpu/drm/sti/sti_hdmi.c | 8 +- + drivers/gpu/drm/ttm/ttm_pool.c | 2 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 1 + + drivers/hwtracing/coresight/coresight-etm4x-core.c | 8 +- + drivers/hwtracing/coresight/coresight-etm4x.h | 8 +- + drivers/i2c/busses/i2c-mpc.c | 7 +- + drivers/infiniband/core/rw.c | 45 +- + drivers/infiniband/hw/hfi1/trace_dbg.h | 8 +- + drivers/input/serio/gscps2.c | 4 + + drivers/iommu/Kconfig | 10 + + drivers/iommu/amd/amd_iommu.h | 18 +- + drivers/iommu/amd/amd_iommu_types.h | 186 +- + drivers/iommu/amd/init.c | 942 +- + drivers/iommu/amd/io_pgtable.c | 6 +- + drivers/iommu/amd/iommu.c | 585 +- + drivers/iommu/amd/iommu_v2.c | 67 +- + drivers/iommu/amd/quirks.c | 4 +- + drivers/iommu/apple-dart.c | 4 - + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 144 +- + drivers/iommu/arm/arm-smmu/Makefile | 1 + + drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c | 142 + + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 34 +- + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.h | 28 + + drivers/iommu/arm/arm-smmu/arm-smmu.c | 73 +- + drivers/iommu/arm/arm-smmu/arm-smmu.h | 1 + + drivers/iommu/arm/arm-smmu/qcom_iommu.c | 18 +- + drivers/iommu/dma-iommu.c | 124 +- + drivers/iommu/exynos-iommu.c | 182 +- + drivers/iommu/fsl_pamu_domain.c | 5 - + drivers/iommu/intel/cap_audit.c | 2 +- + drivers/iommu/intel/debugfs.c | 51 +- + drivers/iommu/intel/dmar.c | 39 +- + drivers/iommu/intel/iommu.c | 447 +- + .../intel-iommu.h => drivers/iommu/intel/iommu.h | 35 +- + drivers/iommu/intel/irq_remapping.c | 2 +- + drivers/iommu/intel/pasid.c | 107 +- + drivers/iommu/intel/pasid.h | 1 + + drivers/iommu/intel/perf.c | 2 +- + drivers/iommu/intel/svm.c | 11 +- + drivers/iommu/intel/trace.c | 2 +- + .../intel_iommu.h => drivers/iommu/intel/trace.h | 7 +- + drivers/iommu/io-pgtable-arm-v7s.c | 75 +- + drivers/iommu/iommu.c | 59 +- + drivers/iommu/iova.c | 12 +- + drivers/iommu/msm_iommu.c | 7 +- + drivers/iommu/mtk_iommu.c | 71 +- + drivers/iommu/mtk_iommu_v1.c | 5 - + drivers/iommu/sprd-iommu.c | 11 - + drivers/iommu/sun50i-iommu.c | 3 - + drivers/iommu/tegra-gart.c | 5 - + drivers/iommu/tegra-smmu.c | 3 - + drivers/iommu/virtio-iommu.c | 31 +- + drivers/irqchip/irq-riscv-intc.c | 7 +- + drivers/irqchip/irq-sifive-plic.c | 7 +- + drivers/irqchip/irq-tegra.c | 10 +- + drivers/macintosh/adb.c | 2 +- + drivers/md/bcache/btree.c | 2 +- + drivers/md/dm-bufio.c | 35 +- + drivers/md/dm-ebs-target.c | 3 +- + drivers/md/dm-integrity.c | 2 +- + drivers/md/dm-snap-persistent.c | 2 +- + drivers/md/dm-verity-fec.c | 4 +- + drivers/md/dm-verity-target.c | 160 +- + drivers/md/dm-verity.h | 6 +- + drivers/md/dm-zoned-metadata.c | 4 +- + drivers/md/dm.c | 2 +- + drivers/md/persistent-data/dm-block-manager.c | 3 +- + drivers/md/raid5.c | 2 +- + drivers/media/i2c/tda1997x.c | 1 - + drivers/mfd/Kconfig | 5 +- + drivers/mfd/asic3.c | 9 +- + drivers/mfd/axp20x.c | 9 + + drivers/mfd/cros_ec_dev.c | 5 + + drivers/mfd/db8500-prcmu.c | 2 +- + drivers/mfd/dln2.c | 17 +- + drivers/mfd/intel-lpss-pci.c | 13 + + drivers/mfd/intel_soc_pmic_bxtwc.c | 194 +- + drivers/mfd/intel_soc_pmic_chtwc.c | 27 +- + drivers/mfd/max77620.c | 2 + + drivers/mfd/max77714.c | 4 +- + drivers/mfd/mt6358-irq.c | 24 + + drivers/mfd/mt6397-core.c | 91 + + drivers/mfd/mt6397-irq.c | 9 +- + drivers/mfd/qcom-pm8008.c | 53 +- + drivers/mfd/syscon.c | 3 +- + drivers/mfd/t7l66xb.c | 6 +- + drivers/mfd/tc6393xb.c | 5 +- + drivers/mfd/twl-core.c | 323 +- + drivers/misc/vmw_balloon.c | 2 +- + drivers/mtd/devices/mtd_dataflash.c | 8 + + drivers/mtd/devices/powernv_flash.c | 4 +- + drivers/mtd/devices/spear_smi.c | 10 +- + drivers/mtd/devices/st_spi_fsm.c | 23 +- + drivers/mtd/hyperbus/hbmc-am654.c | 6 +- + drivers/mtd/hyperbus/hyperbus-core.c | 8 +- + drivers/mtd/hyperbus/rpc-if.c | 13 +- + drivers/mtd/lpddr/lpddr2_nvm.c | 4 +- + drivers/mtd/maps/physmap-core.c | 13 +- + drivers/mtd/maps/physmap-versatile.c | 2 + + drivers/mtd/mtdchar.c | 13 +- + drivers/mtd/mtdcore.c | 63 + + drivers/mtd/nand/raw/arasan-nand-controller.c | 16 +- + drivers/mtd/nand/raw/atmel/nand-controller.c | 4 +- + drivers/mtd/nand/raw/cafe_nand.c | 9 +- + drivers/mtd/nand/raw/meson_nand.c | 17 +- + drivers/mtd/nand/raw/omap2.c | 6 +- + drivers/mtd/nand/raw/qcom_nandc.c | 306 +- + drivers/mtd/nand/raw/sm_common.c | 2 +- + drivers/mtd/nand/raw/tegra_nand.c | 5 +- + drivers/mtd/nand/spi/Makefile | 2 +- + drivers/mtd/nand/spi/ato.c | 86 + + drivers/mtd/nand/spi/core.c | 1 + + drivers/mtd/parsers/Kconfig | 9 + + drivers/mtd/parsers/Makefile | 1 + + drivers/mtd/parsers/ofpart_bcm4908.c | 3 + + drivers/mtd/parsers/redboot.c | 1 + + drivers/mtd/parsers/scpart.c | 249 + + drivers/mtd/sm_ftl.c | 2 +- + drivers/mtd/spi-nor/controllers/hisi-sfc.c | 2 +- + drivers/mtd/spi-nor/controllers/nxp-spifi.c | 8 +- + drivers/mtd/spi-nor/core.c | 70 +- + drivers/mtd/spi-nor/core.h | 21 +- + drivers/mtd/spi-nor/debugfs.c | 2 +- + drivers/mtd/spi-nor/esmt.c | 2 +- + drivers/mtd/spi-nor/issi.c | 31 +- + drivers/mtd/spi-nor/micron-st.c | 12 +- + drivers/mtd/spi-nor/otp.c | 12 +- + drivers/mtd/spi-nor/sfdp.c | 34 +- + drivers/mtd/spi-nor/spansion.c | 185 +- + drivers/mtd/spi-nor/xilinx.c | 2 +- + drivers/net/can/mscan/mpc5xxx_can.c | 2 +- + drivers/net/ethernet/freescale/fec_mpc52xx.c | 2 +- + drivers/net/ethernet/freescale/fec_mpc52xx_phy.c | 3 +- + drivers/net/ethernet/freescale/fs_enet/mii-fec.c | 4 +- + drivers/net/wireless/ath/ath10k/trace.h | 14 +- + drivers/net/wireless/ath/ath11k/trace.h | 7 +- + drivers/net/wireless/ath/ath6kl/trace.h | 14 +- + drivers/net/wireless/ath/trace.h | 7 +- + drivers/net/wireless/ath/wil6210/trace.h | 7 +- + .../broadcom/brcm80211/brcmfmac/tracepoint.h | 12 +- + .../brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h | 12 +- + .../net/wireless/intel/iwlwifi/iwl-devtrace-msg.h | 12 +- + drivers/nvdimm/pmem.c | 17 + + drivers/nvme/host/core.c | 3 +- + drivers/nvme/host/nvme.h | 2 +- + drivers/nvme/host/pci.c | 81 +- + drivers/nvme/target/rdma.c | 2 +- + drivers/of/fdt.c | 2 +- + drivers/parisc/lba_pci.c | 6 +- + drivers/pci/Kconfig | 5 + + drivers/pci/p2pdma.c | 93 +- + drivers/reset/Kconfig | 13 +- + drivers/reset/Makefile | 1 + + drivers/reset/reset-tps380x.c | 126 + + drivers/s390/char/Kconfig | 2 +- + drivers/s390/char/tape_34xx.c | 2 +- + drivers/s390/char/uvdevice.c | 5 +- + drivers/s390/char/zcore.c | 55 +- + drivers/s390/cio/vfio_ccw_async.c | 1 - + drivers/s390/cio/vfio_ccw_cp.c | 205 +- + drivers/s390/cio/vfio_ccw_cp.h | 12 +- + drivers/s390/cio/vfio_ccw_drv.c | 58 +- + drivers/s390/cio/vfio_ccw_fsm.c | 99 +- + drivers/s390/cio/vfio_ccw_ops.c | 114 +- + drivers/s390/cio/vfio_ccw_private.h | 13 +- + drivers/s390/crypto/ap_bus.c | 31 +- + drivers/s390/crypto/ap_queue.c | 2 +- + drivers/s390/crypto/pkey_api.c | 2 +- + drivers/s390/crypto/vfio_ap_drv.c | 124 +- + drivers/s390/crypto/vfio_ap_ops.c | 1544 +- + drivers/s390/crypto/vfio_ap_private.h | 54 +- + drivers/scsi/cxlflash/ocxl_hw.c | 1 + + drivers/scsi/hosts.c | 5 + + drivers/scsi/mesh.c | 7 +- + drivers/scsi/scsi_lib.c | 4 - + drivers/scsi/scsi_transport_sas.c | 6 + + drivers/scsi/sd.c | 7 + + drivers/soc/qcom/qcom-geni-se.c | 3 + + drivers/soundwire/intel.c | 16 +- + drivers/spi/spi-mpc52xx.c | 2 +- + drivers/tty/serial/mpc52xx_uart.c | 4 +- + drivers/tty/serial/qcom_geni_serial.c | 3 + + drivers/usb/chipidea/trace.h | 4 +- + drivers/usb/core/hcd.c | 17 +- + drivers/usb/host/ohci-sa1111.c | 25 + + drivers/usb/host/xhci-trace.h | 4 +- + drivers/usb/mtu3/mtu3_trace.h | 6 +- + drivers/usb/musb/musb_trace.h | 4 +- + drivers/vfio/fsl-mc/vfio_fsl_mc_private.h | 2 +- + drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 11 +- + drivers/vfio/pci/mlx5/cmd.c | 14 +- + drivers/vfio/pci/mlx5/cmd.h | 4 +- + drivers/vfio/pci/mlx5/main.c | 11 +- + drivers/vfio/pci/vfio_pci_config.c | 4 +- + drivers/vfio/pci/vfio_pci_core.c | 7 + + drivers/vfio/platform/vfio_platform_private.h | 21 +- + drivers/vfio/vfio.c | 192 +- + drivers/vfio/vfio.h | 17 +- + drivers/vfio/vfio_iommu_spapr_tce.c | 14 +- + drivers/vfio/vfio_iommu_type1.c | 197 +- + drivers/video/backlight/lp855x_bl.c | 21 +- + drivers/video/backlight/platform_lcd.c | 10 - + drivers/video/backlight/rt4831-backlight.c | 33 +- + drivers/video/fbdev/68328fb.c | 7 +- + drivers/video/fbdev/amba-clcd.c | 24 +- + drivers/video/fbdev/amifb.c | 15 +- + drivers/video/fbdev/arkfb.c | 9 +- + drivers/video/fbdev/atafb.c | 103 +- + drivers/video/fbdev/cirrusfb.c | 2 +- + drivers/video/fbdev/dnfb.c | 2 +- + drivers/video/fbdev/fm2fb.c | 4 +- + drivers/video/fbdev/hpfb.c | 4 +- + drivers/video/fbdev/i740fb.c | 9 +- + drivers/video/fbdev/imxfb.c | 134 +- + drivers/video/fbdev/offb.c | 1 + + drivers/video/fbdev/omap/hwa742.c | 3 +- + drivers/video/fbdev/omap/omapfb.h | 9 - + drivers/video/fbdev/omap/omapfb_main.c | 3 +- + drivers/video/fbdev/q40fb.c | 2 +- + drivers/video/fbdev/s3fb.c | 2 + + drivers/video/fbdev/sa1100fb.c | 41 - + drivers/video/fbdev/sis/init.c | 4 +- + drivers/video/fbdev/skeletonfb.c | 6 +- + drivers/video/fbdev/valkyriefb.c | 10 +- + drivers/video/fbdev/vt8623fb.c | 2 + + drivers/virtio/virtio_balloon.c | 2 +- + drivers/virtio/virtio_mem.c | 6 +- + drivers/watchdog/Kconfig | 8 + + drivers/watchdog/Makefile | 1 + + drivers/watchdog/pseries-wdt.c | 239 + + drivers/xen/xenbus/xenbus_probe_backend.c | 2 +- + fs/9p/fid.c | 61 +- + fs/9p/fid.h | 6 +- + fs/9p/vfs_addr.c | 4 +- + fs/9p/vfs_dentry.c | 4 +- + fs/9p/vfs_dir.c | 2 +- + fs/9p/vfs_file.c | 9 +- + fs/9p/vfs_inode.c | 89 +- + fs/9p/vfs_inode_dotl.c | 82 +- + fs/9p/vfs_super.c | 8 +- + fs/9p/xattr.c | 8 +- + fs/autofs/autofs_i.h | 7 +- + fs/autofs/expire.c | 2 +- + fs/autofs/inode.c | 1 + + fs/autofs/root.c | 108 +- + fs/btrfs/super.c | 2 + + fs/cifs/Makefile | 4 +- + fs/cifs/cifs_debug.c | 72 +- + fs/cifs/cifsacl.c | 2 + + fs/cifs/cifsencrypt.c | 6 +- + fs/cifs/cifsfs.c | 53 +- + fs/cifs/cifsfs.h | 4 +- + fs/cifs/cifsglob.h | 135 +- + fs/cifs/cifsproto.h | 10 +- + fs/cifs/cifssmb.c | 477 +- + fs/cifs/connect.c | 299 +- + fs/cifs/dfs_cache.c | 8 +- + fs/cifs/dir.c | 8 + + fs/cifs/file.c | 283 +- + fs/cifs/inode.c | 64 +- + fs/cifs/ioctl.c | 2 + + fs/cifs/link.c | 8 + + fs/cifs/misc.c | 33 +- + fs/cifs/netmisc.c | 2 +- + fs/cifs/sess.c | 5 +- + fs/cifs/smb1ops.c | 10 +- + fs/cifs/smb2misc.c | 49 +- + fs/cifs/smb2ops.c | 61 +- + fs/cifs/smb2pdu.c | 32 +- + fs/cifs/smb2transport.c | 38 +- + fs/cifs/transport.c | 334 +- + fs/cifs/xattr.c | 5 +- + fs/dax.c | 401 +- + fs/erofs/super.c | 10 +- + fs/erofs/utils.c | 2 +- + fs/eventpoll.c | 22 + + fs/ext2/super.c | 7 +- + fs/ext4/extents_status.c | 3 +- + fs/ext4/super.c | 9 +- + fs/f2fs/super.c | 2 +- + fs/fat/namei_vfat.c | 231 +- + fs/gfs2/dir.c | 2 +- + fs/gfs2/file.c | 3 +- + fs/gfs2/glock.c | 202 +- + fs/gfs2/glock.h | 2 +- + fs/gfs2/glops.c | 31 +- + fs/gfs2/incore.h | 6 +- + fs/gfs2/lock_dlm.c | 2 +- + fs/gfs2/main.c | 3 +- + fs/gfs2/ops_fstype.c | 2 - + fs/gfs2/quota.c | 28 +- + fs/gfs2/rgrp.c | 12 +- + fs/gfs2/rgrp.h | 5 +- + fs/gfs2/super.c | 2 +- + fs/gfs2/xattr.c | 2 +- + fs/hugetlbfs/inode.c | 13 +- + fs/jbd2/journal.c | 3 +- + fs/kernel_read_file.c | 38 +- + fs/mbcache.c | 2 +- + fs/nfs/nfs42xattr.c | 7 +- + fs/nfs/super.c | 2 +- + fs/nfsd/filecache.c | 2 +- + fs/nfsd/nfscache.c | 3 +- + fs/ocfs2/dlmfs/dlmfs.c | 14 +- + fs/ocfs2/heartbeat.c | 27 +- + fs/ocfs2/quota_global.c | 2 +- + fs/proc/array.c | 5 +- + fs/proc/base.c | 46 +- + fs/proc/inode.c | 19 +- + fs/proc/kmsg.c | 1 - + fs/proc/nommu.c | 1 - + fs/proc/proc_net.c | 9 +- + fs/proc/proc_tty.c | 2 - + fs/proc/root.c | 8 +- + fs/proc/task_mmu.c | 7 +- + fs/proc/vmcore.c | 1 - + fs/quota/dquot.c | 2 +- + fs/remap_range.c | 31 +- + fs/squashfs/Makefile | 4 +- + fs/squashfs/block.c | 10 +- + fs/squashfs/decompressor.h | 1 + + fs/squashfs/file.c | 133 +- + fs/squashfs/file_direct.c | 90 +- + fs/squashfs/lz4_wrapper.c | 7 +- + fs/squashfs/lzo_wrapper.c | 7 +- + fs/squashfs/page_actor.c | 55 +- + fs/squashfs/page_actor.h | 57 +- + fs/squashfs/super.c | 33 - + fs/squashfs/xz_wrapper.c | 11 +- + fs/squashfs/zlib_wrapper.c | 12 +- + fs/squashfs/zstd_wrapper.c | 12 +- + fs/super.c | 6 +- + fs/ubifs/super.c | 2 +- + fs/userfaultfd.c | 6 +- + fs/xfs/Makefile | 5 + + fs/xfs/xfs_buf.c | 13 +- + fs/xfs/xfs_file.c | 35 +- + fs/xfs/xfs_fsops.c | 3 + + fs/xfs/xfs_icache.c | 2 +- + fs/xfs/xfs_inode.c | 69 +- + fs/xfs/xfs_inode.h | 1 + + fs/xfs/xfs_iomap.c | 30 +- + fs/xfs/xfs_iomap.h | 1 + + fs/xfs/xfs_mount.h | 1 + + fs/xfs/xfs_notify_failure.c | 226 + + fs/xfs/xfs_qm.c | 3 +- + fs/xfs/xfs_reflink.c | 12 +- + fs/xfs/xfs_super.c | 6 +- + fs/xfs/xfs_super.h | 1 + + include/asm-generic/io.h | 105 +- + include/asm-generic/softirq_stack.h | 2 +- + include/dt-bindings/sound/qcom,wcd9335.h | 15 + + include/linux/acpi.h | 6 + + include/linux/acpi_iort.h | 14 +- + include/linux/amd-iommu.h | 4 + + include/linux/backing-dev-defs.h | 7 - + include/linux/backing-dev.h | 23 - + include/linux/compiler-gcc.h | 11 - + include/linux/cpumask.h | 108 +- + include/linux/damon.h | 25 +- + include/linux/dax.h | 56 +- + include/linux/dm-bufio.h | 8 +- + include/linux/dma-map-ops.h | 64 + + include/linux/dma-mapping.h | 10 + + include/linux/dmar.h | 6 +- + include/linux/firmware/cirrus/cs_dsp.h | 77 +- + include/linux/fs.h | 12 +- + include/linux/highmem.h | 23 +- + include/linux/hmm.h | 4 +- + include/linux/huge_mm.h | 94 +- + include/linux/hugetlb.h | 28 +- + include/linux/io-pgtable.h | 15 +- + include/linux/iommu.h | 27 +- + include/linux/iova.h | 2 + + include/linux/kernel_read_file.h | 32 +- + include/linux/kfifo.h | 2 +- + include/linux/khugepaged.h | 30 - + include/linux/kmemleak.h | 8 +- + include/linux/limits.h | 1 + + include/linux/mdev.h | 5 - + include/linux/memcontrol.h | 74 +- + include/linux/memory_hotplug.h | 9 - + include/linux/memremap.h | 35 +- + include/linux/mfd/ipaq-micro.h | 4 +- + include/linux/mfd/max77714.h | 2 +- + include/linux/mfd/mt6331/core.h | 40 + + include/linux/mfd/mt6331/registers.h | 584 + + include/linux/mfd/mt6332/core.h | 65 + + include/linux/mfd/mt6332/registers.h | 642 + + include/linux/mfd/mt6357/core.h | 119 + + include/linux/mfd/mt6357/registers.h | 1574 ++ + include/linux/mfd/mt6397/core.h | 3 + + include/linux/mfd/t7l66xb.h | 1 - + include/linux/mfd/tc6387xb.h | 1 - + include/linux/mfd/tc6393xb.h | 2 +- + include/linux/mfd/twl.h | 55 - + include/linux/migrate.h | 1 + + include/linux/mm.h | 136 +- + include/linux/mm_types.h | 7 + + include/linux/mmu_notifier.h | 2 +- + include/linux/mmzone.h | 159 +- + include/linux/mtd/hyperbus.h | 4 +- + include/linux/mtd/spi-nor.h | 4 +- + include/linux/mtd/spinand.h | 1 + + include/linux/net.h | 2 - + include/linux/nmi.h | 2 + + include/linux/once.h | 2 - + include/linux/page-flags.h | 23 + + include/linux/pagemap.h | 2 - + include/linux/pagevec.h | 1 - + include/linux/pci-p2pdma.h | 27 - + include/linux/pgtable.h | 28 + + include/linux/platform_data/cros_ec_commands.h | 2 + + include/linux/platform_data/cros_ec_proto.h | 1 + + include/linux/platform_data/video-imxfb.h | 70 - + include/linux/rbtree.h | 2 +- + include/linux/rmap.h | 4 +- + include/linux/rv.h | 70 + + include/linux/scatterlist.h | 69 + + include/linux/sched.h | 13 +- + include/linux/sched/mm.h | 4 +- + include/linux/shmem_fs.h | 11 + + include/linux/shrinker.h | 33 +- + include/linux/soundwire/sdw_intel.h | 3 + + include/linux/swap.h | 12 +- + include/linux/swapops.h | 12 +- + include/linux/swiotlb.h | 17 +- + include/linux/tboot.h | 2 - + include/linux/tpm_eventlog.h | 2 +- + include/linux/trace_events.h | 18 + + include/linux/tracepoint.h | 2 +- + include/linux/vfio.h | 106 +- + include/linux/vfio_pci_core.h | 65 +- + include/net/9p/client.h | 49 +- + include/rdma/ib_verbs.h | 11 + + include/rv/automata.h | 75 + + include/rv/da_monitor.h | 544 + + include/rv/instrumentation.h | 29 + + include/scsi/scsi_host.h | 1 + + include/sound/control.h | 4 +- + include/sound/core.h | 14 + + include/sound/cs35l41.h | 7 + + include/sound/dmaengine_pcm.h | 2 + + include/sound/hda_codec.h | 1 - + include/sound/hdaudio.h | 1 + + include/sound/hdmi-codec.h | 4 +- + include/sound/madera-pdata.h | 2 +- + include/sound/pcm.h | 71 +- + include/sound/rawmidi.h | 6 +- + include/sound/simple_card_utils.h | 5 +- + include/sound/soc-acpi-intel-match.h | 2 + + include/sound/soc-card.h | 1 + + include/sound/soc-component.h | 7 +- + include/sound/soc-dai.h | 6 + + include/sound/soc.h | 15 +- + include/sound/sof.h | 1 + + include/sound/sof/dai-amd.h | 7 + + include/sound/sof/dai-intel.h | 2 + + include/sound/sof/dai.h | 2 +- + include/sound/sof/ipc4/header.h | 8 + + include/sound/sof/stream.h | 6 +- + include/trace/events/9p.h | 48 + + include/trace/events/devlink.h | 7 +- + include/trace/events/fib.h | 6 +- + include/trace/events/fib6.h | 8 +- + include/trace/events/iscsi.h | 4 +- + include/trace/events/neigh.h | 2 +- + include/trace/events/qla.h | 4 +- + include/trace/events/rv.h | 142 + + include/trace/events/rwmmio.h | 97 + + include/trace/stages/stage1_struct_define.h | 3 + + include/trace/stages/stage2_data_offsets.h | 3 + + include/trace/stages/stage4_event_fields.h | 11 +- + include/trace/stages/stage5_get_offsets.h | 4 + + include/trace/stages/stage6_event_callback.h | 12 + + include/uapi/linux/elf.h | 1 + + include/uapi/linux/swab.h | 6 +- + include/uapi/mtd/mtd-abi.h | 4 +- + include/uapi/sound/compress_offload.h | 2 +- + include/uapi/sound/compress_params.h | 6 +- + include/uapi/sound/sof/abi.h | 4 +- + include/uapi/sound/sof/header.h | 30 + + include/uapi/sound/sof/tokens.h | 44 + + init/version.c | 17 + + ipc/mqueue.c | 2 +- + kernel/cgroup/cpuset.c | 2 +- + kernel/crash_core.c | 28 +- + kernel/dma/direct.c | 43 +- + kernel/dma/direct.h | 8 +- + kernel/dma/mapping.c | 47 +- + kernel/dma/swiotlb.c | 263 +- + kernel/events/core.c | 2 +- + kernel/exit.c | 2 +- + kernel/fork.c | 14 + + kernel/hung_task.c | 2 +- + kernel/kallsyms.c | 23 +- + kernel/kallsyms_internal.h | 30 + + kernel/kexec_file.c | 10 +- + kernel/kprobes.c | 3 +- + kernel/profile.c | 15 +- + kernel/rcu/tree.c | 2 +- + kernel/sched/core.c | 16 +- + kernel/sched/sched.h | 7 +- + kernel/trace/Kconfig | 2 + + kernel/trace/Makefile | 1 + + kernel/trace/rv/Kconfig | 78 + + kernel/trace/rv/Makefile | 8 + + kernel/trace/rv/monitors/wip/wip.c | 88 + + kernel/trace/rv/monitors/wip/wip.h | 46 + + kernel/trace/rv/monitors/wwnr/wwnr.c | 87 + + kernel/trace/rv/monitors/wwnr/wwnr.h | 46 + + kernel/trace/rv/reactor_panic.c | 43 + + kernel/trace/rv/reactor_printk.c | 42 + + kernel/trace/rv/rv.c | 799 + + kernel/trace/rv/rv.h | 68 + + kernel/trace/rv/rv_reactors.c | 510 + + kernel/trace/trace.c | 35 +- + kernel/trace/trace.h | 9 + + kernel/trace/trace_dynevent.c | 2 +- + kernel/trace/trace_eprobe.c | 37 +- + kernel/trace/trace_events_hist.c | 5 +- + kernel/trace/trace_events_user.c | 2 +- + kernel/trace/trace_kprobe.c | 16 +- + kernel/trace/trace_probe.c | 4 + + kernel/trace/trace_probe.h | 5 +- + kernel/trace/trace_uprobe.c | 12 +- + kernel/watchdog.c | 21 +- + lib/Kconfig | 16 +- + lib/Kconfig.debug | 17 + + lib/Makefile | 6 +- + lib/btree.c | 30 +- + lib/cpumask.c | 2 + + lib/devres.c | 15 +- + lib/error-inject.c | 28 +- + lib/flex_proportions.c | 10 +- + lib/list_debug.c | 12 +- + lib/livepatch/test_klp_callbacks_busy.c | 8 + + lib/lru_cache.c | 4 +- + lib/lz4/lz4_decompress.c | 6 +- + lib/lzo/lzo1x_compress.c | 6 +- + lib/mpi/mpiutil.c | 2 +- + lib/radix-tree.c | 4 +- + lib/scatterlist.c | 4 +- + lib/smp_processor_id.c | 2 +- + lib/stackdepot.c | 59 +- + lib/test_cpumask.c | 138 + + lib/test_free_pages.c | 2 +- + lib/test_hmm.c | 347 +- + lib/test_hmm_uapi.h | 19 +- + lib/test_printf.c | 21 +- + lib/test_vmalloc.c | 15 +- + lib/trace_readwrite.c | 47 + + lib/ts_bm.c | 2 +- + mm/Kconfig | 15 +- + mm/Makefile | 1 + + mm/cma_debug.c | 2 +- + mm/compaction.c | 5 +- + mm/damon/Kconfig | 8 + + mm/damon/Makefile | 1 + + mm/damon/dbgfs.c | 79 +- + mm/damon/lru_sort.c | 548 + + mm/damon/ops-common.c | 42 + + mm/damon/ops-common.h | 2 + + mm/damon/paddr.c | 60 +- + mm/damon/reclaim.c | 44 +- + mm/damon/sysfs.c | 69 +- + mm/debug_vm_pgtable.c | 2 +- + mm/filemap.c | 18 +- + mm/frontswap.c | 2 +- + mm/gup.c | 90 +- + mm/gup_test.c | 2 +- + mm/highmem.c | 2 +- + mm/huge_memory.c | 186 +- + mm/hugetlb.c | 169 +- + mm/hugetlb_cgroup.c | 1 + + mm/hugetlb_vmemmap.c | 68 +- + mm/internal.h | 19 + + mm/kasan/common.c | 8 +- + mm/kasan/hw_tags.c | 32 +- + mm/kasan/kasan.h | 3 +- + mm/kasan/report.c | 12 +- + mm/kasan/shadow.c | 29 +- + mm/kfence/core.c | 4 +- + mm/khugepaged.c | 230 +- + mm/kmemleak.c | 260 +- + mm/ksm.c | 10 +- + mm/list_lru.c | 2 +- + mm/madvise.c | 14 +- + mm/memblock.c | 28 +- + mm/memcontrol.c | 224 +- + mm/memory-failure.c | 330 +- + mm/memory.c | 27 +- + mm/memory_hotplug.c | 57 +- + mm/mempolicy.c | 10 +- + mm/mempool.c | 2 +- + mm/memremap.c | 16 +- + mm/migrate.c | 43 +- + mm/migrate_device.c | 80 +- + mm/mlock.c | 2 +- + mm/mmap.c | 53 +- + mm/mprotect.c | 81 +- + mm/nommu.c | 2 +- + mm/page_alloc.c | 439 +- + mm/page_vma_mapped.c | 5 +- + mm/percpu.c | 6 +- + mm/rmap.c | 114 +- + mm/shmem.c | 78 +- + mm/shrinker_debug.c | 286 + + mm/slab.c | 10 - + mm/sparse-vmemmap.c | 10 +- + mm/sparse.c | 2 +- + mm/swap.c | 599 +- + mm/swap.h | 19 +- + mm/swap_state.c | 56 +- + mm/swapfile.c | 31 +- + mm/util.c | 2 +- + mm/vmalloc.c | 148 +- + mm/vmscan.c | 332 +- + mm/workingset.c | 2 +- + mm/zsmalloc.c | 16 +- + net/9p/client.c | 168 +- + net/9p/trans_fd.c | 13 +- + net/9p/trans_rdma.c | 2 +- + net/9p/trans_virtio.c | 4 +- + net/9p/trans_xen.c | 2 +- + net/batman-adv/trace.h | 9 +- + net/core/net_namespace.c | 7 + + net/core/page_pool.c | 2 +- + net/mac80211/trace_msg.h | 6 +- + net/sunrpc/auth.c | 2 +- + samples/trace_events/trace-events-sample.c | 14 +- + samples/trace_events/trace-events-sample.h | 32 +- + scripts/bloat-o-meter | 47 +- + scripts/checkpatch.pl | 5 +- + scripts/faddr2line | 7 +- + scripts/gdb/linux/dmesg.py | 9 +- + scripts/gdb/linux/utils.py | 14 +- + scripts/gdb/vmlinux-gdb.py | 2 +- + scripts/remove-stale-files | 2 + + scripts/sign-file.c | 2 +- + scripts/tracing/draw_functrace.py | 2 +- + sound/ac97/bus.c | 2 +- + sound/aoa/soundbus/sysfs.c | 22 +- + sound/core/Kconfig | 37 +- + sound/core/compress_offload.c | 9 +- + sound/core/control.c | 290 +- + sound/core/control_led.c | 29 +- + sound/core/device.c | 2 + + sound/core/info.c | 2 + + sound/core/init.c | 18 +- + sound/core/isadma.c | 3 +- + sound/core/memalloc.c | 10 +- + sound/core/misc.c | 94 + + sound/core/pcm.c | 7 +- + sound/core/pcm_dmaengine.c | 30 +- + sound/core/pcm_lib.c | 2 +- + sound/core/pcm_memory.c | 4 + + sound/core/pcm_native.c | 8 +- + sound/core/rawmidi.c | 274 +- + sound/core/timer.c | 11 +- + sound/core/vmaster.c | 3 +- + sound/hda/ext/hdac_ext_controller.c | 7 - + sound/hda/hdac_bus.c | 2 +- + sound/hda/hdac_controller.c | 7 +- + sound/hda/hdac_sysfs.c | 42 +- + sound/hda/intel-dsp-config.c | 5 + + sound/hda/trace.h | 41 +- + sound/isa/wavefront/wavefront_synth.c | 2 - + sound/pci/asihpi/hpi6000.c | 2 +- + sound/pci/asihpi/hpi6205.c | 2 +- + sound/pci/emu10k1/memory.c | 2 +- + sound/pci/ens1370.c | 2 +- + sound/pci/hda/Kconfig | 12 +- + sound/pci/hda/Makefile | 2 + + sound/pci/hda/cs35l41_hda.c | 958 +- + sound/pci/hda/cs35l41_hda.h | 39 + + sound/pci/hda/cs35l41_hda_i2c.c | 19 +- + sound/pci/hda/cs35l41_hda_spi.c | 16 +- + sound/pci/hda/hda_bind.c | 7 + + sound/pci/hda/hda_codec.c | 41 +- + sound/pci/hda/hda_component.h | 3 + + sound/pci/hda/hda_cs_dsp_ctl.c | 240 + + sound/pci/hda/hda_cs_dsp_ctl.h | 39 + + sound/pci/hda/hda_sysfs.c | 23 +- + sound/pci/hda/patch_cs8409-tables.c | 6 +- + sound/pci/hda/patch_cs8409.h | 2 - + sound/pci/hda/patch_realtek.c | 152 +- + sound/soc/Makefile | 4 +- + sound/soc/adi/axi-i2s.c | 1 + + sound/soc/adi/axi-spdif.c | 1 + + sound/soc/amd/Kconfig | 22 + + sound/soc/amd/Makefile | 3 + + sound/soc/amd/acp-config.c | 30 + + sound/soc/amd/acp-es8336.c | 318 + + sound/soc/amd/acp-pcm-dma.c | 50 +- + sound/soc/amd/acp.h | 13 + + sound/soc/amd/acp/Kconfig | 12 + + sound/soc/amd/acp/Makefile | 2 + + sound/soc/amd/acp/acp-i2s.c | 169 +- + sound/soc/amd/acp/acp-legacy-mach.c | 32 + + sound/soc/amd/acp/acp-mach-common.c | 301 +- + sound/soc/amd/acp/acp-mach.h | 9 + + sound/soc/amd/acp/acp-pci.c | 35 +- + sound/soc/amd/acp/acp-pdm.c | 10 +- + sound/soc/amd/acp/acp-platform.c | 55 +- + sound/soc/amd/acp/acp-rembrandt.c | 401 + + sound/soc/amd/acp/acp-renoir.c | 48 +- + sound/soc/amd/acp/acp-sof-mach.c | 30 + + sound/soc/amd/acp/amd.h | 86 +- + sound/soc/amd/acp/chip_offset_byte.h | 40 +- + sound/soc/amd/mach-config.h | 1 + + sound/soc/amd/raven/acp3x-i2s.c | 3 +- + sound/soc/amd/renoir/acp3x-pdm-dma.c | 13 +- + sound/soc/amd/rpl/Makefile | 5 + + sound/soc/amd/rpl/rpl-pci-acp6x.c | 227 + + sound/soc/amd/rpl/rpl_acp6x.h | 36 + + sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h | 30 + + sound/soc/amd/vangogh/acp5x-i2s.c | 5 +- + sound/soc/amd/vangogh/acp5x-mach.c | 3 +- + sound/soc/amd/yc/acp6x-mach.c | 32 +- + sound/soc/amd/yc/acp6x-pdm-dma.c | 13 +- + sound/soc/amd/yc/pci-acp6x.c | 2 +- + sound/soc/atmel/atmel-classd.c | 1 + + sound/soc/atmel/atmel-i2s.c | 7 +- + sound/soc/atmel/atmel-pdmic.c | 1 + + sound/soc/atmel/atmel_ssc_dai.c | 30 +- + sound/soc/atmel/mchp-i2s-mcc.c | 11 +- + sound/soc/atmel/mchp-pdmc.c | 7 +- + sound/soc/atmel/mchp-spdifrx.c | 22 +- + sound/soc/atmel/mchp-spdiftx.c | 25 +- + sound/soc/atmel/mikroe-proto.c | 4 +- + sound/soc/au1x/ac97c.c | 3 +- + sound/soc/au1x/i2sc.c | 5 +- + sound/soc/au1x/psc-ac97.c | 3 +- + sound/soc/au1x/psc-i2s.c | 7 +- + sound/soc/bcm/bcm2835-i2s.c | 23 +- + sound/soc/bcm/bcm63xx-i2s-whistler.c | 1 + + sound/soc/bcm/cygnus-ssp.c | 11 +- + sound/soc/cirrus/ep93xx-ac97.c | 3 +- + sound/soc/cirrus/ep93xx-i2s.c | 11 +- + sound/soc/codecs/88pm860x-codec.c | 1 - + sound/soc/codecs/Kconfig | 28 + + sound/soc/codecs/Makefile | 6 + + sound/soc/codecs/ab8500-codec.c | 3 - + sound/soc/codecs/ab8500-codec.h | 2 - + sound/soc/codecs/ac97.c | 1 - + sound/soc/codecs/ad1836.c | 1 - + sound/soc/codecs/ad193x.c | 1 - + sound/soc/codecs/ad1980.c | 1 - + sound/soc/codecs/ad73311.c | 1 - + sound/soc/codecs/adau1373.c | 1 - + sound/soc/codecs/adau1701.c | 1 - + sound/soc/codecs/adau1761.c | 1 - + sound/soc/codecs/adau1781.c | 1 - + sound/soc/codecs/adau1977.c | 1 - + sound/soc/codecs/adau7002.c | 1 - + sound/soc/codecs/adau7118.c | 1 - + sound/soc/codecs/adav80x.c | 1 - + sound/soc/codecs/ads117x.c | 1 - + sound/soc/codecs/ak4104.c | 1 - + sound/soc/codecs/ak4118.c | 1 - + sound/soc/codecs/ak4375.c | 1 - + sound/soc/codecs/ak4458.c | 2 - + sound/soc/codecs/ak4535.c | 1 - + sound/soc/codecs/ak4554.c | 1 - + sound/soc/codecs/ak4613.c | 7 - + sound/soc/codecs/ak4641.c | 1 - + sound/soc/codecs/ak4642.c | 1 - + sound/soc/codecs/ak4671.c | 1 - + sound/soc/codecs/ak5386.c | 1 - + sound/soc/codecs/ak5558.c | 2 - + sound/soc/codecs/alc5623.c | 1 - + sound/soc/codecs/alc5632.c | 1 - + sound/soc/codecs/bd28623.c | 1 - + sound/soc/codecs/bt-sco.c | 1 - + sound/soc/codecs/cpcap.c | 1 - + sound/soc/codecs/cq93vc.c | 1 - + sound/soc/codecs/cros_ec_codec.c | 1 + + sound/soc/codecs/cs35l32.c | 1 - + sound/soc/codecs/cs35l33.c | 1 - + sound/soc/codecs/cs35l34.c | 1 - + sound/soc/codecs/cs35l35.c | 1 - + sound/soc/codecs/cs35l36.c | 1 - + sound/soc/codecs/cs35l41-lib.c | 82 +- + sound/soc/codecs/cs35l41-spi.c | 1 + + sound/soc/codecs/cs35l41.c | 101 +- + sound/soc/codecs/cs35l45-i2c.c | 4 +- + sound/soc/codecs/cs35l45.c | 6 +- + sound/soc/codecs/cs35l45.h | 4 +- + sound/soc/codecs/cs4234.c | 1 - + sound/soc/codecs/cs4265.c | 1 - + sound/soc/codecs/cs4270.c | 2 - + sound/soc/codecs/cs4271.c | 1 - + sound/soc/codecs/cs42l42.c | 4 +- + sound/soc/codecs/cs42l51.c | 1 - + sound/soc/codecs/cs42l52.c | 1 - + sound/soc/codecs/cs42l56.c | 1 - + sound/soc/codecs/cs42l73.c | 1 - + sound/soc/codecs/cs42xx8.c | 1 - + sound/soc/codecs/cs43130.c | 1 - + sound/soc/codecs/cs4341.c | 1 - + sound/soc/codecs/cs4349.c | 1 - + sound/soc/codecs/cs47l15.c | 1 - + sound/soc/codecs/cs47l24.c | 1 - + sound/soc/codecs/cs47l35.c | 1 - + sound/soc/codecs/cs47l85.c | 1 - + sound/soc/codecs/cs47l90.c | 1 - + sound/soc/codecs/cs47l92.c | 1 - + sound/soc/codecs/cs53l30.c | 1 - + sound/soc/codecs/cx20442.c | 1 - + sound/soc/codecs/cx2072x.c | 17 +- + sound/soc/codecs/da7210.c | 3 +- + sound/soc/codecs/da7213.c | 1 - + sound/soc/codecs/da7218.c | 1 - + sound/soc/codecs/da7219.c | 7 - + sound/soc/codecs/da732x.c | 7 - + sound/soc/codecs/da9055.c | 1 - + sound/soc/codecs/dmic.c | 1 - + sound/soc/codecs/es7134.c | 1 - + sound/soc/codecs/es7241.c | 1 - + sound/soc/codecs/es8316.c | 21 +- + sound/soc/codecs/es8328.c | 1 - + sound/soc/codecs/gtm601.c | 1 - + sound/soc/codecs/hda-dai.c | 102 + + sound/soc/codecs/hda.c | 395 + + sound/soc/codecs/hda.h | 19 + + sound/soc/codecs/hdac_hdmi.c | 1 - + sound/soc/codecs/hdmi-codec.c | 19 +- + sound/soc/codecs/ics43432.c | 1 - + sound/soc/codecs/inno_rk3036.c | 1 - + sound/soc/codecs/isabelle.c | 1 - + sound/soc/codecs/jz4740.c | 2 - + sound/soc/codecs/lm49453.c | 7 - + sound/soc/codecs/lochnagar-sc.c | 1 - + sound/soc/codecs/lpass-va-macro.c | 11 +- + sound/soc/codecs/max98088.c | 33 +- + sound/soc/codecs/max98090.c | 13 +- + sound/soc/codecs/max98095.c | 1 - + sound/soc/codecs/max98357a.c | 1 - + sound/soc/codecs/max98371.c | 1 - + sound/soc/codecs/max98373-i2c.c | 1 - + sound/soc/codecs/max98373.c | 16 +- + sound/soc/codecs/max98390.c | 3 +- + sound/soc/codecs/max98396.c | 271 +- + sound/soc/codecs/max98396.h | 10 +- + sound/soc/codecs/max9850.c | 1 - + sound/soc/codecs/max98520.c | 1 - + sound/soc/codecs/max9860.c | 7 +- + sound/soc/codecs/max9867.c | 1 - + sound/soc/codecs/max98925.c | 1 - + sound/soc/codecs/max98926.c | 1 - + sound/soc/codecs/max98927.c | 1 - + sound/soc/codecs/mc13783.c | 1 - + sound/soc/codecs/ml26124.c | 1 - + sound/soc/codecs/msm8916-wcd-analog.c | 1 - + sound/soc/codecs/msm8916-wcd-digital.c | 47 +- + sound/soc/codecs/mt6358.c | 1 + + sound/soc/codecs/mt6359-accdet.c | 1 + + sound/soc/codecs/mt6359.c | 1 + + sound/soc/codecs/nau8315.c | 1 - + sound/soc/codecs/nau8540.c | 1 - + sound/soc/codecs/nau8810.c | 1 - + sound/soc/codecs/nau8821.c | 76 +- + sound/soc/codecs/nau8821.h | 1 + + sound/soc/codecs/nau8822.c | 15 +- + sound/soc/codecs/nau8822.h | 2 + + sound/soc/codecs/nau8824.c | 1 - + sound/soc/codecs/nau8825.c | 3 +- + sound/soc/codecs/pcm1681.c | 1 - + sound/soc/codecs/pcm1789.c | 1 - + sound/soc/codecs/pcm179x.c | 1 - + sound/soc/codecs/pcm186x.c | 2 - + sound/soc/codecs/pcm3008.c | 1 - + sound/soc/codecs/pcm3168a.c | 1 - + sound/soc/codecs/pcm5102a.c | 1 - + sound/soc/codecs/pcm512x.c | 1 - + sound/soc/codecs/rk3328_codec.c | 6 +- + sound/soc/codecs/rk817_codec.c | 1 - + sound/soc/codecs/rt1011.c | 1 - + sound/soc/codecs/rt1015.c | 1 - + sound/soc/codecs/rt1015p.c | 1 - + sound/soc/codecs/rt1016.c | 1 - + sound/soc/codecs/rt1019.c | 1 - + sound/soc/codecs/rt1305.c | 1 - + sound/soc/codecs/rt1308-sdw.c | 12 + + sound/soc/codecs/rt1308.c | 1 - + sound/soc/codecs/rt1316-sdw.c | 12 + + sound/soc/codecs/rt274.c | 11 +- + sound/soc/codecs/rt286.c | 19 +- + sound/soc/codecs/rt286.h | 2 - + sound/soc/codecs/rt298.c | 61 +- + sound/soc/codecs/rt298.h | 2 - + sound/soc/codecs/rt5514.c | 1 - + sound/soc/codecs/rt5616.c | 1 - + sound/soc/codecs/rt5631.c | 1 - + sound/soc/codecs/rt5640.c | 13 +- + sound/soc/codecs/rt5645.c | 1 - + sound/soc/codecs/rt5651.c | 1 - + sound/soc/codecs/rt5659.c | 1 - + sound/soc/codecs/rt5660.c | 1 - + sound/soc/codecs/rt5663.c | 1 - + sound/soc/codecs/rt5665.c | 1 - + sound/soc/codecs/rt5668.c | 1 - + sound/soc/codecs/rt5670.c | 1 - + sound/soc/codecs/rt5677.c | 1 - + sound/soc/codecs/rt5682.c | 1 - + sound/soc/codecs/rt5682s.c | 1 - + sound/soc/codecs/rt700.c | 5 + + sound/soc/codecs/rt711-sdca.c | 5 + + sound/soc/codecs/rt711.c | 5 + + sound/soc/codecs/rt715-sdca.c | 12 + + sound/soc/codecs/rt715.c | 12 + + sound/soc/codecs/sgtl5000.c | 1 - + sound/soc/codecs/si476x.c | 1 - + sound/soc/codecs/spdif_receiver.c | 1 - + sound/soc/codecs/spdif_transmitter.c | 1 - + sound/soc/codecs/ssm2518.c | 5 +- + sound/soc/codecs/ssm2602.c | 7 +- + sound/soc/codecs/ssm4567.c | 5 +- + sound/soc/codecs/sta32x.c | 5 +- + sound/soc/codecs/sta350.c | 5 +- + sound/soc/codecs/sta529.c | 1 - + sound/soc/codecs/stac9766.c | 2 - + sound/soc/codecs/sti-sas.c | 7 +- + sound/soc/codecs/tas2552.c | 13 +- + sound/soc/codecs/tas2562.c | 2 - + sound/soc/codecs/tas2764.c | 1 - + sound/soc/codecs/tas2770.c | 7 +- + sound/soc/codecs/tas2780.c | 663 + + sound/soc/codecs/tas2780.h | 101 + + sound/soc/codecs/tas5086.c | 3 +- + sound/soc/codecs/tas571x.c | 1 - + sound/soc/codecs/tas5720.c | 6 +- + sound/soc/codecs/tas5805m.c | 1 - + sound/soc/codecs/tas6424.c | 7 +- + sound/soc/codecs/tfa9879.c | 5 +- + sound/soc/codecs/tfa989x.c | 31 +- + sound/soc/codecs/tlv320adc3xxx.c | 3 +- + sound/soc/codecs/tlv320adcx140.c | 11 +- + sound/soc/codecs/tlv320aic23.c | 8 +- + sound/soc/codecs/tlv320aic26.c | 16 +- + sound/soc/codecs/tlv320aic31xx.c | 20 +- + sound/soc/codecs/tlv320aic32x4.c | 11 +- + sound/soc/codecs/tlv320aic3x.c | 12 +- + sound/soc/codecs/tlv320dac33.c | 13 +- + sound/soc/codecs/tscs42xx.c | 1 - + sound/soc/codecs/twl4030.c | 102 +- + sound/soc/codecs/twl6040.c | 1 - + sound/soc/codecs/uda1334.c | 3 +- + sound/soc/codecs/uda134x.c | 1 - + sound/soc/codecs/uda1380.c | 1 - + sound/soc/codecs/wcd-mbhc-v2.c | 12 +- + sound/soc/codecs/wcd9335.c | 98 +- + sound/soc/codecs/wl1273.c | 1 - + sound/soc/codecs/wm0010.c | 1 - + sound/soc/codecs/wm1250-ev1.c | 1 - + sound/soc/codecs/wm2000.c | 1 - + sound/soc/codecs/wm2200.c | 1 - + sound/soc/codecs/wm5100.c | 1 - + sound/soc/codecs/wm5102.c | 1 - + sound/soc/codecs/wm5110.c | 1 - + sound/soc/codecs/wm8350.c | 1 - + sound/soc/codecs/wm8400.c | 1 - + sound/soc/codecs/wm8510.c | 1 - + sound/soc/codecs/wm8523.c | 1 - + sound/soc/codecs/wm8524.c | 1 - + sound/soc/codecs/wm8580.c | 1 - + sound/soc/codecs/wm8711.c | 1 - + sound/soc/codecs/wm8727.c | 1 - + sound/soc/codecs/wm8728.c | 1 - + sound/soc/codecs/wm8731.c | 1 - + sound/soc/codecs/wm8737.c | 1 - + sound/soc/codecs/wm8741.c | 1 - + sound/soc/codecs/wm8750.c | 1 - + sound/soc/codecs/wm8753.c | 1 - + sound/soc/codecs/wm8770.c | 1 - + sound/soc/codecs/wm8776.c | 1 - + sound/soc/codecs/wm8782.c | 1 - + sound/soc/codecs/wm8804.c | 1 - + sound/soc/codecs/wm8900.c | 1 - + sound/soc/codecs/wm8903.c | 1 - + sound/soc/codecs/wm8904.c | 1 - + sound/soc/codecs/wm8940.c | 1 - + sound/soc/codecs/wm8955.c | 1 - + sound/soc/codecs/wm8960.c | 1 - + sound/soc/codecs/wm8961.c | 1 - + sound/soc/codecs/wm8962.c | 1 - + sound/soc/codecs/wm8971.c | 1 - + sound/soc/codecs/wm8974.c | 1 - + sound/soc/codecs/wm8978.c | 1 - + sound/soc/codecs/wm8983.c | 1 - + sound/soc/codecs/wm8985.c | 1 - + sound/soc/codecs/wm8988.c | 1 - + sound/soc/codecs/wm8990.c | 1 - + sound/soc/codecs/wm8991.c | 1 - + sound/soc/codecs/wm8993.c | 1 - + sound/soc/codecs/wm8994.c | 1 - + sound/soc/codecs/wm8995.c | 1 - + sound/soc/codecs/wm8996.c | 2 - + sound/soc/codecs/wm8997.c | 1 - + sound/soc/codecs/wm8998.c | 1 - + sound/soc/codecs/wm9081.c | 1 - + sound/soc/codecs/wm9090.c | 1 - + sound/soc/codecs/wm9705.c | 1 - + sound/soc/codecs/wm9712.c | 1 - + sound/soc/codecs/wm9713.c | 1 - + sound/soc/codecs/wm_adsp.c | 25 +- + sound/soc/codecs/wsa881x.c | 16 +- + sound/soc/codecs/wsa883x.c | 1511 ++ + sound/soc/codecs/zl38060.c | 1 - + sound/soc/dwc/dwc-i2s.c | 15 +- + sound/soc/fsl/Kconfig | 3 + + sound/soc/fsl/fsl-asoc-card.c | 5 +- + sound/soc/fsl/fsl_asrc.c | 6 +- + sound/soc/fsl/fsl_asrc_dma.c | 19 +- + sound/soc/fsl/fsl_aud2htx.c | 3 +- + sound/soc/fsl/fsl_audmix.c | 6 +- + sound/soc/fsl/fsl_easrc.c | 16 +- + sound/soc/fsl/fsl_easrc.h | 2 +- + sound/soc/fsl/fsl_esai.c | 11 +- + sound/soc/fsl/fsl_micfil.c | 55 +- + sound/soc/fsl/fsl_micfil.h | 9 + + sound/soc/fsl/fsl_mqs.c | 136 +- + sound/soc/fsl/fsl_rpmsg.c | 3 +- + sound/soc/fsl/fsl_sai.c | 375 +- + sound/soc/fsl/fsl_sai.h | 28 +- + sound/soc/fsl/fsl_spdif.c | 51 +- + sound/soc/fsl/fsl_ssi.c | 23 +- + sound/soc/fsl/fsl_utils.c | 69 + + sound/soc/fsl/fsl_utils.h | 7 + + sound/soc/fsl/fsl_xcvr.c | 12 +- + sound/soc/fsl/imx-audmix.c | 4 +- + sound/soc/fsl/imx-audmux.c | 24 +- + sound/soc/fsl/imx-card.c | 24 +- + sound/soc/fsl/mpc5200_psc_i2s.c | 3 +- + sound/soc/fsl/pcm030-audio-fabric.c | 8 +- + sound/soc/generic/audio-graph-card.c | 4 +- + .../generic/audio-graph-card2-custom-sample.dtsi | 101 +- + sound/soc/generic/audio-graph-card2.c | 78 +- + sound/soc/generic/simple-card-utils.c | 44 +- + sound/soc/generic/test-component.c | 20 +- + sound/soc/hisilicon/hi6210-i2s.c | 19 +- + sound/soc/img/img-i2s-in.c | 7 +- + sound/soc/img/img-i2s-out.c | 21 +- + sound/soc/img/img-parallel-out.c | 3 +- + sound/soc/img/img-spdif-in.c | 3 +- + sound/soc/img/img-spdif-out.c | 3 +- + sound/soc/img/pistachio-internal-dac.c | 1 - + sound/soc/intel/Kconfig | 5 +- + sound/soc/intel/atom/sst-atom-controls.c | 8 +- + sound/soc/intel/atom/sst/sst.c | 2 +- + sound/soc/intel/atom/sst/sst_ipc.c | 8 +- + sound/soc/intel/avs/Makefile | 3 + + sound/soc/intel/avs/boards/Kconfig | 121 + + sound/soc/intel/avs/boards/Makefile | 27 + + sound/soc/intel/avs/boards/da7219.c | 282 + + sound/soc/intel/avs/boards/dmic.c | 93 + + sound/soc/intel/avs/boards/hdaudio.c | 294 + + sound/soc/intel/avs/boards/i2s_test.c | 180 + + sound/soc/intel/avs/boards/max98357a.c | 154 + + sound/soc/intel/avs/boards/max98373.c | 239 + + sound/soc/intel/avs/boards/nau8825.c | 353 + + sound/soc/intel/avs/boards/rt274.c | 310 + + sound/soc/intel/avs/boards/rt286.c | 281 + + sound/soc/intel/avs/boards/rt298.c | 281 + + sound/soc/intel/avs/boards/rt5682.c | 340 + + sound/soc/intel/avs/boards/ssm4567.c | 271 + + sound/soc/intel/avs/cldma.c | 12 +- + sound/soc/intel/avs/core.c | 13 +- + sound/soc/intel/avs/dsp.c | 11 +- + sound/soc/intel/avs/ipc.c | 1 + + sound/soc/intel/avs/loader.c | 2 +- + sound/soc/intel/avs/messages.c | 18 +- + sound/soc/intel/avs/path.c | 54 +- + sound/soc/intel/avs/pcm.c | 2 - + sound/soc/intel/avs/topology.c | 27 + + sound/soc/intel/boards/Kconfig | 5 +- + sound/soc/intel/boards/Makefile | 4 +- + sound/soc/intel/boards/bdw-rt5650.c | 1 + + sound/soc/intel/boards/bdw-rt5677.c | 1 + + sound/soc/intel/boards/bdw_rt286.c | 280 + + sound/soc/intel/boards/broadwell.c | 336 - + sound/soc/intel/boards/bxt_da7219_max98357a.c | 21 +- + sound/soc/intel/boards/bxt_rt298.c | 2 +- + sound/soc/intel/boards/bytcht_cx2072x.c | 2 +- + sound/soc/intel/boards/bytcht_da7213.c | 2 +- + sound/soc/intel/boards/bytcht_es8316.c | 2 +- + sound/soc/intel/boards/bytcht_nocodec.c | 2 +- + sound/soc/intel/boards/bytcr_rt5640.c | 4 +- + sound/soc/intel/boards/bytcr_rt5651.c | 4 +- + sound/soc/intel/boards/bytcr_wm5102.c | 2 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 3 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 8 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 2 +- + sound/soc/intel/boards/cml_rt1011_rt5682.c | 23 +- + sound/soc/intel/boards/glk_rt5682_max98357a.c | 21 +- + sound/soc/intel/boards/haswell.c | 202 - + sound/soc/intel/boards/hda_dsp_common.c | 4 +- + sound/soc/intel/boards/hsw_rt5640.c | 177 + + sound/soc/intel/boards/kbl_da7219_max98357a.c | 21 +- + sound/soc/intel/boards/kbl_da7219_max98927.c | 21 +- + sound/soc/intel/boards/kbl_rt5663_max98927.c | 21 +- + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 21 +- + sound/soc/intel/boards/skl_hda_dsp_generic.c | 4 +- + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 19 +- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 19 +- + sound/soc/intel/boards/skl_rt286.c | 2 +- + sound/soc/intel/boards/sof_cs42l42.c | 109 +- + sound/soc/intel/boards/sof_da7219_max98373.c | 23 +- + sound/soc/intel/boards/sof_es8336.c | 160 +- + sound/soc/intel/boards/sof_nau8825.c | 33 +- + sound/soc/intel/boards/sof_pcm512x.c | 2 +- + sound/soc/intel/boards/sof_realtek_common.c | 24 +- + sound/soc/intel/boards/sof_realtek_common.h | 6 +- + sound/soc/intel/boards/sof_rt5682.c | 51 +- + sound/soc/intel/boards/sof_sdw.c | 53 +- + sound/soc/intel/boards/sof_sdw_rt711.c | 3 + + sound/soc/intel/boards/sof_sdw_rt711_sdca.c | 3 + + sound/soc/intel/catpt/device.c | 5 +- + sound/soc/intel/catpt/pcm.c | 26 +- + sound/soc/intel/catpt/sysfs.c | 4 +- + sound/soc/intel/common/Makefile | 1 + + sound/soc/intel/common/soc-acpi-intel-adl-match.c | 61 + + .../intel/common/soc-acpi-intel-hsw-bdw-match.c | 6 +- + sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 89 + + sound/soc/intel/keembay/kmb_platform.c | 18 +- + sound/soc/intel/skylake/skl-pcm.c | 5 +- + sound/soc/intel/skylake/skl-topology.c | 6 - + sound/soc/jz4740/Kconfig | 2 +- + sound/soc/jz4740/jz4740-i2s.c | 44 +- + sound/soc/mediatek/Kconfig | 45 + + sound/soc/mediatek/Makefile | 1 + + sound/soc/mediatek/common/Makefile | 2 +- + sound/soc/mediatek/common/mtk-dsp-sof-common.c | 196 + + sound/soc/mediatek/common/mtk-dsp-sof-common.h | 36 + + sound/soc/mediatek/common/mtk-soc-card.h | 17 + + sound/soc/mediatek/mt6797/mt6797-mt6351.c | 6 +- + sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 6 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 10 +- + sound/soc/mediatek/mt8173/mt8173-rt5650.c | 9 +- + sound/soc/mediatek/mt8186/Makefile | 22 + + sound/soc/mediatek/mt8186/mt8186-afe-clk.c | 652 + + sound/soc/mediatek/mt8186/mt8186-afe-clk.h | 106 + + sound/soc/mediatek/mt8186/mt8186-afe-common.h | 195 + + sound/soc/mediatek/mt8186/mt8186-afe-control.c | 255 + + sound/soc/mediatek/mt8186/mt8186-afe-gpio.c | 243 + + sound/soc/mediatek/mt8186/mt8186-afe-gpio.h | 19 + + sound/soc/mediatek/mt8186/mt8186-afe-pcm.c | 3000 +++ + sound/soc/mediatek/mt8186/mt8186-audsys-clk.c | 150 + + sound/soc/mediatek/mt8186/mt8186-audsys-clk.h | 15 + + sound/soc/mediatek/mt8186/mt8186-audsys-clkid.h | 45 + + sound/soc/mediatek/mt8186/mt8186-dai-adda.c | 865 + + sound/soc/mediatek/mt8186/mt8186-dai-hostless.c | 298 + + sound/soc/mediatek/mt8186/mt8186-dai-hw-gain.c | 236 + + sound/soc/mediatek/mt8186/mt8186-dai-i2s.c | 1223 + + sound/soc/mediatek/mt8186/mt8186-dai-pcm.c | 418 + + sound/soc/mediatek/mt8186/mt8186-dai-src.c | 695 + + sound/soc/mediatek/mt8186/mt8186-dai-tdm.c | 645 + + sound/soc/mediatek/mt8186/mt8186-interconnection.h | 69 + + sound/soc/mediatek/mt8186/mt8186-misc-control.c | 252 + + sound/soc/mediatek/mt8186/mt8186-mt6366-common.c | 57 + + sound/soc/mediatek/mt8186/mt8186-mt6366-common.h | 17 + + .../mt8186/mt8186-mt6366-da7219-max98357.c | 1002 + + .../mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c | 978 + + sound/soc/mediatek/mt8186/mt8186-reg.h | 2913 +++ + sound/soc/mediatek/mt8195/mt8195-afe-clk.c | 8 +- + sound/soc/mediatek/mt8195/mt8195-dai-etdm.c | 6 +- + sound/soc/mediatek/mt8195/mt8195-dai-pcm.c | 6 +- + sound/soc/mediatek/mt8195/mt8195-mt6359.c | 233 +- + sound/soc/meson/aiu-acodec-ctrl.c | 1 - + sound/soc/meson/aiu-codec-ctrl.c | 1 - + sound/soc/meson/aiu-encoder-i2s.c | 2 +- + sound/soc/meson/axg-frddr.c | 3 + + sound/soc/meson/axg-pdm.c | 4 +- + sound/soc/meson/axg-spdifin.c | 1 + + sound/soc/meson/axg-spdifout.c | 1 + + sound/soc/meson/axg-tdm-interface.c | 14 +- + sound/soc/meson/axg-toddr.c | 3 + + sound/soc/meson/g12a-toacodec.c | 2 - + sound/soc/meson/g12a-tohdmitx.c | 1 - + sound/soc/meson/meson-codec-glue.c | 2 +- + sound/soc/meson/t9015.c | 1 - + sound/soc/mxs/mxs-saif.c | 7 +- + sound/soc/pxa/magician.c | 8 +- + sound/soc/pxa/mmp-sspa.c | 15 +- + sound/soc/pxa/pxa-ssp.c | 43 +- + sound/soc/pxa/pxa2xx-i2s.c | 27 +- + sound/soc/qcom/apq8016_sbc.c | 2 +- + sound/soc/qcom/lpass-apq8016.c | 1 + + sound/soc/qcom/lpass-cpu.c | 7 + + sound/soc/qcom/qdsp6/audioreach.c | 4 +- + sound/soc/qcom/qdsp6/q6adm.c | 8 +- + sound/soc/qcom/qdsp6/q6afe.c | 6 +- + sound/soc/qcom/qdsp6/q6asm-dai.c | 23 +- + sound/soc/qcom/qdsp6/q6asm.c | 2 +- + sound/soc/qcom/sc7180.c | 2 +- + sound/soc/qcom/sc7280.c | 33 + + sound/soc/qcom/sdm845.c | 6 +- + sound/soc/qcom/sm8250.c | 4 +- + sound/soc/rockchip/rk3288_hdmi_analog.c | 4 +- + sound/soc/rockchip/rockchip_i2s.c | 182 +- + sound/soc/rockchip/rockchip_i2s_tdm.c | 13 +- + sound/soc/rockchip/rockchip_pdm.c | 7 +- + sound/soc/rockchip/rockchip_spdif.c | 1 + + sound/soc/samsung/Kconfig | 20 +- + sound/soc/samsung/aries_wm8994.c | 7 +- + sound/soc/samsung/h1940_uda1380.c | 2 +- + sound/soc/samsung/i2s.c | 8 +- + sound/soc/samsung/neo1973_wm8753.c | 2 +- + sound/soc/samsung/pcm.c | 7 +- + sound/soc/samsung/rx1950_uda1380.c | 4 +- + sound/soc/samsung/s3c-i2s-v2.c | 17 +- + sound/soc/samsung/s3c2412-i2s.c | 7 +- + sound/soc/samsung/s3c24xx-i2s.c | 14 +- + sound/soc/samsung/snow.c | 2 +- + sound/soc/samsung/spdif.c | 7 +- + sound/soc/sh/fsi.c | 6 +- + sound/soc/sh/hac.c | 3 +- + sound/soc/sh/rcar/core.c | 30 +- + sound/soc/sh/rcar/ssiu.c | 3 + + sound/soc/sh/rz-ssi.c | 11 +- + sound/soc/sh/siu_pcm.c | 17 +- + sound/soc/sh/ssi.c | 13 +- + sound/soc/soc-card.c | 6 + + sound/soc/soc-core.c | 167 +- + sound/soc/soc-dai.c | 3 +- + sound/soc/soc-dapm.c | 10 +- + sound/soc/soc-ops.c | 51 +- + sound/soc/soc-pcm.c | 3 +- + sound/soc/soc-topology-test.c | 37 +- + sound/soc/soc-topology.c | 2 +- + sound/soc/soc-utils.c | 1 - + sound/soc/sof/Kconfig | 7 + + sound/soc/sof/Makefile | 16 +- + sound/soc/sof/amd/Kconfig | 1 + + sound/soc/sof/amd/acp-dsp-offset.h | 2 + + sound/soc/sof/amd/acp.c | 36 + + sound/soc/sof/amd/acp.h | 4 + + sound/soc/sof/amd/pci-rn.c | 4 + + sound/soc/sof/amd/renoir.c | 4 + + sound/soc/sof/compress.c | 73 +- + sound/soc/sof/core.c | 7 +- + sound/soc/sof/debug.c | 5 +- + sound/soc/sof/imx/Kconfig | 1 + + sound/soc/sof/intel/Kconfig | 27 + + sound/soc/sof/intel/Makefile | 4 +- + sound/soc/sof/intel/apl.c | 1 + + sound/soc/sof/intel/atom.c | 16 +- + sound/soc/sof/intel/bdw.c | 7 +- + sound/soc/sof/intel/byt.c | 5 +- + sound/soc/sof/intel/cnl.c | 39 +- + sound/soc/sof/intel/hda-dai.c | 226 +- + sound/soc/sof/intel/hda-dsp.c | 26 +- + sound/soc/sof/intel/hda-ipc.c | 39 +- + sound/soc/sof/intel/hda-loader.c | 28 +- + sound/soc/sof/intel/hda-probes.c | 16 +- + sound/soc/sof/intel/hda-stream.c | 21 +- + sound/soc/sof/intel/hda.c | 235 +- + sound/soc/sof/intel/hda.h | 70 + + sound/soc/sof/intel/icl.c | 1 + + sound/soc/sof/intel/mtl.c | 794 + + sound/soc/sof/intel/mtl.h | 76 + + sound/soc/sof/intel/pci-apl.c | 1 + + sound/soc/sof/intel/pci-cnl.c | 1 + + sound/soc/sof/intel/pci-icl.c | 1 + + sound/soc/sof/intel/pci-mtl.c | 71 + + sound/soc/sof/intel/pci-tgl.c | 1 + + sound/soc/sof/intel/shim.h | 2 + + sound/soc/sof/intel/tgl.c | 34 +- + sound/soc/sof/ipc.c | 24 +- + sound/soc/sof/ipc3-dtrace.c | 55 +- + sound/soc/sof/ipc3-loader.c | 17 +- + sound/soc/sof/ipc3-pcm.c | 11 +- + sound/soc/sof/ipc3-topology.c | 73 +- + sound/soc/sof/ipc3.c | 36 +- + sound/soc/sof/ipc4-control.c | 216 + + sound/soc/sof/ipc4-pcm.c | 234 + + sound/soc/sof/ipc4-priv.h | 7 + + sound/soc/sof/ipc4-topology.c | 1921 ++ + sound/soc/sof/ipc4-topology.h | 270 + + sound/soc/sof/ipc4.c | 45 +- + sound/soc/sof/mediatek/Kconfig | 1 + + sound/soc/sof/mediatek/adsp_helper.h | 1 + + sound/soc/sof/mediatek/mt8186/mt8186-clk.c | 4 +- + sound/soc/sof/mediatek/mt8195/mt8195-clk.c | 7 + + sound/soc/sof/mediatek/mt8195/mt8195-loader.c | 13 +- + sound/soc/sof/mediatek/mt8195/mt8195.c | 50 +- + sound/soc/sof/mediatek/mt8195/mt8195.h | 5 + + sound/soc/sof/ops.h | 6 + + sound/soc/sof/pcm.c | 13 + + sound/soc/sof/sof-audio.h | 12 + + sound/soc/sof/sof-client-ipc-msg-injector.c | 29 +- + sound/soc/sof/sof-client-probes.c | 13 +- + sound/soc/sof/sof-client-probes.h | 8 +- + sound/soc/sof/sof-client.c | 4 +- + sound/soc/sof/sof-priv.h | 15 +- + sound/soc/sof/topology.c | 121 +- + sound/soc/spear/spdif_in.c | 3 +- + sound/soc/spear/spdif_out.c | 3 +- + sound/soc/sti/sti_uniperif.c | 3 +- + sound/soc/stm/stm32_adfsdm.c | 3 +- + sound/soc/stm/stm32_i2s.c | 9 +- + sound/soc/stm/stm32_sai_sub.c | 11 +- + sound/soc/stm/stm32_spdifrx.c | 1 + + sound/soc/sunxi/sun4i-codec.c | 85 +- + sound/soc/sunxi/sun4i-i2s.c | 23 +- + sound/soc/sunxi/sun4i-spdif.c | 3 +- + sound/soc/sunxi/sun50i-codec-analog.c | 8 + + sound/soc/sunxi/sun8i-codec.c | 7 +- + sound/soc/tegra/Kconfig | 9 + + sound/soc/tegra/Makefile | 2 + + sound/soc/tegra/tegra20_ac97.c | 5 +- + sound/soc/tegra/tegra20_das.c | 198 +- + sound/soc/tegra/tegra20_das.h | 120 - + sound/soc/tegra/tegra20_i2s.c | 9 +- + sound/soc/tegra/tegra20_spdif.c | 1 + + sound/soc/tegra/tegra210_adx.c | 2 +- + sound/soc/tegra/tegra210_ahub.c | 39 +- + sound/soc/tegra/tegra210_i2s.c | 7 +- + sound/soc/tegra/tegra210_mbdrc.c | 1014 + + sound/soc/tegra/tegra210_mbdrc.h | 215 + + sound/soc/tegra/tegra210_ope.c | 419 + + sound/soc/tegra/tegra210_ope.h | 90 + + sound/soc/tegra/tegra210_peq.c | 434 + + sound/soc/tegra/tegra210_peq.h | 56 + + sound/soc/tegra/tegra30_i2s.c | 9 +- + sound/soc/ti/davinci-i2s.c | 35 +- + sound/soc/ti/davinci-mcasp.c | 16 +- + sound/soc/ti/davinci-vcif.c | 3 +- + sound/soc/ti/omap-dmic.c | 3 +- + sound/soc/ti/omap-hdmi.c | 1 + + sound/soc/ti/omap-mcbsp.c | 15 +- + sound/soc/ti/omap-mcpdm.c | 7 +- + sound/soc/uniphier/evea.c | 1 - + sound/soc/ux500/mop500.c | 2 - + sound/soc/ux500/mop500_ab8500.c | 2 - + sound/soc/ux500/mop500_ab8500.h | 2 - + sound/soc/ux500/ux500_msp_dai.c | 41 +- + sound/soc/ux500/ux500_msp_dai.h | 2 - + sound/soc/ux500/ux500_msp_i2s.c | 2 - + sound/soc/ux500/ux500_msp_i2s.h | 2 - + sound/soc/ux500/ux500_pcm.c | 2 - + sound/soc/ux500/ux500_pcm.h | 2 - + sound/soc/xilinx/xlnx_formatter_pcm.c | 18 +- + sound/soc/xilinx/xlnx_i2s.c | 1 + + sound/soc/xilinx/xlnx_spdif.c | 1 + + sound/soc/xtensa/xtfpga-i2s.c | 19 +- + sound/usb/6fire/pcm.c | 2 +- + sound/usb/bcd2000/bcd2000.c | 3 +- + sound/usb/endpoint.c | 2 +- + sound/usb/hiface/pcm.c | 2 +- + sound/usb/line6/pod.c | 8 +- + sound/usb/line6/podhd.c | 4 +- + sound/usb/mixer_quirks.c | 187 +- + sound/usb/quirks.c | 2 + + tools/accounting/getdelays.c | 4 - + tools/arch/x86/include/asm/amd-ibs.h | 16 +- + tools/bpf/Makefile | 7 +- + tools/bpf/bpf_jit_disasm.c | 5 +- + tools/bpf/bpftool/Makefile | 8 +- + tools/bpf/bpftool/jit_disasm.c | 42 +- + tools/build/Makefile.feature | 4 +- + tools/build/feature/Makefile | 4 + + tools/build/feature/test-all.c | 4 + + .../build/feature/test-disassembler-init-styled.c | 13 + + tools/build/feature/test-libcrypto.c | 6 + + tools/cgroup/memcg_shrinker.py | 71 + + tools/include/linux/list.h | 11 + + tools/include/tools/dis-asm-compat.h | 55 + + tools/include/uapi/asm-generic/fcntl.h | 2 +- + tools/lib/perf/include/internal/evsel.h | 4 + + tools/lib/perf/include/perf/event.h | 8 + + tools/perf/Build | 1 + + tools/perf/Documentation/perf-buildid-list.txt | 4 + + tools/perf/Documentation/perf-dlfilter.txt | 22 + + tools/perf/Documentation/perf-inject.txt | 17 + + tools/perf/Documentation/perf-intel-pt.txt | 181 +- + tools/perf/Documentation/perf-kwork.txt | 180 + + tools/perf/Documentation/perf-lock.txt | 55 +- + tools/perf/Documentation/perf-record.txt | 10 + + tools/perf/Documentation/perf-script.txt | 10 +- + tools/perf/Documentation/perf.data-file-format.txt | 20 +- + tools/perf/Makefile.config | 37 +- + tools/perf/Makefile.perf | 19 +- + tools/perf/arch/x86/tests/Build | 1 - + tools/perf/arch/x86/tests/arch-tests.c | 2 - + tools/perf/arch/x86/tests/rdpmc.c | 182 - + tools/perf/arch/x86/util/cpuid.h | 34 + + tools/perf/arch/x86/util/evlist.c | 64 +- + tools/perf/arch/x86/util/evsel.c | 72 + + tools/perf/arch/x86/util/header.c | 27 +- + tools/perf/arch/x86/util/topdown.c | 51 + + tools/perf/arch/x86/util/topdown.h | 1 + + tools/perf/arch/x86/util/tsc.c | 77 + + tools/perf/builtin-annotate.c | 8 + + tools/perf/builtin-buildid-list.c | 39 +- + tools/perf/builtin-inject.c | 1046 +- + tools/perf/builtin-kwork.c | 1832 ++ + tools/perf/builtin-list.c | 2 +- + tools/perf/builtin-lock.c | 958 +- + tools/perf/builtin-record.c | 44 +- + tools/perf/builtin-report.c | 6 + + tools/perf/builtin-script.c | 25 + + tools/perf/builtin-stat.c | 75 +- + tools/perf/builtin-timechart.c | 1 + + tools/perf/builtin-trace.c | 1 + + tools/perf/builtin.h | 1 + + tools/perf/command-list.txt | 1 + + tools/perf/include/perf/perf_dlfilter.h | 8 + + tools/perf/perf.c | 1 + + tools/perf/pmu-events/Build | 17 +- + tools/perf/pmu-events/arch/arm64/mapfile.csv | 2 + + .../pmu-events/arch/x86/alderlake/adl-metrics.json | 4 +- + .../perf/pmu-events/arch/x86/alderlake/cache.json | 178 +- + .../arch/x86/alderlake/floating-point.json | 19 +- + .../pmu-events/arch/x86/alderlake/frontend.json | 38 +- + .../perf/pmu-events/arch/x86/alderlake/memory.json | 40 +- + .../perf/pmu-events/arch/x86/alderlake/other.json | 97 +- + .../pmu-events/arch/x86/alderlake/pipeline.json | 507 +- + .../arch/x86/alderlake/uncore-other.json | 2 +- + .../arch/x86/alderlake/virtual-memory.json | 63 +- + tools/perf/pmu-events/arch/x86/bonnell/cache.json | 2 +- + .../arch/x86/bonnell/floating-point.json | 2 +- + .../perf/pmu-events/arch/x86/bonnell/frontend.json | 2 +- + tools/perf/pmu-events/arch/x86/bonnell/memory.json | 2 +- + tools/perf/pmu-events/arch/x86/bonnell/other.json | 2 +- + .../perf/pmu-events/arch/x86/bonnell/pipeline.json | 2 +- + .../arch/x86/bonnell/virtual-memory.json | 2 +- + .../pmu-events/arch/x86/broadwell/bdw-metrics.json | 130 +- + .../perf/pmu-events/arch/x86/broadwell/cache.json | 2 +- + .../arch/x86/broadwell/floating-point.json | 2 +- + .../pmu-events/arch/x86/broadwell/frontend.json | 2 +- + .../perf/pmu-events/arch/x86/broadwell/memory.json | 2 +- + .../perf/pmu-events/arch/x86/broadwell/other.json | 2 +- + .../pmu-events/arch/x86/broadwell/pipeline.json | 2 +- + .../arch/x86/broadwell/uncore-cache.json | 152 + + .../arch/x86/broadwell/uncore-other.json | 82 + + .../perf/pmu-events/arch/x86/broadwell/uncore.json | 278 - + .../arch/x86/broadwell/virtual-memory.json | 2 +- + .../arch/x86/broadwellde/bdwde-metrics.json | 136 +- + .../pmu-events/arch/x86/broadwellde/cache.json | 2 +- + .../arch/x86/broadwellde/floating-point.json | 2 +- + .../pmu-events/arch/x86/broadwellde/frontend.json | 2 +- + .../pmu-events/arch/x86/broadwellde/memory.json | 2 +- + .../pmu-events/arch/x86/broadwellde/other.json | 2 +- + .../pmu-events/arch/x86/broadwellde/pipeline.json | 2 +- + .../arch/x86/broadwellde/uncore-cache.json | 3818 ++- + .../arch/x86/broadwellde/uncore-memory.json | 2867 ++- + .../arch/x86/broadwellde/uncore-other.json | 1246 + + .../arch/x86/broadwellde/uncore-power.json | 492 +- + .../arch/x86/broadwellde/virtual-memory.json | 2 +- + .../arch/x86/broadwellx/bdx-metrics.json | 570 +- + .../perf/pmu-events/arch/x86/broadwellx/cache.json | 22 +- + .../arch/x86/broadwellx/floating-point.json | 9 +- + .../pmu-events/arch/x86/broadwellx/frontend.json | 2 +- + .../pmu-events/arch/x86/broadwellx/memory.json | 39 +- + .../perf/pmu-events/arch/x86/broadwellx/other.json | 2 +- + .../pmu-events/arch/x86/broadwellx/pipeline.json | 4 +- + .../arch/x86/broadwellx/uncore-cache.json | 3788 ++- + .../arch/x86/broadwellx/uncore-interconnect.json | 1438 +- + .../arch/x86/broadwellx/uncore-memory.json | 2849 ++- + .../arch/x86/broadwellx/uncore-other.json | 3252 +++ + .../arch/x86/broadwellx/uncore-power.json | 437 +- + .../arch/x86/broadwellx/virtual-memory.json | 2 +- + .../pmu-events/arch/x86/cascadelakex/cache.json | 8 +- + .../arch/x86/cascadelakex/clx-metrics.json | 724 +- + .../arch/x86/cascadelakex/floating-point.json | 2 +- + .../pmu-events/arch/x86/cascadelakex/frontend.json | 2 +- + .../pmu-events/arch/x86/cascadelakex/other.json | 63 + + .../pmu-events/arch/x86/cascadelakex/pipeline.json | 11 + + .../arch/x86/cascadelakex/uncore-memory.json | 9 + + .../arch/x86/cascadelakex/uncore-other.json | 697 +- + .../arch/x86/cascadelakex/virtual-memory.json | 2 +- + .../pmu-events/arch/x86/elkhartlake/cache.json | 956 +- + .../arch/x86/elkhartlake/floating-point.json | 19 +- + .../pmu-events/arch/x86/elkhartlake/frontend.json | 34 +- + .../pmu-events/arch/x86/elkhartlake/memory.json | 388 +- + .../pmu-events/arch/x86/elkhartlake/other.json | 527 +- + .../pmu-events/arch/x86/elkhartlake/pipeline.json | 203 +- + .../arch/x86/elkhartlake/virtual-memory.json | 151 +- + tools/perf/pmu-events/arch/x86/goldmont/cache.json | 2 +- + .../arch/x86/goldmont/floating-point.json | 2 +- + .../pmu-events/arch/x86/goldmont/frontend.json | 2 +- + .../perf/pmu-events/arch/x86/goldmont/memory.json | 2 +- + .../pmu-events/arch/x86/goldmont/pipeline.json | 2 +- + .../arch/x86/goldmont/virtual-memory.json | 2 +- + .../pmu-events/arch/x86/goldmontplus/cache.json | 2 +- + .../arch/x86/goldmontplus/floating-point.json | 2 +- + .../pmu-events/arch/x86/goldmontplus/frontend.json | 2 +- + .../pmu-events/arch/x86/goldmontplus/memory.json | 2 +- + .../pmu-events/arch/x86/goldmontplus/pipeline.json | 2 +- + .../arch/x86/goldmontplus/virtual-memory.json | 2 +- + tools/perf/pmu-events/arch/x86/haswell/cache.json | 78 +- + .../arch/x86/haswell/floating-point.json | 2 +- + .../perf/pmu-events/arch/x86/haswell/frontend.json | 2 +- + .../pmu-events/arch/x86/haswell/hsw-metrics.json | 85 +- + tools/perf/pmu-events/arch/x86/haswell/memory.json | 75 +- + tools/perf/pmu-events/arch/x86/haswell/other.json | 2 +- + .../perf/pmu-events/arch/x86/haswell/pipeline.json | 9 +- + .../pmu-events/arch/x86/haswell/uncore-other.json | 7 +- + .../arch/x86/haswell/virtual-memory.json | 2 +- + tools/perf/pmu-events/arch/x86/haswellx/cache.json | 44 +- + .../arch/x86/haswellx/floating-point.json | 2 +- + .../pmu-events/arch/x86/haswellx/frontend.json | 2 +- + .../pmu-events/arch/x86/haswellx/hsx-metrics.json | 85 +- + .../perf/pmu-events/arch/x86/haswellx/memory.json | 52 +- + tools/perf/pmu-events/arch/x86/haswellx/other.json | 2 +- + .../pmu-events/arch/x86/haswellx/pipeline.json | 9 +- + .../pmu-events/arch/x86/haswellx/uncore-cache.json | 3779 ++- + .../arch/x86/haswellx/uncore-interconnect.json | 1430 +- + .../arch/x86/haswellx/uncore-memory.json | 2839 ++- + .../pmu-events/arch/x86/haswellx/uncore-other.json | 3170 +++ + .../pmu-events/arch/x86/haswellx/uncore-power.json | 477 +- + .../arch/x86/haswellx/virtual-memory.json | 2 +- + tools/perf/pmu-events/arch/x86/icelake/cache.json | 8 +- + .../arch/x86/icelake/floating-point.json | 2 +- + .../perf/pmu-events/arch/x86/icelake/frontend.json | 2 +- + .../pmu-events/arch/x86/icelake/icl-metrics.json | 126 +- + .../pmu-events/arch/x86/icelake/uncore-other.json | 31 + + .../arch/x86/icelake/virtual-memory.json | 2 +- + tools/perf/pmu-events/arch/x86/icelakex/cache.json | 28 +- + .../arch/x86/icelakex/floating-point.json | 2 +- + .../pmu-events/arch/x86/icelakex/frontend.json | 2 +- + .../pmu-events/arch/x86/icelakex/icx-metrics.json | 691 +- + .../perf/pmu-events/arch/x86/icelakex/memory.json | 6 +- + tools/perf/pmu-events/arch/x86/icelakex/other.json | 51 +- + .../pmu-events/arch/x86/icelakex/pipeline.json | 12 + + .../arch/x86/icelakex/virtual-memory.json | 2 +- + .../perf/pmu-events/arch/x86/ivybridge/cache.json | 2 +- + .../arch/x86/ivybridge/floating-point.json | 2 +- + .../pmu-events/arch/x86/ivybridge/frontend.json | 2 +- + .../pmu-events/arch/x86/ivybridge/ivb-metrics.json | 94 +- + .../perf/pmu-events/arch/x86/ivybridge/memory.json | 2 +- + .../perf/pmu-events/arch/x86/ivybridge/other.json | 2 +- + .../pmu-events/arch/x86/ivybridge/pipeline.json | 4 +- + .../arch/x86/ivybridge/uncore-other.json | 2 +- + .../arch/x86/ivybridge/virtual-memory.json | 2 +- + tools/perf/pmu-events/arch/x86/ivytown/cache.json | 2 +- + .../arch/x86/ivytown/floating-point.json | 2 +- + .../perf/pmu-events/arch/x86/ivytown/frontend.json | 2 +- + .../pmu-events/arch/x86/ivytown/ivt-metrics.json | 94 +- + tools/perf/pmu-events/arch/x86/ivytown/memory.json | 2 +- + tools/perf/pmu-events/arch/x86/ivytown/other.json | 2 +- + .../pmu-events/arch/x86/ivytown/uncore-cache.json | 3495 ++- + .../arch/x86/ivytown/uncore-interconnect.json | 1750 +- + .../pmu-events/arch/x86/ivytown/uncore-memory.json | 1775 +- + .../pmu-events/arch/x86/ivytown/uncore-other.json | 2411 ++ + .../pmu-events/arch/x86/ivytown/uncore-power.json | 696 +- + .../arch/x86/ivytown/virtual-memory.json | 2 +- + tools/perf/pmu-events/arch/x86/jaketown/cache.json | 2 +- + .../arch/x86/jaketown/floating-point.json | 2 +- + .../pmu-events/arch/x86/jaketown/frontend.json | 2 +- + .../pmu-events/arch/x86/jaketown/jkt-metrics.json | 11 +- + .../perf/pmu-events/arch/x86/jaketown/memory.json | 2 +- + tools/perf/pmu-events/arch/x86/jaketown/other.json | 2 +- + .../pmu-events/arch/x86/jaketown/pipeline.json | 16 +- + .../pmu-events/arch/x86/jaketown/uncore-cache.json | 1960 +- + .../arch/x86/jaketown/uncore-interconnect.json | 824 +- + .../arch/x86/jaketown/uncore-memory.json | 445 +- + .../pmu-events/arch/x86/jaketown/uncore-other.json | 1551 ++ + .../pmu-events/arch/x86/jaketown/uncore-power.json | 362 +- + .../arch/x86/jaketown/virtual-memory.json | 2 +- + .../pmu-events/arch/x86/knightslanding/cache.json | 2 +- + .../arch/x86/knightslanding/floating-point.json | 2 +- + .../arch/x86/knightslanding/frontend.json | 2 +- + .../pmu-events/arch/x86/knightslanding/memory.json | 2 +- + .../arch/x86/knightslanding/pipeline.json | 2 +- + .../arch/x86/knightslanding/uncore-memory.json | 42 - + .../arch/x86/knightslanding/uncore-other.json | 3890 +++ + .../arch/x86/knightslanding/virtual-memory.json | 2 +- + tools/perf/pmu-events/arch/x86/mapfile.csv | 74 +- + .../perf/pmu-events/arch/x86/meteorlake/cache.json | 262 + + .../pmu-events/arch/x86/meteorlake/frontend.json | 24 + + .../pmu-events/arch/x86/meteorlake/memory.json | 185 + + .../perf/pmu-events/arch/x86/meteorlake/other.json | 46 + + .../pmu-events/arch/x86/meteorlake/pipeline.json | 254 + + .../arch/x86/meteorlake/virtual-memory.json | 46 + + .../perf/pmu-events/arch/x86/nehalemep/cache.json | 14 +- + .../arch/x86/nehalemep/floating-point.json | 2 +- + .../pmu-events/arch/x86/nehalemep/frontend.json | 2 +- + .../perf/pmu-events/arch/x86/nehalemep/memory.json | 6 +- + .../arch/x86/nehalemep/virtual-memory.json | 2 +- + .../perf/pmu-events/arch/x86/nehalemex/cache.json | 2974 +-- + .../arch/x86/nehalemex/floating-point.json | 182 +- + .../pmu-events/arch/x86/nehalemex/frontend.json | 20 +- + .../perf/pmu-events/arch/x86/nehalemex/memory.json | 672 +- + .../perf/pmu-events/arch/x86/nehalemex/other.json | 170 +- + .../pmu-events/arch/x86/nehalemex/pipeline.json | 830 +- + .../arch/x86/nehalemex/virtual-memory.json | 92 +- + .../pmu-events/arch/x86/sandybridge/cache.json | 2 +- + .../arch/x86/sandybridge/floating-point.json | 2 +- + .../pmu-events/arch/x86/sandybridge/frontend.json | 4 +- + .../pmu-events/arch/x86/sandybridge/memory.json | 2 +- + .../pmu-events/arch/x86/sandybridge/other.json | 2 +- + .../pmu-events/arch/x86/sandybridge/pipeline.json | 10 +- + .../arch/x86/sandybridge/snb-metrics.json | 11 +- + .../arch/x86/sandybridge/uncore-other.json | 2 +- + .../arch/x86/sandybridge/virtual-memory.json | 2 +- + .../pmu-events/arch/x86/sapphirerapids/cache.json | 135 +- + .../arch/x86/sapphirerapids/floating-point.json | 6 + + .../arch/x86/sapphirerapids/frontend.json | 16 + + .../pmu-events/arch/x86/sapphirerapids/memory.json | 23 +- + .../pmu-events/arch/x86/sapphirerapids/other.json | 68 +- + .../arch/x86/sapphirerapids/pipeline.json | 99 +- + .../arch/x86/sapphirerapids/spr-metrics.json | 566 +- + .../arch/x86/sapphirerapids/uncore-other.json | 9 - + .../arch/x86/sapphirerapids/virtual-memory.json | 20 + + .../perf/pmu-events/arch/x86/silvermont/cache.json | 2 +- + .../arch/x86/silvermont/floating-point.json | 2 +- + .../pmu-events/arch/x86/silvermont/frontend.json | 2 +- + .../pmu-events/arch/x86/silvermont/memory.json | 2 +- + .../perf/pmu-events/arch/x86/silvermont/other.json | 2 +- + .../pmu-events/arch/x86/silvermont/pipeline.json | 2 +- + .../arch/x86/silvermont/virtual-memory.json | 2 +- + .../arch/x86/skylake/floating-point.json | 2 +- + .../perf/pmu-events/arch/x86/skylake/frontend.json | 2 +- + tools/perf/pmu-events/arch/x86/skylake/other.json | 2 +- + .../pmu-events/arch/x86/skylake/skl-metrics.json | 178 +- + .../pmu-events/arch/x86/skylake/uncore-cache.json | 142 + + .../pmu-events/arch/x86/skylake/uncore-other.json | 79 + + tools/perf/pmu-events/arch/x86/skylake/uncore.json | 254 - + .../arch/x86/skylake/virtual-memory.json | 2 +- + .../arch/x86/skylakex/floating-point.json | 2 +- + .../pmu-events/arch/x86/skylakex/frontend.json | 2 +- + tools/perf/pmu-events/arch/x86/skylakex/other.json | 66 +- + .../pmu-events/arch/x86/skylakex/pipeline.json | 11 + + .../pmu-events/arch/x86/skylakex/skx-metrics.json | 667 +- + .../arch/x86/skylakex/uncore-memory.json | 9 + + .../pmu-events/arch/x86/skylakex/uncore-other.json | 730 +- + .../arch/x86/skylakex/virtual-memory.json | 2 +- + .../arch/x86/{tremontx => snowridgex}/cache.json | 60 +- + .../{tremontx => snowridgex}/floating-point.json | 9 +- + .../x86/{tremontx => snowridgex}/frontend.json | 20 +- + .../arch/x86/{tremontx => snowridgex}/memory.json | 4 +- + .../arch/x86/{tremontx => snowridgex}/other.json | 18 +- + .../x86/{tremontx => snowridgex}/pipeline.json | 98 +- + .../arch/x86/snowridgex/uncore-memory.json | 619 + + .../arch/x86/snowridgex/uncore-other.json | 25249 +++++++++++++++++++ + .../arch/x86/snowridgex/uncore-power.json | 235 + + .../{tremontx => snowridgex}/virtual-memory.json | 69 +- + .../perf/pmu-events/arch/x86/tigerlake/cache.json | 48 +- + .../arch/x86/tigerlake/floating-point.json | 2 +- + .../pmu-events/arch/x86/tigerlake/frontend.json | 2 +- + .../perf/pmu-events/arch/x86/tigerlake/memory.json | 2 +- + .../perf/pmu-events/arch/x86/tigerlake/other.json | 1 - + .../pmu-events/arch/x86/tigerlake/pipeline.json | 4 +- + .../pmu-events/arch/x86/tigerlake/tgl-metrics.json | 378 +- + .../arch/x86/tigerlake/uncore-other.json | 65 + + .../arch/x86/tigerlake/virtual-memory.json | 2 +- + .../arch/x86/tremontx/uncore-memory.json | 245 - + .../pmu-events/arch/x86/tremontx/uncore-other.json | 2395 -- + .../pmu-events/arch/x86/tremontx/uncore-power.json | 11 - + .../pmu-events/arch/x86/westmereep-dp/cache.json | 2 +- + .../arch/x86/westmereep-dp/floating-point.json | 2 +- + .../arch/x86/westmereep-dp/frontend.json | 2 +- + .../pmu-events/arch/x86/westmereep-dp/memory.json | 2 +- + .../arch/x86/westmereep-dp/virtual-memory.json | 2 +- + .../arch/x86/westmereep-sp/floating-point.json | 2 +- + .../arch/x86/westmereep-sp/frontend.json | 2 +- + .../arch/x86/westmereep-sp/virtual-memory.json | 2 +- + .../arch/x86/westmereex/floating-point.json | 2 +- + .../pmu-events/arch/x86/westmereex/frontend.json | 2 +- + .../arch/x86/westmereex/virtual-memory.json | 2 +- + tools/perf/pmu-events/empty-pmu-events.c | 158 + + tools/perf/pmu-events/jevents.c | 1342 - + tools/perf/pmu-events/jevents.py | 409 + + tools/perf/pmu-events/jsmn.c | 352 - + tools/perf/pmu-events/jsmn.h | 68 - + tools/perf/pmu-events/json.c | 162 - + tools/perf/pmu-events/json.h | 39 - + tools/perf/scripts/perl/Perf-Trace-Util/Build | 6 +- + tools/perf/scripts/python/intel-pt-events.py | 32 +- + tools/perf/tests/bpf-script-example.c | 35 +- + tools/perf/tests/expr.c | 13 + + tools/perf/tests/mmap-basic.c | 127 +- + tools/perf/tests/pmu-events.c | 10 + + tools/perf/tests/shell/stat+csv_output.sh | 7 +- + tools/perf/tests/shell/stat_all_metrics.sh | 47 +- + tools/perf/tests/shell/test_arm_spe.sh | 30 +- + tools/perf/tests/shell/test_brstack.sh | 114 + + tools/perf/util/Build | 4 + + tools/perf/util/amd-sample-raw.c | 68 +- + tools/perf/util/annotate.c | 7 +- + tools/perf/util/auxtrace.c | 30 +- + tools/perf/util/auxtrace.h | 4 + + tools/perf/util/bpf_kwork.c | 346 + + tools/perf/util/bpf_lock_contention.c | 189 + + tools/perf/util/bpf_skel/kwork_trace.bpf.c | 383 + + tools/perf/util/bpf_skel/lock_contention.bpf.c | 175 + + tools/perf/util/build-id.c | 80 +- + tools/perf/util/build-id.h | 16 +- + tools/perf/util/callchain.c | 18 +- + tools/perf/util/cs-etm.c | 2 +- + tools/perf/util/data-convert-json.c | 5 +- + tools/perf/util/data.c | 43 +- + tools/perf/util/data.h | 2 + + tools/perf/util/dlfilter.c | 2 + + tools/perf/util/dso.h | 6 + + tools/perf/util/dsos.c | 15 +- + tools/perf/util/env.c | 62 +- + tools/perf/util/env.h | 14 +- + tools/perf/util/event.c | 1 + + tools/perf/util/event.h | 23 + + tools/perf/util/evlist.c | 53 +- + tools/perf/util/evlist.h | 9 +- + tools/perf/util/evsel.c | 41 +- + tools/perf/util/evsel.h | 4 + + tools/perf/util/expr.c | 13 + + tools/perf/util/genelf.c | 6 +- + tools/perf/util/header.c | 192 +- + tools/perf/util/header.h | 2 +- + tools/perf/util/intel-pt.c | 183 +- + tools/perf/util/kwork.h | 257 + + tools/perf/util/llvm-utils.c | 2 +- + tools/perf/util/lock-contention.h | 147 + + tools/perf/util/machine.c | 56 +- + tools/perf/util/machine.h | 7 + + tools/perf/util/ordered-events.h | 6 + + tools/perf/util/parse-events.c | 714 +- + tools/perf/util/parse-events.h | 31 - + tools/perf/util/pmu.c | 15 +- + tools/perf/util/pmu.h | 2 + + tools/perf/util/print-events.c | 572 + + tools/perf/util/print-events.h | 22 + + tools/perf/util/probe-event.c | 2 +- + tools/perf/util/record.c | 2 +- + tools/perf/util/record.h | 1 + + tools/perf/util/scripting-engines/Build | 4 +- + .../util/scripting-engines/trace-event-python.c | 15 +- + tools/perf/util/session.c | 115 +- + tools/perf/util/session.h | 4 + + tools/perf/util/setup.py | 12 +- + tools/perf/util/stat-display.c | 2 +- + tools/perf/util/symbol-elf.c | 27 +- + tools/perf/util/symbol.c | 6 +- + tools/perf/util/synthetic-events.c | 105 +- + tools/perf/util/synthetic-events.h | 2 + + tools/perf/util/thread.c | 1 + + tools/perf/util/thread.h | 1 + + tools/perf/util/tool.h | 3 +- + tools/perf/util/topdown.c | 7 + + tools/perf/util/topdown.h | 3 +- + tools/perf/util/trace-event-info.c | 96 + + tools/perf/util/tracepoint.c | 63 + + tools/perf/util/tracepoint.h | 25 + + tools/perf/util/tsc.h | 1 + + tools/perf/util/util.c | 70 +- + tools/perf/util/util.h | 15 + + tools/testing/crypto/chacha20-s390/test-cipher.c | 9 +- + tools/testing/memblock/linux/kmemleak.h | 2 +- + tools/testing/selftests/Makefile | 1 + + .../testing/selftests/filesystems/fat}/.gitignore | 3 +- + tools/testing/selftests/filesystems/fat/Makefile | 7 + + tools/testing/selftests/filesystems/fat/config | 2 + + .../selftests/filesystems/fat/rename_exchange.c | 37 + + .../selftests/filesystems/fat/run_fat_tests.sh | 82 + + .../ftrace/test.d/dynevent/add_remove_eprobe.tc | 9 +- + .../ftrace/test.d/dynevent/add_remove_kprobe.tc | 7 + + .../ftrace/test.d/kprobe/kprobe_syntax_errors.tc | 2 +- + .../testing/selftests/powerpc/include/basic_asm.h | 63 +- + tools/testing/selftests/powerpc/include/reg.h | 73 +- + tools/testing/selftests/powerpc/include/utils.h | 10 + + tools/testing/selftests/powerpc/lib/reg.S | 107 +- + tools/testing/selftests/powerpc/math/.gitignore | 1 + + tools/testing/selftests/powerpc/math/mma.S | 3 + + tools/testing/selftests/powerpc/mce/.gitignore | 1 + + .../selftests/powerpc/papr_attributes/attr_test.c | 30 +- + tools/testing/selftests/powerpc/pmu/Makefile | 11 +- + tools/testing/selftests/powerpc/pmu/branch_loops.S | 28 + + tools/testing/selftests/powerpc/pmu/ebb/.gitignore | 1 + + .../powerpc/pmu/ebb/cycles_with_mmcr2_test.c | 1 + + .../powerpc/pmu/event_code_tests/Makefile | 15 + + .../pmu/event_code_tests/blacklisted_events_test.c | 132 + + .../event_alternatives_tests_p10.c | 109 + + .../event_code_tests/event_alternatives_tests_p9.c | 116 + + .../event_code_tests/generic_events_valid_test.c | 130 + + .../event_code_tests/group_constraint_cache_test.c | 60 + + .../group_constraint_l2l3_sel_test.c | 64 + + .../group_constraint_mmcra_sample_test.c | 54 + + .../event_code_tests/group_constraint_pmc56_test.c | 63 + + .../group_constraint_pmc_count_test.c | 70 + + .../group_constraint_radix_scope_qual_test.c | 56 + + .../group_constraint_repeat_test.c | 56 + + .../group_constraint_thresh_cmp_test.c | 96 + + .../group_constraint_thresh_ctl_test.c | 64 + + .../group_constraint_thresh_sel_test.c | 63 + + .../event_code_tests/group_constraint_unit_test.c | 74 + + .../group_pmc56_exclude_constraints_test.c | 64 + + .../event_code_tests/hw_cache_event_type_test.c | 88 + + .../pmu/event_code_tests/invalid_event_code_test.c | 67 + + .../reserved_bits_mmcra_sample_elig_mode_test.c | 77 + + .../reserved_bits_mmcra_thresh_ctl_test.c | 44 + + .../selftests/powerpc/pmu/sampling_tests/Makefile | 7 +- + .../pmu/sampling_tests/bhrb_filter_map_test.c | 105 + + .../pmu/sampling_tests/bhrb_no_crash_wo_pmu_test.c | 59 + + .../intr_regs_no_crash_wo_pmu_test.c | 57 + + .../selftests/powerpc/pmu/sampling_tests/misc.c | 135 +- + .../selftests/powerpc/pmu/sampling_tests/misc.h | 9 +- + .../pmu/sampling_tests/mmcr1_sel_unit_cache_test.c | 77 + + .../pmu/sampling_tests/mmcra_bhrb_any_test.c | 65 + + .../pmu/sampling_tests/mmcra_bhrb_cond_test.c | 69 + + .../mmcra_bhrb_disable_no_branch_test.c | 64 + + .../pmu/sampling_tests/mmcra_bhrb_disable_test.c | 66 + + .../pmu/sampling_tests/mmcra_bhrb_ind_call_test.c | 69 + + .../pmu/sampling_tests/mmcra_thresh_cmp_test.c | 74 + + tools/testing/selftests/powerpc/ptrace/Makefile | 40 +- + .../testing/selftests/powerpc/ptrace/ptrace-gpr.S | 52 + + .../testing/selftests/powerpc/ptrace/ptrace-gpr.c | 125 +- + .../testing/selftests/powerpc/ptrace/ptrace-gpr.h | 14 +- + .../selftests/powerpc/ptrace/ptrace-tm-gpr.c | 18 +- + .../selftests/powerpc/ptrace/ptrace-tm-spd-gpr.c | 20 +- + tools/testing/selftests/powerpc/ptrace/ptrace.h | 79 +- + .../testing/selftests/powerpc/security/.gitignore | 1 + + tools/testing/selftests/proc/proc-pid-vm.c | 75 +- + tools/testing/selftests/sgx/defines.h | 23 + + tools/testing/selftests/sgx/load.c | 41 + + tools/testing/selftests/sgx/main.c | 1435 ++ + tools/testing/selftests/sgx/main.h | 1 + + tools/testing/selftests/sgx/test_encl.c | 68 + + tools/testing/selftests/sgx/test_encl_bootstrap.S | 6 + + tools/testing/selftests/vm/Makefile | 1 + + tools/testing/selftests/vm/hmm-tests.c | 325 +- + tools/testing/selftests/vm/hugepage-mremap.c | 2 +- + tools/testing/selftests/vm/hugetlb-madvise.c | 5 +- + tools/testing/selftests/vm/mrelease_test.c | 16 +- + tools/testing/selftests/vm/run_vmtests.sh | 15 +- + tools/testing/selftests/vm/soft-dirty.c | 67 +- + tools/testing/selftests/vm/test_hmm.sh | 24 +- + tools/testing/selftests/vm/userfaultfd.c | 4 +- + tools/testing/selftests/vm/va_128TBswitch.c | 8 +- + tools/testing/selftests/vm/va_128TBswitch.sh | 54 + + tools/tracing/rtla/Makefile | 2 +- + tools/tracing/rtla/src/trace.c | 9 +- + tools/tracing/rtla/src/utils.c | 7 +- + tools/verification/dot2/Makefile | 26 + + tools/verification/dot2/automata.py | 174 + + tools/verification/dot2/dot2c | 26 + + tools/verification/dot2/dot2c.py | 254 + + tools/verification/dot2/dot2k | 47 + + tools/verification/dot2/dot2k.py | 177 + + .../dot2/dot2k_templates/main_global.c | 91 + + .../dot2/dot2k_templates/main_per_cpu.c | 91 + + .../dot2/dot2k_templates/main_per_task.c | 91 + + tools/verification/models/wip.dot | 16 + + tools/verification/models/wwnr.dot | 16 + + tools/vm/page_owner_sort.c | 30 +- + tools/vm/slabinfo.c | 32 +- + 2645 files changed, 173359 insertions(+), 34926 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-event_source-devices-caps + create mode 100644 Documentation/admin-guide/mm/damon/lru_sort.rst + create mode 100644 Documentation/admin-guide/mm/shrinker_debugfs.rst + delete mode 100644 Documentation/core-api/bus-virt-phys-mapping.rst + create mode 100644 Documentation/devicetree/bindings/dsp/mediatek,mt8186-dsp.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/da9063.txt + create mode 100644 Documentation/devicetree/bindings/mfd/dlg,da9063.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/qcom,tcsr.txt + create mode 100644 Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml + create mode 100644 Documentation/devicetree/bindings/reset/ti,tps380x-reset.yaml + create mode 100644 Documentation/devicetree/bindings/sound/atmel,sama5d2-classd.yaml + create mode 100644 Documentation/devicetree/bindings/sound/atmel,sama5d2-i2s.yaml + create mode 100644 Documentation/devicetree/bindings/sound/atmel,sama5d2-pdmic.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/atmel-classd.txt + delete mode 100644 Documentation/devicetree/bindings/sound/atmel-i2s.txt + delete mode 100644 Documentation/devicetree/bindings/sound/atmel-pdmic.txt + delete mode 100644 Documentation/devicetree/bindings/sound/designware-i2s.txt + delete mode 100644 Documentation/devicetree/bindings/sound/fsl,micfil.txt + create mode 100644 Documentation/devicetree/bindings/sound/fsl,micfil.yaml + create mode 100644 Documentation/devicetree/bindings/sound/mt8186-afe-pcm.yaml + create mode 100644 Documentation/devicetree/bindings/sound/mt8186-mt6366-da7219-max98357.yaml + create mode 100644 Documentation/devicetree/bindings/sound/mt8186-mt6366-rt1019-rt5682s.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra210-mbdrc.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra210-ope.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra210-peq.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/qcom,sdm845.txt + create mode 100644 Documentation/devicetree/bindings/sound/qcom,wsa883x.yaml + create mode 100644 Documentation/devicetree/bindings/sound/snps,designware-i2s.yaml + rename Documentation/{vm => mm}/active_mm.rst (100%) + rename Documentation/{vm => mm}/arch_pgtable_helpers.rst (100%) + rename Documentation/{vm => mm}/balance.rst (100%) + rename Documentation/{vm => mm}/bootmem.rst (100%) + rename Documentation/{vm => mm}/damon/api.rst (100%) + rename Documentation/{vm => mm}/damon/design.rst (100%) + rename Documentation/{vm => mm}/damon/faq.rst (100%) + rename Documentation/{vm => mm}/damon/index.rst (100%) + rename Documentation/{vm => mm}/free_page_reporting.rst (100%) + rename Documentation/{vm => mm}/frontswap.rst (100%) + rename Documentation/{vm => mm}/highmem.rst (100%) + rename Documentation/{vm => mm}/hmm.rst (100%) + rename Documentation/{vm => mm}/hugetlbfs_reserv.rst (100%) + rename Documentation/{vm => mm}/hwpoison.rst (100%) + rename Documentation/{vm => mm}/index.rst (100%) + rename Documentation/{vm => mm}/ksm.rst (100%) + rename Documentation/{vm => mm}/memory-model.rst (99%) + rename Documentation/{vm => mm}/mmu_notifier.rst (100%) + rename Documentation/{vm => mm}/numa.rst (100%) + rename Documentation/{vm => mm}/oom.rst (100%) + rename Documentation/{vm => mm}/overcommit-accounting.rst (100%) + rename Documentation/{vm => mm}/page_allocation.rst (100%) + rename Documentation/{vm => mm}/page_cache.rst (100%) + rename Documentation/{vm => mm}/page_frags.rst (100%) + rename Documentation/{vm => mm}/page_migration.rst (100%) + rename Documentation/{vm => mm}/page_owner.rst (100%) + rename Documentation/{vm => mm}/page_reclaim.rst (100%) + rename Documentation/{vm => mm}/page_table_check.rst (100%) + rename Documentation/{vm => mm}/page_tables.rst (100%) + rename Documentation/{vm => mm}/physical_memory.rst (100%) + rename Documentation/{vm => mm}/process_addrs.rst (100%) + rename Documentation/{vm => mm}/remap_file_pages.rst (100%) + rename Documentation/{vm => mm}/shmfs.rst (100%) + rename Documentation/{vm => mm}/slab.rst (100%) + rename Documentation/{vm => mm}/slub.rst (100%) + rename Documentation/{vm => mm}/split_page_table_lock.rst (100%) + rename Documentation/{vm => mm}/swap.rst (100%) + rename Documentation/{vm => mm}/transhuge.rst (100%) + rename Documentation/{vm => mm}/unevictable-lru.rst (100%) + rename Documentation/{vm => mm}/vmalloc.rst (100%) + rename Documentation/{vm => mm}/vmalloced-kernel-stacks.rst (100%) + rename Documentation/{vm => mm}/vmemmap_dedup.rst (100%) + rename Documentation/{vm => mm}/z3fold.rst (100%) + rename Documentation/{vm => mm}/zsmalloc.rst (100%) + create mode 100644 Documentation/powerpc/elf_hwcaps.rst + create mode 100644 Documentation/s390/vfio-ap-locking.rst + create mode 100644 Documentation/trace/rv/da_monitor_instrumentation.rst + create mode 100644 Documentation/trace/rv/da_monitor_synthesis.rst + create mode 100644 Documentation/trace/rv/deterministic_automata.rst + create mode 100644 Documentation/trace/rv/index.rst + create mode 100644 Documentation/trace/rv/monitor_wip.rst + create mode 100644 Documentation/trace/rv/monitor_wwnr.rst + create mode 100644 Documentation/trace/rv/runtime-verification.rst + rename Documentation/translations/zh_CN/{vm => mm}/active_mm.rst (98%) + rename Documentation/translations/zh_CN/{vm => mm}/balance.rst (99%) + rename Documentation/translations/zh_CN/{vm => mm}/damon/api.rst (91%) + rename Documentation/translations/zh_CN/{vm => mm}/damon/design.rst (98%) + rename Documentation/translations/zh_CN/{vm => mm}/damon/faq.rst (98%) + rename Documentation/translations/zh_CN/{vm => mm}/damon/index.rst (90%) + rename Documentation/translations/zh_CN/{vm => mm}/free_page_reporting.rst (97%) + rename Documentation/translations/zh_CN/{vm => mm}/frontswap.rst (99%) + rename Documentation/translations/zh_CN/{vm => mm}/highmem.rst (99%) + rename Documentation/translations/zh_CN/{vm => mm}/hmm.rst (99%) + rename Documentation/translations/zh_CN/{vm => mm}/hugetlbfs_reserv.rst (99%) + rename Documentation/translations/zh_CN/{vm => mm}/hwpoison.rst (99%) + rename Documentation/translations/zh_CN/{vm => mm}/index.rst (97%) + rename Documentation/translations/zh_CN/{vm => mm}/ksm.rst (98%) + rename Documentation/translations/zh_CN/{vm => mm}/memory-model.rst (98%) + rename Documentation/translations/zh_CN/{vm => mm}/mmu_notifier.rst (98%) + rename Documentation/translations/zh_CN/{vm => mm}/numa.rst (99%) + rename Documentation/translations/zh_CN/{vm => mm}/overcommit-accounting.rst (98%) + rename Documentation/translations/zh_CN/{vm => mm}/page_frags.rst (97%) + rename Documentation/translations/zh_CN/{vm => mm}/page_migration.rst (99%) + rename Documentation/translations/zh_CN/{vm => mm}/page_owner.rst (99%) + rename Documentation/translations/zh_CN/{vm => mm}/page_table_check.rst (97%) + rename Documentation/translations/zh_CN/{vm => mm}/remap_file_pages.rst (97%) + rename Documentation/translations/zh_CN/{vm => mm}/split_page_table_lock.rst (98%) + rename Documentation/translations/zh_CN/{vm => mm}/vmalloced-kernel-stacks.rst (98%) + rename Documentation/translations/zh_CN/{vm => mm}/z3fold.rst (96%) + rename Documentation/translations/zh_CN/{vm => mm}/zsmalloc.rst (98%) + delete mode 100644 arch/arm/common/dmabounce.c + delete mode 100644 arch/arm/include/asm/dma-mapping.h + create mode 100644 arch/arm/mach-footbridge/include/mach/dma-direct.h + delete mode 100644 arch/mips/configs/capcella_defconfig + delete mode 100644 arch/mips/configs/e55_defconfig + delete mode 100644 arch/mips/configs/mpc30x_defconfig + delete mode 100644 arch/mips/configs/tb0219_defconfig + delete mode 100644 arch/mips/configs/tb0226_defconfig + delete mode 100644 arch/mips/configs/tb0287_defconfig + delete mode 100644 arch/mips/configs/workpad_defconfig + delete mode 100644 arch/mips/include/asm/mach-vr41xx/irq.h + delete mode 100644 arch/mips/include/asm/vr41xx/capcella.h + delete mode 100644 arch/mips/include/asm/vr41xx/giu.h + delete mode 100644 arch/mips/include/asm/vr41xx/irq.h + delete mode 100644 arch/mips/include/asm/vr41xx/mpc30x.h + delete mode 100644 arch/mips/include/asm/vr41xx/pci.h + delete mode 100644 arch/mips/include/asm/vr41xx/siu.h + delete mode 100644 arch/mips/include/asm/vr41xx/tb0219.h + delete mode 100644 arch/mips/include/asm/vr41xx/tb0226.h + delete mode 100644 arch/mips/include/asm/vr41xx/tb0287.h + delete mode 100644 arch/mips/include/asm/vr41xx/vr41xx.h + delete mode 100644 arch/mips/pci/fixup-capcella.c + delete mode 100644 arch/mips/pci/fixup-mpc30x.c + delete mode 100644 arch/mips/pci/fixup-tb0219.c + delete mode 100644 arch/mips/pci/fixup-tb0226.c + delete mode 100644 arch/mips/pci/fixup-tb0287.c + delete mode 100644 arch/mips/pci/ops-vr41xx.c + delete mode 100644 arch/mips/pci/pci-vr41xx.c + delete mode 100644 arch/mips/pci/pci-vr41xx.h + delete mode 100644 arch/mips/vr41xx/Kconfig + delete mode 100644 arch/mips/vr41xx/Makefile + delete mode 100644 arch/mips/vr41xx/Platform + delete mode 100644 arch/mips/vr41xx/casio-e55/Makefile + delete mode 100644 arch/mips/vr41xx/casio-e55/setup.c + delete mode 100644 arch/mips/vr41xx/common/Makefile + delete mode 100644 arch/mips/vr41xx/common/bcu.c + delete mode 100644 arch/mips/vr41xx/common/cmu.c + delete mode 100644 arch/mips/vr41xx/common/giu.c + delete mode 100644 arch/mips/vr41xx/common/icu.c + delete mode 100644 arch/mips/vr41xx/common/init.c + delete mode 100644 arch/mips/vr41xx/common/irq.c + delete mode 100644 arch/mips/vr41xx/common/pmu.c + delete mode 100644 arch/mips/vr41xx/common/rtc.c + delete mode 100644 arch/mips/vr41xx/common/siu.c + delete mode 100644 arch/mips/vr41xx/common/type.c + delete mode 100644 arch/mips/vr41xx/ibm-workpad/Makefile + delete mode 100644 arch/mips/vr41xx/ibm-workpad/setup.c + create mode 100644 arch/openrisc/configs/virt_defconfig + create mode 100644 arch/powerpc/boot/dts/turris1x.dts + create mode 100644 arch/powerpc/kernel/irq_64.c + create mode 100644 arch/powerpc/kernel/syscall.c + create mode 100644 arch/powerpc/kvm/book3s_hv_p9_perf.c + create mode 100644 arch/powerpc/mm/kasan/init_book3e_64.c + create mode 100644 arch/powerpc/platforms/pseries/plpks.c + create mode 100644 arch/powerpc/platforms/pseries/plpks.h + create mode 100644 arch/powerpc/purgatory/kexec-purgatory.S + create mode 100644 arch/s390/kernel/cpufeature.c + create mode 100644 arch/um/include/asm/kasan.h + create mode 100644 drivers/char/tpm/tpm_tis_i2c.c + create mode 100644 drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c + create mode 100644 drivers/iommu/arm/arm-smmu/arm-smmu-qcom.h + rename include/linux/intel-iommu.h => drivers/iommu/intel/iommu.h (97%) + rename include/trace/events/intel_iommu.h => drivers/iommu/intel/trace.h (93%) + create mode 100644 drivers/mtd/nand/spi/ato.c + create mode 100644 drivers/mtd/parsers/scpart.c + create mode 100644 drivers/reset/reset-tps380x.c + create mode 100644 drivers/watchdog/pseries-wdt.c + create mode 100644 fs/xfs/xfs_notify_failure.c + create mode 100644 include/dt-bindings/sound/qcom,wcd9335.h + create mode 100644 include/linux/mfd/mt6331/core.h + create mode 100644 include/linux/mfd/mt6331/registers.h + create mode 100644 include/linux/mfd/mt6332/core.h + create mode 100644 include/linux/mfd/mt6332/registers.h + create mode 100644 include/linux/mfd/mt6357/core.h + create mode 100644 include/linux/mfd/mt6357/registers.h + delete mode 100644 include/linux/platform_data/video-imxfb.h + create mode 100644 include/linux/rv.h + create mode 100644 include/rv/automata.h + create mode 100644 include/rv/da_monitor.h + create mode 100644 include/rv/instrumentation.h + create mode 100644 include/trace/events/rv.h + create mode 100644 include/trace/events/rwmmio.h + create mode 100644 kernel/kallsyms_internal.h + create mode 100644 kernel/trace/rv/Kconfig + create mode 100644 kernel/trace/rv/Makefile + create mode 100644 kernel/trace/rv/monitors/wip/wip.c + create mode 100644 kernel/trace/rv/monitors/wip/wip.h + create mode 100644 kernel/trace/rv/monitors/wwnr/wwnr.c + create mode 100644 kernel/trace/rv/monitors/wwnr/wwnr.h + create mode 100644 kernel/trace/rv/reactor_panic.c + create mode 100644 kernel/trace/rv/reactor_printk.c + create mode 100644 kernel/trace/rv/rv.c + create mode 100644 kernel/trace/rv/rv.h + create mode 100644 kernel/trace/rv/rv_reactors.c + create mode 100644 lib/test_cpumask.c + create mode 100644 lib/trace_readwrite.c + create mode 100644 mm/damon/lru_sort.c + create mode 100644 mm/shrinker_debug.c + create mode 100644 sound/pci/hda/hda_cs_dsp_ctl.c + create mode 100644 sound/pci/hda/hda_cs_dsp_ctl.h + create mode 100644 sound/soc/amd/acp-es8336.c + create mode 100644 sound/soc/amd/acp/acp-rembrandt.c + create mode 100644 sound/soc/amd/rpl/Makefile + create mode 100644 sound/soc/amd/rpl/rpl-pci-acp6x.c + create mode 100644 sound/soc/amd/rpl/rpl_acp6x.h + create mode 100644 sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h + create mode 100644 sound/soc/codecs/hda-dai.c + create mode 100644 sound/soc/codecs/hda.c + create mode 100644 sound/soc/codecs/hda.h + create mode 100644 sound/soc/codecs/tas2780.c + create mode 100644 sound/soc/codecs/tas2780.h + create mode 100644 sound/soc/codecs/wsa883x.c + create mode 100644 sound/soc/intel/avs/boards/Kconfig + create mode 100644 sound/soc/intel/avs/boards/Makefile + create mode 100644 sound/soc/intel/avs/boards/da7219.c + create mode 100644 sound/soc/intel/avs/boards/dmic.c + create mode 100644 sound/soc/intel/avs/boards/hdaudio.c + create mode 100644 sound/soc/intel/avs/boards/i2s_test.c + create mode 100644 sound/soc/intel/avs/boards/max98357a.c + create mode 100644 sound/soc/intel/avs/boards/max98373.c + create mode 100644 sound/soc/intel/avs/boards/nau8825.c + create mode 100644 sound/soc/intel/avs/boards/rt274.c + create mode 100644 sound/soc/intel/avs/boards/rt286.c + create mode 100644 sound/soc/intel/avs/boards/rt298.c + create mode 100644 sound/soc/intel/avs/boards/rt5682.c + create mode 100644 sound/soc/intel/avs/boards/ssm4567.c + create mode 100644 sound/soc/intel/boards/bdw_rt286.c + delete mode 100644 sound/soc/intel/boards/broadwell.c + delete mode 100644 sound/soc/intel/boards/haswell.c + create mode 100644 sound/soc/intel/boards/hsw_rt5640.c + create mode 100644 sound/soc/intel/common/soc-acpi-intel-mtl-match.c + create mode 100644 sound/soc/mediatek/common/mtk-dsp-sof-common.c + create mode 100644 sound/soc/mediatek/common/mtk-dsp-sof-common.h + create mode 100644 sound/soc/mediatek/common/mtk-soc-card.h + create mode 100644 sound/soc/mediatek/mt8186/Makefile + create mode 100644 sound/soc/mediatek/mt8186/mt8186-afe-clk.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-afe-clk.h + create mode 100644 sound/soc/mediatek/mt8186/mt8186-afe-common.h + create mode 100644 sound/soc/mediatek/mt8186/mt8186-afe-control.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-afe-gpio.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-afe-gpio.h + create mode 100644 sound/soc/mediatek/mt8186/mt8186-afe-pcm.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-audsys-clk.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-audsys-clk.h + create mode 100644 sound/soc/mediatek/mt8186/mt8186-audsys-clkid.h + create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-adda.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-hostless.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-hw-gain.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-i2s.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-pcm.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-src.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-tdm.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-interconnection.h + create mode 100644 sound/soc/mediatek/mt8186/mt8186-misc-control.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-mt6366-common.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-mt6366-common.h + create mode 100644 sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-reg.h + create mode 100644 sound/soc/sof/intel/mtl.c + create mode 100644 sound/soc/sof/intel/mtl.h + create mode 100644 sound/soc/sof/intel/pci-mtl.c + create mode 100644 sound/soc/sof/ipc4-control.c + create mode 100644 sound/soc/sof/ipc4-pcm.c + create mode 100644 sound/soc/sof/ipc4-topology.c + create mode 100644 sound/soc/sof/ipc4-topology.h + delete mode 100644 sound/soc/tegra/tegra20_das.h + create mode 100644 sound/soc/tegra/tegra210_mbdrc.c + create mode 100644 sound/soc/tegra/tegra210_mbdrc.h + create mode 100644 sound/soc/tegra/tegra210_ope.c + create mode 100644 sound/soc/tegra/tegra210_ope.h + create mode 100644 sound/soc/tegra/tegra210_peq.c + create mode 100644 sound/soc/tegra/tegra210_peq.h + create mode 100644 tools/build/feature/test-disassembler-init-styled.c + create mode 100644 tools/cgroup/memcg_shrinker.py + create mode 100644 tools/include/tools/dis-asm-compat.h + create mode 100644 tools/perf/Documentation/perf-kwork.txt + delete mode 100644 tools/perf/arch/x86/tests/rdpmc.c + create mode 100644 tools/perf/arch/x86/util/cpuid.h + create mode 100644 tools/perf/builtin-kwork.c + create mode 100644 tools/perf/pmu-events/arch/x86/broadwell/uncore-cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwell/uncore-other.json + delete mode 100644 tools/perf/pmu-events/arch/x86/broadwell/uncore.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwellde/uncore-other.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwellx/uncore-other.json + create mode 100644 tools/perf/pmu-events/arch/x86/haswellx/uncore-other.json + create mode 100644 tools/perf/pmu-events/arch/x86/icelake/uncore-other.json + create mode 100644 tools/perf/pmu-events/arch/x86/ivytown/uncore-other.json + create mode 100644 tools/perf/pmu-events/arch/x86/jaketown/uncore-other.json + delete mode 100644 tools/perf/pmu-events/arch/x86/knightslanding/uncore-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/knightslanding/uncore-other.json + create mode 100644 tools/perf/pmu-events/arch/x86/meteorlake/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/meteorlake/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/meteorlake/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/meteorlake/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/meteorlake/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/meteorlake/virtual-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/skylake/uncore-cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/skylake/uncore-other.json + delete mode 100644 tools/perf/pmu-events/arch/x86/skylake/uncore.json + rename tools/perf/pmu-events/arch/x86/{tremontx => snowridgex}/cache.json (95%) + rename tools/perf/pmu-events/arch/x86/{tremontx => snowridgex}/floating-point.json (84%) + rename tools/perf/pmu-events/arch/x86/{tremontx => snowridgex}/frontend.json (94%) + rename tools/perf/pmu-events/arch/x86/{tremontx => snowridgex}/memory.json (99%) + rename tools/perf/pmu-events/arch/x86/{tremontx => snowridgex}/other.json (98%) + rename tools/perf/pmu-events/arch/x86/{tremontx => snowridgex}/pipeline.json (89%) + create mode 100644 tools/perf/pmu-events/arch/x86/snowridgex/uncore-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/snowridgex/uncore-other.json + create mode 100644 tools/perf/pmu-events/arch/x86/snowridgex/uncore-power.json + rename tools/perf/pmu-events/arch/x86/{tremontx => snowridgex}/virtual-memory.json (91%) + create mode 100644 tools/perf/pmu-events/arch/x86/tigerlake/uncore-other.json + delete mode 100644 tools/perf/pmu-events/arch/x86/tremontx/uncore-memory.json + delete mode 100644 tools/perf/pmu-events/arch/x86/tremontx/uncore-other.json + delete mode 100644 tools/perf/pmu-events/arch/x86/tremontx/uncore-power.json + create mode 100644 tools/perf/pmu-events/empty-pmu-events.c + delete mode 100644 tools/perf/pmu-events/jevents.c + create mode 100755 tools/perf/pmu-events/jevents.py + delete mode 100644 tools/perf/pmu-events/jsmn.c + delete mode 100644 tools/perf/pmu-events/jsmn.h + delete mode 100644 tools/perf/pmu-events/json.c + delete mode 100644 tools/perf/pmu-events/json.h + create mode 100755 tools/perf/tests/shell/test_brstack.sh + create mode 100644 tools/perf/util/bpf_kwork.c + create mode 100644 tools/perf/util/bpf_lock_contention.c + create mode 100644 tools/perf/util/bpf_skel/kwork_trace.bpf.c + create mode 100644 tools/perf/util/bpf_skel/lock_contention.bpf.c + create mode 100644 tools/perf/util/kwork.h + create mode 100644 tools/perf/util/lock-contention.h + create mode 100644 tools/perf/util/print-events.c + create mode 100644 tools/perf/util/print-events.h + create mode 100644 tools/perf/util/tracepoint.c + create mode 100644 tools/perf/util/tracepoint.h + rename {Documentation/vm => tools/testing/selftests/filesystems/fat}/.gitignore (66%) + create mode 100644 tools/testing/selftests/filesystems/fat/Makefile + create mode 100644 tools/testing/selftests/filesystems/fat/config + create mode 100644 tools/testing/selftests/filesystems/fat/rename_exchange.c + create mode 100644 tools/testing/selftests/filesystems/fat/run_fat_tests.sh + create mode 100644 tools/testing/selftests/powerpc/mce/.gitignore + create mode 100644 tools/testing/selftests/powerpc/pmu/branch_loops.S + create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/Makefile + create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/blacklisted_events_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/event_alternatives_tests_p10.c + create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/event_alternatives_tests_p9.c + create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/generic_events_valid_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_cache_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_l2l3_sel_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_mmcra_sample_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_pmc56_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_pmc_count_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_radix_scope_qual_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_repeat_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_thresh_cmp_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_thresh_ctl_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_thresh_sel_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_unit_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/group_pmc56_exclude_constraints_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/hw_cache_event_type_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/invalid_event_code_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/reserved_bits_mmcra_sample_elig_mode_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/reserved_bits_mmcra_thresh_ctl_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/bhrb_filter_map_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/bhrb_no_crash_wo_pmu_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/intr_regs_no_crash_wo_pmu_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/mmcr1_sel_unit_cache_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_any_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_cond_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_disable_no_branch_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_disable_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_ind_call_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_thresh_cmp_test.c + create mode 100644 tools/testing/selftests/powerpc/ptrace/ptrace-gpr.S + create mode 100755 tools/testing/selftests/vm/va_128TBswitch.sh + create mode 100644 tools/verification/dot2/Makefile + create mode 100644 tools/verification/dot2/automata.py + create mode 100644 tools/verification/dot2/dot2c + create mode 100644 tools/verification/dot2/dot2c.py + create mode 100644 tools/verification/dot2/dot2k + create mode 100644 tools/verification/dot2/dot2k.py + create mode 100644 tools/verification/dot2/dot2k_templates/main_global.c + create mode 100644 tools/verification/dot2/dot2k_templates/main_per_cpu.c + create mode 100644 tools/verification/dot2/dot2k_templates/main_per_task.c + create mode 100644 tools/verification/models/wip.dot + create mode 100644 tools/verification/models/wwnr.dot +Merging fixes/fixes (4a57a8400075 vf/remap: return the amount of bytes actually deduplicated) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes +Already up to date. +Merging mm-hotfixes/mm-hotfixes-unstable (b2f4c6e29531 mm/smaps: don't access young/dirty bit if pte unpresent) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Auto-merging .mailmap +Auto-merging fs/proc/task_mmu.c +Auto-merging mm/hugetlb.c +Auto-merging mm/page-writeback.c +Auto-merging mm/shmem.c +Auto-merging mm/vmscan.c +Merge made by the 'ort' strategy. + .mailmap | 2 ++ + fs/fs-writeback.c | 12 ++++++------ + fs/proc/task_mmu.c | 7 ++++--- + mm/backing-dev.c | 10 +++++----- + mm/hugetlb.c | 2 +- + mm/page-writeback.c | 6 +++++- + mm/shmem.c | 1 + + mm/vmscan.c | 10 ++++------ + 8 files changed, 28 insertions(+), 22 deletions(-) +Merging kbuild-current/fixes (32346491ddf2 Linux 5.19-rc6) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (952deecb065e arc: dts: Harmonize EHCI/OHCI DT nodes name) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Auto-merging arch/arc/kernel/smp.c +Merge made by the 'ort' strategy. + arch/arc/boot/dts/axc003.dtsi | 4 ++-- + arch/arc/boot/dts/axc003_idu.dtsi | 4 ++-- + arch/arc/boot/dts/axs10x_mb.dtsi | 4 ++-- + arch/arc/boot/dts/hsdk.dts | 4 ++-- + arch/arc/boot/dts/vdk_axs10x_mb.dtsi | 2 +- + arch/arc/include/asm/bitops.h | 4 ++-- + arch/arc/include/asm/entry-compact.h | 2 +- + arch/arc/kernel/smp.c | 2 +- + arch/arc/mm/cache.c | 4 ++-- + 9 files changed, 15 insertions(+), 15 deletions(-) +Merging arm-current/fixes (ec85bd369fd2 ARM: findbit: fix overflowing offset) +$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (410982303772 arm64: hugetlb: Restore TLB invalidation for BBM on contiguous ptes) +$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (879bcfc4e536 Merge tag 'asahi-soc-maintainers-5.20' of https://github.com/AsahiLinux/linux into arm/fixes) +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Already up to date. +Merging drivers-memory-fixes/fixes (1332661e0930 memory: samsung: exynos5422-dmc: Fix refcount leak in of_get_dram_timings) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Already up to date. +Merging tee-fixes/fixes (98268f2a2a9f Merge branch 'optee_ffa_probe_fix_for_v5.18' into fixes) +$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes +Merge made by the 'ort' strategy. +Merging m68k-current/for-linus (b508128bb0d1 m68k: defconfig: Update defconfigs for v5.19-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (3d7cb6b04c3f Linux 5.19) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (918e75f77af7 s390/archrandom: prevent CPACF trng invocations in interrupt context) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git 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 -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master +Already up to date. +Merging fscrypt-current/for-stable (80f6e3080bfc fs-verity: fix signed integer overflow with i_size near S64_MAX) +$ git merge -m Merge branch 'for-stable' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt-current/for-stable +Already up to date. +Merging net/master (ac0dbed9ba4c net: seg6: initialize induction variable to first valid array index) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/networking/bonding.rst | 9 - + MAINTAINERS | 2 +- + drivers/net/bonding/bond_main.c | 35 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 1 - + drivers/net/ethernet/broadcom/genet/bcmmii.c | 3 + + drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 6 + + .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 15 +- + .../net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 3 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 19 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 1 + + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 2 + + drivers/net/ethernet/wangxun/Kconfig | 6 +- + drivers/net/phy/phy_device.c | 6 + + drivers/net/tap.c | 20 +- + drivers/net/veth.c | 4 - + include/net/bonding.h | 13 +- + net/ax25/ax25_timer.c | 4 +- + net/ipv6/seg6_local.c | 10 +- + net/mptcp/protocol.c | 47 ++- + net/mptcp/protocol.h | 13 +- + net/mptcp/subflow.c | 3 +- + net/netfilter/Kconfig | 3 +- + net/netfilter/nf_tables_core.c | 21 +- + net/sched/sch_generic.c | 8 +- + tools/testing/selftests/net/.gitignore | 3 +- + tools/testing/selftests/net/Makefile | 2 +- + tools/testing/selftests/net/mptcp/mptcp_connect.c | 26 +- + tools/testing/selftests/net/tap.c | 434 +++++++++++++++++++++ + .../selftests/netfilter/nft_trans_stress.sh | 81 +++- + 29 files changed, 675 insertions(+), 125 deletions(-) + create mode 100644 tools/testing/selftests/net/tap.c +Merging bpf/master (62d468e5e100 bpf: Cleanup ftrace hash in bpf_trampoline_put) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Merge made by the 'ort' strategy. + Documentation/bpf/bpf_design_QA.rst | 25 +++++++++++++++++++++++++ + include/linux/bpfptr.h | 8 ++++++-- + kernel/bpf/trampoline.c | 5 ++++- + 3 files changed, 35 insertions(+), 3 deletions(-) +Merging ipsec/master (6aa811acdb76 xfrm: clone missing x->lastused in xfrm_do_migrate) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Auto-merging include/uapi/linux/xfrm.h +Auto-merging net/xfrm/xfrm_state.c +Merge made by the 'ort' strategy. + include/uapi/linux/xfrm.h | 2 +- + net/xfrm/xfrm_input.c | 1 - + net/xfrm/xfrm_output.c | 1 - + net/xfrm/xfrm_policy.c | 1 + + net/xfrm/xfrm_state.c | 1 + + 5 files changed, 3 insertions(+), 3 deletions(-) +Merging netfilter/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master +Already up to date. +Merging ipvs/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/master +Already up to date. +Merging wireless/for-next (11052589cf5c tcp/udp: Make early_demux back namespacified.) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Already up to date. +Merging rdma-fixes/for-rc (cc0315564d6e RDMA/irdma: Fix sleep from invalid context BUG) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (666d3b612f91 ALSA: ice1712: remove redundant assignment to new) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'ort' strategy. + sound/pci/hda/patch_realtek.c | 11 +++++++++++ + sound/pci/ice1712/quartet.c | 2 +- + 2 files changed, 12 insertions(+), 1 deletion(-) +Merging sound-asoc-fixes/for-linus (f16e5a31c0a9 Merge remote-tracking branch 'asoc/for-5.19' into asoc-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Auto-merging sound/soc/sh/rcar/ssiu.c +Merge made by the 'ort' strategy. + sound/soc/amd/yc/acp6x-mach.c | 28 ++++++++++++++++++++++++++++ + sound/soc/intel/avs/pcm.c | 4 ++-- + sound/soc/intel/boards/sof_es8336.c | 4 +++- + sound/soc/sh/rz-ssi.c | 26 +++++++++++++++----------- + sound/soc/soc-pcm.c | 3 +++ + sound/soc/sof/debug.c | 6 +++--- + sound/soc/sof/intel/hda.c | 2 +- + sound/soc/sof/ipc3-topology.c | 2 +- + 8 files changed, 56 insertions(+), 19 deletions(-) +Merging regmap-fixes/for-linus (3f05010f243b regmap-irq: Fix offset/index mismatch in read_sub_irq_data()) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (b0de7fa70650 regulator: pca9450: Remove restrictions for regulator-name) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Merge made by the 'ort' strategy. + .../devicetree/bindings/regulator/nxp,pca9450-regulator.yaml | 11 ----------- + 1 file changed, 11 deletions(-) +Merging spi-fixes/for-linus (4188e495dd66 Merge remote-tracking branch 'spi/for-5.19' into spi-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Auto-merging Documentation/devicetree/bindings/spi/qcom,spi-geni-qcom.yaml +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging drivers/spi/spi-bcm2835.c +Auto-merging drivers/spi/spi.c +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + drivers/spi/spi.c | 14 +++++++------- + 2 files changed, 8 insertions(+), 8 deletions(-) +Merging pci-current/for-linus (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (b2a88c212e65 Merge tag 'xfs-5.20-merge-6' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (ff6992735ade Linux 5.19-rc7) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (b2a88c212e65 Merge tag 'xfs-5.20-merge-6' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (ff6992735ade Linux 5.19-rc7) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Already up to date. +Merging phy/fixes (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (b2a88c212e65 Merge tag 'xfs-5.20-merge-6' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (b3e6b165f59f iio: adc: mcp3911: use correct formula for AD conversion) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'ort' strategy. + drivers/iio/adc/mcp3911.c | 30 ++++++++++++++++++++++++------ + drivers/iio/light/cm3605.c | 6 ++++-- + 2 files changed, 28 insertions(+), 8 deletions(-) +Merging counter-fixes/fixes-togreg (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'fixes-togreg' of https://gitlab.com/vilhelmgray/counter.git counter-fixes/fixes-togreg +Already up to date. +Merging char-misc.current/char-misc-linus (1612c382ffbd Merge tag 'x86-urgent-2022-08-06' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (3d7cb6b04c3f Linux 5.19) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (8bb5e7f4dcd9 Merge branch 'next' into for-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Auto-merging drivers/input/touchscreen/wm97xx-core.c +Auto-merging include/uapi/linux/input.h +Merge made by the 'ort' strategy. + .../devicetree/bindings/input/adc-joystick.yaml | 2 +- + .../devicetree/bindings/input/adc-keys.txt | 67 - + .../devicetree/bindings/input/adc-keys.yaml | 103 ++ + .../input/allwinner,sun4i-a10-lradc-keys.yaml | 5 +- + .../devicetree/bindings/input/ariel-pwrbutton.yaml | 1 + + .../devicetree/bindings/input/azoteq,iqs7222.yaml | 41 +- + .../bindings/input/fsl,mpr121-touchkey.yaml | 4 +- + .../devicetree/bindings/input/gpio-keys.yaml | 167 ++- + Documentation/devicetree/bindings/input/input.yaml | 24 +- + .../devicetree/bindings/input/iqs269a.yaml | 17 +- + .../devicetree/bindings/input/iqs626a.yaml | 13 +- + .../devicetree/bindings/input/iqs62x-keys.yaml | 9 +- + .../devicetree/bindings/input/max77650-onkey.yaml | 8 +- + .../bindings/input/microchip,cap11xx.yaml | 2 +- + .../bindings/input/touchscreen/edt-ft5x06.yaml | 8 + + drivers/input/input-core-private.h | 16 + + drivers/input/input-mt.c | 48 +- + drivers/input/input.c | 149 +-- + drivers/input/joystick/adc-joystick.c | 15 +- + drivers/input/joystick/sensehat-joystick.c | 4 +- + drivers/input/keyboard/Kconfig | 2 +- + drivers/input/keyboard/adp5588-keys.c | 206 ++-- + drivers/input/keyboard/cros_ec_keyb.c | 89 +- + drivers/input/keyboard/mt6779-keypad.c | 18 +- + drivers/input/keyboard/mtk-pmic-keys.c | 98 +- + drivers/input/keyboard/omap4-keypad.c | 26 +- + drivers/input/misc/iqs7222.c | 178 ++- + drivers/input/mouse/cyapa_gen6.c | 2 +- + drivers/input/mouse/gpio_mouse.c | 2 +- + drivers/input/serio/i8042-x86ia64io.h | 1282 ++++++++++++-------- + drivers/input/touchscreen/edt-ft5x06.c | 96 +- + drivers/input/touchscreen/exc3000.c | 7 +- + drivers/input/touchscreen/goodix.c | 22 +- + drivers/input/touchscreen/zinitix.c | 112 +- + 34 files changed, 1709 insertions(+), 1134 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/input/adc-keys.txt + create mode 100644 Documentation/devicetree/bindings/input/adc-keys.yaml + create mode 100644 drivers/input/input-core-private.h +Merging crypto-current/master (af5d35b83f64 crypto: tcrypt - Remove the static variable initialisations to NULL) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Already up to date. +Merging vfio-fixes/for-linus (afe4e376ac5d vfio: Move IOMMU_CAP_CACHE_COHERENCY test to after we know we have a group) +$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (9b4d5c01eb23 selftests: make use of GUP_TEST_FILE macro) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (e69a66147d49 module: kallsyms: Ensure preemption in add_kallsyms() with PREEMPT_RT) +$ git merge -m Merge branch 'modules-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (607a48c78e6b dt-bindings: dma: allwinner,sun50i-a64-dma: Fix min/max typo) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (0fddf9ad06fd mtd: rawnand: gpmi: Set WAIT_FOR_READY timeout based on program/erase times) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git 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 -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (3bcc2c1eade4 media: rkvdec: Disable H.264 error detection) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes +Auto-merging drivers/media/i2c/Kconfig +Auto-merging drivers/media/v4l2-core/v4l2-ioctl.c +Auto-merging drivers/staging/media/rkvdec/rkvdec-h264.c +Merge made by the 'ort' strategy. + drivers/media/dvb-core/dvb_vb2.c | 11 +++++++++ + .../platform/mediatek/vcodec/mtk_vcodec_enc_drv.c | 9 +++----- + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 2 ++ + drivers/media/v4l2-core/v4l2-ioctl.c | 26 ++++++++++------------ + drivers/staging/media/rkvdec/rkvdec-h264.c | 4 ++-- + 5 files changed, 30 insertions(+), 22 deletions(-) +Merging reset-fixes/reset/fixes (a57f68ddc886 reset: Fix devm bulk optional exclusive control getter) +$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (88084a3df167 Linux 5.19-rc5) +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (ef0324b6415d ARM: dts: lan966x: fix sys_clk frequency) +$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (2eb502f496f7 ARM: dts: am33xx: Fix MMCHS0 dma properties) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes +Merge made by the 'ort' strategy. + arch/arm/boot/dts/am33xx-l4.dtsi | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging kvm-fixes/master (cf5029d5dd7c KVM: x86: Protect the unused bits in MSR exiting flags) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (cf5029d5dd7c KVM: x86: Protect the unused bits in MSR exiting flags) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (88084a3df167 Linux 5.19-rc5) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (17d9c15c9b9e fsdax: Fix infinite loop in dax_iomap_rw()) +$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Auto-merging drivers/nvdimm/pmem.c +Auto-merging fs/dax.c +Merge made by the 'ort' strategy. + drivers/nvdimm/namespace_devs.c | 2 - + drivers/nvdimm/pmem.c | 6 +-- + fs/dax.c | 3 ++ + tools/testing/nvdimm/test/ndtest.c | 77 -------------------------------------- + 4 files changed, 6 insertions(+), 82 deletions(-) +Merging cxl-fixes/fixes (e35f5718903b cxl/mbox: Fix missing variable payload checks in cmd size validation) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging btrfs-fixes/next-fixes (af39011ec0c7 Merge branch 'misc-5.19' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Auto-merging fs/btrfs/tree-log.c +Merge made by the 'ort' strategy. +Merging vfs-fixes/fixes (c3497fd009ef fix short copy handling in copy_mc_pipe_to_iter()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (3be4562584bb dma-direct: use the correct size for dma_set_encrypted()) +$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge -m Merge branch 'i3c/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c-fixes/i3c/fixes +Already up to date. +Merging drivers-x86-fixes/fixes (5ad26161a371 ACPI: video: Fix acpi_video_handles_brightness_key_presses()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (c4c79525042a ARM: exynos: Fix refcount leak in exynos_map_pmu) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (0b9431c8221c dt-bindings: display: arm,malidp: remove bogus RQOS property) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Already up to date. +Merging dt-krzk-fixes/fixes (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes +Already up to date. +Merging scsi-fixes/fixes (f5c2976e0cb0 scsi: ufs: core: Fix a race condition related to device management) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (3d7cb6b04c3f Linux 5.19) +$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git 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 -m Merge branch 'drm-fixes' of git://people.freedesktop.org/~agd5f/linux amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (3d7cb6b04c3f Linux 5.19) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (51189eb9ddc8 mmc: sdhci-omap: Fix a lockdep warning for PM runtime init) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git 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 -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Auto-merging drivers/rtc/rtc-cmos.c +Merge made by the 'ort' strategy. +Merging gnss-fixes/gnss-linus (a111daf0c53a Linux 5.19-rc3) +$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (49d6a3c062a1 x86/Hyper-V: Add SEV negotiate protocol support in Isolation VM) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (4b0986a3613c Linux 5.18) +$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (88bd24d73d5b riscv: compat: vdso: Fix vdso_install target) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Already up to date. +Merging risc-v-mc-fixes/dt-fixes (efa310ba0071 riscv: dts: microchip: hook up the mpfs' l2cache) +$ git merge -m Merge branch 'dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git risc-v-mc-fixes/dt-fixes +Already up to date. +Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd-fixes/fixes +Already up to date. +Merging fpga-fixes/fixes (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (b2a88c212e65 Merge tag 'xfs-5.20-merge-6' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (e0dccc3b76fb Linux 5.19-rc8) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (b93a8b2c5161 gpio: dln2: make irq_chip immutable) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (ba79c5e45eec MAINTAINERS: Update Intel pin control to Supported) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (8b1ac84dcf2c Documentation/ABI: sysfs-fs-erofs: Fix Sphinx errors) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (c3c07fc25f37 ubi: fastmap: Return error code if memory allocation fails in add_aeb()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes +Already up to date. +Merging memblock-fixes/fixes (c94afc46cae7 memblock: use kfree() to release kmalloced memblock regions) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Already up to date. +Merging cel-fixes/for-rc (1197eb5906a5 lockd: fix nlm_close_files) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux cel-fixes/for-rc +Already up to date. +Merging irqchip-fixes/irq/irqchip-fixes (54cfa910b443 irqchip/loongson-eiointc: Fix a build warning) +$ git merge -m Merge branch 'irq/irqchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip-fixes/irq/irqchip-fixes +Merge made by the 'ort' strategy. + drivers/iommu/hyperv-iommu.c | 4 +--- + drivers/irqchip/irq-loongson-eiointc.c | 10 +++++++--- + 2 files changed, 8 insertions(+), 6 deletions(-) +Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging broadcom-fixes/fixes (a26f045984e7 Merge branch 'devicetree/fixes' into fixes) +$ git merge -m Merge branch 'fixes' of https://github.com/Broadcom/stblinux.git broadcom-fixes/fixes +Merge made by the 'ort' strategy. +Merging perf-current/perf/urgent (bb83c99d3d0a Merge tag 'perf-tools-fixes-for-v5.19-2022-07-29' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux) +$ git merge -m Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf-current/perf/urgent +Already up to date. +Merging efi-fixes/urgent (aa6d1ed107eb efi/x86: libstub: Fix typo in __efi64_argmap* name) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging zstd-fixes/zstd-linus (88a309465b3f lib: zstd: clean up double word in comment.) +$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus +Merge made by the 'ort' strategy. + include/linux/zstd_lib.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging battery-fixes/fixes (093d27bb6f2d power: supply: core: Fix boundary conditions in interpolation) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (c20ee5749a3f drm/nouveau: recognise GA103) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/device/base.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/imx/dcss/dcss-kms.c | 2 -- + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 22 ++++++++++++++++++++++ + 2 files changed, 22 insertions(+), 2 deletions(-) +Merging kbuild/for-next (672fb6740cbf modpost: remove .symbol_white_list field entirely) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging init/Kconfig +Auto-merging scripts/mod/modpost.c +Merge made by the 'ort' strategy. + Documentation/kbuild/kconfig-language.rst | 2 +- + MAINTAINERS | 1 - + Makefile | 18 +- + arch/arc/configs/axs101_defconfig | 1 - + arch/arc/configs/axs103_defconfig | 1 - + arch/arc/configs/axs103_smp_defconfig | 1 - + arch/arc/configs/haps_hs_defconfig | 1 - + arch/arc/configs/haps_hs_smp_defconfig | 1 - + arch/arc/configs/hsdk_defconfig | 1 - + arch/arc/configs/nsim_700_defconfig | 1 - + arch/arc/configs/nsimosci_defconfig | 1 - + arch/arc/configs/nsimosci_hs_defconfig | 1 - + arch/arc/configs/nsimosci_hs_smp_defconfig | 1 - + arch/arc/configs/tb10x_defconfig | 1 - + arch/arc/configs/vdk_hs38_defconfig | 1 - + arch/arc/configs/vdk_hs38_smp_defconfig | 1 - + certs/Makefile | 14 +- + certs/blacklist_hashes.c | 1 - + certs/blacklist_nohashes.c | 6 - + {scripts => certs}/check-blacklist-hashes.awk | 0 + init/Kconfig | 16 +- + scripts/Kconfig.include | 2 +- + scripts/Makefile.build | 5 +- + scripts/Makefile.compiler | 2 +- + scripts/Makefile.extrawarn | 1 - + scripts/Makefile.modinst | 3 + + scripts/Makefile.package | 4 +- + scripts/checkstack.pl | 4 + + .../dummy-plugin-dir/include/plugin-version.h | 0 + scripts/dummy-tools/gcc | 8 +- + scripts/headers_install.sh | 2 - + scripts/kconfig/qconf-cfg.sh | 1 + + scripts/mod/file2alias.c | 4 +- + scripts/mod/modpost.c | 281 ++++----------------- + scripts/mod/modpost.h | 33 ++- + scripts/package/mkspec | 3 + + 36 files changed, 111 insertions(+), 313 deletions(-) + delete mode 100644 certs/blacklist_nohashes.c + rename {scripts => certs}/check-blacklist-hashes.awk (100%) + create mode 100644 scripts/dummy-tools/dummy-plugin-dir/include/plugin-version.h +Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros) +$ git merge -m Merge branch 'clang-format' of https://github.com/ojeda/linux.git clang-format/clang-format +Already up to date. +Merging perf/perf/core (bb8bc52e7578 perf stat: Refactor __run_perf_stat() common code) +$ git merge -m Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf/core +Already up to date. +Merging compiler-attributes/compiler-attributes (7c00621dcaee compiler_types: mark __compiletime_assert failure as __noreturn) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (5c850d31880e swiotlb: fix passing local variable to debugfs_create_ulong()) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Already up to date. +Merging asm-generic/master (82dc270146a8 Merge branch 'asm-generic-fixes' into asm-generic) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Auto-merging include/asm-generic/io.h +Auto-merging tools/include/uapi/asm-generic/fcntl.h +Merge made by the 'ort' strategy. +Merging arc/for-next (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next +Already up to date. +Merging arm/for-next (3eaecd0677e1 Merge branches 'misc' and 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next +Merge made by the 'ort' strategy. +Merging arm64/for-next/core (892f7237b3ff arm64: Delay initialisation of cpuinfo_arm64::reg_{zcr,smcr}) +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (aaaee7b55c9e docs: perf: Include hns3-pmu.rst in toctree to fix 'htmldocs' WARNING) +$ git merge -m Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (87a5b37a8f02 Merge branch 'arm/late' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/boot/dts/at91-sam9x60ek.dts +Auto-merging arch/arm/boot/dts/at91-sama5d2_icp.dts +Auto-merging arch/arm/boot/dts/imx6ull-colibri.dtsi +Auto-merging arch/arm/boot/dts/imx7d-smegw01.dts +Auto-merging arch/arm/boot/dts/lan966x-kontron-kswitch-d10-mmt.dtsi +Auto-merging arch/arm/boot/dts/lan966x.dtsi +Auto-merging arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi +Auto-merging arch/arm/boot/dts/qcom-msm8974.dtsi +Auto-merging arch/arm/boot/dts/sama5d2.dtsi +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/configs/mxs_defconfig +Auto-merging arch/arm/mach-davinci/Kconfig +Auto-merging arch/arm/mach-dove/Kconfig +Auto-merging arch/arm/mach-orion5x/Kconfig +Auto-merging arch/arm/mach-s3c/Kconfig.s3c24xx +Auto-merging arch/arm/mach-s3c/Kconfig.s3c64xx +CONFLICT (content): Merge conflict in arch/arm/mach-s3c/Kconfig.s3c64xx +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mp-evk.dts +Auto-merging arch/arm64/boot/dts/freescale/imx8mp.dtsi +Auto-merging arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi +Auto-merging arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/configs/defconfig +CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig +Auto-merging drivers/irqchip/Kconfig +Auto-merging drivers/reset/Kconfig +Auto-merging drivers/reset/Makefile +Merge made by the 'ort' strategy. + arch/arm/arm-soc-for-next-contents.txt | 246 +++++++++++++++++++++++++++++++++ + 1 file changed, 246 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git actions/for-next +Auto-merging arch/arm/boot/dts/owl-s500-roseapplepi.dts +Merge made by the 'ort' strategy. +Merging amlogic/for-next (147c83586707 Merge branch 'v5.20/drivers' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Merge made by the 'ort' strategy. +Merging aspeed/for-next (bfcbea2c93e5 ARM: dts: aspeed: nuvia: rename vendor nuvia to qcom) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'ort' strategy. +Merging at91/at91-next (38b729bf1ee6 Merge branch 'at91-dt' into at91-next) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Auto-merging arch/arm/boot/dts/lan966x-kontron-kswitch-d10-mmt.dtsi +Auto-merging arch/arm/boot/dts/lan966x.dtsi +Auto-merging arch/arm/boot/dts/sama5d2.dtsi +Merge made by the 'ort' strategy. + drivers/clk/at91/dt-compat.c | 108 +++++++++++++++++++++++++++++++++---------- + 1 file changed, 84 insertions(+), 24 deletions(-) +Merging broadcom/next (ade0d6ecf54a Merge branch 'drivers/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Auto-merging arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts +Auto-merging arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi +Auto-merging drivers/soc/bcm/brcmstb/pm/pm-arm.c +Merge made by the 'ort' strategy. + arch/arm/boot/dts/bcm5301x.dtsi | 12 ++++ + .../broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts | 48 +++++++++++++ + arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | 83 ++++++++++++++++++++++ + drivers/soc/bcm/brcmstb/pm/pm-arm.c | 16 ++++- + 4 files changed, 157 insertions(+), 2 deletions(-) +Merging drivers-memory/for-next (1b33eb4acdc8 Merge branch 'for-v5.20/mem-ctrl-next-late' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Auto-merging drivers/memory/mtk-smi.c +Merge made by the 'ort' strategy. + drivers/memory/dfl-emif.c | 62 ++++++++++++++++++++++++++++++++++++++++++---- + drivers/memory/of_memory.c | 2 ++ + drivers/memory/pl353-smc.c | 1 + + 3 files changed, 60 insertions(+), 5 deletions(-) +Merging imx-mxs/for-next (37960df982d0 Merge branch 'imx/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Auto-merging arch/arm/boot/dts/imx6qdl-colibri.dtsi +Auto-merging arch/arm/boot/dts/imx6qdl.dtsi +Auto-merging arch/arm/boot/dts/imx6ull-colibri.dtsi +Auto-merging arch/arm/boot/dts/imx7d-smegw01.dts +Auto-merging arch/arm/boot/dts/imx7s.dtsi +Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mp-evk.dts +Auto-merging arch/arm64/boot/dts/freescale/imx8mp.dtsi +Auto-merging drivers/soc/imx/imx8m-blk-ctrl.c +Merge made by the 'ort' strategy. +Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git keystone/next +Merge made by the 'ort' strategy. +Merging mediatek/for-next (5281655db0e1 Merge branch 'v5.19-next/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git mediatek/for-next +Merge made by the 'ort' strategy. +Merging mvebu/for-next (bc50bfd4f018 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Merge made by the 'ort' strategy. +Merging omap/for-next (ad2fe4582c48 Merge branches 'omap-for-v5.20/omap1', 'omap-for-v5.20/ti-sysc' and 'omap-for-v5.20/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next +Auto-merging arch/arm/mach-omap1/Kconfig +Auto-merging arch/arm/mach-omap1/timer.c +Merge made by the 'ort' strategy. + arch/arm/mach-omap1/Kconfig | 22 +++++++++++----------- + arch/arm/mach-omap1/timer.c | 2 +- + arch/arm/mach-omap2/omap4-common.c | 1 + + drivers/bus/ti-sysc.c | 3 +++ + 4 files changed, 16 insertions(+), 12 deletions(-) +Merging qcom/for-next (58b9ca29ff61 Merge branches 'arm64-for-5.20', 'arm64-defconfig-for-5.20', 'clk-for-5.20', 'dts-for-5.20', 'dts-fixes-for-5.19' and 'drivers-for-5.20' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml +Auto-merging MAINTAINERS +Auto-merging arch/arm/boot/dts/qcom-msm8974.dtsi +Merge made by the 'ort' strategy. +Merging raspberrypi/for-next (c5915b53d4c2 dt-bindings: soc: bcm: Convert brcm,bcm2835-vchiq to json-schema) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git raspberrypi/for-next +Auto-merging arch/arm/boot/dts/bcm2711-rpi-400.dts +Merge made by the 'ort' strategy. +Merging renesas/next (b5468cb7909f Merge branches 'renesas-arm-dt-for-v5.20' and 'renesas-dt-bindings-for-v5.20' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Merge made by the 'ort' strategy. +Merging reset/reset/next (d985db836226 reset: tps380x: Fix spelling mistake "Voltags" -> "Voltage") +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Already up to date. +Merging rockchip/for-next (2e1170c71ec0 Merge branch 'v5.20-armsoc/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Auto-merging arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi +Auto-merging arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts +Merge made by the 'ort' strategy. +Merging samsung-krzk/for-next (5642cb8ce0f1 Merge branch 'next/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Auto-merging arch/arm64/boot/dts/exynos/exynos7885.dtsi +Merge made by the 'ort' strategy. +Merging scmi/for-linux-next (3d7cb6b04c3f Linux 5.19) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Already up to date. +Merging stm32/stm32-next (4b43ff02d2a4 ARM: dts: stm32: Add ST MIPID02 bindings to AV96) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'ort' strategy. + arch/arm/boot/dts/stm32mp131.dtsi | 2 ++ + 1 file changed, 2 insertions(+) +Merging sunxi/sunxi/for-next (3a83b092dd59 Merge branch 'sunxi/dt-for-5.20' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'ort' strategy. +Merging tee/next (db30e53bf897 Merge branch 'tee_cleanup_for_v5.19' into next) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Auto-merging drivers/tee/tee_shm.c +Merge made by the 'ort' strategy. +Merging tegra/for-next (393c6c3a6152 Merge branch for-5.20/arm64/defconfig into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'ort' strategy. + drivers/soc/tegra/Kconfig | 11 +- + drivers/soc/tegra/Makefile | 1 + + drivers/soc/tegra/cbb/Makefile | 9 + + drivers/soc/tegra/cbb/tegra-cbb.c | 190 +++ + drivers/soc/tegra/cbb/tegra194-cbb.c | 2365 ++++++++++++++++++++++++++++++++ + drivers/soc/tegra/cbb/tegra234-cbb.c | 1114 +++++++++++++++ + drivers/soc/tegra/fuse/fuse-tegra.c | 16 + + drivers/soc/tegra/fuse/tegra-apbmisc.c | 36 +- + include/soc/tegra/fuse.h | 7 + + include/soc/tegra/tegra-cbb.h | 47 + + 10 files changed, 3791 insertions(+), 5 deletions(-) + create mode 100644 drivers/soc/tegra/cbb/Makefile + create mode 100644 drivers/soc/tegra/cbb/tegra-cbb.c + create mode 100644 drivers/soc/tegra/cbb/tegra194-cbb.c + create mode 100644 drivers/soc/tegra/cbb/tegra234-cbb.c + create mode 100644 include/soc/tegra/tegra-cbb.h +Merging ti/ti-next (62b9e4033c13 Merge branches 'ti-drivers-soc-next' and 'ti-k3-dts-next' into ti-next) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Merge made by the 'ort' strategy. +Merging xilinx/for-next (b2a88c212e65 Merge tag 'xfs-5.20-merge-6' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Already up to date. +Merging clk/clk-next (08fc500fe3d4 Merge branch 'clk-allwinner' into clk-next) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Already up to date. +Merging clk-imx/for-next (c196175acdd3 clk: imx: clk-fracn-gppll: Add more freq config for video pll) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Already up to date. +Merging clk-renesas/renesas-clk (0e704f6c42dc clk: renesas: rcar-gen4: Fix initconst confusion for cpg_pll_config) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Already up to date. +Merging clk-samsung/for-next (b35f27fe73d8 clk: samsung: exynosautov9: add cmu_peric1 clock support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git clk-samsung/for-next +Already up to date. +Merging csky/linux-next (45fef4c4b9c9 csky: abiv1: Fixup compile error) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Already up to date. +Merging loongarch/loongarch-next (2c25940dedb1 LoongArch: Add efistub booting support) +$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Auto-merging arch/loongarch/Kconfig +Auto-merging arch/loongarch/Kconfig +Auto-merging arch/loongarch/include/asm/uaccess.h +Auto-merging arch/loongarch/kernel/head.S +Auto-merging drivers/acpi/bus.c +Auto-merging drivers/firmware/efi/Kconfig +Auto-merging drivers/irqchip/Kconfig +Auto-merging drivers/irqchip/irq-gic-v3.c +Auto-merging include/linux/acpi.h +Auto-merging include/linux/efi.h +Merge made by the 'ort' strategy. + arch/loongarch/Kconfig | 16 +++ + arch/loongarch/Makefile | 7 + + arch/loongarch/boot/Makefile | 4 + + arch/loongarch/include/asm/dma.h | 13 ++ + arch/loongarch/include/asm/page.h | 2 - + arch/loongarch/include/asm/pci.h | 25 ++++ + arch/loongarch/include/asm/uaccess.h | 4 +- + arch/loongarch/include/asm/vdso.h | 1 + + arch/loongarch/include/asm/vdso/vdso.h | 15 ++- + arch/loongarch/kernel/acpi.c | 18 +++ + arch/loongarch/kernel/efi-header.S | 101 ++++++++++++++ + arch/loongarch/kernel/efi.c | 126 +++++++++++++++++- + arch/loongarch/kernel/head.S | 26 ++++ + arch/loongarch/kernel/image-vars.h | 29 ++++ + arch/loongarch/kernel/time.c | 2 +- + arch/loongarch/kernel/vdso.c | 25 ++-- + arch/loongarch/kernel/vmlinux.lds.S | 1 + + arch/loongarch/pci/acpi.c | 175 +++++++++++++++++++++++++ + arch/loongarch/pci/pci.c | 101 ++++++++++++++ + arch/loongarch/vdso/Makefile | 2 +- + arch/loongarch/vdso/vdso.lds.S | 1 + + arch/loongarch/vdso/vgetcpu.c | 43 ++++++ + drivers/acpi/tables.c | 10 ++ + drivers/firmware/efi/Kconfig | 2 +- + drivers/firmware/efi/libstub/Makefile | 10 ++ + drivers/firmware/efi/libstub/efi-stub-helper.c | 2 +- + drivers/firmware/efi/libstub/efi-stub.c | 4 +- + drivers/firmware/efi/libstub/loongarch-stub.c | 90 +++++++++++++ + include/linux/efi.h | 1 + + include/linux/pe.h | 2 + + 30 files changed, 836 insertions(+), 22 deletions(-) + create mode 100644 arch/loongarch/include/asm/dma.h + create mode 100644 arch/loongarch/include/asm/pci.h + create mode 100644 arch/loongarch/kernel/efi-header.S + create mode 100644 arch/loongarch/kernel/image-vars.h + create mode 100644 arch/loongarch/pci/acpi.c + create mode 100644 arch/loongarch/pci/pci.c + create mode 100644 arch/loongarch/vdso/vgetcpu.c + create mode 100644 drivers/firmware/efi/libstub/loongarch-stub.c +$ git reset --hard HEAD^ +HEAD is now at b0a709675d84 Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git +Merging next-20220805 version of loongarch +$ git merge -m next-20220805/loongarch a111daf0c53ae91e71fd2bfe7497862d14132e3e +Already up to date. +Merging m68k/for-next (b508128bb0d1 m68k: defconfig: Update defconfigs for v5.19-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Already up to date. +Merging m68knommu/for-next (472e68df4a5e m68k: Fix syntax errors in comments) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Merge made by the 'ort' strategy. + arch/m68k/coldfire/device.c | 6 +++--- + arch/m68k/coldfire/intc-2.c | 2 +- + arch/m68k/coldfire/m523x.c | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) +Merging microblaze/next (5b7d1d575e3f microblaze: Fix some typos in comment) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Already up to date. +Merging mips/mips-next (74de14fe05dd MIPS: tlbex: Explicitly compare _PAGE_NO_EXEC against 0) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Already up to date. +Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git nios2/for-next +Already up to date. +Merging openrisc/for-next (52e0ea900202 openrisc: io: Define iounmap argument as volatile) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (3d7cb6b04c3f Linux 5.19) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Already up to date. +Merging powerpc/next (4cfa6ff24a97 powerpc/64e: Fix kexec build error) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Already up to date. +Merging soc-fsl/next (4b0986a3613c Linux 5.18) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next +Already up to date. +Merging risc-v/for-next (ba6cfef057e1 riscv: enable Docker requirements in defconfig) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Already up to date. +Merging risc-v-mc/dt-for-next (88d319c6abae riscv: dts: microchip: Add mpfs' topology information) +$ git merge -m Merge branch 'dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git risc-v-mc/dt-for-next +Already up to date. +Merging s390/for-next (53897c8b7f82 Merge branch 'features' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Auto-merging arch/s390/kernel/setup.c +Auto-merging drivers/s390/crypto/ap_bus.c +Merge made by the 'ort' strategy. +Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer from integer of different size) +$ git merge -m Merge branch 'for-next' of git://git.libc.org/linux-sh sh/for-next +Already up to date. +Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git sparc-next/master +Already up to date. +Merging uml/linux-next (af3e16101cee um: include sys/types.h for size_t) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (0847d167d0f9 xtensa: enable ARCH_HAS_GCOV_PROFILE_ALL) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Already up to date. +Merging pidfd/for-next (6a857ab5b57c Merge branch 'fs.idmapped.overlay.acl' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next +Auto-merging MAINTAINERS +Auto-merging fs/inode.c +Auto-merging fs/namei.c +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + fs/ceph/file.c | 4 --- + fs/inode.c | 34 ++++++++++++++++++++--- + fs/namei.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++-------- + fs/ocfs2/namei.c | 1 + + include/linux/fs.h | 2 ++ + 5 files changed, 102 insertions(+), 19 deletions(-) +Merging fscrypt/master (218d921b581e fscrypt: add new helper functions for test_dummy_encryption) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt/master +Already up to date. +Merging fscache/fscache-next (0885eacdc81f Merge tag 'nfsd-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux) +$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next +Already up to date. +Merging afs/afs-next (26291c54e111 Linux 5.17-rc2) +$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next +Already up to date. +Merging btrfs/for-next (6130a25681d4 Merge branch 'for-next-next-v5.20-20220804' into for-next-20220804) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/super.c +Merge made by the 'ort' strategy. + fs/btrfs/block-group.c | 4 +- + fs/btrfs/ctree.c | 3 + + fs/btrfs/ctree.h | 100 +++++++++++++++++++++++-- + fs/btrfs/disk-io.c | 109 +++++++-------------------- + fs/btrfs/disk-io.h | 10 --- + fs/btrfs/extent-tree.c | 18 ++++- + fs/btrfs/extent_io.c | 11 ++- + fs/btrfs/file-item.c | 21 +++--- + fs/btrfs/file.c | 5 +- + fs/btrfs/free-space-cache.c | 16 ++++ + fs/btrfs/inode.c | 16 +++- + fs/btrfs/locking.c | 91 ++++++++++++++++++++++ + fs/btrfs/locking.h | 14 ++++ + fs/btrfs/ordered-data.c | 21 ++++++ + fs/btrfs/relocation.c | 9 ++- + fs/btrfs/scrub.c | 69 +++++++++++------ + fs/btrfs/super.c | 2 + + fs/btrfs/sysfs.c | 56 +++++--------- + fs/btrfs/transaction.c | 105 ++++++++++++++++++++++---- + fs/btrfs/tree-checker.c | 25 ++++++- + fs/btrfs/tree-log.c | 179 +++++--------------------------------------- + fs/btrfs/volumes.c | 3 + + fs/btrfs/volumes.h | 2 + + 23 files changed, 533 insertions(+), 356 deletions(-) +Merging ceph/master (a8af0d682ae0 libceph: clean up ceph_osdc_start_request prototype) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Auto-merging drivers/block/rbd.c +Auto-merging fs/ceph/file.c +Auto-merging fs/crypto/fscrypt_private.h +Auto-merging fs/crypto/policy.c +Auto-merging fs/dcache.c +Auto-merging fs/inode.c +Auto-merging include/linux/dcache.h +Merge made by the 'ort' strategy. + drivers/block/rbd.c | 6 +- + fs/ceph/addr.c | 59 ++++++-------- + fs/ceph/caps.c | 38 ++++----- + fs/ceph/dir.c | 79 ++++++++++++++++--- + fs/ceph/file.c | 123 ++++++++++++------------------ + fs/ceph/inode.c | 13 +++- + fs/ceph/mds_client.c | 165 ++++++++++++++++++++++++++++++++++++++-- + fs/ceph/mds_client.h | 13 ++-- + fs/ceph/mdsmap.c | 22 +++++- + fs/ceph/super.c | 19 +++-- + fs/ceph/super.h | 31 ++++++-- + fs/ceph/xattr.c | 12 ++- + fs/crypto/fname.c | 36 +++++++-- + fs/crypto/fscrypt_private.h | 9 +-- + fs/crypto/hooks.c | 6 +- + fs/crypto/policy.c | 35 +++++++-- + fs/dcache.c | 15 +++- + fs/inode.c | 10 ++- + include/linux/ceph/ceph_fs.h | 8 +- + include/linux/ceph/mdsmap.h | 1 + + include/linux/ceph/osd_client.h | 5 +- + include/linux/dcache.h | 2 + + include/linux/fscrypt.h | 5 ++ + include/linux/mmdebug.h | 10 +++ + net/ceph/osd_client.c | 15 ++-- + net/ceph/osdmap.c | 32 ++++++-- + net/ceph/pagelist.c | 2 +- + 27 files changed, 538 insertions(+), 233 deletions(-) +Merging cifs/for-next (0d168a58fca3 cifs: update internal module number) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Already up to date. +Merging configfs/for-next (84ec758fb2da configfs: fix a race in configfs_{,un}register_subsystem()) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next +Already up to date. +Merging ecryptfs/next (682a8e2b41ef Merge tag 'ecryptfs-5.13-rc1-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next +Already up to date. +Merging erofs/dev (ecce9212d0fd erofs: update ctx->pos for every emitted dirent) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Already up to date. +Merging exfat/dev (df13a3477635 MAINTAINERS: Add Namjae's exfat git tree) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + fs/exfat/exfat_fs.h | 19 +++++++------ + fs/exfat/fatent.c | 2 +- + fs/exfat/file.c | 82 +++++++++++++++++------------------------------------ + fs/exfat/inode.c | 41 +++++++-------------------- + fs/exfat/misc.c | 17 ----------- + fs/exfat/namei.c | 22 +------------- + fs/exfat/nls.c | 4 +-- + fs/exfat/super.c | 4 +-- + 9 files changed, 54 insertions(+), 138 deletions(-) +Merging ext3/for_next (5b02b6900c8d Pull fsnotify typo fix.) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Merge made by the 'ort' strategy. +Merging ext4/dev (d95efb14c0b8 ext4: add ioctls to get/set the ext4 superblock uuid) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Already up to date. +Merging f2fs/dev (01fc4b9a6ed8 f2fs: use onstack pages instead of pvec) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Auto-merging Documentation/filesystems/f2fs.rst +Auto-merging fs/f2fs/compress.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/node.c +Auto-merging fs/f2fs/segment.c +Auto-merging fs/f2fs/super.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 30 +++++ + Documentation/filesystems/f2fs.rst | 5 + + fs/f2fs/compress.c | 229 +++++++++++++++++++++----------- + fs/f2fs/data.c | 82 +++++++----- + fs/f2fs/debug.c | 2 +- + fs/f2fs/f2fs.h | 102 ++++++++++---- + fs/f2fs/file.c | 79 +++++++---- + fs/f2fs/gc.c | 11 +- + fs/f2fs/gc.h | 21 ++- + fs/f2fs/inode.c | 3 +- + fs/f2fs/node.c | 14 +- + fs/f2fs/segment.c | 79 ++++++----- + fs/f2fs/segment.h | 11 +- + fs/f2fs/super.c | 90 ++++++++----- + fs/f2fs/sysfs.c | 56 ++++++++ + include/uapi/linux/f2fs.h | 2 +- + 16 files changed, 562 insertions(+), 254 deletions(-) +Merging fsverity/fsverity (8da572c52a9b fs-verity: mention btrfs support) +$ git merge -m Merge branch 'fsverity' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fsverity/fsverity +Already up to date. +Merging fuse/for-next (247861c325c2 fuse: retire block-device-based superblock on force unmount) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Auto-merging fs/fuse/file.c +Auto-merging fs/super.c +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + Documentation/filesystems/fuse.rst | 29 +++++++++++++++++++++++----- + fs/fuse/control.c | 4 ++-- + fs/fuse/dax.c | 2 +- + fs/fuse/dir.c | 16 +++++++++++++++- + fs/fuse/file.c | 39 +++++++++++++++++++++++++------------- + fs/fuse/inode.c | 16 ++++++++++++++-- + fs/fuse/ioctl.c | 15 +++++++++++++-- + fs/fuse/virtio_fs.c | 9 ++++----- + fs/super.c | 33 ++++++++++++++++++++++++++++++-- + include/linux/fs.h | 2 ++ + 10 files changed, 132 insertions(+), 33 deletions(-) +Merging gfs2/for-next (446279168e03 Merge part of branch 'for-next.instantiate' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Already up to date. +Merging jfs/jfs-next (e471e5942c00 fs/jfs: Remove dead code) +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Already up to date. +Merging ksmbd/ksmbd-for-next (8f0541186e9a ksmbd: fix heap-based overflow in set_ntacl_dacl()) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Auto-merging MAINTAINERS +Auto-merging fs/ksmbd/vfs.c +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + fs/ksmbd/auth.c | 56 ++++++++++--------- + fs/ksmbd/auth.h | 11 ++-- + fs/ksmbd/connection.c | 9 +-- + fs/ksmbd/connection.h | 10 +--- + fs/ksmbd/mgmt/share_config.c | 14 ----- + fs/ksmbd/mgmt/share_config.h | 2 - + fs/ksmbd/mgmt/tree_connect.c | 5 +- + fs/ksmbd/mgmt/tree_connect.h | 4 +- + fs/ksmbd/mgmt/user_session.c | 95 +++++++++++++++++-------------- + fs/ksmbd/mgmt/user_session.h | 13 ++--- + fs/ksmbd/oplock.c | 46 +++++++++------ + fs/ksmbd/server.c | 8 ++- + fs/ksmbd/smb2misc.c | 12 ++-- + fs/ksmbd/smb2pdu.c | 112 ++++++++++++++++++++++++------------- + fs/ksmbd/smb_common.h | 2 +- + fs/ksmbd/smbacl.c | 130 +++++++++++++++++++++++++++++-------------- + fs/ksmbd/smbacl.h | 2 +- + fs/ksmbd/vfs.c | 8 ++- + fs/ksmbd/vfs_cache.c | 2 +- + 20 files changed, 322 insertions(+), 220 deletions(-) +Merging nfs/linux-next (2135e5d56278 NFSv4/pnfs: Fix a use-after-free bug in open) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Auto-merging fs/nfs/file.c +Auto-merging fs/nfs/internal.h +Auto-merging fs/nfs/write.c +Auto-merging net/sunrpc/auth.c +Auto-merging net/sunrpc/backchannel_rqst.c +Merge made by the 'ort' strategy. + fs/nfs/blocklayout/dev.c | 42 ++---- + fs/nfs/client.c | 13 +- + fs/nfs/dir.c | 8 +- + fs/nfs/direct.c | 50 +++----- + fs/nfs/file.c | 2 - + fs/nfs/filelayout/filelayout.c | 2 + + fs/nfs/flexfilelayout/flexfilelayout.c | 4 + + fs/nfs/flexfilelayout/flexfilelayoutdev.c | 6 +- + fs/nfs/fs_context.c | 26 ++-- + fs/nfs/internal.h | 51 ++++++++ + fs/nfs/nfs3client.c | 1 - + fs/nfs/nfs42xdr.c | 170 ++++++++++++------------ + fs/nfs/nfs4client.c | 4 +- + fs/nfs/nfs4idmap.c | 46 +++---- + fs/nfs/nfs4proc.c | 32 +++-- + fs/nfs/nfstrace.h | 128 ++++++++++++++++++ + fs/nfs/write.c | 50 +++++--- + include/linux/nfs_xdr.h | 1 + + include/linux/sunrpc/clnt.h | 5 + + include/linux/sunrpc/sched.h | 4 +- + include/linux/sunrpc/xdr.h | 7 +- + include/linux/sunrpc/xprt.h | 6 +- + include/linux/sunrpc/xprtmultipath.h | 7 +- + include/trace/events/sunrpc.h | 20 +++ + net/sunrpc/auth.c | 2 +- + net/sunrpc/auth_gss/auth_gss.c | 11 +- + net/sunrpc/backchannel_rqst.c | 14 ++ + net/sunrpc/clnt.c | 207 ++++++++++++++++++++++++++---- + net/sunrpc/sched.c | 1 + + net/sunrpc/sysfs.c | 28 +--- + net/sunrpc/xdr.c | 168 +++++++++++++++--------- + net/sunrpc/xprt.c | 59 +++++++-- + net/sunrpc/xprtmultipath.c | 111 +++++++++++++--- + net/sunrpc/xprtrdma/transport.c | 6 +- + net/sunrpc/xprtsock.c | 18 +-- + 35 files changed, 919 insertions(+), 391 deletions(-) +Merging nfs-anna/linux-next (4f40a5b55446 NFSv4: Add an fattr allocation to _nfs4_discover_trunking()) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Already up to date. +Merging nfsd/for-next (9905ce116c9b NFSD: fix use-after-free on source server when doing inter-server copy) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/for-next +Auto-merging fs/nfsd/filecache.c +Auto-merging include/linux/sunrpc/xdr.h +Auto-merging include/trace/events/sunrpc.h +Merge made by the 'ort' strategy. + Documentation/fault-injection/fault-injection.rst | 7 + + fs/lockd/svc4proc.c | 12 +- + fs/lockd/svclock.c | 10 +- + fs/lockd/svcproc.c | 5 +- + fs/lockd/xdr4.c | 19 +- + fs/nfsd/acl.h | 6 +- + fs/nfsd/filecache.c | 749 +++++++++++++--------- + fs/nfsd/filecache.h | 11 +- + fs/nfsd/netns.h | 3 + + fs/nfsd/nfs2acl.c | 6 +- + fs/nfsd/nfs3acl.c | 4 +- + fs/nfsd/nfs3proc.c | 35 +- + fs/nfsd/nfs4acl.c | 46 +- + fs/nfsd/nfs4callback.c | 37 +- + fs/nfsd/nfs4proc.c | 330 +++++----- + fs/nfsd/nfs4state.c | 136 +++- + fs/nfsd/nfs4xdr.c | 123 ++-- + fs/nfsd/nfsctl.c | 21 +- + fs/nfsd/nfsd.h | 6 + + fs/nfsd/nfsfh.c | 27 +- + fs/nfsd/nfsfh.h | 58 +- + fs/nfsd/nfsproc.c | 27 +- + fs/nfsd/state.h | 1 - + fs/nfsd/trace.h | 327 ++++++++-- + fs/nfsd/vfs.c | 256 ++++---- + fs/nfsd/vfs.h | 33 +- + fs/nfsd/xdr4.h | 60 +- + include/linux/lockd/lockd.h | 1 + + include/linux/lockd/xdr.h | 2 + + include/linux/nfs_ssc.h | 2 +- + include/linux/sunrpc/xdr.h | 4 +- + include/trace/events/sunrpc.h | 14 +- + net/sunrpc/svc_xprt.c | 2 +- + 33 files changed, 1434 insertions(+), 946 deletions(-) +Merging ntfs3/master (451e45a0e6df fs/ntfs3: Make ni_ins_new_attr return error) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/file.c +Auto-merging fs/ntfs3/fsntfs.c +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ntfs3/ntfs_fs.h +Auto-merging fs/ntfs3/super.c +Merge made by the 'ort' strategy. + fs/ntfs3/attrib.c | 557 ++++++++++++++++++++++++++++++++++++++++++++--------- + fs/ntfs3/bitmap.c | 7 +- + fs/ntfs3/file.c | 110 ++++++----- + fs/ntfs3/frecord.c | 128 ++++++++---- + fs/ntfs3/fslog.c | 4 +- + fs/ntfs3/fsntfs.c | 92 +++++---- + fs/ntfs3/index.c | 33 ++-- + fs/ntfs3/inode.c | 19 +- + fs/ntfs3/namei.c | 6 +- + fs/ntfs3/ntfs_fs.h | 16 +- + fs/ntfs3/record.c | 27 +-- + fs/ntfs3/run.c | 108 +++++++++-- + fs/ntfs3/super.c | 17 +- + fs/ntfs3/xattr.c | 33 ++-- + 14 files changed, 834 insertions(+), 323 deletions(-) +Merging orangefs/for-next (40a74870b2d1 orangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (4f1196288dfb ovl: fix spelling mistakes) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next +Auto-merging fs/overlayfs/inode.c +CONFLICT (content): Merge conflict in fs/overlayfs/inode.c +Auto-merging fs/overlayfs/overlayfs.h +Auto-merging fs/overlayfs/super.c +Recorded preimage for 'fs/overlayfs/inode.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'fs/overlayfs/inode.c'. +[master 652aa965697d] Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git +$ git diff -M --stat --summary HEAD^.. + fs/overlayfs/export.c | 2 +- + fs/overlayfs/inode.c | 4 +++- + fs/overlayfs/namei.c | 4 ++-- + fs/overlayfs/overlayfs.h | 6 ++++++ + fs/overlayfs/super.c | 13 +++++++++---- + 5 files changed, 21 insertions(+), 8 deletions(-) +Merging ubifs/next (8c03a1c21d72 ubi: ubi_create_volume: Fix use-after-free when volume creation failed) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Already up to date. +Merging v9fs/9p-next (aa7aeee16948 net/9p: Initialize the iounit field during fid creation) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Already up to date. +Merging xfs/for-next (d62113303d69 xfs: Fix false ENOSPC when performing direct write on a delalloc extent in cow fork) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/xfs/xfs_qm.c +Auto-merging fs/xfs/xfs_reflink.c +Merge made by the 'ort' strategy. + fs/xfs/xfs_file.c | 22 +++--- + fs/xfs/xfs_log.c | 12 +++- + fs/xfs/xfs_qm.c | 5 ++ + fs/xfs/xfs_reflink.c | 198 ++++++++++++++++++++++++++++++++++++++++++--------- + 4 files changed, 192 insertions(+), 45 deletions(-) +Merging zonefs/for-next (6bac30bb8ff8 zonefs: Call page_address() on page acquired with GFP_KERNEL flag) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Already up to date. +Merging iomap/iomap-for-next (478af190cb6c iomap: remove iomap_writepage) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Auto-merging fs/gfs2/aops.c +Auto-merging fs/gfs2/log.c +Auto-merging fs/iomap/buffered-io.c +Auto-merging fs/zonefs/super.c +Auto-merging include/linux/iomap.h +Merge made by the 'ort' strategy. + fs/gfs2/aops.c | 26 -------------------------- + fs/gfs2/log.c | 5 ++--- + fs/iomap/buffered-io.c | 15 --------------- + fs/zonefs/super.c | 8 -------- + include/linux/iomap.h | 3 --- + 5 files changed, 2 insertions(+), 55 deletions(-) +Merging djw-vfs/vfs-for-next (49df34221804 fs: fix an infinite loop in iomap_fiemap) +$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (9de1f9c8ca51 Merge tag 'irq-core-2022-08-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Already up to date. +Merging vfs/for-next (82c4fd03ef05 Merge branches 'work.misc' and 'work.iov_iter' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Auto-merging arch/s390/include/asm/uaccess.h +Auto-merging block/bio.c +CONFLICT (content): Merge conflict in block/bio.c +Auto-merging block/fops.c +Auto-merging block/fops.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/ceph/addr.c +Auto-merging fs/ceph/file.c +Auto-merging fs/cifs/file.c +Auto-merging fs/cifs/misc.c +Auto-merging fs/direct-io.c +Auto-merging fs/fuse/file.c +Auto-merging fs/gfs2/file.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging fs/io_uring.c +Auto-merging fs/iomap/direct-io.c +Auto-merging fs/iomap/direct-io.c +Auto-merging fs/nfs/direct.c +Auto-merging fs/read_write.c +Auto-merging fs/splice.c +Auto-merging fs/zonefs/super.c +Auto-merging include/linux/uio.h +Auto-merging lib/iov_iter.c +Auto-merging lib/iov_iter.c +Auto-merging mm/shmem.c +Auto-merging net/9p/client.c +CONFLICT (content): Merge conflict in net/9p/client.c +Auto-merging net/9p/trans_virtio.c +Auto-merging net/core/datagram.c +Auto-merging net/core/skmsg.c +Auto-merging net/tls/tls_sw.c +Resolved 'block/bio.c' using previous resolution. +Resolved 'net/9p/client.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d6d7c853aea6] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git +$ git diff -M --stat --summary HEAD^.. + block/bio.c | 25 +- + block/blk-map.c | 7 +- + block/fops.c | 6 +- + crypto/af_alg.c | 3 +- + crypto/algif_hash.c | 5 +- + drivers/vhost/scsi.c | 4 +- + fs/ceph/addr.c | 2 +- + fs/ceph/file.c | 5 +- + fs/cifs/file.c | 8 +- + fs/cifs/misc.c | 3 +- + fs/direct-io.c | 5 +- + fs/fuse/dev.c | 7 +- + fs/fuse/file.c | 5 +- + fs/gfs2/file.c | 2 +- + fs/hugetlbfs/inode.c | 31 +- + fs/iomap/direct-io.c | 2 +- + fs/nfs/direct.c | 8 +- + fs/proc_namespace.c | 2 +- + fs/read_write.c | 6 +- + fs/splice.c | 54 ++- + include/linux/pipe_fs_i.h | 20 -- + include/linux/uio.h | 35 +- + lib/iov_iter.c | 826 +++++++++++++++++++++------------------------- + mm/shmem.c | 2 +- + net/9p/client.c | 39 ++- + net/9p/protocol.c | 3 +- + net/9p/trans_virtio.c | 3 +- + net/core/datagram.c | 3 +- + net/core/skmsg.c | 3 +- + net/rds/message.c | 3 +- + net/tls/tls_sw.c | 4 +- + 31 files changed, 509 insertions(+), 622 deletions(-) +Merging printk/for-next (a7e796c88820 Merge branch 'for-5.20' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Merge made by the 'ort' strategy. +Merging pci/next (c4f36c3ab065 Merge branch 'pci/header-cleanup-immutable') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci/next +Already up to date. +Merging pstore/for-next/pstore (2c09d1443b9b pstore/zone: cleanup "rcnt" type) +$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Already up to date. +Merging hid/for-next (a60885b6a97b Merge branch 'for-5.20/uclogic' into for-linus) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Already up to date. +Merging i2c/i2c/for-next (0c42dacaa607 Merge branch 'i2c/for-mergewindow' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/i2c/busses/i2c-cadence.c +Auto-merging drivers/i2c/busses/i2c-mlxcpld.c +Auto-merging drivers/i2c/busses/i2c-npcm7xx.c +Merge made by the 'ort' strategy. +Merging i3c/i3c/next (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Already up to date. +Merging dmi/dmi-for-next (d2139dfca361 firmware: dmi: Use the proper accessor for the version field) +$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Merge made by the 'ort' strategy. + drivers/firmware/dmi_scan.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging hwmon-staging/hwmon-next (cdbe34da01e3 hwmon: (aquacomputer_d5next) Add support for Aquacomputer Quadro fan controller) +$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (339170d8d3da docs: efi-stub: Fix paths for x86 / arm stubs) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (485ade76c95a media: hantro: Remove dedicated control documentation) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (485ade76c95a media: hantro: Remove dedicated control documentation) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Already up to date. +Merging pm/linux-next (9851f9cb75d0 Merge branches 'thermal-tools', 'thermal-core' and 'thermal-intel' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Auto-merging drivers/cpuidle/cpuidle.c +Auto-merging drivers/gpu/drm/panfrost/panfrost_drv.c +Auto-merging include/linux/acpi.h +Merge made by the 'ort' strategy. + .../bindings/cpufreq/cpufreq-qcom-hw.yaml | 1 + + .../bindings/cpufreq/qcom-cpufreq-nvmem.yaml | 7 + + .../devicetree/bindings/opp/opp-v2-base.yaml | 10 + + .../devicetree/bindings/opp/opp-v2-kryo-cpu.yaml | 15 + + drivers/acpi/property.c | 465 ++++-- + drivers/cpufreq/cpufreq-dt.c | 19 +- + drivers/cpufreq/cpufreq.c | 6 +- + drivers/cpufreq/imx-cpufreq-dt.c | 12 +- + drivers/cpufreq/mediatek-cpufreq.c | 1 + + drivers/cpufreq/qcom-cpufreq-hw.c | 14 +- + drivers/cpufreq/qcom-cpufreq-nvmem.c | 109 +- + drivers/cpufreq/sti-cpufreq.c | 27 +- + drivers/cpufreq/sun50i-cpufreq-nvmem.c | 31 +- + drivers/cpufreq/tegra194-cpufreq.c | 4 +- + drivers/cpufreq/tegra20-cpufreq.c | 12 +- + drivers/cpufreq/ti-cpufreq.c | 42 +- + drivers/cpuidle/cpuidle.c | 6 +- + drivers/devfreq/exynos-bus.c | 21 +- + drivers/devfreq/tegra30-devfreq.c | 22 +- + drivers/gpu/drm/lima/lima_devfreq.c | 12 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 3 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 15 +- + drivers/media/platform/qcom/venus/pm_helpers.c | 10 +- + drivers/memory/tegra/tegra124-emc.c | 11 +- + drivers/opp/core.c | 1577 ++++++++++---------- + drivers/opp/cpu.c | 12 +- + drivers/opp/debugfs.c | 27 +- + drivers/opp/of.c | 150 +- + drivers/opp/opp.h | 56 +- + drivers/opp/ti-opp-supply.c | 77 +- + drivers/soc/tegra/common.c | 49 +- + drivers/soc/tegra/pmc.c | 4 +- + drivers/thermal/Kconfig | 4 +- + drivers/thermal/intel/intel_tcc_cooling.c | 2 + + drivers/thermal/thermal_sysfs.c | 10 +- + include/acpi/acpi_bus.h | 3 +- + include/linux/acpi.h | 2 +- + include/linux/pm_opp.h | 322 ++-- + include/trace/events/power.h | 22 + + tools/thermal/tmon/sysfs.c | 24 +- + 40 files changed, 1763 insertions(+), 1453 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (33fe1cb20cf4 cpufreq: tegra194: Staticize struct tegra_cpufreq_soc instances) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (53f853d55e31 PM / devfreq: tegra30: Add error message for devm_devfreq_add_device()) +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Already up to date. +Merging opp/opp/linux-next (1d95af02f230 venus: pm_helpers: Fix warning in OPP during probe) +$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Already up to date. +Merging thermal/thermal/linux-next (ad86429b42b4 thermal/of: Remove old OF code) +$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Auto-merging drivers/hwmon/pmbus/pmbus_core.c +Auto-merging drivers/regulator/max8973-regulator.c +Auto-merging drivers/thermal/hisi_thermal.c +Auto-merging drivers/thermal/rcar_gen3_thermal.c +Auto-merging drivers/thermal/thermal_core.c +Auto-merging drivers/thermal/thermal_sysfs.c +Merge made by the 'ort' strategy. + drivers/ata/ahci_imx.c | 15 +- + drivers/hwmon/hwmon.c | 14 +- + drivers/hwmon/pmbus/pmbus_core.c | 10 +- + drivers/hwmon/scpi-hwmon.c | 14 +- + drivers/iio/adc/sun4i-gpadc-iio.c | 14 +- + drivers/input/touchscreen/sun4i-ts.c | 10 +- + drivers/regulator/max8973-regulator.c | 10 +- + drivers/thermal/amlogic_thermal.c | 16 +- + drivers/thermal/armada_thermal.c | 12 +- + drivers/thermal/broadcom/bcm2711_thermal.c | 14 +- + drivers/thermal/broadcom/bcm2835_thermal.c | 14 +- + drivers/thermal/broadcom/brcmstb_thermal.c | 20 +- + drivers/thermal/broadcom/ns-thermal.c | 50 +- + drivers/thermal/broadcom/sr-thermal.c | 16 +- + drivers/thermal/db8500_thermal.c | 8 +- + drivers/thermal/hisi_thermal.c | 14 +- + drivers/thermal/imx8mm_thermal.c | 14 +- + drivers/thermal/imx_sc_thermal.c | 14 +- + drivers/thermal/k3_bandgap.c | 12 +- + drivers/thermal/k3_j72xx_bandgap.c | 12 +- + drivers/thermal/max77620_thermal.c | 8 +- + drivers/thermal/mtk_thermal.c | 10 +- + drivers/thermal/qcom/qcom-spmi-adc-tm5.c | 19 +- + drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 12 +- + drivers/thermal/qcom/tsens.c | 16 +- + drivers/thermal/qoriq_thermal.c | 12 +- + drivers/thermal/rcar_gen3_thermal.c | 16 +- + drivers/thermal/rcar_thermal.c | 13 +- + drivers/thermal/rockchip_thermal.c | 14 +- + drivers/thermal/rzg2l_thermal.c | 10 +- + drivers/thermal/samsung/exynos_tmu.c | 24 +- + drivers/thermal/sprd_thermal.c | 18 +- + drivers/thermal/st/stm_thermal.c | 18 +- + drivers/thermal/sun8i_thermal.c | 14 +- + drivers/thermal/tegra/soctherm.c | 21 +- + drivers/thermal/tegra/tegra-bpmp-thermal.c | 19 +- + drivers/thermal/tegra/tegra30-tsensor.c | 12 +- + drivers/thermal/thermal-generic-adc.c | 10 +- + drivers/thermal/thermal_core.c | 6 - + drivers/thermal/thermal_core.h | 2 - + drivers/thermal/thermal_mmio.c | 17 +- + drivers/thermal/thermal_of.c | 1140 +++++++------------- + drivers/thermal/thermal_sysfs.c | 5 +- + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 16 +- + drivers/thermal/uniphier_thermal.c | 10 +- + include/linux/thermal.h | 85 +- + 46 files changed, 708 insertions(+), 1142 deletions(-) +Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Already up to date. +Merging dlm/next (958589892218 fs: dlm: move kref_put assert for lkb structs) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Already up to date. +Merging rdma/for-next (6b822d408b58 RDMA/ib_srpt: Unify checking rdma_cm_id condition in srpt_cm_req_recv()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Already up to date. +Merging net-next/master (f86d1fbbe785 Merge tag 'net-next-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/master +Already up to date. +Merging bpf-next/for-next (f86d1fbbe785 Merge tag 'net-next-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Already up to date. +Merging ipsec-next/master (5e25c25aa2c0 xfrm: improve wording of comment above XFRM_OFFLOAD flags) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (b0bb369ee451 net/mlx5: fs, allow flow table creation with a UID) +$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git netfilter-next/master +Already up to date. +Merging ipvs-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/master +Already up to date. +Merging bluetooth/master (aac59090a068 Bluetooth: ISO: Fix not using the correct QoS) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Merge made by the 'ort' strategy. + drivers/bluetooth/btusb.c | 3 +++ + net/bluetooth/aosp.c | 15 ++++++++++++--- + net/bluetooth/hci_conn.c | 11 ++--------- + net/bluetooth/hci_event.c | 7 +++++-- + net/bluetooth/iso.c | 35 +++++++++++++++++++++++------------ + net/bluetooth/l2cap_core.c | 4 ++-- + net/bluetooth/mgmt.c | 7 ++++--- + net/bluetooth/msft.c | 15 ++++++++++++--- + 8 files changed, 63 insertions(+), 34 deletions(-) +Merging wireless-next/for-next (35610745d71d Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Already up to date. +Merging mtd/mtd/next (7ec4cdb32173 mtd: core: check partition before dereference) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Already up to date. +Merging nand/nand/next (e16eceea863b mtd: rawnand: arasan: Fix clock rate in NV-DDR) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (f8cd9f632f44 mtd: spi-nor: fix spi_nor_spimem_setup_op() call in spi_nor_erase_{sector,chip}()) +$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (af5d35b83f64 crypto: tcrypt - Remove the static variable initialisations to NULL) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Already up to date. +Merging drm/drm-next (5493ee1919ea Merge tag 'amd-drm-next-5.20-2022-07-29' of https://gitlab.freedesktop.org/agd5f/linux into drm-next) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Already up to date. +Merging drm-misc/for-linux-next (6f2c8d5f1659 drm/amdgpu: Fix for drm buddy memory corruption) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Already up to date. +Merging amdgpu/drm-next (64f991590ff4 drm/amd/display: Fix a compilation failure on PowerPC caused by FPU code) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Already up to date. +Merging drm-intel/for-linux-next (8fc50447a216 drm/i915/gt: Skip TLB invalidations once wedged) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 10 ++++++---- + drivers/gpu/drm/i915/gt/intel_gt.c | 30 ++++++++++++++++++++++------- + drivers/gpu/drm/i915/gt/intel_gt_pm.h | 3 +++ + drivers/gpu/drm/i915/gt/intel_migrate.c | 23 +++++++++++++++++++++- + drivers/gpu/drm/i915/gt/intel_region_lmem.c | 4 ++++ + 5 files changed, 58 insertions(+), 12 deletions(-) +Merging drm-tegra/for-next (135f4c551d51 drm/tegra: vic: Use devm_platform_ioremap_resource()) +$ git merge -m Merge branch 'for-next' of https://gitlab.freedesktop.org/drm/tegra.git drm-tegra/for-next +Already up to date. +Merging drm-msm/msm-next (cb77085b1f0a drm/msm/dpu: Fix for non-visible planes) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Already up to date. +Merging drm-msm-lumag/msm-next-lumag (1ff1da40d6fc Merge branches 'msm-next-lumag-core', 'msm-next-lumag-dpu', 'msm-next-lumag-dp', 'msm-next-lumag-dsi', 'msm-next-lumag-hdmi', 'msm-next-lumag-mdp5' and 'msm-next-lumag-mdp4' into msm-next-lumag) +$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag +Already up to date. +Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation) +$ git merge -m Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (2829a9fcb738 drm/etnaviv: reap idle softpin mappings when necessary) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Already up to date. +Merging fbdev/for-next (ff6992735ade Linux 5.19-rc7) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Already up to date. +Merging regmap/for-next (739f872e48d4 regmap: permit to set reg_update_bits with bulk implementation) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Already up to date. +Merging sound/for-next (666d3b612f91 ALSA: ice1712: remove redundant assignment to new) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Already up to date. +Merging sound-asoc/for-next (f16e5a31c0a9 Merge remote-tracking branch 'asoc/for-5.19' into asoc-linus) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Already up to date. +Merging modules/modules-next (554694ba120b module: Replace kmap() with kmap_local_page()) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging init/Kconfig +Auto-merging kernel/module/main.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 17 +- + MAINTAINERS | 1 + + init/Kconfig | 293 +----------------------- + kernel/module/Kconfig | 293 ++++++++++++++++++++++++ + kernel/module/decompress.c | 8 +- + kernel/module/internal.h | 2 +- + kernel/module/kallsyms.c | 41 ++-- + kernel/module/main.c | 43 ++-- + kernel/module/procfs.c | 2 +- + scripts/module.lds.S | 2 + + 10 files changed, 375 insertions(+), 327 deletions(-) + create mode 100644 kernel/module/Kconfig +Merging input/next (7c744d00990e Input: adc-joystick - fix ordering in adc_joystick_probe()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Already up to date. +Merging block/for-next (ece775e9aa82 Merge branch 'for-5.20/block' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. +Merging device-mapper/for-next (12907efde6ad dm verity: have verify_wq use WQ_HIGHPRI if "try_verify_in_tasklet") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Already up to date. +Merging libata/for-next (b3b2bec9646e ata: sata_mv: Fixes expected number of resources now IRQs are gone) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Already up to date. +Merging pcmcia/pcmcia-next (2ef4bb24ff39 pcmcia: Use platform_get_irq() to get the interrupt) +$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (527f36f5efa4 mmc: mediatek: add support for SDIO eint wakup IRQ) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Already up to date. +Merging mfd/for-mfd-next (ae4ccaed3a06 dt-bindings: mfd: stm32-timers: Move fixed string node names under 'properties') +$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Already up to date. +Merging backlight/for-backlight-next (fe201f6fa4cf MAINTAINERS: Use Lee Jones' kernel.org address for Backlight submissions) +$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Already up to date. +Merging battery/for-next (c9d8468158ad power: supply: olpc_battery: Hold the reference returned by of_find_compatible_node) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Auto-merging Documentation/devicetree/bindings/power/supply/bq24190.yaml +Auto-merging Documentation/devicetree/bindings/power/supply/summit,smb347-charger.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/power/supply/ab8500_fg.c +Auto-merging drivers/power/supply/power_supply_core.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/atmel-sysregs.txt | 15 - + .../bindings/power/reset/msm-poweroff.txt | 17 - + .../bindings/power/reset/qcom,pshold.yaml | 35 ++ + .../devicetree/bindings/power/supply/bq24190.yaml | 2 +- + .../bindings/power/supply/qcom,pm8941-charger.yaml | 9 +- + .../power/supply/summit,smb347-charger.yaml | 2 +- + .../bindings/reset/atmel,at91sam9260-reset.yaml | 68 +++ + MAINTAINERS | 5 + + drivers/power/reset/Kconfig | 6 + + drivers/power/reset/Makefile | 1 + + drivers/power/reset/at91-reset.c | 184 +++++++- + drivers/power/reset/pwr-mlxbf.c | 97 ++++ + drivers/power/supply/ab8500-chargalg.h | 4 - + drivers/power/supply/ab8500_btemp.c | 1 - + drivers/power/supply/ab8500_chargalg.c | 70 ++- + drivers/power/supply/ab8500_charger.c | 48 +- + drivers/power/supply/ab8500_fg.c | 3 +- + drivers/power/supply/bq24257_charger.c | 2 +- + drivers/power/supply/cros_peripheral_charger.c | 2 +- + drivers/power/supply/goldfish_battery.c | 4 +- + drivers/power/supply/lp8788-charger.c | 2 +- + drivers/power/supply/max77976_charger.c | 4 +- + drivers/power/supply/olpc_battery.c | 5 +- + drivers/power/supply/pm2301_charger.h | 492 --------------------- + drivers/power/supply/power_supply_core.c | 4 +- + include/dt-bindings/reset/sama7g5-reset.h | 10 + + 26 files changed, 462 insertions(+), 630 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/power/reset/msm-poweroff.txt + create mode 100644 Documentation/devicetree/bindings/power/reset/qcom,pshold.yaml + create mode 100644 Documentation/devicetree/bindings/reset/atmel,at91sam9260-reset.yaml + create mode 100644 drivers/power/reset/pwr-mlxbf.c + delete mode 100644 drivers/power/supply/pm2301_charger.h + create mode 100644 include/dt-bindings/reset/sama7g5-reset.h +Merging regulator/for-next (b0de7fa70650 regulator: pca9450: Remove restrictions for regulator-name) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Already up to date. +Merging security/next (ed56f4b5173e MAINTAINERS: update the LSM maintainer info) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Already up to date. +Merging apparmor/apparmor-next (79eb2711c919 apparmor: correct config reference to intended one) +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Auto-merging MAINTAINERS +Auto-merging security/apparmor/policy_unpack_test.c +Merge made by the 'ort' strategy. + MAINTAINERS | 7 +- + security/apparmor/Kconfig | 86 +++++++++++++++------- + security/apparmor/apparmorfs.c | 103 +++++++++++++++------------ + security/apparmor/audit.c | 2 +- + security/apparmor/domain.c | 5 +- + security/apparmor/include/apparmor.h | 1 + + security/apparmor/include/apparmorfs.h | 14 ++++ + security/apparmor/include/file.h | 3 + + security/apparmor/include/ipc.h | 18 ----- + security/apparmor/include/label.h | 2 + + security/apparmor/include/lib.h | 5 ++ + security/apparmor/include/path.h | 4 +- + security/apparmor/include/policy.h | 6 +- + security/apparmor/include/policy_ns.h | 1 + + security/apparmor/include/policy_unpack.h | 2 + + security/apparmor/include/secid.h | 5 +- + security/apparmor/include/task.h | 18 +++++ + security/apparmor/ipc.c | 110 ---------------------------- + security/apparmor/label.c | 29 ++++---- + security/apparmor/lib.c | 27 +++++-- + security/apparmor/lsm.c | 38 +++++----- + security/apparmor/mount.c | 13 ++-- + security/apparmor/net.c | 3 +- + security/apparmor/policy.c | 35 +++++---- + security/apparmor/policy_ns.c | 53 ++++++++++---- + security/apparmor/policy_unpack.c | 53 +++++++++----- + security/apparmor/policy_unpack_test.c | 16 ++--- + security/apparmor/procattr.c | 2 +- + security/apparmor/secid.c | 56 ++++++--------- + security/apparmor/task.c | 114 ++++++++++++++++++++++++++++++ + 30 files changed, 491 insertions(+), 340 deletions(-) +Merging integrity/next-integrity (1d212f9037b0 Merge remote-tracking branch 'linux-integrity/kexec-keyrings' into next-integrity) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Merge made by the 'ort' strategy. +Merging keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge -m Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys/keys-next +Already up to date. +Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest) +$ git merge -m Merge branch 'safesetid-next' of https://github.com/micah-morton/linux.git safesetid/safesetid-next +Already up to date. +Merging selinux/next (ef54ccb61616 selinux: selinux_add_opt() callers free memory) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Already up to date. +Merging smack/next (b50503990d88 smack: Remove the redundant lsm_inode_alloc) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Merge made by the 'ort' strategy. +Merging tomoyo/master (05fe531eb3f1 kernel/hung_task: show backtrace of tasks with locks held) +$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master +Auto-merging kernel/hung_task.c +Merge made by the 'ort' strategy. + kernel/hung_task.c | 19 +++++++++++++++++-- + 1 file changed, 17 insertions(+), 2 deletions(-) +Merging tpmdd/next (863ed94c589f tpm: Add check for Failure mode for TPM2 modules) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Already up to date. +Merging watchdog/master (2d27e5284109 watchdog: armada_37xx_wdt: check the return value of devm_ioremap() in armada_37xx_wdt_probe()) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +CONFLICT (modify/delete): Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt deleted in HEAD and modified in watchdog/master. Version watchdog/master of Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt left in tree. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt +rm 'Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt' +$ git commit --no-edit -v -a +[master 054dd4e183d5] Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/watchdog/qcom-wdt.yaml | 1 + + .../bindings/watchdog/realtek,otto-wdt.yaml | 1 + + drivers/watchdog/armada_37xx_wdt.c | 2 ++ + drivers/watchdog/bcm7038_wdt.c | 8 ++--- + drivers/watchdog/booke_wdt.c | 2 +- + drivers/watchdog/dw_wdt.c | 8 ++--- + drivers/watchdog/f71808e_wdt.c | 4 ++- + drivers/watchdog/max77620_wdt.c | 4 +-- + drivers/watchdog/mtk_wdt.c | 10 ++---- + drivers/watchdog/pc87413_wdt.c | 2 +- + drivers/watchdog/pm8916_wdt.c | 41 +++++++++++++++++++--- + drivers/watchdog/realtek_otto_wdt.c | 1 + + drivers/watchdog/s3c2410_wdt.c | 9 ++--- + drivers/watchdog/sama5d4_wdt.c | 8 ++--- + drivers/watchdog/sp5100_tco.c | 1 + + drivers/watchdog/sp805_wdt.c | 5 +++ + drivers/watchdog/st_lpc_wdt.c | 9 ++--- + drivers/watchdog/tegra_wdt.c | 14 +++----- + drivers/watchdog/wdat_wdt.c | 7 ++-- + 19 files changed, 80 insertions(+), 57 deletions(-) +Merging iommu/next (c10100a416c1 Merge branches 'arm/exynos', 'arm/mediatek', 'arm/msm', 'arm/smmu', 'virtio', 'x86/vt-d', 'x86/amd' and 'core' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next +Already up to date. +Merging audit/next (546093206ba1 audit: make is_audit_feature_set() static) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Already up to date. +Merging devicetree/for-next (7e7a24c3c6c9 dt-bindings: mtd: microchip,mchp48l640: use spi-peripheral-props.yaml) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Already up to date. +Merging dt-krzk/for-next (12f158808510 dt-bindings: arm: aspeed: add Aspeed Evaluation boards) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Already up to date. +Merging mailbox/mailbox-for-next (8a8dc2b9596e mailbox: imx: clear pending interrupts) +$ git merge -m Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration.git mailbox/mailbox-for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/mailbox/fsl,mu.yaml | 6 ++- + .../bindings/mailbox/qcom,apcs-kpss-global.yaml | 46 ++++++++++++---------- + .../devicetree/bindings/mailbox/qcom-ipcc.yaml | 1 + + drivers/mailbox/imx-mailbox.c | 40 ++++++++++++++++--- + drivers/mailbox/mtk-cmdq-mailbox.c | 11 ------ + include/linux/mailbox/mtk-cmdq-mailbox.h | 10 ----- + 6 files changed, 64 insertions(+), 50 deletions(-) +Merging spi/for-next (4188e495dd66 Merge remote-tracking branch 'spi/for-5.19' into spi-linus) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Already up to date. +Merging tip/master (a20dc5e7b11c Merge branch into tip/master: 'x86/platform') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Merge made by the 'ort' strategy. + arch/x86/boot/bitops.h | 4 +- + arch/x86/include/asm/acrn.h | 14 ++++++ + arch/x86/kernel/amd_gart_64.c | 2 +- + arch/x86/kernel/aperture_64.c | 2 +- + arch/x86/kernel/cpu/acrn.c | 3 ++ + arch/x86/kvm/vmx/nested.c | 2 +- + arch/x86/mm/pat/set_memory.c | 4 +- + arch/x86/platform/efi/efi.c | 2 +- + kernel/locking/spinlock.c | 56 +++++++++++----------- + kernel/sched/core.c | 13 +---- + kernel/sched/core_sched.c | 2 +- + kernel/sched/cpudeadline.c | 2 +- + kernel/sched/deadline.c | 28 +++++------ + kernel/sched/fair.c | 26 ++++++---- + kernel/sched/rt.c | 4 +- + kernel/sched/sched.h | 35 ++++++++------ + .../functional/futex_requeue_pi_signal_restart.c | 2 +- + 17 files changed, 108 insertions(+), 93 deletions(-) +Merging clockevents/timers/drivers/next (c19e18637d89 clocksource/drivers/sun4i: Remove unnecessary (void*) conversions) +$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Auto-merging arch/arm/mach-omap2/Kconfig +Auto-merging drivers/clocksource/Kconfig +Auto-merging drivers/clocksource/Makefile +Auto-merging drivers/clocksource/timer-ti-dm.c +Merge made by the 'ort' strategy. +Merging edac/edac-for-next (5e2805d53796 EDAC/ghes: Set the DIMM label unconditionally) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Already up to date. +Merging irqchip/irq/irqchip-next (2bd1753e8c43 Merge branch irq/misc-5.20 into irq/irqchip-next) +$ git merge -m Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (07a451dae367 Merge branch 'trace/for-next-core' into trace/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git ftrace/for-next +Merge made by the 'ort' strategy. +Merging rcu/rcu/next (21714867a12a Merge branch 'lkmm-dev.2022.06.20a' into HEAD) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Merge made by the 'ort' strategy. + .../litmus-tests/locking/DCL-broken.litmus | 55 ++++ + .../litmus-tests/locking/DCL-fixed.litmus | 56 ++++ + .../litmus-tests/locking/RM-broken.litmus | 42 +++ + Documentation/litmus-tests/locking/RM-fixed.litmus | 42 +++ + tools/memory-model/Documentation/locking.txt | 320 +++++++++++++++++++++ + tools/memory-model/litmus-tests/.gitignore | 2 +- + tools/memory-model/scripts/README | 16 +- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 11 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 +++ + tools/memory-model/scripts/cmplitmushist.sh | 49 +++- + tools/memory-model/scripts/hwfnseg.sh | 20 ++ + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 ++++++-- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 ++++++ + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 +++ + 21 files changed, 915 insertions(+), 88 deletions(-) + create mode 100644 Documentation/litmus-tests/locking/DCL-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/DCL-fixed.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-fixed.litmus + create mode 100644 tools/memory-model/Documentation/locking.txt + create mode 100755 tools/memory-model/scripts/checktheselitmus.sh + create mode 100755 tools/memory-model/scripts/hwfnseg.sh + create mode 100755 tools/memory-model/scripts/runlitmus.sh + create mode 100755 tools/memory-model/scripts/simpletest.sh +Merging kvm/next (90752dcef2e3 KVM: x86: do not report preemption if the steal time cache is stale) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging arch/x86/kvm/x86.c +Merge made by the 'ort' strategy. + arch/x86/kvm/x86.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) +Merging kvm-arm/next (0982c8d859f8 Merge branch kvm-arm64/nvhe-stacktrace into kvmarm-master/next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Already up to date. +Merging kvms390/next (f5ecfee94493 KVM: s390: resetting the Topology-Change-Report) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Already up to date. +Merging xen-tip/linux-next (251e90e7e346 xen: don't require virtio with grants for non-PV guests) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Already up to date. +Merging percpu/for-next (a111daf0c53a Linux 5.19-rc3) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Already up to date. +Merging workqueues/for-next (46a4d679ef88 workqueue: Avoid a false warning in unbind_workers()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (3d46d7848075 platform/x86/intel/vsec: Fix wrong type for local status variables) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (afef1e1a0223 platform/chrome: cros_kunit_util: add default value for `msg->result`) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Already up to date. +Merging hsi/for-next (43c14f8d18a7 HSI: omap_ssi: Fix refcount leak in ssi_probe) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Merge made by the 'ort' strategy. + drivers/hsi/clients/ssi_protocol.c | 1 - + drivers/hsi/controllers/omap_ssi_core.c | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) +Merging leds/for-next (38ba0bb291aa leds: is31fl319x: use simple i2c probe function) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next +Auto-merging Documentation/devicetree/bindings/leds/leds-lp50xx.yaml +Auto-merging Documentation/devicetree/bindings/leds/leds-pwm-multicolor.yaml +Auto-merging Documentation/devicetree/bindings/leds/leds-qcom-lpg.yaml +Merge made by the 'ort' strategy. + .../bindings/leds/cznic,turris-omnia-leds.yaml | 2 + + .../devicetree/bindings/leds/leds-bcm63138.yaml | 95 ++++ + .../bindings/leds/leds-class-multicolor.yaml | 32 +- + .../devicetree/bindings/leds/leds-lp50xx.yaml | 10 +- + .../bindings/leds/leds-pwm-multicolor.yaml | 15 +- + .../devicetree/bindings/leds/leds-qcom-lpg.yaml | 2 + + drivers/leds/Kconfig | 10 +- + drivers/leds/blink/Kconfig | 14 + + drivers/leds/blink/Makefile | 1 + + drivers/leds/blink/leds-bcm63138.c | 307 ++++++++++++ + drivers/leds/leds-is31fl319x.c | 529 +++++++++++++-------- + drivers/leds/leds-turris-omnia.c | 4 +- + drivers/leds/rgb/leds-pwm-multicolor.c | 8 +- + 13 files changed, 811 insertions(+), 218 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-bcm63138.yaml + create mode 100644 drivers/leds/blink/leds-bcm63138.c +Merging ipmi/for-next (79c87b8f8ba7 ipmi: Fix comment typo) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/ipmi/npcm7xx-kcs-bmc.txt | 5 +++-- + drivers/char/ipmi/Kconfig | 6 +++--- + drivers/char/ipmi/ipmi_msghandler.c | 2 +- + 3 files changed, 7 insertions(+), 6 deletions(-) +Merging driver-core/driver-core-next (b2a88c212e65 Merge tag 'xfs-5.20-merge-6' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (b2a88c212e65 Merge tag 'xfs-5.20-merge-6' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Already up to date. +Merging thunderbolt/next (34b9715b7cae thunderbolt: Fix typo in comment) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Already up to date. +Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (688ee1d1785c USB: serial: fix tty-port initialized comments) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Already up to date. +Merging tty/tty-next (0fec518018cc tty: serial: qcom-geni-serial: Fix %lu -> %u in print statements) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Auto-merging MAINTAINERS +Auto-merging drivers/of/fdt.c +Auto-merging drivers/tty/serial/8250/8250_core.c +Auto-merging drivers/tty/serial/8250/8250_dw.c +Auto-merging drivers/tty/serial/8250/8250_port.c +Auto-merging drivers/tty/serial/Kconfig +Auto-merging drivers/tty/serial/amba-pl011.c +Auto-merging drivers/tty/serial/mvebu-uart.c +Auto-merging drivers/tty/serial/qcom_geni_serial.c +Auto-merging drivers/tty/serial/samsung_tty.c +Auto-merging drivers/tty/serial/serial_core.c +Auto-merging drivers/tty/serial/stm32-usart.c +Auto-merging drivers/tty/tty_buffer.c +Auto-merging drivers/tty/vt/vt.c +Auto-merging drivers/video/fbdev/core/fbcon.c +Auto-merging include/linux/serial_core.h +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/serial/8250.yaml | 1 + + .../devicetree/bindings/serial/mediatek,uart.yaml | 120 +++ + .../devicetree/bindings/serial/mtk-uart.txt | 59 -- + .../devicetree/bindings/serial/renesas,hscif.yaml | 1 + + .../devicetree/bindings/serial/rs485.yaml | 4 +- + .../bindings/serial/snps-dw-apb-uart.yaml | 2 + + Documentation/driver-api/serial/driver.rst | 482 +---------- + Documentation/driver-api/serial/serial-rs485.rst | 38 +- + MAINTAINERS | 3 +- + arch/mips/ath79/early_printk.c | 17 +- + drivers/accessibility/braille/braille_console.c | 2 +- + drivers/accessibility/speakup/main.c | 2 +- + drivers/accessibility/speakup/serialio.h | 3 +- + drivers/of/fdt.c | 4 +- + drivers/tty/amiserial.c | 20 +- + drivers/tty/mips_ejtag_fdc.c | 4 +- + drivers/tty/n_gsm.c | 757 ++++++++++++----- + drivers/tty/n_tty.c | 92 +- + drivers/tty/serial/8250/8250.h | 24 +- + drivers/tty/serial/8250/8250_bcm2835aux.c | 7 +- + drivers/tty/serial/8250/8250_bcm7271.c | 24 +- + drivers/tty/serial/8250/8250_core.c | 8 +- + drivers/tty/serial/8250/8250_dw.c | 68 +- + drivers/tty/serial/8250/8250_dwlib.c | 152 +++- + drivers/tty/serial/8250/8250_early.c | 4 +- + drivers/tty/serial/8250/8250_exar.c | 25 +- + drivers/tty/serial/8250/8250_fintek.c | 31 +- + drivers/tty/serial/8250/8250_fsl.c | 4 +- + drivers/tty/serial/8250/8250_ingenic.c | 2 +- + drivers/tty/serial/8250/8250_lpc18xx.c | 28 +- + drivers/tty/serial/8250/8250_lpss.c | 2 +- + drivers/tty/serial/8250/8250_of.c | 1 + + drivers/tty/serial/8250/8250_omap.c | 7 +- + drivers/tty/serial/8250/8250_pci.c | 135 ++- + drivers/tty/serial/8250/8250_pericom.c | 2 +- + drivers/tty/serial/8250/8250_port.c | 157 ++-- + drivers/tty/serial/8250/Kconfig | 1 + + drivers/tty/serial/Kconfig | 18 +- + drivers/tty/serial/Makefile | 1 - + drivers/tty/serial/amba-pl011.c | 15 +- + drivers/tty/serial/ar933x_uart.c | 27 +- + drivers/tty/serial/atmel_serial.c | 103 +-- + drivers/tty/serial/earlycon.c | 3 + + drivers/tty/serial/fsl_lpuart.c | 67 +- + drivers/tty/serial/imx.c | 21 +- + drivers/tty/serial/kgdboc.c | 2 +- + drivers/tty/serial/max310x.c | 272 ++++-- + drivers/tty/serial/mcf.c | 10 +- + drivers/tty/serial/meson_uart.c | 2 +- + drivers/tty/serial/msm_serial.c | 550 ++++++------ + drivers/tty/serial/mux.c | 6 - + drivers/tty/serial/mvebu-uart.c | 11 + + drivers/tty/serial/omap-serial.c | 18 +- + drivers/tty/serial/owl-uart.c | 2 +- + drivers/tty/serial/pch_uart.c | 7 +- + drivers/tty/serial/pic32_uart.c | 4 +- + drivers/tty/serial/pmac_zilog.c | 1 - + drivers/tty/serial/pxa.c | 5 +- + drivers/tty/serial/qcom_geni_serial.c | 88 +- + drivers/tty/serial/rda-uart.c | 2 +- + drivers/tty/serial/samsung_tty.c | 90 +- + drivers/tty/serial/sc16is7xx.c | 10 +- + drivers/tty/serial/serial-tegra.c | 5 +- + drivers/tty/serial/serial_core.c | 452 ++++++---- + drivers/tty/serial/serial_mctrl_gpio.c | 48 ++ + drivers/tty/serial/sifive.c | 10 - + drivers/tty/serial/st-asc.c | 1 - + drivers/tty/serial/stm32-usart.c | 79 +- + drivers/tty/serial/stm32-usart.h | 68 -- + drivers/tty/serial/sunsu.c | 4 +- + drivers/tty/serial/ucc_uart.c | 2 + + drivers/tty/serial/vr41xx_siu.c | 934 --------------------- + drivers/tty/tty_buffer.c | 59 +- + drivers/tty/tty_io.c | 2 +- + drivers/tty/tty_ioctl.c | 4 + + drivers/tty/tty_port.c | 21 + + drivers/tty/vt/Makefile | 2 +- + drivers/tty/vt/consolemap.c | 684 ++++++++------- + drivers/tty/vt/defkeymap.c_shipped | 6 +- + drivers/tty/vt/selection.c | 3 +- + drivers/tty/vt/vt.c | 16 +- + drivers/usb/misc/sisusbvga/sisusb_con.c | 2 +- + drivers/video/console/vgacon.c | 12 +- + drivers/video/fbdev/core/fbcon.c | 8 +- + include/linux/console_struct.h | 6 +- + include/linux/consolemap.h | 60 +- + include/linux/serial.h | 15 +- + include/linux/serial_8250.h | 7 +- + include/linux/serial_core.h | 364 +++++++- + include/linux/serial_s3c.h | 2 +- + include/linux/tty_buffer.h | 1 + + include/linux/tty_ldisc.h | 14 + + include/linux/tty_port.h | 2 + + include/uapi/asm-generic/termbits-common.h | 1 + + include/uapi/linux/serial.h | 20 +- + include/uapi/linux/serial_core.h | 4 - + include/uapi/linux/serial_reg.h | 4 +- + 97 files changed, 3353 insertions(+), 3197 deletions(-) + create mode 100644 Documentation/devicetree/bindings/serial/mediatek,uart.yaml + delete mode 100644 Documentation/devicetree/bindings/serial/mtk-uart.txt + delete mode 100644 drivers/tty/serial/vr41xx_siu.c +Merging char-misc/char-misc-next (1612c382ffbd Merge tag 'x86-urgent-2022-08-06' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Already up to date. +Merging coresight/next (4d45bc82df66 coresight: etm4x: avoid build failure with unrolled loops) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Already up to date. +Merging fpga/for-next (ee794221a6f6 fpga: fpga-mgr: Fix spelling mistake "bitsream" -> "bitstream") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Already up to date. +Merging icc/icc-next (009c963eefa0 Merge branch 'icc-rpm' into icc-next) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Already up to date. +Merging iio/togreg (180c6cb6b9b7 dt-bindings: iio: adc: Add compatible for MT8188) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Already up to date. +Merging phy-next/next (08680588d340 dt-bindings: phy: mediatek: tphy: add compatible for mt8188) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Already up to date. +Merging soundwire/next (3f4a70268d54 soundwire: qcom: Enable software clock gating requirement flag) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Already up to date. +Merging extcon/extcon-next (3a06ed80265f extcon: Add EXTCON_DISP_CVBS and EXTCON_DISP_EDP) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Already up to date. +Merging gnss/gnss-next (c0c725d7350e gnss: replace ida_simple API) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Merge made by the 'ort' strategy. + drivers/gnss/core.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging vfio/next (099fd2c20207 vfio/pci: fix the wrong word) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging staging/staging-next (b2a88c212e65 Merge tag 'xfs-5.20-merge-6' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Already up to date. +Merging mux/for-next (0fcfb00b28c0 Linux 5.16-rc4) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Already up to date. +Merging dmaengine/next (a1873f837f9e dmaengine: mediatek: mtk-hsdma: Fix typo 'the the' in comment) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Already up to date. +Merging cgroup/for-next (3109920b3d95 Merge branch 'for-5.20' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Auto-merging include/linux/cgroup-defs.h +Auto-merging init/Kconfig +Auto-merging kernel/cgroup/cgroup.c +Merge made by the 'ort' strategy. +Merging scsi/for-next (0f8c3a1df936 Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c +Auto-merging drivers/scsi/mpt3sas/mpt3sas_scsih.c +Auto-merging drivers/scsi/pm8001/pm8001_hwi.c +Auto-merging drivers/scsi/pm8001/pm8001_init.c +Auto-merging drivers/scsi/pm8001/pm80xx_hwi.c +Auto-merging drivers/target/target_core_file.c +Auto-merging drivers/target/target_core_iblock.c +Auto-merging drivers/target/target_core_sbc.c +Auto-merging drivers/ufs/core/ufshcd.c +Auto-merging drivers/ufs/host/ufshcd-pltfrm.c +CONFLICT (content): Merge conflict in drivers/ufs/host/ufshcd-pltfrm.c +Merge made by the 'ort' strategy. +Merging scsi-mkp/for-next (c6380f992427 scsi: pm8001: Fix typo 'the the' in comment) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging drivers/scsi/hosts.c +Auto-merging drivers/scsi/pm8001/pm8001_hwi.c +Auto-merging drivers/scsi/scsi_sysfs.c +Auto-merging drivers/ufs/core/ufshcd.c +Auto-merging include/scsi/scsi_device.h +Auto-merging include/scsi/scsi_host.h +Merge made by the 'ort' strategy. + drivers/s390/scsi/zfcp_fc.c | 29 ++++++++++++++++++-------- + drivers/s390/scsi/zfcp_fc.h | 6 ++++-- + drivers/s390/scsi/zfcp_fsf.c | 4 ++-- + drivers/scsi/FlashPoint.c | 4 ++-- + drivers/scsi/hosts.c | 18 +++++++++++----- + drivers/scsi/lpfc/lpfc_init.c | 2 ++ + drivers/scsi/megaraid/megaraid_sas_fusion.c | 3 +-- + drivers/scsi/pm8001/pm8001_hwi.c | 2 +- + drivers/scsi/scsi.c | 9 +++++--- + drivers/scsi/scsi_scan.c | 9 ++++++++ + drivers/scsi/scsi_sysfs.c | 29 +++++++++++++++----------- + drivers/target/target_core_alua.c | 3 +-- + drivers/target/target_core_device.c | 32 ++++++++++------------------- + drivers/target/target_core_pr.c | 28 ++++++++----------------- + drivers/target/target_core_stat.c | 10 ++++----- + drivers/target/target_core_xcopy.c | 2 +- + drivers/ufs/core/ufshcd.c | 7 ++----- + drivers/ufs/host/ufshcd-pci.c | 17 +++++++++++---- + include/scsi/scsi_device.h | 2 ++ + include/scsi/scsi_host.h | 3 +++ + include/target/target_core_base.h | 4 ++-- + 21 files changed, 124 insertions(+), 99 deletions(-) +Merging vhost/linux-next (6a9720576cd0 virtio: VIRTIO_HARDEN_NOTIFICATION is broken) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Auto-merging drivers/virtio/Kconfig +Auto-merging include/uapi/linux/vhost_types.h +Merge made by the 'ort' strategy. + drivers/nvdimm/virtio_pmem.c | 9 +++- + drivers/remoteproc/remoteproc_core.c | 4 +- + drivers/remoteproc/remoteproc_virtio.c | 10 ++--- + drivers/vdpa/vdpa_sim/vdpa_sim.c | 21 +++++++++ + drivers/vdpa/vdpa_sim/vdpa_sim.h | 1 + + drivers/vdpa/vdpa_sim/vdpa_sim_blk.c | 3 ++ + drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 3 ++ + drivers/vhost/vdpa.c | 35 ++++++++++++++- + drivers/vhost/vringh.c | 78 ++++++++++++++++++++++++---------- + drivers/virtio/Kconfig | 3 +- + drivers/virtio/virtio_ring.c | 7 ++- + include/linux/remoteproc.h | 4 +- + include/linux/vdpa.h | 4 ++ + include/uapi/linux/vhost.h | 14 ++++++ + include/uapi/linux/vhost_types.h | 2 + + 15 files changed, 160 insertions(+), 38 deletions(-) +Merging rpmsg/for-next (54a2e6f66586 Merge branches 'rpmsg-next', 'rproc-next' and 'hwspinlock-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Auto-merging Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt +Auto-merging drivers/remoteproc/remoteproc_core.c +Auto-merging include/linux/dma-map-ops.h +Merge made by the 'ort' strategy. + .../devicetree/bindings/remoteproc/mtk,scp.yaml | 2 + + .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 74 +++--- + .../bindings/remoteproc/qcom,glink-edge.yaml | 72 ++++++ + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 88 ++----- + .../bindings/remoteproc/qcom,qcs404-cdsp-pil.yaml | 1 - + .../bindings/remoteproc/qcom,sc7180-mss-pil.yaml | 245 +++++++++++++++++++ + .../bindings/remoteproc/qcom,sc7280-mss-pil.yaml | 266 +++++++++++++++++++++ + .../bindings/remoteproc/qcom,sc7280-wpss-pil.yaml | 21 +- + .../bindings/remoteproc/qcom,sdm845-adsp-pil.yaml | 1 - + .../bindings/remoteproc/qcom,smd-edge.yaml | 85 +++++++ + .../bindings/remoteproc/ti,pru-rproc.yaml | 5 +- + .../devicetree/bindings/soc/qcom/qcom,smd.yaml | 50 +--- + drivers/hwspinlock/omap_hwspinlock.c | 6 +- + drivers/hwspinlock/qcom_hwspinlock.c | 28 ++- + drivers/remoteproc/imx_rproc.c | 7 +- + drivers/remoteproc/keystone_remoteproc.c | 3 +- + drivers/remoteproc/mtk_scp.c | 23 +- + drivers/remoteproc/omap_remoteproc.c | 6 +- + drivers/remoteproc/pru_rproc.c | 1 + + drivers/remoteproc/qcom_common.c | 4 +- + drivers/remoteproc/qcom_q6v5.c | 4 + + drivers/remoteproc/qcom_q6v5_adsp.c | 3 +- + drivers/remoteproc/qcom_q6v5_mss.c | 54 ++++- + drivers/remoteproc/qcom_q6v5_pas.c | 85 +++++-- + drivers/remoteproc/qcom_sysmon.c | 16 +- + drivers/remoteproc/qcom_wcnss.c | 10 +- + drivers/remoteproc/remoteproc_core.c | 24 +- + drivers/remoteproc/ti_k3_r5_remoteproc.c | 2 + + drivers/rpmsg/mtk_rpmsg.c | 2 + + drivers/rpmsg/qcom_glink_native.c | 10 +- + drivers/rpmsg/qcom_glink_ssr.c | 2 +- + drivers/rpmsg/qcom_smd.c | 9 +- + drivers/rpmsg/rpmsg_char.c | 7 +- + drivers/rpmsg/rpmsg_core.c | 3 +- + drivers/rpmsg/rpmsg_internal.h | 4 +- + include/linux/dma-map-ops.h | 3 + + kernel/dma/coherent.c | 10 +- + 37 files changed, 987 insertions(+), 249 deletions(-) + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,glink-edge.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sc7180-mss-pil.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sc7280-mss-pil.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,smd-edge.yaml +Merging gpio/for-next (e73f0f0ee754 Linux 5.14-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (c4f0d16daa6d dt-bindings: gpio: fsl-imx-gpio: Add i.MXRT compatibles) +$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Already up to date. +Merging gpio-intel/for-next (b65bb2c14891 gpio: pch: Change PCI device macros) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Already up to date. +Merging gpio-sim/gpio/gpio-sim (0fcfb00b28c0 Linux 5.16-rc4) +$ git merge -m Merge branch 'gpio/gpio-sim' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-sim/gpio/gpio-sim +Already up to date. +Merging pinctrl/for-next (5b045200b53a dt-bindings: pinctrl: qcom,pmic-gpio: add PM8226 constraints) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Auto-merging Documentation/devicetree/bindings/pinctrl/allwinner,sun4i-a10-pinctrl.yaml +Auto-merging MAINTAINERS +Auto-merging arch/arm/boot/dts/sun6i-a31.dtsi +Auto-merging arch/arm/boot/dts/sun8i-a23-a33.dtsi +Auto-merging drivers/pinctrl/Kconfig +Auto-merging drivers/pinctrl/freescale/pinctrl-imx93.c +Auto-merging drivers/pinctrl/intel/pinctrl-intel.c +Auto-merging drivers/pinctrl/pinctrl-ocelot.c +Auto-merging drivers/pinctrl/qcom/pinctrl-spmi-gpio.c +Auto-merging drivers/pinctrl/renesas/pinctrl-rzg2l.c +Auto-merging drivers/pinctrl/sunxi/pinctrl-sunxi.c +Auto-merging include/linux/firmware/xlnx-zynqmp.h +Merge made by the 'ort' strategy. + .../bindings/gpio/x-powers,axp209-gpio.yaml | 6 + + .../pinctrl/allwinner,sun4i-a10-pinctrl.yaml | 16 +- + .../bindings/pinctrl/nuvoton,wpcm450-pinctrl.yaml | 2 +- + .../bindings/pinctrl/pinctrl-mt8186.yaml | 31 +- + .../bindings/pinctrl/pinctrl-mt8192.yaml | 64 +- + .../bindings/pinctrl/pinctrl-mt8195.yaml | 41 +- + .../bindings/pinctrl/qcom,msm8909-tlmm.yaml | 152 + + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 4 + + .../pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml | 5 + + .../bindings/pinctrl/qcom,sm6375-tlmm.yaml | 158 + + .../devicetree/bindings/pinctrl/renesas,pfc.yaml | 1 + + .../bindings/pinctrl/renesas,rzv2m-pinctrl.yaml | 170 + + .../bindings/pinctrl/st,stm32-pinctrl.yaml | 4 +- + .../bindings/pinctrl/sunplus,sp7021-pinctrl.yaml | 5 +- + .../bindings/pinctrl/xlnx,zynqmp-pinctrl.yaml | 4 + + MAINTAINERS | 1 + + arch/arm/boot/dts/imxrt1170-pinfunc.h | 1561 +++++++ + arch/arm/boot/dts/sun6i-a31.dtsi | 1 - + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 1 - + arch/arm/boot/dts/sun9i-a80.dtsi | 1 - + drivers/pinctrl/Kconfig | 2 +- + drivers/pinctrl/aspeed/pinmux-aspeed.h | 2 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 21 +- + drivers/pinctrl/core.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imx93.c | 1 + + drivers/pinctrl/intel/Kconfig | 8 + + drivers/pinctrl/intel/Makefile | 1 + + drivers/pinctrl/intel/pinctrl-baytrail.c | 18 +- + drivers/pinctrl/intel/pinctrl-cherryview.c | 16 +- + drivers/pinctrl/intel/pinctrl-intel.c | 14 +- + drivers/pinctrl/intel/pinctrl-intel.h | 25 +- + drivers/pinctrl/intel/pinctrl-lynxpoint.c | 10 +- + drivers/pinctrl/intel/pinctrl-merrifield.c | 14 +- + drivers/pinctrl/intel/pinctrl-meteorlake.c | 417 ++ + drivers/pinctrl/mediatek/pinctrl-mt8192.c | 296 +- + drivers/pinctrl/mvebu/pinctrl-mvebu.c | 10 + + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 4 +- + drivers/pinctrl/pinctrl-amd.c | 242 +- + drivers/pinctrl/pinctrl-amd.h | 1376 ++++++- + drivers/pinctrl/pinctrl-at91-pio4.c | 7 +- + drivers/pinctrl/pinctrl-at91.c | 10 +- + drivers/pinctrl/pinctrl-axp209.c | 14 +- + drivers/pinctrl/pinctrl-ingenic.c | 64 +- + drivers/pinctrl/pinctrl-ocelot.c | 4 +- + drivers/pinctrl/pinctrl-starfive.c | 5 + + drivers/pinctrl/pinctrl-zynqmp.c | 11 + + drivers/pinctrl/qcom/Kconfig | 19 +- + drivers/pinctrl/qcom/Makefile | 2 + + drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 2 +- + drivers/pinctrl/qcom/pinctrl-lpass-lpi.h | 1 - + drivers/pinctrl/qcom/pinctrl-msm8909.c | 956 +++++ + drivers/pinctrl/qcom/pinctrl-msm8916.c | 4 +- + drivers/pinctrl/qcom/pinctrl-sc7280-lpass-lpi.c | 1 - + drivers/pinctrl/qcom/pinctrl-sm6375.c | 1544 +++++++ + drivers/pinctrl/qcom/pinctrl-sm8250.c | 2 +- + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 3 + + drivers/pinctrl/renesas/Kconfig | 18 + + drivers/pinctrl/renesas/Makefile | 2 + + drivers/pinctrl/renesas/core.c | 6 + + drivers/pinctrl/renesas/pfc-r8a779f0.c | 2 - + drivers/pinctrl/renesas/pfc-r8a779g0.c | 4262 ++++++++++++++++++++ + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 2 + + drivers/pinctrl/renesas/pinctrl-rzv2m.c | 1119 +++++ + drivers/pinctrl/renesas/sh_pfc.h | 9 +- + drivers/pinctrl/samsung/pinctrl-exynos.c | 6 +- + drivers/pinctrl/samsung/pinctrl-exynos.h | 3 + + drivers/pinctrl/samsung/pinctrl-samsung.c | 4 +- + drivers/pinctrl/samsung/pinctrl-samsung.h | 8 + + drivers/pinctrl/sunxi/Kconfig | 8 +- + drivers/pinctrl/sunxi/Makefile | 1 + + drivers/pinctrl/sunxi/pinctrl-sun20i-d1.c | 840 ++++ + drivers/pinctrl/sunxi/pinctrl-sun50i-a100-r.c | 1 + + drivers/pinctrl/sunxi/pinctrl-sun50i-a100.c | 2 +- + drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun50i-h6-r.c | 2 +- + drivers/pinctrl/sunxi/pinctrl-sun50i-h616-r.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun50i-h616.c | 2 +- + drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c | 22 +- + drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c | 25 +- + drivers/pinctrl/sunxi/pinctrl-sun8i-a83t-r.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun9i-a80-r.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 156 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.h | 109 +- + include/dt-bindings/pinctrl/r7s9210-pinctrl.h | 2 +- + include/dt-bindings/pinctrl/rzg2l-pinctrl.h | 2 +- + include/dt-bindings/pinctrl/rzv2m-pinctrl.h | 23 + + include/linux/firmware/xlnx-zynqmp.h | 5 + + include/linux/pinctrl/pinctrl.h | 20 + + 88 files changed, 13354 insertions(+), 667 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8909-tlmm.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm6375-tlmm.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/renesas,rzv2m-pinctrl.yaml + create mode 100644 arch/arm/boot/dts/imxrt1170-pinfunc.h + create mode 100644 drivers/pinctrl/intel/pinctrl-meteorlake.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-msm8909.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sm6375.c + create mode 100644 drivers/pinctrl/renesas/pfc-r8a779g0.c + create mode 100644 drivers/pinctrl/renesas/pinctrl-rzv2m.c + create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun20i-d1.c + create mode 100644 include/dt-bindings/pinctrl/rzv2m-pinctrl.h +Merging pinctrl-intel/for-next (25097de7b236 pinctrl: intel: Add Intel Meteor Lake pin controller support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (36611d28f513 pinctrl: renesas: r8a779g0: Add missing MODSELx for AVBx) +$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Already up to date. +Merging pinctrl-samsung/for-next (c98ebe065e07 pinctrl: samsung: do not use bindings header with constants) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Merge made by the 'ort' strategy. +Merging pwm/for-next (8933d30c5f46 pwm: lpc18xx: Fix period handling) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next +Already up to date. +Merging userns/for-next (a0b88362d2c7 Merge of ucount-rlimits-cleanups-for-v5.19, interrupting_kthread_stop-for-v5.20, signal-for-v5.20, and retire_mq_sysctls-for-v5.19 for testing in linux-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next +Auto-merging fs/coredump.c +Auto-merging fs/exec.c +Auto-merging fs/proc/array.c +Auto-merging ipc/mqueue.c +Auto-merging kernel/exit.c +Auto-merging kernel/fork.c +Merge made by the 'ort' strategy. + fs/coredump.c | 2 +- + fs/exec.c | 2 +- + fs/proc/array.c | 2 +- + include/linux/sched/signal.h | 1 + + include/linux/user_namespace.h | 35 ++++++++++++++++++++++------------- + ipc/mqueue.c | 1 + + kernel/exit.c | 20 +++++++++++++++++++- + kernel/fork.c | 14 ++++++++------ + kernel/kthread.c | 1 + + kernel/signal.c | 3 ++- + kernel/sys.c | 2 +- + kernel/ucount.c | 34 +++++++++++++++------------------- + kernel/user_namespace.c | 10 +++++----- + 13 files changed, 78 insertions(+), 49 deletions(-) +Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Already up to date. +Merging kselftest/next (b1d34b1375f9 selftests/landlock: fix broken include of linux/landlock.h) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Merge made by the 'ort' strategy. + tools/testing/selftests/landlock/Makefile | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) +Merging livepatching/for-next (df44b1ee72f4 Merge branch 'for-5.20/selftests-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next +Merge made by the 'ort' strategy. +Merging rtc/rtc-next (5adbaed16cc6 rtc: Add NCT3018Y real time clock driver) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 49276d91bbb3] Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/rtc/microcrystal,rv3032.yaml | 1 + + .../devicetree/bindings/rtc/nuvoton,nct3018y.yaml | 45 ++ + .../devicetree/bindings/rtc/nxp,pcf85063.txt | 32 - + .../devicetree/bindings/rtc/nxp,pcf85063.yaml | 92 +++ + .../devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml | 2 +- + .../devicetree/bindings/rtc/rtc-mt6397.txt | 2 + + .../devicetree/bindings/rtc/ti,k3-rtc.yaml | 62 ++ + .../devicetree/bindings/rtc/xlnx,zynqmp-rtc.yaml | 12 +- + MAINTAINERS | 3 + + drivers/rtc/Kconfig | 41 +- + drivers/rtc/Makefile | 4 +- + drivers/rtc/class.c | 6 +- + drivers/rtc/dev.c | 8 +- + drivers/rtc/rtc-ab-b5ze-s3.c | 5 +- + drivers/rtc/rtc-ab-eoz9.c | 5 +- + drivers/rtc/rtc-bq32k.c | 5 +- + drivers/rtc/rtc-core.h | 5 - + drivers/rtc/rtc-cros-ec.c | 4 +- + drivers/rtc/rtc-ds1374.c | 5 +- + drivers/rtc/rtc-ds1672.c | 5 +- + drivers/rtc/rtc-ds3232.c | 5 +- + drivers/rtc/rtc-em3027.c | 5 +- + drivers/rtc/rtc-fm3130.c | 5 +- + drivers/rtc/rtc-hym8563.c | 5 +- + drivers/rtc/rtc-isl12022.c | 5 +- + drivers/rtc/rtc-isl1208.c | 10 +- + drivers/rtc/rtc-max6900.c | 5 +- + drivers/rtc/rtc-mc146818-lib.c | 8 +- + drivers/rtc/rtc-mpfs.c | 323 ++++++++++ + drivers/rtc/rtc-nct3018y.c | 553 +++++++++++++++++ + drivers/rtc/rtc-pcf8523.c | 5 +- + drivers/rtc/rtc-pcf85363.c | 5 +- + drivers/rtc/rtc-pcf8563.c | 5 +- + drivers/rtc/rtc-pcf8583.c | 5 +- + drivers/rtc/rtc-rv3029c2.c | 5 +- + drivers/rtc/rtc-rv8803.c | 98 ++- + drivers/rtc/rtc-rx6110.c | 5 +- + drivers/rtc/rtc-rx8025.c | 22 +- + drivers/rtc/rtc-rx8581.c | 5 +- + drivers/rtc/rtc-s35390a.c | 5 +- + drivers/rtc/rtc-sd3078.c | 5 +- + drivers/rtc/rtc-sun6i.c | 2 + + drivers/rtc/rtc-ti-k3.c | 680 +++++++++++++++++++++ + drivers/rtc/rtc-vr41xx.c | 363 ----------- + drivers/rtc/rtc-x1205.c | 5 +- + drivers/rtc/rtc-zynqmp.c | 115 +++- + 46 files changed, 2062 insertions(+), 536 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/nuvoton,nct3018y.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/nxp,pcf85063.txt + create mode 100644 Documentation/devicetree/bindings/rtc/nxp,pcf85063.yaml + create mode 100644 Documentation/devicetree/bindings/rtc/ti,k3-rtc.yaml + create mode 100644 drivers/rtc/rtc-mpfs.c + create mode 100644 drivers/rtc/rtc-nct3018y.c + create mode 100644 drivers/rtc/rtc-ti-k3.c + delete mode 100644 drivers/rtc/rtc-vr41xx.c +Merging nvdimm/libnvdimm-for-next (53fc59511fc4 nvdimm/namespace: drop unneeded temporary variable in size_store()) +$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Auto-merging drivers/nvdimm/namespace_devs.c +Merge made by the 'ort' strategy. + drivers/nvdimm/namespace_devs.c | 22 +++++++--------------- + 1 file changed, 7 insertions(+), 15 deletions(-) +Merging at24/at24/for-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (e8c04e435db5 NTB: EPF: Mark pci_read and pci_write as static) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Auto-merging drivers/pci/controller/dwc/pcie-designware-ep.c +Merge made by the 'ort' strategy. + Documentation/PCI/endpoint/index.rst | 2 + + Documentation/PCI/endpoint/pci-vntb-function.rst | 126 ++ + Documentation/PCI/endpoint/pci-vntb-howto.rst | 161 +++ + drivers/ntb/hw/epf/ntb_hw_epf.c | 48 +- + drivers/ntb/hw/idt/ntb_hw_idt.c | 6 +- + drivers/ntb/hw/intel/ntb_hw_gen1.c | 4 +- + drivers/ntb/hw/intel/ntb_hw_gen4.c | 2 +- + drivers/ntb/hw/intel/ntb_hw_intel.h | 9 + + drivers/ntb/test/ntb_perf.c | 828 ++++++++++++- + drivers/pci/controller/dwc/pcie-designware-ep.c | 10 +- + drivers/pci/endpoint/functions/Kconfig | 11 + + drivers/pci/endpoint/functions/Makefile | 1 + + drivers/pci/endpoint/functions/pci-epf-vntb.c | 1425 ++++++++++++++++++++++ + 13 files changed, 2598 insertions(+), 35 deletions(-) + create mode 100644 Documentation/PCI/endpoint/pci-vntb-function.rst + create mode 100644 Documentation/PCI/endpoint/pci-vntb-howto.rst + create mode 100644 drivers/pci/endpoint/functions/pci-epf-vntb.c +Merging seccomp/for-next/seccomp (3ce4b78f73e8 selftests/seccomp: Fix compile warning when CC=clang) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Already up to date. +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge -m Merge branch 'for-next' of https://github.com/daniel-walker/cisco-linux.git cisco/for-next +Already up to date. +Merging fsi/next (04823dd2af87 fsi: master-ast-cf: Fix missing of_node_put in fsi_master_acf_probe) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next +Auto-merging drivers/hwmon/occ/p9_sbe.c +Merge made by the 'ort' strategy. + drivers/fsi/fsi-core.c | 8 ++++---- + drivers/fsi/fsi-master-ast-cf.c | 2 ++ + drivers/fsi/fsi-master.h | 2 +- + drivers/fsi/fsi-occ.c | 25 ++++++++++++++++++++----- + drivers/fsi/fsi-sbefifo.c | 15 +++++++++------ + drivers/hwmon/occ/p9_sbe.c | 15 ++++++++++----- + 6 files changed, 46 insertions(+), 21 deletions(-) +Merging slimbus/for-next (4ad3deabeea2 slimbus: messaging: fix typos in comments) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Merge made by the 'ort' strategy. +Merging nvmem/for-next (432ee5a3cfcf nvmem: mtk-efuse: Simplify with devm_platform_get_and_ioremap_resource()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. +Merging xarray/main (69cb69ea5542 ida: Remove assertions that an ID was allocated) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Merge made by the 'ort' strategy. + lib/idr.c | 14 ++++---------- + 1 file changed, 4 insertions(+), 10 deletions(-) +Merging hyperv/hyperv-next (d180e0a1be6c Drivers: hv: Create debugfs file with hyper-v balloon usage information) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Auto-merging drivers/pci/controller/pci-hyperv.c +Merge made by the 'ort' strategy. + drivers/hv/connection.c | 11 ++++ + drivers/hv/hv_balloon.c | 135 +++++++++++++++++++++++++++++++++++++++++++--- + drivers/hv/hyperv_vmbus.h | 7 +++ + drivers/hv/vmbus_drv.c | 27 +++++++--- + 4 files changed, 166 insertions(+), 14 deletions(-) +Merging auxdisplay/auxdisplay (13de23494f38 auxdisplay: lcd2s: Use array size explicitly in lcd2s_gotoxy()) +$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper function) +$ git merge -m Merge branch 'kgdb/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (ca7fd6cff3b8 RDMA/erdma: Add driver to kernel build environment) +$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging kunit/test (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging cfi/cfi/next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging kunit-next/kunit (4c392516accf Documentation: KUnit: Fix example with compilation error) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Already up to date. +Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git trivial/for-next +Already up to date. +Merging mhi/mhi-next (bb3c64f6a017 bus: mhi: host: Fix up null pointer access in mhi_irq_handler) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Merge made by the 'ort' strategy. + drivers/bus/mhi/host/main.c | 19 ++++++++++++++++--- + 1 file changed, 16 insertions(+), 3 deletions(-) +Merging memblock/for-next (04d9490986d1 memblock test: Modify the obsolete description in README) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Auto-merging mm/memblock.c +Merge made by the 'ort' strategy. + mm/memblock.c | 11 + + tools/testing/memblock/Makefile | 3 +- + tools/testing/memblock/README | 17 +- + tools/testing/memblock/TODO | 14 +- + tools/testing/memblock/internal.h | 11 + + tools/testing/memblock/linux/memory_hotplug.h | 8 +- + tools/testing/memblock/main.c | 2 + + tools/testing/memblock/scripts/Makefile.include | 10 +- + tools/testing/memblock/tests/alloc_api.c | 225 ++++++++++----- + tools/testing/memblock/tests/alloc_helpers_api.c | 129 ++++++--- + tools/testing/memblock/tests/alloc_nid_api.c | 351 +++++++++++++++-------- + tools/testing/memblock/tests/basic_api.c | 337 +++++++++++++++------- + tools/testing/memblock/tests/common.c | 118 ++++++++ + tools/testing/memblock/tests/common.h | 54 ++++ + 14 files changed, 920 insertions(+), 370 deletions(-) +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge -m Merge branch 'init-user-pointers' of git://git.infradead.org/users/hch/misc.git init/init-user-pointers +Already up to date. +Merging counters/counters (e71ba9452f0b Linux 5.11-rc2) +$ git merge -m Merge branch 'counters' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git counters/counters +Already up to date. +Merging cxl/next (1cd8a2537eb0 cxl/hdm: Fix skip allocations vs multiple pmem allocations) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Auto-merging arch/powerpc/mm/mem.c +Auto-merging drivers/pci/Kconfig +Auto-merging drivers/pci/probe.c +Auto-merging include/linux/pci_ids.h +Auto-merging mm/Kconfig +Merge made by the 'ort' strategy. + .clang-format | 1 + + Documentation/ABI/testing/sysfs-bus-cxl | 305 +++- + Documentation/driver-api/cxl/memory-devices.rst | 8 + + arch/powerpc/mm/mem.c | 1 + + drivers/cxl/Kconfig | 9 + + drivers/cxl/acpi.c | 243 ++- + drivers/cxl/core/Makefile | 1 + + drivers/cxl/core/core.h | 51 +- + drivers/cxl/core/hdm.c | 691 ++++++++- + drivers/cxl/core/mbox.c | 95 +- + drivers/cxl/core/memdev.c | 4 +- + drivers/cxl/core/pci.c | 181 ++- + drivers/cxl/core/pmem.c | 4 +- + drivers/cxl/core/port.c | 738 ++++++--- + drivers/cxl/core/region.c | 1896 +++++++++++++++++++++++ + drivers/cxl/cxl.h | 312 +++- + drivers/cxl/cxlmem.h | 42 +- + drivers/cxl/cxlpci.h | 1 + + drivers/cxl/mem.c | 49 +- + drivers/cxl/pci.c | 46 +- + drivers/cxl/pmem.c | 259 +++- + drivers/cxl/port.c | 53 + + drivers/nvdimm/region_devs.c | 28 +- + drivers/pci/Kconfig | 3 + + drivers/pci/Makefile | 1 + + drivers/pci/doe.c | 536 +++++++ + drivers/pci/probe.c | 2 +- + include/linux/ioport.h | 3 + + include/linux/libnvdimm.h | 5 + + include/linux/pci-doe.h | 77 + + include/linux/pci_ids.h | 1 + + include/linux/sysfs.h | 16 + + include/uapi/linux/pci_regs.h | 29 +- + kernel/resource.c | 185 ++- + mm/Kconfig | 5 + + tools/testing/cxl/Kbuild | 1 + + tools/testing/cxl/test/cxl.c | 131 +- + tools/testing/cxl/test/mem.c | 53 +- + tools/testing/cxl/test/mock.c | 8 +- + 39 files changed, 5498 insertions(+), 576 deletions(-) + create mode 100644 drivers/cxl/core/region.c + create mode 100644 drivers/pci/doe.c + create mode 100644 include/linux/pci-doe.h +Merging folio-iomap/folio-iomap (4d7bd0eb72e5 iomap: Inline __iomap_zero_iter into its caller) +$ git merge -m Merge branch 'folio-iomap' of git://git.infradead.org/users/willy/linux.git folio-iomap/folio-iomap +Already up to date. +Merging zstd/zstd-next (88a309465b3f lib: zstd: clean up double word in comment.) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (df3c9072ef90 Merge branch 'efivars-cleanup' into efi/next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Auto-merging include/linux/efi.h +Merge made by the 'ort' strategy. +Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Merge made by the 'ort' strategy. + fs/unicode/mkutf8data.c | 38 ++++++++++++++++++++++++-------------- + 1 file changed, 24 insertions(+), 14 deletions(-) +Merging slab/for-next (3041808b5220 mm/slab_common: move generic bulk alloc/free functions to SLOB) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/for-next +Already up to date. +Merging random/master (c2a24a7a036b Merge tag 'v5.20-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Already up to date. +Merging landlock/next (b13baccc3850 Linux 5.19-rc2) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Already up to date. +Merging rust/rust-next (07a3263c2554 init/Kconfig: Specify the interpreter for rust_is_available.sh) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging Documentation/doc-guide/kernel-doc.rst +Auto-merging Documentation/index.rst +Auto-merging MAINTAINERS +Auto-merging Makefile +CONFLICT (content): Merge conflict in Makefile +Auto-merging arch/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging init/Kconfig +Auto-merging kernel/kallsyms.c +Auto-merging lib/Kconfig.debug +Auto-merging scripts/Kconfig.include +Auto-merging scripts/Makefile.build +Auto-merging scripts/checkpatch.pl +Auto-merging tools/lib/perf/include/perf/event.h +Recorded preimage for 'Makefile' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'Makefile'. +[master c62db627ed7e] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git +$ git diff -M --stat --summary HEAD^.. + .gitignore | 6 + + .rustfmt.toml | 12 + + Documentation/core-api/printk-formats.rst | 10 + + Documentation/doc-guide/kernel-doc.rst | 3 + + Documentation/index.rst | 1 + + Documentation/kbuild/kbuild.rst | 17 + + Documentation/kbuild/makefiles.rst | 50 +- + Documentation/process/changes.rst | 41 + + Documentation/rust/arch-support.rst | 19 + + Documentation/rust/coding-guidelines.rst | 216 ++ + Documentation/rust/general-information.rst | 79 + + Documentation/rust/index.rst | 22 + + Documentation/rust/quick-start.rst | 232 ++ + MAINTAINERS | 18 + + Makefile | 171 +- + arch/Kconfig | 6 + + arch/x86/Kconfig | 1 + + arch/x86/Makefile | 10 + + include/linux/compiler_types.h | 6 +- + include/linux/kallsyms.h | 2 +- + init/Kconfig | 52 +- + kernel/configs/rust.config | 1 + + kernel/kallsyms.c | 26 +- + kernel/livepatch/core.c | 4 +- + lib/Kconfig.debug | 34 + + lib/vsprintf.c | 13 + + rust/.gitignore | 8 + + rust/Makefile | 381 ++++ + rust/alloc/README.md | 33 + + rust/alloc/alloc.rs | 440 ++++ + rust/alloc/borrow.rs | 498 ++++ + rust/alloc/boxed.rs | 2028 +++++++++++++++++ + rust/alloc/collections/mod.rs | 156 ++ + rust/alloc/lib.rs | 244 ++ + rust/alloc/raw_vec.rs | 527 +++++ + rust/alloc/slice.rs | 1204 ++++++++++ + rust/alloc/vec/drain.rs | 186 ++ + rust/alloc/vec/drain_filter.rs | 145 ++ + rust/alloc/vec/into_iter.rs | 366 +++ + rust/alloc/vec/is_zero.rs | 120 + + rust/alloc/vec/mod.rs | 3140 ++++++++++++++++++++++++++ + rust/alloc/vec/partial_eq.rs | 49 + + rust/bindgen_parameters | 21 + + rust/bindings/bindings_helper.h | 13 + + rust/bindings/lib.rs | 53 + + rust/compiler_builtins.rs | 63 + + rust/exports.c | 21 + + rust/helpers.c | 51 + + rust/kernel/allocator.rs | 64 + + rust/kernel/error.rs | 59 + + rust/kernel/lib.rs | 78 + + rust/kernel/prelude.rs | 20 + + rust/kernel/print.rs | 198 ++ + rust/kernel/str.rs | 72 + + rust/macros/helpers.rs | 51 + + rust/macros/lib.rs | 72 + + rust/macros/module.rs | 282 +++ + samples/Kconfig | 2 + + samples/Makefile | 1 + + samples/rust/Kconfig | 30 + + samples/rust/Makefile | 5 + + samples/rust/hostprogs/.gitignore | 3 + + samples/rust/hostprogs/Makefile | 5 + + samples/rust/hostprogs/a.rs | 7 + + samples/rust/hostprogs/b.rs | 5 + + samples/rust/hostprogs/single.rs | 12 + + samples/rust/rust_minimal.rs | 38 + + scripts/.gitignore | 1 + + scripts/Kconfig.include | 6 +- + scripts/Makefile | 3 + + scripts/Makefile.build | 60 + + scripts/Makefile.debug | 10 + + scripts/Makefile.host | 34 +- + scripts/Makefile.lib | 12 + + scripts/Makefile.modfinal | 8 +- + scripts/cc-version.sh | 12 +- + scripts/checkpatch.pl | 12 +- + scripts/decode_stacktrace.sh | 14 + + scripts/generate_rust_analyzer.py | 135 ++ + scripts/generate_rust_target.rs | 182 ++ + scripts/is_rust_module.sh | 16 + + scripts/kallsyms.c | 47 +- + scripts/kconfig/confdata.c | 75 + + scripts/min-tool-version.sh | 6 + + scripts/rust_is_available.sh | 160 ++ + scripts/rust_is_available_bindgen_libclang.h | 2 + + tools/include/linux/kallsyms.h | 2 +- + tools/lib/perf/include/perf/event.h | 2 +- + tools/lib/symbol/kallsyms.h | 2 +- + 89 files changed, 12553 insertions(+), 51 deletions(-) + create mode 100644 .rustfmt.toml + create mode 100644 Documentation/rust/arch-support.rst + create mode 100644 Documentation/rust/coding-guidelines.rst + create mode 100644 Documentation/rust/general-information.rst + create mode 100644 Documentation/rust/index.rst + create mode 100644 Documentation/rust/quick-start.rst + create mode 100644 kernel/configs/rust.config + create mode 100644 rust/.gitignore + create mode 100644 rust/Makefile + create mode 100644 rust/alloc/README.md + create mode 100644 rust/alloc/alloc.rs + create mode 100644 rust/alloc/borrow.rs + create mode 100644 rust/alloc/boxed.rs + create mode 100644 rust/alloc/collections/mod.rs + create mode 100644 rust/alloc/lib.rs + create mode 100644 rust/alloc/raw_vec.rs + create mode 100644 rust/alloc/slice.rs + create mode 100644 rust/alloc/vec/drain.rs + create mode 100644 rust/alloc/vec/drain_filter.rs + create mode 100644 rust/alloc/vec/into_iter.rs + create mode 100644 rust/alloc/vec/is_zero.rs + create mode 100644 rust/alloc/vec/mod.rs + create mode 100644 rust/alloc/vec/partial_eq.rs + create mode 100644 rust/bindgen_parameters + create mode 100644 rust/bindings/bindings_helper.h + create mode 100644 rust/bindings/lib.rs + 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/error.rs + create mode 100644 rust/kernel/lib.rs + create mode 100644 rust/kernel/prelude.rs + create mode 100644 rust/kernel/print.rs + create mode 100644 rust/kernel/str.rs + create mode 100644 rust/macros/helpers.rs + create mode 100644 rust/macros/lib.rs + create mode 100644 rust/macros/module.rs + create mode 100644 samples/rust/Kconfig + create mode 100644 samples/rust/Makefile + create mode 100644 samples/rust/hostprogs/.gitignore + create mode 100644 samples/rust/hostprogs/Makefile + create mode 100644 samples/rust/hostprogs/a.rs + create mode 100644 samples/rust/hostprogs/b.rs + create mode 100644 samples/rust/hostprogs/single.rs + create mode 100644 samples/rust/rust_minimal.rs + create mode 100755 scripts/generate_rust_analyzer.py + create mode 100644 scripts/generate_rust_target.rs + create mode 100755 scripts/is_rust_module.sh + create mode 100755 scripts/rust_is_available.sh + create mode 100644 scripts/rust_is_available_bindgen_libclang.h +Merging sysctl/sysctl-next (acdc07ace871 kernel/sysctl.c: Clean up indentation, replace spaces with tab.) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next +Auto-merging kernel/sysctl.c +Merge made by the 'ort' strategy. + kernel/sysctl.c | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) +Merging folio/for-next (03b33c09ea22 fs: remove the NULL get_block case in mpage_writepages) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git folio/for-next +Auto-merging block/fops.c +Auto-merging block/partitions/core.c +Auto-merging drivers/misc/vmw_balloon.c +Auto-merging drivers/virtio/virtio_balloon.c +Auto-merging fs/aio.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/buffer.c +Auto-merging fs/ext2/inode.c +Auto-merging fs/ext2/super.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/node.c +Auto-merging fs/gfs2/aops.c +Auto-merging fs/gfs2/lops.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging fs/iomap/buffered-io.c +Auto-merging fs/mpage.c +Auto-merging fs/nfs/file.c +Auto-merging fs/nfs/internal.h +Auto-merging fs/nfs/write.c +Auto-merging fs/ntfs/aops.c +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ocfs2/aops.c +Auto-merging fs/squashfs/file.c +Auto-merging fs/zonefs/super.c +Auto-merging include/linux/buffer_head.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/iomap.h +Auto-merging include/linux/migrate.h +Auto-merging include/linux/page-flags.h +Auto-merging include/linux/pagemap.h +Auto-merging mm/compaction.c +Auto-merging mm/ksm.c +Auto-merging mm/migrate.c +Auto-merging mm/migrate_device.c +Auto-merging mm/secretmem.c +Auto-merging mm/shmem.c +Auto-merging mm/swap_state.c +Auto-merging mm/util.c +Auto-merging mm/zsmalloc.c +Merge made by the 'ort' strategy. + fs/btrfs/disk-io.c | 19 ++++++++----------- + 1 file changed, 8 insertions(+), 11 deletions(-) +Merging execve/for-next/execve (c6e8e36c6ae4 exec: Call kmap_local_page() in copy_string_kernel()) +$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Already up to date. +Merging bitmap/bitmap-for-next (36d4b36b6959 lib/nodemask: inline next_node_in() and node_random()) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging MAINTAINERS +Auto-merging arch/m68k/include/asm/bitops.h +Auto-merging arch/powerpc/include/asm/archrandom.h +CONFLICT (content): Merge conflict in arch/powerpc/include/asm/archrandom.h +Auto-merging arch/powerpc/kernel/setup-common.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_power.c +Auto-merging drivers/iommu/intel/dmar.c +Auto-merging drivers/iommu/intel/iommu.c +Auto-merging drivers/net/ethernet/intel/ice/ice_switch.c +Auto-merging include/linux/cpumask.h +CONFLICT (content): Merge conflict in include/linux/cpumask.h +Auto-merging include/linux/gfp.h +CONFLICT (content): Merge conflict in include/linux/gfp.h +Auto-merging lib/Makefile +CONFLICT (content): Merge conflict in lib/Makefile +Auto-merging lib/cpumask.c +Resolved 'arch/powerpc/include/asm/archrandom.h' using previous resolution. +Resolved 'include/linux/cpumask.h' using previous resolution. +Resolved 'include/linux/gfp.h' using previous resolution. +Resolved 'lib/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4a9ca222c212] Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/core-api/mm-api.rst | 8 +- + MAINTAINERS | 2 +- + arch/alpha/include/asm/bitops.h | 32 +- + arch/arm/include/asm/bitops.h | 18 +- + arch/hexagon/include/asm/bitops.h | 24 +- + arch/ia64/include/asm/bitops.h | 42 +-- + arch/ia64/include/asm/processor.h | 2 +- + arch/m68k/include/asm/bitops.h | 49 ++- + arch/powerpc/include/asm/archrandom.h | 9 +- + arch/powerpc/kernel/setup-common.c | 12 + + arch/s390/include/asm/bitops.h | 61 ++-- + arch/sh/include/asm/bitops-op32.h | 34 +- + arch/sparc/include/asm/bitops_32.h | 18 +- + arch/sparc/lib/atomic32.c | 12 +- + arch/x86/include/asm/bitops.h | 22 +- + arch/x86/platform/olpc/olpc-xo1-sci.c | 2 +- + drivers/dma/ti/k3-udma.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 2 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 2 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c | 2 +- + drivers/iommu/intel/dmar.c | 2 +- + drivers/iommu/intel/iommu.c | 2 +- + drivers/net/ethernet/intel/ice/ice_switch.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/fw.c | 2 +- + drivers/net/wireless/ath/ath9k/htc_drv_debug.c | 2 +- + drivers/net/wireless/ath/carl9170/debug.c | 2 +- + include/asm-generic/bitops/generic-non-atomic.h | 161 ++++++++++ + .../asm-generic/bitops/instrumented-non-atomic.h | 35 ++- + include/asm-generic/bitops/non-atomic.h | 121 +------ + .../bitops/non-instrumented-non-atomic.h | 16 + + include/linux/bitmap.h | 37 ++- + include/linux/bitops.h | 50 +++ + include/linux/cpumask.h | 120 +++++-- + include/linux/gfp.h | 348 +-------------------- + include/linux/gfp_types.h | 348 +++++++++++++++++++++ + include/linux/nodemask.h | 24 +- + lib/Makefile | 2 +- + lib/bitmap.c | 11 +- + lib/cpumask.c | 97 +----- + lib/nodemask.c | 8 - + lib/test_bitmap.c | 68 ++++ + tools/include/asm-generic/bitops/non-atomic.h | 34 +- + tools/include/linux/bitmap.h | 12 +- + tools/include/linux/bitops.h | 16 + + tools/lib/bitmap.c | 6 +- + 45 files changed, 1088 insertions(+), 797 deletions(-) + create mode 100644 include/asm-generic/bitops/generic-non-atomic.h + create mode 100644 include/asm-generic/bitops/non-instrumented-non-atomic.h + create mode 100644 include/linux/gfp_types.h +$ git am -3 ../patches/0001-fix-up-for-mm-kasan-Skip-unpoisoning-of-user-pages.patch +Applying: fix up for "mm: kasan: Skip unpoisoning of user pages" +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/gfp_types.h +$ git add -A . +$ git commit -v -a --amend +[master 336d53639b2a] Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git + Date: Mon Aug 8 11:34:46 2022 +1000 +$ git am -3 ../patches/0001-fix-up-for-bitmap_weight-return-value-changing.patch +Applying: fix up for bitmap_weight return value changing +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/i915/gt/intel_sseu.c +M drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c +$ git add -A . +$ git commit -v -a --amend +[master 8b3f227dad17] Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git + Date: Mon Aug 8 11:34:46 2022 +1000 +$ git am -3 ../patches/0001-fix-up-for-powerpc-drop-dependency-on-asm-machdep.h-.patch +Applying: fix up for "powerpc: drop dependency on <asm/machdep.h> in archrandom.h" +error: sha1 information is lacking or useless (arch/powerpc/kernel/setup-common.c). +error: could not build fake ancestor +hint: Use 'git am --show-current-patch=diff' to see the failed patch +Patch failed at 0001 fix up for "powerpc: drop dependency on <asm/machdep.h> in archrandom.h" +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +$ git reset HEAD^ +Unstaged changes after reset: +M arch/powerpc/kernel/setup-common.c +$ git add -A . +$ git commit -v -a --amend +[master 5d6fc35ccb1f] Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git + Date: Mon Aug 8 11:34:46 2022 +1000 +Merging hte/hte/for-next (85ff37e302ef gpiolib: cdev: Fix kernel doc for struct line) +$ git merge -m Merge branch 'hte/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git hte/hte/for-next +Already up to date. +Merging kspp/for-next/kspp (27603a606fda dm: verity-loadpin: Drop use of dm_table_get_num_targets()) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Already up to date. +Merging kspp-gustavo/for-next/kspp (94dfc73e7cf4 treewide: uapi: Replace zero-length arrays with flexible-array members) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp +Already up to date. +Merging mm-stable/mm-stable (360614c01f81 tools/testing/selftests/vm/hmm-tests.c: fix build) +$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Already up to date. +Merging mm-nonmm-stable/mm-nonmm-stable (b99695580bfc scripts/gdb: ensure the absolute path is generated on initial source) +$ git merge -m Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Already up to date. +Merging mm/mm-everything (11378c6a99ac Merge branch 'mm-nonmm-unstable' into mm-everything) +$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything +Auto-merging .mailmap +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging drivers/dma-buf/dma-buf.c +Auto-merging drivers/iommu/tegra-smmu.c +Auto-merging fs/ocfs2/namei.c +Auto-merging fs/ocfs2/refcounttree.c +Auto-merging fs/proc/task_mmu.c +Auto-merging fs/userfaultfd.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/gfp.h +CONFLICT (content): Merge conflict in include/linux/gfp.h +Auto-merging include/linux/highmem.h +Auto-merging include/linux/huge_mm.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/page-flags.h +Auto-merging include/linux/sysctl.h +Auto-merging init/main.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/test_printf.c +Auto-merging mm/gup.c +Auto-merging mm/huge_memory.c +Auto-merging mm/hugetlb.c +Auto-merging mm/hugetlb.c +Auto-merging mm/internal.h +Auto-merging mm/kfence/core.c +Auto-merging mm/ksm.c +Auto-merging mm/memory-failure.c +Auto-merging mm/memory.c +Auto-merging mm/memory.c +Auto-merging mm/memremap.c +Auto-merging mm/page_alloc.c +Auto-merging mm/page_alloc.c +Auto-merging mm/rmap.c +Auto-merging mm/shmem.c +Auto-merging mm/sparse-vmemmap.c +Auto-merging mm/sparse-vmemmap.c +Auto-merging mm/vmscan.c +Resolved 'include/linux/gfp.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1e1614cf9953] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 7 +- + Documentation/admin-guide/mm/hugetlbpage.rst | 4 +- + Documentation/admin-guide/mm/memory-hotplug.rst | 4 +- + Documentation/admin-guide/sysctl/vm.rst | 3 +- + Documentation/filesystems/proc.rst | 22 +- + Documentation/mm/balance.rst | 2 +- + Documentation/mm/highmem.rst | 31 +- + Documentation/mm/vmemmap_dedup.rst | 72 ++- + arch/alpha/include/uapi/asm/mman.h | 2 + + arch/arm64/mm/flush.c | 13 +- + arch/mips/include/uapi/asm/mman.h | 2 + + arch/parisc/include/uapi/asm/mman.h | 2 + + arch/x86/mm/hugetlbpage.c | 8 +- + arch/xtensa/include/uapi/asm/mman.h | 2 + + drivers/dma-buf/dma-buf.c | 1 - + drivers/iommu/tegra-smmu.c | 4 +- + fs/Kconfig | 12 +- + fs/libfs.c | 9 + + fs/ocfs2/namei.c | 49 +- + fs/ocfs2/namei.h | 2 + + fs/ocfs2/refcounttree.c | 15 +- + fs/ocfs2/xattr.c | 12 +- + fs/ocfs2/xattr.h | 1 + + fs/proc/fd.c | 18 +- + fs/proc/task_mmu.c | 2 +- + include/linux/fs.h | 1 + + include/linux/highmem.h | 7 +- + include/linux/huge_mm.h | 23 +- + include/linux/hugetlb.h | 24 +- + include/linux/mm.h | 9 +- + include/linux/page-flags.h | 32 +- + include/linux/swapops.h | 9 + + include/linux/sysctl.h | 4 + + include/ras/ras_event.h | 1 - + include/trace/events/huge_memory.h | 1 + + include/trace/events/mmflags.h | 1 - + include/uapi/asm-generic/mman-common.h | 2 + + init/main.c | 25 +- + lib/debugobjects.c | 10 + + lib/test_printf.c | 8 +- + mm/huge_memory.c | 32 +- + mm/hugetlb.c | 73 ++- + mm/hugetlb_vmemmap.c | 589 +++++++++++++----- + mm/hugetlb_vmemmap.h | 45 +- + mm/internal.h | 4 +- + mm/khugepaged.c | 768 ++++++++++++++---------- + mm/ksm.c | 10 + + mm/madvise.c | 9 +- + mm/memory-failure.c | 179 +++++- + mm/memory.c | 4 +- + mm/page_alloc.c | 45 +- + mm/page_ext.c | 6 +- + mm/rmap.c | 15 +- + mm/sparse-vmemmap.c | 399 ------------ + tools/include/linux/gfp.h | 3 +- + tools/include/uapi/asm-generic/mman-common.h | 2 + + tools/perf/builtin-kmem.c | 1 - + tools/testing/selftests/vm/khugepaged.c | 563 +++++++++-------- + 58 files changed, 1803 insertions(+), 1400 deletions(-) +$ git am -3 ../patches/0001-fix-up-for-headers-deps-mm-Split-linux-gfp_types.h-o.patch +Applying: fix up for "headers/deps: mm: Split <linux/gfp_types.h> out of <linux/gfp.h>" +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/gfp_types.h +$ git add -A . +$ git commit -v -a --amend +[master 14fe36b07d1d] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm + Date: Mon Aug 8 12:06:07 2022 +1000 |