path: root/Next/merge.log

$ date -R
Mon, 11 Sep 2023 09:47:26 +1000
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at ff6e6ded5472 Merge tag 'rtc-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
Merging origin/master (0bb80ecc33a8 Linux 6.6-rc1)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master
Updating ff6e6ded5472..0bb80ecc33a8
Fast-forward (no commit created; -m option ignored)
 Documentation/admin-guide/perf/alibaba_pmu.rst     |    5 +
 Documentation/admin-guide/sysctl/kernel.rst        |   29 +
 Documentation/bpf/btf.rst                          |   31 +-
 Documentation/bpf/index.rst                        |    1 +
 .../bpf/{standardization => }/linux-notes.rst      |    0
 Documentation/bpf/llvm_reloc.rst                   |  304 ++
 Documentation/bpf/standardization/abi.rst          |   25 +
 Documentation/bpf/standardization/index.rst        |    2 +-
 .../bpf/standardization/instruction-set.rst        |   44 +-
 Documentation/dev-tools/kasan.rst                  |    4 +-
 .../bindings/cache/andestech,ax45mp-cache.yaml     |   81 +
 .../devicetree/bindings/i2c/qcom,i2c-cci.yaml      |    1 +
 .../interrupt-controller/st,sti-irq-syscfg.txt     |   30 -
 .../st,stih407-irq-syscfg.yaml                     |   65 +
 .../devicetree/bindings/media/i2c/ov5695.txt       |   41 -
 .../devicetree/bindings/media/i2c/ov7251.txt       |   52 -
 .../devicetree/bindings/media/i2c/ovti,ov5693.yaml |   31 +-
 .../devicetree/bindings/media/i2c/ovti,ov7251.yaml |  109 +
 .../devicetree/bindings/media/rockchip-isp1.yaml   |    1 +
 .../devicetree/bindings/pwm/brcm,kona-pwm.txt      |   21 -
 .../devicetree/bindings/pwm/brcm,kona-pwm.yaml     |   51 +
 .../devicetree/bindings/sound/fsl,easrc.yaml       |    8 +-
 .../features/debug/KASAN/arch-support.txt          |    2 +-
 Documentation/features/debug/kcov/arch-support.txt |    2 +-
 Documentation/features/debug/kgdb/arch-support.txt |    2 +-
 Documentation/gpu/amdgpu/driver-misc.rst           |    8 +-
 Documentation/gpu/automated_testing.rst            |  144 +
 Documentation/gpu/index.rst                        |    1 +
 Documentation/process/maintainer-netdev.rst        |   36 +-
 Documentation/riscv/hwprobe.rst                    |   11 +-
 .../translations/zh_CN/dev-tools/kasan.rst         |    2 +-
 Documentation/userspace-api/netlink/intro.rst      |    2 +
 MAINTAINERS                                        |   19 +-
 Makefile                                           |    4 +-
 arch/arm64/include/asm/efi.h                       |    2 +
 arch/arm64/kernel/idreg-override.c                 |    6 +-
 arch/arm64/lib/csum.c                              |    2 +-
 arch/loongarch/Kconfig                             |   26 +
 arch/loongarch/Makefile                            |    3 +
 arch/loongarch/configs/loongson3_defconfig         |   74 +-
 arch/loongarch/include/asm/asm-prototypes.h        |    1 +
 arch/loongarch/include/asm/asmmacro.h              |  158 +-
 arch/loongarch/include/asm/kasan.h                 |  126 +
 arch/loongarch/include/asm/kfence.h                |   61 +
 arch/loongarch/include/asm/kgdb.h                  |   97 +
 arch/loongarch/include/asm/lbt.h                   |  109 +
 arch/loongarch/include/asm/loongarch.h             |   47 +-
 arch/loongarch/include/asm/mmzone.h                |    2 -
 arch/loongarch/include/asm/page.h                  |    7 +-
 arch/loongarch/include/asm/pgalloc.h               |    1 +
 arch/loongarch/include/asm/pgtable.h               |   31 +-
 arch/loongarch/include/asm/processor.h             |   26 +-
 arch/loongarch/include/asm/setup.h                 |    8 +-
 arch/loongarch/include/asm/stackframe.h            |    4 +
 arch/loongarch/include/asm/string.h                |   20 +
 arch/loongarch/include/asm/switch_to.h             |    2 +
 arch/loongarch/include/asm/thread_info.h           |    4 +
 arch/loongarch/include/asm/xor.h                   |   68 +
 arch/loongarch/include/asm/xor_simd.h              |   34 +
 arch/loongarch/include/uapi/asm/ptrace.h           |    6 +
 arch/loongarch/include/uapi/asm/sigcontext.h       |   10 +
 arch/loongarch/kernel/Makefile                     |    9 +
 arch/loongarch/kernel/asm-offsets.c                |   18 +-
 arch/loongarch/kernel/cpu-probe.c                  |   14 +
 arch/loongarch/kernel/entry.S                      |    5 +
 arch/loongarch/kernel/fpu.S                        |   14 +-
 arch/loongarch/kernel/head.S                       |   13 +-
 arch/loongarch/kernel/kfpu.c                       |   55 +-
 arch/loongarch/kernel/kgdb.c                       |  727 +++++
 arch/loongarch/kernel/lbt.S                        |  155 ++
 arch/loongarch/kernel/numa.c                       |   35 +-
 arch/loongarch/kernel/process.c                    |   15 +-
 arch/loongarch/kernel/ptrace.c                     |   54 +
 arch/loongarch/kernel/relocate.c                   |    8 +-
 arch/loongarch/kernel/setup.c                      |    4 +
 arch/loongarch/kernel/signal.c                     |  188 ++
 arch/loongarch/kernel/stacktrace.c                 |   18 +-
 arch/loongarch/kernel/traps.c                      |   50 +-
 arch/loongarch/lib/Makefile                        |    2 +
 arch/loongarch/lib/clear_user.S                    |   87 +-
 arch/loongarch/lib/copy_user.S                     |  161 +-
 arch/loongarch/lib/memcpy.S                        |    8 +-
 arch/loongarch/lib/memmove.S                       |   20 +-
 arch/loongarch/lib/memset.S                        |    8 +-
 arch/loongarch/lib/xor_simd.c                      |   93 +
 arch/loongarch/lib/xor_simd.h                      |   38 +
 arch/loongarch/lib/xor_simd_glue.c                 |   72 +
 arch/loongarch/lib/xor_template.c                  |  110 +
 arch/loongarch/mm/Makefile                         |    3 +
 arch/loongarch/mm/cache.c                          |    1 -
 arch/loongarch/mm/fault.c                          |   22 +-
 arch/loongarch/mm/init.c                           |   71 +-
 arch/loongarch/mm/kasan_init.c                     |  243 ++
 arch/loongarch/mm/mmap.c                           |   13 +-
 arch/loongarch/mm/pgtable.c                        |   12 +
 arch/loongarch/vdso/Makefile                       |    3 +
 arch/riscv/Kconfig                                 |   28 +-
 arch/riscv/Kconfig.errata                          |   21 +
 arch/riscv/errata/Makefile                         |    1 +
 arch/riscv/errata/andes/Makefile                   |    1 +
 arch/riscv/errata/andes/errata.c                   |   66 +
 arch/riscv/errata/thead/errata.c                   |    8 -
 arch/riscv/include/asm/alternative.h               |    8 +-
 arch/riscv/include/asm/cpufeature.h                |    2 +
 arch/riscv/include/asm/dma-noncoherent.h           |   28 +
 arch/riscv/include/asm/efi.h                       |    2 +
 arch/riscv/include/asm/errata_list.h               |    5 +
 arch/riscv/include/asm/page.h                      |    3 +
 arch/riscv/include/asm/patch.h                     |    1 +
 arch/riscv/include/asm/vendorid_list.h             |    1 +
 arch/riscv/include/uapi/asm/ptrace.h               |   13 +-
 arch/riscv/kernel/Makefile                         |    1 +
 arch/riscv/kernel/alternative.c                    |   24 +-
 arch/riscv/kernel/copy-unaligned.S                 |   71 +
 arch/riscv/kernel/copy-unaligned.h                 |   13 +
 arch/riscv/kernel/cpufeature.c                     |  104 +
 arch/riscv/kernel/image-vars.h                     |    1 +
 arch/riscv/kernel/patch.c                          |  114 +-
 arch/riscv/kernel/pi/Makefile                      |    2 +-
 arch/riscv/kernel/pi/cmdline_early.c               |   13 +
 arch/riscv/kernel/pi/fdt_early.c                   |   30 +
 arch/riscv/kernel/ptrace.c                         |   79 +
 arch/riscv/kernel/setup.c                          |   25 +
 arch/riscv/kernel/smpboot.c                        |    3 +-
 arch/riscv/mm/dma-noncoherent.c                    |  103 +-
 arch/riscv/mm/init.c                               |   36 +-
 arch/riscv/mm/pmem.c                               |   13 +
 arch/riscv/net/bpf_jit.h                           |    3 +
 arch/riscv/net/bpf_jit_comp64.c                    |   60 +-
 arch/riscv/net/bpf_jit_core.c                      |  106 +-
 arch/s390/net/bpf_jit_comp.c                       |   10 +
 arch/sh/boards/mach-ap325rxa/setup.c               |    2 +-
 arch/sh/boards/mach-ecovec24/setup.c               |    6 +-
 arch/sh/boards/mach-kfr2r09/setup.c                |    2 +-
 arch/sh/boards/mach-migor/setup.c                  |    2 +-
 arch/sh/boards/mach-se/7724/setup.c                |    6 +-
 arch/sh/drivers/push-switch.c                      |    2 +-
 arch/x86/events/intel/uncore_snbep.c               |   12 +-
 arch/x86/include/asm/mman.h                        |   15 +
 arch/x86/include/uapi/asm/mman.h                   |    8 -
 arch/x86/kernel/cpu/sgx/virt.c                     |    3 +
 arch/x86/kernel/smpboot.c                          |    2 +-
 arch/x86/kernel/vmlinux.lds.S                      |    2 +-
 block/blk-map.c                                    |    7 +-
 block/blk-throttle.c                               |  134 +-
 block/blk-throttle.h                               |    4 +-
 block/fops.c                                       |    4 -
 block/ioctl.c                                      |    2 +
 drivers/Kconfig                                    |    2 +
 drivers/Makefile                                   |    1 +
 drivers/accel/ivpu/ivpu_jsm_msg.c                  |    3 +-
 drivers/ata/libata-scsi.c                          |    2 +-
 drivers/block/drbd/drbd_main.c                     |    2 +-
 drivers/block/null_blk/main.c                      |   12 +-
 drivers/cache/Kconfig                              |   11 +
 drivers/cache/Makefile                             |    3 +
 drivers/cache/ax45mp_cache.c                       |  213 ++
 drivers/firmware/efi/libstub/Makefile              |    4 +-
 drivers/firmware/efi/libstub/arm64-stub.c          |  117 +-
 drivers/firmware/efi/libstub/efistub.h             |    8 +
 drivers/firmware/efi/libstub/kaslr.c               |  159 ++
 drivers/firmware/efi/libstub/riscv-stub.c          |   33 +-
 drivers/gpio/gpio-zynq.c                           |   26 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c         |    8 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c   |   18 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c             |   18 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c         |   30 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c      |   15 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_display.c        |   26 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h            |    3 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c            |   11 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h            |    3 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c            |   15 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c     |    3 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c            |   26 +-
 drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c           |    6 +-
 drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c             |   18 +
 drivers/gpu/drm/amd/amdgpu/psp_v13_0.c             |   40 +-
 drivers/gpu/drm/amd/amdgpu/soc15.c                 |    4 +-
 drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c    |    2 +-
 drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c   |    3 +
 drivers/gpu/drm/amd/amdkfd/kfd_svm.c               |    2 +
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  |   24 +-
 .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c |    9 +-
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c    |   16 +
 drivers/gpu/drm/amd/display/dc/Makefile            |    1 +
 .../drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.c |   20 +-
 drivers/gpu/drm/amd/display/dc/core/dc.c           |   68 +-
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c |   47 +-
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c |   17 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h |    2 +
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c  |    2 +-
 .../gpu/drm/amd/display/dc/dcn301/dcn301_init.c    |    1 +
 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c  |    2 +-
 .../gpu/drm/amd/display/dc/dcn314/dcn314_init.c    |    2 +-
 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c  |    2 +-
 .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c  |  118 +-
 .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c   |   25 +-
 .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c |   21 +-
 .../drm/amd/display/modules/freesync/freesync.c    |    9 +-
 drivers/gpu/drm/amd/include/amd_shared.h           |    2 +
 drivers/gpu/drm/amd/include/atomfirmware.h         |   18 +
 drivers/gpu/drm/amd/include/discovery.h            |   38 +-
 drivers/gpu/drm/amd/pm/amdgpu_pm.c                 |   11 +-
 drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h      |    5 +-
 .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_0_ppsmc.h   |    5 +-
 .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_pmfw.h    |    4 +-
 .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_ppsmc.h   |   16 +-
 drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h       |    4 +-
 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c     |    8 +-
 .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c   |    2 +
 .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c   |   54 +-
 drivers/gpu/drm/ci/arm.config                      |   69 +
 drivers/gpu/drm/ci/arm64.config                    |  199 ++
 drivers/gpu/drm/ci/build-igt.sh                    |   35 +
 drivers/gpu/drm/ci/build.sh                        |  157 ++
 drivers/gpu/drm/ci/build.yml                       |  110 +
 drivers/gpu/drm/ci/check-patch.py                  |   57 +
 drivers/gpu/drm/ci/container.yml                   |   65 +
 drivers/gpu/drm/ci/gitlab-ci.yml                   |  251 ++
 drivers/gpu/drm/ci/igt_runner.sh                   |   77 +
 drivers/gpu/drm/ci/image-tags.yml                  |   15 +
 drivers/gpu/drm/ci/lava-submit.sh                  |   57 +
 drivers/gpu/drm/ci/static-checks.yml               |   12 +
 drivers/gpu/drm/ci/test.yml                        |  335 +++
 drivers/gpu/drm/ci/testlist.txt                    | 2912 ++++++++++++++++++++
 drivers/gpu/drm/ci/x86_64.config                   |  111 +
 drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt  |   19 +
 drivers/gpu/drm/ci/xfails/amdgpu-stoney-flakes.txt |   21 +
 drivers/gpu/drm/ci/xfails/amdgpu-stoney-skips.txt  |    2 +
 drivers/gpu/drm/ci/xfails/i915-amly-fails.txt      |   17 +
 drivers/gpu/drm/ci/xfails/i915-amly-flakes.txt     |   32 +
 drivers/gpu/drm/ci/xfails/i915-amly-skips.txt      |    4 +
 drivers/gpu/drm/ci/xfails/i915-apl-fails.txt       |   58 +
 drivers/gpu/drm/ci/xfails/i915-apl-flakes.txt      |    1 +
 drivers/gpu/drm/ci/xfails/i915-apl-skips.txt       |    6 +
 drivers/gpu/drm/ci/xfails/i915-cml-fails.txt       |   18 +
 drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt      |   38 +
 drivers/gpu/drm/ci/xfails/i915-cml-skips.txt       |    2 +
 drivers/gpu/drm/ci/xfails/i915-glk-fails.txt       |   19 +
 drivers/gpu/drm/ci/xfails/i915-glk-flakes.txt      |   41 +
 drivers/gpu/drm/ci/xfails/i915-glk-skips.txt       |    5 +
 drivers/gpu/drm/ci/xfails/i915-kbl-fails.txt       |   25 +
 drivers/gpu/drm/ci/xfails/i915-kbl-flakes.txt      |   26 +
 drivers/gpu/drm/ci/xfails/i915-kbl-skips.txt       |    5 +
 drivers/gpu/drm/ci/xfails/i915-tgl-fails.txt       |   37 +
 drivers/gpu/drm/ci/xfails/i915-tgl-flakes.txt      |    5 +
 drivers/gpu/drm/ci/xfails/i915-tgl-skips.txt       |   11 +
 drivers/gpu/drm/ci/xfails/i915-whl-fails.txt       |   48 +
 drivers/gpu/drm/ci/xfails/i915-whl-flakes.txt      |    1 +
 drivers/gpu/drm/ci/xfails/i915-whl-skips.txt       |    2 +
 .../gpu/drm/ci/xfails/mediatek-mt8173-fails.txt    |   29 +
 .../gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt   |    0
 .../gpu/drm/ci/xfails/mediatek-mt8183-fails.txt    |   10 +
 .../gpu/drm/ci/xfails/mediatek-mt8183-flakes.txt   |   14 +
 drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt     |   12 +
 drivers/gpu/drm/ci/xfails/meson-g12b-flakes.txt    |    4 +
 drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt    |   15 +
 drivers/gpu/drm/ci/xfails/msm-apq8016-flakes.txt   |    4 +
 drivers/gpu/drm/ci/xfails/msm-apq8096-fails.txt    |    2 +
 drivers/gpu/drm/ci/xfails/msm-apq8096-flakes.txt   |    4 +
 drivers/gpu/drm/ci/xfails/msm-apq8096-skips.txt    |    2 +
 drivers/gpu/drm/ci/xfails/msm-sc7180-fails.txt     |   25 +
 drivers/gpu/drm/ci/xfails/msm-sc7180-flakes.txt    |    7 +
 drivers/gpu/drm/ci/xfails/msm-sc7180-skips.txt     |   23 +
 drivers/gpu/drm/ci/xfails/msm-sdm845-fails.txt     |   68 +
 drivers/gpu/drm/ci/xfails/msm-sdm845-flakes.txt    |   11 +
 drivers/gpu/drm/ci/xfails/msm-sdm845-skips.txt     |    2 +
 .../gpu/drm/ci/xfails/rockchip-rk3288-fails.txt    |   48 +
 .../gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt   |    9 +
 .../gpu/drm/ci/xfails/rockchip-rk3288-skips.txt    |   52 +
 .../gpu/drm/ci/xfails/rockchip-rk3399-fails.txt    |   37 +
 .../gpu/drm/ci/xfails/rockchip-rk3399-flakes.txt   |   23 +
 .../gpu/drm/ci/xfails/rockchip-rk3399-skips.txt    |    5 +
 .../gpu/drm/ci/xfails/virtio_gpu-none-fails.txt    |   38 +
 .../gpu/drm/ci/xfails/virtio_gpu-none-flakes.txt   |    0
 .../gpu/drm/ci/xfails/virtio_gpu-none-skips.txt    |    6 +
 drivers/gpu/drm/i915/gt/intel_engine_types.h       |    1 +
 drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c  |    3 +
 drivers/gpu/drm/i915/i915_request.c                |    7 +-
 drivers/gpu/drm/nouveau/dispnv04/crtc.c            |    9 +-
 drivers/gpu/drm/nouveau/nouveau_bo.c               |    8 +-
 drivers/gpu/drm/nouveau/nouveau_chan.c             |    6 +-
 drivers/gpu/drm/nouveau/nouveau_dmem.c             |    9 +-
 drivers/gpu/drm/nouveau/nouveau_exec.c             |   11 +-
 drivers/gpu/drm/nouveau/nouveau_fence.c            |   32 +-
 drivers/gpu/drm/nouveau/nouveau_fence.h            |    5 +-
 drivers/gpu/drm/nouveau/nouveau_gem.c              |    5 +-
 drivers/media/dvb-frontends/ascot2e.c              |    2 +-
 drivers/media/dvb-frontends/atbm8830.c             |    2 +-
 drivers/media/dvb-frontends/au8522_dig.c           |    2 +-
 drivers/media/dvb-frontends/bcm3510.c              |    2 +-
 drivers/media/dvb-frontends/cx22700.c              |    2 +-
 drivers/media/dvb-frontends/cx22702.c              |    2 +-
 drivers/media/dvb-frontends/cx24110.c              |    2 +-
 drivers/media/dvb-frontends/cx24113.c              |    2 +-
 drivers/media/dvb-frontends/cx24116.c              |    2 +-
 drivers/media/dvb-frontends/cx24120.c              |    2 +-
 drivers/media/dvb-frontends/cx24123.c              |    2 +-
 drivers/media/dvb-frontends/cxd2820r_core.c        |    2 +-
 drivers/media/dvb-frontends/cxd2841er.c            |    4 +-
 drivers/media/dvb-frontends/cxd2880/cxd2880_top.c  |    2 +-
 drivers/media/dvb-frontends/dib0070.c              |    2 +-
 drivers/media/dvb-frontends/dib0090.c              |    4 +-
 drivers/media/dvb-frontends/dib3000mb.c            |    2 +-
 drivers/media/dvb-frontends/dib3000mc.c            |    2 +-
 drivers/media/dvb-frontends/dib7000m.c             |    2 +-
 drivers/media/dvb-frontends/dib7000p.c             |    2 +-
 drivers/media/dvb-frontends/dib8000.c              |    2 +-
 drivers/media/dvb-frontends/dib9000.c              |    2 +-
 drivers/media/dvb-frontends/drx39xyj/drxj.c        |    2 +-
 drivers/media/dvb-frontends/drxd_hard.c            |    2 +-
 drivers/media/dvb-frontends/drxk_hard.c            |    2 +-
 drivers/media/dvb-frontends/ds3000.c               |    2 +-
 drivers/media/dvb-frontends/dvb-pll.c              |    2 +-
 drivers/media/dvb-frontends/ec100.c                |    2 +-
 drivers/media/dvb-frontends/helene.c               |    4 +-
 drivers/media/dvb-frontends/horus3a.c              |    2 +-
 drivers/media/dvb-frontends/isl6405.c              |    2 +-
 drivers/media/dvb-frontends/isl6421.c              |    2 +-
 drivers/media/dvb-frontends/isl6423.c              |    2 +-
 drivers/media/dvb-frontends/itd1000.c              |    2 +-
 drivers/media/dvb-frontends/ix2505v.c              |    2 +-
 drivers/media/dvb-frontends/l64781.c               |    2 +-
 drivers/media/dvb-frontends/lg2160.c               |    2 +-
 drivers/media/dvb-frontends/lgdt3305.c             |    2 +-
 drivers/media/dvb-frontends/lgdt3306a.c            |    2 +-
 drivers/media/dvb-frontends/lgdt330x.c             |    2 +-
 drivers/media/dvb-frontends/lgs8gxx.c              |    2 +-
 drivers/media/dvb-frontends/lnbh25.c               |    2 +-
 drivers/media/dvb-frontends/lnbp21.c               |    4 +-
 drivers/media/dvb-frontends/lnbp22.c               |    2 +-
 drivers/media/dvb-frontends/m88ds3103.c            |    2 +-
 drivers/media/dvb-frontends/m88rs2000.c            |    2 +-
 drivers/media/dvb-frontends/mb86a16.c              |    2 +-
 drivers/media/dvb-frontends/mb86a20s.c             |    2 +-
 drivers/media/dvb-frontends/mt312.c                |    2 +-
 drivers/media/dvb-frontends/mt352.c                |    2 +-
 drivers/media/dvb-frontends/nxt200x.c              |    2 +-
 drivers/media/dvb-frontends/nxt6000.c              |    2 +-
 drivers/media/dvb-frontends/or51132.c              |    2 +-
 drivers/media/dvb-frontends/or51211.c              |    2 +-
 drivers/media/dvb-frontends/s5h1409.c              |    2 +-
 drivers/media/dvb-frontends/s5h1411.c              |    2 +-
 drivers/media/dvb-frontends/s5h1420.c              |    2 +-
 drivers/media/dvb-frontends/s5h1432.c              |    2 +-
 drivers/media/dvb-frontends/s921.c                 |    2 +-
 drivers/media/dvb-frontends/si21xx.c               |    2 +-
 drivers/media/dvb-frontends/sp887x.c               |    2 +-
 drivers/media/dvb-frontends/stb0899_drv.c          |    2 +-
 drivers/media/dvb-frontends/stb6000.c              |    2 +-
 drivers/media/dvb-frontends/stb6100.c              |    2 +-
 drivers/media/dvb-frontends/stv0288.c              |    2 +-
 drivers/media/dvb-frontends/stv0297.c              |    2 +-
 drivers/media/dvb-frontends/stv0299.c              |    2 +-
 drivers/media/dvb-frontends/stv0367.c              |    6 +-
 drivers/media/dvb-frontends/stv0900_core.c         |    2 +-
 drivers/media/dvb-frontends/stv090x.c              |    2 +-
 drivers/media/dvb-frontends/stv6110.c              |    2 +-
 drivers/media/dvb-frontends/stv6110x.c             |    2 +-
 drivers/media/dvb-frontends/tda10021.c             |    2 +-
 drivers/media/dvb-frontends/tda10023.c             |    2 +-
 drivers/media/dvb-frontends/tda10048.c             |    2 +-
 drivers/media/dvb-frontends/tda1004x.c             |    4 +-
 drivers/media/dvb-frontends/tda10086.c             |    2 +-
 drivers/media/dvb-frontends/tda665x.c              |    2 +-
 drivers/media/dvb-frontends/tda8083.c              |    2 +-
 drivers/media/dvb-frontends/tda8261.c              |    2 +-
 drivers/media/dvb-frontends/tda826x.c              |    2 +-
 drivers/media/dvb-frontends/ts2020.c               |    2 +-
 drivers/media/dvb-frontends/tua6100.c              |    2 +-
 drivers/media/dvb-frontends/ves1820.c              |    2 +-
 drivers/media/dvb-frontends/ves1x93.c              |    2 +-
 drivers/media/dvb-frontends/zl10036.c              |    2 +-
 drivers/media/dvb-frontends/zl10039.c              |    2 +-
 drivers/media/dvb-frontends/zl10353.c              |    2 +-
 drivers/media/pci/bt8xx/dst.c                      |    2 +-
 drivers/media/pci/bt8xx/dst_ca.c                   |    2 +-
 drivers/media/pci/ddbridge/ddbridge-dummy-fe.c     |    2 +-
 drivers/media/tuners/fc0011.c                      |    2 +-
 drivers/media/tuners/fc0012.c                      |    2 +-
 drivers/media/tuners/fc0013.c                      |    2 +-
 drivers/media/tuners/max2165.c                     |    2 +-
 drivers/media/tuners/mc44s803.c                    |    2 +-
 drivers/media/tuners/mt2060.c                      |    2 +-
 drivers/media/tuners/mt2131.c                      |    2 +-
 drivers/media/tuners/mt2266.c                      |    2 +-
 drivers/media/tuners/mxl5005s.c                    |    2 +-
 drivers/media/tuners/qt1010.c                      |    2 +-
 drivers/media/tuners/tda18218.c                    |    2 +-
 drivers/media/tuners/xc2028.c                      |    2 +-
 drivers/media/tuners/xc4000.c                      |    2 +-
 drivers/media/tuners/xc5000.c                      |    2 +-
 drivers/net/dsa/microchip/ksz_common.c             |   16 +-
 drivers/net/dsa/sja1105/sja1105.h                  |    2 +
 drivers/net/dsa/sja1105/sja1105_main.c             |   51 +-
 drivers/net/dsa/sja1105/sja1105_spi.c              |    4 +
 drivers/net/ethernet/freescale/enetc/enetc_pf.c    |    2 +-
 drivers/net/ethernet/google/gve/gve_rx_dqo.c       |    5 +-
 drivers/net/ethernet/hisilicon/hns3/hnae3.h        |    1 +
 drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c |   11 +-
 drivers/net/ethernet/hisilicon/hns3/hns3_enet.c    |   19 +-
 drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c |    4 +-
 .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c |   20 +-
 .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c |   14 +-
 .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c    |    5 +-
 .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h    |    2 -
 drivers/net/ethernet/intel/igb/igb.h               |    4 +-
 drivers/net/ethernet/intel/igb/igb_main.c          |    5 +-
 drivers/net/ethernet/intel/igbvf/igbvf.h           |    4 +-
 drivers/net/ethernet/intel/igc/igc.h               |    4 +-
 .../net/ethernet/marvell/octeontx2/af/rvu_nix.c    |   21 +-
 .../net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c |    4 +-
 .../ethernet/mellanox/mlx5/core/en/tc/act/mirred.c |    1 +
 .../ethernet/mellanox/mlx5/core/en/tc/act/pedit.c  |    4 +-
 .../mlx5/core/en/tc/act/redirect_ingress.c         |    1 +
 .../ethernet/mellanox/mlx5/core/en/tc/act/vlan.c   |    1 +
 .../mellanox/mlx5/core/en/tc/act/vlan_mangle.c     |    4 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_tc.c    |    1 +
 drivers/net/ethernet/mellanox/mlx5/core/eswitch.c  |   21 +-
 .../ethernet/mellanox/mlx5/core/eswitch_offloads.c |   49 +-
 drivers/net/ethernet/sfc/rx.c                      |   20 +-
 .../net/ethernet/stmicro/stmmac/stmmac_platform.c  |    5 +-
 drivers/net/macsec.c                               |    3 +-
 drivers/net/phy/micrel.c                           |    9 +-
 drivers/net/veth.c                                 |    4 +-
 drivers/nfc/nxp-nci/i2c.c                          |    1 +
 drivers/ntb/hw/amd/ntb_hw_amd.c                    |   11 +-
 drivers/ntb/ntb_transport.c                        |   21 +-
 drivers/ntb/test/ntb_perf.c                        |    2 +-
 drivers/ntb/test/ntb_tool.c                        |   15 +-
 drivers/pci/Kconfig                                |    2 +-
 drivers/pci/probe.c                                |    1 +
 drivers/pci/quirks.c                               |    2 +-
 drivers/perf/cxl_pmu.c                             |    2 +-
 drivers/power/supply/power_supply_core.c           |    4 +-
 drivers/powercap/intel_rapl_common.c               |    4 +-
 drivers/pwm/core.c                                 |   41 +-
 drivers/pwm/pwm-apple.c                            |    1 +
 drivers/pwm/pwm-atmel-hlcdc.c                      |   66 +-
 drivers/pwm/pwm-atmel-tcb.c                        |  123 +-
 drivers/pwm/pwm-atmel.c                            |   79 +-
 drivers/pwm/pwm-bcm-kona.c                         |    4 +-
 drivers/pwm/pwm-berlin.c                           |    1 +
 drivers/pwm/pwm-crc.c                              |    4 +-
 drivers/pwm/pwm-cros-ec.c                          |   11 +-
 drivers/pwm/pwm-fsl-ftm.c                          |    3 +-
 drivers/pwm/pwm-hibvt.c                            |    2 +-
 drivers/pwm/pwm-imx1.c                             |    1 -
 drivers/pwm/pwm-jz4740.c                           |    2 +-
 drivers/pwm/pwm-lp3943.c                           |    5 +-
 drivers/pwm/pwm-lpc18xx-sct.c                      |   34 +-
 drivers/pwm/pwm-lpc32xx.c                          |   16 +-
 drivers/pwm/pwm-mediatek.c                         |    1 -
 drivers/pwm/pwm-meson.c                            |    1 -
 drivers/pwm/pwm-microchip-core.c                   |    2 +-
 drivers/pwm/pwm-mtk-disp.c                         |    1 -
 drivers/pwm/pwm-ntxec.c                            |    4 +-
 drivers/pwm/pwm-pxa.c                              |   10 +-
 drivers/pwm/pwm-rockchip.c                         |    4 +-
 drivers/pwm/pwm-rz-mtu3.c                          |    2 +-
 drivers/pwm/pwm-sifive.c                           |    5 +-
 drivers/pwm/pwm-sl28cpld.c                         |   14 +-
 drivers/pwm/pwm-sprd.c                             |    1 +
 drivers/pwm/pwm-stm32.c                            |   14 +-
 drivers/pwm/pwm-stmpe.c                            |   17 +-
 drivers/pwm/pwm-sun4i.c                            |    1 -
 drivers/pwm/pwm-sunplus.c                          |    1 +
 drivers/pwm/pwm-tegra.c                            |    1 -
 drivers/pwm/pwm-tiecap.c                           |    2 +-
 drivers/pwm/pwm-tiehrpwm.c                         |    2 +-
 drivers/pwm/pwm-visconti.c                         |    2 +-
 drivers/pwm/pwm-vt8500.c                           |    5 +-
 drivers/s390/block/dasd_devmap.c                   |    6 +-
 drivers/s390/block/dasd_eckd.c                     |   10 +-
 drivers/s390/block/dasd_int.h                      |    4 +
 drivers/scsi/aacraid/commsup.c                     |    2 +-
 drivers/scsi/fnic/fnic.h                           |    3 +-
 drivers/scsi/fnic/fnic_scsi.c                      |   53 +-
 drivers/scsi/libsas/sas_scsi_host.c                |   41 +-
 drivers/scsi/mpt3sas/mpi/mpi2.h                    |    2 +-
 drivers/scsi/mpt3sas/mpt3sas_base.c                |   50 +-
 drivers/scsi/mpt3sas/mpt3sas_base.h                |    3 +-
 drivers/scsi/mvumi.c                               |    2 +-
 drivers/scsi/qedf/qedf.h                           |    1 -
 drivers/scsi/qedi/qedi_gbl.h                       |    2 -
 drivers/scsi/qla2xxx/qla_attr.c                    |    2 -
 drivers/scsi/qla2xxx/qla_dbg.c                     |    7 +-
 drivers/scsi/qla2xxx/qla_dbg.h                     |    1 +
 drivers/scsi/qla2xxx/qla_def.h                     |   57 +-
 drivers/scsi/qla2xxx/qla_dfs.c                     |   10 +
 drivers/scsi/qla2xxx/qla_gbl.h                     |   14 +-
 drivers/scsi/qla2xxx/qla_init.c                    |   36 +-
 drivers/scsi/qla2xxx/qla_inline.h                  |   57 +-
 drivers/scsi/qla2xxx/qla_iocb.c                    |  323 ++-
 drivers/scsi/qla2xxx/qla_isr.c                     |  162 +-
 drivers/scsi/qla2xxx/qla_mbx.c                     |    4 -
 drivers/scsi/qla2xxx/qla_nvme.c                    |  402 ++-
 drivers/scsi/qla2xxx/qla_nvme.h                    |   17 +-
 drivers/scsi/qla2xxx/qla_nx.h                      |    4 +-
 drivers/scsi/qla2xxx/qla_os.c                      |   73 +-
 drivers/scsi/qla2xxx/qla_version.h                 |    6 +-
 drivers/scsi/scsi_debugfs.c                        |   26 +-
 drivers/scsi/scsi_lib.c                            |    2 +-
 drivers/scsi/scsi_priv.h                           |    1 -
 drivers/scsi/scsi_scan.c                           |    4 +-
 drivers/scsi/scsi_sysfs.c                          |    4 +-
 drivers/scsi/sd.c                                  |   66 +-
 drivers/scsi/smartpqi/smartpqi.h                   |   16 +-
 drivers/scsi/smartpqi/smartpqi_init.c              |  264 +-
 drivers/scsi/st.c                                  |    2 +
 drivers/scsi/storvsc_drv.c                         |    2 +-
 drivers/scsi/virtio_scsi.c                         |    2 +-
 drivers/scsi/xen-scsifront.c                       |    6 +-
 drivers/soc/renesas/Kconfig                        |    5 +
 drivers/staging/greybus/pwm.c                      |   12 +-
 drivers/staging/media/av7110/sp8870.c              |    2 +-
 drivers/thermal/armada_thermal.c                   |    5 +-
 drivers/thermal/dove_thermal.c                     |    4 +-
 .../intel/int340x_thermal/int3400_thermal.c        |    6 +-
 drivers/thermal/kirkwood_thermal.c                 |    4 +-
 drivers/thermal/spear_thermal.c                    |    4 +-
 drivers/thermal/thermal_core.c                     |   16 +-
 drivers/ufs/core/ufs_bsg.c                         |    3 +-
 drivers/ufs/core/ufshcd.c                          |   14 +-
 fs/nls/Kconfig                                     |    7 +-
 fs/smb/client/cached_dir.c                         |   11 +-
 fs/smb/client/cached_dir.h                         |    2 +-
 fs/smb/client/cifsfs.c                             |   12 +
 fs/smb/client/cifsfs.h                             |    4 +-
 fs/smb/client/cifsglob.h                           |    2 +
 fs/smb/client/connect.c                            |    1 +
 fs/smb/client/fs_context.c                         |   11 +-
 fs/smb/client/fs_context.h                         |    4 +-
 fs/smb/client/fscache.c                            |    2 +-
 fs/smb/client/smb2ops.c                            |    1 +
 fs/smb/client/trace.h                              |    2 +-
 fs/smb/common/smb2pdu.h                            |    2 +-
 fs/smb/server/Kconfig                              |    2 +-
 fs/smb/server/server.c                             |    2 -
 include/linux/audit.h                              |    2 +
 include/linux/bpf.h                                |    2 +-
 include/linux/ipv6.h                               |    1 +
 include/linux/kasan.h                              |    2 +
 include/linux/micrel_phy.h                         |    7 +-
 include/linux/nvme-fc-driver.h                     |    6 +-
 include/linux/of.h                                 |    4 +-
 include/linux/oid_registry.h                       |    1 +
 include/linux/phylink.h                            |    4 +-
 include/linux/pwm.h                                |    6 +-
 include/linux/raid/pq.h                            |    4 +
 include/linux/thermal.h                            |   47 +-
 include/linux/xarray.h                             |   18 +
 include/net/ip.h                                   |    3 +-
 include/net/ip6_fib.h                              |    5 +-
 include/net/ip_fib.h                               |    5 +-
 include/net/ip_tunnels.h                           |   15 +-
 include/net/scm.h                                  |   14 +-
 include/net/sock.h                                 |   29 +-
 include/scsi/scsi_host.h                           |    2 +-
 include/sound/dmaengine_pcm.h                      |    2 +-
 include/sound/soc-component.h                      |    4 +-
 include/uapi/linux/elf.h                           |    2 +
 include/uapi/linux/netfilter/nf_tables.h           |    1 +
 include/uapi/scsi/scsi_bsg_ufs.h                   |    2 +-
 io_uring/fdinfo.c                                  |    2 +
 io_uring/io-wq.c                                   |   10 +
 io_uring/io-wq.h                                   |    1 +
 io_uring/io_uring.c                                |   56 +-
 io_uring/sqpoll.c                                  |    4 +-
 kernel/auditsc.c                                   |    2 +
 kernel/bpf/bpf_local_storage.c                     |   49 +-
 kernel/bpf/core.c                                  |    8 +-
 kernel/bpf/syscall.c                               |    2 +-
 kernel/bpf/trampoline.c                            |    5 +-
 kernel/dma/Kconfig                                 |    2 +-
 kernel/dma/contiguous.c                            |    5 -
 kernel/dma/debug.c                                 |   20 +-
 kernel/dma/pool.c                                  |    4 +-
 kernel/printk/printk.c                             |    2 -
 lib/Kconfig.debug                                  |   11 +
 lib/Makefile                                       |    1 +
 lib/idr.c                                          |    2 +-
 lib/iov_iter.c                                     |   30 +-
 lib/kunit_iov_iter.c                               |  777 ++++++
 lib/raid6/Makefile                                 |    1 +
 lib/raid6/algos.c                                  |   16 +
 lib/raid6/loongarch.h                              |   38 +
 lib/raid6/loongarch_simd.c                         |  422 +++
 lib/raid6/recov_loongarch_simd.c                   |  513 ++++
 lib/raid6/test/Makefile                            |   12 +
 lib/xarray.c                                       |    8 +-
 mm/kasan/init.c                                    |   18 +-
 mm/kasan/kasan.h                                   |    6 +
 mm/kfence/core.c                                   |    5 +-
 net/bpf/test_run.c                                 |    1 +
 net/can/j1939/socket.c                             |   10 +-
 net/core/flow_dissector.c                          |    3 +-
 net/core/skbuff.c                                  |   54 +-
 net/core/skmsg.c                                   |   12 +-
 net/core/sock.c                                    |   27 +-
 net/core/sock_map.c                                |   36 +-
 net/handshake/netlink.c                            |   18 +-
 net/ipv4/fib_semantics.c                           |    5 +-
 net/ipv4/fib_trie.c                                |    3 +-
 net/ipv4/igmp.c                                    |    3 +-
 net/ipv4/ip_forward.c                              |    1 -
 net/ipv4/ip_input.c                                |    3 +-
 net/ipv4/ip_output.c                               |    9 +-
 net/ipv4/ip_sockglue.c                             |    2 +-
 net/ipv4/ipmr.c                                    |    1 -
 net/ipv4/route.c                                   |    1 +
 net/ipv4/tcp.c                                     |    4 +-
 net/ipv4/tcp_output.c                              |    2 +-
 net/ipv4/udp.c                                     |    6 +-
 net/ipv6/addrconf.c                                |    2 +-
 net/ipv6/ip6_input.c                               |    3 +-
 net/ipv6/ip6_output.c                              |    3 +-
 net/ipv6/ip6mr.c                                   |    2 -
 net/ipv6/ping.c                                    |    2 +-
 net/ipv6/raw.c                                     |    2 +-
 net/ipv6/route.c                                   |    3 +
 net/ipv6/udp.c                                     |    2 +-
 net/kcm/kcmsock.c                                  |    2 +
 net/mptcp/protocol.c                               |   23 +-
 net/netfilter/ipset/ip_set_hash_netportnet.c       |    1 +
 net/netfilter/nf_tables_api.c                      |   54 +-
 net/netfilter/nfnetlink_osf.c                      |    8 +
 net/netfilter/nft_exthdr.c                         |   42 +-
 net/netfilter/nft_set_rbtree.c                     |    8 +-
 net/netfilter/xt_sctp.c                            |    2 +
 net/netfilter/xt_u32.c                             |   21 +
 net/sched/sch_fq_pie.c                             |   27 +-
 net/sched/sch_plug.c                               |    2 +-
 net/sched/sch_qfq.c                                |   22 +-
 net/sctp/proc.c                                    |    2 +-
 net/sctp/socket.c                                  |   10 +-
 net/socket.c                                       |   15 +-
 net/unix/af_unix.c                                 |    2 +-
 net/unix/scm.c                                     |    6 +-
 net/xdp/xsk.c                                      |   22 +-
 net/xdp/xsk_diag.c                                 |    3 +
 scripts/bpf_doc.py                                 |   56 +-
 scripts/headers_install.sh                         |    1 -
 security/landlock/ruleset.h                        |    2 +-
 sound/core/pcm_lib.c                               |    8 +-
 sound/core/seq/seq_memory.c                        |    9 +-
 sound/isa/sb/emu8000_pcm.c                         |    2 +-
 sound/pci/hda/patch_cs8409.c                       |    2 +-
 sound/pci/hda/patch_cs8409.h                       |    1 +
 sound/pci/hda/patch_realtek.c                      |   30 +
 sound/pci/hda/tas2781_hda_i2c.c                    |   16 +-
 sound/soc/amd/yc/acp6x-mach.c                      |   14 +
 sound/soc/atmel/mchp-pdmc.c                        |    2 +-
 sound/soc/codecs/Kconfig                           |    6 +
 sound/soc/codecs/Makefile                          |    8 +-
 sound/soc/codecs/cs35l45.c                         |   11 +-
 sound/soc/codecs/cs35l56-shared.c                  |   27 +-
 sound/soc/codecs/cs42l43.c                         |    3 +-
 sound/soc/codecs/rt5645.c                          |   16 +-
 sound/soc/codecs/wcd-clsh-v2.c                     |    8 +
 sound/soc/intel/avs/pcm.c                          |   22 +
 sound/soc/soc-component.c                          |    4 +-
 sound/soc/soc-generic-dmaengine-pcm.c              |   10 +-
 sound/soc/stm/stm32_sai_sub.c                      |    2 +-
 sound/usb/midi2.c                                  |    7 +-
 tools/bpf/bpftool/link.c                           |    2 +-
 tools/build/Makefile.build                         |   10 +
 tools/build/feature/Makefile                       |   10 +-
 tools/build/feature/test-clang.cpp                 |   28 -
 tools/build/feature/test-cxx.cpp                   |   16 -
 tools/build/feature/test-llvm-version.cpp          |   12 -
 tools/build/feature/test-llvm.cpp                  |   14 -
 tools/lib/perf/include/perf/event.h                |   12 +-
 tools/perf/Documentation/perf-bench.txt            |    3 +
 tools/perf/Documentation/perf-config.txt           |   33 -
 tools/perf/Documentation/perf-dlfilter.txt         |   22 +-
 tools/perf/Documentation/perf-ftrace.txt           |   16 +-
 tools/perf/Documentation/perf-record.txt           |   93 +-
 tools/perf/Documentation/perf.data-file-format.txt |    2 +-
 tools/perf/Makefile.config                         |   59 +-
 tools/perf/Makefile.perf                           |   36 +-
 tools/perf/arch/arm/include/perf_regs.h            |    3 -
 tools/perf/arch/arm/util/cs-etm.c                  |   12 +-
 tools/perf/arch/arm/util/perf_regs.c               |   11 +
 tools/perf/arch/arm/util/unwind-libdw.c            |    1 +
 tools/perf/arch/arm64/include/arch-tests.h         |    3 +
 tools/perf/arch/arm64/include/perf_regs.h          |    3 -
 tools/perf/arch/arm64/tests/Build                  |    1 +
 tools/perf/arch/arm64/tests/arch-tests.c           |    4 +
 tools/perf/arch/arm64/tests/cpuid-match.c          |   37 +
 tools/perf/arch/arm64/util/arm-spe.c               |    2 +-
 tools/perf/arch/arm64/util/header.c                |   67 +-
 tools/perf/arch/arm64/util/machine.c               |    1 +
 tools/perf/arch/arm64/util/mem-events.c            |    2 +-
 tools/perf/arch/arm64/util/perf_regs.c             |    6 +
 tools/perf/arch/arm64/util/pmu.c                   |   18 +-
 tools/perf/arch/arm64/util/unwind-libdw.c          |    1 +
 tools/perf/arch/csky/include/perf_regs.h           |    3 -
 tools/perf/arch/csky/util/perf_regs.c              |   11 +
 tools/perf/arch/csky/util/unwind-libdw.c           |    1 +
 tools/perf/arch/loongarch/include/perf_regs.h      |    2 -
 tools/perf/arch/loongarch/util/perf_regs.c         |   11 +
 tools/perf/arch/loongarch/util/unwind-libdw.c      |    1 +
 tools/perf/arch/mips/include/perf_regs.h           |    2 -
 tools/perf/arch/mips/util/perf_regs.c              |   11 +
 tools/perf/arch/powerpc/include/perf_regs.h        |    3 -
 tools/perf/arch/powerpc/util/mem-events.c          |    6 +-
 tools/perf/arch/powerpc/util/perf_regs.c           |    6 +
 tools/perf/arch/powerpc/util/unwind-libdw.c        |    1 +
 tools/perf/arch/riscv/include/perf_regs.h          |    3 -
 tools/perf/arch/riscv/util/perf_regs.c             |   11 +
 tools/perf/arch/riscv/util/unwind-libdw.c          |    1 +
 tools/perf/arch/s390/include/perf_regs.h           |    3 -
 tools/perf/arch/s390/util/perf_regs.c              |   11 +
 tools/perf/arch/s390/util/unwind-libdw.c           |    1 +
 tools/perf/arch/x86/entry/syscalls/syscalltbl.sh   |    2 +-
 tools/perf/arch/x86/include/perf_regs.h            |    2 -
 tools/perf/arch/x86/util/evlist.c                  |    7 +-
 tools/perf/arch/x86/util/evsel.c                   |    7 +-
 tools/perf/arch/x86/util/intel-pt.c                |   39 +-
 tools/perf/arch/x86/util/mem-events.c              |    8 +-
 tools/perf/arch/x86/util/perf_regs.c               |    6 +
 tools/perf/arch/x86/util/pmu.c                     |   10 +-
 tools/perf/arch/x86/util/unwind-libdw.c            |    1 +
 tools/perf/bench/Build                             |    1 +
 tools/perf/bench/bench.h                           |    3 +
 tools/perf/bench/breakpoint.c                      |   24 +-
 tools/perf/bench/pmu-scan.c                        |    8 +-
 tools/perf/bench/uprobe.c                          |  198 ++
 tools/perf/builtin-bench.c                         |    8 +
 tools/perf/builtin-diff.c                          |    4 +-
 tools/perf/builtin-list.c                          |   23 +-
 tools/perf/builtin-lock.c                          |    3 +-
 tools/perf/builtin-record.c                        |   45 -
 tools/perf/builtin-script.c                        |   22 +-
 tools/perf/builtin-top.c                           |    1 +
 tools/perf/builtin-trace.c                         |  338 +--
 tools/perf/check-headers.sh                        |    6 +-
 tools/perf/dlfilters/dlfilter-test-api-v0.c        |   26 +-
 tools/perf/dlfilters/dlfilter-test-api-v2.c        |  377 +++
 tools/perf/examples/bpf/5sec.c                     |   53 -
 tools/perf/examples/bpf/empty.c                    |   12 -
 tools/perf/examples/bpf/hello.c                    |   27 -
 tools/perf/examples/bpf/sys_enter_openat.c         |   33 -
 tools/perf/include/perf/perf_dlfilter.h            |   11 +-
 tools/perf/perf.c                                  |    2 -
 tools/perf/pmu-events/Build                        |    6 +
 .../arch/arm64/ampere/ampereone/cache.json         |    3 -
 .../arch/arm64/ampere/ampereone/core-imp-def.json  |  120 -
 .../arch/arm64/ampere/ampereone/metrics.json       |  362 +++
 .../arch/arm64/ampere/ampereone/pipeline.json      |   12 +-
 .../arch/arm64/arm/neoverse-n2-v2/branch.json      |    8 -
 .../arch/arm64/arm/neoverse-n2-v2/bus.json         |   18 +-
 .../arch/arm64/arm/neoverse-n2-v2/cache.json       |  155 --
 .../arch/arm64/arm/neoverse-n2-v2/exception.json   |   45 +-
 .../arm64/arm/neoverse-n2-v2/fp_operation.json     |   22 +
 .../arch/arm64/arm/neoverse-n2-v2/general.json     |   10 +
 .../arch/arm64/arm/neoverse-n2-v2/instruction.json |  143 -
 .../arch/arm64/arm/neoverse-n2-v2/l1d_cache.json   |   54 +
 .../arch/arm64/arm/neoverse-n2-v2/l1i_cache.json   |   14 +
 .../arch/arm64/arm/neoverse-n2-v2/l2_cache.json    |   50 +
 .../arch/arm64/arm/neoverse-n2-v2/l3_cache.json    |   22 +
 .../arch/arm64/arm/neoverse-n2-v2/ll_cache.json    |   10 +
 .../arch/arm64/arm/neoverse-n2-v2/memory.json      |   39 +-
 .../arch/arm64/arm/neoverse-n2-v2/metrics.json     |  387 +--
 .../arch/arm64/arm/neoverse-n2-v2/pipeline.json    |   23 -
 .../arch/arm64/arm/neoverse-n2-v2/retired.json     |   30 +
 .../arch/arm64/arm/neoverse-n2-v2/spe.json         |   12 +-
 .../arm64/arm/neoverse-n2-v2/spec_operation.json   |  110 +
 .../arch/arm64/arm/neoverse-n2-v2/stall.json       |   30 +
 .../arch/arm64/arm/neoverse-n2-v2/sve.json         |   50 +
 .../arch/arm64/arm/neoverse-n2-v2/tlb.json         |   66 +
 .../arch/arm64/arm/neoverse-n2-v2/trace.json       |   27 +-
 .../arm64/freescale/yitian710/sys/ali_drw.json     |  373 +++
 .../arm64/freescale/yitian710/sys/metrics.json     |   20 +
 tools/perf/pmu-events/arch/arm64/sbsa.json         |   24 +-
 .../pmu-events/arch/powerpc/power10/cache.json     |   47 +-
 .../arch/powerpc/power10/floating_point.json       |   66 +-
 .../pmu-events/arch/powerpc/power10/frontend.json  |  201 +-
 .../pmu-events/arch/powerpc/power10/marked.json    |  224 +-
 .../pmu-events/arch/powerpc/power10/memory.json    |   93 +-
 .../pmu-events/arch/powerpc/power10/metrics.json   |   89 +-
 .../pmu-events/arch/powerpc/power10/others.json    |  210 +-
 .../pmu-events/arch/powerpc/power10/pipeline.json  |  294 +-
 .../perf/pmu-events/arch/powerpc/power10/pmc.json  |  198 +-
 .../arch/powerpc/power10/translation.json          |   43 +-
 .../pmu-events/arch/x86/alderlake/adl-metrics.json |   11 +-
 .../arch/x86/alderlaken/adln-metrics.json          |    2 +
 .../pmu-events/arch/x86/icelake/icl-metrics.json   |   10 +-
 .../pmu-events/arch/x86/icelakex/icx-metrics.json  |   10 +-
 tools/perf/pmu-events/arch/x86/mapfile.csv         |    4 +-
 .../perf/pmu-events/arch/x86/meteorlake/cache.json |  165 ++
 .../arch/x86/meteorlake/floating-point.json        |    8 +
 .../pmu-events/arch/x86/meteorlake/frontend.json   |   56 +
 .../pmu-events/arch/x86/meteorlake/memory.json     |   80 +
 .../perf/pmu-events/arch/x86/meteorlake/other.json |   16 +
 .../pmu-events/arch/x86/meteorlake/pipeline.json   |  159 ++
 .../arch/x86/rocketlake/rkl-metrics.json           |   10 +-
 .../pmu-events/arch/x86/sapphirerapids/other.json  |   18 +
 .../arch/x86/sapphirerapids/spr-metrics.json       |    9 +-
 .../pmu-events/arch/x86/skylake/skl-metrics.json   |    2 +-
 .../pmu-events/arch/x86/tigerlake/tgl-metrics.json |   10 +-
 tools/perf/pmu-events/empty-pmu-events.c           |   49 +-
 tools/perf/pmu-events/jevents.py                   |  330 ++-
 tools/perf/pmu-events/metric.py                    |   17 +-
 tools/perf/pmu-events/pmu-events.h                 |   15 +-
 tools/perf/scripts/python/Perf-Trace-Util/Build    |    3 +-
 .../python/Perf-Trace-Util/lib/Perf/Trace/Util.py  |    7 +-
 tools/perf/scripts/python/bin/gecko-record         |    2 +
 tools/perf/scripts/python/bin/gecko-report         |    7 +
 tools/perf/scripts/python/gecko.py                 |  395 +++
 tools/perf/tests/.gitignore                        |    5 -
 tools/perf/tests/Build                             |   31 -
 tools/perf/tests/bpf-script-example.c              |   60 -
 tools/perf/tests/bpf-script-test-kbuild.c          |   21 -
 tools/perf/tests/bpf-script-test-prologue.c        |   49 -
 tools/perf/tests/bpf-script-test-relocation.c      |   51 -
 tools/perf/tests/bpf.c                             |  389 ---
 tools/perf/tests/builtin-test.c                    |   14 +-
 tools/perf/tests/clang.c                           |   32 -
 tools/perf/tests/config-fragments/README           |    7 +
 tools/perf/tests/config-fragments/arm64            |    1 +
 tools/perf/tests/config-fragments/config           |   11 +
 tools/perf/tests/dlfilter-test.c                   |   38 +-
 tools/perf/tests/expr.c                            |    5 +-
 tools/perf/tests/llvm.c                            |  219 --
 tools/perf/tests/llvm.h                            |   31 -
 tools/perf/tests/make                              |    1 -
 tools/perf/tests/parse-events.c                    |    4 +-
 tools/perf/tests/pmu-events.c                      |  200 +-
 tools/perf/tests/pmu.c                             |   88 +-
 tools/perf/tests/shell/coresight/asm_pure_loop.sh  |    2 +-
 .../tests/shell/coresight/memcpy_thread_16k_10.sh  |    2 +-
 .../shell/coresight/thread_loop_check_tid_10.sh    |    2 +-
 .../shell/coresight/thread_loop_check_tid_2.sh     |    2 +-
 .../tests/shell/coresight/unroll_loop_thread_10.sh |    2 +-
 tools/perf/tests/shell/lib/probe.sh                |    1 +
 tools/perf/tests/shell/lib/probe_vfs_getname.sh    |    5 +-
 tools/perf/tests/shell/lib/stat_output.sh          |    1 +
 tools/perf/tests/shell/lib/waiting.sh              |    1 +
 tools/perf/tests/shell/lock_contention.sh          |   12 +-
 tools/perf/tests/shell/probe_vfs_getname.sh        |    4 +-
 tools/perf/tests/shell/record+zstd_comp_decomp.sh  |   14 +-
 tools/perf/tests/shell/record_bpf_filter.sh        |  134 +
 tools/perf/tests/shell/record_offcpu.sh            |    6 +-
 tools/perf/tests/shell/stat+csv_output.sh          |    2 +-
 tools/perf/tests/shell/stat+csv_summary.sh         |    4 +-
 tools/perf/tests/shell/stat+shadow_stat.sh         |    4 +-
 tools/perf/tests/shell/stat+std_output.sh          |    3 +-
 tools/perf/tests/shell/stat_bpf_counters.sh        |    8 +-
 tools/perf/tests/shell/stat_bpf_counters_cgrp.sh   |   28 +-
 tools/perf/tests/shell/test_arm_spe_fork.sh        |    2 +-
 .../tests/shell/test_perf_data_converter_json.sh   |    2 +-
 tools/perf/tests/shell/test_task_analyzer.sh       |    2 +-
 tools/perf/tests/shell/trace+probe_vfs_getname.sh  |    8 +-
 tools/perf/tests/stat.c                            |    2 +-
 tools/perf/tests/tests.h                           |    2 -
 tools/perf/trace/beauty/arch_errno_names.sh        |   15 +-
 tools/perf/trace/beauty/beauty.h                   |   15 +-
 tools/perf/trace/beauty/mmap_flags.sh              |    7 +-
 tools/perf/trace/beauty/mmap_prot.sh               |    5 +-
 tools/perf/trace/beauty/x86_arch_prctl.sh          |    6 +-
 tools/perf/ui/Build                                |    2 -
 tools/perf/ui/browser.c                            |    6 +-
 tools/perf/ui/browsers/Build                       |    5 -
 tools/perf/ui/browsers/hists.c                     |   60 +-
 tools/perf/ui/libslang.h                           |   20 +-
 tools/perf/ui/tui/helpline.c                       |    2 +-
 tools/perf/ui/tui/setup.c                          |    2 +-
 tools/perf/ui/tui/util.c                           |   12 +-
 tools/perf/util/Build                              |   72 +-
 tools/perf/util/amd-sample-raw.c                   |    1 -
 tools/perf/util/annotate.c                         |   10 +-
 tools/perf/util/bpf-filter.c                       |   14 +-
 tools/perf/util/bpf-filter.y                       |    2 +
 tools/perf/util/bpf-loader.c                       | 2110 --------------
 tools/perf/util/bpf-loader.h                       |  216 --
 .../bpf_skel/augmented_raw_syscalls.bpf.c}         |   53 +-
 tools/perf/util/bpf_skel/bench_uprobe.bpf.c        |   23 +
 tools/perf/util/build-id.c                         |    6 +-
 tools/perf/util/c++/Build                          |    2 -
 tools/perf/util/c++/clang-c.h                      |   43 -
 tools/perf/util/c++/clang-test.cpp                 |   67 -
 tools/perf/util/c++/clang.cpp                      |  225 --
 tools/perf/util/c++/clang.h                        |   27 -
 tools/perf/util/config.c                           |    4 -
 tools/perf/util/cs-etm.c                           |   14 +-
 tools/perf/util/dlfilter.c                         |   32 +
 tools/perf/util/env.c                              |    8 +-
 tools/perf/util/event.c                            |   30 +-
 tools/perf/util/event.h                            |    2 +
 tools/perf/util/evsel.c                            |   10 +-
 tools/perf/util/expr.c                             |   29 +-
 tools/perf/util/expr.h                             |    1 +
 tools/perf/util/expr.l                             |    1 +
 tools/perf/util/expr.y                             |   12 +-
 tools/perf/util/header.c                           |   52 +-
 tools/perf/util/libunwind/arm64.c                  |    2 -
 tools/perf/util/libunwind/x86_32.c                 |    2 -
 tools/perf/util/llvm-utils.c                       |  612 ----
 tools/perf/util/llvm-utils.h                       |   69 -
 tools/perf/util/lzma.c                             |   12 +-
 tools/perf/util/machine.c                          |    4 +-
 tools/perf/util/mem-events.c                       |   16 +-
 tools/perf/util/mem-events.h                       |    2 +-
 tools/perf/util/metricgroup.c                      |   10 +-
 tools/perf/util/parse-events.c                     |  723 ++---
 tools/perf/util/parse-events.h                     |  104 +-
 tools/perf/util/parse-events.l                     |   44 +-
 tools/perf/util/parse-events.y                     |  448 ++-
 tools/perf/util/perf-regs-arch/Build               |    9 +
 tools/perf/util/perf-regs-arch/perf_regs_aarch64.c |   96 +
 tools/perf/util/perf-regs-arch/perf_regs_arm.c     |   60 +
 tools/perf/util/perf-regs-arch/perf_regs_csky.c    |  100 +
 .../perf/util/perf-regs-arch/perf_regs_loongarch.c |   91 +
 tools/perf/util/perf-regs-arch/perf_regs_mips.c    |   87 +
 tools/perf/util/perf-regs-arch/perf_regs_powerpc.c |  145 +
 tools/perf/util/perf-regs-arch/perf_regs_riscv.c   |   92 +
 tools/perf/util/perf-regs-arch/perf_regs_s390.c    |   96 +
 tools/perf/util/perf-regs-arch/perf_regs_x86.c     |   98 +
 tools/perf/util/perf_regs.c                        |  772 +-----
 tools/perf/util/perf_regs.h                        |   56 +-
 tools/perf/util/pmu.c                              |  938 ++++---
 tools/perf/util/pmu.h                              |  122 +-
 tools/perf/util/pmu.y                              |   35 +-
 tools/perf/util/pmus.c                             |  328 +--
 tools/perf/util/pmus.h                             |    2 +
 tools/perf/util/print-events.h                     |    1 +
 tools/perf/util/probe-event.c                      |   30 +-
 tools/perf/util/probe-event.h                      |    1 -
 tools/perf/util/python-ext-sources                 |    9 +
 tools/perf/util/python.c                           |    5 +
 tools/perf/util/s390-sample-raw.c                  |   51 +-
 tools/perf/util/scripting-engines/Build            |    3 +-
 tools/perf/util/session.c                          |    4 +-
 tools/perf/util/setup.py                           |    3 +
 tools/perf/util/stat-display.c                     |    4 +-
 tools/perf/util/stat.c                             |    2 +-
 tools/perf/util/svghelper.c                        |    2 +-
 tools/perf/util/symbol-elf.c                       |    2 +
 tools/perf/util/symbol.c                           |   15 +-
 tools/perf/util/synthetic-events.c                 |    2 +-
 tools/perf/util/thread.c                           |   13 +
 tools/perf/util/thread.h                           |    2 +
 tools/perf/util/unwind-libdw.c                     |    8 +-
 tools/perf/util/unwind-libunwind-local.c           |    6 +-
 tools/perf/util/unwind.h                           |    8 -
 tools/scripts/utilities.mak                        |   20 +
 tools/testing/radix-tree/multiorder.c              |   68 +-
 tools/testing/selftests/bpf/Makefile               |   12 +
 .../selftests/bpf/prog_tests/bpf_obj_pinning.c     |    5 +-
 tools/testing/selftests/bpf/prog_tests/d_path.c    |   19 +-
 .../bpf/prog_tests/sk_storage_omem_uncharge.c      |   56 +
 .../selftests/bpf/prog_tests/sockmap_helpers.h     |   26 +
 .../selftests/bpf/prog_tests/sockmap_listen.c      |    7 +
 .../testing/selftests/bpf/progs/bpf_tracing_net.h  |    1 +
 .../selftests/bpf/progs/sk_storage_omem_uncharge.c |   61 +
 tools/testing/selftests/landlock/fs_test.c         |    8 +-
 tools/testing/selftests/net/fib_tests.sh           |  155 +-
 960 files changed, 24420 insertions(+), 11616 deletions(-)
 rename Documentation/bpf/{standardization => }/linux-notes.rst (100%)
 create mode 100644 Documentation/bpf/standardization/abi.rst
 create mode 100644 Documentation/devicetree/bindings/cache/andestech,ax45mp-cache.yaml
 delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/st,sti-irq-syscfg.txt
 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/st,stih407-irq-syscfg.yaml
 delete mode 100644 Documentation/devicetree/bindings/media/i2c/ov5695.txt
 delete mode 100644 Documentation/devicetree/bindings/media/i2c/ov7251.txt
 create mode 100644 Documentation/devicetree/bindings/media/i2c/ovti,ov7251.yaml
 delete mode 100644 Documentation/devicetree/bindings/pwm/brcm,kona-pwm.txt
 create mode 100644 Documentation/devicetree/bindings/pwm/brcm,kona-pwm.yaml
 create mode 100644 Documentation/gpu/automated_testing.rst
 create mode 100644 arch/loongarch/include/asm/kasan.h
 create mode 100644 arch/loongarch/include/asm/kfence.h
 create mode 100644 arch/loongarch/include/asm/kgdb.h
 create mode 100644 arch/loongarch/include/asm/lbt.h
 create mode 100644 arch/loongarch/include/asm/xor.h
 create mode 100644 arch/loongarch/include/asm/xor_simd.h
 create mode 100644 arch/loongarch/kernel/kgdb.c
 create mode 100644 arch/loongarch/kernel/lbt.S
 create mode 100644 arch/loongarch/lib/xor_simd.c
 create mode 100644 arch/loongarch/lib/xor_simd.h
 create mode 100644 arch/loongarch/lib/xor_simd_glue.c
 create mode 100644 arch/loongarch/lib/xor_template.c
 create mode 100644 arch/loongarch/mm/kasan_init.c
 create mode 100644 arch/riscv/errata/andes/Makefile
 create mode 100644 arch/riscv/errata/andes/errata.c
 create mode 100644 arch/riscv/include/asm/dma-noncoherent.h
 create mode 100644 arch/riscv/kernel/copy-unaligned.S
 create mode 100644 arch/riscv/kernel/copy-unaligned.h
 create mode 100644 arch/riscv/kernel/pi/fdt_early.c
 create mode 100644 arch/x86/include/asm/mman.h
 create mode 100644 drivers/cache/Kconfig
 create mode 100644 drivers/cache/Makefile
 create mode 100644 drivers/cache/ax45mp_cache.c
 create mode 100644 drivers/firmware/efi/libstub/kaslr.c
 create mode 100644 drivers/gpu/drm/ci/arm.config
 create mode 100644 drivers/gpu/drm/ci/arm64.config
 create mode 100644 drivers/gpu/drm/ci/build-igt.sh
 create mode 100644 drivers/gpu/drm/ci/build.sh
 create mode 100644 drivers/gpu/drm/ci/build.yml
 create mode 100755 drivers/gpu/drm/ci/check-patch.py
 create mode 100644 drivers/gpu/drm/ci/container.yml
 create mode 100644 drivers/gpu/drm/ci/gitlab-ci.yml
 create mode 100755 drivers/gpu/drm/ci/igt_runner.sh
 create mode 100644 drivers/gpu/drm/ci/image-tags.yml
 create mode 100755 drivers/gpu/drm/ci/lava-submit.sh
 create mode 100644 drivers/gpu/drm/ci/static-checks.yml
 create mode 100644 drivers/gpu/drm/ci/test.yml
 create mode 100644 drivers/gpu/drm/ci/testlist.txt
 create mode 100644 drivers/gpu/drm/ci/x86_64.config
 create mode 100644 drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/amdgpu-stoney-flakes.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/amdgpu-stoney-skips.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/i915-amly-fails.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/i915-amly-flakes.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/i915-amly-skips.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/i915-apl-fails.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/i915-apl-flakes.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/i915-apl-skips.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/i915-cml-fails.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/i915-cml-skips.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/i915-glk-fails.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/i915-glk-flakes.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/i915-glk-skips.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/i915-kbl-fails.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/i915-kbl-flakes.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/i915-kbl-skips.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/i915-tgl-fails.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/i915-tgl-flakes.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/i915-tgl-skips.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/i915-whl-fails.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/i915-whl-flakes.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/i915-whl-skips.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8173-fails.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8183-fails.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8183-flakes.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/meson-g12b-flakes.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/msm-apq8016-flakes.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/msm-apq8096-fails.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/msm-apq8096-flakes.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/msm-apq8096-skips.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/msm-sc7180-fails.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/msm-sc7180-flakes.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/msm-sc7180-skips.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/msm-sdm845-fails.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/msm-sdm845-flakes.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/msm-sdm845-skips.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/rockchip-rk3288-skips.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/rockchip-rk3399-fails.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/rockchip-rk3399-flakes.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/rockchip-rk3399-skips.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/virtio_gpu-none-fails.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/virtio_gpu-none-flakes.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/virtio_gpu-none-skips.txt
 create mode 100644 lib/kunit_iov_iter.c
 create mode 100644 lib/raid6/loongarch.h
 create mode 100644 lib/raid6/loongarch_simd.c
 create mode 100644 lib/raid6/recov_loongarch_simd.c
 delete mode 100644 tools/build/feature/test-clang.cpp
 delete mode 100644 tools/build/feature/test-cxx.cpp
 delete mode 100644 tools/build/feature/test-llvm-version.cpp
 delete mode 100644 tools/build/feature/test-llvm.cpp
 create mode 100644 tools/perf/arch/arm64/tests/cpuid-match.c
 create mode 100644 tools/perf/bench/uprobe.c
 create mode 100644 tools/perf/dlfilters/dlfilter-test-api-v2.c
 delete mode 100644 tools/perf/examples/bpf/5sec.c
 delete mode 100644 tools/perf/examples/bpf/empty.c
 delete mode 100644 tools/perf/examples/bpf/hello.c
 delete mode 100644 tools/perf/examples/bpf/sys_enter_openat.c
 create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/ampereone/metrics.json
 delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/branch.json
 delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/cache.json
 create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/fp_operation.json
 create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/general.json
 delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/instruction.json
 create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/l1d_cache.json
 create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/l1i_cache.json
 create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/l2_cache.json
 create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/l3_cache.json
 create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/ll_cache.json
 delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/pipeline.json
 create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/retired.json
 create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/spec_operation.json
 create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/stall.json
 create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/sve.json
 create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/tlb.json
 create mode 100644 tools/perf/pmu-events/arch/arm64/freescale/yitian710/sys/ali_drw.json
 create mode 100644 tools/perf/pmu-events/arch/arm64/freescale/yitian710/sys/metrics.json
 create mode 100644 tools/perf/scripts/python/bin/gecko-record
 create mode 100755 tools/perf/scripts/python/bin/gecko-report
 create mode 100644 tools/perf/scripts/python/gecko.py
 delete mode 100644 tools/perf/tests/.gitignore
 delete mode 100644 tools/perf/tests/bpf-script-example.c
 delete mode 100644 tools/perf/tests/bpf-script-test-kbuild.c
 delete mode 100644 tools/perf/tests/bpf-script-test-prologue.c
 delete mode 100644 tools/perf/tests/bpf-script-test-relocation.c
 delete mode 100644 tools/perf/tests/bpf.c
 delete mode 100644 tools/perf/tests/clang.c
 create mode 100644 tools/perf/tests/config-fragments/README
 create mode 100644 tools/perf/tests/config-fragments/arm64
 create mode 100644 tools/perf/tests/config-fragments/config
 delete mode 100644 tools/perf/tests/llvm.c
 delete mode 100644 tools/perf/tests/llvm.h
 create mode 100755 tools/perf/tests/shell/record_bpf_filter.sh
 delete mode 100644 tools/perf/util/bpf-loader.c
 delete mode 100644 tools/perf/util/bpf-loader.h
 rename tools/perf/{examples/bpf/augmented_raw_syscalls.c => util/bpf_skel/augmented_raw_syscalls.bpf.c} (91%)
 create mode 100644 tools/perf/util/bpf_skel/bench_uprobe.bpf.c
 delete mode 100644 tools/perf/util/c++/Build
 delete mode 100644 tools/perf/util/c++/clang-c.h
 delete mode 100644 tools/perf/util/c++/clang-test.cpp
 delete mode 100644 tools/perf/util/c++/clang.cpp
 delete mode 100644 tools/perf/util/c++/clang.h
 delete mode 100644 tools/perf/util/llvm-utils.c
 delete mode 100644 tools/perf/util/llvm-utils.h
 create mode 100644 tools/perf/util/perf-regs-arch/Build
 create mode 100644 tools/perf/util/perf-regs-arch/perf_regs_aarch64.c
 create mode 100644 tools/perf/util/perf-regs-arch/perf_regs_arm.c
 create mode 100644 tools/perf/util/perf-regs-arch/perf_regs_csky.c
 create mode 100644 tools/perf/util/perf-regs-arch/perf_regs_loongarch.c
 create mode 100644 tools/perf/util/perf-regs-arch/perf_regs_mips.c
 create mode 100644 tools/perf/util/perf-regs-arch/perf_regs_powerpc.c
 create mode 100644 tools/perf/util/perf-regs-arch/perf_regs_riscv.c
 create mode 100644 tools/perf/util/perf-regs-arch/perf_regs_s390.c
 create mode 100644 tools/perf/util/perf-regs-arch/perf_regs_x86.c
 create mode 100644 tools/testing/selftests/bpf/prog_tests/sk_storage_omem_uncharge.c
 create mode 100644 tools/testing/selftests/bpf/progs/sk_storage_omem_uncharge.c
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
$ 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 (9268f370c2cc mm-shmem-fix-race-in-shmem_undo_range-w-thp-fix)
$ 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
Merge made by the 'ort' strategy.
 mm/memory.c |  3 +++
 mm/shmem.c  | 19 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
Merging kbuild-current/fixes (6ccbd7fd4746 alpha: remove __init annotation from exported page_is_ram())
$ 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 (c40cad3b0aa4 ARC: boot log: fix warning)
$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr
Already up to date.
Merging arm-current/fixes (6995e2de6891 Linux 6.4)
$ 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 (8bd795fedb84 arm64: csum: Fix OoB access in IP checksum code for negative lengths)
$ 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 (3c78dbf25135 Merge tag 'qcom-arm64-fixes-for-6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/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 davinci-current/davinci/for-current (06c2afb862f9 Linux 6.5-rc1)
$ git merge -m Merge branch 'davinci/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci-current/davinci/for-current
Already up to date.
Merging drivers-memory-fixes/fixes (faafd6ca7e6e memory: tegra: make icc_set_bw return zero if BWMGR not supported)
$ 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 (ceaa837f96ad Linux 6.2-rc8)
$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes
Already up to date.
Merging m68k-current/for-linus (eb1e6ccdcf78 zorro: Include zorro.h in names.c)
$ 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 (4f3175979e62 powerpc/rtas_flash: allow user copy to flash block cache objects)
$ 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 (e5b7ca09e9aa Merge tag 's390-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
$ 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 (2d2b17d08bfc sparc: Unbreak the build)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master
Auto-merging arch/sparc/mm/srmmu.c
Merge made by the 'ort' strategy.
Merging fscrypt-current/for-current (4bcf6f827a79 fscrypt: check for NULL keyring in fscrypt_put_master_key_activeref())
$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt-current/for-current
Already up to date.
Merging fsverity-current/for-current (a075bacde257 fsverity: don't drop pagecache at end of FS_IOC_ENABLE_VERITY)
$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity-current/for-current
Already up to date.
Merging net/main (6eadb0b3d085 Merge branch 'smc-r-fixes')
$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main
Merge made by the 'ort' strategy.
 drivers/net/ethernet/broadcom/asp2/bcmasp.c        |  1 +
 drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c |  6 ++-
 drivers/net/ethernet/marvell/octeontx2/nic/cn10k.h |  2 +-
 .../ethernet/marvell/octeontx2/nic/otx2_common.c   | 43 +++-------------------
 .../ethernet/marvell/octeontx2/nic/otx2_common.h   |  3 +-
 .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c   |  7 ++--
 .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 30 ++++++++++++---
 .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.h |  4 +-
 drivers/net/ethernet/microchip/vcap/vcap_api.c     | 18 ++++++++-
 net/ipv4/devinet.c                                 | 10 ++---
 net/smc/smc_core.c                                 |  2 +
 net/smc/smc_stats.h                                |  3 +-
 tools/testing/selftests/net/bind_bhash.sh          | 26 +++++++------
 13 files changed, 84 insertions(+), 71 deletions(-)
Merging bpf/master (7182e56411b9 selftests/bpf: Add kprobe_multi override test)
$ 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.
 kernel/trace/bpf_trace.c                           | 16 ++++++++++
 .../selftests/bpf/prog_tests/kprobe_multi_test.c   | 37 ++++++++++++++++++++++
 .../selftests/bpf/progs/kprobe_multi_override.c    | 13 ++++++++
 3 files changed, 66 insertions(+)
 create mode 100644 tools/testing/selftests/bpf/progs/kprobe_multi_override.c
Merging ipsec/master (f7c4e3e5d4f6 xfrm: interface: use DEV_STATS_INC())
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master
Merge made by the 'ort' strategy.
 net/xfrm/xfrm_interface_core.c | 22 ++++++++++------------
 net/xfrm/xfrm_policy.c         | 19 +++++++++++++------
 2 files changed, 23 insertions(+), 18 deletions(-)
Merging netfilter/main (7153a404fb70 Merge tag 'nf-23-09-06' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf)
$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git netfilter/main
Already up to date.
Merging ipvs/main (931abcdcad10 Merge branch 'mlxsw-fixes')
$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/main
Already up to date.
Merging wireless/for-next (d5a93b7d2877 wifi: mwifiex: Sanity check tlv_len and tlv_bitmap_len)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
 MAINTAINERS                                        | 10 +---------
 .../net/wireless/marvell/mwifiex/11n_rxreorder.c   | 22 +++++++++++++++++++---
 drivers/net/wireless/marvell/mwifiex/fw.h          |  2 +-
 drivers/net/wireless/mediatek/mt76/dma.c           |  8 ++++----
 4 files changed, 25 insertions(+), 17 deletions(-)
Merging wpan/master (9a43827e876c net: dpaa2-mac: add 25gbase-r support)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master
Already up to date.
Merging rdma-fixes/for-rc (2ccdd1b13c59 Linux 6.5-rc6)
$ 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 (ecc8b4d0b6e1 Merge tag 'asoc-fix-v6.6-merge-window' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus
Already up to date.
Merging sound-asoc-fixes/for-linus (d9a1beeb9043 Merge remote-tracking branch 'asoc/for-6.5' 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
Merge made by the 'ort' strategy.
Merging regmap-fixes/for-linus (52a93d39b17d Linux 6.5-rc5)
$ 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 (41f02a383ac6 Merge remote-tracking branch 'regulator/for-6.5' into regulator-linus)
$ 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.
Merging spi-fixes/for-linus (578464679f33 spi: sun6i: fix RX data corruption in DMA mode)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus
Merge made by the 'ort' strategy.
Merging pci-current/for-linus (5260bd6d36c8 Revert "PCI: Mark NVIDIA T4 GPUs to avoid bus reset")
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus
Already up to date.
Merging driver-core.current/driver-core-linus (6b8bb5b8d9b3 Merge tag 'sh-for-v6.6-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-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 (535a265d7f0d Merge tag 'perf-tools-for-v6.6-1-2023-09-05' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools)
$ 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 (535a265d7f0d Merge tag 'perf-tools-for-v6.6-1-2023-09-05' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools)
$ 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-serial-fixes/usb-linus (706a74159504 Linux 6.5-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 (52a93d39b17d Linux 6.5-rc5)
$ 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 (6b8bb5b8d9b3 Merge tag 'sh-for-v6.6-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-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 (aefee19a6d9e iio: adc: imx8qxp: Fix address for command buffer registers)
$ 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.
 Documentation/devicetree/bindings/iio/light/rohm,bu27010.yaml | 1 +
 drivers/iio/adc/imx8qxp-adc.c                                 | 4 ++--
 drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c     | 6 +++++-
 drivers/iio/dac/ad3552r.c                                     | 4 ++--
 drivers/iio/frequency/admv1013.c                              | 4 ++--
 drivers/iio/pressure/bmp280-core.c                            | 2 +-
 drivers/iio/proximity/irsd200.c                               | 6 +++---
 7 files changed, 16 insertions(+), 11 deletions(-)
Merging counter-current/counter-current (df8fdd01c98b counter: microchip-tcb-capture: Fix the use of internal GCLK logic)
$ git merge -m Merge branch 'counter-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current
Auto-merging drivers/counter/microchip-tcb-capture.c
Merge made by the 'ort' strategy.
 drivers/counter/counter-chrdev.c        | 4 ++--
 drivers/counter/microchip-tcb-capture.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
Merging char-misc.current/char-misc-linus (535a265d7f0d Merge tag 'perf-tools-for-v6.6-1-2023-09-05' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools)
$ 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 (52a93d39b17d Linux 6.5-rc5)
$ 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 (2dde18cd1d8f Linux 6.5)
$ 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 (1ac731c529cd 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
Already up to date.
Merging crypto-current/master (ba22e81872c1 crypto: powerpc/chacha20,poly1305-p10 - Add dependency on VSX)
$ 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 (4752354af710 vfio/type1: check pfn valid before converting to struct page)
$ 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 (569f8b501b17 selftests/arm64: fix build failure during the "emit_tests" step)
$ 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 (f412eef03938 Documentation: livepatch: module-elf-format: Remove local klp_modinfo definition)
$ 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 (2ccdd1b13c59 Linux 6.5-rc6)
$ 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 (88603b6dc419 Linux 6.2-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 (c6abce60338a mtd: rawnand: fsl_upm: Fix an off-by one test in fun_exec_op())
$ 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 (88603b6dc419 Linux 6.2-rc2)
$ 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 (e7f2e65699e2 media: vcodec: Fix potential array out-of-bounds in encoder queue_setup)
$ git merge -m Merge branch 'fixes' of https://git.linuxtv.org/media_stage.git v4l-dvb-fixes/fixes
Already up to date.
Merging reset-fixes/reset/fixes (3a2390c6777e reset: uniphier-glue: Fix possible null-ptr-deref)
$ 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 (6eaae1980760 Linux 6.5-rc3)
$ 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 (06c2afb862f9 Linux 6.5-rc1)
$ 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 (2a906db2824b Merge branch 'am5748-fix' into fixes)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes
Already up to date.
Merging kvm-fixes/master (d5ad9aae13dc selftests/rseq: Fix build with undefined __weak)
$ 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 (c2fceb59bbda KVM: s390: pv: fix index value of replaced ASCE)
$ 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 (9c53fb0ad1ac hwmon: (asus-ec-sensosrs) fix mutex path for X670E Hero)
$ 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 (e98d14fa7315 tools/testing/nvdimm: Drop empty platform remove function)
$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes
Already up to date.
Merging cxl-fixes/fixes (ad64f5952ce3 cxl/memdev: Only show sanitize sysfs files when supported)
$ 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 (bfecc348c9ed Merge branch 'misc-6.6' 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 MAINTAINERS
Auto-merging fs/btrfs/delayed-inode.c
Auto-merging fs/btrfs/ioctl.c
Auto-merging fs/btrfs/transaction.c
Merge made by the 'ort' strategy.
 Documentation/filesystems/btrfs.rst |   1 -
 MAINTAINERS                         |   1 -
 fs/btrfs/Kconfig                    |   2 +-
 fs/btrfs/block-group.c              |  12 ++++-
 fs/btrfs/delayed-inode.c            | 104 ++++++++++++++++++++++++------------
 fs/btrfs/disk-io.c                  |  22 ++++----
 fs/btrfs/ioctl.c                    |   8 ++-
 fs/btrfs/locking.h                  |   2 +-
 fs/btrfs/ordered-data.c             |   2 +-
 fs/btrfs/transaction.c              |  39 ++++++++------
 fs/btrfs/transaction.h              |   1 +
 11 files changed, 128 insertions(+), 66 deletions(-)
Merging vfs-fixes/fixes (609d54441493 fs: prevent out-of-bounds array speculation when closing a file descriptor)
$ 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 (bbb73a103fbb swiotlb: fix a braino in the alignment check fix)
$ 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 drivers-x86-fixes/fixes (0848cab765c6 platform/mellanox: Fix mlxbf-tmfifo not handling all virtio CONSOLE notifications)
$ 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 (06c2afb862f9 Linux 6.5-rc1)
$ 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 (06c2afb862f9 Linux 6.5-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 (591b00cc4fcf dt-bindings: irqchip: convert st,stih407-irq-syscfg to DT schema)
$ 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 (06c2afb862f9 Linux 6.5-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 (812fe6420a6e scsi: storvsc: Handle additional SRB status values)
$ 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 (2dde18cd1d8f Linux 6.5)
$ 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 drm-intel-fixes/for-linux-next-fixes (2dde18cd1d8f Linux 6.5)
$ 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 (58abdd80b93b mmc: f-sdh30: fix order of function calls in sdhci_f_sdh30_remove)
$ 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 (08279468a294 rtc: sunplus: fix format string for printing resource)
$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes
Already up to date.
Merging gnss-fixes/gnss-linus (fdf0eaf11452 Linux 6.5-rc2)
$ 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 (6ad0f2f91ad1 Drivers: hv: vmbus: Remove unused extern declaration vmbus_ontimer())
$ 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 (06c2afb862f9 Linux 6.5-rc1)
$ 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 (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
$ 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 riscv-dt-fixes/riscv-dt-fixes (602afaaa6ef9 riscv: dts: starfive: fix NOR flash reserved-data partition size)
$ git merge -m Merge branch 'riscv-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes
Merge made by the 'ort' strategy.
 arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging riscv-soc-fixes/riscv-soc-fixes (06c2afb862f9 Linux 6.5-rc1)
$ git merge -m Merge branch 'riscv-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc-fixes/riscv-soc-fixes
Already up to date.
Merging fpga-fixes/fixes (06c2afb862f9 Linux 6.5-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 (6b8bb5b8d9b3 Merge tag 'sh-for-v6.6-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-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 (180b10bd160b gpio: zynq: restore zynq_gpio_irq_reqres/zynq_gpio_irq_relres callbacks)
$ 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 (06c2afb862f9 Linux 6.5-rc1)
$ 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 (06c2afb862f9 Linux 6.5-rc1)
$ 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 (4da3c7183e18 erofs: drop unnecessary WARN_ON() in erofs_kill_sb())
$ 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 kunit-fixes/kunit-fixes (06c2afb862f9 Linux 6.5-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 (2241ab53cbb5 Linux 6.2-rc5)
$ 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 (9e46e4dcd9d6 mm,memblock: reset memblock.reserved to system init state to prevent UAF)
$ 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 nfsd-fixes/nfsd-fixes (784e1afb0032 nfsd: fix change_info in NFSv4 RENAME replies)
$ git merge -m Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes
Merge made by the 'ort' strategy.
 fs/nfsd/nfs4proc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Merging irqchip-fixes/irq/irqchip-fixes (6fe5c68ee6a1 irqchip/gic-v3: Workaround for GIC-700 erratum 2941627)
$ 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
Already up to date.
Merging renesas-fixes/fixes (4c188fa183eb arm64: dts: renesas: rzg2l: Update overfow/underflow IRQ names for MTU3 channels)
$ 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 (9abf2313adc1 Linux 6.1-rc1)
$ git merge -m Merge branch 'fixes' of https://github.com/Broadcom/stblinux.git broadcom-fixes/fixes
Already up to date.
Merging perf-current/perf-tools (45fc4628c15a perf parse-events: Fix driver config term)
$ git merge -m Merge branch 'perf-tools' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools perf-current/perf-tools
Already up to date.
Merging efi-fixes/urgent (d6c221df1e32 efi/unaccepted: Use ACPI reclaim memory for unaccepted memory table)
$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent
Merge made by the 'ort' strategy.
 arch/x86/Kconfig                                 |  2 +-
 arch/x86/include/asm/efi.h                       | 32 ++----------------------
 arch/x86/platform/efi/efi_32.c                   | 12 +++++++++
 arch/x86/platform/efi/efi_64.c                   | 19 ++++++++++++--
 drivers/firmware/efi/libstub/unaccepted_memory.c |  2 +-
 5 files changed, 33 insertions(+), 34 deletions(-)
Merging zstd-fixes/zstd-linus (6906598f1ce9 zstd: Fix definition of assert())
$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus
Already up to date.
Merging battery-fixes/fixes (205f4cf3136f power: supply: ab8500: Set typing and props)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes
Merge made by the 'ort' strategy.
 drivers/power/supply/ab8500_btemp.c    | 9 +--------
 drivers/power/supply/ab8500_chargalg.c | 2 +-
 2 files changed, 2 insertions(+), 9 deletions(-)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes
Already up to date.
Merging asahi-soc-fixes/asahi-soc/fixes (568035b01cfb Linux 6.0-rc1)
$ git merge -m Merge branch 'asahi-soc/fixes' of https://github.com/AsahiLinux/linux.git asahi-soc-fixes/asahi-soc/fixes
Already up to date.
Merging iommufd-fixes/for-rc (b7c822fa6b77 iommufd: Set end correctly when doing batch carry)
$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc
Already up to date.
Merging rust-fixes/rust-fixes (3fa7187eceee rust: macros: vtable: fix `HAS_*` redefinition (`gen_const_name`))
$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes
Already up to date.
Merging v9fs-fixes/fixes/next (2dde18cd1d8f Linux 6.5)
$ git merge -m Merge branch 'fixes/next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-fixes/fixes/next
Already up to date.
Merging w1-fixes/fixes (06c2afb862f9 Linux 6.5-rc1)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1-fixes/fixes
Already up to date.
Merging genpd-fixes/fixes (12acb348fa45 cpuidle: psci: Move enabling OSI mode after power domains creation)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git genpd-fixes/fixes
Already up to date.
Merging drm-misc-fixes/for-linux-next-fixes (dcbad727513d drm/radeon: make fence wait in suballocator uninterrruptable)
$ 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/drm_connector.c
Merge made by the 'ort' strategy.
 drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c |  2 +-
 drivers/gpu/drm/drm_connector.c        |  2 ++
 drivers/gpu/drm/radeon/radeon_sa.c     |  2 +-
 drivers/gpu/drm/tiny/gm12u320.c        | 10 +++++-----
 4 files changed, 9 insertions(+), 7 deletions(-)
Merging mm-stable/mm-stable (6bc660278f11 Merge branch 'master' into mm-stable)
$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable
Merge made by the 'ort' strategy.
Merging mm-nonmm-stable/mm-nonmm-stable (1548b060d6f3 Merge tag 'topic/drm-ci-2023-08-31-1' of git://anongit.freedesktop.org/drm/drm)
$ 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 (839cadadb256 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 drivers/scsi/qla2xxx/qla_dfs.c
Merge made by the 'ort' strategy.
 drivers/acpi/acpi_pad.c                   |   2 +-
 drivers/acpi/numa/hmat.c                  | 218 ++++++++++++++++-----
 drivers/dax/kmem.c                        |  54 ++++--
 drivers/dax/super.c                       |   3 +-
 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c    | 137 +-------------
 drivers/scsi/qla2xxx/qla_dfs.c            |  59 +-----
 fs/dax.c                                  |  24 +--
 fs/exec.c                                 |   4 +-
 fs/ocfs2/alloc.c                          |   2 +-
 fs/proc/base.c                            |   6 +-
 fs/xfs/xfs_notify_failure.c               |  99 +++++++++-
 include/linux/compiler-clang.h            |   5 -
 include/linux/compiler-gcc.h              |   2 -
 include/linux/compiler.h                  |   5 +-
 include/linux/dax.h                       |  10 +-
 include/linux/gfp.h                       |   9 +
 include/linux/memcontrol.h                |   8 +-
 include/linux/memory-tiers.h              |  25 ++-
 include/linux/mm.h                        |  11 +-
 include/linux/mm_types.h                  |  11 ++
 include/linux/sched.h                     |   1 -
 include/linux/sched/signal.h              |  19 +-
 include/linux/seq_file.h                  |  15 ++
 include/linux/swap.h                      |   6 +
 init/init_task.c                          |   1 -
 kernel/Kconfig.kexec                      |   2 +-
 kernel/exit.c                             |   5 -
 kernel/fork.c                             |   7 -
 kernel/kthread.c                          |   1 -
 kernel/panic.c                            |  22 ++-
 kernel/signal.c                           |  17 +-
 mm/compaction.c                           |  91 +++++----
 mm/huge_memory.c                          |   6 +-
 mm/hugetlb.c                              |  35 +++-
 mm/hugetlb_vmemmap.c                      |  11 +-
 mm/internal.h                             |   3 +-
 mm/madvise.c                              |   5 +-
 mm/memcontrol.c                           | 114 ++++++++---
 mm/memory-failure.c                       |  36 ++--
 mm/memory-tiers.c                         |  73 ++++++-
 mm/memory.c                               |   2 -
 mm/mmap.c                                 |   3 +-
 mm/mremap.c                               |  77 +++++++-
 mm/page_alloc.c                           |  72 +++++--
 mm/show_mem.c                             |  11 +-
 mm/vmscan.c                               |  33 +++-
 mm/vmstat.c                               |  22 ++-
 mm/workingset.c                           |   4 +-
 tools/testing/selftests/mm/gup_longterm.c |   3 +-
 tools/testing/selftests/mm/mremap_test.c  | 305 +++++++++++++++++++++++++-----
 50 files changed, 1152 insertions(+), 544 deletions(-)
Merging kbuild/for-next (6099776f9f26 Merge tag '6.6-rc-ksmbd' of git://git.samba.org/ksmbd)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next
Already up to date.
Merging clang-format/clang-format (5d0c230f1de8 Linux 6.5-rc4)
$ 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-tools-next (45fc4628c15a perf parse-events: Fix driver config term)
$ git merge -m Merge branch 'perf-tools-next' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git perf/perf-tools-next
Already up to date.
Merging compiler-attributes/compiler-attributes (5d0c230f1de8 Linux 6.5-rc4)
$ 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 (f875db4f20f4 Revert "dma-contiguous: check for memory region overlap")
$ 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 (6e8d96909a23 asm-generic: partially revert "Unify uapi bitsperlong.h for arm64, riscv and loongarch")
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master
Already up to date.
Merging arc/for-next (06c2afb862f9 Linux 6.5-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 (133789d4a458 Revert part of ae1f8d793a19 ("ARM: 9304/1: add prototype for function called only from asm"))
$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next
Already up to date.
Merging arm64/for-next/core (e1df27213941 Merge branch 'for-next/selftests' into for-next/core)
$ 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 (21b61fe48c2f drivers/perf: hisi: Update HiSilicon PMU maintainers)
$ 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 (42ed07054d75 soc: document merges)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next
Merge made by the 'ort' strategy.
 arch/arm/arm-soc-for-next-changes.txt | 238 ++++++++++++++++++++++++++++++++++
 1 file changed, 238 insertions(+)
 create mode 100644 arch/arm/arm-soc-for-next-changes.txt
Merging amlogic/for-next (413f5c02929b Merge branch 'v6.6/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 asahi-soc/asahi-soc/for-next (eaf935fa48ec soc: apple: mailbox: Rename config symbol to APPLE_MAILBOX)
$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next
Auto-merging MAINTAINERS
Auto-merging drivers/soc/apple/Makefile
CONFLICT (content): Merge conflict in drivers/soc/apple/Makefile
Resolved 'drivers/soc/apple/Makefile' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master 39ce306435d3] Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git
$ git diff -M --stat --summary HEAD^..
 MAINTAINERS                        |   2 -
 drivers/mailbox/Kconfig            |  12 -
 drivers/mailbox/Makefile           |   2 -
 drivers/mailbox/apple-mailbox.c    | 441 -------------------------------------
 drivers/soc/apple/Kconfig          |  15 +-
 drivers/soc/apple/Makefile         |   3 +
 drivers/soc/apple/mailbox.c        | 436 ++++++++++++++++++++++++++++++++++++
 drivers/soc/apple/mailbox.h        |  48 ++++
 drivers/soc/apple/rtkit-internal.h |   8 +-
 drivers/soc/apple/rtkit.c          | 133 +++--------
 include/linux/apple-mailbox.h      |  19 --
 include/linux/soc/apple/rtkit.h    |  18 --
 12 files changed, 531 insertions(+), 606 deletions(-)
 delete mode 100644 drivers/mailbox/apple-mailbox.c
 create mode 100644 drivers/soc/apple/mailbox.c
 create mode 100644 drivers/soc/apple/mailbox.h
 delete mode 100644 include/linux/apple-mailbox.h
Merging aspeed/for-next (05f42491c813 ARM: dts: aspeed: bonnell: Add reserved memory for TPM event log)
$ 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/configs/aspeed_g5_defconfig
Merge made by the 'ort' strategy.
 arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-bonnell.dts | 8 +++++++-
 arch/arm/configs/aspeed_g5_defconfig                | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)
Merging at91/at91-next (b04dba7c1c30 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 MAINTAINERS
Merge made by the 'ort' strategy.
Merging broadcom/next (a70e8c9ff89a Merge branch 'soc/next' into next)
$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next
Merge made by the 'ort' strategy.
Merging davinci/davinci/for-next (06c2afb862f9 Linux 6.5-rc1)
$ git merge -m Merge branch 'davinci/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci/davinci/for-next
Already up to date.
Merging drivers-memory/for-next (35bd78cf2522 memory: tegra: add MC client for Tegra234 GPU)
$ 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
Already up to date.
Merging imx-mxs/for-next (246e2cc22265 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
Merge made by the 'ort' strategy.
Merging mediatek/for-next (f6925844c82a Merge branch 'v6.4-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
Auto-merging arch/arm64/boot/dts/mediatek/mt8192.dtsi
Auto-merging arch/arm64/boot/dts/mediatek/mt8195.dtsi
Merge made by the 'ort' strategy.
 arch/arm64/boot/dts/mediatek/mt8192.dtsi | 2 ++
 arch/arm64/boot/dts/mediatek/mt8195.dtsi | 2 ++
 2 files changed, 4 insertions(+)
Merging mvebu/for-next (a8e364c2c428 Merge branch 'mvebu/drivers' 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.
 drivers/firmware/turris-mox-rwtm.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
Merging omap/for-next (6387fcbea64f Merge branch 'omap-for-v6.6/ti-sysc' 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
Merge made by the 'ort' strategy.
Merging qcom/for-next (9c573e27d40a Merge branches 'arm64-defconfig-for-6.6', 'arm64-fixes-for-6.5', 'arm64-for-6.6', 'clk-for-6.6', 'drivers-for-6.6' and 'dts-for-6.6' 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
Merge made by the 'ort' strategy.
Merging renesas/next (13512fa6af4a Merge branch 'renesas-dts-for-v6.6' 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 (417a3a5ae44a reset: ti: syscon: remove unneeded call to platform_set_drvdata())
$ 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 (6d1fa8808888 Merge branch 'v6.5-armsoc/dtsfixes' 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
Merge made by the 'ort' strategy.
Merging samsung-krzk/for-next (7a736a6b2c9b Merge branch 'next/clk' 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
Merge made by the 'ort' strategy.
Merging scmi/for-linux-next (84f64289860a Merge branch 'pcc_type4' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
$ 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
Merge made by the 'ort' strategy.
 drivers/firmware/arm_scmi/perf.c |  4 +-
 drivers/mailbox/pcc.c            | 91 +++++++++++++++++++++++++++++++++++-----
 2 files changed, 82 insertions(+), 13 deletions(-)
Merging stm32/stm32-next (da50d4f56078 ARM: dts: stm32: Add Octavo OSD32MP1-RED board)
$ 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/configs/multi_v7_defconfig
Merge made by the 'ort' strategy.
 .../devicetree/bindings/arm/stm32/stm32.yaml       |   1 +
 arch/arm/boot/dts/st/Makefile                      |   1 +
 arch/arm/boot/dts/st/stm32mp15-pinctrl.dtsi        | 114 +++++++++++
 arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dts  | 225 +++++++++++++++++++++
 arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi      |   4 -
 arch/arm/boot/dts/st/stm32mp15xx-osd32.dtsi        |   6 -
 6 files changed, 341 insertions(+), 10 deletions(-)
 create mode 100644 arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dts
Merging sunxi/sunxi/for-next (aa333f5e8461 Merge branch 'sunxi/dt-for-6.6' 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 (6a8b7e801054 tee: optee: Use kmemdup() to replace kmalloc + memcpy)
$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next
Already up to date.
Merging tegra/for-next (c62440bd774b Merge branch for-6.6/arm64/dt 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.
 .../bindings/arm/tegra/nvidia,tegra20-pmc.yaml     | 393 -------------------
 .../bindings/soc/tegra/nvidia,tegra20-pmc.yaml     | 416 +++++++++++++++++++++
 arch/arm64/boot/dts/nvidia/tegra132.dtsi           |   2 +
 arch/arm64/boot/dts/nvidia/tegra210-smaug.dts      |  66 ++++
 .../dts/nvidia/tegra234-p3737-0000+p3701-0000.dts  |   1 +
 arch/arm64/boot/dts/nvidia/tegra234-p3767.dtsi     |   4 +-
 .../dts/nvidia/tegra234-p3768-0000+p3767-0000.dts  |  13 -
 .../arm64/boot/dts/nvidia/tegra234-p3768-0000.dtsi |   1 +
 arch/arm64/boot/dts/nvidia/tegra234.dtsi           |  40 +-
 9 files changed, 509 insertions(+), 427 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.yaml
 create mode 100644 Documentation/devicetree/bindings/soc/tegra/nvidia,tegra20-pmc.yaml
Merging ti/ti-next (d0857dc9b22d Merge branch '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 (65d6e954e378 Merge tag 'gfs2-v6.5-rc5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2)
$ 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 (41680df0975e Merge branch 'clk-qcom' 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 (72d00e560d10 clk: imx: pll14xx: dynamically configure PLL for 393216000/361267200Hz)
$ 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 (708cb698ffa2 clk: renesas: rcar-gen3: Add ADG clocks)
$ 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 csky/linux-next (5195c35ac4f0 csky: 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 (671eae93ae20 LoongArch: Update Loongson-3 default config file)
$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next
Already up to date.
Merging m68k/for-next (eb1e6ccdcf78 zorro: Include zorro.h in names.c)
$ 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 (cf18ecd34f71 m68k: coldfire: dma_timer: ERROR: "foo __init bar" should be "foo __init bar")
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next
Already up to date.
Merging microblaze/next (65d6e954e378 Merge tag 'gfs2-v6.5-rc5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2)
$ 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 (e7513eccb7d7 MIPS: TXx9: Do PCI error checks on own line)
$ 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 openrisc/for-next (c289330331eb openrisc: Remove kernel-doc marker from ioremap comment)
$ 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 (e5ef93d02d6c parisc: BTLB: Initialize BTLB tables at CPU startup)
$ 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
Merge made by the 'ort' strategy.
 arch/parisc/include/asm/cache.h     |  1 +
 arch/parisc/include/asm/mckinley.h  |  8 -----
 arch/parisc/include/asm/pdc.h       |  5 +--
 arch/parisc/include/asm/processor.h |  1 +
 arch/parisc/include/asm/ropes.h     |  7 ++--
 arch/parisc/include/asm/shmparam.h  | 15 ++++++++
 arch/parisc/kernel/asm-offsets.c    |  2 ++
 arch/parisc/kernel/cache.c          |  8 +----
 arch/parisc/kernel/drivers.c        |  2 +-
 arch/parisc/kernel/firmware.c       | 56 +++++++++++++++++++++++------
 arch/parisc/kernel/head.S           | 16 +++++++--
 arch/parisc/kernel/irq.c            |  2 +-
 arch/parisc/kernel/processor.c      |  2 ++
 arch/parisc/kernel/vmlinux.lds.S    |  1 +
 arch/parisc/mm/init.c               | 72 +++++++++++++++++++++++++++++++++++++
 drivers/char/agp/parisc-agp.c       |  2 --
 drivers/parisc/ccio-dma.c           | 18 +++++-----
 drivers/parisc/iommu-helpers.h      |  8 ++---
 drivers/parisc/iosapic.c            |  4 +--
 drivers/parisc/iosapic_private.h    |  4 +--
 drivers/parisc/sba_iommu.c          | 38 +++++++++-----------
 21 files changed, 196 insertions(+), 76 deletions(-)
 delete mode 100644 arch/parisc/include/asm/mckinley.h
Merging powerpc/next (85a616416e9e macintosh/ams: linux/platform_device.h is needed)
$ 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 (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
$ 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 (c6a906cce61a soc: renesas: Kconfig: For ARCH_R9A07G043 select the required configs if dependencies are met)
$ 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 riscv-dt/riscv-dt-for-next (a3ce3ff28385 riscv: dts: change TH1520 files to dual license)
$ git merge -m Merge branch 'riscv-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next
Already up to date.
Merging riscv-soc/riscv-soc-for-next (30fb4784483b soc: starfive: Add JH7110 AON PMU support)
$ git merge -m Merge branch 'riscv-soc-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
 MAINTAINERS                                     |   1 +
 arch/riscv/Kconfig.socs                         |   1 +
 drivers/genpd/starfive/jh71xx-pmu.c             | 139 +++++++++++++++++++-----
 drivers/soc/starfive/Kconfig                    |   4 +-
 include/dt-bindings/power/starfive,jh7110-pmu.h |   5 +-
 5 files changed, 118 insertions(+), 32 deletions(-)
Merging s390/for-next (06fc3b0d2251 s390/vmem: do not silently ignore mapping limit)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next
Already up to date.
Merging sh/for-next (246f80a0b17f sh: push-switch: Reorder cleanup operations to avoid use-after-free bug)
$ git merge -m Merge branch 'for-next' of git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next
Already up to date.
Merging uml/next (974b808d85ab um: virt-pci: fix missing declaration warning)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next
Already up to date.
Merging xtensa/xtensa-for-next (03ce34cf8f50 xtensa: add XIP-aware MTD support)
$ 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 (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next
Already up to date.
Merging fscrypt/for-next (324718ddddc4 fscrypt: improve the "Encryption modes and usage" section)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next
Already up to date.
Merging afs/afs-next (0a278bc196e7 afs: Automatically generate trace tag enums)
$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next
Merge made by the 'ort' strategy.
 include/trace/events/afs.h | 475 ++++++++++++++-------------------------------
 1 file changed, 148 insertions(+), 327 deletions(-)
Merging btrfs/for-next (330c15bebcb4 Merge branch 'for-next-next-v6.5-20230824' into for-next-20230824)
$ 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/inode.c
Auto-merging fs/btrfs/ordered-data.c
Merge made by the 'ort' strategy.
 fs/btrfs/extent_io.c    | 171 +++++++++++++++++++++++++++++-------------------
 fs/btrfs/inode.c        |  55 +---------------
 fs/btrfs/ordered-data.c |  24 ++++++-
 3 files changed, 127 insertions(+), 123 deletions(-)
Merging ceph/master (ce0d5bd3a6c1 ceph: make num_fwd and num_retry to __u32)
$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master
Already up to date.
Merging cifs/for-next (fd3a5940e66d Merge tag '6.6-rc-smb3-client-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6)
$ 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 (77992f896745 configfs: remove mentions of committable items)
$ 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 (a3d78fe3e1ae fs: ecryptfs: comment typo fix)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next
Auto-merging fs/ecryptfs/crypto.c
Auto-merging fs/ecryptfs/read_write.c
Merge made by the 'ort' strategy.
 fs/ecryptfs/crypto.c   | 2 +-
 fs/ecryptfs/keystore.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Merging erofs/dev (91b1ad0815fb erofs: release ztailpacking pclusters properly)
$ 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 (b3a62a988600 exfat: support create zero-size directory)
$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev
Merge made by the 'ort' strategy.
 fs/exfat/dir.c      | 12 +++----
 fs/exfat/exfat_fs.h |  8 +++++
 fs/exfat/file.c     | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 fs/exfat/namei.c    | 36 +++++++++++++++------
 fs/exfat/super.c    |  7 ++++
 5 files changed, 141 insertions(+), 15 deletions(-)
Merging ext3/for_next (d3cc1b0be258 quota: explicitly forbid quota files from being encrypted)
$ 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.
 fs/quota/dquot.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
Merging ext4/dev (768d612f7982 ext4: fix slab-use-after-free in ext4_es_insert_extent())
$ 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 (708283abf896 Merge tag 'dmaengine-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine)
$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev
Already up to date.
Merging fsverity/for-next (919dc320956e fsverity: skip PKCS#7 parser when keyring is empty)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next
Already up to date.
Merging fuse/for-next (f73016b63b09 fuse: conditionally fill kstat in fuse_do_statx())
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next
Already up to date.
Merging gfs2/for-next (2f06468197b1 gfs2: Remove freeze_go_demote_ok)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next
Merge made by the 'ort' strategy.
 fs/gfs2/glops.c | 13 -------------
 fs/gfs2/super.c | 10 ----------
 2 files changed, 23 deletions(-)
Merging jfs/jfs-next (0225e10972fa jfs: validate max amount of blocks before allocation.)
$ 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 (a3c57ab79a06 iov_iter: Kunit tests for page extraction)
$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next
Already up to date.
Merging nfs/linux-next (2dde18cd1d8f Linux 6.5)
$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next
Already up to date.
Merging nfs-anna/linux-next (c4a123d2e8c4 pNFS: Fix assignment of xprtdata.cred)
$ 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/nfsd-next (b38a6023da6a Documentation: Add missing documentation for EXPORT_OP flags)
$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next
Already up to date.
Merging ntfs3/master (44b4494d5c59 fs/ntfs3: Correct mode for label entry inside /proc/fs/ntfs3/)
$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master
Already up to date.
Merging orangefs/for-next (31720a2b109b orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init())
$ 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 (724768a39374 ovl: fix incorrect fdput() on aio completion)
$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs/overlayfs-next
Merge made by the 'ort' strategy.
 fs/overlayfs/copy_up.c | 3 ++-
 fs/overlayfs/file.c    | 9 +++------
 2 files changed, 5 insertions(+), 7 deletions(-)
Merging ubifs/next (017c73a34a66 ubi: Refuse attaching if mtd's erasesize is 0)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next
Merge made by the 'ort' strategy.
 drivers/mtd/ubi/build.c | 7 +++++++
 1 file changed, 7 insertions(+)
Merging v9fs/9p-next (4ec5183ec486 Linux 6.2-rc7)
$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next
Already up to date.
Merging v9fs-ericvh/ericvh/for-next (2dde18cd1d8f Linux 6.5)
$ git merge -m Merge branch 'ericvh/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-ericvh/ericvh/for-next
Already up to date.
Merging xfs/for-next (c1950a111dd8 fs/xfs: Fix typos in comments)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next
Already up to date.
Merging zonefs/for-next (8812387d0569 zonefs: set FMODE_CAN_ODIRECT instead of a dummy direct_IO method)
$ 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 (377698d4abe2 Merge tag 'xfs-async-dio.6-2023-08-01' of git://git.kernel.dk/linux into iomap-6.6-mergeA)
$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next
Already up to date.
Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck)
$ 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 (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
$ 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 iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
$ git merge -m Merge branch 'iversion-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git iversion/iversion-next
Already up to date.
Merging vfs-brauner/vfs.all (f505786d6915 Merge branch 'vfs.fs_context' into vfs.all)
$ git merge -m Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner/vfs.all
Auto-merging fs/ext4/super.c
Auto-merging fs/xfs/xfs_super.c
Auto-merging mm/shmem.c
Merge made by the 'ort' strategy.
Merging vfs/for-next (cff4b23c731a Merge branch 'work.lock_rename_child' 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
Merge made by the 'ort' strategy.
Merging printk/for-next (189f53ec6668 Merge branch 'for-6.6-fixup' 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 (b6f6167ea8a4 Merge tag 'pci-v6.6-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next
Already up to date.
Merging pstore/for-next/pstore (94160062396d pstore: Base compression input buffer size on estimated compressed size)
$ 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 (bd0ffb67f8d3 Merge branch 'for-6.6/upstream-fixes' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next
Merge made by the 'ort' strategy.
 drivers/hid/hid-sony.c | 3 +++
 1 file changed, 3 insertions(+)
Merging i2c/i2c/for-next (6bd4bef7f554 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
Merge made by the 'ort' strategy.
Merging i3c/i3c/next (6e13d6528be2 i3c: master: svc: fix probe failure when no i3c device exist)
$ 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 (13a0ac816d22 firmware: dmi: Fortify entry point length checks)
$ 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
Already up to date.
Merging hwmon-staging/hwmon-next (919a83d020a8 hwmon: (tmp513) Simplify probe())
$ 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 (c63594f2d666 Docu: genericirq.rst: fix irq-example)
$ 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 (9a5d660fdb25 media: ivsc: Add ACPI dependency)
$ 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 (4c420b729238 media: ivsc: Depend on VIDEO_DEV)
$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master
Merge made by the 'ort' strategy.
 drivers/media/pci/intel/ivsc/Kconfig   | 5 ++++-
 drivers/media/platform/marvell/Kconfig | 4 ++--
 drivers/media/platform/via/Kconfig     | 2 +-
 drivers/media/usb/em28xx/Kconfig       | 4 ++--
 drivers/media/usb/go7007/Kconfig       | 2 +-
 drivers/media/usb/uvc/uvc_ctrl.c       | 3 +++
 6 files changed, 13 insertions(+), 7 deletions(-)
Merging pm/linux-next (3a0edc2c5c29 Merge branch 'powercap' 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
Merge made by the 'ort' strategy.
Merging cpufreq-arm/cpufreq/arm/linux-next (16567117aa0c cpufreq: Add QCM6490 to cpufreq-dt-platdev blocklist)
$ 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
Merge made by the 'ort' strategy.
 drivers/cpufreq/cpufreq-dt-platdev.c | 1 +
 drivers/cpufreq/tegra194-cpufreq.c   | 2 ++
 2 files changed, 3 insertions(+)
Merging cpupower/cpupower (af75504c3896 cpupower: Add Georgian translation to Makefile LANGUAGES)
$ 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 (5693d077595d PM / devfreq: Fix leak in devfreq_dev_release())
$ 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 genpd/next (5e536362f6ab genpd: ti: Use for_each_node_with_property() simplify code logic)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git genpd/next
Already up to date.
Merging opp/opp/linux-next (e576a9a8603f dt-bindings: cpufreq: Convert ti-cpufreq to json schema)
$ 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 (edd220b33f47 thermal: core: Drop thermal_zone_device_register())
$ 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
Already up to date.
Merging dlm/next (7c53e847ff5e dlm: fix plock lookup when using multiple lockspaces)
$ 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 (f5acc36b0714 IB/hfi1: Reduce printing of errors during driver shut down)
$ 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/main (73be7fb14e83 Merge tag 'net-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main
Already up to date.
Merging bpf-next/for-next (73be7fb14e83 Merge tag 'net-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
$ 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 (a94fd40a18ae xfrm: delete not-needed clear to zero of encap_oa)
$ 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 (58dbd6428a68 RDMA/mlx5: Handles RoCE MACsec steering rules addition and deletion)
$ 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/main (c2e5f4fd1148 Merge branch 'netconsole-enable-compile-time-configuration')
$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git netfilter-next/main
Already up to date.
Merging ipvs-next/main (c2e5f4fd1148 Merge branch 'netconsole-enable-compile-time-configuration')
$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/main
Already up to date.
Merging bluetooth/master (ec63120307a6 Bluetooth: Add support for Intel Misty Peak - 8087:0038)
$ 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        |  5 +++
 include/net/bluetooth/hci.h      |  3 ++
 include/net/bluetooth/hci_core.h | 25 +++++++++++++-
 include/net/bluetooth/hci_sync.h |  2 ++
 net/bluetooth/hci_conn.c         | 71 ++++++++++++++++++++++++----------------
 net/bluetooth/hci_core.c         |  5 +++
 net/bluetooth/hci_event.c        | 54 ++++++++++++++++++++++--------
 net/bluetooth/hci_request.h      |  2 --
 net/bluetooth/hci_sync.c         | 41 +++++++++--------------
 net/bluetooth/iso.c              | 28 +++++++++++-----
 10 files changed, 158 insertions(+), 78 deletions(-)
Merging wireless-next/for-next (b32add2d20ea Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue)
$ 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 wpan-next/master (18b849f12dcc ieee802154: ca8210: Remove stray gpiod_unexport() call)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-next/master
Already up to date.
Merging wpan-staging/staging (18b849f12dcc ieee802154: ca8210: Remove stray gpiod_unexport() call)
$ git merge -m Merge branch 'staging' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-staging/staging
Already up to date.
Merging mtd/mtd/next (54a3f6e89fbb Merge tag 'nand/for-6.6' into mtd/next)
$ 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 (b9283ac01a27 dt-bindings: mtd: amlogic,meson-nand: drop unneeded quotes)
$ 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 (69d50d0461a1 mtd: spi-nor: nxp-spifi: Use helper function devm_clk_get_enabled())
$ 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 (85b9bf9a514d Revert "dt-bindings: crypto: qcom,prng: Add SM8450")
$ 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 (43ffcd6fa163 Merge tag 'amd-drm-fixes-6.6-2023-09-06' 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-ci/topic/drm-ci (ad6bfe1b66a5 drm: ci: docs: fix build warning - add missing escape)
$ git merge -m Merge branch 'topic/drm-ci' of git://git.freedesktop.org/git/drm/drm.git drm-ci/topic/drm-ci
Already up to date.
Merging drm-misc/for-linux-next (d20b484c674d drm/drm_exec: Work around a WW mutex lockdep oddity)
$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next
Merge made by the 'ort' strategy.
 drivers/gpu/drm/drm_exec.c |  2 +-
 include/drm/drm_exec.h     | 35 +++++++++++++++++++++++++++++++----
 2 files changed, 32 insertions(+), 5 deletions(-)
Merging amdgpu/drm-next (88ca2f8a962e drm/amd/display: clean up one inconsistent indenting)
  00481158ca02 ("drm/amdgpu/jpeg - skip change of power-gating state for sriov")
  078649113570 ("drm/amd/pm: Add critical temp for GC v9.4.3")
  084f658ece13 ("drm/amd/display: prevent potential division by zero errors")
  0bc119fa2ebe ("drm/amdkfd: use correct method to get clock under SRIOV")
  15c5c5f57514 ("drm/amdgpu: Add bootloader status check")
  15e6b396f5ac ("drm/amd/display: update blank state on ODM changes")
  1b8e56b99459 ("drm/amdgpu: Restrict bootloader wait to SMUv13.0.6")
  1c6b6bd0780f ("drm/amdgpu: register a dirty framebuffer callback for fbcon")
  2c0f880abcca ("drm/amdgpu: Fix the return for gpu mode1_reset")
  302be1cb9f4b ("drm/amd/display: Add smu write msg id fail retry process")
  36b0f88988be ("drm/amdgpu: Unset baco dummy mode on nbio v7.9")
  38498908c5e3 ("drm/amdkfd: Add missing gfx11 MQD manager callbacks")
  3cce0bfcd0f9 ("drm/amd/display: Enable Replay for static screen use cases")
  3ea691873492 ("drm/amd/display: Correct unit conversion for vstartup")
  46963ed58545 ("drm/amdgpu: Only support RAS EEPROM on dGPU platform")
  5465e7b87f58 ("drm/amdgpu/pm: Add notification for no DC support")
  559259362e5a ("drm/amdgpu: Remove SRAM clock gater override by driver")
  62a79c93d8c7 ("drm/amdgpu: Add umc_info v4_0 structure")
  63461ea3fb40 ("Revert "drm/amd/display: Remove v_startup workaround for dcn3+"")
  65d1f8896e4c ("drm/amd/display: Roll back unit correction")
  709c280ad526 ("drm/amd/pm: Update SMUv13.0.6 PMFW headers")
  7caebc8f99b2 ("drm/amdgpu: Updated TCP/UTCL1 programming")
  80578f1641aa ("drm/amdgpu: Enable ras for mp0 v13_0_6 sriov")
  813ba1ff8484 ("drm/amd/display: limit the v_startup workaround to ASICs older than DCN3.1")
  95dd6efc6bd3 ("drm/amd/display: fix mode scaling (RMX_.*)")
  a5492fe27ff9 ("drm/amdgpu: fix amdgpu_cs_p1_user_fence")
  a8cde40201a4 ("drm/amdgpu: Support query ecc cap for aqua_vanjaram")
  ac0ec1c7d1f0 ("drm/amd/display: register edp_backlight_control() for DCN301")
  ac3343c761fa ("drm/amdgpu: use read-modify-write mode for gfx v9_4_3 SQ setting")
  b03b44b622de ("Partially revert "drm/amd/display: update add plane to context logic with a new algorithm"")
  b1803560ba9d ("drm/amd/display: fix static screen detection setting")
  c4b9dc5313da ("drm/amdgpu: Add SMU v13.0.6 default reset methods")
  d12f00c91fdf ("drm/amd/display: Remove wait while locked")
  d28e6d5aab47 ("drm/amd/pm: Fix critical temp unit of SMU v13.0.6")
  d30279a9e37a ("drm/amdgpu: Hide xcp partition sysfs under SRIOV")
  d68ccdb26392 ("drm/amdgpu: Allocate coredump memory in a nonblocking way")
  da3a815ccd3a ("drm/amdkfd: use mask to get v9 interrupt sq data bits correctly")
  e0e1764a3a05 ("drm/amd/pm: fix debugfs pm_info output")
  e240020ad1e5 ("drm/amdgpu: update gc_info v2_1 from discovery")
  e370f8f38976 ("drm/amdgpu: Add bootloader wait for PSP v13")
  ea7e2edca8b2 ("drm/amd/display: always switch off ODM before committing more streams")
  ebac9414a56a ("drm/amdkfd: retry after EBUSY is returned from hmm_ranges_get_pages")
  ec4247823bbc ("drm/amd/display: set minimum of VBlank_nom")
  f33647b9e1b0 ("Documentation/gpu: Update amdgpu documentation")
  f489a41998ac ("drm/amdgpu: update mall info v2 from discovery")
  fabd2165d116 ("drm/amd/display: enable cursor degamma for DCN3+ DRM legacy gamma")
  fe320639c129 ("Revert "Revert "drm/amd/display: Implement zpos property""")
$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
Auto-merging drivers/gpu/drm/amd/amdgpu/soc15.c
Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c
Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_svm.c
Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
Auto-merging drivers/gpu/drm/amd/display/dc/Makefile
Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c
Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
Auto-merging drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c
Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c
Auto-merging drivers/gpu/drm/amd/include/amd_shared.h
Auto-merging drivers/gpu/drm/amd/pm/amdgpu_pm.c
Auto-merging drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h
Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
Recorded preimage for 'drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c'
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
Recorded resolution for 'drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c'.
[master 5b29845e0dcc] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux
$ git diff -M --stat --summary HEAD^..
 Documentation/gpu/amdgpu/thermal.rst               |    30 +
 drivers/gpu/drm/amd/amdgpu/Makefile                |    22 +-
 drivers/gpu/drm/amd/amdgpu/aldebaran.c             |    19 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu.h                |    22 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c   |     5 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c        |    15 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h        |    18 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c     |    11 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c             |     3 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c            |     1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c         |   159 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c      |    60 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h       |     9 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell_mgr.c   |     2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c            |    10 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c         |     1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c            |     6 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c            |     6 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c            |    19 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h           |     2 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c         |    29 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c            |    18 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c            |     7 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h            |     2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c          |     8 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h          |    16 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h           |     5 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c           |     2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c          |    69 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h          |    36 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c       |   874 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.h       |   218 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c            |     4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c             |     2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c            |   676 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.h            |    91 +
 drivers/gpu/drm/amd/amdgpu/dce_v10_0.c             |     6 +-
 drivers/gpu/drm/amd/amdgpu/dce_v11_0.c             |     6 +-
 drivers/gpu/drm/amd/amdgpu/dce_v6_0.c              |     6 +-
 drivers/gpu/drm/amd/amdgpu/dce_v8_0.c              |     6 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c             |    13 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c             |    46 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c              |     6 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c            |     4 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c            |    40 +-
 drivers/gpu/drm/amd/amdgpu/gfxhub_v11_5_0.c        |   516 +
 drivers/gpu/drm/amd/amdgpu/gfxhub_v11_5_0.h        |    29 +
 drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0.c           |     3 +-
 drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0_3.c         |     3 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c             |    12 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c              |    24 +-
 drivers/gpu/drm/amd/amdgpu/hdp_v6_0.c              |    20 +-
 drivers/gpu/drm/amd/amdgpu/imu_v11_0.c             |     3 +-
 drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c           |   622 +
 drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.h           |    35 +
 drivers/gpu/drm/amd/amdgpu/mes_v11_0.c             |     3 +
 drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c            |     3 +-
 drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c          |     3 +-
 drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_2.c          |     3 +-
 drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c            |   589 +
 drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.h            |    29 +
 drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c            |   265 +
 drivers/gpu/drm/amd/amdgpu/nbio_v7_11.h            |    33 +
 drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h            |     3 +
 drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c           |     8 +-
 drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c             |     8 +-
 drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c        |    20 +-
 drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c          |    19 +-
 drivers/gpu/drm/amd/amdgpu/soc15.c                 |     5 +-
 drivers/gpu/drm/amd/amdgpu/soc21.c                 |    12 +
 drivers/gpu/drm/amd/amdgpu/umc_v12_0.c             |   256 +
 drivers/gpu/drm/amd/amdgpu/umc_v12_0.h             |    56 +
 drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.c         |   408 +
 drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.h         |    30 +
 drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c            |  1779 +
 drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.h            |    35 +
 drivers/gpu/drm/amd/amdgpu/vpe_6_1_fw_if.h         |   217 +
 drivers/gpu/drm/amd/amdgpu/vpe_v6_1.c              |   289 +
 drivers/gpu/drm/amd/amdgpu/vpe_v6_1.h              |    29 +
 drivers/gpu/drm/amd/amdkfd/kfd_crat.c              |     1 +
 drivers/gpu/drm/amd/amdkfd/kfd_device.c            |     7 +
 .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c  |   116 +-
 drivers/gpu/drm/amd/amdkfd/kfd_int_process_v10.c   |     6 +-
 drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c   |     6 +-
 drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c    |     6 +-
 drivers/gpu/drm/amd/amdkfd/kfd_priv.h              |     2 +-
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  |    37 +
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c  |    51 +-
 .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c |     1 +
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c    |     1 +
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_replay.c   |     4 +-
 drivers/gpu/drm/amd/display/dc/Makefile            |     1 +
 .../amd/display/dc/bios/command_table_helper2.c    |     1 +
 drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile    |     8 +
 drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c   |     5 +
 .../gpu/drm/amd/display/dc/clk_mgr/dcn32/dalsmc.h  |    11 +-
 .../dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.c       |   154 +-
 .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c   |  1000 +
 .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.h   |    63 +
 .../drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.c   |   453 +
 .../drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.h   |   180 +
 drivers/gpu/drm/amd/display/dc/core/dc.c           |    26 +
 .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c  |    23 +
 .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c  |    35 +-
 drivers/gpu/drm/amd/display/dc/core/dc_resource.c  |  1408 +-
 drivers/gpu/drm/amd/display/dc/core/dc_stream.c    |     2 +-
 drivers/gpu/drm/amd/display/dc/dc.h                |    65 +-
 drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c       |    75 +-
 drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h       |     4 +
 drivers/gpu/drm/amd/display/dc/dc_helper.c         |     4 +
 drivers/gpu/drm/amd/display/dc/dc_stream.h         |     1 -
 drivers/gpu/drm/amd/display/dc/dc_types.h          |     1 +
 drivers/gpu/drm/amd/display/dc/dce/dce_abm.h       |     9 +-
 drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h     |    20 +
 drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c    |     4 +
 drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.h    |     6 +
 .../amd/display/dc/dce110/dce110_hw_sequencer.c    |     5 +-
 .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h    |     5 +
 .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h  |    33 +
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h  |    30 +
 .../amd/display/dc/dcn10/dcn10_stream_encoder.h    |    19 +-
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h  |    64 +
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c |    32 +-
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h |     5 +
 .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c  |    22 +-
 .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h  |     4 +-
 .../drm/amd/display/dc/dcn201/dcn201_resource.c    |     1 +
 .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c  |     1 +
 .../gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c |   104 +-
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.h   |     2 -
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.h   |     2 -
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c   |    17 -
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.h   |     1 -
 .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c  |     1 +
 .../drm/amd/display/dc/dcn301/dcn301_resource.c    |     1 +
 .../drm/amd/display/dc/dcn302/dcn302_resource.c    |     1 +
 .../drm/amd/display/dc/dcn303/dcn303_resource.c    |     1 +
 .../display/dc/dcn31/dcn31_hpo_dp_link_encoder.h   |    10 +-
 .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c    |    32 +-
 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.c  |     6 +
 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.h  |     3 +
 .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c  |     1 +
 .../gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c    |     2 +-
 .../gpu/drm/amd/display/dc/dcn314/dcn314_dccg.h    |     6 +
 .../display/dc/dcn314/dcn314_dio_stream_encoder.c  |    22 +-
 .../display/dc/dcn314/dcn314_dio_stream_encoder.h  |    40 +
 .../gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.c   |     3 +-
 .../drm/amd/display/dc/dcn314/dcn314_resource.c    |    24 +
 .../drm/amd/display/dc/dcn315/dcn315_resource.c    |     1 +
 .../drm/amd/display/dc/dcn316/dcn316_resource.c    |     1 +
 .../gpu/drm/amd/display/dc/dcn32/dcn32_mmhubbub.h  |     4 -
 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.h   |     2 -
 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c  |    25 +
 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.h  |     1 +
 .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c  |   156 +-
 .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h  |    14 +-
 .../amd/display/dc/dcn32/dcn32_resource_helpers.c  |    46 +
 .../drm/amd/display/dc/dcn321/dcn321_resource.c    |     1 +
 drivers/gpu/drm/amd/display/dc/dcn35/Makefile      |    20 +
 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dccg.c  |   737 +
 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dccg.h  |   190 +
 .../amd/display/dc/dcn35/dcn35_dio_link_encoder.c  |   267 +
 .../amd/display/dc/dcn35/dcn35_dio_link_encoder.h  |   137 +
 .../display/dc/dcn35/dcn35_dio_stream_encoder.c    |   528 +
 .../display/dc/dcn35/dcn35_dio_stream_encoder.h    |   326 +
 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dpp.c   |    51 +
 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dpp.h   |    55 +
 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dsc.c   |    58 +
 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dsc.h   |    57 +
 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dwb.c   |    58 +
 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dwb.h   |    59 +
 .../gpu/drm/amd/display/dc/dcn35/dcn35_hubbub.c    |   573 +
 .../gpu/drm/amd/display/dc/dcn35/dcn35_hubbub.h    |   150 +
 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubp.c  |   104 +
 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubp.h  |    59 +
 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hwseq.c |  1192 +
 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hwseq.h |    82 +
 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_init.c  |   167 +
 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_init.h  |    32 +
 .../gpu/drm/amd/display/dc/dcn35/dcn35_mmhubbub.c  |    57 +
 .../gpu/drm/amd/display/dc/dcn35/dcn35_mmhubbub.h  |    73 +
 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_opp.c   |    51 +
 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_opp.h   |    65 +
 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_optc.c  |   288 +
 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_optc.h  |   219 +
 .../gpu/drm/amd/display/dc/dcn35/dcn35_pg_cntl.c   |   553 +
 .../gpu/drm/amd/display/dc/dcn35/dcn35_pg_cntl.h   |   193 +
 .../gpu/drm/amd/display/dc/dcn35/dcn35_resource.c  |  2084 +
 .../gpu/drm/amd/display/dc/dcn35/dcn35_resource.h  |   307 +
 drivers/gpu/drm/amd/display/dc/dml/Makefile        |     3 +
 .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c   |     6 +-
 .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c   |   517 +-
 .../dc/dml/dcn32/display_mode_vba_util_32.c        |     4 -
 .../gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c   |   484 +
 .../gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.h   |    44 +
 drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c   |     1 +
 drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c |     1 +
 drivers/gpu/drm/amd/display/dc/inc/core_types.h    |    15 +
 drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h    |     1 +
 drivers/gpu/drm/amd/display/dc/inc/hw/pg_cntl.h    |    52 +
 .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h |     5 +
 .../drm/amd/display/dc/inc/hw/timing_generator.h   |     1 +
 drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h  |    20 +
 .../drm/amd/display/dc/inc/hw_sequencer_private.h  |     2 +
 drivers/gpu/drm/amd/display/dc/inc/link.h          |     1 +
 drivers/gpu/drm/amd/display/dc/inc/resource.h      |   268 +-
 drivers/gpu/drm/amd/display/dc/irq/Makefile        |     9 +
 .../amd/display/dc/irq/dce110/irq_service_dce110.c |    12 +-
 .../amd/display/dc/irq/dce120/irq_service_dce120.c |    12 +-
 .../amd/display/dc/irq/dce60/irq_service_dce60.c   |    12 +-
 .../amd/display/dc/irq/dce80/irq_service_dce80.c   |    12 +-
 .../amd/display/dc/irq/dcn10/irq_service_dcn10.c   |    14 +-
 .../amd/display/dc/irq/dcn20/irq_service_dcn20.c   |    14 +-
 .../amd/display/dc/irq/dcn201/irq_service_dcn201.c |    14 +-
 .../amd/display/dc/irq/dcn21/irq_service_dcn21.c   |    16 +-
 .../amd/display/dc/irq/dcn30/irq_service_dcn30.c   |    16 +-
 .../amd/display/dc/irq/dcn302/irq_service_dcn302.c |    16 +-
 .../amd/display/dc/irq/dcn303/irq_service_dcn303.c |    14 +-
 .../amd/display/dc/irq/dcn31/irq_service_dcn31.c   |    16 +-
 .../amd/display/dc/irq/dcn314/irq_service_dcn314.c |    16 +-
 .../amd/display/dc/irq/dcn315/irq_service_dcn315.c |    16 +-
 .../amd/display/dc/irq/dcn32/irq_service_dcn32.c   |    16 +-
 .../amd/display/dc/irq/dcn35/irq_service_dcn35.c   |   427 +
 .../amd/display/dc/irq/dcn35/irq_service_dcn35.h   |    34 +
 drivers/gpu/drm/amd/display/dc/irq/irq_service.h   |     2 +-
 drivers/gpu/drm/amd/display/dc/link/link_dpms.c    |    32 +-
 drivers/gpu/drm/amd/display/dc/link/link_factory.c |     5 +
 .../amd/display/dc/link/protocols/link_dp_phy.c    |     3 +-
 .../dc/link/protocols/link_edp_panel_control.c     |    29 +
 .../dc/link/protocols/link_edp_panel_control.h     |     1 +
 drivers/gpu/drm/amd/display/dmub/dmub_srv.h        |    52 +-
 drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h    |     5 -
 drivers/gpu/drm/amd/display/dmub/src/Makefile      |     1 +
 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c  |    62 +-
 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.h  |    17 +-
 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c  |   552 +
 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.h  |   282 +
 drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c    |    94 +-
 drivers/gpu/drm/amd/display/include/dal_types.h    |     2 +
 .../drm/amd/display/modules/color/color_gamma.c    |   115 +-
 drivers/gpu/drm/amd/include/amd_shared.h           |     3 +
 .../amd/include/asic_reg/dcn/dcn_3_5_0_offset.h    | 15255 +++++
 .../amd/include/asic_reg/dcn/dcn_3_5_0_sh_mask.h   | 53412 +++++++++++++++++
 .../drm/amd/include/asic_reg/gc/gc_11_5_0_offset.h | 10000 ++++
 .../amd/include/asic_reg/gc/gc_11_5_0_sh_mask.h    | 36531 ++++++++++++
 .../include/asic_reg/mmhub/mmhub_3_3_0_offset.h    |  1395 +
 .../include/asic_reg/mmhub/mmhub_3_3_0_sh_mask.h   |  6722 +++
 .../drm/amd/include/asic_reg/mp/mp_14_0_0_offset.h |   359 +
 .../amd/include/asic_reg/mp/mp_14_0_0_sh_mask.h    |   534 +
 .../amd/include/asic_reg/nbio/nbio_7_11_0_offset.h |  9391 +++
 .../include/asic_reg/nbio/nbio_7_11_0_sh_mask.h    | 57846 +++++++++++++++++++
 .../amd/include/asic_reg/umc/umc_12_0_0_offset.h   |    33 +
 .../amd/include/asic_reg/umc/umc_12_0_0_sh_mask.h  |    95 +
 .../amd/include/asic_reg/vcn/vcn_4_0_0_offset.h    |   422 +
 .../amd/include/asic_reg/vcn/vcn_4_0_0_sh_mask.h   |   882 +
 .../amd/include/asic_reg/vcn/vcn_4_0_5_offset.h    |  1797 +
 .../amd/include/asic_reg/vcn/vcn_4_0_5_sh_mask.h   |  8614 +++
 .../amd/include/asic_reg/vpe/vpe_6_1_0_offset.h    |  1553 +
 .../amd/include/asic_reg/vpe/vpe_6_1_0_sh_mask.h   |  4393 ++
 .../drm/amd/include/ivsrcid/vpe/irqsrcs_vpe_6_1.h  |    40 +
 drivers/gpu/drm/amd/include/kgd_pp_interface.h     |    12 +-
 drivers/gpu/drm/amd/include/soc15_hw_ip.h          |     1 +
 drivers/gpu/drm/amd/include/soc15_ih_clientid.h    |     2 +
 drivers/gpu/drm/amd/include/umsch_mm_4_0_api_def.h |   437 +
 drivers/gpu/drm/amd/pm/amdgpu_pm.c                 |   791 +-
 drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h            |    14 +
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c          |    33 +
 drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h       |     5 +
 drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c  |   172 +-
 drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c   |    24 +-
 drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c |   189 +-
 .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c   |   368 +-
 .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c   |     2 +-
 .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c   |     6 +-
 .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c   |   362 +-
 drivers/gpu/drm/radeon/evergreen.c                 |     7 +-
 drivers/gpu/drm/radeon/radeon.h                    |     4 -
 drivers/gpu/drm/radeon/radeon_drv.c                |     2 -
 drivers/gpu/drm/radeon/radeon_fence.c              |   111 +-
 drivers/gpu/drm/radeon/radeon_gem.c                |    16 -
 drivers/gpu/drm/radeon/radeon_ttm.c                |     2 -
 include/uapi/drm/amdgpu_drm.h                      |     6 +-
 282 files changed, 234920 insertions(+), 1607 deletions(-)
 create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.h
 create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.h
 create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v11_5_0.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v11_5_0.h
 create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.h
 create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.h
 create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_11.h
 create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v12_0.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v12_0.h
 create mode 100644 drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.h
 create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.h
 create mode 100644 drivers/gpu/drm/amd/amdgpu/vpe_6_1_fw_if.h
 create mode 100644 drivers/gpu/drm/amd/amdgpu/vpe_v6_1.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/vpe_v6_1.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/Makefile
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dccg.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dccg.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dio_link_encoder.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dio_link_encoder.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dio_stream_encoder.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dio_stream_encoder.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dpp.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dpp.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dsc.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dsc.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dwb.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dwb.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubbub.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubbub.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubp.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubp.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hwseq.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hwseq.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_init.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_init.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_mmhubbub.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_mmhubbub.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_opp.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_opp.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_optc.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_optc.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_pg_cntl.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_pg_cntl.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_resource.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_resource.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/pg_cntl.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn35/irq_service_dcn35.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn35/irq_service_dcn35.h
 create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c
 create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_5_0_offset.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_5_0_sh_mask.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_11_5_0_offset.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_11_5_0_sh_mask.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_3_3_0_offset.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_3_3_0_sh_mask.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_14_0_0_offset.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_14_0_0_sh_mask.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_11_0_offset.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_11_0_sh_mask.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_12_0_0_offset.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_12_0_0_sh_mask.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_4_0_5_offset.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_4_0_5_sh_mask.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vpe/vpe_6_1_0_offset.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vpe/vpe_6_1_0_sh_mask.h
 create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/vpe/irqsrcs_vpe_6_1.h
 create mode 100644 drivers/gpu/drm/amd/include/umsch_mm_4_0_api_def.h
Merging drm-intel/for-linux-next (5eefc5307c98 drm/i915: mark requests for GuC virtual engines to avoid use-after-free)
$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next
Already up to date.
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
$ 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 (34b149ecae85 drm/msm/a6xx: Bail out early if setting GPU OOB fails)
$ 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 (d93cf453f51d drm/msm/dpu: fix the irq index in dpu_encoder_phys_wb_wait_for_commit_done)
$ 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 etnaviv/etnaviv/next (88c31d2dd191 drm/etnaviv: fix error code in event_alloc())
$ 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 (2dde18cd1d8f Linux 6.5)
$ 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 (26fc7cfa30d6 Merge remote-tracking branch 'regmap/for-6.6' into regmap-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next
Merge made by the 'ort' strategy.
Merging sound/for-next (ecc8b4d0b6e1 Merge tag 'asoc-fix-v6.6-merge-window' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
$ 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 ieee1394/for-next (2dde18cd1d8f Linux 6.5)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next
Already up to date.
Merging sound-asoc/for-next (d9a1beeb9043 Merge remote-tracking branch 'asoc/for-6.5' 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 (33c24bee4b78 kallsyms: Add more debug output for selftest)
$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next
Already up to date.
Merging input/next (305dd7645503 Input: wdt87xx_i2c - use device core to create driver-specific device attributes)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next
Auto-merging drivers/input/touchscreen/exc3000.c
Merge made by the 'ort' strategy.
 drivers/input/keyboard/cros_ec_keyb.c      | 10 +++-------
 drivers/input/misc/iqs269a.c               | 10 ++--------
 drivers/input/misc/kxtj9.c                 | 29 +++++++++++++++++------------
 drivers/input/mouse/cyapa.c                | 14 +++-----------
 drivers/input/touchscreen/ad7877.c         | 12 +++++-------
 drivers/input/touchscreen/ad7879-i2c.c     |  7 ++++---
 drivers/input/touchscreen/ad7879-spi.c     |  7 ++++---
 drivers/input/touchscreen/ad7879.c         | 10 ++++++----
 drivers/input/touchscreen/ad7879.h         |  3 +++
 drivers/input/touchscreen/ads7846.c        | 18 ++++++------------
 drivers/input/touchscreen/edt-ft5x06.c     | 10 ++--------
 drivers/input/touchscreen/elants_i2c.c     | 15 +++------------
 drivers/input/touchscreen/exc3000.c        | 12 +++---------
 drivers/input/touchscreen/hideep.c         | 15 +++------------
 drivers/input/touchscreen/hycon-hy46xx.c   | 10 ++--------
 drivers/input/touchscreen/ili210x.c        | 15 +++++----------
 drivers/input/touchscreen/ilitek_ts_i2c.c  | 12 ++----------
 drivers/input/touchscreen/iqs5xx.c         | 10 +++-------
 drivers/input/touchscreen/melfas_mip4.c    | 13 ++-----------
 drivers/input/touchscreen/raydium_i2c_ts.c | 16 +++-------------
 drivers/input/touchscreen/rohm_bu21023.c   | 12 ++----------
 drivers/input/touchscreen/s6sy761.c        | 10 ++--------
 drivers/input/touchscreen/stmfts.c         | 10 ++--------
 drivers/input/touchscreen/tsc2004.c        |  7 ++++---
 drivers/input/touchscreen/tsc2005.c        |  7 ++++---
 drivers/input/touchscreen/tsc200x-core.c   | 18 +++++++-----------
 drivers/input/touchscreen/tsc200x-core.h   |  1 +
 drivers/input/touchscreen/wdt87xx_i2c.c    | 16 ++++------------
 28 files changed, 107 insertions(+), 222 deletions(-)
Merging block/for-next (e7151bd1d070 Merge branch 'block-6.6' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next
Merge made by the 'ort' strategy.
Merging device-mapper/for-next (1e4ab7b4c881 dm cache policy smq: ensure IO doesn't prevent cleaner policy progress)
$ 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 (27fd071040e3 ata: libata-core: Disable NCQ_TRIM on Micron 1100 drives)
$ 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 (4f733de8b78a pcmcia: tcic: remove unneeded "&" in call to setup_timer())
$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next
Merge made by the 'ort' strategy.
 drivers/pcmcia/cs.c              |  1 +
 drivers/pcmcia/ds.c              | 14 +++++++++-----
 drivers/pcmcia/pcmcia_resource.c |  2 +-
 drivers/pcmcia/tcic.c            |  2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)
Merging mmc/next (98ac9e4fc07f mmc: atmel-mci: Move card detect gpio polarity quirk to gpiolib)
$ 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 (9aab92bc3a89 mfd: mc13xxx: Simplify device data fetching in probe())
$ 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 (a4464092f2c5 backlight: led_bl: Remove redundant of_match_ptr())
$ 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 (7e6311f04b41 power: supply: qcom_pmi8998_charger: fix charger status)
$ 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
Already up to date.
Merging regulator/for-next (41f02a383ac6 Merge remote-tracking branch 'regulator/for-6.5' into regulator-linus)
$ 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 (8e4672d6f902 lsm: constify the 'file' parameter in security_binder_transfer_file())
$ 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 (8884ba07786c apparmor: fix invalid reference on profile->disconnected)
$ 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 security/apparmor/apparmorfs.c
Auto-merging security/apparmor/policy_unpack.c
Merge made by the 'ort' strategy.
 security/apparmor/apparmorfs.c     |  3 +++
 security/apparmor/audit.c          |  1 +
 security/apparmor/capability.c     |  4 ++--
 security/apparmor/domain.c         | 12 +++++++-----
 security/apparmor/file.c           |  6 +++---
 security/apparmor/include/file.h   | 37 -------------------------------------
 security/apparmor/include/net.h    |  1 -
 security/apparmor/include/policy.h |  9 ---------
 security/apparmor/include/task.h   |  2 +-
 security/apparmor/label.c          | 26 ++++++++++++++------------
 security/apparmor/lib.c            |  4 ++--
 security/apparmor/match.c          |  4 ++--
 security/apparmor/policy.c         | 22 +++++++++++++---------
 security/apparmor/policy_compat.c  |  1 +
 security/apparmor/policy_unpack.c  |  7 ++++---
 security/apparmor/resource.c       |  8 ++++----
 security/apparmor/task.c           |  5 +----
 17 files changed, 58 insertions(+), 94 deletions(-)
Merging integrity/next-integrity (55e2b69649be kexec_lock: Replace kexec_mutex() by kexec_lock() in two comments)
$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity
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 (1df83cbf23a2 selinux: prevent KMSAN warning in selinux_inet_conn_request())
$ 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 (3ad49d37cf57 smackfs: Prevent underflow in smk_set_cipso())
$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next
Already up to date.
Merging tomoyo/master (3f86ed6ec0b3 Merge tag 'arc-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc)
$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master
Already up to date.
Merging tpmdd/next (8f7f35e5aa6f tpm: Enable hwrng only for Pluton on AMD CPUs)
$ 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 (8c776a0401f1 watchdog: Add support for Amlogic-T7 SoCs)
$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master
Already up to date.
Merging iommu/next (d8fe59f11096 Merge branches 'apple/dart', 'arm/mediatek', 'arm/renesas', 'arm/rockchip', 'arm/smmu', 'unisoc', '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 (b1a0f64cc65e audit: move trailing statements to next line)
$ 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 (d117ca218b16 Merge branch 'dt/header-cleanups-for-6.6' into dt/next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next
Merge made by the 'ort' strategy.
Merging dt-krzk/for-next (f418e00ab433 Merge branch 'next/qcom-pinctrl' into for-next)
$ 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
Merge made by the 'ort' strategy.
Merging mailbox/mailbox-for-next (a493208079e2 mailbox: qcom-ipcc: fix incorrect num_chans counting)
$ git merge -m Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration.git mailbox/mailbox-for-next
Already up to date.
Merging spi/for-next (578464679f33 spi: sun6i: fix RX data corruption in DMA mode)
$ 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 (8bec678d83e9 Merge branch into tip/master: 'x86/bugs')
$ 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.
 Documentation/admin-guide/hw-vuln/srso.rst |  24 +-
 arch/x86/events/core.c                     |   6 +-
 arch/x86/events/intel/core.c               | 429 +++++++++++++++--------------
 arch/x86/events/intel/ds.c                 |   4 +-
 arch/x86/events/perf_event.h               |  37 ++-
 arch/x86/include/asm/bitops.h              |   9 +
 arch/x86/include/asm/nospec-branch.h       |  69 ++---
 arch/x86/include/asm/processor.h           |   2 -
 arch/x86/kernel/alternative.c              |   8 -
 arch/x86/kernel/cpu/amd.c                  |  28 +-
 arch/x86/kernel/cpu/bugs.c                 | 102 ++++---
 arch/x86/kernel/vmlinux.lds.S              |  10 +-
 arch/x86/lib/retpoline.S                   | 171 ++++++------
 include/linux/objtool.h                    |   3 +-
 kernel/sched/fair.c                        |  15 +-
 scripts/Makefile.vmlinux_o                 |   3 +-
 16 files changed, 477 insertions(+), 443 deletions(-)
Merging clockevents/timers/drivers/next (0a8b07c77ea0 clocksource: Explicitly include correct DT includes)
$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next
Already up to date.
Merging edac/edac-for-next (ce53ad81ed36 EDAC/igen6: Fix the issue of no error events)
$ 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 (19b5a44bee16 irqchip: Add support for Amlogic-C3 SoCs)
$ 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 (fc1653abba0d Merge probes/for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next
Auto-merging Documentation/filesystems/proc.rst
Auto-merging init/main.c
Merge made by the 'ort' strategy.
 Documentation/filesystems/proc.rst |  5 ++++-
 fs/proc/Makefile                   |  1 +
 fs/proc/raw_cmdline.c              | 25 +++++++++++++++++++++++++
 include/linux/init.h               |  3 ++-
 init/main.c                        |  2 +-
 5 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 fs/proc/raw_cmdline.c
Merging rcu/rcu/next (94e70d269433 Merge branch 'csd-lock.2023.07.14b' 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.
Merging kvm/next (d011151616e7 Merge branch 'kvm-x86-mmu-6.6' into HEAD)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next
Already up to date.
Merging kvm-arm/next (169c0f23cacc KVM: arm64: Properly return allocated EL2 VA from hyp_alloc_private_va_range())
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next
Auto-merging arch/arm64/kvm/mmu.c
Merge made by the 'ort' strategy.
 arch/arm64/kvm/mmu.c | 3 +++
 1 file changed, 3 insertions(+)
Merging kvms390/next (899e2206f46a KVM: s390: pv: Allow AP-instructions for pv-guests)
$ 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 kvm-riscv/riscv_kvm_next (477069398ed6 KVM: riscv: selftests: Add get-reg-list test)
$ git merge -m Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git kvm-riscv/riscv_kvm_next
Already up to date.
Merging kvm-x86/next (ff6e6ded5472 Merge tag 'rtc-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux)
$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next
Already up to date.
Merging xen-tip/linux-next (475505975093 xen: simplify evtchn_do_upcall() call maze)
$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next
Auto-merging arch/x86/xen/enlighten_hvm.c
Merge made by the 'ort' strategy.
 arch/arm/xen/enlighten.c         |  2 +-
 arch/x86/entry/common.c          |  2 +-
 arch/x86/xen/enlighten.c         |  2 +-
 arch/x86/xen/enlighten_hvm.c     |  2 +-
 drivers/xen/events/events_base.c | 21 ++-------------------
 drivers/xen/platform-pci.c       |  2 +-
 include/xen/events.h             |  3 +--
 7 files changed, 8 insertions(+), 26 deletions(-)
Merging percpu/for-next (3fcf62f24c80 Merge branch 'for-6.6' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next
Merge made by the 'ort' strategy.
Merging workqueues/for-next (96796025f400 Merge branch 'for-6.6' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next
Merge made by the 'ort' strategy.
Merging drivers-x86/for-next (acce85a7dd28 platform/x86: asus-wmi: corrections to egpu safety check)
$ 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 (0820debb7d48 platform/chrome: chromeos_acpi: print hex string for ACPI_TYPE_BUFFER)
$ 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 chrome-platform-firmware/for-firmware-next (0979e7e3cfd7 MAINTAINERS: Add drivers/firmware/google/ entry)
$ git merge -m Merge branch 'for-firmware-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform-firmware/for-firmware-next
Already up to date.
Merging hsi/for-next (7ebf243a2018 hsi: omap_ssi: Explicitly include correct DT includes)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next
Already up to date.
Merging leds/for-next (1b929c02afd3 Linux 6.2-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next
Already up to date.
Merging leds-lj/for-leds-next (baca986e1f2c leds: aw2013: Enable pull-up supply for interrupt and I2C)
$ git merge -m Merge branch 'for-leds-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git leds-lj/for-leds-next
Already up to date.
Merging ipmi/for-next (29aa98d0fe01 Merge tag 'for-linus-2023083101' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid)
$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next
Already up to date.
Merging driver-core/driver-core-next (6b8bb5b8d9b3 Merge tag 'sh-for-v6.6-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-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 (535a265d7f0d Merge tag 'perf-tools-for-v6.6-1-2023-09-05' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools)
$ 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 (a3f6445842e5 Documentation/ABI: thunderbolt: Replace 01.org in contact)
$ 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-serial/usb-next (4d9488b294e1 USB: serial: option: add FOXCONN T99W368/T99W373 product)
$ 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 (535a265d7f0d Merge tag 'perf-tools-for-v6.6-1-2023-09-05' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools)
$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next
Already up to date.
Merging char-misc/char-misc-next (535a265d7f0d Merge tag 'perf-tools-for-v6.6-1-2023-09-05' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools)
$ 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 accel/habanalabs-next (ef8b0cb1ba37 accel/habanalabs: fix ETR/ETF flush logic)
$ git merge -m Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git accel/habanalabs-next
Auto-merging Documentation/ABI/testing/debugfs-driver-habanalabs
Auto-merging drivers/accel/habanalabs/common/habanalabs.h
CONFLICT (content): Merge conflict in drivers/accel/habanalabs/common/habanalabs.h
Resolved 'drivers/accel/habanalabs/common/habanalabs.h' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master 1afa675a672d] Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git
$ git diff -M --stat --summary HEAD^..
 .../ABI/testing/debugfs-driver-habanalabs          |  82 ++---
 Documentation/ABI/testing/sysfs-driver-habanalabs  |  64 ++--
 drivers/accel/drm_accel.c                          |  21 +-
 drivers/accel/habanalabs/common/command_buffer.c   |   5 +-
 .../accel/habanalabs/common/command_submission.c   | 374 +++++++++++++--------
 drivers/accel/habanalabs/common/context.c          |   9 +-
 drivers/accel/habanalabs/common/debugfs.c          |  22 +-
 drivers/accel/habanalabs/common/device.c           | 268 +++++++--------
 drivers/accel/habanalabs/common/firmware_if.c      |  13 +-
 drivers/accel/habanalabs/common/habanalabs.h       |  88 +++--
 drivers/accel/habanalabs/common/habanalabs_drv.c   | 169 +++++-----
 drivers/accel/habanalabs/common/habanalabs_ioctl.c |  98 +++---
 drivers/accel/habanalabs/common/irq.c              |  17 +-
 drivers/accel/habanalabs/common/memory.c           |   7 +-
 drivers/accel/habanalabs/gaudi/gaudi.c             |   4 +
 drivers/accel/habanalabs/gaudi/gaudi_coresight.c   |  12 +
 drivers/accel/habanalabs/gaudi2/gaudi2.c           | 371 +++++++++++++++++---
 drivers/accel/habanalabs/gaudi2/gaudi2_coresight.c |  34 +-
 drivers/accel/habanalabs/gaudi2/gaudi2_security.c  |  21 +-
 drivers/accel/habanalabs/goya/goya_coresight.c     |  10 +
 .../accel/habanalabs/include/common/hl_boot_if.h   |   5 +
 include/uapi/drm/habanalabs_accel.h                |  55 +--
 22 files changed, 1098 insertions(+), 651 deletions(-)
Merging coresight/next (c0a232f1e19e coresight: trbe: Fix TRBE potential sleep in atomic context)
$ 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 fastrpc/for-next (06c2afb862f9 Linux 6.5-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git fastrpc/for-next
Already up to date.
Merging fpga/for-next (1a22ec09a2c1 fpga: region: make fpga_region_class a static const structure)
$ 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 (6ac3f01201fa Merge branch 'icc-debugfs' 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 (14b7447cec15 Documentation: ABI: testing: admv8818: add bypass)
$ 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 (691525074db9 phy: exynos5-usbdrd: Add Exynos850 support)
$ 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 (8c4c9a9ae5af soundwire: intel_ace2x: add DAI hw_params/prepare/hw_free callbacks)
$ 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 (d20a3a8a32e3 extcon: cht_wc: add POWER_SUPPLY dependency)
$ 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 (fdf0eaf11452 Linux 6.5-rc2)
$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next
Already up to date.
Merging vfio/next (642265e22ecc vfio/pds: Send type for SUSPEND_STATUS command)
$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next
Already up to date.
Merging w1/for-next (06c2afb862f9 Linux 6.5-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next
Already up to date.
Merging staging/staging-next (6b8bb5b8d9b3 Merge tag 'sh-for-v6.6-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-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 counter-next/counter-next (631c15d5f14d counter: chrdev: remove a typo in header file comment)
$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next
Auto-merging drivers/counter/microchip-tcb-capture.c
Merge made by the 'ort' strategy.
 include/uapi/linux/counter.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
$ 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 (72f5801a4e2b dmaengine: fsl-edma: integrate v3 support)
$ 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 (78d44b824ed0 cgroup: Avoid -Wstringop-overflow warnings)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next
Already up to date.
Merging scsi/for-next (bd198f03568f 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
Merge made by the 'ort' strategy.
Merging scsi-mkp/for-next (d32533d30e21 scsi: ufs: core: Poll HCS.UCRDY before issuing a UIC command)
$ 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/qla2xxx/qla_dfs.c
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_dfs.c
Resolved 'drivers/scsi/qla2xxx/qla_dfs.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master 145301ab3706] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
$ git diff -M --stat --summary HEAD^..
 drivers/scsi/megaraid/megaraid_sas.h      |  2 +-
 drivers/scsi/megaraid/megaraid_sas_base.c | 21 +++++++++------------
 drivers/scsi/ppa.c                        |  4 ++--
 drivers/scsi/qedf/qedf_io.c               | 10 ++++++++--
 drivers/scsi/qedf/qedf_main.c             |  7 ++++++-
 drivers/scsi/qla2xxx/qla_dfs.c            |  6 +++---
 drivers/scsi/qla2xxx/qla_inline.h         |  2 +-
 drivers/scsi/qla2xxx/qla_isr.c            |  6 +++---
 drivers/scsi/qla2xxx/qla_nvme.c           | 10 +++++-----
 drivers/scsi/qla2xxx/qla_target.c         |  3 +--
 drivers/scsi/qla2xxx/tcm_qla2xxx.c        |  4 ++--
 drivers/target/target_core_configfs.c     | 24 ++++++++++++------------
 drivers/ufs/core/ufshcd.c                 | 13 +++++++------
 include/linux/nvme-fc-driver.h            |  6 +++---
 14 files changed, 63 insertions(+), 55 deletions(-)
Merging vhost/linux-next (1acfe2c12258 virtio_ring: fix avail_wrap_counter in virtqueue_add_packed)
$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next
Already up to date.
Merging rpmsg/for-next (569e93d37475 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-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
Merge made by the 'ort' strategy.
Merging gpio/for-next (ac9a78681b92 Linux 6.4-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 (3d0957b07e27 gpio: pca953x: add support for TCA9538)
$ 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 (06c2afb862f9 Linux 6.5-rc1)
$ 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 pinctrl/for-next (b4e880a8d840 Merge branch 'devel' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next
Merge made by the 'ort' strategy.
Merging pinctrl-intel/for-next (d5301c90716a pinctrl: cherryview: fix address_space_handler() argument)
$ 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 (3a629cf4f0e6 Merge tag 'renesas-pinctrl-fixes-for-v6.5-tag2' into renesas-pinctrl)
$ 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
Merge made by the 'ort' strategy.
Merging pinctrl-samsung/for-next (06c2afb862f9 Linux 6.5-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next
Already up to date.
Merging pwm/for-next (4aae44f65827 pwm: lpc32xx: Remove handling of PWM channels)
$ 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 (05bd6e0242b4 Merge of unpriv-ipc-sysctls-for-v6.2, and fix-atomic_lock_inc_below-for-v6.2 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 Documentation/admin-guide/sysctl/kernel.rst
Auto-merging ipc/ipc_sysctl.c
Auto-merging ipc/mq_sysctl.c
Auto-merging kernel/ucount.c
Merge made by the 'ort' strategy.
 Documentation/admin-guide/sysctl/kernel.rst | 14 ++++++++---
 ipc/ipc_sysctl.c                            | 37 +++++++++++++++++++++++++++--
 ipc/mq_sysctl.c                             | 36 ++++++++++++++++++++++++++++
 kernel/ucount.c                             | 16 ++++++-------
 4 files changed, 89 insertions(+), 14 deletions(-)
Merging ktest/for-next (7dc8e24f0e09 ktest: Restore stty setting at first in dodie)
$ 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 (3f3f384139ed selftests: Keep symlinks, when possible)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next
Auto-merging tools/testing/selftests/kselftest/runner.sh
Merge made by the 'ort' strategy.
 .../ftrace/test.d/instances/instance-event.tc      |  2 +-
 tools/testing/selftests/kselftest/runner.sh        |  3 +-
 tools/testing/selftests/kselftest_deps.sh          | 77 ++++++++++++++++++----
 tools/testing/selftests/lib.mk                     |  4 +-
 4 files changed, 70 insertions(+), 16 deletions(-)
Merging kunit/test (06c2afb862f9 Linux 6.5-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 kunit-next/kunit (9076bc476d7e kunit: Fix possible memory leak in kunit_filter_suites())
$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit
Merge made by the 'ort' strategy.
 lib/kunit/executor.c      | 48 ++++++++++++++++++++++++++++++++---------------
 lib/kunit/executor_test.c | 13 ++++++++-----
 lib/kunit/test.c          |  3 ++-
 3 files changed, 43 insertions(+), 21 deletions(-)
Merging livepatching/for-next (ac4890f97211 Merge branch 'for-6.5/core' 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 (ce413486c9a0 dt-bindings: rtc: ds3231: Remove text binding)
$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next
Already up to date.
Merging nvdimm/libnvdimm-for-next (08ca6906a4b7 nvdimm: Fix dereference after free in register_nvdimm_pmu())
$ 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
Already up to date.
Merging at24/at24/for-next (06c2afb862f9 Linux 6.5-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 (643982232860 ntb: Check tx descriptors outstanding instead of head/tail for tx queue)
$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next
Already up to date.
Merging seccomp/for-next/seccomp (46822860a5a9 seccomp: Add missing kerndoc notations)
$ 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 fsi/next (f04d61a379d6 fsi: fix some spelling mistakes in comment)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next
Already up to date.
Merging slimbus/for-next (06c2afb862f9 Linux 6.5-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next
Already up to date.
Merging nvmem/for-next (06c2afb862f9 Linux 6.5-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next
Already up to date.
Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main
Already up to date.
Merging hyperv/hyperv-next (284930a0146a x86/hyperv: Remove duplicate include)
$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next
Already up to date.
Merging auxdisplay/auxdisplay (35b464e32c8b auxdisplay: hd44780: move cursor home after clear display command)
$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay
Already up to date.
Merging kgdb/kgdb/for-next (b6464883f45a kdb: move kdb_send_sig() declaration to a better header file)
$ 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 (06c2afb862f9 Linux 6.5-rc1)
$ 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 cfi/cfi/next (06c2afb862f9 Linux 6.5-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 mhi/mhi-next (0724869ede9c bus: mhi: host: pci_generic: add support for Telit FE990 modem)
$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next
Already up to date.
Merging memblock/for-next (0f5e4adb608c memblock: report failures when memblock_can_resize is not set)
$ 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging cxl/next (fe77cc2e5a6a cxl: Fix one kernel-doc comment)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next
Already up to date.
Merging zstd/zstd-next (2aa14b1ab2c4 zstd: import usptream v1.5.2)
$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next
Already up to date.
Merging efi/next (b691118f2c44 Merge remote-tracking branch 'linux-efi/urgent' into efi/next)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next
Already up to date.
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/slab/for-next (3d053e806043 Merge branch 'slab/for-6.6/random_kmalloc' into slab/for-next)
$ git merge -m Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/slab/for-next
Already up to date.
Merging random/master (512dee0c00ad Merge tag 'x86-urgent-2023-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
$ 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 (2a2015495142 selftests/landlock: Fix a resource leak)
$ 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 (4af84c6a85c6 rust: init: update expanded macro explanation)
$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next
Already up to date.
Merging sysctl/sysctl-next (53f3811dfd5e sysctl: Use ctl_table_size as stopping criteria for list macro)
$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next
Already up to date.
Merging execve/for-next/execve (fdf0eaf11452 Linux 6.5-rc2)
$ 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 (bcafd8b927ed bitmap: Remove dead code, i.e. bitmap_copy_le())
$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next
Merge made by the 'ort' strategy.
 include/linux/bitmap.h  |   5 ---
 include/linux/cpumask.h | 113 +++++++++++++++++++++++++++++-------------------
 lib/bitmap.c            |  27 +-----------
 lib/cpumask.c           |  17 +++++---
 4 files changed, 83 insertions(+), 79 deletions(-)
Merging hte/for-next (06c2afb862f9 Linux 6.5-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next
Already up to date.
Merging kspp/for-next/kspp (5f536ac6a5a7 LoadPin: Annotate struct dm_verity_loadpin_trusted_root_digest with __counted_by)
$ 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 (4d8cbf6dbcda fs: omfs: Use flexible-array member in struct omfs_extent)
$ 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 nolibc/nolibc (556fb7131e03 tools/nolibc: avoid undesired casts in the __sysret() macro)
$ git merge -m Merge branch 'nolibc' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git nolibc/nolibc
Already up to date.
Merging iommufd/for-next (eb501c2d96cf iommufd/selftest: Don't leak the platform device memory when unloading the module)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next
Already up to date.